From 961f0d1df526285b3a08b8a75af7197b5e6f86b7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 2 Feb 2020 22:42:01 +0000 Subject: l2e (2feb20) git-svn-id: svn://tug.org/texlive/trunk@53640 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/base/ltfssdcl.dtx | 83 ++++-------------------- 1 file changed, 12 insertions(+), 71 deletions(-) (limited to 'Master/texmf-dist/source/latex/base/ltfssdcl.dtx') diff --git a/Master/texmf-dist/source/latex/base/ltfssdcl.dtx b/Master/texmf-dist/source/latex/base/ltfssdcl.dtx index d1284a08e8a..951c6de2e5a 100644 --- a/Master/texmf-dist/source/latex/base/ltfssdcl.dtx +++ b/Master/texmf-dist/source/latex/base/ltfssdcl.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright (C) 1993-2019 +% Copyright (C) 1993-2020 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -36,7 +36,7 @@ % % \ProvidesFile{ltfssdcl.dtx} - [2019/08/27 v3.0s LaTeX Kernel (NFSS Declarative Interface)] + [2020/01/20 v3.0t LaTeX Kernel (NFSS Declarative Interface)] % \iffalse \documentclass{ltxdoc} \begin{document} @@ -1104,7 +1104,7 @@ \edef\reserved@a{\noexpand\in@ {\expandafter\@gobble\string\mathaccent} {\expandafter\meaning - \csname\expandafter\@gobble\string#1\space\endcsname}}% + \csname\expandafter\@gobble\string#1\space\endcsname}}% \reserved@a \ifin@ \expandafter\let @@ -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|latexrelease> -%\IncludeInRelease{2019/10/01}% -% {\@DeclareMathDelimiter}{Make math delimiters robust}% \def\@DeclareMathDelimiter#1#2#3#4#5#6{% \expandafter\in@\csname sym#3\expandafter\endcsname \expandafter{\group@list}% @@ -1398,11 +1393,9 @@ \edef\reserved@d{\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}% % \edef\reserved@a{\noexpand\in@ - {\expandafter\@gobble\string\delimiter}% - {\expandafter\meaning\csname\expandafter\@gobble\string#1\space\endcsname}}% + {\expandafter\@gobble\string\delimiter}{\meaning#1}}% \reserved@a \ifin@ - \expandafter\let\csname\expandafter\@gobble\string#1\space\endcsname\@undefined \expandafter\set@mathdelimiter \csname sym#3\expandafter\endcsname \csname sym#5\endcsname#1#2% @@ -1428,65 +1421,6 @@ \@latex@error{Symbol font `#3' is not defined}\@eha \fi } -% -%\EndIncludeInRelease -%\IncludeInRelease{0000/00/00}% -% {\@DeclareMathDelimiter}{Make math delimiters robust}% -%\def\@DeclareMathDelimiter#1#2#3#4#5#6{% -% \expandafter\in@\csname sym#3\expandafter\endcsname -% \expandafter{\group@list}% -% \ifin@ -% \expandafter\in@\csname sym#5\expandafter\endcsname -% \expandafter{\group@list}% -% \ifin@ -% \begingroup -% \count\z@=#4\relax -% \count\tw@\count\z@ -% \divide\count\z@\sixt@@n -% \count@\count\z@ -% \multiply\count@\sixt@@n -% \advance\count\tw@-\count@ -% \edef\reserved@c{\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}% -% % -% \count\z@=#6\relax -% \count\tw@\count\z@ -% \divide\count\z@\sixt@@n -% \count@\count\z@ -% \multiply\count@\sixt@@n -% \advance\count\tw@-\count@ -% \edef\reserved@d{\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}% -% % -% \edef\reserved@a{\noexpand\in@ -% {\expandafter\@gobble\string\delimiter}{\meaning#1}}% -% \reserved@a -% \ifin@ -% \expandafter\set@mathdelimiter -% \csname sym#3\expandafter\endcsname -% \csname sym#5\endcsname#1#2% -% \reserved@c\reserved@d -% \@font@info{Redeclaring math delimiter \string#1}% -% \else -% \expandafter\ifx -% \csname\expandafter\@gobble\string#1\endcsname -% \relax -% \expandafter\set@mathdelimiter -% \csname sym#3\expandafter\endcsname -% \csname sym#5\endcsname#1#2% -% \reserved@c\reserved@d -% \else -% \@latex@error{Command `\string#1' already defined}\@eha -% \fi -% \fi -% \endgroup -% \else -% \@latex@error{Symbol font `#5' is not defined}\@eha -% \fi -% \else -% \@latex@error{Symbol font `#3' is not defined}\@eha -% \fi -%} -%\EndIncludeInRelease -%<*2ekernel> % \end{macrocode} % % \begin{macrocode} @@ -1547,9 +1481,16 @@ %\IncludeInRelease{2019/10/01}% % {\set@mathdelimiter}{make delimiters robust}% \def\set@mathdelimiter#1#2#3#4#5#6{% +% \end{macrocode} +% We use \cs{protected} not \cs{MakeRobust} so that +% \verb=\bigl\lfoor= etc.\ works inside \cs{protected@edef}. +% \changes{v3.0s}{2019/08/27}{Make math delimiters robust} +% \changes{v3.0t}{2020/01/20}{fix for gh/251} +% \begin{macrocode} + \protected \xdef#3{\delimiter"\mathchar@type#4\hexnumber@#1#5% \hexnumber@#2#6 }% - \MakeRobust#3% +% \MakeRobust#3% } \@onlypreamble\set@mathdelimiter % -- cgit v1.2.3