[latex3-commits] [git/LaTeX3-latex3-latex2e] everymath: Extend math processing to receive env. name (e055d2b2)
Joseph Wright
joseph.wright at morningstar2.co.uk
Fri Jan 6 15:31:39 CET 2023
Repository : https://github.com/latex3/latex2e
On branch : everymath
Link : https://github.com/latex3/latex2e/commit/e055d2b20915fdd1dcbd425d1764a0a3b07949eb
>---------------------------------------------------------------
commit e055d2b20915fdd1dcbd425d1764a0a3b07949eb
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date: Fri Jan 6 14:27:10 2023 +0000
Extend math processing to receive env. name
>---------------------------------------------------------------
e055d2b20915fdd1dcbd425d1764a0a3b07949eb
required/latex-lab/latex-lab-mathcapture.dtx | 29 ++++---
.../testfiles-mathcapture/mathcapture-001.lvt | 4 +-
.../testfiles-mathcapture/mathcapture-001.tlg | 14 +++
.../testfiles-mathcapture/mathcapture-002.lvt | 3 +-
.../testfiles-mathcapture/mathcapture-002.tlg | 8 ++
.../testfiles-mathcapture/mathcapture-003.lvt | 3 +-
.../testfiles-mathcapture/mathcapture-003.tlg | 2 +
.../testfiles-mathcapture/mathcapture-004.lvt | 3 +-
.../testfiles-mathcapture/mathcapture-004.tlg | 1 +
.../testfiles-mathcapture/mathcapture-005.lvt | 3 +-
.../testfiles-mathcapture/mathcapture-005.tlg | 3 +
.../testfiles-mathcapture/mathcapture-006.lvt | 3 +-
.../testfiles-mathcapture/mathcapture-006.tlg | 2 +
.../testfiles-mathcapture/mathcapture-007.lvt | 3 +-
.../testfiles-mathcapture/mathcapture-007.tlg | 5 ++
.../testfiles-mathcapture/mathcapture-008.lvt | 3 +-
.../testfiles-mathcapture/mathcapture-008.tlg | 10 +++
.../testfiles-mathcapture/mathcapture-009.lvt | 3 +-
.../testfiles-mathcapture/mathcapture-009.tlg | 6 ++
.../testfiles-mathcapture/mathcapture-010.lvt | 3 +-
.../testfiles-mathcapture/mathcapture-011.lvt | 3 +-
.../testfiles-mathcapture/mathcapture-011.tlg | 3 +
.../testfiles-mathcapture/mathcapture-012.lvt | 3 +-
.../testfiles-mathcapture/mathcapture-012.tlg | 99 ++++++++++++++++++++++
24 files changed, 195 insertions(+), 24 deletions(-)
diff --git a/required/latex-lab/latex-lab-mathcapture.dtx b/required/latex-lab/latex-lab-mathcapture.dtx
index e3b3725a..001a07c5 100644
--- a/required/latex-lab/latex-lab-mathcapture.dtx
+++ b/required/latex-lab/latex-lab-mathcapture.dtx
@@ -75,7 +75,8 @@
% \cs{math_processor:n} \Arg{tokens}
% \end{syntax}
% Declares that the captured math content should be passed to the
-% \meta{tokens}, which will receive the content as |#1|.
+% \meta{tokens}, which will receive the environment type as |#1| and
+% the content as |#2|.
% \end{function}
%
% \subsection{Document level interfaces}
@@ -134,16 +135,20 @@
%
% \subsection{Interface commands}
%
-% \begin{macro}{\@@_process:n, \@@_process_aux:n}
+% \begin{macro}
+% {\@@_process:nn, \@@_process:Vn, \@@_process_auxi:nn, \@@_process_auxii:nn}
% A no-op place-holder; the internal wrapper means that it does not need to
% be concerned with internals.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_process:n #1
+\cs_new_protected:Npn \@@_process:nn #1#2
{
\legacy_if:nF { measuring@ }
- { \tl_trim_spaces_apply:nN {#1} \@@_process_aux:n }
+ { \tl_trim_spaces_apply:nN {#2} \@@_process_auxi:nn {#1} }
}
-\cs_new_protected:Npn \@@_process_aux:n #1 { }
+\cs_generate_variant:Nn \@@_process:nn { V }
+\cs_new_protected:Npn \@@_process_auxi:nn #1#2
+ { \@@_process_auxii:nn {#2} {#1} }
+\cs_new_protected:Npn \@@_process_auxii:nn #1#2 { }
% \end{macrocode}
% \end{macro}
%
@@ -151,7 +156,7 @@
% A simple installer
% \begin{macrocode}
\cs_new_protected:Npn \math_processor:n #1
- { \cs_set_protected:Npn \@@_process_aux:n ##1 {#1} }
+ { \cs_set_protected:Npn \@@_process_auxii:nn ##1##2 {#1} }
% \end{macrocode}
% \end{macro}
%
@@ -163,7 +168,7 @@
\cs_new_protected:Npn \@@_grab_dollar:w % $
#1 $
{
- \@@_process:n {#1} % $
+ \@@_process:nn { $ } {#1} % $
#1 $
}
% \end{macrocode}
@@ -174,7 +179,7 @@
\cs_new_protected:Npn \@@_grab_dollardollar:w % $$
#1 $$
{
- \@@_process:n {#1} % $$
+ \@@_process:nn { equation* } {#1} % $$
#1 $$
}
% \end{macrocode}
@@ -186,7 +191,7 @@
\cs_new_protected:Npn \@@_grab_inline:w % \(
#1 \)
{
- \@@_process:n {#1}
+ \@@_process:nn { $ } {#1}
$ #1 $
\bool_set_false:N \l_@@_collected_bool
}
@@ -217,7 +222,7 @@
\ExpandArgs { nnx } \RenewDocumentEnvironment {#1} { b }
{
\bool_set_true:N \exp_not:N \l_@@_collected_bool
- \exp_not:N \@@_process:n {####1}
+ \exp_not:N \@@_process:nn {#1} {####1}
\exp_not:c { @@_env_ #1 _begin: }
####1
\exp_not:c { @@_env_ #1 _end: }
@@ -313,7 +318,7 @@
{ \@ensuredmath {#1} }
{
\bool_set_true:N \l_@@_collected_bool
- \@@_process:n {#1}
+ \@@_process:nn { $ } {#1}
\@ensuredmath {#1}
\bool_set_false:N \l_@@_collected_bool
}
@@ -404,7 +409,7 @@
\cs_new_eq:cc { @@_amsmath_ #1 @:n } { #1@ }
\cs_gset_protected:cpx { #1@ } ##1
{
- \exp_not:N \@@_process:n {##1}
+ \exp_not:N \@@_process:Vn \exp_not:N \@currenvir {##1}
\exp_not:c { @@_amsmath_ #1 @:n } {##1}
}
}
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-001.lvt b/required/latex-lab/testfiles-mathcapture/mathcapture-001.lvt
index 5821a793..02b14ee0 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-001.lvt
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-001.lvt
@@ -15,7 +15,9 @@
\ExplSyntaxOn
\math_processor:n
{
- \TYPE { \unexpanded{#1} }
+ \TYPE {-----------------------------------}
+ \TYPE { Math~env~#1 }
+ \TYPE {\unexpanded{#2}}
}
\ExplSyntaxOff
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-001.tlg b/required/latex-lab/testfiles-mathcapture/mathcapture-001.tlg
index ebab25f0..28248b31 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-001.tlg
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-001.tlg
@@ -1,9 +1,23 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
+-----------------------------------
+Math env equation*
y = mx + c
+-----------------------------------
+Math env equation
y = mx + c
+-----------------------------------
+Math env equation*
y = mx + c \quad \hbox {for all $c$}
+-----------------------------------
+Math env align
a + b &= c \\ d + e &= f \\
+-----------------------------------
+Math env $
g_{\hbox {foo$b$}}
+-----------------------------------
+Math env $
\alpha
+-----------------------------------
+Math env eqnarray
a = b \\ c = d
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-002.lvt b/required/latex-lab/testfiles-mathcapture/mathcapture-002.lvt
index 3aae2a6e..5c8f3857 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-002.lvt
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-002.lvt
@@ -16,7 +16,8 @@
\math_processor:n
{
\TYPE {-----------------------------------}
- \TYPE {\unexpanded{#1}}
+ \TYPE { Math~env~#1 }
+ \TYPE {\unexpanded{#2}}
}
\ExplSyntaxOff
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-002.tlg b/required/latex-lab/testfiles-mathcapture/mathcapture-002.tlg
index 6534aba4..507e66a1 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-002.tlg
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-002.tlg
@@ -1,19 +1,27 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-----------------------------------
+Math env $
\alpha \neq \beta \pmod x
-----------------------------------
+Math env $
\m at th \ast
Definitely broken because it should not capture math!
-----------------------------------
+Math env equation
(a+b)^2 = a^2+2ab+b^2
-----------------------------------
+Math env equation*
\sin ^2\eta +\cos ^2\eta = 1
-----------------------------------
+Math env gather
(a + b)^2 = a^2 + 2ab + b^2 \\ (a + b) \cdot (a - b) = a^2 - b^2
-----------------------------------
+Math env gather
D(a,r) \equiv \{ z \in \mathbf {C} \colon |z - a| < r \} \notag \\ \operatorname {seg} (a, r) \equiv \{ z \in \mathbf {C} \colon \Im z < \Im a, \ |z - a| < r \} \\ C (E, \theta , r) \equiv \bigcup _{e \in E} c (e, \theta , r)
-----------------------------------
+Math env align
(a + b)^3 &= (a + b) (a + b)^2 \\ &= (a + b)(a^2 + 2ab + b^2) \\ &= a^3 + 3a^2b + 3ab^2 + b^3
-----------------------------------
+Math env align
x^2 + y^2 & = 1 \\ x & = \sqrt {1-y^2}
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-003.lvt b/required/latex-lab/testfiles-mathcapture/mathcapture-003.lvt
index 5d0672af..89ea635b 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-003.lvt
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-003.lvt
@@ -16,7 +16,8 @@
\math_processor:n
{
\TYPE {-----------------------------------}
- \TYPE {\unexpanded{#1}}
+ \TYPE { Math~env~#1 }
+ \TYPE {\unexpanded{#2}}
}
\ExplSyntaxOff
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-003.tlg b/required/latex-lab/testfiles-mathcapture/mathcapture-003.tlg
index 7d75bab4..6a033896 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-003.tlg
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-003.tlg
@@ -1,6 +1,8 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-----------------------------------
+Math env align
\text {Compare } x^2 + y^2 &= 1 & x^3 + y^3 &= 1 \\ x &= \sqrt {1-y^2} & x &= \sqrt [3]{1-y^3}
-----------------------------------
+Math env align
x &= y & X &= Y & a &= b+c \\ x' &= y' & X' &= Y' & a' &= b \\ x + x' &= y + y' & X + X' &= Y + Y' & a'b &= c'b
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-004.lvt b/required/latex-lab/testfiles-mathcapture/mathcapture-004.lvt
index feea2f63..acf97878 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-004.lvt
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-004.lvt
@@ -17,7 +17,8 @@
\math_processor:n
{
\TYPE {-----------------------------------}
- \TYPE {\unexpanded{#1}}
+ \TYPE { Math~env~#1 }
+ \TYPE {\unexpanded{#2}}
}
\ExplSyntaxOff
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-004.tlg b/required/latex-lab/testfiles-mathcapture/mathcapture-004.tlg
index 4b6cbd8f..3a373f49 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-004.tlg
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-004.tlg
@@ -1,4 +1,5 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-----------------------------------
+Math env equation
\begin {aligned} x^2 + y^2 &= 1 \\ x &= \sqrt {1-y^2} \\ \text {and also } y &= \sqrt {1-x^2} \end {aligned} \qquad \begin {gathered} (a + b)^2 = a^2 + 2ab + b^2 \\ (a + b) \cdot (a - b) = a^2 - b^2 \end {gathered}
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-005.lvt b/required/latex-lab/testfiles-mathcapture/mathcapture-005.lvt
index 8b3e42d8..3cab571b 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-005.lvt
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-005.lvt
@@ -17,7 +17,8 @@
\math_processor:n
{
\TYPE {-----------------------------------}
- \TYPE {\unexpanded{#1}}
+ \TYPE { Math~env~#1 }
+ \TYPE {\unexpanded{#2}}
}
\ExplSyntaxOff
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-005.tlg b/required/latex-lab/testfiles-mathcapture/mathcapture-005.tlg
index bc476567..e97f5265 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-005.tlg
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-005.tlg
@@ -1,10 +1,13 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-----------------------------------
+Math env equation*
\begin {rcases} \bm {B}' &=-c\nabla \times \bm {E} \\ \bm {E}' &=c\nabla \times \bm {B} - 4\pi \bm {J}\, \end {rcases} \quad \text {Maxwell's equations}
-----------------------------------
+Math env equation
\begin {aligned} V_j &= v_j & X_i &= x_i - q_i x_j & &= u_j + \sum _{i\ne j} q_i \\ V_i &= v_i - q_i v_j & X_j &= x_j & U_i &= u_i \end {aligned}
-----------------------------------
+Math env align
A_1 &= N_0 (\lambda ; \Omega ') - \phi ( \lambda ; \Omega ') \\ A_2 &= \phi (\lambda ; \Omega ') \phi (\lambda ; \Omega ) \\ \intertext {and finally} A_3 &= \mathcal {N} (\lambda ; \omega )
Package tagpdf Warning: nested marked content found - mcid 3
! LaTeX Error: Control sequence \g__tag_struct_5_prop already defined.
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-006.lvt b/required/latex-lab/testfiles-mathcapture/mathcapture-006.lvt
index 53888bb7..b152d3cf 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-006.lvt
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-006.lvt
@@ -20,7 +20,8 @@
\math_processor:n
{
\TYPE {-----------------------------------}
- \TYPE {\unexpanded{#1}}
+ \TYPE { Math~env~#1 }
+ \TYPE {\unexpanded{#2}}
}
\ExplSyntaxOff
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-006.tlg b/required/latex-lab/testfiles-mathcapture/mathcapture-006.tlg
index 72c76692..c7bd70b2 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-006.tlg
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-006.tlg
@@ -1,6 +1,8 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-----------------------------------
+Math env gather
\begin {xgathered} x_0=1,\quad x_1=2 \\ x_3=3 \end {xgathered}
-----------------------------------
+Math env equation*
\left | \begin {multlined}[c] (a+b)^2 = \\ (a+b)(a+b) \\ = a^2 + 2ab + b^2 \end {multlined} \right |
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-007.lvt b/required/latex-lab/testfiles-mathcapture/mathcapture-007.lvt
index fc5a48f0..b7e3dd53 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-007.lvt
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-007.lvt
@@ -20,7 +20,8 @@
\math_processor:n
{
\TYPE {-----------------------------------}
- \TYPE {\unexpanded{#1}}
+ \TYPE { Math~env~#1 }
+ \TYPE {\unexpanded{#2}}
}
\ExplSyntaxOff
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-007.tlg b/required/latex-lab/testfiles-mathcapture/mathcapture-007.tlg
index c90415ac..77da8909 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-007.tlg
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-007.tlg
@@ -2,12 +2,17 @@ This is a generated file for the l3build validation system.
Don't change this file in any respect.
next examples die ....
-----------------------------------
+Math env dmath
f_{h, \ve }(x, y) = \ve \bfE _{x, y} \int _0^{\tve } L_{x, \yvf (\ve u)} \vf (x) \,du = h \int L_{x, z} \vf (x) \rho _x(dz) + h \biggl [ \frac {1}{\tve } \biggl ( \bfE _{y} \int _0^{\tve } L_{x, y^x(s)} \vf (x) \,ds - \tve \int L_{x, z} \vf (x) \rho _x(dz) \biggr ) + \frac {1}{\tve } \biggl ( \bfE _{y} \int _0^{\tve } L_{x, y^x(s)} \vf (x) \,ds - \bfE _{x, y} \int _0^{\tve } L_{x, \yvf (\ve s)} \vf (x) \,ds \biggr ) \biggr ]
-----------------------------------
+Math env dgroup*
\begin {dmath} (a+b)^2 = a^2+2ab+b^2 \end {dmath} \begin {dmath} (a-b)^2 = a^2-2ab+b^2 \end {dmath} \begin {dmath*} (a+b)(a-b) = a^2-b^2 \end {dmath*}
-----------------------------------
+Math env dmath
(a+b)^2 = a^2+2ab+b^2
-----------------------------------
+Math env dmath
(a-b)^2 = a^2-2ab+b^2
-----------------------------------
+Math env dmath
\frac {1}{x} \condition {for $x\ne 0$}
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-008.lvt b/required/latex-lab/testfiles-mathcapture/mathcapture-008.lvt
index a1e5f6ac..064c6cff 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-008.lvt
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-008.lvt
@@ -22,7 +22,8 @@
\math_processor:n
{
\TYPE {-----------------------------------}
- \TYPE {\unexpanded{#1}}
+ \TYPE { Math~env~#1 }
+ \TYPE {\unexpanded{#2}}
}
\ExplSyntaxOff
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-008.tlg b/required/latex-lab/testfiles-mathcapture/mathcapture-008.tlg
index 1f7212e1..efebeebe 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-008.tlg
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-008.tlg
@@ -1,25 +1,35 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-----------------------------------
+Math env align
x^2+y^2 &= z^2 \label {eq:A} \\ x^3+y^3 &= z^3 \notag \\ x^4+y^4 &= r^4 \tag {$*$} \\ x^5+y^5 &= r^5 \tag *{$*$} \\ x^6+y^6 &= r^6 \tag {\ref {eq:A}$'$}
-----------------------------------
+Math env align
f &= g \label {eq:1A} \\ f' &= g' \label {eq:1B} \\ \mathcal {L}f &= \mathcal {L}g \label {eq:1C}
-----------------------------------
+Math env align
f &= g \label {eq:2A} \\ f' &= g' \label {eq:2B} \\ \mathcal {L}f &= \mathcal {L}g + K \label {eq:2C}
-----------------------------------
+Math env align
A_1 &= N_0 (\lambda ; \Omega ') - \phi ( \lambda ; \Omega ') \\ A_2 &= \phi (\lambda ; \Omega ') \, \phi (\lambda ; \Omega ) \tag *{ALSO (\theequation )} \\ A_3 &= \mathcal {N} (\lambda ; \omega )
-----------------------------------
+Math env equation
\begin {split} \lvert I_2 \rvert &= \left \lvert \int _{0}^T \psi (t) \left \{ u(a, t) - \int _{\gamma (t)}^a \frac {d\theta }{k} (\theta , t) \int _{a}^\theta c (\xi ) u_t (\xi , t) \,d\xi \right \} dt \right \rvert \\ &\le C_6 \Biggl \lvert \left \lvert f \int _\Omega \left \lvert \widetilde {S}^{-1,0}_{a,-} W_2(\Omega , \Gamma _l) \right \rvert \ \right \rvert \left \lvert \lvert u \rvert \overset {\circ }{\to } W_2^{\widetilde {A}} (\Omega ; \Gamma _r,T) \right \rvert \Biggr \rvert \end {split}
-----------------------------------
+Math env equation
\split at tag \begin {split} \lvert I_2 \rvert &= \left \lvert \int _{0}^T \psi (t) \left \{ u(a, t) - \int _{\gamma (t)}^a \frac {d\theta }{k} (\theta , t) \int _{a}^\theta c (\xi ) u_t (\xi , t) \,d\xi \right \} dt \right \rvert \\ &\le C_6 \Biggl \lvert \left \lvert f \int _\Omega \left \lvert \widetilde {S}^{-1,0}_{a,-} W_2(\Omega , \Gamma _l) \right \rvert \ \right \rvert \left \lvert \lvert u \rvert \overset {\circ }{\to } W_2^{\widetilde {A}} (\Omega ; \Gamma _r,T) \right \rvert \Biggr \rvert \end {split}
-----------------------------------
+Math env gather
\raisetag {-10pt} \text {The sign function: \ } \mathcal {S}(x) = \begin {cases} -1 & x < 0 \\ 0 & x = 0 \\ 1 & x > 0 \end {cases}
-----------------------------------
+Math env multline
\text {First line of a multline} \\ \text {Centered Middle line} \\ \shoveright {\text {A right Middle}} \\ \text {Another centered Middle} \\ \text {Yet another centered Middle} \\ \shoveleft {\text {A left Middle}} \\ \text {Last line of the multline}
[1
]
-----------------------------------
+Math env multline
\tag {2} \sum _{t \in \mathbf {T}} \int _a^t \biggl \lbrace \int _a^t f(t - x)^2 \, g(y)^2 \,dx \biggr \rbrace \,dy \\ = \sum _{t \notin \mathbf {T}} \int _t^a \biggl \lbrace g(y)^2 \int _t^a f(x)^2 \,dx \biggr \rbrace \,dy
-----------------------------------
+Math env gather*
\begin {matrix} 0 & 1 \\ 1 & 0 \end {matrix} \quad \begin {pmatrix} 0 & -i \\ i & 0 \end {pmatrix} \\[10pt] \begin {bmatrix} 0 & -1 \\ 1 & 0 \end {bmatrix} \quad \begin {Bmatrix} 1 & 0 \\ 0 & -1 \end {Bmatrix} \\[10pt] \begin {vmatrix} a & b \\ c & d \end {vmatrix} \quad \begin {Vmatrix} i & 0 \\ 0 & -i \end {Vmatrix}
[2] (mathcapture-008.aux)
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-009.lvt b/required/latex-lab/testfiles-mathcapture/mathcapture-009.lvt
index 22dbd580..72186788 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-009.lvt
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-009.lvt
@@ -22,7 +22,8 @@
\math_processor:n
{
\TYPE {-----------------------------------}
- \TYPE {\unexpanded{#1}}
+ \TYPE { Math~env~#1 }
+ \TYPE {\unexpanded{#2}}
}
\ExplSyntaxOff
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-009.tlg b/required/latex-lab/testfiles-mathcapture/mathcapture-009.tlg
index 56a63a29..90a03d2e 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-009.tlg
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-009.tlg
@@ -1,16 +1,22 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-----------------------------------
+Math env equation*
\begin {array}{ccc} S^{\mathcal {W}_\Lambda }\otimes T & \stackrel {j}{\longrightarrow } & T \\ \Big \downarrow & & \Big \downarrow \vcenter {\rlap {$\scriptstyle {\mathrm {End}}\,P$}} \\ (S\otimes T)/I & = & (Z\otimes T)/J \end {array}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \displaystyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \textstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \scriptstyle {\mathrm {End}}\,P
???????????????????????? strange extra
[1
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-010.lvt b/required/latex-lab/testfiles-mathcapture/mathcapture-010.lvt
index 3f83f680..d86fc5b9 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-010.lvt
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-010.lvt
@@ -20,7 +20,8 @@
\math_processor:n
{
\TYPE {-----------------------------------}
- \TYPE {\unexpanded{#1}}
+ \TYPE { Math~env~#1 }
+ \TYPE {\unexpanded{#2}}
}
\ExplSyntaxOff
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-011.lvt b/required/latex-lab/testfiles-mathcapture/mathcapture-011.lvt
index 275ea2b2..236baf95 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-011.lvt
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-011.lvt
@@ -20,7 +20,8 @@
\math_processor:n
{
\TYPE {-----------------------------------}
- \TYPE {\unexpanded{#1}}
+ \TYPE { Math~env~#1 }
+ \TYPE {\unexpanded{#2}}
}
\ExplSyntaxOff
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-011.tlg b/required/latex-lab/testfiles-mathcapture/mathcapture-011.tlg
index 7c7f671f..1679a593 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-011.tlg
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-011.tlg
@@ -4,10 +4,13 @@ Don't change this file in any respect.
????? just loading cases but not amsmath now gives an error
-----------------------------------
-----------------------------------
+Math env $
\left (\begin {smallmatrix} -1 & 0 \\ 0 & -1 \end {smallmatrix}\right )
-----------------------------------
+Math env smallmatrix
-1 & 0 \\ 0 & -1
-----------------------------------
+Math env subnumcases
{f(x) = \label {L1}} -1 & if $x<0$\,, \\ 0 & if $x=0$\,, \tag {$*$} \\ 1 & if $x>0$\,. \label {L2}
[1
] (mathcapture-011.aux)
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-012.lvt b/required/latex-lab/testfiles-mathcapture/mathcapture-012.lvt
index 12fbdf39..3b96f6cc 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-012.lvt
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-012.lvt
@@ -20,7 +20,8 @@
\math_processor:n
{
\TYPE {-----------------------------------}
- \TYPE {\unexpanded{#1}}
+ \TYPE { Math~env~#1 }
+ \TYPE {\unexpanded{#2}}
}
\ExplSyntaxOff
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-012.tlg b/required/latex-lab/testfiles-mathcapture/mathcapture-012.tlg
index 7bf3719d..30c825d9 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-012.tlg
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-012.tlg
@@ -1,204 +1,303 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-----------------------------------
+Math env equation*
0 \xleftarrow [\zeta ]{} F \times \Delta (n - 1) \xrightarrow {\partial _0 \alpha (b)} E^{\partial _0 b}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \displaystyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \textstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \displaystyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \textstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {\std at minus }
???????????????????????? again spurious extra captures
-----------------------------------
+Math env align*
u & \equiv v + 1 \mod {n^2} \\ u & \equiv v + 1 \bmod {n^2} \\ u & = v + 1 \pmod {n^2} \\ u & = v + 1 \pod {n^2}
-----------------------------------
+Math env $
u = v + 1 \pmod {n^2}
-----------------------------------
+Math env gather
A \xLeftarrow {\ x} B \xRightarrow [y\ ]{} C \xLeftrightarrow [y]{\ x\ } D \\ A \xhookleftarrow {x} B \xhookrightarrow [bbb]{a} C \\ \xleftharpoondown {} \xleftharpoonup {} \xleftrightharpoons {xxx} \xrightleftharpoons [yy]{} \xrightharpoondown {} \xrightharpoonup {} \\ \xmapsto {x>0} A \xleftrightarrow [\text {letters}]{} Z
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \displaystyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \textstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \displaystyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \textstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \displaystyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \textstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \displaystyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \textstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \thickmuskip 0mu\medmuskip \thickmuskip \thinmuskip \thickmuskip \relax \displaystyle \leftharpoonup \mkern -7mu\cleaders \hbox {$\displaystyle \mkern -2mu\relbar \mkern -2mu$}\hfill \mkern -7mu\relbar
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \displaystyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \textstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \displaystyle {}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \textstyle {}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \displaystyle {}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \textstyle {}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \thickmuskip 0mu\medmuskip \thickmuskip \thinmuskip \thickmuskip \relax \displaystyle \relbar \mkern -7mu\cleaders \hbox {$\displaystyle \mkern -2mu\relbar \mkern -2mu$}\hfill \mkern -7mu\rightharpoondown
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \displaystyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \textstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \displaystyle {xxx}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \textstyle {xxx}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {xxx}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {xxx}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \displaystyle {xxx}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \textstyle {xxx}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {xxx}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {xxx}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \thickmuskip 0mu\medmuskip \thickmuskip \thinmuskip \thickmuskip \relax \displaystyle \relbar \mkern -7mu\cleaders \hbox {$\displaystyle \mkern -2mu\relbar \mkern -2mu$}\hfill \mkern -7mu\rightharpoonup
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \displaystyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \textstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \displaystyle {yy}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \textstyle {yy}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {yy}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {yy}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \displaystyle {yy}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \textstyle {yy}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {yy}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {yy}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \thickmuskip 0mu\medmuskip \thickmuskip \thinmuskip \thickmuskip \relax \displaystyle \leftharpoondown \mkern -7mu\cleaders \hbox {$\displaystyle \mkern -2mu\relbar \mkern -2mu$}\hfill \mkern -7mu\relbar
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \displaystyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \textstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \displaystyle {}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \textstyle {}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \displaystyle {}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \textstyle {}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {}
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \displaystyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \textstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \displaystyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \textstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \displaystyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \textstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \displaystyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \textstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptstyle {\std at minus }
-----------------------------------
+Math env $
\bool_set_false:N \l__math_collected_bool \bool_set_false:N \l__math_collected_bool \m at th \scriptscriptstyle {\std at minus }
???????????????????????? again spurious extra captures
-----------------------------------
+Math env gather*
\ropen {a,d}=\closed {a,b} + \lopen {b,c} + \dotsb \\[3pt] \open {\frac {a}{b}} \approx \open *{\frac {a}{b}} \neq \closed [\Bigg ]{x}
-----------------------------------
+Math env equation*
\interval [open right]{a}{d} = \interval {a}{b} + \interval [open left]{b}{c} + \interval [open]{c}{e} - \interval [open right]{d}{e}
-----------------------------------
+Math env gather*
\ket {\psi }\bra {\phi } : \ket {\xi } \mapsto \ket {\psi } \braket {\psi |\xi } \\ \Braket { \phi | \frac {\partial ^2}{\partial t^2} | \psi } \\ \shortintertext {Also:} \Set { x\in \Re ^2 | 0 < |x| < 5 }
Package tagpdf Warning: nested marked content found - mcid 6
! LaTeX Error: Control sequence \g__tag_struct_8_prop already defined.
More information about the latex3-commits
mailing list.