From 475394d90803cb2cf33bfae1be2e0f69db6727ec Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 8 Apr 2018 20:05:34 +0000 Subject: acmart (8apr18) git-svn-id: svn://tug.org/texlive/trunk@47378 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/acmart/acmart.dtx | 68 +++++++++++++++--------- 1 file changed, 43 insertions(+), 25 deletions(-) (limited to 'Master/texmf-dist/source/latex/acmart') diff --git a/Master/texmf-dist/source/latex/acmart/acmart.dtx b/Master/texmf-dist/source/latex/acmart/acmart.dtx index b2dc5cae34c..e6752ff6f86 100644 --- a/Master/texmf-dist/source/latex/acmart/acmart.dtx +++ b/Master/texmf-dist/source/latex/acmart/acmart.dtx @@ -101,6 +101,7 @@ % Michael D.~Adams, % Leif Andersen, % Dirk Beyer, +% Joachim Breitner, % Benjamin Byholm, % Michael Ekstrand, % Matthew Fluet, @@ -865,9 +866,9 @@ % \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. Also, the +% set to |usgov|, |rightsretained|, |iw3c2w3|, or |iw3c2w3g|, when it +% is suppressed. Note that to override the defaults you need to set +% the price \emph{after} the \cs{setcopyright} command. Also, the % command |\acmPrice{}| suppresses the printing of the price. % % \DescribeMacro{\acmISBN}% @@ -998,7 +999,7 @@ % \texttt{acmcopyright} & The authors transfer the copyright to the % ACM (the ``traditional'' choice).\\ % \texttt{acmlicensed} & The authors retain the copyright but -% license the publication rights to the ACM\@. \\ +% license the publication rights to ACM\@. \\ % \texttt{rightsretained} & The authors retain the copyright and % publication rights to themselves or somebody else. \\ % \texttt{usgov} & All the authors are employees of the US @@ -1010,17 +1011,17 @@ % \texttt{cagovmixed} & Some authors are employees of the Canadian % government. \\ % \texttt{licensedusgovmixed} & Some authors are employees of the US -% government, and the publication rights are licensed to the ACM\@. \\ +% government, and the publication rights are licensed to ACM\@. \\ % \texttt{licensedcagov} & All the authors are employees of the Canadian -% government, and the publication rights are licensed to the ACM\@. \\ +% government, and the publication rights are licensed to ACM\@. \\ % \texttt{licensedcagovmixed} & Some authors are employees of the % Canadian -% government, and the publication rights are licensed to the ACM\@. \\ +% government, and the publication rights are licensed to ACM\@. \\ % \texttt{othergov} & Authors are employees of a % government other than the US or Canada. \\ % \texttt{licensedothergov} & Authors are employees of a % government other than the US or Canada, and the publication rights -% are licensed to the ACM\@. \\ +% are licensed to ACM\@. \\ % \texttt{iw3c2w3} & Special statement for conferences organized % by IW3C2.\\ % \texttt{iw3c2w3g} & Special statement for conferences organized @@ -1671,7 +1672,7 @@ \ProvidesFile{acmart.dtx} % %\ProvidesClass{acmart} -[2018/02/07 v1.50 Typesetting articles for the Association for +[2018/04/05 v1.51 Typesetting articles for the Association for Computing Machinery] % \end{macrocode} % @@ -2820,13 +2821,20 @@ Computing Machinery] % 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)} % We use Libertine throughout. % \begin{macrocode} \if@ACM@newfonts -\RequirePackage[tt=false, type1=true]{libertine} +\ifxetex + \RequirePackage[tt=false]{libertine} +\else + \RequirePackage[tt=false, type1=true]{libertine} +\fi \RequirePackage[varqu]{zi4} \RequirePackage[libertine]{newtxmath} -\RequirePackage[T1]{fontenc} +\ifxetex\else + \RequirePackage[T1]{fontenc} +\fi \fi % \end{macrocode} % @@ -4196,6 +4204,9 @@ Computing Machinery] % \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} +% \changes{v1.51}{2018/04/05}{Suppress price if the copyright is set +% to iw3c2w3 or iw3c2w3g} +% \changes{v1.51}{2018/04/05}{Corrected the bug with price suppression} % Keys: % \begin{macrocode} \define@choicekey*{ACM@}{acmcopyrightmode}[% @@ -4217,13 +4228,13 @@ Computing Machinery] \fi \ifnum\acm@copyrightmode=3\relax % rightsretained \@acmownedfalse - \acmPrice{}% + \AtBeginDocument{\acmPrice{}}% \fi \ifnum\acm@copyrightmode=4\relax % usgov \@printpermissiontrue \@printcopyrightfalse \@acmownedfalse - \acmPrice{}% + \AtBeginDocument{\acmPrice{}}% \fi \ifnum\acm@copyrightmode=6\relax % cagov \@acmownedfalse @@ -4245,9 +4256,11 @@ Computing Machinery] \fi \ifnum\acm@copyrightmode=13\relax % iw3c2w3 \@acmownedfalse + \AtBeginDocument{\acmPrice{}}% \fi \ifnum\acm@copyrightmode=14\relax % iw3c2w3g \@acmownedfalse + \AtBeginDocument{\acmPrice{}}% \fi} % \end{macrocode} % @@ -4271,7 +4284,7 @@ Computing Machinery] Association for Computing Machinery. \or % acmlicensed Copyright held by the owner/author(s). Publication rights licensed to - the Association for Computing Machinery. + ACM\@. \or % rightsretained Copyright held by the owner/author(s). \or % usgov @@ -4283,18 +4296,18 @@ Computing Machinery] Association for Computing Machinery. \or %licensedusgovmixed Copyright held by the owner/author(s). Publication rights licensed to - the Association for Computing Machinery. + ACM\@. \or % licensedcagov Crown in Right of Canada. Publication rights licensed to - the Association for Computing Machinery. + ACM\@. \or %licensedcagovmixed Copyright held by the owner/author(s). Publication rights licensed to - the Association for Computing Machinery. + ACM\@. \or % othergov Association for Computing Machinery. \or % licensedothergov Copyright held by the owner/author(s). Publication rights licensed to - the Association for Computing Machinery. + ACM\@. \or % ic2w3www IW3C2 (International World Wide Web Conference Committee), published under Creative Commons CC~BY~4.0 License. @@ -5647,6 +5660,8 @@ Computing Machinery] % \changes{v1.33}{2017/03/10}{Added timestamp (Michael D.~Adams)} % \changes{v1.33}{2017/03/29}{Added right linecount for two-column formats} % The page style for all pages but the first one +% \changes{v1.51}{2018/04/05}{We now use journal abbreviation for footers} +% The page style for all pages but the first one % \begin{macrocode} \fancypagestyle{standardpagestyle}{% \fancyhf{}% @@ -5664,7 +5679,7 @@ Computing Machinery] \fancyhead[RO]{\@headfootfont\@acmArticle\if@ACM@printfolios:\thepage\fi}% \fancyhead[RE]{\@headfootfont\@shortauthors}% \fancyhead[LO]{\ACM@linecountL\@headfootfont\shorttitle}% - \fancyfoot[RO,LE]{\footnotesize \@journalName, Vol. \@acmVolume, No. + \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No. \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}% \or % acmlarge \fancyhead[LE]{\ACM@linecountL\@headfootfont @@ -5672,7 +5687,7 @@ Computing Machinery] \fancyhead[LO]{\ACM@linecountL}% \fancyhead[RO]{\@headfootfont \shorttitle\quad\textbullet\quad\@acmArticle\if@ACM@printfolios:\thepage\fi}% - \fancyfoot[RO,LE]{\footnotesize \@journalName, Vol. \@acmVolume, No. + \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No. \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}% \or % acmtog \fancyhead[LE]{\ACM@linecountL\@headfootfont @@ -5681,7 +5696,7 @@ Computing Machinery] \fancyhead[RE]{\ACM@linecountR}% \fancyhead[RO]{\@headfootfont \shorttitle\quad\textbullet\quad\@acmArticle\if@ACM@printfolios:\thepage\fi\ACM@linecountR}% - \fancyfoot[RO,LE]{\footnotesize \@journalName, Vol. \@acmVolume, No. + \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No. \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}% \else % Proceedings \fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}% @@ -5776,7 +5791,10 @@ Computing Machinery] % % \begin{macro}{firstpagestyle} % \changes{v1.33}{2017/03/10}{Added timestamp (Michael D.~Adams)} -% \changes{v1.33}{2017/03/29}{Added right linecount for two-column formats} +% \changes{v1.33}{2017/03/29}{Added right linecount for two-column +% formats} +% \changes{v1.51}{2018/04/05}{We now use journal abbreviation for +% footers} % The page style for the first page only. % \begin{macrocode} \fancypagestyle{firstpagestyle}{% @@ -5789,7 +5807,7 @@ Computing Machinery] \fancyfoot[RO,LE]{\if@ACM@printfolios\small\thepage\fi}% \fancyfoot[RE,LO]{\footnotesize Manuscript submitted to ACM}% \or % acmsmall - \fancyfoot[RO,LE]{\footnotesize \@journalName, Vol. \@acmVolume, No. + \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No. \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}% \fancyhead[LE]{\ACM@linecountL\@folioblob}% @@ -5797,7 +5815,7 @@ Computing Machinery] \fancyhead[RO]{\@folioblob}% \fancyheadoffset[RO,LE]{0.6\@folio@wd}% \or % acmlarge - \fancyfoot[RO,LE]{\footnotesize \@journalName, Vol. \@acmVolume, No. + \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No. \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}% \fancyhead[RO]{\@folioblob}% @@ -5805,7 +5823,7 @@ Computing Machinery] \fancyhead[LO]{\ACM@linecountL}% \fancyheadoffset[RO,LE]{1.4\@folio@wd}% \or % acmtog - \fancyfoot[RO,LE]{\footnotesize \@journalName, Vol. \@acmVolume, No. + \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No. \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}% \fancyhead[L]{\ACM@linecountL}% -- cgit v1.2.3