summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-10-27 20:51:48 +0000
committerKarl Berry <karl@freefriends.org>2020-10-27 20:51:48 +0000
commit1387a1d4afa9aedee6995a13360695336e89f53f (patch)
tree2879ae69e3ff91e0332afae0f40e2216c84cf4a9
parent3aeee77f9fec56d9be08ab6811e33823bbbc2de9 (diff)
firstaid (27oct20)
git-svn-id: svn://tug.org/texlive/trunk@56783 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/firstaid/changes.txt5
-rw-r--r--Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdfbin223600 -> 210720 bytes
-rw-r--r--Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx87
-rw-r--r--Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx76
4 files changed, 9 insertions, 159 deletions
diff --git a/Master/texmf-dist/doc/latex/firstaid/changes.txt b/Master/texmf-dist/doc/latex/firstaid/changes.txt
index 75067562e71..b4fef50cc85 100644
--- a/Master/texmf-dist/doc/latex/firstaid/changes.txt
+++ b/Master/texmf-dist/doc/latex/firstaid/changes.txt
@@ -1,3 +1,8 @@
+2020-10-25 Frank Mittelbach <Frank.Mittelbach@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@latex-project.org>
* latex2e-first-aid-for-external-files.dtx:
diff --git a/Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf b/Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf
index 70301b7646a..d5bcf3836d6 100644
--- a/Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf
+++ b/Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx b/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx
index 55e0d01e263..09c32101be9 100644
--- a/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx
+++ b/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx
@@ -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,89 +351,6 @@
% {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@videpackage[#1]{%
- \expandafter\protected@xdef % <-- protected...
- \csname ver@\@currname.\@currext\endcsname{#1}% Loaded package
- \expandafter\let
- \csname ver@\@currpkg@reqd\expandafter\endcsname % Requested package
- \csname ver@\@currname.\@currext\endcsname
- \ifx\@currext\@clsextension
- \typeout{Document Class: \@gtempa\space#1}%
- \else
- \protected@wlog{Package: \@gtempa\space#1}% <--- protected
- \fi}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\def\load@onefilewithoptions#1[#2][#3]#4{% % <--- \@onefilewithoptions
- % earlier in the kernel
- \@pushfilename
- \xdef\@currname{#1}%
- \global\let\@currext#4%
- \@ifl@aded\@currext\@currname
- {\@if@ptions\@currext{\@currname}{#2}{}%
- {\@latex@error
- {Option clash for \@cls@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@ptions
- \IfFileExists{\@currname.\@currext}{}%
- {\@missing@onefilewithoptions{#2}}%
- \ifx\@currname\@empty
- \expandafter\@gobble
- \else
- \@disable@packageload@do{\@currname.\@currext}%
- {\@expl@@@filehook@file@push@@
- \set@curr@file{\@currname.\@currext}%
- \@filehook@set@CurrentFile
- \expandafter\@swaptwoargs\expandafter
- {\expandafter{\@currpkg@reqd}}%
- {% <
- \edef\@currpkg@reqd{\@currname.\@currext}%
- \ifx\CurrentFile\CurrentFileUsed
- \else
- \filename@parse\@curr@file
- \edef\@currname{\string@makeletter\filename@base}%
- \edef\@currext{\string@makeletter\filename@ext}%
- \fi
- \load@onefile@withoptions{#2}%
- \def\@currpkg@reqd%{\@currpkg@reqd}
- }% >
- \@expl@@@filehook@file@pop@@}%
- \expandafter\@firstofone
- \fi}%
- {\@ifl@ter\@currext{\@currname}{#3}{}%
- {\@latex@warning@no@line
- {You have requested,\on@line,
- version\MessageBreak
- `#3' of \@cls@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@ptions}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\let\@currpkg@reqd\@empty
-% \end{macrocode}
-%
%
% \begin{macrocode}
%</kernel>
diff --git a/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx b/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx
index f4a48bc8fdb..fe06663390f 100644
--- a/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx
+++ b/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx
@@ -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@videpackage[#1]{%
- \expandafter\protected@xdef % <-- protected...
- \csname ver@\@currname.\@currext\endcsname{#1}% Loaded package
- \expandafter\let
- \csname ver@\@currpkg@reqd\expandafter\endcsname % Requested package
- \csname ver@\@currname.\@currext\endcsname
- \ifx\@currext\@clsextension
- \typeout{Document Class: \@gtempa\space#1}%
- \else
- \protected@wlog{Package: \@gtempa\space#1}% <--- protected
- \fi}
-\def\load@onefilewithoptions#1[#2][#3]#4{% % <--- \@onefilewithoptions
- % earlier in the kernel
- \@pushfilename
- \xdef\@currname{#1}%
- \global\let\@currext#4%
- \@ifl@aded\@currext\@currname
- {\@if@ptions\@currext{\@currname}{#2}{}%
- {\@latex@error
- {Option clash for \@cls@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@ptions
- \IfFileExists{\@currname.\@currext}{}%
- {\@missing@onefilewithoptions{#2}}%
- \ifx\@currname\@empty
- \expandafter\@gobble
- \else
- \@disable@packageload@do{\@currname.\@currext}%
- {\@expl@@@filehook@file@push@@
- \set@curr@file{\@currname.\@currext}%
- \@filehook@set@CurrentFile
- \expandafter\@swaptwoargs\expandafter
- {\expandafter{\@currpkg@reqd}}%
- {% <
- \edef\@currpkg@reqd{\@currname.\@currext}%
- \ifx\CurrentFile\CurrentFileUsed
- \else
- \filename@parse\@curr@file
- \edef\@currname{\string@makeletter\filename@base}%
- \edef\@currext{\string@makeletter\filename@ext}%
- \fi
- \load@onefile@withoptions{#2}%
- \def\@currpkg@reqd%{\@currpkg@reqd}
- }% >
- \@expl@@@filehook@file@pop@@}%
- \expandafter\@firstofone
- \fi}%
- {\@ifl@ter\@currext{\@currname}{#3}{}%
- {\@latex@warning@no@line
- {You have requested,\on@line,
- version\MessageBreak
- `#3' of \@cls@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@ptions}
-\let\@currpkg@reqd\@empty
\endinput
%%
%% End of file `latex2e-first-aid-for-external-files.ltx'.