[latex3-commits] [git/LaTeX3-latex3-pdfresources] test-drop-zref: replace zref by xref (c69996b)

[Ulrike Fischer]

Repository : https://github.com/latex3/pdfresources
On branch  : test-drop-zref
Link       : https://github.com/latex3/pdfresources/commit/c69996b8bfaf0bf43558dcb071b827330a3d158b

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

commit c69996b8bfaf0bf43558dcb071b827330a3d158b
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Tue Nov 17 14:50:56 2020 +0100

    replace zref by xref


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

c69996b8bfaf0bf43558dcb071b827330a3d158b
 l3backend-pdf-extra.dtx | 53 +++++++++++++++++++++++++++++--------------------
 pdfresources.dtx        |  3 ++-
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/l3backend-pdf-extra.dtx b/l3backend-pdf-extra.dtx
index 3cc36f8..345408b 100644
--- a/l3backend-pdf-extra.dtx
+++ b/l3backend-pdf-extra.dtx
@@ -58,6 +58,9 @@
 %
 %    \begin{macrocode}
 %<@@=pdf>
+\RequirePackage{l3xref}
+\cs_generate_variant:Nn \xref_label:nn {en}
+\cs_generate_variant:Nn \xref_value:nn {en}
 %    \end{macrocode}
 %    \begin{macrocode}
 %<*dvipdfmx|xdvipdfmx>
@@ -82,9 +85,9 @@
 % new lthooks/ltshipout package.
 %    \begin{macrocode}
 %<*drivers>
-\zref at newlist  { l3pdf }
-\zref at newprop* { pdf at abspage } [0] { \int_use:N \g_shipout_readonly_int }
-\zref at addprop  { l3pdf } { pdf at abspage }
+%\zref at newlist  { l3pdf }
+%\zref at newprop* { pdf at abspage } [0] { \int_use:N \g_shipout_readonly_int }
+%\zref at addprop  { l3pdf } { pdf at abspage }
 %</drivers>
 %    \end{macrocode}
 %
@@ -270,13 +273,15 @@
   {
     %we need to know the page the resource should be added too.
     \int_gincr:N\g_@@_backend_resourceid_int
-    \zref at labelbylist {l3pdf\int_use:N\g_@@_backend_resourceid_int} {l3pdf}
+    %\zref at labelbylist {l3pdf\int_use:N\g_@@_backend_resourceid_int} {l3pdf}
+    \xref_label:en{l3pdf\int_use:N\g_@@_backend_resourceid_int}{abspage}
     \tl_set:Nx \l_@@_tmpa_tl
       {
-        \zref at extractdefault
-          {l3pdf\int_use:N\g_@@_backend_resourceid_int}
-          {pdf at abspage}
-          {0}
+        %\zref at extractdefault
+%          {l3pdf\int_use:N\g_@@_backend_resourceid_int}
+%          {pdf at abspage}
+%          {0}
+        \xref_value:en{l3pdf\int_use:N\g_@@_backend_resourceid_int}{abspage}
       }
     \pdfdict_if_exist:nnF { g } {Core/backend_Page\l_@@_tmpa_tl}
       {
@@ -864,15 +869,17 @@
           { \@@_backend_object_ref:n { #2 } }
       }
       {
-        \zref at labelbylist
-          { l3pdf\int_use:N\g_@@_backend_resourceid_int }
-          { l3pdf }
+        %\zref at labelbylist
+%          { l3pdf\int_use:N\g_@@_backend_resourceid_int }
+%          { l3pdf }
+        \xref_label:en{l3pdf\int_use:N\g_@@_backend_resourceid_int}{abspage}
         \tl_set:Nx \l_@@_tmpa_tl
           {
-            \zref at extractdefault
-              { l3pdf\int_use:N\g_@@_backend_resourceid_int }
-              {pdf at abspage}
-              {0}
+            %\zref at extractdefault
+%              { l3pdf\int_use:N\g_@@_backend_resourceid_int }
+%              {pdf at abspage}
+%              {0}
+            \xref_value:en{l3pdf\int_use:N\g_@@_backend_resourceid_int}{abspage}
           }
         \pdfdict_if_exist:nnF { g } { Core/backend_Page\l_@@_tmpa_tl/Resources/Properties }
           {
@@ -899,15 +906,17 @@
           { \@@_backend_object_last: }
       }
       {
-        \zref at labelbylist
-          { l3pdf\int_use:N\g_@@_backend_resourceid_int }
-          { l3pdf }
+        %\zref at labelbylist
+%          { l3pdf\int_use:N\g_@@_backend_resourceid_int }
+%          { l3pdf }
+       \xref_label:en{l3pdf\int_use:N\g_@@_backend_resourceid_int}{abspage}
         \tl_set:Nx \l_@@_tmpa_tl
           {
-            \zref at extractdefault
-              { l3pdf\int_use:N\g_@@_backend_resourceid_int }
-              {pdf at abspage}
-              {0}
+            %\zref at extractdefault
+%              { l3pdf\int_use:N\g_@@_backend_resourceid_int }
+%              {pdf at abspage}
+%              {0}
+            \xref_value:en{l3pdf\int_use:N\g_@@_backend_resourceid_int}{abspage}
           }
         \pdfdict_if_exist:nnF { g } { Core/backend_Page\l_@@_tmpa_tl/Resources/Properties }
           {
diff --git a/pdfresources.dtx b/pdfresources.dtx
index 04c82e6..321b95f 100644
--- a/pdfresources.dtx
+++ b/pdfresources.dtx
@@ -38,7 +38,8 @@
 %<*package>
 \ProvidesExplPackage {pdfresources} {2020-07-13} {0.7}
   {experimental pdf-resource management}
-\RequirePackage{zref-base,bitset}
+%\RequirePackage{zref-base}
+\RequirePackage{bitset}
 \DeclareOption { debug }
   {
     \msg_redirect_module:nnn { pdf } { none } { warning }