summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-08-24 19:35:26 +0000
committerKarl Berry <karl@freefriends.org>2022-08-24 19:35:26 +0000
commit87e18b2b2bb18c4eb9b9142708a16a7d9f388e34 (patch)
treec2f3155071ee9a37cb7ee0b039d3424e03da6a74 /Master/texmf-dist
parent0c1c284218c508e0c84bad7586f5a6814bacaafb (diff)
pdfmanagement-testphase (24aug22)
git-svn-id: svn://tug.org/texlive/trunk@64186 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/CHANGELOG.md9
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/hyperref-generic.pdfbin952309 -> 950072 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3backend-testphase.pdfbin682520 -> 680665 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfannot.pdfbin577920 -> 577844 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfdict.pdfbin505882 -> 505793 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-action.pdfbin546973 -> 546831 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-checkbox.pdfbin530024 -> 529869 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-choice.pdfbin533213 -> 533083 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-pushbutton.pdfbin525406 -> 525255 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-radiobutton.pdfbin580848 -> 580694 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-textfield.pdfbin504654 -> 504492 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield.pdfbin738986 -> 738839 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffile.pdfbin552584 -> 552332 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmanagement.pdfbin673774 -> 673768 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmeta.pdfbin672516 -> 672429 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdftools.pdfbin517558 -> 517303 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfxform.pdfbin417757 -> 417532 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/ltdocinit.pdfbin573773 -> 573525 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/output-patches-tmp-ltx.pdfbin385493 -> 385557 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-firstaid.pdfbin425881 -> 425614 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-testphase.pdfbin446714 -> 446650 bytes
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/hyperref-generic.dtx52
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/l3backend-testphase.dtx53
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfannot.dtx4
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfdict.dtx4
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-action.dtx2
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-checkbox.dtx2
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-choice.dtx2
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-pushbutton.dtx2
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-radiobutton.dtx2
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-textfield.dtx2
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield.dtx4
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffile.dtx4
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmanagement.dtx52
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmeta.dtx4
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdftools.dtx4
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfxform.dtx4
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/ltdocinit.dtx4
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-firstaid.dtx6
-rw-r--r--Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.dtx6
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty33
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty20
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty2
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def48
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty6
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def2
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def2
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def18
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def6
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty2
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdflscape-ltx.sty2
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty4
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx50
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty2
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/transparent-ltx.sty2
-rw-r--r--Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty108
59 files changed, 206 insertions, 337 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/CHANGELOG.md b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/CHANGELOG.md
index 14c0c77bdea..32ce2b1be19 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/CHANGELOG.md
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/CHANGELOG.md
@@ -5,6 +5,15 @@ 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.
+## [2022-08-24]
+
+### Changed
+ - internal cleanup
+ - prepare for change in l3backend object handling
+
+### Fixed
+ - ensure that pdfproducer is set with hyperxmp
+
## [2022-07-08]
### Fixed
- link detection if french is active (issue #28)
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/README.md b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/README.md
index 2eae8e67574..0d96f71d827 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.95q, 2022-07-08
+Version: 0.95r, 2022-08-24
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 55557375302..e19406467b2 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/hyperref-generic.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/hyperref-generic.pdf
Binary files differ
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 2b357b3eda9..b74c3c95ba6 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3backend-testphase.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3backend-testphase.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfannot.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfannot.pdf
index 5dbda679a01..702ae1a64eb 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfannot.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfannot.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfdict.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfdict.pdf
index 4e5c0bd5c57..bb93058f761 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfdict.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfdict.pdf
Binary files differ
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 6b5122c3d52..a2136f3d338 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-action.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-action.pdf
Binary files differ
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 20a6ae6185d..d075bd344f6 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-checkbox.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-checkbox.pdf
Binary files differ
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 26c1f001166..876073d8c7e 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-choice.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-choice.pdf
Binary files differ
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 4795e9a50c9..3557d2e663a 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
Binary files differ
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 d177ccbf12d..5f62fd992dc 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
Binary files differ
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 8a41e69f577..561066f44bf 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-textfield.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield-textfield.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield.pdf
index e9b37dfed0c..03a6bc7a6f2 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffield.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffile.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffile.pdf
index 83b9c83d09c..16a76d4976b 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffile.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdffile.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmanagement.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmanagement.pdf
index f3df93793ef..8f678cf00f9 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmanagement.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmanagement.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmeta.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmeta.pdf
index a9f7e579665..d3647b40519 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmeta.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfmeta.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdftools.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdftools.pdf
index dbce88a7871..b26d20df9d4 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdftools.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdftools.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfxform.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfxform.pdf
index 652c88ebba5..ee6f8179e85 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfxform.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/l3pdfxform.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/ltdocinit.pdf b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/ltdocinit.pdf
index 74f366d78fd..cf8942cb502 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/ltdocinit.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/ltdocinit.pdf
Binary files differ
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 79ddec156fa..4db63d591e4 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
Binary files differ
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 bb0d5007ded..1acdd4fefea 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
Binary files differ
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 5cbb3a5591f..d63d6239527 100644
--- a/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-testphase.pdf
+++ b/Master/texmf-dist/doc/latex/pdfmanagement-testphase/pdfmanagement-testphase.pdf
Binary files differ
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 c0075f181ae..a1616e6f179 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/hyperref-generic.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/hyperref-generic.dtx
@@ -83,7 +83,7 @@
% }^^A
% }
%
-% \date{Version 0.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \maketitle
% \begin{documentation}
@@ -560,7 +560,7 @@
% \item |backref|
% \item |CJKbookmarks| this key should not be used anymore. At some time
% it will be removed.
-% \item |destlabels| (destination names are taken from \cs{label} if possible)
+% \item |destlabel| (destination names are taken from \cs{label} if possible)
% \item |encap|
% \item |hyperfigures| (according to the \pkg{hyperref} manual
% it makes figures hyper links, but actually is a no-op for most drivers, and it
@@ -959,7 +959,7 @@
%<@@=hyp>
% \end{macrocode}
% \begin{macrocode}
-\ProvidesFile{hgeneric-testphase.def}[2022-07-08 v0.95q %
+\ProvidesFile{hgeneric-testphase.def}[2022-08-24 v0.95r %
generic Hyperref driver for the LaTeX PDF management testphase bundle]
\RequirePackage{etoolbox} %why?
@@ -3090,12 +3090,8 @@
% \begin{macrocode}
\keys_define:nn { hyp / setup }
{
- ,verbose .choice:
- ,verbose / true .code:n = { \Hy@verbosetrue}
- ,verbose / false .code:n = { \Hy@verbosefalse}
- ,verbose .default:n = {true}
- ,debug .meta:n = {verbose=#1}
- ,debug .default:n = {true}
+ ,verbose .legacy_if_set:n = {Hy@verbose}
+ ,debug .legacy_if_set:n = {Hy@verbose}
}
\keys_define:nn { hyp / setup }
{
@@ -3120,27 +3116,12 @@
{
,extension .tl_set:N = \XR@ext
,extension .initial:n= pdf
- ,hypertexnames .choice:
- ,hypertexnames / true .code:n = { \Hy@hypertexnamestrue}
- ,hypertexnames / false .code:n = { \Hy@hypertexnamesfalse}
- ,hypertexnames .default:n = {true}
+ ,hypertexnames .legacy_if_set:n = {Hy@hypertexnames}
,linkfileprefix .tl_set:N = \Hy@linkfileprefix
- ,localanchorname .choice:
- ,localanchorname / true .code:n = { \Hy@localanchornametrue }
- ,localanchorname / false .code:n = { \Hy@localanchornamefalse }
- ,localanchorname .default:n = {true}
- ,naturalnames .choice:
- ,naturalnames / true .code:n = { \Hy@naturalnamestrue}
- ,naturalnames / false .code:n = { \Hy@naturalnamesfalse}
- ,naturalnames .default:n = {true}
- ,pageanchor .choice:
- ,pageanchor / true .code:n = { \Hy@pageanchortrue}
- ,pageanchor / false .code:n = { \Hy@pageanchorfalse}
- ,pageanchor .default:n = {true}
- ,plainpages .choice:
- ,plainpages / true .code:n = { \Hy@plainpagestrue}
- ,plainpages / false .code:n = { \Hy@plainpagesfalse}
- ,plainpages .default:n = {true}
+ ,localanchorname .legacy_if_set:n = {Hy@localanchorname}
+ ,naturalnames .legacy_if_set:n = {Hy@naturalnames}
+ ,pageanchor .legacy_if_set:n = {Hy@pageanchor}
+ ,plainpages .legacy_if_set:n = {Hy@plainpages}
}
\keys_define:nn { hyp / setup }
@@ -3196,14 +3177,8 @@
,bookmarks / false .code:n = {\RemoveFromHook {begindocument/before}[hyperref/bookmark]}
,bookmarks / true .code:n = {}
,bookmarks .default:n = {true}
- ,bookmarksnumbered .choice:
- ,bookmarksnumbered / false .code:n = { \Hy@bookmarksnumberedfalse }
- ,bookmarksnumbered / true .code:n = { \Hy@bookmarksnumberedtrue }
- ,bookmarksnumbered .default:n = {true}
- ,bookmarksopen .choice:
- ,bookmarksopen / false .code:n = { \Hy@bookmarksopenfalse }
- ,bookmarksopen / true .code:n = { \Hy@bookmarksopentrue }
- ,bookmarksopen .default:n = {true}
+ ,bookmarksnumbered .legacy_if_set:n = {Hy@bookmarksnumbered}
+ ,bookmarksopen .legacy_if_set:n = {Hy@bookmarksopen}
,bookmarksopenlevel .tl_set:N = \@bookmarksopenlevel
,bookmarkstype .tl_set:N = \Hy@bookmarkstype
,pdfcenterwindow .choice:
@@ -5299,6 +5274,8 @@
\hss
}%
}
+\@ifundefined{hyper@nopatch@sectioning}
+{
\let\H@old@ssect\@ssect
\def\@ssect#1#2#3#4#5{%
\Hy@MakeCurrentHrefAuto{section*}%
@@ -5387,6 +5364,7 @@
\H@old@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]{#8}%
}%
}
+}{}
\expandafter\def\csname Parent-4\endcsname{}
\expandafter\def\csname Parent-3\endcsname{}
\expandafter\def\csname Parent-2\endcsname{}
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 88fd3a3fd5a..f9fc15bf4dd 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.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \maketitle
%
@@ -56,34 +56,34 @@
% \begin{macrocode}
%<drivers>\ProvidesExplFile
%<*dvipdfmx>
- {l3backend-testphase-dvipdfmx.def}{2022-07-08}{}
+ {l3backend-testphase-dvipdfmx.def}{2022-08-24}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx}
%</dvipdfmx>
%<*dvips>
- {l3backend-testphase-dvips.def}{2022-07-08}{}
+ {l3backend-testphase-dvips.def}{2022-08-24}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvips}
%</dvips>
%<*dvisvgm>
- {l3backend-testphase-dvisvgm.def}{2022-07-08}{}
+ {l3backend-testphase-dvisvgm.def}{2022-08-24}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm}
%</dvisvgm>
%<*luatex>
- {l3backend-testphase-luatex.def}{2022-07-08}{}
+ {l3backend-testphase-luatex.def}{2022-08-24}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)}
%</luatex>
%<*pdftex>
- {l3backend-testphase-pdftex.def}{2022-07-08}{}
+ {l3backend-testphase-pdftex.def}{2022-08-24}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)}
%</pdftex>
%<*xdvipdfmx>
- {l3backend-testphase-xetex.def}{2022-07-08}{}
+ {l3backend-testphase-xetex.def}{2022-08-24}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX}
%</xdvipdfmx>
% \end{macrocode}
% \subsection{Crossreferences}
% This uses the temporary l3ref-tmp.sty. It will
% will be replaced by kernel code later.
-% It is only need to get a reference for the absolute page counter.
+% It is only needed to get a reference for the absolute page counter.
% This uses the counter from the
% new lthooks/ltshipout package.
% \begin{macrocode}
@@ -267,7 +267,7 @@
% \begin{NOTE}{UF}
% path: Page
% !!!!!!!!!!!!!!!!!!!!!!
-% This part of the code depends on zref/xref as it sets labels.
+% This part of the code depends on l3ref-tmp as it sets labels.
% It also depends on code in l3pdfmanagement as the code uses the Core-dictionaries
% !!!!!!!!!!!!!!!!!!!!!!
%
@@ -338,16 +338,9 @@
{
%we need to know the page the resource should be added too.
\int_gincr:N\g_@@_backend_resourceid_int
- %\zref@labelbylist {l3pdf\int_use:N\g_@@_backend_resourceid_int} {l3pdf}
- %\ref_label:en{l3pdf\int_use:N\g_@@_backend_resourceid_int}{abspage}
- \@@_backend_ref_label:en { l3pdf\int_use:N\g_@@_backend_resourceid_int }{abspage}
+ \@@_backend_ref_label:en { l3pdf\int_use:N\g_@@_backend_resourceid_int }{abspage}
\tl_set:Nx \l_@@_tmpa_tl
{
- %\zref@extractdefault
-% {l3pdf\int_use:N\g_@@_backend_resourceid_int}
-% {pdf@abspage}
-% {0}
-% \ref_value:en{l3pdf\int_use:N\g_@@_backend_resourceid_int}{abspage}
\@@_backend_ref_value:en {l3pdf\int_use:N\g_@@_backend_resourceid_int}{abspage}
}
\pdfdict_if_exist:nF { g_@@_Core/backend_Page\l_@@_tmpa_tl}
@@ -587,7 +580,7 @@
%<*pdftex|luatex>
\clist_map_inline:Nn \c_@@_backend_PageResources_clist
{
- \@@_backend_object_new:nn {@@/Page/Resources/#1} {dict}
+ \pdf_object_new:nn {@@/Page/Resources/#1} {dict}
\cs_if_exist:NT \tex_directlua:D
{
\tex_directlua:D
@@ -631,7 +624,7 @@
\prop_if_empty:cF
{ \__kernel_pdfdict_name:n { g_@@_Core/Page/Resources/##1} }
{
- \@@_backend_object_write:nx
+ \pdf_object_write:nx
{ @@/Page/Resources/##1 }
{ \pdfdict_use:n { g_@@_Core/Page/Resources/##1} }
}
@@ -656,8 +649,8 @@
%
\clist_map_inline:Nn \c_@@_backend_PageResources_clist
{
- \@@_backend_object_new:nn { @@/Page/Resources/#1 } { dict }
- \hook_gput_code:nnn{shipout/firstpage}{pdf}{\@@_backend_object_write:nn { @@/Page/Resources/#1 } {}}
+ \pdf_object_new:nn { @@/Page/Resources/#1 } { dict }
+ \hook_gput_code:nnn{shipout/firstpage}{pdf}{\pdf_object_write:nn { @@/Page/Resources/#1 } {}}
}
\cs_new_protected:Npn \@@_backend_PageResources:n #1
{
@@ -958,18 +951,9 @@
{ \@@_backend_object_ref:n { #2 } }
}
{
- %\zref@labelbylist
-% { l3pdf\int_use:N\g_@@_backend_resourceid_int }
-% { l3pdf }
-% \ref_label:en{l3pdf\int_use:N\g_@@_backend_resourceid_int}{abspage}
\@@_backend_ref_label:en{l3pdf\int_use:N\g_@@_backend_resourceid_int}{abspage}
\tl_set:Nx \l_@@_tmpa_tl
{
- %\zref@extractdefault
-% { l3pdf\int_use:N\g_@@_backend_resourceid_int }
-% {pdf@abspage}
-% {0}
- %\ref_value:en{l3pdf\int_use:N\g_@@_backend_resourceid_int}{abspage}
\@@_backend_ref_value:en{l3pdf\int_use:N\g_@@_backend_resourceid_int}{abspage}
}
\pdfdict_if_exist:nF { g_@@_Core/backend_Page\l_@@_tmpa_tl/Resources/Properties }
@@ -997,18 +981,9 @@
{ \@@_backend_object_last: }
}
{
- %\zref@labelbylist
-% { l3pdf\int_use:N\g_@@_backend_resourceid_int }
-% { l3pdf }
- %\ref_label:en{l3pdf\int_use:N\g_@@_backend_resourceid_int}{abspage}
\@@_backend_ref_label:en{l3pdf\int_use:N\g_@@_backend_resourceid_int}{abspage}
\tl_set:Nx \l_@@_tmpa_tl
{
- %\zref@extractdefault
-% { l3pdf\int_use:N\g_@@_backend_resourceid_int }
-% {pdf@abspage}
-% {0}
- % \ref_value:en{l3pdf\int_use:N\g_@@_backend_resourceid_int}{abspage}
\@@_backend_ref_value:en{l3pdf\int_use:N\g_@@_backend_resourceid_int}{abspage}
}
\pdfdict_if_exist:nF { g_@@_Core/backend_Page\l_@@_tmpa_tl/Resources/Properties }
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfannot.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfannot.dtx
index 97c0c5e8d6c..399f483a7a1 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfannot.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfannot.dtx
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Version 0.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \maketitle
% \begin{documentation}
@@ -433,7 +433,7 @@
% \begin{macrocode}
%<@@=pdfannot>
%<*header>
-\ProvidesExplPackage{l3pdfannot}{2022-07-08}{0.95q}
+\ProvidesExplPackage{l3pdfannot}{2022-08-24}{0.95r}
{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 8d32eeed549..5a7fba13526 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfdict.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfdict.dtx
@@ -50,7 +50,7 @@
% }^^A
% }
%
-% \date{Version 0.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \maketitle
% \begin{documentation}
@@ -209,7 +209,7 @@
% \begin{macrocode}
%<@@=pdfdict>
%<*header>
-\ProvidesExplPackage{l3pdfdict}{2022-07-08}{0.95q}
+\ProvidesExplPackage{l3pdfdict}{2022-08-24}{0.95r}
{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 4fdc0bac2f8..96e39426af1 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-action.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-action.dtx
@@ -50,7 +50,7 @@
% }^^A
% }
%
-% \date{Version 0.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \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 5acdcd56812..ffa2b7ca3ab 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-checkbox.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-checkbox.dtx
@@ -65,7 +65,7 @@
% }^^A
% }
%
-% \date{Version 0.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \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 7723bd2326b..f9991ad304c 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-choice.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-choice.dtx
@@ -50,7 +50,7 @@
% }^^A
% }
%
-% \date{Version 0.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \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 8c7284694cb..83b90edcddf 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
@@ -56,7 +56,7 @@
% }^^A
% }
%
-% \date{Version 0.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \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 bb9ae7b7bbb..1551e41fd0c 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
@@ -84,7 +84,7 @@
% }^^A
% }
%
-% \date{Version 0.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \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 cb7de4a1678..f3497cb8fb6 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-textfield.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-textfield.dtx
@@ -50,7 +50,7 @@
% }^^A
% }
%
-% \date{Version 0.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \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 9a2aa3c0912..51a81d2f01f 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield.dtx
@@ -70,7 +70,7 @@
% }^^A
% }
%
-% \date{Version 0.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \maketitle
% \begin{documentation}
@@ -974,7 +974,7 @@
%<*package>
%<@@=pdffield>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplPackage{l3pdffield-testphase}{2022-07-08}{0.95q}%
+\ProvidesExplPackage{l3pdffield-testphase}{2022-08-24}{0.95r}%
{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 c24f7b781d5..5527a4e1281 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffile.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffile.dtx
@@ -50,7 +50,7 @@
% }^^A
% }
%
-% \date{Version 0.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \maketitle
% \begin{documentation}
@@ -397,7 +397,7 @@
%
% \begin{macrocode}
%<*header>
-\ProvidesExplPackage{l3pdffile}{2022-07-08}{0.95q}
+\ProvidesExplPackage{l3pdffile}{2022-08-24}{0.95r}
{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 f29b7580fa3..63865b46273 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmanagement.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmanagement.dtx
@@ -58,7 +58,7 @@
% }^^A
% }
%
-% \date{Version 0.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \maketitle
% \begin{documentation}
@@ -633,7 +633,7 @@
%<@@=pdfmanagement>
%<*header>
%
-\ProvidesExplPackage{l3pdfmanagement}{2022-07-08}{0.95q}
+\ProvidesExplPackage{l3pdfmanagement}{2022-08-24}{0.95r}
{Management of core PDF dictionaries (LaTeX PDF management testphase bundle)}
%</header>
% \end{macrocode}
@@ -1279,8 +1279,8 @@
\prop_if_empty:cF
{ \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AA } }
{
- \__pdf_backend_object_new:nn { @@/Catalog/AA } { dict }
- \__pdf_backend_object_write:nx
+ \pdf_object_new:nn { @@/Catalog/AA } { dict }
+ \pdf_object_write:nx
{ @@/Catalog/AA }
{ \pdfdict_use:n { g__pdf_Core/Catalog/AA } }
\exp_args:Nnx
@@ -1309,8 +1309,8 @@
{
\seq_if_empty:cF { g_@@_/Catalog/AcroForm/Fields_seq }
{
- \__pdf_backend_object_new:nn { @@/Catalog/AcroForm/Fields } { array }
- \__pdf_backend_object_write:nx
+ \pdf_object_new:nn { @@/Catalog/AcroForm/Fields } { array }
+ \pdf_object_write:nx
{ @@/Catalog/AcroForm/Fields }
{ \seq_use:cn { g_@@_/Catalog/AcroForm/Fields_seq } {~} }
\exp_args:Nnnx
@@ -1321,9 +1321,9 @@
}
\seq_if_empty:cF { g_@@_/Catalog/AcroForm/CO_seq }
{
- \__pdf_backend_object_new:nn { @@/Catalog/AcroForm/CO } { array }
+ \pdf_object_new:nn { @@/Catalog/AcroForm/CO } { array }
\exp_args:Nnx
- \__pdf_backend_object_write:nn
+ \pdf_object_write:nn
{ @@/Catalog/AcroForm/CO }
{ \seq_use:cn { g_@@_/Catalog/AcroForm/CO_seq } {~} }
\exp_args:Nnnx
@@ -1334,9 +1334,9 @@
}
\prop_if_empty:cF { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm/DR/Font}}
{
- \__pdf_backend_object_new:nn { @@/Catalog/AcroForm/DR/Font } {dict}
+ \pdf_object_new:nn { @@/Catalog/AcroForm/DR/Font } {dict}
\exp_args:Nnx
- \__pdf_backend_object_write:nn
+ \pdf_object_write:nn
{ @@/Catalog/AcroForm/DR/Font }
{ \pdfdict_use:n { g__pdf_Core/Catalog/AcroForm/DR/Font } }
\exp_args:Nnnx
@@ -1347,9 +1347,9 @@
}
\prop_if_empty:cF { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm/DR}}
{
- \__pdf_backend_object_new:nn { @@/Catalog/AcroForm/DR } {dict}
+ \pdf_object_new:nn { @@/Catalog/AcroForm/DR } {dict}
\exp_args:Nnx
- \__pdf_backend_object_write:nn
+ \pdf_object_write:nn
{ @@/Catalog/AcroForm/DR }
{ \pdfdict_use:n { g__pdf_Core/Catalog/AcroForm/DR } }
\exp_args:Nnnx
@@ -1360,9 +1360,9 @@
}
\prop_if_empty:cF { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm} }
{
- \__pdf_backend_object_new:nn { @@/Catalog/AcroForm } {dict}
+ \pdf_object_new:nn { @@/Catalog/AcroForm } {dict}
\exp_args:Nnx
- \__pdf_backend_object_write:nn
+ \pdf_object_write:nn
{ @@/Catalog/AcroForm }
{ \pdfdict_use:n { g__pdf_Core/Catalog/AcroForm } }
\exp_args:Nnnx
@@ -1385,9 +1385,9 @@
\seq_if_empty:cF
{ g_@@_/Catalog/AF_seq }
{
- \__pdf_backend_object_new:nn { @@/Catalog/AF } { array }
+ \pdf_object_new:nn { @@/Catalog/AF } { array }
\exp_args:Nnx
- \__pdf_backend_object_write:nn
+ \pdf_object_write:nn
{ @@/Catalog/AF }
{ \seq_use:cn { g_@@_/Catalog/AF_seq } {~} }
\exp_args:Nnx
@@ -1409,9 +1409,9 @@
\prop_if_empty:cF
{ \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/MarkInfo } }
{
- \__pdf_backend_object_new:nn { @@/Catalog/MarkInfo } { dict }
+ \pdf_object_new:nn { @@/Catalog/MarkInfo } { dict }
\exp_args:Nnx
- \__pdf_backend_object_write:nn
+ \pdf_object_write:nn
{ @@/Catalog/MarkInfo }
{ \pdfdict_use:n { g__pdf_Core/Catalog/MarkInfo } }
\exp_args:Nnx
@@ -1450,10 +1450,10 @@
>
{ 0 }
{
- \__pdf_backend_object_new:nn { @@/Catalog/OCProperties } { dict }
+ \pdf_object_new:nn { @@/Catalog/OCProperties } { dict }
\seq_gpop_left:cN { g_@@_/Catalog/OCProperties/Configs_seq} \l_@@_tmpa_tl
\exp_args:Nnx
- \__pdf_backend_object_write:nn {@@/Catalog/OCProperties}
+ \pdf_object_write:nn {@@/Catalog/OCProperties}
{
/OCGs~[ \seq_use:cn { g_@@_/Catalog/OCProperties/OCGs_seq } {~} ]
/D~\l_@@_tmpa_tl~
@@ -1481,9 +1481,9 @@
\seq_if_empty:cF
{ g_@@_/Catalog/OutputIntents_seq }
{
- \__pdf_backend_object_new:nn { @@/Catalog/OutputIntents } { array }
+ \pdf_object_new:nn { @@/Catalog/OutputIntents } { array }
\exp_args:Nnx
- \__pdf_backend_object_write:nn
+ \pdf_object_write:nn
{ @@/Catalog/OutputIntents }
{ \seq_use:cn { g_@@_/Catalog/OutputIntents_seq } {~} }
\exp_args:Nnx
@@ -1506,9 +1506,9 @@
\seq_if_empty:cF
{ g_@@_/Catalog/Requirements_seq }
{
- \__pdf_backend_object_new:nn { @@/Catalog/Requirements } { array }
+ \pdf_object_new:nn { @@/Catalog/Requirements } { array }
\exp_args:Nnx
- \__pdf_backend_object_write:nn
+ \pdf_object_write:nn
{ @@/Catalog/Requirements }
{ \seq_use:cn { g_@@_/Catalog/Requirements_seq } {~} }
\exp_args:Nnx
@@ -1531,9 +1531,9 @@
\prop_if_empty:cF
{ \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/ViewerPreferences } }
{
- \__pdf_backend_object_new:nn { @@/Catalog/ViewerPreferences } { dict }
+ \pdf_object_new:nn { @@/Catalog/ViewerPreferences } { dict }
\exp_args:Nnx
- \__pdf_backend_object_write:nn
+ \pdf_object_write:nn
{ @@/Catalog/ViewerPreferences }
{ \pdfdict_use:n { g__pdf_Core/Catalog/ViewerPreferences } }
\exp_args:Nnx
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmeta.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmeta.dtx
index 5cb81013521..d284c399a9d 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmeta.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmeta.dtx
@@ -50,7 +50,7 @@
% }^^A
% }
%
-% \date{Version 0.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \maketitle
% \begin{documentation}
@@ -381,7 +381,7 @@
% \begin{macrocode}
%<@@=pdfmeta>
%<*header>
-\ProvidesExplPackage{l3pdfmeta}{2022-07-08}{0.95q}
+\ProvidesExplPackage{l3pdfmeta}{2022-08-24}{0.95r}
{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 09885d91559..b7bd6a54ed5 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdftools.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdftools.dtx
@@ -50,7 +50,7 @@
% }^^A
% }
%
-% \date{Version 0.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \maketitle
% \begin{documentation}
@@ -212,7 +212,7 @@
%
% \begin{macrocode}
%<*header>
-\ProvidesExplPackage{l3pdftools}{2022-07-08}{0.95q}
+\ProvidesExplPackage{l3pdftools}{2022-08-24}{0.95r}
{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 80aa5201c3d..3b7d7247101 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfxform.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfxform.dtx
@@ -49,7 +49,7 @@
% }^^A
% }
%
-% \date{Version 0.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \maketitle
% \begin{documentation}
@@ -133,7 +133,7 @@
% \begin{macrocode}
%<@@=pdf>
%<*header>
-\ProvidesExplPackage{l3pdfxform}{2022-07-08}{0.95q}
+\ProvidesExplPackage{l3pdfxform}{2022-08-24}{0.95r}
{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 1c21229b75b..ed9fda6588e 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/ltdocinit.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/ltdocinit.dtx
@@ -48,7 +48,7 @@
% }^^A
% }
%
-% \date{Version 0.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \maketitle
% \begin{documentation}
@@ -217,7 +217,7 @@
% \begin{macrocode}
%<@@=pdfmanagement>
%<*header>
-\ProvidesExplPackage{ltdocinit}{2022-07-08}{0.95q}
+\ProvidesExplPackage{ltdocinit}{2022-08-24}{0.95r}
{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 0ddec54f3f7..f02cc7ec553 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
@@ -48,7 +48,7 @@
% }^^A
% }
%
-% \date{Version 0.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \maketitle
% \begin{documentation}
@@ -64,7 +64,7 @@
% |debug={firstaidoff={name1,name2,...},...}|.
% \begin{macrocode}
%<*package>
-\ProvidesExplPackage{pdfmanagement-firstaid}{2022-07-08}{0.95q}
+\ProvidesExplPackage{pdfmanagement-firstaid}{2022-08-24}{0.95r}
{LaTeX PDF management testphase bundle / firstaid-patches}
%<@@=pdfmanagement>
@@ -175,7 +175,7 @@
{
package/xcolor/after
}
- {\RequirePackage{xcolor-patches-tmp-ltx}\XC@@@@names}
+ {\RequirePackage{xcolor-patches-tmp-ltx}}
}
% \end{macrocode}
% \subsection{\pkg{pgf}}
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 c503632465d..22f0445ac03 100644
--- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.dtx
+++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.dtx
@@ -48,7 +48,7 @@
% }^^A
% }
%
-% \date{Version 0.95q, released 2022-07-08}
+% \date{Version 0.95r, released 2022-08-24}
%
% \maketitle
% \begin{documentation}
@@ -386,7 +386,7 @@
% \begin{macrocode}
%<@@=pdf>
%<*package>
-\ProvidesExplPackage{pdfmanagement-testphase}{2022-07-08}{0.95q}
+\ProvidesExplPackage{pdfmanagement-testphase}{2022-08-24}{0.95r}
{LaTeX PDF management testphase bundle}
\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
\IfFormatAtLeastTF{2020-10-01}{}{
@@ -414,7 +414,7 @@
% to allow to set it in the document.
% \begin{macrocode}
%<*header>
-\ProvidesExplFile{pdfmanagement-testphase.ltx}{2022-07-08}{0.95q}
+\ProvidesExplFile{pdfmanagement-testphase.ltx}{2022-08-24}{0.95r}
{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 68734671663..7400b4be957 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty
@@ -24,7 +24,7 @@
%% This file has the LPPL maintenance status "maintained".
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{color-ltx}[2022-07-08 v0.95q
+\ProvidesPackage{color-ltx}[2022-08-24 v0.95r
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
@@ -136,25 +136,18 @@
\c@lor@usename{#2}}}}
\@onlypreamble\DefineNamedColor
\protected\def\@expl@color@set@@nnn#1#2#3{}
-\ifdefined\ExplSyntaxOn
- \ExplSyntaxOn
- \cs_gset_protected:Npn \@expl@color@set@@nnn #1 #2 #3
- {
- \cs_if_exist:NT \color_set:nnn
- { \cs_if_exist:cTF { __color_parse_model_ #2 :w }
- {
- \color_set:nnn {#1}{#2}{#3}
- }
- { %for dvi mode
- \tl_if_eq:nnT{#2}{named}
- {
- \color_set:nn{#1}{#3}
- }
- }
- }
- }
- \ExplSyntaxOff
-\fi
+\ExplSyntaxOn
+\cs_set_protected:Npn \@expl@color@set@@nnn #1 #2 #3
+ {
+ \str_if_eq:nnTF {#2}{named}
+ {
+ \color_set:nn {#1}{#3}
+ }
+ {
+ \color_set:nnn {#1}{#2}{#3}
+ }
+ }
+\ExplSyntaxOff
\newif\ifcolors@
\colors@true
\def\c@lor@special#1#2{%
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
index 733b0170082..666d4d028bb 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
@@ -19,7 +19,7 @@
%
% for those people who are interested.
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
-\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2022-07-08}{0.95q}
+\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2022-08-24}{0.95r}
{temporay patches to for the colorspace package to test pdfresource management ... UF}
\hook_gput_code:nnn {begindocument} {pdf}
@@ -35,30 +35,30 @@
{
\tl_if_exist:NT \spc@op
{
- \__pdf_backend_object_new:nn {__spc_extgstate_op_false}{dict}
- \__pdf_backend_object_write:nn
+ \pdf_object_new:nn {__spc_extgstate_op_false}{dict}
+ \pdf_object_write:nn
{__spc_extgstate_op_false}
{/Type /ExtGState~/op~false~/OP~false}
\pdfmanagement_add:nnn
{Page/Resources/ExtGState}
{SPCko}
- {\__pdf_backend_object_ref:n {__spc_extgstate_op_false}}
- \__pdf_backend_object_new:nn {__spc_extgstate_op_true0}{dict}
- \__pdf_backend_object_write:nn
+ {\pdf_object_ref:n {__spc_extgstate_op_false}}
+ \pdf_object_new:nn {__spc_extgstate_op_true0}{dict}
+ \pdf_object_write:nn
{__spc_extgstate_op_true0}
{/Type /ExtGState~/op~true~/OP~true~/OPM~0}%
\pdfmanagement_add:nnn
{Page/Resources/ExtGState}
{SPCmz}
- {\__pdf_backend_object_ref:n {__spc_extgstate_op_true0}}
- \__pdf_backend_object_new:nn {__spc_extgstate_op_true1}{dict}
- \__pdf_backend_object_write:nn
+ {\pdf_object_ref:n {__spc_extgstate_op_true0}}
+ \pdf_object_new:nn {__spc_extgstate_op_true1}{dict}
+ \pdf_object_write:nn
{__spc_extgstate_op_true1}
{/Type /ExtGState~/op~true~/OP~true~/OPM~1}%
\pdfmanagement_add:nnn
{Page/Resources/ExtGState}
{SPCop}
- {\__pdf_backend_object_ref:n {__spc_extgstate_op_true1}}
+ {\pdf_object_ref:n {__spc_extgstate_op_true1}}
}
}
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty
index 366b860f229..4f52820adfd 100644
--- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty
+++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty
@@ -40,7 +40,7 @@
\RequirePackage{xparse}
\ProvidesExplPackage{fontspec-luatex-tmp-ltx}%
- {2022/01/15}{2022-07-08}{0.95q}
+ {2022/01/15}{2022-08-24}{0.95r}
%%^^A%% fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec>
%%^^A%% fontspec-code-vars.dtx -- part of FONTSPEC <wspr.io/fontspec>
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 28ae5758a98..900c3197372 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-07-08 v0.95q %
+\ProvidesFile{hgeneric-testphase.def}[2022-08-24 v0.95r %
generic Hyperref driver for the LaTeX PDF management testphase bundle]
\RequirePackage{etoolbox} %why?
@@ -1411,12 +1411,8 @@
}
\keys_define:nn { hyp / setup }
{
- ,verbose .choice:
- ,verbose / true .code:n = { \Hy@verbosetrue}
- ,verbose / false .code:n = { \Hy@verbosefalse}
- ,verbose .default:n = {true}
- ,debug .meta:n = {verbose=#1}
- ,debug .default:n = {true}
+ ,verbose .legacy_if_set:n = {Hy@verbose}
+ ,debug .legacy_if_set:n = {Hy@verbose}
}
\keys_define:nn { hyp / setup }
{
@@ -1435,27 +1431,12 @@
{
,extension .tl_set:N = \XR@ext
,extension .initial:n= pdf
- ,hypertexnames .choice:
- ,hypertexnames / true .code:n = { \Hy@hypertexnamestrue}
- ,hypertexnames / false .code:n = { \Hy@hypertexnamesfalse}
- ,hypertexnames .default:n = {true}
+ ,hypertexnames .legacy_if_set:n = {Hy@hypertexnames}
,linkfileprefix .tl_set:N = \Hy@linkfileprefix
- ,localanchorname .choice:
- ,localanchorname / true .code:n = { \Hy@localanchornametrue }
- ,localanchorname / false .code:n = { \Hy@localanchornamefalse }
- ,localanchorname .default:n = {true}
- ,naturalnames .choice:
- ,naturalnames / true .code:n = { \Hy@naturalnamestrue}
- ,naturalnames / false .code:n = { \Hy@naturalnamesfalse}
- ,naturalnames .default:n = {true}
- ,pageanchor .choice:
- ,pageanchor / true .code:n = { \Hy@pageanchortrue}
- ,pageanchor / false .code:n = { \Hy@pageanchorfalse}
- ,pageanchor .default:n = {true}
- ,plainpages .choice:
- ,plainpages / true .code:n = { \Hy@plainpagestrue}
- ,plainpages / false .code:n = { \Hy@plainpagesfalse}
- ,plainpages .default:n = {true}
+ ,localanchorname .legacy_if_set:n = {Hy@localanchorname}
+ ,naturalnames .legacy_if_set:n = {Hy@naturalnames}
+ ,pageanchor .legacy_if_set:n = {Hy@pageanchor}
+ ,plainpages .legacy_if_set:n = {Hy@plainpages}
}
\keys_define:nn { hyp / setup }
@@ -1502,14 +1483,8 @@
,bookmarks / false .code:n = {\RemoveFromHook {begindocument/before}[hyperref/bookmark]}
,bookmarks / true .code:n = {}
,bookmarks .default:n = {true}
- ,bookmarksnumbered .choice:
- ,bookmarksnumbered / false .code:n = { \Hy@bookmarksnumberedfalse }
- ,bookmarksnumbered / true .code:n = { \Hy@bookmarksnumberedtrue }
- ,bookmarksnumbered .default:n = {true}
- ,bookmarksopen .choice:
- ,bookmarksopen / false .code:n = { \Hy@bookmarksopenfalse }
- ,bookmarksopen / true .code:n = { \Hy@bookmarksopentrue }
- ,bookmarksopen .default:n = {true}
+ ,bookmarksnumbered .legacy_if_set:n = {Hy@bookmarksnumbered}
+ ,bookmarksopen .legacy_if_set:n = {Hy@bookmarksopen}
,bookmarksopenlevel .tl_set:N = \@bookmarksopenlevel
,bookmarkstype .tl_set:N = \Hy@bookmarkstype
,pdfcenterwindow .choice:
@@ -3481,6 +3456,8 @@
\hss
}%
}
+\@ifundefined{hyper@nopatch@sectioning}
+{
\let\H@old@ssect\@ssect
\def\@ssect#1#2#3#4#5{%
\Hy@MakeCurrentHrefAuto{section*}%
@@ -3569,6 +3546,7 @@
\H@old@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]{#8}%
}%
}
+}{}
\expandafter\def\csname Parent-4\endcsname{}
\expandafter\def\csname Parent-3\endcsname{}
\expandafter\def\csname Parent-2\endcsname{}
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 623388bcfc8..5c77d8ce6b0 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-07-08}{0.95q}
+\ProvidesExplPackage{hyperxmp-patches-tmp-ltx}{2022-08-24}{0.95r}
{Store hyperref metadata in XMP format / temporay patches to test pdfresource management ... UF}
\cs_if_exist:NT \pdfmanagement_add:nnn
@@ -153,6 +153,10 @@
{\AddToDocumentProperties[hyperref]{pdfauthor}{Title}}
}
+% hyperxmp recalculates pdfproduce at begin document and we should copy that definition
+\AddToHook{begindocument/end}
+ {\edef\next{\noexpand\AddToDocumentProperties[hyperref]{pdfproducer}{\@pdfproducer}}\next}
+
\DeclareHookRule{begindocument/before}{pdfmanagement/firstaid/hyperxmp}{before}{hyperxmp}
% hyperxmp puts the code into enddocument, but for xetex this is too late.
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 4961b8905c1..ae72606474a 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-07-08}{}
+ {l3backend-testphase-dvipdfmx.def}{2022-08-24}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx}
\RequirePackage{l3ref-tmp}
\cs_generate_variant:Nn \ref_label:nn {en}
@@ -120,8 +120,8 @@
\hook_gset_rule:nnnn{shipout/firstpage}{l3backend-dvipdfmx}{after}{pdf}
\clist_map_inline:Nn \c__pdf_backend_PageResources_clist
{
- \__pdf_backend_object_new:nn { __pdf/Page/Resources/#1 } { dict }
- \hook_gput_code:nnn{shipout/firstpage}{pdf}{\__pdf_backend_object_write:nn { __pdf/Page/Resources/#1 } {}}
+ \pdf_object_new:nn { __pdf/Page/Resources/#1 } { dict }
+ \hook_gput_code:nnn{shipout/firstpage}{pdf}{\pdf_object_write:nn { __pdf/Page/Resources/#1 } {}}
}
\cs_new_protected:Npn \__pdf_backend_PageResources:n #1
{
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 e81514f70e1..86be59a5a81 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-07-08}{}
+ {l3backend-testphase-dvips.def}{2022-08-24}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: dvips}
\RequirePackage{l3ref-tmp}
\cs_generate_variant:Nn \ref_label:nn {en}
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 1ed006bf09f..12e95a1c0c8 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-07-08}{}
+ {l3backend-testphase-dvisvgm.def}{2022-08-24}{}
{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 ed0ab64b8ee..f750dbff875 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-07-08}{}
+ {l3backend-testphase-luatex.def}{2022-08-24}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)}
\RequirePackage{l3ref-tmp}
\cs_generate_variant:Nn \ref_label:nn {en}
@@ -153,7 +153,7 @@
}
\clist_map_inline:Nn \c__pdf_backend_PageResources_clist
{
- \__pdf_backend_object_new:nn {__pdf/Page/Resources/#1} {dict}
+ \pdf_object_new:nn {__pdf/Page/Resources/#1} {dict}
\cs_if_exist:NT \tex_directlua:D
{
\tex_directlua:D
@@ -180,7 +180,7 @@
\prop_if_empty:cF
{ \__kernel_pdfdict_name:n { g__pdf_Core/Page/Resources/##1} }
{
- \__pdf_backend_object_write:nx
+ \pdf_object_write:nx
{ __pdf/Page/Resources/##1 }
{ \pdfdict_use:n { g__pdf_Core/Page/Resources/##1} }
}
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 1b1d284d39b..6d5f16690d0 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-07-08}{}
+ {l3backend-testphase-pdftex.def}{2022-08-24}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)}
\RequirePackage{l3ref-tmp}
\cs_generate_variant:Nn \ref_label:nn {en}
@@ -88,12 +88,9 @@
{
%we need to know the page the resource should be added too.
\int_gincr:N\g__pdf_backend_resourceid_int
- %\zref@labelbylist {l3pdf\int_use:N\g__pdf_backend_resourceid_int} {l3pdf}
- %\ref_label:en{l3pdf\int_use:N\g__pdf_backend_resourceid_int}{abspage}
- \__pdf_backend_ref_label:en { l3pdf\int_use:N\g__pdf_backend_resourceid_int }{abspage}
+ \__pdf_backend_ref_label:en { l3pdf\int_use:N\g__pdf_backend_resourceid_int }{abspage}
\tl_set:Nx \l__pdf_tmpa_tl
{
- %\zref@extractdefault
\__pdf_backend_ref_value:en {l3pdf\int_use:N\g__pdf_backend_resourceid_int}{abspage}
}
\pdfdict_if_exist:nF { g__pdf_Core/backend_Page\l__pdf_tmpa_tl}
@@ -127,7 +124,7 @@
}
\clist_map_inline:Nn \c__pdf_backend_PageResources_clist
{
- \__pdf_backend_object_new:nn {__pdf/Page/Resources/#1} {dict}
+ \pdf_object_new:nn {__pdf/Page/Resources/#1} {dict}
\cs_if_exist:NT \tex_directlua:D
{
\tex_directlua:D
@@ -149,7 +146,7 @@
\prop_if_empty:cF
{ \__kernel_pdfdict_name:n { g__pdf_Core/Page/Resources/##1} }
{
- \__pdf_backend_object_write:nx
+ \pdf_object_write:nx
{ __pdf/Page/Resources/##1 }
{ \pdfdict_use:n { g__pdf_Core/Page/Resources/##1} }
}
@@ -172,12 +169,9 @@
{ \__pdf_backend_object_ref:n { #2 } }
}
{
- %\zref@labelbylist
\__pdf_backend_ref_label:en{l3pdf\int_use:N\g__pdf_backend_resourceid_int}{abspage}
\tl_set:Nx \l__pdf_tmpa_tl
{
- %\zref@extractdefault
- %\ref_value:en{l3pdf\int_use:N\g__pdf_backend_resourceid_int}{abspage}
\__pdf_backend_ref_value:en{l3pdf\int_use:N\g__pdf_backend_resourceid_int}{abspage}
}
\pdfdict_if_exist:nF { g__pdf_Core/backend_Page\l__pdf_tmpa_tl/Resources/Properties }
@@ -205,13 +199,9 @@
{ \__pdf_backend_object_last: }
}
{
- %\zref@labelbylist
- %\ref_label:en{l3pdf\int_use:N\g__pdf_backend_resourceid_int}{abspage}
\__pdf_backend_ref_label:en{l3pdf\int_use:N\g__pdf_backend_resourceid_int}{abspage}
\tl_set:Nx \l__pdf_tmpa_tl
{
- %\zref@extractdefault
- % \ref_value:en{l3pdf\int_use:N\g__pdf_backend_resourceid_int}{abspage}
\__pdf_backend_ref_value:en{l3pdf\int_use:N\g__pdf_backend_resourceid_int}{abspage}
}
\pdfdict_if_exist:nF { g__pdf_Core/backend_Page\l__pdf_tmpa_tl/Resources/Properties }
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 6af67f4ed14..3e3f2260739 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-07-08}{}
+ {l3backend-testphase-xetex.def}{2022-08-24}{}
{LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX}
\RequirePackage{l3ref-tmp}
\cs_generate_variant:Nn \ref_label:nn {en}
@@ -120,8 +120,8 @@
\hook_gset_rule:nnnn{shipout/firstpage}{l3backend-xetex}{after}{pdf}
\clist_map_inline:Nn \c__pdf_backend_PageResources_clist
{
- \__pdf_backend_object_new:nn { __pdf/Page/Resources/#1 } { dict }
- \hook_gput_code:nnn{shipout/firstpage}{pdf}{\__pdf_backend_object_write:nn { __pdf/Page/Resources/#1 } {}}
+ \pdf_object_new:nn { __pdf/Page/Resources/#1 } { dict }
+ \hook_gput_code:nnn{shipout/firstpage}{pdf}{\pdf_object_write:nn { __pdf/Page/Resources/#1 } {}}
}
\cs_new_protected:Npn \__pdf_backend_PageResources:n #1
{
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 5cf58e30097..2b39d5ec3b4 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-07-08}{0.95q}%
+\ProvidesExplPackage{l3pdffield-testphase}{2022-08-24}{0.95r}%
{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 ff8088006c3..1cefb7112c1 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-07-08}{0.95q}
+\ProvidesExplPackage{pdflscape-ltx}{2022-08-24}{0.95r}
{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 4ea886e3059..be55fe9a7f6 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-07-08}{0.95q}
+\ProvidesExplPackage{pdfmanagement-firstaid}{2022-08-24}{0.95r}
{LaTeX PDF management testphase bundle / firstaid-patches}
\clist_map_inline:nn {pgf,transparent,hyperxmp,pdflscape,xcolor,color,beamer,output,colorspace,fontspec}
@@ -82,7 +82,7 @@
{
package/xcolor/after
}
- {\RequirePackage{xcolor-patches-tmp-ltx}\XC@@names}
+ {\RequirePackage{xcolor-patches-tmp-ltx}}
}
\bool_if:NT \g__pdfmanagement_firstaid_pgf_bool
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 f09e8eab565..7e7cff0f66f 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-07-08}{0.95q}
+\ProvidesExplFile{pdfmanagement-testphase.ltx}{2022-08-24}{0.95r}
{PDF~management~code~(testphase)}
%% File: l3pdfdict.dtx
\cs_new:Npn \__pdfdict_get_type:n #1
@@ -718,8 +718,8 @@
\prop_if_empty:cF
{ \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AA } }
{
- \__pdf_backend_object_new:nn { __pdfmanagement/Catalog/AA } { dict }
- \__pdf_backend_object_write:nx
+ \pdf_object_new:nn { __pdfmanagement/Catalog/AA } { dict }
+ \pdf_object_write:nx
{ __pdfmanagement/Catalog/AA }
{ \pdfdict_use:n { g__pdf_Core/Catalog/AA } }
\exp_args:Nnx
@@ -734,8 +734,8 @@
{
\seq_if_empty:cF { g__pdfmanagement_/Catalog/AcroForm/Fields_seq }
{
- \__pdf_backend_object_new:nn { __pdfmanagement/Catalog/AcroForm/Fields } { array }
- \__pdf_backend_object_write:nx
+ \pdf_object_new:nn { __pdfmanagement/Catalog/AcroForm/Fields } { array }
+ \pdf_object_write:nx
{ __pdfmanagement/Catalog/AcroForm/Fields }
{ \seq_use:cn { g__pdfmanagement_/Catalog/AcroForm/Fields_seq } {~} }
\exp_args:Nnnx
@@ -746,9 +746,9 @@
}
\seq_if_empty:cF { g__pdfmanagement_/Catalog/AcroForm/CO_seq }
{
- \__pdf_backend_object_new:nn { __pdfmanagement/Catalog/AcroForm/CO } { array }
+ \pdf_object_new:nn { __pdfmanagement/Catalog/AcroForm/CO } { array }
\exp_args:Nnx
- \__pdf_backend_object_write:nn
+ \pdf_object_write:nn
{ __pdfmanagement/Catalog/AcroForm/CO }
{ \seq_use:cn { g__pdfmanagement_/Catalog/AcroForm/CO_seq } {~} }
\exp_args:Nnnx
@@ -759,9 +759,9 @@
}
\prop_if_empty:cF { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm/DR/Font}}
{
- \__pdf_backend_object_new:nn { __pdfmanagement/Catalog/AcroForm/DR/Font } {dict}
+ \pdf_object_new:nn { __pdfmanagement/Catalog/AcroForm/DR/Font } {dict}
\exp_args:Nnx
- \__pdf_backend_object_write:nn
+ \pdf_object_write:nn
{ __pdfmanagement/Catalog/AcroForm/DR/Font }
{ \pdfdict_use:n { g__pdf_Core/Catalog/AcroForm/DR/Font } }
\exp_args:Nnnx
@@ -772,9 +772,9 @@
}
\prop_if_empty:cF { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm/DR}}
{
- \__pdf_backend_object_new:nn { __pdfmanagement/Catalog/AcroForm/DR } {dict}
+ \pdf_object_new:nn { __pdfmanagement/Catalog/AcroForm/DR } {dict}
\exp_args:Nnx
- \__pdf_backend_object_write:nn
+ \pdf_object_write:nn
{ __pdfmanagement/Catalog/AcroForm/DR }
{ \pdfdict_use:n { g__pdf_Core/Catalog/AcroForm/DR } }
\exp_args:Nnnx
@@ -785,9 +785,9 @@
}
\prop_if_empty:cF { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm} }
{
- \__pdf_backend_object_new:nn { __pdfmanagement/Catalog/AcroForm } {dict}
+ \pdf_object_new:nn { __pdfmanagement/Catalog/AcroForm } {dict}
\exp_args:Nnx
- \__pdf_backend_object_write:nn
+ \pdf_object_write:nn
{ __pdfmanagement/Catalog/AcroForm }
{ \pdfdict_use:n { g__pdf_Core/Catalog/AcroForm } }
\exp_args:Nnnx
@@ -803,9 +803,9 @@
\seq_if_empty:cF
{ g__pdfmanagement_/Catalog/AF_seq }
{
- \__pdf_backend_object_new:nn { __pdfmanagement/Catalog/AF } { array }
+ \pdf_object_new:nn { __pdfmanagement/Catalog/AF } { array }
\exp_args:Nnx
- \__pdf_backend_object_write:nn
+ \pdf_object_write:nn
{ __pdfmanagement/Catalog/AF }
{ \seq_use:cn { g__pdfmanagement_/Catalog/AF_seq } {~} }
\exp_args:Nnx
@@ -821,9 +821,9 @@
\prop_if_empty:cF
{ \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/MarkInfo } }
{
- \__pdf_backend_object_new:nn { __pdfmanagement/Catalog/MarkInfo } { dict }
+ \pdf_object_new:nn { __pdfmanagement/Catalog/MarkInfo } { dict }
\exp_args:Nnx
- \__pdf_backend_object_write:nn
+ \pdf_object_write:nn
{ __pdfmanagement/Catalog/MarkInfo }
{ \pdfdict_use:n { g__pdf_Core/Catalog/MarkInfo } }
\exp_args:Nnx
@@ -844,10 +844,10 @@
>
{ 0 }
{
- \__pdf_backend_object_new:nn { __pdfmanagement/Catalog/OCProperties } { dict }
+ \pdf_object_new:nn { __pdfmanagement/Catalog/OCProperties } { dict }
\seq_gpop_left:cN { g__pdfmanagement_/Catalog/OCProperties/Configs_seq} \l__pdfmanagement_tmpa_tl
\exp_args:Nnx
- \__pdf_backend_object_write:nn {__pdfmanagement/Catalog/OCProperties}
+ \pdf_object_write:nn {__pdfmanagement/Catalog/OCProperties}
{
/OCGs~[ \seq_use:cn { g__pdfmanagement_/Catalog/OCProperties/OCGs_seq } {~} ]
/D~\l__pdfmanagement_tmpa_tl~
@@ -868,9 +868,9 @@
\seq_if_empty:cF
{ g__pdfmanagement_/Catalog/OutputIntents_seq }
{
- \__pdf_backend_object_new:nn { __pdfmanagement/Catalog/OutputIntents } { array }
+ \pdf_object_new:nn { __pdfmanagement/Catalog/OutputIntents } { array }
\exp_args:Nnx
- \__pdf_backend_object_write:nn
+ \pdf_object_write:nn
{ __pdfmanagement/Catalog/OutputIntents }
{ \seq_use:cn { g__pdfmanagement_/Catalog/OutputIntents_seq } {~} }
\exp_args:Nnx
@@ -886,9 +886,9 @@
\seq_if_empty:cF
{ g__pdfmanagement_/Catalog/Requirements_seq }
{
- \__pdf_backend_object_new:nn { __pdfmanagement/Catalog/Requirements } { array }
+ \pdf_object_new:nn { __pdfmanagement/Catalog/Requirements } { array }
\exp_args:Nnx
- \__pdf_backend_object_write:nn
+ \pdf_object_write:nn
{ __pdfmanagement/Catalog/Requirements }
{ \seq_use:cn { g__pdfmanagement_/Catalog/Requirements_seq } {~} }
\exp_args:Nnx
@@ -904,9 +904,9 @@
\prop_if_empty:cF
{ \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/ViewerPreferences } }
{
- \__pdf_backend_object_new:nn { __pdfmanagement/Catalog/ViewerPreferences } { dict }
+ \pdf_object_new:nn { __pdfmanagement/Catalog/ViewerPreferences } { dict }
\exp_args:Nnx
- \__pdf_backend_object_write:nn
+ \pdf_object_write:nn
{ __pdfmanagement/Catalog/ViewerPreferences }
{ \pdfdict_use:n { g__pdf_Core/Catalog/ViewerPreferences } }
\exp_args:Nnx
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 c52d7d08cf2..34ad090aa17 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-07-08}{0.95q}
+\ProvidesExplPackage{pdfmanagement-testphase}{2022-08-24}{0.95r}
{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 8218bd26d76..bf44fbeb221 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-07-08}{0.95q}
+\ProvidesExplPackage{transparent-ltx}{2022-08-24}{0.95r}
{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 ad78d86b812..88c8bf739dd 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,91 +1,24 @@
%% LaTeX2e file `xcolor-patches.sty'
%%
-\ProvidesPackage{xcolor-patches-tmp-ltx}[2022-07-08 v0.95q patch xcolor for l3color]
+\ProvidesPackage{xcolor-patches-tmp-ltx}[2022-08-24 v0.95r patch xcolor for l3color]
\@ifundefined{color_set:nn}{\RequirePackage{l3color}}{}
\ExplSyntaxOn
-% #1 is the color name
-% #2: model or models
-% #3: value: either numbers or a color name
-% #4 is the type: named or ps
-\cs_gset_protected:Npn \__pdfmanagement_firstaid_xcolor_set:nnnn #1 #2 #3 #4
- {
- \str_case:nnF {#4}
- {
- % we ignore the ps type for now.
- {ps}{}
- {named}
- {
- \cs_if_exist:cT { __color_parse_model_ #2 :w }
- {
- \color_set:nnn {#1}{#2}{#3}
- }
- }
- }
- {
- \cs_if_exist:cTF { __color_parse_model_ #2 :w }
- {
- \color_set:nnn {#1}{#2}{#3}
- }
- {
- \tl_if_eq:nnTF{#2}{named}%this the model not the type!
- {
- \color_set:nn{#1}{#3}
- }
- {
- %this is for multi models, it will break if there is model
- %l3 doesn't know, but the case is rare, so accept it for now.
- \str_if_in:nnT {#2}{/}
- {
- \color_set:nnn{#1}{#2}{#3}
- }
- }
- }
- }
- }
-\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
- {
- \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}
-\def\XC@col@rlet[#1]#2[#3]#4%
- {\@expl@xcolor@set@@ne{#2}{#4}%
- \begingroup
- \edef\@@cls{#1}\XC@edef\@@nam{#2}\XC@sdef\@@mod{#3}\XC@edef\@@clr{#4}%
- \XC@info\@@clr\@@tmp\XC@@tstfalse
- \ifnum\@@tmp=\@ne\ifx\@@mod\@empty
- \ifx\@@cls\@empty
- \XC@@tsttrue
- \else
- \edef\@@tmp
- {\expandafter\expandafter\expandafter\@secondoffive
- \csname\string\color@\@@clr\endcsname}%
- \ifx\@@cls\@@tmp\XC@@tsttrue\fi
- \fi
- \fi\fi
- \ifXC@@tst
- \XC@logdef\@@nam\XC@c@l@rlet\@@nam\@@clr
- \else
- \extractcolorspec\@@clr\@@clr
- \ifx\@@mod\@empty\else
- \expandafter\convertcolorspec\@@clr\@@mod\@@clr
- \edef\@@clr{{\@@mod}{\@@clr}}\fi
- \edef\@@tmp{\noexpand\XC@definecolor[\@@cls]{\@@nam}\@@clr}%
- \fi
- \expandafter\endgroup\@@tmp\xglobal@stop}
+\cs_set_protected:Npn \expl@color@set@@nnn #1#2#3
+ {
+ \color_set:nnn{#1}{#2}{#3}
+ }
-%\pretocmd{\XC@definec@lor}{\@expl@color@set@@nnn{#2}{#4}{#5}}{}{\fail}
+\cs_set_protected:Npn \expl@color@set@eq@@nn #1 #2
+ {
+ \color_if_exist:nT{#2}
+ {
+ \color_set_eq:nn{#1}{#2}
+ }
+ }
+\ExplSyntaxOff
\def\XC@definec@lor[#1]#2[#3]#4#5%
- {\@expl@xcolor@set@@nonn{#2}{#4}{#5}{#1}%
- \begingroup
+ {\begingroup
\XC@sdef\@@cls{#1}\XC@edef\@@nam{#2}\edef\colornameprefix{#3}%
\XC@logdef\@@nam
\XC@getmodclr02{#4}{#5}{\let\@@tmp\relax}%
@@ -118,10 +51,18 @@
\toks@\expandafter{\@@drv}%
\edef\@@tmp
{\ifglobalcolors\global\else\xglobal@\fi
- \noexpand\@namedef{\string\color@\@@nam}%
- {\noexpand\xcolor@{\@@cls}{\the\toks@}{\@@mod}{\@@clr}}}%
+ \noexpand\@namedef{\@backslashchar color@\@@nam}%
+ {\noexpand\xcolor@{\@@cls}{\the\toks@}{\@@mod}{\@@clr}}%
+ \noexpand\expl@color@set@@nnn{\@@nam}{\@@mod}{\@@clr}}%
\fi}%
\expandafter\endgroup\@@tmp\xglobal@stop}
+\def\XC@c@l@rlet#1#2%
+ {\@ifundefinedcolor{#2}%
+ {\c@lor@error{`#2'}\let\@@tmp\@empty}%
+ {\edef\@@tmp
+ {\ifglobalcolors\global\else\xglobal@\fi
+ \noexpand\XC@let@cc{\@backslashchar color@#1}{\@backslashchar color@#2}%
+ \noexpand\expl@color@set@eq@@nn{#1}{#2}}}}
%re-predefine the colors
\definecolorset{rgb/hsb/cmyk/gray}{}{}%
@@ -139,4 +80,5 @@
gray,.5/.5,.5,.5/0,0,.5/0,0,0,.5;%
lightgray,.75/.75,.75,.75/0,0,.75/0,0,0,.25}
+\XC@@names
\endinput