acmart (15may16)

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

1 files changed, 217 insertions, 60 deletions

diff --git a/Master/texmf-dist/source/latex/acmart/acmart.dtx b/Master/texmf-dist/source/latex/acmart/acmart.dtx
index 57c062ee9ed..71070c7c321 100644
--- a/Master/texmf-dist/source/latex/acmart/acmart.dtx
+++ b/Master/texmf-dist/source/latex/acmart/acmart.dtx
@@ -208,14 +208,14 @@
 %     \normalfont Value & Meaning\\
 %     \midrule
 %     manuscript  & A manuscript. This is the default \\
-%   acmsmall & Small format, used for CIE, CSUR, JACM, JDIQ, JEA, JERIC,
+%   acmsmall & Small single column format, used for CIE, CSUR, JACM, JDIQ, JEA, JERIC,
 %            JETC, TAAS, TACCESS, TACO, TALG, TALLIP (formerly TALIP), TCPS,
 %            TEAC, TECS, 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\@. \\
-%           acmlarge  & Large single colummn format, used for
+%           acmlarge  & Large single column format, used for
 %          JOCCH, TAP \\
 %            acmtog   & Large double column format, used for
 %          TOG\\
@@ -224,7 +224,7 @@
 %           siggraph & Proceedings format for SIGGRAPH and SIGGRAPH
 %          Asia conferences, published in ACM Transactions on Graphics
 %          journal issues \\
-%            sigplan & Proceedings format used for SIGPLAN conferences\\
+%            sigplan & Proceedings format for SIGPLAN conferences\\
 %            sigchi  & Proceedings format for SIGCHI conferences\\
 %           sigchi-a & Format for SIGCHI extended abstract\\
 %   \bottomrule
@@ -262,8 +262,8 @@
 %     \toprule
 %     \normalfont Option & \normalfont Default & Meaning\\
 %     \midrule
-%     review & false & A review version: doublespaced, lines are
-%     numbered, hyperlinks are colored\\
+%     review & false & A review version: lines are numbered,
+%     hyperlinks are colored\\
 %     screen & false & A screen version: hyperlinks are colored\\
 %     natbib & false & Whether to use |natbib| package (see
 %     Section~\ref{sec:ug_bibliography})\\
@@ -689,7 +689,7 @@
 % the details).  The document option |authorversion=true| produces the
 % special form of the copyright statement for this case.  Note that
 % you still need the \cs{setcopyright} command and (optionally)
-% \cs{authoryear} command to tell \TeX\ about the copyright owner and
+% \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 page breaks might be different between them.
@@ -742,8 +742,8 @@
 %
 %
 % \DescribeMacro{\received}%
-% The command \cs{received}\marg[stage]\oarg{date} sets the history of
-% the publication.  The \marg{stage} argument is optional; the default
+% The command \cs{received}\oarg{stage}\marg{date} sets the history of
+% the publication.  The \oarg{stage} argument is optional; the default
 % is |Received| for the first date and |revised| for the subsequent
 % ones.  For example
 % \begin{verbatim}
@@ -784,7 +784,7 @@
 % tables.  There are some important items to be aware of, however.
 %
 % \begin{enumerate}
-% \item The captions for figures must be intered \emph{after} the
+% \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
 % several new ones.  In total there are follwing types:
@@ -868,6 +868,16 @@
 % \item[margintable:] a table on the margin
 % \end{description}
 %
+% \DescribeMacro{\nocaptionrule}%
+% \DescribeMacro{\captionruleoff}%
+% \DescribeMacro{\captionruleon}%
+% SIGPLAN format uses rules between captions and float bodies.  In
+% some cases these rules interfere with the material.  The command
+% \cs{nocaptionrule} before the caption (but inside figure or table)
+% switches the rule off.  The command \cs{captionruleoff} switches off
+% caption rules for all subsequent figures, while the command
+% \cs{captionruleon} switches them on.  In other formats this command
+% does not make any difference.
 %
 %\subsection{Theorems}
 %\label{sec:ug_theorems}
@@ -997,7 +1007,7 @@
 \ProvidesFile{acmart.dtx}
 %</gobble>
 %<class>\ProvidesClass{acmart}
