acmart (15may16)

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

1 files changed, 121 insertions, 49 deletions

diff --git a/Master/texmf-dist/tex/latex/acmart/acmart.cls b/Master/texmf-dist/tex/latex/acmart/acmart.cls
index 3d8c4fc1401..36f1109af94 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}
-[2016/05/03 v1.07 Typesetting articles for Association of
+[2016/05/14 v1.08 Typesetting articles for Association of
 Computing Machinery]
 \def\@classname{acmart}
 \RequirePackage{xkeyval}
@@ -119,7 +119,7 @@ Computing Machinery]
 \ifcase\ACM@format@nr
 \relax % manuscript
   \@ACM@journaltrue
-\or% acmsmall
+\or % acmsmall
   \@ACM@journaltrue
 \or % acmlarge
   \@ACM@journaltrue
@@ -141,7 +141,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}%
@@ -329,10 +329,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,
@@ -361,7 +370,7 @@ Computing Machinery]
 \fi
 \ifcase\ACM@format@nr
 \relax % manuscript
-\or% acmsmall
+\or % acmsmall
 \or % acmlarge
 \or % acmtog
 \or % sigconf
@@ -404,7 +413,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,
@@ -437,8 +446,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,
@@ -460,7 +469,7 @@ Computing Machinery]
 \setlength\parskip{\z@}
 \ifcase\ACM@format@nr
 \relax % manuscript
-\or% acmsmall
+\or % acmsmall
 \or % acmlarge
 \or % acmtog
   \setlength\parindent{9\p@}%
@@ -509,6 +518,16 @@ Computing Machinery]
 \fi
 \RequirePackage{caption, float}
 \captionsetup[table]{position=top}
+\newif\if@ACM@captionrule
+\@ACM@captionruletrue
+\def\nocaptionrule{\@ACM@captionrulefalse}
+\def\captionruleoff{\global\@ACM@captionrulefalse}
+\def\captionruleon{\global\@ACM@captionruletrue}
+\DeclareCaptionFormat{@ACM@capfmtWithRuleAbove}{%
+  \if@ACM@captionrule\hrulefill\par\noindent\fi#1#2#3\par}
+\DeclareCaptionFormat{@ACM@capfmtWithRuleBelow}{%
+  #1#2#3\if@ACM@captionrule\par\vspace{-.5\baselineskip}%
+  \noindent\hrulefill\fi\par}
 \if@ACM@journal
   \captionsetup{labelfont={sf, small},
     textfont={sf, small},  margin=\z@}
@@ -518,13 +537,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}}
@@ -566,6 +590,21 @@ Computing Machinery]
     \dimexpr(\fulltextwidth-\textwidth)\box\@currbox}%
   \wd\@currbox=\textwidth
 }
+\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
 \define@choicekey*+{ACM}{acmJournal}[\@journalCode\@journalCode@nr]{%
   CIE,%
   CSUR,%
@@ -1288,9 +1327,24 @@ Computing Machinery]
   \@afterheading
 }
 \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}
 \def\@printtopmatter{%
@@ -1305,7 +1359,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
@@ -1341,7 +1395,7 @@ Computing Machinery]
   \ifcase\ACM@format@nr
   \relax % manuscript
     \@mktitle@i
-  \or% acmsmall
+  \or % acmsmall
     \@mktitle@i
   \or % acmlarge
     \@mktitle@i
@@ -1363,7 +1417,7 @@ Computing Machinery]
   \ifcase\ACM@format@nr
   \relax % manuscript
     \LARGE\bfseries\sffamily
-  \or% acmsmall
+  \or % acmsmall
     \LARGE\bfseries\sffamily
   \or % acmlarge
     \LARGE\bfseries\sffamily
@@ -1374,7 +1428,7 @@ Computing Machinery]
   \or % siggraph
     \Huge\sffamily\bfseries
   \or % sigplan
-    \Huge\sffamily\bfseries
+    \Huge\bfseries
   \or % sigchi
     \Huge\sffamily\bfseries
   \or % sigchi-a
@@ -1384,7 +1438,7 @@ Computing Machinery]
   \ifcase\ACM@format@nr
   \relax % manuscript
     \mdseries
-  \or% acmsmall
+  \or % acmsmall
     \mdseries
   \or % acmlarge
     \mdseries
@@ -1470,7 +1524,7 @@ Computing Machinery]
   \ifcase\ACM@format@nr
   \relax % manuscript
     \@mkauthors@i
-  \or% acmsmall
+  \or % acmsmall
     \@mkauthors@i
   \or % acmlarge
     \@mkauthors@i
@@ -1493,7 +1547,7 @@ Computing Machinery]
 \def\@affiliationfont{\normalsize\normalfont}
 \ifcase\ACM@format@nr
 \relax % manuscript
-\or% acmsmall
+\or % acmsmall
 \or % acmlarge
 \or % acmtog
   \def\@authorfont{\LARGE\sffamily}
@@ -1505,6 +1559,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}
@@ -1656,7 +1712,7 @@ Computing Machinery]
   {\if@ACM@journal
        \small\noindent
     \else
-      \section*{ABSTRACT}%
+      \section*{Abstract}%
     \fi
       \@abstract\par}%
   \fi\egroup}
@@ -1671,7 +1727,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
@@ -1717,7 +1773,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}%
@@ -1755,7 +1811,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
@@ -1794,7 +1850,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.}%
@@ -1820,6 +1876,26 @@ Computing Machinery]
     \fancyfoot[R]{\footnotesize\thepage}%
   \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\@secfont{\sffamily\bfseries\raggedright\MakeUppercase}
 \def\@subsecfont{\sffamily\bfseries\raggedright}
 \def\@subsubsecfont{\sffamily\itshape}
@@ -1827,7 +1903,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}
@@ -1841,8 +1917,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}
@@ -1853,26 +1944,7 @@ Computing Machinery]
  \def\@subsecfont{\bfseries\sffamily\raggedright}
 \fi
 \def\@adddotafter#1{#1\@addpunct{.}}
-\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}}
 \newtheoremstyle{acmplain}%
   {.5\baselineskip\@plus.2\baselineskip
     \@minus.2\baselineskip}% space above