Apply improved naming to bindings

Author: brucemiller

lib/LaTeXML/Package/aas_support.sty.ltxml

@@ -112,7 +112,7 @@ DefMacro('\lx@aas@checkorchid@ Until:, Until:\done', sub {
 
 # \email[]{addr} applies to previous author
 # \correspondingauthor{name}
-DefMacro('\correspondingauthor{}', '\lx@add@contact[role=correspondent,mark={fuzzy:#1}]{#1}');
+DefMacro('\correspondingauthor{}', '\lx@add@contact[role=correspondent,label={fuzzy:#1}]{#1}');
 
 # Various contact information attaches to previous \author
 DefMacro('\affiliation{}',    '\lx@add@affiliation{#1}');
@@ -121,15 +121,15 @@ DefMacro('\affil',            '\affiliation');
 DefMacro('\authoraddr{}',     '\lx@add@address{#1}');
 DefMacro('\email{}',          '\lx@add@email{#1}');
 
-# \collaboration{n}{name} applies to previous n authors [can be 0 or all]
-# \nocollaboration{n} ???
-DefMacro('\collaboration{}{}', '\lx@add@contact[role=collaboration,attach={#1}]{#2}');
-DefMacro('\nocollaboration{}', '');
+# \collaboration{n}{name} applies to previous authors w/o collab; n is how many to SHOW
+# \nocollaboration{n} ditto, but says they are not in a collaboration gruup.
+DefMacro('\collaboration{}{}', '\lx@add@contact[role=collaboration,annotate=new]{#2}');
+DefMacro('\nocollaboration{}', '\lx@add@contact[role=collaboration,annotate=new]{}');
 
 # Older aas versions: put mark within \author, text will be attached
-DefMacro('\altaffilmark{}',    '\lx@add@creator@mark[altaffil]{#1}');
-DefMacro('\altaffilteext{}{}', '\lx@add@contact[role=altaffiliation,mark=altaffil#1]{#2}');
-DefMacro('\authoremail',       '\email');    # Obsolete form
+DefMacro('\altaffilmark{}',   '\lx@request@frontmatter@annotation[altaffil]{#1}');
+DefMacro('\altaffiltext{}{}', '\lx@add@contact[role=altaffiliation,label=altaffil#1]{#2}');
+DefMacro('\authoremail',      '\email');    # Obsolete form
 
 # Redefine to straight email address after document begin.
 ###AddToMacro(T_CS('\@startsection@hook'), TokenizeInternal('\let\email\@@email'));

lib/LaTeXML/Package/acmart.cls.ltxml

@@ -87,7 +87,7 @@ DefConstructor('\Description[]{}', '^^<ltx:note xml:id="#id" class="ltx_nodispla
 # Note that \affiliation can apply to all preceding authors without one
 DefMacro('\author{}',                '\lx@add@creator[role=author]{#1}');
 DefMacro('\editor{}',                '\lx@add@creator[role=editor]{#1}');
-DefMacro('\affiliation{}',           '\lx@add@contact[role=affiliation,attach=new]{#1}');
+DefMacro('\affiliation{}',           '\lx@add@contact[role=affiliation,annotate=new]{#1}');
 DefMacro('\additionalaffiliation{}', '\lx@add@contact[role=altaffiliation]{#1}');
 DefMacro('\email [] Semiverbatim',   '\lx@add@contact[role=email,name={email: }]{#2}');
 DefMacro('\orcid{}',                 '\lx@add@contact[role=orcid, name={OrcID: }]{#1}');

lib/LaTeXML/Package/authblk.sty.ltxml

@@ -46,16 +46,16 @@ NewCounter('@affil');
 #  \author[mark]{name} : REPEATED
 #  \affil[mark]{affil} : REPEATED, attaches to author with same mark
 DefMacro('\author[]{}', sub {
-    my ($gullet, $mark, $author) = @_;
-    if ($mark) {    # Use mark attachment
-      Invocation('\lx@add@creator[role=author,mark={#1}]{#2}', $mark, $author); }
+    my ($gullet, $label, $author) = @_;
+    if ($label) {    # Use label attachment
+      Invocation('\lx@add@creator[role=author,annotations={#1}]{#2}', $label, $author); }
     elsif (grep { $_->defined_as(T_CS('\and')) || $_->defined_as(T_CS('\And')); } $author->unlist) {
       Invocation(T_CS('\lx@add@authors'), $author); }
     else {
       Invocation(T_CS('\lx@add@creator'), undef, $author); } });
 
 DefMacro('\affil[]{}',
-  '\lx@add@contact[role=affiliation,attach={\ifx.#1.new\else 1\fi},mark={#1}]{#2}');
+  '\lx@add@contact[role=affiliation,annotate={\ifx.#1.new\else 1\fi},label={#1}]{#2}');
 
 # we shouldn't need these, but if someone is using them low-level
 # might as well provide them

lib/LaTeXML/Package/elsart_support_core.sty.ltxml

@@ -33,12 +33,12 @@ DefEnvironment('{frontmatter}', '#body');
 # It either should be followed by \affiliation,
 # or both should get matching marks
 DefMacro('\author[]{}',
-  '\lx@add@creator[role=author,mark={#1}]{#2}');
+  '\lx@add@creator[role=author,annotations={#1}]{#2}');
 
 DefMacro('\address[]{}',
-  '\lx@add@contact[mark={#1},role=address]{#2}');
+  '\lx@add@contact[label={#1},role=address]{#2}');
 DefMacro('\affiliation[]{}',
-  '\lx@add@contact[mark={#1},role=affiliation]{#2}');
+  '\lx@add@contact[label={#1},role=affiliation]{#2}');
 
 # Redefine to account for the label, which we ignore for now!
 DefConstructor('\thanks[]{}', "<ltx:note role='thanks'>#2</ltx:note>");
