[latex3-commits] [latex3/latex2e] latex-lab/uf-review-05: update pdfmanagement (eb99ab8c)

github at latex-project.org github at latex-project.org
Wed Nov 8 23:34:28 CET 2023


Repository : https://github.com/latex3/latex2e
On branch  : latex-lab/uf-review-05
Link       : https://github.com/latex3/latex2e/commit/eb99ab8c38040a55f023f619502324d546378cdd

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

commit eb99ab8c38040a55f023f619502324d546378cdd
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Wed Nov 8 23:34:28 2023 +0100

    update pdfmanagement


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

eb99ab8c38040a55f023f619502324d546378cdd
 .../pdfmanagement-testphase/hgeneric-testphase.def |  56 ++--------
 .../l3backend-testphase-dvipdfmx.def               |  38 ++-----
 .../l3backend-testphase-dvips.def                  |  38 ++-----
 .../l3backend-testphase-dvisvgm.def                |  38 ++-----
 .../l3backend-testphase-luatex.def                 |  38 ++-----
 .../l3backend-testphase-pdftex.def                 |  38 ++-----
 .../l3backend-testphase-xetex.def                  |  38 ++-----
 .../latex/pdfmanagement-testphase/l3ref-tmp.sty    | 124 ---------------------
 8 files changed, 69 insertions(+), 339 deletions(-)

diff --git a/texmf/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def b/texmf/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def
index a9e7d4c3..a51ad39e 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def
+++ b/texmf/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def
@@ -454,51 +454,13 @@
   {
     \PassOptionsToPackage{draft}{bookmark}
   }
