acmart (16dec17)

git-svn-id: svn://tug.org/texlive/trunk@46077 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 785 insertions, 716 deletions

diff --git a/Master/texmf-dist/source/latex/acmart/acmart.dtx b/Master/texmf-dist/source/latex/acmart/acmart.dtx
index 2ba07735822..92964a2c423 100644
--- a/Master/texmf-dist/source/latex/acmart/acmart.dtx
+++ b/Master/texmf-dist/source/latex/acmart/acmart.dtx
@@ -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@lk.net}{\texttt{borisv@lk.net}},
@@ -67,72 +66,78 @@
 % \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,
 %  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,39 +151,40 @@
 %
 % 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
 % |.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,30 +490,30 @@
 % \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}
 % \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,54 +542,54 @@
 % \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{...}
 % \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{...}
 % \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{...}
 % \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,14 +635,14 @@
 % \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
 % (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,30 +718,28 @@
 %   \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
 % 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,14 +913,14 @@
 %
 % \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}%
 % \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,40 +985,44 @@
 %
 % \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
 %     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,47 +1145,47 @@
 %
 % 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.
 %
 %
 %
 %\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,47 +1275,47 @@
 %
 % \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}
 %
 % \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,77 +1351,83 @@
 % 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:
 % \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}
 %
 % 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.
+%
+% 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.
 %
-% There are several customized \BibTeX\ entries and fields in ACM
-% style \path{ACM-Reference-Format.bst} you may want to be aware of.
+% 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 fields \path{doi} and \path{url}, for example,
+% 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,83 +1501,83 @@
 % \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,
 %  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:
 %    \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,16 +1653,16 @@
 %\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>
 \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 @@ Computing Machinery]
 % \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 @@ Computing Machinery]
 % \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,7 +1734,13 @@ Computing Machinery]
 % \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}
@@ -1749,7 +1766,7 @@ Computing Machinery]
 %
 %
 %
-%\subsection{Preload}
+%\subsection{Preload hook}
 %\label{sec:preload}
 %
 % We preload |acmart-preload-hook|:
@@ -1759,7 +1776,7 @@ Computing Machinery]
     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,7 +1790,7 @@ Computing Machinery]
 \RequirePackage{xstring}
 %    \end{macrocode}
 %
-% 
+%
 %
 % \begin{macro}{format}
 %   The possible formats
@@ -1807,7 +1824,7 @@ Computing Machinery]
     \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 @@ Computing Machinery]
     \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 @@ Computing Machinery]
 %
 %
 % \begin{macro}{\if@ACM@review}
+% \changes{v1.48}{2017/09/09}{Review mode now switches on folios}
 %   Whether we use review mode
 %    \begin{macrocode}
 \define@boolkey+{acmart.cls}[@ACM@]{review}[true]{%
   \if@ACM@review
     \PackageInfo{\@classname}{Using review mode}%
+    \AtBeginDocument{\@ACM@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,14 +1868,14 @@ Computing Machinery]
 %
 % \begin{macro}{\if@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@boolkey+{acmart.cls}[@ACM@]{authorversion}[true]{%
   \if@ACM@authorversion
     \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,17 +1886,18 @@ Computing Machinery]
 % \begin{macro}{\if@ACM@natbib@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@ACM@natbib}
-%   Whether we use natbib mode
+%   Whether we use |natbib| mode
 %    \begin{macrocode}
 \define@boolkey+{acmart.cls}[@ACM@]{natbib}[true]{%
   \if@ACM@natbib
     \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 @@ Computing Machinery]
     \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 @@ Computing Machinery]
     \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 @@ Computing Machinery]
 % \begin{macro}{\if@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@boolkey+{acmart.cls}[@ACM@]{authordraft}[true]{%
   \if@ACM@authordraft
@@ -1930,7 +1950,7 @@ Computing Machinery]
     \@ACM@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 @@ Computing Machinery]
 % \end{macro}
 %
 % \begin{macro}{\if@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@ACM@sigchiamode
@@ -1995,7 +2015,7 @@ Computing Machinery]
 % Setting up switches
 %    \begin{macrocode}
 \ifnum\ACM@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,16 +2048,16 @@ Computing Machinery]
 \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}
 % \changes{v1.38}{2017/05/13}{Increase default font size for SIGPLAN}
 %
 %
