diff options
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r-- | Master/texmf-dist/source/latex/base/ltfinal.dtx | 34 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/base/ltspace.dtx | 16 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/base/ltvers.dtx | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/base/ltxdoc.dtx | 11 |
4 files changed, 51 insertions, 12 deletions
diff --git a/Master/texmf-dist/source/latex/base/ltfinal.dtx b/Master/texmf-dist/source/latex/base/ltfinal.dtx index 7f4bef3bcc1..a19ffa83052 100644 --- a/Master/texmf-dist/source/latex/base/ltfinal.dtx +++ b/Master/texmf-dist/source/latex/base/ltfinal.dtx @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{ltfinal.dtx} - [2022/10/26 v2.2x LaTeX Kernel (Final Settings)] + [2022/11/30 v2.2y LaTeX Kernel (Final Settings)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltfinal.dtx} @@ -1151,9 +1151,7 @@ \cs_set_protected:Npn \reserved@a #1 { \cs_generate_variant:cn { text_ \str_lowercase:n {#1} case:nn } { V } - \cs_new_protected:cpx { Make#1case \c_space_tl \c_space_tl \c_space_tl } [##1] ##2 - { \exp_not:N \@@text@case@aux { \str_lowercase:n {#1} } {##1} {##2} } - \ExpandArgs { cnx } \NewExpandableDocumentCommand + \ExpandArgs { cnx } \NewExpandableDocumentCommand { Make#1case } { O{} +m } { \exp_not:c { Make#1case \c_space_tl \c_space_tl \c_space_tl } [####1] {####2} } @@ -1162,6 +1160,34 @@ \reserved@a { Lower } \reserved@a { Title } % \end{macrocode} +% \changes{v2.2y}{2022/11/30}{Set \cs{oe}/\cs{OE} equal to act as a marker for \pkg{babel}} +% Currently, \pkg{babel} uses the equivalence of \cs{oe} and \cs{OE} to force casing of +% some material, most notably in \cs{today}. To enable that to work, we have to set those +% commands equal even though the current case changing code does not work using this +% approach. +% \begin{macrocode} +\cs_new_protected:cpn { MakeLowercase \c_space_tl \c_space_tl \c_space_tl } [#1] #2 + { + \let \kernel@saved@OE \OE + \let \OE \oe + \@@text@case@aux { lower } {#1} {#2} + \let \OE \kernel@saved@OE + } +\cs_new_protected:cpn { MakeUppercase \c_space_tl \c_space_tl \c_space_tl } [#1] #2 + { + \let \kernel@saved@oe \oe + \let \oe \OE + \@@text@case@aux { upper } {#1} {#2} + \let \oe \kernel@saved@oe + } +\cs_new_protected:cpn { MakeTitlecase \c_space_tl \c_space_tl \c_space_tl } [#1] #2 + { + \let \kernel@saved@oe \oe + \let \oe \OE + \@@text@case@aux { title } {#1} {#2} + \let \oe \kernel@saved@oe + } +% \end{macrocode} % % \changes{v2.2u}{2022/06/02}{Add \cs{NoCaseChange}} % \changes{v2.2u}{2022/06/30}{Add \cs{AddToNoCaseChangeList}} diff --git a/Master/texmf-dist/source/latex/base/ltspace.dtx b/Master/texmf-dist/source/latex/base/ltspace.dtx index feb82730ece..30bda278fbf 100644 --- a/Master/texmf-dist/source/latex/base/ltspace.dtx +++ b/Master/texmf-dist/source/latex/base/ltspace.dtx @@ -32,7 +32,7 @@ %<*driver> % \fi \ProvidesFile{ltspace.dtx} - [2020/05/06 v1.3n LaTeX Kernel (spacing)] + [2022/11/28 v1.3o LaTeX Kernel (spacing)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltspace.dtx} @@ -438,12 +438,13 @@ % \cs{setlength}. This way the \texttt{calc} package can operate on % the argument value. % \changes{v1.3m}{2020/04/21}{Support calc syntax (gh/152)} +% \changes{v1.3o}{2022/11/28}{Support calc syntax without a group (gh/967)} % \begin{macrocode} %</2ekernel> %<*2ekernel|latexrelease> %<latexrelease>\IncludeInRelease{2020/10/01}% %<latexrelease> {\@vspace@calcify}{Add calc support}% -\def\@vspace@calcify#1{\begingroup\setlength\skip@{#1}\vskip\skip@\endgroup} +\def\@vspace@calcify#1{\setlength\sp@ce@skip{#1}\vskip\sp@ce@skip} %</2ekernel|latexrelease> %<latexrelease>\EndIncludeInRelease % \end{macrocode} @@ -1261,12 +1262,21 @@ % {(RmS) Removed superfluous \cs{leavevmode} in \cs{@hspace} and % \cs{@hspacer}, as suggested by CAR.} % \changes{v1.3m}{2020/04/21}{Support calc syntax (gh/152)} +% \changes{v1.3o}{2022/11/28}{Support calc syntax correctly (gh/967)} % \begin{macrocode} %</2ekernel> %<*2ekernel|latexrelease> %<latexrelease>\IncludeInRelease{2020/10/01}% %<latexrelease> {\@hspace}{Support calc with \hspace}% -\def\@hspace#1{\begingroup\setlength\skip@{#1}\hskip\skip@\endgroup} +% \end{macrocode} +% We use a private register to calculate the space (if \pkg{calc} is used). Previously +% we used a group but that results in +% \cs{everypar} etc.\ being executed inside the group if the \cs{hspace} starts a paragraph. +% This is a bug fix so +% we do not provide rollback to the incorrect intermediate version. +% \begin{macrocode} +\newskip\sp@ce@skip +\def\@hspace#1{\setlength\sp@ce@skip{#1}\hskip\sp@ce@skip} %</2ekernel|latexrelease> %<latexrelease>\EndIncludeInRelease % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx index e1282139e15..24308589f1f 100644 --- a/Master/texmf-dist/source/latex/base/ltvers.dtx +++ b/Master/texmf-dist/source/latex/base/ltvers.dtx @@ -115,7 +115,7 @@ {2022-11-01} %</2ekernel|latexrelease> %<*2ekernel> -\def\patch@level{0} +\def\patch@level{1} % \end{macrocode} % % \begin{macro}{\development@branch@name} diff --git a/Master/texmf-dist/source/latex/base/ltxdoc.dtx b/Master/texmf-dist/source/latex/base/ltxdoc.dtx index 46c324c5900..6863349be3d 100644 --- a/Master/texmf-dist/source/latex/base/ltxdoc.dtx +++ b/Master/texmf-dist/source/latex/base/ltxdoc.dtx @@ -30,7 +30,7 @@ % %<class>\NeedsTeXFormat{LaTeX2e} %<class>\ProvidesClass{ltxdoc} -%<class> [2022/06/22 v2.1h Standard LaTeX documentation class] +%<class> [2022/06/22 v2.1i Standard LaTeX documentation class] % %<*driver> \documentclass{ltxdoc} @@ -633,12 +633,15 @@ Bug reports can be opened (category \texttt{#1}) at\\% % % \changes{v2.1f}{2022/06/03}{define \cs{pkg} and other commands} % \changes{v2.1f}{2022/06/03}{allow \_ in macro names} -% Some feaures from l3doc.cls +% Some features from l3doc.cls % \changes{v2.1g}{2022/06/14}{define \cs{pkg} but delay until begin document} +% \changes{v2.1i}{2022/11/28}{Revert 2.1f and not use \cs{detokenize} for now (gh/962)} +% Eventually, \cs{cs} should get the definition from \pkg{l3doc} but for now we +% revert to the simple one from \pkg{doc}. % \begin{macrocode} -\DeclareRobustCommand\cs[1]{\texttt{\bslash\detokenize{#1}}}% +%\DeclareRobustCommand\cs[1]{\texttt{\bslash #1}}% -- def in doc.sty \AtBeginDocument{% - \renewcommand\PrintMacroName[1]{\MacroFont\detokenize{#1}}% +% \renewcommand\PrintMacroName[1]{\MacroFont\string #1\ }% -- def in doc.sty % \end{macrocode} % We provide those delated in case somebody has loaded \texttt{csquotes} % or makes some definitions in the preamble. |