pdfmanagement-testphase (28jan22)

git-svn-id: svn://tug.org/texlive/trunk@61775 c570f23f-e606-0410-a88d-b1316a301751

57 files changed, 166 insertions, 155 deletions

diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/CHANGELOG.md b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/CHANGELOG.md
index ec1686c5781..62f2c920051 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/CHANGELOG.md
@@ -5,7 +5,16 @@ first release 0.95a, 2021-02-23 will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 this project uses date-based 'snapshot' version identifiers.
 
-## [Unreleased] 
+## [2022-01-28] 
+
+### Changed 
+ - adapted the color patch to the changes in (x)color.sty (mathcolor)
+ - documentation uses new doc version (so needs currently latex-dev to compile)
+  
+### Fixed
+
+ - xcolor patch failed with color names containing active chars (e.g. from french)
+ - clipping of xform object on the dvips route (issue #25)
 
 ## [2022-01-13]
 ### Changed
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/README.md b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/README.md
index e08a4162fff..9336ce7ab49 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/README.md
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/README.md
@@ -1,6 +1,6 @@
 # LaTeX PDF management testphase bundle
 
-Version: 0.95j, 2022-01-13
+Version: 0.95k, 2022-01-28
 
 This package is used during a test phase to load the new PDF management code
 of LaTeX.
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/hyperref-generic.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/hyperref-generic.pdf
index 578272d2388..4ff66d1f1ee 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/hyperref-generic.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/hyperref-generic.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3backend-testphase.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3backend-testphase.pdf
index bd6d7985ee0..3123d088643 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3backend-testphase.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3backend-testphase.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfannot.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfannot.pdf
index cc44dcca2c4..3feab4139aa 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfannot.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfannot.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfdict.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfdict.pdf
index 29b211ec27d..56965d2854e 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfdict.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfdict.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-action.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-action.pdf
index 9e4f0061b1d..10bbf6ec75a 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-action.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-action.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-checkbox.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-checkbox.pdf
index 70666fc0073..74b88c7273e 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-checkbox.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-checkbox.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-choice.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-choice.pdf
index 72dfa1e3cef..a43c6946d0f 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-choice.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-choice.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-pushbutton.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
index cf69bffb994..f1d290eaeb2 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-radiobutton.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
index 2164a70c1c4..5c54bb4ebf4 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-textfield.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-textfield.pdf
index 2ce744434df..814cce07d34 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-textfield.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-textfield.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield.pdf
index 9bb4331db65..feedecbdf7e 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffile.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffile.pdf
index 2561e4d1187..ea5bdf46474 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffile.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffile.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmanagement.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmanagement.pdf
index a62a1a0d80a..a53b31189b7 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmanagement.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmanagement.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmeta.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmeta.pdf
index 6bf44b039bf..af8813dbab8 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmeta.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmeta.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdftools.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdftools.pdf
index df2e6594630..618b279d342 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdftools.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdftools.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfxform.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfxform.pdf
index 9e341ac9651..1491257d68f 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfxform.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfxform.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/ltdocinit.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/ltdocinit.pdf
index 0816edae0ff..a3ea02b46be 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/ltdocinit.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/ltdocinit.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/output-patches-tmp-ltx.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/output-patches-tmp-ltx.pdf
index a99709cf135..7224257eeca 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/output-patches-tmp-ltx.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/output-patches-tmp-ltx.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-firstaid.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
index b730d9e75ea..30e7a7bf457 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-testphase.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-testphase.pdf
index 70cf64c5c1b..f401c09d25a 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-testphase.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-testphase.pdf
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/hyperref-generic.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/hyperref-generic.dtx
index cc8ab85ef5b..5dcc7d28b21 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/hyperref-generic.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/hyperref-generic.dtx
@@ -27,9 +27,6 @@
 %<*driver>
 \RequirePackage{pdfmanagement-testphase}
 \DocumentMetadata{pdfstandard=A-2b}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
 \documentclass{l3doc}
 \usepackage{tabularx,array,booktabs,hyperxmp}
 \hypersetup{pdfauthor=The LaTeX Project,
@@ -86,7 +83,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 % \begin{documentation}
@@ -962,7 +959,7 @@
 %<@@=hyp>
 %    \end{macrocode}
 %    \begin{macrocode}
-\ProvidesFile{hgeneric-testphase.def}[2022-01-13 v0.95j %
+\ProvidesFile{hgeneric-testphase.def}[2022-01-28 v0.95k %
   generic Hyperref driver for the LaTeX PDF management testphase bundle]
 
 \RequirePackage{etoolbox} %why?
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3backend-testphase.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3backend-testphase.dtx
index 54f2e089dfd..84571e8a2b8 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3backend-testphase.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3backend-testphase.dtx
@@ -45,7 +45,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 %
@@ -56,27 +56,27 @@
 %    \begin{macrocode}
 %<drivers>\ProvidesExplFile
 %<*dvipdfmx>
-  {l3backend-testphase-dvipdfmx.def}{2022-01-13}{}
+  {l3backend-testphase-dvipdfmx.def}{2022-01-28}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx}
 %</dvipdfmx>
 %<*dvips>
-  {l3backend-testphase-dvips.def}{2022-01-13}{}
+  {l3backend-testphase-dvips.def}{2022-01-28}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: dvips}
 %</dvips>
 %<*dvisvgm>
-  {l3backend-testphase-dvisvgm.def}{2022-01-13}{}
+  {l3backend-testphase-dvisvgm.def}{2022-01-28}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm}
 %</dvisvgm>
 %<*luatex>
