[latex3-commits] [git/LaTeX3-latex3-latex2e] adapt-new-or: correct typos and file names from review (e73d3e37)

Ulrike Fischer fischer at troubleshooting-tex.de
Fri Nov 4 18:27:15 CET 2022


Repository : https://github.com/latex3/latex2e
On branch  : adapt-new-or
Link       : https://github.com/latex3/latex2e/commit/e73d3e37a5c6469f0f610e327d73fa7c1e899d47

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

commit e73d3e37a5c6469f0f610e327d73fa7c1e899d47
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Fri Nov 4 18:27:15 2022 +0100

    correct typos and file names from review


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

e73d3e37a5c6469f0f610e327d73fa7c1e899d47
 required/latex-lab/changes.txt                  |  2 +-
 required/latex-lab/documentmetadata-support.dtx |  8 +++----
 required/latex-lab/latex-lab-new-or-1.dtx       | 29 ++++++++++---------------
 required/latex-lab/latex-lab-new-or-2.dtx       |  4 ++--
 required/latex-lab/latex-lab-testphase.dtx      | 10 ++++-----
 5 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/required/latex-lab/changes.txt b/required/latex-lab/changes.txt
index 8d21ac17..74312e03 100644
--- a/required/latex-lab/changes.txt
+++ b/required/latex-lab/changes.txt
@@ -2,7 +2,7 @@
 
 	* documentmeta-support.dtx:
 	updated documentation
-    * moved output patches from pdfresources to in a new latex-lab-new-or-1
+    * moved output patches from pdfresources to latex-lab-new-or-1
     * reorganized new-or: number subfiles as new-or-1, new-or-2 and load all with new-or.
 
 
diff --git a/required/latex-lab/documentmetadata-support.dtx b/required/latex-lab/documentmetadata-support.dtx
index 5ac3d023..10c2a46b 100644
--- a/required/latex-lab/documentmetadata-support.dtx
+++ b/required/latex-lab/documentmetadata-support.dtx
@@ -72,7 +72,7 @@
 %    \cs{DocumentMetadata} also loads and activates
 %    the new PDF management code from \pkg{pdfmanagement-testphase}.
 %    As this forces the loading of the \pkg{l3backend} files, a backend
-%    which can't be detected automatically like |dvipdfmx|,
+%    that can't be detected automatically like |dvipdfmx|,
 %    must be set in the first \cs{DocumentMetadata}.
 %
 %    From a process perspective \cs{DocumentMetadata} loads the
@@ -124,14 +124,14 @@
 %      it can do theoretically has already been implemented.
 %      When setting an A-standard a color profile is included and the
 %      \texttt{/OutputIntent} is set and javascript action in hyperref are suppressed.
-%      The |u| variants do not force unicode,
+%      The |u| variants do not enforce unicode,
 %      but they will pass the information to hyperref. The |a| variants
 %      do \emph{not} enforce (or even test) a tagged pdf yet.
 %      
 %      Starting with version 0.95s of \pkg{pdfmanagement-testphase}
 %      it is also possible to use the values
 %      |X-4|, |X-4p|, |X-5g|, |X-5n|, |X-5pg|, |X-6|, |X-6n|, |X-6p|, |UA-1| for
-%      a PDF/X and PDF/UA standard. These keys set \emph{only} the relevant
+%      a PDF/X and PDF/UA standard. These keys currently set \emph{only} the relevant
 %      XMP-metadata.
 %
 %      |pdfstandard| can be used more than once to set overlapping standards, e.g:\\
@@ -144,7 +144,7 @@
 %      of \pkg{l3pdfmeta}.   
 %
 %    \item[\texttt{xmp}] A boolean, if set to false no XMP metadata are added to the PDF.
-%    The default is true. Details are described in the documentation of \pkg{l3pdfmeta}.
+%    The initial value is true. Details are described in the documentation of \pkg{l3pdfmeta}.
 %    
 %    \item[\texttt{colorprofiles}] This allows to load icc-colorprofiles. Details
 %       are described in the documentation of \pkg{l3pdfmeta}.
diff --git a/required/latex-lab/latex-lab-new-or-1.dtx b/required/latex-lab/latex-lab-new-or-1.dtx
index 0810876c..b3e763ff 100644
--- a/required/latex-lab/latex-lab-new-or-1.dtx
+++ b/required/latex-lab/latex-lab-new-or-1.dtx
@@ -32,7 +32,7 @@
 %
 % \section{Introduction}
 %
-%    This package contains a few patches of internal \LaTeX{} needed
+%    This file contains a few patches of internal \LaTeX{} commands
 %    to support paragraph tagging across
 %    page boundaries (in \pdfTeX) and improve the behaviour of links across page breaks.
 %
@@ -58,7 +58,7 @@
 %
 %
 %  \subsection{Patching the OR}