-\cs_if_exist:NTF \property_new:nnnn
-  {
-    \cs_new_protected:Npn \__hyp_property_record:nn #1 #2 %label/attributes
-     {
-       \@bsphack
-         \property_record:nn{#1}{#2}
-       \@esphack
-     }
-    \prg_new_eq_conditional:NNn
-      \__hyp_property_if_recorded:nn \property_if_recorded:nn { T }
-    \cs_new_eq:NN \__hyp_property_ref_undefined_warn:nn \property_ref_undefined_warn:nn
-    \cs_new_eq:NN \__hyp_property_ref:nn \property_ref:nn
-  }
-  {
-    \cs_new_protected:Npn \__hyp_property_record:nn #1 #2 %label/attributes
-      {
-        \@bsphack
-          \ref_label:nn{#1}{#2}
-        \@esphack
-      }
-
-    \prg_new_eq_conditional:NNn \__hyp_property_if_recorded:nn \ref_if_exist:nn { T }
-
-    \cs_new_protected:Npn \__hyp_property_ref_undefined_warn:nn #1 #2 %label/attribute
-      {
-        \__hyp_property_if_recorded:nnF {#1}{#2}
-          {
-            \protect\G at refundefinedtrue
-            \@latex at warning
-              {
-                Reference~'\tl_to_str:n {#1}'~with~attribute~'\tl_to_str:n {#2}'~
-                on~page~\thepage~\space undefined
-              }
-          }
-      }
-
-    \cs_new:Npn \__hyp_property_ref:nn #1 #2
-      {
-        \ref_value:nn{#1}{#2}
-      }
-  }
+\cs_new_protected:Npn \__hyp_property_record:nn #1 #2 %label/attributes
+ {
+   \@bsphack
+     \property_record:nn{#1}{#2}
+   \@esphack
+ }
 \cs_generate_variant:Nn \__hyp_property_record:nn {ee}
-\prg_generate_conditional_variant:Nnn \__hyp_property_if_recorded:nn  {ee}  { T }
-\cs_generate_variant:Nn \__hyp_property_ref_undefined_warn:nn {ee}
-\cs_generate_variant:Nn \__hyp_property_ref:nn {ee}
 \box_new:N \l__hyp_tmpa_box
 \tl_new:N  \l__hyp_tmpa_tl
 \seq_new:N \l__hyp_tmpa_seq
@@ -2584,15 +2546,15 @@
     %\zref at labelbylist {HyAnn@\the\HyAnn at Count} {l3pdf}
     %\zref at refused{HyAnn@\the\HyAnn at Count}%
     \__hyp_property_record:ee {HyAnn@\the\HyAnn at Count}{abspage}
-    \__hyp_property_ref_undefined_warn:ee {HyAnn@\the\HyAnn at Count}{abspage}
+    \property_ref_undefined_warn:ee {HyAnn@\the\HyAnn at Count}{abspage}
   }%
 \def\Fld at pageobjref
   {
-    \__hyp_property_if_recorded:eeT {HyAnn@\the\HyAnn at Count}{abspage}
+    \property_if_recorded:eeT {HyAnn@\the\HyAnn at Count}{abspage}
       {
         /P~\pdf_pageobject_ref:e
           {
-            \__hyp_property_ref:ee{HyAnn@\the\HyAnn at Count}{abspage}
+            \property_ref:ee{HyAnn@\the\HyAnn at Count}{abspage}
           }
       }
   }
diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def
index 37bca32a..3898095e 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def
+++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def
@@ -30,35 +30,17 @@
      { \tex_special:D~shipout { #1} }
  }
 
-\RequirePackage{l3ref-tmp}
-\cs_if_exist:NTF \property_new:nnnn
- {
-   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
-     {
-        \@bsphack
-        \property_record:nn{#1}{abspage}
-        \@esphack
-     }
-   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
-     {
-        \property_ref:nn{#1}{abspage}
-     }
+\cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
+  {
+     \@bsphack
+     \property_record:nn{#1}{abspage}
+     \@esphack
+  }
+\cs_new:Npn \__pdf_backend_ref_abspage:n #1
+  {
+     \property_ref:nn{#1}{abspage}
+  }
 
- }
- {
-   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
-    %% \__pdf_backend_ref_label:nn #1 #2
-     {
-        \@bsphack
-        \ref_label:nn{#1}{abspage}
-        \@esphack
-     }
-   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
-    %% \__pdf_backend_ref_value:nn #1 #2
-     {
-        \ref_value:nn{#1}{abspage}
-     }
- }
 \cs_generate_variant:Nn \__pdf_backend_record_abspage:n {e}
 \cs_generate_variant:Nn \__pdf_backend_ref_abspage:n {e}
     \__kernel_backend_literal:n { dvipdfmx:config~C~ 0x0010 }
diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def
index 3778a6d8..7710a258 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def
+++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def
@@ -30,35 +30,17 @@
      { \tex_special:D~shipout { #1} }
  }
 
-\RequirePackage{l3ref-tmp}
-\cs_if_exist:NTF \property_new:nnnn
- {
-   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
-     {
-        \@bsphack
-        \property_record:nn{#1}{abspage}
-        \@esphack
-     }
-   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
-     {
-        \property_ref:nn{#1}{abspage}
-     }
+\cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
+  {
+     \@bsphack
+     \property_record:nn{#1}{abspage}
+     \@esphack
+  }
+\cs_new:Npn \__pdf_backend_ref_abspage:n #1
+  {
+     \property_ref:nn{#1}{abspage}
+  }
 
- }
- {
-   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
-    %% \__pdf_backend_ref_label:nn #1 #2
-     {
-        \@bsphack
-        \ref_label:nn{#1}{abspage}
-        \@esphack
-     }
-   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
-    %% \__pdf_backend_ref_value:nn #1 #2
-     {
-        \ref_value:nn{#1}{abspage}
-     }
- }
 \cs_generate_variant:Nn \__pdf_backend_record_abspage:n {e}
 \cs_generate_variant:Nn \__pdf_backend_ref_abspage:n {e}
 \prop_new:N \g__pdf_tmpa_prop
diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def
index ab7012c1..4a3ca8e4 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def
+++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def
@@ -28,35 +28,17 @@
      { \tex_special:D~shipout { #1} }
  }
 
-\RequirePackage{l3ref-tmp}
-\cs_if_exist:NTF \property_new:nnnn
- {
-   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
-     {
-        \@bsphack
-        \property_record:nn{#1}{abspage}
-        \@esphack
-     }
-   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
-     {
-        \property_ref:nn{#1}{abspage}
-     }
+\cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
+  {
+     \@bsphack
+     \property_record:nn{#1}{abspage}
+     \@esphack
+  }
+\cs_new:Npn \__pdf_backend_ref_abspage:n #1
+  {
+     \property_ref:nn{#1}{abspage}
+  }
 
- }
- {
-   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
-    %% \__pdf_backend_ref_label:nn #1 #2
-     {
-        \@bsphack
-        \ref_label:nn{#1}{abspage}
-        \@esphack
-     }
-   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
-    %% \__pdf_backend_ref_value:nn #1 #2
-     {
-        \ref_value:nn{#1}{abspage}
-     }
- }
 \cs_generate_variant:Nn \__pdf_backend_record_abspage:n {e}
 \cs_generate_variant:Nn \__pdf_backend_ref_abspage:n {e}
 \prop_new:N \g__pdf_tmpa_prop
diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def
index 75d50bb2..2b2888e3 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def
+++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def
@@ -39,35 +39,17 @@
     }
  }
 
-\RequirePackage{l3ref-tmp}
-\cs_if_exist:NTF \property_new:nnnn
- {
-   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
-     {
-        \@bsphack
-        \property_record:nn{#1}{abspage}
-        \@esphack
-     }
-   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
-     {
-        \property_ref:nn{#1}{abspage}
-     }
+\cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
+  {
+     \@bsphack
+     \property_record:nn{#1}{abspage}
+     \@esphack
+  }
+\cs_new:Npn \__pdf_backend_ref_abspage:n #1
+  {
+     \property_ref:nn{#1}{abspage}
+  }
 
- }
- {
-   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
-    %% \__pdf_backend_ref_label:nn #1 #2
-     {
-        \@bsphack
-        \ref_label:nn{#1}{abspage}
-        \@esphack
-     }
-   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
-    %% \__pdf_backend_ref_value:nn #1 #2
-     {
-        \ref_value:nn{#1}{abspage}
-     }
- }
 \cs_generate_variant:Nn \__pdf_backend_record_abspage:n {e}
 \cs_generate_variant:Nn \__pdf_backend_ref_abspage:n {e}
 \prop_new:N \g__pdf_tmpa_prop
diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def
index 15ff542a..cb4ff240 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def
+++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def
@@ -39,35 +39,17 @@
     }
  }
 
-\RequirePackage{l3ref-tmp}
-\cs_if_exist:NTF \property_new:nnnn
- {
-   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
-     {
-        \@bsphack
-        \property_record:nn{#1}{abspage}
-        \@esphack
-     }
-   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
-     {
-        \property_ref:nn{#1}{abspage}
-     }
+\cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
+  {
+     \@bsphack
+     \property_record:nn{#1}{abspage}
+     \@esphack
+  }
+\cs_new:Npn \__pdf_backend_ref_abspage:n #1
+  {
+     \property_ref:nn{#1}{abspage}
+  }
 
- }
- {
-   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
-    %% \__pdf_backend_ref_label:nn #1 #2
-     {
-        \@bsphack
-        \ref_label:nn{#1}{abspage}
-        \@esphack
-     }
-   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
-    %% \__pdf_backend_ref_value:nn #1 #2
-     {
-        \ref_value:nn{#1}{abspage}
-     }
- }
 \cs_generate_variant:Nn \__pdf_backend_record_abspage:n {e}
 \cs_generate_variant:Nn \__pdf_backend_ref_abspage:n {e}
 \prop_new:N \g__pdf_tmpa_prop
diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def
index 7bf6539d..02a1ab2f 100644
--- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def
+++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def
@@ -30,35 +30,17 @@
      { \tex_special:D~shipout { #1} }
  }
 
-\RequirePackage{l3ref-tmp}
-\cs_if_exist:NTF \property_new:nnnn
- {
-   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
-     {
-        \@bsphack
-        \property_record:nn{#1}{abspage}
-        \@esphack
-     }
-   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
-     {
-        \property_ref:nn{#1}{abspage}
-     }
+\cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
+  {
+     \@bsphack
+     \property_record:nn{#1}{abspage}
+     \@esphack
+  }
+\cs_new:Npn \__pdf_backend_ref_abspage:n #1
+  {
+     \property_ref:nn{#1}{abspage}
+  }
 
- }
- {
-   \cs_new_protected:Npn \__pdf_backend_record_abspage:n #1
-    %% \__pdf_backend_ref_label:nn #1 #2
-     {
-        \@bsphack
-        \ref_label:nn{#1}{abspage}
-        \@esphack
-     }
-   \cs_new:Npn \__pdf_backend_ref_abspage:n #1
-    %% \__pdf_backend_ref_value:nn #1 #2
-     {
-        \ref_value:nn{#1}{abspage}
-     }
- }
 \cs_generate_variant:Nn \__pdf_backend_record_abspage:n {e}
 \cs_generate_variant:Nn \__pdf_backend_ref_abspage:n {e}
     \__kernel_backend_literal:n { dvipdfmx:config~C~ 0x0010 }
diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3ref-tmp.sty b/texmf/tex/latex/pdfmanagement-testphase/l3ref-tmp.sty
deleted file mode 100644
index f5d2a8ba..00000000
--- a/texmf/tex/latex/pdfmanagement-testphase/l3ref-tmp.sty
+++ /dev/null
@@ -1,124 +0,0 @@
-%% This is file `l3ref-tmp.sty',
-%%
-%% Copyright (C) 2020-2021 The LaTeX Project
-%%
-%% It may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License (LPPL), either version 1.3c of
-%% this license or (at your option) any later version.  The latest
-%% version of this license is in the file:
-%%
-%%    http://www.latex-project.org/lppl.txt
-%%
-%% This file is a tmp file in place of a future kernel module
-%% and subject to change without notice.
-%%
-\ProvidesExplPackage{l3ref-tmp}{2021-06-23}{}
-  {L3 Experimental cross-referencing}
-\cs_new_protected:Npn \ref_attribute_gset:nnnn #1#2#3#4
-  {
-    \exp_args:Nx \__ref_attribute_gset:nnnn { \tl_to_str:n {#1} }
-      {#2} {#3} {#4}
-  }
-\cs_new_protected:Npn \__ref_attribute_gset:nnnn #1#2#3#4
-  {
-    \cs_gset:cpn { __ref_attribute_ #1 : } {#4}
-    \tl_gclear_new:c { g__ref_default_ #1 _tl }
-    \tl_gset:cn { g__ref_default_ #1 _tl } {#2}
-    \bool_if_exist:cF { g__ref_shipout_ #1 _tl }
-      { \bool_new:c { g__ref_shipout_ #1 _tl } }
-    \str_case:nnF {#3}
-      {
-        { now } { { \bool_gset_false:c { g__ref_shipout_ #1 _tl } } }
-        { shipout }
-          { \bool_gset_true:c { g__ref_shipout_ #1 _tl } }
-      }
-      { \msg_error:nnnn { ref } { unknown-setpoint } {#1} {#3} }
-  }
-\cs_new_protected:Npn \ref_label:nN #1#2
-  { \ref_label:nV {#1} #2 }
-\cs_new_protected:Npn \ref_label:nn #1#2
-  { \exp_args:Nx \__ref_label:nn { \tl_to_str:n {#1} } {#2} }
-\cs_generate_variant:Nn \ref_label:nn { nV }
-\cs_new_protected:Npn \__ref_label:nn #1#2
-  {
-    \legacy_if:nT { @filesw }
-      {
-        \iow_shipout_x:Nx \@auxout
-          {
-            \token_to_str:N \newlabeldata
-              {#1}
-              { \clist_map_function:nN {#2} \__ref_label_attribute:n }
-          }
-      }
-  }
-\cs_new:Npn \__ref_label_attribute:n #1
-  { \exp_args:Ne \__ref_label_attribute_aux:n { \tl_to_str:n {#1} } }
-\cs_new:Npn \__ref_label_attribute_aux:n #1
-  {
-    \cs_if_exist:cTF { __ref_attribute_ #1 : }
-      {
-        {#1}
-        {
-          \bool_if:cTF { g__ref_shipout_ #1 _tl }
-            { \exp_not:c }
-            { \use:c }
-              { __ref_attribute_ #1 : }
-        }
-      }
-      { \msg_expandable_error:nnn { ref } { attribute-not-defined } {#1} }
-  }
-\cs_new:Npn \ref_value:nn #1#2
-  {
-    \exp_args:Nee \__ref_value:nn { \tl_to_str:n {#1} } { \tl_to_str:n {#2} }
-  }
-\cs_new:Npn \__ref_value:nn #1#2
-  {
-    \tl_if_exist:cTF { g__ref_label_ #1 _ #2 _tl }
-      { \tl_use:c { g__ref_label_ #1 _ #2 _tl } }
-      {
-        \tl_if_exist:cTF { g__ref_default_ #2 _tl }
-          { \tl_use:c { g__ref_default_ #2 _tl } }
-          { \exp_not:n { \textbf { ?? } } }
-      }
-  }
-\prg_new_conditional:Npnn \ref_if_exist:nn #1#2 { p , T , F,  TF }  % #1 label #2 attribute
-  {
-    \tl_if_exist:cTF { g__ref_label_ \tl_to_str:n {#1} _ \tl_to_str:n {#2} _tl }
-      {
-        \prg_return_true:
-      }
-      {
-        \prg_return_false:
-      }
-  }
-\cs_new_protected:Npn \newlabeldata #1#2
-  {
-    \__ref_data:nnn {#1} #2 { \q_recursion_tail } { ? } \q_recursion_stop
-  }
-\cs_new_protected:Npn \__ref_data:nnn #1#2#3
-  {
-    \quark_if_recursion_tail_stop:n {#2}
-    \tl_gclear_new:c { g__ref_label_ \tl_to_str:n {#1} _ \tl_to_str:n {#2} _tl }
-    \tl_gset:cn { g__ref_label_ \tl_to_str:n {#1} _ \tl_to_str:n {#2} _tl } {#3}
-    \__ref_data:nnn {#1}
-  }
-\ref_attribute_gset:nnnn { abspage } { 0 } { shipout }
-  { \int_use:N \g_shipout_readonly_int }
-\ref_attribute_gset:nnnn { page } { 0 } { shipout } { \thepage }
-\clist_new:N \g_ref_main_clist
-\clist_gput_right:Nn \g_ref_main_clist { page }
-\msg_new:nnnn { ref } { attribute-not-defined }
-  { Attribute~'#1'~not~defined. }
-  {
-    LaTeX~has~been~asked~to~use~attribute~'#1',~but~this~
-    name~has~not~been~defined.
-  }
-\msg_new:nnnn { ref } { unknown-setpoint }
-  { Unknown~keyword~'#3'~for~setting~attribute~'#1'. }
-  {
-    LaTeX~has~been~asked~to~set~the~attribute~'#1',~but~the~keyword~
-    '#3'~is~not~one~of~the~two~known~values:~'now'~or~'shipout'.
-  }
-%%
-%%
-%% End of file `l3ref.sty'.





More information about the latex3-commits mailing list.