-% At this point we either have \cs{ACM@fontsize}, or use defaults
+% At this point we either have \cs{ACM@fontsize} or use defaults
 %    \begin{macrocode}
 \ifx\ACM@fontsize\@empty
   \ifcase\ACM@format@nr
@@ -2066,26 +2086,27 @@ Computing Machinery]
 \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@body} is defined using \cs{def}.  We load
-% |environ| to access the \cs{long} version of the command
+% The \cs{collect@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@ACM@manuscript
 \RequirePackage{setspace}
@@ -2094,16 +2115,17 @@ Computing Machinery]
 %    \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 @@ Computing Machinery]
 \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 @@ Computing Machinery]
 % \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 @@ Computing Machinery]
   \addvspace{32\p@\@plus14\p@}%
 }
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\l@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@section{\@tocline{1}{0pt}{1pc}{2pc}{}}
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{\l@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@subsection{\@tocline{2}{0pt}{1pc}{3pc}{}}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 % \begin{macro}{\l@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@subsubsection{\@tocline{2}{0pt}{1pc}{5pc}{}}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % And |hyperref|
@@ -2420,9 +2442,11 @@ Computing Machinery]
   \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@ACM@natbib
   \let\citeN\cite
@@ -2430,7 +2454,6 @@ Computing Machinery]
   \let\citeANP\citeauthor
   \let\citeNN\citeyearpar
   \let\citeyearNP\citeyear
-  \let\citeyear\citeyearpar
   \let\citeNP\citealt
   \DeclareRobustCommand\citeA
      {\begingroup\NAT@swafalse
@@ -2442,14 +2465,15 @@ Computing Machinery]
     \providecommand\citename[1]{#1}}
 \fi
 \newcommand\shortcite[2][]{%
-  \ifNAT@numbers\cite[#1]{#2}\else\citeyear[#1]{#2}\fi}
+  \ifNAT@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 @@ Computing Machinery]
        \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,20 +2505,20 @@ Computing Machinery]
 \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@ACM@authordraft
   \RequirePackage{draftwatermark}
   \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 @@ Computing Machinery]
 % \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@format@nr
@@ -2597,12 +2622,12 @@ Computing Machinery]
 %
 % \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 @@ Computing Machinery]
 %
 % 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,7 +2659,7 @@ Computing Machinery]
 \SelectFootnoteRule[2]{copyrightpermission}
 \DeclareNewFootnote{copyrightpermission}
 %    \end{macrocode}
-% 
+%
 %
 % \begin{macro}{\footnoterule}
 % \changes{v1.12}{2016/05/30}{Made shorter}
@@ -2657,7 +2682,7 @@ Computing Machinery]
       \normalcolor
       \unvbox\@mpfootins
     \fi
-    \@minipagefalse   %% added 24 May 89
+    \@minipagefalse
   \color@endgroup
   \egroup
   \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}}
@@ -2666,7 +2691,7 @@ Computing Machinery]
 % \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 @@ Computing Machinery]
 % \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@ACM@sigchiamode
 \long\def\@footnotetext#1{\marginpar{%
@@ -2709,9 +2734,9 @@ Computing Machinery]
         \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
     \color@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 @@ Computing Machinery]
 %    \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 @@ Computing Machinery]
 % \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,7 +2785,7 @@ Computing Machinery]
 \fi
 \RequirePackage{cmap}
 %    \end{macrocode}
