[latex3-commits] [git/LaTeX3-latex3-pdfresources] test-new-or-change: change output patch replacement to avoid clash with latex-lab (d09d510)

Ulrike Fischer fischer at troubleshooting-tex.de
Wed Nov 2 20:57:12 CET 2022


Repository : https://github.com/latex3/pdfresources
On branch  : test-new-or-change
Link       : https://github.com/latex3/pdfresources/commit/d09d510be5e947a6bb4e0d23c85687da9f7d890a

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

commit d09d510be5e947a6bb4e0d23c85687da9f7d890a
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Wed Nov 2 20:57:12 2022 +0100

    change output patch replacement to avoid clash with latex-lab


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

d09d510be5e947a6bb4e0d23c85687da9f7d890a
 CHANGELOG.md                        | 11 ++---
 firstaid/output-patches-tmp-ltx.dtx |  2 +-
 ltdocinit.dtx                       | 15 ++++++
 pdfmanagement-firstaid.dtx          | 13 ++++--
 pdfmanagement-testphase.ins         |  8 ----
 resave.bat                          | 10 ----
 testfiles/pagelabels.xetex.tpf      | 92 ++++++++++++++++++-------------------
 7 files changed, 75 insertions(+), 76 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eef3b52..57fa2bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,16 +9,15 @@ this project uses date-based 'snapshot' version identifiers.
 
 ### Added 
  - ltdocinit: expl3 functions to retrieve values from the document properties.
- - ltdocinit/firstaid: the output patches for header and footer 
-   are no longer loaded by default but must be loaded with the testphase key.
-    
     
 ### Changed
- - removed firstaid for transparent. The package is now compatible.
- - removed firstaid for pdflscape. The package is now compatible. 
+ - removed firstaid for transparent as the package is now compatible.
+ - removed firstaid for pdflscape as the package is now compatible. 
+ - ltdocinit/firstaid: the output patches for header and footer 
+   are no longer loaded by default but must be loaded with the testphase key.
 
 ### Fixed
- - fault firstaid for doclicense
+ - faulty firstaid for doclicense
  
 ## [2022-09-26]
 
diff --git a/firstaid/output-patches-tmp-ltx.dtx b/firstaid/output-patches-tmp-ltx.dtx
index 3e6490f..38f0f38 100644
--- a/firstaid/output-patches-tmp-ltx.dtx
+++ b/firstaid/output-patches-tmp-ltx.dtx
@@ -51,7 +51,7 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\ProvidesPackage{latex-lab-testphase-new-or-1}
+\ProvidesPackage{output-patches-tmp-ltx}
         [2022-10-29 v0.96 Temporary output patches for tagging and better link support]
 \RequirePackage{etoolbox}
 %    \end{macrocode}
diff --git a/ltdocinit.dtx b/ltdocinit.dtx
index 7f2074d..1af2631 100644
--- a/ltdocinit.dtx
+++ b/ltdocinit.dtx
@@ -282,6 +282,21 @@
 %    \end{macrocode}
 % \end{variable}
 %    \begin{macrocode}
+\keys_define:nn { document / metadata }
+  {
+    ,testphase / new-or-1 .code:n =   
+      {
+        \tl_gput_right:Nn\g_@@_testphase_tl
+           {
+             \file_if_exist_input:nF {new-or-1-latex-lab-testphase.ltx}
+               {
+                \RequirePackage{output-patches-tmp-ltx}
+               }
+           }    
+      }
+  }
+%    \end{macrocode}
+%    \begin{macrocode}
 \cs_if_free:NT \DocumentMetadata
   {
     \keys_define:nn { document / metadata }
diff --git a/pdfmanagement-firstaid.dtx b/pdfmanagement-firstaid.dtx
index 74d2cdd..b4c4bc1 100644
--- a/pdfmanagement-firstaid.dtx
+++ b/pdfmanagement-firstaid.dtx
@@ -139,13 +139,16 @@
 %    \end{macrocode}
 % This catches also phase-II and tagpdf.
 %    \begin{macrocode}
-    \AddToHook{package/latex-lab-testphase-new-or/after}
-      {\RequirePackage{latex-lab-testphase-new-or-1}}
+    \file_if_exist:nF {new-or-1-latex-lab-testphase.ltx}
+      { 
+        \AddToHook{package/latex-lab-testphase-new-or/after}
+          {\RequirePackage{output-patches-tmp-ltx}}
 %    \end{macrocode}
-% This is for phase-II
+% This is for phase-I
 %    \begin{macrocode}
-    \AddToHook{file/phase-I-latex-lab-testphase/after}
-      {\RequirePackage{latex-lab-testphase-new-or-1}}
+        \AddToHook{package/tagpdf/after}
+          {\RequirePackage{output-patches-tmp-ltx}}
+      }    
   }
 %    \end{macrocode}
 
