From d8d4c8c20f235a6610baf22bea580063cc19e9a6 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 13 Jan 2020 03:01:06 +0000 Subject: CTAN sync 202001130301 --- .../latex/contrib/acmart/ACM-Reference-Format.bst | 10 ++++--- macros/latex/contrib/acmart/README | 4 +++ macros/latex/contrib/acmart/acmart.dtx | 30 ++++++++++----------- macros/latex/contrib/acmart/acmart.pdf | Bin 835600 -> 834371 bytes macros/latex/contrib/acmart/acmguide.pdf | Bin 405658 -> 405658 bytes .../contrib/acmart/samples/sample-acmlarge.pdf | Bin 563818 -> 563818 bytes .../acmart/samples/sample-acmsmall-conf.pdf | Bin 1008632 -> 1008632 bytes .../contrib/acmart/samples/sample-acmsmall.pdf | Bin 573671 -> 573671 bytes .../latex/contrib/acmart/samples/sample-acmtog.pdf | Bin 520986 -> 520986 bytes .../contrib/acmart/samples/sample-authordraft.pdf | Bin 1000722 -> 1000733 bytes .../contrib/acmart/samples/sample-manuscript.pdf | Bin 573679 -> 573679 bytes .../contrib/acmart/samples/sample-sigchi-a.pdf | Bin 460372 -> 460383 bytes .../latex/contrib/acmart/samples/sample-sigchi.pdf | Bin 574639 -> 574638 bytes .../contrib/acmart/samples/sample-sigconf.pdf | Bin 996944 -> 996956 bytes .../contrib/acmart/samples/sample-sigplan.pdf | Bin 971885 -> 1006144 bytes .../contrib/acmart/samples/sample-xelatex.pdf | Bin 630477 -> 630491 bytes .../contrib/circledsteps/circledsteps-manual.pdf | Bin 404870 -> 404880 bytes .../contrib/circledsteps/circledsteps-manual.tex | 7 ++--- macros/latex/contrib/circledsteps/circledsteps.sty | 19 ++++++++----- 19 files changed, 40 insertions(+), 30 deletions(-) (limited to 'macros') diff --git a/macros/latex/contrib/acmart/ACM-Reference-Format.bst b/macros/latex/contrib/acmart/ACM-Reference-Format.bst index 554a604985..fa5273282a 100644 --- a/macros/latex/contrib/acmart/ACM-Reference-Format.bst +++ b/macros/latex/contrib/acmart/ACM-Reference-Format.bst @@ -1252,18 +1252,20 @@ FUNCTION { format.city } if$ } { - location empty.or.unknown - { + location empty.or.unknown + { date empty.or.unknown { " (" * city * ")" * } { " (" * city * ", " * date * ")" * } + if$ } - { + { date empty.or.unknown { " (" * location * ")" * } { " (" * location * ", " * date * ")" * } + if$ } - if$ + if$ } if$ } diff --git a/macros/latex/contrib/acmart/README b/macros/latex/contrib/acmart/README index 79d183c36f..8e584fcc3c 100644 --- a/macros/latex/contrib/acmart/README +++ b/macros/latex/contrib/acmart/README @@ -248,3 +248,7 @@ Version 1.66 Bug fixes CCS concepts and keywords are now mandatory for papers over two pages. Authors' addresses are mandatory for journal articles. + +Version 1.67 Urgent bug fixes: + BibTeX style bug fixed (Michael D. Adams) + Sigplan special section bugfix diff --git a/macros/latex/contrib/acmart/acmart.dtx b/macros/latex/contrib/acmart/acmart.dtx index f659f3f668..d63df04341 100644 --- a/macros/latex/contrib/acmart/acmart.dtx +++ b/macros/latex/contrib/acmart/acmart.dtx @@ -1842,7 +1842,7 @@ \ProvidesFile{acmart.dtx} % %\ProvidesClass{acmart} -[2019/12/18 v1.66 Typesetting articles for the Association for Computing Machinery] +[2020/01/11 v1.67 Typesetting articles for the Association for Computing Machinery] % \end{macrocode} % % \changes{v1.00}{2016/04/14}{First released version} @@ -3197,6 +3197,8 @@ % |algorithm*| in case somebody uses them. % \changes{v1.66}{2019/11/23}{Patching algorithm and algorithm* % to prevent spurious space warnings} +% \changes{v1.67}{2020/01/11}{Patching lstlisting and lstlisting* +% to prevent spurious space warnings} % \begin{macrocode} \AtBeginEnvironment{figure}{\@Description@presentfalse \let\@vspace\@vspace@orig @@ -3218,6 +3220,10 @@ \let\@vspacer\@vspacer@orig} \AtBeginEnvironment{algorithm*}{\let\@vspace\@vspace@orig \let\@vspacer\@vspacer@orig} +\AtBeginEnvironment{lstlisting}{\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig} +\AtBeginEnvironment{lstlisting*}{\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig} % \end{macrocode} % @@ -5154,7 +5160,7 @@ \if@ACM@printccs \ifx\@concepts\@empty\else\bgroup {\@specialsection{CCS Concepts}% - \@concepts\par}\egroup + \noindent\@concepts\par}\egroup \fi \fi \ifx\@keywords\@empty\else\bgroup @@ -5163,7 +5169,7 @@ \else \@specialsection{Keywords}% \fi - \@keywords}\par\egroup + \noindent\@keywords}\par\egroup \fi \andify\authors \andify\shortauthors @@ -5194,6 +5200,8 @@ % % \begin{macro}{\@specialsection} % \changes{v1.66}{2019/11/23}{Suppress warnings about \cs{vspace}} +% \changes{v1.67}{2020/01/11}{Paragraph inside group does not print +% its argument. Added a bugfix} % This macro starts sections for proceedings and uses \cs{small} for journals % \begin{macrocode} \def\@specialsection#1{% @@ -5214,7 +5222,7 @@ \or % siggraph \section*{#1}% \or % sigplan - \paragraph*{#1}% + \noindent\emph{\bfseries#1.}~% \or % sigchi \section*{#1}% \or % sigchi-a @@ -6578,6 +6586,7 @@ {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}% {-3.5\p@}% {\ACM@NRadjust{\@parfont\@adddotafter}}} + \renewcommand\part{\@startsection{part}{9}{\z@}% {-10\p@ \@plus -4\p@ \@minus -2\p@}% {4\p@}% @@ -6606,6 +6615,7 @@ % \changes{v1.40}{2017/06/04}{Switched to MakeTextUppercase} % \changes{v1.45}{2017/08/15}{Switched \cs{bfeseries}\cs{sffamily} to % \cs{sffamily}\cs{bfseries}} +% \changes{v1.67}{2020/01/11}{Deleted redefinitions of sections} % Fonts for sections etc. are different for different formats. % \begin{macrocode} \def\@secfont{\sffamily\bfseries\section@raggedright\MakeTextUppercase} @@ -6631,20 +6641,8 @@ \or % sigplan \def\@secfont{\bfseries\Large\section@raggedright} \def\@subsecfont{\bfseries\section@raggedright} - \renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}% - {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}% - {.25\baselineskip}% - {\@subsubsecfont}} \def\@subsubsecfont{\bfseries\section@raggedright} - \renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}% - {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}% - {-3.5\p@}% - {\@parfont\@addspaceafter}} \def\@parfont{\bfseries\itshape} - \renewcommand\subparagraph{\@startsection{subparagraph}{5}{\z@}% - {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}% - {-3.5\p@}% - {\@subparfont\@addspaceafter}} \def\@subparfont{\itshape} \or % sigchi \setcounter{secnumdepth}{1} diff --git a/macros/latex/contrib/acmart/acmart.pdf b/macros/latex/contrib/acmart/acmart.pdf index 2a7be30a71..29ae3c77c6 100644 Binary files a/macros/latex/contrib/acmart/acmart.pdf and b/macros/latex/contrib/acmart/acmart.pdf differ diff --git a/macros/latex/contrib/acmart/acmguide.pdf b/macros/latex/contrib/acmart/acmguide.pdf index c08c969b99..af84e88ca0 100644 Binary files a/macros/latex/contrib/acmart/acmguide.pdf and b/macros/latex/contrib/acmart/acmguide.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf index c098d6a475..b825eb8c3c 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf and b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf index 3bf3d2f13c..ea39d42da6 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf and b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf index ecc270129e..0f5e101957 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf and b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf index 72a1ddd7bb..e69c92bd20 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf and b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-authordraft.pdf b/macros/latex/contrib/acmart/samples/sample-authordraft.pdf index 8700c317c3..baa98ac773 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-authordraft.pdf and b/macros/latex/contrib/acmart/samples/sample-authordraft.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf index 203849fb0e..07669d4ce8 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf and b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-sigchi-a.pdf b/macros/latex/contrib/acmart/samples/sample-sigchi-a.pdf index 0c28d1a751..940cc553d9 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-sigchi-a.pdf and b/macros/latex/contrib/acmart/samples/sample-sigchi-a.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-sigchi.pdf b/macros/latex/contrib/acmart/samples/sample-sigchi.pdf index 4836f34d7a..773432ce6d 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-sigchi.pdf and b/macros/latex/contrib/acmart/samples/sample-sigchi.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf index 73b32227e8..7fbea363fb 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf and b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf index a9275d405d..6a29056f3b 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf and b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf differ diff --git a/macros/latex/contrib/acmart/samples/sample-xelatex.pdf b/macros/latex/contrib/acmart/samples/sample-xelatex.pdf index 5dcd47755b..31f5777864 100644 Binary files a/macros/latex/contrib/acmart/samples/sample-xelatex.pdf and b/macros/latex/contrib/acmart/samples/sample-xelatex.pdf differ diff --git a/macros/latex/contrib/circledsteps/circledsteps-manual.pdf b/macros/latex/contrib/circledsteps/circledsteps-manual.pdf index e7b54234b3..f428edaea5 100644 Binary files a/macros/latex/contrib/circledsteps/circledsteps-manual.pdf and b/macros/latex/contrib/circledsteps/circledsteps-manual.pdf differ diff --git a/macros/latex/contrib/circledsteps/circledsteps-manual.tex b/macros/latex/contrib/circledsteps/circledsteps-manual.tex index 4867907abf..d1599bb95c 100644 --- a/macros/latex/contrib/circledsteps/circledsteps-manual.tex +++ b/macros/latex/contrib/circledsteps/circledsteps-manual.tex @@ -40,6 +40,7 @@ The package loads (if not already loaded) the packages \texttt{pict2e}, \texttt{ The manual is for version~\cstepsversion. The main changes between version are listed below. \begin{description} + \item[v1.3] Minor fixes to the manual; added a warning in case the patching of \texttt{picture.sty} fails. \item[v1.2] Added optional argument to the commands and make them sensitive to math mode (thanks to \texttt{@tallmarmot} for the suggestion and example code); fixed several bugs. Added \texttt{fill color} for the circles background. @@ -126,7 +127,7 @@ If you want to change colors it's easy: \end{LTXexample} \begin{LTXexample} -\pgfkeys{/csteps/inner color=white} +\pgfkeys{/csteps/inner color=yellow} \pgfkeys{/csteps/outer color=red} \pgfkeys{/csteps/fill color=black} And you can have filled circles and ovals: @@ -154,7 +155,7 @@ You can have also quite nice math mode effects, thanks to suggestion from \textt \section{Automatically generated numbers} -The command \verb|\cstep| will generate a circled number, starting from \texttt{1}, that can be referenced with the normal \verb|\label|/\verb|\ref| mechanism.\footnote{Notice that in the example the numbers in the references one the right are blue to to \texttt{hyperref} configuration!} You can reset the numbering with +The command \verb|\cstep| will generate a circled number, starting from \texttt{1}, that can be referenced with the normal \verb|\label|/\verb|\ref| mechanism.\footnote{Notice that in the example the numbers in the references on the right are blue due to \texttt{hyperref} configuration!} You can reset the numbering with \verb|\startcstep|. For example: \input{ctikzexample.tex} @@ -170,7 +171,7 @@ The definition of \verb|CircledTexT| is simply the following one; you can get id \begin{lstlisting} \newcommand{\CircledText}[2][]{% - \csteps@CircledParamOpts{inner color=none, outer color=none, #1}{1}{#2}% + \CircledParamOpts{inner color=none, outer color=none, #1}{1}{#2}% } \end{lstlisting} diff --git a/macros/latex/contrib/circledsteps/circledsteps.sty b/macros/latex/contrib/circledsteps/circledsteps.sty index db49c69cbc..8b5d69cfc8 100644 --- a/macros/latex/contrib/circledsteps/circledsteps.sty +++ b/macros/latex/contrib/circledsteps/circledsteps.sty @@ -1,7 +1,7 @@ % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1996/06/01] -\ProvidesPackage{circledsteps}[2020/01/08 v1.2 Circled steps that you can reference] -\def\cstepsversion{v1.2} +\ProvidesPackage{circledsteps}[2020/01/12 v1.3 Circled steps that you can reference] +\def\cstepsversion{v1.3} % \end{macrocode} % % Copyright (c) 2019 Romano Giannetti @@ -35,7 +35,12 @@ \@ifpackageloaded{picture}{\patchcmd\PcOrg@@oval}{\patchcmd\@oval} {\pIIe@strokeGraph} {\ifcstepsfilledovals\pIIe@fillGraph\else\pIIe@strokeGraph\fi} - {}{} + {}{% + \PackageWarningNoLine{circledsteps}{% + Failed to patch either picture.sty or pict2e.sty:\MessageBreak + \space\space oval shapes will not be filled. + } + } \newsavebox\csteps@CBox @@ -56,8 +61,8 @@ \makebox[\csteps@XLength]{% X bigger than Y \makebox(0,\csteps@YLength){% \ifx\csteps@fillcolor\csteps@none\else - \color{\csteps@fillcolor}% - {\cstepsfilledovalstrue\put(0,0){\oval(\csteps@XLength,\csteps@YLength)}}% + {\color{\csteps@fillcolor}% + \cstepsfilledovalstrue\put(0,0){\oval(\csteps@XLength,\csteps@YLength)}}% \fi \ifx\csteps@outercolor\csteps@none\else \color{\csteps@outercolor}% @@ -77,8 +82,8 @@ \makebox[\csteps@YLength]{% \makebox(0,\csteps@YLength){% \ifx\csteps@fillcolor\csteps@none\else - \color{\csteps@fillcolor}% - \put(0,0){\circle*{\csteps@YLength}}% + {\color{\csteps@fillcolor}% + \put(0,0){\circle*{\csteps@YLength}}}% \fi \ifx\csteps@outercolor\csteps@none\else \color{\csteps@outercolor}% -- cgit v1.2.3