From aab89493103eee4673adc09ca1cb724b08d8ce98 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 10 Nov 2019 22:06:36 +0000 Subject: latex(2e) (10nov19) git-svn-id: svn://tug.org/texlive/trunk@52722 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/base/ltfiles.dtx | 7 +++++-- Master/texmf-dist/source/latex/base/ltmiscen.dtx | 9 +++++---- Master/texmf-dist/source/latex/base/ltvers.dtx | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/source/latex/base') diff --git a/Master/texmf-dist/source/latex/base/ltfiles.dtx b/Master/texmf-dist/source/latex/base/ltfiles.dtx index d0d33a4c717..87a7f5e983b 100644 --- a/Master/texmf-dist/source/latex/base/ltfiles.dtx +++ b/Master/texmf-dist/source/latex/base/ltfiles.dtx @@ -32,7 +32,7 @@ %<*driver> % \fi \ProvidesFile{ltfiles.dtx} - [2019/10/26 v1.2d LaTeX Kernel (File Handling)] + [2019/11/09 v1.2e LaTeX Kernel (File Handling)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltfiles.dtx} @@ -715,6 +715,7 @@ % \changes{v1.2a}{2019/07/01}{Support UTF-8} % \changes{v1.2c}{2019/10/11}{Remove one brace group} % \changes{v1.2d}{2019/10/26}{remove quotes} +% \changes{v1.2e}{2019/11/09}{expand and \cs{string} before removing quotes} % \begin{macrocode} % %<*2ekernel|latexrelease> @@ -724,8 +725,10 @@ \begingroup \escapechar\m@ne \xdef\@curr@file{% + \expandafter\expandafter\expandafter\unquote@name + \expandafter\expandafter\expandafter{% \expandafter\string - \csname\expandafter\unquote@name\expandafter{\@firstofone#1\@empty}\endcsname}% + \csname\@firstofone#1\@empty\endcsname}}% \endgroup } % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/base/ltmiscen.dtx b/Master/texmf-dist/source/latex/base/ltmiscen.dtx index 2a88438dee1..61e44e5e91c 100644 --- a/Master/texmf-dist/source/latex/base/ltmiscen.dtx +++ b/Master/texmf-dist/source/latex/base/ltmiscen.dtx @@ -32,7 +32,7 @@ %<*driver> % \fi \ProvidesFile{ltmiscen.dtx} - [2019/10/25 v1.1q LaTeX Kernel (Misc. Environments)] + [2019/11/10 v1.1r LaTeX Kernel (Misc. Environments)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltmiscen.dtx} @@ -381,8 +381,9 @@ % group the braces aren't stripped. The |\expandafter| then expands % this extra token away again. % \changes{v1.1q}{2019/10/25}{Allow unbalanced conditionals in \texttt{\#1} (gh/202)} +% \changes{v1.1r}{2019/08/27}{fix to special comment catcodes (gh/202)} % \begin{macrocode} - {\ifx!#2!\expandafter\dont@add@percent@to@temptokena\else + {\expandafter\ifx\expandafter X\detokenize{#2}X\expandafter\dont@add@percent@to@temptokena\else \expandafter\do@add@percent@to@temptokena\fi{#1}} % \end{macrocode} % @@ -401,8 +402,8 @@ % \begin{macrocode} \begingroup \catcode`\%=12 -\long\gdef\do@add@percent@to@temptokena#1{% - \@temptokena\expandafter{#1%^^A +\catcode`\^^A=14 +\long\gdef\do@add@percent@to@temptokena#1{\@temptokena\expandafter{#1%^^A % \end{macrocode} % Can't be on the same line as the |%| --- see above. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx index 89d72953210..813dd68f633 100644 --- a/Master/texmf-dist/source/latex/base/ltvers.dtx +++ b/Master/texmf-dist/source/latex/base/ltvers.dtx @@ -115,7 +115,7 @@ {2019-10-01} % %<*2ekernel> -\def\patch@level{2} +\def\patch@level{3} % \end{macrocode} % % \begin{macro}{\development@branch@name} -- cgit v1.2.3