From f8b91d888f60b20880a9c0749883747cd913bc3f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 8 Jan 2017 22:21:12 +0000 Subject: acmart (8jan17) git-svn-id: svn://tug.org/texlive/trunk@42900 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/acmart/README | 3 ++ Master/texmf-dist/doc/latex/acmart/acmart.pdf | Bin 682217 -> 683075 bytes .../doc/latex/acmart/sample-acmlarge.pdf | Bin 610281 -> 611863 bytes .../doc/latex/acmart/sample-acmlarge.tex | 2 +- .../doc/latex/acmart/sample-acmsmall.pdf | Bin 625820 -> 627365 bytes .../doc/latex/acmart/sample-acmsmall.tex | 2 +- .../texmf-dist/doc/latex/acmart/sample-acmtog.pdf | Bin 585079 -> 586648 bytes .../doc/latex/acmart/sample-manuscript.pdf | Bin 655426 -> 656956 bytes .../doc/latex/acmart/sample-sigchi-a.pdf | Bin 1299105 -> 1299341 bytes .../doc/latex/acmart/sample-sigchi-a.tex | 2 +- .../texmf-dist/doc/latex/acmart/sample-sigchi.pdf | Bin 1069523 -> 1071059 bytes .../texmf-dist/doc/latex/acmart/sample-sigchi.tex | 2 +- .../texmf-dist/doc/latex/acmart/sample-sigconf.pdf | Bin 608567 -> 610128 bytes .../texmf-dist/doc/latex/acmart/sample-sigconf.tex | 2 +- .../doc/latex/acmart/sample-siggraph.pdf | Bin 1041430 -> 1042965 bytes .../doc/latex/acmart/sample-siggraph.tex | 2 +- .../texmf-dist/doc/latex/acmart/sample-sigplan.pdf | Bin 969078 -> 970129 bytes .../texmf-dist/doc/latex/acmart/sample-sigplan.tex | 2 +- .../doc/latex/acmart/samplebody-journals.tex | 10 +++---- Master/texmf-dist/source/latex/acmart/acmart.dtx | 32 ++++++++++++++------- Master/texmf-dist/tex/latex/acmart/acmart.cls | 19 ++++++++---- 21 files changed, 50 insertions(+), 28 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/acmart/README b/Master/texmf-dist/doc/latex/acmart/README index a31b83afd13..131658a5951 100644 --- a/Master/texmf-dist/doc/latex/acmart/README +++ b/Master/texmf-dist/doc/latex/acmart/README @@ -55,3 +55,6 @@ version 1.26 Bug fixes version 1.27 Bug fixes +version 1.28 Bug fixes: natbib=false now behaves correctly. + + diff --git a/Master/texmf-dist/doc/latex/acmart/acmart.pdf b/Master/texmf-dist/doc/latex/acmart/acmart.pdf index 02b2a14224f..a0539d49fb9 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/sample-acmlarge.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf index 0ac710f855c..ff1167ac66a 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-acmlarge.tex b/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.tex index 075314776c8..5c097a557c2 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.tex +++ b/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.tex @@ -169,7 +169,7 @@ multi-channel, radio interference, time synchronization} \maketitle % The default list of authors is too long for headers} -\renewcommand{\shortauthors}{G. Zhou et. al.} +\renewcommand{\shortauthors}{G. Zhou et al.} \input{samplebody-journals} diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf index 6f4d96cb56b..85eb69712f4 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-acmsmall.tex b/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.tex index 630fd9c4779..247e93674b1 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.tex +++ b/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.tex @@ -161,7 +161,7 @@ multi-channel, radio interference, time synchronization} \maketitle % The default list of authors is too long for headers} -\renewcommand{\shortauthors}{G. Zhou et. al.} +\renewcommand{\shortauthors}{G. Zhou et al.} \input{samplebody-journals} diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf index 7fb2ac5d6fc..705f73b7383 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-manuscript.pdf b/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf index edb5ef576e1..344f34cfa4d 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 afad1d155f5..809759e6ae1 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-a.tex b/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.tex index c1d3fbd7982..92c8de8cbbb 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.tex +++ b/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.tex @@ -76,7 +76,7 @@ \email{author7@umbhaliu.ac.za} % The default list of authors is too long for headers} -\renewcommand{\shortauthors}{F. Author et. al.} +\renewcommand{\shortauthors}{F. Author et al.} % diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf index faccec5b3f7..918ef026be1 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-sigchi.tex b/Master/texmf-dist/doc/latex/acmart/sample-sigchi.tex index 54dab36b39b..8d1afcb6688 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-sigchi.tex +++ b/Master/texmf-dist/doc/latex/acmart/sample-sigchi.tex @@ -102,7 +102,7 @@ \email{jpkumquat@consortium.net} % The default list of authors is too long for headers} -\renewcommand{\shortauthors}{B. Trovato et. al.} +\renewcommand{\shortauthors}{B. Trovato et al.} \begin{abstract} diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf index 6f0c29e60be..6f3b794604b 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-sigconf.tex b/Master/texmf-dist/doc/latex/acmart/sample-sigconf.tex index 4dea9c21a50..887f22e0a5f 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-sigconf.tex +++ b/Master/texmf-dist/doc/latex/acmart/sample-sigconf.tex @@ -103,7 +103,7 @@ \email{jpkumquat@consortium.net} % The default list of authors is too long for headers} -\renewcommand{\shortauthors}{B. Trovato et. al.} +\renewcommand{\shortauthors}{B. Trovato et al.} \begin{abstract} diff --git a/Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdf b/Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdf index f9eb75ff96e..55ee004a833 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdf and b/Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/sample-siggraph.tex b/Master/texmf-dist/doc/latex/acmart/sample-siggraph.tex index 0cdc2d9ef97..49abfbd599c 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-siggraph.tex +++ b/Master/texmf-dist/doc/latex/acmart/sample-siggraph.tex @@ -105,7 +105,7 @@ % The default list of authors is too long for headers} -\renewcommand{\shortauthors}{B. Trovato et. al.} +\renewcommand{\shortauthors}{B. Trovato et al.} \begin{abstract} This paper provides a sample of a \LaTeX\ document which conforms, diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf index fd28df3bddb..1042a346728 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/doc/latex/acmart/sample-sigplan.tex b/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex index 1c4bef59045..4f4e1490a20 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex +++ b/Master/texmf-dist/doc/latex/acmart/sample-sigplan.tex @@ -106,7 +106,7 @@ % The default list of authors is too long for headers} -\renewcommand{\shortauthors}{B. Trovato et. al.} +\renewcommand{\shortauthors}{B. Trovato et al.} \begin{abstract} diff --git a/Master/texmf-dist/doc/latex/acmart/samplebody-journals.tex b/Master/texmf-dist/doc/latex/acmart/samplebody-journals.tex index a7339c32ecb..f53700f3082 100644 --- a/Master/texmf-dist/doc/latex/acmart/samplebody-journals.tex +++ b/Master/texmf-dist/doc/latex/acmart/samplebody-journals.tex @@ -230,11 +230,11 @@ coalescing were made). \section{Performance Evaluation} -During all the experiments, the Geographic Forwarding (GF) -\cite{Akyildiz-01} routing protocol is used. GF exploits geographic -information of nodes and conducts local data-forwarding to achieve -end-to-end routing. Our simulation is configured according to the -settings in Table~\ref{tab:one}. Each run lasts for 2 minutes and +During all the experiments, the Geographic Forwarding (GF) by Akuilidz +et al.~\shortcite{Akyildiz-01} routing protocol is used. GF exploits +geographic information of nodes and conducts local data-forwarding to +achieve end-to-end routing. Our simulation is configured according to +the settings in Table~\ref{tab:one}. Each run lasts for 2 minutes and repeated 100 times. For each data value we present in the results, we also give its 90\% confidence interval. diff --git a/Master/texmf-dist/source/latex/acmart/acmart.dtx b/Master/texmf-dist/source/latex/acmart/acmart.dtx index 73fb5630922..4dff38b1e01 100644 --- a/Master/texmf-dist/source/latex/acmart/acmart.dtx +++ b/Master/texmf-dist/source/latex/acmart/acmart.dtx @@ -1,6 +1,6 @@ % \iffalse % -% Copyright 2016, Association for Computing Machinery +% Copyright 2016-2017, Association for Computing Machinery % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either % version 1.3 of this license or (at your option) any @@ -42,7 +42,7 @@ % \GetFileInfo{acmart.dtx} % \newcommand{\progname}[1]{\textsf{#1}} % \title{\LaTeX{} Class for \emph{Association for Computing -% Machinery}\thanks{\copyright 2016, Association for Computing Machinery}} +% Machinery}\thanks{\copyright 2016--2017, Association for Computing Machinery}} % \author{Boris Veytsman\thanks{% % \href{mailto:borisv@lk.net}{\texttt{borisv@lk.net}}, % \href{mailto:boris@varphi.com}{\texttt{boris@varphi.com}}}} @@ -855,7 +855,7 @@ % redefine it if the list of author's name is too long, e.g., % \begin{verbatim} % \maketitle -% \renewcommand{\shortauthors}{Zhou et. al.} +% \renewcommand{\shortauthors}{Zhou et al.} % \end{verbatim} % % @@ -1275,7 +1275,7 @@ \ProvidesFile{acmart.dtx} % %\ProvidesClass{acmart} -[2016/12/29 v1.27 Typesetting articles for Association of +[2017/01/07 v1.28 Typesetting articles for Association of Computing Machinery] % \end{macrocode} % @@ -1731,9 +1731,12 @@ Computing Machinery] % % \end{macro} % +% \changes{v1.28}{2017/01/07}{Corrected option natbib behavior} % The default is numeric: % \begin{macrocode} +\if@ACM@natbib \citestyle{acmnumeric} +\fi % \end{macrocode} % % @@ -1831,10 +1834,17 @@ Computing Machinery] % % % And |hyperref| +% \changes{v1.28}{2017/01/07}{Got rid of warnings in pdf keywords} % \begin{macrocode} \let\@footnotemark@nolink\@footnotemark \let\@footnotetext@nolink\@footnotetext -\RequirePackage[bookmarksnumbered]{hyperref} +\RequirePackage[bookmarksnumbered,unicode]{hyperref} +\pdfstringdefDisableCommands{% + \def\unskip{} + \def\textbullet{- } + \def\textrightarrow{ -> } + \def\footnotemark{} +} \urlstyle{rm} \ifcase\ACM@format@nr \relax % manuscript @@ -1870,7 +1880,6 @@ Computing Machinery] \let\citeyearNP\citeyear \let\citeyear\citeyearpar \let\citeNP\citealt - \def\shortcite#1{\ifNAT@numbers\cite{#1}\else\citeyear{#1}\fi} \DeclareRobustCommand\citeA {\begingroup\NAT@swafalse \let\NAT@ctype\@ne\NAT@partrue\NAT@fullfalse\NAT@open\NAT@citetp}% @@ -1878,6 +1887,7 @@ Computing Machinery] \else \providecommand\citename[1]{#1} \fi +\def\shortcite#1{\ifNAT@numbers\cite{#1}\else\citeyear{#1}\fi} % \end{macrocode} % % @@ -2145,8 +2155,6 @@ Computing Machinery] \RequirePackage[tt=false]{libertine} \RequirePackage[varqu]{zi4} \RequirePackage[libertine]{newtxmath} -\else -\RequirePackage{textcomp} \fi % \end{macrocode} % @@ -3177,11 +3185,15 @@ Computing Machinery] % \end{macro} % % \begin{macro}{\ccsdesc@parse} -% The parser of the expression |Significance~General~Specific|: +% \changes{v1.28}{2017/01/04}{Change from \cs{to} to +% \cs{textrightarrow} (Matteo Riondato)} +% The parser of the expression |Significance~General~Specific| (we need +% |textcomp| for |\\textrightarrow|: % \begin{macrocode} +\RequirePackage{textcomp} \def\ccsdesc@parse#1~#2~#3~{% \expandafter\ifx\csname CCS@#2\endcsname\relax - \expandafter\gdef\csname CCS@#2\endcsname{\textbullet\textbf{#2} $\to$ }% + \expandafter\gdef\csname CCS@#2\endcsname{\textbullet\textbf{#2} \textrightarrow }% \g@addto@macro{\@concepts}{\csname CCS@#2\endcsname}\fi \expandafter\g@addto@macro\expandafter{\csname CCS@#2\endcsname}{% \ifnum#1>499\textbf{#3; }\else diff --git a/Master/texmf-dist/tex/latex/acmart/acmart.cls b/Master/texmf-dist/tex/latex/acmart/acmart.cls index c7798f9c202..51d39e13d36 100644 --- a/Master/texmf-dist/tex/latex/acmart/acmart.cls +++ b/Master/texmf-dist/tex/latex/acmart/acmart.cls @@ -38,7 +38,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{acmart} -[2016/12/29 v1.27 Typesetting articles for Association of +[2017/01/07 v1.28 Typesetting articles for Association of Computing Machinery] \def\@classname{acmart} \RequirePackage{xkeyval} @@ -265,7 +265,9 @@ Computing Machinery] numbers,sort&compress,% open={[},close={]},citesep={,},% notesep={, }}} +\if@ACM@natbib \citestyle{acmnumeric} +\fi \def\@startsection#1#2#3#4#5#6{% \if@noskipsec \leavevmode \fi \par @@ -353,7 +355,13 @@ Computing Machinery] \@xsect{#3}} \let\@footnotemark@nolink\@footnotemark \let\@footnotetext@nolink\@footnotetext -\RequirePackage[bookmarksnumbered]{hyperref} +\RequirePackage[bookmarksnumbered,unicode]{hyperref} +\pdfstringdefDisableCommands{% + \def\unskip{} + \def\textbullet{- } + \def\textrightarrow{ -> } + \def\footnotemark{} +} \urlstyle{rm} \ifcase\ACM@format@nr \relax % manuscript @@ -385,7 +393,6 @@ Computing Machinery] \let\citeyearNP\citeyear \let\citeyear\citeyearpar \let\citeNP\citealt - \def\shortcite#1{\ifNAT@numbers\cite{#1}\else\citeyear{#1}\fi} \DeclareRobustCommand\citeA {\begingroup\NAT@swafalse \let\NAT@ctype\@ne\NAT@partrue\NAT@fullfalse\NAT@open\NAT@citetp}% @@ -393,6 +400,7 @@ Computing Machinery] \else \providecommand\citename[1]{#1} \fi +\def\shortcite#1{\ifNAT@numbers\cite{#1}\else\citeyear{#1}\fi} \def\bibliographystyle#1{% \ifx\@begindocumenthook\@undefined\else \expandafter\AtBeginDocument @@ -538,8 +546,6 @@ Computing Machinery] \RequirePackage[tt=false]{libertine} \RequirePackage[varqu]{zi4} \RequirePackage[libertine]{newtxmath} -\else -\RequirePackage{textcomp} \fi \if@ACM@sigchiamode \renewcommand{\familydefault}{\sfdefault} @@ -1073,9 +1079,10 @@ Computing Machinery] \let\@concepts\@empty \newcommand\ccsdesc[2][100]{% \ccsdesc@parse#1~#2~} +\RequirePackage{textcomp} \def\ccsdesc@parse#1~#2~#3~{% \expandafter\ifx\csname CCS@#2\endcsname\relax - \expandafter\gdef\csname CCS@#2\endcsname{\textbullet\textbf{#2} $\to$ }% + \expandafter\gdef\csname CCS@#2\endcsname{\textbullet\textbf{#2} \textrightarrow }% \g@addto@macro{\@concepts}{\csname CCS@#2\endcsname}\fi \expandafter\g@addto@macro\expandafter{\csname CCS@#2\endcsname}{% \ifnum#1>499\textbf{#3; }\else -- cgit v1.2.3