Merge branch 'develop' into tagging-777-778

latex3 · Jan 12, 2025 · 686c209 · 686c209
2 parents 4689ed4 + afc5bf6
commit 686c209
Show file tree

Hide file tree

Showing 35 changed files with 6,224 additions and 914 deletions.
diff --git a/base/changes.txt b/base/changes.txt
@@ -6,6 +6,11 @@ to completeness or accuracy and it contains some references to files that are
 not part of the distribution.
 ================================================================================
 
+2025-01-10  Frank Mittelbach  <[email protected]>
+
+	* ltmarks.dtx (subsection{Updating mark structures}):
+	Do not expand mark content while debugging.
+
 2025-01-03  Frank Mittelbach  <[email protected]>
 
 	* lthooks.dtx (subsubsection{Updating code for hooks}):

diff --git a/base/doc/tlc3.err b/base/doc/tlc3.err
@@ -1,4 +1,4 @@
-\newcommand\erratafiledate{2024/08/07}        % needs / and not -
+\newcommand\erratafiledate{2025/01/09}        % needs / and not -
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % To produce a printed version of this errata file run this file through
@@ -933,6 +933,16 @@ In table note:   \textit{Unfortunately, \u{\texttt{sco}}} \> \textit{Unfortunate
 \erroronpage{II-42}{para 3, l.4}{MRu}{2024/04/12}{s}
 rudimentary \> rudimentarily 
 
+\erroronpage{II-45}{several places}{FMi}{2025/01/09}{s}
+
+The Gentium fonts are no longer supported for pdf\TeX{} and only
+available for Unicode engines. The Type1 fonts and the
+\texttt{gentium} package are deprecated (because of quality issues in
+the fonts). Instead \texttt{gentium-otf} is newly available.
+
+This affects table 10.30 and the font example in the text. We now show
+Gentium Plus and Gentium Book Plus using the Lua\TeX{} engine.
+
 \erroronpage{II-50}{font sample Cambria}{FMi}{2023/08/14}{s}
 
 Because of problems with the font names, the Cambria family currently requires a \texttt{Cambria.fontspec} file
@@ -997,6 +1007,15 @@ ub should be upright: \verb+\fontseries{+\u{\textsl{ub}}\verb+}+ \> \verb+\fonts
 \u{Akira Kobayashi} should be written in Japanese style \> \u{KOBAYASHI Akira}\\
 Also corrected in the index.
 
+\erroronpage{II-71,72}{table 10.60}{FMi}{2025/01/09}{s}
+
+Font family name for Classico has changed in recent distribution from
+\texttt{-LF} to \texttt{-TLF}.  Affects font example on page II-71 and
+table 10.60 on page II-72.
+
+The fact small captitals are only available with the pdfTeX
+engine. This is now explicitly mentioned.
+
 \erroronpage{II-75}{table 10.64}{FMi}{2023/08/15}{s}
 Add table note:
 %
@@ -1076,13 +1095,25 @@ The Cambria fonts currently require a \texttt{Cambria.fontspec} file
 Without it, the bold fonts are not correctly set up, which is why they are
 not showing in the example.
 
+\erroronpage{II-107}{exa 10-11-2}{FMi}{2025/01/09}{s}
+
+The Gentium fonts are no longer supported for pdf\TeX{} and only
+available for Unicode engines.  We therefore show the Greek text in
+Gentium Plus using the Lua\TeX{} engine.
+
 \erroronpage{II-110}{exa 10-12-1}{FMi}{2023/08/14}{s}
 
 The Cambria fonts currently require a \texttt{Cambria.fontspec} file
 (possibly temporary) when used with Lua\TeX{} --- see errata on page II-50.
 Without it, the  bold fonts are not correctly set up, which is why they are
 not showing in the example.
 
+\erroronpage{II-111}{exa 10-12-2}{FMi}{2025/01/09}{s}
+
+The Gentium fonts are no longer supported for pdf\TeX{} and only
+available for Unicode engines.  We therefore show the Cyrillic text in
+Gentium Plus using the Lua\TeX{} engine.
+
 
 
 \erroronpage{II-114}{table 10.89}{FMi}{2023/04/04}{s}
@@ -1394,6 +1425,10 @@ IETF \> the Internet Engineering Task Force (IETF)
 \erroronpage{II-308}{para 3, l.1}{BeB}{2023/08/20}{s}
      BPD \> BCP
 
+\erroronpage{II-309}{exa 13-3-2}{FMi}{2025/01/09}{s}
+the package \texttt{gentium} is deprecated. We therefore now use
+\texttt{garamondlibre} in the example.
+
 \erroronpage{II-319}{para 2, l.1}{BeB}{2023/08/20}{s}
 Missing word: is described \textit{A History} \> is described \u{in} 
 \textit{A History}
@@ -1510,7 +1545,7 @@ a few that \> a few \u{commands} that
 \erroronpage{II-658}{first item in the list}{BeB}{2024/03/17}{s}
 square root $\sqrt{x}$ \> square root \texttt{sqrt} $x$
 
-\erroronpage{II-663}{A-3-7}{MRu}{2024/05/01}{}
+\erroronpage{II-663}{A-3-7}{MRu}{2024/05/01}{s}
 In the code, text should read either ``This is the content'' or ``These are the contents''.
 
 \erroronpage{II-682}{para -2, l .3}{FMi}{2023/04/28}{s}

diff --git a/base/ltmarks.dtx b/base/ltmarks.dtx
@@ -17,7 +17,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltmarks.dtx}
-             [2024/12/25 v1.1b LaTeX Kernel (Marks)]
+             [2025/01/10 v1.1c LaTeX Kernel (Marks)]
 % \iffalse
 %
 \documentclass{l3doc}
