diff options
author | Karl Berry <karl@freefriends.org> | 2020-02-02 22:42:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-02-02 22:42:01 +0000 |
commit | 961f0d1df526285b3a08b8a75af7197b5e6f86b7 (patch) | |
tree | a0a096f519b75b148833f7ebd70ca5af996fa2c6 /Master/texmf-dist/source/latex/base/ltspace.dtx | |
parent | b97aa19e35137596fcf0193abee3788b21250f32 (diff) |
l2e (2feb20)
git-svn-id: svn://tug.org/texlive/trunk@53640 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/base/ltspace.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/base/ltspace.dtx | 48 |
1 files changed, 35 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/latex/base/ltspace.dtx b/Master/texmf-dist/source/latex/base/ltspace.dtx index d840b13bbbe..16d7dcb43aa 100644 --- a/Master/texmf-dist/source/latex/base/ltspace.dtx +++ b/Master/texmf-dist/source/latex/base/ltspace.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. % @@ -32,7 +32,7 @@ %<*driver> % \fi \ProvidesFile{ltspace.dtx} - [2019/08/27 v1.3j LaTeX Kernel (spacing)] + [2019/11/02 v1.3k LaTeX Kernel (spacing)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltspace.dtx} @@ -275,7 +275,7 @@ %<*2ekernel> \message{spacing,} % \end{macrocode} -% +% % \begin{macrocode} %</2ekernel> %<*2ekernel|latexrelease> @@ -393,15 +393,38 @@ % so now it is explicitly robust, like |\\|. % \begin{macro}{\@normalcr} % The internal definition of the `normal' definition of |\\|. +% \changes{v1.3k}{2019/11/02}{Make also \cs{@normalcr} robust} % \begin{macrocode} -\DeclareRobustCommand\\{% +%</2ekernel> +%<*2ekernel|latexrelease> +%<latexrelease>\IncludeInRelease{2020/02/02}% +%<latexrelease> {\@normalcr}{Make robust}% +\protected\def\@normalcr{% \let \reserved@e \relax \let \reserved@f \relax \@ifstar{\let \reserved@e \vadjust \let \reserved@f \nobreak \@xnewline}% - \@xnewline} -\expandafter\let\expandafter\@normalcr - \csname\expandafter\@gobble\string\\ \endcsname + \@xnewline} +% \end{macrocode} +% +% \begin{macrocode} +\let\\\@normalcr +%</2ekernel|latexrelease> +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}% +%<latexrelease> {\@normalcr}{Make robust}% +%<latexrelease> +%<latexrelease>\DeclareRobustCommand\\{% +%<latexrelease> \let \reserved@e \relax +%<latexrelease> \let \reserved@f \relax +%<latexrelease> \@ifstar{\let \reserved@e \vadjust \let \reserved@f \nobreak +%<latexrelease> \@xnewline}% +%<latexrelease> \@xnewline} +%<latexrelease>\expandafter\let\expandafter\@normalcr +%<latexrelease> \csname\expandafter\@gobble\string\\ \endcsname +%<latexrelease> +%<latexrelease>\EndIncludeInRelease +%<*2ekernel> % \end{macrocode} % \end{macro} % \end{macro} @@ -598,7 +621,7 @@ % \changes{v1.3f}{2015/11/07} % {Only space if there is no space at the end of the hlist latex/4443} % \begin{macrocode} - \ifdim\lastskip=\z@ + \ifdim\lastskip=\z@ \nobreak \hskip\z@skip \fi \ignorespaces @@ -624,7 +647,7 @@ %<latexrelease> \ifhmode %<latexrelease> \spacefactor\@savsf %<latexrelease> \ifdim\@savsk>\z@ -%<latexrelease> \ifdim\lastskip=\z@ +%<latexrelease> \ifdim\lastskip=\z@ %<latexrelease> \nobreak \hskip\z@skip %<latexrelease> \fi %<latexrelease> \ignorespaces @@ -1153,7 +1176,7 @@ % \end{macrocode} % \end{macro} % -% +% % \begin{macrocode} %</2ekernel> %<*2ekernel|latexrelease> @@ -1165,7 +1188,7 @@ % \begin{macro}{\thinspace} % \begin{macro}{\negthinspace} % \begin{macro}{\enspace} -% \changes{v1.3h}{2018/09/24}{Start LR-mode if necessary (git/49)} +% \changes{v1.3h}{2018/09/24}{Start LR-mode if necessary (git/49)} % \begin{macrocode} \DeclareRobustCommand\thinspace{\leavevmode@ifvmode\kern .16667em } \DeclareRobustCommand\negthinspace{\leavevmode@ifvmode\kern-.16667em } @@ -1178,7 +1201,7 @@ % \begin{macro}{\leavevmode@ifvmode} % Leave vmode but only if we are really in vmode, otherwise the % expansion is empty (which is not the case with the default definition). -% \changes{v1.3h}{2018/09/24}{Macro added (git/49)} +% \changes{v1.3h}{2018/09/24}{Macro added (git/49)} % \begin{macrocode} \protected\def\leavevmode@ifvmode{\ifvmode\expandafter\indent\fi} % \end{macrocode} @@ -1234,4 +1257,3 @@ % % \Finale \endinput - |