From eca3f5fdf6c224e5d2294694df10e49b281dd9c4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 29 Apr 2018 23:33:08 +0000 Subject: latex2e (24apr18) git-svn-id: svn://tug.org/texlive/trunk@47500 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/base/docstrip.dtx | 20 ++++++++++++++++---- Master/texmf-dist/source/latex/base/inputenc.dtx | 2 +- Master/texmf-dist/source/latex/base/ltclass.dtx | 8 +++++--- Master/texmf-dist/source/latex/base/ltcounts.dtx | 4 +++- Master/texmf-dist/source/latex/base/ltvers.dtx | 2 +- 5 files changed, 26 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/source/latex/base') diff --git a/Master/texmf-dist/source/latex/base/docstrip.dtx b/Master/texmf-dist/source/latex/base/docstrip.dtx index cedf3c4a381..29afc6f6267 100644 --- a/Master/texmf-dist/source/latex/base/docstrip.dtx +++ b/Master/texmf-dist/source/latex/base/docstrip.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1993-2017 +% Copyright 1993-2018 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % @@ -29,9 +29,9 @@ \catcode`\{=1 \catcode`\}=2 \def\filename{docstrip.dtx} -\def\fileversion{2.5e} -\def\filedate{2014/09/29} -\def\docdate {2017/03/13} +\def\fileversion{2.5f} +\def\filedate{2018/04/10} +\def\docdate {2018/04/10} %% % %\iffalse @@ -3034,6 +3034,18 @@ Z \makeOther\~\makeOther\{\makeOther\}\makeOther\&% \endlinechar-1\relax % \end{macrocode} +% To avoid any UTF-8 handling of characters we set code points +% 128--255 to other. +% \changes{2.5f}{2018/04/10}{Read 8bit raw to leave high bits in the +% code to unchanged without utf8 handling (issue 34)} +% \begin{macrocode} + \@tempcnta=128\relax + \loop + \catcode\@tempcnta 12\relax + \ifnum\@tempcnta <255\relax + \advance\@tempcnta\@ne + \repeat +% \end{macrocode} % Then we start a loop to process the lines in the file one by one. % \begin{macrocode} \loop diff --git a/Master/texmf-dist/source/latex/base/inputenc.dtx b/Master/texmf-dist/source/latex/base/inputenc.dtx index c88d488b482..32a20cc600b 100644 --- a/Master/texmf-dist/source/latex/base/inputenc.dtx +++ b/Master/texmf-dist/source/latex/base/inputenc.dtx @@ -647,7 +647,7 @@ \else % \end{macrocode} % Unicode based TeX engines do not require this package at all, and always use UTF-8 -% input. Allow the package to be used if |[uf8]| or |[ascii]| options are used to simplify +% input. Allow the package to be used if |[utf8]| or |[ascii]| options are used to simplify % switching between TeX engines. % \begin{macrocode} \def\inputencoding#1{% diff --git a/Master/texmf-dist/source/latex/base/ltclass.dtx b/Master/texmf-dist/source/latex/base/ltclass.dtx index 4c383a6e6df..63c66a16b32 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/04/08 v1.2h LaTeX Kernel (Class & Package Interface)] + [2018/04/10 v1.2h LaTeX Kernel (Class & Package Interface)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltclass.dtx} @@ -1951,7 +1951,6 @@ % % \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. @@ -2000,7 +1999,10 @@ % \end{macrocode} % If we had a rollback request then |#3| may contain data but not % necessarily a ``minimal date'' so instead of passing it on we -% pass on |\pkgcls@mindate|. +% pass on the content of |\pkgcls@mindate|. We need to pass the +% value not the command, otherwise nested packages may pick up the +% wrong information. +% \changes{v1.2h}{2018-04-08}{Pass expanded date} % \begin{macrocode} \begingroup \edef\reserved@a{% diff --git a/Master/texmf-dist/source/latex/base/ltcounts.dtx b/Master/texmf-dist/source/latex/base/ltcounts.dtx index 02f411c2af5..8158ef7c611 100644 --- a/Master/texmf-dist/source/latex/base/ltcounts.dtx +++ b/Master/texmf-dist/source/latex/base/ltcounts.dtx @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{ltcounts.dtx} - [2018/03/08 v1.1k LaTeX Kernel (Counters)] + [2018/04/22 v1.1l LaTeX Kernel (Counters)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltcounts.dtx} @@ -410,6 +410,7 @@ \@ifbothcounters{#1}{#2}{\@addtoreset{#1}{#2}}} % \end{macrocode} % +% \changes{v1.1l}{2018/04/11}{Correct default (issue/38)} % \begin{macrocode} \def\counterwithin@x#1#2{% \@ifbothcounters{#1}{#2}% @@ -417,6 +418,7 @@ \expandafter \gdef\csname the#1\expandafter\endcsname\expandafter {\csname the#2\expandafter\endcsname\expandafter + .\expandafter \@arabic\csname c@#1\endcsname}}} % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx index 5784715048e..bc8c1866451 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{2} +\def\patch@level{3} % \end{macrocode} % \end{macro} % \end{macro} -- cgit v1.2.3