diff options
author | Norbert Preining <norbert@preining.info> | 2019-12-20 03:00:48 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2019-12-20 03:00:48 +0000 |
commit | 18d9ec0eba21e6b8c55cdd50afb91c56e02ce7bf (patch) | |
tree | 56de5f55a6575a68557d5a384f57e3e8566c536d /macros | |
parent | 3b24b0599bb35e1a3338fa33bfb24044a6125ba4 (diff) |
CTAN sync 201912200300
Diffstat (limited to 'macros')
21 files changed, 129 insertions, 37 deletions
diff --git a/macros/latex/contrib/acmart/ACM-Reference-Format.bst b/macros/latex/contrib/acmart/ACM-Reference-Format.bst index 78bf7924ce..554a604985 100644 --- a/macros/latex/contrib/acmart/ACM-Reference-Format.bst +++ b/macros/latex/contrib/acmart/ACM-Reference-Format.bst @@ -34,6 +34,7 @@ ENTRY institution journal key + location month note number @@ -1232,6 +1233,8 @@ FUNCTION { format.btitle } FUNCTION { format.emphasize.booktitle } { booktitle format.a.title.with.edition } + + FUNCTION { format.city } { % jtb: if the preceding string (the title of the conference) is non-empty, @@ -1241,7 +1244,7 @@ FUNCTION { format.city } duplicate$ empty.or.unknown { } { - city empty.or.unknown + city empty.or.unknown location empty.or.unknown and { date empty.or.unknown { } @@ -1249,10 +1252,18 @@ FUNCTION { format.city } if$ } { - date empty.or.unknown - { " (" * city * ")" * } - { " (" * city * ", " * date * ")" * } - if$ + location empty.or.unknown + { + date empty.or.unknown + { " (" * city * ")" * } + { " (" * city * ", " * date * ")" * } + } + { + date empty.or.unknown + { " (" * location * ")" * } + { " (" * location * ", " * date * ")" * } + } + if$ } if$ } diff --git a/macros/latex/contrib/acmart/Makefile b/macros/latex/contrib/acmart/Makefile index 03cf1c0aeb..96f5db4e8e 100644 --- a/macros/latex/contrib/acmart/Makefile +++ b/macros/latex/contrib/acmart/Makefile @@ -39,7 +39,7 @@ acmguide.pdf: $(PACKAGE).dtx $(PACKAGE).cls ALLSAMPLES: cd samples; pdflatex samples.ins; cd .. for texfile in samples/*.tex; do \ - pdffile=$${texfile/.tex/.pdf}; \ + pdffile=$${texfile%.tex}.pdf; \ ${MAKE} $$pdffile; \ done @@ -100,3 +100,5 @@ zip: all clean documents.zip: all docclean zip -r $@ acmart.pdf acmguide.pdf samples *.cls ACM-Reference-Format.* + +.PHONY: all ALLSAMPLES docclean clean distclean archive zip diff --git a/macros/latex/contrib/acmart/README b/macros/latex/contrib/acmart/README index a90e4c91df..79d183c36f 100644 --- a/macros/latex/contrib/acmart/README +++ b/macros/latex/contrib/acmart/README @@ -240,4 +240,11 @@ Version 1.64 Produce error if abstract is entered after maketitle Version 1.65 Bug fixes New journal: DGOV - DTRAP and HEALTH are now using acmlarge format
\ No newline at end of file + DTRAP and HEALTH are now using acmlarge format + +Version 1.66 Bug fixes + BibTeX change: location is now a synonym for city (Feras Saad) + ACM reference format is now mandatory for papers over one page. + CCS concepts and keywords are now mandatory for + papers over two pages. + Authors' addresses are mandatory for journal articles. diff --git a/macros/latex/contrib/acmart/acmart.bib b/macros/latex/contrib/acmart/acmart.bib index 44d499ff0a..c4ccd85f31 100644 --- a/macros/latex/contrib/acmart/acmart.bib +++ b/macros/latex/contrib/acmart/acmart.bib @@ -72,11 +72,11 @@ } @Manual{Talbot16:Glossaries, - title = {User Manual for glossaries.sty v4.25}, + title = {User Manual for glossaries.sty v4.44}, author = {Nicola L. C. Talbot}, - year = 2016, - month = jun, - note = {\url{http://www.ctan.org/pkg/subcaption}} + year = 2019, + month = dec, + note = {\url{http://www.ctan.org/pkg/glossaries}} } @Manual{Carlisle04:Textcase, diff --git a/macros/latex/contrib/acmart/acmart.dtx b/macros/latex/contrib/acmart/acmart.dtx index 3988394321..f659f3f668 100644 --- a/macros/latex/contrib/acmart/acmart.dtx +++ b/macros/latex/contrib/acmart/acmart.dtx @@ -112,7 +112,6 @@ % Enrico Gregorio, % Jamie Davis, % Peter Kemp, -% Kerry A. Seitz, Jr., % Luis Leiva, % Ben Liblit, % Rholais Lii, @@ -130,8 +129,11 @@ % Matteo Riondato, % Craig Rodkin, % Bernard Rous, +% Feras Saad, +% Kerry A. Seitz, Jr., % David Shamma, % Gabriel Scherer, +% Kartik Singhal, % Stephen Spencer, % Shin Hwei Tan, % Daniel Thomas, @@ -617,7 +619,7 @@ % copy, but they \emph{are} necessary since they are used by the XML % metadata extraction programs. Do \emph{not} put commas or |\\| % between the elements of \cs{affiliation}. They will be provided -% automatically. +% automatically. % % % An example of the author block: @@ -722,7 +724,7 @@ % 123456 Helm, Germany % \end{verbatim} % -% Note that you should \emph{not} use this option for journals. +% Note that you should \emph{not} use this option for journals. % % It is expected that these commands are inserted by the author of the % manuscript. @@ -754,7 +756,8 @@ % Moffett Field, California 94035.} % \end{verbatim} % You can \emph{suppress} printing authors' addresses by setting them -% to an empty string: |\authorsaddresses{}|. +% to an empty string: |\authorsaddresses{}|. Please note that +% authors' addresses are mandatory for journal articles. % % \DescribeMacro{\titlenote}% % \DescribeMacro{\subtitlenote}% @@ -947,6 +950,10 @@ % You just need to copy this code and paste it in your paper anywhere % before \verb|\maketitle|. % +% CCS Concepts and user-defined keywords are required for all articles +% over two pages in length, and are optional for one- and two-page +% articles (or abstracts). +% % \DescribeMacro{\setcopyright} % There are several possibilities for the copyright of the papers % published by the ACM: the authors may transfer the rights to the ACM, @@ -1068,6 +1075,11 @@ % default settings. Setting |authorsperrow| to $0$ will revert it to the % default settings. % +% The parameter |printacmref| specifies whether to print the ACM +% bibliographic entry (default), or not. Note that this entry is +% required for all articles over one page in length, and is optional +% for one-page articles (abstracts). +% % \begin{table} % \centering % \caption{Settings for the \cs{settopmatter} command} @@ -1830,7 +1842,7 @@ \ProvidesFile{acmart.dtx} %</gobble> %<class>\ProvidesClass{acmart} -[2019/10/19 v1.65 Typesetting articles for the Association for Computing Machinery] +[2019/12/18 v1.66 Typesetting articles for the Association for Computing Machinery] % \end{macrocode} % % \changes{v1.00}{2016/04/14}{First released version} @@ -1925,7 +1937,12 @@ % \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} -% \changes{1.65}{2019/10/19}{New journal: DGOV} +% \changes{1.65}{2019/10/19}{New journal: DGOV} +% \changes{1.66}{2019/12/18}{ACM reference format is now mandatory for +% papers over one page; CCS concepts and keywords are now mandatory for +% papers over two pages} +% \changes{1.66}{2019/12/18}{Authors' addresses are mandatory for +% journal articles} % % And the driver code: % \begin{macrocode} @@ -3176,7 +3193,10 @@ \ClassWarningNoLine{\@classname}{Some images may lack descriptions}\fi} % \end{macrocode} % -% Hooks for figures and tables +% Hooks for figures and tables. We also patch |algorithm| and +% |algorithm*| in case somebody uses them. +% \changes{v1.66}{2019/11/23}{Patching algorithm and algorithm* +% to prevent spurious space warnings} % \begin{macrocode} \AtBeginEnvironment{figure}{\@Description@presentfalse \let\@vspace\@vspace@orig @@ -3194,6 +3214,11 @@ \let\@vspacer\@vspacer@orig} \AtBeginEnvironment{table*}{\let\@vspace\@vspace@orig \let\@vspacer\@vspacer@orig} +\AtBeginEnvironment{algorithm}{\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig} +\AtBeginEnvironment{algorithm*}{\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig} + % \end{macrocode} % % @@ -4388,9 +4413,18 @@ % sense to keep them for compatibility. % \begin{macrocode} \def\keywords#1{\def\@keywords{#1}} -\keywords{} +\let\@keywords\@empty % \end{macrocode} % +% \changes{1.66}{2019/12/18}{Added warning for missing keywords} +% \begin{macrocode} +\AtEndDocument{\if@ACM@nonacm\else\ifx\@keywords\@empty + \ifnum\getrefnumber{TotPages}>2\relax + \ClassWarningNoLine{\@classname}{ACM keywords are mandatory + for papers over two pages}% + \fi\fi\fi} +% \end{macrocode} +% % \end{macro} % % @@ -4448,6 +4482,15 @@ \fi}{\ClassError{\@classname}{The option printacmref can be either true or false}} % \end{macrocode} % +% \changes{1.66}{2019/12/18}{Added warning for longer papers} +% \begin{macrocode} +\AtEndDocument{\if@ACM@nonacm\else\if@ACM@printacmref\else + \ifnum\getrefnumber{TotPages}>1\relax + \ClassWarningNoLine{\@classname}{ACM reference format is mandatory + for papers over one page}% + \fi\fi\fi} +% \end{macrocode} +% % \end{macro} % % \begin{macro}{\if@ACM@printfolios} @@ -4598,6 +4641,14 @@ \ccsdesc@parse@finish} % \end{macrocode} % +% \changes{1.66}{2019/12/18}{Added warning for missing concepts} +% \begin{macrocode} +\AtEndDocument{\if@ACM@nonacm\else\ifx\@concepts\@empty\relax + \ifnum\getrefnumber{TotPages}>2\relax + \ClassWarningNoLine{\@classname}{CCS concepts are mandatory + for papers over two pages}% + \fi\fi\fi} +% \end{macrocode} % \end{macro} % % \begin{macro}{\ccdesc@parse@finish} @@ -4818,10 +4869,10 @@ source. \or % usgovmixed ACM acknowledges that this contribution was authored or co-authored - by an employee, contractor, or affiliate of the United States government. As such, - the United States government retains a nonexclusive, royalty-free right to - publish or reproduce this article, or to allow others to do so, for - government purposes only. + by an employee, contractor, or affiliate of the United States + government. As such, the United States government retains a + nonexclusive, royalty-free right to publish or reproduce this + article, or to allow others to do so, for government purposes only. \or % cagov This article was authored by employees of the Government of Canada. As such, the Canadian government retains all interest in the @@ -5142,9 +5193,13 @@ % \end{macro} % % \begin{macro}{\@specialsection} +% \changes{v1.66}{2019/11/23}{Suppress warnings about \cs{vspace}} % This macro starts sections for proceedings and uses \cs{small} for journals % \begin{macrocode} \def\@specialsection#1{% + \bgroup + \let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig \ifcase\ACM@format@nr \relax % manuscript \par\medskip\small\noindent#1: % @@ -5164,7 +5219,8 @@ \section*{#1}% \or % sigchi-a \section*{#1}% - \fi} + \fi + \egroup} % \end{macrocode} % % \end{macro} @@ -5858,6 +5914,14 @@ \egroup} % \end{macrocode} % +% \changes{1.66}{2019/12/18}{Added warning for missing addresses} +% \begin{macrocode} +\AtEndDocument{\if@ACM@nonacm\else\if@ACM@journal + \ifx\@authorsaddresses\@empty + \ClassWarningNoLine{\@classname}{Authors' + addresses are mandatory for ACM journals}% + \fi\fi\fi} +% \end{macrocode} % \end{macro} % % \begin{macro}{\@setaddresses} diff --git a/macros/latex/contrib/acmart/acmart.pdf b/macros/latex/contrib/acmart/acmart.pdf Binary files differindex cb7692acaa..2a7be30a71 100644 --- a/macros/latex/contrib/acmart/acmart.pdf +++ b/macros/latex/contrib/acmart/acmart.pdf diff --git a/macros/latex/contrib/acmart/acmguide.pdf b/macros/latex/contrib/acmart/acmguide.pdf Binary files differindex 676c8c6685..c08c969b99 100644 --- a/macros/latex/contrib/acmart/acmguide.pdf +++ b/macros/latex/contrib/acmart/acmguide.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf Binary files differindex 32e5fdec81..c098d6a475 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf Binary files differindex 09f48e1bad..3bf3d2f13c 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf Binary files differindex 0691f8a8d7..ecc270129e 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf Binary files differindex a37a06ed46..72a1ddd7bb 100644 --- a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf +++ b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-authordraft.pdf b/macros/latex/contrib/acmart/samples/sample-authordraft.pdf Binary files differindex c4bbd91be8..8700c317c3 100644 --- a/macros/latex/contrib/acmart/samples/sample-authordraft.pdf +++ b/macros/latex/contrib/acmart/samples/sample-authordraft.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf Binary files differindex c76f7bfb14..203849fb0e 100644 --- a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf +++ b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-sigchi-a.pdf b/macros/latex/contrib/acmart/samples/sample-sigchi-a.pdf Binary files differindex 2929850592..0c28d1a751 100644 --- a/macros/latex/contrib/acmart/samples/sample-sigchi-a.pdf +++ b/macros/latex/contrib/acmart/samples/sample-sigchi-a.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-sigchi.pdf b/macros/latex/contrib/acmart/samples/sample-sigchi.pdf Binary files differindex 03d4610cbf..4836f34d7a 100644 --- a/macros/latex/contrib/acmart/samples/sample-sigchi.pdf +++ b/macros/latex/contrib/acmart/samples/sample-sigchi.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf Binary files differindex 7865e94acb..73b32227e8 100644 --- a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf +++ b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf Binary files differindex 60216788d3..a9275d405d 100644 --- a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf +++ b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf diff --git a/macros/latex/contrib/acmart/samples/sample-xelatex.pdf b/macros/latex/contrib/acmart/samples/sample-xelatex.pdf Binary files differindex 18d011a875..5dcd47755b 100644 --- a/macros/latex/contrib/acmart/samples/sample-xelatex.pdf +++ b/macros/latex/contrib/acmart/samples/sample-xelatex.pdf diff --git a/macros/latex/contrib/acmart/samples/samples.dtx b/macros/latex/contrib/acmart/samples/samples.dtx index a93e1f1d10..33b67895bd 100644 --- a/macros/latex/contrib/acmart/samples/samples.dtx +++ b/macros/latex/contrib/acmart/samples/samples.dtx @@ -390,6 +390,8 @@ The article template's documentation, available at complete explanation of these commands and tips for their effective use. +Note that authors' addresses are mandatory for journal articles. + \section{Rights Information} Authors of any work published by ACM will need to complete a rights @@ -413,6 +415,9 @@ Rights information is unique to the work; if you are preparing several works for an event, make sure to use the correct set of commands with each of the works. +The ACM Reference Format text is required for all articles over one +page in length, and is optional for one-page articles (abstracts). + \section{CCS Concepts and User-Defined Keywords} Two elements of the ``acmart'' document class provide powerful @@ -430,8 +435,9 @@ User-defined keywords are a comma-separated list of words and phrases of the authors' choosing, providing a more flexible way of describing the research being presented. -CCS concepts and user-defined keywords are required for all short- and -full-length articles, and optional for two-page abstracts. +CCS concepts and user-defined keywords are required for for all +articles over two pages in length, and are optional for one- and +two-page articles (or abstracts). \section{Sectioning Commands} diff --git a/macros/latex/contrib/kvdefinekeys/kvdefinekeys.dtx b/macros/latex/contrib/kvdefinekeys/kvdefinekeys.dtx index 11810e3324..3ff9036f4b 100644 --- a/macros/latex/contrib/kvdefinekeys/kvdefinekeys.dtx +++ b/macros/latex/contrib/kvdefinekeys/kvdefinekeys.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % % File: kvdefinekeys.dtx -% Version: 2019/12/15 v1.5 +% Version: 2019-12-19 v1.6 % Info: Define keys % % Copyright (C) @@ -83,7 +83,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: kvdefinekeys 2019/12/15 v1.5 Define keys (HO)} +\Msg{* Package: kvdefinekeys 2019-12-19 v1.6 Define keys (HO)} \Msg{************************************************************************} \keepsilent @@ -95,7 +95,7 @@ This is a generated file. Project: kvdefinekeys -Version: 2019/12/15 v1.5 +Version: 2019-12-19 v1.6 Copyright (C) 2010, 2011 Heiko Oberdiek @@ -160,7 +160,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{kvdefinekeys.drv}% - [2019/12/15 v1.5 Define keys (HO)]% + [2019-12-19 v1.6 Define keys (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \begin{document} @@ -174,7 +174,7 @@ and the derived files % \GetFileInfo{kvdefinekeys.drv} % % \title{The \xpackage{kvdefinekeys} package} -% \date{2019/12/15 v1.5} +% \date{2019-12-19 v1.6} % \author{Heiko Oberdiek\thanks % {Please report any issues at \url{https://github.com/ho-tex/kvdefinekeys/issues}}} % @@ -293,7 +293,7 @@ and the derived files \fi \expandafter\x\csname ver@kvdefinekeys.sty\endcsname \ProvidesPackage{kvdefinekeys}% - [2019/12/15 v1.5 Define keys (HO)]% + [2019-12-19 v1.6 Define keys (HO)]% % \end{macrocode} % % \begin{macrocode} @@ -385,11 +385,10 @@ and the derived files % \begin{macro}{\KVD@DefineKey} % \begin{macrocode} \def\KVD@DefineKey#1#2{% - \@ifnextchar[\@firstoftwo\@secondoftwo{% - \KVD@DefineKeyWithDefault{#1}{#2}% - }{% - \long\expandafter\def\csname KV@#1@#2\endcsname##1% - }% + \begingroup + \toks\z@{\endgroup\KVD@DefineKeyWithDefault{#1}{#2}}% + \toks\tw@{\endgroup\long\expandafter\def\csname KV@#1@#2\endcsname##1}% + \@ifnextchar[{\the\toks\z@}{\the\toks\tw@}% } % \end{macrocode} % \end{macro} @@ -604,6 +603,9 @@ and the derived files % \item % Documentation updates. % \end{Version} +% \begin{Version}{2019-12-19 v1.6} +% \item Fix definition of \cs{KVD@DefineKey} for gh issue embedfile/2 +% \end{Version} % \end{History} % % \PrintIndex diff --git a/macros/latex/contrib/kvdefinekeys/kvdefinekeys.pdf b/macros/latex/contrib/kvdefinekeys/kvdefinekeys.pdf Binary files differindex 5006be590c..6a6146ab15 100644 --- a/macros/latex/contrib/kvdefinekeys/kvdefinekeys.pdf +++ b/macros/latex/contrib/kvdefinekeys/kvdefinekeys.pdf |