-[2016/05/03 v1.07 Typesetting articles for Association of
+[2016/05/14 v1.08 Typesetting articles for Association of
 Computing Machinery]
 %    \end{macrocode}
 %
@@ -1019,6 +1029,8 @@ Computing Machinery]
 % closes \url{https://github.com/borisveytsman/acmart/issues/19}}
 % \changes{v1.05}{2016/04/27}{Added processing doi numbers for
 % acmsiggraph and doi numbers for sigproc.bib}
+% \changes{v1.08}{2016/05/13}{SIGPLAN reformatting by Matthew Fluet}
+% \changes{v1.08}{2016/05/13}{Typos corrected (Tobias Pape)}
 %
 %
 % And the driver code:
@@ -1220,7 +1232,7 @@ Computing Machinery]
 \ifcase\ACM@format@nr
 \relax % manuscript
   \@ACM@journaltrue
-\or% acmsmall
+\or % acmsmall
   \@ACM@journaltrue
 \or % acmlarge
   \@ACM@journaltrue
@@ -1251,7 +1263,7 @@ Computing Machinery]
   \ifcase\ACM@format@nr
   \relax % manuscript
     \def\ACM@fontsize{9pt}%
-  \or% acmsmall
+  \or % acmsmall
     \def\ACM@fontsize{10pt}%
   \or % acmlarge
     \def\ACM@fontsize{9pt}%
@@ -1470,10 +1482,19 @@ Computing Machinery]
 \let\@footnotemark@nolink\@footnotemark
 \let\@footnotetext@nolink\@footnotetext
 \RequirePackage{hyperref}
-\if@ACM@sigchiamode
+\urlstyle{rm}
+\ifcase\ACM@format@nr
+\relax % manuscript
+\or % acmsmall
+\or % acmlarge
+\or % acmtog
+\or % sigconf
+\or % siggraph
+\or % sigplan
+  \urlstyle{sf}
+\or % sigchi
+\or % sigchi-a
   \urlstyle{sf}
-\else
-  \urlstyle{rm}
 \fi
 \if@ACM@screen
   \hypersetup{colorlinks,
@@ -1506,7 +1527,7 @@ Computing Machinery]
 \fi
 \ifcase\ACM@format@nr
 \relax % manuscript
-\or% acmsmall
+\or % acmsmall
 \or % acmlarge
 \or % acmtog
 \or % sigconf
@@ -1565,7 +1586,7 @@ Computing Machinery]
 \ifcase\ACM@format@nr
 \relax % manuscript
    \geometry{letterpaper,head=1pc}%
-\or% acmsmall
+\or % acmsmall
    \geometry{twoside=true,
      includeheadfoot, head=1pc, foot=2pc,
      paperwidth=6.75in, paperheight=10in,
@@ -1598,8 +1619,8 @@ Computing Machinery]
 \or % sigplan
    \geometry{twoside=true, head=1pc,
      paperwidth=8.5in, paperheight=11in,
-     includeheadfoot, columnsep=2pc,
-     top=74pt, bottom=70pt, inner=54pt, outer=54pt
+     includeheadfoot=false, columnsep=2pc,
+     top=1in, bottom=1in, inner=0.75in, outer=0.75in
      }%
 \or % sigchi
    \geometry{twoside=true, head=1pc,
@@ -1628,7 +1649,7 @@ Computing Machinery]
 \setlength\parskip{\z@}
 \ifcase\ACM@format@nr
 \relax % manuscript
-\or% acmsmall
+\or % acmsmall
 \or % acmlarge
 \or % acmtog
   \setlength\parindent{9\p@}%
@@ -1736,6 +1757,73 @@ Computing Machinery]
 %    \begin{macrocode}
 \RequirePackage{caption, float}
 \captionsetup[table]{position=top}
