Move luamml patches into latex-lab

base/changes.txt

@@ -6,6 +6,10 @@ to completeness or accuracy and it contains some references to files that are
 not part of the distribution.
 ================================================================================
 
+2025-02-17 Ulrike Fischer <[email protected]>
+	* lttagging.dtx: add sockets for luamml support.
+	* lttagging.dtx: provide \MathCollectTrue, \MathCollectFalse
+
 2025-02-14  Frank Mittelbach  <[email protected]>
 
 	* ltoutput.dtx:
@@ -21,19 +25,20 @@ not part of the distribution.
 	* ltoutenc.dtx
 	Log only text command/symbol redeclarations  (gh/1242)
 
-
 2025-02-03  Frank Mittelbach  <[email protected]>
 
 	* lthooks.dtx:
 	Document more prominently that using a hook with \UseHook or similar
 	commands requires that the hook to be declared first (gh/1519)
 
+
 2025-02-01  Jonathan P. Spratte
 
     * ltcmd.dtx (subsection{User functions}):
     Generalise \ProcessList by using \tl_map_tokens:nn instead of
     \tl_map_function:nN.
 
+
 2025-01-31  Frank Mittelbach  <[email protected]>
 
 	* latexrelease.dtx (subsection{Ignoring \texttt{\string_new} errors when rolling back}):
@@ -62,6 +67,7 @@ not part of the distribution.
 	Allow * to denote the current counter (as used by \label) in counter
 	related commands, \alph*,  \stepcounter*, etc. (gh/1632)
 
+
 2025-01-21  Frank Mittelbach  <[email protected]>
 
 	* ltoutput.dtx (subsection{Floats}):
@@ -153,6 +159,7 @@ not part of the distribution.
 	* ltxref.dtx (subsection{Cross Referencing})
 	Replace \@tempa with \reserved@a in \Ref (gh/1579)
 
+
 2024-12-03  Yukai Chou  <[email protected]>
 	* ltmarks.dtx (subsection{Allocating new mark classes}):
 	Fix inconsistent local/global assignment (gh/1574)

base/doc/ltnews41.tex

@@ -311,6 +311,18 @@ \section{News from Tagged PDF project}
 
 \emph{to write}
 
+\subsection{Setting up math tagging}
+
+With the \LuaTeX{} engine there are now various options for accessible math described in full details in latex-lab-math.pdf. To simplify the setup a new
+key \texttt{math/setup} can be used that  accepts a comma list with the values \texttt{structelem} (add MathML structure element), \texttt{mathml-AF}
+(attach MathML associated file) or \texttt{tex-AF} (attach the TeX source).
+
+
+\subsection{Promoting PDF 2.0}
+
+PDF 2.0 is a requirement for accessible PDF containing math as the MathML name spaces isn't supported by earlier PDF versions. \LaTeX{} will therefore set
+PDF 2.0 as default version if \cs{DocumentMetadata} is used. A different PDF version can be set with the \texttt{pdfversion} key.  
+
 \subsection{Fixing the spacing after display math}
 
 When \LaTeX{} produces an accessible (tagged) PDF it has to add

base/lttagging.dtx

@@ -126,10 +126,10 @@
 % Usually, these sockets have (beside the default plug defined for every socket)
 % one additional plug defined and directly assigned. This plug is used when
 % tagging is active.
-% There may be more plugs, e.g., tagging with special debugging or special behaviour
+% There may be more plugs, e.g., tagging with special debugging or special behavior
 % depending on the class or PDF version etc., but right now it is usually just on or off.
 %
-% When tagging is suspended they all have the same predefined behaviour:
+% When tagging is suspended they all have the same predefined behavior:
 % The sockets with zero arguments do nothing. The sockets with one argument
 % gobble their argument. The sockets with two arguments
 % will drop their first argument and pass the second unchanged.
@@ -152,7 +152,14 @@
 %  \cs{UseTaggingSocket} because they do not have to determine how
 %  many arguments the socket takes when disabling it.
 %