-% 
+%
 %
 % \begin{macro}{\if@ACM@newfonts}
 % \changes{v1.12}{2016/05/30}{Added macro}%
@@ -2769,21 +2794,22 @@ Computing Machinery]
 \newif\if@ACM@newfonts
 \@ACM@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@newfontsfalse}
 \IfFileExists{zi4.sty}{}{\ClassWarning{\@classname}{You do not
-    have zi4 package installed.  Please upgrade your TeX}\@ACM@newfontsfalse}
+    have the zi4 package installed.  Please upgrade your
+    TeX}\@ACM@newfontsfalse}
 \IfFileExists{newtxmath.sty}{}{\ClassWarning{\@classname}{You do not
-    have newtxmath package installed.  Please upgrade your
-    TeX}\@ACM@newfontsfalse} 
+    have the newtxmath package installed.  Please upgrade your
+    TeX}\@ACM@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@ACM@newfonts
@@ -2795,15 +2821,15 @@ Computing Machinery]
 %    \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 @@ Computing Machinery]
 %\subsection{Floats}
 %\label{sec:floats}
 %
-% We use |caption| package
+% We use the |caption| package
 %    \begin{macrocode}
 \RequirePackage{caption, float}
 \captionsetup[table]{position=top}
 \if@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 @@ Computing Machinery]
 %    \end{macrocode}
 %
 % \begin{macro}{sidebar}
-%   The sidebar environment:
+%   The |sidebar| environment:
 %    \begin{macrocode}
 \newfloat{sidebar}{}{sbar}
 \floatname{sidebar}{Sidebar}
@@ -2870,7 +2896,7 @@ Computing Machinery]
 % \end{macro}
 %
 % \begin{macro}{marginfigure}
-%   The marginfigure environment:
+%   The |marginfigure| environment:
 %    \begin{macrocode}
 \newenvironment{marginfigure}{\Collect@Body\@marginfigure}{}
 %    \end{macrocode}
@@ -2888,7 +2914,7 @@ Computing Machinery]
 % \end{macro}
 %
 % \begin{macro}{margintable}
-%   The margintable environment:
+%   The |margintable| environment:
 %    \begin{macrocode}
 \newenvironment{margintable}{\Collect@Body\@margintable}{}
 %    \end{macrocode}
@@ -2906,7 +2932,7 @@ Computing Machinery]
 % \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 @@ Computing Machinery]
 % \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 @@ Computing Machinery]
 % \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 @@ Computing Machinery]
 %
 %
 % \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@labelwidth
@@ -3039,19 +3065,19 @@ Computing Machinery]
 % \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}
 %
 %
 % \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@labelwidth
@@ -3061,11 +3087,11 @@ Computing Machinery]
 }
 \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 @@ Computing Machinery]
 % \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@choicekey*+{ACM}{acmJournal}[\@journalCode\@journalCode@nr]{%
@@ -3143,7 +3169,7 @@ Computing Machinery]
   \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@screentrue
@@ -3170,22 +3196,22 @@ Computing Machinery]
   \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@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@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@screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
@@ -3199,6 +3225,7 @@ Computing Machinery]
   \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 @@ Computing Machinery]
 \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 @@ Computing Machinery]
   \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 @@ Computing Machinery]
   \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 @@ Computing Machinery]
        \ifx\acmConference@name\acmConference@shortname\else
          \ (\acmConference@shortname)\fi}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 % \end{macro}
 %
@@ -3404,18 +3429,21 @@ Computing Machinery]
 %    \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 @@ Computing Machinery]
     \g@addto@macro\@acmEditors{\and#1}%
 \fi}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\subtitle}
@@ -3450,7 +3478,7 @@ Computing Machinery]
 %
 % \begin{macro}{\num@authors}
 % \changes{v1.46}{2017/08/27}{Introduced macro}
-%   The total number of authors.
+%   The total number of authors
 %    \begin{macrocode}
 \newcount\num@authors
 \num@authors=0\relax
