texlive[56783] Master/texmf-dist: firstaid (27oct20)
commits+karl at tug.org
commits+karl at tug.org
Tue Oct 27 21:51:48 CET 2020
Revision: 56783
http://tug.org/svn/texlive?view=revision&revision=56783
Author: karl
Date: 2020-10-27 21:51:48 +0100 (Tue, 27 Oct 2020)
Log Message:
-----------
firstaid (27oct20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/firstaid/changes.txt
trunk/Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf
trunk/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx
trunk/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx
Modified: trunk/Master/texmf-dist/doc/latex/firstaid/changes.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/firstaid/changes.txt 2020-10-27 20:51:30 UTC (rev 56782)
+++ trunk/Master/texmf-dist/doc/latex/firstaid/changes.txt 2020-10-27 20:51:48 UTC (rev 56783)
@@ -1,3 +1,8 @@
+2020-10-25 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * latex2e-first-aid-for-external-files.dtx
+ Fix for gh408 taken out as now in the kernel.
+
2020-10-13 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* latex2e-first-aid-for-external-files.dtx:
Modified: trunk/Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx 2020-10-27 20:51:30 UTC (rev 56782)
+++ trunk/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx 2020-10-27 20:51:48 UTC (rev 56783)
@@ -110,8 +110,8 @@
% \end{macrocode}
%
% \begin{macrocode}
-\def\LaTeXFirstAidDate{2020/10/13}
-\def\LaTeXFirstAidVersion{v1.0f}
+\def\LaTeXFirstAidDate{2020/10/25}
+\def\LaTeXFirstAidVersion{v1.0g}
% \end{macrocode}
%
% \begin{macrocode}
@@ -351,91 +351,8 @@
% {Temporary fixes for the kernel \\
% (until the next patch-level release)}
%
-% This is fixing GitHub issue 408. Looks rather long but changes
-% only 3 or 4 lines in the macros.
-% \begin{macrocode}
-\def\@pr at videpackage[#1]{%
- \expandafter\protected at xdef % <-- protected...
- \csname ver@\@currname.\@currext\endcsname{#1}% Loaded package
- \expandafter\let
- \csname ver@\@currpkg at reqd\expandafter\endcsname % Requested package
- \csname ver@\@currname.\@currext\endcsname
- \ifx\@currext\@clsextension
- \typeout{Document Class: \@gtempa\space#1}%
- \else
- \protected at wlog{Package: \@gtempa\space#1}% <--- protected
- \fi}
-% \end{macrocode}
%
% \begin{macrocode}
-\def\load at onefilewithoptions#1[#2][#3]#4{% % <--- \@onefilewithoptions
- % earlier in the kernel
- \@pushfilename
- \xdef\@currname{#1}%
- \global\let\@currext#4%
- \@ifl at aded\@currext\@currname
- {\@if at ptions\@currext{\@currname}{#2}{}%
- {\@latex at error
- {Option clash for \@cls at pkg\space \@currname}%
- {The package \@currname\space has already been loaded
- with options:\MessageBreak
- \space\space[\@ptionlist{\@currname.\@currext}]\MessageBreak
- There has now been an attempt to load it
- with options\MessageBreak
- \space\space[#2]\MessageBreak
- Adding the global options:\MessageBreak
- \space\space
- \@ptionlist{\@currname.\@currext},#2\MessageBreak
- to your \noexpand\documentclass declaration may fix this.%
- \MessageBreak
- Try typing \space <return> \space to proceed.}}%
- \@firstofone}%
- {\makeatletter
- \@reset at ptions
- \IfFileExists{\@currname.\@currext}{}%
- {\@missing at onefilewithoptions{#2}}%
- \ifx\@currname\@empty
- \expandafter\@gobble
- \else
- \@disable at packageload@do{\@currname.\@currext}%
- {\@expl@@@filehook at file@push@@
- \set at curr@file{\@currname.\@currext}%
- \@filehook at set@CurrentFile
- \expandafter\@swaptwoargs\expandafter
- {\expandafter{\@currpkg at reqd}}%
- {% <
- \edef\@currpkg at reqd{\@currname.\@currext}%
- \ifx\CurrentFile\CurrentFileUsed
- \else
- \filename at parse\@curr at file
- \edef\@currname{\string at makeletter\filename at base}%
- \edef\@currext{\string at makeletter\filename at ext}%
- \fi
- \load at onefile@withoptions{#2}%
- \def\@currpkg at reqd%{\@currpkg at reqd}
- }% >
- \@expl@@@filehook at file@pop@@}%
- \expandafter\@firstofone
- \fi}%
- {\@ifl at ter\@currext{\@currname}{#3}{}%
- {\@latex at warning@no at line
- {You have requested,\on at line,
- version\MessageBreak
- `#3' of \@cls at pkg\space \@currname,\MessageBreak
- but only version\MessageBreak
- `\csname ver@\@currname.\@currext\endcsname'\MessageBreak
- is available}}%
- \ifx\@currext\@clsextension\let\LoadClass\@twoloadclasserror\fi}%
- \@popfilename
- \@reset at ptions}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\let\@currpkg at reqd\@empty
-% \end{macrocode}
-%
-%
-% \begin{macrocode}
%</kernel>
% \end{macrocode}
%
Modified: trunk/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx
===================================================================
--- trunk/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx 2020-10-27 20:51:30 UTC (rev 56782)
+++ trunk/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx 2020-10-27 20:51:48 UTC (rev 56783)
@@ -33,8 +33,8 @@
%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020
%% The LaTeX Project and any individual authors listed elsewhere
%% in this file.
-\def\LaTeXFirstAidDate{2020/10/13}
-\def\LaTeXFirstAidVersion{v1.0f}
+\def\LaTeXFirstAidDate{2020/10/25}
+\def\LaTeXFirstAidVersion{v1.0g}
\ProvidesFile{latex2e-first-aid-for-external-files.ltx}
[\LaTeXFirstAidDate\space \LaTeXFirstAidVersion\space
LaTeX kernel fixes to external files and packages]
@@ -63,78 +63,6 @@
\FirstAidNeededT{dinbrief}{cls}{2000/03/02 LaTeX2e class}%
{\AddToHook{env/document/begin}{\begingroup}}%
}
-\def\@pr at videpackage[#1]{%
- \expandafter\protected at xdef % <-- protected...
- \csname ver@\@currname.\@currext\endcsname{#1}% Loaded package
- \expandafter\let
- \csname ver@\@currpkg at reqd\expandafter\endcsname % Requested package
- \csname ver@\@currname.\@currext\endcsname
- \ifx\@currext\@clsextension
- \typeout{Document Class: \@gtempa\space#1}%
- \else
- \protected at wlog{Package: \@gtempa\space#1}% <--- protected
- \fi}
-\def\load at onefilewithoptions#1[#2][#3]#4{% % <--- \@onefilewithoptions
- % earlier in the kernel
- \@pushfilename
- \xdef\@currname{#1}%
- \global\let\@currext#4%
- \@ifl at aded\@currext\@currname
- {\@if at ptions\@currext{\@currname}{#2}{}%
- {\@latex at error
- {Option clash for \@cls at pkg\space \@currname}%
- {The package \@currname\space has already been loaded
- with options:\MessageBreak
- \space\space[\@ptionlist{\@currname.\@currext}]\MessageBreak
- There has now been an attempt to load it
- with options\MessageBreak
- \space\space[#2]\MessageBreak
- Adding the global options:\MessageBreak
- \space\space
- \@ptionlist{\@currname.\@currext},#2\MessageBreak
- to your \noexpand\documentclass declaration may fix this.%
- \MessageBreak
- Try typing \space <return> \space to proceed.}}%
- \@firstofone}%
- {\makeatletter
- \@reset at ptions
- \IfFileExists{\@currname.\@currext}{}%
- {\@missing at onefilewithoptions{#2}}%
- \ifx\@currname\@empty
- \expandafter\@gobble
- \else
- \@disable at packageload@do{\@currname.\@currext}%
- {\@expl@@@filehook at file@push@@
- \set at curr@file{\@currname.\@currext}%
- \@filehook at set@CurrentFile
- \expandafter\@swaptwoargs\expandafter
- {\expandafter{\@currpkg at reqd}}%
- {% <
- \edef\@currpkg at reqd{\@currname.\@currext}%
- \ifx\CurrentFile\CurrentFileUsed
- \else
- \filename at parse\@curr at file
- \edef\@currname{\string at makeletter\filename at base}%
- \edef\@currext{\string at makeletter\filename at ext}%
- \fi
- \load at onefile@withoptions{#2}%
- \def\@currpkg at reqd%{\@currpkg at reqd}
- }% >
- \@expl@@@filehook at file@pop@@}%
- \expandafter\@firstofone
- \fi}%
- {\@ifl at ter\@currext{\@currname}{#3}{}%
- {\@latex at warning@no at line
- {You have requested,\on at line,
- version\MessageBreak
- `#3' of \@cls at pkg\space \@currname,\MessageBreak
- but only version\MessageBreak
- `\csname ver@\@currname.\@currext\endcsname'\MessageBreak
- is available}}%
- \ifx\@currext\@clsextension\let\LoadClass\@twoloadclasserror\fi}%
- \@popfilename
- \@reset at ptions}
-\let\@currpkg at reqd\@empty
\endinput
%%
%% End of file `latex2e-first-aid-for-external-files.ltx'.
More information about the tex-live-commits
mailing list.