diff --git a/pdfmanagement-testphase.ins b/pdfmanagement-testphase.ins
index c93e30b..5f0656d 100644
--- a/pdfmanagement-testphase.ins
+++ b/pdfmanagement-testphase.ins
@@ -221,14 +221,6 @@ and all files in that bundle must be distributed together.
       {
        \from{output-patches-tmp-ltx.dtx}{package}
       }
-    \file {latex-lab-testphase-new-or-1.sty}
-      {
-       \from{output-patches-tmp-ltx.dtx}{package}
-      }  
-    \file {new-or-1-latex-lab-testphase.ltx}
-      {
-       \from{output-patches-tmp-ltx.dtx}{latex-lab}
-      }        
   }
 
 \def\MetaPrefix{-- }
diff --git a/resave.bat b/resave.bat
index 4bfcaeb..e7ab889 100644
--- a/resave.bat
+++ b/resave.bat
@@ -3,13 +3,3 @@ rem l3build save -e\2 \1
 rem l3build save -cconfig-dvips \1
 rem l3build save -cconfig-luatex -e\2 \1
 rem l3build save -cconfig-noxetex -e\2 \1
-
-Failed tests for configuration build:
-
-  Check failed with difference files
-  - ./build/test/documentmetadata-support-000.luatex.fc
-  - ./build/test/documentmetadata-support-000.pdftex.fc
-  - ./build/test/documentmetadata-support-000.xetex.fc
-
-
-
diff --git a/testfiles/pagelabels.xetex.tpf b/testfiles/pagelabels.xetex.tpf
index eb39dd9..bf905c5 100644
--- a/testfiles/pagelabels.xetex.tpf
+++ b/testfiles/pagelabels.xetex.tpf
@@ -1,45 +1,45 @@
 %PDF-1.5
 %äðíø
 7 0 obj
-<</Length 157>>
+<</Length 136>>
 stream
- q 1 0 0 1 72 769.89 cm 0 G 0 g BT /F1 9.9626 Tf 76.712 -62.765 Td[<001c0023>-28<002b>]TJ ET BT /F1 9.9626 Tf 226.949 -630.635 Td[<0000000000000052>]TJ ET Q
+ q 1 0 0 1 72 769.89 cm 0 G 0 g BT /F1 9.9626 Tf 76.712 -62.765 Td[<001c0023>-28<002b>]TJ 150.237 -567.87 Td[<0000000000000052>]TJ ET Q
 endstream
 endobj
 8 0 obj
 <</ExtGState 4 0 R/Font<</F1 5 0 R>>/ProcSet[/PDF/Text/ImageC/ImageB/ImageI]>>
 endobj
 10 0 obj
-<</Length 157>>
+<</Length 136>>
 stream
- q 1 0 0 1 72 769.89 cm 0 G 0 g BT /F1 9.9626 Tf 76.712 -62.765 Td[<001c0023>-28<002b>]TJ ET BT /F1 9.9626 Tf 226.949 -630.635 Td[<000000000000006b>]TJ ET Q
+ q 1 0 0 1 72 769.89 cm 0 G 0 g BT /F1 9.9626 Tf 76.712 -62.765 Td[<001c0023>-28<002b>]TJ 150.237 -567.87 Td[<000000000000006b>]TJ ET Q
 endstream
 endobj
 11 0 obj
 <</ExtGState 4 0 R/Font<</F1 5 0 R>>/ProcSet[/PDF/Text/ImageC/ImageB/ImageI]>>
 endobj
 13 0 obj
-<</Length 157>>
+<</Length 136>>
 stream