-%
+% \DescribeMacro\MathCollectTrue
+% \DescribeMacro\MathCollectFalse
+% The tagging of math has to collect/grab the math first. This is not wanted
+% for all uses of \verb+$+. These command allow to control the behavior of the
+% math shift token. Without the  math tagging code they do nothing. Their behavior
+% with the math tagging code is documented in latex-lab-math.pdf 
+%  
+% 
 % \MaybeStop{}
 %
 %
@@ -230,6 +237,16 @@
 %
 %  \end{macro}
 %
+% \subsection{Math collection}
+% The documentation is in latex-lab-math.
+% 
+% \begin{macro}{\MathCollectTrue,\MathCollectFalse}
+%    \begin{macrocode}
+\cs_new_protected:Npn\MathCollectTrue{}
+\cs_new_protected:Npn\MathCollectFalse{}
+%    \end{macrocode}
+% \end{macro}
+% 
 % \subsection{Tagging sockets}
 % This collects tagging sockets that should be generally available
 % so that they can also be used even if the tagging code is not loaded.
@@ -621,7 +638,222 @@
 %    \end{macrocode}
 % \end{socketdecl}
 %
+% \subsection{Tagging support for math}
+%
+% \subsubsection{General sockets}
+%
+% The following sockets are the main math sockets.
+%
+% \changes{v1.0n}{2025/02/19}{Moved math sockets into lttagging}
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/inline/begin}{0}
+\NewSocket{tagsupport/math/inline/end}{0}
+\NewSocket{tagsupport/math/inline/formula/begin}{2}
+\NewSocket{tagsupport/math/inline/formula/end}{0}
+\NewSocket{tagsupport/math/display/begin}{0}
+\NewSocket{tagsupport/math/display/end}{0}
+\NewSocket{tagsupport/math/display/formula/begin}{2}
+\NewSocket{tagsupport/math/display/formula/end}{0}
+\NewSocket{tagsupport/math/display/tag/begin}{0}
+\NewSocket{tagsupport/math/display/tag/end}{0}
+%    \end{macrocode}
+% Assign transparent socket to the sockets with two arguments:
+%    \begin{macrocode}
+\NewSocketPlug{tagsupport/math/inline/formula/begin}{transparent}{#2}
+\AssignSocketPlug{tagsupport/math/inline/formula/begin}{transparent}
+\NewSocketPlug{tagsupport/math/display/formula/begin}{transparent}{#2}
+\AssignSocketPlug{tagsupport/math/display/formula/begin}{transparent}
+%    \end{macrocode}
+%
+% \subsubsection{Sockets specific for luamml}
+% \paragraph{Save sockets}
+%  These sockets are wrappers around the \cs{luamml_save:...} commands.
+%  They take an argument which should contain the argument of the save command.
+%
+% \begin{socketdecl}{tagsupport/math/luamml/save/nn}
+%  The argument should contain the two arguments of the command.
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/save/nn}{1}
+\AssignSocketPlug{tagsupport/math/luamml/save/nn}{noop}
+%    \end{macrocode}
+% \end{socketdecl}
+%
+% \begin{socketdecl}{tagsupport/math/luamml/save/nNn}
+%  The argument should contain the three arguments of the command.
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/save/nNn}{1}
+\AssignSocketPlug{tagsupport/math/luamml/save/nNn}{noop}
+%    \end{macrocode}
+% \end{socketdecl}
+%
+% \paragraph{Socket to annotate}
+% 
+% \begin{socketdecl}{tagsupport/math/luamml/annotate/false}
+%  These socket can be used for content that should be annotated
+%  with \texttt{core=false}
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/annotate/false}{2}
+\NewSocketPlug{tagsupport/math/luamml/annotate/false}{transparent}{#2}
+\AssignSocketPlug{tagsupport/math/luamml/annotate/false}{transparent}
+%    \end{macrocode}
+% \end{socketdecl}
+% 
+% \paragraph{Array sockets} These sockets will be used in \pkg{array} to
+% add luamml support to the array environment.
 %
+% \begin{socketdecl}{tagsupport/math/luamml/array/save}
+%
+%  This socket will be used in \cs{endarray}. The plug is set by luamml.
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/array/save}{0}
+%    \end{macrocode}
+% \end{socketdecl}
+%
+% \begin{socketdecl}{tagsupport/math/luamml/array/finalize}
+%
+%  This socket will be used in \cs{endarray}. The plug is set by luamml.
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/array/finalize}{0}
+%    \end{macrocode}
+% \end{socketdecl}
+%
+% \begin{socketdecl}{tagsupport/math/luamml/array/initcol}
+%  This socket will be used in \cs{@classz}. The plug is set by luamml.
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/array/initcol}{0}
+%    \end{macrocode}
+% \end{socketdecl}
+%
+%
+% \begin{socketdecl}{tagsupport/math/luamml/array/finalizecol}
+%  This socket will be used in \cs{@classz}. The plug is set by luamml.
+% The argument sets the type of the column.
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/array/finalizecol}{1}
+\AssignSocketPlug{tagsupport/math/luamml/array/finalizecol}{noop}
+%    \end{macrocode}
+% \end{socketdecl}
+%
+% \paragraph{Alignment environments}
+% Multiline environments like \texttt{align}, \texttt{multline} or \texttt{gather}
+% are tagged as \texttt{mtable}.
+%
+% \begin{socketdecl}{tagsupport/math/luamml/mtable/finalizecol}
+% This sockets is used at the end of alignment cells and adds them to
+% the row. The argument passes a type like \texttt{last} or \texttt{box}.
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/mtable/finalizecol}{1}
+\AssignSocketPlug{tagsupport/math/luamml/mtable/finalizecol}{noop}
+%    \end{macrocode}
+% \end{socketdecl}
+% 
+% 
+% \begin{socketdecl}{tagsupport/math/luamml/mtable/finalize}
+% This sockets is used at the end of alignment environment to finalize the
+% mtable code. It should be used normally with \cs{UseExpandableTaggingSocket}.
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/mtable/finalize}{1}
+\AssignSocketPlug{tagsupport/math/luamml/mtable/finalize}{noop}
+%    \end{macrocode}
+% \end{socketdecl}
+%
+% \begin{socketdecl}{tagsupport/math/luamml/mtable/aligncol}
+% This sockets is used in multline to add attributes
+% describing the alignment to the left and right.
+% It takes an argument, the alignment.
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/mtable/aligncol}{1}
+\AssignSocketPlug{tagsupport/math/luamml/mtable/aligncol}{noop}
+%    \end{macrocode}
+% \end{socketdecl}
+
+% 
+% \begin{socketdecl}{tagsupport/math/luamml/mtable/innertable/save}
+% This socket is used in \cs{endaligned} to save the table. It takes no argument.
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/mtable/innertable/save}{0}
+%    \end{macrocode}
+% \end{socketdecl}
+%
+% \begin{socketdecl}{tagsupport/math/luamml/mtable/smallmatrix/save}
+% This socket is used in \cs{endsmallmatrix} to save the table. It takes no argument.
+% TODO: Check if this socket and the innertable socket can/should be merged into a more
+% generic version.
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/mtable/smallmatrix/save}{0}
+%    \end{macrocode}
+% \end{socketdecl}
+% 
+% \begin{socketdecl}{tagsupport/math/luamml/mtable/innertable/finalize}
+% This socket is used e.g. in \cs{endsmallmatrix} and \cs{gathered} to finalize the table. 
+% It takes no argument.
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/mtable/innertable/finalize}{0}
+%    \end{macrocode}
+% \end{socketdecl}
+% 
+% \begin{socketdecl}{tagsupport/math/luamml/mtable/tag/save}
+% This socket is used to save a tag for later use.
+% has been save before.
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/mtable/tag/save}{0}
+%    \end{macrocode}
+% \end{socketdecl}
+
+% \begin{socketdecl}{tagsupport/math/luamml/mtable/tag/set}
+% This socket should be used when a tag is placed. It inserts a tag that
+% has been save before.
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/mtable/tag/set}{0}
+%    \end{macrocode}
+% \end{socketdecl}
+% 
+% \paragraph{mbox socket}
+%
+% \begin{socketdecl}{tagsupport/math/luamml/hbox}
+%  This socket is used around \cs{hbox}
+%  inside an \cs{mbox}, \cs{makebox} and \cs{text} and annotates
+%  the content if the \cs{hbox} is used inside math.
+%  The real plug is set by luamml but a default plug is defined
+%  here so that the socket can also be used if luamml is not used.
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/hbox}{2}
+\NewSocketPlug{tagsupport/math/luamml/hbox}{transparent}{#2}
+\AssignSocketPlug{tagsupport/math/luamml/hbox}{transparent}
+%    \end{macrocode}
+% \end{socketdecl}
+%
+%
+% \paragraph{math phantom sockets}
+% \changes{1.0m}{2025-01-27}{add sockets for math phantom commands}
+% \begin{socketdecl}{tagsupport/math/luamml/finph@nt}
+%  This socket handles the annotation of \cs{finph@nt}
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/finph@nt}{2}
+\NewSocketPlug{tagsupport/math/luamml/finph@nt}{transparent}{#2}
+\AssignSocketPlug{tagsupport/math/luamml/finph@nt}{transparent}
+%    \end{macrocode}
+% \end{socketdecl}
+%
+% \begin{socketdecl}{tagsupport/math/luamml/finph@nt}
+%  This socket handles the annotation of \cs{finsm@sh}
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/finsm@sh}{2}
+\NewSocketPlug{tagsupport/math/luamml/finsm@sh}{transparent}{#2}
+\AssignSocketPlug{tagsupport/math/luamml/finsm@sh}{transparent}
+%    \end{macrocode}
+% \end{socketdecl}
+% \paragraph{Artifact root sign}
+%
+% \begin{socketdecl}{tagsupport/math/luamml/artifact}
+% Unicode characters like a root sign should be marked as artifacts
+% to avoid duplication, e.g., in derivation if mathml
+% structure elements are used that imply the meaning.
+%
+%    \begin{macrocode}
+\NewSocket{tagsupport/math/luamml/artifact}{0}
+%    \end{macrocode}
+% \end{socketdecl}
 %
 % \section{For lttab.dtx parked here for now}
 %

required/latex-lab/changes.txt

@@ -1,3 +1,7 @@
+2025-02-17 Ulrike Fischer <[email protected]>
+	* documentmetadata-support.dtx: set PDF 2.0 as default
+	* latex-lab-text.dtx: add phoneme instruction to LaTeX.
+
 2025-02-14  Frank Mittelbach  <[email protected]>
 
 	* latex-lab-new-or-1.dtx:
@@ -13,6 +17,19 @@
 	* latex-lab-new-or-2.dtx:
 	Use sockets and hooks to make output routine configurable.
 
+2025-02-06 Ulrike Fischer <[email protected]>
+	* documentmetadata-support.dtx: replace deprecated \keys_set_filter:nnn
+	* latex-lab-math.dtx: removed the subpart code. It will probably never be used.
+	* latex-lab-math.dtx: move amsmath-patches int latex-lab-amsmath, and insert
+	luamml patches.
+	* latex-lab-math.dtx: redefine \mathpalette in luatex.
+    * latex-lab-text.dtx: suppress tagging in \phantom in text mode, adapt for mathmode.
+	* latex-lab-unicode-math.dtx: tag roots and fraction rules as artifact is
+	mathml structure elements are used.
+	* use \@math@level to identify nested math
+	* added latex-lab-unicode-math.dtx/ltx for unicode-math fixes
+	* redefine \bBigg@ if unicode-math is used.
+
 2024-01-30 Ulrike Fischer <[email protected]>
 	* latex-lab-block.dtx, latex-lab-namespace.dtx: change tagging of verbatim.