acmart (15feb17)

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

1 files changed, 112 insertions, 43 deletions

diff --git a/Master/texmf-dist/source/latex/acmart/acmart.dtx b/Master/texmf-dist/source/latex/acmart/acmart.dtx
index 4dff38b1e01..2920b6a38ed 100644
--- a/Master/texmf-dist/source/latex/acmart/acmart.dtx
+++ b/Master/texmf-dist/source/latex/acmart/acmart.dtx
@@ -39,6 +39,18 @@
 %
 %
 % \MakeShortVerb{|}
+% \def\guide{acmguide}
+% \iffalse
+% From
+% http://tex.stackexchange.com/questions/117892/can-i-convert-a-string-to-catcode-11 by egreg
+% \fi
+% \begingroup
+%  \everyeof{\noexpand}
+%  \endlinechar=-1
+%  \xdef\currentjob{\scantokens\expandafter{\jobname}}
+% \endgroup
+%
+% \ifx\currentjob\guide\OnlyDescription\fi
 % \GetFileInfo{acmart.dtx}
 % \newcommand{\progname}[1]{\textsf{#1}}
 % \title{\LaTeX{} Class for \emph{Association for Computing
@@ -55,7 +67,7 @@
 % \tableofcontents
 %
 % \clearpage
-%
+% 
 %\section{Introduction}
 %\label{sec:intro}
 %
@@ -63,7 +75,7 @@
 % 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
-% earily adopters of \TeX\ for its typesetting.
+% early adopters of \TeX\ for its typesetting.
 %
 % It provided several different classes for a number of journal and
 % conference proceedings.  Unfortunately during the years since these
@@ -101,7 +113,7 @@
 %
 % 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
+% may need to upgrade it anyway since the package uses a number of
 % relatively recent packages, especially the ones related to the
 % fonts.
 %
@@ -169,7 +181,7 @@
 %\subsection{Invocation and options}
 %\label{sec:invocation}
 %
-% To use the class put in the premable of your document
+% To use the class put in the preamble of your document
 % \begin{quote}
 %   \cs{documentclass}\oarg{options}|{acmart}|
 % \end{quote}
@@ -216,7 +228,8 @@
 %            acmtog   & Large double column format, used for
 %          TOG\\
 %           sigconf & Proceedings format for most of ACM
-%          conferences (with the exceptions listed below)\\
+%          conferences (with the exceptions listed below) and all ICPS
+%          volumes\\
 %           siggraph & Proceedings format for SIGGRAPH and SIGGRAPH
 %          Asia conferences, published in ACM Transactions on Graphics
 %          journal issues \\
@@ -504,6 +517,7 @@
 %  \emph{not} put commas or |\\| between the elements of
 %  \cs{affiliation}: they will be provided automatically.
 %
+%
 % An example of the author block:
 % \begin{verbatim}
 % \author{A. U. Thor}
@@ -541,6 +555,28 @@
 % authors and required some efforts from the 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
+%  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}}
+% \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}}
+% \end{verbatim}
 %
 %
 % It is expected that these commands are inserted by the author of the
@@ -600,9 +636,9 @@
 % \end{verbatim}
 %
 % \DescribeMacro{\acmArticleSeq}%
-% The articles in the same issue of a journal have \emph{sequential
-% number}.  It is used to position black blob in same formats.  By
-% default it is the same as article number, but the command
+% 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:
 % \begin{verbatim}
 % \acmArticle{39}   % The sequence number will be 39 by default
@@ -878,7 +914,7 @@
 % \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:
+% 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.
@@ -1073,6 +1109,11 @@
 % which you can include using the optional argument of \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
+% create a global database of sponsoring organizations.
+%
 % Example:
 % \begin{verbatim}
 % \begin{acks}
@@ -1094,7 +1135,7 @@
 %\subsection{Bibliography}
 %\label{sec:ug_bibliography}
 %
-% ACM uses \textsl{natbib} package for formatting of referencing ant
+% 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
 % option |natbib=false| in \cs{documentclass}.  However, it is not
@@ -1275,7 +1316,7 @@
 \ProvidesFile{acmart.dtx}
 %</gobble>
 %<class>\ProvidesClass{acmart}
-[2017/01/07 v1.28 Typesetting articles for Association of
+[2017/02/15 v1.30 Typesetting articles for Association of
 Computing Machinery]
 %    \end{macrocode}
 %
@@ -1316,6 +1357,7 @@ Computing Machinery]
 % \changes{v1.26}{2016/12/24}{Corrected \cs{shortcite} bug}
 % \changes{v1.26}{2016/12/24}{Documentation typos fixed (thanks to
 % Stephen Spencer)} 
