Merge branch 'develop' into UF-latex-lab-verbatim

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}):

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

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}

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
 #########################