acmart (12apr17)

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

24 files changed, 79 insertions, 83 deletions

diff --git a/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst b/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst
index 53f7ba58b16..088f2389d9d 100644
--- a/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst
+++ b/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst
@@ -3444,7 +3444,7 @@ FUNCTION { begin.bib }
   %%         \newcommand{\showLCCN}[1]{LCCN #1.}
 
   "\ifx \showCODEN    \undefined \def \showCODEN     #1{\unskip}     \fi" writeln
-  "\ifx \showDOI      \undefined \def \showDOI       #1{{\tt DOI:}\penalty0{#1}\ } \fi" writeln
+  "\ifx \showDOI      \undefined \def \showDOI       #1{#1}\fi" writeln
   % ACM styles omit ISBNs, but they can be included by suitable definitions of
   % \showISBNx and \showISBNxiii before the .bbl file is read
   "\ifx \showISBNx    \undefined \def \showISBNx     #1{\unskip}     \fi" writeln
diff --git a/Master/texmf-dist/doc/latex/acmart/README b/Master/texmf-dist/doc/latex/acmart/README
index ec9162742c4..8a784a4e224 100644
--- a/Master/texmf-dist/doc/latex/acmart/README
+++ b/Master/texmf-dist/doc/latex/acmart/README
@@ -95,3 +95,7 @@ version 1.33    New option `timestamp' (Michael D. Adams)
 		Added workaround for Adobe Acrobat bugs in selection
 		Added eid field to the bibliography
 		
+version 1.34    Deleted DOI from doi numbers
+		Changed bibstrip formatting
+		The command \terms is now obsolete
+		The rulers in review mode now have continuous numbering
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/acmart/acmart.pdf b/Master/texmf-dist/doc/latex/acmart/acmart.pdf
index 50424b247e0..9a1deffa54d 100644
--- a/Master/texmf-dist/doc/latex/acmart/acmart.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/acmart.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/acmguide.pdf b/Master/texmf-dist/doc/latex/acmart/acmguide.pdf
index 2313f4f64f3..2b0660c1f7d 100644
--- a/Master/texmf-dist/doc/latex/acmart/acmguide.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/acmguide.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf
index 93d3e62ebc9..bb704b4fedf 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.tex b/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.tex
index 7f1f4de8b7d..702a365e499 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.tex
+++ b/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.tex
@@ -148,8 +148,6 @@ synchronization errors.
 % End generated code
 %
 
-% We no longer use \terms command
-\terms{Design, Algorithms, Performance}
 
 \keywords{Wireless sensor networks, media access control,
 multi-channel, radio interference, time synchronization}
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf
index bed79309e6b..69c39db4c44 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.tex b/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.tex
index 247e93674b1..a3d4e4d5371 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.tex
+++ b/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.tex
@@ -140,8 +140,6 @@ parallel transmissions among neighboring nodes.
 % End generated code
 %
 
-% We no longer use \terms command
-%\terms{Design, Algorithms, Performance}
 
 \keywords{Wireless sensor networks, media access control,
 multi-channel, radio interference, time synchronization}
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf
index 6ae236ed611..e5217270986 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmtog.tex b/Master/texmf-dist/doc/latex/acmart/sample-acmtog.tex
index ebe66c1f5a1..e71a1828e45 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-acmtog.tex
+++ b/Master/texmf-dist/doc/latex/acmart/sample-acmtog.tex
@@ -153,8 +153,6 @@ synchronization errors.
 % End generated code
 %
 
-% We no longer use \terms command
-\terms{Design, Algorithms, Performance}
 
 \keywords{Wireless sensor networks, media access control,
 multi-channel, radio interference, time synchronization}
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf b/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf
index c0be7e1ab04..e12f16ed8b2 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex b/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex
index 68a0502e3dd..7b12d443923 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex
+++ b/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex
@@ -151,8 +151,6 @@ synchronization errors.\footnote{This is an abstract footnote}
 % End generated code
 %
 
-% We no longer use \terms command
-\terms{Design, Algorithms, Performance}
 
 \keywords{Wireless sensor networks, media access control,
 multi-channel, radio interference, time synchronization}
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf
index d8c67ef8e5b..ea917e81432 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.tex b/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.tex
index 92c8de8cbbb..942fec8e23d 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.tex
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.tex
@@ -114,8 +114,6 @@
 \ccsdesc{Computer systems organization~Robotics}
 \ccsdesc[100]{Networks~Network reliability}
 
-% We no longer use \terms command
-%\terms{Theory}
 
 \begin{abstract}
   UPDATED---\today. This sample paper describes the formatting
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf
index 276171c20a8..9f3cd23eb26 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigchi.tex b/Master/texmf-dist/doc/latex/acmart/sample-sigchi.tex
index 8d1afcb6688..51347c5286a 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigchi.tex
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigchi.tex
@@ -146,8 +146,6 @@ ACM SIG Proceedings.
 \ccsdesc{Computer systems organization~Robotics}
 \ccsdesc[100]{Networks~Network reliability}
 
-% We no longer use \terms command
-%\terms{Theory}
 
 \keywords{ACM proceedings, \LaTeX, text tagging}
 
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.pdf
index f7ba3f06a64..686b8b1632a 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.tex b/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.tex
index c54d024e4d0..09ac3ad0df0 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.tex
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.tex
@@ -148,8 +148,6 @@ ACM SIG Proceedings.\footnote{This is an abstract footnote}
 \ccsdesc{Computer systems organization~Robotics}
 \ccsdesc[100]{Networks~Network reliability}
 
-% We no longer use \terms command
-%\terms{Theory}
 
 \keywords{ACM proceedings, \LaTeX, text tagging}
 
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf
index 90925bf7ca0..ffb3d1cee24 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigconf.tex b/Master/texmf-dist/doc/latex/acmart/sample-sigconf.tex
index c37fedd635f..3547f0a816c 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigconf.tex
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigconf.tex
@@ -147,8 +147,6 @@ ACM SIG Proceedings.\footnote{This is an abstract footnote}
 \ccsdesc{Computer systems organization~Robotics}
 \ccsdesc[100]{Networks~Network reliability}
 
-% We no longer use \terms command
-%\terms{Theory}
 
 \keywords{ACM proceedings, \LaTeX, text tagging}
 
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf
index 07895d1d45c..2e9d79c96bc 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex b/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex
index 4f4e1490a20..b1ace5a09fc 100644
--- a/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex
+++ b/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex
@@ -150,8 +150,6 @@ ACM SIG Proceedings.
 \ccsdesc{Computer systems organization~Robotics}
 \ccsdesc[100]{Networks~Network reliability}
 
-% We no longer use \terms command
-%\terms{Theory}
 
 \keywords{ACM proceedings, \LaTeX, text tagging}
 
diff --git a/Master/texmf-dist/source/latex/acmart/acmart.dtx b/Master/texmf-dist/source/latex/acmart/acmart.dtx
index bbac104e45b..ef206e62577 100644
--- a/Master/texmf-dist/source/latex/acmart/acmart.dtx
+++ b/Master/texmf-dist/source/latex/acmart/acmart.dtx
@@ -819,12 +819,11 @@
 %
 % \DescribeMacro{\terms}%
 % \DescribeMacro{\keywords}%
-% The macros \cs{terms}\marg{term, term,\ldots} and
-% \cs{keywords}\marg{keyword, keyword,\ldots} set the main terms and
-% the additional keywords for the article.  Term and keywords must be
+% The command
+% \cs{keywords}\marg{keyword, keyword,\ldots} sets keywords for the
+% article.  They must be 
 % separated by commas, for example,
 % \begin{verbatim}
-% \terms{wireless, interference}
 % \keywords{wireless sensor networks, media access control,
 % multi-channel, radio interference, time synchronization}
 % \end{verbatim}
@@ -1506,7 +1505,7 @@
 \ProvidesFile{acmart.dtx}
 %</gobble>
 %<class>\ProvidesClass{acmart}
-[2017/03/30 v1.33 Typesetting articles for Association of
+[2017/04/09 v1.34 Typesetting articles for Association of
 Computing Machinery]
 %    \end{macrocode}
 %
@@ -3468,11 +3467,12 @@ Computing Machinery]
 % \end{macro}
 %
 % \begin{macro}{\terms}
-%   Terms are mostly obsolete, we use CCS now.  Still it makes
-%   sense to keep them for compatibility.
+% \changes{v1.34}{2017/04/09}{The \cs{terms} command now just produces
+% a warning} 
+%   Terms are obsolete, we use CCS now. 
 %    \begin{macrocode}
-\def\terms#1{\def\@terms{#1}}
-\terms{}
+\def\terms#1{\ClassWarning{\@classname}{The command \string\terms{} is
+    obsolete.  I am going to ignore it}}
 %    \end{macrocode}
 %
 % \end{macro}
@@ -3752,30 +3752,30 @@ Computing Machinery]
 \def\@copyrightowner{%
   \ifcase\acm@copyrightmode\relax % none
   \or % acmcopyright
-  ACM\@.
+  Association for Computing Machinery.
   \or % acmlicensed
   Copyright held by the owner/author(s). Publication rights licensed to
-  ACM\@.
+  Association for Computing Machinery.
   \or % rightsretained
   Copyright held by the owner/author(s).
   \or % usgov
   \or % usgovmixed
-  ACM\@.
+  Association for Computing Machinery.
   \or % cagov
   Crown in Right of Canada.
   \or %cagovmixed
-  ACM\@.
+  Association for Computing Machinery.
   \or %licensedusgovmixed
   Copyright held by the owner/author(s). Publication rights licensed to
-  ACM\@.
+  Association for Computing Machinery.
   \or %licensedcagovmixed
   Copyright held by the owner/author(s). Publication rights licensed to
-  ACM\@.
+  Association for Computing Machinery.
   \or % othergov
-  ACM\@.
+  Association for Computing Machinery.
   \or % licensedothergov
   Copyright held by the owner/author(s). Publication rights licensed to
-  ACM\@.
+  Association for Computing Machinery.
   \fi}
 %    \end{macrocode}
 %
@@ -3979,6 +3979,10 @@ Computing Machinery]
 % \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}
+% \changes{v1.34}{2017/04/09}{Deleted `DOI' from doi numbers}
+% \changes{v1.34}{2017/04/09}{Added date to the bibstrip in conf proceedings}
+% \changes{v1.34}{2017/04/09}{The \cs{terms} command is now obsolete}
+% \changes{v1.34}{2017/04/11}{Rearranged bibstrip}
 %   The (in)famous \cs{maketitle}.  Note that in sigchi-a mode authors
 %   are \emph{not} in the title box.
 %
@@ -4027,12 +4031,12 @@ Computing Machinery]
       \if@printpermission\@copyrightpermission\par\fi
     \fi
     \if@ACM@manuscript\else
