[latex3-commits] [git/LaTeX3-latex3-latex2e] OR-lab: simplify loading of OR code by using a sty (68e0f5c2)

[Ulrike Fischer]

Repository : https://github.com/latex3/latex2e
On branch  : OR-lab
Link       : https://github.com/latex3/latex2e/commit/68e0f5c24ec5622722f6cc665a445e025566c171

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

commit 68e0f5c24ec5622722f6cc665a445e025566c171
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Tue Feb 15 18:19:41 2022 +0100

    simplify loading of OR code by using a sty


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

68e0f5c24ec5622722f6cc665a445e025566c171
 required/latex-lab/latex-lab-testphase.dtx | 41 +++++++++---------------------
 required/latex-lab/latex-lab.ins           |  2 +-
 2 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/required/latex-lab/latex-lab-testphase.dtx b/required/latex-lab/latex-lab-testphase.dtx
index 416c6e63..d8d9c671 100644
--- a/required/latex-lab/latex-lab-testphase.dtx
+++ b/required/latex-lab/latex-lab-testphase.dtx
@@ -43,14 +43,24 @@
 %    This code implements small files which can be loaded with the |testphase|
 %    key of \cs{DocumentMetadata}. This will be extended to allow user to load
 %    well defined parts of the tagged PDF project.
-%
+%    Currently the values |phase-I|, |phase-II| and |new-or| are provided.
+%    |tagpdf| is an undocumented alias for |phase-II| which is kept for compability.
 %
 %
 % \StopEventually{\setlength\IndexMin{200pt}  \PrintIndex  }
 %
 %
 % \section{The Implementation}
-%
+%  New output routine code is loaded in phase-II and new-or:
+%    \begin{macrocode}
+%<*tagpdf|phase-II|new-or>
+\IfFileExists{latex-lab-testphase-new-or.sty}
+ {
+   \RequirePackage{latex-lab-testphase-new-or}
+ }
+ {}
+%</tagpdf|phase-II|new-or>
+%    \end{macrocode}
 %    \begin{macrocode}
 %<*tagpdf|phase-I|phase-II>
 %    \end{macrocode}
@@ -70,32 +80,5 @@
 %    \begin{macrocode}
 %</tagpdf|phase-I|phase-II>
 %    \end{macrocode}
-%    \begin{macrocode}
-%<*tagpdf|phase-II>
-\ExplSyntaxOn
-\str_if_eq:eeF {\GetDocumentProperties{document/testphase/new-or}}{loaded}
-  {
-    \ExplSyntaxOff\makeatletter
-    \input{latex-lab-new-or.ltx}
-    \makeatother
-    \AddToDocumentProperties [document]{testphase/new-or}{loaded}
-  }
-\ExplSyntaxOff
-%</tagpdf|phase-II>
-%    \end{macrocode}
-% New output routine
-%    \begin{macrocode}
-%<*new-or>
-\ExplSyntaxOn
-\str_if_eq:eeF {\GetDocumentProperties{document/testphase/new-or}}{loaded}
-  {
-    \ExplSyntaxOff\makeatletter
-    \input{latex-lab-new-or.ltx}
-    \makeatother
-    \AddToDocumentProperties [document]{testphase/new-or}{loaded}
-  }
-\ExplSyntaxOff
-%</new-or>
-%    \end{macrocode}
 % \Finale
 %
diff --git a/required/latex-lab/latex-lab.ins b/required/latex-lab/latex-lab.ins
index ef832570..56e01fd1 100644
--- a/required/latex-lab/latex-lab.ins
+++ b/required/latex-lab/latex-lab.ins
@@ -71,7 +71,7 @@ where one can also log issues in case there are any.
 \generate{\file{phase-II-latex-lab-testphase.ltx}{\from{latex-lab-testphase.dtx}{phase-II}}}
 \generate{\file{new-or-latex-lab-testphase.ltx}{\from{latex-lab-testphase.dtx}{new-or}}}
 
-\generate{\file{latex-lab-new-or.ltx}{\from{latex-lab-new-or.dtx}{code}}}
+\generate{\file{latex-lab-testphase-new-or.sty}{\from{latex-lab-new-or.dtx}{code}}}
 \generate{\file{latex-lab-footmisc.ltx}{\from{latex-lab-new-or.dtx}{footmisc}}}
 
 \endbatchfile