diff options
Diffstat (limited to 'macros/latex/contrib/acmart')
19 files changed, 122 insertions, 66 deletions
diff --git a/macros/latex/contrib/acmart/ACM-Reference-Format.bst b/macros/latex/contrib/acmart/ACM-Reference-Format.bst index fa5273282a..8b97b18812 100644 --- a/macros/latex/contrib/acmart/ACM-Reference-Format.bst +++ b/macros/latex/contrib/acmart/ACM-Reference-Format.bst @@ -426,6 +426,44 @@ FUNCTION { output.coden } % UTAH if$ } +% +% Sometimes articleno starts with the word 'Article' or 'Paper. +% (this is a bug of acmdl, sigh) +% We strip them. We assume eid or articleno is already on stack +% + +FUNCTION { strip.articleno.or.eid } +{ + 't := + t #1 #7 substring$ "Article" = + {t #8 t text.length$ substring$ 't :=} + { } + if$ + t #1 #7 substring$ "article" = + {t #8 t text.length$ substring$ 't :=} + { } + if$ + t #1 #5 substring$ "Paper" = + {t #6 t text.length$ substring$ 't :=} + { } + if$ + t #1 #5 substring$ "paper" = + {t #6 t text.length$ substring$ 't :=} + { } + if$ + % Strip any left trailing space or ~ + t #1 #1 substring$ " " = + {t #2 t text.length$ substring$ 't :=} + { } + if$ + t #1 #1 substring$ "~" = + {t #2 t text.length$ substring$ 't :=} + { } + if$ + t +} + + FUNCTION { format.articleno } { articleno empty.or.unknown not eid empty.or.unknown not and @@ -441,8 +479,8 @@ FUNCTION { format.articleno } { } if$ eid empty.or.unknown - { "Article \bibinfo{articleno}{" articleno * "}" * } - { "Article \bibinfo{articleno}{" eid * "}" * } + { "Article \bibinfo{articleno}{" articleno strip.articleno.or.eid * "}" * } + { "Article \bibinfo{articleno}{" eid strip.articleno.or.eid * "}" * } if$ } if$ diff --git a/macros/latex/contrib/acmart/Makefile b/macros/latex/contrib/acmart/Makefile index 96f5db4e8e..68e33d0437 100644 --- a/macros/latex/contrib/acmart/Makefile +++ b/macros/latex/contrib/acmart/Makefile @@ -51,20 +51,20 @@ samples/$(PACKAGE).cls: $(PACKAGE).cls samples/ACM-Reference-Format.bst: ACM-Reference-Format.bst samples/%.pdf: samples/%.tex samples/$(PACKAGE).cls samples/ACM-Reference-Format.bst - cd $(dir $@) && pdflatex $(notdir $<) + cd $(dir $@) && pdflatex-dev $(notdir $<) - cd $(dir $@) && bibtex $(notdir $(basename $<)) - cd $(dir $@) && pdflatex $(notdir $<) - cd $(dir $@) && pdflatex $(notdir $<) + cd $(dir $@) && pdflatex-dev $(notdir $<) + cd $(dir $@) && pdflatex-dev $(notdir $<) while ( grep -q '^LaTeX Warning: Label(s) may have changed' $(basename $<).log) \ - do cd $(dir $@) && pdflatex $(notdir $<); done + do cd $(dir $@) && pdflatex-dev $(notdir $<); done samples/sample-xelatex.pdf: samples/sample-xelatex.tex samples/$(PACKAGE).cls samples/ACM-Reference-Format.bst - cd $(dir $@) && xelatex $(notdir $<) + cd $(dir $@) && xelatex-dev $(notdir $<) - cd $(dir $@) && bibtex $(notdir $(basename $<)) - cd $(dir $@) && xelatex $(notdir $<) - cd $(dir $@) && xelatex $(notdir $<) + cd $(dir $@) && xelatex-dev $(notdir $<) + cd $(dir $@) && xelatex-dev $(notdir $<) while ( grep -q '^LaTeX Warning: Label(s) may have changed' $(basename $<).log) \ - do cd $(dir $@) && xelatex $(notdir $<); done + do cd $(dir $@) && xelatex-dev $(notdir $<); done diff --git a/macros/latex/contrib/acmart/README b/macros/latex/contrib/acmart/README index 8e584fcc3c..c0781d2b64 100644 --- a/macros/latex/contrib/acmart/README +++ b/macros/latex/contrib/acmart/README @@ -252,3 +252,10 @@ Version 1.66 Bug fixes Version 1.67 Urgent bug fixes: BibTeX style bug fixed (Michael D. Adams) Sigplan special section bugfix + +Version 1.68 Bug fixes + BST now recognizes words `Paper' or 'Article' in + eid or articleno + +Version 1.69 Bug fixes + Compatibility with LaTeX 2020-02-02 release diff --git a/macros/latex/contrib/acmart/acmart.dtx b/macros/latex/contrib/acmart/acmart.dtx index d63df04341..389e3e6e35 100644 --- a/macros/latex/contrib/acmart/acmart.dtx +++ b/macros/latex/contrib/acmart/acmart.dtx @@ -1842,7 +1842,7 @@ \ProvidesFile{acmart.dtx} %</gobble> %<class>\ProvidesClass{acmart} -[2020/01/11 v1.67 Typesetting articles for the Association for Computing Machinery] +[2020/02/08 v1.69 Typesetting articles for the Association for Computing Machinery] % \end{macrocode} % % \changes{v1.00}{2016/04/14}{First released version} @@ -4620,10 +4620,11 @@ % \changes{v1.40}{2017/05/27}{Now we can parse |Significance~General| nodes} % \changes{v1.56}{2018/10/23}{End the concepts list with a period % (Philip Quinn)} +% \changes{v1.69}{2019/02/06}{Use math right arrow in text} % The parser of the expression |Significance~General~Specific| (we need % |textcomp| for |\textrightarrow|). Note that |Specific| can be empty! % \begin{macrocode} -\RequirePackage{textcomp} +\def\textrightarrow{$\rightarrow$} \def\ccsdesc@parse#1~#2~#3~{% \stepcounter{@concepts}% \expandafter\ifx\csname CCS@General@#2\endcsname\relax @@ -5202,12 +5203,11 @@ % \changes{v1.66}{2019/11/23}{Suppress warnings about \cs{vspace}} % \changes{v1.67}{2020/01/11}{Paragraph inside group does not print % its argument. Added a bugfix} +% \changes{v1.68}{2020/01/19}{Deleted grouping altogether} +% \changes{v1.69}{2020/02/02}{Changed dot to colon for sigplan} % 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: % @@ -5222,13 +5222,13 @@ \or % siggraph \section*{#1}% \or % sigplan - \noindent\emph{\bfseries#1.}~% + \noindentparagraph*{#1:~}% \or % sigchi \section*{#1}% \or % sigchi-a \section*{#1}% \fi - \egroup} +} % \end{macrocode} % % \end{macro} @@ -6058,13 +6058,16 @@ % \begin{macro}{\@printendtopmatter} % \changes{v1.46}{2017/08/28}{Made it \cs{par}\cs{bigskip} uniformly} % \changes{v1.58}{2019/01/23}{Deleted spurious \cs{vspace} warning} +% \changes{v1.69}{2020/02/02}{Deleted grouping} % End the top matter % \begin{macrocode} -\def\@printendtopmatter{\bgroup +\def\@printendtopmatter{% \let\@vspace\@vspace@orig \let\@vspacer\@vspacer@orig \par\bigskip - \egroup} + \let\@vspace\@vspace@acm + \let\@vspacer\@vspacer@acm + } % \end{macrocode} % % \end{macro} @@ -6164,14 +6167,35 @@ % \begin{macro}{\ACM@linecountR} % \changes{v1.33}{2017/03/29}{Added macro} % \changes{v1.34}{2017/04/10}{Rulers now are continuous} -% How to display the box on the right +% \changes{v1.69}{2020/02/02}{Do not increase numbers in one column format} +% How to display the box on the right. In one column formats we do +% not step the numbers. % \begin{macrocode} \def\ACM@linecountR{% \if@ACM@review - \ACM@mk@linecount - \begin{picture}(0,0)% - \put(20,-22){\usebox{\ACM@linecount@bx}}% - \end{picture}% + \ifcase\ACM@format@nr + \relax % manuscript + \relax + \or % acmsmall + \relax + \or % acmlarge + \relax + \or % acmtog + \ACM@mk@linecount + \or % sigconf + \ACM@mk@linecount + \or % siggraph + \ACM@mk@linecount + \or % sigplan + \ACM@mk@linecount + \or % sigchi + \ACM@mk@linecount + \or % sigchi-a + \ACM@mk@linecount + \fi + \begin{picture}(0,0)% + \put(20,-22){\usebox{\ACM@linecount@bx}}% + \end{picture}% \fi} % \end{macrocode} % @@ -6568,6 +6592,8 @@ % % \changes{v1.54}{2018/05/27}{Deleted indent for subsubsection} % \changes{v1.54}{2018/06/17}{Added Ross's patch for sectioning} +% \changes{v1.68}{2020/01/19}{New command for unindent paras} +% \changes{v1.69}{2020/02/02}{No dots for unindented paragraphs} % Sectioning is different for different levels % \begin{macrocode} \renewcommand\section{\@startsection{section}{1}{\z@}% @@ -6586,6 +6612,10 @@ {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}% {-3.5\p@}% {\ACM@NRadjust{\@parfont\@adddotafter}}} +\newcommand\noindentparagraph{\@startsection{paragraph}{4}{\z@}% + {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}% + {-3.5\p@}% + {\ACM@NRadjust{\@parfont}}} \renewcommand\part{\@startsection{part}{9}{\z@}% {-10\p@ \@plus -4\p@ \@minus -2\p@}% @@ -7070,6 +7100,7 @@ % \changes{v1.57}{2018/12/16}{Added warning} % \changes{v1.58}{2019/01/23}{Preserved old versions as % \cs{@vspace@orig} and \cs{@vspace@orig}} +% \changes{1.69}{2020/02/02}{Added the changed command to avoid grouping} % We do not disable \cs{vspace}, but add warning to it % \begin{macrocode} \let\@vspace@orig=\@vspace @@ -7079,7 +7110,9 @@ objects}}{}{} \apptocmd{\@vspacer}{\ClassWarning{\@classname}{\string\vspace\space should only be used to provide space above/below surrounding - objects}}{}{} + objects}}{}{} +\let\@vspace@acm=\@vspace +\let\@vspacer@acm=\@vspacer % \end{macrocode} % % \end{macro} diff --git a/macros/latex/contrib/acmart/acmart.pdf b/macros/latex/contrib/acmart/acmart.pdf Binary files differindex 29ae3c77c6..f54d34e6e0 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 af84e88ca0..1d7121c44f 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 b825eb8c3c..5a05ff8d3b 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 ea39d42da6..fd0221fe85 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 0f5e101957..bd87b06be8 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 e69c92bd20..c4ed5e87cf 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 baa98ac773..a05f96b441 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-base.bib b/macros/latex/contrib/acmart/samples/sample-base.bib index 48ec212b3f..dde657f885 100644 --- a/macros/latex/contrib/acmart/samples/sample-base.bib +++ b/macros/latex/contrib/acmart/samples/sample-base.bib @@ -215,16 +215,15 @@ author = "Sarah Cohen and Werner Nutt and Yehoshua Sagic", title = "Deciding equivalances among conjunctive aggregate queries", journal = JACM, - articleno = "5", - numpages = "50", - volume = "54", - number = "2", + articleno = 5, + numpages = 50, + volume = 54, + number = 2, month = apr, - year = "2007", + year = 2007, doi = "10.1145/1219092.1219093", url = "http://doi.acm.org/10.1145/1219092.1219093", - acmid = "1219093", - note = "", + acmid = 1219093, } @@ -492,59 +491,38 @@ Editors= "Z. Ghahramani and R. Cowell" @Inproceedings{VanGundy07, author = "Matthew Van Gundy and Davide Balzarotti and Giovanni Vigna", - year = "2007", + year = 2007, title = "Catch me, if you can: Evading network signatures with web-based polymorphic worms", booktitle = "Proceedings of the first USENIX workshop on Offensive Technologies", series = "WOOT '07", publisher = "USENIX Association", address = "Berkley, CA", - articleno = "7", - numpages = "9", - editor = "", - volume = "", - number = "", - pages = "", - month = "", - organization = "", - note = "", + articleno = {Paper 7}, + numpages = 9, } @Inproceedings{VanGundy08, author = "Matthew Van Gundy and Davide Balzarotti and Giovanni Vigna", - year = "2008", + year = 2008, title = "Catch me, if you can: Evading network signatures with web-based polymorphic worms", booktitle = "Proceedings of the first USENIX workshop on Offensive Technologies", series = "WOOT '08", publisher = "USENIX Association", address = "Berkley, CA", - articleno = "7", - numpages = "2", - editor = "", - volume = "", - number = "", + articleno = 7, + numpages = 2, pages = "99-100", - month = "", - organization = "", - note = "", } @Inproceedings{VanGundy09, author = "Matthew Van Gundy and Davide Balzarotti and Giovanni Vigna", - year = "2009", + year = 2009, title = "Catch me, if you can: Evading network signatures with web-based polymorphic worms", booktitle = "Proceedings of the first USENIX workshop on Offensive Technologies", series = "WOOT '09", publisher = "USENIX Association", address = "Berkley, CA", - articleno = "", - numpages = "", - editor = "", - volume = "", - number = "", pages = "90--100", - month = "", - organization = "", - note = "", } @Inproceedings{Andler79, @@ -695,7 +673,7 @@ year = {2003}, volume = "12", number = "3", month = jul, - articleno = "5", + articleno = "Article~5", doi = "", url = "", howpublished = "", @@ -720,14 +698,14 @@ year = {2003}, author = {Werneck, Renato and Setubal, Jo\~{a}o and da Conceic\~{a}o, Arlindo}, title = {(new) Finding minimum congestion spanning trees}, journal = {J. Exp. Algorithmics}, - volume = {5}, + volume = 5, month = dec, - year = {2000}, + year = 2000, issn = {1084-6654}, - articleno = {11}, + articleno = 11, url = {http://portal.acm.org/citation.cfm?id=351827.384253}, doi = {10.1145/351827.384253}, - acmid = {384253}, + acmid = 384253, publisher = {ACM}, address = {New York, NY, USA}, } diff --git a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf Binary files differindex 07669d4ce8..53500a2498 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 940cc553d9..46e9f4c8ab 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 773432ce6d..906f91858e 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 7fbea363fb..592dbb49f5 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 6a29056f3b..f8cf4e026a 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 31f5777864..f7273d8595 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 33b67895bd..0c9e2514bb 100644 --- a/macros/latex/contrib/acmart/samples/samples.dtx +++ b/macros/latex/contrib/acmart/samples/samples.dtx @@ -617,7 +617,7 @@ suffix, of the \BibTeX\ file. Citations and references are numbered by default. A small number of ACM publications have citations and references formatted in the ``author year'' style; for these exceptions, please include this -command in the {\bfseries preamble} (before +command in the {\bfseries preamble} (before the command ``\verb|\begin{document}|'') of your \LaTeX\ source: \begin{verbatim} \citestyle{acmauthoryear} |