+%    \end{macrocode}
+% 
+%
+%
+% \begin{macro}{\if@ACM@captionrule}
+% \changes{v1.08}{2016/05/14}{Introduced macro}
+%   Whether to use caption rules in SIGPLAN.  We define it here, so
+%   caption rule commands do not produce errors with other
+%   formats. Fortunately, other formats do not use rules.
+%    \begin{macrocode}
+\newif\if@ACM@captionrule
+\@ACM@captionruletrue
+%    \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\nocaptionrule}
+% \changes{v1.08}{2016/05/14}{Introduced macro}
+%   Locally delete caption rule
+%    \begin{macrocode}
+\def\nocaptionrule{\@ACM@captionrulefalse}
+%    \end{macrocode}
+%   
+% \end{macro}
+%
+% \begin{macro}{\captionruleoff}
+% \changes{v1.08}{2016/05/14}{Introduced macro}
+%   Globally switching rules off
+%    \begin{macrocode}
+\def\captionruleoff{\global\@ACM@captionrulefalse}
+%    \end{macrocode}
+%   
+% \end{macro}
+%
+% \begin{macro}{\captionruleon}
+% \changes{v1.08}{2016/05/14}{Introduced macro}
+%   Globally switching rules on
+%    \begin{macrocode}
+\def\captionruleon{\global\@ACM@captionruletrue}
+%    \end{macrocode}
+%   
+% \end{macro}
+%
+% \begin{macro}{@ACM@capfmtWithRuleAbove}
+% \changes{v1.08}{2016/05/14}{Introduced macro}
+%   The SIGPLAN ruled caption for figures
+%    \begin{macrocode}
+\DeclareCaptionFormat{@ACM@capfmtWithRuleAbove}{%
+  \if@ACM@captionrule\hrulefill\par\noindent\fi#1#2#3\par}
+%    \end{macrocode}
+%   
+% \end{macro}
+%
+% \begin{macro}{@ACM@capfmtWithRuleBelow}
+% \changes{v1.08}{2016/05/14}{Introduced macro}
+%   The SIGPLAN ruled caption for tables
+%    \begin{macrocode}
+\DeclareCaptionFormat{@ACM@capfmtWithRuleBelow}{%
+  #1#2#3\if@ACM@captionrule\par\vspace{-.5\baselineskip}%
+  \noindent\hrulefill\fi\par}
+%    \end{macrocode}
+%   
+% \end{macro}
+%
+%
+% And the actual setup
+%    \begin{macrocode}
 \if@ACM@journal
   \captionsetup{labelfont={sf, small},
     textfont={sf, small},  margin=\z@}
@@ -1745,13 +1833,18 @@ Computing Machinery]
     textfont={bf}, labelsep=colon, margin=\z@}
   \ifcase\ACM@format@nr
   \relax % manuscript
-  \or% acmsmall
+  \or % acmsmall
   \or % acmlarge
   \or % acmtog
   \or % sigconf
   \or % siggraph
     \captionsetup{textfont={it}}
   \or % sigplan
+    \setlength\abovecaptionskip{4\p@}
+    \captionsetup[figure]{format=@ACM@capfmtWithRuleAbove}
+    \captionsetup[table]{format=@ACM@capfmtWithRuleBelow}
+    \captionsetup{labelfont={bf},
+      textfont={normalfont}, labelsep=period, margin=\z@}
   \or % sigchi
     \captionsetup[figure]{labelfont={bf, small},
       textfont={bf, small}}
@@ -1871,6 +1964,29 @@ Computing Machinery]
 %
 % \end{macro}
 %
+%
+%\subsection{Lists}
+%\label{sec:lists}
+%
+%    \begin{macrocode}
+\ifcase\ACM@format@nr
+\relax % manuscript
+\or % acmsmall
+\or % acmlarge
+\or % acmtog
+\or % sigconf
+\or % siggraph
+\or % sigplan
+\def\labelenumi{\theenumi.}
+\def\labelenumii{\theenumii.}
+\def\labelenumiii{\theenumiii.}
+\def\labelenumiv{\theenumiv.}
+\or % sigchi
+\or % sigchi-a
+\fi
+%    \end{macrocode}
+%
+%
 %\subsection{Top matter data}
 %\label{sec:top_matter_data}
 %
@@ -3075,9 +3191,24 @@ Computing Machinery]
 %   This macro starts section for proceedings and uses small for journals
 %    \begin{macrocode}
 \def\@specialsection#1{%