-  {l3backend-testphase-luatex.def}{2022-01-13}{}
+  {l3backend-testphase-luatex.def}{2022-01-28}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)}
 %</luatex>
 %<*pdftex>
-  {l3backend-testphase-pdftex.def}{2022-01-13}{}
+  {l3backend-testphase-pdftex.def}{2022-01-28}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)}
 %</pdftex>
 %<*xdvipdfmx>
-  {l3backend-testphase-xetex.def}{2022-01-13}{}
+  {l3backend-testphase-xetex.def}{2022-01-28}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX}
 %</xdvipdfmx>
 %    \end{macrocode}
@@ -1488,8 +1488,15 @@
 % (in atfi-dvips), along with some ideas from pdfbase and has been corrected
 % with the help of Alexander Grahn.
 % Details like clipping and landscape will probably be corrected in the future.
+% We need some temporary variables to store dimensions
 %    \begin{macrocode}
 %<*dvips>
+\tl_new:N \l_@@_backend_xform_tmpwd_tl
+\tl_new:N \l_@@_backend_xform_tmpdp_tl
+\tl_new:N \l_@@_backend_xform_tmpht_tl
+%    \end{macrocode}
+%
+%    \begin{macrocode}
 \cs_new_protected:Npn\@@_backend_xform_new:nnnn #1 #2 #3 #4 % #1 name, #2 attribute, #4  content
   {
     \int_gincr:N \g_@@_backend_object_int
@@ -1513,31 +1520,51 @@
     \tl_const:cx
       { c_@@_backend_xform_dp_ \tl_to_str:n {#1} _tl }
       { \tex_the:D \box_dp:N \l_@@_backend_tmpa_box }
-    %mirror the box
-    \box_scale:Nnn \l_@@_backend_tmpa_box {1} {-1}
+   %store content dimensions in DPI units (Dots) (code from issue 25)
+    \tl_set:Nx\l_@@_backend_xform_tmpwd_tl
+      {
+        \dim_to_decimal_in_sp:n{ \box_wd:N \l_@@_backend_tmpa_box }~
+        65536~div~72.27~div~DVImag~mul~Resolution~mul~
+      }
+    \tl_set:Nx\l_@@_backend_xform_tmpht_tl
+      {
+        \dim_to_decimal_in_sp:n{ \box_ht:N \l_@@_backend_tmpa_box }~
+        65536~div~72.27~div~DVImag~mul~VResolution~mul~
+      }
+    \tl_set:Nx\l_@@_backend_xform_tmpdp_tl
+      {
+        \dim_to_decimal_in_sp:n{ \box_dp:N \l_@@_backend_tmpa_box }~
+        65536~div~72.27~div~DVImag~mul~VResolution~mul~
+      }
+    % mirror the box
+    %\box_scale:Nnn \l_@@_backend_tmpa_box {1} {-1}
     \hbox_set:Nn\l_@@_backend_tmpb_box
       {
         \__kernel_backend_postscript:x
           {
-            gsave~currentpoint~translate~
+            gsave~currentpoint~
+            initclip~ % restore default clipping path (page device/whole page)
+            clippath~pathbbox~newpath~pop~pop~
+            \tl_use:N\l_@@_backend_xform_tmpdp_tl~add~translate~
             mark~
-            /_objdef~{ pdf.obj \int_use:N\g_@@_backend_object_int }\c_space_tl~
-            /BBox[
-            currentpoint~\dim_to_decimal:n{\box_dp:N \l_@@_backend_tmpa_box}~72.27~div~VResolution~mul~add~
-            currentpoint~
-              exch~\dim_to_decimal:n{\box_wd:N \l_@@_backend_tmpa_box}~72.27~div~Resolution~mul~add~
-              exch~\dim_to_decimal:n{\box_ht:N \l_@@_backend_tmpa_box}~72.27~div~VResolution~mul~sub~
-             ]
-             \str_if_eq:eeF{#1}{}
-              {
-                product~(Distiller)~search~{pop~pop~pop~#2}{pop}ifelse~
-              }
-             /BP~pdfmark~grestore~
+              /_objdef~{ pdf.obj \int_use:N\g_@@_backend_object_int }\c_space_tl~
+              /BBox[
+                0~
+                \tl_use:N\l_@@_backend_xform_tmpht_tl~
+                \tl_use:N\l_@@_backend_xform_tmpwd_tl~
+                \tl_use:N\l_@@_backend_xform_tmpdp_tl~
+                neg
+              ]
+              \str_if_eq:eeF{#1}{}
+               {
+                 product~(Distiller)~search~{pop~pop~pop~#2}{pop}ifelse~
+               }
+            /BP~pdfmark~1~-1~scale~neg~exch~neg~exch~translate
           }
         \box_use_drop:N\l_@@_backend_tmpa_box
         \__kernel_backend_postscript:n
           {
-            mark ~ /EP~pdfmark
+            mark ~ /EP~pdfmark  ~ grestore
           }
        \str_if_eq:eeF{#1}{}
          {
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfannot.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfannot.dtx
index c77314ca25e..b852e6ea3a9 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfannot.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfannot.dtx
@@ -25,9 +25,6 @@
 %<*driver>
 \RequirePackage{pdfmanagement-testphase}
 \DocumentMetadata{pdfstandard=A-2b}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
 \documentclass[full]{l3doc}
 \usepackage{array,booktabs,hyperxmp}
 \hypersetup{pdfauthor=The LaTeX Project,
@@ -52,7 +49,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 % \begin{documentation}
@@ -436,7 +433,7 @@
 %    \begin{macrocode}
 %<@@=pdfannot>
 %<*header>
-\ProvidesExplPackage{l3pdfannot}{2022-01-13}{0.95j}
+\ProvidesExplPackage{l3pdfannot}{2022-01-28}{0.95k}
   {PDF-annotations}
 \RequirePackage{l3pdfdict}
 %</header>
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfdict.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfdict.dtx
index 3a63005f370..2a2d80cec94 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfdict.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfdict.dtx
@@ -25,9 +25,6 @@
 %<*driver>
 \RequirePackage{pdfmanagement-testphase}
 \DocumentMetadata{pdfstandard=A-2b}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
 \documentclass[full]{l3doc}
 \usepackage{array,booktabs,hyperxmp}
 \hypersetup{pdfauthor=The LaTeX Project,
@@ -53,7 +50,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 % \begin{documentation}
@@ -212,7 +209,7 @@
 %    \begin{macrocode}
 %<@@=pdfdict>
 %<*header>
-\ProvidesExplPackage{l3pdfdict}{2022-01-13}{0.95j}
+\ProvidesExplPackage{l3pdfdict}{2022-01-28}{0.95k}
   {Tools for PDF dictionaries (LaTeX PDF management testphase bundle)}
 %</header>
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-action.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-action.dtx
index 2de21f001ab..0e05a47aa9f 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-action.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-action.dtx
@@ -25,9 +25,6 @@
 %<*driver>
 \RequirePackage{pdfmanagement-testphase}
 \DocumentMetadata{}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
 \documentclass[full]{l3doc}
 \usepackage{array,booktabs,siunitx}
 \usepackage{l3pdffield-testphase,bearwear}
@@ -53,7 +50,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 % \begin{documentation}
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-checkbox.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-checkbox.dtx
index eff3d2cd1e1..64d6e256c49 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-checkbox.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-checkbox.dtx
@@ -25,9 +25,6 @@
 %<*driver>
 \RequirePackage{pdfmanagement-testphase}
 \DocumentMetadata{}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
 \documentclass[full]{l3doc}
 \usepackage{array,booktabs}
 \usepackage{l3pdffield-testphase,bearwear}
@@ -68,7 +65,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 % \begin{documentation}
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-choice.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-choice.dtx
index 7c16fa49828..12318618f4a 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-choice.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-choice.dtx
@@ -25,9 +25,6 @@
 %<*driver>
 \RequirePackage{pdfmanagement-testphase}
 \DocumentMetadata{}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
 \documentclass[full]{l3doc}
 \usepackage{array,booktabs}
 \usepackage{l3pdffield-testphase}
@@ -53,7 +50,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 % \begin{documentation}
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-pushbutton.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
index eff2adfdb27..62da08394f4 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
@@ -25,9 +25,6 @@
 %<*driver>
 \RequirePackage{pdfmanagement-testphase}
 \DocumentMetadata{}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
 \documentclass[full]{l3doc}
 \usepackage{array,booktabs,siunitx}
 \usepackage{l3pdffield-testphase,bearwear}
@@ -59,7 +56,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 % \begin{documentation}
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-radiobutton.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
index 9d5515d1f46..784ca7f380a 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
@@ -25,9 +25,6 @@
 %<*driver>
 \RequirePackage{pdfmanagement-testphase}
 \DocumentMetadata{}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
 \documentclass[full]{l3doc}
 \usepackage{array,booktabs}
 \usepackage{l3pdffield-testphase,bearwear,tikzlings,tikzducks}
@@ -87,7 +84,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 % \begin{documentation}
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-textfield.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-textfield.dtx
index 4a5f7299107..3227454208e 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-textfield.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-textfield.dtx
@@ -25,9 +25,6 @@
 %<*driver>
 \RequirePackage{pdfmanagement-testphase}
 \DocumentMetadata{}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
 \documentclass[full]{l3doc}
 \usepackage{array,booktabs}
 \usepackage{l3pdffield-testphase}
@@ -53,7 +50,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 % \begin{documentation}
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield.dtx
index b872c40f263..e72fed2071c 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield.dtx
@@ -25,9 +25,6 @@
 %<*driver>
 \RequirePackage{pdfmanagement-testphase}
 \DocumentMetadata{}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
 \documentclass{l3doc}
 \usepackage{array,booktabs,caption}
 \usepackage{l3pdffield-testphase,tikz}
@@ -73,7 +70,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 % \begin{documentation}
@@ -977,7 +974,7 @@
 %<*package>
 %<@@=pdffield>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesExplPackage{l3pdffield-testphase}{2022-01-13}{0.95j}%
+\ProvidesExplPackage{l3pdffield-testphase}{2022-01-28}{0.95k}%
   {form fields}
 %    \end{macrocode}
 % \subsection{hyperref specific command}
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffile.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffile.dtx
index 4da7ef97230..2d09da77f82 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffile.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffile.dtx
@@ -25,9 +25,6 @@
 %<*driver>
 \RequirePackage{pdfmanagement-testphase}
 \DocumentMetadata{pdfstandard=A-2b}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
 \documentclass[full]{l3doc}
 \usepackage{array,booktabs,hyperxmp}
 \hypersetup{pdfauthor=The LaTeX Project,pdftitle=l3pdffile (LaTeX PDF management testphase bundle)}
@@ -53,7 +50,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 % \begin{documentation}
@@ -400,7 +397,7 @@
 %
 %    \begin{macrocode}
 %<*header>
-\ProvidesExplPackage{l3pdffile}{2022-01-13}{0.95j}
+\ProvidesExplPackage{l3pdffile}{2022-01-28}{0.95k}
   {embedding and referencing files in PDF---LaTeX PDF management testphase bundle}
 \RequirePackage{l3pdftools}  %temporarly!!
 %</header>
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmanagement.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmanagement.dtx
index f2e494c1fa8..4fb6ff4c8c5 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmanagement.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmanagement.dtx
@@ -25,9 +25,6 @@
 %<*driver>
 \RequirePackage{pdfmanagement-testphase}
 \DocumentMetadata{pdfstandard=A-2b}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
 \documentclass[full]{l3doc}
 \usepackage{tabularx}
 \usepackage{array,booktabs,hyperxmp}
@@ -61,7 +58,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 % \begin{documentation}
@@ -622,7 +619,7 @@
 %<@@=pdfmanagement>
 %<*header>
 %
-\ProvidesExplPackage{l3pdfmanagement}{2022-01-13}{0.95j}
+\ProvidesExplPackage{l3pdfmanagement}{2022-01-28}{0.95k}
   {Management of core PDF dictionaries (LaTeX PDF management testphase bundle)}
 %</header>
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmeta.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmeta.dtx
index f91555dd040..622fd0b41cd 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmeta.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmeta.dtx
@@ -25,9 +25,6 @@
 %<*driver>
 \RequirePackage{pdfmanagement-testphase}
 \DocumentMetadata{pdfstandard=A-2b}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
 \documentclass[full]{l3doc}
 \usepackage{array,booktabs,hyperxmp}
 \hypersetup{pdfauthor=The LaTeX Project,pdftitle=l3pdfmeta (LaTeX PDF management testphase bundle)}
@@ -53,7 +50,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 % \begin{documentation}
@@ -345,7 +342,7 @@
 %    \begin{macrocode}
 %<@@=pdfmeta>
 %<*header>
-\ProvidesExplPackage{l3pdfmeta}{2022-01-13}{0.95j}
+\ProvidesExplPackage{l3pdfmeta}{2022-01-28}{0.95k}
   {PDF-Standards---LaTeX PDF management testphase bundle}
 %</header>
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdftools.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdftools.dtx
index 9959583cd3b..89afdc43003 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdftools.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdftools.dtx
@@ -25,9 +25,6 @@
 %<*driver>
 \RequirePackage{pdfmanagement-testphase}
 \DocumentMetadata{pdfstandard=A-2b}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
 \documentclass[full]{l3doc}
 \usepackage{array,booktabs,hyperxmp}
 \hypersetup{pdfauthor=The LaTeX Project,pdftitle=l3pdftools (LaTeX PDF management testphase bundle)}
@@ -53,7 +50,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 % \begin{documentation}
@@ -215,7 +212,7 @@
 %
 %    \begin{macrocode}
 %<*header>
-\ProvidesExplPackage{l3pdftools}{2022-01-13}{0.95j}
+\ProvidesExplPackage{l3pdftools}{2022-01-28}{0.95k}
   {candidate commands for l3pdf---LaTeX PDF management testphase bundle}
 %</header>
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfxform.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfxform.dtx
index f4a4a6a7f42..228b3ff72de 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfxform.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfxform.dtx
@@ -25,9 +25,6 @@
 %<*driver>
 \RequirePackage{pdfmanagement-testphase}
 \DocumentMetadata{pdfstandard=A-2b}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
 \documentclass[full]{l3doc}
 \usepackage{array,booktabs,hyperxmp}
 \hypersetup{pdfauthor=The LaTeX Project,pdftitle=l3pdfxform (LaTeX PDF management testphase bundle)}
@@ -52,7 +49,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 % \begin{documentation}
@@ -136,7 +133,7 @@
 %    \begin{macrocode}
 %<@@=pdf>
 %<*header>
-\ProvidesExplPackage{l3pdfxform}{2022-01-13}{0.95j}
+\ProvidesExplPackage{l3pdfxform}{2022-01-28}{0.95k}
   {command to create xforms (beta)---LaTeX PDF management testphase bundle}
 %</header>
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/ltdocinit.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/ltdocinit.dtx
index 110bbb09b2c..8a2ec5136ae 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/ltdocinit.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/ltdocinit.dtx
@@ -25,9 +25,6 @@
 %<*driver>
 \RequirePackage{pdfmanagement-testphase}
 \DocumentMetadata{pdfstandard=A-2b}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
 \documentclass[full]{l3doc}
 \usepackage{array,booktabs,hyperxmp}
 \hypersetup{pdfauthor=The LaTeX Project,pdftitle=ltdocinit (LaTeX PDF management testphase bundle)}
@@ -51,7 +48,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 % \begin{documentation}
@@ -219,7 +216,7 @@
 %    \begin{macrocode}
 %<@@=pdfmanagement>
 %<*header>
-\ProvidesExplPackage{ltdocinit}{2022-01-13}{0.95j}
+\ProvidesExplPackage{ltdocinit}{2022-01-28}{0.95k}
   {Initialize document metadata}
 %</header>
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-firstaid.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
index 6383bd9922e..662d1d52dc5 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
@@ -25,9 +25,6 @@
 %<*driver>
 \RequirePackage{pdfmanagement-testphase}
 \DocumentMetadata{pdfstandard=A-2b}
-\makeatletter
-\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
 \documentclass[full]{l3doc}
 \usepackage{array,booktabs,hyperxmp}
 \hypersetup{pdfauthor=The LaTeX Project,pdftitle=pdfmanagement-firstaid
@@ -51,7 +48,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 % \begin{documentation}
@@ -67,7 +64,7 @@
 % |debug={firstaidoff={name1,name2,...},...}|.
 %    \begin{macrocode}
 %<*package>
-\ProvidesExplPackage{pdfmanagement-firstaid}{2022-01-13}{0.95j}
+\ProvidesExplPackage{pdfmanagement-firstaid}{2022-01-28}{0.95k}
   {LaTeX PDF management testphase bundle / firstaid-patches}
 
 %<@@=pdfmanagement>
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.dtx
index 1364b8e83c0..3d788e56432 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.dtx
@@ -25,9 +25,6 @@
 %<*driver>
 \RequirePackage{pdfmanagement-testphase}
 \DocumentMetadata{pdfstandard=A-2b}
-\makeatletter
-%\declare@file@substitution{doc.sty}{doc-v3beta.sty}
-\makeatother
 \documentclass{l3doc}
 \usepackage{tabularx,array,booktabs,hyperxmp}
 \hypersetup{pdfauthor=The LaTeX Project,pdftitle=LaTeX PDF management testphase bundle}
@@ -51,7 +48,7 @@
 %    }^^A
 % }
 %
-% \date{Version 0.95j, released 2022-01-13}
+% \date{Version 0.95k, released 2022-01-28}
 %
 % \maketitle
 % \begin{documentation}
@@ -389,7 +386,7 @@
 %    \begin{macrocode}
 %<@@=pdf>
 %<*package>
-\ProvidesExplPackage{pdfmanagement-testphase}{2022-01-13}{0.95j}
+\ProvidesExplPackage{pdfmanagement-testphase}{2022-01-28}{0.95k}
   {LaTeX PDF management testphase bundle}
 \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
 \IfFormatAtLeastTF{2020-10-01}{}{
@@ -417,7 +414,7 @@
 % to allow to set it in the document.
 %    \begin{macrocode}
 %<*header>
-\ProvidesExplFile{pdfmanagement-testphase.ltx}{2022-01-13}{0.95j}
+\ProvidesExplFile{pdfmanagement-testphase.ltx}{2022-01-28}{0.95k}
   {PDF~management~code~(testphase)}
 %</header>
 %<*package>
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty
index 9ea89b54e13..b530980baaa 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty
@@ -12,7 +12,9 @@
 %%
 %%
 %% color.dtx Copyright (C) 1994--1999 David Carlisle
-%%           Copyright (C) 2005-2020 David Carlisle, LaTeX3 Project
+%%           Copyright (C) 2005-2022
+%% The LaTeX Project and any individual authors listed elsewhere
+%% in this file.
 %%
 %% This file is part of the Standard LaTeX `Graphics Bundle'.
 %% It may be distributed under the terms of the LaTeX Project Public
@@ -22,8 +24,8 @@
 %% This file has the LPPL maintenance status "maintained".
 %%
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{color-ltx}[2022-01-13 v0.95j
-  Standard LaTeX Color (patched for l3color, part of pdfmanagement-testphase, original version 2021/03/07 v1.2e) (DPC)]
+\ProvidesPackage{color-ltx}[2022-01-28 v0.95k
+  Standard LaTeX Color (patched for l3color, part of pdfmanagement-testphase, original version 2022/01/06 v1.3d) (DPC)]
 \edef\Gin@codes{%
  \catcode`\noexpand\^^A\the\catcode`\^^A\relax
  \catcode`\noexpand\"\the\catcode`\"\relax
@@ -58,7 +60,7 @@
                       \def\c@lor@namefile{dvipsnam.def}}
 \DeclareOption{xdvi}{\ExecuteOptions{dvips,monochrome}}
 \DeclareOption{dvipdf}{\def\Gin@driver{dvipdf.def}}
-\DeclareOption{dvipdfm}{\def\Gin@driver{dvipdfm.def}}
+\DeclareOption{dvipdfm}{\def\Gin@driver{dvipdfmx.def}}
 \DeclareOption{dvipdfmx}{\def\Gin@driver{dvipdfmx.def}}
 \DeclareOption{pdftex}{\def\Gin@driver{pdftex.def}}
 \DeclareOption{luatex}{\def\Gin@driver{luatex.def}}
@@ -82,7 +84,7 @@
 \let\c@lor@usename\@gobble
 \DeclareOption{usenames}{%
   \def\c@lor@usename#1{%
-    \expandafter\color@named\csname\string\color @#1\endcsname{#1}}}
+    \expandafter\color@named\csname\@backslashchar color@#1\endcsname{#1}}}
 \DeclareRobustCommand\color{%
   \@ifnextchar[\@undeclaredcolor\@declaredcolor}
 \def\@undeclaredcolor[#1]#2{%
@@ -92,10 +94,10 @@
      \set@color}%
   \ignorespaces}
 \def\@declaredcolor#1{%
-  \@ifundefined{\string\color @#1}%
+  \@ifundefined{\@backslashchar color@#1}%
     {\c@lor@error{`#1'}}%
     {\expandafter\let\expandafter\current@color
-     \csname\string\color @#1\endcsname
+     \csname\@backslashchar color@#1\endcsname
      \set@color}%
   \ignorespaces}
 \protected\def\textcolor#1#{\@textcolor{#1}}
@@ -107,7 +109,7 @@
       \color}
 \protected\def\nopagecolor{%
   \@ifundefined{no@page@color}{%
-    \PackageInfo{color}{\string\nopagecolor\space is not supported}%
+    \PackageInfo{color}{\@backslashchar nopagecolor\space is not supported}%
   }{%
     \no@page@color
   }%
@@ -115,12 +117,12 @@
 \protected\def\definecolor#1#2#3{%
   \@ifundefined{color@#2}%
     {\c@lor@error{model `#2'}}%
-    {\@ifundefined{\string\color @#1}{}%
+    {\@ifundefined{\@backslashchar color@#1}{}%
       {\PackageInfo{color}{Redefining color #1}}%
      \csname color@#2\expandafter\endcsname
-         \csname\string\color @#1\endcsname{#3}}%
-    \@expl@color@set@@nnn{#1}{#2}{#3}%
-  }
+         \csname\@backslashchar color@#1\endcsname{#3}}%
+     \@expl@color@set@@nnn{#1}{#2}{#3}%
+   }
 \protected\def\DefineNamedColor#1#2#3#4{%
   \@ifundefined{define@color@#1}%
     {\c@lor@error{model `#1'}}%
@@ -188,6 +190,7 @@
  \dimen@\dp\z@\advance\dimen@\fboxsep\dp\z@\dimen@
  {#1{#2\color@block{\wd\z@}{\ht\z@}{\dp\z@}%
       \box\z@}}}
+\InputIfFileExists{mathcolor.ltx}{}{}
 \def\color@setgroup{\begingroup\set@color}
 \let\color@begingroup\begingroup
 \def\color@endgroup{\endgraf\endgroup}
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def
index c14036e6a64..3e2d091f291 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def
@@ -20,7 +20,7 @@
 %% 
 %% File: hyperref-generic.dtx
 
-\ProvidesFile{hgeneric-testphase.def}[2022-01-13 v0.95j %
+\ProvidesFile{hgeneric-testphase.def}[2022-01-28 v0.95k %
   generic Hyperref driver for the LaTeX PDF management testphase bundle]
 
 \RequirePackage{etoolbox} %why?
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty
index a1bc3caddb7..c056293ec07 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty
@@ -19,7 +19,7 @@
 %
 % for those people who are interested.
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
-\ProvidesExplPackage{hyperxmp-patches-tmp-ltx}{2022-01-13}{0.95j}
+\ProvidesExplPackage{hyperxmp-patches-tmp-ltx}{2022-01-28}{0.95k}
   {Store hyperref metadata in XMP format / temporay patches to test pdfresource management ... UF}
 
 \cs_if_exist:NT \pdfmanagement_add:nnn
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def
index 45754cdcb5c..c898fd19465 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def
@@ -20,7 +20,7 @@
 %% 
 %% File: l3backend-testphase.dtx
 \ProvidesExplFile
-  {l3backend-testphase-dvipdfmx.def}{2022-01-13}{}
+  {l3backend-testphase-dvipdfmx.def}{2022-01-28}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx}
 \RequirePackage{l3ref-tmp}
 \cs_generate_variant:Nn \ref_label:nn {en}
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def
index 85dce6a1431..a92574979bc 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def
@@ -20,7 +20,7 @@
 %% 
 %% File: l3backend-testphase.dtx
 \ProvidesExplFile
-  {l3backend-testphase-dvips.def}{2022-01-13}{}
+  {l3backend-testphase-dvips.def}{2022-01-28}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: dvips}
 \RequirePackage{l3ref-tmp}
 \cs_generate_variant:Nn \ref_label:nn {en}
@@ -158,6 +158,9 @@
       }
 \cs_new_protected:Npn \__pdf_backend_link_off:{}
 \cs_new_protected:Npn \__pdf_backend_link_on: {}
+\tl_new:N \l__pdf_backend_xform_tmpwd_tl
+\tl_new:N \l__pdf_backend_xform_tmpdp_tl
+\tl_new:N \l__pdf_backend_xform_tmpht_tl
 \cs_new_protected:Npn\__pdf_backend_xform_new:nnnn #1 #2 #3 #4 % #1 name, #2 attribute, #4  content
   {
     \int_gincr:N \g__pdf_backend_object_int
@@ -181,31 +184,51 @@
     \tl_const:cx
       { c__pdf_backend_xform_dp_ \tl_to_str:n {#1} _tl }
       { \tex_the:D \box_dp:N \l__pdf_backend_tmpa_box }
-    %mirror the box
-    \box_scale:Nnn \l__pdf_backend_tmpa_box {1} {-1}
+   %store content dimensions in DPI units (Dots) (code from issue 25)
+    \tl_set:Nx\l__pdf_backend_xform_tmpwd_tl
+      {
+        \dim_to_decimal_in_sp:n{ \box_wd:N \l__pdf_backend_tmpa_box }~
+        65536~div~72.27~div~DVImag~mul~Resolution~mul~
+      }
+    \tl_set:Nx\l__pdf_backend_xform_tmpht_tl
+      {
+        \dim_to_decimal_in_sp:n{ \box_ht:N \l__pdf_backend_tmpa_box }~
+        65536~div~72.27~div~DVImag~mul~VResolution~mul~
+      }
+    \tl_set:Nx\l__pdf_backend_xform_tmpdp_tl
+      {
+        \dim_to_decimal_in_sp:n{ \box_dp:N \l__pdf_backend_tmpa_box }~
+        65536~div~72.27~div~DVImag~mul~VResolution~mul~
+      }
+    % mirror the box
+    %\box_scale:Nnn \l__pdf_backend_tmpa_box {1} {-1}
     \hbox_set:Nn\l__pdf_backend_tmpb_box
       {
         \__kernel_backend_postscript:x
           {
-            gsave~currentpoint~translate~
+            gsave~currentpoint~
+            initclip~ % restore default clipping path (page device/whole page)
+            clippath~pathbbox~newpath~pop~pop~
+            \tl_use:N\l__pdf_backend_xform_tmpdp_tl~add~translate~
             mark~
-            /_objdef~{ pdf.obj \int_use:N\g__pdf_backend_object_int }\c_space_tl~
-            /BBox[
-            currentpoint~\dim_to_decimal:n{\box_dp:N \l__pdf_backend_tmpa_box}~72.27~div~VResolution~mul~add~
-            currentpoint~
-              exch~\dim_to_decimal:n{\box_wd:N \l__pdf_backend_tmpa_box}~72.27~div~Resolution~mul~add~
-              exch~\dim_to_decimal:n{\box_ht:N \l__pdf_backend_tmpa_box}~72.27~div~VResolution~mul~sub~
-             ]
-             \str_if_eq:eeF{#1}{}
-              {
-                product~(Distiller)~search~{pop~pop~pop~#2}{pop}ifelse~
-              }
-             /BP~pdfmark~grestore~
+              /_objdef~{ pdf.obj \int_use:N\g__pdf_backend_object_int }\c_space_tl~
+              /BBox[
+                0~
+                \tl_use:N\l__pdf_backend_xform_tmpht_tl~
+                \tl_use:N\l__pdf_backend_xform_tmpwd_tl~
+                \tl_use:N\l__pdf_backend_xform_tmpdp_tl~
+                neg
+              ]
+              \str_if_eq:eeF{#1}{}
+               {
+                 product~(Distiller)~search~{pop~pop~pop~#2}{pop}ifelse~
+               }
+            /BP~pdfmark~1~-1~scale~neg~exch~neg~exch~translate
           }
         \box_use_drop:N\l__pdf_backend_tmpa_box
         \__kernel_backend_postscript:n
           {
-            mark ~ /EP~pdfmark
+            mark ~ /EP~pdfmark  ~ grestore
           }
        \str_if_eq:eeF{#1}{}
          {
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def
index a2f70adf247..a715135af09 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def
@@ -20,7 +20,7 @@
 %% 
 %% File: l3backend-testphase.dtx
 \ProvidesExplFile
-  {l3backend-testphase-dvisvgm.def}{2022-01-13}{}
+  {l3backend-testphase-dvisvgm.def}{2022-01-28}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm}
 \RequirePackage{l3ref-tmp}
 \cs_generate_variant:Nn \ref_label:nn {en}
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def
index 6ac246c9e27..4184e4e2bec 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def
@@ -20,7 +20,7 @@
 %% 
 %% File: l3backend-testphase.dtx
 \ProvidesExplFile
-  {l3backend-testphase-luatex.def}{2022-01-13}{}
+  {l3backend-testphase-luatex.def}{2022-01-28}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)}
 \RequirePackage{l3ref-tmp}
 \cs_generate_variant:Nn \ref_label:nn {en}
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def
index 0188aa55b8a..d4e7214158d 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def
@@ -20,7 +20,7 @@
 %% 
 %% File: l3backend-testphase.dtx
 \ProvidesExplFile
-  {l3backend-testphase-pdftex.def}{2022-01-13}{}
+  {l3backend-testphase-pdftex.def}{2022-01-28}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)}
 \RequirePackage{l3ref-tmp}
 \cs_generate_variant:Nn \ref_label:nn {en}
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def
index 160d37b9882..ed5877cb600 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def
@@ -20,7 +20,7 @@
 %% 
 %% File: l3backend-testphase.dtx
 \ProvidesExplFile
-  {l3backend-testphase-xetex.def}{2022-01-13}{}
+  {l3backend-testphase-xetex.def}{2022-01-28}{}
   {LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX}
 \RequirePackage{l3ref-tmp}
 \cs_generate_variant:Nn \ref_label:nn {en}
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty
index 3c045da7bcc..677a628120f 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty
@@ -27,7 +27,7 @@
 %% File: l3pdffield.dtx
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesExplPackage{l3pdffield-testphase}{2022-01-13}{0.95j}%
+\ProvidesExplPackage{l3pdffield-testphase}{2022-01-28}{0.95k}%
   {form fields}
 \csname HyField@NeedAppearancesfalse\endcsname % suppress NeedAppearances
 \str_new:N \l__pdffield_tmpa_str
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdflscape-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdflscape-ltx.sty
index 677e3fe40e5..f9e901c52b8 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdflscape-ltx.sty
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdflscape-ltx.sty
@@ -22,7 +22,7 @@
 %% This work consists of the main source file pdflscape-ltx.sty
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesExplPackage{pdflscape-ltx}{2022-01-13}{0.95j}
+\ProvidesExplPackage{pdflscape-ltx}{2022-01-28}{0.95k}
  {Display of landscape pages in PDF - adaption of pdflscape to the PDFmanagement bundle (testphase)}
 
 \DeclareOption*{\PassOptionsToPackage\CurrentOption{graphics}}
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty
index 9bff4c5cdb6..63217144c6b 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: pdfmanagement-firstaid.dtx
-\ProvidesExplPackage{pdfmanagement-firstaid}{2022-01-13}{0.95j}
+\ProvidesExplPackage{pdfmanagement-firstaid}{2022-01-28}{0.95k}
   {LaTeX PDF management testphase bundle / firstaid-patches}
 
 \clist_map_inline:nn {pgf,transparent,hyperxmp,pdflscape,xcolor,color,beamer,output}
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx
index 3ac88ac680f..e9fd89dc7af 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx
@@ -27,7 +27,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: pdfmanagement-testphase.dtx
-\ProvidesExplFile{pdfmanagement-testphase.ltx}{2022-01-13}{0.95j}
+\ProvidesExplFile{pdfmanagement-testphase.ltx}{2022-01-28}{0.95k}
   {PDF~management~code~(testphase)}
 %% File: l3pdfdict.dtx
 \cs_new:Npn \__pdfdict_get_type:n #1
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty
index 4c34d556cc9..0dbade66d5b 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: pdfmanagement-testphase.dtx
-\ProvidesExplPackage{pdfmanagement-testphase}{2022-01-13}{0.95j}
+\ProvidesExplPackage{pdfmanagement-testphase}{2022-01-28}{0.95k}
   {LaTeX PDF management testphase bundle}
 \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
 \IfFormatAtLeastTF{2020-10-01}{}{
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/transparent-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/transparent-ltx.sty
index f9987ba4436..4b4cc8907ee 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/transparent-ltx.sty
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/transparent-ltx.sty
@@ -3,7 +3,7 @@
 %% a replacement for transparent sty from Heiko Oberdiek
 %%
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
-\ProvidesExplPackage{transparent-ltx}{2022-01-13}{0.95j}
+\ProvidesExplPackage{transparent-ltx}{2022-01-28}{0.95k}
   {Transparency with color stacks (replacement for transparent.sty from Heiko Oberdiek)}%
 
 \RequirePackage{l3opacity}
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
index 5ff2ef09972..c131c9a922e 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
@@ -1,6 +1,6 @@
 %% LaTeX2e file `xcolor-patches.sty'
 %%
-\ProvidesPackage{xcolor-patches-tmp-ltx}[2022-01-13 v0.95j patch xcolor for l3color]
+\ProvidesPackage{xcolor-patches-tmp-ltx}[2022-01-28 v0.95k patch xcolor for l3color]
 \@ifundefined{color_set:nn}{\RequirePackage{l3color}}{}
 
 \ExplSyntaxOn
@@ -43,10 +43,13 @@
 \cs_generate_variant:Nn \__pdfmanagement_firstaid_xcolor_set:nnnn {nonn}
 \cs_set_eq:NN \@expl@xcolor@set@@nonn \__pdfmanagement_firstaid_xcolor_set:nonn
 \cs_generate_variant:Nn \color_set:nn {ne}
+\tl_new:N\l__pdfmanagement_firstaid_tmpa_tl
+% the color name should be sanitized to avoid problems with e.g. french making ! active
 \cs_new_protected:Npn \@expl@xcolor@set@@ne #1 #2
    {
-     \exp_args:Nx \__color_if_defined:nT {#2}
-       { \color_set:ne {#1}{#2} }
+     \XC@edef\l__pdfmanagement_firstaid_tmpa_tl{#2}
+     \exp_args:NV \__color_if_defined:nT \l__pdfmanagement_firstaid_tmpa_tl
+       { \color_set:ne {#1}{\l__pdfmanagement_firstaid_tmpa_tl} }
    }
 \ExplSyntaxOff
 %\pretocmd{\XC@col@rlet}   {\@expl@color@set@@ne{#2}{#4}}{}{\fail}