From 9eb25126001ce227868e2031aa8508dc007d01d2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 8 Apr 2018 20:05:14 +0000 Subject: latex2e (8apr18) git-svn-id: svn://tug.org/texlive/trunk@47377 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/base/ltclass.dtx | 19 +++++++++++++++---- Master/texmf-dist/source/latex/base/ltfinal.dtx | 17 ++++++++++++++++- Master/texmf-dist/source/latex/base/ltvers.dtx | 2 +- 3 files changed, 32 insertions(+), 6 deletions(-) (limited to 'Master/texmf-dist/source/latex/base') diff --git a/Master/texmf-dist/source/latex/base/ltclass.dtx b/Master/texmf-dist/source/latex/base/ltclass.dtx index 91194a2adda..4c383a6e6df 100644 --- a/Master/texmf-dist/source/latex/base/ltclass.dtx +++ b/Master/texmf-dist/source/latex/base/ltclass.dtx @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{ltclass.dtx} - [2018/03/27 v1.2f LaTeX Kernel (Class & Package Interface)] + [2018/04/08 v1.2h LaTeX Kernel (Class & Package Interface)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltclass.dtx} @@ -626,17 +626,20 @@ % {Added //00 so parsing never produces a runaway argument.} % \changes{v1.2d}{2018/02/18} % {Added 0 up front to make bad data come out as 0.} +% \changes{v1.2g}{2018/04/08} +% {Strip leading spaces from dates.} % \begin{macrocode} %\IncludeInRelease{2018/04/01}% % {\@ifl@t@r}{Guard against bad input}% %<*2ekernel|latexrelease> \def\@ifl@t@r#1#2{% - \ifnum\expandafter\@parse@version\expandafter0#1//00\@nil<% - \expandafter\@parse@version\expandafter0#2//00\@nil + \ifnum\expandafter\@parse@version@#1//00\@nil<% + \expandafter\@parse@version@#2//00\@nil \expandafter\@secondoftwo \else \expandafter\@firstoftwo \fi} +\def\@parse@version@#1{\@parse@version0#1} % %\EndIncludeInRelease %\IncludeInRelease{0000/00/00}% @@ -648,6 +651,7 @@ % \else % \expandafter\@firstoftwo % \fi} +%\let\@parse@version@\@undefined %\EndIncludeInRelease %<*2ekernel> % \end{macrocode} @@ -1947,6 +1951,7 @@ % % \begin{macro}{\load@onefilewithoptions} % \begin{macro}{\@onefilewithoptions} +% \changes{v1.2h}{2018-04-08}{Pass expanded date} % the best place to add the rollback code is at the point where % |\@onefilewithoptions| is called to load a single class or % package. @@ -1997,7 +2002,13 @@ % necessarily a ``minimal date'' so instead of passing it on we % pass on |\pkgcls@mindate|. % \begin{macrocode} - \load@onefilewithoptions#1[#2][\pkgcls@mindate]#4% + \begingroup + \edef\reserved@a{% + \endgroup + \unexpanded{\load@onefilewithoptions#1[#2]}% + [\pkgcls@mindate]% + \unexpanded{#4}}% + \reserved@a } \fi % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/base/ltfinal.dtx b/Master/texmf-dist/source/latex/base/ltfinal.dtx index 0d53743d0fb..01ea82cdb94 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} - [2018/04/06 v2.1b LaTeX Kernel (Final Settings)] + [2018/04/08 v2.1d LaTeX Kernel (Final Settings)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltfinal.dtx} @@ -614,8 +614,10 @@ % Useful for special behaviours, or for compatibility with older \LaTeX\ formats. % \changes{v2.1b}{2018/04/06}{Undo changes to \cs{DeclareFontEncoding@} and % definition of \cs{DeclareUnicodeCharacter}} +% \changes{v2.1c}{2018/04/07}{Undefine \cs{inputencodingname}} % \begin{macrocode} \def\UseRawInputEncoding{% +\let\inputencodingname\@undefined % revert \let\DeclareFontEncoding@\DeclareFontEncoding@saved % revert \let\DeclareUnicodeCharacter\@undefined % revert \@tempcnta=1 @@ -647,9 +649,21 @@ % \end{macrocode} % \end{macro} % +% \changes{v2.1d}{2018/04/08}{Delay full UTF-8 handling to \cs{everyjob}} % \begin{macrocode} \edef\inputencodingname{utf8}% \input{utf8.def} +\let\UTFviii@two@octets@@\UTFviii@two@octets +\let\UTFviii@three@octets@@\UTFviii@three@octets +\let\UTFviii@four@octets@@\UTFviii@four@octets +%<2ekernel>\long\def\UTFviii@two@octets#1#2{\string#1\string#2} +%<2ekernel>\long\def\UTFviii@three@octets#1#2#3{\string#1\string#2\string#3} +%<2ekernel>\long\def\UTFviii@four@octets#1#2#3#4{\string#1\string#2\string#3\string#4} +%<2ekernel>\everyjob\expandafter{\the\everyjob +%<2ekernel>\let\UTFviii@two@octets\UTFviii@two@octets@@ +%<2ekernel>\let\UTFviii@three@octets\UTFviii@three@octets@@ +%<2ekernel>\let\UTFviii@four@octets\UTFviii@four@octets@@ +%<2ekernel>} \let\@inpenc@test\@undefined \let\saved@space@catcode\@undefined % \end{macrocode} @@ -717,6 +731,7 @@ % } % \let\UseRawInputEncoding\@undefined % \let\DeclareFontEncoding@saved\@undefined +% \let\inputencodingname\@undefined %\EndIncludeInRelease % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx index 6860fd1e3b5..5784715048e 100644 --- a/Master/texmf-dist/source/latex/base/ltvers.dtx +++ b/Master/texmf-dist/source/latex/base/ltvers.dtx @@ -115,7 +115,7 @@ {2018-04-01} % %<*2ekernel> -\def\patch@level{0} +\def\patch@level{2} % \end{macrocode} % \end{macro} % \end{macro} -- cgit v1.2.3