-%  This add hooks around header and footer, in \cs{@makecol} and in multicol.
+%  This adds hooks around header and footer, in \cs{@makecol} and in multicol.
 %  At first initialize some of the hooks. We use providecommand to avoid problems if
 %  the kernel changes here and provides them directly.
 %    \begin{macrocode}
@@ -92,25 +92,20 @@
 %      update the \cs{footins} stream if that one got split
 %    \end{itemize}
 %
-%   If the new latex-lab file for the output routine is loaded it will do the right thing.
-%   In the other case we patch \cs{@makecol} manually.
+%   We patch \cs{@makecol}, if new-or-2 is loaded too it will overwrite that again.
 %    \begin{macrocode}
-\@ifpackageloaded{latex-lab-testphase-new-or}
-   {}
-   {
-    \providecommand\@kernel at before@footins{}
-    \providecommand\@kernel at before@cclv{}
+  \providecommand\@kernel at before@footins{}
+  \providecommand\@kernel at before@cclv{}
 
-    \patchcmd\@makecol
-      {\vskip\skip\footins}
-      {\vskip\skip\footins\@kernel at before@footins}
-      {\typeout{Patching \string\@makecol\space for tagging}}{\PATCHerror }
+  \patchcmd\@makecol
+    {\vskip\skip\footins}
+    {\vskip\skip\footins\@kernel at before@footins}
+    {\typeout{Patching \string\@makecol\space for tagging}}{\PATCHerror }
 
-% for some reason patching with etoolbox only works in this order ...
+%for some reason patching with etoolbox only works in this order ...
 
-    \pretocmd\@makecol{\@kernel at before@cclv}
-     {\typeout{Patching \string\@makecol\space for tagging}}{\PATCHerror }
-   }
+  \pretocmd\@makecol{\@kernel at before@cclv}
+   {\typeout{Patching \string\@makecol\space for tagging}}{\PATCHerror }
 %    \end{macrocode}
 %  \end{macro}
 %
diff --git a/required/latex-lab/latex-lab-new-or-2.dtx b/required/latex-lab/latex-lab-new-or-2.dtx
index 88e39a17..74d56d68 100644
--- a/required/latex-lab/latex-lab-new-or-2.dtx
+++ b/required/latex-lab/latex-lab-new-or-2.dtx
@@ -29,7 +29,7 @@
 % \fi
 %
 %
-% \title{The \texttt{latex-lab-new-or-2} code\thanks{}}
+% \title{The \texttt{latex-lab-testphase-new-or-2} code\thanks{}}
 % \author{Frank Mittelbach, \LaTeX{} Project}
 %
 % \maketitle
@@ -128,7 +128,7 @@
 %
 % \subsection{File declaration}
 %    \begin{macrocode}
-\ProvidesFile{latex-lab-new-or.ltx}
+\ProvidesPackage{latex-lab-testphase-new-or-2}
         [2022-11-04 v0.1c changes to the output routine]
 %    \end{macrocode}
 % \subsection{\cs{@makecol} reimplementation}
diff --git a/required/latex-lab/latex-lab-testphase.dtx b/required/latex-lab/latex-lab-testphase.dtx
index 23577125..3880c36c 100644
--- a/required/latex-lab/latex-lab-testphase.dtx
+++ b/required/latex-lab/latex-lab-testphase.dtx
@@ -68,27 +68,27 @@
 %    \end{macrocode}
 %    \begin{macrocode}
 %<*phase-I> 
-\ProvidesFile{phase-I-lab-testphase.ltx}
+\ProvidesFile{phase-I-latex-lab-testphase.ltx}
               [2022-11-04 v0.1a  latex-lab wrapper phase-I]
 %</phase-I>
 %    \end{macrocode}
 %    \begin{macrocode}
 %<*phase-II> 
-\ProvidesFile{phase-II-lab-testphase.ltx}
+\ProvidesFile{phase-II-latex-lab-testphase.ltx}
               [2022-11-04 v0.1a  latex-lab wrapper phase-II]
 %</phase-II>
 %    \end{macrocode}
 % this is only provided for compatibility
 %    \begin{macrocode}
 %<*tagpdf> 
-\ProvidesFile{tagpdf-lab-testphase.ltx}
+\ProvidesFile{tagpdf-latex-lab-testphase.ltx}
               [2022-11-04 v0.1a  latex-lab wrapper tagpdf (deprecated)]
 %</tagpdf>
 %    \end{macrocode}
 %    \begin{macrocode}
-%<*tagpdf|phase-II|new-or|new-or-1>
+%<*tagpdf|phase-I|phase-II|new-or|new-or-1>
 \RequirePackage{latex-lab-testphase-new-or-1}
-%</tagpdf|phase-II|new-or|new-or-1>
+%</tagpdf|phase-I|phase-II|new-or|new-or-1>
 %    \end{macrocode}  
 %  New output routine code is loaded in phase-II and new-or:
 %    \begin{macrocode}





More information about the latex3-commits mailing list.