diff options
17 files changed, 97 insertions, 26 deletions
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 670b2b55481..c036479984e 100644 --- a/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst +++ b/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst @@ -817,7 +817,8 @@ FUNCTION { output.year.check } year empty.or.unknown { "empty year in " cite$ * warning$ } { write$ - " " year * extra.label * + " \bibinfo{year}{" year * "}" * + "\natexlab{" extra.label * "}" * * mid.sentence 'output.state := } if$ @@ -1239,7 +1240,10 @@ FUNCTION { format.editors.fml } editor empty.or.unknown { "" } { - editor format.names.fml editor num.names$ #1 > + "\bibfield{editor}{" + editor format.names.fml + * "}" * + editor num.names$ #1 > { " (Eds.)" * } { " (Ed.)" * } if$ @@ -3325,6 +3329,7 @@ FUNCTION { begin.bib } "% invisible to TeX" writeln "\providecommand\bibfield[2]{#2}" writeln "\providecommand\bibinfo[2]{#2}" writeln + "\providecommand\natexlab[1]{#1}" writeln } EXECUTE {begin.bib} diff --git a/Master/texmf-dist/doc/latex/acmart/Makefile b/Master/texmf-dist/doc/latex/acmart/Makefile index b90e372243b..97b03d12763 100644 --- a/Master/texmf-dist/doc/latex/acmart/Makefile +++ b/Master/texmf-dist/doc/latex/acmart/Makefile @@ -39,7 +39,7 @@ all: ${PDF} %.cls: %.ins %.dtx pdflatex $< -%.pdf: %.tex $(PACKAGE).cls +%.pdf: %.tex $(PACKAGE).cls ACM-Reference-Format.bst pdflatex $< - bibtex $* pdflatex $< diff --git a/Master/texmf-dist/doc/latex/acmart/README b/Master/texmf-dist/doc/latex/acmart/README index a912373c93a..fb0f4c34c83 100644 --- a/Master/texmf-dist/doc/latex/acmart/README +++ b/Master/texmf-dist/doc/latex/acmart/README @@ -34,5 +34,8 @@ version 1.17 Formatting changes for margins and lists. Bug fixes. version 1.18 Natbib is now the default for all versions. A unified bib file is used for all styles. Better treatment of multiple affiliations. - +version 1.19 Include 'Abstract', 'Acknowledgements', and 'References' + in PDF bookmarks. + +version 1.20 Bug fixes, documentation updates diff --git a/Master/texmf-dist/doc/latex/acmart/acmart.bib b/Master/texmf-dist/doc/latex/acmart/acmart.bib index 06f4ce82760..bb56301f3ee 100644 --- a/Master/texmf-dist/doc/latex/acmart/acmart.bib +++ b/Master/texmf-dist/doc/latex/acmart/acmart.bib @@ -63,3 +63,27 @@ year = 2007 } +@Manual{Sommerfeldt13:Subcaption, + title = {The subcaption package}, + author = {Axel Sommerfeldt}, + month = {April}, + year = 2013, + note = {\url{http://www.ctan.org/pkg/subcaption}}, +} + + +@Manual{Nomencl, + title = {A package to create a nomenclature}, + author = {Boris Veytsman and Bern Schandl and Lee Netherton + and CV Radhakrishnan}, + month = {September}, + note = {\url{http://www.ctan.org/pkg/nomencl}}, + year = 2005} + +@Manual{Talbot16:Glossaries, + title = {User Manual for glossaries.sty v4.25}, + author = {Nicola L. C. Talbot}, + month = {June}, + year = 2016, + note = {\url{http://www.ctan.org/pkg/subcaption}}} + diff --git a/Master/texmf-dist/doc/latex/acmart/acmart.pdf b/Master/texmf-dist/doc/latex/acmart/acmart.pdf Binary files differindex ac7ffe99f62..222df06761c 100644 --- a/Master/texmf-dist/doc/latex/acmart/acmart.pdf +++ b/Master/texmf-dist/doc/latex/acmart/acmart.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf Binary files differindex 2251f7f8080..e41de09833b 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf +++ b/Master/texmf-dist/doc/latex/acmart/sample-acmlarge.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf Binary files differindex 2eab3c0f65f..a833b3bcfb3 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf +++ b/Master/texmf-dist/doc/latex/acmart/sample-acmsmall.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf b/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf Binary files differindex 696211eded7..b1c0aab946b 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf +++ b/Master/texmf-dist/doc/latex/acmart/sample-acmtog.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf b/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf Binary files differindex adc6d8eb2a8..c8be5efd8d9 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf +++ b/Master/texmf-dist/doc/latex/acmart/sample-manuscript.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex b/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex index 7a7ca096cc1..b3862ee502c 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex +++ b/Master/texmf-dist/doc/latex/acmart/sample-manuscript.tex @@ -1,6 +1,7 @@ \listfiles \documentclass[manuscript, review, screen]{acmart} -\setcitestyle{super,sort&compress} +%\setcitestyle{super,sort&compress} +\citestyle{acmauthoryear} \usepackage{booktabs} % For formal tables \usepackage[ruled]{algorithm2e} % For algorithms diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf Binary files differindex b5a4d52f9eb..2b70a0b34d9 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf +++ b/Master/texmf-dist/doc/latex/acmart/sample-sigchi-a.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf Binary files differindex 8451289eeae..c17438ec7ed 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf +++ b/Master/texmf-dist/doc/latex/acmart/sample-sigchi.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf Binary files differindex c4f16a5e396..4f951be5022 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf +++ b/Master/texmf-dist/doc/latex/acmart/sample-sigconf.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdf b/Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdf Binary files differindex c20049bdd02..496248964ea 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdf +++ b/Master/texmf-dist/doc/latex/acmart/sample-siggraph.pdf diff --git a/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf b/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf Binary files differindex 749528509f4..5d316e48f93 100644 --- a/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf +++ b/Master/texmf-dist/doc/latex/acmart/sample-sigplan.pdf diff --git a/Master/texmf-dist/source/latex/acmart/acmart.dtx b/Master/texmf-dist/source/latex/acmart/acmart.dtx index 46a8f4e8f5c..9765b874f2d 100644 --- a/Master/texmf-dist/source/latex/acmart/acmart.dtx +++ b/Master/texmf-dist/source/latex/acmart/acmart.dtx @@ -1132,10 +1132,18 @@ % assignments. % % +%\subsection{Other notable packages and typographic remarks} +%\label{sec:ug_other} % +% Several other packages are recommended for specialized tasks. +% +% The package \textsl{subcaption}~\cite{Sommerfeldt13:Subcaption} is +% recommended for complex figures with several subplots or subfigures +% that require separate subcaptioning. The packages +% \textsl{nomencl}~\cite{Nomencl} and +% \textsl{glossaries}~\cite{Talbot16:Glossaries} can be used for the +% automatic creation of the lists of symbols and concepts used. % -%\subsection{Typographich niceties} -%\label{sec:ug_penalties} % % By default |acmart| prevents all widows and orphans (i.e. lonely % lines at the beginning and the end of the page) and hyphenation at @@ -1179,7 +1187,7 @@ \ProvidesFile{acmart.dtx} %</gobble> %<class>\ProvidesClass{acmart} -[2016/07/12 v1.18 Typesetting articles for Association of +[2016/08/06 v1.20 Typesetting articles for Association of Computing Machinery] % \end{macrocode} % @@ -1212,6 +1220,9 @@ Computing Machinery] % Fluet)} % \changes{v1.18}{2016/07/10}{Natbib is now the default for all % formats} +% \changes{v1.19}{2016/07/28}{Include 'Abstract', 'Acknowledgements', +% and 'References' in PDF bookmarks (Matthew Fluet)} +% \changes{v1.20}{2016/08/06}{Bug fixes for bst} % % % And the driver code: @@ -1507,6 +1518,8 @@ Computing Machinery] \fi % \end{macrocode} % +% \changes{v1.19}{2016/07/28}{Include 'References' in PDF bookmarks +% (Matthew Fluet)} % \changes{v1.14}{2016/06/09}{Patched \cs{citestyle}} % Citations. We patch \cs{setcitestyle} to allow, e.g., % \cs{setcitestyle}|{sort}| and \cs{setcitestyle}|{nosort}|. We patch @@ -1514,6 +1527,10 @@ Computing Machinery] % \begin{macrocode} \if@ACM@natbib \RequirePackage{natbib} + \renewcommand{\bibsection}{% + \section*{\refname}% + \phantomsection\addcontentsline{toc}{section}{\refname}% + } \renewcommand{\bibfont}{\bibliofont} \renewcommand\setcitestyle[1]{ \@for\@tempa:=#1\do @@ -1724,7 +1741,7 @@ Computing Machinery] % \begin{macrocode} \let\@footnotemark@nolink\@footnotemark \let\@footnotetext@nolink\@footnotetext -\RequirePackage{hyperref} +\RequirePackage[bookmarksnumbered]{hyperref} \urlstyle{rm} \ifcase\ACM@format@nr \relax % manuscript @@ -2753,7 +2770,7 @@ Computing Machinery] % \end{macro} % % \begin{macro}{\acmMonth} -% \changes{v1.17}{2017/07/09}{The default must be numerical. Closes \#50.} +% \changes{v1.17}{2016/07/09}{The default must be numerical. Closes \#50.} % The current month % \begin{macrocode} \def\acmMonth#1{\def\@acmMonth{#1}} @@ -3403,12 +3420,12 @@ Computing Machinery] \@topnum\z@ % this prevents figures from falling at the top of page % 1 \hsize=\textwidth - \def\@makefnmark{\hbox{\@textsuperscript{\@thefnmark}}} + \def\@makefnmark{\hbox{\@textsuperscript{\@thefnmark}}}% \@mktitle\if@ACM@sigchiamode\else\@mkauthors\fi\@mkteasers \@printtopmatter \if@ACM@sigchiamode\@mkauthors\fi \setcounter{footnote}{0}% - \def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}} + \def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}}% \@titlenotes \@subtitlenotes \@authornotes @@ -3844,7 +3861,7 @@ Computing Machinery] % \end{macro} % % \begin{macro}{\@mkauthors} -% \changes{v1.17}{2017/07/09}{TOG now uses the same authors block as +% \changes{v1.17}{2016/07/09}{TOG now uses the same authors block as % other journals} % Typesetting authors % \begin{macrocode} @@ -3923,7 +3940,7 @@ Computing Machinery] % \end{macrocode} % % \begin{macro}{\@typeset@author@line} -% \changes{v1.18}{2017/07/12}{Added macro} +% \changes{v1.18}{2016/07/12}{Added macro} % At this point we have \cs{@currentauthors} and % \cs{@currentaffiliations}. We typeset them in the journal style % \begin{macrocode} @@ -3941,7 +3958,7 @@ Computing Machinery] % % % \begin{macro}{\@mkauthors@i} -% \changes{v1.18}{2017/07/12}{Now we andify affiliations} +% \changes{v1.18}{2016/07/12}{Now we andify affiliations} % This is version used in most formats. Note that \cs{and} between % authors with the same affiliation becomes \verb*| and |: % \begin{macrocode} @@ -3975,7 +3992,7 @@ Computing Machinery] % \end{macro} % % \begin{macro}{\@mkauthors@ii} -% \changes{v1.17}{2017/07/09}{Deleted} +% \changes{v1.17}{2016/07/09}{Deleted} % \cs{@mkauthors@iI} was version used in acmtog. No longer necessary % % \end{macro} @@ -4172,6 +4189,9 @@ Computing Machinery] % \end{macro} % % \begin{macro}{\@mkabstract} +% \changes{v1.19}{2016/07/28}{Include 'Abstract' in PDF bookmarks +% (Matthew Fluet)} +% \changes{v1.20}{2016/08/03}{Deleted spurious space} % Typesetting abstract % \begin{macrocode} \def\@mkabstract{\bgroup @@ -4181,7 +4201,8 @@ Computing Machinery] \else \section*{Abstract}% \fi - \@abstract\par}% + \phantomsection\addcontentsline{toc}{section}{Abstract}% + \ignorespaces\@abstract\par}% \fi\egroup} % \end{macrocode} % @@ -4832,11 +4853,18 @@ Computing Machinery] %\label{sec:acks} % % \begin{macro}{\acks} +% \changes{v1.19}{2016/07/28}{Include 'Acknowledgements' in PDF bookmarks +% (Matthew Fluet)} % \changes{v1.15}{2016/07/05}{Added macro} % This is a |comment|-like structure % \begin{macrocode} -\specialcomment{acks} - {\begingroup\section*{Acknowledgments}}{\endgroup} +\specialcomment{acks}{% + \begingroup + \section*{Acknowledgments} + \phantomsection\addcontentsline{toc}{section}{Acknowledgments} +}{% + \endgroup +} % \end{macrocode} % % \end{macro} diff --git a/Master/texmf-dist/tex/latex/acmart/acmart.cls b/Master/texmf-dist/tex/latex/acmart/acmart.cls index 7035523121d..5bd1277ad2d 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/07/12 v1.18 Typesetting articles for Association of +[2016/08/06 v1.20 Typesetting articles for Association of Computing Machinery] \def\@classname{acmart} \RequirePackage{xkeyval} @@ -176,6 +176,10 @@ Computing Machinery] \fi \if@ACM@natbib \RequirePackage{natbib} + \renewcommand{\bibsection}{% + \section*{\refname}% + \phantomsection\addcontentsline{toc}{section}{\refname}% + } \renewcommand{\bibfont}{\bibliofont} \renewcommand\setcitestyle[1]{ \@for\@tempa:=#1\do @@ -349,7 +353,7 @@ Computing Machinery] \@xsect{#3}} \let\@footnotemark@nolink\@footnotemark \let\@footnotetext@nolink\@footnotetext -\RequirePackage{hyperref} +\RequirePackage[bookmarksnumbered]{hyperref} \urlstyle{rm} \ifcase\ACM@format@nr \relax % manuscript @@ -1270,12 +1274,12 @@ Computing Machinery] \@topnum\z@ % this prevents figures from falling at the top of page % 1 \hsize=\textwidth - \def\@makefnmark{\hbox{\@textsuperscript{\@thefnmark}}} + \def\@makefnmark{\hbox{\@textsuperscript{\@thefnmark}}}% \@mktitle\if@ACM@sigchiamode\else\@mkauthors\fi\@mkteasers \@printtopmatter \if@ACM@sigchiamode\@mkauthors\fi \setcounter{footnote}{0}% - \def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}} + \def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}}% \@titlenotes \@subtitlenotes \@authornotes @@ -1766,7 +1770,8 @@ Computing Machinery] \else \section*{Abstract}% \fi - \@abstract\par}% + \phantomsection\addcontentsline{toc}{section}{Abstract}% + \ignorespaces\@abstract\par}% \fi\egroup} \def\@mkbibcitation{\bgroup \def\footnotemark{}% @@ -2135,8 +2140,13 @@ Computing Machinery] }{% \popQED\endtrivlist\@endpefalse } -\specialcomment{acks} - {\begingroup\section*{Acknowledgments}}{\endgroup} +\specialcomment{acks}{% + \begingroup + \section*{Acknowledgments} + \phantomsection\addcontentsline{toc}{section}{Acknowledgments} +}{% + \endgroup +} \def\grantsponsor#1#2#3{#2} \newcommand\grantnum[3][]{#3% \def\@tempa{#1}\ifx\@tempa\@empty\else\space(\url{#1})\fi} |