-       \if@ACM@journal\else % Print the conference short name
-         {\itshape \acmConference@shortname, \acmConference@venue}\par
+       \if@ACM@journal\else % Print the conference information
+         {\itshape \acmConference@shortname, \acmConference@date, \acmConference@venue}\par
        \fi
     \fi
     \if@printcopyright
-      \copyright\ \@copyrightyear\ \@copyrightowner\
+      \copyright\ \@copyrightyear\ \@copyrightowner\\
     \else
      \@copyrightyear.\
     \fi
@@ -4057,11 +4061,11 @@ Computing Machinery]
           \if@ACM@journal
             \@permissionCodeOne/\@acmYear/\@acmMonth-ART\@acmArticle\
             \$\@acmPrice\\
-            DOI: \nolinkurl{\@acmDOI}%
+            \@formatdoi{\@acmDOI}%
           \else % Conference
-             \@acmISBN
+             ACM~ISBN~\@acmISBN
              \ifx\@acmPrice\@empty.\else\dots\$\@acmPrice\fi\\
-             DOI: \nolinkurl{\@acmDOI}%
+             \@formatdoi{\@acmDOI}%
           \fi
         \fi
       \fi}
@@ -4074,10 +4078,6 @@ Computing Machinery]
          \@concepts\par}\egroup
      \fi
    \fi