@@ -3464,8 +3492,11 @@ Computing Machinery]
 % \begin{macro}{\if@insideauthorgroup}
 % \changes{v1.15}{2016/06/25}{Introduced macro}
 %  Whether we are continuing an author group
+%    \begin{macrocode}
 \newif\if@insideauthorgroup
 \@insideauthorgroupfalse
+%    \end{macrocode}
+%
 % \end{macro}
 %
 % \begin{macro}{\author}
@@ -3535,11 +3566,11 @@ Computing Machinery]
 %
 % \begin{macro}{\if@ACM@affiliation@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@boolkey+{@ACM@affiliation@}[@ACM@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 @@ Computing Machinery]
 %    \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 @@ Computing Machinery]
 %
 % \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@ACM@anonymous\else
@@ -3588,20 +3619,26 @@ Computing Machinery]
 %
 % \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 @@ Computing Machinery]
 % \end{macro}
 %
 % \begin{macro}{\titlenote}
-%   Adding note to the title
+%   Adding a note to the title
 %    \begin{macrocode}
 \def\titlenote#1{%
   \g@addto@macro\@title{\footnotemark}%
@@ -3624,7 +3661,7 @@ Computing Machinery]
 % \end{macro}
 %
 % \begin{macro}{\@subtitlenotes}
-%   The subtitlenotes
+%   The subtitle notes
 %    \begin{macrocode}
 \def\@subtitlenotes{}
 %    \end{macrocode}
@@ -3632,7 +3669,7 @@ Computing Machinery]
 % \end{macro}
 %
 % \begin{macro}{\subtitlenote}
-%   Adding note to the subtitle
+%   Adding a note to the subtitle
 %    \begin{macrocode}
 \def\subtitlenote#1{%
   \g@addto@macro\@subtitle{\footnotemark}%
@@ -3648,7 +3685,7 @@ Computing Machinery]
 % \end{macro}
 %
 % \begin{macro}{\@authornotes}
-%   The authornotes
+%   The author notes
 %    \begin{macrocode}
 \def\@authornotes{}
 %    \end{macrocode}
@@ -3657,7 +3694,7 @@ Computing Machinery]
 %
 %
 % \begin{macro}{\authornote}
-%   Adding note to the author
+%   Adding a note to the author
 %    \begin{macrocode}
 \def\authornote#1{%
   \if@ACM@anonymous\else
@@ -3671,7 +3708,7 @@ Computing Machinery]
 %
 % \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 @@ Computing Machinery]
   \g@addto@macro\addresses{\@@authornotemark{#1}}%
   \fi}
 %    \end{macrocode}
-% 
+%
 % \end{macro}
 %
 % \begin{macro}{\acmVolume}
@@ -3728,7 +3765,7 @@ Computing Machinery]
 % \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 @@ Computing Machinery]
 % \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 @@ Computing Machinery]
 %
 % \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 @@ Computing Machinery]
 %
 % \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 @@ Computing Machinery]
 %
 % \begin{macro}{\if@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@ACM@badge
 \@ACM@badgefalse
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\@ACM@badge@width}
@@ -3820,7 +3857,7 @@ Computing Machinery]
 \newlength\@ACM@badge@width
 \setlength\@ACM@badge@width{5pc}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 %
@@ -3830,7 +3867,7 @@ Computing Machinery]
 %    \begin{macrocode}
 \newlength\@ACM@title@width
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 %
@@ -3841,7 +3878,7 @@ Computing Machinery]
 \newlength\@ACM@badge@skip
 \setlength\@ACM@badge@skip{1pc}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\acmBadgeR}
@@ -3854,7 +3891,7 @@ Computing Machinery]
 \def\@acmBadgeR@url{}
 \def\@acmBadgeR@image{}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\acmBadgeL}
