CTAN sync 202404020303

24 files changed, 75 insertions, 32 deletions

diff --git a/macros/latex/contrib/acmart/Makefile b/macros/latex/contrib/acmart/Makefile
index 832265701d..545e505ed5 100644
--- a/macros/latex/contrib/acmart/Makefile
+++ b/macros/latex/contrib/acmart/Makefile
@@ -8,6 +8,8 @@
 
 PACKAGE=acmart
 
+DEV=-dev # To switch dev on
+#DEV=
 
 PDF = $(PACKAGE).pdf acmguide.pdf
 
@@ -70,45 +72,47 @@ samples/%.cbx: %.cbx
 samples/%.dbx: %.dbx
 samples/%.lbx: %.lbx
 
+
+
 samples/%.pdf:  samples/%.tex   samples/$(PACKAGE).cls samples/ACM-Reference-Format.bst
-	cd $(dir $@) && pdflatex-dev $(notdir $<)
+	cd $(dir $@) && pdflatex${DEV} $(notdir $<)
 	- cd $(dir $@) && bibtex $(notdir $(basename $<))
-	cd $(dir $@) && pdflatex-dev $(notdir $<)
-	cd $(dir $@) && pdflatex-dev $(notdir $<)
+	cd $(dir $@) && pdflatex${DEV} $(notdir $<)
+	cd $(dir $@) && pdflatex${DEV} $(notdir $<)
 	while ( grep -q '^LaTeX Warning: Label(s) may have changed' $(basename $<).log) \
-	  do cd $(dir $@) && pdflatex-dev $(notdir $<); done
+	  do cd $(dir $@) && pdflatex${DEV} $(notdir $<); done
 
 samples/sample-sigconf-biblatex.pdf: samples/sample-sigconf-biblatex.tex $(SAMPLEBIBLATEXFILES)
-	cd $(dir $@) && pdflatex-dev $(notdir $<)
+	cd $(dir $@) && pdflatex${DEV} $(notdir $<)
 	- cd $(dir $@) && biber $(notdir $(basename $<))
-	cd $(dir $@) && pdflatex-dev $(notdir $<)
-	cd $(dir $@) && pdflatex-dev $(notdir $<)
+	cd $(dir $@) && pdflatex${DEV} $(notdir $<)
+	cd $(dir $@) && pdflatex${DEV} $(notdir $<)
 	while ( grep -q '^LaTeX Warning: Label(s) may have changed' $(basename $<).log) \
-	  do cd $(dir $@) && pdflatex-dev $(notdir $<); done
+	  do cd $(dir $@) && pdflatex${DEV} $(notdir $<); done
 
 samples/sample-acmsmall-biblatex.pdf: samples/sample-acmsmall-biblatex.tex $(SAMPLEBIBLATEXFILES)
-	cd $(dir $@) && pdflatex-dev $(notdir $<)
+	cd $(dir $@) && pdflatex${DEV} $(notdir $<)
 	- cd $(dir $@) && biber $(notdir $(basename $<))
-	cd $(dir $@) && pdflatex-dev $(notdir $<)
-	cd $(dir $@) && pdflatex-dev $(notdir $<)
+	cd $(dir $@) && pdflatex${DEV} $(notdir $<)
+	cd $(dir $@) && pdflatex${DEV} $(notdir $<)
 	while ( grep -q '^LaTeX Warning: Label(s) may have changed' $(basename $<).log) \
-	  do cd $(dir $@) && pdflatex-dev $(notdir $<); done
+	  do cd $(dir $@) && pdflatex${DEV} $(notdir $<); done
 
 samples/sample-sigconf-xelatex.pdf:  samples/sample-xelatex.tex   samples/$(PACKAGE).cls samples/ACM-Reference-Format.bst
-	cd $(dir $@) && xelatex-dev $(notdir $<)
+	cd $(dir $@) && xelatex${DEV} $(notdir $<)
 	- cd $(dir $@) && bibtex $(notdir $(basename $<))
-	cd $(dir $@) && xelatex-dev $(notdir $<)
-	cd $(dir $@) && xelatex-dev $(notdir $<)
+	cd $(dir $@) && xelatex${DEV} $(notdir $<)
+	cd $(dir $@) && xelatex${DEV} $(notdir $<)
 	while ( grep -q '^LaTeX Warning: Label(s) may have changed' $(basename $<).log) \