+% \changes{v1.30}{2017/02/04}{Bibtex style now recognizes https:// in doi} 
 %
 %
 % And the driver code:
@@ -1840,10 +1882,10 @@ Computing Machinery]
 \let\@footnotetext@nolink\@footnotetext
 \RequirePackage[bookmarksnumbered,unicode]{hyperref}
 \pdfstringdefDisableCommands{%
-  \def\unskip{}
-  \def\textbullet{- }
-  \def\textrightarrow{ -> }
-  \def\footnotemark{}
+  \def\unskip{}%
+  \def\textbullet{- }%
+  \def\textrightarrow{ -> }%
+  \def\footnotemark{}%
 }
 \urlstyle{rm}
 \ifcase\ACM@format@nr
@@ -1930,56 +1972,60 @@ Computing Machinery]
 %\label{sec:paper}
 %
 % \changes{v1.17}{2016/07/07}{Slightly decreased margins for sigs}
-% We use |geometry| for dimensions
+% \changes{v1.29}{2017/01/22}{Increased head to 13pt}
+% 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}. 
 %    \begin{macrocode}
 \RequirePackage{geometry}
 \ifcase\ACM@format@nr
 \relax % manuscript
-   \geometry{letterpaper,head=1pc}%
+   \geometry{letterpaper,head=13pt}%
 \or % acmsmall
    \geometry{twoside=true,
-     includeheadfoot, head=1pc, foot=2pc,
+     includeheadfoot, head=13pt, foot=2pc,
      paperwidth=6.75in, paperheight=10in,
      top=58pt, bottom=44pt, inner=46pt, outer=46pt
    }%
 \or % acmlarge
