[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: If \protected is used for delimiters we need to back out the change that tests if a delimiter is redefined Also amsmath was actually not correctly aware that delimiters got robust which showed up due to this correction Finally a couple of test file updates due to the changes (7c9ff357)
Frank Mittelbach
frank.mittelbach at latex-project.org
Mon Jan 20 20:41:15 CET 2020
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/7c9ff357c5f14cce07fc37b26cb1bf20960eb79f
>---------------------------------------------------------------
commit 7c9ff357c5f14cce07fc37b26cb1bf20960eb79f
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Mon Jan 20 20:41:15 2020 +0100
If \protected is used for delimiters we need to back out the change that tests if a delimiter is redefined
Also amsmath was actually not correctly aware that delimiters got robust which showed up due to this correction
Finally a couple of test file updates due to the changes
>---------------------------------------------------------------
7c9ff357c5f14cce07fc37b26cb1bf20960eb79f
base/doc/ltnews31.tex | 2 +-
base/ltfssdcl.dtx | 69 +-------------------------
base/testfiles/github-robust-0123.luatex.tlg | 5 +-
base/testfiles/github-robust-0123.lvt | 2 +-
base/testfiles/github-robust-0123.tlg | 5 +-
base/testfiles/github-robust-0123.xetex.tlg | 5 +-
base/testfiles/github-robust-0123b.luatex.tlg | 4 +-
base/testfiles/github-robust-0123b.tlg | 4 +-
base/testfiles/tlb-latexrelease-003.luatex.tlg | 4 --
base/testfiles/tlb-latexrelease-003.tlg | 4 --
base/testfiles/tlb-latexrelease-003.xetex.tlg | 4 --
base/testfiles/tlb0942.luatex.tlg | 54 ++++++++++----------
base/testfiles/tlb0942.lvt | 54 +++++++++++---------
base/testfiles/tlb0942.tlg | 54 ++++++++++----------
required/amsmath/amsmath.dtx | 16 +++---
required/amsmath/changes.txt | 6 +++
16 files changed, 114 insertions(+), 178 deletions(-)
diff --git a/base/doc/ltnews31.tex b/base/doc/ltnews31.tex
index 80411c5f..55efd42a 100644
--- a/base/doc/ltnews31.tex
+++ b/base/doc/ltnews31.tex
@@ -522,7 +522,7 @@ typesetting was used.
\subsection{Make math delimiters robust in a different way}
Making math delimiters robust caused an issue in some situations. This
-has been corrected.
+has been corrected. This also involved a correction in \pkg{amsmath}.
%
\githubissue{251}
diff --git a/base/ltfssdcl.dtx b/base/ltfssdcl.dtx
index 80181079..17fc1228 100644
--- a/base/ltfssdcl.dtx
+++ b/base/ltfssdcl.dtx
@@ -1367,12 +1367,7 @@
% \begin{macro}{\@DeclareMathDelimiter}
% \changes{v3.0r}{2016/02/18}
% {Check for delimiter not \cs{delimiter}}
-% \changes{v3.0s}{2019/08/27}{Make math delimiters robust}
% \begin{macrocode}
-%</2ekernel>
-%<*2ekernel|latexrelease>
-%<latexrelease>\IncludeInRelease{2019/10/01}%
-%<latexrelease> {\@DeclareMathDelimiter}{Make math delimiters robust}%
\def\@DeclareMathDelimiter#1#2#3#4#5#6{%
\expandafter\in@\csname sym#3\expandafter\endcsname
\expandafter{\group at list}%
@@ -1398,11 +1393,9 @@
\edef\reserved at d{\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}%
%
\edef\reserved at a{\noexpand\in@
- {\expandafter\@gobble\string\delimiter}%
- {\expandafter\meaning\csname\expandafter\@gobble\string#1\space\endcsname}}%
+ {\expandafter\@gobble\string\delimiter}{\meaning#1}}%
\reserved at a
\ifin@
- \expandafter\let\csname\expandafter\@gobble\string#1\space\endcsname\@undefined
\expandafter\set at mathdelimiter
\csname sym#3\expandafter\endcsname
\csname sym#5\endcsname#1#2%
@@ -1428,65 +1421,6 @@
\@latex at error{Symbol font `#3' is not defined}\@eha
\fi
}
-%</2ekernel|latexrelease>
-%<latexrelease>\EndIncludeInRelease
-%<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease> {\@DeclareMathDelimiter}{Make math delimiters robust}%
-%<latexrelease>\def\@DeclareMathDelimiter#1#2#3#4#5#6{%
-%<latexrelease> \expandafter\in@\csname sym#3\expandafter\endcsname
-%<latexrelease> \expandafter{\group at list}%
-%<latexrelease> \ifin@
-%<latexrelease> \expandafter\in@\csname sym#5\expandafter\endcsname
-%<latexrelease> \expandafter{\group at list}%
-%<latexrelease> \ifin@
-%<latexrelease> \begingroup
-%<latexrelease> \count\z@=#4\relax
-%<latexrelease> \count\tw@\count\z@
-%<latexrelease> \divide\count\z@\sixt@@n
-%<latexrelease> \count@\count\z@
-%<latexrelease> \multiply\count@\sixt@@n
-%<latexrelease> \advance\count\tw at -\count@
-%<latexrelease> \edef\reserved at c{\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}%
-%<latexrelease> %
-%<latexrelease> \count\z@=#6\relax
-%<latexrelease> \count\tw@\count\z@
-%<latexrelease> \divide\count\z@\sixt@@n
-%<latexrelease> \count@\count\z@
-%<latexrelease> \multiply\count@\sixt@@n
-%<latexrelease> \advance\count\tw at -\count@
-%<latexrelease> \edef\reserved at d{\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}%
-%<latexrelease> %
-%<latexrelease> \edef\reserved at a{\noexpand\in@
-%<latexrelease> {\expandafter\@gobble\string\delimiter}{\meaning#1}}%
-%<latexrelease> \reserved at a
-%<latexrelease> \ifin@
-%<latexrelease> \expandafter\set at mathdelimiter
-%<latexrelease> \csname sym#3\expandafter\endcsname
-%<latexrelease> \csname sym#5\endcsname#1#2%
-%<latexrelease> \reserved at c\reserved at d
-%<latexrelease> \@font at info{Redeclaring math delimiter \string#1}%
-%<latexrelease> \else
-%<latexrelease> \expandafter\ifx
-%<latexrelease> \csname\expandafter\@gobble\string#1\endcsname
-%<latexrelease> \relax
-%<latexrelease> \expandafter\set at mathdelimiter
-%<latexrelease> \csname sym#3\expandafter\endcsname
-%<latexrelease> \csname sym#5\endcsname#1#2%
-%<latexrelease> \reserved at c\reserved at d
-%<latexrelease> \else
-%<latexrelease> \@latex at error{Command `\string#1' already defined}\@eha
-%<latexrelease> \fi
-%<latexrelease> \fi
-%<latexrelease> \endgroup
-%<latexrelease> \else
-%<latexrelease> \@latex at error{Symbol font `#5' is not defined}\@eha
-%<latexrelease> \fi
-%<latexrelease> \else
-%<latexrelease> \@latex at error{Symbol font `#3' is not defined}\@eha
-%<latexrelease> \fi
-%<latexrelease>}
-%<latexrelease>\EndIncludeInRelease
-%<*2ekernel>
% \end{macrocode}
%
% \begin{macrocode}
@@ -1550,6 +1484,7 @@
% \end{macrocode}
% We use \cs{protected} not \cs{MakeRobust} so that
% \verb=\bigl\lfoor= etc.\ works inside \cs{protected at edef}.
+% \changes{v3.0s}{2019/08/27}{Make math delimiters robust}
% \changes{v3.0t}{2020/01/20}{fix for gh/251}
% \begin{macrocode}
\protected
diff --git a/base/testfiles/github-robust-0123.luatex.tlg b/base/testfiles/github-robust-0123.luatex.tlg
index 79713605..f8ec523c 100644
--- a/base/testfiles/github-robust-0123.luatex.tlg
+++ b/base/testfiles/github-robust-0123.luatex.tlg
@@ -1,10 +1,9 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
LaTeX Font Info: Redeclaring math delimiter \Downarrow on input line ...
-> \Downarrow =macro:
+> \Downarrow=\protected macro:
->\delimiter "322B3AA .
-<recently read> \Downarrow
-l. ......dafter\show\csname Downarrow\space\endcsname
+l. ...\show\Downarrow
---------------------------------------
====================================
Not worth making robust ...
diff --git a/base/testfiles/github-robust-0123.lvt b/base/testfiles/github-robust-0123.lvt
index 8dcc89dd..bdc598b1 100644
--- a/base/testfiles/github-robust-0123.lvt
+++ b/base/testfiles/github-robust-0123.lvt
@@ -12,7 +12,7 @@
{\mathrel}{symbols}{"2B}{largesymbols}{"AA}
% proof that this was changed (should show AA in the delimiter number)
-\expandafter\show\csname Downarrow\space\endcsname
+\show\Downarrow
\typeout{---------------------------------------}
\OMIT
diff --git a/base/testfiles/github-robust-0123.tlg b/base/testfiles/github-robust-0123.tlg
index f0570ca0..50bc174f 100644
--- a/base/testfiles/github-robust-0123.tlg
+++ b/base/testfiles/github-robust-0123.tlg
@@ -1,10 +1,9 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
LaTeX Font Info: Redeclaring math delimiter \Downarrow on input line ...
-> \Downarrow =macro:
+> \Downarrow=\protected macro:
->\delimiter "322B3AA .
-<recently read> \Downarrow
-l. ......fter\show\csname Downarrow\space\endcsname
+l. ...\show\Downarrow
---------------------------------------
====================================
Not worth making robust ...
diff --git a/base/testfiles/github-robust-0123.xetex.tlg b/base/testfiles/github-robust-0123.xetex.tlg
index ec6619e9..161e5ad3 100644
--- a/base/testfiles/github-robust-0123.xetex.tlg
+++ b/base/testfiles/github-robust-0123.xetex.tlg
@@ -1,10 +1,9 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
LaTeX Font Info: Redeclaring math delimiter \Downarrow on input line ...
-> \Downarrow =macro:
+> \Downarrow=\protected macro:
->\delimiter "322B3AA .
-<recently read> \Downarrow
-l. ......fter\show\csname Downarrow\space\endcsname
+l. ...\show\Downarrow
---------------------------------------
====================================
Not worth making robust ...
diff --git a/base/testfiles/github-robust-0123b.luatex.tlg b/base/testfiles/github-robust-0123b.luatex.tlg
index 71f3763d..24ef1c8e 100644
--- a/base/testfiles/github-robust-0123b.luatex.tlg
+++ b/base/testfiles/github-robust-0123b.luatex.tlg
@@ -2,9 +2,9 @@ This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
\Downarrow -> \Downarrow
---------------------------------------
-macro:->\protect \Downarrow + macro:->\delimiter "322B37F
+\protected macro:->\delimiter "322B37F + \relax
LaTeX Font Info: Redeclaring math delimiter \Downarrow on input line ...
-macro:->\protect \Downarrow + macro:->\delimiter "322B3AA
+\protected macro:->\delimiter "322B3AA + \relax
---------------------------------------
\hbar -> \hbar
---------------------------------------
diff --git a/base/testfiles/github-robust-0123b.tlg b/base/testfiles/github-robust-0123b.tlg
index 6dbaf9a6..1e38648e 100644
--- a/base/testfiles/github-robust-0123b.tlg
+++ b/base/testfiles/github-robust-0123b.tlg
@@ -2,9 +2,9 @@ This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
\Downarrow -> \Downarrow
---------------------------------------
-macro:->\protect \Downarrow + macro:->\delimiter "322B37F
+\protected macro:->\delimiter "322B37F + \relax
LaTeX Font Info: Redeclaring math delimiter \Downarrow on input line ...
-macro:->\protect \Downarrow + macro:->\delimiter "322B3AA
+\protected macro:->\delimiter "322B3AA + \relax
---------------------------------------
\hbar -> \hbar
---------------------------------------
diff --git a/base/testfiles/tlb-latexrelease-003.luatex.tlg b/base/testfiles/tlb-latexrelease-003.luatex.tlg
index e4b635cd..45d6d558 100644
--- a/base/testfiles/tlb-latexrelease-003.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-003.luatex.tlg
@@ -178,8 +178,6 @@ Skipping: [....-..-..] Make math accents robust on input line ....
Applying: [....-..-..] Make math accents robust on input line ....
Skipping: [....-..-..] makemath accents robust on input line ....
Applying: [....-..-..] makemath accents robust on input line ....
-Skipping: [....-..-..] Make math delimiters robust on input line ....
-Applying: [....-..-..] Make math delimiters robust on input line ....
Skipping: [....-..-..] make delimiters robust on input line ....
Applying: [....-..-..] make delimiters robust on input line ....
Skipping: [....-..-..] Custom series on input line ....
@@ -513,8 +511,6 @@ Applying: [....-..-..] Make math accents robust on input line ....
Already applied: [....-..-..] Make math accents robust on input line ....
Applying: [....-..-..] makemath accents robust on input line ....
Already applied: [....-..-..] makemath accents robust on input line ....
-Applying: [....-..-..] Make math delimiters robust on input line ....
-Already applied: [....-..-..] Make math delimiters robust on input line ...
Applying: [....-..-..] make delimiters robust on input line ....
Already applied: [....-..-..] make delimiters robust on input line ....
Skipping: [....-..-..] Custom series on input line ....
diff --git a/base/testfiles/tlb-latexrelease-003.tlg b/base/testfiles/tlb-latexrelease-003.tlg
index 86c528f1..2bc9ce35 100644
--- a/base/testfiles/tlb-latexrelease-003.tlg
+++ b/base/testfiles/tlb-latexrelease-003.tlg
@@ -176,8 +176,6 @@ Skipping: [....-..-..] Make math accents robust on input line ....
Applying: [....-..-..] Make math accents robust on input line ....
Skipping: [....-..-..] makemath accents robust on input line ....
Applying: [....-..-..] makemath accents robust on input line ....
-Skipping: [....-..-..] Make math delimiters robust on input line ....
-Applying: [....-..-..] Make math delimiters robust on input line ....
Skipping: [....-..-..] make delimiters robust on input line ....
Applying: [....-..-..] make delimiters robust on input line ....
Skipping: [....-..-..] Custom series on input line ....
@@ -505,8 +503,6 @@ Applying: [....-..-..] Make math accents robust on input line ....
Already applied: [....-..-..] Make math accents robust on input line ....
Applying: [....-..-..] makemath accents robust on input line ....
Already applied: [....-..-..] makemath accents robust on input line ....
-Applying: [....-..-..] Make math delimiters robust on input line ....
-Already applied: [....-..-..] Make math delimiters robust on input line ...
Applying: [....-..-..] make delimiters robust on input line ....
Already applied: [....-..-..] make delimiters robust on input line ....
Skipping: [....-..-..] Custom series on input line ....
diff --git a/base/testfiles/tlb-latexrelease-003.xetex.tlg b/base/testfiles/tlb-latexrelease-003.xetex.tlg
index fcdca682..3981fab1 100644
--- a/base/testfiles/tlb-latexrelease-003.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-003.xetex.tlg
@@ -176,8 +176,6 @@ Skipping: [....-..-..] Make math accents robust on input line ....
Applying: [....-..-..] Make math accents robust on input line ....
Skipping: [....-..-..] makemath accents robust on input line ....
Applying: [....-..-..] makemath accents robust on input line ....
-Skipping: [....-..-..] Make math delimiters robust on input line ....
-Applying: [....-..-..] Make math delimiters robust on input line ....
Skipping: [....-..-..] make delimiters robust on input line ....
Applying: [....-..-..] make delimiters robust on input line ....
Skipping: [....-..-..] Custom series on input line ....
@@ -514,8 +512,6 @@ Applying: [....-..-..] Make math accents robust on input line ....
Already applied: [....-..-..] Make math accents robust on input line ....
Applying: [....-..-..] makemath accents robust on input line ....
Already applied: [....-..-..] makemath accents robust on input line ....
-Applying: [....-..-..] Make math delimiters robust on input line ....
-Already applied: [....-..-..] Make math delimiters robust on input line ...
Applying: [....-..-..] make delimiters robust on input line ....
Already applied: [....-..-..] make delimiters robust on input line ....
Skipping: [....-..-..] Custom series on input line ....
diff --git a/base/testfiles/tlb0942.luatex.tlg b/base/testfiles/tlb0942.luatex.tlg
index a8a1c1f2..b1368f29 100644
--- a/base/testfiles/tlb0942.luatex.tlg
+++ b/base/testfiles/tlb0942.luatex.tlg
@@ -14,30 +14,30 @@ Format: LaTeX2e<1994/06/01>
\vec = macro:->\mathaccent "017E\relax
\widehat = macro:->\mathaccent "0362\relax
\widetilde = macro:->\mathaccent "0365\relax
-\Arrowvert = macro:->\delimiter "026B33D
-\Downarrow = macro:->\delimiter "322B37F
-\Uparrow = macro:->\delimiter "322A37E
-\Updownarrow = macro:->\delimiter "326D377
-\Vert = macro:->\delimiter "026B30D
-\arrowvert = macro:->\delimiter "026A33C
-\backslash = macro:->\delimiter "026E30F
-\bracevert = macro:->\delimiter "033E33E
-\downarrow = macro:->\delimiter "3223379
-\langle = macro:->\delimiter "426830A
-\lbrace = macro:->\delimiter "4266308
-\lceil = macro:->\delimiter "4264306
-\lfloor = macro:->\delimiter "4262304
-\lgroup = macro:->\delimiter "433A33A
-\lmoustache = macro:->\delimiter "437A340
-\rangle = macro:->\delimiter "526930B
-\rbrace = macro:->\delimiter "5267309
-\rceil = macro:->\delimiter "5265307
-\rfloor = macro:->\delimiter "5263305
-\rgroup = macro:->\delimiter "533B33B
-\rmoustache = macro:->\delimiter "537B341
-\uparrow = macro:->\delimiter "3222378
-\updownarrow = macro:->\delimiter "326C33F
-\vert = macro:->\delimiter "026A30C
+\Arrowvert = \protected macro:->\delimiter "026B33D
+\Downarrow = \protected macro:->\delimiter "322B37F
+\Uparrow = \protected macro:->\delimiter "322A37E
+\Updownarrow = \protected macro:->\delimiter "326D377
+\Vert = \protected macro:->\delimiter "026B30D
+\arrowvert = \protected macro:->\delimiter "026A33C
+\backslash = \protected macro:->\delimiter "026E30F
+\bracevert = \protected macro:->\delimiter "033E33E
+\downarrow = \protected macro:->\delimiter "3223379
+\langle = \protected macro:->\delimiter "426830A
+\lbrace = \protected macro:->\delimiter "4266308
+\lceil = \protected macro:->\delimiter "4264306
+\lfloor = \protected macro:->\delimiter "4262304
+\lgroup = \protected macro:->\delimiter "433A33A
+\lmoustache = \protected macro:->\delimiter "437A340
+\rangle = \protected macro:->\delimiter "526930B
+\rbrace = \protected macro:->\delimiter "5267309
+\rceil = \protected macro:->\delimiter "5265307
+\rfloor = \protected macro:->\delimiter "5263305
+\rgroup = \protected macro:->\delimiter "533B33B
+\rmoustache = \protected macro:->\delimiter "537B341
+\uparrow = \protected macro:->\delimiter "3222378
+\updownarrow = \protected macro:->\delimiter "326C33F
+\vert = \protected macro:->\delimiter "026A30C
> 14680112.
l. ...\showthe\mathcode`\0
> 14680113.
@@ -177,17 +177,17 @@ l. ...\showthe
<to be read again>
\showthe
l. ...\showthe
- \mathcode`\Y
+ \mathcode`\Y
> 31457369.
<to be read again>
\showthe
l. ...\showthe
- \mathcode`\Z
+ \mathcode`\Z
> 31457370.
<to be read again>
\show
l. ...\show
- \Delta
+ \Delta
> \Delta=\mathchar"7001.
l. ...\show\Delta
> \Gamma=\mathchar"7000.
diff --git a/base/testfiles/tlb0942.lvt b/base/testfiles/tlb0942.lvt
index 937925f8..11ce17ec 100644
--- a/base/testfiles/tlb0942.lvt
+++ b/base/testfiles/tlb0942.lvt
@@ -11,6 +11,9 @@
\def\showprotected#1{\typeout{\string#1\space=
\expandafter\meaning\csname\expandafter\@gobble\string#1\space\endcsname}}
+\def\showengineprotected#1{\typeout{\string#1\space=
+ \meaning#1}}
+
% Everything before this is ignored by the test system.
\START
@@ -33,30 +36,33 @@
\showprotected\vec
\showprotected\widehat
\showprotected\widetilde
-\showprotected\Arrowvert
-\showprotected\Downarrow
-\showprotected\Uparrow
-\showprotected\Updownarrow
-\showprotected\Vert
-\showprotected\arrowvert
-\showprotected\backslash
-\showprotected\bracevert
-\showprotected\downarrow
-\showprotected\langle
-\showprotected\lbrace
-\showprotected\lceil
-\showprotected\lfloor
-\showprotected\lgroup
-\showprotected\lmoustache
-\showprotected\rangle
-\showprotected\rbrace
-\showprotected\rceil
-\showprotected\rfloor
-\showprotected\rgroup
-\showprotected\rmoustache
-\showprotected\uparrow
-\showprotected\updownarrow
-\showprotected\vert
+
+% delmiters done differently:
+\showengineprotected\Arrowvert
+\showengineprotected\Downarrow
+\showengineprotected\Uparrow
+\showengineprotected\Updownarrow
+\showengineprotected\Vert
+\showengineprotected\arrowvert
+\showengineprotected\backslash
+\showengineprotected\bracevert
+\showengineprotected\downarrow
+\showengineprotected\langle
+\showengineprotected\lbrace
+\showengineprotected\lceil
+\showengineprotected\lfloor
+\showengineprotected\lgroup
+\showengineprotected\lmoustache
+\showengineprotected\rangle
+\showengineprotected\rbrace
+\showengineprotected\rceil
+\showengineprotected\rfloor
+\showengineprotected\rgroup
+\showengineprotected\rmoustache
+\showengineprotected\uparrow
+\showengineprotected\updownarrow
+\showengineprotected\vert
+
\showthe\mathcode`\0
\showthe\mathcode`\1
\showthe\mathcode`\2
diff --git a/base/testfiles/tlb0942.tlg b/base/testfiles/tlb0942.tlg
index 761d7e56..8a5765ed 100644
--- a/base/testfiles/tlb0942.tlg
+++ b/base/testfiles/tlb0942.tlg
@@ -14,30 +14,30 @@ Format: LaTeX2e<1994/06/01>
\vec = macro:->\mathaccent "017E\relax
\widehat = macro:->\mathaccent "0362\relax
\widetilde = macro:->\mathaccent "0365\relax
-\Arrowvert = macro:->\delimiter "026B33D
-\Downarrow = macro:->\delimiter "322B37F
-\Uparrow = macro:->\delimiter "322A37E
-\Updownarrow = macro:->\delimiter "326D377
-\Vert = macro:->\delimiter "026B30D
-\arrowvert = macro:->\delimiter "026A33C
-\backslash = macro:->\delimiter "026E30F
-\bracevert = macro:->\delimiter "033E33E
-\downarrow = macro:->\delimiter "3223379
-\langle = macro:->\delimiter "426830A
-\lbrace = macro:->\delimiter "4266308
-\lceil = macro:->\delimiter "4264306
-\lfloor = macro:->\delimiter "4262304
-\lgroup = macro:->\delimiter "433A33A
-\lmoustache = macro:->\delimiter "437A340
-\rangle = macro:->\delimiter "526930B
-\rbrace = macro:->\delimiter "5267309
-\rceil = macro:->\delimiter "5265307
-\rfloor = macro:->\delimiter "5263305
-\rgroup = macro:->\delimiter "533B33B
-\rmoustache = macro:->\delimiter "537B341
-\uparrow = macro:->\delimiter "3222378
-\updownarrow = macro:->\delimiter "326C33F
-\vert = macro:->\delimiter "026A30C
+\Arrowvert = \protected macro:->\delimiter "026B33D
+\Downarrow = \protected macro:->\delimiter "322B37F
+\Uparrow = \protected macro:->\delimiter "322A37E
+\Updownarrow = \protected macro:->\delimiter "326D377
+\Vert = \protected macro:->\delimiter "026B30D
+\arrowvert = \protected macro:->\delimiter "026A33C
+\backslash = \protected macro:->\delimiter "026E30F
+\bracevert = \protected macro:->\delimiter "033E33E
+\downarrow = \protected macro:->\delimiter "3223379
+\langle = \protected macro:->\delimiter "426830A
+\lbrace = \protected macro:->\delimiter "4266308
+\lceil = \protected macro:->\delimiter "4264306
+\lfloor = \protected macro:->\delimiter "4262304
+\lgroup = \protected macro:->\delimiter "433A33A
+\lmoustache = \protected macro:->\delimiter "437A340
+\rangle = \protected macro:->\delimiter "526930B
+\rbrace = \protected macro:->\delimiter "5267309
+\rceil = \protected macro:->\delimiter "5265307
+\rfloor = \protected macro:->\delimiter "5263305
+\rgroup = \protected macro:->\delimiter "533B33B
+\rmoustache = \protected macro:->\delimiter "537B341
+\uparrow = \protected macro:->\delimiter "3222378
+\updownarrow = \protected macro:->\delimiter "326C33F
+\vert = \protected macro:->\delimiter "026A30C
> 28720.
l. ...\showthe\mathcode`\0
> 28721.
@@ -177,17 +177,17 @@ l. ...\showthe
<to be read again>
\showthe
l. ...\showthe
- \mathcode`\Y
+ \mathcode`\Y
> 29017.
<to be read again>
\showthe
l. ...\showthe
- \mathcode`\Z
+ \mathcode`\Z
> 29018.
<to be read again>
\show
l. ...\show
- \Delta
+ \Delta
> \Delta=\mathchar"7001.
l. ...\show\Delta
> \Gamma=\mathchar"7000.
diff --git a/required/amsmath/amsmath.dtx b/required/amsmath/amsmath.dtx
index 71bfa830..c45524f6 100644
--- a/required/amsmath/amsmath.dtx
+++ b/required/amsmath/amsmath.dtx
@@ -2,7 +2,7 @@
% \iffalse meta-comment
%
% Copyright (C) 1995, 2000, 2013 American Mathematical Society.
-% Copyright (C) 2016-2019 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 2016-2020 LaTeX3 Project and American Mathematical Society.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -86,7 +86,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
% \end{macrocode}
%
% \begin{macrocode}
-\ProvidesPackage{amsmath}[2019/12/01 v2.17d AMS math features]
+\ProvidesPackage{amsmath}[2020/01/20 v2.17e AMS math features]
% \end{macrocode}
%
% \section{Catcode defenses}
@@ -520,9 +520,13 @@ For additional information on amsmath, use the \lq ?\rq\space option.%
\@xp\@tempa\vert\@empty\@nil
\ifnum\@tempcnta>\z@
\advance\@tempcnta "4000000
- \xdef\lvert{\delimiter\number\@tempcnta\space }
+% \end{macrocode}
+% Use \cs{protected} on the delimiters}.
+% \changes{v2.17e}{2020/01/20}{Make delimiters robust (gh/251))}
+% \begin{macrocode}
+ \protected\xdef\lvert{\delimiter\number\@tempcnta\space }
\advance\@tempcnta "1000000
- \xdef\rvert{\delimiter\number\@tempcnta\space }
+ \protected\xdef\rvert{\delimiter\number\@tempcnta\space }
\else
\ifx\@@undefined\lvert
% Fall back to cmex encoding since we don't know what else to do.
@@ -535,9 +539,9 @@ For additional information on amsmath, use the \lq ?\rq\space option.%
\@xp\@tempa\Vert\@empty\@nil
\ifnum\@tempcnta>\z@
\advance\@tempcnta "4000000
- \xdef\lVert{\delimiter\number\@tempcnta\space }
+ \protected\xdef\lVert{\delimiter\number\@tempcnta\space }
\advance\@tempcnta "1000000
- \xdef\rVert{\delimiter\number\@tempcnta\space }
+ \protected\xdef\rVert{\delimiter\number\@tempcnta\space }
\else
\ifx\@@undefined\lVert
\DeclareMathDelimiter{\lVert}
diff --git a/required/amsmath/changes.txt b/required/amsmath/changes.txt
index 38832204..3b392742 100644
--- a/required/amsmath/changes.txt
+++ b/required/amsmath/changes.txt
@@ -1,3 +1,9 @@
+2020-01-20 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * amsmath.dtx (subsection{Vertical bar symbols}):
+ Make \lvert, \rvert, \lVert and \rVert robust to match kernel
+ correction (gh/251)
+
2019-12-01 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* amsmath.dtx: docu update for gh/200 no code change.
More information about the latex3-commits
mailing list