@@ -50,16 +50,16 @@ Let('\collaboration', '\collab');
 # These pairs add various contact information to authors.
 # The \<XXX>ref forms are used within the \author text to anchor the connection
 # the \<XXX>text forms supply the text (& and role) for the contact that will be attached.
-DefMacro('\thanksref{}',   '\lx@add@creator@mark{thanks:#1}');
-DefMacro('\corref{}',      '\lx@add@creator@mark{cor:#1}');
-DefMacro('\corauthref{}',  '\lx@add@creator@mark{corauth:#1}');
-DefMacro('\fnref{}',       '\lx@add@creator@mark{fn:#1}');
-DefMacro('\tnoteref{}',    '\lx@add@creator@mark{tnote:#1}');     # Possibly for title, not author?
-DefMacro('\thanks[]{}',    '\lx@add@contact[mark={thanks:#1},role=thanks]{#2}');
-DefMacro('\cortext[]{}',   '\lx@add@contact[mark={cor:#1},role=correspondent]{#2}');
-DefMacro('\corauth[]{}',   '\lx@add@contact[mark={corauth:#1},role=correspondent]{#2}');
-DefMacro('\fntext[]{}',    '\lx@add@contact[mark={fn:#1},role=note]{#2}');
-DefMacro('\tnotetext[]{}', '\lx@add@contact[mark={tnote:#1},role=note]{#2}');    # title note?
+DefMacro('\thanksref{}',  '\lx@request@frontmatter@annotation{thanks:#1}');
+DefMacro('\corref{}',     '\lx@request@frontmatter@annotation{cor:#1}');
+DefMacro('\corauthref{}', '\lx@request@frontmatter@annotation{corauth:#1}');
+DefMacro('\fnref{}',      '\lx@request@frontmatter@annotation{fn:#1}');
+DefMacro('\tnoteref{}', '\lx@request@frontmatter@annotation{tnote:#1}'); # Possibly for title, not author?
+DefMacro('\thanks[]{}',    '\lx@add@contact[label={thanks:#1},role=thanks]{#2}');
+DefMacro('\cortext[]{}',   '\lx@add@contact[label={cor:#1},role=correspondent]{#2}');
+DefMacro('\corauth[]{}',   '\lx@add@contact[label={corauth:#1},role=correspondent]{#2}');
+DefMacro('\fntext[]{}',    '\lx@add@contact[label={fn:#1},role=note]{#2}');
+DefMacro('\tnotetext[]{}', '\lx@add@contact[label={tnote:#1},role=note]{#2}');    # title note?
 
 DefMacro('\runauthor{}', Tokens());
 DefMacro('\runtitle{}',  Tokens());

lib/LaTeXML/Package/icml_support.sty.ltxml

@@ -38,15 +38,16 @@ DefMacro('\icmlsetsymbol{}{}', '');
 
 DefEnvironment('{icmlauthorlist}', '#body');
 
