From 7c55167ecf36309f45793303eea23651cb983f12 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 6 Nov 2019 22:12:38 +0000 Subject: l2e (6nov19) git-svn-id: svn://tug.org/texlive/trunk@52656 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/base/latex.ltx | 52 ++++++++++++++++++------------ 1 file changed, 32 insertions(+), 20 deletions(-) (limited to 'Master/texmf-dist/tex/latex/base/latex.ltx') diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx index e1729727086..bfc59b91d2b 100644 --- a/Master/texmf-dist/tex/latex/base/latex.ltx +++ b/Master/texmf-dist/tex/latex/base/latex.ltx @@ -254,13 +254,20 @@ \let\filename@area\@empty \expandafter\filename@simple#1.\\} \fi\fi\fi - \def\filename@simple#1.#2\\{% - \ifx\\#2\\% - \let\filename@ext\relax - \else - \edef\filename@ext{\filename@dot#2\\}% - \fi - \edef\filename@base{#1}} +\def\filename@simple#1.#2\\{% + \ifx\\#2\\% + \let\filename@ext\relax + \edef\filename@base{#1}% + \else + \filename@dots{#1}#2\\% + \fi} +\def\filename@dots#1#2.#3\\{% + \ifx\\#3\\% + \def\filename@ext{#2}% + \edef\filename@base{#1}% + \else + \filename@dots{#1.#2}#3\\% + \fi} \def\filename@dot#1.\\{#1} \else \typeout{^^J^^J% @@ -701,7 +708,7 @@ \def\fmtname{LaTeX2e} \edef\fmtversion {2019-10-01} -\def\patch@level{1} +\def\patch@level{2} \edef\development@branch@name{} \iffalse \def\reserved@a#1/#2/#3\@nil{% @@ -1844,7 +1851,9 @@ Type H for immediate help.}% \def\set@curr@file#1{% \begingroup \escapechar\m@ne - \xdef\@curr@file{\expandafter\string\csname\@firstofone#1\@empty\endcsname}% + \xdef\@curr@file{% + \expandafter\string + \csname\expandafter\unquote@name\expandafter{\@firstofone#1\@empty}\endcsname}% \endgroup } \def\quote@name#1{"\quote@@name#1\@gobble""} @@ -1852,10 +1861,9 @@ Type H for immediate help.}% \def\unquote@name#1{\quote@@name#1\@gobble"} \DeclareRobustCommand\IfFileExists[1]{% \set@curr@file{#1}% - \edef\q@curr@file{\expandafter\quote@name\expandafter{\@curr@file}}% - \expandafter\IfFileExists@\expandafter{\q@curr@file}} + \expandafter\IfFileExists@\expandafter{\@curr@file}} \long\def \IfFileExists@#1#2#3{% - \openin\@inputcheck#1 % + \openin\@inputcheck"#1" % \ifeof\@inputcheck \ifx\input@path\@undefined \def\reserved@a{#3}% @@ -1864,7 +1872,7 @@ Type H for immediate help.}% \fi \else \closein\@inputcheck - \edef\@filef@und{#1 }% + \edef\@filef@und{"#1" }% \def\reserved@a{#2}% \fi \reserved@a} @@ -1872,9 +1880,9 @@ Type H for immediate help.}% \let\reserved@a\@secondoftwo \expandafter\@tfor\expandafter\reserved@b\expandafter :\expandafter=\input@path\do{% - \openin\@inputcheck\reserved@b#1 % + \openin\@inputcheck\expandafter\quote@name\expandafter{\reserved@b#1} % \ifeof\@inputcheck\else - \edef\@filef@und{\reserved@b#1 }% + \edef\@filef@und{"\reserved@b#1" }% \let\reserved@a\@firstoftwo% \closein\@inputcheck \@break@tfor @@ -4334,14 +4342,18 @@ Type H for immediate help.}% \reserved@a \else \@tempswatrue \fi} \protected\def\protected@file@percent{} -\begingroup -\catcode`\%=12 \catcode`\^^A=9 \long\gdef\add@percent@to@temptokena #1\protected@file@percent#2\add@percent@to@temptokena - {\ifx!#2!\@temptokena\expandafter{#1}\else - \@temptokena\expandafter{#1%^^A - }\fi} + {\ifx!#2!\expandafter\dont@add@percent@to@temptokena\else + \expandafter\do@add@percent@to@temptokena\fi{#1}} +\long\def\dont@add@percent@to@temptokena#1{% + \@temptokena\expandafter{#1}} +\begingroup +\catcode`\%=12 +\long\gdef\do@add@percent@to@temptokena#1{% + \@temptokena\expandafter{#1%^^A + }} \endgroup \long\def\@writefile#1#2{% \@ifundefined{tf@#1}\relax -- cgit v1.2.3