From 137220c3442927290385d230913b8cb7d6eff71b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 28 May 2018 22:28:24 +0000 Subject: latex(2e) (28may18) git-svn-id: svn://tug.org/texlive/trunk@47860 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/base/latex.ltx | 25 +++++++++++++---------- Master/texmf-dist/tex/latex/base/latexrelease.sty | 23 +++++++++++---------- 2 files changed, 26 insertions(+), 22 deletions(-) (limited to 'Master/texmf-dist/tex/latex/base') diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx index df97702703f..b3ae3eab45d 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{4} +\def\patch@level{5} \iffalse \def\reserved@a#1/#2/#3\@nil{% \count@\year @@ -8198,14 +8198,11 @@ Type H for immediate help.}% \def\pkgcls@mindate{#1}% \ifnum \pkgcls@targetdate > \z@ \ifnum \@parse@version0#1//00\@nil > \pkgcls@targetdate - \@latex@error{Suspicious rollback/min-date date given}% - {There is a minimal date of #1 specified for - \@cls@pkg\space'\pkgcls@name'.\MessageBreak + \@latex@warning@no@line{Suspicious rollback/min-date date given\MessageBreak + A minimal date of #1 has been specified for + \@cls@pkg\MessageBreak '\pkgcls@name'.\MessageBreak But this is in conflict - with a rollback request to \requestedpatchdate, - so something\MessageBreak - is wrong here. Continue and I - ignore the minimal date request.}% + with a rollback request to \requestedpatchdate} \fi \fi \fi @@ -8680,13 +8677,19 @@ Type H for immediate help.}% \let\DeclareFontEncoding@saved\DeclareFontEncoding@ \edef\inputencodingname{utf8}% \input{utf8.def} +\let\UTFviii@undefined@err@@\UTFviii@undefined@err +\let\UTFviii@invalid@err@@\UTFviii@invalid@err \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} +\def\UTFviii@undefined@err#1{\@gobble#1}% +\let\UTFviii@invalid@err\string +\let\UTFviii@two@octets\string +\let\UTFviii@three@octets\string +\let\UTFviii@four@octets\string \everyjob\expandafter{\the\everyjob +\let\UTFviii@undefined@err\UTFviii@undefined@err@@ +\let\UTFviii@invalid@err\UTFviii@invalid@err@@ \let\UTFviii@two@octets\UTFviii@two@octets@@ \let\UTFviii@three@octets\UTFviii@three@octets@@ \let\UTFviii@four@octets\UTFviii@four@octets@@ diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty index 27e82353a26..29cb5c7df6c 100644 --- a/Master/texmf-dist/tex/latex/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty @@ -145,14 +145,11 @@ \def\pkgcls@mindate{#1}% \ifnum \pkgcls@targetdate > \z@ \ifnum \@parse@version0#1//00\@nil > \pkgcls@targetdate - \@latex@error{Suspicious rollback/min-date date given}% - {There is a minimal date of #1 specified for - \@cls@pkg\space'\pkgcls@name'.\MessageBreak + \@latex@warning@no@line{Suspicious rollback/min-date date given\MessageBreak + A minimal date of #1 has been specified for + \@cls@pkg\MessageBreak '\pkgcls@name'.\MessageBreak But this is in conflict - with a rollback request to \requestedpatchdate, - so something\MessageBreak - is wrong here. Continue and I - ignore the minimal date request.}% + with a rollback request to \requestedpatchdate} \fi \fi \fi @@ -331,17 +328,19 @@ \PackageError{latexrelease}{skipped IncludeInRelease}{}% \fi} \ProvidesPackage{latexrelease} - [2018/02/18 v1.0j LaTeX release emulation and tests + [2018/05/08 v1.0k LaTeX release emulation and tests (including releases up to \latexreleaseversion)] \NeedsTeXFormat{LaTeX2e}[1996/06/01] \DeclareOption*{% \def\@IncludeInRelease#1[#2]{\@IncludeInRele@se{#1}}% \let\requestedpatchdate\CurrentOption} \DeclareOption{latest}{% - \let\requestedpatchdate\latexreleaseversion} + \let\requestedpatchdate\latexreleaseversion + \AtEndOfPackage{\def\requestedLaTeXdate{0}}} \DeclareOption{current}{% - \let\requestedpatchdate\fmtversion} -\ExecuteOptions{current} + \let\requestedpatchdate\fmtversion + \AtEndOfPackage{\def\requestedLaTeXdate{0}}} +\let\requestedpatchdate\fmtversion \ProcessOptions\relax \def\reserved@a{% \edef\requestedLaTeXdate{\the\count@}% @@ -3583,6 +3582,8 @@ of this package available from CTAN} \let\DeclareFontEncoding@saved\DeclareFontEncoding@ \edef\inputencodingname{utf8}% \input{utf8.def} +\let\UTFviii@undefined@err@@\UTFviii@undefined@err +\let\UTFviii@invalid@err@@\UTFviii@invalid@err \let\UTFviii@two@octets@@\UTFviii@two@octets \let\UTFviii@three@octets@@\UTFviii@three@octets \let\UTFviii@four@octets@@\UTFviii@four@octets -- cgit v1.2.3