-  \if@ACM@journal
+  \ifcase\ACM@format@nr
+  \relax % manuscript
     \par\medskip\small\noindent#1: %
-  \else
+  \or % acmsmall
+    \par\medskip\small\noindent#1: %
+  \or % acmlarge
+    \par\medskip\small\noindent#1: %
+  \or % acmtog
+    \par\medskip\small\noindent#1: %
+  \or % sigconf
+    \section*{#1}%
+  \or % siggraph
+    \section*{#1}%
+  \or % sigplan
+    \paragraph*{#1}%
+  \or % sigchi
+    \section*{#1}%
+  \or % sigchi-a
     \section*{#1}%
   \fi}
 %    \end{macrocode}
@@ -3103,7 +3234,7 @@ Computing Machinery]
   \relax % manuscript
     \box\mktitle@bx\par
     \noindent\hrulefill\par
-  \or% acmsmall
+  \or % acmsmall
     \box\mktitle@bx\par
     \noindent\hrulefill\par
   \or % acmlarge
@@ -3146,7 +3277,7 @@ Computing Machinery]
   \ifcase\ACM@format@nr
   \relax % manuscript
     \@mktitle@i
-  \or% acmsmall
+  \or % acmsmall
     \@mktitle@i
   \or % acmlarge
     \@mktitle@i
@@ -3176,7 +3307,7 @@ Computing Machinery]
   \ifcase\ACM@format@nr
   \relax % manuscript
     \LARGE\bfseries\sffamily
-  \or% acmsmall
+  \or % acmsmall
     \LARGE\bfseries\sffamily
   \or % acmlarge
     \LARGE\bfseries\sffamily
@@ -3187,7 +3318,7 @@ Computing Machinery]
   \or % siggraph
     \Huge\sffamily\bfseries
   \or % sigplan
-    \Huge\sffamily\bfseries
+    \Huge\bfseries
   \or % sigchi
     \Huge\sffamily\bfseries
   \or % sigchi-a
@@ -3205,7 +3336,7 @@ Computing Machinery]
   \ifcase\ACM@format@nr
   \relax % manuscript
     \mdseries
-  \or% acmsmall
+  \or % acmsmall
     \mdseries
   \or % acmlarge
     \mdseries
@@ -3335,7 +3466,7 @@ Computing Machinery]
   \ifcase\ACM@format@nr
   \relax % manuscript
     \@mkauthors@i
-  \or% acmsmall
+  \or % acmsmall
     \@mkauthors@i
   \or % acmlarge
     \@mkauthors@i
@@ -3378,7 +3509,7 @@ Computing Machinery]
 %    \begin{macrocode}
 \ifcase\ACM@format@nr
 \relax % manuscript
-\or% acmsmall
+\or % acmsmall
 \or % acmlarge
 \or % acmtog
   \def\@authorfont{\LARGE\sffamily}
@@ -3390,6 +3521,8 @@ Computing Machinery]
   \def\@authorfont{\normalsize\normalfont}
   \def\@affiliationfont{\normalsize\normalfont}
 \or % sigplan
+  \def\@authorfont{\Large\normalfont}
+  \def\@affiliationfont{\normalsize\normalfont}
 \or % sigchi
   \def\@authorfont{\bfseries}
   \def\@affiliationfont{\mdseries}
@@ -3654,7 +3787,7 @@ Computing Machinery]
   {\if@ACM@journal
        \small\noindent
     \else
-      \section*{ABSTRACT}%
+      \section*{Abstract}%
     \fi
       \@abstract\par}%
   \fi\egroup}
@@ -3683,7 +3816,7 @@ Computing Machinery]
   \ifcase\ACM@format@nr
   \relax % manuscript
     \noindent\hrulefill\par\medskip
-  \or% acmsmall
+  \or % acmsmall
     \noindent\hrulefill\par\medskip
   \or % acmlarge
     \noindent\hrulefill\par\medskip
@@ -3768,7 +3901,7 @@ Computing Machinery]
     \fancyhead[LE]{\ACM@linecount\shortauthors}%
     \fancyhead[RO]{\shorttitle}%
     \fancyfoot[RO,LE]{\footnotesize Manuscript submitted to ACM}%
