summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/base
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-04-08 20:05:14 +0000
committerKarl Berry <karl@freefriends.org>2018-04-08 20:05:14 +0000
commit9eb25126001ce227868e2031aa8508dc007d01d2 (patch)
tree5ba777fe83091d4b3911c19e06c406107aba50cd /Master/texmf-dist/tex/latex/base
parent334e6afcc530e6f2463ca4cf8e9a5f6d5e0cfe1f (diff)
latex2e (8apr18)
git-svn-id: svn://tug.org/texlive/trunk@47377 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/base')
-rw-r--r--Master/texmf-dist/tex/latex/base/latex.ltx27
-rw-r--r--Master/texmf-dist/tex/latex/base/latexrelease.sty19
2 files changed, 39 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx
index 95d8c046bcf..35c895b0686 100644
--- a/Master/texmf-dist/tex/latex/base/latex.ltx
+++ b/Master/texmf-dist/tex/latex/base/latex.ltx
@@ -701,7 +701,7 @@
\def\fmtname{LaTeX2e}
\edef\fmtversion
{2018-04-01}
-\def\patch@level{0}
+\def\patch@level{2}
\iffalse
\def\reserved@a#1/#2/#3\@nil{%
\count@\year
@@ -7661,12 +7661,13 @@ Type H <return> for immediate help.}%
\csname ver@#2.#1\endcsname}
\@onlypreamble\@ifl@ter
\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}
\@onlypreamble\@ifl@t@r
\def\@parse@version#1/#2/#3#4#5\@nil{%
\@parse@version@dash#1-#2-#3#4\@nil
@@ -8159,7 +8160,13 @@ Type H <return> for immediate help.}%
\def\pkgcls@arg {#3}% % for info message
\pkgcls@parse@date@arg{#3}%
\let\pkgcls@candidate\@empty
- \load@onefilewithoptions#1[#2][\pkgcls@mindate]#4%
+ \begingroup
+ \edef\reserved@a{%
+ \endgroup
+ \unexpanded{\load@onefilewithoptions#1[#2]}%
+ [\pkgcls@mindate]%
+ \unexpanded{#4}}%
+ \reserved@a
}
\fi
\def\pkgcls@parse@date@arg #1{%
@@ -8648,6 +8655,7 @@ Type H <return> for immediate help.}%
\ifnum\@tempcnta<256
\repeat
\def\UseRawInputEncoding{%
+\let\inputencodingname\@undefined % revert
\let\DeclareFontEncoding@\DeclareFontEncoding@saved % revert
\let\DeclareUnicodeCharacter\@undefined % revert
\@tempcnta=1
@@ -8671,6 +8679,17 @@ Type H <return> for immediate help.}%
\let\DeclareFontEncoding@saved\DeclareFontEncoding@
\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
+\long\def\UTFviii@two@octets#1#2{\string#1\string#2}
+\long\def\UTFviii@three@octets#1#2#3{\string#1\string#2\string#3}
+\long\def\UTFviii@four@octets#1#2#3#4{\string#1\string#2\string#3\string#4}
+\everyjob\expandafter{\the\everyjob
+\let\UTFviii@two@octets\UTFviii@two@octets@@
+\let\UTFviii@three@octets\UTFviii@three@octets@@
+\let\UTFviii@four@octets\UTFviii@four@octets@@
+}
\let\@inpenc@test\@undefined
\let\saved@space@catcode\@undefined
\else
diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty
index 25de5431147..acfc988e290 100644
--- a/Master/texmf-dist/tex/latex/base/latexrelease.sty
+++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty
@@ -108,7 +108,13 @@
\def\pkgcls@arg {#3}% % for info message
\pkgcls@parse@date@arg{#3}%
\let\pkgcls@candidate\@empty
- \load@onefilewithoptions#1[#2][\pkgcls@mindate]#4%
+ \begingroup
+ \edef\reserved@a{%
+ \endgroup
+ \unexpanded{\load@onefilewithoptions#1[#2]}%
+ [\pkgcls@mindate]%
+ \unexpanded{#4}}%
+ \reserved@a
}
\fi
\def\pkgcls@parse@date@arg #1{%
@@ -2104,12 +2110,13 @@ of this package available from CTAN}
\IncludeInRelease{2018/04/01}%
{\@ifl@t@r}{Guard against bad input}%
\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}%
{\@ifl@t@r}{Guard against bad input}%
@@ -2120,6 +2127,7 @@ of this package available from CTAN}
\else
\expandafter\@firstoftwo
\fi}
+\let\@parse@version@\@undefined
\EndIncludeInRelease
\IncludeInRelease{2017/01/01}%
{\@if@pti@ns}{Spaces in option clash check}%
@@ -3550,6 +3558,7 @@ of this package available from CTAN}
\ifnum\@tempcnta<256
\repeat
\def\UseRawInputEncoding{%
+\let\inputencodingname\@undefined % revert
\let\DeclareFontEncoding@\DeclareFontEncoding@saved % revert
\let\DeclareUnicodeCharacter\@undefined % revert
\@tempcnta=1
@@ -3573,6 +3582,9 @@ of this package available from CTAN}
\let\DeclareFontEncoding@saved\DeclareFontEncoding@
\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
\let\@inpenc@test\@undefined
\let\saved@space@catcode\@undefined
\else
@@ -3626,6 +3638,7 @@ of this package available from CTAN}
}
\let\UseRawInputEncoding\@undefined
\let\DeclareFontEncoding@saved\@undefined
+ \let\inputencodingname\@undefined
\EndIncludeInRelease
\endinput
%%