-	  do cd $(dir $@) && xelatex-dev $(notdir $<); done
+	  do cd $(dir $@) && xelatex${DEV} $(notdir $<); done
 
 samples/sample-sigconf-lualatex.pdf:  samples/sample-lualatex.tex   samples/$(PACKAGE).cls samples/ACM-Reference-Format.bst
-	cd $(dir $@) && lualatex-dev $(notdir $<)
+	cd $(dir $@) && lualatex${DEV} $(notdir $<)
 	- cd $(dir $@) && bibtex $(notdir $(basename $<))
-	cd $(dir $@) && lualatex-dev $(notdir $<)
-	cd $(dir $@) && lualatex-dev $(notdir $<)
+	cd $(dir $@) && lualatex${DEV} $(notdir $<)
+	cd $(dir $@) && lualatex${DEV} $(notdir $<)
 	while ( grep -q '^LaTeX Warning: Label(s) may have changed' $(basename $<).log) \
-	  do cd $(dir $@) && lualatex-dev $(notdir $<); done
+	  do cd $(dir $@) && lualatex${DEV} $(notdir $<); done
 
 samples/sample-acmcp.pdf: samples/acm-jdslogo.png
 
diff --git a/macros/latex/contrib/acmart/README b/macros/latex/contrib/acmart/README
index 3495405601..8d799d2832 100644
--- a/macros/latex/contrib/acmart/README
+++ b/macros/latex/contrib/acmart/README
@@ -12,6 +12,10 @@ The production version is the one on CTAN and ACM sites.
 
 Changes
 
+Version 2.04.  Compatibility with the new latex-dev format
+               eSSN is always printed, even if pSSN is present
+	       Wording change in copyright statement
+
 Version 2.03.  Cleaned generation of samples.
 	       New options for printing conference proceedings
 	       in ACM journals
diff --git a/macros/latex/contrib/acmart/acmart.dtx b/macros/latex/contrib/acmart/acmart.dtx
index 11c9b1eca1..61251bff30 100644
--- a/macros/latex/contrib/acmart/acmart.dtx
+++ b/macros/latex/contrib/acmart/acmart.dtx
@@ -2309,7 +2309,7 @@
 \ProvidesFile{acmart.dtx}
 %</gobble>
 %<class>\ProvidesClass{acmart}
-[2024/02/04 v2.03 Typesetting articles for the Association for Computing Machinery]
+[2024/03/31 v2.04 Typesetting articles for the Association for Computing Machinery]
 %    \end{macrocode}
 %
 % \changes{v1.00}{2016/04/14}{First released version}
