Tagging 1199 1202 1203 1207 (latex3#1993)

* fix for latex3/tagging-project#1999 latex3/tagging-project/latex3#1202 and latex3/tagging-project/latex3#1203

* fix test

* fix for latex3/tagging-project#1299 latex3/tagging-project#1202 latex3/tagging-project#1203

* fix for latex3/tagging-project#1200

* unboxed captions ...

* and a few more

* fix for latex3/tagging-project#1207

Author: FrankMittelbach

required/latex-lab/changes.txt

@@ -1,3 +1,25 @@
+2026-02-02  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* latex-lab-block.dtx (subsection{Template types and template interfaces}):
+	Add caption-unbreakable key (tagging/1200)
+
+	(subsection{Template types and template interfaces}):
+	Use \proofname as value for title proof template (tagging/1207)
+
+2026-02-01  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* latex-lab-block.dtx (subsubsection{Declarations for theorem-like environments}):
+	Argument applied to the wrong keys (tagging/1202)
+
+	(subsubsection{The \insttype{thmstyle} instances they use}):
+	Add further decl keys (tagging/1199)
+
+	(subsubsection{The \insttype{thmstyle} instances they use}):
+	Change order of elements (tagging/1199)
+
+	(subsubsection{Supporting QED in proofs}):
+	Stray definition of \cs{math@qedhere} removed (taggging/1203)
+
 2026-01-28 Joseph Wright <Joseph.Wright@latex-project.org>
 	* latex-lab-math.dtx: Support nested alignments when grabbing math
 

required/latex-lab/latex-lab-block.dtx

@@ -9,8 +9,8 @@
 %
 %    https://www.latex-project.org/lppl.txt
 %
-\def\ltlabblockdate{2026-01-26}
-\def\ltlabblockversion{0.9m}
+\def\ltlabblockdate{2026-02-02}
+\def\ltlabblockversion{0.9n}
 
 %<*driver>
 \DocumentMetadata{tagging=on,pdfstandard=ua-2,lang=en}
@@ -599,13 +599,17 @@
 %
 %  \TemplateKey{title}{tokenlist}
 %              {Heading for the environment unless overwritten on
-%               document level.}{Proof}
+%               document level. The default value, i.e.,
+%              \cs{proofname} resolves to \enquote{Proof}
+%              unless changed}{\cs{proofname}}
 %  \TemplateKey{punct}{tokenlist}
 %              {Punctuation following the heading.}{.}
 %  \TemplateKey{caption-placement}{choice}
 %              {Supported values
 %               \keyvalue{chained},\keyvalue{unchained}, and
 %               \keyvalue{standalone}}{unchained}
+%  \TemplateKey{caption-unbreakable}{boolean}
+%              {Can this caption have (implicit or explicit) line breaks?}{false}
 %  \TemplateKey{before-hspace}{skip}
 %              {Horizontal displacement of the heading.}{0pt}
 %  \TemplateKey{after-hspace}{skip}
@@ -614,6 +618,12 @@
 %  \TemplateKey{caption-decls}{tokenlist}
 %              {Declarations that are applied to the whole caption,
 %               e.g., some font settings.}{\meta{empty}}