-   \if\@terms\@empty\else\bgroup
-      {\@specialsection{General Terms}%
-         \@terms\par}\egroup
-   \fi
    \ifx\@keywords\@empty\else\bgroup
       {\if@ACM@journal
          \@specialsection{Additional Key Words and Phrases}%
@@ -4829,6 +4829,7 @@ Computing Machinery]
 % \changes{v1.17}{2016/07/10}{Changed format for sigs}
 % \changes{v1.17}{2016/07/10}{Added \cs{nobreak}}
 % \changes{v1.31}{2017/03/04}{Disabled linebreak}
+% \changes{v1.34}{2017/04/09}{Deleted DOI from doi numbers}
 %   Print bibcitation format
 %    \begin{macrocode}
 \def\@mkbibcitation{\bgroup
@@ -4850,7 +4851,7 @@ Computing Machinery]
          \ (\acmConference@shortname)\fi
          ,} \ref{TotPages}~pages.
   \fi\par
-  \noindent DOI: \nolinkurl{\@acmDOI}
+  \noindent\@formatdoi{\@acmDOI}
 \par\egroup}
 %    \end{macrocode}
 %
@@ -4903,17 +4904,21 @@ Computing Machinery]
 %    \end{macrocode}
 %
 % \begin{macro}{\ACM@linecount@bx}