@@ -3526,6 +3526,10 @@
 % \changes{v1.76}{2021/02/21}{Moved hyperxmp before hyperref, see
 % \url{https://github.com/borisveytsman/acmart/issues/425}}
 % \changes{1.92}{2023/10/14}{Moved hyperxmp again due to kernel update}
+% \changes{2.04}{2024/03/17}{Explicitly load ifdraft since hyperxmp
+% tries to load it inside a group}
+% \changes{2.04}{2024/03/31}{Deleted loading ifdraft due to the new
+% release of hyperxmp}
 %    \begin{macrocode}
 \let\@footnotemark@nolink\@footnotemark
 \let\@footnotetext@nolink\@footnotetext
@@ -4797,12 +4801,13 @@
 % \end{macro}
 %
 % The defaults:
+% \changes{v2.04}{2024/03/17}{eISSN is printed, rather than pSSN}
 %    \begin{macrocode}
 \def\@journalCode@nr{0}
 \def\@journalName{}%
 \def\@journalNameShort{\@journalName}%
 \def\@permissionCodeOne{XXXX-XXXX}%
-\def\@permissionCodeTwo{}%
+\def\@permissionCodeTwo{\@permissionCodeOne}%
 %    \end{macrocode}
 %
 %
@@ -5895,6 +5900,7 @@
 % \changes{v1.52}{2018/04/09}{Rewording of licenses}
 % \changes{v1.85}{2022/05/08}{Added CC licenses}
 % \changes{v2.00}{2023/10/22}{Changed wording}
+% \changes{v2.04}{2024/03/28}{Changed wording}
 %   Here is the owner of the copyright
 %    \begin{macrocode}
 \def\@copyrightowner{%
@@ -5985,6 +5991,7 @@
 % \changes{v1.87}{2022/07/30}{CC licenses now are allowed only for
 % non-acm or ACM engage publications}
 % \changes{v2.00}{2023/10/24}{Rewrote wording}
+% \changes{v2.00}{2023/10/24}{Rewrote wording}
 %   The canned permission block.
 %    \begin{macrocode}
 \def\@copyrightpermission{%
@@ -6012,7 +6019,7 @@
    and\hspace*{.5pt}/or a fee. Request permissions from
    permissions@acm.org. 
   \or % rightsretained
-   Permission to make digital or hard copies of part or all of this
+   Permission to make digital or hard copies of all or part of this
    work for personal or classroom use is granted without fee provided
    that copies are not made or distributed for profit or commercial
    advantage and that copies bear this notice and the full citation on
@@ -6406,7 +6413,7 @@
         \else
           \if@ACM@nonacm\else
             \if@ACM@journal@bibstrip
-              ACM~\@permissionCodeOne/\@acmYear/\@acmMonth-ART\@acmArticle\\
+              ACM~\@permissionCodeTwo/\@acmYear/\@acmMonth-ART\@acmArticle\\
               \@formatdoi{\@acmDOI}%
             \else % Conference
               \ifx\@acmISBN\@empty\else ACM~ISBN~\@acmISBN\\\fi
diff --git a/macros/latex/contrib/acmart/acmart.pdf b/macros/latex/contrib/acmart/acmart.pdf
index 93692df1e0..af42c74465 100644
--- a/macros/latex/contrib/acmart/acmart.pdf
+++ b/macros/latex/contrib/acmart/acmart.pdf
diff --git a/macros/latex/contrib/acmart/acmguide.pdf b/macros/latex/contrib/acmart/acmguide.pdf
index 22dc7ca12b..c13a1ecd0b 100644
--- a/macros/latex/contrib/acmart/acmguide.pdf
+++ b/macros/latex/contrib/acmart/acmguide.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-acmcp.pdf b/macros/latex/contrib/acmart/samples/sample-acmcp.pdf
index f39caf1c8b..0371cfab76 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmcp.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmcp.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-acmengage.pdf b/macros/latex/contrib/acmart/samples/sample-acmengage.pdf
index 31111cd2e9..a9d9c5573d 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmengage.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmengage.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
index cfc9ad6502..efad61a4f5 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmlarge.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf
index e07715a2e1..fa2c7fcdb0 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-biblatex.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf
index 1d2da5b59b..2d4ae466ce 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-conf.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf
index 7ff5c10f04..925fec5551 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmsmall-submission.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
index 83f9079b4d..1c1a2ab289 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmsmall.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-acmtog-conf.pdf b/macros/latex/contrib/acmart/samples/sample-acmtog-conf.pdf
index f85fb2a500..b3e3733cfd 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmtog-conf.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmtog-conf.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf
index 5606df631d..7d9d35c82e 100644
--- a/macros/latex/contrib/acmart/samples/sample-acmtog.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-acmtog.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf
index fe08711da0..c9c20da0cf 100644
--- a/macros/latex/contrib/acmart/samples/sample-manuscript.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-manuscript.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf-authordraft.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf-authordraft.pdf
index 666237fc9f..ea9d209bd8 100644
--- a/macros/latex/contrib/acmart/samples/sample-sigconf-authordraft.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-sigconf-authordraft.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf
index b2396e58cc..072c1d6a77 100644
--- a/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-sigconf-biblatex.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf
index 0b72540afd..30463e2948 100644
--- a/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-sigconf-i13n.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf
index d296f0c24a..3bfab889d7 100644
--- a/macros/latex/contrib/acmart/samples/sample-sigconf.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-sigconf.pdf
diff --git a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf
index b291348ea8..8a2c4acee7 100644
--- a/macros/latex/contrib/acmart/samples/sample-sigplan.pdf
+++ b/macros/latex/contrib/acmart/samples/sample-sigplan.pdf
diff --git a/macros/latex/contrib/fontscale/fontscale-manual.pdf b/macros/latex/contrib/fontscale/fontscale-manual.pdf
index e90ca7b92d..67af2fa36c 100644
--- a/macros/latex/contrib/fontscale/fontscale-manual.pdf
+++ b/macros/latex/contrib/fontscale/fontscale-manual.pdf
diff --git a/macros/latex/contrib/fontscale/fontscale-manual.tex b/macros/latex/contrib/fontscale/fontscale-manual.tex
index f7d475cd7b..bb08e2eff9 100644
--- a/macros/latex/contrib/fontscale/fontscale-manual.tex
+++ b/macros/latex/contrib/fontscale/fontscale-manual.tex
@@ -13,7 +13,7 @@ A user interface for setting document font sizes
 
 Oliver Beery
 
-Version 1.0.3\quad{}26 March 2024
+Version 1.1.0\quad{}31 March 2024
 
 
 \section{Introduction}
@@ -346,8 +346,15 @@ The key \Key{reset}[preamble] sets all the keys to their values at the end of th
 \section{Programming}
 \label{sec:programming}
 
-For \LaTeX3 programmers, the \pkg{fontscale} package provides some public \pkg{expl3} variables.
-No public \pkg{expl3} functions are provided.
+This section is relevant to \LaTeX3 programmers.
+
+The user commands \cs{SetFontStep}, \cs{SetFontScale}, \cs{SetFontSize}, \cs{ScaleFont}, and \cs{SetFontSizeBaselineskip} are set up to work with \cs{text_purify:n}.
+\cs{text_purify:n} will correctly remove these commands and their arguments.
+This includes the starred versions \cs{SetFontStep*}, \cs{SetFontScale*}, and \cs{SetFontSize*}.
+
+This package does not provide any public \pkg{expl3} functions.
+
+This package provides some public \pkg{expl3} variables.
 The package stores in public variables the step, scale, size, and baselineskip of each font size command.
 These variables should not be modified directly.
 Instead, they should be modified only indirectly via the command \cs{fontscalesetup}.
diff --git a/macros/latex/contrib/fontscale/fontscale.sty b/macros/latex/contrib/fontscale/fontscale.sty
index 3a6d63676a..2047438621 100644
--- a/macros/latex/contrib/fontscale/fontscale.sty
+++ b/macros/latex/contrib/fontscale/fontscale.sty
@@ -8,8 +8,8 @@
 \NeedsTeXFormat{LaTeX2e}[2022-06-01]
 \ProvidesExplPackage
   {fontscale}
-  {2024-03-26}
-  {1.0.3}
+  {2024-03-31}
+  {1.1.0}
   {A user interface for setting document font sizes}
 
 % The 2023-10-10 l3kernel update added many 'e'-variants.
@@ -452,7 +452,7 @@
   }
 \cs_new_protected:Npn \__fontscale_keys_name_code_split:ww #1 / #2 \q_stop
   {
-    \tl_set:cn { l__fontscale_ \l_keys_key_str _size        _tl } {#1}
+    \tl_set:cn { l__fontscale_ \l_keys_key_str _size_tl } {#1}
     \tl_set:cn { l__fontscale_ \l_keys_key_str _baselineskip_tl } {#2}
   }
 
@@ -1284,4 +1284,25 @@
         }
       }
       { UNDEFINED \@ }
-  }
\ No newline at end of file
+  }
+
+% TEXT PURIFY
+
+\cs_new:Npn \__fontscale_text_purify_equivalent:n #1
+  {
+    \bool_lazy_all:nT
+      {
+        { \tl_if_single_p:n {#1} }
+        { \tl_if_single_token_p:n #1 }
+        { \token_if_eq_meaning_p:NN #1 * }
+      }
+      { \use_none:n }
+  }
+\text_declare_purify_equivalent:Nn \SetFontStep
+  { \__fontscale_text_purify_equivalent:n }
+\text_declare_purify_equivalent:Nn \SetFontScale
+  { \__fontscale_text_purify_equivalent:n }
+\text_declare_purify_equivalent:Nn \SetFontSize
+  { \__fontscale_text_purify_equivalent:n }
+\text_declare_purify_equivalent:Nn \ScaleFont { \use_none:n }
+\text_declare_purify_equivalent:Nn \SetFontSizeBaselineskip { \use_none:nn }
\ No newline at end of file
diff --git a/timestamp b/timestamp
index 6ee82fd36c..60e88ea847 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
 #   The source CTAN of this site's material:
 dante.ctan.org
 #   The year-month-day-hour-minute of this site's material:
-2024-04-01-02-02
+2024-04-01-12-02