From b84f33e7d31e7a93ab4197d49c64036eff027dcf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 24 Apr 2017 21:25:47 +0000 Subject: acmart (24apr17) git-svn-id: svn://tug.org/texlive/trunk@44022 c570f23f-e606-0410-a88d-b1316a301751 --- .../bibtex/bst/acmart/ACM-Reference-Format.bst | 4 ++-- Master/texmf-dist/doc/latex/acmart/README | 7 ++++++- Master/texmf-dist/doc/latex/acmart/acmart.pdf | Bin 733297 -> 734448 bytes Master/texmf-dist/doc/latex/acmart/acmguide.pdf | Bin 442689 -> 443322 bytes .../doc/latex/acmart/sample-acmlarge.pdf | Bin 616855 -> 616855 bytes .../doc/latex/acmart/sample-acmsmall.pdf | Bin 631614 -> 631614 bytes .../texmf-dist/doc/latex/acmart/sample-acmtog.pdf | Bin 591639 -> 593737 bytes .../texmf-dist/doc/latex/acmart/sample-acmtog.tex | 4 ++++ .../doc/latex/acmart/sample-manuscript.pdf | Bin 652784 -> 652787 bytes .../doc/latex/acmart/sample-sigchi-a.pdf | Bin 1301098 -> 1301096 bytes .../texmf-dist/doc/latex/acmart/sample-sigchi.pdf | Bin 1086557 -> 1086557 bytes .../latex/acmart/sample-sigconf-authordraft.pdf | Bin 634798 -> 634804 bytes .../texmf-dist/doc/latex/acmart/sample-sigconf.pdf | Bin 630588 -> 630588 bytes .../texmf-dist/doc/latex/acmart/sample-sigplan.pdf | Bin 978079 -> 978079 bytes Master/texmf-dist/source/latex/acmart/acmart.dtx | 22 +++++++++++++++------ Master/texmf-dist/tex/latex/acmart/acmart.cls | 10 ++++++---- 16 files changed, 34 insertions(+), 13 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst b/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst index 088f2389d9d..033f0c862e2 100644 --- a/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst +++ b/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst @@ -1176,7 +1176,7 @@ FUNCTION { format.names } { "," * } 'skip$ if$ - t "{\sc others}" = + t "\bibinfo{person}{others}" = { " {et~al\mbox{.}}" * } % jrh: avoid spacing problems { " {and} " * t * } % from Chicago Manual of Style if$ @@ -1249,7 +1249,7 @@ FUNCTION { format.names.fml } { "," * } 'skip$ if$ - t "{others}" = + t "\bibinfo{person}{others}" = { " {et~al\mbox{.}}" * } { " {and} " * t * } if$ diff --git a/Master/texmf-dist/doc/latex/acmart/README b/Master/texmf-dist/doc/latex/acmart/README index 8a784a4e224..3ab41c7c3bb 100644 --- a/Master/texmf-dist/doc/latex/acmart/README +++ b/Master/texmf-dist/doc/latex/acmart/README @@ -98,4 +98,9 @@ version 1.33 New option `timestamp' (Michael D. Adams) version 1.34 Deleted DOI from doi numbers Changed bibstrip formatting The command \terms is now obsolete - The rulers in review mode now have continuous numbering \ No newline at end of file + The rulers in review mode now have continuous numbering + +version 1.35 Author-year bib style now uses square brackets. + Changed defaults for TOG sample + Price is suppressed for usgov and rightsretained modes. + Bugs fixed \ 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 9a1deffa54d..42ad0eba1e6 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 2b0660c1f7d..12e66490db0 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/sample-acmlarge.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf index bb704b4fedf..f37be207a18 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf and b/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf index 69c39db4c44..4acb4ecaf89 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf and b/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf index e5217270986..62d2cb6aeca 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf and b/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmtog.tex b/Master/texmf-dist/doc/latex/acmart/sample-acmtog.tex index e71a1828e45..b029f726e34 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-acmtog.tex +++ b/Master/texmf-dist/doc/latex/acmart/sample-acmtog.tex @@ -2,6 +2,10 @@ \usepackage{booktabs} % For formal tables +% TOG prefers author-name bib system with square brackets +\citestyle{acmauthoryear} +\setcitestyle{square} + \usepackage[ruled]{algorithm2e} % For algorithms \renewcommand{\algorithmcfname}{ALGORITHM} diff --git a/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf b/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf index e12f16ed8b2..994622a90f4 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf and b/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf index ea917e81432..6184befd46a 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf and b/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf index 9f3cd23eb26..bdc3d72e2f2 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf and b/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.pdf index 686b8b1632a..f5a507ca193 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.pdf and b/Master/texmf-dist/doc/latex/acmart/sample-sigconf-authordraft.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf index ffb3d1cee24..f18ab4fcbb8 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf and b/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf index 2e9d79c96bc..33513f55761 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf and b/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf differ diff --git a/Master/texmf-dist/source/latex/acmart/acmart.dtx b/Master/texmf-dist/source/latex/acmart/acmart.dtx index ef206e62577..76b80c798c4 100644 --- a/Master/texmf-dist/source/latex/acmart/acmart.dtx +++ b/Master/texmf-dist/source/latex/acmart/acmart.dtx @@ -765,11 +765,15 @@ % % \DescribeMacro{\acmPrice}% % The macro \cs{acmPrice}\marg{price} sets the price for the article -% (by default 15.00), for example, % \begin{verbatim} % \acmPrice{25.00} % \end{verbatim} -% +% Note that you do not need to put the dollar sign here, just the +% amount. By default the price is \$15.00, unless the copyright is +% set to |usgov| or |rightsretained|, when it is suppressed Note that to +% override the defaults you need to set the price \emph{after} the +% \cs{setcopyright} command to override the default. Also, the +% command |\acmPrice{}| suppresses the printing of the price. % % \DescribeMacro{\acmISBN}% % Book-like volumes have ISBN numbers attached to them. The macro @@ -1505,7 +1509,7 @@ \ProvidesFile{acmart.dtx} % %\ProvidesClass{acmart} -[2017/04/09 v1.34 Typesetting articles for Association of +[2017/04/23 v1.35 Typesetting articles for Association of Computing Machinery] % \end{macrocode} % @@ -1557,6 +1561,7 @@ Computing Machinery] % \changes{v1.33}{2017/03/18}{BibTeX numpages bug corrected} % \changes{v1.33}{2017/03/28}{Added acmart-preload-hook} % \changes{v1.33}{2017/03/33}{Documentation updates} +% \changes{v1.35}{2017/04/23}{BibTeX bug fixed: et al.} % % % And the driver code: @@ -1989,12 +1994,13 @@ Computing Machinery] % \changes{v1.13}{2016/06/06}{Added macro} % \changes{v1.14}{2016/06/09}{Moved def of \cs{bibstyle@acmauthoryear} % before use} +% \changes{v1.35}{2017/04/13}{Square brackets for author-year style} % The default author-year format: % \begin{macrocode} \newcommand{\bibstyle@acmauthoryear}{% \setcitestyle{% authoryear,% - open={(},close={)},citesep={;},% + open={[},close={]},citesep={;},% aysep={},yysep={,},% notesep={, }}} % \end{macrocode} @@ -3694,6 +3700,8 @@ Computing Machinery] % \end{macro} % % \changes{v1.10}{2016/05/22}{Changes of `licensedothergov' wording} +% \changes{v1.35}{2017/04/22}{If the copyright is set to usgov or +% rigtsretained, the price is suppressed} % Keys: % \begin{macrocode} \define@choicekey*{ACM@}{acmcopyrightmode}[% @@ -3713,11 +3721,13 @@ Computing Machinery] \fi \ifnum\acm@copyrightmode=3\relax % rightsretained \@acmownedfalse + \acmPrice{}% \fi \ifnum\acm@copyrightmode=4\relax % usgov \@printpermissiontrue \@printcopyrightfalse \@acmownedfalse + \acmPrice{}% \fi \ifnum\acm@copyrightmode=6\relax % cagov \@acmownedfalse @@ -4059,8 +4069,8 @@ Computing Machinery] \fi\\ \else \if@ACM@journal - \@permissionCodeOne/\@acmYear/\@acmMonth-ART\@acmArticle\ - \$\@acmPrice\\ + \@permissionCodeOne/\@acmYear/\@acmMonth-ART\@acmArticle + \ifx\@acmPrice\@empty\else\ \$\@acmPrice\fi\\ \@formatdoi{\@acmDOI}% \else % Conference ACM~ISBN~\@acmISBN diff --git a/Master/texmf-dist/tex/latex/acmart/acmart.cls b/Master/texmf-dist/tex/latex/acmart/acmart.cls index bc54fd505de..7557fe327b9 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} -[2017/04/09 v1.34 Typesetting articles for Association of +[2017/04/23 v1.35 Typesetting articles for Association of Computing Machinery] \def\@classname{acmart} \InputIfFileExists{acmart-preload-hook.tex}{% @@ -278,7 +278,7 @@ Computing Machinery] \newcommand{\bibstyle@acmauthoryear}{% \setcitestyle{% authoryear,% - open={(},close={)},citesep={;},% + open={[},close={]},citesep={;},% aysep={},yysep={,},% notesep={, }}} \newcommand{\bibstyle@acmnumeric}{% @@ -1203,11 +1203,13 @@ Computing Machinery] \fi \ifnum\acm@copyrightmode=3\relax % rightsretained \@acmownedfalse + \acmPrice{}% \fi \ifnum\acm@copyrightmode=4\relax % usgov \@printpermissiontrue \@printcopyrightfalse \@acmownedfalse + \acmPrice{}% \fi \ifnum\acm@copyrightmode=6\relax % cagov \@acmownedfalse @@ -1440,8 +1442,8 @@ Computing Machinery] \fi\\ \else \if@ACM@journal - \@permissionCodeOne/\@acmYear/\@acmMonth-ART\@acmArticle\ - \$\@acmPrice\\ + \@permissionCodeOne/\@acmYear/\@acmMonth-ART\@acmArticle + \ifx\@acmPrice\@empty\else\ \$\@acmPrice\fi\\ \@formatdoi{\@acmDOI}% \else % Conference ACM~ISBN~\@acmISBN -- cgit v1.2.3