acmart (12jan20)

git-svn-id: svn://tug.org/texlive/trunk@53381 c570f23f-e606-0410-a88d-b1316a301751

17 files changed, 33 insertions, 36 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 554a604985b..fa5273282a1 100644
--- a/Master/texmf-dist/bibtex/bst/acmart/ACM-Reference-Format.bst
+++ b/Master/texmf-dist/bibtex/bst/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/Master/texmf-dist/doc/latex/acmart/README b/Master/texmf-dist/doc/latex/acmart/README
index 79d183c36f0..8e584fcc3cf 100644
--- a/Master/texmf-dist/doc/latex/acmart/README
+++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/acmart/acmart.pdf b/Master/texmf-dist/doc/latex/acmart/acmart.pdf
index 2a7be30a71b..29ae3c77c6a 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/acmguide.pdf b/Master/texmf-dist/doc/latex/acmart/acmguide.pdf
index c08c969b991..af84e88ca0f 100644
--- a/Master/texmf-dist/doc/latex/acmart/acmguide.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/acmguide.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmlarge.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmlarge.pdf
index c098d6a475b..b825eb8c3cf 100644
--- a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmlarge.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmlarge.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-conf.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-conf.pdf
index 3bf3d2f13cd..ea39d42da66 100644
--- a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-conf.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-conf.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall.pdf
index ecc270129e7..0f5e1019570 100644
--- a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmtog.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmtog.pdf
index 72a1ddd7bb4..e69c92bd20a 100644
--- a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmtog.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmtog.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-authordraft.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-authordraft.pdf
index 8700c317c3f..baa98ac7737 100644
--- a/Master/texmf-dist/doc/latex/acmart/samples/sample-authordraft.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-authordraft.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-manuscript.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-manuscript.pdf
index 203849fb0ed..07669d4ce8c 100644
--- a/Master/texmf-dist/doc/latex/acmart/samples/sample-manuscript.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-manuscript.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigchi-a.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigchi-a.pdf
index 0c28d1a7513..940cc553d9c 100644
--- a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigchi-a.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigchi-a.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigchi.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigchi.pdf
index 4836f34d7a4..773432ce6de 100644
--- a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigchi.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigchi.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf.pdf
index 73b32227e81..7fbea363fbd 100644
--- a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigplan.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigplan.pdf
index a9275d405d7..6a29056f3b7 100644
--- a/Master/texmf-dist/doc/latex/acmart/samples/sample-sigplan.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigplan.pdf
diff --git a/Master/texmf-dist/doc/latex/acmart/samples/sample-xelatex.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-xelatex.pdf
index 5dcd47755b5..31f57778640 100644
--- a/Master/texmf-dist/doc/latex/acmart/samples/sample-xelatex.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-xelatex.pdf
diff --git a/Master/texmf-dist/source/latex/acmart/acmart.dtx b/Master/texmf-dist/source/latex/acmart/acmart.dtx
index f659f3f6689..d63df043413 100644
--- a/Master/texmf-dist/source/latex/acmart/acmart.dtx
+++ b/Master/texmf-dist/source/latex/acmart/acmart.dtx
@@ -1842,7 +1842,7 @@
 \ProvidesFile{acmart.dtx}
 %</gobble>
 %<class>\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/Master/texmf-dist/tex/latex/acmart/acmart.cls b/Master/texmf-dist/tex/latex/acmart/acmart.cls
index f123aecd61d..1d72f7e8324 100644
--- a/Master/texmf-dist/tex/latex/acmart/acmart.cls
+++ b/Master/texmf-dist/tex/latex/acmart/acmart.cls
@@ -37,7 +37,7 @@
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
 \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]
 \def\@classname{acmart}
 \InputIfFileExists{acmart-preload-hook.tex}{%
   \ClassWarning{\@classname}{%
@@ -734,6 +734,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}
 
 \RequirePackage{caption, float}
 \captionsetup[table]{position=top}
@@ -1819,7 +1823,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
@@ -1828,7 +1832,7 @@
        \else
          \@specialsection{Keywords}%
        \fi
-         \@keywords}\par\egroup
+         \noindent\@keywords}\par\egroup
    \fi
   \andify\authors
   \andify\shortauthors
@@ -1871,7 +1875,7 @@
   \or % siggraph
     \section*{#1}%
   \or % sigplan
-    \paragraph*{#1}%
+     \noindent\emph{\bfseries#1.}~%
   \or % sigchi
     \section*{#1}%
   \or % sigchi-a
@@ -2654,6 +2658,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@}%
@@ -2685,20 +2690,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}