@@ -3867,7 +3904,7 @@ Computing Machinery]
 \def\@acmBadgeL@url{}
 \def\@acmBadgeL@image{}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 %
@@ -3882,8 +3919,8 @@ Computing Machinery]
 %
 % \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 @@ Computing Machinery]
 % \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 @@ Computing Machinery]
 %
 %
 % \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@Body\@saveabstract}{}
 %    \end{macrocode}
@@ -3937,20 +3974,20 @@ Computing Machinery]
     \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@ACM@printacmref}
 % \changes{v1.17}{2016/07/10}{Renamed from \cs{if@ACM@printbib}}
-%   Whether to print ACM bib
+%   Whether to print the ACM bibstrip
 %    \begin{macrocode}
 \define@boolkey+{@ACM@topmatter@}[@ACM@]{printacmref}[true]{%
   \if@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}}
 %    \end{macrocode}
 %
 % \end{macro}
@@ -3964,20 +4001,20 @@ Computing Machinery]
     \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@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@cmdkey{@ACM@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@authorsperrow{0}}}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\settopmatter}
@@ -4081,15 +4118,15 @@ Computing Machinery]
   \expandafter\ifx\csname CCS@General@#2\endcsname\relax
     \expandafter\gdef\csname CCS@General@#2\endcsname{\textbullet\
       \textbf{#2}}%
-    \expandafter\gdef\csname CCS@Punctuation@#2\endcsname{; }%   
-    \expandafter\gdef\csname CCS@Specific@#2\endcsname{}%   
+    \expandafter\gdef\csname CCS@Punctuation@#2\endcsname{; }%
+    \expandafter\gdef\csname CCS@Specific@#2\endcsname{}%
   \g@addto@macro{\@concepts}{\csname CCS@General@#2\endcsname
     \csname CCS@Punctuation@#2\endcsname
     \csname CCS@Specific@#2\endcsname}%
   \fi
   \ifx#3\relax\relax\else
     \expandafter\gdef\csname CCS@Punctuation@#2\endcsname{
-      \textrightarrow\ }%   
+      \textrightarrow\ }%
     \expandafter\g@addto@macro\expandafter{\csname CCS@Specific@#2\endcsname}{%
      \ifnum#1>499\textbf{#3}; \else
      \ifnum#1>299\textit{#3}; \else
@@ -4115,7 +4152,7 @@ Computing Machinery]
 % This is from |acmcopyright.sty|
 %
 % \begin{macro}{\if@printcopyright}
-%   A flag whether to print copyright symbol
+%   Whether to print a copyright symbol
 %    \begin{macrocode}
 \newif\if@printcopyright
 \@printcopyrighttrue
@@ -4124,7 +4161,7 @@ Computing Machinery]
 % \end{macro}
 %
 % \begin{macro}{\if@printpermission}
-%   Whether to print permission block
+%   Whether to print the permission block
 %    \begin{macrocode}
 \newif\if@printpermission
 \@printpermissiontrue
@@ -4133,7 +4170,7 @@ Computing Machinery]
 % \end{macro}
 %
 % \begin{macro}{\if@acmowned}
-%   Whether ACM ownes the rights to the paper
+%   Whether the ACM owns the rights to the paper
 %    \begin{macrocode}
 \newif\if@acmowned
 \@acmownedtrue
@@ -4149,9 +4186,9 @@ Computing Machinery]
 \define@choicekey*{ACM@}{acmcopyrightmode}[%
   \acm@copyrightinput\acm@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 @@ Computing Machinery]
   \fi
   \ifnum\acm@copyrightmode=12\relax % licensedothergov
    \@acmownedfalse
+  \fi
+  \ifnum\acm@copyrightmode=13\relax % iw3c2w3
+   \@acmownedfalse
+  \fi
+  \ifnum\acm@copyrightmode=14\relax % iw3c2w3g
+   \@acmownedfalse
   \fi}
 %    \end{macrocode}
 %
