acmart (14jul16)

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

1 files changed, 252 insertions, 185 deletions

diff --git a/Master/texmf-dist/tex/latex/acmart/acmart.cls b/Master/texmf-dist/tex/latex/acmart/acmart.cls
index 39129a62d05..7035523121d 100644
--- a/Master/texmf-dist/tex/latex/acmart/acmart.cls
+++ b/Master/texmf-dist/tex/latex/acmart/acmart.cls
@@ -35,9 +35,10 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
+
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{acmart}
-[2016/05/30 v1.12 Typesetting articles for Association of
+[2016/07/12 v1.18 Typesetting articles for Association of
 Computing Machinery]
 \def\@classname{acmart}
 \RequirePackage{xkeyval}
@@ -140,26 +141,7 @@ Computing Machinery]
   \@ACM@sigchiamodetrue
 \fi
 \if@ACM@natbib@override\else
-  \ifcase\ACM@format@nr
-  \relax % manuscript
-    \@ACM@natbibtrue
-  \or % acmsmall
-    \@ACM@natbibtrue
-  \or % acmlarge
-    \@ACM@natbibtrue
-  \or % acmtog
     \@ACM@natbibtrue
-  \or % sigconf
-    \@ACM@natbibfalse
-  \or % siggraph
-    \@ACM@natbibfalse
-   \or % sigplan
-    \@ACM@natbibtrue
-   \or % sigchi
-    \@ACM@natbibfalse
-  \or % sigchi-a
-    \@ACM@natbibfalse
-  \fi
 \fi
 \ifx\ACM@fontsize\@empty
   \ifcase\ACM@format@nr
@@ -168,7 +150,7 @@ Computing Machinery]
   \or % acmsmall
     \def\ACM@fontsize{10pt}%
   \or % acmlarge
-    \def\ACM@fontsize{9pt}%
+    \def\ACM@fontsize{10pt}%
   \or % acmtog
     \def\ACM@fontsize{9pt}%
   \or % sigconf
@@ -260,11 +242,26 @@ Computing Machinery]
   }%
   \NAT@@setcites
   }
