diff options
author | Karl Berry <karl@freefriends.org> | 2019-11-19 22:34:19 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-11-19 22:34:19 +0000 |
commit | 3274fea6c34517ff1b5b17ca0ff3b92574f340a5 (patch) | |
tree | 66dede7eb9d4492fb6766ea40ade67bceef07d06 /Master/texmf-dist/tex/latex-dev/base/latex.ltx | |
parent | 079d7aeb0e3afef4ad6b0f906f9ad4a6ae1be57d (diff) |
latex-dev (19nov19)
git-svn-id: svn://tug.org/texlive/trunk@52866 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex-dev/base/latex.ltx')
-rw-r--r-- | Master/texmf-dist/tex/latex-dev/base/latex.ltx | 84 |
1 files changed, 48 insertions, 36 deletions
diff --git a/Master/texmf-dist/tex/latex-dev/base/latex.ltx b/Master/texmf-dist/tex/latex-dev/base/latex.ltx index 3a0686943a4..efc1b5de8e6 100644 --- a/Master/texmf-dist/tex/latex-dev/base/latex.ltx +++ b/Master/texmf-dist/tex/latex-dev/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% @@ -700,8 +707,8 @@ %%% From File: ltvers.dtx \def\fmtname{LaTeX2e} \edef\fmtversion - {2019-10-01} -\def\patch@level{-3} + {2020-02-01} +\def\patch@level{-1} \edef\development@branch@name{development \the\year-\the\month-\the\day} \iffalse \def\reserved@a#1/#2/#3\@nil{% @@ -1488,14 +1495,13 @@ Type H <return> for immediate help.}% \ignorespaces \fi \fi} -\DeclareRobustCommand\\{% +\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} +\let\\\@normalcr \DeclareRobustCommand\newline{\@normalcr\relax} \def\@xnewline{\@ifnextchar[% ] bracket matching \@newline @@ -1844,7 +1850,11 @@ Type H <return> for immediate help.}% \def\set@curr@file#1{% \begingroup \escapechar\m@ne - \xdef\@curr@file{\expandafter\string\csname #1\endcsname}% + \xdef\@curr@file{% + \expandafter\expandafter\expandafter\unquote@name + \expandafter\expandafter\expandafter{% + \expandafter\string + \csname\@firstofone#1\@empty\endcsname}}% \endgroup } \def\quote@name#1{"\quote@@name#1\@gobble""} @@ -1852,10 +1862,9 @@ Type H <return> 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 +1873,7 @@ Type H <return> for immediate help.}% \fi \else \closein\@inputcheck - \edef\@filef@und{#1 }% + \edef\@filef@und{"#1" }% \def\reserved@a{#2}% \fi \reserved@a} @@ -1872,9 +1881,9 @@ Type H <return> 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{\expandafter\quote@name\expandafter{\reserved@b#1} }% \let\reserved@a\@firstoftwo% \closein\@inputcheck \@break@tfor @@ -4334,14 +4343,18 @@ Type H <return> 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} + {\expandafter\ifx\expandafter X\detokenize{#2}X\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 +\catcode`\^^A=14 +\long\gdef\do@add@percent@to@temptokena#1{\@temptokena\expandafter{#1%^^A + }} \endgroup \long\def\@writefile#1#2{% \@ifundefined{tf@#1}\relax @@ -4389,7 +4402,7 @@ Type H <return> for immediate help.}% \reserved@a\@currenvir \else\@badend{#1}\fi} \let\@currenvline\@empty \message{center,} -\def\@centercr{\ifhmode \unskip\else \@nolnerr\fi +\protected\def\@centercr{\ifhmode \unskip\else \@nolnerr\fi \par\@ifstar{\nobreak\@xcentercr}\@xcentercr} \def\@xcentercr{\addvspace{-\parskip}\@ifnextchar [\@icentercr\ignorespaces} @@ -5446,7 +5459,7 @@ Type H <return> for immediate help.}% \@contfield} \DeclareRobustCommand\kill{\@stopfield\@startline\ignorespaces} \newdimen\tabbingsep -\DeclareRobustCommand\extracolsep[1]{\tabskip #1\relax} +\def\extracolsep#1{\tabskip #1\relax} \def\array{\let\@acol\@arrayacol \let\@classz\@arrayclassz \let\@classiv\@arrayclassiv \let\\\@arraycr\let\@halignto\@empty\@tabarray} @@ -8089,7 +8102,6 @@ Type H <return> for immediate help.}% \@pushfilename \xdef\@currname{#1}% \global\let\@currext#4% - \expandafter\let\csname\@currname.\@currext-h@@k\endcsname\@empty \let\CurrentOption\@empty \@reset@ptions \makeatletter @@ -8113,6 +8125,7 @@ Type H <return> for immediate help.}% {\@pass@ptions\@currext{#2}{#1}% \global\expandafter \let\csname ver@\@currname.\@currext\endcsname\@empty + \expandafter\let\csname\@currname.\@currext-h@@k\endcsname\@empty \InputIfFileExists {\@currname.\@currext}% {}% @@ -8206,7 +8219,6 @@ Type H <return> for immediate help.}% {The document may only declare one class.}\@gobble} \@onlypreamble\@twoclasseserror \def\two@digits#1{\ifnum#1<10 0\fi\number#1} - \def\filecontents{\@tempswatrue\@fileswtrue \@ifnextchar[\filec@ntents@opt\filec@ntents } @@ -8357,7 +8369,6 @@ Type H <return> for immediate help.}% \fi \let\pkgcls@targetlabel\@empty \def\pkgcls@innerdate{\maxdimen} - \let\pkgcls@candidate\@empty \let\pkgcls@releasedate\@empty \ifx\load@onefilewithoptions\@undefined @@ -8420,7 +8431,6 @@ Type H <return> for immediate help.}% } \def\pkgcls@parse@date@arg@version#1={% \def\pkgcls@targetlabel{#1}} - \def\DeclareRelease#1#2#3{% \ifnum\pkgcls@targetdate>\z@ % some sort of rollback request \pkgcls@debug{---\string\DeclareRelease:}% @@ -8465,14 +8475,12 @@ Type H <return> for immediate help.}% \fi \fi } - \def\pkgcls@use@this@release#1#2{% \pkgcls@show@selection{#1}{#2}% \pkgcls@targetdate\z@ \@@input #1\relax \endinput } - \def\pkgcls@show@selection#1#2{% \pkgcls@debug{Result: use #1}% \GenericInfo @@ -8497,7 +8505,6 @@ Type H <return> for immediate help.}% \fi \@gobble}% } - \def\pkgcls@rollbackdate@error#1{% \@latex@error{Suspicious rollback date given}% {The \@cls@pkg\space'\@currname' claims that it @@ -8513,7 +8520,6 @@ Type H <return> for immediate help.}% \ifnum\pkgcls@targetdate>\@ne % a date request \ifnum\@parse@version#2//00\@nil >\pkgcls@targetdate - \ifx\pkgcls@candidate\@empty \pkgcls@rollbackdate@error{#2}% \else @@ -8534,7 +8540,6 @@ Type H <return> for immediate help.}% \fi \fi } - \DeclareRobustCommand\IfTargetDateBefore[1]{% \ifnum\pkgcls@innerdate <% \expandafter\@parse@version\expandafter0#1//00\@nil @@ -8996,12 +9001,18 @@ Type H <return> for immediate help.}% \def\i{I}\def\j{J}% \def\reserved@a##1##2{\let##1##2\reserved@a}% \expandafter\reserved@a\@uclclist\reserved@b{\reserved@b\@gobble}% + \let\UTF@two@octets@noexpand\@empty + \let\UTF@three@octets@noexpand\@empty + \let\UTF@four@octets@noexpand\@empty \protected@edef\reserved@a{\uppercase{#1}}% \reserved@a }} \DeclareRobustCommand{\MakeLowercase}[1]{{% \def\reserved@a##1##2{\let##2##1\reserved@a}% \expandafter\reserved@a\@uclclist\reserved@b{\reserved@b\@gobble}% + \let\UTF@two@octets@noexpand\@empty + \let\UTF@three@octets@noexpand\@empty + \let\UTF@four@octets@noexpand\@empty \protected@edef\reserved@a{\lowercase{#1}}% \reserved@a }} @@ -9009,6 +9020,7 @@ Type H <return> for immediate help.}% \dh\DH\dj\DJ\l\L\ng\NG\ss\SS\th\TH} \protected@edef\MakeUppercase#1{\MakeUppercase{#1}} \protected@edef\MakeLowercase#1{\MakeLowercase{#1}} +\input{ltexpl.ltx} \let\reserved@a\@filelist \let\reserved@b=\@undefined \let\reserved@c=\@undefined |