-# \icmlauthor{author}{marks}   One per author; marks used to connect to affiliation
-DefMacro('\icmlauthor{}{}', '\lx@add@creator[role=author,mark={#2}]{#1}');
-# \icmlaffiliation{mark}{address}  provides affiliation for author with same mark
-DefMacro('\icmlaffiliation{}{}', '\lx@add@contact[role=affiliation,mark={#1}]{#2}');
-DefMacro('\icmladdress[]{}',     '\lx@add@contact[role=address,mark={#1}]{#2}');       # deprecated
+# \icmlauthor{author}{labels}   One per author; labels used to connect to affiliation
+DefMacro('\icmlauthor{}{}', '\lx@add@creator[role=author,annotations={#2}]{#1}');
+# \icmlaffiliation{label}{address}  provides affiliation for author with same label
+DefMacro('\icmlaffiliation{}{}', '\lx@add@contact[role=affiliation,label={#1}]{#2}');
+DefMacro('\icmladdress[]{}',     '\lx@add@contact[role=address,label={#1}]{#2}');       # deprecated
 
 # \icmlcorrespondingauthor{author}{email}
-# Attempt to use author as a matching mark to connect to author (should be a fuzzy match?)
-DefMacro('\icmlcorrespondingauthor{}{}', '\lx@add@contact[mark={fuzzy:#1},role=email,name={Correspondence to: }]{#2}');
+# Attempt to use author name as a matching label to connect to author
+# (should be a fuzzy match?)
+DefMacro('\icmlcorrespondingauthor{}{}', '\lx@add@contact[label={fuzzy:#1},role=email,name={Correspondence to: }]{#2}');
 
 DefMacro('\printAffiliationsAndNotice{}', '');
 DefMacro('\icmlEqualContribution',        'Equal contribution');

lib/LaTeXML/Package/ijcai.sty.ltxml

@@ -55,8 +55,8 @@ DefMacro('\emails{}',
   '\lx@clear@frontmatter{ltx:contact}[role=email]'
     . '\lx@splitting{\lx@ijcai@email}{,}{#1}');
 DefMacro('\lx@ijcai@author{}',      '\lx@add@author{#1}');
-DefMacro('\lx@ijcai@affiliation{}', '\lx@add@affiliation[markseq=author]{#1}');
-DefMacro('\lx@ijcai@email{}',       '\lx@add@email[markseq=author]{#1}');
+DefMacro('\lx@ijcai@affiliation{}', '\lx@add@affiliation[labelseq=author]{#1}');
+DefMacro('\lx@ijcai@email{}',       '\lx@add@email[labelseq=author]{#1}');
 
 #**********************************************************************
 

lib/LaTeXML/Package/inst_support.sty.ltxml

@@ -25,8 +25,8 @@ use LaTeXML::Package;
 # so this shouldn't be needed.
 
 # In inst style, the \author (used once for each author)
-# gets some "marks" which are used to connect to \affiliation
-# (also one per affiliation); the affailiation with the matching mark
+# gets some "labels" which are used to connect to \affiliation
+# (also one per affiliation); the affailiation with the matching label
 # is attached to the author.
 
 # \author[marks]{author}
@@ -35,8 +35,8 @@ DefMacro('\author{}',
     . '\lx@splitting{\lx@add@author}{\and\And,}{#1}');
 DefMacro('\institute{}',
   '\lx@clear@frontmatter{ltx:contact}[role=affiliation]'
-    . '\lx@splitting{\lx@add@contact[role=affiliation,markseq=affiliation]}{\and\And}{#1}');
-DefMacro('\inst{}', '\lx@add@creator@mark[affiliation]{#1}');
+    . '\lx@splitting{\lx@add@contact[role=affiliation,labelseq=affiliation]}{\and\And}{#1}');
+DefMacro('\inst{}', '\lx@request@frontmatter@annotation[affiliation]{#1}');
 
 Let('\at',      '\and');    # Actually this is different than \and, but...
 Let('\iand',    '\and');

lib/LaTeXML/Package/jheppub.sty.ltxml

@@ -30,14 +30,14 @@ RequirePackage('graphicx');
 
 # \author[]{}
 # One \author per author followed by \affiliation
-# OR both are supplied an optional mark by which the affiliation is attached to author
-# optional arg is a mark identifying which affliation belongs
-DefMacro('\author[]{}',      '\lx@add@creator[role=author,mark={#1}]{#2}');
-DefMacro('\affiliation[]{}', '\lx@add@contact[role=affiliation,mark={#1}]{#2}');
+# OR both are supplied an optional label by which the affiliation is attached to author
+# optional arg is a label identifying which affliation belongs
+DefMacro('\author[]{}',      '\lx@add@creator[role=author,annotations={#1}]{#2}');
+DefMacro('\affiliation[]{}', '\lx@add@contact[role=affiliation,label={#1}]{#2}');
 # \note{} appears inside author?
 DefMacro('\note{}', '\lx@add@contact[role=note]{#1}');
 # The n-th \emailAdd is attached to the n-th author!