@@ -4213,7 +4256,7 @@ Computing Machinery]
   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 @@ Computing Machinery]
   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 @@ Computing Machinery]
 % \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 @@ Computing Machinery]
    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 @@ Computing Machinery]
 % \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 @@ Computing Machinery]
 % \label{sec:makefile}
 %
 % \begin{macro}{\mktitle@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@bx
@@ -4445,7 +4513,7 @@ Computing Machinery]
 % 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 @@ Computing Machinery]
 % \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@ACM@anonymous
@@ -4474,9 +4547,9 @@ Computing Machinery]
   \let\@footnotemark\@footnotemark@nolink
   \let\@footnotetext\@footnotetext@nolink
   \renewcommand\thefootnote{\@fnsymbol\c@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@ACM@sigchiamode\else\@mkauthors\fi\@mkteasers
@@ -4487,7 +4560,8 @@ Computing Machinery]
   \@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 @@ Computing Machinery]
   \fi
   \footnotetextcopyrightpermission{%
     \if@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 @@ Computing Machinery]
       \if@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@ACM@journal
             \emph{\@journalName}%
           \else
@@ -4575,10 +4648,17 @@ Computing Machinery]
   \if@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@acmart.cls\endcsname\space
+      and hyperref
+      \csname ver@hyperref.sty\endcsname}}%
   \@printendtopmatter
   \@afterindentfalse
   \@afterheading
@@ -4588,7 +4668,7 @@ Computing Machinery]
 % \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@format@nr
@@ -4619,9 +4699,9 @@ Computing Machinery]
 % \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 @@ Computing Machinery]
 % \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@format@nr
@@ -4725,13 +4805,13 @@ Computing Machinery]
      \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@format@nr
@@ -4755,7 +4835,7 @@ Computing Machinery]
      \mdseries
   \fi}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\@mktitle@i}
@@ -4797,7 +4877,7 @@ Computing Machinery]
 %
 % \begin{macro}{\@mktitle@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@i} macro
 % \end{macro}
 %
@@ -4805,8 +4885,8 @@ Computing Machinery]
 % \begin{macro}{\@mktitle@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@iii{\hsize=\textwidth
@@ -4844,7 +4924,7 @@ Computing Machinery]
 %
 % \begin{macro}{\@mktitle@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@iv{\hsize=\textwidth
     \setbox\mktitle@bx=\vbox{\raggedright\leftskip5pc\@titlefont
@@ -4861,12 +4941,12 @@ Computing Machinery]
 % \begin{macro}{\@ACM@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@commabox
@@ -4911,7 +4991,7 @@ Computing Machinery]
 % \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 @@ Computing Machinery]
   \let\country\@ACM@addtoaddress
 \fi
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 % \end{macro}
 % \end{macro}
@@ -4951,7 +5031,7 @@ Computing Machinery]
 % \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 @@ Computing Machinery]
   \fi
   \def\@currentaffiliations{}}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 %
@@ -5049,7 +5129,7 @@ Computing Machinery]
 % \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@i{%
@@ -5088,12 +5168,13 @@ Computing Machinery]
 %
 % \begin{macro}{\@mkauthors@ii}
 % \changes{v1.17}{2016/07/09}{Deleted}
-%   \cs{@mkauthors@iI} was version used in acmtog.  No longer necessary
+%   The \cs{@mkauthors@ii} command was the version used in |acmtog|.
+%   It is no longer necessary.
 %
 % \end{macro}
 %
 % \begin{macro}{\author@bx}
-%   The box to put individual author to
+%   The box to put an individual author in
 %    \begin{macrocode}
 \newbox\author@bx
 %    \end{macrocode}
@@ -5109,7 +5190,7 @@ Computing Machinery]
 % \end{macro}
 %
 % \begin{macro}{\author@bx@sep}
-%   The separation between the author boxes
+%   The separation between author boxes
 %    \begin{macrocode}
 \newskip\author@bx@sep
 \author@bx@sep=1pc\relax