@@ -1476,7 +1476,14 @@
                 {
 %<*trace>
                   \@@_debug:n { \iow_term:x { Marks:~ extract~ last~
-                       mark~ for~ class~ '##1'~ =~  \g_@@_tmp_tl } }
+%    \end{macrocode}
+%    The mark content in \cs{g_@@_tmp_tl} may contain aribtrary code
+%    that may react badly if it is expanded in a write. So we better
+%    avoid that expansion, otherwise debugging might generate spurious
+%    errors when turned on.
+% \changes{v1.1c}{2025/01/10}{Do not expand mark content while debugging}
+%    \begin{macrocode}
+                       mark~ for~ class~ '##1'~ =~ \exp_not:o \g_@@_tmp_tl } }
 %</trace>
                   \tl_gput_right:Ne \g_@@_last_marks_tl
                      { \mark_insert:nn {##1} { \@@_drop_id:o { \g_@@_tmp_tl } } }
@@ -1488,10 +1495,15 @@
 %    faster in case there is none.
 %    \begin{macrocode}
 %<*trace>
-                  \@@_debug:n { \iow_term:x { Marks:~ extract~ first~
-                      mark~ for~ class~ '##1'~ =~
-                      \tex_splitfirstmarks:D
+                  \@@_debug:n { \iow_term:x {
+                      Marks:~ extract~ first~ mark~ for~ class~ '##1'~ =~
+%    \end{macrocode}
+%    Again no expansion for the mark content.
+%    \begin{macrocode}
+                      \exp_not:o {
+                        \tex_splitfirstmarks:D
                         \use:c { c_@@_class_##1_mark }
+                      }
                   } }
 %</trace>
                   \tl_gput_right:Ne \g_@@_first_marks_tl

diff --git a/base/testfiles/github-0479-often.xetex.tlg b/base/testfiles/github-0479-often.xetex.tlg
@@ -928,10 +928,10 @@ Applying: [....-..-..] XeTeX character classes on input line ....
 (../load-unicode-xetex-classes.tex 
 load-unicode-xetex-classes.tex v... (....-..-..)
 Reading Unicode east Asian character class data
-# LineBreak-15.1.0.txt 
-# Date: ....-..-.., 13:19:22 GMT [KW] 
-# EastAsianWidth-15.1.0.txt 
-# Date: ....-..-.., 23:34:08 GMT 
+# LineBreak-16.0.0.txt 
+# Date: ....-..-.., 16:26:55 GMT 
+# EastAsianWidth-16.0.0.txt 
+# Date: ....-..-.., 21:48:20 GMT 
 )
 Already applied: [....-..-..] XeTeX character classes on input line ....
 Applying: [....-..-..] Save language for hyphenation on input line ....

diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -838,10 +838,10 @@ Applying: [....-..-..] XeTeX character classes on input line ....
 (../load-unicode-xetex-classes.tex 
 load-unicode-xetex-classes.tex v... (....-..-..)
 Reading Unicode east Asian character class data
-# LineBreak-15.1.0.txt 
-# Date: ....-..-.., 13:19:22 GMT [KW] 
-# EastAsianWidth-15.1.0.txt 
-# Date: ....-..-.., 23:34:08 GMT 
+# LineBreak-16.0.0.txt 
+# Date: ....-..-.., 16:26:55 GMT 
+# EastAsianWidth-16.0.0.txt 
+# Date: ....-..-.., 21:48:20 GMT 
 )
 Skipping: [....-..-..] Save language for hyphenation on input line ....
 Applying: [....-..-..] Save language for hyphenation on input line ....
@@ -1776,10 +1776,10 @@ Applying: [....-..-..] XeTeX character classes on input line ....
 (../load-unicode-xetex-classes.tex 
 load-unicode-xetex-classes.tex v... (....-..-..)
 Reading Unicode east Asian character class data
-# LineBreak-15.1.0.txt 
-# Date: ....-..-.., 13:19:22 GMT [KW] 
-# EastAsianWidth-15.1.0.txt 
-# Date: ....-..-.., 23:34:08 GMT 
+# LineBreak-16.0.0.txt 
+# Date: ....-..-.., 16:26:55 GMT 
+# EastAsianWidth-16.0.0.txt 
+# Date: ....-..-.., 21:48:20 GMT 
 )
 Already applied: [....-..-..] XeTeX character classes on input line ....
 Applying: [....-..-..] Save language for hyphenation on input line ....

diff --git a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.xetex.tlg
@@ -928,10 +928,10 @@ Applying: [....-..-..] XeTeX character classes on input line ....
 (../load-unicode-xetex-classes.tex 
 load-unicode-xetex-classes.tex v... (....-..-..)
 Reading Unicode east Asian character class data
-# LineBreak-15.1.0.txt 
-# Date: ....-..-.., 13:19:22 GMT [KW] 
-# EastAsianWidth-15.1.0.txt 
-# Date: ....-..-.., 23:34:08 GMT 
+# LineBreak-16.0.0.txt 
+# Date: ....-..-.., 16:26:55 GMT 
+# EastAsianWidth-16.0.0.txt 
+# Date: ....-..-.., 21:48:20 GMT 
 )
 Already applied: [....-..-..] XeTeX character classes on input line ....
 Applying: [....-..-..] Save language for hyphenation on input line ....

diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.xetex.tlg
@@ -928,10 +928,10 @@ Applying: [....-..-..] XeTeX character classes on input line ....
 (../load-unicode-xetex-classes.tex 
 load-unicode-xetex-classes.tex v... (....-..-..)
 Reading Unicode east Asian character class data
-# LineBreak-15.1.0.txt 
-# Date: ....-..-.., 13:19:22 GMT [KW] 
-# EastAsianWidth-15.1.0.txt 
-# Date: ....-..-.., 23:34:08 GMT 
+# LineBreak-16.0.0.txt 
+# Date: ....-..-.., 16:26:55 GMT 
+# EastAsianWidth-16.0.0.txt 
+# Date: ....-..-.., 21:48:20 GMT 
 )
 Already applied: [....-..-..] XeTeX character classes on input line ....
 Applying: [....-..-..] Save language for hyphenation on input line ....

diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.xetex.tlg
@@ -928,10 +928,10 @@ Applying: [....-..-..] XeTeX character classes on input line ....
 (../load-unicode-xetex-classes.tex 
 load-unicode-xetex-classes.tex v... (....-..-..)
 Reading Unicode east Asian character class data
-# LineBreak-15.1.0.txt 
-# Date: ....-..-.., 13:19:22 GMT [KW] 
-# EastAsianWidth-15.1.0.txt 
-# Date: ....-..-.., 23:34:08 GMT 
+# LineBreak-16.0.0.txt 
+# Date: ....-..-.., 16:26:55 GMT 
+# EastAsianWidth-16.0.0.txt 
+# Date: ....-..-.., 21:48:20 GMT 
 )
 Already applied: [....-..-..] XeTeX character classes on input line ....
 Applying: [....-..-..] Save language for hyphenation on input line ....

diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.xetex.tlg
@@ -926,10 +926,10 @@ Applying: [....-..-..] XeTeX character classes on input line ....
 (../load-unicode-xetex-classes.tex 
 load-unicode-xetex-classes.tex v... (....-..-..)
 Reading Unicode east Asian character class data
-# LineBreak-15.1.0.txt 
-# Date: ....-..-.., 13:19:22 GMT [KW] 
-# EastAsianWidth-15.1.0.txt 
-# Date: ....-..-.., 23:34:08 GMT 
+# LineBreak-16.0.0.txt 
+# Date: ....-..-.., 16:26:55 GMT 
+# EastAsianWidth-16.0.0.txt 
+# Date: ....-..-.., 21:48:20 GMT 
 )
 Already applied: [....-..-..] XeTeX character classes on input line ....
 Applying: [....-..-..] Save language for hyphenation on input line ....

diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.xetex.tlg
@@ -926,10 +926,10 @@ Applying: [....-..-..] XeTeX character classes on input line ....
 (../load-unicode-xetex-classes.tex 
 load-unicode-xetex-classes.tex v... (....-..-..)
 Reading Unicode east Asian character class data
-# LineBreak-15.1.0.txt 
-# Date: ....-..-.., 13:19:22 GMT [KW] 
-# EastAsianWidth-15.1.0.txt 
-# Date: ....-..-.., 23:34:08 GMT 
+# LineBreak-16.0.0.txt 
+# Date: ....-..-.., 16:26:55 GMT 
+# EastAsianWidth-16.0.0.txt 
+# Date: ....-..-.., 21:48:20 GMT 
 )
 Already applied: [....-..-..] XeTeX character classes on input line ....
 Applying: [....-..-..] Save language for hyphenation on input line ....

diff --git a/base/testfiles/tlb-latexrelease-rollback-2023-06-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2023-06-01.xetex.tlg
@@ -926,10 +926,10 @@ Applying: [....-..-..] XeTeX character classes on input line ....
 (../load-unicode-xetex-classes.tex 
 load-unicode-xetex-classes.tex v... (....-..-..)
 Reading Unicode east Asian character class data
-# LineBreak-15.1.0.txt 
-# Date: ....-..-.., 13:19:22 GMT [KW] 
-# EastAsianWidth-15.1.0.txt 
-# Date: ....-..-.., 23:34:08 GMT 
+# LineBreak-16.0.0.txt 
+# Date: ....-..-.., 16:26:55 GMT 
+# EastAsianWidth-16.0.0.txt 
+# Date: ....-..-.., 21:48:20 GMT 
 )
 Already applied: [....-..-..] XeTeX character classes on input line ....
 Applying: [....-..-..] Save language for hyphenation on input line ....

diff --git a/base/testfiles/tlb-latexrelease-rollback-2023-11-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2023-11-01.xetex.tlg
@@ -926,10 +926,10 @@ Applying: [....-..-..] XeTeX character classes on input line ....
 (../load-unicode-xetex-classes.tex 
 load-unicode-xetex-classes.tex v... (....-..-..)
 Reading Unicode east Asian character class data
-# LineBreak-15.1.0.txt 
-# Date: ....-..-.., 13:19:22 GMT [KW] 
-# EastAsianWidth-15.1.0.txt 
-# Date: ....-..-.., 23:34:08 GMT 
+# LineBreak-16.0.0.txt 
+# Date: ....-..-.., 16:26:55 GMT 
+# EastAsianWidth-16.0.0.txt 
+# Date: ....-..-.., 21:48:20 GMT 
 )
 Already applied: [....-..-..] XeTeX character classes on input line ....
 Applying: [....-..-..] Save language for hyphenation on input line ....

diff --git a/base/testfiles/tlb-latexrelease-rollback-2024-06-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2024-06-01.xetex.tlg
@@ -926,10 +926,10 @@ Applying: [....-..-..] XeTeX character classes on input line ....
 (../load-unicode-xetex-classes.tex 
 load-unicode-xetex-classes.tex v... (....-..-..)
 Reading Unicode east Asian character class data
-# LineBreak-15.1.0.txt 
-# Date: ....-..-.., 13:19:22 GMT [KW] 
-# EastAsianWidth-15.1.0.txt 
-# Date: ....-..-.., 23:34:08 GMT 
+# LineBreak-16.0.0.txt 
+# Date: ....-..-.., 16:26:55 GMT 
+# EastAsianWidth-16.0.0.txt 
+# Date: ....-..-.., 21:48:20 GMT 
 )
 Already applied: [....-..-..] XeTeX character classes on input line ....
 Applying: [....-..-..] Save language for hyphenation on input line ....

diff --git a/base/testfiles/tlb-latexrelease-rollback-2024-11-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2024-11-01.xetex.tlg
@@ -942,10 +942,10 @@ Applying: [....-..-..] XeTeX character classes on input line ....
 (../load-unicode-xetex-classes.tex 
 load-unicode-xetex-classes.tex v... (....-..-..)
 Reading Unicode east Asian character class data
-# LineBreak-15.1.0.txt 
-# Date: ....-..-.., 13:19:22 GMT [KW] 
-# EastAsianWidth-15.1.0.txt 
-# Date: ....-..-.., 23:34:08 GMT 
+# LineBreak-16.0.0.txt 
+# Date: ....-..-.., 16:26:55 GMT 
+# EastAsianWidth-16.0.0.txt 
+# Date: ....-..-.., 21:48:20 GMT 
 )
 Already applied: [....-..-..] XeTeX character classes on input line ....
 Applying: [....-..-..] Save language for hyphenation on input line ....

diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -925,10 +925,10 @@ Applying: [....-..-..] XeTeX character classes on input line ....
 (../load-unicode-xetex-classes.tex 
 load-unicode-xetex-classes.tex v... (....-..-..)
 Reading Unicode east Asian character class data
-# LineBreak-15.1.0.txt 
-# Date: ....-..-.., 13:19:22 GMT [KW] 
-# EastAsianWidth-15.1.0.txt 
-# Date: ....-..-.., 23:34:08 GMT 
+# LineBreak-16.0.0.txt 
+# Date: ....-..-.., 16:26:55 GMT 
+# EastAsianWidth-16.0.0.txt 
+# Date: ....-..-.., 21:48:20 GMT 
 )
 Already applied: [....-..-..] XeTeX character classes on input line ....
 Applying: [....-..-..] Save language for hyphenation on input line ....

diff --git a/base/testfiles/tlb-rollback-005.xetex.tlg b/base/testfiles/tlb-rollback-005.xetex.tlg
@@ -932,10 +932,10 @@ Applying: [....-..-..] XeTeX character classes on input line ....
 (../load-unicode-xetex-classes.tex 
 load-unicode-xetex-classes.tex v... (....-..-..)
 Reading Unicode east Asian character class data
-# LineBreak-15.1.0.txt 
-# Date: ....-..-.., 13:19:22 GMT [KW] 
-# EastAsianWidth-15.1.0.txt 
-# Date: ....-..-.., 23:34:08 GMT 
+# LineBreak-16.0.0.txt 
+# Date: ....-..-.., 16:26:55 GMT 
+# EastAsianWidth-16.0.0.txt 
+# Date: ....-..-.., 21:48:20 GMT 
 )
 Already applied: [....-..-..] XeTeX character classes on input line ....
 Applying: [....-..-..] Save language for hyphenation on input line ....

diff --git a/required/amsmath/amsmath.dtx b/required/amsmath/amsmath.dtx
@@ -85,7 +85,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesPackage{amsmath}[2024/11/05 v2.17t AMS math features]
+\ProvidesPackage{amsmath}[2025/01/11 v2.17u AMS math features]
 %    \end{macrocode}
 %
 % \section{Catcode defenses}
@@ -3117,9 +3117,12 @@ ill-advised in LaTeX.%
 %    \end{macrocode}
 %    In case there is an enumerate inside a minipage inside an equation,
 %    we need to reset \cn{label} to its normal value:
+% \changes{v2.17u}{2025/01/11}{Correct 30 years old typo:
+%               \cs{@arrayparboxrestore} needs changing not
+%               \cs{@arrayboxrestore} (gh/1608)}
 %    \begin{macrocode}
 \toks@\@xp{\@arrayparboxrestore \let\label\ltx@label}%
-\edef\@arrayboxrestore{\the\toks@}
+\edef\@arrayparboxrestore{\the\toks@}
 %    \end{macrocode}
 %
 %    \begin{macrocode}

diff --git a/required/amsmath/changes.txt b/required/amsmath/changes.txt
@@ -2,6 +2,12 @@
 All changes above are only part of the development branch for the next release.
 ================================================================================
 
+2025-01-11  Frank Mittelbach  <[email protected]>
+
+	* amsmath.dtx (subsection{Implementing tags and labels}):
+	Correct 30 years old typo: \@arrayparboxrestore needs changing
+	not \@arrayboxrestore (gh/1608)
+
 #########################
 # 2024-11-01a Release
 #########################