diff options
author | Karl Berry <karl@freefriends.org> | 2019-11-06 22:12:38 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-11-06 22:12:38 +0000 |
commit | 7c55167ecf36309f45793303eea23651cb983f12 (patch) | |
tree | 11c014344f975231c0cb0ed300b892849a481db8 /Master/texmf-dist/source/latex/base | |
parent | 7b810bfb3e61d6cd1564c490490d6d005dd64813 (diff) |
l2e (6nov19)
git-svn-id: svn://tug.org/texlive/trunk@52656 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/base')
-rw-r--r-- | Master/texmf-dist/source/latex/base/classes.dtx | 10 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/base/doc.dtx | 24 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/base/ltdirchk.dtx | 45 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/base/ltfiles.dtx | 23 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/base/ltluatex.dtx | 25 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/base/ltmiscen.dtx | 42 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/base/ltvers.dtx | 2 |
7 files changed, 116 insertions, 55 deletions
diff --git a/Master/texmf-dist/source/latex/base/classes.dtx b/Master/texmf-dist/source/latex/base/classes.dtx index 9fed94dfdd9..1de8095a6e1 100644 --- a/Master/texmf-dist/source/latex/base/classes.dtx +++ b/Master/texmf-dist/source/latex/base/classes.dtx @@ -53,7 +53,7 @@ %<*driver> \ProvidesFile{classes.drv} %</driver> - [2019/08/27 v1.4j + [2019/10/25 v1.4k %<article|report|book> Standard LaTeX document class] %<10pt|11pt|12pt> Standard LaTeX file (size option)] % \end{macrocode} @@ -611,9 +611,13 @@ \normalsize % \end{macrocode} % We use |\MakeRobust| instead of |\DeclareRobustCommand| above to avoid a log -% entry for the redefinition. +% entry for the redefinition. But if we are running in in a rollback situation +% (prior to 2015) we don't touch it. +% \changes{v1.4k}{2019/10/25}{Roll back handling (gh/201)} % \begin{macrocode} -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi % \end{macrocode} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/latex/base/doc.dtx b/Master/texmf-dist/source/latex/base/doc.dtx index 971bb6053eb..70e70a0de24 100644 --- a/Master/texmf-dist/source/latex/base/doc.dtx +++ b/Master/texmf-dist/source/latex/base/doc.dtx @@ -35,7 +35,7 @@ %<+package|shortvrb>\NeedsTeXFormat{LaTeX2e}[1994/12/01] %<+package> \ProvidesPackage{doc} %<+shortvrb>\ProvidesPackage{shortvrb} -%<+package|shortvrb> [2018/09/25 v2.1i +%<+package|shortvrb> [2019/11/03 v2.1j %<+package|shortvrb> Standard LaTeX documentation package (FMi)] %\catcode`\<=12 % @@ -139,7 +139,7 @@ % \changes{v1.9t}{1995/05/11}{Use \cs{GetFileInfo}} % \GetFileInfo{doc.sty} % -% \CheckSum{2206} ^^A % keep the checksum in this file +% \CheckSum{2207} ^^A % keep the checksum in this file % % \title{The \DOC{} and \texttt{shortvrb} Packages\thanks % {This file has version number \fileversion{} dated \filedate{}.}} @@ -2000,6 +2000,11 @@ % |\MacroFont|. % \begin{macrocode} \def\verbatim{\@beginparpenalty \predisplaypenalty \@verbatim +% \end{macrocode} +% +% \changes{v2.1j}{2019/11/03}{Kernel now sets up \cs{verbvisiblespace} (gh/205)} +% \begin{macrocode} + \@setupverbvisiblespace \MacroFont \frenchspacing \@vobeyspaces \@xverbatim} % \end{macrocode} % We deal in a similar way with the star form of this environment. @@ -2121,13 +2126,14 @@ % \changes{v1.8b}{1993/09/21}{Changed to conform to new LaTeX verbatim, % which has better error trapping.} % See \cite{art:verbatim} for commentary. -% \begin{macrocode} -\def\@sverb#1{% - \catcode`#1\active \lccode`\~`#1% - \gdef\verb@balance@group{\verb@egroup - \@latex@error{Illegal use of \noexpand\verb command}\@ehc}% - \aftergroup\verb@balance@group - \lowercase{\let~\verb@egroup}} +% \changes{v2.1j}{2019/11/03}{Use the kernel definition, no change needed (gh/205)} +% \begin{macrocode} +%\def\@sverb#1{% +% \catcode`#1\active \lccode`\~`#1% +% \gdef\verb@balance@group{\verb@egroup +% \@latex@error{Illegal use of \noexpand\verb command}\@ehc}% +% \aftergroup\verb@balance@group +% \lowercase{\let~\verb@egroup}} % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/base/ltdirchk.dtx b/Master/texmf-dist/source/latex/base/ltdirchk.dtx index b9db177f195..744759f3176 100644 --- a/Master/texmf-dist/source/latex/base/ltdirchk.dtx +++ b/Master/texmf-dist/source/latex/base/ltdirchk.dtx @@ -37,7 +37,7 @@ %<*driver> % \fi \ProvidesFile{ltdirchk.dtx} - [2016/10/15 v1.2b LaTeX Kernel (System Dependent Parts)] + [2019/11/01 v1.3a LaTeX Kernel (System Dependent Parts)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltdirchk.dtx} @@ -918,14 +918,43 @@ % % |\filename@simple| is used by all three versions. % Finally we can split off the extension. +% \changes{v1.3a}{2019/11/01} +% {take last . not first} % \begin{macrocode} - \def\filename@simple#1.#2\\{% - \ifx\\#2\\% - \let\filename@ext\relax - \else - \edef\filename@ext{\filename@dot#2\\}% - \fi - \edef\filename@base{#1}} +%</dircheck> +%<*dircheck,latexrelease> +%<latexrelease>\IncludeInRelease{2019/10/01}{\filename@simple} +%<latexrelease> {Final dot for extension}% +\def\filename@simple#1.#2\\{% + \ifx\\#2\\% + \let\filename@ext\relax + \edef\filename@base{#1}% + \else + \filename@dots{#1}#2\\% + \fi} +% \end{macrocode} +% +% \begin{macrocode} +\def\filename@dots#1#2.#3\\{% + \ifx\\#3\\% + \def\filename@ext{#2}% + \edef\filename@base{#1}% + \else + \filename@dots{#1.#2}#3\\% + \fi} +%<latexrelease>\EndIncludeInRelease +%<latexrelease>\IncludeInRelease{0000/00/00}{\filename@simple} +%<latexrelease> {Final dot for extension}% +%<latexrelease> \def\filename@simple#1.#2\\{% +%<latexrelease> \ifx\\#2\\% +%<latexrelease> \let\filename@ext\relax +%<latexrelease> \else +%<latexrelease> \edef\filename@ext{\filename@dot#2\\}% +%<latexrelease> \fi +%<latexrelease> \edef\filename@base{#1}} +%<latexrelease>\EndIncludeInRelease +%</dircheck,latexrelease> +%<*dircheck> % \end{macrocode} % % Remove a final dot, added earlier. diff --git a/Master/texmf-dist/source/latex/base/ltfiles.dtx b/Master/texmf-dist/source/latex/base/ltfiles.dtx index a2037e221f1..d0d33a4c717 100644 --- a/Master/texmf-dist/source/latex/base/ltfiles.dtx +++ b/Master/texmf-dist/source/latex/base/ltfiles.dtx @@ -32,7 +32,7 @@ %<*driver> % \fi \ProvidesFile{ltfiles.dtx} - [2019/10/11 v1.2c LaTeX Kernel (File Handling)] + [2019/10/26 v1.2d LaTeX Kernel (File Handling)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltfiles.dtx} @@ -714,6 +714,7 @@ % % \changes{v1.2a}{2019/07/01}{Support UTF-8} % \changes{v1.2c}{2019/10/11}{Remove one brace group} +% \changes{v1.2d}{2019/10/26}{remove quotes} % \begin{macrocode} %</2ekernel> %<*2ekernel|latexrelease> @@ -722,7 +723,9 @@ \def\set@curr@file#1{% \begingroup \escapechar\m@ne - \xdef\@curr@file{\expandafter\string\csname\@firstofone#1\@empty\endcsname}% + \xdef\@curr@file{% + \expandafter\string + \csname\expandafter\unquote@name\expandafter{\@firstofone#1\@empty}\endcsname}% \endgroup } % \end{macrocode} @@ -758,11 +761,11 @@ % % \changes{v1.2a}{2019/07/01}{Support UTF-8} % \changes{v1.2b}{2019/08/27}{Make command robust} +% \changes{v1.2d}{2019/10/26}{dont quote name} % \begin{macrocode} \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}} % \end{macrocode} % \end{macro} % @@ -770,10 +773,11 @@ % \changes{v0.9b}{1993/12/04}{Macro added} % \changes{v0.9p}{1994/01/18}{New Definition} % \changes{v1.0t}{1995/05/25}{(CAR) added \cs{long}} -% +% \changes{v1.2d}{2019/10/26}{quote on openin}% +% Argument |#1| is |\@curr@file| so catcode 12 string with no quotes. % \begin{macrocode} \long\def \IfFileExists@#1#2#3{% - \openin\@inputcheck#1 % + \openin\@inputcheck"#1" % \ifeof\@inputcheck \ifx\input@path\@undefined \def\reserved@a{#3}% @@ -782,7 +786,7 @@ \fi \else \closein\@inputcheck - \edef\@filef@und{#1 }% + \edef\@filef@und{"#1" }% \def\reserved@a{#2}% \fi \reserved@a} @@ -834,14 +838,15 @@ % {(CAR) added \cs{long}} % \changes{v1.1d}{1996/01/10} % {Change argument handling to not require doubled hash. latex/2024} +% \changes{v1.2d}{2019/10/26}{quote on openin}% % \begin{macrocode} \long\def\@iffileonpath#1{% \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{"\reserved@b#1" }% \let\reserved@a\@firstoftwo% \closein\@inputcheck \@break@tfor diff --git a/Master/texmf-dist/source/latex/base/ltluatex.dtx b/Master/texmf-dist/source/latex/base/ltluatex.dtx index a043b484360..41f2344a373 100644 --- a/Master/texmf-dist/source/latex/base/ltluatex.dtx +++ b/Master/texmf-dist/source/latex/base/ltluatex.dtx @@ -1,17 +1,21 @@ % \iffalse meta-comment % -% Copyright 2015 2017 2018 +% Copyright (C) 2015-2019 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % -% It may be distributed and/or modified under the conditions of -% the LaTeX Project Public License (LPPL), either version 1.3c of -% this license or (at your option) any later version. The latest -% version of this license is in the file: -% -% https://www.latex-project.org/lppl.txt +% This file is part of the LaTeX base system. +% ------------------------------------------- % +% It may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3c +% of this license or (at your option) any later version. +% The latest version of this license is in +% https://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions of LaTeX +% version 2008 or later. % +% This file has the LPPL maintenance status "maintained". % %<2ekernel>%%% From File: ltluatex.dtx %<plain>\ifx\newluafunction\undefined\else\expandafter\endinput\fi @@ -24,7 +28,7 @@ \ProvidesFile{ltluatex.dtx} %</driver> %<*tex> -[2018/10/21 v1.1i +[2019/10/22 v1.1j %</tex> %<plain> LuaTeX support for plain TeX (core) %<*tex> @@ -1361,11 +1365,12 @@ local callbacktypes = callbacktypes or { % Section 8.6: PDF-related callbacks. % \changes{v1.1j}{2019/06/18}{page\_objnum\_provider added} % \changes{v1.1j}{2019/06/18}{process\_pdf\_image\_content added} +% \changes{v1.1j}{2019/10/22}{page\_objnum\_provider and process\_pdf\_image\_content classified data} % \begin{macrocode} finish_pdffile = data, finish_pdfpage = data, - page_objnum_provider = simple, - process_pdf_image_content = simple, + page_objnum_provider = data, + process_pdf_image_content = data, % \end{macrocode} % Section 8.7: font-related callbacks. % \changes{v1.1e}{2017/03/28}{glyph\_stream\_provider added} diff --git a/Master/texmf-dist/source/latex/base/ltmiscen.dtx b/Master/texmf-dist/source/latex/base/ltmiscen.dtx index 8cd61207514..2a88438dee1 100644 --- a/Master/texmf-dist/source/latex/base/ltmiscen.dtx +++ b/Master/texmf-dist/source/latex/base/ltmiscen.dtx @@ -32,7 +32,7 @@ %<*driver> % \fi \ProvidesFile{ltmiscen.dtx} - [2019/08/29 v1.1p LaTeX Kernel (Misc. Environments)] + [2019/10/25 v1.1q LaTeX Kernel (Misc. Environments)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltmiscen.dtx} @@ -370,17 +370,7 @@ % percent. The result is saved in \cs{@temptokena} for later use. % \changes{v1.1n}{2018/09/26}{Sometimes mask the endline char when % writing to files (github/73)} -% \begin{macrocode} -\begingroup -\catcode`\%=12 -% \end{macrocode} -% \texttt{latexrelease} will read this code in high-speed -% mode in certain situations. During that it will only look for -% \cs{if} tests but not actually execute the \cs{catcode} change -% above. As a result it will drop anything after the |%| character -% in the definition. Therefore the |\fi| needs to be on the next -% line and we need locally another comment character to avoid -% getting spaces into the definition---a weird problem :-) +% % \begin{macrocode} \catcode`\^^A=9 \long\gdef\add@percent@to@temptokena @@ -390,13 +380,33 @@ % the beginning, so that in case the tokenlist consists of a single brace % group the braces aren't stripped. The |\expandafter| then expands % this extra token away again. +% \changes{v1.1q}{2019/10/25}{Allow unbalanced conditionals in \texttt{\#1} (gh/202)} % \begin{macrocode} - {\ifx!#2!\@temptokena\expandafter{#1}\else - \@temptokena\expandafter{#1%^^A + {\ifx!#2!\expandafter\dont@add@percent@to@temptokena\else + \expandafter\do@add@percent@to@temptokena\fi{#1}} +% \end{macrocode} +% +% \begin{macrocode} +\long\def\dont@add@percent@to@temptokena#1{% + \@temptokena\expandafter{#1}} +% \end{macrocode} +% \texttt{latexrelease} will read this code in high-speed +% mode in certain situations. During that it will only look for +% \cs{if} tests but not actually execute the \cs{catcode} change +% above. As a result it will drop anything after the |%| character +% in the definition. Therefore the |\fi| needs to be on the next +% line and we need locally another comment character to avoid +% getting spaces into the definition---a weird problem :-) +% +% \begin{macrocode} +\begingroup +\catcode`\%=12 +\long\gdef\do@add@percent@to@temptokena#1{% + \@temptokena\expandafter{#1%^^A % \end{macrocode} % Can't be on the same line as the |%| --- see above. % \begin{macrocode} - }\fi} + }} \endgroup % \end{macrocode} % \end{macro} @@ -432,6 +442,8 @@ %<latexrelease> {\protected@file@percent}{Mask line endings}% %<latexrelease>\let\protected@file@percent\@undefined %<latexrelease>\let\add@percent@to@temptokena\@undefined +%<latexrelease>\let\do@add@percent@to@temptokena\@undefined +%<latexrelease>\let\dont@add@percent@to@temptokena\@undefined %<latexrelease>\long\def\@writefile#1#2{% %<latexrelease> \@ifundefined{tf@#1}\relax %<latexrelease> {\@temptokena{#2}% diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx index d15bd784040..89d72953210 100644 --- a/Master/texmf-dist/source/latex/base/ltvers.dtx +++ b/Master/texmf-dist/source/latex/base/ltvers.dtx @@ -115,7 +115,7 @@ {2019-10-01} %</2ekernel|latexrelease> %<*2ekernel> -\def\patch@level{1} +\def\patch@level{2} % \end{macrocode} % % \begin{macro}{\development@branch@name} |