@@ -5119,7 +5200,7 @@ Computing Machinery]
 %
 % \begin{macro}{\@typeset@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@author@bx{\bgroup\hsize=\author@bx@wd\def\and{\par}%
@@ -5130,7 +5211,7 @@ Computing Machinery]
   \gdef\@currentauthors{}%
   \gdef\@currentaffiliation{}}
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 %
@@ -5138,7 +5219,7 @@ Computing Machinery]
 % \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@iii{%
@@ -5196,7 +5277,7 @@ Computing Machinery]
   \global\let\and\@typeset@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@bx=\vbox{\noindent
@@ -5211,9 +5292,8 @@ Computing Machinery]
 % \begin{macro}{\@mkauthors@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@iv{%
 %    \end{macrocode}
@@ -5264,7 +5344,7 @@ Computing Machinery]
   \global\let\and\@typeset@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 @@ Computing Machinery]
 % \begin{macro}{\@mkauthorsaddresses}
 % \changes{v1.46}{2017/08/27}{Introduced macro}
 % Typesetting authors' addresses in the footnote style
+%    \begin{macrocode}
 \def\@mkauthorsaddresses{%
   \ifnum\num@authors>1\relax
   Authors' \else Author's \fi
@@ -5296,10 +5377,12 @@ Computing Machinery]
   \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 @@ Computing Machinery]
 %
 %
 % \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@addto@macro\@currentauthors{\footnotemark\relax}}
 %    \end{macrocode}
@@ -5318,15 +5401,15 @@ Computing Machinery]
 %
 % \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@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 @@ Computing Machinery]
 % \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@ACM@journal
-       \small\noindent
+       \everypar{\setbox\z@\lastbox\everypar{}}\small
     \else
       \section*{Abstract}%
     \fi
@@ -5368,14 +5454,14 @@ Computing Machinery]
 % \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@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@string{\ifx\@acmArticle\@empty{\ }\else,
     Article~\@acmArticle\ \fi}%
@@ -5384,17 +5470,17 @@ Computing Machinery]
   \ifx\@subtitle\@empty. \else: \@subtitle. \fi
   \if@ACM@journal
      \textit{\@journalNameShort}
-     \@acmVolume, \@acmNumber \@article@string (\@acmPubDate), 
+     \@acmVolume, \@acmNumber \@article@string (\@acmPubDate),
      \ref{TotPages}~\@pages@word.
   \else
      In \textit{\@acmBooktitle}%
      \ifx\@acmEditors\@empty\textit{.}\else
        \andify\@acmEditors\textit{, }\@acmEditors~\@editorsAbbrev.%
-     \fi\ 
+     \fi\
      ACM, New York, NY, USA%
        \@article@string\unskip, \ref{TotPages}~\@pages@word.
   \fi
-  \@formatdoi{\@acmDOI}
+  \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi
 \par\egroup}
 %    \end{macrocode}
 %
@@ -5441,7 +5527,7 @@ Computing Machinery]
 % 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@ACM@review
   \newsavebox{\ACM@linecount@bx}
@@ -5498,10 +5584,11 @@ Computing Machinery]
 % \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@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@time@hours}
   \setcounter{ACM@time@hours}{\numexpr (\time - 30) / 60 \relax}
