From e546ad01a2bf102f02e32ad5117a44644a3aea8b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 15 Feb 2017 22:09:32 +0000 Subject: acmart (15feb17) git-svn-id: svn://tug.org/texlive/trunk@43232 c570f23f-e606-0410-a88d-b1316a301751 --- .../bibtex/bst/acmart/ACM-Reference-Format.bst | 15 +- Master/texmf-dist/doc/latex/acmart/Makefile | 11 +- Master/texmf-dist/doc/latex/acmart/README | 10 +- Master/texmf-dist/doc/latex/acmart/acmart.pdf | Bin 683075 -> 686848 bytes Master/texmf-dist/doc/latex/acmart/acmguide.pdf | Bin 0 -> 416542 bytes .../doc/latex/acmart/flies-eps-converted-to.pdf | Bin 9666 -> 9687 bytes .../doc/latex/acmart/rosette-eps-converted-to.pdf | 42 +++--- .../doc/latex/acmart/sample-acmlarge.pdf | Bin 611863 -> 611015 bytes .../doc/latex/acmart/sample-acmsmall.pdf | Bin 627365 -> 626710 bytes .../texmf-dist/doc/latex/acmart/sample-acmtog.pdf | Bin 586648 -> 585847 bytes .../doc/latex/acmart/sample-bibliography.bib | 5 +- .../doc/latex/acmart/sample-manuscript.pdf | Bin 656956 -> 665170 bytes .../doc/latex/acmart/sample-manuscript.tex | 2 +- .../doc/latex/acmart/sample-sigchi-a.pdf | Bin 1299341 -> 1292711 bytes .../texmf-dist/doc/latex/acmart/sample-sigchi.pdf | Bin 1071059 -> 1077266 bytes .../texmf-dist/doc/latex/acmart/sample-sigconf.pdf | Bin 610128 -> 608969 bytes .../texmf-dist/doc/latex/acmart/sample-sigconf.tex | 2 +- .../doc/latex/acmart/sample-siggraph.pdf | Bin 1042965 -> 1041850 bytes .../texmf-dist/doc/latex/acmart/sample-sigplan.pdf | Bin 970129 -> 978359 bytes .../doc/latex/acmart/samplebody-conf.tex | 8 +- .../doc/latex/acmart/samplebody-journals.tex | 3 + Master/texmf-dist/source/latex/acmart/acmart.dtx | 155 +++++++++++++++------ Master/texmf-dist/tex/latex/acmart/acmart.cls | 64 ++++----- 23 files changed, 208 insertions(+), 109 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/acmart/acmguide.pdf (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 e3343e72abe..8fdf15305ec 100644 --- a/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst +++ b/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst @@ -25,6 +25,7 @@ % Revised 15-APRIL-2011 (Boris/Gerry) % Revised 27-SEPTEMBER-2011 (Boris) % Revised 10-JULY-2016 (Boris) +% Revised 04-FEB-2017 (Boris) % % % History (by Nelson) @@ -620,12 +621,22 @@ FUNCTION { strip.doi } % UTAH % lists. % The numeric prefix is guaranteed to start with "10.", so we use % that as a test. + % 2017-02-04 Added stripping of https:// (Boris) doi #1 #3 substring$ "10." = { doi } { - doi #1 #7 substring$ "http://" = + doi 't := % get modifiable copy of DOI + + % Change https:// to http:// to strip both prefixes (BV) + + t #1 #8 substring$ "https://" = + { "http://" t #9 t text.length$ #8 - substring$ * 't := } + { } + if$ + + t #1 #7 substring$ "http://" = { - doi #8 doi text.length$ #7 - substring$ 't := % get modifiable copy of rest of DOI + t #8 t text.length$ #7 - substring$ 't := "INTERNAL STYLE-FILE ERROR" 's := diff --git a/Master/texmf-dist/doc/latex/acmart/Makefile b/Master/texmf-dist/doc/latex/acmart/Makefile index 390cd4b01ad..efddea4fa02 100644 --- a/Master/texmf-dist/doc/latex/acmart/Makefile +++ b/Master/texmf-dist/doc/latex/acmart/Makefile @@ -20,7 +20,7 @@ SAMPLES = \ sample-sigchi-a.tex -PDF = $(PACKAGE).pdf ${SAMPLES:%.tex=%.pdf} +PDF = $(PACKAGE).pdf ${SAMPLES:%.tex=%.pdf} acmguide.pdf all: ${PDF} @@ -36,6 +36,13 @@ all: ${PDF} do pdflatex $<; done +acmguide.pdf: $(PACKAGE).dtx $(PACKAGE).cls + pdflatex -jobname acmguide $(PACKAGE).dtx + - bibtex acmguide + pdflatex -jobname acmguide $(PACKAGE).dtx + while ( grep -q '^LaTeX Warning: Label(s) may have changed' acmguide.log) \ + do pdflatex -jobname acmguide $(PACKAGE).dtx; done + %.cls: %.ins %.dtx pdflatex $< @@ -75,7 +82,7 @@ distclean: clean # Archive for the distribution. Includes typeset documentation # archive: all clean - tar -C .. -czvf $(PACKAGE).tgz --exclude '*~' --exclude '*.tgz' --exclude '*.zip' --exclude CVS --exclude '.git*' $(PACKAGE) + tar -C .. -czvf ../$(PACKAGE).tgz --exclude '*~' --exclude '*.tgz' --exclude '*.zip' --exclude CVS --exclude '.git*' $(PACKAGE); mv ../$(PACKAGE).tgz . zip: all clean zip -r $(PACKAGE).zip * -x '*~' -x '*.tgz' -x '*.zip' -x CVS -x 'CVS/*' diff --git a/Master/texmf-dist/doc/latex/acmart/README b/Master/texmf-dist/doc/latex/acmart/README index 131658a5951..ffa26c1bab4 100644 --- a/Master/texmf-dist/doc/latex/acmart/README +++ b/Master/texmf-dist/doc/latex/acmart/README @@ -57,4 +57,12 @@ version 1.27 Bug fixes version 1.28 Bug fixes: natbib=false now behaves correctly. - +version 1.29 Documentation changes. Head height increased from 12pt to 13pt. + Removed spurious indent at start of abstract. + Improved kerning in CCS description list. + +version 1.30 Bibtex style now recognizes https:// in doi. + Added \frenchspacing. + \department now has an optional hierarchy level. + Switched to T1 encoding + Updated IMWUT and PACMPL \ 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 a0539d49fb9..b3276c1ad22 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 new file mode 100644 index 00000000000..8ca535318dd Binary files /dev/null and b/Master/texmf-dist/doc/latex/acmart/acmguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/flies-eps-converted-to.pdf b/Master/texmf-dist/doc/latex/acmart/flies-eps-converted-to.pdf index dab14238d1d..845317703ca 100644 Binary files a/Master/texmf-dist/doc/latex/acmart/flies-eps-converted-to.pdf and b/Master/texmf-dist/doc/latex/acmart/flies-eps-converted-to.pdf differ diff --git a/Master/texmf-dist/doc/latex/acmart/rosette-eps-converted-to.pdf b/Master/texmf-dist/doc/latex/acmart/rosette-eps-converted-to.pdf index 9e49eb1fb4a..37ba807bad0 100644 --- a/Master/texmf-dist/doc/latex/acmart/rosette-eps-converted-to.pdf +++ b/Master/texmf-dist/doc/latex/acmart/rosette-eps-converted-to.pdf @@ -5,10 +5,10 @@ stream xV;0 y @Nr~  m -<,7+4b"Eb."Scz!'YC!" YM-p*=vۀVρv -{R!@yqafz&} !3H[&F{OGGoTKZNǠĄ RïKmn B)\ ǀ|xcATN)I%:Wd8EUVBfkȘPtb86ȴ fuvUąahJhVɈC9`kVr @tZ22Ŵe/VбR ME&ddĊ1() .:h2yqQn=r&NqirٙuDN;&~==54*"xˉ:)r X,xdZN8v+@W7> @tZQ=Xf̹]V8-LƖ[^b#fuzvXi^60}Άi}0?& D"\pCendstream +{R!@yqafz&} !3H[&F{OGGoTKZNǠĄ RïKmn B)\ ǀ|xcATN)I%:Wd8EUVBfkȘPtb86ȴ fuvUąahJhVɈC9`kVr @tZ22Ŵe/VбR ME&ddĊ1() .:h2yqQn=r&NqirٙuDN;&~==54*"xˉ:)r X,xdZN8v+@W7> @tZQ=Xf̹]V8-LƖ[^b#fuzvXi^60}Άi}0?& l\ptc-endstream endobj 6 0 obj -604 +602 endobj 4 0 obj <>stream +/Subtype/XML/Length 1344>>stream - -2016-04-27T13:59:08-04:00 -2016-04-27T13:59:08-04:00 + +2017-02-15T11:56:03-05:00 +2017-02-15T11:56:03-05:00 UnknownApplication - -Untitled + +Untitled @@ -58,25 +58,25 @@ endobj endstream endobj 2 0 obj -<>endobj +<>endobj xref 0 10 0000000000 65535 f -0000000904 00000 n -0000002433 00000 n -0000000845 00000 n -0000000708 00000 n +0000000902 00000 n +0000002456 00000 n +0000000843 00000 n +0000000706 00000 n 0000000015 00000 n -0000000689 00000 n -0000000968 00000 n -0000001009 00000 n -0000001038 00000 n +0000000687 00000 n +0000000966 00000 n +0000001007 00000 n +0000001036 00000 n trailer << /Size 10 /Root 1 0 R /Info 2 0 R -/ID [<27FFEE371E447DBF31C0814450606A79><27FFEE371E447DBF31C0814450606A79>] +/ID [] >> startxref -2556 +2579 %%EOF diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf index ff1167ac66a..ddcd384ca0e 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 85eb69712f4..68a5fbe8265 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 705f73b7383..2569d0163a5 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-bibliography.bib b/Master/texmf-dist/doc/latex/acmart/sample-bibliography.bib index a7716388a7b..7bc39956732 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-bibliography.bib +++ b/Master/texmf-dist/doc/latex/acmart/sample-bibliography.bib @@ -905,13 +905,12 @@ year = {2003}, series = {ICWS '04}, year = {2004}, isbn = {0-7695-2167-3}, - pages = {.21--}, + pages = {21--22}, url = {http://dx.doi.org/10.1109/ICWS.2004.64}, doi = {http://dx.doi.org/10.1109/ICWS.2004.64}, acmid = {1010128}, publisher = {IEEE Computer Society}, address = {Washington, DC, USA}, -key = {{$\!\!$}} , } % div book @@ -1179,7 +1178,7 @@ key = {{$\!\!$}} , pages = {1714--1747}, numpages = {34}, url = {http://dx.doi.org/10.1137/080734467}, - doi = {http://dx.doi.org/10.1137/080734467}, + doi = {https://doi.org/10.1137/080734467}, acmid = {1958018}, publisher = {Society for Industrial and Applied Mathematics}, address = {Philadelphia, PA, USA}, diff --git a/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf b/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf index 344f34cfa4d..9462244f65a 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-manuscript.tex b/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex index b3862ee502c..68a0502e3dd 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex +++ b/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex @@ -108,7 +108,7 @@ parallel transmissions among neighboring nodes. When multiple physical frequencies are available, it also achieves increased energy efficiency, demonstrating the ability to work against radio interference and the tolerance to a wide range of measured time -synchronization errors\footnote{This is an abstract footnote}. +synchronization errors.\footnote{This is an abstract footnote} \end{abstract} 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 809759e6ae1..dae67f5fa95 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 918ef026be1..74f2caa6e10 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.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf index 6f3b794604b..e5638697e06 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 887f22e0a5f..c37fedd635f 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-sigconf.tex +++ b/Master/texmf-dist/doc/latex/acmart/sample-sigconf.tex @@ -109,7 +109,7 @@ \begin{abstract} This paper provides a sample of a \LaTeX\ document which conforms, somewhat loosely, to the formatting guidelines for -ACM SIG Proceedings\footnote{This is an abstract footnote}. +ACM SIG Proceedings.\footnote{This is an abstract footnote} \end{abstract} % diff --git a/Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdf b/Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdf index 55ee004a833..c9940c09abd 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-sigplan.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf index 1042a346728..caa71c8b0a2 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/samplebody-conf.tex b/Master/texmf-dist/doc/latex/acmart/samplebody-conf.tex index 2e33a5fdb1c..732f0610a22 100644 --- a/Master/texmf-dist/doc/latex/acmart/samplebody-conf.tex +++ b/Master/texmf-dist/doc/latex/acmart/samplebody-conf.tex @@ -1,7 +1,7 @@ \section{Introduction} -The \textit{proceedings} are the records of a conference\footnote{This - is a footnote}. ACM seeks +The \textit{proceedings} are the records of a conference.\footnote{This + is a footnote} ACM seeks to give these conference by-products a uniform, high-quality appearance. To do this, ACM has some rigid requirements for the format of the proceedings documents: there is a specified format @@ -38,9 +38,9 @@ computer code) with \texttt{{\char'134}texttt}. But remember, you do not have to indicate typestyle changes when such changes are part of the \textit{structural} elements of your article; for instance, the heading of this subsection will be in a sans serif\footnote{Another - footnote, here. Let's make this a rather short one to see how it + footnote here. Let's make this a rather long one to see how it looks.} typeface, but that is handled by the document class file. -Take care with the use of\footnote{A third, and last, footnote.} the +Take care with the use of\footnote{Another footnote.} the curly braces in typeface changes; they mark the beginning and end of the text that is to be in the different typeface. diff --git a/Master/texmf-dist/doc/latex/acmart/samplebody-journals.tex b/Master/texmf-dist/doc/latex/acmart/samplebody-journals.tex index f53700f3082..57c6a29ba2c 100644 --- a/Master/texmf-dist/doc/latex/acmart/samplebody-journals.tex +++ b/Master/texmf-dist/doc/latex/acmart/samplebody-journals.tex @@ -306,6 +306,9 @@ work accepted for publication \cite{rous08}, 'YYYYb'-test for prolific author Boris / Barbara Beeton: multi-volume works as books \cite{MR781536} and \cite{MR781537}. +A couple of citations with DOIs: \cite{2004:ITE:1009386.1010128, + Kirschmer:2010:AEI:1958016.1958018}. + % Appendix \appendix \section{Switching times} diff --git a/Master/texmf-dist/source/latex/acmart/acmart.dtx b/Master/texmf-dist/source/latex/acmart/acmart.dtx index 4dff38b1e01..2920b6a38ed 100644 --- a/Master/texmf-dist/source/latex/acmart/acmart.dtx +++ b/Master/texmf-dist/source/latex/acmart/acmart.dtx @@ -39,6 +39,18 @@ % % % \MakeShortVerb{|} +% \def\guide{acmguide} +% \iffalse +% From +% http://tex.stackexchange.com/questions/117892/can-i-convert-a-string-to-catcode-11 by egreg +% \fi +% \begingroup +% \everyeof{\noexpand} +% \endlinechar=-1 +% \xdef\currentjob{\scantokens\expandafter{\jobname}} +% \endgroup +% +% \ifx\currentjob\guide\OnlyDescription\fi % \GetFileInfo{acmart.dtx} % \newcommand{\progname}[1]{\textsf{#1}} % \title{\LaTeX{} Class for \emph{Association for Computing @@ -55,7 +67,7 @@ % \tableofcontents % % \clearpage -% +% %\section{Introduction} %\label{sec:intro} % @@ -63,7 +75,7 @@ % educational and scientific computing society, which delivers % resources that advance computing as a science and a % profession\footnote{\url{http://www.acm.org/}}. It was one of the -% earily adopters of \TeX\ for its typesetting. +% early adopters of \TeX\ for its typesetting. % % It provided several different classes for a number of journal and % conference proceedings. Unfortunately during the years since these @@ -101,7 +113,7 @@ % % Most probably, you already have this package installed in your % favorite \TeX\ distribution; if not, you may want to upgrade. You -% may need to upgrade it anyway since the package uses a number +% may need to upgrade it anyway since the package uses a number of % relatively recent packages, especially the ones related to the % fonts. % @@ -169,7 +181,7 @@ %\subsection{Invocation and options} %\label{sec:invocation} % -% To use the class put in the premable of your document +% To use the class put in the preamble of your document % \begin{quote} % \cs{documentclass}\oarg{options}|{acmart}| % \end{quote} @@ -216,7 +228,8 @@ % acmtog & Large double column format, used for % TOG\\ % sigconf & Proceedings format for most of ACM -% conferences (with the exceptions listed below)\\ +% conferences (with the exceptions listed below) and all ICPS +% volumes\\ % siggraph & Proceedings format for SIGGRAPH and SIGGRAPH % Asia conferences, published in ACM Transactions on Graphics % journal issues \\ @@ -504,6 +517,7 @@ % \emph{not} put commas or |\\| between the elements of % \cs{affiliation}: they will be provided automatically. % +% % An example of the author block: % \begin{verbatim} % \author{A. U. Thor} @@ -541,6 +555,28 @@ % authors and required some efforts from the authors to achieve % alignment. The new format is much better in this. % +% Sometimes an author works in several departments within the same +% insitution. There could be two situations: the departments are +% independent, or one department is within another. In the first +% case just repeat the command \cs{department} several times. To +% handle the second case the command has an optional numerical +% parameter. The departments with higher numbers are higher in the +% organizational chart. Compare +% \begin{verbatim} +% \affiliation{% +% \department[0]{Department of Lunar Studies} % 0 is the default +% \department[1]{John Doe Institute} % higher than 0 +% \institution{University of San Serriffe} +% \country{San Serriffe}} +% \end{verbatim} +% and +% \begin{verbatim} +% \affiliation{% +% \department{Department of Lunar Studies} % Not within JD Inst! +% \department{John Doe Institute} +% \institution{University of San Serriffe} +% \country{San Serriffe}} +% \end{verbatim} % % % It is expected that these commands are inserted by the author of the @@ -600,9 +636,9 @@ % \end{verbatim} % % \DescribeMacro{\acmArticleSeq}% -% The articles in the same issue of a journal have \emph{sequential -% number}. It is used to position black blob in same formats. By -% default it is the same as article number, but the command +% The articles in the same issue of a journal have a \emph{sequential +% number}. It is used to vertically position the black blob in some +% formats. By default it is the same as article number, but the command % \cs{acmArticleSeq}\marg{n} can be used to change it: % \begin{verbatim} % \acmArticle{39} % The sequence number will be 39 by default @@ -878,7 +914,7 @@ % \item The captions for figures must be entered \emph{after} the % figure bodies, and for the tables \emph{before} the table bodies. % \item ACM uses the standard types for figures and types and adds -% several new ones. In total there are follwing types: +% several new ones. In total there are the following types: % \begin{description} % \item[figure, table:] a standard figure or table, taking full text % width in one-column formats and one column in two-column formats. @@ -1073,6 +1109,11 @@ % which you can include using the optional argument of \cs{grantnum} % command. % +% At present \marg{sponsorID} is chosen by the authors and can be an +% arbitrary key, in the same way the label of \cs{cite} is arbitrarily +% chosen. There might be a change to this policy if ACM decides to +% create a global database of sponsoring organizations. +% % Example: % \begin{verbatim} % \begin{acks} @@ -1094,7 +1135,7 @@ %\subsection{Bibliography} %\label{sec:ug_bibliography} % -% ACM uses \textsl{natbib} package for formatting of referencing ant +% ACM uses the \textsl{natbib} package for formatting references and % the style \path{ACM-Reference-Format.bst} for Bib\TeX\ % processing. You may disable loading of \textsl{natbib} by using the % option |natbib=false| in \cs{documentclass}. However, it is not @@ -1275,7 +1316,7 @@ \ProvidesFile{acmart.dtx} % %\ProvidesClass{acmart} -[2017/01/07 v1.28 Typesetting articles for Association of +[2017/02/15 v1.30 Typesetting articles for Association of Computing Machinery] % \end{macrocode} % @@ -1316,6 +1357,7 @@ Computing Machinery] % \changes{v1.26}{2016/12/24}{Corrected \cs{shortcite} bug} % \changes{v1.26}{2016/12/24}{Documentation typos fixed (thanks to % Stephen Spencer)} +% \changes{v1.30}{2017/02/04}{Bibtex style now recognizes https:// in doi} % % % And the driver code: @@ -1840,10 +1882,10 @@ Computing Machinery] \let\@footnotetext@nolink\@footnotetext \RequirePackage[bookmarksnumbered,unicode]{hyperref} \pdfstringdefDisableCommands{% - \def\unskip{} - \def\textbullet{- } - \def\textrightarrow{ -> } - \def\footnotemark{} + \def\unskip{}% + \def\textbullet{- }% + \def\textrightarrow{ -> }% + \def\footnotemark{}% } \urlstyle{rm} \ifcase\ACM@format@nr @@ -1930,56 +1972,60 @@ Computing Machinery] %\label{sec:paper} % % \changes{v1.17}{2016/07/07}{Slightly decreased margins for sigs} -% We use |geometry| for dimensions +% \changes{v1.29}{2017/01/22}{Increased head to 13pt} +% We use |geometry| for dimensions. Note the presently margins do not +% depend on the font size option - maybe we will need to change this. +% See +% \url{https://github.com/borisveytsman/acmart/issues/5#issuecomment-272881329}. % \begin{macrocode} \RequirePackage{geometry} \ifcase\ACM@format@nr \relax % manuscript - \geometry{letterpaper,head=1pc}% + \geometry{letterpaper,head=13pt}% \or % acmsmall \geometry{twoside=true, - includeheadfoot, head=1pc, foot=2pc, + includeheadfoot, head=13pt, foot=2pc, paperwidth=6.75in, paperheight=10in, top=58pt, bottom=44pt, inner=46pt, outer=46pt }% \or % acmlarge - \geometry{twoside=true, head=1pc, foot=2pc, + \geometry{twoside=true, head=13pt, foot=2pc, paperwidth=8.5in, paperheight=11in, includeheadfoot, top=78pt, bottom=114pt, inner=81pt, outer=81pt }% \or % acmtog - \geometry{twoside=true, head=1pc, foot=2pc, + \geometry{twoside=true, head=13pt, foot=2pc, paperwidth=8.5in, paperheight=11in, includeheadfoot, columnsep=24pt, top=52pt, bottom=75pt, inner=52pt, outer=52pt }% \or % sigconf - \geometry{twoside=true, head=1pc, + \geometry{twoside=true, head=13pt, paperwidth=8.5in, paperheight=11in, includeheadfoot, columnsep=2pc, top=57pt, bottom=73pt, inner=54pt, outer=54pt }% \or % siggraph - \geometry{twoside=true, head=1pc, + \geometry{twoside=true, head=13pt, paperwidth=8.5in, paperheight=11in, includeheadfoot, columnsep=2pc, top=57pt, bottom=73pt, inner=54pt, outer=54pt }% \or % sigplan - \geometry{twoside=true, head=1pc, + \geometry{twoside=true, head=13pt, paperwidth=8.5in, paperheight=11in, includeheadfoot=false, columnsep=2pc, top=1in, bottom=1in, inner=0.75in, outer=0.75in }% \or % sigchi - \geometry{twoside=true, head=1pc, + \geometry{twoside=true, head=13pt, paperwidth=8.5in, paperheight=11in, includeheadfoot, columnsep=2pc, top=66pt, bottom=73pt, inner=54pt, outer=54pt }% \or % sigchi-a - \geometry{twoside=false, head=1pc, + \geometry{twoside=false, head=13pt, paperwidth=11in, paperheight=8.5in, includeheadfoot, marginparsep=72pt, marginparwidth=170pt, columnsep=20pt, @@ -2149,12 +2195,15 @@ Computing Machinery] % % \end{macro} % +% \changes{v1.30}{2017/02/15}{Switched to T1: looks like libertine has +% problems with \cs{l} in OT1}% % We use Libertine throughout. % \begin{macrocode} \if@ACM@newfonts \RequirePackage[tt=false]{libertine} \RequirePackage[varqu]{zi4} \RequirePackage[libertine]{newtxmath} +\RequirePackage[T1]{fontenc} \fi % \end{macrocode} % @@ -2368,6 +2417,7 @@ Computing Machinery] % % \changes{v1.24}{2016/11/16}{Add IMWUT journal option} % \changes{v1.25}{2016/12/03}{Updated PACMPL} +% \changes{v1.30}{2017/02/15}{Updated IMWUT and PACMPL} % % We use keyval interface to define journal title and relevant % information @@ -2433,9 +2483,9 @@ Computing Machinery] \def\@journalNameShort{ACM Comput. Surv.}% \def\@permissionCodeOne{0360-0300}% \or % IMWUT - \def\@journalName{PACM on Interactive, Mobile, Wearable and - Ubiquitous Technologies}% - \def\@journalNameShort{PACM Interact. Mob. Wearable Ubiquitous Technol.}% + \def\@journalName{Proceedings of the ACM on Interactive, Mobile, + Wearable and Ubiquitous Technologies}% + \def\@journalNameShort{Proc. ACM Interact. Mob. Wearable Ubiquitous Technol.}% \def\@permissionCodeOne{2474-9567}% \or % JACM \def\@journalName{Journal of the ACM}% @@ -2461,8 +2511,8 @@ Computing Machinery] \def\@journalName{ACM Journal on Computing and Cultural Heritage}% \def\@journalName{ACM J. Comput. Cult. Herit.}% \or % PACMPL - \def\@journalName{PACM on Programming Languages}% - \def\@journalName{PACM Progr. Lang.}% + \def\@journalName{Proceedings of the ACM on Programming Languages}% + \def\@journalName{Proc. ACM Program. Lang.}% \def\@permissionCodeOne{2475-1421}% \or % TAAS \def\@journalName{ACM Transactions on Autonomous and Adaptive Systems}% @@ -2878,7 +2928,7 @@ Computing Machinery] % The current year % \begin{macrocode} \def\acmYear#1{\def\@acmYear{#1}} -\acmYear{2016} +\acmYear{2017} % \end{macrocode} % % \end{macro} @@ -3187,17 +3237,19 @@ Computing Machinery] % \begin{macro}{\ccsdesc@parse} % \changes{v1.28}{2017/01/04}{Change from \cs{to} to % \cs{textrightarrow} (Matteo Riondato)} +% \changes{v1.29}{2017/01/22}{Add spacing after bullet and around +% rightarrow; semicolon separators no longer in bold/italic (John Wickerson)} % 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} \textrightarrow }% + \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 - \ifnum#1>299\textit{#3; }\else + \ifnum#1>499\textbf{#3}; \else + \ifnum#1>299\textit{#3}; \else #3; \fi\fi}} % \end{macrocode} % @@ -3931,6 +3983,7 @@ Computing Machinery] % \changes{v1.15}{2016/07/03}{Added macro} % \begin{macro}{\department} % \changes{v1.15}{2016/07/03}{Added macro} +% \changes{v1.30}{2017/02/10}{Added optional parameter} % \begin{macro}{\streetaddress} % \changes{v1.15}{2016/07/03}{Added macro} % \begin{macro}{\city} @@ -3952,7 +4005,7 @@ Computing Machinery] \if@ACM@journal \let\position\@gobble \def\institution#1{#1\ignorespaces}% - \let\department\@gobble + \newcommand\department[2][0]{}% \let\streetaddress\@gobble \let\city\@gobble \let\state\@gobble @@ -3961,7 +4014,7 @@ Computing Machinery] \else \def\position#1{#1\par}% \def\institution#1{#1\par}% - \def\department#1{#1\par}% + \newcommand\department[2][0]{#2\par}% \def\streetaddress#1{#1\par}% \let\city\@ACM@addtoaddress \let\state\@ACM@addtoaddress @@ -4101,7 +4154,7 @@ Computing Machinery] \g@addto@macro{\@currentaffiliations}{\and##2}% \fi \fi - \global\let\and\@typeset@author@line} + \global\let\and\@typeset@author@line}% \global\setbox\mktitle@bx=\vbox{\noindent\box\mktitle@bx\par\medskip \noindent\addresses\@typeset@author@line \par\medskip}% @@ -4311,16 +4364,17 @@ Computing Machinery] % \changes{v1.19}{2016/07/28}{Include 'Abstract' in PDF bookmarks % (Matthew Fluet)} % \changes{v1.20}{2016/08/03}{Deleted spurious space} +% \changes{v1.29}{2017/01/22}{Removed spurious indentation (John Wickerson)} % Typesetting abstract % \begin{macrocode} \def\@mkabstract{\bgroup - \ifx\@abstract\@lempty\else - {\if@ACM@journal + \ifx\@abstract\@lempty\else + {\phantomsection\addcontentsline{toc}{section}{Abstract}% + \if@ACM@journal \small\noindent \else \section*{Abstract}% \fi - \phantomsection\addcontentsline{toc}{section}{Abstract}% \ignorespaces\@abstract\par}% \fi\egroup} % \end{macrocode} @@ -4476,6 +4530,7 @@ Computing Machinery] % \changes{v1.15}{2016/07/04}{Better handling of anonymous mode} % \changes{v1.16}{2016/07/07}{Customize header/footer text font} % \changes{v1.17}{2016/07/10}{Added paper title to sigs} +% \changes{v1.29}{2017/01/22}{Corrected printfolios (Matthew Fluet)} % The pagestyle for all pages but the first one % \begin{macrocode} \fancypagestyle{standardpagestyle}{% @@ -4498,7 +4553,7 @@ Computing Machinery] \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}% \or % acmlarge \fancyhead[LE]{\ACM@linecount\@headfootfont - \@acmArticle:\if@ACM@printfolios\thepage\quad\textbullet\quad\fi\@shortauthors}% + \@acmArticle\if@ACM@printfolios:\thepage\fi\quad\textbullet\quad\@shortauthors}% \fancyhead[LO]{\ACM@linecount}% \fancyhead[RO]{\@headfootfont \shorttitle\quad\textbullet\quad\@acmArticle\if@ACM@printfolios:\thepage\fi}% @@ -4506,7 +4561,7 @@ Computing Machinery] \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}% \or % acmtog \fancyhead[LE]{\ACM@linecount\@headfootfont - \@acmArticle:\if@ACM@printfolios\thepage\quad\textbullet\quad\fi\@shortauthors}% + \@acmArticle\if@ACM@printfolios:\thepage\fi\quad\textbullet\quad\@shortauthors}% \fancyhead[LO]{\ACM@linecount}% \fancyhead[RO]{\@headfootfont \shorttitle\quad\textbullet\quad\@acmArticle\if@ACM@printfolios:\thepage\fi}% @@ -4758,6 +4813,19 @@ Computing Machinery] % % \end{macro} % +%\subsection{TOC Lists} +%\label{sec:tocs} +% +% \begin{macro}{\@dotsep} +% Related to the \cs{tableofcontents} are all the horizontal fillers. Base +% \LaTeX\ defines \cs{@dottedtocline}, which we should not disable. Yet, this +% command expects \cs{@dotsep} to be defined, but leaves this to the class +% implementation. Since |amsart| does not provide this, we copy the standard +% variant from |article| here. +% \begin{macrocode} +\providecommand*\@dotsep{4.5} +% \end{macrocode} +% \end{macro} % %\subsection{Theorems} %\label{sec:theorems} @@ -5055,8 +5123,9 @@ Computing Machinery] %\label{end} % % +% \changes{v1.30}{2017/02/10}{Added \cs{frenchspacing}} % \begin{macrocode} -\normalsize\normalfont +\normalsize\normalfont\frenchspacing % % \end{macrocode} % diff --git a/Master/texmf-dist/tex/latex/acmart/acmart.cls b/Master/texmf-dist/tex/latex/acmart/acmart.cls index 51d39e13d36..b48188cb9d0 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} -[2017/01/07 v1.28 Typesetting articles for Association of +[2017/02/15 v1.30 Typesetting articles for Association of Computing Machinery] \def\@classname{acmart} \RequirePackage{xkeyval} @@ -357,10 +357,10 @@ Computing Machinery] \let\@footnotetext@nolink\@footnotetext \RequirePackage[bookmarksnumbered,unicode]{hyperref} \pdfstringdefDisableCommands{% - \def\unskip{} - \def\textbullet{- } - \def\textrightarrow{ -> } - \def\footnotemark{} + \def\unskip{}% + \def\textbullet{- }% + \def\textrightarrow{ -> }% + \def\footnotemark{}% } \urlstyle{rm} \ifcase\ACM@format@nr @@ -420,51 +420,51 @@ Computing Machinery] \RequirePackage{geometry} \ifcase\ACM@format@nr \relax % manuscript - \geometry{letterpaper,head=1pc}% + \geometry{letterpaper,head=13pt}% \or % acmsmall \geometry{twoside=true, - includeheadfoot, head=1pc, foot=2pc, + includeheadfoot, head=13pt, foot=2pc, paperwidth=6.75in, paperheight=10in, top=58pt, bottom=44pt, inner=46pt, outer=46pt }% \or % acmlarge - \geometry{twoside=true, head=1pc, foot=2pc, + \geometry{twoside=true, head=13pt, foot=2pc, paperwidth=8.5in, paperheight=11in, includeheadfoot, top=78pt, bottom=114pt, inner=81pt, outer=81pt }% \or % acmtog - \geometry{twoside=true, head=1pc, foot=2pc, + \geometry{twoside=true, head=13pt, foot=2pc, paperwidth=8.5in, paperheight=11in, includeheadfoot, columnsep=24pt, top=52pt, bottom=75pt, inner=52pt, outer=52pt }% \or % sigconf - \geometry{twoside=true, head=1pc, + \geometry{twoside=true, head=13pt, paperwidth=8.5in, paperheight=11in, includeheadfoot, columnsep=2pc, top=57pt, bottom=73pt, inner=54pt, outer=54pt }% \or % siggraph - \geometry{twoside=true, head=1pc, + \geometry{twoside=true, head=13pt, paperwidth=8.5in, paperheight=11in, includeheadfoot, columnsep=2pc, top=57pt, bottom=73pt, inner=54pt, outer=54pt }% \or % sigplan - \geometry{twoside=true, head=1pc, + \geometry{twoside=true, head=13pt, paperwidth=8.5in, paperheight=11in, includeheadfoot=false, columnsep=2pc, top=1in, bottom=1in, inner=0.75in, outer=0.75in }% \or % sigchi - \geometry{twoside=true, head=1pc, + \geometry{twoside=true, head=13pt, paperwidth=8.5in, paperheight=11in, includeheadfoot, columnsep=2pc, top=66pt, bottom=73pt, inner=54pt, outer=54pt }% \or % sigchi-a - \geometry{twoside=false, head=1pc, + \geometry{twoside=false, head=13pt, paperwidth=11in, paperheight=8.5in, includeheadfoot, marginparsep=72pt, marginparwidth=170pt, columnsep=20pt, @@ -546,6 +546,7 @@ Computing Machinery] \RequirePackage[tt=false]{libertine} \RequirePackage[varqu]{zi4} \RequirePackage[libertine]{newtxmath} +\RequirePackage[T1]{fontenc} \fi \if@ACM@sigchiamode \renewcommand{\familydefault}{\sfdefault} @@ -695,9 +696,9 @@ Computing Machinery] \def\@journalNameShort{ACM Comput. Surv.}% \def\@permissionCodeOne{0360-0300}% \or % IMWUT - \def\@journalName{PACM on Interactive, Mobile, Wearable and - Ubiquitous Technologies}% - \def\@journalNameShort{PACM Interact. Mob. Wearable Ubiquitous Technol.}% + \def\@journalName{Proceedings of the ACM on Interactive, Mobile, + Wearable and Ubiquitous Technologies}% + \def\@journalNameShort{Proc. ACM Interact. Mob. Wearable Ubiquitous Technol.}% \def\@permissionCodeOne{2474-9567}% \or % JACM \def\@journalName{Journal of the ACM}% @@ -723,8 +724,8 @@ Computing Machinery] \def\@journalName{ACM Journal on Computing and Cultural Heritage}% \def\@journalName{ACM J. Comput. Cult. Herit.}% \or % PACMPL - \def\@journalName{PACM on Programming Languages}% - \def\@journalName{PACM Progr. Lang.}% + \def\@journalName{Proceedings of the ACM on Programming Languages}% + \def\@journalName{Proc. ACM Program. Lang.}% \def\@permissionCodeOne{2475-1421}% \or % TAAS \def\@journalName{ACM Transactions on Autonomous and Adaptive Systems}% @@ -986,7 +987,7 @@ Computing Machinery] \def\acmArticleSeq#1{\def\@acmArticleSeq{#1}} \acmArticleSeq{\@acmArticle} \def\acmYear#1{\def\@acmYear{#1}} -\acmYear{2016} +\acmYear{2017} \def\acmMonth#1{\def\@acmMonth{#1}} \acmMonth{1} \def\@acmPubDate{\ifcase\@acmMonth\or @@ -1082,11 +1083,11 @@ Computing Machinery] \RequirePackage{textcomp} \def\ccsdesc@parse#1~#2~#3~{% \expandafter\ifx\csname CCS@#2\endcsname\relax - \expandafter\gdef\csname CCS@#2\endcsname{\textbullet\textbf{#2} \textrightarrow }% + \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 - \ifnum#1>299\textit{#3; }\else + \ifnum#1>499\textbf{#3}; \else + \ifnum#1>299\textit{#3}; \else #3; \fi\fi}} \newif\if@printcopyright \@printcopyrighttrue @@ -1587,7 +1588,7 @@ Computing Machinery] \if@ACM@journal \let\position\@gobble \def\institution#1{#1\ignorespaces}% - \let\department\@gobble + \newcommand\department[2][0]{}% \let\streetaddress\@gobble \let\city\@gobble \let\state\@gobble @@ -1596,7 +1597,7 @@ Computing Machinery] \else \def\position#1{#1\par}% \def\institution#1{#1\par}% - \def\department#1{#1\par}% + \newcommand\department[2][0]{#2\par}% \def\streetaddress#1{#1\par}% \let\city\@ACM@addtoaddress \let\state\@ACM@addtoaddress @@ -1682,7 +1683,7 @@ Computing Machinery] \g@addto@macro{\@currentaffiliations}{\and##2}% \fi \fi - \global\let\and\@typeset@author@line} + \global\let\and\@typeset@author@line}% \global\setbox\mktitle@bx=\vbox{\noindent\box\mktitle@bx\par\medskip \noindent\addresses\@typeset@author@line \par\medskip}% @@ -1783,12 +1784,12 @@ Computing Machinery] \def\@setaddresses{} \def\@mkabstract{\bgroup \ifx\@abstract\@lempty\else - {\if@ACM@journal + {\phantomsection\addcontentsline{toc}{section}{Abstract}% + \if@ACM@journal \small\noindent \else \section*{Abstract}% \fi - \phantomsection\addcontentsline{toc}{section}{Abstract}% \ignorespaces\@abstract\par}% \fi\egroup} \def\@mkbibcitation{\bgroup @@ -1889,7 +1890,7 @@ Computing Machinery] \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}% \or % acmlarge \fancyhead[LE]{\ACM@linecount\@headfootfont - \@acmArticle:\if@ACM@printfolios\thepage\quad\textbullet\quad\fi\@shortauthors}% + \@acmArticle\if@ACM@printfolios:\thepage\fi\quad\textbullet\quad\@shortauthors}% \fancyhead[LO]{\ACM@linecount}% \fancyhead[RO]{\@headfootfont \shorttitle\quad\textbullet\quad\@acmArticle\if@ACM@printfolios:\thepage\fi}% @@ -1897,7 +1898,7 @@ Computing Machinery] \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}% \or % acmtog \fancyhead[LE]{\ACM@linecount\@headfootfont - \@acmArticle:\if@ACM@printfolios\thepage\quad\textbullet\quad\fi\@shortauthors}% + \@acmArticle\if@ACM@printfolios:\thepage\fi\quad\textbullet\quad\@shortauthors}% \fancyhead[LO]{\ACM@linecount}% \fancyhead[RO]{\@headfootfont \shorttitle\quad\textbullet\quad\@acmArticle\if@ACM@printfolios:\thepage\fi}% @@ -2064,6 +2065,7 @@ Computing Machinery] \fi \def\@adddotafter#1{#1\@addpunct{.}} \def\@addspaceafter#1{#1\@addpunct{\enspace}} +\providecommand*\@dotsep{4.5} \def\@acmplainbodyfont{\itshape} \def\@acmplainindent{\parindent} \def\@acmplainheadfont{\scshape} @@ -2188,7 +2190,7 @@ Computing Machinery] \ifx\@tempa\@tempb arXiv:\href{http://arxiv.org/abs/#2}{#2}\else arXiv:#2% \fi} -\normalsize\normalfont +\normalsize\normalfont\frenchspacing \endinput %% %% End of file `acmart.cls'. -- cgit v1.2.3