From 54424c2bc9fd7804517082053c023fb6b0cb70fa Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 28 Aug 2019 23:40:39 +0000 Subject: acmart (29aug19) git-svn-id: svn://tug.org/texlive/trunk@51972 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/acmart/README | 6 +++- Master/texmf-dist/doc/latex/acmart/acmart.pdf | Bin 839110 -> 842074 bytes Master/texmf-dist/doc/latex/acmart/acmguide.pdf | Bin 417995 -> 418106 bytes .../doc/latex/acmart/samples/sample-acmlarge.pdf | Bin 650680 -> 650678 bytes .../latex/acmart/samples/sample-acmsmall-conf.pdf | Bin 1095292 -> 1095289 bytes .../doc/latex/acmart/samples/sample-acmsmall.pdf | Bin 660394 -> 660393 bytes .../doc/latex/acmart/samples/sample-acmtog.pdf | Bin 607695 -> 607694 bytes .../latex/acmart/samples/sample-authordraft.pdf | Bin 1088498 -> 1087409 bytes .../doc/latex/acmart/samples/sample-manuscript.pdf | Bin 660375 -> 660372 bytes .../doc/latex/acmart/samples/sample-sigchi-a.pdf | Bin 547134 -> 547135 bytes .../doc/latex/acmart/samples/sample-sigchi.pdf | Bin 661287 -> 661286 bytes .../doc/latex/acmart/samples/sample-sigconf.pdf | Bin 1083625 -> 1083620 bytes .../doc/latex/acmart/samples/sample-sigplan.pdf | Bin 1092892 -> 1092882 bytes .../doc/latex/acmart/samples/sample-xelatex.pdf | Bin 632052 -> 632048 bytes Master/texmf-dist/source/latex/acmart/acmart.dtx | 32 ++++++++++++++++++--- Master/texmf-dist/tex/latex/acmart/acmart.cls | 13 +++++++-- Master/tlpkg/libexec/ctan2tds | 1 + 17 files changed, 44 insertions(+), 8 deletions(-) diff --git a/Master/texmf-dist/doc/latex/acmart/README b/Master/texmf-dist/doc/latex/acmart/README index ae92987c609..1685b99783f 100644 --- a/Master/texmf-dist/doc/latex/acmart/README +++ b/Master/texmf-dist/doc/latex/acmart/README @@ -232,4 +232,8 @@ Version 1.62 Documentation update Version 1.63 New journals: TQUANT, FACMP -Version 1.63a Moved TQUANT to TQC \ No newline at end of file +Version 1.63a Moved TQUANT to TQC + +Version 1.64 Produce error if abstract is entered after maketitle + (previously abstract was silently dropped) + Bug fixes for line numbering \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/acmart/acmart.pdf b/Master/texmf-dist/doc/latex/acmart/acmart.pdf index 86be7848ead..85eb0750fc5 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/acmart.pdf and b/Master/texmf-dist/doc/latex/acmart/acmart.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/acmguide.pdf b/Master/texmf-dist/doc/latex/acmart/acmguide.pdf index 0385d246a47..3786747d960 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/acmguide.pdf and b/Master/texmf-dist/doc/latex/acmart/acmguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmlarge.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmlarge.pdf index 60a665a7845..11e5f3dfccb 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmlarge.pdf and b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmlarge.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-conf.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-conf.pdf index e611d70aa04..bcbdc895060 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-conf.pdf and b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-conf.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall.pdf index 3fd7b390625..db87e3dde1e 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall.pdf and b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmtog.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmtog.pdf index 89a94b7024a..894bbefbb7a 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmtog.pdf and b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmtog.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-authordraft.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-authordraft.pdf index e3b4c591dcf..4f5817958e3 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/samples/sample-authordraft.pdf and b/Master/texmf-dist/doc/latex/acmart/samples/sample-authordraft.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-manuscript.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-manuscript.pdf index 862a5f50bc3..aa339614e45 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/samples/sample-manuscript.pdf and b/Master/texmf-dist/doc/latex/acmart/samples/sample-manuscript.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigchi-a.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigchi-a.pdf index d8cc7048eb6..317da3cb338 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigchi-a.pdf and b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigchi-a.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigchi.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigchi.pdf index a887f01af32..ccf7383b899 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigchi.pdf and b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigchi.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf.pdf index 008caf34e64..85e43e7b1d6 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf.pdf and b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigplan.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigplan.pdf index 82a8d449c58..c198433c4d5 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigplan.pdf and b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigplan.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-xelatex.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-xelatex.pdf index 8b2d9a3a9f3..81b2d03fd4f 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/samples/sample-xelatex.pdf and b/Master/texmf-dist/doc/latex/acmart/samples/sample-xelatex.pdf differ diff --git a/Master/texmf-dist/source/latex/acmart/acmart.dtx b/Master/texmf-dist/source/latex/acmart/acmart.dtx index 0918598581e..918947f21d3 100644 --- a/Master/texmf-dist/source/latex/acmart/acmart.dtx +++ b/Master/texmf-dist/source/latex/acmart/acmart.dtx @@ -100,6 +100,7 @@ % I am grateful to % Michael D.~Adams, % Leif Andersen, +% Lawrence Christopher Angrave, % Dirk Beyer, % Joachim Breitner, % Benjamin Byholm, @@ -131,6 +132,7 @@ % David Shamma, % Gabriel Scherer, % Stephen Spencer, +% Shin Hwei Tan, % Daniel Thomas, % Zack Weinberg, % John Wickerson @@ -1025,6 +1027,7 @@ % \DescribeEnv{abstract}% % The environment |abstract| must \emph{precede} the \cs{maketitle} % command. Again, this is different from the standard \LaTeX. +% Putting |abstract| after \cs{maketitle} will trigger an error. % % % \DescribeEnv{teaserfigure}% @@ -1663,7 +1666,7 @@ % warning. % % You cannot change \cs{baselinestretch} in your document: this -% produces an erorr. +% produces an error. % % You should not abuse the command \cs{vspace}: this command may % disturb the typesetting of ACM papers. @@ -1825,7 +1828,7 @@ \ProvidesFile{acmart.dtx} % %\ProvidesClass{acmart} -[2019/08/05 v1.63a Typesetting articles for the Association for Computing Machinery] +[2019/08/24 v1.64 Typesetting articles for the Association for Computing Machinery] % \end{macrocode} % % \changes{v1.00}{2016/04/14}{First released version} @@ -1918,6 +1921,8 @@ % \changes{1.63}{2019/08/04}{New journal: TQUANT} % \changes{1.63}{2019/08/04}{New journal: FACMP} % \changes{1.63a}{2019/08/05}{Move: TQUANT to TQC} +% \changes{1.64}{2019/08/17}{Putting abstract after \cs{maketitle} now +% causes an error} % % And the driver code: % \begin{macrocode} @@ -3464,6 +3469,16 @@ %\subsection{Top-matter data} %\label{sec:top_matter_data} % +% \begin{macro}{\if@ACM@maketitle@typeset} +% \changes{v1.64}{2019/08/17}{Introduced macro} +% The switch to check whether \cs{maketitle} is already typeset. It +% is initally false, and setting top matter when it is true is wrong. +% \begin{macrocode} +\newif\if@ACM@maketitle@typeset +\@ACM@maketitle@typesetfalse +% \end{macrocode} +% +% \end{macro} % % \changes{v1.24}{2016/11/16}{Add IMWUT journal option} % \changes{v1.25}{2016/12/03}{Updated PACMPL} @@ -4383,7 +4398,10 @@ % \begin{macro}{\@saveabstract} % And saving the abstract % \begin{macrocode} -\long\def\@saveabstract#1{\long\gdef\@abstract{#1}} +\long\def\@saveabstract#1{\if@ACM@maketitle@typeset + \ClassError{\@classname}{Abstract must be defined before maketitle + command. Please move it!}\fi + \long\gdef\@abstract{#1}} \@saveabstract{} % \end{macrocode} % @@ -4972,6 +4990,8 @@ % \changes{v1.55}{2018/10/14}{Fixes topnum} % \changes{v1.58}{2019/01/23}{Original \cs{vspace} inside % \cs{maketitle}} +% \changes{v1.64}{2019/08/17}{Added a switch setting to show that +% \cs{maketitle} is typeset} % The (in)famous \cs{maketitle}. Note that in |sigchi-a| mode, authors % are \emph{not} in the title box. % @@ -4981,6 +5001,7 @@ % way, this was the default behavior of the old ACM classes. % \begin{macrocode} \def\maketitle{% + \@ACM@maketitle@typesettrue \if@ACM@anonymous % Anonymize omission of \author-s \ifnum\num@authorgroups=0\author{}\fi @@ -6019,6 +6040,8 @@ % cmyk colors in boxes do not work} % \changes{v1.46}{2017/08/28}{Rearranged the code to get rid of % spurious underfull messages (Benjamin Byholm)} +% \changes{v1.64}{2019/08/24}{Bug fix: made the spacing on the left +% and the right size equal} % This is the box displayed in review mode % \begin{macrocode} \if@ACM@review @@ -6027,7 +6050,8 @@ \newcount\ACM@linecount \ACM@linecount\@ne\relax \def\ACM@mk@linecount{% - \savebox{\ACM@linecount@bx}[4em][t]{\parbox[t]{4em}{% + \savebox{\ACM@linecount@bx}[4em][t]{\parbox[t]{4em}{\normalfont + \normalsize \setlength{\ACM@linecount@bxht}{0pt}% \loop{\color{red}\scriptsize\the\ACM@linecount}\\ \global\advance\ACM@linecount by \@ne diff --git a/Master/texmf-dist/tex/latex/acmart/acmart.cls b/Master/texmf-dist/tex/latex/acmart/acmart.cls index b6fd7a27fac..167de34bfb5 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} -[2019/08/05 v1.63a Typesetting articles for the Association for Computing Machinery] +[2019/08/24 v1.64 Typesetting articles for the Association for Computing Machinery] \def\@classname{acmart} \InputIfFileExists{acmart-preload-hook.tex}{% \ClassWarning{\@classname}{% @@ -869,6 +869,8 @@ \endlist } \let\enddescription=\endlist % for efficiency +\newif\if@ACM@maketitle@typeset +\@ACM@maketitle@typesetfalse \define@choicekey*+{ACM}{acmJournal}[\@journalCode\@journalCode@nr]{% CIE,% CSUR,% @@ -1374,7 +1376,10 @@ \def\keywords#1{\def\@keywords{#1}} \keywords{} \renewenvironment{abstract}{\Collect@Body\@saveabstract}{} -\long\def\@saveabstract#1{\long\gdef\@abstract{#1}} +\long\def\@saveabstract#1{\if@ACM@maketitle@typeset + \ClassError{\@classname}{Abstract must be defined before maketitle + command. Please move it!}\fi + \long\gdef\@abstract{#1}} \@saveabstract{} \long\def\@lempty{} \define@boolkey+{@ACM@topmatter@}[@ACM@]{printccs}[true]{% @@ -1695,6 +1700,7 @@ \fi}} \newbox\mktitle@bx \def\maketitle{% + \@ACM@maketitle@typesettrue \if@ACM@anonymous % Anonymize omission of \author-s \ifnum\num@authorgroups=0\author{}\fi @@ -2332,7 +2338,8 @@ \newcount\ACM@linecount \ACM@linecount\@ne\relax \def\ACM@mk@linecount{% - \savebox{\ACM@linecount@bx}[4em][t]{\parbox[t]{4em}{% + \savebox{\ACM@linecount@bx}[4em][t]{\parbox[t]{4em}{\normalfont + \normalsize \setlength{\ACM@linecount@bxht}{0pt}% \loop{\color{red}\scriptsize\the\ACM@linecount}\\ \global\advance\ACM@linecount by \@ne diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 5d1fd608ddf..50ccac91902 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -2666,6 +2666,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex"; 'emisa' => 'pdflatex-preserve-pdf', 'engpron' => 'latex -translate-file=empty.tcx', # no 8-bit 'ecclesiastic' => 'latex', # requires interaction + 'esint' => 'xelatex', 'etextools' => 'etex -translate-file=empty.tcx', # no 8-bit 'extpfeil' => 'latex -translate-file=empty.tcx', # no 8-bit 'factura' => 'pdftex', -- cgit v1.2.3