+% \changes{v1.34}{2017/04/10}{Rulers now are continuous}
 %   This is the box displayed in the review mode
 %    \begin{macrocode}
 \if@ACM@review
   \newsavebox{\ACM@linecount@bx}
-  \savebox{\ACM@linecount@bx}[4em][t]{\parbox[t]{4em}{%
-      \newlength\ACM@linecount@bxht\setlength{\ACM@linecount@bxht}{-\baselineskip}
-      \@tempcnta\@ne\relax
-      \loop{\color{ACMRed}\scriptsize\the\@tempcnta}\\
-      \advance\@tempcnta by \@ne
-      \addtolength{\ACM@linecount@bxht}{\baselineskip}
-      \ifdim\ACM@linecount@bxht<\textheight\repeat}}
+  \newlength\ACM@linecount@bxht
+  \newcount\ACM@linecount
+  \ACM@linecount\@ne\relax
+  \def\ACM@mk@linecount{%
+    \savebox{\ACM@linecount@bx}[4em][t]{\parbox[t]{4em}{%
+        \setlength{\ACM@linecount@bxht}{-\baselineskip}%
+        \loop{\color{ACMRed}\scriptsize\the\ACM@linecount}\\
+        \global\advance\ACM@linecount by \@ne
+        \addtolength{\ACM@linecount@bxht}{\baselineskip}%
+        \ifdim\ACM@linecount@bxht<\textheight\repeat}}}
 \fi
 %    \end{macrocode}
 %
@@ -4921,10 +4926,12 @@ Computing Machinery]
 %
 % \begin{macro}{\ACM@linecountL}
 % \changes{v1.33}{2017/03/29}{Renamed macro}
+% \changes{v1.34}{2017/04/10}{Rulers now are continuous}
 %   How to display the box on the left
 %    \begin{macrocode}
 \def\ACM@linecountL{%
   \if@ACM@review
+  \ACM@mk@linecount
   \begin{picture}(0,0)%
     \put(-26,-22){\usebox{\ACM@linecount@bx}}%
   \end{picture}%
@@ -4935,10 +4942,12 @@ Computing Machinery]
 %
 % \begin{macro}{\ACM@linecountR}
 % \changes{v1.33}{2017/03/29}{Added macro}
+% \changes{v1.34}{2017/04/10}{Rulers now are continuous}
 %   How to display the box on the right
 %    \begin{macrocode}
 \def\ACM@linecountR{%
   \if@ACM@review
+  \ACM@mk@linecount
   \begin{picture}(0,0)%
     \put(20,-22){\usebox{\ACM@linecount@bx}}%
   \end{picture}%
diff --git a/Master/texmf-dist/tex/latex/acmart/acmart.cls b/Master/texmf-dist/tex/latex/acmart/acmart.cls
index 4c9d138690e..bc54fd505de 100644
--- a/Master/texmf-dist/tex/latex/acmart/acmart.cls
+++ b/Master/texmf-dist/tex/latex/acmart/acmart.cls
@@ -37,7 +37,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{acmart}
-[2017/03/30 v1.33 Typesetting articles for Association of
+[2017/04/09 v1.34 Typesetting articles for Association of
 Computing Machinery]
 \def\@classname{acmart}
 \InputIfFileExists{acmart-preload-hook.tex}{%
@@ -1110,8 +1110,8 @@ Computing Machinery]
 \def\@acmBadgeL@image{}
 \def\startPage#1{\def\@startPage{#1}}
 \startPage{}
-\def\terms#1{\def\@terms{#1}}
-\terms{}
+\def\terms#1{\ClassWarning{\@classname}{The command \string\terms{} is
+    obsolete.  I am going to ignore it}}
 \def\keywords#1{\def\@keywords{#1}}
 \keywords{}
 \renewenvironment{abstract}{\Collect@Body\@saveabstract}{}
@@ -1229,30 +1229,30 @@ Computing Machinery]
 \def\@copyrightowner{%
   \ifcase\acm@copyrightmode\relax % none
   \or % acmcopyright
-  ACM\@.
+  Association for Computing Machinery.
   \or % acmlicensed
   Copyright held by the owner/author(s). Publication rights licensed to
-  ACM\@.
+  Association for Computing Machinery.
   \or % rightsretained
   Copyright held by the owner/author(s).
   \or % usgov
   \or % usgovmixed
-  ACM\@.
+  Association for Computing Machinery.
   \or % cagov
   Crown in Right of Canada.
   \or %cagovmixed
-  ACM\@.
+  Association for Computing Machinery.
   \or %licensedusgovmixed
   Copyright held by the owner/author(s). Publication rights licensed to
-  ACM\@.
+  Association for Computing Machinery.
   \or %licensedcagovmixed
   Copyright held by the owner/author(s). Publication rights licensed to
-  ACM\@.
+  Association for Computing Machinery.
   \or % othergov
-  ACM\@.
+  Association for Computing Machinery.
   \or % licensedothergov
   Copyright held by the owner/author(s). Publication rights licensed to
-  ACM\@.
+  Association for Computing Machinery.
   \fi}
 \def\@formatdoi#1{\url{https://doi.org/#1}}
 \def\@copyrightpermission{%
@@ -1412,12 +1412,12 @@ Computing Machinery]
       \if@printpermission\@copyrightpermission\par\fi
     \fi
     \if@ACM@manuscript\else
