[latex3-commits] [git/LaTeX3-latex3-latex2e] everymath: change $ -> math (a61603c6)

Frank Mittelbach frank.mittelbach at latex-project.org
Sat Jan 7 00:00:32 CET 2023


Repository : https://github.com/latex3/latex2e
On branch  : everymath
Link       : https://github.com/latex3/latex2e/commit/a61603c63537a25fd1610e12ce6637d32e02e56d

>---------------------------------------------------------------

commit a61603c63537a25fd1610e12ce6637d32e02e56d
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Sat Jan 7 00:00:32 2023 +0100

    change $ -> math


>---------------------------------------------------------------

a61603c63537a25fd1610e12ce6637d32e02e56d
 required/latex-lab/latex-lab-mathcapture.dtx           |  6 +++---
 .../testfiles-mathcapture/mathcapture-001.tlg          |  4 ++--
 .../testfiles-mathcapture/mathcapture-002.tlg          |  2 +-
 .../testfiles-mathcapture/mathcapture-009.tlg          |  2 +-
 .../testfiles-mathcapture/mathcapture-011.tlg          |  2 +-
 .../testfiles-mathcapture/mathcapture-012.tlg          | 10 +++++-----
 .../testfiles-mathcapture/mathcapture-014.tlg          |  4 ++--
 required/latex-lab/update-mathcapture-all.sh           | 18 ++++++++++++++++++
 8 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/required/latex-lab/latex-lab-mathcapture.dtx b/required/latex-lab/latex-lab-mathcapture.dtx
index fe1c97e5..fd7c65db 100644
--- a/required/latex-lab/latex-lab-mathcapture.dtx
+++ b/required/latex-lab/latex-lab-mathcapture.dtx
@@ -170,7 +170,7 @@
   #1 $
   {
     \tl_if_head_eq_meaning:nNF {#1} \m at th
-      { \@@_process:nn { $ } {#1} } % $
+      { \@@_process:nn { math } {#1} }
     #1 $
   }
 %    \end{macrocode}
@@ -193,7 +193,7 @@
 \cs_new_protected:Npn \@@_grab_inline:w % \(
   #1 \)
   {
-    \@@_process:nn { $ } {#1}
+    \@@_process:nn { math } {#1}
     $ #1 $
     \bool_set_false:N \l_@@_collected_bool
   }
@@ -336,7 +336,7 @@
           { \@ensuredmath {#1} }
           {
             \bool_set_true:N \l_@@_collected_bool
-            \@@_process:nn { $ } {#1}
+            \@@_process:nn { math } {#1}
             \@ensuredmath {#1}
             \bool_set_false:N \l_@@_collected_bool
           }
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-001.tlg b/required/latex-lab/testfiles-mathcapture/mathcapture-001.tlg
index 28248b31..2679ffe3 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-001.tlg
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-001.tlg
@@ -13,10 +13,10 @@ y = mx + c \quad \hbox {for all $c$}
 Math env align
 a + b &= c \\ d + e &= f \\
 -----------------------------------
-Math env $
+Math env math
 g_{\hbox {foo$b$}}
 -----------------------------------
-Math env $
+Math env math
 \alpha 
 -----------------------------------
 Math env eqnarray
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-002.tlg b/required/latex-lab/testfiles-mathcapture/mathcapture-002.tlg
index 31eefed7..c9d575d2 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-002.tlg
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-002.tlg
@@ -1,7 +1,7 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
 -----------------------------------
-Math env $
+Math env math
 \alpha \neq \beta \pmod x
 -----------------------------------
 Math env equation
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-009.tlg b/required/latex-lab/testfiles-mathcapture/mathcapture-009.tlg
index 7d8c9f34..ca2c9299 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-009.tlg
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-009.tlg
@@ -4,7 +4,7 @@ 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 $
+Math env math
 \bool_set_false:N \l__math_collected_bool \scriptstyle {\mathrm {End}}\,P
 [1
 ] (mathcapture-009.aux)
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-011.tlg b/required/latex-lab/testfiles-mathcapture/mathcapture-011.tlg
index e263c507..7448eb2c 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-011.tlg
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-011.tlg
@@ -8,7 +8,7 @@ Package: cases ....-..-.. ver 3.2
 ==> just loading cases but not amsmath now gives an error
 -----------------------------------
 -----------------------------------
-Math env $
+Math env math
 \left (\begin {smallmatrix} -1 & 0 \\ 0 & -1 \end {smallmatrix}\right )
 -----------------------------------
 Math env smallmatrix
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-012.tlg b/required/latex-lab/testfiles-mathcapture/mathcapture-012.tlg
index ecd85062..66beaee0 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-012.tlg
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-012.tlg
@@ -7,22 +7,22 @@ Math env equation*
 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 $
+Math env math
 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 $
+Math env math
 \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 $
+Math env math
 \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 $
+Math env math
 \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 $
+Math env math
 \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 
 ==> again spurious extra captures below
 -----------------------------------
diff --git a/required/latex-lab/testfiles-mathcapture/mathcapture-014.tlg b/required/latex-lab/testfiles-mathcapture/mathcapture-014.tlg
index c967d874..b4cbff20 100644
--- a/required/latex-lab/testfiles-mathcapture/mathcapture-014.tlg
+++ b/required/latex-lab/testfiles-mathcapture/mathcapture-014.tlg
@@ -4,7 +4,7 @@ Don't change this file in any respect.
 Math env gather
 A \xlongequal [\text {characters}]{ +12 } M \xLongrightarrow [\text {characters}]{\text {more}} Z \\ 0 \xrightarrow {x} \epsilon \xlongrightarrow {x} 1 \\ \xLongleftarrow {1} \xLongrightarrow {2} \xlongleftarrow {3} \xlongrightarrow {4} \xlongleftrightarrow {5}
 -----------------------------------
-Math env $
+Math env math
 \dot {S} \quad \ddot {P} \quad \dddot {Q} \quad \ddddot {R}
 -----------------------------------
 Math env equation*
@@ -28,7 +28,7 @@ Math env gather*
 Math env multline*
 f(x)=a_0+a_1x+a_2x^2+ \overbrace [B]{a_3x^3 + a_4x^4 + \dots + a_{i-1}x^{i-1} + \enspace } ^{\text {some explanation}} \\ \overbrace [e]{\enspace a_ix^i + a_{i+1}x^{i+1}} + \dots + a_{n-1}x^{n-1}
 -----------------------------------
-Math env $
+Math env math
 \bool_set_false:N \l__math_collected_bool \scriptstyle \text {some explanation}
 ==> some surplus capture with abraces
 [1
diff --git a/required/latex-lab/update-mathcapture-all.sh b/required/latex-lab/update-mathcapture-all.sh
new file mode 100644
index 00000000..ca9e83e4
--- /dev/null
+++ b/required/latex-lab/update-mathcapture-all.sh
@@ -0,0 +1,18 @@
+l3build save -cconfig-mathcapture \
+	mathcapture-001 \
+	mathcapture-002 \
+	mathcapture-003 \
+	mathcapture-004 \
+	mathcapture-005 \
+	mathcapture-006 \
+	mathcapture-007 \
+	mathcapture-008 \
+	mathcapture-009 \
+	mathcapture-010 \
+	mathcapture-011 \
+	mathcapture-012 \
+	mathcapture-013 \
+	mathcapture-014
+
+
+	





More information about the latex3-commits mailing list.