-   \geometry{twoside=true, head=1pc, foot=2pc,
+   \geometry{twoside=true, head=13pt, foot=2pc,
      paperwidth=8.5in, paperheight=11in,
      includeheadfoot,
      top=78pt, bottom=114pt, inner=81pt, outer=81pt
      }%
 \or % acmtog
-   \geometry{twoside=true, head=1pc, foot=2pc,
+   \geometry{twoside=true, head=13pt, foot=2pc,
      paperwidth=8.5in, paperheight=11in,
      includeheadfoot, columnsep=24pt,
      top=52pt, bottom=75pt, inner=52pt, outer=52pt
      }%
 \or % sigconf
-   \geometry{twoside=true, head=1pc,
+   \geometry{twoside=true, head=13pt,
      paperwidth=8.5in, paperheight=11in,
      includeheadfoot, columnsep=2pc,
      top=57pt, bottom=73pt, inner=54pt, outer=54pt
      }%
 \or % siggraph
-   \geometry{twoside=true, head=1pc,
+   \geometry{twoside=true, head=13pt,
      paperwidth=8.5in, paperheight=11in,
      includeheadfoot, columnsep=2pc,
      top=57pt, bottom=73pt, inner=54pt, outer=54pt
      }%
 \or % sigplan
-   \geometry{twoside=true, head=1pc,
+   \geometry{twoside=true, head=13pt,
      paperwidth=8.5in, paperheight=11in,
      includeheadfoot=false, columnsep=2pc,
      top=1in, bottom=1in, inner=0.75in, outer=0.75in
      }%
 \or % sigchi
-   \geometry{twoside=true, head=1pc,
+   \geometry{twoside=true, head=13pt,
      paperwidth=8.5in, paperheight=11in,
      includeheadfoot, columnsep=2pc,
      top=66pt, bottom=73pt, inner=54pt, outer=54pt
      }%
 \or % sigchi-a
-   \geometry{twoside=false, head=1pc,
+   \geometry{twoside=false, head=13pt,
      paperwidth=11in, paperheight=8.5in,
      includeheadfoot, marginparsep=72pt,
      marginparwidth=170pt, columnsep=20pt,
@@ -2149,12 +2195,15 @@ Computing Machinery]
 %   
 % \end{macro}
 % 
+% \changes{v1.30}{2017/02/15}{Switched to T1: looks like libertine has
+% problems with \cs{l} in OT1}%
 % We use Libertine throughout.
 %    \begin{macrocode}
 \if@ACM@newfonts
 \RequirePackage[tt=false]{libertine}
 \RequirePackage[varqu]{zi4}
 \RequirePackage[libertine]{newtxmath}
+\RequirePackage[T1]{fontenc}
 \fi
 %    \end{macrocode}
 %
@@ -2368,6 +2417,7 @@ Computing Machinery]
 %
 % \changes{v1.24}{2016/11/16}{Add IMWUT journal option}
 % \changes{v1.25}{2016/12/03}{Updated PACMPL}
+% \changes{v1.30}{2017/02/15}{Updated IMWUT and PACMPL}
 %
 % We use keyval interface to define journal title and relevant
 % information
@@ -2433,9 +2483,9 @@ Computing Machinery]
   \def\@journalNameShort{ACM Comput. Surv.}%
   \def\@permissionCodeOne{0360-0300}%
 \or % IMWUT
-  \def\@journalName{PACM on Interactive, Mobile, Wearable and
-    Ubiquitous Technologies}% 
-  \def\@journalNameShort{PACM Interact. Mob. Wearable Ubiquitous Technol.}%
+  \def\@journalName{Proceedings of the ACM on Interactive, Mobile,
+    Wearable and Ubiquitous Technologies}%  
+  \def\@journalNameShort{Proc. ACM Interact. Mob. Wearable Ubiquitous Technol.}%
   \def\@permissionCodeOne{2474-9567}%
 \or % JACM
   \def\@journalName{Journal of the ACM}%
@@ -2461,8 +2511,8 @@ Computing Machinery]
   \def\@journalName{ACM Journal on Computing and Cultural Heritage}%
   \def\@journalName{ACM J. Comput. Cult. Herit.}%
 \or % PACMPL
-  \def\@journalName{PACM on Programming Languages}%
-  \def\@journalName{PACM Progr. Lang.}%
+  \def\@journalName{Proceedings of the ACM on Programming Languages}%
+  \def\@journalName{Proc. ACM Program. Lang.}%
   \def\@permissionCodeOne{2475-1421}%
 \or % TAAS
   \def\@journalName{ACM Transactions on Autonomous and Adaptive Systems}%
@@ -2878,7 +2928,7 @@ Computing Machinery]
 %   The current year
 %    \begin{macrocode}
 \def\acmYear#1{\def\@acmYear{#1}}
-\acmYear{2016}
+\acmYear{2017}
 %    \end{macrocode}
 %
 % \end{macro}
@@ -3187,17 +3237,19 @@ Computing Machinery]
 % \begin{macro}{\ccsdesc@parse}
 % \changes{v1.28}{2017/01/04}{Change from \cs{to} to
 % \cs{textrightarrow} (Matteo Riondato)}
+% \changes{v1.29}{2017/01/22}{Add spacing after bullet and around
+% rightarrow; semicolon separators no longer in bold/italic (John Wickerson)}
 %   The parser of the expression |Significance~General~Specific| (we need
 %   |textcomp| for |\\textrightarrow|:
 %    \begin{macrocode}
 \RequirePackage{textcomp}
 \def\ccsdesc@parse#1~#2~#3~{%
   \expandafter\ifx\csname CCS@#2\endcsname\relax
-    \expandafter\gdef\csname CCS@#2\endcsname{\textbullet\textbf{#2} \textrightarrow }%
+    \expandafter\gdef\csname CCS@#2\endcsname{\textbullet\ \textbf{#2} \textrightarrow\ }%
   \g@addto@macro{\@concepts}{\csname CCS@#2\endcsname}\fi
   \expandafter\g@addto@macro\expandafter{\csname CCS@#2\endcsname}{%
-    \ifnum#1>499\textbf{#3; }\else
-    \ifnum#1>299\textit{#3; }\else
+    \ifnum#1>499\textbf{#3}; \else
+    \ifnum#1>299\textit{#3}; \else
     #3; \fi\fi}}
 %    \end{macrocode}
 %
@@ -3931,6 +3983,7 @@ Computing Machinery]
 % \changes{v1.15}{2016/07/03}{Added macro}
 % \begin{macro}{\department}
 % \changes{v1.15}{2016/07/03}{Added macro}
+% \changes{v1.30}{2017/02/10}{Added optional parameter}
 % \begin{macro}{\streetaddress}
 % \changes{v1.15}{2016/07/03}{Added macro}
 % \begin{macro}{\city}
@@ -3952,7 +4005,7 @@ Computing Machinery]
 \if@ACM@journal
   \let\position\@gobble
   \def\institution#1{#1\ignorespaces}%
-  \let\department\@gobble
+  \newcommand\department[2][0]{}%
   \let\streetaddress\@gobble
   \let\city\@gobble
   \let\state\@gobble
@@ -3961,7 +4014,7 @@ Computing Machinery]
 \else
   \def\position#1{#1\par}%
   \def\institution#1{#1\par}%
-  \def\department#1{#1\par}%
+  \newcommand\department[2][0]{#2\par}%
   \def\streetaddress#1{#1\par}%
   \let\city\@ACM@addtoaddress
   \let\state\@ACM@addtoaddress
@@ -4101,7 +4154,7 @@ Computing Machinery]
          \g@addto@macro{\@currentaffiliations}{\and##2}%
       \fi
     \fi
-     \global\let\and\@typeset@author@line}
+     \global\let\and\@typeset@author@line}%
   \global\setbox\mktitle@bx=\vbox{\noindent\box\mktitle@bx\par\medskip
     \noindent\addresses\@typeset@author@line
    \par\medskip}%
@@ -4311,16 +4364,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
 %    \begin{macrocode}
 \def\@mkabstract{\bgroup
-  \ifx\@abstract\@lempty\else
-  {\if@ACM@journal
+  \ifx\@abstract\@lempty\else  
+  {\phantomsection\addcontentsline{toc}{section}{Abstract}%
+    \if@ACM@journal
        \small\noindent
     \else
       \section*{Abstract}%
     \fi
-   \phantomsection\addcontentsline{toc}{section}{Abstract}%
    \ignorespaces\@abstract\par}%
   \fi\egroup}
 %    \end{macrocode}
@@ -4476,6 +4530,7 @@ Computing Machinery]
 % \changes{v1.15}{2016/07/04}{Better handling of anonymous mode}
 % \changes{v1.16}{2016/07/07}{Customize header/footer text font}
 % \changes{v1.17}{2016/07/10}{Added paper title to sigs}
+% \changes{v1.29}{2017/01/22}{Corrected printfolios (Matthew Fluet)}
 %   The pagestyle for all pages but the first one
 %    \begin{macrocode}
 \fancypagestyle{standardpagestyle}{%
@@ -4498,7 +4553,7 @@ Computing Machinery]
     \@acmNumber, Article \@acmArticle.  Publication date: \@acmPubDate.}%
   \or % acmlarge
     \fancyhead[LE]{\ACM@linecount\@headfootfont
-      \@acmArticle:\if@ACM@printfolios\thepage\quad\textbullet\quad\fi\@shortauthors}%
+      \@acmArticle\if@ACM@printfolios:\thepage\fi\quad\textbullet\quad\@shortauthors}%
     \fancyhead[LO]{\ACM@linecount}%
     \fancyhead[RO]{\@headfootfont
       \shorttitle\quad\textbullet\quad\@acmArticle\if@ACM@printfolios:\thepage\fi}%