- q 1 0 0 1 72 769.89 cm 0 G 0 g BT /F1 9.9626 Tf 76.712 -62.765 Td[<001c0023>-28<002b>]TJ ET BT /F1 9.9626 Tf 226.949 -630.635 Td[<000000000000006a>]TJ ET Q
+ q 1 0 0 1 72 769.89 cm 0 G 0 g BT /F1 9.9626 Tf 76.712 -62.765 Td[<001c0023>-28<002b>]TJ 150.237 -567.87 Td[<000000000000006a>]TJ ET Q
 endstream
 endobj
 14 0 obj
 <</ExtGState 4 0 R/Font<</F1 5 0 R>>/ProcSet[/PDF/Text/ImageC/ImageB/ImageI]>>
 endobj
 16 0 obj
-<</Length 145>>
+<</Length 124>>
 stream
- q 1 0 0 1 72 769.89 cm 0 G 0 g BT /F1 9.9626 Tf 76.712 -62.765 Td[<001c0023>-28<002b>]TJ ET BT /F1 9.9626 Tf 232.239 -630.635 Td[<0042>]TJ ET Q
+ q 1 0 0 1 72 769.89 cm 0 G 0 g BT /F1 9.9626 Tf 76.712 -62.765 Td[<001c0023>-28<002b>]TJ 155.527 -567.87 Td[<0042>]TJ ET Q
 endstream
 endobj
 17 0 obj
 <</ExtGState 4 0 R/Font<</F1 5 0 R>>/ProcSet[/PDF/Text/ImageC/ImageB/ImageI]>>
 endobj
 20 0 obj
-<</Length 145>>
+<</Length 124>>
 stream
- q 1 0 0 1 72 769.89 cm 0 G 0 g BT /F1 9.9626 Tf 76.712 -62.765 Td[<001c0023>-28<002b>]TJ ET BT /F1 9.9626 Tf 229.888 -630.635 Td[<006f>]TJ ET Q
+ q 1 0 0 1 72 769.89 cm 0 G 0 g BT /F1 9.9626 Tf 76.712 -62.765 Td[<001c0023>-28<002b>]TJ 153.176 -567.87 Td[<006f>]TJ ET Q
 endstream
 endobj
 21 0 obj
@@ -367,45 +367,45 @@ endobj
 xref
 0 37
 0000000000 65535 f 
-0000013174 00000 n 
-0000012977 00000 n 
-0000012412 00000 n 
-0000001499 00000 n 
-0000015973 00000 n 
-0000015523 00000 n 
+0000013069 00000 n 
+0000012872 00000 n 
+0000012307 00000 n 
+0000001394 00000 n 
+0000015868 00000 n 
+0000015418 00000 n 
 0000000015 00000 n 
-0000000221 00000 n 
-0000012488 00000 n 
-0000000315 00000 n 
-0000000522 00000 n 
-0000012566 00000 n 
-0000000617 00000 n 
-0000000824 00000 n 
-0000012645 00000 n 
-0000000919 00000 n 
-0000001114 00000 n 
-0000012724 00000 n 
-0000001542 00000 n 
-0000001209 00000 n 
-0000001404 00000 n 
-0000012093 00000 n 
-0000012140 00000 n 
-0000012188 00000 n 
-0000012236 00000 n 
-0000012283 00000 n 
-0000012330 00000 n 
-0000011923 00000 n 
-0000012378 00000 n 
-0000012877 00000 n 
-0000012803 00000 n 
-0000013378 00000 n 
-0000015712 00000 n 
-0000013896 00000 n 
-0000015386 00000 n 
-0000015460 00000 n 
+0000000200 00000 n 
+0000012383 00000 n 
+0000000294 00000 n 
+0000000480 00000 n 
+0000012461 00000 n 
+0000000575 00000 n 
+0000000761 00000 n 
+0000012540 00000 n 
+0000000856 00000 n 
+0000001030 00000 n 
+0000012619 00000 n 
+0000001437 00000 n 
+0000001125 00000 n 
+0000001299 00000 n 
+0000011988 00000 n 
+0000012035 00000 n 
+0000012083 00000 n 
+0000012131 00000 n 
+0000012178 00000 n 
+0000012225 00000 n 
+0000011818 00000 n 
+0000012273 00000 n 
+0000012772 00000 n 
+0000012698 00000 n 
+0000013273 00000 n 
+0000015607 00000 n 
+0000013791 00000 n 
+0000015281 00000 n 
+0000015355 00000 n 
 trailer
 <</ID[<ID-STRING><ID-STRING>]/Root
 1 0 R/Info 2 0 R/Size 37>>
 startxref
-16122
+16017
 %%EOF





More information about the latex3-commits mailing list.