texlive[46077] Master/texmf-dist: acmart (16dec17)

commits+karl at tug.org commits+karl at tug.org
Sat Dec 16 22:29:01 CET 2017


Revision: 46077
          http://tug.org/svn/texlive?view=revision&revision=46077
Author:   karl
Date:     2017-12-16 22:29:01 +0100 (Sat, 16 Dec 2017)
Log Message:
-----------
acmart (16dec17)

Modified Paths:
--------------
    trunk/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst
    trunk/Master/texmf-dist/doc/latex/acmart/Makefile
    trunk/Master/texmf-dist/doc/latex/acmart/README
    trunk/Master/texmf-dist/doc/latex/acmart/acmart.bib
    trunk/Master/texmf-dist/doc/latex/acmart/acmart.pdf
    trunk/Master/texmf-dist/doc/latex/acmart/acmguide.pdf
    trunk/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf
    trunk/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.tex
    trunk/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf
    trunk/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.tex
    trunk/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf
    trunk/Master/texmf-dist/doc/latex/acmart/sample-acmtog.tex
    trunk/Master/texmf-dist/doc/latex/acmart/sample-bibliography.bib
    trunk/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf
    trunk/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex
    trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf
    trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.tex
    trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf
    trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi.tex
    trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.pdf
    trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.tex
    trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf
    trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf.tex
    trunk/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf
    trunk/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex
    trunk/Master/texmf-dist/doc/latex/acmart/samplebody-conf.tex
    trunk/Master/texmf-dist/doc/latex/acmart/samplebody-journals.tex
    trunk/Master/texmf-dist/source/latex/acmart/acmart.dtx
    trunk/Master/texmf-dist/tex/latex/acmart/acmart.cls

Added Paths:
-----------
    trunk/Master/texmf-dist/doc/latex/acmart/sample-bibliography-biblatex.bib
    trunk/Master/texmf-dist/doc/latex/acmart/sample-bibliography-sigchi-a.bib
    trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf-biblatex.tex
    trunk/Master/texmf-dist/tex/latex/acmart/ACM-Reference-Format.bbx
    trunk/Master/texmf-dist/tex/latex/acmart/ACM-Reference-Format.cbx
    trunk/Master/texmf-dist/tex/latex/acmart/ACM-Reference-Format.dbx

Removed Paths:
-------------
    trunk/Master/texmf-dist/doc/latex/acmart/sigchi-a.bib

Modified: trunk/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst	2017-12-16 21:29:01 UTC (rev 46077)
@@ -23,11 +23,13 @@
     author
     booktitle
     chapter
-    city     
-    date     
+    city
+    date
     edition
     editor
     eprint
+    eprinttype
+    eprintclass
     howpublished
     institution
     journal
@@ -48,7 +50,7 @@
         % New keys recognized
         issue         % UTAH: used in, e.g., ACM SIGSAM Bulletin and ACM Communications in Computer Algebra
         articleno
-	eid           
+        eid
         day           % UTAH: needed for newspapers, weeklies, bi-weeklies
         doi           % UTAH
         url           % UTAH
@@ -433,11 +435,11 @@
      { "" }
      {
         numpages empty.or.unknown
-          { "articleno or eid field, but no numpages field, in " 
+          { "articleno or eid field, but no numpages field, in "
             cite$ * warning$ }
           { }
         if$
-        eid empty.or.unknown 
+        eid empty.or.unknown
           { "Article \bibinfo{articleno}{" articleno * "}" * }
           { "Article \bibinfo{articleno}{" eid * "}" * }
         if$
@@ -578,14 +580,11 @@
   doi empty.or.unknown
     { }
     {
-      %% NB: We want URLs at beginning of line to reduce likelihood of
-      %% BibTeX's nasty line wrapping after column 79, which then requires
-      %% manual (or automated) editing of the .bbl file to repair.
-      %% The \url{} macro strips percent-newlines, and is thus safe in
-      %% the presence of the line wrapping, but \path|...| and
-      %% \verb|...| do not.
-      "\showDOI{%" writeln
-      "\url{https://doi.org/" strip.doi * "}}" * writeln
+      %% Use \urldef here for the same reason it is used in output.url,
+      %% see output.url for further discussion.
+      "\urldef\tempurl%" writeln
+      "\url{https://doi.org/" strip.doi * "}" * writeln
+      "\showDOI{\tempurl}" writeln
     }
   if$
 }
@@ -673,13 +672,21 @@
     { }
     { "\showeprint"
          archiveprefix empty.or.unknown
-           { }
-           { "["  archiveprefix "l" change.case$ "]" * * * }
+           { eprinttype empty.or.unknown
+               { }
+               { "[" eprinttype "]" * * * }
+             if$
+           }
+           { "[" archiveprefix "l" change.case$ "]" * * * }
          if$
          "{" *
          primaryclass empty.or.unknown
-           { }
-           { primaryclass "/" * *}
+           { eprintclass empty.or.unknown
+             { }
+             { eprintclass "/" * * }
+             if$
+           }
+           { primaryclass "/" * * }
          if$
          eprint "}" * *
          writeln
@@ -700,52 +707,22 @@
     url empty.or.unknown
       { }
       {
-          %% NB: We want URLs at beginning of line to reduce likelihood of
-          %% BibTeX's nasty line wrapping after column 79, which would require
-          %% manual (or automated) editing of the .bbl file to repair.  However,
-          %% the \url{} macro handles the unwrapping job automatically.
+          %% Use \urldef, outside \showURL, so that %nn, #, etc in URLs work
+          %% correctly.  Put the actual URL on its own line to reduce the
+          %% likelihood of BibTeX's nasty line wrapping after column 79.
+          %% \url{} can undo this, but if that doesn't work for some reason
+          %% the .bbl file would have to be repaired manually.
+          "\urldef\tempurl%" writeln
+          "\url{" url * "}" * writeln
+
           "\showURL{%" writeln
           lastaccessed empty.or.unknown
             { "" }
             { "Retrieved " lastaccessed * " from " * }
           if$
-
-          %% The URL field may contain a semicolon-separated list of Web
-          %% addresses, and we locate and wrap each of them in \url{...}.
-          %% The simplistic approach of putting the entire list into the
-          %% macro argument is that the semicolons are typeset in a
-          %% typewriter font, and no space follows them.
-          %%
-          %% We therefore replace the original code
-          %%    "\url{" * url * "}}" * writeln
-          %% with this character-at-a-time loop:
-
-          "\url{" *
-
-          url 't :=                       % get modifiable copy of URL list
-
-          { t text.length$ }
-          {
-            t #1 #1 substring$ ";" =
-              {                         % then split argument at separator
-                "};" * writeln
-                "\url{"
-              }
-              {                         % else concatenate nonblank character to argument
-                t #1 #1 substring$ " " =
-                  { }
-                  { t #1 #1 substring$ * }
-                if$
-              }
-            if$
-
-            t #2 t text.length$ #1 - substring$ 't :=
-          }
-          while$
-
-          "}}" * writeln
+          "\tempurl}" * writeln
       }
-    if$
+      if$
   }
   { }
   if$
@@ -754,9 +731,9 @@
 FUNCTION { output.year.check }
 { % warn if year empty, output top string and leave " YEAR<label>" on stack in mid-sentence
   year empty.or.unknown
-     { "empty year in " cite$ * warning$ 
+     { "empty year in " cite$ * warning$
        write$
-       " \bibinfo{year}{[n. d.]}"  
+       " \bibinfo{year}{[n. d.]}"
        "\natexlab{" extra.label * "}" * *
        mid.sentence 'output.state :=
      }
@@ -993,21 +970,13 @@
 
 
 FUNCTION { emphasize }
-{ % emphasize a non-empty top string on the stack (WITHOUT italic correction)
+{ % emphasize a non-empty top string on the stack
   duplicate$ empty.or.unknown
     { pop$ "" }
-    { "{\em " swap$ * "}" * }
+    { "\emph{" swap$ * "}" * }
   if$
 }
 
-FUNCTION { emphasize.with.italic.correction }
-{ % convert empty string to null string, or emphasize with a trailing italic correction
-  duplicate$ empty.or.unknown
-    { pop$ "" }
-    { "{\em " swap$ * "\/}" * }
-  if$
-}
-
 FUNCTION { comma }
 { % convert empty string to null string, or brace string and add trailing comma
   duplicate$ empty.or.unknown
@@ -1246,35 +1215,23 @@
   while$
 }
 
-FUNCTION { format.btitle }
+FUNCTION { format.a.title.with.edition }
 {
   "\bibinfo{booktitle}{"
+  swap$ emphasize *
   edition empty.or.unknown
-  { title emphasize }
-  { title empty.or.unknown
-    { title emphasize } % jtb: what is this supposed to do ?!?
-    { "{\em " title * "\/} (\bibinfo{edition}{" * edition "l" change.case$ *
-    "} ed.)" * } % jtb: no parens for ed.
-    if$
-  }
+    'skip$
+    { " (\bibinfo{edition}{" * edition "l" change.case$ *
+      "} ed.)" * } % jtb: no parens for ed.
   if$
-  * "}" *
+  "}" *
 }
 
+FUNCTION { format.btitle }
+{ title format.a.title.with.edition }
+
 FUNCTION { format.emphasize.booktitle }
-{ % push "" or "{\em booktitle}" or "{\em booktitle}, (second ed.)" on stack
-  "\bibinfo{booktitle}{"
-  edition empty.or.unknown
-    { booktitle emphasize }
-    { booktitle empty.or.unknown
-      { "" }
-      { "{\em " booktitle * "} (\bibinfo{edition}{" *
-      edition "l" change.case$ * "} ed.)" * }
-      if$
-    }
-  if$
-  * "}" *
-}
+{ booktitle format.a.title.with.edition }
 
 FUNCTION { format.city }
 {
@@ -1352,7 +1309,7 @@
 {
   series empty.or.unknown
     {""}
-    {" {\em (\bibinfo{series}{" * series "})}" *}
+    {" \emph{(\bibinfo{series}{" * series "})}" *}
   if$
 }
 
@@ -1505,7 +1462,7 @@
       numpages empty.or.unknown
         { }
         { "numpages field, but no articleno or eid field, in "
-	  cite$ * warning$ }
+          cite$ * warning$ }
       if$
       ""
     }
@@ -1515,7 +1472,7 @@
           pages empty.or.unknown
             {
               "articleno or eid, but no pages or numpages field in "
-	         cite$ * warning$
+                 cite$ * warning$
               "" 'page.count :=
             }
             { reduce.pages.to.page.count }
@@ -1550,6 +1507,105 @@
 }
 
 
+FUNCTION { journal.canon.abbrev }
+{
+  % Returns a canonical abbreviation for 'journal', or else 'journal'
+  % unchanged.
+  journal "ACM Computing Surveys"                                                                       = { "Comput. Surveys"                                 } {
+  journal "{ACM} Computing Surveys"                                                                     = { "Comput. Surveys"                                 } {
+  journal "ACM Transactions on Mathematical Software"                                                   = { "ACM Trans. Math. Software"                       } {
+  journal "{ACM} Transactions on Mathematical Software"                                                 = { "ACM Trans. Math. Software"                       } {
+  journal "ACM SIGNUM Newsletter"                                                                       = { "ACM SIGNUM Newslett."                            } {
+  journal "ACM {SIGNUM} Newsletter"                                                                     = { "ACM SIGNUM Newslett."                            } {
+  journal "{ACM} SIGNUM Newsletter"                                                                     = { "ACM SIGNUM Newslett."                            } {
+  journal "{ACM} {SIGNUM} Newsletter"                                                                   = { "ACM SIGNUM Newslett."                            } {
+  journal "American Journal of Sociology"                                                               = { "Amer. J. Sociology"                              } {
+  journal "American Mathematical Monthly"                                                               = { "Amer. Math. Monthly"                             } {
+  journal "American Mathematical Society Translations"                                                  = { "Amer. Math. Soc. Transl."                        } {
+  journal "Applied Mathematics and Computation"                                                         = { "Appl. Math. Comput."                             } {
+  journal "British Journal of Mathematical and Statistical Psychology"                                  = { "Brit. J. Math. Statist. Psych."                  } {
+  journal "Bulletin of the American Mathematical Society"                                               = { "Bull. Amer. Math. Soc."                          } {
+  journal "Canadian Mathematical Bulletin"                                                              = { "Canad. Math. Bull."                              } {
+  journal "Communications of the ACM"                                                                   = { "Commun. ACM"                                     } {
+  journal "Communications of the {ACM}"                                                                 = { "Commun. ACM"                                     } {
+  journal "Computers and Structures"                                                                    = { "Comput. \& Structures"                           } {
+  journal "Contemporary Mathematics"                                                                    = { "Contemp. Math."                                  } {
+  journal "Crelle's Journal"                                                                            = { "Crelle's J."                                     } {
+  journal "Giornale di Mathematiche"                                                                    = { "Giorn. Mat."                                     } {
+  journal "IEEE Transactions on Aerospace and Electronic Systems"                                       = { "IEEE Trans. Aerospace Electron. Systems"         } {
+  journal "{IEEE} Transactions on Aerospace and Electronic Systems"                                     = { "IEEE Trans. Aerospace Electron. Systems"         } {
+  journal "IEEE Transactions on Automatic Control"                                                      = { "IEEE Trans. Automat. Control"                    } {
+  journal "{IEEE} Transactions on Automatic Control"                                                    = { "IEEE Trans. Automat. Control"                    } {
+  journal "IEEE Transactions on Computers"                                                              = { "IEEE Trans. Comput."                             } {
+  journal "{IEEE} Transactions on Computers"                                                            = { "IEEE Trans. Comput."                             } {
+  journal "IMA Journal of Numerical Analysis"                                                           = { "IMA J. Numer. Anal."                             } {
+  journal "{IMA} Journal of Numerical Analysis"                                                         = { "IMA J. Numer. Anal."                             } {
+  journal "Information Processing Letters"                                                              = { "Inform. Process. Lett."                          } {
+  journal "International Journal for Numerical Methods in Engineering"                                  = { "Internat. J. Numer. Methods Engrg."              } {
+  journal "International Journal of Control"                                                            = { "Internat. J. Control"                            } {
+  journal "International Journal of Supercomputing Applications"                                        = { "Internat. J. Supercomputing Applic."             } {
+  journal "Journal of Computational Physics"                                                            = { "J. Comput. Phys."                                } {
+  journal "Journal of Computational and Applied Mathematics"                                            = { "J. Comput. Appl. Math."                          } {
+  journal "Journal of Computer and System Sciences"                                                     = { "J. Comput. System Sci."                          } {
+  journal "Journal of Mathematical Analysis and Applications"                                           = { "J. Math. Anal. Appl."                            } {
+  journal "Journal of Mathematical Physics"                                                             = { "J. Math. Phys."                                  } {
+  journal "Journal of Parallel and Distributed Computing"                                               = { "J. Parallel and Distrib. Comput."                } {
+  journal "Journal of Research of the National Bureau of Standards"                                     = { "J. Res. Nat. Bur. Standards"                     } {
+  journal "Journal of VLSI and Computer Systems"                                                        = { "J. VLSI Comput. Syst."                           } {
+  journal "Journal of {VLSI} and Computer Systems"                                                      = { "J. VLSI Comput. Syst."                           } {
+  journal "Journal of the ACM"                                                                          = { "J. ACM"                                          } {
+  journal "Journal of the American Statistical Association"                                             = { "J. Amer. Statist. Assoc."                        } {
+  journal "Journal of the Institute of Mathematics and its Applications"                                = { "J. Inst. Math. Appl."                            } {
+  journal "Journal of the Society for Industrial and Applied Mathematics"                               = { "J. Soc. Indust. Appl. Math."                     } {
+  journal "Journal of the Society for Industrial and Applied Mathematics, Series B, Numerical Analysis" = { "J. Soc. Indust. Appl. Math. Ser. B Numer. Anal." } {
+  journal "Linear Algebra and its Applications"                                                         = { "Linear Algebra Appl."                            } {
+  journal "Mathematica Scandinavica"                                                                    = { "Math. Scand."                                    } {
+  journal "Mathematical Tables and Other Aids to Computation"                                           = { "Math. Tables Aids Comput."                       } {
+  journal "Mathematics of Computation"                                                                  = { "Math. Comp."                                     } {
+  journal "Mathematische Annalen"                                                                       = { "Math. Ann."                                      } {
+  journal "Numerische Mathematik"                                                                       = { "Numer. Math."                                    } {
+  journal "Pacific Journal of Mathematics"                                                              = { "Pacific J. Math."                                } {
+  journal "Parallel Computing"                                                                          = { "Parallel Comput."                                } {
+  journal "Philosophical Magazine"                                                                      = { "Philos. Mag."                                    } {
+  journal "Proceedings of the American Mathematical Society"                                            = { "Proc. Amer. Math. Soc."                          } {
+  journal "Proceedings of the IEEE"                                                                     = { "Proc. IEEE"                                      } {
+  journal "Proceedings of the {IEEE}"                                                                   = { "Proc. IEEE"                                      } {
+  journal "Proceedings of the National Academy of Sciences of the USA"                                  = { "Proc. Nat. Acad. Sci. U. S. A."                  } {
+  journal "Quarterly Journal of Mathematics, Oxford, Series (2)"                                        = { "Quart. J. Math. Oxford Ser. (2)"                 } {
+  journal "Quarterly of Applied Mathematics"                                                            = { "Quart. Appl. Math."                              } {
+  journal "Review of the International Statisical Institute"                                            = { "Rev. Inst. Internat. Statist."                   } {
+  journal "SIAM Journal on Algebraic and Discrete Methods"                                              = { "SIAM J. Algebraic Discrete Methods"              } {
+  journal "{SIAM} Journal on Algebraic and Discrete Methods"                                            = { "SIAM J. Algebraic Discrete Methods"              } {
+  journal "SIAM Journal on Applied Mathematics"                                                         = { "SIAM J. Appl. Math."                             } {
+  journal "{SIAM} Journal on Applied Mathematics"                                                       = { "SIAM J. Appl. Math."                             } {
+  journal "SIAM Journal on Computing"                                                                   = { "SIAM J. Comput."                                 } {
+  journal "{SIAM} Journal on Computing"                                                                 = { "SIAM J. Comput."                                 } {
+  journal "SIAM Journal on Matrix Analysis and Applications"                                            = { "SIAM J. Matrix Anal. Appl."                      } {
+  journal "{SIAM} Journal on Matrix Analysis and Applications"                                          = { "SIAM J. Matrix Anal. Appl."                      } {
+  journal "SIAM Journal on Numerical Analysis"                                                          = { "SIAM J. Numer. Anal."                            } {
+  journal "{SIAM} Journal on Numerical Analysis"                                                        = { "SIAM J. Numer. Anal."                            } {
+  journal "SIAM Journal on Scientific and Statistical Computing"                                        = { "SIAM J. Sci. Statist. Comput."                   } {
+  journal "{SIAM} Journal on Scientific and Statistical Computing"                                      = { "SIAM J. Sci. Statist. Comput."                   } {
+  journal "SIAM Review"                                                                                 = { "SIAM Rev."                                       } {
+  journal "{SIAM} Review"                                                                               = { "SIAM Rev."                                       } {
+  journal "Software Practice and Experience"                                                            = { "Software Prac. Experience"                       } {
+  journal "Statistical Science"                                                                         = { "Statist. Sci."                                   } {
+  journal "The Computer Journal"                                                                        = { "Comput. J."                                      } {
+  journal "Transactions of the American Mathematical Society"                                           = { "Trans. Amer. Math. Soc."                         } {
+  journal "USSR Computational Mathematics and Mathematical Physics"                                     = { "U. S. S. R. Comput. Math. and Math. Phys."       } {
+  journal "{USSR} Computational Mathematics and Mathematical Physics"                                   = { "U. S. S. R. Comput. Math. and Math. Phys."       } {
+  journal "Zeitschrift fur Angewandte Mathematik und Mechanik"                                          = { "Z. Angew. Math. Mech."                           } {
+  journal "Zeitschrift fur Angewandte Mathematik und Physik"                                            = { "Z. Angew. Math. Phys."                           } {
+  journal
+  } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$
+  } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$
+  } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$
+  } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$
+  } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$
+  } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$
+  } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$
+  } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$
+}
 
 FUNCTION { format.journal.volume.number.day.month.year }
 {
@@ -1559,429 +1615,11 @@
   % Format journal, volume, number, pages for article types.
   %
   journal empty.or.unknown
-    { "no journal in " cite$ * warning$
-      "" }
-%    { journal emphasize.with.italic.correction }
-     {
-       "\bibinfo{journal}{"
-           journal "Journal of the ACM" =
-       { "{\it J. ACM}" }
-       {
-           journal "American Mathematical Society Translations" =
-       { "{\it Amer. Math. Soc. Transl.}" }
-       {
-           journal "Bulletin of the American Mathematical Society" =
-       { "{\it Bull. Amer. Math. Soc.}" }
-       {
-           journal "Proceedings of the American Mathematical Society" =
-       { "{\it Proc. Amer. Math. Soc.}" }
-       {
-           journal "Transactions of the American Mathematical Society" =
-       { "{\it Trans. Amer. Math. Soc.}" }
-       {
-           journal "Communications of the {ACM}" =
-       { "{\it Commun. {ACM}}" }
-       {
-           journal "{ACM} Computing Surveys" =
-       { "{\it Comput. Surveys}" }
-       {
-           journal "{ACM} Transactions on Mathematical Software" =
-       { "{\it {ACM} Trans. Math. Software}" }
-       {
-           journal "{ACM} {SIGNUM} Newsletter" =
-       { "{\it {ACM} {SIGNUM} Newslett.}" }
-       {
-           journal "American Journal of Sociology" =
-       { "{\it Amer. J. Sociology}" }
-       {
-           journal "Journal of the American Statistical Association" =
-       { "{\it J. Amer. Statist. Assoc.}" }
-       {
-           journal "Applied Mathematics and Computation" =
-       { "{\it Appl. Math. Comput.}" }
-       {
-           journal "American Mathematical Monthly" =
-       { "{\it Amer. Math. Monthly}" }
-       {
-           journal "British Journal of Mathematical and Statistical Psychology" =
-       { "{\it Brit. J. Math. Statist. Psych.}" }
-       {
-           journal "Canadian Mathematical Bulletin" =
-       { "{\it Canad. Math. Bull.}" }
-       {
-           journal "Journal of Computational and Applied Mathematics" =
-       { "{\it J. Comput. Appl. Math.}" }
-       {
-           journal "Journal of Computational Physics" =
-       { "{\it J. Comput. Phys.}" }
-       {
-           journal "Computers and Structures" =
-       { "{\it Comput. \& Structures}" }
-       {
-           journal "The Computer Journal" =
-       { "{\it Comput. J.}" }
-       {
-           journal "Journal of Computer and System Sciences" =
-       { "{\it J. Comput. System Sci.}" }
-       {
-           journal "Contemporary Mathematics" =
-       { "{\it Contemp. Math.}" }
-       {
-           journal "Crelle's Journal" =
-       { "{\it Crelle's J.}" }
-       {
-           journal "Giornale di Mathematiche" =
-       { "{\it Giorn. Mat.}" }
-       {
-           journal "{IEEE} Transactions on Computers" =
-       { "{\it {IEEE} Trans. Comput.}" }
-       {
-           journal "{IEEE} Transactions on Automatic Control" =
-       { "{\it {IEEE} Trans. Automat. Control}" }
-       {
-           journal "Proceedings of the {IEEE}" =
-       { "{\it Proc. {IEEE}}" }
-       {
-           journal "{IEEE} Transactions on Aerospace and Electronic Systems" =
-       { "{\it {IEEE} Trans. Aerospace Electron. Systems}" }
-       {
-           journal "{IMA} Journal of Numerical Analysis" =
-       { "{\it {IMA} J. Numer. Anal.}" }
-       {
-           journal "Information Processing Letters" =
-       { "{\it Inform. Process. Lett.}" }
-       {
-           journal "Journal of the Institute of Mathematics and its Applications" =
-       { "{\it J. Inst. Math. Appl.}" }
-       {
-           journal "International Journal of Control" =
-       { "{\it Internat. J. Control}" }
-       {
-           journal "International Journal for Numerical Methods in Engineering" =
-       { "{\it Internat. J. Numer. Methods Engrg.}" }
-       {
-           journal "International Journal of Supercomputing Applications" =
-       { "{\it Internat. J. Supercomputing Applic.}" }
-       {
-           journal "Journal of Research of the National Bureau of Standards" =
-       { "{\it J. Res. Nat. Bur. Standards}" }
-       {
-           journal "Linear Algebra and its Applications" =
-       { "{\it Linear Algebra Appl.}" }
-       {
-           journal "Journal of Mathematical Analysis and Applications" =
-       { "{\it J. Math. Anal. Appl.}" }
-       {
-           journal "Mathematische Annalen" =
-       { "{\it Math. Ann.}" }
-       {
-           journal "Journal of Mathematical Physics" =
-       { "{\it J. Math. Phys.}" }
-       {
-           journal "Mathematics of Computation" =
-       { "{\it Math. Comp.}" }
-       {
-           journal "Mathematica Scandinavica" =
-       { "{\it Math. Scand.}" }
-       {
-           journal "Mathematical Tables and Other Aids to Computation" =
-       { "{\it Math. Tables Aids Comput.}" }
-       {
-           journal "Numerische Mathematik" =
-       { "{\it Numer. Math.}" }
-       {
-           journal "Pacific Journal of Mathematics" =
-       { "{\it Pacific J. Math.}" }
-       {
-           journal "Journal of Parallel and Distributed Computing" =
-       { "{\it J. Parallel and Distrib. Comput.}" }
-       {
-           journal "Parallel Computing" =
-       { "{\it Parallel Comput.}" }
-       {
-           journal "Philosophical Magazine" =
-       { "{\it Philos. Mag.}" }
-       {
-           journal "Proceedings of the National Academy of Sciences of the USA" =
-       { "{\it Proc. Nat. Acad. Sci. U. S. A.}" }
-       {
-           journal "Quarterly Journal of Mathematics, Oxford, Series (2)" =
-       { "{\it Quart. J. Math. Oxford Ser. (2)}" }
-       {
-           journal "Quarterly of Applied Mathematics" =
-       { "{\it Quart. Appl. Math.}" }
-       {
-           journal "Review of the International Statisical Institute" =
-       { "{\it Rev. Inst. Internat. Statist.}" }
-       {
-           journal "Journal of the Society for Industrial and Applied Mathematics" =
-       { "{\it J. Soc. Indust. Appl. Math.}" }
-       {
-           journal "Journal of the Society for Industrial and Applied Mathematics, Series B, Numerical Analysis" =
-       { "{\it J. Soc. Indust. Appl. Math. Ser. B Numer. Anal.}" }
-       {
-           journal "{SIAM} Journal on Algebraic and Discrete Methods" =
-       { "{\it {SIAM} J. Algebraic Discrete Methods}" }
-       {
-           journal "{SIAM} Journal on Applied Mathematics" =
-       { "{\it {SIAM} J. Appl. Math.}" }
-       {
-           journal "{SIAM} Journal on Computing" =
-       { "{\it {SIAM} J. Comput.}" }
-       {
-           journal "{SIAM} Journal on Matrix Analysis and Applications" =
-       { "{\it {SIAM} J. Matrix Anal. Appl.}" }
-       {
-           journal "{SIAM} Journal on Numerical Analysis" =
-       { "{\it {SIAM} J. Numer. Anal.}" }
-       {
-           journal "{SIAM} Review" =
-       { "{\it {SIAM} Rev.}" }
-       {
-           journal "{SIAM} Journal on Scientific and Statistical Computing" =
-       { "{\it {SIAM} J. Sci. Statist. Comput.}" }
-       {
-           journal "Software Practice and Experience" =
-       { "{\it Software Prac. Experience}" }
-       {
-           journal "Statistical Science" =
-       { "{\it Statist. Sci.}" }
-       {
-           journal "{USSR} Computational Mathematics and Mathematical Physics" =
-       { "{\it {U. S. S. R.} Comput. Math. and Math. Phys.}" }
-       {
-           journal "Journal of {VLSI} and Computer Systems" =
-       { "{\it J. {VLSI} Comput. Syst.}" }
-       {
-           journal "Zeitschrift fur Angewandte Mathematik und Mechanik" =
-       { "{\it Z. Angew. Math. Mech.}" }
-       {
-           journal "Zeitschrift fur Angewandte Mathematik und Physik" =
-       { "{\it Z. Angew. Math. Phys.}" }
-       {
-           journal "ACM Computing Surveys" =
-       { "{\it Comput. Surveys}" }
-       {
-           journal "ACM Transactions on Mathematical Software" =
-       { "{\it ACM Trans. Math. Software}" }
-       {
-           journal "ACM {SIGNUM} Newsletter" =
-       { "{\it ACM {SIGNUM} Newslett.}" }
-       {
-           journal "IEEE Transactions on Computers" =
-       { "{\it IEEE Trans. Comput.}" }
-       {
-           journal "IEEE Transactions on Automatic Control" =
-       { "{\it IEEE Trans. Automat. Control}" }
-       {
-           journal "Proceedings of the IEEE" =
-       { "{\it Proc. IEEE}" }
-       {
-           journal "IEEE Transactions on Aerospace and Electronic Systems" =
-       { "{\it IEEE Trans. Aerospace Electron. Systems}" }
-       {
-           journal "IMA Journal of Numerical Analysis" =
-       { "{\it IMA J. Numer. Anal.}" }
-       {
-           journal "SIAM Journal on Algebraic and Discrete Methods" =
-       { "{\it SIAM J. Algebraic Discrete Methods}" }
-       {
-           journal "SIAM Journal on Applied Mathematics" =
-       { "{\it SIAM J. Appl. Math.}" }
-       {
-           journal "SIAM Journal on Computing" =
-       { "{\it SIAM J. Comput.}" }
-       {
-           journal "SIAM Journal on Matrix Analysis and Applications" =
-       { "{\it SIAM J. Matrix Anal. Appl.}" }
-       {
-           journal "SIAM Journal on Numerical Analysis" =
-       { "{\it SIAM J. Numer. Anal.}" }
-       {
-           journal "SIAM Review" =
-       { "{\it SIAM Rev.}" }
-       {
-           journal "SIAM Journal on Scientific and Statistical Computing" =
-       { "{\it SIAM J. Sci. Statist. Comput.}" }
-       {
-           journal "USSR Computational Mathematics and Mathematical Physics" =
-       { "{\it U. S. S. R. Comput. Math. and Math. Phys.}" }
-       {
-           journal "Journal of VLSI and Computer Systems" =
-       { "{\it J. VLSI Comput. Syst.}" }
-       {
-           journal "Communications of the ACM" =
-       { "{\it Commun. ACM}" }
-       %% If no match with cases needing special handling, just output journal name
-       {  journal emphasize.with.italic.correction  }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-     * "}" *
-         }
-    if$
+    { "no journal in " cite$ * warning$ "" }
+    { "\bibinfo{journal}{"
+      journal.canon.abbrev emphasize *
+      "}" * }
+  if$
 
   number empty.or.unknown
     {
@@ -2136,7 +1774,7 @@
           crossref * warning$
           "" *
         }
-        { "{\em " * series * "\/}" * }
+        { series emphasize * }
       if$
     }
     { key * }
@@ -2282,7 +1920,7 @@
     }
   if$
   duplicate$
-  year empty.or.unknown 
+  year empty.or.unknown
     { "[n. d.]" }
     { year field.or.null purify$ #-1 #4 substring$}
   if$
@@ -2330,7 +1968,7 @@
   %
   % save the year for sort processing afterwards (adding a, b, c, etc.)
   %
-  year empty.or.unknown 
+  year empty.or.unknown
     { "[n. d.]" }
     { year field.or.null purify$ #-1 #4 substring$}
   if$
@@ -2824,6 +2462,8 @@
   fin.entry
 }
 
+FUNCTION { collection } { proceedings }
+
 FUNCTION { techreport }
 {
   output.bibitem
@@ -3037,13 +2677,13 @@
   % including organizations as the sort key; the following is stolen from
   % alpha.bst.
 
-  calc.label 
-  basic.label.year 
+  calc.label
+  basic.label.year
   swap$
-  "    " 
+  "    "
   swap$
   * *
-  "    " 
+  "    "
   *
   sortify
   year field.or.null purify$ #-1 #4 substring$ * % add year

Modified: trunk/Master/texmf-dist/doc/latex/acmart/Makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/Makefile	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/doc/latex/acmart/Makefile	2017-12-16 21:29:01 UTC (rev 46077)
@@ -17,7 +17,7 @@
 	sample-sigconf-authordraft.tex \
 	sample-sigplan.tex \
 	sample-sigchi.tex \
-	sample-sigchi-a.tex 
+	sample-sigchi-a.tex
 
 
 PDF = $(PACKAGE).pdf ${SAMPLES:%.tex=%.pdf} acmguide.pdf
@@ -41,9 +41,9 @@
 	- bibtex acmguide
 	pdflatex -jobname acmguide $(PACKAGE).dtx
 	while ( grep -q '^LaTeX Warning: Label(s) may have changed' acmguide.log) \
-	do 	pdflatex -jobname acmguide $(PACKAGE).dtx; done
+	do pdflatex -jobname acmguide $(PACKAGE).dtx; done
 
-%.cls:   %.ins %.dtx  
+%.cls:   %.ins %.dtx
 	pdflatex $<
 
 %.pdf:  %.tex   $(PACKAGE).cls ACM-Reference-Format.bst
@@ -88,4 +88,4 @@
 	zip -r  $(PACKAGE).zip * -x '*~' -x '*.tgz' -x '*.zip' -x CVS -x 'CVS/*'
 
 documents.zip: all
-	zip $@ acmart.pdf acmguide.pdf sample-*.pdf
+	zip $@ acmart.pdf acmguide.pdf sample-*.pdf *.cls

Modified: trunk/Master/texmf-dist/doc/latex/acmart/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/README	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/doc/latex/acmart/README	2017-12-16 21:29:01 UTC (rev 46077)
@@ -1,10 +1,15 @@
-This package provides a class for typesetting publications of 
+This package provides a class for typesetting publications of the
 Association for Computing Machinery.
 
 Your TeX distribution probably includes the latest released version of
-this package.  If you decide to install it yourself, please see
+this package.  If you decide to install it yourself, please see the
 Installation section of the User's Guide.
 
+Please note that the version on Github is a development (or
+experimental) version: please download it for testing new features.
+The production version is the one on CTAN and ACM sites.  
+
+
 Changes
 
 version 1.08    SIGPLAN reformatting (Matthew Fluet); bug fixes
@@ -16,13 +21,13 @@
 version 1.11    Customization of ACM theorem styles and proof
                 environment (Matthew Fluet).
 
-version 1.12    Bug fixes and documentation updates.  
-		Footnotes rearranged.
-                Option natbib is now mostly superfluous: the class 
-		makes a guess based on the format chosen.
+version 1.12    Bug fixes and documentation updates.
+                Footnotes rearranged.
+                Option natbib is now mostly superfluous: the class
+                makes a guess based on the format chosen.
 
 version 1.13    Formatting changes: headers, folios etc.
-		Bibliography changes.
+                Bibliography changes.
 
 version 1.14    Warn about undefined citation styles; move definitions
                 of acmauthoryear and acmnumeric citation styles before
@@ -36,8 +41,8 @@
 version 1.17    Formatting changes for margins and lists.  Bug fixes.
 
 version 1.18    Natbib is now the default for all versions.  A unified bib
-		file is used for all styles.  Better treatment
-		of multiple affiliations.
+                file is used for all styles.  Better treatment
+                of multiple affiliations.
 
 version 1.19    Include 'Abstract', 'Acknowledgements', and 'References'
                 in PDF bookmarks.
@@ -46,8 +51,8 @@
 
 version 1.21    Bibliography changes: added arXiv, some cleanup
 
-version 1.22    Bibliography changes for Aptara backend;  should be 
-		invisible for the users.
+version 1.22    Bibliography changes for Aptara backend; should be
+                invisible for the users.
 
 version 1.23    Added PACM PL journal option.
 
@@ -61,56 +66,56 @@
 
 version 1.28    Bug fixes: natbib=false now behaves correctly.
 
-version 1.29	Documentation changes.  Head height increased from 12pt to 13pt.
-		Removed spurious indent at start of abstract.
-		Improved kerning in CCS description list.
+version 1.29    Documentation changes.  Head height increased from 12pt to 13pt.
+                Removed spurious indent at start of abstract.
+                Improved kerning in CCS description list.
 
 version 1.30    Bibtex style now recognizes https:// in doi.
-	        Added \frenchspacing.
-		\department now has an optional hierarchy level.
-		Switched to T1 encoding
-		Updated IMWUT and PACMPL
+                Added \frenchspacing.
+                \department now has an optional hierarchy level.
+                Switched to T1 encoding
+                Updated IMWUT and PACMPL
 
 version 1.31    Changed default year and month to the current ones
-		(thanks to Matteo Riondato)
-		Table of contents now works
-		Marginalia now work in all formats
-		New command \additionalaffiliation
-		Documentation changes
+                (thanks to Matteo Riondato)
+                Table of contents now works
+                Marginalia now work in all formats
+                New command \additionalaffiliation
+                Documentation changes
 
 version 1.32    New DOI formatting.
-		Format siggraph is now obsolete, and sigconf
-		is used instead.
-		New proceedings title: POMACS.
+                Format siggraph is now obsolete, and sigconf
+                is used instead.
+                New proceedings title: POMACS.
 
 version 1.33    New option `timestamp' (Michael D. Adams)
-		New option `authordraft'
+                New option `authordraft'
                 Documentation updates
-		Bug fixes
-		We now use Type 1 versions of Libertine fonts even with XeTeX.
-		New hook acmart-preload-hook.tex (wizards only!)
-		Added new options `obeypunctuation' for \affiliation command
-		Added SubmissionID
-		Added right line count ruler for two-column formats
-		Added workaround for Adobe Acrobat bugs in selection
-		Added eid field to the bibliography
-		
+                Bug fixes
+                We now use Type 1 versions of Libertine fonts even with XeTeX.
+                New hook acmart-preload-hook.tex (wizards only!)
+                Added new options `obeypunctuation' for \affiliation command
+                Added SubmissionID
+                Added right line count ruler for two-column formats
+                Added workaround for Adobe Acrobat bugs in selection
+                Added eid field to the bibliography
+
 version 1.34    Deleted DOI from doi numbers
-		Changed bibstrip formatting
-		The command \terms is now obsolete
-		The rulers in review mode now have continuous numbering
+                Changed bibstrip formatting
+                The command \terms is now obsolete
+                The rulers in review mode now have continuous numbering
 
 version 1.35    Author-year bib style now uses square brackets.
-		Changed defaults for TOG sample
-		Price is suppressed for usgov and rightsretained modes.
-		Bugs fixed
+                Changed defaults for TOG sample
+                Price is suppressed for usgov and rightsretained modes.
+                Bugs fixed
 
 Version 1.36    Bug fixes
-		Moved PACMPL to acmlarge format
-		New journal: PACMHCI
-		Added the possibility to adjust number of author
-		boxes per row in conference formats
-		
+                Moved PACMPL to acmlarge format
+                New journal: PACMHCI
+                Added the possibility to adjust number of author
+                boxes per row in conference formats
+
 Version 1.37    Reduce list indentation (Matthew Fluet)
 
 Version 1.38    Increase default font size for SIGPLAN
@@ -118,40 +123,52 @@
 Version 1.39    Added \authornotemark commmand
 
 Version 1.40    Bibliography changes
-		Added processing of one-compoment ccsdesc nodes
-		Bug fixes.
-		Made the height a multiple of \baselineskip + \topskip
-		Added cleveref
-		We no longer print street address in SIGs
+                Added processing of one-compoment ccsdesc nodes
+                Bug fixes.
+                Made the height a multiple of \baselineskip + \topskip
+                Added cleveref
+                We no longer print street address in SIGs
 
 Version 1.41    Rearranged bib files
-		Added new badges
+                Added new badges
 
 Version 1.42    Deleted ACM badges
-		Bug fixes
+                Bug fixes
 
 Version 1.43    Bug fixes
 
 Version 1.44    Bug fixes.
-		Empty DOI and ISBN suppress printing DOI or ISBN lines
-		Separated theorem code into acmthm.sty, loaded by default.
-		Article number can be set for proceedings.
-		New commands: \acmBooktile, \editor.
-		Reference citation format updated.
+                Empty DOI and ISBN suppress printing DOI or ISBN lines
+                Separated theorem code into acmthm.sty, loaded by default.
+                Article number can be set for proceedings.
+                New commands: \acmBooktile, \editor.
+                Reference citation format updated.
 
 Version 1.45    Workaround for a Libertine bug.  Thanks to LianTze Lim
-		from Overleaf
+                from Overleaf
 
-Version 1.46    Bug fixes for bibliography:  label width is now calculated
-		correctly.
-		All PACM now use screen option.  This requires etoolbox.
-		Added subtitle to ACM reference format.
-		Now acmart is compatible with fontspec.
-		\thanks is now obsolete.  The addresses are automatically
-		added to the journal version;  this can be overriden with
-		\authorsaddresses command.
-		Deleted the rule at the end of frontmatter for all formats.
-		Deleted new line before doi in the reference format.
-		Reintegrated theorem code into acmart.dtx (Matthew Fluet)
+Version 1.46    Bug fixes for bibliography: label width is now calculated
+                correctly.
+                All PACM now use screen option.  This requires etoolbox.
+                Added subtitle to ACM reference format.
+                Now acmart is compatible with fontspec.
+                \thanks is now obsolete.  The addresses are automatically
+                added to the journal version; this can be overriden with
+                \authorsaddresses command.
+                Deleted the rule at the end of frontmatter for all formats.
+                Deleted new line before doi in the reference format.
+                Reintegrated theorem code into acmart.dtx (Matthew Fluet)
 
-Version 1.47    New journal:  THRI
+Version 1.47    New journal: THRI
+
+Version 1.48    Bug fixes
+                Review mode now switches on folios
+                Code prettying (Michael D. Adams)
+                Bibliography changes: @MISC entries no longer have a
+                separate date
+		Sigch-a sample bibliography renamed
+		Bib code cleanup (Zack Weinberg)
+                Acmart and version info are added to pdfcreator tag
+                \citeyear no longer produces parenthetical year
+                Added initial support for Biblatex (Daniel Thomas)
+		Added support for IW3C2 conferences
\ No newline at end of file

Modified: trunk/Master/texmf-dist/doc/latex/acmart/acmart.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/acmart.bib	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/doc/latex/acmart/acmart.bib	2017-12-16 21:29:01 UTC (rev 46077)
@@ -1,88 +1,88 @@
 @Misc{TeXFAQ,
-  title =	 {{UK} List of {\TeX} Frequently Asked Questions},
-  author =	 {{UK \TeX{} Users Group}},
-  year =	 2016,
+  title =        {{UK} List of {\TeX} Frequently Asked Questions},
+  author =       {{UK \TeX{} Users Group}},
+  year =         2016,
   howpublished = {\url{http://www.tex.ac.uk}}
 }
 
 @Manual{Downes04:amsart,
-  title =	 {The \textsf{amsart}, \textsf{amsproc}, and
+  title =        {The \textsf{amsart}, \textsf{amsproc}, and
                   \textsf{amsbook} document~classes},
-  author =	 {Michael Downes and Barbara Beeton},
+  author =       {Michael Downes and Barbara Beeton},
   organization = {American Mathematical Society},
-  year =	 2004,
-  month =	 aug,
-  note =	 {\url{http://www.ctan.org/pkg/amslatex}}
+  year =         2004,
+  month =        aug,
+  note =         {\url{http://www.ctan.org/pkg/amslatex}}
 }
 
 @Manual{Fiorio15,
-  title =	 {{a}lgorithm2e.sty---package for algorithms},
-  author =	 {Cristophe Fiorio},
-  year =	 2015,
-  month =	 oct,
-  note =	 {\url{http://www.ctan.org/pkg/algorithm2e}}
+  title =        {{a}lgorithm2e.sty---package for algorithms},
+  author =       {Cristophe Fiorio},
+  year =         2015,
+  month =        oct,
+  note =         {\url{http://www.ctan.org/pkg/algorithm2e}}
 }
 
 @Manual{Brito09,
-  title =	 {The algorithms bundle},
-  author =	 {Rog\'erio Brito},
-  year =	 2009,
-  month =	 aug,
-  note =	 {\url{http://www.ctan.org/pkg/algorithms}}
+  title =        {The algorithms bundle},
+  author =       {Rog\'erio Brito},
+  year =         2009,
+  month =        aug,
+  note =         {\url{http://www.ctan.org/pkg/algorithms}}
 }
 
 @Manual{Heinz15,
-  title =	 {The Listings Package},
-  author =	 {Carsten Heinz and Brooks Moses and Jobst Hoffmann},
-  year =	 2015,
-  month =	 jun,
-  note =	 {\url{http://www.ctan.org/pkg/listings}}
+  title =        {The Listings Package},
+  author =       {Carsten Heinz and Brooks Moses and Jobst Hoffmann},
+  year =         2015,
+  month =        jun,
+  note =         {\url{http://www.ctan.org/pkg/listings}}
 }
 
 @Manual{Fear05,
-  title =	 {Publication quality tables in {\LaTeX}},
-  author =	 {Simon Fear},
-  year =	 2005,
-  month =	 apr,
-  note =	 {\url{http://www.ctan.org/pkg/booktabs}}
+  title =        {Publication quality tables in {\LaTeX}},
+  author =       {Simon Fear},
+  year =         2005,
+  month =        apr,
+  note =         {\url{http://www.ctan.org/pkg/booktabs}}
 }
 
 @Manual{ACMIdentityStandards,
-  title =	 {{ACM} Visual Identity Standards},
+  title =        {{ACM} Visual Identity Standards},
   organization = {Association for Computing Machinery},
-  year =	 2007,
-  note =	 {\url{http://identitystandards.acm.org}}
+  year =         2007,
+  note =         {\url{http://identitystandards.acm.org}}
 }
 
 @Manual{Sommerfeldt13:Subcaption,
-  title =	 {The subcaption package},
-  author =	 {Axel Sommerfeldt},
-  year =	 2013,
-  month =	 apr,
-  note =	 {\url{http://www.ctan.org/pkg/subcaption}}
+  title =        {The subcaption package},
+  author =       {Axel Sommerfeldt},
+  year =         2013,
+  month =        apr,
+  note =         {\url{http://www.ctan.org/pkg/subcaption}}
 }
 
 @Manual{Nomencl,
-  title =	 {A package to create a nomenclature},
-  author =	 {Boris Veytsman and Bern Schandl and Lee Netherton
+  title =        {A package to create a nomenclature},
+  author =       {Boris Veytsman and Bern Schandl and Lee Netherton
                   and C. V. Radhakrishnan},
-  year =	 2005,
-  month =	 sep,
-  note =	 {\url{http://www.ctan.org/pkg/nomencl}}
+  year =         2005,
+  month =        sep,
+  note =         {\url{http://www.ctan.org/pkg/nomencl}}
 }
 
 @Manual{Talbot16:Glossaries,
-  title =	 {User Manual for glossaries.sty v4.25},
-  author =	 {Nicola L. C. Talbot},
-  year =	 2016,
-  month =	 jun,
-  note =	 {\url{http://www.ctan.org/pkg/subcaption}}
+  title =        {User Manual for glossaries.sty v4.25},
+  author =       {Nicola L. C. Talbot},
+  year =         2016,
+  month =        jun,
+  note =         {\url{http://www.ctan.org/pkg/subcaption}}
 }
 
 @Manual{Carlisle04:Textcase,
-  title = 	 {The \textsl{textcase} package},
-  author = 	 {David Carlisle},
-  month = 	 oct,
-  year = 	 2004,
-  note = 	  {\url{http://www.ctan.org/pkg/textcase}}}
-
+  title =        {The \textsl{textcase} package},
+  author =       {David Carlisle},
+  month =        oct,
+  year =         2004,
+  note =         {\url{http://www.ctan.org/pkg/textcase}}
+}

Modified: trunk/Master/texmf-dist/doc/latex/acmart/acmart.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/acmart/acmguide.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.tex	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.tex	2017-12-16 21:29:01 UTC (rev 46077)
@@ -46,7 +46,7 @@
 \begin{document}
 % Title portion
 \title{A Multifrequency MAC Specially Designed for Wireless Sensor
-  Network Applications} 
+  Network Applications}
 \titlenote{We can add a note to the title}
 
 \author{Gang Zhou}
@@ -67,11 +67,11 @@
   \country{France}
 }
 \email{beranger at inria.fr}
-\author{Aparna Patel} 
+\author{Aparna Patel}
 \affiliation{%
  \institution{Rajiv Gandhi University}
  \streetaddress{Rono-Hills}
- \city{Doimukh} 
+ \city{Doimukh}
  \state{Arunachal Pradesh}
  \country{India}}
 \email{aprna_patel at rguhs.ac.in}
@@ -79,7 +79,7 @@
 \affiliation{%
   \institution{Tsinghua University}
   \streetaddress{30 Shuangqing Rd}
-  \city{Haidian Qu} 
+  \city{Haidian Qu}
   \state{Beijing Shi}
   \country{China}
 }
@@ -142,7 +142,7 @@
 %
 % The code below should be generated by the tool at
 % http://dl.acm.org/ccs.cfm
-% Please copy and paste the code instead of the example below. 
+% Please copy and paste the code instead of the example below.
 %
 \begin{CCSXML}
 <ccs2012>
@@ -166,7 +166,7 @@
   <concept_desc>Networks~Network reliability</concept_desc>
   <concept_significance>100</concept_significance>
  </concept>
-</ccs2012>  
+</ccs2012>
 \end{CCSXML}
 
 \ccsdesc[500]{Computer systems organization~Embedded systems}
@@ -198,7 +198,7 @@
 
 \maketitle
 
-% The default list of authors is too long for headers}
+% The default list of authors is too long for headers.
 \renewcommand{\shortauthors}{G. Zhou et al.}
 
 \input{samplebody-journals}

Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.tex	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.tex	2017-12-16 21:29:01 UTC (rev 46077)
@@ -41,9 +41,9 @@
 
 % Document starts
 \begin{document}
-% Title portion. Note the short title for running heads 
+% Title portion. Note the short title for running heads
 \title[A Multifrequency MAC for Wireless Sensor]{A Multifrequency MAC
-  Specially Designed for Wireless Sensor  Network Applications}  
+  Specially Designed for Wireless Sensor  Network Applications}
 
 \author{Gang Zhou}
 \orcid{1234-5678-9012-3456}
@@ -62,11 +62,11 @@
   \country{France}
 }
 \email{beranger at inria.fr}
-\author{Aparna Patel} 
+\author{Aparna Patel}
 \affiliation{%
  \institution{Rajiv Gandhi University}
  \streetaddress{Rono-Hills}
- \city{Doimukh} 
+ \city{Doimukh}
  \state{Arunachal Pradesh}
  \country{India}}
 \email{aprna_patel at rguhs.ac.in}
@@ -74,7 +74,7 @@
 \affiliation{%
   \institution{Tsinghua University}
   \streetaddress{30 Shuangqing Rd}
-  \city{Haidian Qu} 
+  \city{Haidian Qu}
   \state{Beijing Shi}
   \country{China}
 }
@@ -125,7 +125,7 @@
 multifrequency availability while, at the same time, takes into
 consideration the restrictions of wireless sensor networks. Through
 extensive experiments, MMSN exhibits the prominent ability to utilize
-parallel transmissions among neighboring nodes. 
+parallel transmissions among neighboring nodes.
 \end{abstract}
 
 
@@ -132,7 +132,7 @@
 %
 % The code below should be generated by the tool at
 % http://dl.acm.org/ccs.cfm
-% Please copy and paste the code instead of the example below. 
+% Please copy and paste the code instead of the example below.
 %
 \begin{CCSXML}
 <ccs2012>
@@ -156,7 +156,7 @@
   <concept_desc>Networks~Network reliability</concept_desc>
   <concept_significance>100</concept_significance>
  </concept>
-</ccs2012>  
+</ccs2012>
 \end{CCSXML}
 
 \ccsdesc[500]{Computer systems organization~Embedded systems}
@@ -177,7 +177,7 @@
 
 \maketitle
 
-% The default list of authors is too long for headers}
+% The default list of authors is too long for headers.
 \renewcommand{\shortauthors}{G. Zhou et al.}
 
 \input{samplebody-journals}

Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-acmtog.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-acmtog.tex	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-acmtog.tex	2017-12-16 21:29:01 UTC (rev 46077)
@@ -46,7 +46,7 @@
 \begin{document}
 % Title portion
 \title{A Multifrequency MAC Specially Designed for Wireless Sensor
-  Network Applications} 
+  Network Applications}
 
 \author{Gang Zhou}
 \orcid{1234-5678-9012-3456}
@@ -65,11 +65,11 @@
   \country{France}
 }
 \email{beranger at inria.fr}
-\author{Aparna Patel} 
+\author{Aparna Patel}
 \affiliation{%
  \institution{Rajiv Gandhi University}
  \streetaddress{Rono-Hills}
- \city{Doimukh} 
+ \city{Doimukh}
  \state{Arunachal Pradesh}
  \country{India}}
 \email{aprna_patel at rguhs.ac.in}
@@ -77,7 +77,7 @@
 \affiliation{%
   \institution{Tsinghua University}
   \streetaddress{30 Shuangqing Rd}
-  \city{Haidian Qu} 
+  \city{Haidian Qu}
   \state{Beijing Shi}
   \country{China}
 }
@@ -140,7 +140,7 @@
 %
 % The code below should be generated by the tool at
 % http://dl.acm.org/ccs.cfm
-% Please copy and paste the code instead of the example below. 
+% Please copy and paste the code instead of the example below.
 %
 \begin{CCSXML}
 <ccs2012>
@@ -164,7 +164,7 @@
   <concept_desc>Networks~Network reliability</concept_desc>
   <concept_significance>100</concept_significance>
  </concept>
-</ccs2012>  
+</ccs2012>
 \end{CCSXML}
 
 \ccsdesc[500]{Computer systems organization~Embedded systems}

Added: trunk/Master/texmf-dist/doc/latex/acmart/sample-bibliography-biblatex.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-bibliography-biblatex.bib	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-bibliography-biblatex.bib	2017-12-16 21:29:01 UTC (rev 46077)
@@ -0,0 +1,1595 @@
+%%% ====================================================================
+%%%  BibTeX-file{
+%%%     author          = "Gerry Murray",
+%%%     version         = "1.2",
+%%%     date            = "2 April 2012",
+%%%     filename        = "acmsmall-sample-bibfile.bib",
+%%%     address         = "ACM, NY",
+%%%     email           = "murray at hq.acm.org",
+%%%     codetable       = "ISO/ASCII",
+%%%     keywords        = "ACM Reference Format, bibliography, citation, references",
+%%%     supported       = "yes",
+%%%     docstring       = "This BibTeX database file contains 'bibdata' entries
+%%%                        that 'match' the examples provided in the Specifications Document
+%%%                        AND, also, 'legacy'-type bibs. It should assist authors in 
+%%%                        choosing the 'correct' at-bibtype and necessary bib-fields
+%%%                        so as to obtain the appropriate ACM Reference Format output. 
+%%%			   It also contains many 'Standard Abbreviations'. "
+%%%  }
+%%% ====================================================================
+
+% Journals
+
+% First the Full Name is given, then the abbreviation used in the AMS Math
+% Reviews, with an indication if it could not be found there.
+% Note the 2nd overwrites the 1st, so swap them if you want the full name.
+
+ %{AMS}
+ @String{AMSTrans = "American Mathematical Society Translations" }
+ @String{AMSTrans = "Amer. Math. Soc. Transl." }
+ @String{BullAMS = "Bulletin of the American Mathematical Society" }
+ @String{BullAMS = "Bull. Amer. Math. Soc." }
+ @String{ProcAMS = "Proceedings of the American Mathematical Society" }
+ @String{ProcAMS = "Proc. Amer. Math. Soc." }
+ @String{TransAMS = "Transactions of the American Mathematical Society" }
+ @String{TransAMS = "Trans. Amer. Math. Soc." }
+
+ %ACM
+ @String{CACM = "Communications of the {ACM}" }
+ @String{CACM = "Commun. {ACM}" }
+ @String{CompServ = "Comput. Surveys" }
+ @String{JACM = "J. ACM" }
+ @String{ACMMathSoft = "{ACM} Transactions on Mathematical Software" }
+ @String{ACMMathSoft = "{ACM} Trans. Math. Software" }
+ @String{SIGNUM = "{ACM} {SIGNUM} Newsletter" }
+ @String{SIGNUM = "{ACM} {SIGNUM} Newslett." }
+
+ @String{AmerSocio = "American Journal of Sociology" }
+ @String{AmerStatAssoc = "Journal of the American Statistical Association" }
+ @String{AmerStatAssoc = "J. Amer. Statist. Assoc." }
+ @String{ApplMathComp = "Applied Mathematics and Computation" }
+ @String{ApplMathComp = "Appl. Math. Comput." }
+ @String{AmerMathMonthly = "American Mathematical Monthly" }
+ @String{AmerMathMonthly = "Amer. Math. Monthly" }
+ @String{BIT = "{BIT}" }
+ @String{BritStatPsych = "British Journal of Mathematical and Statistical
+          Psychology" }
+ @String{BritStatPsych = "Brit. J. Math. Statist. Psych." }
+ @String{CanMathBull = "Canadian Mathematical Bulletin" }
+ @String{CanMathBull = "Canad. Math. Bull." }
+ @String{CompApplMath = "Journal of Computational and Applied Mathematics" }
+ @String{CompApplMath = "J. Comput. Appl. Math." }
+ @String{CompPhys = "Journal of Computational Physics" }
+ @String{CompPhys = "J. Comput. Phys." }
+ @String{CompStruct = "Computers and Structures" }
+ @String{CompStruct = "Comput. \& Structures" }
+ @String{CompJour = "The Computer Journal" }
+ @String{CompJour = "Comput. J." }
+ @String{CompSysSci = "Journal of Computer and System Sciences" }
+ @String{CompSysSci = "J. Comput. System Sci." }
+ @String{Computing = "Computing" }
+ @String{ContempMath = "Contemporary Mathematics" }
+ @String{ContempMath = "Contemp. Math." }
+ @String{Crelle = "Crelle's Journal" }
+ @String{GiornaleMath = "Giornale di Mathematiche" }
+ @String{GiornaleMath = "Giorn. Mat." } % didn't find in AMS MR., ibid.
+
+ %IEEE
+ @String{Computer = "{IEEE} Computer" }
+ @String{IEEETransComp = "{IEEE} Transactions on Computers" }
+ @String{IEEETransComp = "{IEEE} Trans. Comput." }
+ @String{IEEETransAC = "{IEEE} Transactions on Automatic Control" }
+ @String{IEEETransAC = "{IEEE} Trans. Automat. Control" }
+ @String{IEEESpec = "{IEEE} Spectrum" } % didn't find in AMS MR
+ @String{ProcIEEE = "Proceedings of the {IEEE}" }
+ @String{ProcIEEE = "Proc. {IEEE}" } % didn't find in AMS MR
+ @String{IEEETransAeroElec = "{IEEE} Transactions on Aerospace and Electronic
+     Systems" }
+ @String{IEEETransAeroElec = "{IEEE} Trans. Aerospace Electron. Systems" }
+
+ @String{IMANumerAna = "{IMA} Journal of Numerical Analysis" }
+ @String{IMANumerAna = "{IMA} J. Numer. Anal." }
+ @String{InfProcLet = "Information Processing Letters" }
+ @String{InfProcLet = "Inform. Process. Lett." }
+ @String{InstMathApp = "Journal of the Institute of Mathematics and
+     its Applications" }
+ @String{InstMathApp = "J. Inst. Math. Appl." }
+ @String{IntControl = "International Journal of Control" }
+ @String{IntControl = "Internat. J. Control" }
+ @String{IntNumerEng = "International Journal for Numerical Methods in
+     Engineering" }
+ @String{IntNumerEng = "Internat. J. Numer. Methods Engrg." }
+ @String{IntSuper = "International Journal of Supercomputing Applications" }
+ @String{IntSuper = "Internat. J. Supercomputing Applic." } % didn't find
+%% in AMS MR
+ @String{Kibernetika = "Kibernetika" }
+ @String{JResNatBurStand = "Journal of Research of the National Bureau
+     of Standards" }
+ @String{JResNatBurStand = "J. Res. Nat. Bur. Standards" }
+ @String{LinAlgApp = "Linear Algebra and its Applications" }
+ @String{LinAlgApp = "Linear Algebra Appl." }
+ @String{MathAnaAppl = "Journal of Mathematical Analysis and Applications" }
+ @String{MathAnaAppl = "J. Math. Anal. Appl." }
+ @String{MathAnnalen = "Mathematische Annalen" }
+ @String{MathAnnalen = "Math. Ann." }
+ @String{MathPhys = "Journal of Mathematical Physics" }
+ @String{MathPhys = "J. Math. Phys." }
+ @String{MathComp = "Mathematics of Computation" }
+ @String{MathComp = "Math. Comp." }
+ @String{MathScand = "Mathematica Scandinavica" }
+ @String{MathScand = "Math. Scand." }
+ @String{TablesAidsComp = "Mathematical Tables and Other Aids to Computation" }
+ @String{TablesAidsComp = "Math. Tables Aids Comput." }
+ @String{NumerMath = "Numerische Mathematik" }
+ @String{NumerMath = "Numer. Math." }
+ @String{PacificMath = "Pacific Journal of Mathematics" }
+ @String{PacificMath = "Pacific J. Math." }
+ @String{ParDistComp = "Journal of Parallel and Distributed Computing" }
+ @String{ParDistComp = "J. Parallel and Distrib. Comput." } % didn't find
+%% in AMS MR
+ @String{ParComputing = "Parallel Computing" }
+ @String{ParComputing = "Parallel Comput." }
+ @String{PhilMag = "Philosophical Magazine" }
+ @String{PhilMag = "Philos. Mag." }
+ @String{ProcNAS = "Proceedings of the National Academy of Sciences
+                    of the USA" }
+ @String{ProcNAS = "Proc. Nat. Acad. Sci. U. S. A." }
+ @String{Psychometrika = "Psychometrika" }
+ @String{QuartMath = "Quarterly Journal of Mathematics, Oxford, Series (2)" }
+ @String{QuartMath = "Quart. J. Math. Oxford Ser. (2)" }
+ @String{QuartApplMath = "Quarterly of Applied Mathematics" }
+ @String{QuartApplMath = "Quart. Appl. Math." }
+ @String{RevueInstStat = "Review of the International Statisical Institute" }
+ @String{RevueInstStat = "Rev. Inst. Internat. Statist." }
+
+ %SIAM
+ @String{JSIAM = "Journal of the Society for Industrial and Applied
+     Mathematics" }
+ @String{JSIAM = "J. Soc. Indust. Appl. Math." }
+ @String{JSIAMB = "Journal of the Society for Industrial and Applied
+     Mathematics, Series B, Numerical Analysis" }
+ @String{JSIAMB = "J. Soc. Indust. Appl. Math. Ser. B Numer. Anal." }
+ @String{SIAMAlgMeth = "{SIAM} Journal on Algebraic and Discrete Methods" }
+ @String{SIAMAlgMeth = "{SIAM} J. Algebraic Discrete Methods" }
+ @String{SIAMAppMath = "{SIAM} Journal on Applied Mathematics" }
+ @String{SIAMAppMath = "{SIAM} J. Appl. Math." }
+ @String{SIAMComp = "{SIAM} Journal on Computing" }
+ @String{SIAMComp = "{SIAM} J. Comput." }
+ @String{SIAMMatrix = "{SIAM} Journal on Matrix Analysis and Applications" }
+ @String{SIAMMatrix = "{SIAM} J. Matrix Anal. Appl." }
+ @String{SIAMNumAnal = "{SIAM} Journal on Numerical Analysis" }
+ @String{SIAMNumAnal = "{SIAM} J. Numer. Anal." }
+ @String{SIAMReview = "{SIAM} Review" }
+ @String{SIAMReview = "{SIAM} Rev." }
+ @String{SIAMSciStat = "{SIAM} Journal on Scientific and Statistical
+     Computing" }
+ @String{SIAMSciStat = "{SIAM} J. Sci. Statist. Comput." }
+
+ @String{SoftPracExp = "Software Practice and Experience" }
+ @String{SoftPracExp = "Software Prac. Experience" } % didn't find in AMS MR
+ @String{StatScience = "Statistical Science" }
+ @String{StatScience = "Statist. Sci." }
+ @String{Techno = "Technometrics" }
+ @String{USSRCompMathPhys = "{USSR} Computational Mathematics and Mathematical
+     Physics" }
+ @String{USSRCompMathPhys = "{U. S. S. R.} Comput. Math. and Math. Phys." }
+ @String{VLSICompSys = "Journal of {VLSI} and Computer Systems" }
+ @String{VLSICompSys = "J. {VLSI} Comput. Syst." }
+ @String{ZAngewMathMech = "Zeitschrift fur Angewandte Mathematik und
+     Mechanik" }
+ @String{ZAngewMathMech = "Z. Angew. Math. Mech." }
+ @String{ZAngewMathPhys = "Zeitschrift fur Angewandte Mathematik und Physik" }
+ @String{ZAngewMathPhys = "Z. Angew. Math. Phys." }
+
+% Publishers % ================================================= |
+
+ @String{Academic = "Academic Press" }
+ @String{ACMPress = "{ACM} Press" }
+ @String{AdamHilger = "Adam Hilger" }
+ @String{AddisonWesley = "Addison-Wesley" }
+ @String{AllynBacon = "Allyn and Bacon" }
+ @String{AMS = "American Mathematical Society" }
+ @String{Birkhauser = "Birkha{\"u}ser" }
+ @String{CambridgePress = "Cambridge University Press" }
+ @String{Chelsea = "Chelsea" }
+ @String{ClaredonPress = "Claredon Press" }
+ @String{DoverPub = "Dover Publications" }
+ @String{Eyolles = "Eyolles" }
+ @String{HoltRinehartWinston = "Holt, Rinehart and Winston" }
+ @String{Interscience = "Interscience" }
+ @String{JohnsHopkinsPress = "The Johns Hopkins University Press" }
+ @String{JohnWileySons = "John Wiley and Sons" }
+ @String{Macmillan = "Macmillan" }
+ @String{MathWorks = "The Math Works Inc." }
+ @String{McGrawHill = "McGraw-Hill" }
+ @String{NatBurStd = "National Bureau of Standards" }
+ @String{NorthHolland = "North-Holland" }
+ @String{OxfordPress = "Oxford University Press" }  %address Oxford or London?
+ @String{PergamonPress = "Pergamon Press" }
+ @String{PlenumPress = "Plenum Press" }
+ @String{PrenticeHall = "Prentice-Hall" }
+ @String{SIAMPub = "{SIAM} Publications" }
+ @String{Springer = "Springer-Verlag" }
+ @String{TexasPress = "University of Texas Press" }
+ @String{VanNostrand = "Van Nostrand" }
+ @String{WHFreeman = "W. H. Freeman and Co." }
+
+%Entries
+
+ at Article{Abril07,
+  author 	= "Patricia S. Abril and Robert Plant",
+  title 	= "The patent holder's dilemma: Buy, sell, or troll?",
+  journal 	= "Communications of the ACM",
+  volume 	= "50",
+  number 	= "1",
+  month 	= jan,
+  year 		= "2007",
+  pages 	= "36--44",
+  doi 		= "10.1145/1188913.1188915",
+  note		= "",
+}
+
+ at Article{Cohen07,
+  author 	=	"Sarah Cohen and Werner Nutt and Yehoshua Sagic",
+  title		=	"Deciding equivalances among conjunctive aggregate queries",
+  journal 	=	JACM,
+  articleno	=	"5",
+  numpages	=	"50",
+  volume 	=	"54",
+  number 	= 	"2",
+  month 	=	apr,
+  year 		=	"2007",
+  doi 		=	"10.1145/1219092.1219093",
+  acmid		=	"1219093",
+  note 		= 	"",
+}
+
+
+ at periodical{JCohen96,
+  key = 	 "Cohen",
+  editor =       "Jacques Cohen",
+  title =        "Special issue: Digital Libraries",
+  journal =      CACM,
+  volume =       "39",
+  number = 	 "11",
+  month =	 nov,
+  year = 	 "1996",
+}
+
+
+ at Book{Kosiur01,
+  author =       "David Kosiur",
+  title =        "Understanding Policy-Based Networking",
+  publisher =    "Wiley",
+  year =         "2001",
+  address =      "New York, NY",
+  edition =      "2nd.",
+  editor = 	 "",
+  volume = 	 "",
+  number = 	 "",
+  series = 	 "",
+  month = 	 "",
+  note = 	 "",
+}
+
+
+ at Book{Harel79,
+  author =       "David Harel",
+  year =         "1979",
+  title =        "First-Order Dynamic Logic",
+  series =       "Lecture Notes in Computer Science",
+  volume =       "68",
+  address =      "New York, NY",
+  publisher =    "Springer-Verlag",
+  doi = 	 "10.1007/3-540-09237-4",
+  editor = 	 "",
+  number = 	 "",
+  month = 	 "",
+  note = 	 "",
+}
+
+
+ at Inbook{Editor00,
+  author = 	 "",
+  editor =       "Ian Editor",
+  title =        "The title of book one",
+  subtitle =     "The book subtitle",
+  series =       "The name of the series one",
+  year =         "2007",
+  volume = 	 "9",
+  address =      "Chicago",
+  edition =      "1st.",
+  publisher =    "University of Chicago Press",
+  doi = 	 "10.1007/3-540-09237-4",
+  chapter = 	 "",
+  pages = 	 "",
+  number = 	 "",
+  type = 	 "",
+  month = 	 "",
+  note = 	 "",
+}
+
+%
+ at InBook{Editor00a,
+  author = 	 "",
+  editor =       "Ian Editor",
+  title =        "The title of book two",
+  subtitle =     "The book subtitle",
+  series =       "The name of the series two",
+  year =         "2008",
+  address =      "Chicago",
+  edition =      "2nd.",
+  publisher =    "University of Chicago Press",
+  doi = 	 "10.1007/3-540-09237-4",
+  volume = 	 "",
+  chapter = 	 "100",
+  pages = 	 "",
+  number = 	 "",
+  type = 	 "",
+  month = 	 "",
+  note = 	 "",
+}
+
+
+% incollection (has an editor, title, and possibly a booktitle)
+ at Incollection{Spector90,
+  author =       "Asad Z. Spector",
+  title =        "Achieving application requirements",
+  booktitle =    "Distributed Systems",
+  publisher =    "ACM Press",
+  address =      "New York, NY",
+  year =         "1990",
+  edition =      "2nd.",
+  chapter =      "",
+  editor = 	 "Sape Mullender",
+  pages =        "19--33",
+  doi = 	 "10.1145/90417.90738",
+  volume =	 "",
+  number = 	 "",
+  series =	 "",
+  type = 	 "",
+  month = 	 "",
+  note = 	 "",
+}
+
+
+% incollection (has an editor, title, and possibly a booktitle)
+ at Incollection{Douglass98,
+  author =       "Bruce P. Douglass and David Harel and Mark B. Trakhtenbrot",
+  title =        "Statecarts in use: structured analysis and object-orientation",
+  series =       "Lecture Notes in Computer Science",
+  booktitle =    "Lectures on Embedded Systems",
+  publisher =    "Springer-Verlag",
+  address =      "London",
+  volume = 	 "1494",
+  year =         "1998",
+  chapter =      "",
+  editor = 	 "Grzegorz Rozenberg and Frits W. Vaandrager",
+  pages =        "368--394",
+  doi = 	 "10.1007/3-540-65193-4_29",
+  edition = 	 "",
+  number = 	 "",
+  type = 	 "",
+  month = 	 "",
+  note = 	 "",
+}
+
+
+ at Book{Knuth97,
+  author =       "Donald E. Knuth",
+  title =        "The Art of Computer Programming, Vol. 1: Fundamental Algorithms (3rd. ed.)",
+  publisher =    "Addison Wesley Longman Publishing Co., Inc.",
+  year =         "1997",
+  address =      "",
+  edition =      "",
+  editor = 	 "",
+  volume = 	 "",
+  number = 	 "",
+  series = 	 "",
+  month = 	 "",
+  note = 	 "",
+}
+
+
+ at Book{Knuth98,
+  author =       "Donald E. Knuth",
+  year =         "1998",
+  title =        "The Art of Computer Programming",
+  series =       "Fundamental Algorithms",
+  volume =       "1",
+  edition =      "3rd",
+  address =      "",
+  publisher =    "Addison Wesley Longman Publishing Co., Inc.",
+  doi = 	 "",
+  url = 	 "",
+  editor = 	 "",
+  number = 	 "",
+  month = 	 "",
+  note = 	 "(book)",
+}
+
+%Inbook{Knuth97,
+%  author = 	 "Donald E. Knuth",
+%  title = 	 "The Art of Computer Programming",
+%  booktitle =    "the booktitle",
+%  edition =      "3",
+%  volume =       "1",
+%  year =         "1997",
+%  publisher =    "Addison Wesley Longman Publishing Co., Inc.",
+%  editor = 	 "",
+%  number = 	 "",
+%  series = 	 "Fundamental Algorithms",
+%  type = 	 "",
+%  chapter = 	 "",
+%  pages = 	 "",
+%  address = 	 "",
+%  month = 	 "",
+%  note = 	 "(inbook)",
+%}
+
+%INBOOK{DK:73-inbook-full,
+%   author = "Donald E. Knuth",
+%   title = "Fundamental Algorithms (inbook w series)",
+%   volume = 1,
+%   series = "The Art of Computer Programming",
+%   publisher = "Addison-Wesley",
+%   address = "Reading, Massachusetts",
+%   edition = "Second",
+%   month = "10~" # jan,
+%   year = "1973",
+%   type = "Section",
+%   chapter = "1.2",
+%   pages = "10--119",
+%   note = "Full INBOOK entry (w series)",
+%}
+
+%INcollection{DK:74-incoll,
+%   author = "Donald E. Knuth",
+%   title = "Fundamental Algorithms (incoll)",
+%   volume = 1,
+%   booktitle = "The Art of Computer Programming",
+%   publisher = "Addison-Wesley",
+%   address = "Reading, Massachusetts",
+%   month = "10~" # jan,
+%   year = "1974",
+%   pages = "10--119",
+%   editor = 	 "Bernard Rous",
+%   note = "This is a full incoll entry with an editor",
+%}
+
+%INcollection{DK:75-incollws,
+%   author = "Donald E. Knuth",
+%   title = "Fundamental Algorithms (incoll w series)",
+%   volume = 1,
+%   booktitle = "The Art of Computer Programming",
+%   series = "The Art of Computer Programming",
+%   publisher = "Addison-Wesley",
+%   address = "Reading, Massachusetts",
+%   month = "10~" # jan,
+%   year = "1975",
+%   pages = "10--119",
+%   editor = "Bernard Rous",
+%   note = "This is a full incoll entry with an editor and series",
+%}
+
+
+ at incollection{GM05,
+Author= "Dan Geiger and Christopher Meek",
+Title= "Structured Variational Inference Procedures and their Realizations (as incol)",
+Year= 2005,
+Booktitle="Proceedings of Tenth International Workshop on Artificial Intelligence and Statistics, {\rm The Barbados}",
+Publisher="The Society for Artificial Intelligence and Statistics",
+Month= jan,
+Editors= "Z. Ghahramani and R. Cowell"
+}
+
+ at Inproceedings{Smith10,
+  author =       "Stan W. Smith",
+  title =        "An experiment in bibliographic mark-up: Parsing metadata for XML export",
+  booktitle =    "Proceedings of the 3rd. annual workshop on Librarians and Computers",
+  series = 	 "LAC '10",
+  editor = 	 "Reginald N. Smythe and Alexander Noble",
+  volume = 	  "3",
+  year =         "2010",
+  publisher =    "Paparazzi Press",
+  address = 	 "Milan Italy",
+  pages =        "422--431",
+  doi = 	 "99.9999/woot07-S422",
+  number =	 "",
+  month = 	 "",
+  organization = "",
+  note = 	 "",
+}
+
+ at Inproceedings{VanGundy07,
+  author =       "Matthew Van Gundy and Davide Balzarotti and Giovanni Vigna",
+  year =         "2007",
+  title =        "Catch me, if you can: Evading network signatures with web-based polymorphic worms",
+  booktitle =    "Proceedings of the first USENIX workshop on Offensive Technologies",
+  series = 	 "WOOT '07",
+  publisher =    "USENIX Association",
+  address = 	 "Berkley, CA",
+  articleno = 	 "7",
+  numpages = 	 "9",
+}
+
+ at Inproceedings{VanGundy08,
+  author =       "Matthew Van Gundy and Davide Balzarotti and Giovanni Vigna",
+  year =         "2008",
+  title =        "Catch me, if you can: Evading network signatures with web-based polymorphic worms",
+  booktitle =    "Proceedings of the first USENIX workshop on Offensive Technologies",
+  series = 	 "WOOT '08",
+  publisher =    "USENIX Association",
+  address = 	 "Berkley, CA",
+  articleno = 	 "7",
+  numpages = 	 "2",
+  editor = 	 "",
+  volume = 	 "",
+  number = 	 "",
+  pages = 	 "99-100",
+  month = 	 "",
+  organization = "",
+  note = 	 "",
+}
+
+ at Inproceedings{VanGundy09,
+  author =       "Matthew Van Gundy and Davide Balzarotti and Giovanni Vigna",
+  year =         "2009",
+  title =        "Catch me, if you can: Evading network signatures with web-based polymorphic worms",
+  booktitle =    "Proceedings of the first USENIX workshop on Offensive Technologies",
+  series = 	 "WOOT '09",
+  publisher =    "USENIX Association",
+  address = 	 "Berkley, CA",
+  articleno = 	 "",
+  numpages = 	 "",
+  editor = 	 "",
+  volume = 	 "",
+  number = 	 "",
+  pages = 	 "90--100",
+  month = 	 "",
+  organization = "",
+  note = 	 "",
+}
+
+ at Inproceedings{Andler79,
+  author =       "Sten Andler",
+  title =        "Predicate Path expressions",
+  booktitle =    "Proceedings of the 6th. ACM SIGACT-SIGPLAN symposium on Principles of Programming Languages",
+  series = 	 "POPL '79",
+  year =         "1979",
+  publisher =    "ACM Press",
+  address = 	 "New York, NY",
+  pages =        "226--236",
+  doi = 	 "10.1145/567752.567774",
+  editor = 	 "",
+  volume = 	 "",
+  number = 	 "",
+  month = 	 "",
+  organization = "",
+  note = 	 "",
+}
+
+ at Techreport{Harel78,
+  author =       "David Harel",
+  year =         "1978",
+  title =        "LOGICS of Programs: AXIOMATICS and DESCRIPTIVE POWER",
+  institution =  "Massachusetts Institute of Technology",
+  type =         "MIT Research Lab Technical Report",
+  number =       "TR-200",
+  address =      "Cambridge, MA",
+  month = 	 "",
+  note = 	 "",
+}
+
+ at MASTERSTHESIS{anisi03,
+author = {David A. Anisi},
+title = {Optimal Motion Control of a Ground Vehicle},
+school = {Royal Institute of Technology (KTH), Stockholm, Sweden},
+institution = {FOI-R-0961-SE, Swedish Defence Research Agency (FOI)},
+year = {2003},
+}
+
+
+ at Phdthesis{Clarkson85,
+  author =       "Kenneth L. Clarkson",
+  year =         "1985",
+  title =        "Algorithms for Closest-Point Problems (Computational Geometry)",
+  school =       "Stanford University",
+  address =      "Palo Alto, CA",
+  note =         "UMI Order Number: AAT 8506171",
+}
+
+
+ at online{Thornburg01,
+  author =       "Harry Thornburg",
+  year =         "2001",
+  title =        "Introduction to Bayesian Statistics",
+  url =           "http://ccrma.stanford.edu/~jos/bayes/bayes.html",
+  month = 	 mar,
+  urldate = "2015-03-02",
+}
+
+
+ at online{Ablamowicz07,
+  author =       "Rafal Ablamowicz and Bertfried Fauser",
+  year =         "2007",
+  title =        "CLIFFORD: a Maple 11 Package for Clifford Algebra Computations, version 11",
+  url =          "http://math.tntech.edu/rafal/cliff11/index.html",
+  urldate = "2008-02-28",
+}
+
+
+ at misc{Poker06,
+  author =       "Poker-Edge.Com",
+  year =         "2006",
+  month 	= mar,
+  title =        "Stats and Analysis",
+  urldate = "2006-06-07",
+  url =          "http://www.poker-edge.com/stats.php",
+}
+
+ at misc{Obama08,
+  author 	= "Barack Obama",
+  year 		= "2008",
+  title		= "A more perfect union",
+  howpublished  = "Video",
+  day 		= "5",
+  url 		= "http://video.google.com/videoplay?docid=6528042696351994555",
+  month 	= mar,
+  urldate  = "2008-03-21",
+}
+
+ at patent{JoeScientist001,
+  author =       "Joseph Scientist",
+  year =         "2009",
+  title =        "The fountain of youth",
+  number = 12345,
+  note =         "Filed July 1st., 2008, Issued Aug. 9th., 2009",
+  month = 	 aug,
+}
+
+
+ at Inproceedings{Novak03,
+  author =       "Dave Novak",
+  title =        "Solder man",
+  booktitle =    "ACM SIGGRAPH 2003 Video Review on Animation theater Program: Part I - Vol. 145 (July 27--27, 2003)",
+  year =         "2003",
+  publisher = 	 "ACM Press",
+  address = 	 "New York, NY",
+  pages =        "4",
+  month = 	 "March 21, 2008",
+  doi = 	 "99.9999/woot07-S422",
+  url = 	 "http://video.google.com/videoplay?docid=6528042696351994555",
+  note = 	 "",
+  howpublished = "Video",
+  editor = 	 "",
+  volume = 	 "",
+  number = 	 "",
+  series = 	 "",
+  organization = "",
+}
+
+
+ at article{Lee05,
+  author =       "Newton Lee",
+  year = 	 "2005",
+  title =        "Interview with Bill Kinder: January 13, 2005",
+  journal = 	 "Comput. Entertain.",
+  eid      =     "4",
+  volume =       "3",
+  number = 	 "1",
+  month =  	 "Jan.-March",
+  doi = 	 "10.1145/1057270.1057278",
+  howpublished = "Video",
+  note =	 "",
+}
+
+ at article{Rous08,
+  author =       "Bernard Rous",
+  year = 	 "2008",
+  title =        "The Enabling of Digital Libraries",
+  journal = 	 "Digital Libraries",
+  volume =       "12",
+  number = 	 "3",
+  month =  	 jul,
+  articleno = 	 "5",
+  doi = 	 "",
+  url = 	 "",
+  howpublished = "",
+  note =	 "To appear",
+}
+
+ at article{384253,
+ author = {Werneck,, Renato and Setubal,, Jo\~{a}o and da Conceic\~{a}o,, Arlindo},
+ title = {(old) Finding minimum congestion spanning trees},
+ journal = {J. Exp. Algorithmics},
+ volume = {5},
+ year = {2000},
+ issn = {1084-6654},
+ pages = {11},
+ doi = {10.1145/351827.384253},
+ publisher = {ACM},
+ address = {New York, NY, USA},
+ }
+
+
+ at article{Werneck:2000:FMC:351827.384253,
+ author = {Werneck, Renato and Setubal, Jo\~{a}o and da Conceic\~{a}o, Arlindo},
+ title = {(new) Finding minimum congestion spanning trees},
+ journal = {J. Exp. Algorithmics},
+ volume = {5},
+ month = dec,
+ year = {2000},
+ issn = {1084-6654},
+ articleno = {11},
+ url = {http://portal.acm.org/citation.cfm?id=351827.384253},
+ doi = {10.1145/351827.384253},
+ acmid = {384253},
+ publisher = {ACM},
+ address = {New York, NY, USA},
+}
+
+ at article{1555162,
+ author = {Conti, Mauro and Di Pietro, Roberto and Mancini, Luigi V. and Mei, Alessandro},
+ title = {(old) Distributed data source verification in wireless sensor networks},
+ journal = {Inf. Fusion},
+ volume = {10},
+ number = {4},
+ year = {2009},
+ issn = {1566-2535},
+ pages = {342--353},
+ doi = {10.1016/j.inffus.2009.01.002},
+ publisher = {Elsevier Science Publishers B. V.},
+ address = {Amsterdam, The Netherlands, The Netherlands},
+ }
+
+ at article{Conti:2009:DDS:1555009.1555162,
+ author = {Conti, Mauro and Di Pietro, Roberto and Mancini, Luigi V. and Mei, Alessandro},
+ title = {(new) Distributed data source verification in wireless sensor networks},
+ journal = {Inf. Fusion},
+ volume = {10},
+ number = {4},
+ month = oct,
+ year = {2009},
+ issn = {1566-2535},
+ pages = {342--353},
+ numpages = {12},
+ url = {http://portal.acm.org/citation.cfm?id=1555009.1555162},
+ doi = {10.1016/j.inffus.2009.01.002},
+ acmid = {1555162},
+ publisher = {Elsevier Science Publishers B. V.},
+ address = {Amsterdam, The Netherlands, The Netherlands},
+ keywords = {Clone detection, Distributed protocol, Securing data fusion, Wireless sensor networks},
+}
+
+ at inproceedings{Li:2008:PUC:1358628.1358946,
+ author = {Li, Cheng-Lun and Buyuktur, Ayse G. and Hutchful, David K. and Sant, Natasha B. and Nainwal, Satyendra K.},
+ title = {Portalis: using competitive online interactions to support aid initiatives for the homeless},
+ booktitle = {CHI '08 extended abstracts on Human factors in computing systems},
+ year = {2008},
+ isbn = {978-1-60558-012-X},
+ location = {Florence, Italy},
+ pages = {3873--3878},
+ numpages = {6},
+ url = {http://portal.acm.org/citation.cfm?id=1358628.1358946},
+ doi = {10.1145/1358628.1358946},
+ acmid = {1358946},
+ publisher = {ACM},
+ address = {New York, NY, USA},
+ keywords = {cscw, distributed knowledge acquisition, incentive design, online games, recommender systems, reputation systems, user studies, virtual community},
+}
+
+ at book{Hollis:1999:VBD:519964,
+ author = {Hollis, Billy S.},
+ title = {Visual Basic 6: Design, Specification, and Objects with Other},
+ year = {1999},
+ isbn = {0130850845},
+ edition = {1st},
+ publisher = {Prentice Hall PTR},
+ address = {Upper Saddle River, NJ, USA},
+ }
+
+
+ at book{Goossens:1999:LWC:553897,
+ author = {Goossens, Michel and Rahtz, S. P. and Moore, Ross and Sutor, Robert S.},
+ title = {The  Latex Web Companion: Integrating TEX, HTML, and XML},
+ year = {1999},
+ isbn = {0201433117},
+ edition = {1st},
+ publisher = {Addison-Wesley Longman Publishing Co., Inc.},
+ address = {Boston, MA, USA},
+ }
+
+% need to test genres for errant isbn output
+
+% techreport
+ at techreport{897367,
+ author = {Buss, Jonathan F. and Rosenberg, Arnold L. and Knott, Judson D.},
+ title = {Vertex Types in Book-Embeddings},
+ year = {1987},
+ source = {http://www.ncstrl.org:8900/ncstrl/servlet/search?formname=detail\&id=oai%3Ancstrlh%3Aumass_cs%3Ancstrl.umassa_cs%2F%2FUM-CS-1987-018},
+ publisher = {University of Massachusetts},
+ address = {Amherst, MA, USA},
+ }
+
+ at techreport{Buss:1987:VTB:897367,
+ author = {Buss, Jonathan F. and Rosenberg, Arnold L. and Knott, Judson D.},
+ title = {Vertex Types in Book-Embeddings},
+ year = {1987},
+ source = {http://www.ncstrl.org:8900/ncstrl/servlet/search?formname=detail\&id=oai%3Ancstrlh%3Aumass_cs%3Ancstrl.umassa_cs%2F%2FUM-CS-1987-018},
+ publisher = {University of Massachusetts},
+ address = {Amherst, MA, USA},
+ }
+
+% whole proceedings
+
+ at proceedings{Czerwinski:2008:1358628,
+ author = {},
+ note = {General Chair-Czerwinski, Mary and General Chair-Lund, Arnie and Program Chair-Tan, Desney},
+ title = {CHI '08: CHI '08 extended abstracts on Human factors in computing systems},
+ year = {2008},
+ isbn = {978-1-60558-012-X},
+ location = {Florence, Italy},
+ order_no = {608085},
+ publisher = {ACM},
+ address = {New York, NY, USA},
+ }
+
+% phdthesis
+
+ at phdthesis{Clarkson:1985:ACP:911891,
+ author = {Clarkson, Kenneth Lee},
+ advisor = {Yao, Andrew C.},
+ title = {Algorithms for Closest-Point Problems (Computational Geometry)},
+ year = {1985},
+ note = {AAT 8506171},
+ school = {Stanford University},
+ address = {Stanford, CA, USA},
+ }
+% school is being picked up -- but not publisher (which is OK)
+% Also -- the title is NOT being output in italics !!! Arrrrgh! - I fixed it. :-)
+
+
+%%% compare with 'old' 
+%%% atsign-Phdthesis{Clarkson85,
+%%%  author =       "Kenneth L. Clarkson",
+%%%  year =         "1985",
+%%%  title =        "Algorithms for Closest-Point Problems (Computational Geometry)",
+%%%  school =       "Stanford University",
+%%%  address =      "Palo Alto, CA",
+%%%  note =         "UMI Order Number: AAT 8506171",
+%%%  type = 	 "",
+%%%  month = 	 "",
+%%%}
+
+% A bibliography
+ at Article{1984:1040142,
+ key = {{$\!\!$}},
+ journal = {SIGCOMM Comput. Commun. Rev.},
+ year = {1984},
+ issn = {0146-4833},
+ volume = {13-14},
+ number = {5-1},
+ issue_date = {January/April 1984},
+ publisher = {ACM},
+ address = {New York, NY, USA},
+ }
+
+
+% grinder
+ at inproceedings{2004:ITE:1009386.1010128,
+ author = {IEEE},
+ title = {IEEE TCSC Executive Committee},
+ booktitle = {Proceedings of the IEEE International Conference on Web Services},
+ series = {ICWS '04},
+ year = {2004},
+ isbn = {0-7695-2167-3},
+ pages = {21--22},
+ doi = {10.1109/ICWS.2004.64},
+ acmid = {1010128},
+ publisher = {IEEE Computer Society},
+ address = {Washington, DC, USA},
+}
+
+% div book
+ at book{Mullender:1993:DS:302430,
+ editor = {Mullender, Sape},
+ title = {Distributed systems (2nd Ed.)},
+ year = {1993},
+ isbn = {0-201-62427-3},
+ publisher = {ACM Press/Addison-Wesley Publishing Co.},
+ address = {New York, NY, USA},
+ }
+
+% master thesis (as techreport and thesis)
+
+ at techreport{Petrie:1986:NAD:899644,
+ author = {Petrie, Charles J.},
+ title = {New Algorithms for Dependency-Directed Backtracking (Master's thesis)},
+ year = {1986},
+ source = {http://www.ncstrl.org:8900/ncstrl/servlet/search?formname=detail\&id=oai%3Ancstrlh%3Autexas_cs%3AUTEXAS_CS%2F%2FAI86-33},
+ publisher = {University of Texas at Austin},
+ address = {Austin, TX, USA},
+ }
+
+ at MASTERSTHESIS{Petrie:1986:NAD:12345,
+ author = {Petrie, Charles J.},
+ title = {New Algorithms for Dependency-Directed Backtracking (Master's thesis)},
+ year = {1986},
+ source = {http://www.ncstrl.org:8900/ncstrl/servlet/search?formname=detail\&id=oai%3Ancstrlh%3Autexas_cs%3AUTEXAS_CS%2F%2FAI86-33},
+ school = {University of Texas at Austin},
+ address = {Austin, TX, USA},
+ }
+
+
+
+
+ at BOOK{book-minimal,
+   author = "Donald E. Knuth",
+   title = "Seminumerical Algorithms",
+   publisher = "Addison-Wesley",
+   year = "1981",
+}
+
+% incollection (has an editor, title, and possibly a booktitle)
+ at INcollection{KA:2001,
+ author = {Kong, Wei-Chang},
+ Title = {The implementation of electronic commerce in SMEs in Singapore (as Incoll)},
+ booktitle = {E-commerce and cultural values},
+ year = {2001},
+ isbn = {1-59140-056-2},
+ pages = {51--74},
+ numpages = {24},
+ url = {http://portal.acm.org/citation.cfm?id=887006.887010},
+ acmid = {887010},
+ publisher = {IGI Publishing},
+ address = {Hershey, PA, USA},
+}
+
+
+% with bibfield 'type' before chapter (note no editor)
+ at INBOOK{KAGM:2001,
+ author = {Kong, Wei-Chang},
+ type = {Name of Chapter:},
+ chapter = {The implementation of electronic commerce in SMEs in Singapore (Inbook-w-chap-w-type)},
+ title = {E-commerce and cultural values},
+ year = {2001},
+ isbn = {1-59140-056-2},
+ pages = {51--74},
+ numpages = {24},
+ url = {http://portal.acm.org/citation.cfm?id=887006.887010},
+ acmid = {887010},
+ publisher = {IGI Publishing},
+ address = {Hershey, PA, USA},
+}
+
+%%% Notes! This is because the atsign-INBOOK citation type specifies EITHER
+%%% editor or author, but not both. In my experiments with the harvard/dcu
+%%% bibtex style (and presumably this applies to other styles too), bibtex
+%%% ignores the editor information if author information exists in an
+%%% atsign-INBOOK entry. atsign-INCOLLECTION is far more commonly used in my references,
+%%% and in the absence of an editor I believe most bibtex styles will just
+%%% ommit the editor from the reference - the chapter information will not
+%%% end up in the in-text citation as you suggest it should be but at least
+%%% there is a place to put the editor if necessary.
+
+
+
+% was 'Inbook' -- changed to incollection - (editor is different to author) - need to tell Asad to codify as such.
+ at incollection{Kong:2002:IEC:887006.887010,
+  author = 	{Kong, Wei-Chang},
+  editor =	{Theerasak Thanasankit},
+  title =	{Chapter 9},
+  booktitle =	{E-commerce and cultural values (Incoll-w-text (chap 9) 'title')},
+  year =	{2002},
+  address =	{Hershey, PA, USA},
+  publisher =	{IGI Publishing},
+  url =		{http://portal.acm.org/citation.cfm?id=887006.887010},
+  pages =	{51--74},
+  numpages =	{24},
+  acmid =	{887010},
+  isbn =	{1-59140-056-2},
+  number = 	 "",
+  type = 	 "",
+  month = 	 "",
+  note = 	 "",
+}
+
+% incol when the chapter is 'text' - due to presence of editor (different to author)
+ at incollection{Kong:2003:IEC:887006.887011,
+ author = {Kong, Wei-Chang},
+ title = {The implementation of electronic commerce in SMEs in Singapore (Incoll)},
+ booktitle = {E-commerce and cultural values},
+ editor = {Thanasankit, Theerasak},
+ year = {2003},
+ isbn = {1-59140-056-2},
+ pages = {51--74},
+ numpages = {24},
+ url = {http://portal.acm.org/citation.cfm?id=887006.887010},
+ acmid = {887010},
+ publisher = {IGI Publishing},
+ address = {Hershey, PA, USA},
+}
+
+% ------ test
+%incollection{Kong:2003:IEC:887006.887010,
+% author = {Kong, Wei-Chang},
+% chapter = {The implementation of electronic commerce in SMEs in Singapore (Incoll-text-in-chap)},
+% booktitle = {booktitle E-commerce and cultural values},
+% title =   {The title},
+% editor = {Thanasankit, Theerasak},
+% year = {2003},
+% isbn = {1-59140-056-2},
+% pages = {51--74},
+% numpages = {24},
+% url = {http://portal.acm.org/citation.cfm?id=887006.887010},
+% acmid = {887010},
+% publisher = {IGI Publishing},
+% address = {Hershey, PA, USA},
+%}
+
+
+% ---------
+
+
+
+
+
+% Need inbook with num in chapter
+
+% and inbook with number in chapter
+ at InBook{Kong:2004:IEC:123456.887010,
+  author = 	{Kong, Wei-Chang},
+  editor =	{Theerasak Thanasankit},
+  title =	{E-commerce and cultural values - (InBook-num-in-chap)},
+  chapter =	{9},
+  year =	{2004},
+  address =	{Hershey, PA, USA},
+  publisher =	{IGI Publishing},
+  url =		{http://portal.acm.org/citation.cfm?id=887006.887010},
+  pages =	{51--74},
+  numpages =	{24},
+  acmid =	{887010},
+  isbn =	{1-59140-056-2},
+  number = 	 "",
+  type = 	 "",
+  month = 	 "",
+  note = 	 "",
+}
+
+
+% and inbook with text in chapter
+ at Inbook{Kong:2005:IEC:887006.887010,
+  author = 	{Kong, Wei-Chang},
+  editor =	{Theerasak Thanasankit},
+  title =	{E-commerce and cultural values (Inbook-text-in-chap)},
+  chapter =	{The implementation of electronic commerce in SMEs in Singapore},
+  year =	{2005},
+  address =	{Hershey, PA, USA},
+  publisher =	{IGI Publishing},
+  url =		{http://portal.acm.org/citation.cfm?id=887006.887010},
+  type =        {Chapter:},
+  pages =	{51--74},
+  numpages =	{24},
+  acmid =	{887010},
+  isbn =	{1-59140-056-2},
+  number = 	 "",
+  month = 	 "",
+  note = 	 "",
+}
+
+
+% and inbook with a num and type field
+ at Inbook{Kong:2006:IEC:887006.887010,
+  author = 	{Kong, Wei-Chang},
+  editor =	{Theerasak Thanasankit},
+  title =	{E-commerce and cultural values (Inbook-num chap)},
+  chapter =	{22},
+  year =	{2006},
+  address =	{Hershey, PA, USA},
+  publisher =	{IGI Publishing},
+  url =		{http://portal.acm.org/citation.cfm?id=887006.887010},
+  type =        {Chapter (in type field)},
+  pages =	{51--74},
+  numpages =	{24},
+  acmid =	{887010},
+  isbn =	{1-59140-056-2},
+  number = 	 "",
+  month = 	 "",
+  note = 	 "",
+}
+
+
+% and incol coz we have a BLANK chapter - due to presence of editor
+%atIncollection{Kong:2006:IEC:887006.887011,
+%  author = 	{Kong, Wei-Chang},
+%  editor =	{Theerasak Thanasankit},
+%  title =       "The title"
+%  booktitle =	{E-commerce and cultural values (Incol-coz-blank-chap)},
+%  year =	{2006},
+%  address =	{Hershey, PA, USA},
+%  publisher =	{IGI Publishing},
+%  url =		{http://portal.acm.org/citation.cfm?id=887006.887010},
+%  type =        {Type!},
+%  chapter =	{},
+%  pages =	{51--74},
+%  numpages =	{24},
+%  acmid =	{887010},
+%  isbn =	{1-59140-056-2},
+%  number = 	 "",
+%  month = 	 "",
+%  note = 	 "",
+%}
+
+ at article{SaeediMEJ10,
+            author = {Mehdi Saeedi and Morteza Saheb Zamani and Mehdi Sedighi},
+            title = {A library-based synthesis methodology for reversible logic},
+            journal = {Microelectron. J.},
+            volume = {41},
+            number = {4},
+            month = apr,
+            year = {2010},
+            pages = {185--194},
+}
+
+ at ARTICLE{SaeediJETC10,
+            author = {Mehdi Saeedi and Morteza Saheb Zamani and Mehdi Sedighi and Zahra Sasanian},
+            title = {Synthesis of Reversible Circuit Using Cycle-Based Approach},
+            journal = {J. Emerg. Technol. Comput. Syst.},
+            volume = {6},
+            number = {4},
+            month = dec,
+            year = {2010}
+            }
+
+% Asad's new version
+ at article{Kirschmer:2010:AEI:1958016.1958018,
+ author = {Kirschmer, Markus and Voight, John},
+ title = {Algorithmic Enumeration of Ideal Classes for Quaternion Orders},
+ journal = {SIAM J. Comput.},
+ issue_date = {January 2010},
+ volume = {39},
+ number = {5},
+ month = jan,
+ year = {2010},
+ issn = {0097-5397},
+ pages = {1714--1747},
+ numpages = {34},
+ doi = {10.1137/080734467},
+ acmid = {1958018},
+ publisher = {Society for Industrial and Applied Mathematics},
+ address = {Philadelphia, PA, USA},
+ keywords = {ideal classes, maximal orders, number theory, quaternion algebras},
+}
+
+
+% incol due to presence of booktitle
+ at incollection{Hoare:1972:CIN:1243380.1243382,
+ author = {Hoare, C. A. R.},
+ title = {Chapter II: Notes on data structuring},
+ booktitle = {Structured programming (incoll)},
+ editor = {Dahl, O. J. and Dijkstra, E. W. and Hoare, C. A. R.},
+ year = {1972},
+ isbn = {0-12-200550-3},
+ pages = {83--174},
+ numpages = {92},
+ url = {http://portal.acm.org/citation.cfm?id=1243380.1243382},
+ acmid = {1243382},
+ publisher = {Academic Press Ltd.},
+ address = {London, UK, UK},
+} 
+
+% incol due to presence of booktitle
+ at incollection{Lee:1978:TQA:800025.1198348,
+ author = {Lee, Jan},
+ title = {Transcript of question and answer session},
+ booktitle = {History of programming languages I (incoll)},
+ editor = {Wexelblat, Richard L.},
+ year = {1981},
+ isbn = {0-12-745040-8},
+ pages = {68--71},
+ numpages = {4},
+ doi = {10.1145/800025.1198348},
+ acmid = {1198348},
+ publisher = {ACM},
+ address = {New York, NY, USA},
+}
+
+% incol due to booktitle
+ at incollection{Dijkstra:1979:GSC:1241515.1241518,
+ author = {Dijkstra, E.},
+ title = {Go to statement considered harmful},
+ booktitle = {Classics in software engineering (incoll)},
+ year = {1979},
+ isbn = {0-917072-14-6},
+ pages = {27--33},
+ numpages = {7},
+ url = {http://portal.acm.org/citation.cfm?id=1241515.1241518},
+ acmid = {1241518},
+ publisher = {Yourdon Press},
+ address = {Upper Saddle River, NJ, USA},
+} 
+
+% incol due to booktitle
+ at incollection{Wenzel:1992:TVA:146022.146089,
+ author = {Wenzel, Elizabeth M.},
+ title = {Three-dimensional virtual acoustic displays},
+ booktitle = {Multimedia interface design (incoll)},
+ year = {1992},
+ isbn = {0-201-54981-6},
+ pages = {257--288},
+ numpages = {32},
+ url = {http://portal.acm.org/citation.cfm?id=146022.146089},
+ doi = {10.1145/146022.146089},
+ acmid = {146089},
+ publisher = {ACM},
+ address = {New York, NY, USA},
+}
+
+% incol due to booktitle
+ at incollection{Mumford:1987:MES:54905.54911,
+ author = {Mumford, E.},
+ title = {Managerial expert systems and organizational change: some critical research issues},
+ booktitle = {Critical issues in information systems research (incoll)},
+ year = {1987},
+ isbn = {0-471-91281-6},
+ pages = {135--155},
+ numpages = {21},
+ url = {http://portal.acm.org/citation.cfm?id=54905.54911},
+ acmid = {54911},
+ publisher = {John Wiley \& Sons, Inc.},
+ address = {New York, NY, USA},
+} 
+
+ at book{McCracken:1990:SSC:575315,
+ author = {McCracken, Daniel D. and Golden, Donald G.},
+ title = {Simplified Structured COBOL with Microsoft/MicroFocus COBOL},
+ year = {1990},
+ isbn = {0471514071},
+ publisher = {John Wiley \& Sons, Inc.},
+ address = {New York, NY, USA},
+} 
+
+% Let's include Boris / BBeeton entries  (multi-volume works)
+
+ at book {MR781537,
+    AUTHOR = {H{\"o}rmander, Lars},
+     TITLE = {The analysis of linear partial differential operators. {III}},
+    SERIES = {Grundlehren der Mathematischen Wissenschaften [Fundamental
+              Principles of Mathematical Sciences]},
+    VOLUME = {275},
+      NOTE = {Pseudodifferential operators},  
+PUBLISHER = {Springer-Verlag},
+   ADDRESS = {Berlin, Germany},
+      YEAR = {1985},
+     numpages = {viii+525},
+      ISBN = {3-540-13828-5},
+   MRCLASS = {35-02 (35Sxx 47G05 58G15)},
+  MRNUMBER = {781536 (87d:35002a)},
+MRREVIEWER = {Min You Qi},
+}
+
+ at book {MR781536,
+    AUTHOR = {H{\"o}rmander, Lars},
+     TITLE = {The analysis of linear partial differential operators. {IV}},
+    SERIES = {Grundlehren der Mathematischen Wissenschaften [Fundamental
+              Principles of Mathematical Sciences]},
+    VOLUME = {275},
+      NOTE = {Fourier integral operators},  
+PUBLISHER = {Springer-Verlag},
+   ADDRESS = {Berlin, Germany},
+      YEAR = {1985},
+     numpages = {vii+352},
+      ISBN = {3-540-13829-3},
+   MRCLASS = {35-02 (35Sxx 47G05 58G15)},
+  MRNUMBER = {781537 (87d:35002b)},
+MRREVIEWER = {Min You Qi},
+}
+
+%%%%%%%%%%%%%%%%%%%%%% Start of Aptara sample bib entries
+
+% acmsmall-sam.bib
+ at InProceedings{Adya-01,
+  author        = {A. Adya and P. Bahl and J. Padhye and A.Wolman and L. Zhou},
+  title         = {A multi-radio unification protocol for {IEEE} 802.11 wireless networks},
+  booktitle     = {Proceedings of the IEEE 1st International Conference on Broadnets Networks (BroadNets'04)},
+  publisher     = "IEEE",
+  address       = "Los Alamitos, CA",		  
+  year          = {2004},
+  pages         = "210--217"
+}
+
+ at article{Akyildiz-01,
+  author        = {I. F. Akyildiz and W. Su and Y. Sankarasubramaniam and E. Cayirci},
+  title         = {Wireless Sensor Networks: A Survey},
+  journal       = {Comm. ACM},
+  volume        = 38,
+  number        = "4",
+  year          = {2002},
+  pages         = "393--422"
+}
+
+ at article{Akyildiz-02,
+  author        = {I. F. Akyildiz and T. Melodia and K. R. Chowdhury},
+  title         = {A Survey on Wireless Multimedia Sensor Networks},
+  journal       = {Computer Netw.},
+  volume        = 51,
+  number        = "4",
+  year          = {2007},
+  pages         = "921--960"
+}
+
+ at InProceedings{Bahl-02,
+  author        = {P. Bahl and R. Chancre and J. Dungeon},
+  title         = {{SSCH}: Slotted Seeded Channel Hopping for Capacity Improvement in {IEEE} 802.11 Ad-Hoc Wireless Networks},
+  booktitle     = {Proceeding of the 10th International Conference on Mobile Computing and Networking (MobiCom'04)},
+  publisher     = "ACM",
+  address       = "New York, NY",		  
+  year          = {2004},
+  pages         = "112--117"
+}
+
+ at misc{CROSSBOW,
+  key       = {CROSSBOW},
+  title     = {{XBOW} Sensor Motes Specifications},
+  note      = {http://www.xbow.com},
+  year      = 2008
+}
+
+ at article{Culler-01,
+  author        = {D. Culler and D. Estrin and M. Srivastava},
+  title         = {Overview of Sensor Networks},
+  journal       = {IEEE Comput.},
+  volume        = 37,
+  number        = "8 (Special Issue on Sensor Networks)",
+  publisher     = "IEEE",
+  address       = "Los Alamitos, CA",		  
+  year          = {2004},
+  pages         = "41--49"
+}
+
+ at misc{Harvard-01,
+    key         = {Harvard CodeBlue},
+    title       = {{CodeBlue}: Sensor Networks for Medical Care},
+    note        = {http://www.eecs.harvard.edu/mdw/ proj/codeblue/},
+    year        = 2008
+}
+
+ at InProceedings{Natarajan-01,
+    author      = {A. Natarajan and M. Motani and B. de Silva and K. Yap and K. C. Chua},
+    title       = {Investigating Network Architectures for Body Sensor Networks},
+    booktitle   = {Network Architectures},
+    editor      = {G. Whitcomb and P. Neece},
+    publisher   = "Keleuven Press",
+    address     = "Dayton, OH",		  
+    year        = {2007},
+    pages       = "322--328",
+    eprint      = "960935712",
+    primaryclass = "cs",
+}
+
+ at techreport{Tzamaloukas-01,
+  author        = {A. Tzamaloukas and J. J. Garcia-Luna-Aceves},
+  title         = {Channel-Hopping Multiple Access},
+  number =        {I-CA2301},
+  institution =   {Department of Computer Science, University of California},
+  address =       {Berkeley, CA},
+  year          = {2000}
+}
+
+ at BOOK{Zhou-06,
+  author        = {G. Zhou and J. Lu and C.-Y. Wan and M. D. Yarvis and J. A. Stankovic},
+  title         = {Body Sensor Networks},
+  publisher     = "MIT Press",
+  address       = "Cambridge, MA",		  
+  year          = {2008}
+}
+
+ at mastersthesis{ko94,
+author = "Jacob Kornerup",
+title = "Mapping Powerlists onto Hypercubes",
+school = "The University of Texas at Austin",
+note = "(In preparation)",
+year = "1994"}
+%month = "dec",}
+
+ at PhdThesis{gerndt:89,
+  author =       "Michael Gerndt",
+  title =        "Automatic Parallelization for Distributed-Memory
+                  Multiprocessing Systems",
+  school =       "University of Bonn",
+  year =         1989,
+  address =      "Bonn, Germany",
+  month =        dec
+}
+
+ at article{6:1:1,
+author = "J. E. {Archer, Jr.} and R. Conway and F. B. Schneider",
+title = "User recovery and reversal in interactive systems",
+journal = "ACM Trans. Program. Lang. Syst.",
+volume =  "6",
+number = "1",
+month = jan,
+year = 1984,
+pages = "1--19"}
+
+ at article{7:1:137,
+author = "D. D. Dunlop and V. R. Basili",
+title = "Generalizing specifications for uniformly implemented loops",
+journal = "ACM Trans. Program. Lang. Syst.",
+volume =  "7",
+number = "1",
+month = jan,
+year = 1985,
+pages = "137--158"}
+
+ at article{7:2:183,
+author = "J. Heering and P. Klint",
+title = "Towards monolingual programming environments",
+journal = "ACM Trans. Program. Lang. Syst.",
+volume =  "7",
+number = "2",
+month = apr,
+year = 1985,
+pages = "183--213"}
+
+ at book{knuth:texbook,
+author = "Donald E. Knuth",
+title = "The {\TeX{}book}",
+publisher = "Addison-Wesley",
+address = "Reading, MA.",
+year = 1984}
+
+ at article{6:3:380,
+author = "E. Korach and D.  Rotem and N. Santoro",
+title = "Distributed algorithms for finding centers and medians in networks",
+journal = "ACM Trans. Program. Lang. Syst.",
+volume =  "6",
+number = "3",
+month = jul,
+year = 1984,
+pages = "380--401"}
+
+ at book{lamport:latex,
+author = "Leslie Lamport",
+title = "\it {\LaTeX}: A Document Preparation System",
+publisher = "Addison-Wesley",
+address = "Reading, MA.",
+year = 1986}
+
+ at article{7:3:359,
+author = "F. Nielson",
+title = "Program transformations in a denotational setting",
+journal = "ACM Trans. Program. Lang. Syst.",
+volume =  "7",
+number = "3",
+month = jul,
+year = 1985,
+pages = "359--379"}
+
+%testing
+ at BOOK{test,
+   author = "Donald E. Knuth",
+   title = "Seminumerical Algorithms",
+   volume = 2,
+   series = "The Art of Computer Programming",
+   publisher = "Addison-Wesley",
+   address = "Reading, MA",
+   edition = "2nd",
+   month = "10~" # jan,
+   year = "1981",
+}
+
+ at inproceedings{reid:scribe,
+author = "Brian K. Reid",
+title = "A high-level approach to computer document formatting",
+booktitle = "Proceedings of the 7th Annual Symposium on Principles of
+  Programming Languages",
+month = jan,
+year = 1980,
+publisher = "ACM",
+address = "New York",		  
+pages = "24--31"}
+
+ at article{Zhou:2010:MMS:1721695.1721705,
+ author = {Zhou, Gang and Wu, Yafeng and Yan, Ting and He, Tian and Huang, Chengdu and Stankovic, John A. and Abdelzaher, Tarek F.},
+ title = {A multifrequency MAC specially designed for wireless sensor network applications},
+ journal = {ACM Trans. Embed. Comput. Syst.},
+ issue_date = {March 2010},
+ volume = 9,
+ number = 4,
+ month = {April},
+ year = 2010,
+ issn = {1539-9087},
+ pages = {39:1--39:41},
+ articleno = 39,
+ numpages = 41,
+ doi = {10.1145/1721695.1721705},
+ acmid = 1721705,
+ publisher = {ACM},
+ address = {New York, NY, USA},
+ keywords = {Wireless sensor networks, media access control, multi-channel, radio interference, time synchronization},
+}
+
+
+ at online{TUGInstmem,
+  author =          {TUG},
+  year  =        2017,
+  title =        "Institutional members of the {\TeX} Users Group",
+  url =           "http://wwtug.org/instmem.html",
+  urldate = "2017-05-27",
+}
+
+ at online{CTANacmart,
+  author =    {Boris Veytsman},
+  title =  {acmart---{C}lass for typesetting publications of {ACM}},
+  url =    {http://www.ctan.org/pkg/acmart},
+  urldate = {2017-05-27}
+  }
+
+ at ARTICLE{bowman:reasoning,
+    author = {Bowman, Mic and Debray, Saumya K. and Peterson, Larry L.},
+    title = {Reasoning About Naming Systems},
+    journal = {ACM Trans. Program. Lang. Syst.},
+    volume = {15},
+    number = {5},
+    pages = {795-825},
+    month = {November},
+    year = {1993},
+    doi = {10.1145/161468.161471},
+}
+
+ at ARTICLE{braams:babel,
+    author = {Braams, Johannes},
+    title = {Babel, a Multilingual Style-Option System for Use with LaTeX's Standard Document Styles},
+    journal = {TUGboat},
+    volume = {12},
+    number = {2},
+    pages = {291-301},
+    month = {June},
+    year = {1991},
+}
+
+ at INPROCEEDINGS{clark:pct,
+	AUTHOR = "Malcolm Clark",
+	TITLE = "Post Congress Tristesse",
+	BOOKTITLE = "TeX90 Conference Proceedings",
+	PAGES = "84-89",
+	ORGANIZATION = "TeX Users Group",
+	MONTH = "March", 
+	YEAR = {1991}	}
+
+ at ARTICLE{herlihy:methodology,
+    author = {Herlihy, Maurice},
+    title = {A Methodology for Implementing Highly Concurrent Data Objects},
+    journal = {ACM Trans. Program. Lang. Syst.},
+    volume = {15},
+    number = {5},
+    pages = {745-770},
+    month = {November},
+    year = {1993},
+    doi = {10.1145/161468.161469},
+}
+
+ at BOOK{salas:calculus,
+	AUTHOR = "S.L. Salas and Einar Hille",
+	TITLE = "Calculus: One and Several Variable",
+	PUBLISHER = "John Wiley and Sons",
+	ADDRESS = "New York",
+	YEAR = "1978"	}
+
+ at online{Fear05,
+  title = 	 {Publication quality tables in {\LaTeX}},
+  author =	 {Simon Fear},
+  month =	 {April},
+  year =	 2005,
+  url =	 {http://www.ctan.org/pkg/booktabs}
+}
+
+ at Manual{Amsthm15,
+  title = 	 {Using the amsthm Package},
+  organization = {American Mathematical Society},
+  month =	 {April},
+  year =	 2015,
+  note =	 {\url{http://www.ctan.org/pkg/amsthm}}
+}


Property changes on: trunk/Master/texmf-dist/doc/latex/acmart/sample-bibliography-biblatex.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/acmart/sample-bibliography-sigchi-a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-bibliography-sigchi-a.bib	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-bibliography-sigchi-a.bib	2017-12-16 21:29:01 UTC (rev 46077)
@@ -0,0 +1,164 @@
+ at Misc{CHINOSAUR:venue,
+  author =       {@\_CHINOSAUR},
+  key =          {_CHINOSAUR},
+  howpublished = {Tweet},
+  title =        {"VENUE IS TOO COLD" \#BINGO \#CHI2014},
+  month =        {May},
+  day =          1,
+  year =         2014,
+  note =         {Retrieved Febuary 2, 2015 from
+                  \url{https://twitter.com/_CHINOSAUR/status/461864317415989248}},
+  annote =       {Tweet}
+}
+
+ at misc{supermetroid:snes,
+  Address = {Kyoto, Japan},
+  Author = {{Nintendo R\&D1} and {Intelligent Systems}},
+  Day = {18},
+  Howpublished = {Game [SNES]},
+  Month = {April},
+  Note = {Nintendo, Kyoto, Japan. Played August 2011.},
+  Publisher = {Nintendo},
+  Title = {\emph{Super Metroid}},
+  Year = {1994}
+}
+
+ at inproceedings{Klemmer:2002:WSC:503376.503378,
+  author =       {Klemmer, Scott R. and Thomsen, Michael and
+                  Phelps-Goodman, Ethan and Lee, Robert and Landay,
+                  James A.},
+  title =        {Where Do Web Sites Come from?: Capturing and
+                  Interacting with Design History},
+  booktitle =    {Proceedings of the SIGCHI Conference on Human
+                  Factors in Computing Systems},
+  series =       {CHI '02},
+  year =         2002,
+  isbn =         {1-58113-453-3},
+  location =     {Minneapolis, Minnesota, USA},
+  pages =        {1--8},
+  url =          {http://doi.acm.org/10.1145/503376.503378},
+  doi =          {10.1145/503376.503378},
+  acmid =        503378,
+  publisher =    {ACM},
+  address =      {New York, NY, USA},
+  keywords =     {CSCW, activity capture, design rationale, history
+                  management, informal interfaces, sketching, tangible
+                  UI, web design},
+}
+
+ at inproceedings{Mather:2000:MUT,
+  title =        {Making up titles for conference papers},
+  author =       {Mather, B. D.},
+  booktitle =    {Ext. Abstracts CHI 2000},
+  year =         2000,
+  publisher =    "ACM Press",
+  pages =        "1-2",
+}
+
+ at book{Schwartz:1995:GBF,
+  title =        {Guidelines for Bias-Free Writing},
+  author =       {Marilyn Schwartz},
+  address =      {Bloomington, IN, USA},
+  year =         1995,
+  publisher =    {ERIC}
+}
+
+ at inproceedings{Zellweger:2001:FAO:504216.504224,
+  author =       {Zellweger, Polle T. and Bouvin, Niels Olof and
+                  Jeh{\o}j, Henning and Mackinlay, Jock D.},
+  title =        {Fluid annotations in an open world},
+  booktitle =    {Proc. Hypertext 2001},
+  year =         2001,
+  pages =        {9--18},
+  publisher =    {ACM Press},
+}
+
+ at misc{acm_categories,
+  key =          "ACM",
+  author =       {ACM},
+  title =        {How to Classify Works Using ACM's Computing
+                  Classification System},
+  year =         1998,
+  note =         {\url{http://www.acm.org/class/how_to_use.html}},
+}
+
+ at Misc{cavender:writing,
+  author =       {Anna Cavender and Shari Trewin and Vicki Hanson},
+  title =        {Accessible Writing Guide},
+  year =         2014,
+  day =          22,
+  note =
+                  {\url{http://www.sigaccess.org/welcome-to-sigaccess/resources/accessible-writing-guide/}},
+  annote =       {URL}
+}
+
+ at article{ethics,
+  title =        {{Social Impacts of Computing: Codes of Professional
+                  Ethics}},
+  author =       {R. E. Anderson},
+  doi =          "10.1177/089443939201000402",
+  journal =      "Social Science Computer Review December",
+  year =         1992,
+  volume =       10,
+  number =       4,
+  pages =        "453-469"
+}
+
+ at Misc{heilig:sensorama,
+  author =       {Morton L. Heilig},
+  title =        {Sensorama Simulator},
+  howpublished = {U.S. Patent 3,050,870},
+  month =        {August},
+  day =          28,
+  year =         1962,
+  note =         {Filed Februrary 22, 1962.},
+  annote =       {is this right?}
+},
+
+ at article{kaye:puc,
+  year =         2014,
+  issn =         {1617-4909},
+  journal =      {Personal and Ubiquitous Computing},
+  volume =       18,
+  number =       4,
+  doi =          {10.1007/s00779-014-0773-4},
+  title =        {Special issue on science fiction and ubiquitous
+                  computing},
+  url =          {http://dx.doi.org/10.1007/s00779-014-0773-4},
+  publisher =    {Springer London},
+  author =       {Kaye, Jofish and Dourish, Paul},
+  pages =        {765-766},
+  language =     {English}
+}
+
+ at Misc{psy:gangnam,
+  author =       {Psy},
+  title =        {Gangnam Style},
+  howpublished = {Video},
+  month =        {July},
+  day =          15,
+  year =         2012,
+  note =         {Retrieved August 22, 2014 from
+                  \url{https://www.youtube.com/watch?v=9bZkp7q19f0}},
+  annote =       {Video URL}
+}
+
+ at PhdThesis{sutherland:sketchpad,
+  author =       {Ivan E. Sutherland},
+  title =        {Sketchpad, a Man-Machine Graphical Communication
+                  System},
+  school =       {Massachusetts Institute of Technology},
+  year =         1963,
+  address =      {Cambridge, MA},
+}
+
+ at InBook{winner:politics,
+  author =       {Langdon Winner},
+  title =        {The Social Shaping of Technology},
+  chapter =      {Do artifacts have politics?},
+  publisher =    {Open University Press},
+  year =         1999,
+  address =      {UK},
+  edition =      {2nd},
+  pages =        {28--40},
+}


Property changes on: trunk/Master/texmf-dist/doc/latex/acmart/sample-bibliography-sigchi-a.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-bibliography.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-bibliography.bib	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-bibliography.bib	2017-12-16 21:29:01 UTC (rev 46077)
@@ -11,10 +11,10 @@
 %%%     supported       = "yes",
 %%%     docstring       = "This BibTeX database file contains 'bibdata' entries
 %%%                        that 'match' the examples provided in the Specifications Document
-%%%                        AND, also, 'legacy'-type bibs. It should assist authors in 
+%%%                        AND, also, 'legacy'-type bibs. It should assist authors in
 %%%                        choosing the 'correct' at-bibtype and necessary bib-fields
-%%%                        so as to obtain the appropriate ACM Reference Format output. 
-%%%			   It also contains many 'Standard Abbreviations'. "
+%%%                        so as to obtain the appropriate ACM Reference Format output.
+%%%                        It also contains many 'Standard Abbreviations'. "
 %%%  }
 %%% ====================================================================
 
@@ -217,45 +217,45 @@
 %Entries
 
 @Article{Abril07,
-  author 	= "Patricia S. Abril and Robert Plant",
-  title 	= "The patent holder's dilemma: Buy, sell, or troll?",
-  journal 	= "Communications of the ACM",
-  volume 	= "50",
-  number 	= "1",
-  month 	= jan,
-  year 		= "2007",
-  pages 	= "36--44",
-  doi 		= "10.1145/1188913.1188915",
-  url		= "http://doi.acm.org/10.1145/1219092.1219093",
-  note		= "",
+  author        = "Patricia S. Abril and Robert Plant",
+  title         = "The patent holder's dilemma: Buy, sell, or troll?",
+  journal       = "Communications of the ACM",
+  volume        = "50",
+  number        = "1",
+  month         = jan,
+  year          = "2007",
+  pages         = "36--44",
+  doi           = "10.1145/1188913.1188915",
+  url           = "http://doi.acm.org/10.1145/1219092.1219093",
+  note          = "",
 }
 
 @Article{Cohen07,
-  author 	=	"Sarah Cohen and Werner Nutt and Yehoshua Sagic",
-  title		=	"Deciding equivalances among conjunctive aggregate queries",
-  journal 	=	JACM,
-  articleno	=	"5",
-  numpages	=	"50",
-  volume 	=	"54",
-  number 	= 	"2",
-  month 	=	apr,
-  year 		=	"2007",
-  doi 		=	"10.1145/1219092.1219093",
-  url 		=	"http://doi.acm.org/10.1145/1219092.1219093",
-  acmid		=	"1219093",
-  note 		= 	"",
+  author        = "Sarah Cohen and Werner Nutt and Yehoshua Sagic",
+  title         = "Deciding equivalances among conjunctive aggregate queries",
+  journal       = JACM,
+  articleno     = "5",
+  numpages      = "50",
+  volume        = "54",
+  number        = "2",
+  month         = apr,
+  year          = "2007",
+  doi           = "10.1145/1219092.1219093",
+  url           = "http://doi.acm.org/10.1145/1219092.1219093",
+  acmid         = "1219093",
+  note          = "",
 }
 
 
 @periodical{JCohen96,
-  key = 	 "Cohen",
+  key =          "Cohen",
   editor =       "Jacques Cohen",
   title =        "Special issue: Digital Libraries",
   journal =      CACM,
   volume =       "39",
-  number = 	 "11",
-  month =	 nov,
-  year = 	 "1996",
+  number =       "11",
+  month =        nov,
+  year =         "1996",
 }
 
 
@@ -266,12 +266,12 @@
   year =         "2001",
   address =      "New York, NY",
   edition =      "2nd.",
-  editor = 	 "",
-  volume = 	 "",
-  number = 	 "",
-  series = 	 "",
-  month = 	 "",
-  note = 	 "",
+  editor =       "",
+  volume =       "",
+  number =       "",
+  series =       "",
+  month =        "",
+  note =         "",
 }
 
 
@@ -283,39 +283,39 @@
   volume =       "68",
   address =      "New York, NY",
   publisher =    "Springer-Verlag",
-  doi = 	 "10.1007/3-540-09237-4",
-  url = 	 "http://dx.doi.org/10.1007/3-540-09237-4",
-  editor = 	 "",
-  number = 	 "",
-  month = 	 "",
-  note = 	 "",
+  doi =          "10.1007/3-540-09237-4",
+  url =          "http://dx.doi.org/10.1007/3-540-09237-4",
+  editor =       "",
+  number =       "",
+  month =        "",
+  note =         "",
 }
 
 
 @Inbook{Editor00,
-  author = 	 "",
+  author =       "",
   editor =       "Ian Editor",
   title =        "The title of book one",
   subtitle =     "The book subtitle",
   series =       "The name of the series one",
   year =         "2007",
-  volume = 	 "9",
+  volume =       "9",
   address =      "Chicago",
   edition =      "1st.",
   publisher =    "University of Chicago Press",
-  doi = 	 "10.1007/3-540-09237-4",
-  url = 	 "http://dx.doi.org/10.1007/3-540-09456-9",
-  chapter = 	 "",
-  pages = 	 "",
-  number = 	 "",
-  type = 	 "",
-  month = 	 "",
-  note = 	 "",
+  doi =          "10.1007/3-540-09237-4",
+  url =          "http://dx.doi.org/10.1007/3-540-09456-9",
+  chapter =      "",
+  pages =        "",
+  number =       "",
+  type =         "",
+  month =        "",
+  note =         "",
 }
 
 %
 @InBook{Editor00a,
-  author = 	 "",
+  author =       "",
   editor =       "Ian Editor",
   title =        "The title of book two",
   subtitle =     "The book subtitle",
@@ -324,15 +324,15 @@
   address =      "Chicago",
   edition =      "2nd.",
   publisher =    "University of Chicago Press",
-  doi = 	 "10.1007/3-540-09237-4",
-  url = 	 "http://dx.doi.org/10.1007/3-540-09456-9",
-  volume = 	 "",
-  chapter = 	 "100",
-  pages = 	 "",
-  number = 	 "",
-  type = 	 "",
-  month = 	 "",
-  note = 	 "",
+  doi =          "10.1007/3-540-09237-4",
+  url =          "http://dx.doi.org/10.1007/3-540-09456-9",
+  volume =       "",
+  chapter =      "100",
+  pages =        "",
+  number =       "",
+  type =         "",
+  month =        "",
+  note =         "",
 }
 
 
@@ -346,16 +346,16 @@
   year =         "1990",
   edition =      "2nd.",
   chapter =      "",
-  editor = 	 "Sape Mullender",
+  editor =       "Sape Mullender",
   pages =        "19--33",
-  doi = 	 "10.1145/90417.90738",
-  url = 	 "http://doi.acm.org/10.1145/90417.90738",
-  volume =	 "",
-  number = 	 "",
-  series =	 "",
-  type = 	 "",
-  month = 	 "",
-  note = 	 "",
+  doi =          "10.1145/90417.90738",
+  url =          "http://doi.acm.org/10.1145/90417.90738",
+  volume =       "",
+  number =       "",
+  series =       "",
+  type =         "",
+  month =        "",
+  note =         "",
 }
 
 
@@ -367,18 +367,18 @@
   booktitle =    "Lectures on Embedded Systems",
   publisher =    "Springer-Verlag",
   address =      "London",
-  volume = 	 "1494",
+  volume =       "1494",
   year =         "1998",
   chapter =      "",
-  editor = 	 "Grzegorz Rozenberg and Frits W. Vaandrager",
+  editor =       "Grzegorz Rozenberg and Frits W. Vaandrager",
   pages =        "368--394",
-  doi = 	 "10.1007/3-540-65193-4_29",
-  url = 	 "http://dx.doi.org/10.1007/3-540-65193-4_29",
-  edition = 	 "",
-  number = 	 "",
-  type = 	 "",
-  month = 	 "",
-  note = 	 "",
+  doi =          "10.1007/3-540-65193-4_29",
+  url =          "http://dx.doi.org/10.1007/3-540-65193-4_29",
+  edition =      "",
+  number =       "",
+  type =         "",
+  month =        "",
+  note =         "",
 }
 
 
@@ -389,12 +389,12 @@
   year =         "1997",
   address =      "",
   edition =      "",
-  editor = 	 "",
-  volume = 	 "",
-  number = 	 "",
-  series = 	 "",
-  month = 	 "",
-  note = 	 "",
+  editor =       "",
+  volume =       "",
+  number =       "",
+  series =       "",
+  month =        "",
+  note =         "",
 }
 
 
@@ -407,31 +407,31 @@
   edition =      "3rd",
   address =      "",
   publisher =    "Addison Wesley Longman Publishing Co., Inc.",
-  doi = 	 "",
-  url = 	 "",
-  editor = 	 "",
-  number = 	 "",
-  month = 	 "",
-  note = 	 "(book)",
+  doi =          "",
+  url =          "",
+  editor =       "",
+  number =       "",
+  month =        "",
+  note =         "(book)",
 }
 
 %Inbook{Knuth97,
-%  author = 	 "Donald E. Knuth",
-%  title = 	 "The Art of Computer Programming",
+%  author =       "Donald E. Knuth",
+%  title =        "The Art of Computer Programming",
 %  booktitle =    "the booktitle",
 %  edition =      "3",
 %  volume =       "1",
 %  year =         "1997",
 %  publisher =    "Addison Wesley Longman Publishing Co., Inc.",
-%  editor = 	 "",
-%  number = 	 "",
-%  series = 	 "Fundamental Algorithms",
-%  type = 	 "",
-%  chapter = 	 "",
-%  pages = 	 "",
-%  address = 	 "",
-%  month = 	 "",
-%  note = 	 "(inbook)",
+%  editor =       "",
+%  number =       "",
+%  series =       "Fundamental Algorithms",
+%  type =         "",
+%  chapter =      "",
+%  pages =        "",
+%  address =      "",
+%  month =        "",
+%  note =         "(inbook)",
 %}
 
 %INBOOK{DK:73-inbook-full,
@@ -460,7 +460,7 @@
 %   month = "10~" # jan,
 %   year = "1974",
 %   pages = "10--119",
-%   editor = 	 "Bernard Rous",
+%   editor = "Bernard Rous",
 %   note = "This is a full incoll entry with an editor",
 %}
 
@@ -494,19 +494,19 @@
   author =       "Stan W. Smith",
   title =        "An experiment in bibliographic mark-up: Parsing metadata for XML export",
   booktitle =    "Proceedings of the 3rd. annual workshop on Librarians and Computers",
-  series = 	 "LAC '10",
-  editor = 	 "Reginald N. Smythe and Alexander Noble",
-  volume = 	  "3",
+  series =       "LAC '10",
+  editor =       "Reginald N. Smythe and Alexander Noble",
+  volume =       "3",
   year =         "2010",
   publisher =    "Paparazzi Press",
-  address = 	 "Milan Italy",
+  address =      "Milan Italy",
   pages =        "422--431",
-  doi = 	 "99.9999/woot07-S422",
-  url = 	 "http://dx.doi.org/99.0000/woot07-S422",
-  number =	 "",
-  month = 	 "",
+  doi =          "99.9999/woot07-S422",
+  url =          "http://dx.doi.org/99.0000/woot07-S422",
+  number =       "",
+  month =        "",
   organization = "",
-  note = 	 "",
+  note =         "",
 }
 
 @Inproceedings{VanGundy07,
@@ -514,18 +514,18 @@
   year =         "2007",
   title =        "Catch me, if you can: Evading network signatures with web-based polymorphic worms",
   booktitle =    "Proceedings of the first USENIX workshop on Offensive Technologies",
-  series = 	 "WOOT '07",
+  series =       "WOOT '07",
   publisher =    "USENIX Association",
-  address = 	 "Berkley, CA",
-  articleno = 	 "7",
-  numpages = 	 "9",
-  editor = 	 "",
-  volume = 	 "",
-  number = 	 "",
-  pages = 	 "",
-  month = 	 "",
+  address =      "Berkley, CA",
+  articleno =    "7",
+  numpages =     "9",
+  editor =       "",
+  volume =       "",
+  number =       "",
+  pages =        "",
+  month =        "",
   organization = "",
-  note = 	 "",
+  note =         "",
 }
 
 @Inproceedings{VanGundy08,
@@ -533,18 +533,18 @@
   year =         "2008",
   title =        "Catch me, if you can: Evading network signatures with web-based polymorphic worms",
   booktitle =    "Proceedings of the first USENIX workshop on Offensive Technologies",
-  series = 	 "WOOT '08",
+  series =       "WOOT '08",
   publisher =    "USENIX Association",
-  address = 	 "Berkley, CA",
-  articleno = 	 "7",
-  numpages = 	 "2",
-  editor = 	 "",
-  volume = 	 "",
-  number = 	 "",
-  pages = 	 "99-100",
-  month = 	 "",
+  address =      "Berkley, CA",
+  articleno =    "7",
+  numpages =     "2",
+  editor =       "",
+  volume =       "",
+  number =       "",
+  pages =        "99-100",
+  month =        "",
   organization = "",
-  note = 	 "",
+  note =         "",
 }
 
 @Inproceedings{VanGundy09,
@@ -552,18 +552,18 @@
   year =         "2009",
   title =        "Catch me, if you can: Evading network signatures with web-based polymorphic worms",
   booktitle =    "Proceedings of the first USENIX workshop on Offensive Technologies",
-  series = 	 "WOOT '09",
+  series =       "WOOT '09",
   publisher =    "USENIX Association",
-  address = 	 "Berkley, CA",
-  articleno = 	 "",
-  numpages = 	 "",
-  editor = 	 "",
-  volume = 	 "",
-  number = 	 "",
-  pages = 	 "90--100",
-  month = 	 "",
+  address =      "Berkley, CA",
+  articleno =    "",
+  numpages =     "",
+  editor =       "",
+  volume =       "",
+  number =       "",
+  pages =        "90--100",
+  month =        "",
   organization = "",
-  note = 	 "",
+  note =         "",
 }
 
 @Inproceedings{Andler79,
@@ -570,19 +570,19 @@
   author =       "Sten Andler",
   title =        "Predicate Path expressions",
   booktitle =    "Proceedings of the 6th. ACM SIGACT-SIGPLAN symposium on Principles of Programming Languages",
-  series = 	 "POPL '79",
+  series =       "POPL '79",
   year =         "1979",
   publisher =    "ACM Press",
-  address = 	 "New York, NY",
+  address =      "New York, NY",
   pages =        "226--236",
-  doi = 	 "10.1145/567752.567774",
-  url = 	 "http://doi.acm.org/10.1145/567752.567774",
-  editor = 	 "",
-  volume = 	 "",
-  number = 	 "",
-  month = 	 "",
+  doi =          "10.1145/567752.567774",
+  url =          "http://doi.acm.org/10.1145/567752.567774",
+  editor =       "",
+  volume =       "",
+  number =       "",
+  month =        "",
   organization = "",
-  note = 	 "",
+  note =         "",
 }
 
 @Techreport{Harel78,
@@ -593,8 +593,8 @@
   type =         "MIT Research Lab Technical Report",
   number =       "TR-200",
   address =      "Cambridge, MA",
-  month = 	 "",
-  note = 	 "",
+  month =        "",
+  note =         "",
 }
 
 @MASTERSTHESIS{anisi03,
@@ -613,8 +613,8 @@
   school =       "Stanford University",
   address =      "Palo Alto, CA",
   note =         "UMI Order Number: AAT 8506171",
-  type = 	 "",
-  month = 	 "",
+  type =         "",
+  month =        "",
 }
 
 
@@ -622,8 +622,8 @@
   author =       "Harry Thornburg",
   year =         "2001",
   title =        "Introduction to Bayesian Statistics",
-  url =           "http://ccrma.stanford.edu/~jos/bayes/bayes.html",
-  month = 	 mar,
+  url =          "http://ccrma.stanford.edu/~jos/bayes/bayes.html",
+  month =        mar,
   lastaccessed = "March 2, 2005",
 }
 
@@ -640,7 +640,7 @@
 @misc{Poker06,
   author =       "Poker-Edge.Com",
   year =         "2006",
-  month 	= mar,
+  month =        mar,
   title =        "Stats and Analysis",
   lastaccessed = "June 7, 2006",
   url =          "http://www.poker-edge.com/stats.php",
@@ -647,15 +647,15 @@
 }
 
 @misc{Obama08,
-  author 	= "Barack Obama",
-  year 		= "2008",
-  title		= "A more perfect union",
+  author        = "Barack Obama",
+  year          = "2008",
+  title         = "A more perfect union",
   howpublished  = "Video",
-  day 		= "5",
-  url 		= "http://video.google.com/videoplay?docid=6528042696351994555",
-  month 	= mar,
+  day           = "5",
+  url           = "http://video.google.com/videoplay?docid=6528042696351994555",
+  month         = mar,
   lastaccessed  = "March 21, 2008",
-  note		=  "",
+  note          =  "",
 }
 
 @misc{JoeScientist001,
@@ -663,9 +663,9 @@
   year =         "2009",
   title =        "The fountain of youth",
   note =         "Patent No. 12345, Filed July 1st., 2008, Issued Aug. 9th., 2009",
-  url =           "",
+  url =          "",
   howpublished = "",
-  month = 	 aug,
+  month =        aug,
   lastaccessed = "",
 }
 
@@ -675,18 +675,18 @@
   title =        "Solder man",
   booktitle =    "ACM SIGGRAPH 2003 Video Review on Animation theater Program: Part I - Vol. 145 (July 27--27, 2003)",
   year =         "2003",
-  publisher = 	 "ACM Press",
-  address = 	 "New York, NY",
+  publisher =    "ACM Press",
+  address =      "New York, NY",
   pages =        "4",
-  month = 	 "March 21, 2008",
-  doi = 	 "99.9999/woot07-S422",
-  url = 	 "http://video.google.com/videoplay?docid=6528042696351994555",
-  note = 	 "",
+  month =        "March 21, 2008",
+  doi =          "99.9999/woot07-S422",
+  url =          "http://video.google.com/videoplay?docid=6528042696351994555",
+  note =         "",
   howpublished = "Video",
-  editor = 	 "",
-  volume = 	 "",
-  number = 	 "",
-  series = 	 "",
+  editor =       "",
+  volume =       "",
+  number =       "",
+  series =       "",
   organization = "",
 }
 
@@ -693,32 +693,32 @@
 
 @article{Lee05,
   author =       "Newton Lee",
-  year = 	 "2005",
+  year =         "2005",
   title =        "Interview with Bill Kinder: January 13, 2005",
-  journal = 	 "Comput. Entertain.",
-  eid      =     "4",
+  journal =      "Comput. Entertain.",
+  eid =          "4",
   volume =       "3",
-  number = 	 "1",
-  month =  	 "Jan.-March",
-  doi = 	 "10.1145/1057270.1057278",
-  url = 	 "http://doi.acm.org/10.1145/1057270.1057278",
+  number =       "1",
+  month =        "Jan.-March",
+  doi =          "10.1145/1057270.1057278",
+  url =          "http://doi.acm.org/10.1145/1057270.1057278",
   howpublished = "Video",
-  note =	 "",
+  note =         "",
 }
 
 @article{Rous08,
   author =       "Bernard Rous",
-  year = 	 "2008",
+  year =         "2008",
   title =        "The Enabling of Digital Libraries",
-  journal = 	 "Digital Libraries",
+  journal =      "Digital Libraries",
   volume =       "12",
-  number = 	 "3",
-  month =  	 jul,
-  articleno = 	 "5",
-  doi = 	 "",
-  url = 	 "",
+  number =       "3",
+  month =        jul,
+  articleno =    "5",
+  doi =          "",
+  url =          "",
   howpublished = "",
-  note =	 "To appear",
+  note =         "To appear",
 }
 
 @article{384253,
@@ -872,7 +872,7 @@
 % Also -- the title is NOT being output in italics !!! Arrrrgh! - I fixed it. :-)
 
 
-%%% compare with 'old' 
+%%% compare with 'old'
 %%% atsign-Phdthesis{Clarkson85,
 %%%  author =       "Kenneth L. Clarkson",
 %%%  year =         "1985",
@@ -880,8 +880,8 @@
 %%%  school =       "Stanford University",
 %%%  address =      "Palo Alto, CA",
 %%%  note =         "UMI Order Number: AAT 8506171",
-%%%  type = 	 "",
-%%%  month = 	 "",
+%%%  type =         "",
+%%%  month =        "",
 %%%}
 
 % A bibliography
@@ -1000,22 +1000,22 @@
 
 % was 'Inbook' -- changed to incollection - (editor is different to author) - need to tell Asad to codify as such.
 @incollection{Kong:2002:IEC:887006.887010,
-  author = 	{Kong, Wei-Chang},
-  editor =	{Theerasak Thanasankit},
-  title =	{Chapter 9},
-  booktitle =	{E-commerce and cultural values (Incoll-w-text (chap 9) 'title')},
-  year =	{2002},
-  address =	{Hershey, PA, USA},
-  publisher =	{IGI Publishing},
-  url =		{http://portal.acm.org/citation.cfm?id=887006.887010},
-  pages =	{51--74},
-  numpages =	{24},
-  acmid =	{887010},
-  isbn =	{1-59140-056-2},
-  number = 	 "",
-  type = 	 "",
-  month = 	 "",
-  note = 	 "",
+  author =      {Kong, Wei-Chang},
+  editor =      {Theerasak Thanasankit},
+  title =       {Chapter 9},
+  booktitle =   {E-commerce and cultural values (Incoll-w-text (chap 9) 'title')},
+  year =        {2002},
+  address =     {Hershey, PA, USA},
+  publisher =   {IGI Publishing},
+  url =         {http://portal.acm.org/citation.cfm?id=887006.887010},
+  pages =       {51--74},
+  numpages =    {24},
+  acmid =       {887010},
+  isbn =        {1-59140-056-2},
+  number =      "",
+  type =        "",
+  month =       "",
+  note =        "",
 }
 
 % incol when the chapter is 'text' - due to presence of editor (different to author)
@@ -1062,86 +1062,86 @@
 
 % and inbook with number in chapter
 @InBook{Kong:2004:IEC:123456.887010,
-  author = 	{Kong, Wei-Chang},
-  editor =	{Theerasak Thanasankit},
-  title =	{E-commerce and cultural values - (InBook-num-in-chap)},
-  chapter =	{9},
-  year =	{2004},
-  address =	{Hershey, PA, USA},
-  publisher =	{IGI Publishing},
-  url =		{http://portal.acm.org/citation.cfm?id=887006.887010},
-  pages =	{51--74},
-  numpages =	{24},
-  acmid =	{887010},
-  isbn =	{1-59140-056-2},
-  number = 	 "",
-  type = 	 "",
-  month = 	 "",
-  note = 	 "",
+  author =      {Kong, Wei-Chang},
+  editor =      {Theerasak Thanasankit},
+  title =       {E-commerce and cultural values - (InBook-num-in-chap)},
+  chapter =     {9},
+  year =        {2004},
+  address =     {Hershey, PA, USA},
+  publisher =   {IGI Publishing},
+  url =         {http://portal.acm.org/citation.cfm?id=887006.887010},
+  pages =       {51--74},
+  numpages =    {24},
+  acmid =       {887010},
+  isbn =        {1-59140-056-2},
+  number =      "",
+  type =        "",
+  month =       "",
+  note =        "",
 }
 
 
 % and inbook with text in chapter
 @Inbook{Kong:2005:IEC:887006.887010,
-  author = 	{Kong, Wei-Chang},
-  editor =	{Theerasak Thanasankit},
-  title =	{E-commerce and cultural values (Inbook-text-in-chap)},
-  chapter =	{The implementation of electronic commerce in SMEs in Singapore},
-  year =	{2005},
-  address =	{Hershey, PA, USA},
-  publisher =	{IGI Publishing},
-  url =		{http://portal.acm.org/citation.cfm?id=887006.887010},
+  author =      {Kong, Wei-Chang},
+  editor =      {Theerasak Thanasankit},
+  title =       {E-commerce and cultural values (Inbook-text-in-chap)},
+  chapter =     {The implementation of electronic commerce in SMEs in Singapore},
+  year =        {2005},
+  address =     {Hershey, PA, USA},
+  publisher =   {IGI Publishing},
+  url =         {http://portal.acm.org/citation.cfm?id=887006.887010},
   type =        {Chapter:},
-  pages =	{51--74},
-  numpages =	{24},
-  acmid =	{887010},
-  isbn =	{1-59140-056-2},
-  number = 	 "",
-  month = 	 "",
-  note = 	 "",
+  pages =       {51--74},
+  numpages =    {24},
+  acmid =       {887010},
+  isbn =        {1-59140-056-2},
+  number =      "",
+  month =       "",
+  note =        "",
 }
 
 
 % and inbook with a num and type field
 @Inbook{Kong:2006:IEC:887006.887010,
-  author = 	{Kong, Wei-Chang},
-  editor =	{Theerasak Thanasankit},
-  title =	{E-commerce and cultural values (Inbook-num chap)},
-  chapter =	{22},
-  year =	{2006},
-  address =	{Hershey, PA, USA},
-  publisher =	{IGI Publishing},
-  url =		{http://portal.acm.org/citation.cfm?id=887006.887010},
+  author =      {Kong, Wei-Chang},
+  editor =      {Theerasak Thanasankit},
+  title =       {E-commerce and cultural values (Inbook-num chap)},
+  chapter =     {22},
+  year =        {2006},
+  address =     {Hershey, PA, USA},
+  publisher =   {IGI Publishing},
+  url =         {http://portal.acm.org/citation.cfm?id=887006.887010},
   type =        {Chapter (in type field)},
-  pages =	{51--74},
-  numpages =	{24},
-  acmid =	{887010},
-  isbn =	{1-59140-056-2},
-  number = 	 "",
-  month = 	 "",
-  note = 	 "",
+  pages =       {51--74},
+  numpages =    {24},
+  acmid =       {887010},
+  isbn =        {1-59140-056-2},
+  number =      "",
+  month =       "",
+  note =        "",
 }
 
 
 % and incol coz we have a BLANK chapter - due to presence of editor
 %atIncollection{Kong:2006:IEC:887006.887011,
-%  author = 	{Kong, Wei-Chang},
-%  editor =	{Theerasak Thanasankit},
-%  title =       "The title"
-%  booktitle =	{E-commerce and cultural values (Incol-coz-blank-chap)},
-%  year =	{2006},
-%  address =	{Hershey, PA, USA},
-%  publisher =	{IGI Publishing},
-%  url =		{http://portal.acm.org/citation.cfm?id=887006.887010},
-%  type =        {Type!},
-%  chapter =	{},
-%  pages =	{51--74},
-%  numpages =	{24},
-%  acmid =	{887010},
-%  isbn =	{1-59140-056-2},
-%  number = 	 "",
-%  month = 	 "",
-%  note = 	 "",
+%  author =     {Kong, Wei-Chang},
+%  editor =     {Theerasak Thanasankit},
+%  title =      "The title"
+%  booktitle =  {E-commerce and cultural values (Incol-coz-blank-chap)},
+%  year =       {2006},
+%  address =    {Hershey, PA, USA},
+%  publisher =  {IGI Publishing},
+%  url =        {http://portal.acm.org/citation.cfm?id=887006.887010},
+%  type =       {Type!},
+%  chapter =    {},
+%  pages =      {51--74},
+%  numpages =   {24},
+%  acmid =      {887010},
+%  isbn =       {1-59140-056-2},
+%  number =     "",
+%  month =      "",
+%  note =       "",
 %}
 
 @article{SaeediMEJ10,
@@ -1201,7 +1201,7 @@
  acmid = {1243382},
  publisher = {Academic Press Ltd.},
  address = {London, UK, UK},
-} 
+}
 
 % incol due to presence of booktitle
 @incollection{Lee:1978:TQA:800025.1198348,
@@ -1233,7 +1233,7 @@
  acmid = {1241518},
  publisher = {Yourdon Press},
  address = {Upper Saddle River, NJ, USA},
-} 
+}
 
 % incol due to booktitle
 @incollection{Wenzel:1992:TVA:146022.146089,
@@ -1264,7 +1264,7 @@
  acmid = {54911},
  publisher = {John Wiley \& Sons, Inc.},
  address = {New York, NY, USA},
-} 
+}
 
 @book{McCracken:1990:SSC:575315,
  author = {McCracken, Daniel D. and Golden, Donald G.},
@@ -1273,7 +1273,7 @@
  isbn = {0471514071},
  publisher = {John Wiley \& Sons, Inc.},
  address = {New York, NY, USA},
-} 
+}
 
 % Let's include Boris / BBeeton entries  (multi-volume works)
 
@@ -1283,7 +1283,7 @@
     SERIES = {Grundlehren der Mathematischen Wissenschaften [Fundamental
               Principles of Mathematical Sciences]},
     VOLUME = {275},
-      NOTE = {Pseudodifferential operators},  
+      NOTE = {Pseudodifferential operators},
 PUBLISHER = {Springer-Verlag},
    ADDRESS = {Berlin, Germany},
       YEAR = {1985},
@@ -1300,7 +1300,7 @@
     SERIES = {Grundlehren der Mathematischen Wissenschaften [Fundamental
               Principles of Mathematical Sciences]},
     VOLUME = {275},
-      NOTE = {Fourier integral operators},  
+      NOTE = {Fourier integral operators},
 PUBLISHER = {Springer-Verlag},
    ADDRESS = {Berlin, Germany},
       YEAR = {1985},
@@ -1319,7 +1319,7 @@
   title         = {A multi-radio unification protocol for {IEEE} 802.11 wireless networks},
   booktitle     = {Proceedings of the IEEE 1st International Conference on Broadnets Networks (BroadNets'04)},
   publisher     = "IEEE",
-  address       = "Los Alamitos, CA",		  
+  address       = "Los Alamitos, CA",
   year          = {2004},
   pages         = "210--217"
 }
@@ -1349,7 +1349,7 @@
   title         = {{SSCH}: Slotted Seeded Channel Hopping for Capacity Improvement in {IEEE} 802.11 Ad-Hoc Wireless Networks},
   booktitle     = {Proceeding of the 10th International Conference on Mobile Computing and Networking (MobiCom'04)},
   publisher     = "ACM",
-  address       = "New York, NY",		  
+  address       = "New York, NY",
   year          = {2004},
   pages         = "112--117"
 }
@@ -1368,7 +1368,7 @@
   volume        = 37,
   number        = "8 (Special Issue on Sensor Networks)",
   publisher     = "IEEE",
-  address       = "Los Alamitos, CA",		  
+  address       = "Los Alamitos, CA",
   year          = {2004},
   pages         = "41--49"
 }
@@ -1386,7 +1386,7 @@
     booktitle   = {Network Architectures},
     editor      = {G. Whitcomb and P. Neece},
     publisher   = "Keleuven Press",
-    address     = "Dayton, OH",		  
+    address     = "Dayton, OH",
     year        = {2007},
     pages       = "322--328",
     eprint      = "960935712",
@@ -1406,7 +1406,7 @@
   author        = {G. Zhou and J. Lu and C.-Y. Wan and M. D. Yarvis and J. A. Stankovic},
   title         = {Body Sensor Networks},
   publisher     = "MIT Press",
-  address       = "Cambridge, MA",		  
+  address       = "Cambridge, MA",
   year          = {2008}
 }
 
@@ -1513,7 +1513,7 @@
 month = jan,
 year = 1980,
 publisher = "ACM",
-address = "New York",		  
+address = "New York",
 pages = "24--31"}
 
 @article{Zhou:2010:MMS:1721695.1721705,
@@ -1542,7 +1542,7 @@
   key =          {TUG},
   year  =        2017,
   title =        "Institutional members of the {\TeX} Users Group",
-  url =           "http://wwtug.org/instmem.html",
+  url =          "http://wwtug.org/instmem.html",
   lastaccessed = "May 27, 2017",
 }
 
@@ -1577,13 +1577,14 @@
 }
 
 @INPROCEEDINGS{clark:pct,
-	AUTHOR = "Malcolm Clark",
-	TITLE = "Post Congress Tristesse",
-	BOOKTITLE = "TeX90 Conference Proceedings",
-	PAGES = "84-89",
-	ORGANIZATION = "TeX Users Group",
-	MONTH = "March", 
-	YEAR = {1991}	}
+  AUTHOR = "Malcolm Clark",
+  TITLE = "Post Congress Tristesse",
+  BOOKTITLE = "TeX90 Conference Proceedings",
+  PAGES = "84-89",
+  ORGANIZATION = "TeX Users Group",
+  MONTH = "March",
+  YEAR = {1991}
+}
 
 @ARTICLE{herlihy:methodology,
     author = {Herlihy, Maurice},
@@ -1598,25 +1599,25 @@
 }
 
 @BOOK{salas:calculus,
-	AUTHOR = "S.L. Salas and Einar Hille",
-	TITLE = "Calculus: One and Several Variable",
-	PUBLISHER = "John Wiley and Sons",
-	ADDRESS = "New York",
-	YEAR = "1978"	}
+  AUTHOR = "S.L. Salas and Einar Hille",
+  TITLE = "Calculus: One and Several Variable",
+  PUBLISHER = "John Wiley and Sons",
+  ADDRESS = "New York",
+  YEAR = "1978"
+}
 
 @MANUAL{Fear05,
-  title = 	 {Publication quality tables in {\LaTeX}},
-  author =	 {Simon Fear},
-  month =	 {April},
-  year =	 2005,
-  note =	 {\url{http://www.ctan.org/pkg/booktabs}}
+  title =        {Publication quality tables in {\LaTeX}},
+  author =       {Simon Fear},
+  month =        {April},
+  year =         2005,
+  note =         {\url{http://www.ctan.org/pkg/booktabs}}
 }
 
 @Manual{Amsthm15,
-  title = 	 {Using the amsthm Package},
+  title =        {Using the amsthm Package},
   organization = {American Mathematical Society},
-  month =	 {April},
-  year =	 2015,
-  note =	 {\url{http://www.ctan.org/pkg/amsthm}}
+  month =        {April},
+  year =         2015,
+  note =         {\url{http://www.ctan.org/pkg/amsthm}}
 }
-

Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex	2017-12-16 21:29:01 UTC (rev 46077)
@@ -34,7 +34,7 @@
 \begin{document}
 % Title portion
 \title{A Multifrequency MAC Specially Designed for Wireless Sensor
-  Network Applications} 
+  Network Applications}
  \titlenote{This is a titlenote}
  \subtitle{This is a subtitle}
  \subtitlenote{Subtitle note}
@@ -56,11 +56,11 @@
   \country{France}
 }
 \email{beranger at inria.fr}
-\author{Aparna Patel} 
+\author{Aparna Patel}
 \affiliation{%
  \institution{Rajiv Gandhi University}
  \streetaddress{Rono-Hills}
- \city{Doimukh} 
+ \city{Doimukh}
  \state{Arunachal Pradesh}
  \country{India}}
 \email{aprna_patel at rguhs.ac.in}
@@ -68,7 +68,7 @@
 \affiliation{%
   \institution{Tsinghua University}
   \streetaddress{30 Shuangqing Rd}
-  \city{Haidian Qu} 
+  \city{Haidian Qu}
   \state{Beijing Shi}
   \country{China}
 }
@@ -131,7 +131,7 @@
 %
 % The code below should be generated by the tool at
 % http://dl.acm.org/ccs.cfm
-% Please copy and paste the code instead of the example below. 
+% Please copy and paste the code instead of the example below.
 %
 \begin{CCSXML}
 <ccs2012>
@@ -155,7 +155,7 @@
   <concept_desc>Networks~Network reliability</concept_desc>
   <concept_significance>100</concept_significance>
  </concept>
-</ccs2012>  
+</ccs2012>
 \end{CCSXML}
 
 \ccsdesc[500]{Computer systems organization~Embedded systems}

Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.tex	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.tex	2017-12-16 21:29:01 UTC (rev 46077)
@@ -21,7 +21,7 @@
 
 %Conference
 \acmConference[WOODSTOCK'97]{ACM Woodstock conference}{July 1997}{El
-  Paso, Texas USA} 
+  Paso, Texas USA}
 \acmYear{1997}
 \copyrightyear{2016}
 
@@ -37,8 +37,8 @@
 \affiliation{%
   \institution{University of Author}
   \city{Authortown}
-  \state{CA} 
-  \postcode{94022} 
+  \state{CA}
+  \postcode{94022}
   \country{USA} }
 \email{author1 at anotherco.edu}
 
@@ -46,7 +46,7 @@
 \affiliation{%
   \position{VP, Authoring}
   \institution{Authorship Holdings, Ltd.}
-  \city{Awdur} 
+  \city{Awdur}
   \postcode{SA22 8PP}
   \country{UK}}
 \email{author2 at author.ac.uk}
@@ -56,7 +56,7 @@
 \affiliation{%
   \institution{L\={e}khaka Labs}
   \city{Bengaluru} \postcode{560 080} \country{India}}
-\email{author3 at another.com} 
+\email{author3 at another.com}
 \email{author4 at another.com}
 
 \author{Fifth Author}
@@ -63,19 +63,19 @@
 \affiliation{\institution{YetAuthorCo, Inc.}
   \city{Authortown} \state{BC}
   \postcode{V6M 22P} \country{Canada}}
-\email{author5 at anotherco.com} 
+\email{author5 at anotherco.com}
 
 \author{Sixth Author}
 \affiliation{\institution{Universit\'e de Auteur-Sud}
   \city{Auteur} \postcode{40222} \country{France}}
-\email{author6 at author.fr} 
+\email{author6 at author.fr}
 
 \author{Seventh Author}
 \affiliation{\institution{University of Umbhali}
   \city{Pretoria} \country{South Africa}}
-\email{author7 at umbhaliu.ac.za} 
+\email{author7 at umbhaliu.ac.za}
 
-% The default list of authors is too long for headers}
+% The default list of authors is too long for headers.
 \renewcommand{\shortauthors}{F. Author et al.}
 
 
@@ -82,7 +82,7 @@
 %
 % The code below should be generated by the tool at
 % http://dl.acm.org/ccs.cfm
-% Please copy and paste the code instead of the example below. 
+% Please copy and paste the code instead of the example below.
 %
 \begin{CCSXML}
 <ccs2012>
@@ -106,7 +106,7 @@
   <concept_desc>Networks~Network reliability</concept_desc>
   <concept_significance>100</concept_significance>
  </concept>
-</ccs2012>  
+</ccs2012>
 \end{CCSXML}
 
 \ccsdesc[500]{Computer systems organization~Embedded systems}
@@ -134,16 +134,16 @@
 \maketitle
 
 \begin{sidebar}
-  \textbf{Good Utilization of the Side Bar} 
-  
+  \textbf{Good Utilization of the Side Bar}
+
   \textbf{Preparation:} Do not change the margin
   dimensions and do not flow the margin text to the
-  next page. 
-  
+  next page.
+
   \textbf{Materials:} The margin box must not intrude
   or overflow into the header or the footer, or the gutter space
-  between the margin paragraph and the main left column. 
-  
+  between the margin paragraph and the main left column.
+
   \textbf{Images \& Figures:} Practically anything
   can be put in the margin if it fits. Use the
   \texttt{{\textbackslash}marginparwidth} constant to set the
@@ -352,7 +352,7 @@
 For more information and links to instructions and resources, please
 see:
 \url{http://chi2016.acm.org/accessibility} and
-\url{http://tug.org/twg/accessibility/}.  
+\url{http://tug.org/twg/accessibility/}.
 
 
 \section{Producing and Testing PDF Files}
@@ -416,7 +416,7 @@
 book chapters~\cite{winner:politics}, an entire journal
 issue~\cite{kaye:puc},
 websites~\cite{acm_categories,cavender:writing},
-tweets~\cite{CHINOSAUR:venue}, patents~\cite{heilig:sensorama}, 
+tweets~\cite{CHINOSAUR:venue}, patents~\cite{heilig:sensorama},
 games~\cite{supermetroid:snes}, and
 online videos~\cite{psy:gangnam} is given here.  See the examples of
 citations at the end of this document and in the accompanying
@@ -432,7 +432,7 @@
 
 
 
-\bibliography{sigchi-a}
+\bibliography{sample-bibliography-sigchi-a}
 \bibliographystyle{ACM-Reference-Format}
 
 \end{document}

Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi.tex	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi.tex	2017-12-16 21:29:01 UTC (rev 46077)
@@ -23,7 +23,7 @@
 
 %Conference
 \acmConference[WOODSTOCK'97]{ACM Woodstock conference}{July 1997}{El
-  Paso, Texas USA} 
+  Paso, Texas USA}
 \acmYear{1997}
 \copyrightyear{2016}
 
@@ -44,8 +44,8 @@
 \affiliation{%
   \institution{Institute for Clarity in Documentation}
   \streetaddress{P.O. Box 1212}
-  \city{Dublin} 
-  \state{Ohio} 
+  \city{Dublin}
+  \state{Ohio}
   \postcode{43017-6221}
 }
 \email{trovato at corporation.com}
@@ -55,8 +55,8 @@
 \affiliation{%
   \institution{Institute for Clarity in Documentation}
   \streetaddress{P.O. Box 1212}
-  \city{Dublin} 
-  \state{Ohio} 
+  \city{Dublin}
+  \state{Ohio}
   \postcode{43017-6221}
 }
 \email{webmaster at marysville-ohio.com}
@@ -67,7 +67,7 @@
 \affiliation{%
   \institution{The Th{\o}rv{\"a}ld Group}
   \streetaddress{1 Th{\o}rv{\"a}ld Circle}
-  \city{Hekla} 
+  \city{Hekla}
   \country{Iceland}}
 \email{larst at affiliation.org}
 
@@ -77,11 +77,11 @@
   \city{Rocquencourt}
   \country{France}
 }
-\author{Aparna Patel} 
+\author{Aparna Patel}
 \affiliation{%
  \institution{Rajiv Gandhi University}
  \streetaddress{Rono-Hills}
- \city{Doimukh} 
+ \city{Doimukh}
  \state{Arunachal Pradesh}
  \country{India}}
 \author{Huifen Chan}
@@ -88,7 +88,7 @@
 \affiliation{%
   \institution{Tsinghua University}
   \streetaddress{30 Shuangqing Rd}
-  \city{Haidian Qu} 
+  \city{Haidian Qu}
   \state{Beijing Shi}
   \country{China}}
 
@@ -97,7 +97,7 @@
   \institution{Palmer Research Laboratories}
   \streetaddress{8600 Datapoint Drive}
   \city{San Antonio}
-  \state{Texas} 
+  \state{Texas}
   \postcode{78229}}
 \email{cpalmer at prl.com}
 
@@ -109,7 +109,7 @@
 \affiliation{\institution{The Kumquat Consortium}}
 \email{jpkumquat at consortium.net}
 
-% The default list of authors is too long for headers}
+% The default list of authors is too long for headers.
 \renewcommand{\shortauthors}{B. Trovato et al.}
 
 
@@ -116,13 +116,13 @@
 \begin{abstract}
 This paper provides a sample of a \LaTeX\ document which conforms,
 somewhat loosely, to the formatting guidelines for
-ACM SIG Proceedings. 
+ACM SIG Proceedings.
 \end{abstract}
 
 %
 % The code below should be generated by the tool at
 % http://dl.acm.org/ccs.cfm
-% Please copy and paste the code instead of the example below. 
+% Please copy and paste the code instead of the example below.
 %
 \begin{CCSXML}
 <ccs2012>
@@ -146,7 +146,7 @@
   <concept_desc>Networks~Network reliability</concept_desc>
   <concept_significance>100</concept_significance>
  </concept>
-</ccs2012>  
+</ccs2012>
 \end{CCSXML}
 
 \ccsdesc[500]{Computer systems organization~Embedded systems}
@@ -169,6 +169,6 @@
 \input{samplebody-conf}
 
 \bibliographystyle{ACM-Reference-Format}
-\bibliography{sample-bibliography} 
+\bibliography{sample-bibliography}
 
 \end{document}

Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.tex	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.tex	2017-12-16 21:29:01 UTC (rev 46077)
@@ -22,7 +22,7 @@
 
 %Conference
 \acmConference[WOODSTOCK'97]{ACM Woodstock conference}{July 1997}{El
-  Paso, Texas USA} 
+  Paso, Texas USA}
 \acmYear{1997}
 \copyrightyear{2016}
 
@@ -45,8 +45,8 @@
 \affiliation{%
   \institution{Institute for Clarity in Documentation}
   \streetaddress{P.O. Box 1212}
-  \city{Dublin} 
-  \state{Ohio} 
+  \city{Dublin}
+  \state{Ohio}
   \postcode{43017-6221}
 }
 \email{trovato at corporation.com}
@@ -56,8 +56,8 @@
 \affiliation{%
   \institution{Institute for Clarity in Documentation}
   \streetaddress{P.O. Box 1212}
-  \city{Dublin} 
-  \state{Ohio} 
+  \city{Dublin}
+  \state{Ohio}
   \postcode{43017-6221}
 }
 \email{webmaster at marysville-ohio.com}
@@ -68,7 +68,7 @@
 \affiliation{%
   \institution{The Th{\o}rv{\"a}ld Group}
   \streetaddress{1 Th{\o}rv{\"a}ld Circle}
-  \city{Hekla} 
+  \city{Hekla}
   \country{Iceland}}
 \email{larst at affiliation.org}
 
@@ -82,7 +82,7 @@
 \affiliation{%
   \institution{NASA Ames Research Center}
   \city{Moffett Field}
-  \state{California} 
+  \state{California}
   \postcode{94035}}
 \email{fogartys at amesres.org}
 
@@ -91,7 +91,7 @@
   \institution{Palmer Research Laboratories}
   \streetaddress{8600 Datapoint Drive}
   \city{San Antonio}
-  \state{Texas} 
+  \state{Texas}
   \postcode{78229}}
 \email{cpalmer at prl.com}
 
@@ -103,7 +103,7 @@
 \affiliation{\institution{The Kumquat Consortium}}
 \email{jpkumquat at consortium.net}
 
-% The default list of authors is too long for headers}
+% The default list of authors is too long for headers.
 \renewcommand{\shortauthors}{B. Trovato et al.}
 
 
@@ -116,7 +116,7 @@
 %
 % The code below should be generated by the tool at
 % http://dl.acm.org/ccs.cfm
-% Please copy and paste the code instead of the example below. 
+% Please copy and paste the code instead of the example below.
 %
 \begin{CCSXML}
 <ccs2012>
@@ -140,7 +140,7 @@
   <concept_desc>Networks~Network reliability</concept_desc>
   <concept_significance>100</concept_significance>
  </concept>
-</ccs2012>  
+</ccs2012>
 \end{CCSXML}
 
 \ccsdesc[500]{Computer systems organization~Embedded systems}
@@ -157,6 +157,6 @@
 \input{samplebody-conf}
 
 \bibliographystyle{ACM-Reference-Format}
-\bibliography{sample-bibliography} 
+\bibliography{sample-bibliography}
 
 \end{document}

Added: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf-biblatex.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf-biblatex.tex	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf-biblatex.tex	2017-12-16 21:29:01 UTC (rev 46077)
@@ -0,0 +1,185 @@
+\documentclass[sigconf,natbib=false]{acmart}
+
+%drt24 hacks
+% Letter paper
+\setlength{\paperheight}{11in}
+\setlength{\paperwidth}{8.5in}
+
+% Hack to try to make acmart work with biblatex: https://tex.stackexchange.com/questions/37076/is-it-possible-to-load-biblatex-with-a-class-that-has-already-loaded-natbib
+\let\citename\relax
+\RequirePackage[abbreviate=true, dateabbrev=true, isbn=true, doi=true, urldate=comp, url=true, maxbibnames=9, backref=false, backend=biber, style=ACM-Reference-Format, language=american]{biblatex}
+
+
+
+
+\addbibresource{sample-bibliography-biblatex.bib}
+\renewcommand{\bibfont}{\Small}
+
+
+\usepackage{booktabs} % For formal tables
+
+
+% Copyright
+%\setcopyright{none}
+%\setcopyright{acmcopyright}
+%\setcopyright{acmlicensed}
+\setcopyright{rightsretained}
+%\setcopyright{usgov}
+%\setcopyright{usgovmixed}
+%\setcopyright{cagov}
+%\setcopyright{cagovmixed}
+
+
+% DOI
+\acmDOI{10.475/123_4}
+
+% ISBN
+\acmISBN{123-4567-24-567/08/06}
+
+%Conference
+\acmConference[WOODSTOCK'97]{ACM Woodstock conference}{July 1997}{El
+  Paso, Texas USA}
+\acmYear{1997}
+\copyrightyear{2016}
+
+\acmPrice{15.00}
+
+
+\begin{document}
+\title{SIG Proceedings Paper in LaTeX Format}
+\titlenote{Produces the permission block, and
+  copyright information}
+\subtitle{Extended Abstract}
+\subtitlenote{The full version of the author's guide is available as
+  \texttt{acmart.pdf} document}
+
+
+\author{Ben Trovato}
+\authornote{Dr.~Trovato insisted his name be first.}
+\orcid{1234-5678-9012}
+\affiliation{%
+  \institution{Institute for Clarity in Documentation}
+  \streetaddress{P.O. Box 1212}
+  \city{Dublin}
+  \state{Ohio}
+  \postcode{43017-6221}
+}
+\email{trovato at corporation.com}
+
+\author{G.K.M. Tobin}
+\authornote{The secretary disavows any knowledge of this author's actions.}
+\affiliation{%
+  \institution{Institute for Clarity in Documentation}
+  \streetaddress{P.O. Box 1212}
+  \city{Dublin}
+  \state{Ohio}
+  \postcode{43017-6221}
+}
+\email{webmaster at marysville-ohio.com}
+
+\author{Lars Th{\o}rv{\"a}ld}
+\authornote{This author is the
+  one who did all the really hard work.}
+\affiliation{%
+  \institution{The Th{\o}rv{\"a}ld Group}
+  \streetaddress{1 Th{\o}rv{\"a}ld Circle}
+  \city{Hekla}
+  \country{Iceland}}
+\email{larst at affiliation.org}
+
+\author{Valerie B\'eranger}
+\affiliation{%
+  \institution{Inria Paris-Rocquencourt}
+  \city{Rocquencourt}
+  \country{France}
+}
+\author{Aparna Patel}
+\affiliation{%
+ \institution{Rajiv Gandhi University}
+ \streetaddress{Rono-Hills}
+ \city{Doimukh}
+ \state{Arunachal Pradesh}
+ \country{India}}
+\author{Huifen Chan}
+\affiliation{%
+  \institution{Tsinghua University}
+  \streetaddress{30 Shuangqing Rd}
+  \city{Haidian Qu}
+  \state{Beijing Shi}
+  \country{China}
+}
+
+\author{Charles Palmer}
+\affiliation{%
+  \institution{Palmer Research Laboratories}
+  \streetaddress{8600 Datapoint Drive}
+  \city{San Antonio}
+  \state{Texas}
+  \postcode{78229}}
+\email{cpalmer at prl.com}
+
+\author{John Smith}
+\affiliation{\institution{The Th{\o}rv{\"a}ld Group}}
+\email{jsmith at affiliation.org}
+
+\author{Julius P.~Kumquat}
+\affiliation{\institution{The Kumquat Consortium}}
+\email{jpkumquat at consortium.net}
+
+% The default list of authors is too long for headers}
+\renewcommand{\shortauthors}{B. Trovato et al.}
+
+
+\begin{abstract}
+This paper provides a sample of a \LaTeX\ document which conforms,
+somewhat loosely, to the formatting guidelines for
+ACM SIG Proceedings.\footnote{This is an abstract footnote}
+\end{abstract}
+
+%
+% The code below should be generated by the tool at
+% http://dl.acm.org/ccs.cfm
+% Please copy and paste the code instead of the example below.
+%
+\begin{CCSXML}
+<ccs2012>
+ <concept>
+  <concept_id>10010520.10010553.10010562</concept_id>
+  <concept_desc>Computer systems organization~Embedded systems</concept_desc>
+  <concept_significance>500</concept_significance>
+ </concept>
+ <concept>
+  <concept_id>10010520.10010575.10010755</concept_id>
+  <concept_desc>Computer systems organization~Redundancy</concept_desc>
+  <concept_significance>300</concept_significance>
+ </concept>
+ <concept>
+  <concept_id>10010520.10010553.10010554</concept_id>
+  <concept_desc>Computer systems organization~Robotics</concept_desc>
+  <concept_significance>100</concept_significance>
+ </concept>
+ <concept>
+  <concept_id>10003033.10003083.10003095</concept_id>
+  <concept_desc>Networks~Network reliability</concept_desc>
+  <concept_significance>100</concept_significance>
+ </concept>
+</ccs2012>
+\end{CCSXML}
+
+\ccsdesc[500]{Computer systems organization~Embedded systems}
+\ccsdesc[300]{Computer systems organization~Redundancy}
+\ccsdesc{Computer systems organization~Robotics}
+\ccsdesc[100]{Networks~Network reliability}
+
+
+\keywords{ACM proceedings, \LaTeX, text tagging}
+
+
+\maketitle
+
+\input{samplebody-conf}
+
+\printbibliography
+
+
+\end{document}


Property changes on: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf-biblatex.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf.tex	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf.tex	2017-12-16 21:29:01 UTC (rev 46077)
@@ -22,7 +22,7 @@
 
 %Conference
 \acmConference[WOODSTOCK'97]{ACM Woodstock conference}{July 1997}{El
-  Paso, Texas USA} 
+  Paso, Texas USA}
 \acmYear{1997}
 \copyrightyear{2016}
 
@@ -52,8 +52,8 @@
 \affiliation{%
   \institution{Institute for Clarity in Documentation}
   \streetaddress{P.O. Box 1212}
-  \city{Dublin} 
-  \state{Ohio} 
+  \city{Dublin}
+  \state{Ohio}
   \postcode{43017-6221}
 }
 \email{trovato at corporation.com}
@@ -63,8 +63,8 @@
 \affiliation{%
   \institution{Institute for Clarity in Documentation}
   \streetaddress{P.O. Box 1212}
-  \city{Dublin} 
-  \state{Ohio} 
+  \city{Dublin}
+  \state{Ohio}
   \postcode{43017-6221}
 }
 \email{webmaster at marysville-ohio.com}
@@ -75,7 +75,7 @@
 \affiliation{%
   \institution{The Th{\o}rv{\"a}ld Group}
   \streetaddress{1 Th{\o}rv{\"a}ld Circle}
-  \city{Hekla} 
+  \city{Hekla}
   \country{Iceland}}
 \email{larst at affiliation.org}
 
@@ -85,11 +85,11 @@
   \city{Rocquencourt}
   \country{France}
 }
-\author{Aparna Patel} 
+\author{Aparna Patel}
 \affiliation{%
  \institution{Rajiv Gandhi University}
  \streetaddress{Rono-Hills}
- \city{Doimukh} 
+ \city{Doimukh}
  \state{Arunachal Pradesh}
  \country{India}}
 \author{Huifen Chan}
@@ -96,7 +96,7 @@
 \affiliation{%
   \institution{Tsinghua University}
   \streetaddress{30 Shuangqing Rd}
-  \city{Haidian Qu} 
+  \city{Haidian Qu}
   \state{Beijing Shi}
   \country{China}
 }
@@ -106,7 +106,7 @@
   \institution{Palmer Research Laboratories}
   \streetaddress{8600 Datapoint Drive}
   \city{San Antonio}
-  \state{Texas} 
+  \state{Texas}
   \postcode{78229}}
 \email{cpalmer at prl.com}
 
@@ -118,7 +118,7 @@
 \affiliation{\institution{The Kumquat Consortium}}
 \email{jpkumquat at consortium.net}
 
-% The default list of authors is too long for headers}
+% The default list of authors is too long for headers.
 \renewcommand{\shortauthors}{B. Trovato et al.}
 
 
@@ -131,7 +131,7 @@
 %
 % The code below should be generated by the tool at
 % http://dl.acm.org/ccs.cfm
-% Please copy and paste the code instead of the example below. 
+% Please copy and paste the code instead of the example below.
 %
 \begin{CCSXML}
 <ccs2012>
@@ -155,7 +155,7 @@
   <concept_desc>Networks~Network reliability</concept_desc>
   <concept_significance>100</concept_significance>
  </concept>
-</ccs2012>  
+</ccs2012>
 \end{CCSXML}
 
 \ccsdesc[500]{Computer systems organization~Embedded systems}
@@ -172,6 +172,6 @@
 \input{samplebody-conf}
 
 \bibliographystyle{ACM-Reference-Format}
-\bibliography{sample-bibliography} 
+\bibliography{sample-bibliography}
 
 \end{document}

Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex	2017-12-16 21:29:01 UTC (rev 46077)
@@ -22,7 +22,7 @@
 
 %Conference
 \acmConference[WOODSTOCK'97]{ACM Woodstock conference}{July 1997}{El
-  Paso, Texas USA} 
+  Paso, Texas USA}
 \acmYear{1997}
 \copyrightyear{2016}
 
@@ -46,8 +46,8 @@
 \affiliation{%
   \institution{Institute for Clarity in Documentation}
   \streetaddress{P.O. Box 1212}
-  \city{Dublin} 
-  \state{Ohio} 
+  \city{Dublin}
+  \state{Ohio}
   \postcode{43017-6221}
 }
 \email{trovato at corporation.com}
@@ -57,8 +57,8 @@
 \affiliation{%
   \institution{Institute for Clarity in Documentation}
   \streetaddress{P.O. Box 1212}
-  \city{Dublin} 
-  \state{Ohio} 
+  \city{Dublin}
+  \state{Ohio}
   \postcode{43017-6221}
 }
 \email{webmaster at marysville-ohio.com}
@@ -69,7 +69,7 @@
 \affiliation{%
   \institution{The Th{\o}rv{\"a}ld Group}
   \streetaddress{1 Th{\o}rv{\"a}ld Circle}
-  \city{Hekla} 
+  \city{Hekla}
   \country{Iceland}}
 \email{larst at affiliation.org}
 
@@ -79,11 +79,11 @@
   \city{Rocquencourt}
   \country{France}
 }
-\author{Aparna Patel} 
+\author{Aparna Patel}
 \affiliation{%
  \institution{Rajiv Gandhi University}
  \streetaddress{Rono-Hills}
- \city{Doimukh} 
+ \city{Doimukh}
  \state{Arunachal Pradesh}
  \country{India}}
 \author{Huifen Chan}
@@ -90,7 +90,7 @@
 \affiliation{%
   \institution{Tsinghua University}
   \streetaddress{30 Shuangqing Rd}
-  \city{Haidian Qu} 
+  \city{Haidian Qu}
   \state{Beijing Shi}
   \country{China}}
 
@@ -99,7 +99,7 @@
   \institution{Palmer Research Laboratories}
   \streetaddress{8600 Datapoint Drive}
   \city{San Antonio}
-  \state{Texas} 
+  \state{Texas}
   \postcode{78229}}
 \email{cpalmer at prl.com}
 
@@ -112,7 +112,7 @@
 \email{jpkumquat at consortium.net}
 
 
-% The default list of authors is too long for headers}
+% The default list of authors is too long for headers.
 \renewcommand{\shortauthors}{B. Trovato et al.}
 
 
@@ -119,13 +119,13 @@
 \begin{abstract}
 This paper provides a sample of a \LaTeX\ document which conforms,
 somewhat loosely, to the formatting guidelines for
-ACM SIG Proceedings. 
+ACM SIG Proceedings.
 \end{abstract}
 
 %
 % The code below should be generated by the tool at
 % http://dl.acm.org/ccs.cfm
-% Please copy and paste the code instead of the example below. 
+% Please copy and paste the code instead of the example below.
 %
 \begin{CCSXML}
 <ccs2012>
@@ -149,7 +149,7 @@
   <concept_desc>Networks~Network reliability</concept_desc>
   <concept_significance>100</concept_significance>
  </concept>
-</ccs2012>  
+</ccs2012>
 \end{CCSXML}
 
 \ccsdesc[500]{Computer systems organization~Embedded systems}
@@ -172,6 +172,6 @@
 \input{samplebody-conf}
 
 \bibliographystyle{ACM-Reference-Format}
-\bibliography{sample-bibliography} 
+\bibliography{sample-bibliography}
 
 \end{document}

Modified: trunk/Master/texmf-dist/doc/latex/acmart/samplebody-conf.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/samplebody-conf.tex	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/doc/latex/acmart/samplebody-conf.tex	2017-12-16 21:29:01 UTC (rev 46077)
@@ -145,9 +145,9 @@
 \cite{MR781536} and \cite{MR781537}.
 
 A couple of citations with DOIs: \cite{2004:ITE:1009386.1010128,
-  Kirschmer:2010:AEI:1958016.1958018}. 
+  Kirschmer:2010:AEI:1958016.1958018}.
 
-Online citations: \cite{TUGInstmem, Thornburg01, CTANacmart}.  
+Online citations: \cite{TUGInstmem, Thornburg01, CTANacmart}.
 
 
 \subsection{Tables}
@@ -370,7 +370,7 @@
 
 \begin{acks}
   The authors would like to thank Dr. Yuhua Li for providing the
-  matlab code of  the \textit{BEPS} method. 
+  MATLAB code of the \textit{BEPS} method.
 
   The authors would also like to thank the anonymous referees for
   their valuable comments and helpful suggestions. The work is
@@ -378,7 +378,7 @@
     Science Foundation of
     China}{http://dx.doi.org/10.13039/501100001809} under Grant
   No.:~\grantnum{GS501100001809}{61273304}
-  and~\grantnum[http://www.nnsf.cn/youngscientsts]{GS501100001809}{Young
-    Scientsts' Support Program}.
+  and~\grantnum[http://www.nnsf.cn/youngscientists]{GS501100001809}{Young
+    Scientists' Support Program}.
 
 \end{acks}

Modified: trunk/Master/texmf-dist/doc/latex/acmart/samplebody-journals.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/samplebody-journals.tex	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/doc/latex/acmart/samplebody-journals.tex	2017-12-16 21:29:01 UTC (rev 46077)
@@ -1,4 +1,3 @@
-
 \section{Introduction}
 
 
@@ -80,7 +79,7 @@
 protocols based on those similar to \cite{Akyildiz-01} and
 \cite{Adya-01}.} for frequency negotiation and reservation are not
 suitable for WSN applications, even though they exhibit good
-performance in general wireless ad hoc
+performance in general wireless ad-hoc
 networks.
 
 % Head 3
@@ -230,7 +229,7 @@
 
 \section{Performance Evaluation}
 
-During all the experiments, the Geographic Forwarding (GF) by Akuilidz
+During all the experiments, the Geographic Forwarding (GF) by Akyildiz
 et al.~\shortcite{Akyildiz-01} routing protocol is used. GF exploits
 geographic information of nodes and conducts local data-forwarding to
 achieve end-to-end routing. Our simulation is configured according to
@@ -307,9 +306,9 @@
 \cite{MR781536} and \cite{MR781537}.
 
 A couple of citations with DOIs: \cite{2004:ITE:1009386.1010128,
-  Kirschmer:2010:AEI:1958016.1958018}. 
+  Kirschmer:2010:AEI:1958016.1958018}.
 
-Online citations: \cite{TUGInstmem, Thornburg01, CTANacmart}.  
+Online citations: \cite{TUGInstmem, Thornburg01, CTANacmart}.
 
 % Appendix
 \appendix
@@ -361,7 +360,7 @@
 reduce idle listening is executing low duty-cycle on nodes. Two
 primary approaches are considered in controlling duty-cycles in the
 MAC layer.
-  
+
 \end{screenonly}
 
 \begin{acks}
@@ -373,8 +372,8 @@
   Natural Science Foundation of
   China}{http://dx.doi.org/10.13039/501100001809} under Grant
 No.:~\grantnum{GS501100001809}{61273304\_a}
-and~\grantnum[http://www.nnsf.cn/youngscientsts]{GS501100001809}{Young
-  Scientsts' Support Program}.
+and~\grantnum[http://www.nnsf.cn/youngscientists]{GS501100001809}{Young
+  Scientists' Support Program}.
 
 
 \end{acks}

Deleted: trunk/Master/texmf-dist/doc/latex/acmart/sigchi-a.bib
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sigchi-a.bib	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sigchi-a.bib	2017-12-16 21:29:01 UTC (rev 46077)
@@ -1,164 +0,0 @@
- at Misc{CHINOSAUR:venue,
-  author =       {@\_CHINOSAUR},
-  key =          {_CHINOSAUR},
-  howpublished = {Tweet},
-  title =        {"VENUE IS TOO COLD" \#BINGO \#CHI2014},
-  month =        {May},
-  day =          1,
-  year =         2014,
-  note =         {Retrieved Febuary 2, 2015 from
-                  \url{https://twitter.com/_CHINOSAUR/status/461864317415989248}},
-  annote =       {Tweet}
-}
-
- at misc{supermetroid:snes,
-	Address = {Kyoto, Japan},
-	Author = {{Nintendo R\&D1} and {Intelligent Systems}},
-	Day = {18},
-	Howpublished = {Game [SNES]},
-	Month = {April},
-	Note = {Nintendo, Kyoto, Japan. Played August 2011.},
-	Publisher = {Nintendo},
-	Title = {\emph{Super Metroid}},
-	Year = {1994}
-}
-
- at inproceedings{Klemmer:2002:WSC:503376.503378,
-  author =       {Klemmer, Scott R. and Thomsen, Michael and
-                  Phelps-Goodman, Ethan and Lee, Robert and Landay,
-                  James A.},
-  title =        {Where Do Web Sites Come from?: Capturing and
-                  Interacting with Design History},
-  booktitle =    {Proceedings of the SIGCHI Conference on Human
-                  Factors in Computing Systems},
-  series =       {CHI '02},
-  year =         2002,
-  isbn =         {1-58113-453-3},
-  location =     {Minneapolis, Minnesota, USA},
-  pages =        {1--8},
-  url =          {http://doi.acm.org/10.1145/503376.503378},
-  doi =          {10.1145/503376.503378},
-  acmid =        503378,
-  publisher =    {ACM},
-  address =      {New York, NY, USA},
-  keywords =     {CSCW, activity capture, design rationale, history
-                  management, informal interfaces, sketching, tangible
-                  UI, web design},
-}
-
- at inproceedings{Mather:2000:MUT,
-  title =        {Making up titles for conference papers},
-  author =       {Mather, B. D.},
-  booktitle =    {Ext. Abstracts CHI 2000},
-  year =         2000,
-  publisher =    "ACM Press",
-  pages =        "1-2",
-}
-
- at book{Schwartz:1995:GBF,
-  title =        {Guidelines for Bias-Free Writing},
-  author =       {Marilyn Schwartz},
-  address =      {Bloomington, IN, USA},
-  year =         1995,
-  publisher =    {ERIC}
-}
-
- at inproceedings{Zellweger:2001:FAO:504216.504224,
-  author =       {Zellweger, Polle T. and Bouvin, Niels Olof and
-                  Jeh{\o}j, Henning and Mackinlay, Jock D.},
-  title =        {Fluid annotations in an open world},
-  booktitle =    {Proc. Hypertext 2001},
-  year =         2001,
-  pages =        {9--18},
-  publisher =    {ACM Press},
-}
-
- at misc{acm_categories,
-  key =          "ACM",
-  author =       {ACM},
-  title =        {How to Classify Works Using ACM's Computing
-                  Classification System},
-  year =         1998,
-  note =         {\url{http://www.acm.org/class/how_to_use.html}},
-}
-
- at Misc{cavender:writing,
-  author =       {Anna Cavender and Shari Trewin and Vicki Hanson},
-  title =        {Accessible Writing Guide},
-  year =         2014,
-  day =          22,
-  note =
-                  {\url{http://www.sigaccess.org/welcome-to-sigaccess/resources/accessible-writing-guide/}},
-  annote =       {URL}
-}
-
- at article{ethics,
-  title =        {{Social Impacts of Computing: Codes of Professional
-                  Ethics}},
-  author =       {R. E. Anderson},
-  doi =          "10.1177/089443939201000402",
-  journal =      "Social Science Computer Review December",
-  year =         1992,
-  volume =       10,
-  number =       4,
-  pages =        "453-469"
-}
-
- at Misc{heilig:sensorama,
-  author =       {Morton L. Heilig},
-  title =        {Sensorama Simulator},
-  howpublished = {U.S. Patent 3,050,870},
-  month =        {August},
-  day =          28,
-  year =         1962,
-  note =         {Filed Februrary 22, 1962.},
-  annote =       {is this right?}
-},
-
- at article{kaye:puc,
-  year =         2014,
-  issn =         {1617-4909},
-  journal =      {Personal and Ubiquitous Computing},
-  volume =       18,
-  number =       4,
-  doi =          {10.1007/s00779-014-0773-4},
-  title =        {Special issue on science fiction and ubiquitous
-                  computing},
-  url =          {http://dx.doi.org/10.1007/s00779-014-0773-4},
-  publisher =    {Springer London},
-  author =       {Kaye, Jofish and Dourish, Paul},
-  pages =        {765-766},
-  language =     {English}
-}
-
- at Misc{psy:gangnam,
-  author =       {Psy},
-  title =        {Gangnam Style},
-  howpublished = {Video},
-  month =        {July},
-  day =          15,
-  year =         2012,
-  note =         {Retrieved August 22, 2014 from
-                  \url{https://www.youtube.com/watch?v=9bZkp7q19f0}},
-  annote =       {Video URL}
-}
-
- at PhdThesis{sutherland:sketchpad,
-  author =       {Ivan E. Sutherland},
-  title =        {Sketchpad, a Man-Machine Graphical Communication
-                  System},
-  school =       {Massachusetts Institute of Technology},
-  year =         1963,
-  address =      {Cambridge, MA},
-}
-
- at InBook{winner:politics,
-  author =       {Langdon Winner},
-  title =        {The Social Shaping of Technology},
-  chapter =      {Do artifacts have politics?},
-  publisher =    {Open University Press},
-  year =         1999,
-  address =      {UK},
-  edition =      {2nd},
-  pages =        {28--40},
-}

Modified: trunk/Master/texmf-dist/source/latex/acmart/acmart.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/acmart/acmart.dtx	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/source/latex/acmart/acmart.dtx	2017-12-16 21:29:01 UTC (rev 46077)
@@ -57,8 +57,7 @@
 %
 % \ifx\currentjob\guide\OnlyDescription\fi
 % \GetFileInfo{acmart.dtx}
-% \newcommand{\progname}[1]{\textsf{#1}}
-% \title{\LaTeX{} Class for \emph{Association for Computing
+% \title{\LaTeX{} Class for the \emph{Association for Computing
 % Machinery}\thanks{\copyright 2016--2017, Association for Computing Machinery}}
 % \author{Boris Veytsman\thanks{%
 % \href{mailto:borisv at lk.net}{\texttt{borisv at lk.net}},
@@ -67,39 +66,40 @@
 % \maketitle
 % \begin{abstract}
 %   This package provides a class for typesetting publications of
-%   Association for Computing Machinery.
+%   the Association for Computing Machinery.
 % \end{abstract}
 % \tableofcontents
 %
 % \clearpage
-% 
+%
 %\section{Introduction}
 %\label{sec:intro}
 %
-% Association for Computing Machinery is the world's largest
+% The Association for Computing
+% Machinery\footnote{\url{http://www.acm.org/}} is the world's largest
 % educational and scientific computing society, which delivers
 % resources that advance computing as a science and a
-% profession\footnote{\url{http://www.acm.org/}}.  It was one of the
+% profession.  It was one of the
 % early adopters of \TeX\ for its typesetting.
 %
-% It provided several different classes for a number of journal and
+% It provided several different classes for a number of journals and
 % conference proceedings.  Unfortunately during the years since these
-% classes were written, the code was patched many times, and the
-% support of the different versions of the classes became difficult.
+% classes were written, the code was patched many times, and
+% supporting different versions of the classes became difficult.
 %
 % This package provides the uniform interface for all ACM
-% publications.  It is intended to replace all different classes and
-% packages and provide an up to date \LaTeX\ package.
+% publications.  It is intended to replace all the different classes and
+% packages and provide an up-to-date \LaTeX\ package.
 %
-% The package uses only free \TeX\ packages and fonts included in \TeX
+% This package uses only free \TeX\ packages and fonts included in \TeX
 % Live, Mik\TeX\ and other popular \TeX\ distributions.  It is
 % intended to be published in these distributions itself, which
-% minimizes users' efforts in the installation and support of the
+% minimizes users' efforts in the installation and support of this
 % package.
 %
 %  I am grateful to
 %  Michael D.~Adams,
-%  Leif Andersen, 
+%  Leif Andersen,
 %  Dirk Beyer,
 %  Benjamin Byholm,
 %  Michael Ekstrand,
@@ -106,33 +106,38 @@
 %  Matthew Fluet,
 %  Paolo G.~Giarrusso,
 %  Ben Greenman,
+%  Jamie Davis,
 %  LianTze Lim,
 %  Ben Liblit,
 %  Kai Mindermann,
-%  Frank Mittelbach, 
+%  Frank Mittelbach,
+%  Serguei Mokhov,
 %  Ross Moore,
 %  John Owens,
-%  Joel Nider, 
+%  Joel Nider,
 %  Tobias Pape,
-%  Mathias Rav, 
-%  Matteo Riondato, 
+%  Mathias Rav,
+%  Andreas Reichinger,
+%  Matteo Riondato,
 %  Craig Rodkin,
 %  Bernard Rous,
 %  David Shamma,
 %  Stephen Spencer,
-%  John Wickerson, 
+%  Daniel Thomas,
+%  Zack Weinberg,
+%  John Wickerson
 %  and many others for their invaluable help.
 %
 % The development version of the package is available at
-% \url{https://github.com/borisveytsman/acmart}. 
+% \url{https://github.com/borisveytsman/acmart}.
 %
 %\section{User's guide}
 %\label{sec:ug}
 %
 %
-% The class uses many commands and customizaton options, so it might
+% This class uses many commands and customizaton options, so it might
 % appear intimidating for a casual user.  Do not panic!  Many of these
-% commands and options can be safely left with their default values,
+% commands and options can be safely left with their default values
 % or the values recommended by your conference or journal editors.  If
 % you have problems or questions, do not hesitate to ask me directly
 % or the community at \url{https://github.com/borisveytsman/acmart},
@@ -146,32 +151,33 @@
 %
 % Most probably, you already have this package installed in your
 % favorite \TeX\ distribution;  if not, you may want to upgrade.  You
-% may need to upgrade it anyway since the package uses a number of
-% relatively recent packages, especially the ones related to the
-% fonts.
+% may need to upgrade it anyway since this package uses a number of
+% relatively recent packages, especially the ones related to fonts.
 %
-% The latest released version of the package can be found on CTAN:
+% The latest released version of this package can be found on CTAN:
 % \url{https://www.ctan.org/pkg/acmart}.   The development version can
 % be found on GitHub: \url{https://github.com/borisveytsman/acmart}.
 % At this address you can file a bug report---or even contribute your
-% own enhancement making a pull request.
+% own enhancement by making a pull request.
 %
+% Please note that the version on Github is a development (or
+% experimental) version: please download it for testing new features.
+% The production version is the one on CTAN and ACM sites.  
 %
-% Most users should not attempt to install this package themselves,
-% and rather rely on their \TeX\ distributions to provide it.  If you
+% Most users should not attempt to install this package themselves
+% but should rather rely on their \TeX\ distributions to provide it.  If you
 % decide to install the package yourself, follow the standard rules:
 % \begin{enumerate}
-% \item Run \progname{latex} on |acmart.ins|.  This will produce the file
+% \item Run |latex acmart.ins|.  This will produce the file
 % |acmart.cls|
-% \item Put the file |acmart.cls|
-%   and the bibliography files |*.bst|
-%   to the places where \LaTeX{} can find them (see \cite{TeXFAQ} or
+% \item Put the files |acmart.cls| and |ACM-Reference-Format.bst|
+%   in places where \LaTeX{} can find them (see \cite{TeXFAQ} or
 %   the documentation for your \TeX{} system).\label{item:install}
 % \item Update the database of file names.  Again, see \cite{TeXFAQ}
 % or the documentation for your \TeX{} system for the system-specific
 % details.\label{item:update}
 % \item The file |acmart.pdf| provides the documentation for the
-% package (this is the file you are probably reading now).
+% package.  (This is probably the file you are reading now.)
 % \end{enumerate}
 % As an alternative to items~\ref{item:install} and~\ref{item:update}
 % you can just put the files in the working directory where your
@@ -178,7 +184,7 @@
 % |.tex| file is.
 %
 %
-% The class uses a number of other packages.  They are included in all
+% This class uses a number of other packages.  They are included in all
 % major \TeX\ distributions (\TeX Live, Mac\TeX, Mik\TeX) of 2015 and
 % later, so you probably have them installed.  Just in case here is
 % the list of these packages:
@@ -225,18 +231,18 @@
 % \item \textsl{xkeyval}, \url{http://www.ctan.org/pkg/xkeyval}
 % \item \textsl{xstring}, \url{http://www.ctan.org/pkg/xstring}
 % \end{itemize}
-% 
 %
+%
 %\subsection{Invocation and options}
 %\label{sec:invocation}
 %
-% To use the class put in the preamble of your document
+% To use this class, put in the preamble of your document
 % \begin{quote}
 %   \cs{documentclass}\oarg{options}|{acmart}|
 % \end{quote}
 % There are several options corresponding to the type of the document and
 % its general appearance.  They are described below.  Generally
-% speaking, the options have |key=value| forms, for example
+% speaking, the options have |key=value| forms, for example,
 % \begin{verbatim}
 % \documentclass[format=acmsmall, screen=true, review=false]{acmart}
 % \end{verbatim}
@@ -254,12 +260,12 @@
 % The possible formats are listed in
 % Table~\ref{tab:opts_format}.  Note that formats starting with |acm|
 % are intended for journals and transactions, while formats starting
-% with |sig| are intended for proceedings published as books.  
+% with |sig| are intended for proceedings published as books.
 %
 % Note that sometimes conference proceedings are published as a
-% special issue (or issues) of an ACM journal.  In this case you
+% special issue (or issues) of an ACM journal.  In this case, you
 % should use the journal format for a conference paper.  Please
-% contact your conference committee if in doubt.  
+% contact your conference committee if in doubt.
 %
 % \begin{table}
 %   \centering
@@ -269,71 +275,68 @@
 %     \toprule
 %     \normalfont Value & Meaning\\
 %     \midrule
-%     manuscript  & A manuscript. This is the default \\
-%   acmsmall & Small single column format, used for CIE, CSUR, JACM, JDIQ, JEA, JERIC,
+%   manuscript & A manuscript. This is the default. \\
+%   acmsmall & Small single-column format.  Used for CIE, CSUR, JACM, JDIQ, JEA, JERIC,
 %            JETC, PACMHCI, PACMPL, TAAS, TACCESS, TACO, TALG, TALLIP (formerly TALIP), TCPS,
 %            TEAC, TECS, THRI, TIIS, TISSEC, TIST, TKDD, TMIS, TOCE, TOCHI, TOCL,
 %            TOCS, TOCT, TODAES, TODS, TOIS, TOIT, TOMACS, TOMM (formerly
 %            TOMCCAP), TOMPECS, TOMS, TOPC, TOPLAS, TOPS,
 %            TOS, TOSEM, TOSN, TRETS,
-%            TSAS, TSC, TSLP, TWEB, including special issues. \\
-%           acmlarge  & Large single column format, used for
-%           IMWUT, JOCCH, POMACS, TAP, including special issues. \\
-%            acmtog   & Large double column format, used for
-%          TOG, including special issues.\\
-%           sigconf & Proceedings format for most of ACM
+%            TSAS, TSC, TSLP and TWEB, including special issues. \\
+%   acmlarge  & Large single-column format.  Used for
+%           IMWUT, JOCCH, POMACS and TAP, including special issues. \\
+%   acmtog   & Large double-column format.  Used for
+%          TOG, including annual conference Technical Papers.\\
+%   sigconf & Proceedings format for most ACM
 %          conferences (with the exceptions listed below) and all ICPS
 %          volumes.\\
-%           siggraph & As of March 2017, this format is no longer
-%           used.  Please use sigconf for SIGGRAPH conferences. \\
-%            sigplan & Proceedings format for SIGPLAN conferences.\\
-%            sigchi  & Proceedings format for SIGCHI conferences.\\
-%           sigchi-a & Format for SIGCHI extended abstract.\\
+%   sigplan & Proceedings format for SIGPLAN conferences.\\
+%   sigchi  & Proceedings format for SIGCHI conferences.\\
+%   sigchi-a & Format for SIGCHI extended abstracts.\\
 %   \bottomrule
 %   \end{tabularx}
 % \end{table}
 %
-% There are several Boolean options which can take |true| or |false|
+% There are several Boolean options that can take |true| or |false|
 % values.  They are listed in Table~\ref{tab:opts_bool}.  The words
-% |=true| can be omitted when setting the Boolean option, so instead of
+% |=true| can be omitted when setting a Boolean option, so instead of
 % |screen=true| one can write just |screen|, for example,
 % \begin{verbatim}
 % \documentclass[acmsmall, screen, review]{acmart}
 % \end{verbatim}
-% The option
-% |review| is useful when combined with the |manuscript| format
-% option: it provides a version suitable for reviewers and
-% copyeditors.  
+% The option |review| is useful when combined with the |manuscript| format
+% option.  It provides a version suitable for reviewers and
+% copy editors.
 %
 % The default for the option |screen| depends on the publication.  At
 % present it is |false| for all publications \emph{but} PACM, since
-% PACM is now electronic-only.  Thus PACM titles (see
-% Table~\ref{tab:pubs} set this option to |true|.  This option may in
-% the future involve additional features suitable for on-screen
-% versions of the articles.
-% 
+% PACM is now electronic-only.  Thus PACM titles~(see
+% Table~\ref{tab:pubs}) set this option to |true|.  In the future this
+% option may involve additional features suitable for on-screen
+% versions of articles.
+%
 % The option |natbib| is used when the corresponding
 % \BibTeX\ style is based on |natbib|.  In most cases you do not need
 % to set it.  See
-% Section~\ref{sec:ug_bibliography}.  
+% Section~\ref{sec:ug_bibliography}.
 %
 % The option |anonymous| is used
-% for anonymous review process: all author information becomes
+% for anonymous review processes and causes all author information to be
 % obscured.
 %
 % The option |timestamp| is used to include a time stamp in the
 % footer of each page.  When preparing a document, this can help avoid
-% confusing different revisions.  The footer also include the page range of
+% confusing different revisions.  The footer also includes the page range of
 % the document.  This helps detect missing pages in hard copies.
 %
-% The option |authordraft| is intended for the authors' drafts, not
-% intended for distribution.  It typesets copyright block to give the
-% authors the idea of its size and overall size of the paper, but
+% The option |authordraft| is intended for author's drafts that are not
+% intended for distribution.  It typesets a copyright block to give the
+% author an idea of its size and the overall size of the paper but
 % overprints it with the phrase ``Unpublished working draft. Not for
-% distribution'', which also is used as a watermark.  This option sets
-% |timestamp| and |review| to |true|, but these decisions can be
+% distribution.'', which is also used as a watermark.  This option sets
+% |timestamp| and |review| to |true|, but these can be
 % overriden by setting these options to |false| \emph{after}
-% |authordraft|.  
+% setting |authordraft| to |true|.
 %
 % \begin{table}
 %   \centering
@@ -343,19 +346,19 @@
 %     \toprule
 %     \normalfont Option & \normalfont Default & Meaning\\
 %     \midrule
-%     review & false & A review version: lines are numbered,
+%     review & false & A review version: lines are numbered and
 %     hyperlinks are colored\\
 %     screen & {\rmfamily see text} & A screen version:
-%     hyperlinks are colored\\ 
-%     natbib & true & Whether to use |natbib| package (see
+%     hyperlinks are colored\\
+%     natbib & true & Whether to use the |natbib| package (see
 %     Section~\ref{sec:ug_bibliography})\\
 %     anonymous & false & Whether to make author(s) anonymous\\
 %     authorversion & false & Whether to generate a special
-%     version for authors' personal use or posting (see
+%     version for the authors' personal use or posting (see
 %     Section~\ref{sec:ug_topmatter})\\
 %     timestamp & false & Whether to put a time stamp in the
 %     footer of each page\\
-%     authordraft & false & Whether author's draft mode is enabled\\
+%     authordraft & false & Whether author's-draft mode is enabled\\
 %     acmthm & true & Whether to define theorem-like environments, see
 %     Section~\ref{sec:ug_theorems}\\
 %     \bottomrule
@@ -364,23 +367,23 @@
 %
 %
 %
-%\subsection{Topmatter commands}
+%\subsection{Top matter}
 %\label{sec:ug_topmatter}
 %
-% A number of commands set up \emph{top matter} information, or, in
-% the computer science jargon, \emph{metadata} for the article.  They
-% establish the publication name, article title, authors, doi and
-% other data.  Some of these commands, like \cs{title} or \cs{author},
-% should be put by the authors.  Others, like \cs{acmVolume} or
+% A number of commands set up \emph{top matter} or (in
+% computer science jargon) \emph{metadata} for an article.  They
+% establish the publication name, article title, authors, DOI and
+% other data.  Some of these commands, like \cs{title} and \cs{author},
+% should be put by the authors.  Others, like \cs{acmVolume} and
 % \cs{acmDOI}---by the editors.  Below we describe these commands and
 % mention who should issue them.  These macros should be used
-% \emph{before} the \cs{maketitle} command.  Note that in the previous
+% \emph{before} the \cs{maketitle} command.  Note that in previous
 % versions of ACM classes some of these commands should be used before
 % \cs{maketitle}, and some after it. Now they all must be used before
 % \cs{maketitle}.
 %
 %
-% The class internally loads |amsart| class, so many top matter
+% This class internally loads the |amsart| class, so many top-matter
 % commands are inherited from |amsart|~\cite{Downes04:amsart}.
 %
 % \DescribeMacro{\acmJournal}%
@@ -407,7 +410,7 @@
 %     CIE & ACM Computers in Entertainment \\
 %     CSUR & ACM Computing Surveys\\
 %     IMWUT & PACM on Interactive, Mobile, Wearable and Ubiquitous
-%     Technologies\\ 
+%     Technologies\\
 %     JACM &  Journal of the ACM \\
 %     JDIQ & ACM Journal of Data and Information Quality \\
 %     JEA & ACM Journal of Experimental Algorithmics \\
@@ -427,7 +430,7 @@
 %     TCPS & ACM Transactions on Cyber-Physical Systems\\
 %     TEAC & ACM Transactions on Economics and Computation\\
 %     TECS & ACM Transactions on Embedded Computing Systems \\
-%     THRI & ACM Transactions on Human-Robot Interaction\\  
+%     THRI & ACM Transactions on Human-Robot Interaction\\
 %     TIIS & ACM Transactions on Interactive Intelligent Systems\\
 %     TISSEC & ACM Transactions on Information and System Security\\
 %     TIST & ACM Transactions on Intelligent Systems and Technology \\
@@ -436,8 +439,8 @@
 %     TOCE & ACM Transactions on Computing Education\\
 %     TOCHI & ACM Transactions on Computer-Human Interaction\\
 %     TOCL & ACM Transactions on Computational Logic\\
-%     TOCS & ACM Transactions on Computer Systems  \\
-%     TOCT & ACM Transactions on Computation Theory  \\
+%     TOCS & ACM Transactions on Computer Systems \\
+%     TOCT & ACM Transactions on Computation Theory \\
 %     TODAES & ACM Transactions on Design Automation of Electronic Systems\\
 %     TODS & ACM Transactions on Database Systems\\
 %     TOG & ACM Transactions on Graphics\\
@@ -487,20 +490,20 @@
 % \end{verbatim}
 %
 % \DescribeMacro{\acmBooktitle}%
-% By default we assume that the conference proceedings are published
+% By default we assume that conference proceedings are published
 % in the book named \emph{Proceedings of \textsc{CONFERENCE}}, where
 % \textsc{CONFERENCE} is the name of the conference inferred from the
 % command \cs{acmConference} above.  However, sometimes the book title
-% is different.  The command \cs{acmBooktitle} may be used to set this
+% is different.  The command \cs{acmBooktitle} can be used to set this
 % title, for example,
 % \begin{verbatim}
 % \acmBooktitle{Companion to the first International Conference on the
-% Art, Science and Engineering of Programming (Programming '17)} 
+% Art, Science and Engineering of Programming (Programming '17)}
 % \end{verbatim}
-% 
+%
 % \DescribeMacro{\editor}%
-% In most cases conference proceedings are edited.  You can use the
-% command \cs{editor}\oarg{editor} to set the editor of the volume.
+% In most cases, conference proceedings are edited.  You can use the
+% command \cs{editor}\marg{editor} to set the editor of the volume.
 % This command can be repeated, for example,
 % \begin{verbatim}
 % \editor{Jennifer B. Sartor}
@@ -507,10 +510,10 @@
 % \editor{Theo D'Hondt}
 % \editor{Wolfgang De Meuter}
 % \end{verbatim}
-% 
 %
+%
 % \DescribeMacro{\title}%
-% The command |\title|, as in \progname{amsart} class, has two arguments:  one
+% The command |\title|, as in the |amsart| class, has two arguments:  one
 % optional, and one mandatory:
 % \begin{flushleft}
 %   |\title[|\meta{ShortTitle}|]{|\meta{FullTitle}|}|
@@ -524,12 +527,12 @@
 % manuscript.
 %
 % \DescribeMacro{\subtitle}%
-% Besides title, ACM classes allow subtitle, set with the
+% Besides title, ACM classes allow a subtitle, set with the
 % \cs{subtitle}\marg{subtitle} macro.
 %
-% The commands for specification of authors are highly structured.
-% The reason is, they serve double duty:  the authors' information is
-% typeset in the manuscript, \emph{and} is used by the metadata
+% The commands for specifying authors are highly structured.
+% The reason is they serve double duty:  the authors' information is
+% typeset in the manuscript \emph{and} is used by the metadata
 % extraction tools for indexing and cataloguing.  Therefore it is very
 % important to follow the guidelines exactly.
 %
@@ -539,7 +542,7 @@
 % \DescribeMacro{\email}%
 % The basic commands are \cs{author}, \cs{orcid} (for the researchers
 % registered with ORCID, \url{http://www.orcid.org/}), \cs{affiliation} and
-% \cs{email}.  In the simplest case you enter them in this order:
+% \cs{email}.  In the simplest case, you enter them in this order:
 % \begin{verbatim}
 % \author{...}
 % \orcid{...}
@@ -546,13 +549,13 @@
 % \affiliation{...}
 % \email{...}
 % \end{verbatim}
-% Do \emph{not} use \LaTeX\ \cs{and} macro! Each author deserves
+% Do \emph{not} use the \LaTeX\ \cs{and} macro! Each author deserves
 % his or her own \cs{author} command.
 %
-% Note that some formats do not typset e-mails of ORCID identifiers.
-% Do not worry: metadata tools will get them.  
+% Note that some formats do not typset e-mails or ORCID identifiers.
+% Do not worry: the metadata tools will get them.
 %
-% Sometimes an author has several affiliations.  In this case the
+% Sometimes an author has several affiliations.  In this case, the
 % \cs{affiliation} command should be repeated:
 % \begin{verbatim}
 % \author{...}
@@ -559,15 +562,15 @@
 % \orcid{...}
 % \affiliation{...}
 % \affiliation{...}
-% \email{...} 
+% \email{...}
 % \end{verbatim}
-% Similarly you can repeat \cs{email} command.
+% Similarly you can repeat the \cs{email} command.
 %
 % You may have several authors with the same affiliation, different
 % affiliations, or overlapping affiliations (author~$A_1$ is affiliated
 % with institutions $I_1$ and $I_2$, while author $A_2$ is affiliated
-% with $I_2$ only, and author $A_3$ is affiliated with
-% $I_1$ and $I_3$, \ldots).  The recommended solution is to put the
+% with $I_2$ only, author $A_3$ is affiliated with
+% $I_1$ and $I_3$, etc.).  The recommended solution is to put the
 % \cs{affiliation} commands after each author, possibly repeating them:
 % \begin{verbatim}
 % \author{...}
@@ -574,19 +577,19 @@
 % \orcid{...}
 % \affiliation{...}
 % \affiliation{...}
-% \email{...} 
+% \email{...}
 % \author{...}
 % \orcid{...}
 % \affiliation{...}
-% \email{...}  
+% \email{...}
 % \author{...}
 % \orcid{...}
 % \affiliation{...}
 % \affiliation{...}
-% \email{...} 
+% \email{...}
 % \end{verbatim}
-%  In some cases when several authors share the same affiliation you may
-%  try to save the space using the format
+%  In some cases, when several authors share the same affiliation, you can
+%  try to save space using the format
 % \begin{verbatim}
 % \author{...}
 % \email{...}
@@ -597,10 +600,10 @@
 %  However, this format is not generally recommended.
 %
 % \DescribeMacro{\additionalaffiliation}%
-% In some cases too many affiliations take too much space.  The
+% In some cases, too many affiliations can take too much space.  The
 % command \cs{additionalaffiliation}\marg{affiliation} creates a
-% footnote after author's name with the words ``Also with
-% \marg{affiliation}''.  You should use this command only as the last
+% footnote after an author's name with the words ``Also with
+% \marg{affiliation}''.  You should use this command only as a last
 % resort.  An example of usage is:
 % \begin{verbatim}
 % \author{G. Tobin}
@@ -608,19 +611,18 @@
 % \additionalaffiliation{%
 %   \institution{The Th{\o}rv{\"a}ld Group}
 %   \streetaddress{1 Th{\o}rv{\"a}ld Circle}
-%   \city{Hekla} 
+%   \city{Hekla}
 %   \country{Iceland}}
 % \affiliation{%
 %   \institution{Institute for Clarity in Documentation}
 %   \streetaddress{P.O. Box 1212}
-%   \city{Dublin} 
-%   \state{Ohio} 
-%   \postcode{43017-6221}
-% }
+%   \city{Dublin}
+%   \state{Ohio}
+%   \postcode{43017-6221}}
 % \end{verbatim}
 % Here Trovato and Tobin share their affiliation with the Institute
 % for Clarity in Documentation, but only Ben Trovato is affiliated
-% with The Th{\o}rv{\"a}ld Group.  
+% with The Th{\o}rv{\"a}ld Group.
 %
 %
 % \DescribeMacro{\position}%
@@ -633,7 +635,7 @@
 % \DescribeMacro{\country}%
 % The \cs{affiliation} and \cs{additionalaffiliation} commands are
 % further structured to interact with the metadata extraction tools.
-% Inside these commands you should use \cs{position},
+% Inside these commands you should use the \cs{position},
 % \cs{institution}, \cs{department}, \cs{city}, \cs{streetaddress},
 % \cs{state}, \cs{postcode} and \cs{country} macros to indicate the
 % corresponding parts of the affiliation.  Note that in some cases
@@ -640,7 +642,7 @@
 % (for example, journals) these parts are not printed in the resulting
 % copy, but they \emph{are} necessary since they are used by the XML
 % metadata extraction programs.  Do \emph{not} put commas or |\\|
-% between the elements of \cs{affiliation}: they will be provided
+% between the elements of \cs{affiliation}.  They will be provided
 % automatically.
 %
 %
@@ -677,38 +679,38 @@
 %   \country{Australia}}
 % \end{verbatim}
 %
-% Note that old ACM conference formats did not allow for more than six
-% authors and required some efforts from the authors to achieve
+% Note that the old ACM conference formats did not allow more than six
+% authors and required some effort from authors to achieve
 % alignment.  The new format is much better in this.
 %
 %  Sometimes an author works in several departments within the same
 %  insitution.  There could be two situations: the departments are
 %  independent, or one department is within another.  In the first
-%  case just repeat the command \cs{department} several times.  To
+%  case, just repeat the command \cs{department} several times.  To
 %  handle the second case the command has an optional numerical
 %  parameter.  The departments with higher numbers are higher in the
 %  organizational chart.  Compare
 % \begin{verbatim}
-%  \affiliation{%
-% \department[0]{Department of Lunar Studies} % 0 is the default
-% \department[1]{John Doe Institute} % higher than 0
-% \institution{University of San Serriffe}
-% \country{San Serriffe}}
+% \affiliation{%
+%   \department[0]{Department of Lunar Studies} % 0 is the default
+%   \department[1]{John Doe Institute} % higher than 0
+%   \institution{University of San Serriffe}
+%   \country{San Serriffe}}
 % \end{verbatim}
 %  and
 % \begin{verbatim}
-%  \affiliation{%
-% \department{Department of Lunar Studies} % Not within JD Inst!
-% \department{John Doe Institute} 
-% \institution{University of San Serriffe}
-% \country{San Serriffe}}
+% \affiliation{%
+%   \department{Department of Lunar Studies} % Not in the John Doe Institute!
+%   \department{John Doe Institute}
+%   \institution{University of San Serriffe}
+%   \country{San Serriffe}}
 % \end{verbatim}
 %
 %
-% The command \cs{affiliation} formats the output according to
+% The command \cs{affiliation} formats its output according to
 % American conventions.  This might be wrong for some cases.
-% Consider, for example, a German address.  In Germany postcode is put
-% before city and is not separated by a comma.  We can handle this
+% Consider, for example, a German address.  In Germany, the postcode is
+% put before the city and is not separated by a comma.  We can handle this
 % order using
 % \begin{verbatim}
 % \affiliation{%
@@ -716,10 +718,9 @@
 %   \streetaddress{Sonnenallee 17}
 %   \postcode{123456}
 %   \city{Helm}
-%   \country{Germany}
-% }
+%   \country{Germany}}
 % \end{verbatim}
-% However, the comma after postcode is unfortunate:  the address will
+% However, the comma after the postcode is unfortunate:  the address will
 % be typeset (in some formats) as
 % \begin{verbatim}
 % Fluginstitut
@@ -726,20 +727,19 @@
 % Sonenallee 17
 % 123456, Helm, Germany
 % \end{verbatim}
-% 
 %
+%
 % To overcome this problem, the command \cs{affiliation} has an
 % optional parameter |obeypunctuation|, which can be |false| (the
 % default) or |true|.  If this parameter is |true|, \cs{afffiliation}
-% obeys the author's command.  Thus 
+% obeys the author's command.  Thus
 % \begin{verbatim}
-% \affiliation[obeypuctuation=true]{%
+% \affiliation[obeypunctuation=true]{%
 %   \institution{Fluginstitut}\\
 %   \streetaddress{Sonnenallee 17}\\
 %   \postcode{123456}
 %   \city{Helm},
-%   \country{Germany}
-% }
+%   \country{Germany}}
 % \end{verbatim}
 % will be typeset as
 % \begin{verbatim}
@@ -748,21 +748,21 @@
 % 123456 Helm, Germany
 % \end{verbatim}
 %
-% Note that you should \emph{not} use this option for journals.  
+% Note that you should \emph{not} use this option for journals.
 %
 % It is expected that these commands are inserted by the author of the
 % manuscript.
 %
 % \DescribeMacro{\thanks}%
-% Like \progname{amsart} (and unlike standard \LaTeX{}), we allow
-% |\thanks| only \emph{outside} of commands |\title| and |\author|.
-% This command is obsolete, and should \emph{not} be used in most
-% cases.  Do not list your acknowledgements and grant sponsors here:
-% put this information in the |acks| environment (see
+% Like |amsart| (and unlike standard \LaTeX{}), we allow
+% |\thanks| only \emph{outside} of the commands |\title| and |\author|.
+% This command is obsolete and should \emph{not} be used in most
+% cases.  Do not list your acknowledgments or grant sponsors here.
+% Put this information in the |acks| environment (see
 % Section~\ref{sec:ug_acks}).
 %
 % \DescribeMacro{\authorsaddresses}%
-% In some formats the addresses are printed as a footnote on the first
+% In some formats, addresses are printed as a footnote on the first
 % page.  By default \LaTeX\ typesets them itself using the information
 % you give it.  However, you can override its choice using the
 % commmand \cs{authorsaddresses}\marg{contact addresses}, for example,
@@ -780,17 +780,17 @@
 %  Moffett Field, California 94035.}
 % \end{verbatim}
 % You can \emph{suppress} printing authors' addresses by setting them
-% to an empty string:  |\authorsaddresses{}|.   
+% to an empty string:  |\authorsaddresses{}|.
 %
 % \DescribeMacro{\titlenote}%
 % \DescribeMacro{\subtitlenote}%
 % \DescribeMacro{\authornote}%
-% While the command \cs{thanks} generates a note without footnote
+% While the command \cs{thanks} generates a note without a footnote
 % mark, sometimes the authors might need notes more tightly connected
 % to the title, subtitle or author.  The commands \cs{titlenote},
 % \cs{subtitlenote} and \cs{authornote} that follow the corresponding
 % commands (\cs{title}, \cs{subtitle} and \cs{author}) generate such
-% notes, for example
+% notes.  For example,
 % \begin{verbatim}
 % \title{This is a title}
 % \titlenote{This is a titlenote}
@@ -798,14 +798,14 @@
 % \authornote{This is an authornote}
 % \end{verbatim}
 %
-% Please never use \cs{footnotes} inside \cs{author} or \cs{title}
-% commands, since this confuses metadata extraction software (actually
-% these commands now produce errors).
+% Please never use a \cs{footnote} inside an \cs{author} or \cs{title}
+% command since this confuses the metadata extraction software.  (Actually
+% these commands now produce errors.)
 %
 % \DescribeMacro{\authornotemark}%
 % Sometimes one may need to have the same footnote connected to
 % several authors.  The command \cs{authornotemark}\oarg{number} adds
-% just the footnote mark, for example
+% just the footnote mark, for example,
 % \begin{verbatim}
 % \author{A. U. Thor}
 % \authornote{Both authors contributed equally to the paper}
@@ -814,7 +814,7 @@
 % \authornotemark[1]
 % \end{verbatim}
 % The correct numbering of these marks is the responsibility of the
-% user. 
+% user.
 %
 % \DescribeMacro{\acmVolume}%
 % \DescribeMacro{\acmNumber}%
@@ -825,7 +825,7 @@
 % \cs{acmYear} and \cs{acmMonth} are inserted by the editor and set
 % the journal volume, issue, article number, year and month
 % corrspondingly.  The arguments of all these commands, including
-% \cs{acmMonth} is numerical, including \cs{acmMonth}, for example,
+% \cs{acmMonth}, is numerical.  For example,
 % \begin{verbatim}
 % \acmVolume{9}
 % \acmNumber{4}
@@ -833,14 +833,14 @@
 % \acmYear{2010}
 % \acmMonth{3}
 % \end{verbatim}
-% Note that \cs{acmArticle} is used not only for journals, but also
+% Note that \cs{acmArticle} is used not only for journals but also
 % for some conference proceedings.
 %
 % \DescribeMacro{\acmArticleSeq}%
-% The articles in the same issue of a journal have a \emph{sequential
-% number}.  It is used to vertically position the black blob in some
-% formats.  By default it is the same as article number, but the command
-% \cs{acmArticleSeq}\marg{n} can be used to change it:
+% The articles in the same issue of a journal have a \emph{sequence
+% number}.  It is used to vertically position the black blob on the first
+% page of some formats.  By default it is the same as the article number,
+% but the command \cs{acmArticleSeq}\marg{n} can be used to change it:
 % \begin{verbatim}
 % \acmArticle{39}   % The sequence number will be 39 by default
 % \acmArticleSeq{5} % We redefine it to 5
@@ -848,15 +848,16 @@
 % Setting this number to zero suppresses the blob.
 %
 % \DescribeMacro{\acmSubmissionID}%
-% If you paper got a Submission~ID from the Conference Management
+% If your paper got a Submission~ID from the Conference Management
 % System, put it here:
 % \begin{verbatim}
 % \acmSubmissionID{123-A56-BU3}
 % \end{verbatim}
-% 
 %
+%
 % \DescribeMacro{\acmPrice}%
-% The macro \cs{acmPrice}\marg{price} sets the price for the article
+% The macro \cs{acmPrice}\marg{price} sets the price for the article,
+% for example,
 % \begin{verbatim}
 % \acmPrice{25.00}
 % \end{verbatim}
@@ -864,7 +865,7 @@
 % amount.  By default the price is \$15.00, unless the copyright is
 % set to |usgov| or |rightsretained|, when it is suppressed.  Note that to
 % override the defaults you need to set the price \emph{after} the
-% \cs{setcopyright} command to override the default.  Also, the
+% \cs{setcopyright} command.  Also, the
 % command |\acmPrice{}| suppresses the printing of the price.
 %
 % \DescribeMacro{\acmISBN}%
@@ -874,31 +875,31 @@
 % \begin{verbatim}
 % \acmISBN{978-1-4503-3916-2}
 % \end{verbatim}
-% Setting it to empty string, as |\acmISBN{}|, suppresses printing of
-% ISBN.  
+% Setting it to the empty string, as |\acmISBN{}|, suppresses printing the
+% ISBN.
 %
 % \DescribeMacro{\acmDOI}%
-% The macro \cs{acmDOI}\marg{DOI} sets the DOI number of the article, for
+% The macro \cs{acmDOI}\marg{DOI} sets the DOI of the article, for
 % example,
 % \begin{verbatim}
 % \acmDOI{10.1145/9999997.9999999}
 % \end{verbatim}
-% It is normally set by the typesetter.  Setting it to empty
-% string, |\acmDOI{}| suppresses DOI.
+% It is normally set by the typesetter.  Setting it to the empty
+% string, as |\acmDOI{}|, suppresses the DOI.
 %
 %
 % \DescribeMacro{\acmBadgeR}%
 % \DescribeMacro{\acmBadgeL}%
-% Some conference articles get special distinction, for example, the
+% Some conference articles get special distinctions, for example, the
 % artifact evaluation for PPoPP~2016
 % (see~\url{http://ctuning.org/ae/ppopp2016.html}).  These articles
-% display special badges supplied by the conference organizers.  The
+% display special badges supplied by the conference organizers.  This
 % class provides commands to add these badges:
-% \cs{acmBadgeR}\oarg{url}\marg{graphics} and 
+% \cs{acmBadgeR}\oarg{url}\marg{graphics} and
 % \cs{acmBadgeL}\oarg{url}\marg{graphics}.  The first command puts the
 % badge to the right of the title, and the second one---to the left.
-% The exception is the |sigchi-a| mode for SIGCHI Extended abstract,
-% which puts the badges on the left margin.  The argument have the
+% The exception is the |sigchi-a| mode for SIGCHI extended abstracts,
+% which puts the badges on the left margin.  The arguments have the
 % following meaning: \oarg{url}, if provided, sets the link to the
 % badge authority in the screen version, while \marg{graphics} sets
 % the graphics file with the badge image.  The file must be a cropped
@@ -912,7 +913,7 @@
 %
 % \DescribeMacro{\startPage}%
 % The macro \cs{startPage}\marg{page} sets the first page of the
-% article in the journal or book.  It is used by the typesetter.
+% article in a journal or book.  It is used by the typesetter.
 %
 %
 % \DescribeMacro{\terms}%
@@ -919,7 +920,7 @@
 % \DescribeMacro{\keywords}%
 % The command
 % \cs{keywords}\marg{keyword, keyword,\ldots} sets keywords for the
-% article.  They must be 
+% article.  They must be
 % separated by commas, for example,
 % \begin{verbatim}
 % \keywords{wireless sensor networks, media access control,
@@ -930,13 +931,13 @@
 % \DescribeMacro{\ccsdesc}%
 % ACM publications are classified according to the ACM Computing
 % Classification Scheme (CCS).  CCS codes are used both in the typeset
-% version of the publications \emph{and}  in the metadata in the various
+% version of the publications \emph{and} in the metadata in various
 % databases.  Therefore you need to provide both \TeX\ commands and XML
 % metadata with the paper.
 %
 % The tool at \url{http://dl.acm.org/ccs.cfm} can be used to generate
 % CCS codes.  After you select the topics, click on ``Generate CCS
-% codes'' to get the result like the following:
+% codes'' to get results like the following:
 % \begin{verbatim}
 % \begin{CCSXML}
 % <ccs2012>
@@ -969,14 +970,14 @@
 % \ccsdesc[100]{Networks~Network reliability}
 % \end{verbatim}
 %
-% You need to just copy this code and paste it in your paper anywhere
+% You just need to copy this code and paste it in your paper anywhere
 % before \verb|\maketitle|.
 %
 % \DescribeMacro{\setcopyright}
 % There are several possibilities for the copyright of the papers
-% published by ACM: the authors may transfer the rights to ACM, license
-% them to ACM, some or all authors might be employees of the US or
-% Canada Government, etc.  Accordingly the command
+% published by the ACM: the authors may transfer the rights to the ACM,
+% license them to the ACM, some or all authors might be employees of the
+% US or Canadian governments, etc.  Accordingly the command
 % \verb|\setcopyright{...}| is introduced.  Its argument is the
 % copyright status of the paper, for example,
 % \verb|\setcopyright{acmcopyright}|.  The possible values for this
@@ -984,7 +985,7 @@
 %
 % \begin{table}
 %   \centering
-%   \caption{Parameters for \texttt{\textbackslash setcopyright} command}
+%   \caption{Parameters for the \texttt{\textbackslash setcopyright} command}
 %   \label{tab:setcopyright}
 %   \begin{tabularx}{\textwidth}{lX}
 %     \toprule
@@ -991,33 +992,37 @@
 %     Parameter & Meaning\\
 %     \midrule
 %     \texttt{none} & The copyright and permission information is not
-%     typeset (this is the option for some ACM conferences). \\
-%     \texttt{acmcopyright} & The authors transfer the copyright to ACM
-%     (the ``traditional''   choice).\\
-%     \texttt{acmlicensed} &  The authors retain the copyright but
-%     license the publication rights  to ACM\@.  \\
+%     typeset.  (This is the option for some ACM conferences.) \\
+%     \texttt{acmcopyright} & The authors transfer the copyright to the
+%     ACM (the ``traditional'' choice).\\
+%     \texttt{acmlicensed} & The authors retain the copyright but
+%     license the publication rights to the ACM\@. \\
 %     \texttt{rightsretained} & The authors retain the copyright and
-%     publication rights to  themselves or somebody else.  \\
+%     publication rights to themselves or somebody else. \\
 %     \texttt{usgov} & All the authors are employees of the US
-%     Government. \\
-%     \texttt{usgovmixed} & Some  authors are employees of the US
-%     Government. \\
+%     government. \\
+%     \texttt{usgovmixed} & Some authors are employees of the US
+%     government. \\
 %     \texttt{cagov} & All the authors are employees of the Canadian
-%     Government. \\
-%     \texttt{cagovmixed} & Some  authors are employees of the Canadian
-%     Government. \\
-%     \texttt{licensedusgovmixed} & Some  authors are employees of the US
-%     Government, and the publication rights are licensed to ACM\@. \\
+%     government. \\
+%     \texttt{cagovmixed} & Some authors are employees of the Canadian
+%     government. \\
+%     \texttt{licensedusgovmixed} & Some authors are employees of the US
+%     government, and the publication rights are licensed to the ACM\@. \\
 %     \texttt{licensedcagov} & All the authors are employees of the Canadian
-%     Government, and the publication rights are licensed to ACM\@. \\
-%     \texttt{licensedcagovmixed} & Some  authors are employees of the
-%     Canadian 
-%     Government, and the publication rights are licensed to ACM\@. \\
+%     government, and the publication rights are licensed to the ACM\@. \\
+%     \texttt{licensedcagovmixed} & Some authors are employees of the
+%     Canadian
+%     government, and the publication rights are licensed to the ACM\@. \\
 %     \texttt{othergov} & Authors are employees of a
-%     Government other than US or Canada. \\
+%     government other than the US or Canada. \\
 %     \texttt{licensedothergov} & Authors are employees of a
-%     Government other than US or Canada, and the publication rights
-%     are licensed to ACM\@. \\
+%     government other than the US or Canada, and the publication rights
+%                                   are licensed to the ACM\@. \\
+%     \texttt{iw3c2w3} & Special statement for conferences organized
+%     by IW3C2.\\
+%     \texttt{iw3c2w3g} & Special statement for conferences organized
+%     by IW3C2, when some authors are approved Google employees.\\
 %     \bottomrule
 %   \end{tabularx}
 % \end{table}
@@ -1028,7 +1033,7 @@
 % \DescribeMacro{\copyrightyear}%
 % Each copyright statement must have the year of copyright.  By
 % default it is the same as \cs{acmYear}, but you can override this
-% decision using the macro \cs{copyrightyear}, e.g.,
+% using the macro \cs{copyrightyear}, e.g.,
 % \begin{verbatim}
 % \acmYear{2016}
 % \copyrightyear{2015}
@@ -1037,22 +1042,22 @@
 % There is a special case for a personal copy that the authors may be
 % allowed to generate for their use or a posting on a personal site
 % (check the instructions for the specific journal or conference for
-% the details).  The document option |authorversion=true| produces the
+% the details).  The document option |authorversion=true| produces a
 % special form of the copyright statement for this case.  Note that
 % you still need the \cs{setcopyright} command and (optionally)
 % \cs{copyrightyear} command to tell \TeX\ about the copyright owner and
 % year.  Also, you should be aware that due to the different sizes of
-% the permssion blocks for the printed version and authors' version
+% the permssion blocks for the printed version and authors' version,
 % the page breaks might be different between them.
 %
 % \DescribeEnv{abstract}%
-% The environment |abstract| must \emph{precede} \cs{maketitle}
+% The environment |abstract| must \emph{precede} the \cs{maketitle}
 % command.  Again, this is different from the standard \LaTeX.
 %
 %
 % \DescribeEnv{teaserfigure}%
 % A special kind of figure is used for many two-column conference
-% proceedings.  This figure is placed just after the authors, but
+% proceedings.  This figure is placed just after the authors but
 % before the main text.  The environment |teaserfigure| is used for these
 % figures.  This environment must be used \emph{before}
 % \cs{maketitle}, for example,
@@ -1067,7 +1072,7 @@
 %
 % \DescribeMacro{\settopmatter}%
 % Some information in the top matter is printed for certain journals
-% or proceedings and suppressed for others.  You may override these
+% or proceedings and suppressed for others.  You can override these
 % defaults using the command \cs{settopmatter}\marg{settings}.  The
 % settings and their meanings are listed in
 % Table~\ref{tab:settopmatter}.  For example,
@@ -1077,30 +1082,30 @@
 % The parameter |authorsperrow| requires some explanation.  In
 % conference proceedings authors' information is typeset in boxes,
 % several boxes per row (see |sample-sigconf.pdf|,
-% |sample-sigplan.pdf| etc.).  The number of the boxes per row is
-% determined automatically.  If you want to override this decision,
-% you may do it using this parameter, for example,
+% |sample-sigplan.pdf|, etc.).  The number of boxes per row is
+% determined automatically.  If you want to override this,
+% you can do it using this parameter, for example,
 % \begin{verbatim}
 % \settopmatter{authorsperrow=4}
 % \end{verbatim}
-% However, in most cases you should \emph{not} do this and use the
-% default settings.  Setting |authorsperrow| to $0$ will revert to
+% However, in most cases you should \emph{not} do this and should use the
+% default settings.  Setting |authorsperrow| to $0$ will revert it to the
 % default settings.
 %
 % \begin{table}
 %   \centering
-%   \caption{Settings for \cs{settopmatter} command}
+%   \caption{Settings for the \cs{settopmatter} command}
 %   \label{tab:settopmatter}
 %   \begin{tabularx}{\textwidth}{llX}
 %     \toprule
 %     Parameter & Values & Meaning\\
 %     \midrule
-%     printccs & true/false & Whether to print CCS categories\\
-%     printacmref & true/false & Whether to print ACM bibliographic
+%     |printccs| & true/false & Whether to print CCS categories\\
+%     |printacmref| & true/false & Whether to print the ACM bibliographic
 %     entry\\
-%     printfolios & true/false & Whether to print page numbers
+%     |printfolios| & true/false & Whether to print page numbers
 %     (folios)\\
-%     authorsperrow & numeric & Number of authors per row for title
+%     |authorsperrow| & numeric & Number of authors per row for the title
 %     page in
 %     conference proceedings formats\\
 %     \bottomrule
@@ -1110,9 +1115,9 @@
 %
 % \DescribeMacro{\received}%
 % The command \cs{received}\oarg{stage}\marg{date} sets the history of
-% the publication.  The \oarg{stage} argument is optional; the default
+% the publication.  The~\oarg{stage} argument is optional; the default
 % is |Received| for the first date and |revised| for the subsequent
-% ones.  For example
+% ones.  For example,
 % \begin{verbatim}
 % \received{February 2007}
 % \received[revised]{March 2009}
@@ -1121,13 +1126,13 @@
 %
 %
 % \DescribeMacro{\maketitle}%
-% The macro \cs{maketitle} must be the last command in the top matter
-% group:  i.e., it must follow the commands defined in this section.
+% The macro \cs{maketitle} must be the last command in the top-matter
+% group.  That is it must follow the commands defined in this section.
 %
 %
 % \DescribeMacro{\shortauthors}%
-% \emph{After} the command \cs{maketitle} the macro \cs{shortauthors}
-% stores the names of the authors for the running head.  You may
+% \emph{After} the command \cs{maketitle}, the macro \cs{shortauthors}
+% stores the names of the authors for the running head.  You can
 % redefine it if the list of author's name is too long, e.g.,
 % \begin{verbatim}
 % \maketitle
@@ -1140,7 +1145,7 @@
 %
 % There are now several good packages for typesetting
 % algorithms~\cite{Fiorio15, Brito09, Heinz15}, and the authors are
-% now free to choose their favorite one.
+% free to choose their favorite one.
 %
 %
 %
@@ -1147,40 +1152,40 @@
 %\subsection{Figures and tables}
 %\label{sec:ug_floats}
 %
-% New ACM styles use the standard \LaTeX\ interface for figures and
+% The new ACM styles use the standard \LaTeX\ interface for figures and
 % tables.  There are some important items to be aware of, however.
 %
 % \begin{enumerate}
 % \item The captions for figures must be entered \emph{after} the
-% figure bodies, and for the tables \emph{before} the table bodies.
-% \item ACM uses the standard types for figures and types and adds
+% figure bodies and for tables \emph{before} the table bodies.
+% \item The ACM uses the standard types for figures and tables and adds
 % several new ones.  In total there are the following types:
 % \begin{description}
-% \item[figure, table:] a standard figure or table, taking full text
-% width in one-column formats and one column in two-column formats.
+% \item[figure, table:] a standard figure or table taking a full text
+% width in one-column formats and one column width in two-column formats.
 % \item[figure*, table*] in two-column formats, a special figure or
-% table taking full text width.
+% table taking a full text width.
 % \item[teaserfigure:] a special figure before \cs{maketitle}.
 % \item[sidebar, marginfigure, margintable:] in the |sigchi-a| format,
-%   special sidebars, tables and figures on the margin.
+%   special sidebars, tables and figures in the margin.
 % \end{description}
 %
-% \item Accordingly, when scaling the images, one should use the
+% \item Accordingly, when scaling images, one should use the
 % following sizes:
 % \begin{enumerate}
-% \item For |figure| in one-column mode, |figure*| in two-column mode
-%   or |teaserfigure|---\cs{textwidth} (in the one-column you can also
+% \item For |teaserfigure|, |figure| in one-column mode or |figure*| in
+%   two-column mode, use \cs{textwidth}.  In one-column mode, you can also
 %   use \cs{columnwidth}, which coincides with \cs{textwidth} in this
-%   case).
-% \item For |figure| in two-column mode---\cs{columnwidth}.
-% \item For |marginfigure|--\cs{marginparwidth}.
-% \item For |figure*| in SIGCHI Extended
-% abstracts---\cs{fulltextwidth}.
+%   case.
+% \item For |figure| in two-column mode, use \cs{columnwidth}.
+% \item For |marginfigure|, use \cs{marginparwidth}.
+% \item For |figure*| in SIGCHI extended
+% abstracts, use \cs{fulltextwidth}.
 % \end{enumerate}
 %
 % \end{enumerate}
 %
-% It is strongly recommended to use the package booktabs~\cite{Fear05}
+% It is strongly recommended to use the package |booktabs|~\cite{Fear05}
 % and follow its main principles of typography with respect to tables:
 % \begin{enumerate}
 % \item Never, ever use vertical rules.
@@ -1188,8 +1193,8 @@
 % \end{enumerate}
 % It is also a good idea not to overuse horizontal rules.
 %
-% For table \emph{footnotes} you have several options described in TeX
-% FAQ~\cite{TeXFAQ}. The simplest one is to use \cs{minipage}
+% For table \emph{footnotes} you have several options described in the TeX
+% FAQ~\cite{TeXFAQ}. The simplest one is to use a \cs{minipage}
 % environment:
 % \begin{verbatim}
 % \begin{table}
@@ -1200,7 +1205,7 @@
 % \begin{tabular}{ll}
 %   \toprule
 %   TERRAIN\footnote{This is a table footnote. This is a
-%     table footnote. This is a table footnote.}   &
+%     table footnote. This is a table footnote.} &
 %     (200\,m$\times$200\,m) Square\\
 %   Node Number     & 289\\
 %   Node Placement  & Uniform\\
@@ -1227,32 +1232,32 @@
 % \DescribeEnv{sidebar}%
 % \DescribeEnv{marginfigure}%
 % \DescribeEnv{margintable}%
-% SIGCHI extended abstract extensively uses margin space.  The package
-% provides three environments for this with option captions:
+% SIGCHI extended abstracts use margin space extensively.  This package
+% provides three environments for this with optional captions:
 % \begin{description}
-% \item[sidebar:] textual information on the margin
-% \item[marginfigure:] a figure on the margin
-% \item[margintable:] a table on the margin
+% \item[sidebar:] textual information in the margin
+% \item[marginfigure:] a figure in the margin
+% \item[margintable:] a table in the margin
 % \end{description}
 %
 %
 % Tables and figures (including margin tables and margin figures) are
 % by default centered.  However, in some cases (for example, when you
-% use several subimages per figure) you may need to override this
-% decision.  A good way to do so is to put the contents into a
-% \cs{minipage} of the width \cs{columnwidth}.  
+% use several subimages per figure) you may need to override this.
+% A good way to do so is to put the contents into a
+% \cs{minipage} of the width \cs{columnwidth}.
 %
 %\subsection{Theorems}
 %\label{sec:ug_theorems}
 %
-% ACM classes define two theorem styles and several pre-defined
+% The ACM classes define two theorem styles and several pre-defined
 % theorem environments:
 % \begin{description}
-% \item[acmplain:] this is  the style used for
+% \item[acmplain:] this is the style used for
 %   |theorem|,
 %   |conjecture|,
 %   |proposition|,
-%   |lemma|, and
+%   |lemma| and
 %   |corollary|, and
 % \item[acmdefinition:] this is the style used for
 %   |example| and
@@ -1270,27 +1275,27 @@
 %
 % \DescribeEnv{printonly}%
 % \DescribeEnv{screenonly}%
-% Some supplementary material in ACM publication is put online, but
+% Some supplementary material in ACM publications is put online but
 % not in the printed version.  The text inside the environment
 % |screenonly| will be typeset only when the option |screen| (see
 % Section~\ref{sec:invocation}) is set to |true|.  Conversely, the
 % text inside the environment |printonly| is typset only when this
-% option is set to |false|.  For example
+% option is set to |false|.  For example,
 % \begin{verbatim}
 % \section{Supplementary materials}
 %
 % \begin{printonly}
-%   This section is included in the online version of the paper.
+%   Supplementary materials are available in the online version of this paper.
 % \end{printonly}
 %
 % \begin{screenonly}
-%   (The actual section).
+%   (The actual supplementary materials.)
 % \end{screenonly}
 % \end{verbatim}
 %
-% We use \textsl{comment} package for typesetting this code, so
-% |\begin| and |\end| should start at the first positions of the lines
-% of their own (no initial spaces etc.).
+% We use the |comment| package for typesetting this code, so
+% |\begin| and |\end| should start on a line of their own with
+% no leading or trailing spaces.
 %
 %\subsection{Note about anonymous mode}
 %\label{sec:ug_anonymous}
@@ -1297,20 +1302,20 @@
 %
 % \DescribeEnv{anonsuppress}%
 % When the option |anonymous| is selected, \TeX\ suppresses author
-% information (including number of authors) for a blind review.
+% information (including the number of authors) for a blind review.
 % However, sometimes the information identifying the authors may be
-% present in the body of the paper
+% present in the body of the paper.  For example,
 % \begin{verbatim}
 % \begin{anonsuppress}
 %   This is the continuation of the previous work by the author
-%   \cite{prev1, prev2}.  
+%   \cite{prev1, prev2}.
 % \end{anonsuppress}
 % \end{verbatim}
 %
-% As for |printonly| and |screenonly| environments,
-% |\begin{anonsuppress}| and |\end{anonsuppress}| should start the
-% line of their own (no leading or trailing spaces).  
-% 
+% As for the |printonly| and |screenonly| environments,
+% |\begin{anonsuppress}| and |\end{anonsuppress}| should start on a
+% line of their own with no leading or trailing spaces.
+%
 %\subsection{Acknowledgments}
 %\label{sec:ug_acks}
 %
@@ -1319,9 +1324,9 @@
 % However, there are several important considerations about this
 % section.
 %
-% First, in the anonymous mode this section must be omitted: it gives
-% too much information to the reviewers.  Second, the data about
-% the grants is extracted and stored separately by the postprocessing
+% First, in anonymous mode this section must be omitted: it gives
+% too much information to reviewers.  Second, data about
+% grants is extracted and stored separately by the postprocessing
 % software.  ACM classes provide facilities for both these tasks.
 %
 % \DescribeEnv{acks}%
@@ -1329,16 +1334,16 @@
 % ``Acknowledgments'' unless the anonymous mode is chosen.  Put all
 % thanks inside this environment.
 %
-% As for |printonly| and |screenonly| environments,
-% |\begin{acks}| and |\end{acks}| should start the
-% line of their own (no leading or trailing spaces).
+% As for the |printonly| and |screenonly| environments,
+% |\begin{acks}| and |\end{acks}| should start on a
+% line of their own with no leading or trailing spaces.
 %
 % \DescribeMacro{\grantsponsor}%
 % \DescribeMacro{\grantnum}%
-% All the financial support \emph{must} be listed using the commands
+% All financial support \emph{must} be listed using the commands
 % \cs{grantsponsor} and \cs{grantnum}.  These commands tell the
-% postprocessing software about the granting organization and the
-% grant.  The format of the command is the following:
+% postprocessing software about the granting organization and
+% grant.  The format of these commands is the following:
 % \begin{quote}
 %   \cs{grantsponsor}\marg{sponsorID}\marg{name}\marg{url}\\
 %   \cs{grantnum}\oarg{url}\marg{sponsorID}\marg{number}.
@@ -1346,14 +1351,14 @@
 % Here \marg{sponsorID} is the unique ID used to match grants to
 % sponsors, \marg{name} is the name of the sponsor, \marg{url} is its
 % URL, and \marg{number} is the grant number.  The \marg{sponsorID} of
-% the \cs{grantnum} command must correspond to \cs{sponsorID} of a
-% \cs{grantsponsor command}.  Some awards have their own web pages,
-% which you can include using the optional argument of \cs{grantnum}
-% command. 
+% the \cs{grantnum} command must correspond to the \marg{sponsorID} of a
+% \cs{grantsponsor} command.  Some awards have their own web pages,
+% which you can include using the optional argument of the \cs{grantnum}
+% command.
 %
 % At present \marg{sponsorID} is chosen by the authors and can be an
-% arbitrary key, in the same way the label of \cs{cite} is arbitrarily
-% chosen.  There might be a change to this policy if ACM decides to
+% arbitrary key in the same way the label of a \cs{cite} is arbitrarily
+% chosen.  There might be a change to this policy if the ACM decides to
 % create a global database of sponsoring organizations.
 %
 % Example:
@@ -1360,44 +1365,44 @@
 % \begin{verbatim}
 % \begin{acks}
 %   The authors would like to thank Dr. Yuhua Li for providing the
-%   matlab code of  the \textit{BEPS} method. 
+%   matlab code of the \textit{BEPS} method.
 %
 %   The authors would also like to thank the anonymous referees for
-%   their valuable comments and helpful suggestions. The work is
+%   their valuable comments and helpful suggestions. This work is
 %   supported by the \grantsponsor{GS501100001809}{National Natural
 %   Science Foundation of
 %   China}{https://doi.org/10.13039/501100001809} under Grant
 %   No.:~\grantnum{GS501100001809}{61273304}
-%   and~\grantnum[http://www.nnsf.cn/youngscientsts]{GS501100001809}{Young 
-%   Scientsts' Support Program}.
+%   and~\grantnum[http://www.nnsf.cn/youngscientists]{GS501100001809}{Young
+%   Scientists' Support Program}.
 % \end{acks}
 % \end{verbatim}
-% 
 %
+%
 %\subsection{Bibliography}
 %\label{sec:ug_bibliography}
 %
-% ACM uses the \textsl{natbib} package for formatting references and
-% the style \path{ACM-Reference-Format.bst} for Bib\TeX\
-% processing.  You may disable loading of \textsl{natbib} by using the
+% The ACM uses the |natbib| package for formatting references and
+% the Bib\TeX\ style file \path{ACM-Reference-Format.bst} for Bib\TeX\
+% processing.  You can disable loading of |natbib| using the
 % option |natbib=false| in \cs{documentclass}.  However, it is not
 % recommended, as well as the use of Bib\TeX\ styles other than
 % \path{ACM-Reference-Format.bst}, and may delay the processing of the
-% manuscript.  
-% 
+% manuscript.
 %
+%
 % \DescribeMacro{\citestyle}%
-% If you use |natbib|, you can select one of two predefined sitation
-% styles: the author-year format |acmauthoryear| or the numeric
-% format |acmnumeric| using the command \cs{citestyle}, for example,
+% If you use |natbib|, you can select one of two predefined citation
+% styles using the command \cs{citestyle}: the author-year format
+% |acmauthoryear| or the numeric format |acmnumeric|.  For example,
 % \begin{verbatim}
 % \citestyle{acmauthoryear}
 % \end{verbatim}
-% Note that numeric citations are the default mode for most formats.  
-%  
+% Note that numeric citations are the default mode for most formats.
+%
 % \DescribeMacro{\setcitestyle}%
-% You may further customize
-% \textsl{natbib} using \cs{setcitestyle} command, for example,
+% You can further customize |natbib| using
+% the \cs{setcitestyle} command, for example,
 % \begin{verbatim}
 % \setcitestyle{numbers,sort&compress}
 % \end{verbatim}
@@ -1404,19 +1409,25 @@
 %
 % If you use |natbib|, then commands like \cs{citep} and
 % \cs{citeauthor} are automatically supported.  The command
-% \cs{shortcite} is the same as \cs{cite} in numerical mode, and cites
-% the year in the author-date mode.
+% \cs{shortcite} is the same as \cs{cite} in numerical mode and cites
+% the year in author-date mode.
 %
-% There are several customized \BibTeX\ entries and fields in ACM
-% style \path{ACM-Reference-Format.bst} you may want to be aware of.
+% Note that before version~1.48 the command \cs{citeyear} put the year
+% in parentheses.  In version~1.48 and later it produces just the
+% year; the command \cs{citeyearpar} can be used to emulate its old
+% behavior.
 %
-% The style supports fields \path{doi} and \path{url}, for example,
+% There are several customized \BibTeX\ entry types and fields in the ACM
+% style file \path{ACM-Reference-Format.bst} that you may want to be
+% aware of.
+%
+% The style supports the fields \path{doi} and \path{url}, for example,
 % \begin{verbatim}
 %  doi =          "10.1145/1188913.1188915",
 %  url =          "http://ccrma.stanford.edu/~jos/bayes/bayes.pdf",
 % \end{verbatim}
-% 
-% The style supports arXiv recommended fields \path{eprint} and
+%
+% The style supports the arXiv-recommended fields \path{eprint} and
 % (optionally) \path{primaryclass}, for example,
 % \begin{verbatim}
 %  eprint =       "960935712",
@@ -1424,7 +1435,7 @@
 % \end{verbatim}
 % See the examples at \url{http://arxiv.org/hypertex/bibstyles/}.
 %
-% There are special entries \path{online}  and
+% There are the special entry types \path{online} and
 % \path{game} for Web pages and games, for example,
 % \begin{verbatim}
 % @online{Thornburg01,
@@ -1436,13 +1447,13 @@
 %  lastaccessed = "March 2, 2005",
 % }
 % \end{verbatim}
-% For these entries you can use the \path{lastaccessed} field to add
-% the access date to the URL.
-% 
-% There are two ways to enter video and audio sources in the
+% For these entry types you can use the \path{lastaccessed} field to add
+% the access date for the URL.
+%
+% There are two ways to enter video or audio sources in the
 % bibliograpy corresponding to two different possibilies.  For
-% standalone sources available on WWW you can use an \path{online}
-% entry, setting there \path{howpublished} field, for example,
+% standalone sources available online, you can use an \path{online}
+% entry and set its \path{howpublished} field.  For example,
 % \begin{verbatim}
 % @online{Obama08,
 %  author =       "Barack Obama",
@@ -1455,10 +1466,10 @@
 %  lastaccessed = "March 21, 2008",
 % }
 % \end{verbatim}
-% 
-% For the sources available as attachments to conference proceedings
+%
+% For sources available as attachments to conference proceedings
 % and similar documents, you can use the usual \path{inproceedings}
-% entry, again setting the \path{howpublished} field:
+% entry type and set its \path{howpublished} field:
 % \begin{verbatim}
 % @Inproceedings{Novak03,
 %  author =       "Dave Novak",
@@ -1473,9 +1484,9 @@
 %  howpublished = "Video",
 % }
 % \end{verbatim}
-% 
-% Sometimes you need to cite a complete issue of a journal.  The entry
-% \path{periodical} is intended for this:
+%
+% Sometimes you need to cite a complete issue of a journal.  The
+% \path{periodical} entry type is intended for this:
 % \begin{verbatim}
 % @periodical{JCohen96,
 %  key =          "Cohen",
@@ -1490,10 +1501,10 @@
 % \end{verbatim}
 %
 % If you do not know the year of publication, the style will add
-% ``[n. d.]'' (for ``no date'') entry.
+% ``[n. d.]'' (for ``no date'') to the entry.
 %
 % If you do not know the author (this is often the case for online
-% entries), use |key| field to add a key for sorting and citations,
+% entries), use the |key| field to add a key for sorting and citations,
 % for example,
 % \begin{verbatim}
 % @online{TUGInstmem,
@@ -1500,49 +1511,49 @@
 %  key =          {TUG},
 %  year  =        2017,
 %  title =        "Institutional members of the {\TeX} Users Group",
-%  url =           "http://wwtug.org/instmem.html",
+%  url =          "http://wwtug.org/instmem.html",
 %  lastaccessed = "May 27, 2017",
 % }
 % \end{verbatim}
-% 
-% 
 %
+%
+%
 %\subsection{Colors}
 %\label{sec:ug_colors}
 %
-% While printed ACM publications are usually black and white, screen
+% While printed ACM publications are usually black and white, |screen|
 % mode allows the use of colors.  The ACM classes pre-define several
 % colors according to~\cite{ACMIdentityStandards}:  |ACMBlue|,
 % |ACMYellow|, |ACMOrange|, |ACMRed|, |ACMLightBlue|, |ACMGreen|,
-% |ACMPurple|, |ACMDarkBlue|.  You can use them in the color
+% |ACMPurple| and |ACMDarkBlue|.  You can use them in color
 % assignments.
 %
-% ACM provides the following recommendation on color use.
+% The ACM provides the following recommendation on color use.
 %
 % The most accessible approach would be to ensure that your article is
 % still readable when printed in greyscale. The most notable reasons
-% for this are: 
+% for this are:
 % \begin{enumerate}
 % \item The most common type of inherited Color Vision Deficiency
-% (CVD) is red-green (in which similar-brightness colors that only
-% differ in their amounts of red or green are often confused), and it
+% (CVD) is red-green (in which similar-brightness colors that differ
+% only in their amounts of red or green are often confused), and it
 % affects up to 8\% of males and 0.5\% of females of Northern European
-% descent. 
+% descent.
 % \item The most common type of acquired Color Vision Deficiency (CVD)
 % is blue-yellow (including mild cases for many older adults).
-% \item Most printing is in Black \& White.
+% \item Most printing is in black and white.
 % \item Situational impairments (e.g., bright sunlight shining on a
 % mobile screen) tend to reduce the entire color gamut, reducing color
 % discriminability.
 % \end{enumerate}
-% 
+%
 % \textbf{Note:} It is \emph{not} safe to encode information using
 % only variations in color (i.e., only differences in hue and/or
-% saturation), as there is bound to be someone affected! 
+% saturation) as there is bound to be someone affected!
 %
-% To ensure that you are using the most accessible colors, ACM
+% To ensure that you are using the most accessible colors, the ACM
 % recommends that you choose sets of colors to help ensure suitable
-% variations in Black \& White using either of the following tools: 
+% variations in when printed in greyscale by using either of the following tools:
 % \begin{enumerate}
 %  \item ColourBrewer: \url{http://colorbrewer2.org/}
 %  \item ACE: The Accessible Colour Evaluator:
@@ -1549,24 +1560,24 @@
 %    \url{http://daprlab.com/ace/} for designing WCAG 2.0 compliant
 %    palettes.
 %  \end{enumerate}
-%  
 %
+%
 %\subsection{Other notable packages and typographic remarks}
 %\label{sec:ug_other}
 %
 % Several other packages are recommended for specialized tasks.
 %
-% The package \textsl{subcaption}~\cite{Sommerfeldt13:Subcaption} is
+% The package |subcaption|~\cite{Sommerfeldt13:Subcaption} is
 % recommended for complex figures with several subplots or subfigures
 % that require separate subcaptioning.  The packages
-% \textsl{nomencl}~\cite{Nomencl} and
-% \textsl{glossaries}~\cite{Talbot16:Glossaries} can be used for the
-% automatic creation of the lists of symbols and concepts used.  
+% |nomencl|~\cite{Nomencl} and
+% |glossaries|~\cite{Talbot16:Glossaries} can be used for the
+% automatic creation of the lists of symbols and concepts used.
 %
 %
-% By default |acmart| prevents all widows and orphans (i.e. lonely
-% lines at the beginning and the end of the page) and hyphenation at
-% the end of the page.  This is done by rather strict settings
+% By default |acmart| prevents all widows and orphans (i.e., lonely
+% lines at the beginning or end of the page) and hyphenation at
+% the end of the page.  This is done by the rather strict settings
 % \begin{verbatim}
 % \widowpenalty=10000
 % \clubpenalty=10000
@@ -1579,12 +1590,12 @@
 % Another problem might be the too strict line breaking rules.  Again,
 % a strategically placed \cs{sloppy} command or putting the
 % problematic paragraph inside \texttt{sloppypar} environment might
-% help---but beware the results might be, well, sloppy.
+% help---but beware, the results might be, well, sloppy.
 %
 % Note that the uppercasing in section titles is done using
-% \textsl{textcase} package~\cite{Carlisle04:Textcase}, so command
-% \cs{NoCaseChange} inside title may help to prevent extraneous
-% uppercasing.  
+% the |textcase| package~\cite{Carlisle04:Textcase}, so the command
+% \cs{NoCaseChange} inside the title may help to prevent extraneous
+% uppercasing.
 %
 %\subsection{A note for wizards: \texttt{acmart-preload-hook.tex}}
 %\label{sec:ug_preload}
@@ -1592,20 +1603,20 @@
 % Sometimes you need to change the behavior of |acmart|.  The
 % usual way to do this is to redefine commands in the preamble.
 % However, these definitions are executed \emph{after} |acmart| is
-% loaded, and certain decisions are made.  This presents a number of
-% problems.  
+% loaded and certain decisions are made.  This presents a number of
+% problems.
 %
-% For example, one may want to use  |titletoc| package with |acmart|.
+% For example, one may want to use the |titletoc| package with |acmart|.
 % This package should be loaded before |hyperref|.  However, since
 % |acmart| loads |hyperref| itself, the line |\usepackage{titletoc}|
 % in the preamble will lead to grief (see
-% \url{http://tex.stackexchange.com/questions/357265/using-titletoc-with-acm-acmart-style}). 
+% \url{http://tex.stackexchange.com/questions/357265/using-titletoc-with-acm-acmart-style}).
 %
-% Another example is passing options to package.  Suppose you want to
-% use |dvipsnames| option of |xcolor| package.  Normally you cannot do
+% Another example is passing options to a package.  Suppose you want to
+% use the |dvipsnames| option of the |xcolor| package.  Normally you cannot do
 % this because |acmart| loads this package itself without options.
 %
-% The file |acmart-preload-hook.tex| may be used to solve these
+% The file |acmart-preload-hook.tex| can be used to solve these
 % problems.  If this file exists, it will be processed before any other
 % package.  You can use this file to load packages or pass options to
 % them.  For example, if you put in this file
@@ -1622,10 +1633,10 @@
 % you will pass |dvipsnames| to |xcolor|.
 %
 % \textbf{Important note.}  This hook makes it too easy to create a
-% manuscript which is not acceptable by ACM.  Even easier it is to
-% create a file which cannot be compiled.  So please do not use it
+% manuscript that is not acceptable by the ACM.  It is even easier to
+% create a file that cannot be compiled.  So please do not use it
 % \emph{unless you know what you are doing.}  And if you use it,
-% \emph{do not ask for support.}  If you decided to use this hook, you
+% \emph{do not ask for support.}  If you decide to use this hook, you
 % are on your own.
 %
 % \StopEventually{
@@ -1642,9 +1653,9 @@
 %\subsection{Identification}
 %\label{sec:ident}
 %
-% We start with the declaration who we are.  Most |.dtx| files put
-% driver code in a separate driver file |.drv|.  We roll this code into the
-% main file, and use the pseudo-guard |<gobble>| for it.
+% We start with a declaration of who we are.  Most |.dtx| files put
+% driver code in a separate~|.drv| driver file.  We roll this code into the
+% main file and use the pseudo-guard |<gobble>| for it.
 %    \begin{macrocode}
 %<class>\NeedsTeXFormat{LaTeX2e}
 %<*gobble>
@@ -1651,7 +1662,7 @@
 \ProvidesFile{acmart.dtx}
 %</gobble>
 %<class>\ProvidesClass{acmart}
-[2017/08/31 v1.47 Typesetting articles for Association of
+[2017/12/14 v1.48 Typesetting articles for the Association for
 Computing Machinery]
 %    \end{macrocode}
 %
@@ -1683,7 +1694,7 @@
 % \changes{v1.16}{2016/07/07}{Formatting header/footer (Matthew
 % Fluet)}
 % \changes{v1.18}{2016/07/10}{Natbib is now the default for all
-% formats} 
+% formats}
 % \changes{v1.19}{2016/07/28}{Include 'Abstract', 'Acknowledgements',
 % and 'References' in PDF bookmarks (Matthew Fluet)}
 % \changes{v1.20}{2016/08/06}{Bug fixes for bst}
@@ -1691,18 +1702,18 @@
 % \changes{v1.23}{2016/11/04}{Add PACMPL journal option}
 % \changes{v1.26}{2016/12/24}{Corrected \cs{shortcite} bug}
 % \changes{v1.26}{2016/12/24}{Documentation typos fixed (thanks to
-% Stephen Spencer)} 
+% Stephen Spencer)}
 % \changes{v1.30}{2017/02/04}{Bibtex style now recognizes https:// in
-% doi} 
-% \changes{v1.31}{2017/03/04}{Documentation changes} 
-% \changes{v1.32}{2017/03/07}{Format siggraph is now obsolete} 
-% \changes{v1.32}{2017/03/07}{Added POMACS journal option} 
-% \changes{v1.33}{2017/03/12}{BibTeX crossref bug corrected} 
+% doi}
+% \changes{v1.31}{2017/03/04}{Documentation changes}
+% \changes{v1.32}{2017/03/07}{Format siggraph is now obsolete}
+% \changes{v1.32}{2017/03/07}{Added POMACS journal option}
+% \changes{v1.33}{2017/03/12}{BibTeX crossref bug corrected}
 % \changes{v1.33}{2017/03/18}{BibTeX comma before articleno bug
-% corrected} 
-% \changes{v1.33}{2017/03/18}{BibTeX numpages bug corrected} 
-% \changes{v1.33}{2017/03/28}{Added acmart-preload-hook} 
-% \changes{v1.33}{2017/03/33}{Documentation updates} 
+% corrected}
+% \changes{v1.33}{2017/03/18}{BibTeX numpages bug corrected}
+% \changes{v1.33}{2017/03/28}{Added acmart-preload-hook}
+% \changes{v1.33}{2017/03/33}{Documentation updates}
 % \changes{v1.35}{2017/04/23}{BibTeX bug fixed: et al.}
 % \changes{v1.36}{2017/05/12}{Added the possibility to adjust number of
 % author boxes per row in conference formats}
@@ -1723,8 +1734,14 @@
 % \changes{v1.46}{2017/08/25}{Added etoolbox}
 % \changes{v1.46}{2017/08/29}{Restore theorem defs to class file}
 % \changes{v1.47}{2017/08/31}{New journal: THRI}
+% \changes{v1.48}{2017/09/09}{Typos fixed (Jamie Davis)}
+% \changes{v1.48}{2017/09/16}{Code prettying (Michael D.~Adams)}
+% \changes{v1.48}{2017/09/23}{Misc entries in the bibliography no
+% longer produce a separate date}
+% \changes{v1.48}{2017/10/01}{Initial support for Biblatex (Daniel Thomas)}
+% \changes{1.48}{2017/10/14}{Bib code cleanup (Zack Weinberg)}
+% \changes{1.48}{2017/12/03}{Documentation update (siggraph)}
 %
-%
 % And the driver code:
 %    \begin{macrocode}
 %<*gobble>
@@ -1749,7 +1766,7 @@
 %
 %
 %
-%\subsection{Preload}
+%\subsection{Preload hook}
 %\label{sec:preload}
 %
 % We preload |acmart-preload-hook|:
@@ -1759,7 +1776,7 @@
     I am loading acmart-preload-hook.tex. You are fully responsible
     for any problems from now on.}}{}
 %    \end{macrocode}
-% 
+%
 % \subsection{Options}
 % \label{sec:options}
 %
@@ -1773,8 +1790,8 @@
 \RequirePackage{xstring}
 %    \end{macrocode}
 %
-% 
 %
+%
 % \begin{macro}{format}
 %   The possible formats
 %    \begin{macrocode}
@@ -1807,7 +1824,7 @@
     \PackageInfo{\@classname}{Using screen mode}%
   \else
     \PackageInfo{\@classname}{Not using screen mode}%
-  \fi}{\PackageError{\@classname}{Option screen can be either true or
+  \fi}{\PackageError{\@classname}{The option screen can be either true or
     false}}
 \ExecuteOptionsX{screen=false}
 %    \end{macrocode}
@@ -1824,7 +1841,7 @@
     \PackageInfo{\@classname}{Requiring acmthm}%
   \else
     \PackageInfo{\@classname}{Suppressing acmthm}%
-  \fi}{\PackageError{\@classname}{Option acmthm can be either true or
+  \fi}{\PackageError{\@classname}{The option acmthm can be either true or
     false}}
 \ExecuteOptionsX{acmthm=true}
 %    \end{macrocode}
@@ -1833,14 +1850,16 @@
 %
 %
 % \begin{macro}{\if at ACM@review}
+% \changes{v1.48}{2017/09/09}{Review mode now switches on folios}
 %   Whether we use review mode
 %    \begin{macrocode}
 \define at boolkey+{acmart.cls}[@ACM@]{review}[true]{%
   \if at ACM@review
     \PackageInfo{\@classname}{Using review mode}%
+    \AtBeginDocument{\@ACM at printfoliostrue}%
   \else
     \PackageInfo{\@classname}{Not using review mode}%
-  \fi}{\PackageError{\@classname}{Option review can be either true or
+  \fi}{\PackageError{\@classname}{The option review can be either true or
     false}}
 \ExecuteOptionsX{review=false}
 %    \end{macrocode}
@@ -1849,7 +1868,7 @@
 %
 % \begin{macro}{\if at ACM@authorversion}
 % \changes{v1.03}{2016/04/22}{Added macro}
-%   Whether we use author's version
+%   Whether we use author's-version mode
 %    \begin{macrocode}
 \define at boolkey+{acmart.cls}[@ACM@]{authorversion}[true]{%
   \if at ACM@authorversion
@@ -1856,7 +1875,7 @@
     \PackageInfo{\@classname}{Using authorversion mode}%
   \else
     \PackageInfo{\@classname}{Not using authorversion mode}%
-  \fi}{\PackageError{\@classname}{Option authorversion can be either true or
+  \fi}{\PackageError{\@classname}{The option authorversion can be either true or
     false}}
 \ExecuteOptionsX{authorversion=false}
 %    \end{macrocode}
@@ -1867,10 +1886,11 @@
 % \begin{macro}{\if at ACM@natbib at override}
 % \changes{v1.12}{2016/05/30}{Added macro}
 % \changes{v1.33}{2017/03/28}{Deleted macro}
+% This macro is no longer used.
 % \end{macro}
 %
 % \begin{macro}{\if at ACM@natbib}
-%   Whether we use natbib mode
+%   Whether we use |natbib| mode
 %    \begin{macrocode}
 \define at boolkey+{acmart.cls}[@ACM@]{natbib}[true]{%
   \if at ACM@natbib
@@ -1877,7 +1897,7 @@
     \PackageInfo{\@classname}{Explicitly selecting natbib mode}%
   \else
     \PackageInfo{\@classname}{Explicitly deselecting natbib mode}%
-  \fi}{\PackageError{\@classname}{Option natbib can be either true or
+  \fi}{\PackageError{\@classname}{The option natbib can be either true or
     false}}
 \ExecuteOptionsX{natbib=true}
 %    \end{macrocode}
@@ -1893,7 +1913,7 @@
     \PackageInfo{\@classname}{Using anonymous mode}%
   \else
     \PackageInfo{\@classname}{Not using anonymous mode}%
-  \fi}{\PackageError{\@classname}{Option anonymous can be either true or
+  \fi}{\PackageError{\@classname}{The option anonymous can be either true or
     false}}
 \ExecuteOptionsX{anonymous=false}
 %    \end{macrocode}
@@ -1910,7 +1930,7 @@
     \PackageInfo{\@classname}{Using timestamp mode}%
   \else
     \PackageInfo{\@classname}{Not using timestamp mode}%
-  \fi}{\PackageError{\@classname}{Option timestamp can be either true or
+  \fi}{\PackageError{\@classname}{The option timestamp can be either true or
     false}}
 \ExecuteOptionsX{timestamp=false}
 %    \end{macrocode}
@@ -1921,7 +1941,7 @@
 % \begin{macro}{\if at ACM@authordraft}
 % \changes{v1.33}{2017/03/28}{Added macro}
 % \changes{v1.36}{2017/05/13}{Corrected typo, thanks to bargteil}
-%   Whether we use authordraft mode
+%   Whether we use author-draft mode
 %    \begin{macrocode}
 \define at boolkey+{acmart.cls}[@ACM@]{authordraft}[true]{%
   \if at ACM@authordraft
@@ -1930,7 +1950,7 @@
     \@ACM at reviewtrue
   \else
     \PackageInfo{\@classname}{Not using authordraft mode}%
-  \fi}{\PackageError{\@classname}{Option authordraft can be either true or
+  \fi}{\PackageError{\@classname}{The option authordraft can be either true or
     false}}
 \ExecuteOptionsX{authordraft=false}
 %    \end{macrocode}
@@ -1983,7 +2003,7 @@
 % \end{macro}
 %
 % \begin{macro}{\if at ACM@sigchiamode}
-%   The formatting of SIGCHI abstracts is quite unusual.  We have a
+%   The formatting of SIGCHI extended abstracts is quite unusual.  We have a
 %   special switch for them.
 %    \begin{macrocode}
 \newif\if at ACM@sigchiamode
@@ -1995,7 +2015,7 @@
 % Setting up switches
 %    \begin{macrocode}
 \ifnum\ACM at format@nr=5\relax % siggraph
-  \ClassWarning{\@classname}{The format `siggraph' is now obsolete.
+  \ClassWarning{\@classname}{The format siggraph is now obsolete.
     I am switching to sigconf.}
   \setkeys{acmart.cls}{format=sigconf}
 \fi
@@ -2028,9 +2048,9 @@
 \fi
 %    \end{macrocode}
 %
-% 
 %
-%\subsection{Loading base class and package}
+%
+%\subsection{Loading the base class and package}
 %\label{sec:loading}
 %
 % \changes{v1.13}{2016/06/06}{Increased font size for ACM Large}
@@ -2037,7 +2057,7 @@
 % \changes{v1.38}{2017/05/13}{Increase default font size for SIGPLAN}
 %
 %
-% At this point we either have \cs{ACM at fontsize}, or use defaults
+% At this point we either have \cs{ACM at fontsize} or use defaults
 %    \begin{macrocode}
 \ifx\ACM at fontsize\@empty
   \ifcase\ACM at format@nr
@@ -2066,26 +2086,27 @@
 \RequirePackage{microtype}
 %    \end{macrocode}
 %
+%
 % We need |etoolbox| for delayed code
 %    \begin{macrocode}
 \RequirePackage{etoolbox}
 %    \end{macrocode}
-% 
 %
-% We need |totpages| package to calculate the number of pages and
-% |refcount| to use the number
+%
+% We need |totpages| to calculate the number of pages and
+% |refcount| to use that number
 %    \begin{macrocode}
 \RequirePackage{refcount}
 \RequirePackage{totpages}
 %    \end{macrocode}
 %
-% The |amsmath| \cs{collect at body} is defined using \cs{def}.  We load
-% |environ| to access the \cs{long} version of the command
+% The \cs{collect at body} macro in |amsmath| is defined using \cs{def}.  We load
+% |environ| to access the \cs{long} version of this command
 %    \begin{macrocode}
 \RequirePackage{environ}
 %    \end{macrocode}
 %
-% We use |setspace| for doublespacing
+% We use |setspace| for double spacing
 %    \begin{macrocode}
 \if at ACM@manuscript
 \RequirePackage{setspace}
@@ -2094,16 +2115,17 @@
 %    \end{macrocode}
 %
 % \changes{v1.40}{2017/06/05}{Added `textcase' package}
-% We need \textsl{textcase} for better upcasing
+% We need |textcase| for better upcasing
 %    \begin{macrocode}
-\RequirePackage{textcase}      
+\RequirePackage{textcase}
 %    \end{macrocode}
-% 
 %
+%
+%\subsection{Citations}
 % \changes{v1.19}{2016/07/28}{Include 'References' in PDF bookmarks
 % (Matthew Fluet)}
 % \changes{v1.14}{2016/06/09}{Patched \cs{citestyle}}
-% Citations.  We patch \cs{setcitestyle} to allow, e.g.,
+% We patch \cs{setcitestyle} to allow, for example,
 % \cs{setcitestyle}|{sort}| and \cs{setcitestyle}|{nosort}|.  We patch
 % \cs{citestyle} to warn about undefined citation styles.
 %    \begin{macrocode}
@@ -2228,11 +2250,11 @@
 \citestyle{acmnumeric}
 \fi
 %    \end{macrocode}
-% 
+%
 % \begin{macro}{\@startsection}
-% \changes{v1.31}{2017/03/04}{Added \cs{tochangmeasure}} 
+% \changes{v1.31}{2017/03/04}{Added \cs{tochangmeasure}}
 % Before we call |hyperref|, we redefine \cs{startsection} commands to
-% their \LaTeX\ defaults, since |amsart| ones are too AMS-specific.
+% their \LaTeX\ defaults since the |amsart| ones are too AMS-specific.
 % We need to do this early since we want |hyperref| to have a chance
 % to redefine them again:
 %    \begin{macrocode}
@@ -2333,10 +2355,10 @@
 % \end{macro}
 %
 % \begin{macro}{\@startsection}
-% \changes{v1.31}{2017/03/04}{Rededined macro} 
-% \changes{v1.43}{2017/07/09}{Added \cs{makeatletter}} 
-%   Amsart redefines \cs{startsection}.  Here we redefine it again to
-%   make TOC working
+% \changes{v1.31}{2017/03/04}{Rededined macro}
+% \changes{v1.43}{2017/07/09}{Added \cs{makeatletter}}
+%   The |amsart| package redefines \cs{startsection}.  Here we redefine
+%   it again to make the table of contents work.
 %    \begin{macrocode}
 \def\@starttoc#1#2{\begingroup\makeatletter
   \setTrue{#1}%
@@ -2352,32 +2374,32 @@
   \addvspace{32\p@\@plus14\p@}%
 }
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\l at subsection}
-% \changes{v1.40}{2017/05/27}{Redefined macro} 
-%   Section spacing is more generous than for amsart
+% \changes{v1.40}{2017/05/27}{Redefined macro}
+%   Section spacing is more generous than for |amsart|
 %    \begin{macrocode}
 \def\l at section{\@tocline{1}{0pt}{1pc}{2pc}{}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\l at subsection}
-% \changes{v1.31}{2017/03/04}{Redefined macro} 
-%   Amsart has too large spacing
+% \changes{v1.31}{2017/03/04}{Redefined macro}
+%   The spacing in |amsart| is too large
 %    \begin{macrocode}
 \def\l at subsection{\@tocline{2}{0pt}{1pc}{3pc}{}}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 % \begin{macro}{\l at subsubsection}
-% \changes{v1.31}{2017/03/04}{Redefined macro} 
-%   Amsart has too large spacing
+% \changes{v1.31}{2017/03/04}{Redefined macro}
+%   The spacing in |amsart| is too large
 %    \begin{macrocode}
 \def\l at subsubsection{\@tocline{2}{0pt}{1pc}{5pc}{}}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % And |hyperref|
@@ -2420,9 +2442,11 @@
   \fi}
 %    \end{macrocode}
 %
-% Bibliography mangling. 
+% Bibliography mangling.
 % \changes{v1.33}{2017/03/23}{Moved \cs{citename} definition for
-% non-natbib bibliography, so a package may redefine it} 
+% non-natbib bibliography, so a package may redefine it}
+% \changes{v1.48}{2017/09/23}{\cs{citeyear} no longer behaves like
+% \cs{citeyearpar}}
 %    \begin{macrocode}
 \if at ACM@natbib
   \let\citeN\cite
@@ -2430,7 +2454,6 @@
   \let\citeANP\citeauthor
   \let\citeNN\citeyearpar
   \let\citeyearNP\citeyear
-  \let\citeyear\citeyearpar
   \let\citeNP\citealt
   \DeclareRobustCommand\citeA
      {\begingroup\NAT at swafalse
@@ -2442,14 +2465,15 @@
     \providecommand\citename[1]{#1}}
 \fi
 \newcommand\shortcite[2][]{%
-  \ifNAT at numbers\cite[#1]{#2}\else\citeyear[#1]{#2}\fi}
+  \ifNAT at numbers\cite[#1]{#2}\else\citeyearpar[#1]{#2}\fi}
 %    \end{macrocode}
 %
 %
 % \begin{macro}{\bibliographystyle}
 % \changes{v1.13}{2016/06/06}{Redefined macro}
-%   Amsart redefines \cs{bibliographystyle} since it prefers AMS
-%   bibliography.  We turn it back to \LaTeX\ definition:
+%   The |amsart| package redefines \cs{bibliographystyle} since it
+%   prefers the AMS bibliography style.  We turn it back to the
+%   \LaTeX\ definition:
 %    \begin{macrocode}
 \def\bibliographystyle#1{%
   \ifx\@begindocumenthook\@undefined\else
@@ -2459,13 +2483,15 @@
        \immediate\write\@auxout{\string\bibstyle{#1}}%
      \fi}}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 %
-% Graphics and color
+% Graphics and color.
+% \changes{1.48}{2017/10/22}{Added prologue option to xcolor}
 %    \begin{macrocode}
-\RequirePackage{graphicx, xcolor}
+\RequirePackage{graphicx}
+\RequirePackage[prologue]{xcolor}
 %    \end{macrocode}
 %
 % We define ACM colors according to~\cite{ACMIdentityStandards}:
@@ -2479,9 +2505,9 @@
 \definecolor[named]{ACMPurple}{cmyk}{0.55,1,0,0.15}
 \definecolor[named]{ACMDarkBlue}{cmyk}{1,0.58,0,0.21}
 %    \end{macrocode}
-% 
 %
-% Author draft mode
+%
+% Author-draft mode
 %    \begin{macrocode}
 \if at ACM@authordraft
   \RequirePackage{draftwatermark}
@@ -2488,12 +2514,12 @@
   \SetWatermarkFontSize{0.5in}
   \SetWatermarkColor[gray]{.9}
   \SetWatermarkText{\parbox{12em}{\centering
-      Unpublished working draft\\ 
-      Not for distribution}}
+      Unpublished working draft.\\
+      Not for distribution.}}
 \fi
 %    \end{macrocode}
-% 
 %
+%
 %\subsection{Paper size and paragraphing}
 %\label{sec:paper}
 %
@@ -2500,10 +2526,9 @@
 % \changes{v1.17}{2016/07/07}{Slightly decreased margins for sigs}
 % \changes{v1.29}{2017/01/22}{Increased head to 13pt}
 % \changes{v1.40}{2017/07/15}{Added heightrounded to geometry}
-% We use |geometry| for dimensions.  Note the presently margins do not
-% depend on the font size option - maybe we will need to change this.
-% See
-% \url{https://github.com/borisveytsman/acmart/issues/5#issuecomment-272881329}. 
+% We use |geometry| for dimensions.  Note that the present margins do not
+% depend on the font size option---we might need to change this.
+% See \url{https://github.com/borisveytsman/acmart/issues/5#issuecomment-272881329}.
 %    \begin{macrocode}
 \RequirePackage{geometry}
 \ifcase\ACM at format@nr
@@ -2597,12 +2622,12 @@
 %
 % \begin{macro}{\normalparindent}
 % \changes{v1.37}{2017/05/13}{Set \cs{normalparindent} (Matthew Fluet)}%
-%   |amsart| defines the \cs{normalparindent} length and initializes it
-%   to 12pt (the value of \cs{parindent} in |amsart|).  It is later used
-%   to set the \cs{listparindent} length in the |quotation| environment
-%   and the \cs{parindent} length in the \cs{@footnotetext} command.  We
-%   set \cs{normalparindent} to the value of \cs{parindent} as selected
-%   by |acmart| for consistent paragraph indents.
+%   The |amsart| package defines the \cs{normalparindent} length and
+%   initializes it to 12pt (the value of \cs{parindent} in |amsart|).  It
+%   is later used to set the \cs{listparindent} length in the |quotation|
+%   environment and the \cs{parindent} length in the \cs{@footnotetext}
+%   command.  We set \cs{normalparindent} to the value of \cs{parindent}
+%   as selected by |acmart| for consistent paragraph indents.
 %    \begin{macrocode}
 \setlength\normalparindent{\parindent}
 %    \end{macrocode}
@@ -2611,15 +2636,15 @@
 %
 % Footnotes require some consideration.  We have several layers of
 % footnotes:  frontmatter footnotes, ``regular'' footnotes and the
-% special insert for bibstrip.  In the old ACM classes bibstrip was a
-% \cs{@float}.  The problem with floats is that they tend to, well,
-% float---and we want the guarantee they stay.  
+% special insert for the bibstrip.  In the old ACM classes, the bibstrip
+% was a \cs{@float}.  The problem with floats is that they tend to, well,
+% float---and we want the guarantee they stay.
 %
-% We use \textsl{manyfoot} for layered footnotes instead.
+% We use |manyfoot| for layered footnotes instead.
 %
 % \begin{macro}{\copyrightpermissionfootnoterule}
 % \changes{v1.12}{2016/05/30}{Added macro}
-%   This is the footnote rule that separates bibstrip from the rest of
+%   This is the footnote rule that separates the bibstrip from the rest of
 %   the paper.  It is a full width rule.
 %    \begin{macrocode}
 \def\copyrightpermissionfootnoterule{\kern-3\p@
@@ -2634,8 +2659,8 @@
 \SelectFootnoteRule[2]{copyrightpermission}
 \DeclareNewFootnote{copyrightpermission}
 %    \end{macrocode}
-% 
 %
+%
 % \begin{macro}{\footnoterule}
 % \changes{v1.12}{2016/05/30}{Made shorter}
 %   Tschichold's rules:
@@ -2657,7 +2682,7 @@
       \normalcolor
       \unvbox\@mpfootins
     \fi
-    \@minipagefalse   %% added 24 May 89
+    \@minipagefalse
   \color at endgroup
   \egroup
   \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}}
@@ -2666,7 +2691,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@makefntext}
-%   We do note use indentation for footnotes
+%   We do not use indentation for footnotes
 %    \begin{macrocode}
 \def\@makefntext{\noindent\@makefnmark}
 %    \end{macrocode}
@@ -2674,7 +2699,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@footnotetext}
-%   In sigchi-a mode our footnotes are on the margins!
+%   In |sigchi-a| mode our footnotes are in the margin!
 %    \begin{macrocode}
 \if at ACM@sigchiamode
 \long\def\@footnotetext#1{\marginpar{%
@@ -2709,9 +2734,9 @@
         \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
     \color at endgroup}}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
-% 
+%
 % \begin{macro}{\@makefnmark}
 % \changes{v1.17}{2016/067/09}{Redefined}
 %   AMS classes use a buggy definition of \cs{makefnmark}.  We revert
@@ -2719,19 +2744,19 @@
 %    \begin{macrocode}
 \def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 %
 % \begin{macro}{\@textbottom}
-% \changes{v1.31}{2017/03/04}{Redefined} 
-%   Added some stretch according to David Carlisle's advice at
-%   http://tex.stackexchange.com/a/62318/5522
+% \changes{v1.31}{2017/03/04}{Redefined}
+%   Add some stretch according to David Carlisle's advice at
+%   \url{http://tex.stackexchange.com/a/62318/5522}
 %    \begin{macrocode}
 \def\@textbottom{\vskip \z@ \@plus 1pt}
 \let\@texttop\relax
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %\subsection{Fonts}
 %\label{sec:fonts}
@@ -2741,7 +2766,7 @@
 % \changes{v1.33}{2017/03/29}{Added cmap and glyphtounicode}
 % \changes{v1.40}{2017/05/27}{Added Ross Moore code for glyphtounicode}
 %
-% Somehow PDFTeX and XeTeX require different incantations to make PDF
+% Somehow PDFTeX and XeTeX require different incantations to make a PDF
 % compliant with the current Acrobat bugs.  Xpdf is much better.
 %
 % The code below is by Ross Moore.
@@ -2760,8 +2785,8 @@
 \fi
 \RequirePackage{cmap}
 %    \end{macrocode}
-% 
 %
+%
 % \begin{macro}{\if at ACM@newfonts}
 % \changes{v1.12}{2016/05/30}{Added macro}%
 %   Whether we load the new fonts
@@ -2769,21 +2794,22 @@
 \newif\if at ACM@newfonts
 \@ACM at newfontstrue
 \IfFileExists{libertine.sty}{}{\ClassWarning{\@classname}{You do not
-    have libertine package installed.  Please upgrade your 
+    have the libertine package installed.  Please upgrade your
     TeX}\@ACM at newfontsfalse}
 \IfFileExists{zi4.sty}{}{\ClassWarning{\@classname}{You do not
-    have zi4 package installed.  Please upgrade your TeX}\@ACM at newfontsfalse}
+    have the zi4 package installed.  Please upgrade your
+    TeX}\@ACM at newfontsfalse}
 \IfFileExists{newtxmath.sty}{}{\ClassWarning{\@classname}{You do not
-    have newtxmath package installed.  Please upgrade your
-    TeX}\@ACM at newfontsfalse} 
+    have the newtxmath package installed.  Please upgrade your
+    TeX}\@ACM at newfontsfalse}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
-% 
+%
 % \changes{v1.30}{2017/02/15}{Switched to T1: looks like libertine has
 % problems with \cs{l} in OT1}%
 % \changes{v1.33}{2017/03/12}{Switched to Type~1 fonts for libertine
-% even if OTF-capable engine is used (Kai Mindermann)} 
+% even if OTF-capable engine is used (Kai Mindermann)}
 % We use Libertine throughout.
 %    \begin{macrocode}
 \if at ACM@newfonts
@@ -2795,15 +2821,15 @@
 %    \end{macrocode}
 %
 % \begin{macro}{\liningnums}
-% \changes{v1.46}{2017/08/28}{Workaround for compatibility with fontspec} 
-% Libertine defines \cs{liningnums}, which makes fontspec unhappy.
-% While we do not use fontspec, some users do\dots
+% \changes{v1.46}{2017/08/28}{Workaround for compatibility with fontspec}
+% Libertine defines \cs{liningnums}, which makes |fontspec| unhappy.
+% While we do not use |fontspec|, some users do.
 %    \begin{macrocode}
 \let\liningnums\@undefined
 \AtEndPreamble{%
   \DeclareTextFontCommand{\liningnums}{\libertineLF}}
 %    \end{macrocode}
-% 
+%
 % \end{macro}
 %
 %
@@ -2818,13 +2844,13 @@
 %\subsection{Floats}
 %\label{sec:floats}
 %
-% We use |caption| package
+% We use the |caption| package
 %    \begin{macrocode}
 \RequirePackage{caption, float}
 \captionsetup[table]{position=top}
 \if at ACM@journal
   \captionsetup{labelfont={sf, small},
-    textfont={sf, small},  margin=\z@}
+    textfont={sf, small}, margin=\z@}
   \captionsetup[figure]{name={Fig.}}
 \else
   \captionsetup{labelfont={bf},
@@ -2851,7 +2877,7 @@
 %    \end{macrocode}
 %
 % \begin{macro}{sidebar}
-%   The sidebar environment:
+%   The |sidebar| environment:
 %    \begin{macrocode}
 \newfloat{sidebar}{}{sbar}
 \floatname{sidebar}{Sidebar}
@@ -2870,7 +2896,7 @@
 % \end{macro}
 %
 % \begin{macro}{marginfigure}
-%   The marginfigure environment:
+%   The |marginfigure| environment:
 %    \begin{macrocode}
 \newenvironment{marginfigure}{\Collect at Body\@marginfigure}{}
 %    \end{macrocode}
@@ -2888,7 +2914,7 @@
 % \end{macro}
 %
 % \begin{macro}{margintable}
-%   The margintable environment:
+%   The |margintable| environment:
 %    \begin{macrocode}
 \newenvironment{margintable}{\Collect at Body\@margintable}{}
 %    \end{macrocode}
@@ -2906,7 +2932,7 @@
 % \end{macro}
 %
 %
-% SIGCHI extended abstract provides an interesting possibility to push
+% SIGCHI extended abstracts provide an interesting possibility to push
 % into the margin.  Here we use |figure*| and |table*| for this.
 % \begin{macro}{\fulltextwidth}
 %   We define the width of the boxes as
@@ -2918,7 +2944,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@dblfloat}
-%   We redefine the double float command.  First, we make the size
+%   We redefine the double-float command.  First, we make the size
 %   bigger.  Second, our default position is going to be |tp| (to give
 %   marginalia a chance)
 %    \begin{macrocode}
@@ -2944,7 +2970,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@endwidefloatbox}
-%   This is the end of a wide box - we basically move everything
+%   This is the end of a wide box---we basically move everything
 %   to the left
 %    \begin{macrocode}
 \def\@endwidefloatbox{%
@@ -2985,12 +3011,12 @@
 %
 %
 % \changes{v1.37}{2017/05/13}{Reduce list indentation (Matthew Fluet)}%
-% AMS uses generous margins for the lists.  Note that |amsart| defines
-% \cs{leftmargin} values for list levels at begin document, so we must
-% redefine them in the same manner.  Also, note that |amsart|
-% redefines |enumerate| and |itemize| environments with a
+% The AMS uses generous margins for lists.  Note that |amsart| defines
+% \cs{leftmargin} values for list levels at the beginning of the
+% document, so we must redefine them in the same manner.  Also, note that
+% |amsart| redefines the |enumerate| and |itemize| environments with a
 % \cs{makelabel} command that uses \cs{llap}, so the \cs{labelwidth}
-% value is (effectively) irrelevant; nonetheless, we follow |amsart|
+% value is~(effectively) irrelevant; nonetheless, we follow |amsart|
 % and set \cs{labelwidth} to \cs{leftmargin} minus \cs{labelsep}.
 %    \begin{macrocode}
 \newdimen\@ACM at labelwidth
@@ -3039,11 +3065,11 @@
 % \begin{macro}{\descriptionlabel}
 % \changes{v1.37}{2017/05/13}{Reduce list indentation (Matthew Fluet)}%
 % \changes{v1.12}{2016/05/30}{Redefined}
-%   We do not use default colon as \cs{amsart} does:
+%   We do not use a colon by default like |amsart| does:
 %    \begin{macrocode}
 \renewcommand{\descriptionlabel}[1]{\upshape\bfseries #1}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 %
@@ -3050,8 +3076,8 @@
 % \begin{macro}{\description}
 % \changes{v1.37}{2017/05/13}{Reduce list indentation (Matthew Fluet)}%
 % \changes{v1.17}{2016/07/07}{Decreased indent}
-%   Make |description| environment indentation consistent with that of
-%   |itemize| and |enumerate| environments.
+%   Make the |description| environment indentation consistent with that of
+%   the |itemize| and |enumerate| environments.
 %    \begin{macrocode}
 \renewenvironment{description}{\list{}{%
     \labelwidth\@ACM at labelwidth
@@ -3061,11 +3087,11 @@
 }
 \let\enddescription=\endlist % for efficiency
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 %
-%\subsection{Top matter data}
+%\subsection{Top-matter data}
 %\label{sec:top_matter_data}
 %
 %
@@ -3075,7 +3101,7 @@
 % \changes{v1.36}{2017/05/13}{Added PACMHCI journal options}
 % \changes{v1.46}{2017/08/25}{PACM now set screen to true}
 %
-% We use keyval interface to define journal title and relevant
+% We use the |xkeyval| interface to define journal titles and the relevant
 % information
 %    \begin{macrocode}
 \define at choicekey*+{ACM}{acmJournal}[\@journalCode\@journalCode at nr]{%
@@ -3143,7 +3169,7 @@
   \def\@permissionCodeOne{0360-0300}%
 \or % IMWUT
   \def\@journalName{Proceedings of the ACM on Interactive, Mobile,
-    Wearable and Ubiquitous Technologies}%  
+    Wearable and Ubiquitous Technologies}%
   \def\@journalNameShort{Proc. ACM Interact. Mob. Wearable Ubiquitous Technol.}%
   \def\@permissionCodeOne{2474-9567}%
   \@ACM at screentrue
@@ -3170,22 +3196,22 @@
   \def\@permissionCodeOne{1550-4832}%
 \or % JOCCH
   \def\@journalName{ACM Journal on Computing and Cultural Heritage}%
-  \def\@journalName{ACM J. Comput. Cult. Herit.}%
+  \def\@journalNameShort{ACM J. Comput. Cult. Herit.}%
 \or % PACMHCI
   \def\@journalName{Proceedings of the ACM on Human-Computer Interaction}%
-  \def\@journalName{Proc. ACM Hum.-Comput. Interact.}%
+  \def\@journalNameShort{Proc. ACM Hum.-Comput. Interact.}%
   \def\@permissionCodeOne{2573-0142}%
   \@ACM at screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
 \or % PACMPL
   \def\@journalName{Proceedings of the ACM on Programming Languages}%
-  \def\@journalName{Proc. ACM Program. Lang.}%
+  \def\@journalNameShort{Proc. ACM Program. Lang.}%
   \def\@permissionCodeOne{2475-1421}%
   \@ACM at screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
 \or % POMACS
   \def\@journalName{Proceedings of the ACM on Measurement and Analysis of Computing Systems}%
-  \def\@journalName{Proc. ACM Meas. Anal. Comput. Syst.}%
+  \def\@journalNameShort{Proc. ACM Meas. Anal. Comput. Syst.}%
   \def\@permissionCodeOne{2476-1249}%
   \@ACM at screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
@@ -3199,6 +3225,7 @@
   \def\@permissionCodeOne{1936-7228}%
 \or % TACO
   \def\@journalName{ACM Transactions on Architecture and Code Optimization}%
+  \def\@journalNameShort{ACM Trans. Arch. Code Optim.}%
 \or % TALG
   \def\@journalName{ACM Transactions on Algorithms}%
   \def\@journalNameShort{ACM Trans. Algor.}%
@@ -3220,7 +3247,7 @@
 \or % THRI
   \def\@journalName{ACM Transactions on Human-Robot Interaction}%
   \def\@journalNameShort{ACM Trans. Hum.-Robot Interact.}%
-  \def\@permissionCodeOne{2573-9522}%  
+  \def\@permissionCodeOne{2573-9522}%
 \or % TIIS
   \def\@journalName{ACM Transactions on Interactive Intelligent Systems}%
   \def\@journalNameShort{ACM Trans. Interact. Intell. Syst.}%
@@ -3275,7 +3302,6 @@
   \def\@permissionCodeOne{0730-0301}
 \or % TOIS
   \def\@journalName{ACM Transactions on Information Systems}%
-  \def\@journalName{ACM Transactions on Information Systems}%
   \def\@permissionCodeOne{1046-8188}%
 \or % TOIT
   \def\@journalName{ACM Transactions on Internet Technology}%
@@ -3283,7 +3309,6 @@
   \def\@permissionCodeOne{1533-5399}%
 \or % TOMACS
   \def\@journalName{ACM Transactions on Modeling and Computer Simulation}%
-  \def\@journalName{ACM Transactions on Modeling and Computer Simulation}%
   \def\@journalNameShort{ACM Trans. Model. Comput. Simul.}%
 \or % TOMM
   \def\@journalName{ACM Transactions on Multimedia Computing, Communications and Applications}%
@@ -3394,7 +3419,7 @@
        \ifx\acmConference at name\acmConference at shortname\else
          \ (\acmConference at shortname)\fi}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 % \end{macro}
 %
@@ -3404,18 +3429,21 @@
 %    \begin{macrocode}
 \def\@editorsAbbrev{(Ed.)}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\@acmEditors}
 % \changes{v1.44}{2017/08/11}{Added macro}
 %   The list of editors
+%    \begin{macrocode}
 \def\@acmEditors{}
+%    \end{macrocode}
+%
 % \end{macro}
 %
 % \begin{macro}{\editor}
 % \changes{v1.44}{2017/08/11}{Added macro}
-%   Add new editor to the list
+%   Add a new editor to the list
 %    \begin{macrocode}
 \def\editor#1{\ifx\@acmEditors\@empty
     \gdef\@acmEditors{#1}%
@@ -3424,7 +3452,7 @@
     \g at addto@macro\@acmEditors{\and#1}%
 \fi}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\subtitle}
@@ -3450,7 +3478,7 @@
 %
 % \begin{macro}{\num at authors}
 % \changes{v1.46}{2017/08/27}{Introduced macro}
-%   The total number of authors.
+%   The total number of authors
 %    \begin{macrocode}
 \newcount\num at authors
 \num at authors=0\relax
@@ -3464,8 +3492,11 @@
 % \begin{macro}{\if at insideauthorgroup}
 % \changes{v1.15}{2016/06/25}{Introduced macro}
 %  Whether we are continuing an author group
+%    \begin{macrocode}
 \newif\if at insideauthorgroup
 \@insideauthorgroupfalse
+%    \end{macrocode}
+%
 % \end{macro}
 %
 % \begin{macro}{\author}
@@ -3535,11 +3566,11 @@
 %
 % \begin{macro}{\if at ACM@affiliation at obeypunctuation}
 % \changes{v1.33}{2017/03/28}{Added macro}
-%   Whether to use author's punctuation (by default false = add
-%   American punctuation)
+%   Whether to use the author's punctuation (false by default, which adds
+%   American-style address punctuation)
 %    \begin{macrocode}
 \define at boolkey+{@ACM at affiliation@}[@ACM at affiliation@]{obeypunctuation}%
-[true]{}{\ClassError{\@classname}{obeypunctuation must be true or false}}
+[true]{}{\ClassError{\@classname}{The option obeypunctuation can be either true or false}}
 %    \end{macrocode}
 %
 % \end{macro}
@@ -3552,12 +3583,12 @@
 %    \begin{macrocode}
 \def\additionalaffiliation#1{\authornote{\@additionalaffiliation{#1}}}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\@additionalaffiliation}
 % \changes{v1.31}{2017/03/04}{Added macro}
-%   Process additionalaffiliation inside \cs{authornote}
+%   Process \cs{additionalaffiliation} inside \cs{authornote}
 %    \begin{macrocode}
 \def\@additionalaffiliation#1{\bgroup
   \def\position##1{\ignorespaces}%
@@ -3575,8 +3606,8 @@
 %
 % \begin{macro}{\email}
 %   The macro \cs{email} mimics \cs{email} from |amsart|.
-%   Agian it has an optional argument we do not currently need,
-%   but keep for the possible future use.
+%   Again, it has an optional argument that we do not currently need
+%   but keep for possible future use.
 %    \begin{macrocode}
 \renewcommand{\email}[2][]{%
   \if at ACM@anonymous\else
@@ -3588,20 +3619,26 @@
 %
 % \begin{macro}{\orcid}
 % \changes{v1.15}{2016/06/25}{Introduced macro}
-%   Right now we do not typeset orcids
+%   Right now we do not typeset ORCIDs
+%    \begin{macrocode}
 \def\orcid#1{\unskip\ignorespaces}
+%    \end{macrocode}
+%
 % \end{macro}
 %
 % \begin{macro}{\authorsaddresses}
 % \changes{v1.46}{2017/08/27}{Introduced macro}
 % Setting up authors' addresses
+%    \begin{macrocode}
 \def\authorsaddresses#1{\def\@authorsaddresses{#1}}
 \authorsaddresses{\@mkauthorsaddresses}
+%    \end{macrocode}
+%
 % \end{macro}
 %
 %
 % \begin{macro}{\@titlenotes}
-%   The titlenotes
+%   The title notes
 %    \begin{macrocode}
 \def\@titlenotes{}
 %    \end{macrocode}
@@ -3609,7 +3646,7 @@
 % \end{macro}
 %
 % \begin{macro}{\titlenote}
-%   Adding note to the title
+%   Adding a note to the title
 %    \begin{macrocode}
 \def\titlenote#1{%
   \g at addto@macro\@title{\footnotemark}%
@@ -3624,7 +3661,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@subtitlenotes}
-%   The subtitlenotes
+%   The subtitle notes
 %    \begin{macrocode}
 \def\@subtitlenotes{}
 %    \end{macrocode}
@@ -3632,7 +3669,7 @@
 % \end{macro}
 %
 % \begin{macro}{\subtitlenote}
-%   Adding note to the subtitle
+%   Adding a note to the subtitle
 %    \begin{macrocode}
 \def\subtitlenote#1{%
   \g at addto@macro\@subtitle{\footnotemark}%
@@ -3648,7 +3685,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@authornotes}
-%   The authornotes
+%   The author notes
 %    \begin{macrocode}
 \def\@authornotes{}
 %    \end{macrocode}
@@ -3657,7 +3694,7 @@
 %
 %
 % \begin{macro}{\authornote}
-%   Adding note to the author
+%   Adding a note to the author
 %    \begin{macrocode}
 \def\authornote#1{%
   \if at ACM@anonymous\else
@@ -3671,7 +3708,7 @@
 %
 % \begin{macro}{\authornotemark}
 % \changes{v1.39}{2017/05/14}{Added macro}
-% Adding footnotemark to authors
+% Adding a footnote mark to the authors
 %    \begin{macrocode}
 \newcommand\authornotemark[1][\relax]{%
   \ifx#1\relax\relax\relax
@@ -3680,7 +3717,7 @@
   \g at addto@macro\addresses{\@@authornotemark{#1}}%
   \fi}
 %    \end{macrocode}
-% 
+%
 % \end{macro}
 %
 % \begin{macro}{\acmVolume}
@@ -3728,7 +3765,7 @@
 % \begin{macro}{\acmYear}
 % \changes{v1.17}{2016/07/10}{The default is now numerical}
 % \changes{v1.31}{2017/03/04}{The default now is the current year
-% (Matteo Riondato)} 
+% (Matteo Riondato)}
 %   The current year
 %    \begin{macrocode}
 \def\acmYear#1{\def\@acmYear{#1}}
@@ -3740,7 +3777,7 @@
 % \begin{macro}{\acmMonth}
 % \changes{v1.17}{2016/07/09}{The default must be numerical.   Closes \#50.}
 % \changes{v1.31}{2017/03/04}{The default now is the current month
-% (Matteo Riondato)} 
+% (Matteo Riondato)}
 %   The current month
 %    \begin{macrocode}
 \def\acmMonth#1{\def\@acmMonth{#1}}
@@ -3773,18 +3810,18 @@
 %
 % \begin{macro}{\acmSubmissionID}
 % \changes{v1.33}{2017/03/29}{Added macro}
-%   The submission id
+%   The submission ID
 %    \begin{macrocode}
 \def\acmSubmissionID#1{\def\@acmSubmissionID{#1}}
 \acmSubmissionID{}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 %
 % \begin{macro}{\acmISBN}
 % \changes{v1.04}{2016/04/26}{Name change by Matthew Fluet}
-%   The book isbn
+%   The book ISBN
 %    \begin{macrocode}
 \def\acmISBN#1{\def\@acmISBN{#1}}
 \acmISBN{978-x-xxxx-xxxx-x/YY/MM}
@@ -3794,7 +3831,7 @@
 %
 % \begin{macro}{\acmDOI}
 % \changes{v1.04}{2016/04/26}{Name change by Matthew Fluet}
-%   The paper doi
+%   The paper DOI
 %    \begin{macrocode}
 \def\acmDOI#1{\def\@acmDOI{#1}}
 \acmDOI{10.1145/nnnnnnn.nnnnnnn}
@@ -3804,13 +3841,13 @@
 %
 % \begin{macro}{\if at ACM@badge}
 % \changes{v1.06}{2016/05/01}{Added macro}
-%   Whether to print badge.  Note that either left or right badge
+%   Whether to print a badge.  Note that either a left or right badge
 %   triggers it:
 %    \begin{macrocode}
 \newif\if at ACM@badge
 \@ACM at badgefalse
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\@ACM at badge@width}
@@ -3820,7 +3857,7 @@
 \newlength\@ACM at badge@width
 \setlength\@ACM at badge@width{5pc}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 %
@@ -3830,7 +3867,7 @@
 %    \begin{macrocode}
 \newlength\@ACM at title@width
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 %
@@ -3841,7 +3878,7 @@
 \newlength\@ACM at badge@skip
 \setlength\@ACM at badge@skip{1pc}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\acmBadgeR}
@@ -3854,7 +3891,7 @@
 \def\@acmBadgeR at url{}
 \def\@acmBadgeR at image{}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\acmBadgeL}
@@ -3867,7 +3904,7 @@
 \def\@acmBadgeL at url{}
 \def\@acmBadgeL at image{}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 %
@@ -3882,8 +3919,8 @@
 %
 % \begin{macro}{\terms}
 % \changes{v1.34}{2017/04/09}{The \cs{terms} command now just produces
-% a warning} 
-%   Terms are obsolete, we use CCS now. 
+% a warning}
+%   Terms are obsolete.  We use CCS now.
 %    \begin{macrocode}
 \def\terms#1{\ClassWarning{\@classname}{The command \string\terms{} is
     obsolete.  I am going to ignore it}}
@@ -3892,7 +3929,7 @@
 % \end{macro}
 %
 % \begin{macro}{\keywords}
-%   Keywords are mostly obsolete, we use CCS now.  Still it makes
+%   Keywords are mostly obsolete.  We use CCS now.  Still it makes
 %   sense to keep them for compatibility.
 %    \begin{macrocode}
 \def\keywords#1{\def\@keywords{#1}}
@@ -3903,8 +3940,8 @@
 %
 %
 % \begin{macro}{abstract}
-%   Amsart puts |abstract| in the box.  Since we do not know whether
-%   we will use two column mode, we prefer to save the text
+%   The |amsart| package puts |abstract| in a box.  Since we do not
+%   know whether we will use two-column mode, we prefer to save the text
 %    \begin{macrocode}
 \renewenvironment{abstract}{\Collect at Body\@saveabstract}{}
 %    \end{macrocode}
@@ -3937,13 +3974,13 @@
     \ClassInfo{\@classname}{Printing CCS}%
   \else
     \ClassInfo{\@classname}{Suppressing CCS}%
-  \fi}{\ClassError{\@classname}{printccs must be true or false}}
+  \fi}{\ClassError{\@classname}{The option printccs can be either true or false}}
 %    \end{macrocode}
 %
 % \end{macro}
 % \begin{macro}{\if at ACM@printacmref}
 % \changes{v1.17}{2016/07/10}{Renamed from \cs{if at ACM@printbib}}
-%   Whether to print ACM bib
+%   Whether to print the ACM bibstrip
 %    \begin{macrocode}
 \define at boolkey+{@ACM at topmatter@}[@ACM@]{printacmref}[true]{%
   \if at ACM@printacmref
@@ -3950,7 +3987,7 @@
     \ClassInfo{\@classname}{Printing bibformat}%
   \else
     \ClassInfo{\@classname}{Suppressing bibformat}%
-  \fi}{\ClassError{\@classname}{printacmref must be true or false}}
+  \fi}{\ClassError{\@classname}{The option printacmref can be either true or false}}
 %    \end{macrocode}
 %
 % \end{macro}
@@ -3964,20 +4001,20 @@
     \ClassInfo{\@classname}{Printing folios}%
   \else
     \ClassInfo{\@classname}{Suppressing folios}%
-  \fi}{\ClassError{\@classname}{printfolios must be true or false}}
+  \fi}{\ClassError{\@classname}{The option printfolios can be either true or false}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\@ACM at authorsperrow}
 % \changes{v1.36}{2017/05/13}{Added macro}
-%   The number of authors per row.  0 means use default algorithm.
+%   The number of authors per row.  0 means use the default algorithm.
 %    \begin{macrocode}
 \define at cmdkey{@ACM at topmatter@}[@ACM@]{authorsperrow}[0]{%
   \IfInteger{#1}{\ClassInfo{\@classname}{Setting authorsperrow to
-      #1}}{\ClassWarning{\@classname}{Parameter authorsperrow must be
+      #1}}{\ClassWarning{\@classname}{The parameter authorsperrow must be
       numerical. Ignoring the input #1}\gdef\@ACM at authorsperrow{0}}}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\settopmatter}
@@ -4081,8 +4118,8 @@
   \expandafter\ifx\csname CCS at General@#2\endcsname\relax
     \expandafter\gdef\csname CCS at General@#2\endcsname{\textbullet\
       \textbf{#2}}%
-    \expandafter\gdef\csname CCS at Punctuation@#2\endcsname{; }%   
-    \expandafter\gdef\csname CCS at Specific@#2\endcsname{}%   
+    \expandafter\gdef\csname CCS at Punctuation@#2\endcsname{; }%
+    \expandafter\gdef\csname CCS at Specific@#2\endcsname{}%
   \g at addto@macro{\@concepts}{\csname CCS at General@#2\endcsname
     \csname CCS at Punctuation@#2\endcsname
     \csname CCS at Specific@#2\endcsname}%
@@ -4089,7 +4126,7 @@
   \fi
   \ifx#3\relax\relax\else
     \expandafter\gdef\csname CCS at Punctuation@#2\endcsname{
-      \textrightarrow\ }%   
+      \textrightarrow\ }%
     \expandafter\g at addto@macro\expandafter{\csname CCS at Specific@#2\endcsname}{%
      \ifnum#1>499\textbf{#3}; \else
      \ifnum#1>299\textit{#3}; \else
@@ -4115,7 +4152,7 @@
 % This is from |acmcopyright.sty|
 %
 % \begin{macro}{\if at printcopyright}
-%   A flag whether to print copyright symbol
+%   Whether to print a copyright symbol
 %    \begin{macrocode}
 \newif\if at printcopyright
 \@printcopyrighttrue
@@ -4124,7 +4161,7 @@
 % \end{macro}
 %
 % \begin{macro}{\if at printpermission}
-%   Whether to print permission block
+%   Whether to print the permission block
 %    \begin{macrocode}
 \newif\if at printpermission
 \@printpermissiontrue
@@ -4133,7 +4170,7 @@
 % \end{macro}
 %
 % \begin{macro}{\if at acmowned}
-%   Whether ACM ownes the rights to the paper
+%   Whether the ACM owns the rights to the paper
 %    \begin{macrocode}
 \newif\if at acmowned
 \@acmownedtrue
@@ -4149,9 +4186,9 @@
 \define at choicekey*{ACM@}{acmcopyrightmode}[%
   \acm at copyrightinput\acm at copyrightmode]{none,%
     acmcopyright,acmlicensed,rightsretained,%
-    usgov,usgovmixed,cagov,cagovmixed,%
-    licensedusgovmixed,%
-    licensedcagov,licensedcagovmixed,othergov,licensedothergov}{%
+    usgov,usgovmixed,cagov,cagovmixed,licensedusgovmixed,%
+    licensedcagov,licensedcagovmixed,othergov,licensedothergov,%
+    iw3c2w3,iw3c2w3g}{%
   \@printpermissiontrue
   \@printcopyrighttrue
   \@acmownedtrue
@@ -4190,6 +4227,12 @@
   \fi
   \ifnum\acm at copyrightmode=12\relax % licensedothergov
    \@acmownedfalse
+  \fi
+  \ifnum\acm at copyrightmode=13\relax % iw3c2w3
+   \@acmownedfalse
+  \fi
+  \ifnum\acm at copyrightmode=14\relax % iw3c2w3g
+   \@acmownedfalse
   \fi}
 %    \end{macrocode}
 %
@@ -4213,7 +4256,7 @@
   Association for Computing Machinery.
   \or % acmlicensed
   Copyright held by the owner/author(s). Publication rights licensed to
-  Association for Computing Machinery.
+  the Association for Computing Machinery.
   \or % rightsretained
   Copyright held by the owner/author(s).
   \or % usgov
@@ -4225,18 +4268,24 @@
   Association for Computing Machinery.
   \or %licensedusgovmixed
   Copyright held by the owner/author(s). Publication rights licensed to
-  Association for Computing Machinery.
+  the Association for Computing Machinery.
   \or % licensedcagov
   Crown in Right of Canada. Publication rights licensed to
-  Association for Computing Machinery.
+  the Association for Computing Machinery.
   \or %licensedcagovmixed
   Copyright held by the owner/author(s). Publication rights licensed to
-  Association for Computing Machinery.
+  the Association for Computing Machinery.
   \or % othergov
   Association for Computing Machinery.
   \or % licensedothergov
   Copyright held by the owner/author(s). Publication rights licensed to
-  Association for Computing Machinery.
+  the Association for Computing Machinery.
+  \or % ic2w3www
+  IW3C2 (International World Wide Web Conference Committee), published
+  under Creative Commons CC~BY~4.0 License.
+  \or % ic2w3wwwgoogle
+  IW3C2 (International World Wide Web Conference Committee), published
+  under Creative Commons CC~BY-NC-ND~4.0 License.
   \fi}
 %    \end{macrocode}
 %
@@ -4245,11 +4294,11 @@
 % \begin{macro}{\@formatdoi}
 % \changes{v1.03}{2016/04/22}{Added macro}
 % \changes{v1.32}{2017/04/07}{New doi format}
-%   Print a clickable doi
+%   Print a clickable DOI
 %    \begin{macrocode}
 \def\@formatdoi#1{\url{https://doi.org/#1}}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\@copyrightpermission}
@@ -4367,7 +4416,26 @@
    retains a nonexclusive, royalty-free right to publish or reproduce
    this article, or to allow others to do so, for Government purposes
    only.
-  \fi}
+ \or % iw3c2w3
+   This paper is published under the Creative Commons Attribution~4.0
+   International (CC~BY~4.0) license. Authors reserve their rights to
+   disseminate the work on their personal and corporate Web sites with
+   the appropriate attribution. In case of republication, reuse, etc.,
+   the following attribution should be used: ``Published in
+   WWW\@acmYear{} Proceedings \textcopyright{} \@copyrightyear{}
+   International World Wide Web Conference Committee, published under
+   Creative Commons~CC~BY~4.0  License.'' 
+ \or % iw3c2w3g
+   This paper is published under the Creative Commons
+   Attribution-NonCommercial-NoDerivs~4.0 International
+   (CC~BY-NC-ND~4.0) license. Authors reserve their rights to
+   disseminate the work on their personal and corporate Web sites with
+   the appropriate attribution. In case of republication, reuse, etc.,
+   the following attribution should be used: ``Published in
+   WWW\@acmYear{} Proceedings \textcopyright{} \@copyrightyear
+   International World Wide Web Conference Committee, published under
+   Creative Commons CC~BY-NC-ND~4.0 License.''   
+ \fi}
 %    \end{macrocode}
 %
 % \end{macro}
@@ -4410,7 +4478,7 @@
 % \end{macro}
 %
 % \begin{macro}{\thanks}
-%   We redefine |amsart| \cs{thanks}, so the |anonymous| key works
+%   We redefine |amsart| \cs{thanks} so the |anonymous| key works
 %    \begin{macrocode}
 \renewcommand{\thanks}[1]{%
   \@ifnotempty{#1}{%
@@ -4427,9 +4495,9 @@
 % \label{sec:makefile}
 %
 % \begin{macro}{\mktitle at bx}
-%   Some of our formats use two column design, some use one column
-%   one.  In all cases we use wide title.  Thus we typeset the top
-%   matter in a special box to be use in the construction
+%   Some of our formats use a two-column design.  Some use a one-column
+%   design.  In all cases we use a wide title.  Thus we typeset the top
+%   matter in a special box to be used in the construction
 %   \cs{@twocolumn}\oarg{box}.
 %    \begin{macrocode}
 \newbox\mktitle at bx
@@ -4445,7 +4513,7 @@
 % footnotes order}
 % \changes{v1.10}{2016/05/23}{Corrected a bug with doi in manuscript
 % and author vertsion,
-% \url{https://github.com/borisveytsman/acmart/issues/36}} 
+% \url{https://github.com/borisveytsman/acmart/issues/36}}
 % \changes{v1.12}{2016/05/30}{Moved thankses to copyrightpermission box}
 % \changes{v1.33}{2017/03/27}{Fixed the bug with figures on top and
 % bottom of the title page, thanks to David Epstein}
@@ -4454,16 +4522,21 @@
 % \changes{v1.34}{2017/04/09}{The \cs{terms} command is now obsolete}
 % \changes{v1.34}{2017/04/11}{Rearranged bibstrip}
 % \changes{v1.44}{2017/07/30}{Empty DOI or ISBN are not printed (by
-% Michael Ekstrand)} 
-% \changes{v1.46}{2017/08/27}{Added authors' addresses} 
-% \changes{v1.46}{2017/08/28}{Thankses go before authors' addresses} 
-%   The (in)famous \cs{maketitle}.  Note that in sigchi-a mode authors
+% Michael Ekstrand)}
+% \changes{v1.46}{2017/08/27}{Added authors' addresses}
+% \changes{v1.46}{2017/08/28}{Thankses go before authors' addresses}
+% \changes{v1.48}{2017/09/23}{Added acmart and version info to
+% pdfcreator tag}
+% \changes{v1.48}{2017/10/14}{Suppressed empty DOI (Serguei Mokhov)}
+% \changes{v1.48}{2017/11/18}{Added language and doctitle attributes
+% to PDF (Andreas Reichinger)}
+%   The (in)famous \cs{maketitle}.  Note that in |sigchi-a| mode, authors
 %   are \emph{not} in the title box.
 %
 %  Another note: there is a subtle difference between author notes,
-%  title notes and thankses.  The latter refer to the paper itself,
+%  title notes and thanks.  The latter two refer to the paper itself
 %  and therefore belong to the copyright/permission block.  By the
-%  way, this was the default behavior of the old ACM classes.  
+%  way, this was the default behavior of the old ACM classes.
 %    \begin{macrocode}
 \def\maketitle{%
   \if at ACM@anonymous
@@ -4474,9 +4547,9 @@
   \let\@footnotemark\@footnotemark at nolink
   \let\@footnotetext\@footnotetext at nolink
   \renewcommand\thefootnote{\@fnsymbol\c at footnote}%
-  \global\@topnum\z@ % this prevents floats from falling 
+  \global\@topnum\z@ % this prevents floats from falling
                      % at the top of page 1
-  \global\@botnum\z@ % we do not want them to be on bottom either
+  \global\@botnum\z@ % we do not want them to be on the bottom either
   \hsize=\textwidth
   \def\@makefnmark{\hbox{\@textsuperscript{\@thefnmark}}}%
   \@mktitle\if at ACM@sigchiamode\else\@mkauthors\fi\@mkteasers
@@ -4487,7 +4560,8 @@
   \@titlenotes
   \@subtitlenotes
   \@authornotes
-  \let\@makefnmark\relax  \let\@thefnmark\relax
+  \let\@makefnmark\relax
+  \let\@thefnmark\relax
   \let\@makefntext\noindent
   \ifx\@empty\thankses\else
     \footnotetextauthorsaddresses{%
@@ -4503,9 +4577,8 @@
   \fi
   \footnotetextcopyrightpermission{%
     \if at ACM@authordraft
-        \raisebox{-2ex}[\z@][\z@]{\makebox[0pt][l]{\large\bfseries 
-            Unpublished
-            working draft. Not for distribution}}% 
+        \raisebox{-2ex}[\z@][\z@]{\makebox[0pt][l]{\large\bfseries
+            Unpublished working draft. Not for distribution.}}%
        \color[gray]{0.9}%
     \fi
     \parindent\z@\parskip0.1\baselineskip
@@ -4528,7 +4601,7 @@
       \if at ACM@authorversion
           This is the author's version of the work. It is posted here for
           your personal use. Not for redistribution. The definitive Version
-          of Record was published in 
+          of Record was published in
           \if at ACM@journal
             \emph{\@journalName}%
           \else
@@ -4575,10 +4648,17 @@
   \if at ACM@printacmref
      \@mkbibcitation
   \fi
-  \hypersetup{pdfauthor={\authors},
+  \hypersetup{%
+    pdflang={English},
+    pdfdisplaydoctitle,
+    pdfauthor={\authors},
     pdftitle={\@title},
     pdfsubject={\@concepts},
-    pdfkeywords={\@keywords}}%
+    pdfkeywords={\@keywords},
+    pdfcreator={LaTeX with acmart
+      \csname ver at acmart.cls\endcsname\space
+      and hyperref
+      \csname ver at hyperref.sty\endcsname}}%
   \@printendtopmatter
   \@afterindentfalse
   \@afterheading
@@ -4588,7 +4668,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@specialsection}
-%   This macro starts section for proceedings and uses small for journals
+%   This macro starts sections for proceedings and uses \cs{small} for journals
 %    \begin{macrocode}
 \def\@specialsection#1{%
   \ifcase\ACM at format@nr
@@ -4619,9 +4699,9 @@
 % \begin{macro}{\@printtopmatter}
 % \changes{v1.06}{2016/05/01}{Added processing badges}
 % \changes{v1.46}{2017/08/29}{Deleted rule}
-%   The printing of top matter starts the new page, and uses the given
-%   title box.  Note that for sigchi-a we print badges here rather
-%   than in \cs{mktitle} since we want them on the margins.
+%   The printing of top matter starts a new page and uses the given
+%   title box.  Note that for |sigchi-a| we print badges here rather
+%   than in \cs{mktitle} since we want them in the margins.
 %    \begin{macrocode}
 \def\@printtopmatter{%
   \ifx\@startPage\@empty
@@ -4700,8 +4780,8 @@
 % \begin{macro}{\@titlefont}
 % \changes{v1.06}{2016/05/01}{Added macro}
 % \changes{v1.45}{2017/08/15}{Switched \cs{bfeseries}\cs{sffamily} to
-% \cs{sffamily}\cs{bfseries}} 
-%   The font to typeset title
+% \cs{sffamily}\cs{bfseries}}
+%   The font to typeset the title
 %    \begin{macrocode}
 \def\@titlefont{%
   \ifcase\ACM at format@nr
@@ -4725,13 +4805,13 @@
      \Huge\bfseries
   \fi}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\@subtitlefont}
 % \changes{v1.06}{2016/05/01}{Added macro}
 % \changes{v1.33}{2017/03/12}{Added \cs{normalsize}}
-%   The font to typeset title
+%   The font to typeset the subtitle
 %    \begin{macrocode}
 \def\@subtitlefont{\normalsize
   \ifcase\ACM at format@nr
@@ -4755,7 +4835,7 @@
      \mdseries
   \fi}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\@mktitle at i}
@@ -4797,7 +4877,7 @@
 %
 % \begin{macro}{\@mktitle at ii}
 % \changes{v1.06}{2016/05/01}{Now this macro is obsolete}
-%   The version of \cs{mktitle} for TOG.  Since v1.06 is subsumed by
+%   The version of \cs{mktitle} for TOG.  Since v1.06, this is subsumed by
 %   the \cs{mktitle at i} macro
 % \end{macro}
 %
@@ -4805,8 +4885,8 @@
 % \begin{macro}{\@mktitle at iii}
 % \changes{v1.06}{2016/05/01}{Made more generic}
 % \changes{v1.06}{2016/05/01}{Added processing badges}
-%   The version of \cs{@mktitle} for sigproc.  Note that since the
-%   title is centered, we leave the space for the left badge even if
+%   The version of \cs{@mktitle} for SIG proceedings.  Note that since
+%   the title is centered, we leave space for the left badge even if
 %   only the right badge is defined.
 %    \begin{macrocode}
 \def\@mktitle at iii{\hsize=\textwidth
@@ -4844,7 +4924,7 @@
 %
 % \begin{macro}{\@mktitle at iv}
 % \changes{v1.06}{2016/05/01}{Made more generic}
-%   The version of \cs{@mktitle} for sigchi-a
+%   The version of \cs{@mktitle} for |sigchi-a|
 %    \begin{macrocode}
 \def\@mktitle at iv{\hsize=\textwidth
     \setbox\mktitle at bx=\vbox{\raggedright\leftskip5pc\@titlefont
@@ -4861,12 +4941,12 @@
 % \begin{macro}{\@ACM at addtoaddress}
 % \changes{v1.15}{2016/07/03}{Added macro}
 % \changes{v1.33}{2017/03/28}{Added obeypunctuation code}
-%   The macro adds an item to address using the following rules:
+%   This macro adds an item to the address using the following rules:
 %   \begin{enumerate}
 %   \item If we start a paragraph, add the item
 %   \item Otherwise, add a comma and the item
-%   \item However, the comma is deleted, if it is on the end of the
-%   line.  We use the magic cleaders trick for this.
+%   \item However, the comma is deleted if it is at the end of a
+%   line.  We use the magic \cs{cleaders} trick for this.
 %   \end{enumerate}
 %    \begin{macrocode}
 \newbox\@ACM at commabox
@@ -4911,7 +4991,7 @@
 % \changes{v1.33}{2017/03/28}{Added obeypunctuation code}
 % \changes{v1.40}{2017/05/27}{Fixed bugs with extra spaces}
 % \changes{v1.43}{2017/07/11}{Added comma before country for journals}
-% \changes{v1.46}{Corrected spacing for institution}
+% \changes{v1.46}{2017/08/30}{Corrected spacing for institution}
 %   Theoretically we can define the macros for \cs{affiliation} inside
 %   the \cs{@mkauthors}-style commands.  However, this would lead to a
 %   strange error if an author uses them outside \cs{affiliation}.  Of
@@ -4938,7 +5018,7 @@
   \let\country\@ACM at addtoaddress
 \fi
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 % \end{macro}
 % \end{macro}
@@ -4951,7 +5031,7 @@
 % \begin{macro}{\@mkauthors}
 % \changes{v1.17}{2016/07/09}{TOG now uses the same authors block as
 % other journals}
-%   Typesetting authors
+%   Typesetting the authors
 %    \begin{macrocode}
 \def\@mkauthors{\begingroup
   \hsize=\textwidth
@@ -5041,7 +5121,7 @@
   \fi
   \def\@currentaffiliations{}}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 %
@@ -5049,7 +5129,7 @@
 % \changes{v1.18}{2016/07/12}{Now we andify affiliations}
 % \changes{v1.33}{2017/03/28}{Added obeypunctuation code}
 % \changes{v1.40}{2017/06/04}{Switched to MakeTextUppercase}
-%   This is version used in most journal formats.  Note that \cs{and} between
+%   This version is used in most journal formats.  Note that \cs{and} between
 %   authors with the same affiliation becomes \verb*| and |:
 %    \begin{macrocode}
 \def\@mkauthors at i{%
@@ -5088,12 +5168,13 @@
 %
 % \begin{macro}{\@mkauthors at ii}
 % \changes{v1.17}{2016/07/09}{Deleted}
-%   \cs{@mkauthors at iI} was version used in acmtog.  No longer necessary
+%   The \cs{@mkauthors at ii} command was the version used in |acmtog|.
+%   It is no longer necessary.
 %
 % \end{macro}
 %
 % \begin{macro}{\author at bx}
-%   The box to put individual author to
+%   The box to put an individual author in
 %    \begin{macrocode}
 \newbox\author at bx
 %    \end{macrocode}
@@ -5109,7 +5190,7 @@
 % \end{macro}
 %
 % \begin{macro}{\author at bx@sep}
-%   The separation between the author boxes
+%   The separation between author boxes
 %    \begin{macrocode}
 \newskip\author at bx@sep
 \author at bx@sep=1pc\relax
@@ -5119,7 +5200,7 @@
 %
 % \begin{macro}{\@typeset at author@bx}
 % \changes{v1.15}{2016/07/04}{Moved to separate macro}
-%   Typesetting the box with authors.  Note that in SIGCHI-A the box
+%   Typesetting the box with authors.  Note that in |sigchi-a| the box
 %   is not centered.
 %    \begin{macrocode}
 \def\@typeset at author@bx{\bgroup\hsize=\author at bx@wd\def\and{\par}%
@@ -5130,7 +5211,7 @@
   \gdef\@currentauthors{}%
   \gdef\@currentaffiliation{}}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 %
@@ -5138,7 +5219,7 @@
 % \changes{v1.15}{2016/07/04}{New authors system}
 % \changes{v1.33}{2017/03/28}{Added obeypunctuation code}
 % \changes{v1.36}{2017/05/12}{Added authorsperrow overrride}
-%   The |sigconf| version.  Here we use centered design with each
+%   The |sigconf| version.  Here we use a centered design with each
 %   author in a separate box.
 %    \begin{macrocode}
 \def\@mkauthors at iii{%
@@ -5196,7 +5277,7 @@
   \global\let\and\@typeset at author@bx
 }%
 %    \end{macrocode}
-% Actual typesetting is done by \cs{and} macro:
+% Actual typesetting is done by the \cs{and} macro:
 %    \begin{macrocode}
   \hsize=\textwidth
   \global\setbox\mktitle at bx=\vbox{\noindent
@@ -5211,9 +5292,8 @@
 % \begin{macro}{\@mkauthors at iv}
 % \changes{v1.33}{2017/03/28}{Added obeypunctuation code}
 % \changes{v1.36}{2017/05/12}{Added authorsperrow overrride}
-%   The |sigchia| version.  Now we put
-%   authors in the main text, and no more than 2 authors per line,
-%   unless overriden.
+%   The |sigchi-a| version.  We put authors in the main text with
+%   no more than 2 authors per line, unless overriden.
 %    \begin{macrocode}
 \def\@mkauthors at iv{%
 %    \end{macrocode}
@@ -5264,7 +5344,7 @@
   \global\let\and\@typeset at author@bx}%
 %
 %    \end{macrocode}
-% Actual typesetting is done by \cs{and} macro
+% Actual typesetting is done by the \cs{and} macro
 %    \begin{macrocode}
     \bgroup\hsize=\columnwidth
     \par\raggedright\leftskip=\z@
@@ -5277,6 +5357,7 @@
 % \begin{macro}{\@mkauthorsaddresses}
 % \changes{v1.46}{2017/08/27}{Introduced macro}
 % Typesetting authors' addresses in the footnote style
+%    \begin{macrocode}
 \def\@mkauthorsaddresses{%
   \ifnum\num at authors>1\relax
   Authors' \else Author's \fi
@@ -5296,10 +5377,12 @@
   \def\email##1##2{\unskip\@addpunct, \nolinkurl{##2}}%
   \addresses
   \egroup}
+%    \end{macrocode}
+%
 % \end{macro}
 %
 % \begin{macro}{\@setaddresses}
-%   This is an |amsart| macro, which we do not need.
+%   This is an |amsart| macro that we do not need.
 %    \begin{macrocode}
 \def\@setaddresses{}
 %    \end{macrocode}
@@ -5308,8 +5391,8 @@
 %
 %
 % \begin{macro}{\@authornotemark}
-% Adding footnotemark to authors.  This version adds ``normal''
-% footnotemark.
+% Adding a footnote mark to authors.  This version adds a ``normal''
+% footnote mark.
 %    \begin{macrocode}
 \def\@authornotemark{\g at addto@macro\@currentauthors{\footnotemark\relax}}
 %    \end{macrocode}
@@ -5318,15 +5401,15 @@
 %
 % \begin{macro}{\@@authornotemark}
 % \changes{v1.39}{2017/05/14}{Added macro}
-% Adding footnotemark to authors with the given number
+% Adding a footnote mark to authors with a given number
 %    \begin{macrocode}
 \def\@@authornotemark#1{\g at addto@macro\@currentauthors{\footnotemark[#1]}}
 %    \end{macrocode}
-% 
+%
 % \end{macro}
 %
 % \begin{macro}{\@mkteasers}
-%   Typesetting teasers
+%   Typesetting the teasers
 %    \begin{macrocode}
 \def\@mkteasers{%
   \ifx\@teaserfigures\@empty\else
@@ -5343,14 +5426,17 @@
 % \changes{v1.19}{2016/07/28}{Include 'Abstract' in PDF bookmarks
 % (Matthew Fluet)}
 % \changes{v1.20}{2016/08/03}{Deleted spurious space}
-% \changes{v1.29}{2017/01/22}{Removed spurious indentation (John Wickerson)}
-%   Typesetting abstract
+% \changes{v1.29}{2017/01/22}{Removed spurious indentation (John
+% Wickerson)}
+% \changes{v1.48}{2017/09/16}{Removed spurious indentation if abstract
+% is followed by an empty line}
+%   Typesetting the abstract
 %    \begin{macrocode}
 \def\@mkabstract{\bgroup
-  \ifx\@abstract\@lempty\else  
+  \ifx\@abstract\@lempty\else
   {\phantomsection\addcontentsline{toc}{section}{Abstract}%
     \if at ACM@journal
-       \small\noindent
+       \everypar{\setbox\z@\lastbox\everypar{}}\small
     \else
       \section*{Abstract}%
     \fi
@@ -5368,14 +5454,14 @@
 % \changes{v1.44}{2017/07/30}{If the paper has just one page, use
 % `page' instead of `pages'}
 % \changes{v1.46}{2017/08/25}{Added subtitle}
-%   Print bibcitation format
+%   Print the |bibcitation| format
 %    \begin{macrocode}
-\def\@mkbibcitation{\bgroup  
+\def\@mkbibcitation{\bgroup
   \def\@pages at word{\ifnum\getrefnumber{TotPages}=1\relax page\else pages\fi}%
   \def\footnotemark{}%
   \def\\{\unskip{} \ignorespaces}%
   \def\footnote{\ClassError{\@classname}{Please do note use footnotes
-      inside \string\title{} or \string\author{} command! Use
+      inside a \string\title{} or \string\author{} command! Use
       \string\titlenote{} or \string\authornote{} instead!}}%
   \def\@article at string{\ifx\@acmArticle\@empty{\ }\else,
     Article~\@acmArticle\ \fi}%
@@ -5384,17 +5470,17 @@
   \ifx\@subtitle\@empty. \else: \@subtitle. \fi
   \if at ACM@journal
      \textit{\@journalNameShort}
-     \@acmVolume, \@acmNumber \@article at string (\@acmPubDate), 
+     \@acmVolume, \@acmNumber \@article at string (\@acmPubDate),
      \ref{TotPages}~\@pages at word.
   \else
      In \textit{\@acmBooktitle}%
      \ifx\@acmEditors\@empty\textit{.}\else
        \andify\@acmEditors\textit{, }\@acmEditors~\@editorsAbbrev.%
-     \fi\ 
+     \fi\
      ACM, New York, NY, USA%
        \@article at string\unskip, \ref{TotPages}~\@pages at word.
   \fi
-  \@formatdoi{\@acmDOI}
+  \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi
 \par\egroup}
 %    \end{macrocode}
 %
@@ -5441,7 +5527,7 @@
 % cmyk colors in boxes do not work}
 % \changes{v1.46}{2017/08/28}{Rearranged the code to get rid of
 % spurious underfull messages (Benjamin Byholm)}
-%   This is the box displayed in the review mode
+%   This is the box displayed in review mode
 %    \begin{macrocode}
 \if at ACM@review
   \newsavebox{\ACM at linecount@bx}
@@ -5498,10 +5584,11 @@
 % \changes{v1.33}{2017/03/10}{Added macro (Michael D.~Adams)}
 % \changes{v1.33}{2017/03/28}{Added current page number}
 % \changes{v1.33}{2017/03/29}{Added submission id}
+% \changes{v1.48}{2017/09/16}{Fromatting change (Michael D.~Adams)}
 %  The timestamp system
 %    \begin{macrocode}
 \if at ACM@timestamp
-  % Subtracting 30 from \time gives us the effect of rounding-down despite
+  % Subtracting 30 from \time gives us the effect of rounding down despite
   % \numexpr rounding to nearest
   \newcounter{ACM at time@hours}
   \setcounter{ACM at time@hours}{\numexpr (\time - 30) / 60 \relax}
@@ -5509,52 +5596,33 @@
   \setcounter{ACM at time@minutes}{\numexpr \time - \theACM at time@hours * 60 \relax}
   \newcommand\ACM at timestamp{%
     \footnotesize%
-    \the\year-\two at digits{\the\month}-\two at digits{\the\day}{ }%
-    \two at digits{\theACM at time@hours}:\two at digits{\theACM at time@minutes}{ }%
-    page~\thepage\ (pp. \@startPage-\pageref*{TotPages})%
     \ifx\@acmSubmissionID\@empty\relax\else
-    ~Submission~ID: \@acmSubmissionID
+    Submission ID: \@acmSubmissionID.{ }%
     \fi
+    \the\year-\two at digits{\the\month}-\two at digits{\the\day}{ }%
+    \two at digits{\theACM at time@hours}:\two at digits{\theACM at time@minutes}{. }%
+    Page \thepage\ of \@startPage--\pageref*{TotPages}.%
   }
 \fi
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\@shortauthors}
 % \changes{v1.15}{2016/07/04}{Introduced macro}
 %   Even if the author redefined \cs{shortauthors}, we do not print
-%   them in the anonymous mode in the headers:
+%   it in the headers when in anonymous mode:
 %    \begin{macrocode}
 \def\@shortauthors{\if at ACM@anonymous Anon.\else\shortauthors\fi}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\@headfootfont}
 % \changes{v1.16}{2016/07/07}{Added macro}
+% \changes{v1.48}{2017/09/16}{Deleted unnecessary switch (Michael D.~Adams)}
 %   The font to typeset header and footer text.
 %    \begin{macrocode}
-\def\@headfootfont{%
-  \ifcase\ACM at format@nr
-  \relax % manuscript
-    \sffamily
-  \or % acmsmall
-    \sffamily
-  \or % acmlarge
-    \sffamily
-  \or % acmtog
-    \sffamily
-  \or % sigconf
-    \sffamily
-  \or % siggraph
-    \sffamily
-  \or % sigplan
-    \sffamily
-  \or % sigchi
-    \sffamily
-  \or % sigchi-a
-    \sffamily
-  \fi}
+\def\@headfootfont{\sffamily}
 %    \end{macrocode}
 %
 % \end{macro}
@@ -5569,8 +5637,8 @@
 % \changes{v1.17}{2016/07/10}{Added paper title to sigs}
 % \changes{v1.29}{2017/01/22}{Corrected printfolios (Matthew Fluet)}
 % \changes{v1.33}{2017/03/10}{Added timestamp (Michael D.~Adams)}
-% \changes{v1.33}{2017/03/29}{Added right linecount for two column formats}
-%   The pagestyle for all pages but the first one
+% \changes{v1.33}{2017/03/29}{Added right linecount for two-column formats}
+%   The page style for all pages but the first one
 %    \begin{macrocode}
 \fancypagestyle{standardpagestyle}{%
   \fancyhf{}%
@@ -5664,7 +5732,7 @@
 % \begin{macro}{\@folioblob}
 % \changes{v1.44}{2017/08/11}{Suppress the blob if acmArticleSeq is empty}
 % \changes{v1.45}{2017/08/15}{Switched \cs{bfeseries}\cs{sffamily} to
-% \cs{sffamily}\cs{bfseries}} 
+% \cs{sffamily}\cs{bfseries}}
 %   The macro to typeset the folio blob.
 %    \begin{macrocode}
 \def\@folioblob{\@tempcnta=0\@acmArticleSeq\relax
@@ -5700,8 +5768,8 @@
 %
 % \begin{macro}{firstpagestyle}
 % \changes{v1.33}{2017/03/10}{Added timestamp (Michael D.~Adams)}
-% \changes{v1.33}{2017/03/29}{Added right linecount for two column formats}
-%   The pagestyle for the first page only.
+% \changes{v1.33}{2017/03/29}{Added right linecount for two-column formats}
+%   The page style for the first page only.
 %    \begin{macrocode}
 \fancypagestyle{firstpagestyle}{%
   \fancyhf{}%
@@ -5755,7 +5823,7 @@
 % \begin{macro}{\ACM at restore@pagestyle}
 % \changes{v1.44}{2017/07/30}{Added macro}
 % The following code by Ross Moore protects against changes by
-% |totpages| package:
+% the |totpages| package:
 %    \begin{macrocode}
 \let\ACM at ps@plain\ps at plain
 \let\ACM at ps@myheadings\ps at myheadings
@@ -5766,8 +5834,8 @@
   \let\ps at headings\ACM at ps@headings}
 \AtBeginDocument{\ACM at restore@pagestyle}
 %    \end{macrocode}
-% 
-%   
+%
+%
 % \end{macro}
 %
 %
@@ -5820,8 +5888,8 @@
 %  \changes{v1.12}{2016/05/30}{Moved to \cs{section at raggedright}}%
 % \changes{v1.40}{2017/06/04}{Switched to MakeTextUppercase}
 % \changes{v1.45}{2017/08/15}{Switched \cs{bfeseries}\cs{sffamily} to
-% \cs{sffamily}\cs{bfseries}} 
-% Fonts for sections etc. are different for different formats. 
+% \cs{sffamily}\cs{bfseries}}
+% Fonts for sections etc. are different for different formats.
 %    \begin{macrocode}
 \def\@secfont{\sffamily\bfseries\section at raggedright\MakeTextUppercase}
 \def\@subsecfont{\sffamily\bfseries\section at raggedright}
@@ -5873,12 +5941,12 @@
 %    \end{macrocode}
 %
 % \end{macro}
-% \end{macro} 
 % \end{macro}
 % \end{macro}
-% 
+% \end{macro}
+%
 % \begin{macro}{\@adddotafter}
-%   Add punctuation after the command
+%   Add punctuation after a sectioning command
 %    \begin{macrocode}
 \def\@adddotafter#1{#1\@addpunct{.}}
 %    \end{macrocode}
@@ -5886,7 +5954,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@addspaceafter}
-%   Add space after the command
+%   Add space after a sectioning command
 %    \begin{macrocode}
 \def\@addspaceafter#1{#1\@addpunct{\enspace}}
 %    \end{macrocode}
@@ -5893,13 +5961,13 @@
 %
 % \end{macro}
 %
-%\subsection{TOC Lists}
+%\subsection{TOC lists}
 %\label{sec:tocs}
 %
 % \begin{macro}{\@dotsep}
 % Related to the \cs{tableofcontents} are all the horizontal fillers. Base
 % \LaTeX\ defines \cs{@dottedtocline}, which we should not disable. Yet, this
-% command expects \cs{@dotsep} to be defined, but leaves this to the class
+% command expects \cs{@dotsep} to be defined but leaves this to the class
 % implementation. Since |amsart| does not provide this, we copy the standard
 % variant from |article| here.
 %    \begin{macrocode}
@@ -5907,13 +5975,13 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% 
 %
+%
 %\subsection{Theorems}
 %\label{sec:theorems}
 %
 % \begin{macro}{\@acmplainbodyfont}
-%   The font to typeset the |acmplain| theorem style body.
+%   The font to typeset the body of the |acmplain| theorem style.
 %    \begin{macrocode}
 \def\@acmplainbodyfont{\itshape}
 %    \end{macrocode}
@@ -5929,7 +5997,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@acmplainheadfont}
-%   The font to typeset the |acmplain| theorem style head.
+%   The font to typeset the head of the |acmplain| theorem style.
 %    \begin{macrocode}
 \def\@acmplainheadfont{\scshape}
 %    \end{macrocode}
@@ -5937,7 +6005,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@acmplainnotefont}
-%   The font to typeset the |acmplain| theorem style note.
+%   The font to typeset the note of the |acmplain| theorem style.
 %    \begin{macrocode}
 \def\@acmplainnotefont{\@empty}
 %    \end{macrocode}
@@ -5944,7 +6012,7 @@
 %
 % \end{macro}
 %
-% Customization of |acmplain| theorem style:
+% Customization of the |acmplain| theorem style:
 %    \begin{macrocode}
 \ifcase\ACM at format@nr
 \relax % manuscript
@@ -5983,7 +6051,7 @@
 %
 %
 % \begin{macro}{\@acmdefinitionbodyfont}
-%   The font to typeset the |acmdefinition| theorem style body.
+%   The font to typeset the body of the |acmdefinition| theorem style.
 %    \begin{macrocode}
 \def\@acmdefinitionbodyfont{\normalfont}
 %    \end{macrocode}
@@ -5999,7 +6067,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@acmdefinitionheadfont}
-%   The font to typeset the |acmdefinition| theorem style head.
+%   The font to typeset the head of the |acmdefinition| theorem style.
 %    \begin{macrocode}
 \def\@acmdefinitionheadfont{\itshape}
 %    \end{macrocode}
@@ -6007,7 +6075,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@acmdefinitionnotefont}
-%   The font to typeset the |acmdefinition| theorem style note.
+%   The font to typeset the note of the |acmdefinition| theorem style.
 %    \begin{macrocode}
 \def\@acmdefinitionnotefont{\@empty}
 %    \end{macrocode}
@@ -6014,7 +6082,7 @@
 %
 % \end{macro}
 %
-% Customization of |acmdefinition| theorem style:
+% Customization of the |acmdefinition| theorem style:
 %    \begin{macrocode}
 \ifcase\ACM at format@nr
 \relax % manuscript
@@ -6060,7 +6128,7 @@
 % have been loaded.  In particular, the |cleveref| package must be
 % loaded before the theorem environments are defined in order to show
 % the correct environment name (see
-% https://github.com/borisveytsman/acmart/issues/138).  The |acmthm|
+% \url{https://github.com/borisveytsman/acmart/issues/138}).  The |acmthm|
 % option is used to suppress the definition of any theorem
 % environments.  Also, to avoid obscure errors arising from these
 % environment definitions conflicting with environments defined by the
@@ -6079,8 +6147,9 @@
   \@ifundefined{proposition}{%
   \newtheorem{proposition}[theorem]{Proposition}
   }{}
+  \@ifundefined{lemma}{%
   \newtheorem{lemma}[theorem]{Lemma}
-  \@ifundefined{lemma}{}{}
+  }{}
   \@ifundefined{corollary}{%
   \newtheorem{corollary}[theorem]{Corollary}
   }{}
@@ -6113,7 +6182,7 @@
 %
 % \end{macro}
 %
-% Customization of proof environment.
+% Customization of the proof environment.
 %    \begin{macrocode}
 \ifcase\ACM at format@nr
 \relax % manuscript
@@ -6131,7 +6200,7 @@
 %    \end{macrocode}
 %
 % \begin{macro}{proof}
-%   We want some customization of proof environment.
+%   We want some customization of the proof environment.
 %    \begin{macrocode}
 \renewenvironment{proof}[1][\proofname]{\par
   \pushQED{\qed}%
@@ -6164,7 +6233,7 @@
   \endgroup
 }
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\grantsponsor}
@@ -6174,7 +6243,7 @@
 %    \begin{macrocode}
 \def\grantsponsor#1#2#3{#2}
 %    \end{macrocode}
-% 
+%
 % \end{macro}
 %
 % \begin{macro}{\grantnum}
@@ -6182,9 +6251,9 @@
 % \changes{v1.17}{2016/07/10}{Added url}
 %    \begin{macrocode}
 \newcommand\grantnum[3][]{#3%
-  \def\@tempa{#1}\ifx\@tempa\@empty\else\space(\url{#1})\fi}      
+  \def\@tempa{#1}\ifx\@tempa\@empty\else\space(\url{#1})\fi}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \subsection{Conditional typesetting}
@@ -6227,8 +6296,8 @@
      arXiv:\href{http://arxiv.org/abs/#2}{#2}\else arXiv:#2%
   \fi}
 %    \end{macrocode}
-% 
-%   
+%
+%
 % \end{macro}
 %
 %\subsection{End of Class}
@@ -6235,7 +6304,7 @@
 %\label{end}
 %
 %
-% \changes{v1.30}{2017/02/10}{Added \cs{frenchspacing}} 
+% \changes{v1.30}{2017/02/10}{Added \cs{frenchspacing}}
 %    \begin{macrocode}
 \normalsize\normalfont\frenchspacing
 %</class>

Added: trunk/Master/texmf-dist/tex/latex/acmart/ACM-Reference-Format.bbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/acmart/ACM-Reference-Format.bbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/acmart/ACM-Reference-Format.bbx	2017-12-16 21:29:01 UTC (rev 46077)
@@ -0,0 +1,819 @@
+\ProvidesFile{ACM-Reference-Format.bbx}[2017-09-27 v0.1 biblatex bibliography style]
+
+% Inherit a default style
+\RequireBibliographyStyle{trad-plain}
+
+
+
+%%% Localisation strings for ACM
+
+\DefineBibliographyStrings{american}{%
+  mathesis = {Master's thesis},
+  phdthesis = {Ph\adddot{}D\adddotspace Dissertation},
+  editor = {(Ed\adddot)},
+  editors = {(Eds\adddot)},
+  edition = {ed\adddot},
+}
+
+
+
+%%% Formatting for fields
+
+%\DeclareFieldFormat
+%  [article,inbook,incollection,inproceedings,patent,thesis,unpublished]
+%  {title}{#1}
+\DeclareFieldFormat{pages}{#1}
+
+\DeclareFieldFormat{numpages}{#1 pages}
+
+\DeclareFieldFormat{number}{#1}
+
+\DeclareFieldFormat{articleno}{Article #1}
+
+\DeclareFieldFormat{key}{#1}
+
+\DeclareFieldFormat{urldate}{Retrieved\space{}#1\space{}from}
+\DeclareFieldAlias{lastaccessed}{urldate}
+
+\DeclareFieldFormat{url}{\url{#1}}
+
+\DeclareFieldFormat{edition}{%
+  \printtext[parens]{\ifinteger{#1}
+    {\mkbibordedition{#1}~\bibstring{edition}}
+    {#1\isdot~\bibstring{edition}}}}
+
+
+% Handle urls field containing 'and' separated list of URLs
+% https://github.com/plk/biblatex/issues/229
+\DeclareListFormat{urls}{%
+  \url{#1}%
+  \ifthenelse{\value{listcount}<\value{liststop}}
+    {\addcomma\space}
+    {}}
+\renewbibmacro*{url}{\iffieldundef{url}{\printlist{urls}}{\printfield{url}}}
+
+
+
+%%% Bibmacro definitions
+
+\renewbibmacro*{translator+others}{%
+  \ifboolexpr{
+    test \ifusetranslator
+    and
+    not test {\ifnameundef{translator}}
+  }
+    {\printnames{translator}%
+     \setunit{\addcomma\space}%
+     \usebibmacro{translator+othersstrg}%
+     \clearname{translator}}
+    {\printfield{key}}}
+
+\newbibmacro*{year}{%
+  \iffieldundef{year}%
+    {\printtext{[n.\ d.]}}%
+    {\printfield{year}}%
+}
+
+\renewbibmacro*{date}{\printtext[parens]{\printdate}}
+
+
+\renewbibmacro*{url+urldate}{\iffieldundef{urlyear}
+    {}
+    {\usebibmacro{urldate}%
+     \setunit*{\addspace}}%
+     \usebibmacro{url}%
+  }
+
+
+\renewbibmacro*{journal+issuetitle}{%
+  \usebibmacro{journal}%
+  \setunit*{\addcomma\space}%
+  \iffieldundef{series}
+    {}
+    {\newunit%
+     \printfield{series}%
+     \setunit{\addspace}}%
+  \usebibmacro{volume+number+date+pages+eid}%
+  \newcommaunit%
+%  \setunit{\addspace}%
+  \usebibmacro{issue-issue}%
+  \setunit*{\addcolon\space}%
+  \usebibmacro{issue}%
+  \newunit}
+
+
+
+\newbibmacro*{volume+number+date+pages+eid}{%
+  \printfield{volume}%
+  \setunit*{\addcomma\space}%
+  \printfield{number}%
+  \setunit*{\addcomma\space}%
+  \printfield{articleno}
+  \setunit{\addcomma\space}
+  \usebibmacro{date-ifmonth}
+  \setunit{\addcomma\space}%
+  \iffieldundef{pages}%
+    {\printfield{numpages}}%
+    {\printfield{pages}}%
+  \newcommaunit%
+  \printfield{eid}}%
+
+\renewbibmacro*{chapter+pages}{%
+  \printfield{chapter}%
+  \setunit{\bibpagespunct}%
+  \iffieldundef{pages}%
+    {\printfield{numpages}}%
+    {\printfield{pages}}%
+  \newunit}
+
+\renewbibmacro*{editor+others}{%
+  \ifboolexpr{
+    test \ifuseeditor
+    and
+    not test {\ifnameundef{editor}}
+  }
+    {\printnames{editor}%
+     \setunit{\addcomma\space}%
+     \usebibmacro{editor+othersstrg}%
+     \clearname{editor}}
+    {\iflistundef{organization}{}{\printlist{organization}}}}
+
+
+\newbibmacro*{issue-issue}{%
+  \iffieldundef{issue}%
+    {}%
+    {\printfield{issue}%
+     \setunit*{\addcomma\space}%
+     \usebibmacro{date-ifmonth}%
+    }%
+  \newunit}
+
+
+
+
+\newbibmacro*{maintitle+booktitle+series+number}{%
+  \iffieldundef{maintitle}
+    {}
+    {\usebibmacro{maintitle}%
+     \newunit\newblock
+     \iffieldundef{volume}
+       {}
+       {\printfield{volume}%
+        \printfield{part}%
+        \setunit{\addcolon\space}}}%
+  \usebibmacro{booktitle}%
+  \setunit*{\addspace}
+  \printfield[parens]{series}%
+  \setunit*{\addspace}%
+  \printfield{number}%
+  \setunit*{\addcomma\space}%
+  \printfield{articleno}
+  \newunit
+  }
+
+\renewbibmacro*{booktitle}{%
+  \ifboolexpr{
+    test {\iffieldundef{booktitle}}
+    and
+    test {\iffieldundef{booksubtitle}}
+  }
+    {}
+    {\printtext[booktitle]{%
+       \printfield[titlecase]{booktitle}%
+       \iffieldundef{booksubtitle}{}{
+       \setunit{\subtitlepunct}%
+       \printfield[titlecase]{booksubtitle}}%
+       }%
+    }%
+  \printfield{booktitleaddon}}
+
+\renewbibmacro*{volume+number+eid}{%
+  \printfield{volume}%
+  \setunit*{\addcomma\space}%
+  \printfield{number}%
+  \setunit*{\addcomma\space}%
+  \printfield{articleno}
+  \setunit{\addcomma\space}%
+  \printfield{eid}}
+
+
+\renewbibmacro*{publisher+location+date}{%
+  \printlist{publisher}%
+  \setunit*{\addcomma\space}%
+  \printlist{location}%
+  \setunit*{\addcomma\space}%
+  \usebibmacro{date-ifmonth}%
+  \newunit}
+
+
+\newbibmacro{date-ifmonth}{%
+  \iffieldundef{month}{}{%
+    \usebibmacro{date}
+  }%
+}
+
+
+\renewbibmacro*{institution+location+date}{%
+  \printlist{school}%
+  \setunit*{\addcomma\space}%
+  \printlist{institution}%
+  \setunit*{\addcomma\space}%
+  \printlist{location}%
+  \setunit*{\addcomma\space}%
+  \usebibmacro{date-ifmonth}%
+  \newunit}
+
+
+\renewbibmacro*{periodical}{%
+  \iffieldundef{title}
+    {}
+    {\printtext[title]{%
+       \printfield[titlecase]{title}%
+       \setunit{\subtitlepunct}%
+       \printfield[titlecase]{subtitle}}}%
+       \newunit%
+       \usebibmacro{journal}}
+
+\renewbibmacro*{issue+date}{%
+    \iffieldundef{issue}
+      {\usebibmacro{date}}
+      {\printfield{issue}%
+       \setunit*{\addspace}%
+       \usebibmacro{date}}%
+  \newunit}
+
+\renewbibmacro*{title+issuetitle}{%
+  \usebibmacro{periodical}%
+  \setunit*{\addspace}%
+  \iffieldundef{series}
+    {}
+    {\newunit
+     \printfield{series}%
+     \setunit{\addspace}}%
+  \printfield{volume}%
+  \setunit*{\addcomma\space}%
+  \printfield{number}%
+  \setunit*{\addcomma\space}%
+  \printfield{articleno}
+  \setunit{\addcomma\space}%
+  \printfield{eid}%
+  \setunit{\addspace}%
+  \usebibmacro{issue+date}%
+  \setunit{\addcolon\space}%
+  \usebibmacro{issue}%
+  \newunit}
+
+
+
+
+%%% Definitions for drivers (alphabetical)
+
+
+
+\DeclareBibliographyDriver{article}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/translator+others}%
+  \setunit{\labelnamepunct}\newblock%
+  \usebibmacro{year}%
+  \newunit%
+  \usebibmacro{title}%
+  \newunit%
+  \printlist{language}%
+  \newunit\newblock%
+  \usebibmacro{byauthor}%
+  \newunit\newblock%
+  \usebibmacro{bytranslator+others}%
+  \newunit\newblock%
+  \printfield{version}%
+  \newunit\newblock%
+  \usebibmacro{journal+issuetitle}%
+  \newunit%
+  \usebibmacro{byeditor+others}%
+  \newunit%
+  \printfield{note}%
+  \newunit\newblock%
+  \iftoggle{bbx:isbn}
+    {\printfield{issn}}
+    {}%
+  \newunit\newblock%
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock%
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock%
+  \usebibmacro{related}%
+  \usebibmacro{finentry}}
+
+
+
+\DeclareBibliographyDriver{book}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor+others/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{year}%
+  \newunit%
+  \usebibmacro{maintitle+title}%
+  \newunit%
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit
+  \usebibmacro{series+number}%
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \newunit\newblock
+  \printfield{volumes}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publisher+location+date}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit
+  \printfield{pagetotal}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{finentry}}
+
+
+
+\DeclareBibliographyDriver{inbook}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \iffieldundef{author}%
+    {\usebibmacro{byeditor+others}}%
+    {\usebibmacro{author/translator+others}}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{year}
+  \newunit\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+%  \usebibmacro{in:}%
+  \usebibmacro{bybookauthor}%
+  \newunit\newblock
+  \usebibmacro{maintitle+booktitle}%
+  \newunit\newblock
+  \iffieldundef{author}{}%if undef then we already printed editor
+    {\usebibmacro{byeditor+others}}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \usebibmacro{series+number}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publisher+location+date}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{finentry}}
+
+
+
+\DeclareBibliographyDriver{incollection}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{year}
+  \newunit\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{in:}%
+  \usebibmacro{maintitle+booktitle}%
+  \newunit\newblock
+  \usebibmacro{series+number}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{publisher+location+date}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{finentry}}
+
+
+
+\DeclareBibliographyDriver{inproceedings}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{year}
+  \newunit\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{in:}%
+  \usebibmacro{maintitle+booktitle+series+number}%
+  \newunit\newblock
+  \usebibmacro{event+venue+date}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \iffieldundef{maintitle}
+    {\printfield{volume}%
+     \printfield{part}}
+    {}%
+  \newunit
+  \printfield{volumes}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit
+  \usebibmacro{publisher+location+date}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{finentry}}
+
+
+
+\DeclareBibliographyDriver{manual}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{year}
+  \newunit\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor}%
+  \newunit\newblock
+  \printfield{edition}%
+  \newunit\newblock
+  \usebibmacro{series+number}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit
+  \printfield{version}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit
+  \usebibmacro{publisher+location+date}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit
+  \printfield{pagetotal}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{finentry}}
+
+
+
+\DeclareBibliographyDriver{misc}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor+others/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{year}
+  \newunit\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{howpublished}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit
+  \printfield{version}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{organization+location+date}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{finentry}}
+
+
+
+\DeclareBibliographyDriver{online}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author/editor+others/translator+others}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{year}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{byeditor+others}%
+  \newunit\newblock
+  \printfield{version}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock
+  \printlist{organization}%
+  \newunit\newblock
+  \usebibmacro{date-ifmonth}%
+  \newunit\newblock
+  \iftoggle{bbx:eprint}
+    {\usebibmacro{eprint}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{url+urldate}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{finentry}}
+
+
+
+\DeclareFieldFormat[patent]{number}{Patent No.~#1}
+
+\DeclareBibliographyDriver{patent}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{year}%
+  \newunit
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \usebibmacro{date}%
+  \newunit\newblock
+  \printfield{type}%
+  \setunit*{\addspace}%
+  \printfield{number}%
+  \iflistundef{location}
+    {}
+    {\setunit*{\addspace}%
+     \printtext[parens]{%
+       \printlist[][-\value{listtotal}]{location}}}%
+  \newunit\newblock
+  \usebibmacro{byholder}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{finentry}}
+
+
+
+\DeclareBibliographyDriver{periodical}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{editor}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{year}
+  \newunit
+  \usebibmacro{title+issuetitle}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byeditor}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{issn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{finentry}}
+
+
+
+\DeclareBibliographyDriver{report}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{year}
+  \newunit
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \printfield{type}%
+  \setunit*{\addspace}%
+  \printfield{number}%
+  \newunit\newblock
+  \printfield{version}%
+  \newunit
+  \printfield{note}%
+  \newunit\newblock
+  \usebibmacro{institution+location+date}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit
+  \printfield{pagetotal}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isrn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{finentry}}
+
+
+
+\DeclareBibliographyDriver{thesis}{%
+  \usebibmacro{bibindex}%
+  \usebibmacro{begentry}%
+  \usebibmacro{author}%
+  \setunit{\labelnamepunct}\newblock
+  \usebibmacro{year}
+  \newunit
+  \usebibmacro{title}%
+  \newunit
+  \printlist{language}%
+  \newunit\newblock
+  \usebibmacro{byauthor}%
+  \newunit\newblock
+  \printfield{type}%
+  \newunit
+  \usebibmacro{institution+location+date}%
+  \newunit\newblock
+  \usebibmacro{chapter+pages}%
+  \newunit
+  \printfield{pagetotal}%
+  \newunit\newblock
+  \iftoggle{bbx:isbn}
+    {\printfield{isbn}}
+    {}%
+  \newunit\newblock
+  \usebibmacro{doi+eprint+url}%
+  \newunit\newblock
+  \usebibmacro{addendum+pubstate}%
+  \setunit{\bibpagerefpunct}\newblock
+  \usebibmacro{pageref}%
+  \newunit\newblock
+  \printfield{note}%
+  \newunit\newblock
+  \iftoggle{bbx:related}
+    {\usebibmacro{related:init}%
+     \usebibmacro{related}}
+    {}%
+  \usebibmacro{finentry}}
+
+

Added: trunk/Master/texmf-dist/tex/latex/acmart/ACM-Reference-Format.cbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/acmart/ACM-Reference-Format.cbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/acmart/ACM-Reference-Format.cbx	2017-12-16 21:29:01 UTC (rev 46077)
@@ -0,0 +1,5 @@
+\ProvidesFile{ACM-Reference-Format.cbx}[2017-09-27 v0.1]
+
+\RequireCitationStyle{numeric}
+
+\endinput

Added: trunk/Master/texmf-dist/tex/latex/acmart/ACM-Reference-Format.dbx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/acmart/ACM-Reference-Format.dbx	                        (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/acmart/ACM-Reference-Format.dbx	2017-12-16 21:29:01 UTC (rev 46077)
@@ -0,0 +1,18 @@
+% Teach biblatex about numpages field
+\DeclareDatamodelFields[type=field, datatype=literal]{numpages}
+\DeclareDatamodelEntryfields{numpages}
+
+% Teach biblatex about articleno field
+\DeclareDatamodelFields[type=field, datatype=literal]{articleno}
+\DeclareDatamodelEntryfields{articleno}
+
+% Teach biblatex about urls field
+\DeclareDatamodelFields[type=list, datatype=uri]{urls}
+\DeclareDatamodelEntryfields{urls}
+
+% Teach biblatex about school field
+\DeclareDatamodelFields[type=list, datatype=literal]{school}
+\DeclareDatamodelEntryfields[thesis]{school}
+
+\DeclareDatamodelFields[type=field, datatype=literal]{key}
+\DeclareDatamodelEntryfields{key}
\ No newline at end of file

Modified: trunk/Master/texmf-dist/tex/latex/acmart/acmart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/acmart/acmart.cls	2017-12-16 18:20:26 UTC (rev 46076)
+++ trunk/Master/texmf-dist/tex/latex/acmart/acmart.cls	2017-12-16 21:29:01 UTC (rev 46077)
@@ -37,7 +37,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{acmart}
-[2017/08/31 v1.47 Typesetting articles for Association of
+[2017/12/14 v1.48 Typesetting articles for the Association for
 Computing Machinery]
 \def\@classname{acmart}
 \InputIfFileExists{acmart-preload-hook.tex}{%
@@ -68,7 +68,7 @@
     \PackageInfo{\@classname}{Using screen mode}%
   \else
     \PackageInfo{\@classname}{Not using screen mode}%
-  \fi}{\PackageError{\@classname}{Option screen can be either true or
+  \fi}{\PackageError{\@classname}{The option screen can be either true or
     false}}
 \ExecuteOptionsX{screen=false}
 \define at boolkey+{acmart.cls}[@ACM@]{acmthm}[true]{%
@@ -76,15 +76,16 @@
     \PackageInfo{\@classname}{Requiring acmthm}%
   \else
     \PackageInfo{\@classname}{Suppressing acmthm}%
-  \fi}{\PackageError{\@classname}{Option acmthm can be either true or
+  \fi}{\PackageError{\@classname}{The option acmthm can be either true or
     false}}
 \ExecuteOptionsX{acmthm=true}
 \define at boolkey+{acmart.cls}[@ACM@]{review}[true]{%
   \if at ACM@review
     \PackageInfo{\@classname}{Using review mode}%
+    \AtBeginDocument{\@ACM at printfoliostrue}%
   \else
     \PackageInfo{\@classname}{Not using review mode}%
-  \fi}{\PackageError{\@classname}{Option review can be either true or
+  \fi}{\PackageError{\@classname}{The option review can be either true or
     false}}
 \ExecuteOptionsX{review=false}
 \define at boolkey+{acmart.cls}[@ACM@]{authorversion}[true]{%
@@ -92,7 +93,7 @@
     \PackageInfo{\@classname}{Using authorversion mode}%
   \else
     \PackageInfo{\@classname}{Not using authorversion mode}%
-  \fi}{\PackageError{\@classname}{Option authorversion can be either true or
+  \fi}{\PackageError{\@classname}{The option authorversion can be either true or
     false}}
 \ExecuteOptionsX{authorversion=false}
 \define at boolkey+{acmart.cls}[@ACM@]{natbib}[true]{%
@@ -100,7 +101,7 @@
     \PackageInfo{\@classname}{Explicitly selecting natbib mode}%
   \else
     \PackageInfo{\@classname}{Explicitly deselecting natbib mode}%
-  \fi}{\PackageError{\@classname}{Option natbib can be either true or
+  \fi}{\PackageError{\@classname}{The option natbib can be either true or
     false}}
 \ExecuteOptionsX{natbib=true}
 \define at boolkey+{acmart.cls}[@ACM@]{anonymous}[true]{%
@@ -108,7 +109,7 @@
     \PackageInfo{\@classname}{Using anonymous mode}%
   \else
     \PackageInfo{\@classname}{Not using anonymous mode}%
-  \fi}{\PackageError{\@classname}{Option anonymous can be either true or
+  \fi}{\PackageError{\@classname}{The option anonymous can be either true or
     false}}
 \ExecuteOptionsX{anonymous=false}
 \define at boolkey+{acmart.cls}[@ACM@]{timestamp}[true]{%
@@ -116,7 +117,7 @@
     \PackageInfo{\@classname}{Using timestamp mode}%
   \else
     \PackageInfo{\@classname}{Not using timestamp mode}%
-  \fi}{\PackageError{\@classname}{Option timestamp can be either true or
+  \fi}{\PackageError{\@classname}{The option timestamp can be either true or
     false}}
 \ExecuteOptionsX{timestamp=false}
 \define at boolkey+{acmart.cls}[@ACM@]{authordraft}[true]{%
@@ -126,7 +127,7 @@
     \@ACM at reviewtrue
   \else
     \PackageInfo{\@classname}{Not using authordraft mode}%
-  \fi}{\PackageError{\@classname}{Option authordraft can be either true or
+  \fi}{\PackageError{\@classname}{The option authordraft can be either true or
     false}}
 \ExecuteOptionsX{authordraft=false}
 \def\ACM at fontsize{}
@@ -142,7 +143,7 @@
 \newif\if at ACM@journal
 \newif\if at ACM@sigchiamode
 \ifnum\ACM at format@nr=5\relax % siggraph
-  \ClassWarning{\@classname}{The format `siggraph' is now obsolete.
+  \ClassWarning{\@classname}{The format siggraph is now obsolete.
     I am switching to sigconf.}
   \setkeys{acmart.cls}{format=sigconf}
 \fi
@@ -448,7 +449,6 @@
   \let\citeANP\citeauthor
   \let\citeNN\citeyearpar
   \let\citeyearNP\citeyear
-  \let\citeyear\citeyearpar
   \let\citeNP\citealt
   \DeclareRobustCommand\citeA
      {\begingroup\NAT at swafalse
@@ -460,7 +460,7 @@
     \providecommand\citename[1]{#1}}
 \fi
 \newcommand\shortcite[2][]{%
-  \ifNAT at numbers\cite[#1]{#2}\else\citeyear[#1]{#2}\fi}
+  \ifNAT at numbers\cite[#1]{#2}\else\citeyearpar[#1]{#2}\fi}
 \def\bibliographystyle#1{%
   \ifx\@begindocumenthook\@undefined\else
     \expandafter\AtBeginDocument
@@ -468,7 +468,8 @@
     {\if at filesw
        \immediate\write\@auxout{\string\bibstyle{#1}}%
      \fi}}
-\RequirePackage{graphicx, xcolor}
+\RequirePackage{graphicx}
+\RequirePackage[prologue]{xcolor}
 \definecolor[named]{ACMBlue}{cmyk}{1,0.1,0,0.1}
 \definecolor[named]{ACMYellow}{cmyk}{0,0.16,1,0}
 \definecolor[named]{ACMOrange}{cmyk}{0,0.42,1,0.01}
@@ -482,8 +483,8 @@
   \SetWatermarkFontSize{0.5in}
   \SetWatermarkColor[gray]{.9}
   \SetWatermarkText{\parbox{12em}{\centering
-      Unpublished working draft\\
-      Not for distribution}}
+      Unpublished working draft.\\
+      Not for distribution.}}
 \fi
 \RequirePackage{geometry}
 \ifcase\ACM at format@nr
@@ -581,7 +582,7 @@
       \normalcolor
       \unvbox\@mpfootins
     \fi
-    \@minipagefalse   %% added 24 May 89
+    \@minipagefalse
   \color at endgroup
   \egroup
   \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}}
@@ -629,12 +630,13 @@
 \newif\if at ACM@newfonts
 \@ACM at newfontstrue
 \IfFileExists{libertine.sty}{}{\ClassWarning{\@classname}{You do not
-    have libertine package installed.  Please upgrade your
+    have the libertine package installed.  Please upgrade your
     TeX}\@ACM at newfontsfalse}
 \IfFileExists{zi4.sty}{}{\ClassWarning{\@classname}{You do not
-    have zi4 package installed.  Please upgrade your TeX}\@ACM at newfontsfalse}
+    have the zi4 package installed.  Please upgrade your
+    TeX}\@ACM at newfontsfalse}
 \IfFileExists{newtxmath.sty}{}{\ClassWarning{\@classname}{You do not
-    have newtxmath package installed.  Please upgrade your
+    have the newtxmath package installed.  Please upgrade your
     TeX}\@ACM at newfontsfalse}
 \if at ACM@newfonts
 \RequirePackage[tt=false, type1=true]{libertine}
@@ -652,7 +654,7 @@
 \captionsetup[table]{position=top}
 \if at ACM@journal
   \captionsetup{labelfont={sf, small},
-    textfont={sf, small},  margin=\z@}
+    textfont={sf, small}, margin=\z@}
   \captionsetup[figure]{name={Fig.}}
 \else
   \captionsetup{labelfont={bf},
@@ -864,22 +866,22 @@
   \def\@permissionCodeOne{1550-4832}%
 \or % JOCCH
   \def\@journalName{ACM Journal on Computing and Cultural Heritage}%
-  \def\@journalName{ACM J. Comput. Cult. Herit.}%
+  \def\@journalNameShort{ACM J. Comput. Cult. Herit.}%
 \or % PACMHCI
   \def\@journalName{Proceedings of the ACM on Human-Computer Interaction}%
-  \def\@journalName{Proc. ACM Hum.-Comput. Interact.}%
+  \def\@journalNameShort{Proc. ACM Hum.-Comput. Interact.}%
   \def\@permissionCodeOne{2573-0142}%
   \@ACM at screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
 \or % PACMPL
   \def\@journalName{Proceedings of the ACM on Programming Languages}%
-  \def\@journalName{Proc. ACM Program. Lang.}%
+  \def\@journalNameShort{Proc. ACM Program. Lang.}%
   \def\@permissionCodeOne{2475-1421}%
   \@ACM at screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
 \or % POMACS
   \def\@journalName{Proceedings of the ACM on Measurement and Analysis of Computing Systems}%
-  \def\@journalName{Proc. ACM Meas. Anal. Comput. Syst.}%
+  \def\@journalNameShort{Proc. ACM Meas. Anal. Comput. Syst.}%
   \def\@permissionCodeOne{2476-1249}%
   \@ACM at screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
@@ -893,6 +895,7 @@
   \def\@permissionCodeOne{1936-7228}%
 \or % TACO
   \def\@journalName{ACM Transactions on Architecture and Code Optimization}%
+  \def\@journalNameShort{ACM Trans. Arch. Code Optim.}%
 \or % TALG
   \def\@journalName{ACM Transactions on Algorithms}%
   \def\@journalNameShort{ACM Trans. Algor.}%
@@ -969,7 +972,6 @@
   \def\@permissionCodeOne{0730-0301}
 \or % TOIS
   \def\@journalName{ACM Transactions on Information Systems}%
-  \def\@journalName{ACM Transactions on Information Systems}%
   \def\@permissionCodeOne{1046-8188}%
 \or % TOIT
   \def\@journalName{ACM Transactions on Internet Technology}%
@@ -977,7 +979,6 @@
   \def\@permissionCodeOne{1533-5399}%
 \or % TOMACS
   \def\@journalName{ACM Transactions on Modeling and Computer Simulation}%
-  \def\@journalName{ACM Transactions on Modeling and Computer Simulation}%
   \def\@journalNameShort{ACM Trans. Model. Comput. Simul.}%
 \or % TOMM
   \def\@journalName{ACM Transactions on Multimedia Computing, Communications and Applications}%
@@ -1123,7 +1124,7 @@
     \g at addto@macro\addresses{\affiliation{#1}{#2}}%
   \fi}
 \define at boolkey+{@ACM at affiliation@}[@ACM at affiliation@]{obeypunctuation}%
-[true]{}{\ClassError{\@classname}{obeypunctuation must be true or false}}
+[true]{}{\ClassError{\@classname}{The option obeypunctuation can be either true or false}}
 \def\additionalaffiliation#1{\authornote{\@additionalaffiliation{#1}}}
 \def\@additionalaffiliation#1{\bgroup
   \def\position##1{\ignorespaces}%
@@ -1231,22 +1232,22 @@
     \ClassInfo{\@classname}{Printing CCS}%
   \else
     \ClassInfo{\@classname}{Suppressing CCS}%
-  \fi}{\ClassError{\@classname}{printccs must be true or false}}
+  \fi}{\ClassError{\@classname}{The option printccs can be either true or false}}
 \define at boolkey+{@ACM at topmatter@}[@ACM@]{printacmref}[true]{%
   \if at ACM@printacmref
     \ClassInfo{\@classname}{Printing bibformat}%
   \else
     \ClassInfo{\@classname}{Suppressing bibformat}%
-  \fi}{\ClassError{\@classname}{printacmref must be true or false}}
+  \fi}{\ClassError{\@classname}{The option printacmref can be either true or false}}
 \define at boolkey+{@ACM at topmatter@}[@ACM@]{printfolios}[true]{%
   \if at ACM@printfolios
     \ClassInfo{\@classname}{Printing folios}%
   \else
     \ClassInfo{\@classname}{Suppressing folios}%
-  \fi}{\ClassError{\@classname}{printfolios must be true or false}}
+  \fi}{\ClassError{\@classname}{The option printfolios can be either true or false}}
 \define at cmdkey{@ACM at topmatter@}[@ACM@]{authorsperrow}[0]{%
   \IfInteger{#1}{\ClassInfo{\@classname}{Setting authorsperrow to
-      #1}}{\ClassWarning{\@classname}{Parameter authorsperrow must be
+      #1}}{\ClassWarning{\@classname}{The parameter authorsperrow must be
       numerical. Ignoring the input #1}\gdef\@ACM at authorsperrow{0}}}
 \def\settopmatter#1{\setkeys{@ACM at topmatter@}{#1}}
 \settopmatter{printccs=true, printacmref=true}
@@ -1314,9 +1315,9 @@
 \define at choicekey*{ACM@}{acmcopyrightmode}[%
   \acm at copyrightinput\acm at copyrightmode]{none,%
     acmcopyright,acmlicensed,rightsretained,%
-    usgov,usgovmixed,cagov,cagovmixed,%
-    licensedusgovmixed,%
-    licensedcagov,licensedcagovmixed,othergov,licensedothergov}{%
+    usgov,usgovmixed,cagov,cagovmixed,licensedusgovmixed,%
+    licensedcagov,licensedcagovmixed,othergov,licensedothergov,%
+    iw3c2w3,iw3c2w3g}{%
   \@printpermissiontrue
   \@printcopyrighttrue
   \@acmownedtrue
@@ -1355,6 +1356,12 @@
   \fi
   \ifnum\acm at copyrightmode=12\relax % licensedothergov
    \@acmownedfalse
+  \fi
+  \ifnum\acm at copyrightmode=13\relax % iw3c2w3
+   \@acmownedfalse
+  \fi
+  \ifnum\acm at copyrightmode=14\relax % iw3c2w3g
+   \@acmownedfalse
   \fi}
 \def\setcopyright#1{\setkeys{ACM@}{acmcopyrightmode=#1}}
 \setcopyright{acmcopyright}
@@ -1364,7 +1371,7 @@
   Association for Computing Machinery.
   \or % acmlicensed
   Copyright held by the owner/author(s). Publication rights licensed to
-  Association for Computing Machinery.
+  the Association for Computing Machinery.
   \or % rightsretained
   Copyright held by the owner/author(s).
   \or % usgov
@@ -1376,18 +1383,24 @@
   Association for Computing Machinery.
   \or %licensedusgovmixed
   Copyright held by the owner/author(s). Publication rights licensed to
-  Association for Computing Machinery.
+  the Association for Computing Machinery.
   \or % licensedcagov
   Crown in Right of Canada. Publication rights licensed to
-  Association for Computing Machinery.
+  the Association for Computing Machinery.
   \or %licensedcagovmixed
   Copyright held by the owner/author(s). Publication rights licensed to
-  Association for Computing Machinery.
+  the Association for Computing Machinery.
   \or % othergov
   Association for Computing Machinery.
   \or % licensedothergov
   Copyright held by the owner/author(s). Publication rights licensed to
-  Association for Computing Machinery.
+  the Association for Computing Machinery.
+  \or % ic2w3www
+  IW3C2 (International World Wide Web Conference Committee), published
+  under Creative Commons CC~BY~4.0 License.
+  \or % ic2w3wwwgoogle
+  IW3C2 (International World Wide Web Conference Committee), published
+  under Creative Commons CC~BY-NC-ND~4.0 License.
   \fi}
 \def\@formatdoi#1{\url{https://doi.org/#1}}
 \def\@copyrightpermission{%
@@ -1501,7 +1514,26 @@
    retains a nonexclusive, royalty-free right to publish or reproduce
    this article, or to allow others to do so, for Government purposes
    only.
-  \fi}
+ \or % iw3c2w3
+   This paper is published under the Creative Commons Attribution~4.0
+   International (CC~BY~4.0) license. Authors reserve their rights to
+   disseminate the work on their personal and corporate Web sites with
+   the appropriate attribution. In case of republication, reuse, etc.,
+   the following attribution should be used: ``Published in
+   WWW\@acmYear{} Proceedings \textcopyright{} \@copyrightyear{}
+   International World Wide Web Conference Committee, published under
+   Creative Commons~CC~BY~4.0  License.''
+ \or % iw3c2w3g
+   This paper is published under the Creative Commons
+   Attribution-NonCommercial-NoDerivs~4.0 International
+   (CC~BY-NC-ND~4.0) license. Authors reserve their rights to
+   disseminate the work on their personal and corporate Web sites with
+   the appropriate attribution. In case of republication, reuse, etc.,
+   the following attribution should be used: ``Published in
+   WWW\@acmYear{} Proceedings \textcopyright{} \@copyrightyear
+   International World Wide Web Conference Committee, published under
+   Creative Commons CC~BY-NC-ND~4.0 License.''
+ \fi}
 \def\copyrightyear#1{\def\@copyrightyear{#1}}
 \copyrightyear{\@acmYear}
 \def\@teaserfigures{}
@@ -1526,7 +1558,7 @@
   \renewcommand\thefootnote{\@fnsymbol\c at footnote}%
   \global\@topnum\z@ % this prevents floats from falling
                      % at the top of page 1
-  \global\@botnum\z@ % we do not want them to be on bottom either
+  \global\@botnum\z@ % we do not want them to be on the bottom either
   \hsize=\textwidth
   \def\@makefnmark{\hbox{\@textsuperscript{\@thefnmark}}}%
   \@mktitle\if at ACM@sigchiamode\else\@mkauthors\fi\@mkteasers
@@ -1537,7 +1569,8 @@
   \@titlenotes
   \@subtitlenotes
   \@authornotes
-  \let\@makefnmark\relax  \let\@thefnmark\relax
+  \let\@makefnmark\relax
+  \let\@thefnmark\relax
   \let\@makefntext\noindent
   \ifx\@empty\thankses\else
     \footnotetextauthorsaddresses{%
@@ -1554,8 +1587,7 @@
   \footnotetextcopyrightpermission{%
     \if at ACM@authordraft
         \raisebox{-2ex}[\z@][\z@]{\makebox[0pt][l]{\large\bfseries
-            Unpublished
-            working draft. Not for distribution}}%
+            Unpublished working draft. Not for distribution.}}%
        \color[gray]{0.9}%
     \fi
     \parindent\z@\parskip0.1\baselineskip
@@ -1625,10 +1657,17 @@
   \if at ACM@printacmref
      \@mkbibcitation
   \fi
-  \hypersetup{pdfauthor={\authors},
+  \hypersetup{%
+    pdflang={English},
+    pdfdisplaydoctitle,
+    pdfauthor={\authors},
     pdftitle={\@title},
     pdfsubject={\@concepts},
-    pdfkeywords={\@keywords}}%
+    pdfkeywords={\@keywords},
+    pdfcreator={LaTeX with acmart
+      \csname ver at acmart.cls\endcsname\space
+      and hyperref
+      \csname ver at hyperref.sty\endcsname}}%
   \@printendtopmatter
   \@afterindentfalse
   \@afterheading
@@ -2072,7 +2111,7 @@
   \ifx\@abstract\@lempty\else
   {\phantomsection\addcontentsline{toc}{section}{Abstract}%
     \if at ACM@journal
-       \small\noindent
+       \everypar{\setbox\z@\lastbox\everypar{}}\small
     \else
       \section*{Abstract}%
     \fi
@@ -2083,7 +2122,7 @@
   \def\footnotemark{}%
   \def\\{\unskip{} \ignorespaces}%
   \def\footnote{\ClassError{\@classname}{Please do note use footnotes
-      inside \string\title{} or \string\author{} command! Use
+      inside a \string\title{} or \string\author{} command! Use
       \string\titlenote{} or \string\authornote{} instead!}}%
   \def\@article at string{\ifx\@acmArticle\@empty{\ }\else,
     Article~\@acmArticle\ \fi}%
@@ -2102,7 +2141,7 @@
      ACM, New York, NY, USA%
        \@article at string\unskip, \ref{TotPages}~\@pages at word.
   \fi
-  \@formatdoi{\@acmDOI}
+  \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi
 \par\egroup}
 \def\@printendtopmatter{\par\bigskip}
 \def\@setthanks{\long\def\thanks##1{\par##1\@addpunct.}\thankses}
@@ -2138,7 +2177,7 @@
   \end{picture}%
   \fi}
 \if at ACM@timestamp
-  % Subtracting 30 from \time gives us the effect of rounding-down despite
+  % Subtracting 30 from \time gives us the effect of rounding down despite
   % \numexpr rounding to nearest
   \newcounter{ACM at time@hours}
   \setcounter{ACM at time@hours}{\numexpr (\time - 30) / 60 \relax}
@@ -2146,36 +2185,16 @@
   \setcounter{ACM at time@minutes}{\numexpr \time - \theACM at time@hours * 60 \relax}
   \newcommand\ACM at timestamp{%
     \footnotesize%
-    \the\year-\two at digits{\the\month}-\two at digits{\the\day}{ }%
-    \two at digits{\theACM at time@hours}:\two at digits{\theACM at time@minutes}{ }%
-    page~\thepage\ (pp. \@startPage-\pageref*{TotPages})%
     \ifx\@acmSubmissionID\@empty\relax\else
-    ~Submission~ID: \@acmSubmissionID
+    Submission ID: \@acmSubmissionID.{ }%
     \fi
+    \the\year-\two at digits{\the\month}-\two at digits{\the\day}{ }%
+    \two at digits{\theACM at time@hours}:\two at digits{\theACM at time@minutes}{. }%
+    Page \thepage\ of \@startPage--\pageref*{TotPages}.%
   }
 \fi
 \def\@shortauthors{\if at ACM@anonymous Anon.\else\shortauthors\fi}
-\def\@headfootfont{%
-  \ifcase\ACM at format@nr
-  \relax % manuscript
-    \sffamily
-  \or % acmsmall
-    \sffamily
-  \or % acmlarge
-    \sffamily
-  \or % acmtog
-    \sffamily
-  \or % sigconf
-    \sffamily
-  \or % siggraph
-    \sffamily
-  \or % sigplan
-    \sffamily
-  \or % sigchi
-    \sffamily
-  \or % sigchi-a
-    \sffamily
-  \fi}
+\def\@headfootfont{\sffamily}
 \fancypagestyle{standardpagestyle}{%
   \fancyhf{}%
   \renewcommand{\headrulewidth}{\z@}%
@@ -2468,8 +2487,9 @@
   \@ifundefined{proposition}{%
   \newtheorem{proposition}[theorem]{Proposition}
   }{}
+  \@ifundefined{lemma}{%
   \newtheorem{lemma}[theorem]{Lemma}
-  \@ifundefined{lemma}{}{}
+  }{}
   \@ifundefined{corollary}{%
   \newtheorem{corollary}[theorem]{Corollary}
   }{}



More information about the tex-live-commits mailing list