[latex3-commits] [git/LaTeX3-latex3-latex2e] hotfix/gh400: now fix #400 for PL1 andnot in firstaid (5dfbdf2c)

Frank Mittelbach frank.mittelbach at latex-project.org
Sun Oct 4 22:14:28 CEST 2020


Repository : https://github.com/latex3/latex2e
On branch  : hotfix/gh400
Link       : https://github.com/latex3/latex2e/commit/5dfbdf2c76c7d19026eb4b1a3f9d28b1063964b5

>---------------------------------------------------------------

commit 5dfbdf2c76c7d19026eb4b1a3f9d28b1063964b5
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Sun Oct 4 22:14:28 2020 +0200

    now fix #400 for PL1 andnot in firstaid


>---------------------------------------------------------------

5dfbdf2c76c7d19026eb4b1a3f9d28b1063964b5
 base/changes.txt                                   | 12 +++++
 base/ltfiles.dtx                                   |  6 ++-
 base/ltxdoc.dtx                                    |  9 +++-
 required/firstaid/changes.txt                      |  5 ++
 .../latex2e-first-aid-for-external-files.dtx       | 54 +---------------------
 5 files changed, 30 insertions(+), 56 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index 00407db4..80db847f 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -6,6 +6,18 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 ================================================================================
 
+2020-10-04  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* ltxdoc.dtx (section{DocInclude}):
+	Quotes around the aux file name removed,
+        they are not needed and upset BibTeX (gh/400)
+
+2020-10-04  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* ltfiles.dtx (section{File Handling}):
+	Quotes around the aux file name removed,
+        they are not needed and upset BibTeX (gh/400)
+
 2020-10-01  Joseph Wright  <Joseph.Wright at latex-project.org>
 
 	* ltclass.dtx:
diff --git a/base/ltfiles.dtx b/base/ltfiles.dtx
index 835f600e..99be77c8 100644
--- a/base/ltfiles.dtx
+++ b/base/ltfiles.dtx
@@ -32,7 +32,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltfiles.dtx}
-             [2020/08/21 v1.2i LaTeX Kernel (File Handling)]
+             [2020/10/04 v1.2j LaTeX Kernel (File Handling)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltfiles.dtx}
@@ -824,11 +824,13 @@
 %<latexrelease>                 {\@include}{Spaces in file names and hooks}%
 %    \end{macrocode}
 %    
+% \changes{v1.2j}{2020/10/04}{Quotes around the aux file name removed,
+%                       they are not needed and upset BibTeX (gh/400)}
 %    \begin{macrocode}
 \def\@include#1 {%
   \clearpage
   \if at filesw
-    \immediate\write\@mainaux{\string\@input{"#1.aux"}}%
+    \immediate\write\@mainaux{\string\@input{#1.aux}}%
   \fi
   \@tempswatrue
   \if at partsw
diff --git a/base/ltxdoc.dtx b/base/ltxdoc.dtx
index 696af32a..0c7130c3 100644
--- a/base/ltxdoc.dtx
+++ b/base/ltxdoc.dtx
@@ -30,7 +30,7 @@
 %
 %<class>\NeedsTeXFormat{LaTeX2e}
 %<class>\ProvidesClass{ltxdoc}
-%<class>         [2020/08/21 v2.1a Standard LaTeX documentation class]
+%<class>         [2020/10/04 v2.1b Standard LaTeX documentation class]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -443,7 +443,12 @@
     \expandafter\@docinclude\expandafter{\@curr at file}
  \fi}
 \def\@docinclude#1 {\clearpage
-\if at filesw \immediate\write\@mainaux{\string\@input{"#1.aux"}}\fi
+%    \end{macrocode}
+%    
+% \changes{v2.1bj}{2020/10/04}{Quotes around the aux file name removed,
+%                       they are no longer needed and upset BibTeX (gh/400)}
+%    \begin{macrocode}
+\if at filesw \immediate\write\@mainaux{\string\@input{#1.aux}}\fi
 \@tempswatrue\if at partsw \@tempswafalse\edef\@tempb{#1}\@for
 \@tempa:=\@partlist\do{\ifx\@tempa\@tempb\@tempswatrue\fi}\fi
 \if at tempswa \let\@auxout\@partaux \if at filesw
diff --git a/required/firstaid/changes.txt b/required/firstaid/changes.txt
index 1b3472c8..ef734a33 100644
--- a/required/firstaid/changes.txt
+++ b/required/firstaid/changes.txt
@@ -1,3 +1,8 @@
+2020-10-04  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* latex2e-first-aid-for-external-files.dtx:
+	Fix for gh400 taken out and moved into the kernel instead for PL1.
+
 2020-10-03  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 
 	* latex2e-first-aid-for-external-files.dtx:
diff --git a/required/firstaid/latex2e-first-aid-for-external-files.dtx b/required/firstaid/latex2e-first-aid-for-external-files.dtx
index 03f96290..78f52ca7 100644
--- a/required/firstaid/latex2e-first-aid-for-external-files.dtx
+++ b/required/firstaid/latex2e-first-aid-for-external-files.dtx
@@ -99,8 +99,8 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\def\LaTeXFirstAidDate{2020/10/03}
-\def\LaTeXFirstAidVersion{v1.0d}
+\def\LaTeXFirstAidDate{2020/10/04}
+\def\LaTeXFirstAidVersion{v1.0e}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -342,56 +342,6 @@
 %
 %
 %
-% \subsection{Fixing a problem with \BibTeX{}}
-%
-%    This will become a patch release for the kernel but for the moment
-%    we put it here in case some other issues show up. \BibTeX{}
-%    expects \texttt{.aux} files to contain lines
-%    \verb=\@input{filename.aux}= but the new new \LaTeX{}
-%    unnecessarily writes \verb=\@input{"filename.aux"}= and this
-%    upsets \BibTeX{} greatly. As it isn't necessary we take it out.
-%
-%    \begin{macrocode}
-\def\@include#1 {%
-  \clearpage
-  \if at filesw
-    \immediate\write\@mainaux{\string\@input{#1.aux}}%
-  \fi
-  \@tempswatrue
-  \if at partsw
-    \@tempswafalse
-    \edef\reserved at b{#1}%
-    \@for\reserved at a:=\@partlist\do
-      {\ifx\reserved at a\reserved at b\@tempswatrue\fi}%
-  \fi
-  \if at tempswa
-    \let\@auxout\@partaux
-    \if at filesw
-      \immediate\openout\@partaux "#1.aux"
-      \immediate\write\@partaux{\relax}%
-    \fi
-    \@filehook at set@CurrentFile
-    \UseHook{include/before}%
-    \UseHook{include/before/#1}%
-    \@input@{#1.tex}%
-    \UseHook{include/end/#1}%
-    \UseHook{include/end}%
-    \clearpage
-    \UseHook{include/after/#1}%
-    \UseHook{include/after}%
-    \clearpage
-    \@writeckpt{#1}%
-    \if at filesw
-      \immediate\closeout\@partaux
-    \fi
-  \else
-    \deadcycles\z@
-    \@nameuse{cp@#1}%
-  \fi
-  \let\@auxout\@mainaux}
-%    \end{macrocode}
-%
-%
 %
 %    \begin{macrocode}
 %</kernel>





More information about the latex3-commits mailing list.