-       \if@ACM@journal\else % Print the conference short name
-         {\itshape \acmConference@shortname, \acmConference@venue}\par
+       \if@ACM@journal\else % Print the conference information
+         {\itshape \acmConference@shortname, \acmConference@date, \acmConference@venue}\par
        \fi
     \fi
     \if@printcopyright
-      \copyright\ \@copyrightyear\ \@copyrightowner\
+      \copyright\ \@copyrightyear\ \@copyrightowner\\
     \else
      \@copyrightyear.\
     \fi
@@ -1442,11 +1442,11 @@ Computing Machinery]
           \if@ACM@journal
             \@permissionCodeOne/\@acmYear/\@acmMonth-ART\@acmArticle\
             \$\@acmPrice\\
-            DOI: \nolinkurl{\@acmDOI}%
+            \@formatdoi{\@acmDOI}%
           \else % Conference
-             \@acmISBN
+             ACM~ISBN~\@acmISBN
              \ifx\@acmPrice\@empty.\else\dots\$\@acmPrice\fi\\
-             DOI: \nolinkurl{\@acmDOI}%
+             \@formatdoi{\@acmDOI}%
           \fi
         \fi
       \fi}
@@ -1459,10 +1459,6 @@ Computing Machinery]
          \@concepts\par}\egroup
      \fi
    \fi
-   \if\@terms\@empty\else\bgroup
-      {\@specialsection{General Terms}%
-         \@terms\par}\egroup
-   \fi
    \ifx\@keywords\@empty\else\bgroup
       {\if@ACM@journal
          \@specialsection{Additional Key Words and Phrases}%
@@ -1925,7 +1921,7 @@ Computing Machinery]
          \ (\acmConference@shortname)\fi
          ,} \ref{TotPages}~pages.
   \fi\par
-  \noindent DOI: \nolinkurl{\@acmDOI}
+  \noindent\@formatdoi{\@acmDOI}
 \par\egroup}
 \def\@printendtopmatter{\par\medskip
   \ifcase\ACM@format@nr
@@ -1952,22 +1948,27 @@ Computing Machinery]
 \RequirePackage{fancyhdr}
 \if@ACM@review
   \newsavebox{\ACM@linecount@bx}
-  \savebox{\ACM@linecount@bx}[4em][t]{\parbox[t]{4em}{%
-      \newlength\ACM@linecount@bxht\setlength{\ACM@linecount@bxht}{-\baselineskip}
-      \@tempcnta\@ne\relax
-      \loop{\color{ACMRed}\scriptsize\the\@tempcnta}\\
-      \advance\@tempcnta by \@ne
-      \addtolength{\ACM@linecount@bxht}{\baselineskip}
-      \ifdim\ACM@linecount@bxht<\textheight\repeat}}
+  \newlength\ACM@linecount@bxht
+  \newcount\ACM@linecount
+  \ACM@linecount\@ne\relax
+  \def\ACM@mk@linecount{%
+    \savebox{\ACM@linecount@bx}[4em][t]{\parbox[t]{4em}{%
+        \setlength{\ACM@linecount@bxht}{-\baselineskip}%
+        \loop{\color{ACMRed}\scriptsize\the\ACM@linecount}\\
+        \global\advance\ACM@linecount by \@ne
+        \addtolength{\ACM@linecount@bxht}{\baselineskip}%
+        \ifdim\ACM@linecount@bxht<\textheight\repeat}}}
 \fi
 \def\ACM@linecountL{%
   \if@ACM@review
+  \ACM@mk@linecount
   \begin{picture}(0,0)%
     \put(-26,-22){\usebox{\ACM@linecount@bx}}%
   \end{picture}%
   \fi}
 \def\ACM@linecountR{%
   \if@ACM@review
+  \ACM@mk@linecount
   \begin{picture}(0,0)%
     \put(20,-22){\usebox{\ACM@linecount@bx}}%
   \end{picture}%