-  \or% acmsmall
+  \or % acmsmall
     \fancyhead[RE]{\sffamily\@acmArticle:\thepage}%
     \fancyhead[LO]{\ACM@linecount\sffamily\@acmArticle:\thepage}%
     \fancyhead[LE]{\ACM@linecount\sffamily\shortauthors}%
@@ -3816,7 +3949,7 @@ Computing Machinery]
 \def\@folio@max{1}
 \ifcase\ACM@format@nr
 \relax % manuscript
-\or% acmsmall
+\or % acmsmall
   \@folio@wd=45.75pt\relax
   \@folio@ht=1.25in\relax
   \@folio@voffset=.2in\relax
@@ -3868,7 +4001,7 @@ Computing Machinery]
 % \end{macro}
 %
 % \begin{macro}{firstpagestyle}
-%   The pagestyle for all pages but the first one
+%   The pagestyle for the first page only.
 %    \begin{macrocode}
 \fancypagestyle{firstpagestyle}{%
   \fancyhf{}%
@@ -3879,7 +4012,7 @@ Computing Machinery]
     \fancyhead[L]{\ACM@linecount}%
     \fancyfoot[RO,LE]{\small\thepage}%
     \fancyfoot[RE,LO]{\footnotesize Manuscript submitted to ACM}%
-  \or% acmsmall
+  \or % acmsmall
     \fancyfoot[RO,LE]{\footnotesize \@journalName, Vol. \@acmVolume, No.
     \@acmNumber, Article \@acmArticle.  Publication date:
     \@acmPubDate.}%
@@ -3914,6 +4047,31 @@ Computing Machinery]
 %\label{sec:sectioninng}
 %
 %
+%   Sectioning is different for different levels
+%    \begin{macrocode}
+\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}}
+%    \end{macrocode}
+%
+%
 % Fonts for sections etc. are different for different formats.  Also,
 % some formats use the ugly period after section number (sigh):
 %    \begin{macrocode}
@@ -3924,7 +4082,7 @@ Computing Machinery]
 \setcounter{secnumdepth}{3}
 \ifcase\ACM@format@nr
 \relax % manuscript
-\or% acmsmall
+\or % acmsmall
 \or % acmlarge
  \def\@secfont{\sffamily\large\raggedright\MakeUppercase}
  \def\@subsecfont{\sffamily\large\raggedright}
@@ -3938,8 +4096,23 @@ Computing Machinery]
  \def\@secfont{\bfseries\sffamily\Large\raggedright\MakeUppercase}
  \def\@subsecfont{\bfseries\sffamily\Large\raggedright}
 \or % sigplan
- \def\@secfont{\bfseries\Large\raggedright\MakeUppercase}
- \def\@subsecfont{\bfseries\Large\raggedright}
+ \def\@secfont{\bfseries\Large\raggedright}
+ \def\@subsecfont{\bfseries\raggedright}
+ \renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+   {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
+   {.25\baselineskip}%
+   {\@subsubsecfont}}
+ \def\@subsubsecfont{\bfseries\raggedright}
+ \renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
+   {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
+   {-3.5\p@}%
+   {\@parfont\@addspaceafter}}
+ \def\@parfont{\bfseries\itshape}
+ \renewcommand\subparagraph{\@startsection{subparagraph}{5}{\z@}%
+   {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
+   {-3.5\p@}%
+   {\@subparfont\@addspaceafter}}
+ \def\@subparfont{\itshape}
 \or % sigchi
  \setcounter{secnumdepth}{1}
  \def\@secfont{\bfseries\sffamily\raggedright\MakeUppercase}
@@ -3959,30 +4132,14 @@ Computing Machinery]
 %
 % \end{macro}
 %
-%   Sectioning is different for different levels
+% \begin{macro}{\@addspaceafter}
+%   Add space after the command
 %    \begin{macrocode}
-\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\@addspaceafter#1{#1\@addpunct{\enspace}}
 %    \end{macrocode}
 %
+% \end{macro}
+%
 %
 %
 %