-  \setcitestyle{%
-    open={[},close={]},citesep={;},%
-    authoryear,aysep={},yysep={,},%
-    notesep={, }}
+  \renewcommand\citestyle[1]{%
+    \ifcsname bibstyle@#1\endcsname%
+    \csname bibstyle@#1\endcsname\let\bibstyle\@gobble%
+    \else%
+    \@latex@error{Undefined `#1' citestyle}%
+    \fi
+  }%
 \fi
+\newcommand{\bibstyle@acmauthoryear}{%
+  \setcitestyle{%
+    authoryear,%
+    open={(},close={)},citesep={;},%
+    aysep={},yysep={,},%
+    notesep={, }}}
+\newcommand{\bibstyle@acmnumeric}{%
+  \setcitestyle{%
+    numbers,sort&compress,%
+    open={[},close={]},citesep={,},%
+    notesep={, }}}
+\citestyle{acmnumeric}
 \def\@startsection#1#2#3#4#5#6{%
   \if@noskipsec \leavevmode \fi
   \par
@@ -387,43 +384,18 @@ Computing Machinery]
   \def\shortcite#1{\citeyear{#1}}
   \DeclareRobustCommand\citeA
      {\begingroup\NAT@swafalse
-       \let\NAT@ctype\@ne\NAT@partrue\NAT@fullfalse\NAT@open\NAT@citetp}
-  \providecommand\newblock{}
+       \let\NAT@ctype\@ne\NAT@partrue\NAT@fullfalse\NAT@open\NAT@citetp}%
+  \providecommand\newblock{}%
 \else
   \providecommand\citename[1]{#1}
 \fi
-\ifcase\ACM@format@nr
-\relax % manuscript
-\or % acmsmall
-\or % acmlarge
-\or % acmtog
-\or % sigconf
-\or % siggraph
-   \def\@biblabel#1{}
-   \ifx\bibhang\@undefined
-      \newlength\bibhang
-   \fi
-   \setlength{\bibhang}{1em}
-    \renewenvironment{thebibliography}[1]{%
-      \@bibtitlestyle
-      \normalfont\bibliofont\labelsep .5em\relax
-      \renewcommand\theenumiv{\arabic{enumiv}}\let\p@enumiv\@empty
-      \list{\@biblabel{\theenumiv}}{\labelwidth\z@
-        \setlength{\itemindent}{-\bibhang}%
-        \setlength{\leftmargin}{\bibhang}%
-        \labelsep\z@
-        \def\newblock{\hskip .11em plus .33em minus .07em}%
-        \usecounter{enumiv}}%
-      \sloppy \clubpenalty\@M \widowpenalty\clubpenalty
-      \sfcode`\.=\@m
-    }{%
-      \def\@noitemerr{\@latex@warning{Empty `thebibliography' environment}}%
-      \endlist
-    }
-\or % sigplan
-\or % sigchi
-\or % sigchi-a
-\fi
+\def\bibliographystyle#1{%
+  \ifx\@begindocumenthook\@undefined\else
+    \expandafter\AtBeginDocument
+  \fi
+    {\if@filesw
+       \immediate\write\@auxout{\string\bibstyle{#1}}%
+     \fi}}
 \RequirePackage{graphicx, xcolor}
 \definecolor[named]{ACMBlue}{cmyk}{1,0.1,0,0.1}
 \definecolor[named]{ACMYellow}{cmyk}{0,0.16,1,0}
@@ -459,13 +431,13 @@ Computing Machinery]
    \geometry{twoside=true, head=1pc,
      paperwidth=8.5in, paperheight=11in,
      includeheadfoot, columnsep=2pc,
-     top=57pt, bottom=75pt, inner=54pt, outer=57pt
+     top=57pt, bottom=73pt, inner=54pt, outer=54pt
      }%
 \or % siggraph
    \geometry{twoside=true, head=1pc,
      paperwidth=8.5in, paperheight=11in,
      includeheadfoot, columnsep=2pc,
-     top=57pt, bottom=75pt, inner=54pt, outer=57pt
+     top=57pt, bottom=73pt, inner=54pt, outer=54pt
      }%
 \or % sigplan
    \geometry{twoside=true, head=1pc,
@@ -477,7 +449,7 @@ Computing Machinery]
    \geometry{twoside=true, head=1pc,
      paperwidth=8.5in, paperheight=11in,
      includeheadfoot, columnsep=2pc,
-     top=66pt, bottom=78pt, inner=54pt, outer=48pt
+     top=66pt, bottom=73pt, inner=54pt, outer=54pt
      }%
 \or % sigchi-a
    \geometry{twoside=false, head=1pc,
@@ -522,7 +494,6 @@ Computing Machinery]
   \color@endgroup
   \egroup
   \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}}
-
 \def\@makefntext{\noindent\@makefnmark}
 \if@ACM@sigchiamode
 \long\def\@footnotetext#1{\marginpar{%
@@ -536,6 +507,19 @@ Computing Machinery]
         \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
     \color@endgroup}}%
 \fi
+\long\def\@mpfootnotetext#1{%
+  \global\setbox\@mpfootins\vbox{%
+    \unvbox\@mpfootins
+    \reset@font\footnotesize
+    \hsize\columnwidth
+    \@parboxrestore
+    \protected@edef\@currentlabel
+         {\csname p@mpfootnote\endcsname\@thefnmark}%
+    \color@begingroup\centering
+      \@makefntext{%
+        \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+    \color@endgroup}}
+\def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}}
 \newif\if@ACM@newfonts
 \@ACM@newfontstrue
 \IfFileExists{libertine.sty}{}{\ClassWarning{\@classname}{You do not
@@ -633,6 +617,13 @@ Computing Machinery]
 \or % sigchi-a
 \fi
 \renewcommand{\descriptionlabel}[1]{\hspace\labelsep \upshape\bfseries #1}
+\renewenvironment{description}{\list{}{%
+    \itemindent-12\p@
+    \labelwidth\z@ \let\makelabel\descriptionlabel}%
+}{
+  \endlist
+}
+\let\enddescription=\endlist % for efficiency
 \define@choicekey*+{ACM}{acmJournal}[\@journalCode\@journalCode@nr]{%
   CIE,%
   CSUR,%
@@ -869,6 +860,7 @@ Computing Machinery]
   \ClassError{\@classname}{Incorrect journal #1}%
 }%
 \def\acmJournal#1{\setkeys{ACM}{acmJournal=#1}}
+\def\@journalCode@nr{0}
 \def\@journalName{}%
 \def\@journalNameShort{\@journalName}%
 \def\@permissionCodeOne{XXXX-XX}%
@@ -885,10 +877,15 @@ Computing Machinery]
   DC, USA}
 \def\subtitle#1{\def\@subtitle{#1}}
 \subtitle{}
-\newcount\num@authors
-\num@authors=0\relax
+\newcount\num@authorgroups
+\num@authorgroups=0\relax
+\newif\if@insideauthorgroup
+\@insideauthorgroupfalse
 \renewcommand\author[2][]{%
-  \global\advance\num@authors by 1\relax
+  \if@insideauthorgroup\else
+    \global\advance\num@authorgroups by 1\relax
+    \global\@insideauthorgrouptrue
+  \fi
   \ifx\addresses\@empty
     \if@ACM@anonymous
       \gdef\addresses{\@author{Anonymous Author(s)}}%
@@ -924,6 +921,7 @@ Computing Machinery]
     \fi
   \fi}
 \newcommand{\affiliation}[2][]{%
+  \global\@insideauthorgroupfalse
   \if@ACM@anonymous\else
     \g@addto@macro\addresses{\affiliation{#1}{#2}}%
   \fi}
@@ -931,6 +929,7 @@ Computing Machinery]
   \if@ACM@anonymous\else
     \g@addto@macro\addresses{\email{#1}{#2}}%
   \fi}
+\let\orcid\@gobble
 \def\@titlenotes{}
 \def\titlenote#1{%
   \g@addto@macro\@title{\footnotemark}%
@@ -958,17 +957,17 @@ Computing Machinery]
       \stepcounter{footnote}\footnotetext{#1}}%
   \fi}
 \def\acmVolume#1{\def\@acmVolume{#1}}
-\acmVolume{VV}
+\acmVolume{1}
 \def\acmNumber#1{\def\@acmNumber{#1}}
-\acmNumber{NNN}
+\acmNumber{1}
 \def\acmArticle#1{\def\@acmArticle{#1}}
-\acmArticle{AA}
+\acmArticle{1}
 \def\acmArticleSeq#1{\def\@acmArticleSeq{#1}}
 \acmArticleSeq{\@acmArticle}
 \def\acmYear#1{\def\@acmYear{#1}}
-\acmYear{YYYY}
+\acmYear{2016}
 \def\acmMonth#1{\def\@acmMonth{#1}}
-\acmMonth{MM}
+\acmMonth{1}
 \def\@acmPubDate{\ifcase\@acmMonth\or
   January\or February\or March\or April\or May\or June\or
   July\or August\or September\or October\or November\or
@@ -1012,21 +1011,27 @@ Computing Machinery]
   \else
     \ClassInfo{\@classname}{Suppressing CSS}%
   \fi}{\ClassError{\@classname}{printcss must be true or false}}
-\define@boolkey+{@ACM@topmatter@}[@ACM@]{printbib}[true]{%
-  \if@ACM@printcss
+\define@boolkey+{@ACM@topmatter@}[@ACM@]{printacmref}[true]{%
+  \if@ACM@printacmref
     \ClassInfo{\@classname}{Printing bibformat}%
   \else
     \ClassInfo{\@classname}{Suppressing bibformat}%
-  \fi}{\ClassError{\@classname}{printbib must be true or false}}
+  \fi}{\ClassError{\@classname}{printacmref must be true or false}}
+\define@boolkey+{@ACM@topmatter@}[@ACM@]{printfolios}[true]{%
+  \if@ACM@printfolios
+    \ClassInfo{\@classname}{Printing folios}%
+  \else
+    \ClassInfo{\@classname}{Suppressing folios}%
+  \fi}{\ClassError{\@classname}{printfolios must be true or false}}
 \def\settopmatter#1{\setkeys{@ACM@topmatter@}{#1}}
-\settopmatter{printcss=true}
+\settopmatter{printcss=true, printacmref=true}
 \if@ACM@manuscript
-  \settopmatter{printbib=false}
+  \settopmatter{printfolios=true}
 \else
   \if@ACM@journal
-    \settopmatter{printbib=true}
+    \settopmatter{printfolios=true}
   \else
-    \settopmatter{printbib=false}
+    \settopmatter{printfolios=false}
   \fi
 \fi
 \def\@received{}
@@ -1256,7 +1261,7 @@ Computing Machinery]
 \def\maketitle{%
   \if@ACM@anonymous
     % Anonymize omission of \author-s
-    \ifnum\num@authors=0\author{}\fi
+    \ifnum\num@authorgroups=0\author{}\fi
   \fi
   \begingroup
   \let\@footnotemark\@footnotemark@nolink
@@ -1348,7 +1353,7 @@ Computing Machinery]
   \andify\shortauthors
   \global\let\authors=\authors
   \global\let\shortauthors=\shortauthors
-  \if@ACM@printbib
+  \if@ACM@printacmref
      \@mkbibcitation
   \fi
   \hypersetup{pdfauthor={\authors},
@@ -1550,6 +1555,32 @@ Computing Machinery]
        \par\noindent\@subtitlefont\@subtitle
      \fi
      \par\bigskip}}%
+\newbox\@ACM@commabox
+\def\@ACM@addtoaddress#1{%
+  \ifvmode\else
+    \setbox\@ACM@commabox=\hbox{, }%
+    \unskip\cleaders\copy\@ACM@commabox\hskip\wd\@ACM@commabox
+  \fi
+  #1}
+\if@ACM@journal
+  \let\position\@gobble
+  \def\institution#1{#1\ignorespaces}%
+  \let\department\@gobble
+  \let\streetaddress\@gobble
+  \let\city\@gobble
+  \let\state\@gobble
+  \let\postcode\@gobble
+  \let\country\@gobble
+\else
+  \def\position#1{#1\par}%
+  \def\institution#1{#1\par}%
+  \def\department#1{#1\par}%
+  \def\streetaddress#1{#1\par}%
+  \let\city\@ACM@addtoaddress
+  \let\state\@ACM@addtoaddress
+  \def\postcode#1{\unskip\space#1}%
+  \let\country\@ACM@addtoaddress
+\fi
 \def\@mkauthors{\begingroup
   \hsize=\textwidth
   \ifcase\ACM@format@nr
@@ -1560,7 +1591,7 @@ Computing Machinery]
   \or % acmlarge
     \@mkauthors@i
   \or % acmtog
-    \@mkauthors@ii
+    \@mkauthors@i
   \or % sigconf
     \@mkauthors@iii
   \or % siggraph
@@ -1579,6 +1610,8 @@ Computing Machinery]
 \ifcase\ACM@format@nr
 \relax % manuscript
 \or % acmsmall
+  \def\@authorfont{\large\sffamily}
+  \def\@affiliationfont{\small\normalfont}
 \or % acmlarge
 \or % acmtog
   \def\@authorfont{\LARGE\sffamily}
@@ -1599,64 +1632,60 @@ Computing Machinery]
   \def\@authorfont{\bfseries}
   \def\@affiliationfont{\mdseries}
 \fi
+\def\@typeset@author@line{%
+  \andify\@currentauthors\par\noindent
+  \@currentauthors\def\@currentauthors{}%
+  \ifx\@currentaffiliations\@empty\else
+    \andify\@currentaffiliations
+      \unskip, {\@currentaffiliations}\par
+  \fi
+  \def\@currentaffiliations{}}
 \def\@mkauthors@i{%
   \def\@currentauthors{}%
-  \def\and{%
-    \andify\@currentauthors\par\noindent
-    \@currentauthors\def\@currentauthors{}}%
+  \def\@currentaffiliations{}%
+  \global\let\and\@typeset@author@line
   \def\@author##1{%
     \ifx\@currentauthors\@empty
       \gdef\@currentauthors{\@authorfont\MakeUppercase{##1}}%
     \else
        \g@addto@macro{\@currentauthors}{\and\MakeUppercase{##1}}%
     \fi
-    \def\and{}}%
+    \gdef\and{}}%
   \def\email##1##2{}%
   \def\affiliation##1##2{%
-    \ifx\@currentauthors\@empty\else
-      \andify\@currentauthors\par\noindent\@currentauthors
-    \fi
-    \def\@currentauthors{}\def\@tempa{##2}\ifx\@tempa\@empty\else
-    \unskip, {\@affiliationfont##2}\fi\def\and{\par\noindent}}%
-  \global\setbox\mktitle@bx=\vbox{\noindent\box\mktitle@bx\par\medskip
-    \noindent\addresses\andify\@currentauthors\par\noindent\@currentauthors\par\medskip}%
-}
-\def\@mkauthors@ii{\par\medskip
-  \def\@currentauthors{}%
-  \def\and{}%
-  \def\@author##1{%
-    \ifx\@currentauthors\@empty
-      \gdef\@currentauthors{\@authorfont
-      \MakeUppercase{##1}}%
-    \else
-      \g@addto@macro{\@currentauthors}{\and\MakeUppercase{##1}}%
-    \fi\def\and{}}%
-  \def\email##1##2{}%
-  \def\affiliation##1##2{%
-    \ifx\@currentauthors\@empty\else
-      \andify\@currentauthors\par\noindent\@currentauthors
+    \def\@tempa{##2}\ifx\@tempa\@empty\else
+       \ifx\@currentaffiliations\@empty
+          \gdef\@currentaffiliations{\@affiliationfont##2}%
+       \else
+         \g@addto@macro{\@currentaffiliations}{\and##2}%
+      \fi
     \fi
-    \def\@currentauthors{}\def\@tempa{##2}\ifx\@tempa\@empty\else
-    \par\noindent{\@affiliationfont##2}\fi
-    \def\and{\par\noindent{\@affiliationfont and}\par
-      \noindent\def\and{}}}%
+     \global\let\and\@typeset@author@line}
   \global\setbox\mktitle@bx=\vbox{\noindent\box\mktitle@bx\par\medskip
-    \noindent\addresses\andify\@currentauthors\par\noindent\@currentauthors\par\medskip}%
+    \noindent\addresses\@typeset@author@line
+   \par\medskip}%
 }
 \newbox\author@bx
 \newdimen\author@bx@wd
 \newskip\author@bx@sep
 \author@bx@sep=1pc\relax
+\def\@typeset@author@bx{\bgroup\hsize=\author@bx@wd\def\and{\par}%
+  \global\setbox\author@bx=\vtop{\if@ACM@sigchiamode\else\centering\fi
+    \@authorfont\@currentauthors\par\@affiliationfont
+    \@currentaffiliation}\egroup
+  \box\author@bx\hspace{\author@bx@sep}%
+  \gdef\@currentauthors{}%
+  \gdef\@currentaffiliation{}}
 \def\@mkauthors@iii{%
   \author@bx@wd=\textwidth\relax
   \advance\author@bx@wd by -\author@bx@sep\relax
-  \ifcase\num@authors
+  \ifcase\num@authorgroups
   \relax % 0?
   \or  % 1=one author per row
   \or  % 2=two authors per row
-     \divide\author@bx@wd by \num@authors\relax
+     \divide\author@bx@wd by \num@authorgroups\relax
   \or  % 3=three authors per row
-     \divide\author@bx@wd by \num@authors\relax
+     \divide\author@bx@wd by \num@authorgroups\relax
   \or  % 4=two authors per row (!)
      \divide\author@bx@wd by 2\relax
   \else % three authors per row
@@ -1668,8 +1697,9 @@ Computing Machinery]
   \def\@author##1{\ifx\@currentauthors\@empty
     \gdef\@currentauthors{\par##1}%
   \else
-    \g@addto@macro\@currentauthors{\quad##1}%
-  \fi}%
+    \g@addto@macro\@currentauthors{\par##1}%
+  \fi
+  \gdef\and{}}%
   \def\email##1##2{\ifx\@currentaffiliation\@empty
     \gdef\@currentaffiliation{\nolinkurl{##2}}%
   \else
@@ -1679,23 +1709,18 @@ Computing Machinery]
     \gdef\@currentaffiliation{##2}%
   \else
     \g@addto@macro\@currentaffiliation{\par##2}%
-  \fi}%
-  \def\and{\bgroup\hsize=\author@bx@wd\def\and{\quad}%
-    \global\setbox\author@bx=\vtop{\centering
-      \@authorfont\@currentauthors\par\@affiliationfont
-      \@currentaffiliation}\egroup
-    \box\author@bx\hspace{\author@bx@sep}%
-    \gdef\@currentauthors{}%
-    \gdef\@currentaffiliation{}}%
+  \fi
+  \global\let\and\@typeset@author@bx
+}%
   \hsize=\textwidth
   \global\setbox\mktitle@bx=\vbox{\noindent
     \box\mktitle@bx\par\medskip\leavevmode
     \lineskip=1pc\relax\centering\hspace*{-1em}%
-    \addresses\and\par\bigskip}}
+    \addresses\let\and\@typeset@author@bx\and\par\bigskip}}
 \def\@mkauthors@iv{%
   \author@bx@wd=\columnwidth\relax
   \advance\author@bx@wd by -\author@bx@sep\relax
-  \ifcase\num@authors
+  \ifcase\num@authorgroups
   \relax % 0?
   \or  % 1=one author per row
   \else  % 2=two authors per row
@@ -1707,8 +1732,9 @@ Computing Machinery]
   \def\@author##1{\ifx\@currentauthors\@empty
     \gdef\@currentauthors{\par##1}%
   \else
-    \g@addto@macro\@currentauthors{\quad##1}%
-  \fi}%
+    \g@addto@macro\@currentauthors{\par##1}%
+  \fi
+  \gdef\and{}}%
   \def\email##1##2{\ifx\@currentaffiliation\@empty
     \gdef\@currentaffiliation{\nolinkurl{##2}}%
   \else
@@ -1718,17 +1744,12 @@ Computing Machinery]
     \gdef\@currentaffiliation{##2}%
   \else
     \g@addto@macro\@currentaffiliation{\par##2}%
-  \fi}%
-  \def\and{\bgroup\hsize=\author@bx@wd\def\and{\quad}%
-    \global\setbox\author@bx=\vtop{\raggedright
-      \@authorfont\@currentauthors\par\@affiliationfont
-      \@currentaffiliation}\egroup
-    \box\author@bx\hskip\author@bx@sep
-    \gdef\@currentauthors{}%
-    \gdef\@currentaffiliation{}}%
+  \fi
+  \global\let\and\@typeset@author@bx}%
     \bgroup\hsize=\columnwidth
     \par\raggedright\leftskip=\z@
-    \lineskip=1pc\noindent\addresses\and\par\bigskip\egroup}
+    \lineskip=1pc\noindent
+    \addresses\let\and\@typeset@author@bx\and\par\bigskip\egroup}
 \def\@authornotemark{\g@addto@macro\@currentauthors{\footnotemark}}
 \def\@mkteasers{%
   \ifx\@teaserfigures\@empty\else
@@ -1748,10 +1769,20 @@ Computing Machinery]
       \@abstract\par}%
   \fi\egroup}
 \def\@mkbibcitation{\bgroup
-  \par\medskip\small\noindent{\bfseries ACM Reference format:}\par
-  \noindent\authors. \@acmYear. \@title. \textit{\@journalNameShort}
-  \@acmVolume, \@acmNumber, Article~\@acmArticle\
-  (\@acmPubDate), \ref{TotPages}~pages.\par
+  \def\footnotemark{}%
+  \par\medskip\small\noindent{\bfseries ACM Reference format:}\par\nobreak
+  \noindent\authors. \@acmYear. \@title.
+  \if@ACM@journal
+     \textit{\@journalNameShort}
+     \@acmVolume, \@acmNumber, Article~\@acmArticle\ (\@acmPubDate),
+     \ref{TotPages}~pages.
+  \else
+     In \textit{Proceedings of \acmConference@name, \acmConference@venue,
+       \acmConference@date
+       \ifx\acmConference@name\acmConference@shortname\else
+         \ (\acmConference@shortname)\fi
+         ,} \ref{TotPages}~pages.
+  \fi\par
   \noindent DOI: \nolinkurl{\@acmDOI}
 \par\egroup}
 \def\@printendtopmatter{\par\medskip
@@ -1793,43 +1824,73 @@ Computing Machinery]
     \put(-26,-22){\usebox{\ACM@linecount@bx}}%
   \end{picture}%
   \fi}
+\def\@shortauthors{\if@ACM@anonymous Anon.\else\shortauthors\fi}
+\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}
 \fancypagestyle{standardpagestyle}{%
   \fancyhf{}%
   \renewcommand{\headrulewidth}{\z@}%
   \renewcommand{\footrulewidth}{\z@}%
   \ifcase\ACM@format@nr
   \relax % manuscript
-    \fancyhead[LE]{\ACM@linecount\thepage}%
-    \fancyhead[RO]{\thepage}%
-    \fancyhead[RE]{\shortauthors}%
+    \fancyhead[LE]{\ACM@linecount\if@ACM@printfolios\thepage\fi}%
+    \fancyhead[RO]{\if@ACM@printfolios\thepage\fi}%
+    \fancyhead[RE]{\@shortauthors}%
     \fancyhead[LO]{\ACM@linecount\shorttitle}%
     \fancyfoot[RO,LE]{\footnotesize Manuscript submitted to ACM}%
   \or % acmsmall
-    \fancyhead[LE]{\ACM@linecount\sffamily\@acmArticle:\thepage}%
-    \fancyhead[RO]{\sffamily\@acmArticle:\thepage}%
-    \fancyhead[RE]{\sffamily\shortauthors}%
-    \fancyhead[LO]{\ACM@linecount\sffamily\shorttitle}%
+    \fancyhead[LE]{\ACM@linecount\@headfootfont\@acmArticle\if@ACM@printfolios:\thepage\fi}%
+    \fancyhead[RO]{\@headfootfont\@acmArticle\if@ACM@printfolios:\thepage\fi}%
+    \fancyhead[RE]{\@headfootfont\@shortauthors}%
+    \fancyhead[LO]{\ACM@linecount\@headfootfont\shorttitle}%
     \fancyfoot[RO,LE]{\footnotesize \@journalName, Vol. \@acmVolume, No.
     \@acmNumber, Article \@acmArticle.  Publication date: \@acmPubDate.}%
   \or % acmlarge
-    \fancyhead[LE]{\ACM@linecount\sffamily
-      \@acmArticle:\thepage\quad\textbullet\quad\shortauthors}%
+    \fancyhead[LE]{\ACM@linecount\@headfootfont
+      \@acmArticle:\if@ACM@printfolios\thepage\quad\textbullet\quad\fi\@shortauthors}%
     \fancyhead[LO]{\ACM@linecount}%
-    \fancyhead[RO]{\sffamily
-      \shorttitle\quad\textbullet\quad\@acmArticle:\thepage}%
+    \fancyhead[RO]{\@headfootfont
+      \shorttitle\quad\textbullet\quad\@acmArticle\if@ACM@printfolios:\thepage\fi}%
     \fancyfoot[RO,LE]{\footnotesize \@journalName, Vol. \@acmVolume, No.
     \@acmNumber, Article \@acmArticle.  Publication date: \@acmPubDate.}%
   \or % acmtog
-    \fancyhead[LE]{\ACM@linecount\sffamily
-      \@acmArticle:\thepage\quad\textbullet\quad\shortauthors}%
+    \fancyhead[LE]{\ACM@linecount\@headfootfont
+      \@acmArticle:\if@ACM@printfolios\thepage\quad\textbullet\quad\fi\@shortauthors}%
     \fancyhead[LO]{\ACM@linecount}%
-    \fancyhead[RO]{\sffamily
-      \shorttitle\quad\textbullet\quad\@acmArticle:\thepage}%
+    \fancyhead[RO]{\@headfootfont
+      \shorttitle\quad\textbullet\quad\@acmArticle\if@ACM@printfolios:\thepage\fi}%
     \fancyfoot[RO,LE]{\footnotesize \@journalName, Vol. \@acmVolume, No.
     \@acmNumber, Article \@acmArticle.  Publication date: \@acmPubDate.}%
   \else % Proceedings
-    \fancyfoot[R]{\footnotesize\thepage}%
-    \fancyhead[L]{\ACM@linecount}%
+    \fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}%
+    \fancyhead[LO]{\ACM@linecount\@headfootfont\shorttitle}%
+    \fancyhead[RE]{\@headfootfont\@shortauthors}%
+    \fancyhead[LE]{\ACM@linecount\@headfootfont\acmConference@shortname,
+      \acmConference@date, \acmConference@venue}%
+    \fancyhead[RO]{\@headfootfont\acmConference@shortname,
+      \acmConference@date, \acmConference@venue}%
+  \fi
+  \if@ACM@sigchiamode
+     \fancyheadoffset[L]{\dimexpr(\marginparsep+\marginparwidth)}%
   \fi
 }
 \pagestyle{standardpagestyle}
@@ -1879,7 +1940,7 @@ Computing Machinery]
   \ifcase\ACM@format@nr
   \relax % manuscript
     \fancyhead[L]{\ACM@linecount}%
-    \fancyfoot[RO,LE]{\small\thepage}%
+    \fancyfoot[RO,LE]{\if@ACM@printfolios\small\thepage\fi}%
     \fancyfoot[RE,LO]{\footnotesize Manuscript submitted to ACM}%
   \or % acmsmall
     \fancyfoot[RO,LE]{\footnotesize \@journalName, Vol. \@acmVolume, No.
@@ -1904,9 +1965,33 @@ Computing Machinery]
     \fancyhead[L]{\ACM@linecount}%
   \else % Conference proceedings
     \fancyhead[L]{\ACM@linecount}%
-    \fancyfoot[R]{\footnotesize\thepage}%
+    \fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}%
   \fi
 }
+\renewcommand\section{\@startsection{section}{1}{\z@}%
+  {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
+  {.25\baselineskip}%
+  {\@secfont}}
+\renewcommand\subsection{\@startsection{subsection}{2}{\z@}%
+  {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
+  {.25\baselineskip}%
+  {\@subsecfont}}
+\renewcommand\subsubsection{\@startsection{subsubsection}{3}{10pt}%
+  {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
+  {-3.5\p@}%
+  {\@subsubsecfont\@adddotafter}}
+\renewcommand\paragraph{\@startsection{paragraph}{4}{\parindent}%
+  {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
+  {-3.5\p@}%
+  {\@parfont\@adddotafter}}
+\renewcommand\part{\@startsection{part}{9}{\z@}%
+  {-10\p@ \@plus -4\p@ \@minus -2\p@}%
+  {4\p@}%
+  {\@parfont}}
+\def\section@raggedright{\@rightskip\@flushglue
+  \rightskip\@rightskip
+  \leftskip\z@skip
+  \parindent\z@}
 \def\@secfont{\sffamily\bfseries\section@raggedright\MakeUppercase}
 \def\@subsecfont{\sffamily\bfseries\section@raggedright}
 \def\@subsubsecfont{\sffamily\itshape}
@@ -1956,30 +2041,6 @@ Computing Machinery]
 \fi
 \def\@adddotafter#1{#1\@addpunct{.}}
 \def\@addspaceafter#1{#1\@addpunct{\enspace}}
-\renewcommand\section{\@startsection{section}{1}{\z@}%
-  {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
-  {.25\baselineskip}%
-  {\@secfont}}
-\renewcommand\subsection{\@startsection{subsection}{2}{\z@}%
-  {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
-  {.25\baselineskip}%
-  {\@subsecfont}}
-\renewcommand\subsubsection{\@startsection{subsubsection}{3}{10pt}%
-  {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
-  {-3.5\p@}%
-  {\@subsubsecfont\@adddotafter}}
-\renewcommand\paragraph{\@startsection{paragraph}{4}{\parindent}%
-  {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
-  {-3.5\p@}%
-  {\@parfont\@adddotafter}}
-\renewcommand\part{\@startsection{part}{9}{\z@}%
-  {-10\p@ \@plus -4\p@ \@minus -2\p@}%
-  {4\p@}%
-  {\@parfont}}
-\def\section@raggedright{\@rightskip\@flushglue
-  \rightskip\@rightskip
-  \leftskip\z@skip
-  \parindent\z@}
 \def\@acmplainbodyfont{\itshape}
 \def\@acmplainindent{\parindent}
 \def\@acmplainheadfont{\scshape}
@@ -2074,6 +2135,11 @@ Computing Machinery]
 }{%
   \popQED\endtrivlist\@endpefalse
 }
+\specialcomment{acks}
+  {\begingroup\section*{Acknowledgments}}{\endgroup}
+\def\grantsponsor#1#2#3{#2}
+\newcommand\grantnum[3][]{#3%
+  \def\@tempa{#1}\ifx\@tempa\@empty\else\space(\url{#1})\fi}
 \if@ACM@screen
   \includecomment{screenonly}
   \excludecomment{printonly}
@@ -2083,6 +2149,7 @@ Computing Machinery]
 \fi
 \if@ACM@anonymous
   \excludecomment{anonsuppress}
+  \excludecomment{acks}
 \else
   \includecomment{anonsuppress}
 \fi