@@ -5509,52 +5596,33 @@ Computing Machinery]
   \setcounter{ACM@time@minutes}{\numexpr \time - \theACM@time@hours * 60 \relax}
   \newcommand\ACM@timestamp{%
     \footnotesize%
-    \the\year-\two@digits{\the\month}-\two@digits{\the\day}{ }%
-    \two@digits{\theACM@time@hours}:\two@digits{\theACM@time@minutes}{ }%
-    page~\thepage\ (pp. \@startPage-\pageref*{TotPages})%
     \ifx\@acmSubmissionID\@empty\relax\else
-    ~Submission~ID: \@acmSubmissionID
+    Submission ID: \@acmSubmissionID.{ }%
     \fi
+    \the\year-\two@digits{\the\month}-\two@digits{\the\day}{ }%
+    \two@digits{\theACM@time@hours}:\two@digits{\theACM@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@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@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 @@ Computing Machinery]
 % \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 @@ Computing Machinery]
 % \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 @@ Computing Machinery]
 %
 % \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 @@ Computing Machinery]
 % \begin{macro}{\ACM@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@ps@plain\ps@plain
 \let\ACM@ps@myheadings\ps@myheadings
@@ -5766,8 +5834,8 @@ Computing Machinery]
   \let\ps@headings\ACM@ps@headings}
 \AtBeginDocument{\ACM@restore@pagestyle}
 %    \end{macrocode}
-% 
-%   
+%
+%
 % \end{macro}
 %
 %
@@ -5820,8 +5888,8 @@ Computing Machinery]
 %  \changes{v1.12}{2016/05/30}{Moved to \cs{section@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@raggedright\MakeTextUppercase}
 \def\@subsecfont{\sffamily\bfseries\section@raggedright}
@@ -5873,12 +5941,12 @@ Computing Machinery]
 %    \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,20 +5954,20 @@ Computing Machinery]
 % \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}
 %
 % \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 @@ Computing Machinery]
 %    \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 @@ Computing Machinery]
 % \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,14 +6005,14 @@ Computing Machinery]
 % \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}
 %
 % \end{macro}
 %
-% Customization of |acmplain| theorem style:
+% Customization of the |acmplain| theorem style:
 %    \begin{macrocode}
 \ifcase\ACM@format@nr
 \relax % manuscript
@@ -5983,7 +6051,7 @@ Computing Machinery]
 %
 %
 % \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 @@ Computing Machinery]
 % \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,14 +6075,14 @@ Computing Machinery]
 % \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}
 %
 % \end{macro}
 %
-% Customization of |acmdefinition| theorem style:
+% Customization of the |acmdefinition| theorem style:
 %    \begin{macrocode}
 \ifcase\ACM@format@nr
 \relax % manuscript
@@ -6060,7 +6128,7 @@ Computing Machinery]
 % 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 @@ Computing Machinery]
   \@ifundefined{proposition}{%
   \newtheorem{proposition}[theorem]{Proposition}
   }{}
+  \@ifundefined{lemma}{%
   \newtheorem{lemma}[theorem]{Lemma}
-  \@ifundefined{lemma}{}{}
+  }{}
   \@ifundefined{corollary}{%
   \newtheorem{corollary}[theorem]{Corollary}
   }{}
@@ -6113,7 +6182,7 @@ Computing Machinery]
 %
 % \end{macro}
 %
-% Customization of proof environment.
+% Customization of the proof environment.
 %    \begin{macrocode}
 \ifcase\ACM@format@nr
 \relax % manuscript
@@ -6131,7 +6200,7 @@ Computing Machinery]
 %    \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 @@ Computing Machinery]
   \endgroup
 }
 %    \end{macrocode}
-%   
+%
 % \end{macro}
 %
 % \begin{macro}{\grantsponsor}
@@ -6174,7 +6243,7 @@ Computing Machinery]
 %    \begin{macrocode}
 \def\grantsponsor#1#2#3{#2}
 %    \end{macrocode}
-% 
+%
 % \end{macro}
 %
 % \begin{macro}{\grantnum}
@@ -6182,9 +6251,9 @@ Computing Machinery]
 % \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,15 +6296,15 @@ Computing Machinery]
      arXiv:\href{http://arxiv.org/abs/#2}{#2}\else arXiv:#2%
   \fi}
 %    \end{macrocode}
-% 
-%   
+%
+%
 % \end{macro}
 %
 %\subsection{End of Class}
 %\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>