@@ -4506,7 +4561,7 @@ Computing Machinery]
     \@acmNumber, Article \@acmArticle.  Publication date: \@acmPubDate.}%
   \or % acmtog
     \fancyhead[LE]{\ACM@linecount\@headfootfont
-      \@acmArticle:\if@ACM@printfolios\thepage\quad\textbullet\quad\fi\@shortauthors}%
+      \@acmArticle\if@ACM@printfolios:\thepage\fi\quad\textbullet\quad\@shortauthors}%
     \fancyhead[LO]{\ACM@linecount}%
     \fancyhead[RO]{\@headfootfont
       \shorttitle\quad\textbullet\quad\@acmArticle\if@ACM@printfolios:\thepage\fi}%
@@ -4758,6 +4813,19 @@ Computing Machinery]
 %
 % \end{macro}
 %
+%\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
+% implementation. Since |amsart| does not provide this, we copy the standard
+% variant from |article| here.
+%    \begin{macrocode}
+\providecommand*\@dotsep{4.5}
+%    \end{macrocode}
+% \end{macro}
 %
 %\subsection{Theorems}
 %\label{sec:theorems}
@@ -5055,8 +5123,9 @@ Computing Machinery]
 %\label{end}
 %
 %
+% \changes{v1.30}{2017/02/10}{Added \cs{frenchspacing}} 
 %    \begin{macrocode}
-\normalsize\normalfont
+\normalsize\normalfont\frenchspacing
 %</class>
 %    \end{macrocode}
 %