-DefMacro('\emailAdd Semiverbatim', '\lx@add@contact[role=email,markseq=author]{#1}');
+DefMacro('\emailAdd Semiverbatim', '\lx@add@contact[role=email,labelseq=author]{#1}');
 
 DefMacro('\keywordname', '\textbf{Keywords}');
 DefMacro('\keywords{}',  '\lx@add@keywords[name={\keywordname}]{#1}');

lib/LaTeXML/Package/llncs.cls.ltxml

@@ -37,17 +37,17 @@ DefMacro('\emailname', 'E-mail');
 DefMacro('\mailname',  '\textit{Correspondence to}:');
 
 # Single \author, with multiple authors separated by \and
-# \inst{marks} can be used within each author to identify which affiliations apply
+# \inst{labels} can be used within each author to identify which affiliations apply
 DefMacro('\author{}',
   '\lx@clear@creators[role=author]'
     . '\lx@splitting{\lx@add@author}{\and\And,}{#1}');
 # Single  \institute, with multiple institutions serapated by \and
-# The n-th institution is attached to the author which has that n in its \inst marks.
+# The n-th institution is attached to the author which has that n in its \inst labels.
 DefMacro('\institute{}',
   '\lx@clear@frontmatter{ltx:contact}[role=affiliation]'
     . '\lx@splitting{\lx@llncs@affiliation}{\and}{#1}');
-DefMacro('\lx@llncs@affiliation{}', '\lx@add@affiliation[markseq={affiliation}]{#1}');
-DefMacro('\inst{}',                 '\lx@add@creator@mark[affiliation]{#1}');
+DefMacro('\lx@llncs@affiliation{}', '\lx@add@affiliation[labelseq={affiliation}]{#1}');
+DefMacro('\inst{}',                 '\lx@request@frontmatter@annotation[affiliation]{#1}');
 # \orcidID should be used within each author in \author
 DefMacro('\orcidID{}', '\lx@add@orcid{#1}');
 # \email, \url,\mail should be within an institute in \institute!!

lib/LaTeXML/Package/quantumarticle.cls.ltxml

@@ -25,24 +25,24 @@ RequirePackage('bbm');
 RequirePackage('xcolor');
 
 # Note: This seems similar to revtex4; should we just require revtex4_support ?
-# \author[mark]{name}   One \author per author
-# If mark given, the corresponding affiliation from \affil is attached
+# \author[labels]{name}   One \author per author
+# If label given, the corresponding affiliation from \affil is attached
 # otherwise, \author should be followed by \affiliation
-DefMacro('\author[]{}',    '\lx@add@creator[role=author,mark={#1}]{#2}');
-DefMacro('\affiliation{}', '\lx@add@contact[attach=new,role=affiliation]{#1}');
+DefMacro('\author[]{}',    '\lx@add@creator[role=author,annotations={#1}]{#2}');
+DefMacro('\affiliation{}', '\lx@add@contact[annotate=new,role=affiliation]{#1}');
 DefMacro('\affil[]{}',
-  '\lx@add@contact[role=affiliation,attach={\ifx.#1.new\else 1\fi},mark={#1}]{#2}');
+  '\lx@add@contact[role=affiliation,annotate={\ifx.#1.new\else 1\fi},label={#1}]{#2}');
 # \address provides address for previous \author
-DefMacro('\address{}', '\lx@add@contact[attach=new,role=address]{#1}');
+DefMacro('\address{}', '\lx@add@contact[annotate=new,role=address]{#1}');
 # These add contacts to most recent author
-# The optional arguments here are a sort of prefix to the footnote (NOT marks!)
+# The optional arguments here are a sort of prefix to the footnote (NOT label!)
 DefMacro('\email[] Semiverbatim',    '\lx@add@contact[role=email,name={#1}]{#2}');
 DefMacro('\homepage[] Semiverbatim', '\lx@add@contact[role=url,name={#1}]{#2}');
 DefMacro('\thanks[]{}',              '\lx@add@contact[role=thanks,name={#1}]{#2}');
 DefMacro('\orcid[]{}',               '\lx@add@contact[role=orcid,name={#1}]{#2}');
 
 DefMacro('\collaboration{}',    '\author{#1}');
-DefMacro('\altaffiliation[]{}', '\lx@add@contact[attach=new,role=affiliation,name={#1}]{#2}');
+DefMacro('\altaffiliation[]{}', '\lx@add@contact[annotate=new,role=affiliation,name={#1}]{#2}');
 # some elsearticle style commands?
 DefMacro('\ead[]{}', '\email{#1}');    # Strictly if #1=url, should be homepage.