+%  \TemplateKey{title-decls}{tokenlist}
+%              {Declarations that are applied only to the caption
+%               title.}{\meta{empty}}
+%  \TemplateKey{punct-decls}{tokenlist}
+%              {Declarations that are applied only to the caption
+%               punctuation.}{\meta{empty}}
 %  \TemplateKey{title-format}{function{1}}
 %              {Formatting applied to the \key{title} value.}{\#1}
 %  \TemplateKey{punct-format}{function{1}}
@@ -649,6 +659,8 @@
 %              {Supported values
 %               \keyvalue{chained},\keyvalue{unchained}, and
 %               \keyvalue{standalone}}{unchained}
+%  \TemplateKey{caption-unbreakable}{boolean}
+%              {Can this caption have (implicit or explicit) line breaks?}{false}
 %  \TemplateKey{before-hspace}{skip}
 %              {Horizontal displacement of the heading.}{0pt}
 %  \TemplateKey{after-hspace}{skip}
@@ -657,10 +669,20 @@
 %  \TemplateKey{order}{commalist}
 %              {Order of elements in the environment
 %    caption/heading. Supported values are \texttt{title},
-%    \texttt{number}, \texttt{punct}, \texttt{space}, and \texttt{note}.}{title,space,number,space,note}
-%  \TemplateKey{caption-decls}{tokenlist}
-%              {Declarations that are applied to the whole caption,
-%               e.g., some font settings.}{\meta{empty}}
+%    \texttt{number}, \texttt{punct}, \texttt{space}, and
+%    \texttt{note}.}{title,space,number,space,note,punct}
+%  \TemplateKey{title-decls}{tokenlist}
+%              {Declarations that are applied only to the caption
+%               title.}{\meta{empty}}
+%  \TemplateKey{number-decls}{tokenlist}
+%              {Declarations that are applied only to the caption
+%               number.}{\meta{empty}}
+%  \TemplateKey{punct-decls}{tokenlist}
+%              {Declarations that are applied only to the caption
+%               punctuation.}{\meta{empty}}
+%  \TemplateKey{note-decls}{tokenlist}
+%              {Declarations that are applied only to the caption
+%               note.}{\meta{empty}}
 %  \TemplateKey{title-format}{function{1}}
 %              {Formatting applied to the \key{title} value.}{\#1}
 %  \TemplateKey{number-format}{function{1}}
@@ -1897,6 +1919,8 @@
 %    The main style used for many theorem-like environments, i.e., the
 %    one you get if no special \cs{theoremstyle} has been specified.
 %
+% \changes{v0.9n}{2026/02/01}{Change order of elements (tagging/1199)}
+% \changes{v0.9n}{2026/02/01}{Add further decl keys (tagging/1199)}
 %    \begin{macrocode}
 \DeclareInstance{thmstyle}{plain}{std}
   {
@@ -1906,8 +1930,12 @@
     ,punct             = . 
     ,before-hspace     = 0pt
     ,after-hspace      = 5pt plus 1pt minus 1pt
-    ,order             = {title, space, number, punct, space, note}
+    ,order             = {title, space, number, space, note, punct}
     ,caption-decls     = \bfseries
+    ,title-decls       = 
+    ,number-decls      = 
+    ,punct-decls       = 
+    ,note-decls        =
     ,title-format      = #1
     ,number-format     = #1
     ,punct-format      = #1
@@ -1924,7 +1952,7 @@
 \DeclareInstanceCopy{thmstyle}{remark}{plain}
 \EditInstance{thmstyle}{remark}
 {
-  ,caption-decls = \itshape
+  ,title-decls   = \itshape
   ,body-decls    = \normalfont
 }
 %    \end{macrocode}
@@ -2099,10 +2127,11 @@
 %    proof because proofs are not numbered and the argument to a proof
 %    environment has a somewhat different semantic meaning than that
 %    of theorem-like environments.
+%
 %    \begin{macrocode}
 \DeclareInstance{captionedtext}{proof}{proof}
   {
-    ,title         = Proof
+    ,title         = \proofname    % default value
     ,punct         = . 
     ,before-hspace = 0pt
     ,after-hspace  = 5pt plus 1pt minus 1pt
@@ -3242,39 +3271,62 @@
 %    any delegation and therefore shows several keys for customizing
 %    the layout (similar to those seen with \insttype{thmstyle}
 %    \instname{std}).
+% \changes{v0.9n}{2026/02/01}{Add further decl keys (tagging/1199)}
+% \changes{v0.9n}{2026/02/01}{Add caption-unbreakable key (tagging/1200)}
+% \changes{v0.9n}{2026/02/02}{Use \cs{proofname} as value for title (tagging/1207)}
 %    \begin{macrocode}
 \DeclareTemplateInterface{captionedtext}{proof}{4}
 {
-  ,title             : tokenlist = Proof 
+  ,title             : tokenlist = \proofname
   ,punct             : tokenlist = .
   ,caption-placement : choice {chained,unchained,standalone} = unchained
+  ,caption-unbreakable : boolean = false
   ,before-hspace     : skip = 0pt 
   ,after-hspace      : skip = 5pt 
   ,caption-decls     : tokenlist =
+  ,title-decls       : tokenlist = 
+  ,punct-decls       : tokenlist = 
   ,title-format      : function{1} = #1
   ,punct-format      : function{1} = #1
   ,body-decls        : tokenlist =
 }
 %    \end{macrocode}
 % \end{template}
 %
+%  \begin{macro}{\proofname}
+%    The \pkg{amsthm} package supported redefinition of \cs{proofname}
+%    as a means to alter default caption for proofs. We continue to
+%    support this as long as the instance declaration doesn't
+%    overwrite it.
+% \changes{v0.9n}{2026/02/02}{Macro \cs{proofname} added (tagging/1207)}
+%    \begin{macrocode}
+\newcommand\proofname{Proof}
+%    \end{macrocode}
+%  \end{macro}
 %
 %
 %
 %
 % \begin{template}{thmstyle std}
 %
+% \changes{v0.9n}{2026/02/01}{Add further decl keys (tagging/1199)}
+% \changes{v0.9n}{2026/02/01}{Add caption-unbreakable key (tagging/1200)}
 %    \begin{macrocode}
 \DeclareTemplateInterface{thmstyle}{std}{4}
 {
   ,numbered          : boolean = true
   ,space             : tokenlist = \    % <- bad name?
   ,punct             : tokenlist = .
   ,caption-placement : choice {chained,unchained,standalone} = unchained
+  ,caption-unbreakable : boolean = false
   ,before-hspace     : skip = 0pt
   ,after-hspace      : skip = 5pt
   ,order             : commalist = { title, space, number, punct, space, note }
   ,caption-decls     : tokenlist =
+  ,title-decls       : tokenlist =
+  ,number-decls      : tokenlist =
+  ,punct-decls       : tokenlist =
+  ,note-decls        : tokenlist =
   ,title-format      : function{1} = #1
   ,number-format     : function{1} = #1
   ,punct-format      : function{1} = #1
@@ -4167,7 +4219,10 @@
 %    \begin{macrocode}
          \legacy_if_gset_false:n { @inlabel }
          \para_omit_indent:
-         \box_use_drop:N \g_@@_labels_box
+         \bool_if:NTF \l_@@_caption_unbreakable_bool
+                      \box_use_drop:N
+                      \hbox_unpack_drop:N
+            \g_@@_labels_box
          \__kernel_list_label_after:n { \PARALABEL }     % <- change
                                                          % this name
          \penalty \c_zero_int
@@ -5084,6 +5139,7 @@
 %    separation into two templates is that typically the same design
 %    is used for different theorem-like environments only differing in
 %    this fixed string.
+% \changes{v0.9n}{2026/02/01}{Add further decl keys (tagging/1199)}
 %    \begin{macrocode}
 \DeclareTemplateCode{thmstyle}{std}{4}
 {
@@ -5098,10 +5154,15 @@
     ,standalone = \bool_gset_true:N  \g_@@_label_standalone_bool
                   \bool_gset_false:N \g_@@_label_unchained_bool
    }
+  ,caption-unbreakable = \l_@@_caption_unbreakable_bool
   ,before-hspace   = \l_@@_caption_before_skip
   ,after-hspace    = \l_@@_caption_after_skip
   ,order           = \l_@@_order_clist
   ,caption-decls   = \l_@@_caption_decls_tl
+  ,title-decls     = \l_@@_title_decls_tl
+  ,number-decls    = \l_@@_number_decls_tl
+  ,punct-decls     = \l_@@_punct_decls_tl
+  ,note-decls      = \l_@@_note_decls_tl
   ,title-format    = \@@_title_format:n
   ,number-format   = \@@_number_format:n
   ,punct-format    = \@@_punct_format:n
@@ -5282,7 +5343,9 @@
          \@@_insert_spaces:
 %    \end{macrocode}
 %    The title may have its own formatting:
+% \changes{v0.9n}{2026/02/01}{Add decl key (tagging/1199)}
 %    \begin{macrocode}
+         \l_@@_title_decls_tl
          \@@_title_format:n \l_@@_title_tl }
      }
 }
@@ -5292,12 +5355,14 @@
 %
 %  \begin{macro}{\@@_do_note:}
 %    Formatting of a note (if present) uses the same structure.
+% \changes{v0.9n}{2026/02/01}{Add decl key (tagging/1199)}
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_do_note: {
   \tl_if_novalue:oTF \l_@@_note_tl
      { \@@_drop_spaces: }
      { \tag_socket_use:nnn {mc} {} {
          \@@_insert_spaces:
+         \l_@@_note_decls_tl
          \@@_note_format:n \l_@@_note_tl }
      }
 }
@@ -5308,11 +5373,13 @@
 %  \begin{macro}{\@@_do_number:}
 %    The number (if present) has a similar formatting but it uses an
 %    \UseStructureName{block/theorem-like/label} structure:
+% \changes{v0.9n}{2026/02/01}{Add decl key (tagging/1199)}
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_do_number: {
   \bool_if:NTF \l_@@_numbered_bool
      { \tag_socket_use:nnn {struct-mc} {tag=\UseStructureName{block/theorem-like/label}}
          { \@@_insert_spaces:
+         \l_@@_number_decls_tl
            \@@_number_format:n {
              \use:c{ the \l_@@_counter_tl } }
          }
@@ -5326,11 +5393,13 @@
 %  \begin{macro}{\@@_do_punct:}
 %    The punctuation is handled slightly differently. It unconditionally drops any
 %    dangling spaces whether or not it is empty:
+% \changes{v0.9n}{2026/02/01}{Add decl key (tagging/1199)}
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_do_punct: {
   \@@_drop_spaces:
   \tl_if_empty:NF \l_@@_punct_tl
      { \tag_socket_use:nnn {mc} {}{
+         \l_@@_punct_decls_tl
          \@@_punct_format:n \l_@@_punct_tl }
      }
 }
@@ -5386,11 +5455,13 @@
 %
 % \begin{template}{captionedtext proof}
 %    In case of the templates for proofs we do everything in a single template.
+% \changes{v0.9n}{2026/02/01}{Add further decl keys (tagging/1199)}
+% \changes{v0.9n}{2026/02/01}{Add caption-unbreakable key (tagging/1200)}
 %    \begin{macrocode}
 \DeclareTemplateCode{captionedtext}{proof}{4}
 {
-  ,title           = \l_@@_title_tl
-  ,punct           = \l_@@_punct_tl
+  ,title         = \l_@@_title_tl
+  ,punct         = \l_@@_punct_tl
   ,caption-placement = {
      chained    = \bool_gset_false:N \g_@@_label_standalone_bool
                   \bool_gset_false:N \g_@@_label_unchained_bool
@@ -5399,12 +5470,15 @@
     ,standalone = \bool_gset_true:N  \g_@@_label_standalone_bool
                   \bool_gset_false:N \g_@@_label_unchained_bool
    }
-  ,before-hspace   = \l_@@_caption_before_skip
-  ,after-hspace    = \l_@@_caption_after_skip
-  ,caption-decls   = \l_@@_caption_decls_tl
-  ,title-format    = \@@_title_format:n
-  ,punct-format    = \@@_punct_format:n
-  ,body-decls      = \l_@@_body_decls_tl
+  ,caption-unbreakable = \l_@@_caption_unbreakable_bool
+  ,before-hspace = \l_@@_caption_before_skip
+  ,after-hspace  = \l_@@_caption_after_skip
+  ,caption-decls = \l_@@_caption_decls_tl
+  ,title-decls   = \l_@@_title_decls_tl
+  ,punct-decls   = \l_@@_punct_decls_tl
+  ,title-format  = \@@_title_format:n
+  ,punct-format  = \@@_punct_format:n
+  ,body-decls    = \l_@@_body_decls_tl
 }
 {
 %    \end{macrocode}
@@ -5448,12 +5522,16 @@
 %    \end{macrocode}
 %    The remaining code is identical to the one in \insttype{thmstyle}
 %    \instname{std}; for documentation see there:
+% \changes{v0.9n}{2026/02/01}{Allow caption to break by default (tagging/1200)}
 %    \begin{macrocode}
   \bool_if:NTF \g_@@_label_standalone_bool
      {
        \bool_gset_true:N \g_@@_label_standalone_bool
        \para_omit_indent:
-       \box_use_drop:N \g_@@_labels_box
+       \bool_if:NTF \l_@@_caption_unbreakable_bool
+                    \box_use_drop:N
+                    \hbox_unpack_drop:N
+          \g_@@_labels_box
        \par
      }
      {
@@ -6679,11 +6757,12 @@
 \cs_set_protected:Npn \newtheoremstyle #1#2#3#4#5#6#7#8#9 {
 %    \end{macrocode}
 %    First we build a \insttype{thmstyle} instance:
+% \changes{v0.9n}{2026/02/01}{Argument applied to the wrong keys (tagging/1202)}
 %    \begin{macrocode}
   \DeclareInstance{thmstyle}{#1}{std}{
-    ,caption-decls   = {#4}
+    ,caption-decls   = {#6}
     ,before-hspace:e = \tl_if_empty:nTF{#5}{0pt}{#5}
-    ,body-decls      = {#6}
+    ,body-decls      = {#4}
     ,punct           = {#7}
 %    \end{macrocode}
 %    This setting doesn't cover all syntax possibilities.
@@ -6773,6 +6852,7 @@
 %  also not documented---see the \pkg{amsthm} package for
 %  documentation for now).
 %   
+% \changes{v0.9n}{2026/02/01}{Stray definition of \cs{math@qedhere} removed (taggging/1203)}
 %    \begin{macrocode}
 \ExplSyntaxOff
   \def\math@qedhere{%
@@ -6833,8 +6913,6 @@
   \expandafter\let\csname align*@qed\endcsname\align@qed
   \expandafter\let\csname gather*@qed\endcsname\align@qed
   %
-  \def\math@qedhere{\quad\hbox{\qedsymbol}}%
-  %
   \DeclareRobustCommand{\qed}{%
     \ifmmode \mathqed
     \else