texlive[48214] Master/texmf-dist: acmart (17jul18)
commits+karl at tug.org
commits+karl at tug.org
Tue Jul 17 23:17:07 CEST 2018
Revision: 48214
http://tug.org/svn/texlive?view=revision&revision=48214
Author: karl
Date: 2018-07-17 23:17:06 +0200 (Tue, 17 Jul 2018)
Log Message:
-----------
acmart (17jul18)
Modified Paths:
--------------
trunk/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst
trunk/Master/texmf-dist/doc/latex/acmart/README
trunk/Master/texmf-dist/doc/latex/acmart/acmart.pdf
trunk/Master/texmf-dist/doc/latex/acmart/acmguide.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf-xelatex.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf
trunk/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex
trunk/Master/texmf-dist/source/latex/acmart/acmart.dtx
trunk/Master/texmf-dist/tex/latex/acmart/acmart.cls
Modified: trunk/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst
===================================================================
--- trunk/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst 2018-07-17 00:18:17 UTC (rev 48213)
+++ trunk/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst 2018-07-17 21:17:06 UTC (rev 48214)
@@ -1456,14 +1456,16 @@
%% numpages, pages -> "pages-value"
%% numpages -> "numpages-value"
%% pages -> "pages-value"
+ %%
+ %% We no longer issue warninig when missing articleno, but having numpages
articleno empty.or.unknown eid empty.or.unknown and
{
- numpages empty.or.unknown
- { }
- { "numpages field, but no articleno or eid field, in "
- cite$ * warning$ }
- if$
+%% numpages empty.or.unknown
+%% { }
+%% { "numpages field, but no articleno or eid field, in "
+%% cite$ * warning$ }
+%% if$
""
}
{
Modified: trunk/Master/texmf-dist/doc/latex/acmart/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/README 2018-07-17 00:18:17 UTC (rev 48213)
+++ trunk/Master/texmf-dist/doc/latex/acmart/README 2018-07-17 21:17:06 UTC (rev 48214)
@@ -185,4 +185,14 @@
Version 1.52 Another rewording of licenses
-Version 1.53 New journals: PACMCGIT, TIOT, TDSCI
\ No newline at end of file
+Version 1.53 New journals: PACMCGIT, TIOT, TDSCI
+
+Version 1.54 New option: 'noacm' (Gabriel Scherer)
+ Deleted indent for subsubsection (suggested by Ross Moore)
+ Suppressed some obscurious warning in BibTeX processing
+ Suppressed hyperrerf warnings (Paolo G. Giarrusso)
+ New code for sections to help with accessibility patches
+ (Ross Moore)
+ Submission id, if present, is printed in anon mode
+ Bug fixes
+
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/acmart/acmart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/acmguide.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf-xelatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex 2018-07-17 00:18:17 UTC (rev 48213)
+++ trunk/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex 2018-07-17 21:17:06 UTC (rev 48214)
@@ -31,7 +31,10 @@
%\acmBadgeL[http://ctuning.org/ae/ppopp2016.html]{ae-logo}
%\acmBadgeR[http://ctuning.org/ae/ppopp2016.html]{ae-logo}
+% Submission ID
+\acmSubmissionID{123-A56-BU3}
+
\begin{document}
\title{SIG Proceedings Paper in LaTeX Format}
\titlenote{Produces the permission block, and
@@ -116,6 +119,7 @@
\renewcommand{\shortauthors}{B. Trovato et al.}
+
\begin{abstract}
This paper provides a sample of a \LaTeX\ document which conforms,
somewhat loosely, to the formatting guidelines for
Modified: trunk/Master/texmf-dist/source/latex/acmart/acmart.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/acmart/acmart.dtx 2018-07-17 00:18:17 UTC (rev 48213)
+++ trunk/Master/texmf-dist/source/latex/acmart/acmart.dtx 2018-07-17 21:17:06 UTC (rev 48214)
@@ -123,6 +123,7 @@
% Craig Rodkin,
% Bernard Rous,
% David Shamma,
+% Gabriel Scherer,
% Stephen Spencer,
% Daniel Thomas,
% Zack Weinberg,
@@ -360,6 +361,9 @@
% authorversion & false & Whether to generate a special
% version for the authors' personal use or posting (see
% Section~\ref{sec:ug_topmatter})\\
+% nonacm & false & Use the class typesetting options for
+% a non-ACM document, which will not include the conference/journal
+% header and footers or permission statements\\
% timestamp & false & Whether to put a time stamp in the
% footer of each page\\
% authordraft & false & Whether author's-draft mode is enabled\\
@@ -1459,8 +1463,27 @@
% }
% \end{verbatim}
%
+% A note about sorting. The current ACM bibliography styles always
+% sort the entries according to authors names and publication year.
+% There is a controversy about sorting names with ``von'' or ``van''
+% part: should Ludwig van Beethoven be sorted under ``V'' or under
+% ``B''? The American practice is to use ``van'' in sorting, i.e. to
+% file van Beethoven under ``V''. However, some authorities recommend
+% to sort Dutch persons according to their last names (see
+% e.g. \url{https://www.ifla.org/files/assets/cataloguing/pubs/names-of-persons_1996.pdf}).
+% While I do not want to take a part in this dispute, I would like to
+% point to the old ``noopsort'' trick by Oren Patashnik. Add to the
+% \texttt{.bib} file the line
+% \begin{verbatim}
+% @PREAMBLE{"\providecommand{\noopsort}[1]{}"}
+% \end{verbatim}
+% and then encode the author as
+% \begin{verbatim}
+% author = {Ludwig {\noopsort{Beethoven}}van Beethoven},
+% \end{verbatim}
+% This will make the author to be sorted as ``Beethoven'' rather than
+% ``van Beethoven''.
%
-%
%\subsection{Colors}
%\label{sec:ug_colors}
%
@@ -1690,7 +1713,7 @@
\ProvidesFile{acmart.dtx}
%</gobble>
%<class>\ProvidesClass{acmart}
-[2018/04/14 v1.53 Typesetting articles for the Association for
+[2018/07/16 v1.54 Typesetting articles for the Association for
Computing Machinery]
% \end{macrocode}
%
@@ -1772,6 +1795,8 @@
% \changes{1.49}{2018/01/24}{New journal: DTRAP}
% \changes{1.53}{2018/04/14}{New journals: PACMCGIT, TIOT, TDSCI}
% \changes{1.53}{2018/04/14}{Rearranged docs}
+% \changes{1.54}{2018/06/17}{Moved footnote stuff before hyperref call
+% (Ross Moore)}
%
% And the driver code:
% \begin{macrocode}
@@ -1913,7 +1938,27 @@
%
% \end{macro}
%
+% \begin{macro}{\if at ACM@nonacm}
+% \changes{v1.54}{2018/05/08}{Added macro}
+% Special option for non-ACM publications
+% using the ACM typesetting options.
+% \begin{macrocode}
+\define at boolkey+{acmart.cls}[@ACM@]{nonacm}[true]{%
+ \if at ACM@nonacm
+ \PackageInfo{\@classname}{Using nonacm mode}%
+ \AtBeginDocument{\@ACM at printacmreffalse}%
+ % in 'nonacm' mode we disable the "ACM Reference Format"
+ % printing by default, but this can be re-enabled by the
+ % user using \settopmatter{printacmref=true}
+ \else
+ \PackageInfo{\@classname}{Not using nonacm mode}%
+ \fi}{\PackageError{\@classname}{The option nonacm can be either true or
+ false}}
+\ExecuteOptionsX{nonacm=false}
+% \end{macrocode}
%
+% \end{macro}
+%
% \begin{macro}{\if at ACM@natbib at override}
% \changes{v1.12}{2016/05/30}{Added macro}
% \changes{v1.33}{2017/03/28}{Deleted macro}
@@ -2433,7 +2478,67 @@
%
% \end{macro}
%
-% And |hyperref|
+% We need to define foonote-related stuff before the call to hyperref
+% (Ross Moore)
+% \begin{macro}{\@makefntext}
+% We do not use indentation for footnotes
+% \begin{macrocode}
+\def\@makefntext{\noindent\@makefnmark}
+% \end{macrocode}
+%
+% \end{macro}
+%
+% \begin{macro}{\@footnotetext}
+% In |sigchi-a| mode our footnotes are in the margin!
+% \begin{macrocode}
+\if at ACM@sigchiamode
+\long\def\@footnotetext#1{\marginpar{%
+ \reset at font\small
+ \interlinepenalty\interfootnotelinepenalty
+ \protected at edef\@currentlabel{%
+ \csname p at footnote\endcsname\@thefnmark
+ }%
+ \color at begingroup
+ \@makefntext{%
+ \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+ \color at endgroup}}%
+\fi
+% \end{macrocode}
+%
+% \end{macro}
+%
+% \begin{macro}{\@mpfootnotetext}
+% \changes{v1.13}{2016/06/06}{Made minipage footnotes centered}
+% We want the footnotes in minipages centered:
+% \begin{macrocode}
+\long\def\@mpfootnotetext#1{%
+ \global\setbox\@mpfootins\vbox{%
+ \unvbox\@mpfootins
+ \reset at font\footnotesize
+ \hsize\columnwidth
+ \@parboxrestore
+ \protected at edef\@currentlabel
+ {\csname p at mpfootnote\endcsname\@thefnmark}%
+ \color at begingroup\centering
+ \@makefntext{%
+ \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+ \color at endgroup}}
+% \end{macrocode}
+%
+% \end{macro}
+%
+% \begin{macro}{\@makefnmark}
+% \changes{v1.17}{2016/067/09}{Redefined}
+% AMS classes use a buggy definition of \cs{makefnmark}. We revert
+% to the standard one.
+% \begin{macrocode}
+\def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}}
+% \end{macrocode}
+%
+% \end{macro}
+%
+%
+% And now, |hyperref|
% \changes{v1.28}{2017/01/07}{Got rid of warnings in pdf keywords}
% \changes{v1.46}{2017/08/25}{Delayed hypersetup since journal options
% may change screen mode}
@@ -2470,7 +2575,9 @@
filecolor=ACMDarkBlue}
\else
\hypersetup{hidelinks}
- \fi}
+ \fi
+ \hypersetup{pdflang={English},
+ pdfdisplaydoctitle}}
% \end{macrocode}
%
% Bibliography mangling.
@@ -2721,64 +2828,7 @@
%
% \end{macro}
%
-% \begin{macro}{\@makefntext}
-% We do not use indentation for footnotes
-% \begin{macrocode}
-\def\@makefntext{\noindent\@makefnmark}
-% \end{macrocode}
%
-% \end{macro}
-%
-% \begin{macro}{\@footnotetext}
-% In |sigchi-a| mode our footnotes are in the margin!
-% \begin{macrocode}
-\if at ACM@sigchiamode
-\long\def\@footnotetext#1{\marginpar{%
- \reset at font\small
- \interlinepenalty\interfootnotelinepenalty
- \protected at edef\@currentlabel{%
- \csname p at footnote\endcsname\@thefnmark
- }%
- \color at begingroup
- \@makefntext{%
- \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
- \color at endgroup}}%
-\fi
-% \end{macrocode}
-%
-% \end{macro}
-%
-% \begin{macro}{\@mpfootnotetext}
-% \changes{v1.13}{2016/06/06}{Made minipage footnotes centered}
-% We want the footnotes in minipages centered:
-% \begin{macrocode}
-\long\def\@mpfootnotetext#1{%
- \global\setbox\@mpfootins\vbox{%
- \unvbox\@mpfootins
- \reset at font\footnotesize
- \hsize\columnwidth
- \@parboxrestore
- \protected at edef\@currentlabel
- {\csname p at mpfootnote\endcsname\@thefnmark}%
- \color at begingroup\centering
- \@makefntext{%
- \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
- \color at endgroup}}
-% \end{macrocode}
-%
-% \end{macro}
-%
-% \begin{macro}{\@makefnmark}
-% \changes{v1.17}{2016/067/09}{Redefined}
-% AMS classes use a buggy definition of \cs{makefnmark}. We revert
-% to the standard one.
-% \begin{macrocode}
-\def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}}
-% \end{macrocode}
-%
-% \end{macro}
-%
-%
% \begin{macro}{\@textbottom}
% \changes{v1.31}{2017/03/04}{Redefined}
% Add some stretch according to David Carlisle's advice at
@@ -2809,9 +2859,9 @@
\pdfglyphtounicode{f_f_i}{FB03}
\pdfglyphtounicode{f_f_l}{FB04}
\pdfglyphtounicode{f_i}{FB01}
-\pdfglyphtounicode{t_t}{00740074}
-\pdfglyphtounicode{f_t}{00660074}
-\pdfglyphtounicode{T_h}{00540068}
+\pdfglyphtounicode{t_t}{0074 0074}
+\pdfglyphtounicode{f_t}{0066 0074}
+\pdfglyphtounicode{T_h}{0054 0068}
\pdfgentounicode=1
\fi
\RequirePackage{cmap}
@@ -2841,10 +2891,13 @@
% problems with \cs{l} in OT1}%
% \changes{v1.33}{2017/03/12}{Switched to Type~1 fonts for libertine
% even if OTF-capable engine is used (Kai Mindermann)}
-% \changes{v1.51}{2018/04/05}{XeTeX now uses OTF fonts (Joachim Breitner)}
+% \changes{v1.51}{2018/04/05}{XeTeX now uses OTF fonts (Joachim
+% Breitner)}
+% \changes{v1.54}{2018/07/16}{XeTeX now uses T1 encoding}
% We use Libertine throughout.
% \begin{macrocode}
\if at ACM@newfonts
+ \RequirePackage[T1]{fontenc}
\ifxetex
\RequirePackage[tt=false]{libertine}
\else
@@ -2852,10 +2905,7 @@
\fi
\RequirePackage[varqu]{zi4}
\RequirePackage[libertine]{newtxmath}
-\ifxetex\else
- \RequirePackage[T1]{fontenc}
\fi
-\fi
% \end{macrocode}
%
% \begin{macro}{\liningnums}
@@ -3563,6 +3613,7 @@
% \begin{macro}{\author}
% \changes{v1.15}{2016/06/25}{Added code for author groups}
% \changes{v1.46}{2017/08/27}{Started counting authors}
+% \changes{v1.54}{2018/06/23}{Added submission id in anonymous mode}
% Adding an author to the list of authors and addresses
% \begin{macrocode}
\renewcommand\author[2][]{%
@@ -3573,7 +3624,9 @@
\fi
\ifx\addresses\@empty
\if at ACM@anonymous
- \gdef\addresses{\@author{Anonymous Author(s)}}%
+ \gdef\addresses{\@author{Anonymous Author(s)%
+ \ifx\@acmSubmissionID\@empty\else\\Submission Id:
+ \@acmSubmissionID\fi}}%
\gdef\authors{Anonymous Author(s)}%
\else
\gdef\addresses{\@author{#2}}%
@@ -3587,7 +3640,9 @@
\fi
\if at ACM@anonymous
\ifx\shortauthors\@empty
- \gdef\shortauthors{Anon.}%
+ \gdef\shortauthors{Anon.
+ \ifx\@acmSubmissionID\@empty\else Submission Id:
+ \@acmSubmissionID\fi}%
\fi
\else
\def\@tempa{#1}%
@@ -4638,7 +4693,7 @@
\fi
\fi
\fi
- \footnotetextcopyrightpermission{%
+ \if at ACM@nonacm\else\footnotetextcopyrightpermission{%
\if at ACM@authordraft
\raisebox{-2ex}[\z@][\z@]{\makebox[0pt][l]{\large\bfseries
Unpublished working draft. Not for distribution.}}%
@@ -4656,7 +4711,7 @@
\if at printcopyright
\copyright\ \@copyrightyear\ \@copyrightowner\\
\else
- \@copyrightyear.\
+ \@copyrightyear.\
\fi
\if at ACM@manuscript
Manuscript submitted to ACM\\
@@ -4676,17 +4731,20 @@
, \@formatdoi{\@acmDOI}.
\fi\\
\else
- \if at ACM@journal
- \@permissionCodeOne/\@acmYear/\@acmMonth-ART\@acmArticle
- \ifx\@acmPrice\@empty\else\ \$\@acmPrice\fi\\
- \@formatdoi{\@acmDOI}%
- \else % Conference
- \ifx\@acmISBN\@empty\else ACM~ISBN~\@acmISBN
- \ifx\@acmPrice\@empty.\else\dots\$\@acmPrice\fi\\\fi
- \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi%
+ \if at ACM@nonacm\else
+ \if at ACM@journal
+ \@permissionCodeOne/\@acmYear/\@acmMonth-ART\@acmArticle
+ \ifx\@acmPrice\@empty\else\ \$\@acmPrice\fi\\
+ \@formatdoi{\@acmDOI}%
+ \else % Conference
+ \ifx\@acmISBN\@empty\else ACM~ISBN~\@acmISBN
+ \ifx\@acmPrice\@empty.\else\dots\$\@acmPrice\fi\\\fi
+ \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi%
+ \fi
\fi
\fi
\fi}
+ \fi
\endgroup
\setcounter{footnote}{0}%
\@mkabstract
@@ -4712,8 +4770,6 @@
\@mkbibcitation
\fi
\hypersetup{%
- pdflang={English},
- pdfdisplaydoctitle,
pdfauthor={\authors},
pdftitle={\@title},
pdfsubject={\@concepts},
@@ -5517,13 +5573,14 @@
% \changes{v1.44}{2017/07/30}{If the paper has just one page, use
% `page' instead of `pages'}
% \changes{v1.46}{2017/08/25}{Added subtitle}
+% \changes{v1.54}{2018/06/10}{Bug corrected (Ross Moore)}
% Print the |bibcitation| format
% \begin{macrocode}
\def\@mkbibcitation{\bgroup
\def\@pages at word{\ifnum\getrefnumber{TotPages}=1\relax page\else pages\fi}%
\def\footnotemark{}%
- \def\\{\unskip{} \ignorespaces}%
- \def\footnote{\ClassError{\@classname}{Please do note use footnotes
+ \def\\{\unskip{}, \ignorespaces}%
+ \def\footnote{\ClassError{\@classname}{Please do not use footnotes
inside a \string\title{} or \string\author{} command! Use
\string\titlenote{} or \string\authornote{} instead!}}%
\def\@article at string{\ifx\@acmArticle\@empty{\ }\else,
@@ -5531,17 +5588,23 @@
\par\medskip\small\noindent{\bfseries ACM Reference Format:}\par\nobreak
\noindent\authors. \@acmYear. \@title
\ifx\@subtitle\@empty. \else: \@subtitle. \fi
- \if at ACM@journal
- \textit{\@journalNameShort}
- \@acmVolume, \@acmNumber \@article at string (\@acmPubDate),
- \ref{TotPages}~\@pages at word.
- \else
- In \textit{\@acmBooktitle}%
- \ifx\@acmEditors\@empty\textit{.}\else
- \andify\@acmEditors\textit{, }\@acmEditors~\@editorsAbbrev.%
- \fi\
- ACM, New York, NY, USA%
- \@article at string\unskip, \ref{TotPages}~\@pages at word.
+ \if at ACM@nonacm\else
+ % The 'nonacm' option disables 'printacmref' by default,
+ % and the present \@mkbibcitation definition is never used
+ % in this case. The conditional remains useful if the user
+ % explicitly sets \settopmatter{printacmref=true}.
+ \if at ACM@journal
+ \textit{\@journalNameShort}
+ \@acmVolume, \@acmNumber \@article at string (\@acmPubDate),
+ \ref{TotPages}~\@pages at word.
+ \else
+ In \textit{\@acmBooktitle}%
+ \ifx\@acmEditors\@empty\textit{.}\else
+ \andify\@acmEditors\textit{, }\@acmEditors~\@editorsAbbrev.%
+ \fi\
+ ACM, New York, NY, USA%
+ \@article at string\unskip, \ref{TotPages}~\@pages at word.
+ \fi
\fi
\ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi
\par\egroup}
@@ -5672,10 +5735,15 @@
%
% \begin{macro}{\@shortauthors}
% \changes{v1.15}{2016/07/04}{Introduced macro}
+% \changes{v1.54}{2016/06/23}{Added submission id in anonymous mode}
% Even if the author redefined \cs{shortauthors}, we do not print
% it in the headers when in anonymous mode:
% \begin{macrocode}
-\def\@shortauthors{\if at ACM@anonymous Anon.\else\shortauthors\fi}
+\def\@shortauthors{%
+ \if at ACM@anonymous
+ Anon.
+ \ifx\@acmSubmissionID\@empty\else Submission Id: \@acmSubmissionID\fi
+ \else\shortauthors\fi}
% \end{macrocode}
%
% \end{macro}
@@ -5709,6 +5777,13 @@
\fancyhf{}%
\renewcommand{\headrulewidth}{\z@}%
\renewcommand{\footrulewidth}{\z@}%
+ \def\@acmArticlePage{%
+ \ifx\@acmArticle\empty%
+ \if at ACM@printfolios\thepage\fi%
+ \else%
+ \@acmArticle\if at ACM@printfolios:\thepage\fi%
+ \fi%
+ }
\ifcase\ACM at format@nr
\relax % manuscript
\fancyhead[LE]{\ACM at linecountL\if at ACM@printfolios\thepage\fi}%
@@ -5715,39 +5790,49 @@
\fancyhead[RO]{\if at ACM@printfolios\thepage\fi}%
\fancyhead[RE]{\@shortauthors}%
\fancyhead[LO]{\ACM at linecountL\shorttitle}%
- \fancyfoot[RO,LE]{\footnotesize Manuscript submitted to ACM}%
+ \if at ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize Manuscript submitted to ACM}
+ \fi%
\or % acmsmall
- \fancyhead[LE]{\ACM at linecountL\@headfootfont\@acmArticle\if at ACM@printfolios:\thepage\fi}%
- \fancyhead[RO]{\@headfootfont\@acmArticle\if at ACM@printfolios:\thepage\fi}%
+ \fancyhead[LE]{\ACM at linecountL\@headfootfont\@acmArticlePage}%
+ \fancyhead[RO]{\@headfootfont\@acmArticlePage}%
\fancyhead[RE]{\@headfootfont\@shortauthors}%
\fancyhead[LO]{\ACM at linecountL\@headfootfont\shorttitle}%
- \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
- \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}%
+ \if at ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}%
+ \fi%
\or % acmlarge
\fancyhead[LE]{\ACM at linecountL\@headfootfont
- \@acmArticle\if at ACM@printfolios:\thepage\fi\quad\textbullet\quad\@shortauthors}%
+ \@acmArticlePage\quad\textbullet\quad\@shortauthors}%
\fancyhead[LO]{\ACM at linecountL}%
\fancyhead[RO]{\@headfootfont
- \shorttitle\quad\textbullet\quad\@acmArticle\if at ACM@printfolios:\thepage\fi}%
- \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
- \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}%
+ \shorttitle\quad\textbullet\quad\@acmArticlePage}%
+ \if at ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}%
+ \fi%
\or % acmtog
\fancyhead[LE]{\ACM at linecountL\@headfootfont
- \@acmArticle\if at ACM@printfolios:\thepage\fi\quad\textbullet\quad\@shortauthors}%
+ \@acmArticlePage\quad\textbullet\quad\@shortauthors}%
\fancyhead[LO]{\ACM at linecountL}%
\fancyhead[RE]{\ACM at linecountR}%
\fancyhead[RO]{\@headfootfont
- \shorttitle\quad\textbullet\quad\@acmArticle\if at ACM@printfolios:\thepage\fi\ACM at linecountR}%
- \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
- \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}%
+ \shorttitle\quad\textbullet\quad\@acmArticlePage\ACM at linecountR}%
+ \if at ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}%
+ \fi%
\else % Proceedings
\fancyfoot[C]{\if at ACM@printfolios\footnotesize\thepage\fi}%
\fancyhead[LO]{\ACM at linecountL\@headfootfont\shorttitle}%
\fancyhead[RE]{\@headfootfont\@shortauthors\ACM at linecountR}%
- \fancyhead[LE]{\ACM at linecountL\@headfootfont\acmConference at shortname,
- \acmConference at date, \acmConference at venue}%
- \fancyhead[RO]{\@headfootfont\acmConference at shortname,
- \acmConference at date, \acmConference at venue\ACM at linecountR}%
+ \if at ACM@nonacm\else%
+ \fancyhead[LE]{\ACM at linecountL\@headfootfont\acmConference at shortname,
+ \acmConference at date, \acmConference at venue}%
+ \fancyhead[RO]{\@headfootfont\acmConference at shortname,
+ \acmConference at date, \acmConference at venue\ACM at linecountR}%
+ \fi%
\fi
\if at ACM@sigchiamode
\fancyheadoffset[L]{\dimexpr(\marginparsep+\marginparwidth)}%
@@ -5847,27 +5932,35 @@
\relax % manuscript
\fancyhead[L]{\ACM at linecountL}%
\fancyfoot[RO,LE]{\if at ACM@printfolios\small\thepage\fi}%
- \fancyfoot[RE,LO]{\footnotesize Manuscript submitted to ACM}%
+ \if at ACM@nonacm\else%
+ \fancyfoot[RE,LO]{\footnotesize Manuscript submitted to ACM}%
+ \fi%
\or % acmsmall
- \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
- \@acmNumber, Article \@acmArticle. Publication date:
- \@acmPubDate.}%
+ \if at ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date:
+ \@acmPubDate.}%
+ \fi%
\fancyhead[LE]{\ACM at linecountL\@folioblob}%
\fancyhead[LO]{\ACM at linecountL}%
\fancyhead[RO]{\@folioblob}%
\fancyheadoffset[RO,LE]{0.6\@folio at wd}%
\or % acmlarge
- \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
- \@acmNumber, Article \@acmArticle. Publication date:
- \@acmPubDate.}%
+ \if at ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date:
+ \@acmPubDate.}%
+ \fi%
\fancyhead[RO]{\@folioblob}%
\fancyhead[LE]{\ACM at linecountL\@folioblob}%
\fancyhead[LO]{\ACM at linecountL}%
\fancyheadoffset[RO,LE]{1.4\@folio at wd}%
\or % acmtog
- \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
- \@acmNumber, Article \@acmArticle. Publication date:
- \@acmPubDate.}%
+ \if at ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date:
+ \@acmPubDate.}%
+ \fi%
\fancyhead[L]{\ACM at linecountL}%
\fancyhead[R]{\ACM at linecountR}%
\else % Conference proceedings
@@ -5878,7 +5971,9 @@
\if at ACM@timestamp
\ifnum\ACM at format@nr=0\relax % Manuscript
\fancyfoot[LO,RE]{\ACM at timestamp\quad
- \footnotesize Manuscript submitted to ACM}
+ \if at ACM@nonacm\else
+ \footnotesize Manuscript submitted to ACM
+ \fi}
\else
\fancyfoot[LO,RE]{\ACM at timestamp}
\fi
@@ -5910,29 +6005,105 @@
%\subsection{Sectioning}
%\label{sec:sectioninng}
%
+% \begin{macro}{\ACM at NRadjust}
+% \changes{v1.54}{2018/06/17}{Added macro}
+% Ross Moore's macro.
+% \begin{quotation}
+% Initially |\ACM at sect@format@| just passes through its |#1|
+% argument unchanged.
+% When a sectioning macro such as |\section| occurs, the
+% |\ACM at NRadjust| redefines |\ACM at sect@format@| to expand into the
+% styling commands; e.g., |\@secfont|.
+% Then |\Sectionformat| is temporarily redefined to produce
+% |\realSectionformat{\ACM at sect@format{#1}}{#2}|, which ultimately
+% becomes |\Sectionformat{\@secfont{#1}}{#2}|.
+% This is done to allow |\Sectionformat| to be variable, as may be
+% needed in particular circumstances. Its current expansion is saved
+% as |\realSectionformat| which is used with the modified 1st argument,
+% then |\Sectionformat| is reverted to its former expansion.
%
+% To style the section-number, the line |#1{}| is used at the end of
+% |\ACM at NRadjust|. This imposes style-changing commands for fonts and
+% sizes, but any |\MakeUppercase| acts on just the |{}|. It's a bit hacky,
+% by essentially assuming that only numbers occur here, not letters to
+% be case-changed. (This should be acceptable in a class-file, as it
+% ought to be possible to change the case elsewhere, if that was ever
+% desired.) Also, it can result in |\@adddotafter| being called too
+% soon, so a slight adjustment is made, via |\ACM at adddotafter|, which
+% now tests whether its argument is empty. But the coding has to allow
+% for other packages to have also patched |\@adddotafter|.
+% \end{quotation}
+% \begin{macrocode}
+\def\ACM at NRadjust#1{%
+ \begingroup
+ \expandafter\ifx\csname Sectionformat\endcsname\relax
+ % do nothing when \Sectionformat is unknown
+ \def\next{\endgroup #1}%
+ \else
+ \def\next{\endgroup
+ \let\realSectionformat\Sectionformat
+ \def\ACM at sect@format@{#1}%
+ \let\Sectionformat\ACM at NR@adjustedSectionformat
+ %% next lines added 2018-06-17 to ensure section number is styled
+ \let\real at adddotafter\@adddotafter
+ \let\@adddotafter\ACM at adddotafter
+ #1{}% imposes the styles, but nullifies \MakeUppercase
+ \let\@adddotafter\real at adddotafter
+ }%
+ \fi \next
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ACM at NR@adjustedSectionformat}
+% \changes{v1.54}{2018/06/17}{Added macro}
+% \begin{macrocode}
+\def\ACM at NR@adjustedSectionformat#1#2{%
+ \realSectionformat{\ACM at sect@format{#1}}{#2}%
+ \let\Sectionformat\realSectionformat}
+\DeclareRobustCommand{\ACM at sect@format}{\ACM at sect@format@}
+\def\ACM at sect@format at null#1{#1}
+\let\ACM at sect@format@\ACM at sect@format at null
+\AtBeginDocument{%
+ \expandafter\ifx\csname LTX at adddotafter\endcsname\relax
+ \let\LTX at adddotafter\@adddotafter
+ \fi
+}
+% \end{macrocode}
+%
+% \end{macro}
+% \begin{macro}{\ACM at adddotafter}
+% \changes{v1.54}{2018/06/17}{Added macro}
+% \begin{macrocode}
+\def\ACM at adddotafter#1{\ifx\relax#1\relax\else\LTX at adddotafter{#1}\fi}
+% \end{macrocode}
+%
+% \end{macro}
+%
+% \changes{v1.54}{2018/05/27}{Deleted indent for subsubsection}
+% \changes{v1.54}{2018/06/17}{Added Ross's patch for sectioning}
% 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}}
+ {\ACM at NRadjust\@secfont}}
\renewcommand\subsection{\@startsection{subsection}{2}{\z@}%
{-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
{.25\baselineskip}%
- {\@subsecfont}}
-\renewcommand\subsubsection{\@startsection{subsubsection}{3}{10pt}%
+ {\ACM at NRadjust\@subsecfont}}
+\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
{-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
{-3.5\p@}%
- {\@subsubsecfont\@adddotafter}}
+ {\ACM at NRadjust{\@subsubsecfont\@adddotafter}}}
\renewcommand\paragraph{\@startsection{paragraph}{4}{\parindent}%
{-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
{-3.5\p@}%
- {\@parfont\@adddotafter}}
+ {\ACM at NRadjust{\@parfont\@adddotafter}}}
\renewcommand\part{\@startsection{part}{9}{\z@}%
{-10\p@ \@plus -4\p@ \@minus -2\p@}%
{4\p@}%
- {\@parfont}}
+ {\ACM at NRadjust\@parfont}}
% \end{macrocode}
%
% \begin{macro}{\section at raggedright}
Modified: trunk/Master/texmf-dist/tex/latex/acmart/acmart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/acmart/acmart.cls 2018-07-17 00:18:17 UTC (rev 48213)
+++ trunk/Master/texmf-dist/tex/latex/acmart/acmart.cls 2018-07-17 21:17:06 UTC (rev 48214)
@@ -37,7 +37,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{acmart}
-[2018/04/14 v1.53 Typesetting articles for the Association for
+[2018/07/16 v1.54 Typesetting articles for the Association for
Computing Machinery]
\def\@classname{acmart}
\InputIfFileExists{acmart-preload-hook.tex}{%
@@ -96,6 +96,18 @@
\fi}{\PackageError{\@classname}{The option authorversion can be either true or
false}}
\ExecuteOptionsX{authorversion=false}
+\define at boolkey+{acmart.cls}[@ACM@]{nonacm}[true]{%
+ \if at ACM@nonacm
+ \PackageInfo{\@classname}{Using nonacm mode}%
+ \AtBeginDocument{\@ACM at printacmreffalse}%
+ % in 'nonacm' mode we disable the "ACM Reference Format"
+ % printing by default, but this can be re-enabled by the
+ % user using \settopmatter{printacmref=true}
+ \else
+ \PackageInfo{\@classname}{Not using nonacm mode}%
+ \fi}{\PackageError{\@classname}{The option nonacm can be either true or
+ false}}
+\ExecuteOptionsX{nonacm=false}
\define at boolkey+{acmart.cls}[@ACM@]{natbib}[true]{%
\if at ACM@natbib
\PackageInfo{\@classname}{Explicitly selecting natbib mode}%
@@ -410,6 +422,32 @@
\def\l at section{\@tocline{1}{0pt}{1pc}{2pc}{}}
\def\l at subsection{\@tocline{2}{0pt}{1pc}{3pc}{}}
\def\l at subsubsection{\@tocline{2}{0pt}{1pc}{5pc}{}}
+\def\@makefntext{\noindent\@makefnmark}
+\if at ACM@sigchiamode
+\long\def\@footnotetext#1{\marginpar{%
+ \reset at font\small
+ \interlinepenalty\interfootnotelinepenalty
+ \protected at edef\@currentlabel{%
+ \csname p at footnote\endcsname\@thefnmark
+ }%
+ \color at begingroup
+ \@makefntext{%
+ \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+ \color at endgroup}}%
+\fi
+\long\def\@mpfootnotetext#1{%
+ \global\setbox\@mpfootins\vbox{%
+ \unvbox\@mpfootins
+ \reset at font\footnotesize
+ \hsize\columnwidth
+ \@parboxrestore
+ \protected at edef\@currentlabel
+ {\csname p at mpfootnote\endcsname\@thefnmark}%
+ \color at begingroup\centering
+ \@makefntext{%
+ \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+ \color at endgroup}}
+\def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}}
\let\@footnotemark at nolink\@footnotemark
\let\@footnotetext at nolink\@footnotetext
\RequirePackage[bookmarksnumbered,unicode]{hyperref}
@@ -442,7 +480,9 @@
filecolor=ACMDarkBlue}
\else
\hypersetup{hidelinks}
- \fi}
+ \fi
+ \hypersetup{pdflang={English},
+ pdfdisplaydoctitle}}
\if at ACM@natbib
\let\citeN\cite
\let\cite\citep
@@ -586,32 +626,6 @@
\color at endgroup
\egroup
\expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}}
-\def\@makefntext{\noindent\@makefnmark}
-\if at ACM@sigchiamode
-\long\def\@footnotetext#1{\marginpar{%
- \reset at font\small
- \interlinepenalty\interfootnotelinepenalty
- \protected at edef\@currentlabel{%
- \csname p at footnote\endcsname\@thefnmark
- }%
- \color at begingroup
- \@makefntext{%
- \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
- \color at endgroup}}%
-\fi
-\long\def\@mpfootnotetext#1{%
- \global\setbox\@mpfootins\vbox{%
- \unvbox\@mpfootins
- \reset at font\footnotesize
- \hsize\columnwidth
- \@parboxrestore
- \protected at edef\@currentlabel
- {\csname p at mpfootnote\endcsname\@thefnmark}%
- \color at begingroup\centering
- \@makefntext{%
- \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
- \color at endgroup}}
-\def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}}
\def\@textbottom{\vskip \z@ \@plus 1pt}
\let\@texttop\relax
\RequirePackage{iftex}
@@ -621,9 +635,9 @@
\pdfglyphtounicode{f_f_i}{FB03}
\pdfglyphtounicode{f_f_l}{FB04}
\pdfglyphtounicode{f_i}{FB01}
-\pdfglyphtounicode{t_t}{00740074}
-\pdfglyphtounicode{f_t}{00660074}
-\pdfglyphtounicode{T_h}{00540068}
+\pdfglyphtounicode{t_t}{0074 0074}
+\pdfglyphtounicode{f_t}{0066 0074}
+\pdfglyphtounicode{T_h}{0054 0068}
\pdfgentounicode=1
\fi
\RequirePackage{cmap}
@@ -639,6 +653,7 @@
have the newtxmath package installed. Please upgrade your
TeX}\@ACM at newfontsfalse}
\if at ACM@newfonts
+ \RequirePackage[T1]{fontenc}
\ifxetex
\RequirePackage[tt=false]{libertine}
\else
@@ -646,10 +661,7 @@
\fi
\RequirePackage[varqu]{zi4}
\RequirePackage[libertine]{newtxmath}
-\ifxetex\else
- \RequirePackage[T1]{fontenc}
\fi
-\fi
\let\liningnums\@undefined
\AtEndPreamble{%
\DeclareTextFontCommand{\liningnums}{\libertineLF}}
@@ -1114,7 +1126,9 @@
\fi
\ifx\addresses\@empty
\if at ACM@anonymous
- \gdef\addresses{\@author{Anonymous Author(s)}}%
+ \gdef\addresses{\@author{Anonymous Author(s)%
+ \ifx\@acmSubmissionID\@empty\else\\Submission Id:
+ \@acmSubmissionID\fi}}%
\gdef\authors{Anonymous Author(s)}%
\else
\gdef\addresses{\@author{#2}}%
@@ -1128,7 +1142,9 @@
\fi
\if at ACM@anonymous
\ifx\shortauthors\@empty
- \gdef\shortauthors{Anon.}%
+ \gdef\shortauthors{Anon.
+ \ifx\@acmSubmissionID\@empty\else Submission Id:
+ \@acmSubmissionID\fi}%
\fi
\else
\def\@tempa{#1}%
@@ -1606,7 +1622,7 @@
\fi
\fi
\fi
- \footnotetextcopyrightpermission{%
+ \if at ACM@nonacm\else\footnotetextcopyrightpermission{%
\if at ACM@authordraft
\raisebox{-2ex}[\z@][\z@]{\makebox[0pt][l]{\large\bfseries
Unpublished working draft. Not for distribution.}}%
@@ -1624,7 +1640,7 @@
\if at printcopyright
\copyright\ \@copyrightyear\ \@copyrightowner\\
\else
- \@copyrightyear.\
+ \@copyrightyear.\
\fi
\if at ACM@manuscript
Manuscript submitted to ACM\\
@@ -1644,17 +1660,20 @@
, \@formatdoi{\@acmDOI}.
\fi\\
\else
- \if at ACM@journal
- \@permissionCodeOne/\@acmYear/\@acmMonth-ART\@acmArticle
- \ifx\@acmPrice\@empty\else\ \$\@acmPrice\fi\\
- \@formatdoi{\@acmDOI}%
- \else % Conference
- \ifx\@acmISBN\@empty\else ACM~ISBN~\@acmISBN
- \ifx\@acmPrice\@empty.\else\dots\$\@acmPrice\fi\\\fi
- \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi%
+ \if at ACM@nonacm\else
+ \if at ACM@journal
+ \@permissionCodeOne/\@acmYear/\@acmMonth-ART\@acmArticle
+ \ifx\@acmPrice\@empty\else\ \$\@acmPrice\fi\\
+ \@formatdoi{\@acmDOI}%
+ \else % Conference
+ \ifx\@acmISBN\@empty\else ACM~ISBN~\@acmISBN
+ \ifx\@acmPrice\@empty.\else\dots\$\@acmPrice\fi\\\fi
+ \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi%
+ \fi
\fi
\fi
\fi}
+ \fi
\endgroup
\setcounter{footnote}{0}%
\@mkabstract
@@ -1680,8 +1699,6 @@
\@mkbibcitation
\fi
\hypersetup{%
- pdflang={English},
- pdfdisplaydoctitle,
pdfauthor={\authors},
pdftitle={\@title},
pdfsubject={\@concepts},
@@ -2142,8 +2159,8 @@
\def\@mkbibcitation{\bgroup
\def\@pages at word{\ifnum\getrefnumber{TotPages}=1\relax page\else pages\fi}%
\def\footnotemark{}%
- \def\\{\unskip{} \ignorespaces}%
- \def\footnote{\ClassError{\@classname}{Please do note use footnotes
+ \def\\{\unskip{}, \ignorespaces}%
+ \def\footnote{\ClassError{\@classname}{Please do not use footnotes
inside a \string\title{} or \string\author{} command! Use
\string\titlenote{} or \string\authornote{} instead!}}%
\def\@article at string{\ifx\@acmArticle\@empty{\ }\else,
@@ -2151,17 +2168,23 @@
\par\medskip\small\noindent{\bfseries ACM Reference Format:}\par\nobreak
\noindent\authors. \@acmYear. \@title
\ifx\@subtitle\@empty. \else: \@subtitle. \fi
- \if at ACM@journal
- \textit{\@journalNameShort}
- \@acmVolume, \@acmNumber \@article at string (\@acmPubDate),
- \ref{TotPages}~\@pages at word.
- \else
- In \textit{\@acmBooktitle}%
- \ifx\@acmEditors\@empty\textit{.}\else
- \andify\@acmEditors\textit{, }\@acmEditors~\@editorsAbbrev.%
- \fi\
- ACM, New York, NY, USA%
- \@article at string\unskip, \ref{TotPages}~\@pages at word.
+ \if at ACM@nonacm\else
+ % The 'nonacm' option disables 'printacmref' by default,
+ % and the present \@mkbibcitation definition is never used
+ % in this case. The conditional remains useful if the user
+ % explicitly sets \settopmatter{printacmref=true}.
+ \if at ACM@journal
+ \textit{\@journalNameShort}
+ \@acmVolume, \@acmNumber \@article at string (\@acmPubDate),
+ \ref{TotPages}~\@pages at word.
+ \else
+ In \textit{\@acmBooktitle}%
+ \ifx\@acmEditors\@empty\textit{.}\else
+ \andify\@acmEditors\textit{, }\@acmEditors~\@editorsAbbrev.%
+ \fi\
+ ACM, New York, NY, USA%
+ \@article at string\unskip, \ref{TotPages}~\@pages at word.
+ \fi
\fi
\ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi
\par\egroup}
@@ -2215,12 +2238,23 @@
Page \thepage\ of \@startPage--\pageref*{TotPages}.%
}
\fi
-\def\@shortauthors{\if at ACM@anonymous Anon.\else\shortauthors\fi}
+\def\@shortauthors{%
+ \if at ACM@anonymous
+ Anon.
+ \ifx\@acmSubmissionID\@empty\else Submission Id: \@acmSubmissionID\fi
+ \else\shortauthors\fi}
\def\@headfootfont{\sffamily}
\fancypagestyle{standardpagestyle}{%
\fancyhf{}%
\renewcommand{\headrulewidth}{\z@}%
\renewcommand{\footrulewidth}{\z@}%
+ \def\@acmArticlePage{%
+ \ifx\@acmArticle\empty%
+ \if at ACM@printfolios\thepage\fi%
+ \else%
+ \@acmArticle\if at ACM@printfolios:\thepage\fi%
+ \fi%
+ }
\ifcase\ACM at format@nr
\relax % manuscript
\fancyhead[LE]{\ACM at linecountL\if at ACM@printfolios\thepage\fi}%
@@ -2227,39 +2261,49 @@
\fancyhead[RO]{\if at ACM@printfolios\thepage\fi}%
\fancyhead[RE]{\@shortauthors}%
\fancyhead[LO]{\ACM at linecountL\shorttitle}%
- \fancyfoot[RO,LE]{\footnotesize Manuscript submitted to ACM}%
+ \if at ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize Manuscript submitted to ACM}
+ \fi%
\or % acmsmall
- \fancyhead[LE]{\ACM at linecountL\@headfootfont\@acmArticle\if at ACM@printfolios:\thepage\fi}%
- \fancyhead[RO]{\@headfootfont\@acmArticle\if at ACM@printfolios:\thepage\fi}%
+ \fancyhead[LE]{\ACM at linecountL\@headfootfont\@acmArticlePage}%
+ \fancyhead[RO]{\@headfootfont\@acmArticlePage}%
\fancyhead[RE]{\@headfootfont\@shortauthors}%
\fancyhead[LO]{\ACM at linecountL\@headfootfont\shorttitle}%
- \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
- \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}%
+ \if at ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}%
+ \fi%
\or % acmlarge
\fancyhead[LE]{\ACM at linecountL\@headfootfont
- \@acmArticle\if at ACM@printfolios:\thepage\fi\quad\textbullet\quad\@shortauthors}%
+ \@acmArticlePage\quad\textbullet\quad\@shortauthors}%
\fancyhead[LO]{\ACM at linecountL}%
\fancyhead[RO]{\@headfootfont
- \shorttitle\quad\textbullet\quad\@acmArticle\if at ACM@printfolios:\thepage\fi}%
- \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
- \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}%
+ \shorttitle\quad\textbullet\quad\@acmArticlePage}%
+ \if at ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}%
+ \fi%
\or % acmtog
\fancyhead[LE]{\ACM at linecountL\@headfootfont
- \@acmArticle\if at ACM@printfolios:\thepage\fi\quad\textbullet\quad\@shortauthors}%
+ \@acmArticlePage\quad\textbullet\quad\@shortauthors}%
\fancyhead[LO]{\ACM at linecountL}%
\fancyhead[RE]{\ACM at linecountR}%
\fancyhead[RO]{\@headfootfont
- \shorttitle\quad\textbullet\quad\@acmArticle\if at ACM@printfolios:\thepage\fi\ACM at linecountR}%
- \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
- \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}%
+ \shorttitle\quad\textbullet\quad\@acmArticlePage\ACM at linecountR}%
+ \if at ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}%
+ \fi%
\else % Proceedings
\fancyfoot[C]{\if at ACM@printfolios\footnotesize\thepage\fi}%
\fancyhead[LO]{\ACM at linecountL\@headfootfont\shorttitle}%
\fancyhead[RE]{\@headfootfont\@shortauthors\ACM at linecountR}%
- \fancyhead[LE]{\ACM at linecountL\@headfootfont\acmConference at shortname,
- \acmConference at date, \acmConference at venue}%
- \fancyhead[RO]{\@headfootfont\acmConference at shortname,
- \acmConference at date, \acmConference at venue\ACM at linecountR}%
+ \if at ACM@nonacm\else%
+ \fancyhead[LE]{\ACM at linecountL\@headfootfont\acmConference at shortname,
+ \acmConference at date, \acmConference at venue}%
+ \fancyhead[RO]{\@headfootfont\acmConference at shortname,
+ \acmConference at date, \acmConference at venue\ACM at linecountR}%
+ \fi%
\fi
\if at ACM@sigchiamode
\fancyheadoffset[L]{\dimexpr(\marginparsep+\marginparwidth)}%
@@ -2317,27 +2361,35 @@
\relax % manuscript
\fancyhead[L]{\ACM at linecountL}%
\fancyfoot[RO,LE]{\if at ACM@printfolios\small\thepage\fi}%
- \fancyfoot[RE,LO]{\footnotesize Manuscript submitted to ACM}%
+ \if at ACM@nonacm\else%
+ \fancyfoot[RE,LO]{\footnotesize Manuscript submitted to ACM}%
+ \fi%
\or % acmsmall
- \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
- \@acmNumber, Article \@acmArticle. Publication date:
- \@acmPubDate.}%
+ \if at ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date:
+ \@acmPubDate.}%
+ \fi%
\fancyhead[LE]{\ACM at linecountL\@folioblob}%
\fancyhead[LO]{\ACM at linecountL}%
\fancyhead[RO]{\@folioblob}%
\fancyheadoffset[RO,LE]{0.6\@folio at wd}%
\or % acmlarge
- \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
- \@acmNumber, Article \@acmArticle. Publication date:
- \@acmPubDate.}%
+ \if at ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date:
+ \@acmPubDate.}%
+ \fi%
\fancyhead[RO]{\@folioblob}%
\fancyhead[LE]{\ACM at linecountL\@folioblob}%
\fancyhead[LO]{\ACM at linecountL}%
\fancyheadoffset[RO,LE]{1.4\@folio at wd}%
\or % acmtog
- \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
- \@acmNumber, Article \@acmArticle. Publication date:
- \@acmPubDate.}%
+ \if at ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date:
+ \@acmPubDate.}%
+ \fi%
\fancyhead[L]{\ACM at linecountL}%
\fancyhead[R]{\ACM at linecountR}%
\else % Conference proceedings
@@ -2348,7 +2400,9 @@
\if at ACM@timestamp
\ifnum\ACM at format@nr=0\relax % Manuscript
\fancyfoot[LO,RE]{\ACM at timestamp\quad
- \footnotesize Manuscript submitted to ACM}
+ \if at ACM@nonacm\else
+ \footnotesize Manuscript submitted to ACM
+ \fi}
\else
\fancyfoot[LO,RE]{\ACM at timestamp}
\fi
@@ -2362,26 +2416,56 @@
\let\ps at myheadings\ACM at ps@myheadings
\let\ps at headings\ACM at ps@headings}
\AtBeginDocument{\ACM at restore@pagestyle}
+\def\ACM at NRadjust#1{%
+ \begingroup
+ \expandafter\ifx\csname Sectionformat\endcsname\relax
+ % do nothing when \Sectionformat is unknown
+ \def\next{\endgroup #1}%
+ \else
+ \def\next{\endgroup
+ \let\realSectionformat\Sectionformat
+ \def\ACM at sect@format@{#1}%
+ \let\Sectionformat\ACM at NR@adjustedSectionformat
+ %% next lines added 2018-06-17 to ensure section number is styled
+ \let\real at adddotafter\@adddotafter
+ \let\@adddotafter\ACM at adddotafter
+ #1{}% imposes the styles, but nullifies \MakeUppercase
+ \let\@adddotafter\real at adddotafter
+ }%
+ \fi \next
+}
+\def\ACM at NR@adjustedSectionformat#1#2{%
+ \realSectionformat{\ACM at sect@format{#1}}{#2}%
+ \let\Sectionformat\realSectionformat}
+\DeclareRobustCommand{\ACM at sect@format}{\ACM at sect@format@}
+\def\ACM at sect@format at null#1{#1}
+\let\ACM at sect@format@\ACM at sect@format at null
+\AtBeginDocument{%
+ \expandafter\ifx\csname LTX at adddotafter\endcsname\relax
+ \let\LTX at adddotafter\@adddotafter
+ \fi
+}
+\def\ACM at adddotafter#1{\ifx\relax#1\relax\else\LTX at adddotafter{#1}\fi}
\renewcommand\section{\@startsection{section}{1}{\z@}%
{-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
{.25\baselineskip}%
- {\@secfont}}
+ {\ACM at NRadjust\@secfont}}
\renewcommand\subsection{\@startsection{subsection}{2}{\z@}%
{-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
{.25\baselineskip}%
- {\@subsecfont}}
-\renewcommand\subsubsection{\@startsection{subsubsection}{3}{10pt}%
+ {\ACM at NRadjust\@subsecfont}}
+\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
{-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
{-3.5\p@}%
- {\@subsubsecfont\@adddotafter}}
+ {\ACM at NRadjust{\@subsubsecfont\@adddotafter}}}
\renewcommand\paragraph{\@startsection{paragraph}{4}{\parindent}%
{-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
{-3.5\p@}%
- {\@parfont\@adddotafter}}
+ {\ACM at NRadjust{\@parfont\@adddotafter}}}
\renewcommand\part{\@startsection{part}{9}{\z@}%
{-10\p@ \@plus -4\p@ \@minus -2\p@}%
{4\p@}%
- {\@parfont}}
+ {\ACM at NRadjust\@parfont}}
\def\section at raggedright{\@rightskip\@flushglue
\rightskip\@rightskip
\leftskip\z at skip
More information about the tex-live-commits
mailing list