acmart (26oct20)

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

16 files changed, 21 insertions, 6 deletions

diff --git a/Master/texmf-dist/doc/latex/acmart/README b/Master/texmf-dist/doc/latex/acmart/README
index 17cf74a2039..67302fa1746 100644
--- a/Master/texmf-dist/doc/latex/acmart/README
+++ b/Master/texmf-dist/doc/latex/acmart/README
@@ -275,4 +275,6 @@ Version 1.72   Bug fixes.  Better handling of metadata.
 Version 1.73   Bug fixes
 	       The elements institution, city and country are now obligatory
 	       for affiliations
-	       
\ No newline at end of file
+
+Version 1.74   Bug fixes.  A regression introduced in the font changes
+	       is reverted.
\ 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 2277d25c20f..97af4bc0b93 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 089664bc536..974e50ecb06 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 23e6435b0a6..6da30912f56 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 815150402a3..2e3826f3806 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-submission.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-submission.pdf
index 4a79a30f9e0..380e3c4054e 100644
--- a/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-submission.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-acmsmall-submission.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 999f18a8258..3b982c2b9cb 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 9db12266a6d..eb5aa9d0e35 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 13d9f8c29db..39ddfcb499e 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-lualatex.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-lualatex.pdf
index 66626b757c9..67ab63ed06a 100644
--- a/Master/texmf-dist/doc/latex/acmart/samples/sample-lualatex.pdf
+++ b/Master/texmf-dist/doc/latex/acmart/samples/sample-lualatex.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 d38eacec64a..e2349dd0aab 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-sigconf.pdf b/Master/texmf-dist/doc/latex/acmart/samples/sample-sigconf.pdf
index ac225b5f821..3114e63ddc9 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 3fb61763076..2d4b6a5a54c 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 c41474733ad..a6840bf543e 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 1138db98e94..a901526f721 100644
--- a/Master/texmf-dist/source/latex/acmart/acmart.dtx
+++ b/Master/texmf-dist/source/latex/acmart/acmart.dtx
@@ -1886,7 +1886,7 @@
 \ProvidesFile{acmart.dtx}
 %</gobble>
 %<class>\ProvidesClass{acmart}
-[2020/09/13 v1.73 Typesetting articles for the Association for Computing Machinery]
+[2020/10/25 v1.74 Typesetting articles for the Association for Computing Machinery]
 %    \end{macrocode}
 %
 % \changes{v1.00}{2016/04/14}{First released version}
@@ -3212,22 +3212,29 @@
 % Breitner)}
 % \changes{v1.54}{2018/07/16}{XeTeX now uses T1 encoding}
 % \changes{v1.56}{2018/11/11}{Looks like XeTeX requires explicit
-% monotype font delcaration}
+% monotype font declaration}
+% \changes{v1.74}{2020/10/25}{Changed the order of font loading}%
 % We use Libertine throughout.
 %    \begin{macrocode}
 \if@ACM@newfonts
   \RequirePackage[T1]{fontenc}
-  \RequirePackage[libertine]{newtxmath}
+  % Note that the order in which packages are loaded matters,
+  % and the correct order depends on the LaTeX engine used.
+  % See https://github.com/borisveytsman/acmart/issues/402
+  % and https://github.com/borisveytsman/acmart/issues/410
   \ifxetex
+    \RequirePackage[libertine]{newtxmath}
     \RequirePackage[tt=false]{libertine}
     \setmonofont[StylisticSet=3]{inconsolata}
   \else
     \ifluatex
+      \RequirePackage[libertine]{newtxmath}
       \RequirePackage[tt=false]{libertine}
       \setmonofont[StylisticSet=3]{inconsolata}
     \else
        \RequirePackage[tt=false, type1=true]{libertine}
        \RequirePackage[varqu]{zi4}
+       \RequirePackage[libertine]{newtxmath}
     \fi
   \fi
 \fi
diff --git a/Master/texmf-dist/tex/latex/acmart/acmart.cls b/Master/texmf-dist/tex/latex/acmart/acmart.cls
index 00330f8cf2f..88ec017e85f 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}
-[2020/09/13 v1.73 Typesetting articles for the Association for Computing Machinery]
+[2020/10/25 v1.74 Typesetting articles for the Association for Computing Machinery]
 \def\@classname{acmart}
 \InputIfFileExists{acmart-preload-hook.tex}{%
   \ClassWarning{\@classname}{%
@@ -724,17 +724,23 @@
     TeX}\@ACM@newfontsfalse}
 \if@ACM@newfonts
   \RequirePackage[T1]{fontenc}
-  \RequirePackage[libertine]{newtxmath}
+  % Note that the order in which packages are loaded matters,
+  % and the correct order depends on the LaTeX engine used.
+  % See https://github.com/borisveytsman/acmart/issues/402
+  % and https://github.com/borisveytsman/acmart/issues/410
   \ifxetex
+    \RequirePackage[libertine]{newtxmath}
     \RequirePackage[tt=false]{libertine}
     \setmonofont[StylisticSet=3]{inconsolata}
   \else
     \ifluatex
+      \RequirePackage[libertine]{newtxmath}
       \RequirePackage[tt=false]{libertine}
       \setmonofont[StylisticSet=3]{inconsolata}
     \else
        \RequirePackage[tt=false, type1=true]{libertine}
        \RequirePackage[varqu]{zi4}
+       \RequirePackage[libertine]{newtxmath}
     \fi
   \fi
 \fi