[latex3-commits] [git/LaTeX3-latex3-pdfresources] splitting: addapt testfiles to l3pdfgdict (1a99e93)

Ulrike Fischer fischer at troubleshooting-tex.de
Tue Jul 7 19:16:06 CEST 2020


Repository : https://github.com/latex3/pdfresources
On branch  : splitting
Link       : https://github.com/latex3/pdfresources/commit/1a99e93527b08818cb34aec103e2a08cf4cfe12e

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

commit 1a99e93527b08818cb34aec103e2a08cf4cfe12e
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Sun Jun 14 15:47:56 2020 +0200

    addapt testfiles to l3pdfgdict


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

1a99e93527b08818cb34aec103e2a08cf4cfe12e
 hgeneric-experimental.def                  | 148 ++++++++++++++---------------
 newpackages/new-transparent.sty            |   6 +-
 pdfresources.dtx                           |   4 +-
 testfiles-dvips/annot.pvt                  |   6 +-
 testfiles-dvips/bdc-properties.pvt         |   6 +-
 testfiles-dvips/catalogAF.pvt              |  10 +-
 testfiles-dvips/ismap.pvt                  |   6 +-
 testfiles-dvips/linkhook.pvt               |   6 +-
 testfiles-dvips/pagelabels.pvt             |   6 +-
 testfiles-dvips/pdffilelink.pvt            |   6 +-
 testfiles-noxetex/extgstate-patches.pvt    |   2 +-
 testfiles-noxetex/metadata.pvt             |   2 +-
 testfiles-noxetex/test-new-transparent.pvt |   2 +-
 testfiles/catalog-remove.luatex.tlg        |  39 ++++----
 testfiles/catalog-remove.tlg               |  39 ++++----
 testfiles/catalog-remove.xetex.tlg         |  39 ++++----
 testfiles/dict_if_empty.lvt                |   7 +-
 testfiles/infodict.pvt                     |   4 +-
 testfiles/mixpageattr.pvt                  |   4 +-
 testfiles/ocproperties.pvt                 |   6 +-
 testfiles/pageattr.pvt                     |  14 +--
 testfiles/pagesattr.pvt                    |   8 +-
 testfiles/show.lvt                         |   6 +-
 testfiles/thispageattr.pvt                 |   4 +-
 testfiles/xform.pvt                        |   2 +-
 25 files changed, 190 insertions(+), 192 deletions(-)

diff --git a/hgeneric-experimental.def b/hgeneric-experimental.def
index e40a060..35b87dd 100644
--- a/hgeneric-experimental.def
+++ b/hgeneric-experimental.def
@@ -401,7 +401,7 @@
 % we simply hard code this for now until hyperref.sty itself can be adapted ...
 \cs_new_protected:Npn\__hyp_PageLabels_gpush:
   {
-    \pdfdict_gput:nnx {Catalog} {PageLabels}{<</Nums[\HyPL at Labels]>>}
+    \pdfgdict_gput:nnx {Catalog} {PageLabels}{<</Nums[\HyPL at Labels]>>}
   }
 
 
@@ -572,8 +572,8 @@
               /View  <</ViewState/OFF>>~
              >>
           }
-       \pdfdict_gput:nnx { Catalog / OCProperties }{OCGs }{ \pdf_object_ref:n {l__hyp_ocg_view_dict_obj} }
-       \pdfdict_gput:nnx { Catalog / OCProperties }{OCGs }{ \pdf_object_ref:n {l__hyp_ocg_print_dict_obj} }
+       \pdfgdict_gput:nnx { Catalog / OCProperties }{OCGs }{ \pdf_object_ref:n {l__hyp_ocg_view_dict_obj} }
+       \pdfgdict_gput:nnx { Catalog / OCProperties }{OCGs }{ \pdf_object_ref:n {l__hyp_ocg_print_dict_obj} }
        \pdf_object_write:nx { l__hyp_ocg_config_dict_obj }
          {
            /OFF[\pdf_object_ref:n { l__hyp_ocg_print_dict_obj }]
@@ -595,7 +595,7 @@
              >>
               ]
          }
-       \pdfdict_gput:nnx { Catalog / OCProperties }{ D }{ \pdf_object_ref:n { l__hyp_ocg_config_dict_obj} }
+       \pdfgdict_gput:nnx { Catalog / OCProperties }{ D }{ \pdf_object_ref:n { l__hyp_ocg_config_dict_obj} }
     }
     \Hy at AtBeginDocument
       {
@@ -882,24 +882,24 @@
        \__hyp_pstringdef:No \l__hyp_tmpa_tl {#1}%
         \tl_if_empty:NTF \l__hyp_tmpa_tl
           {
-             \pdfdict_gremove:nn {Catalog} { URI }
+             \pdfgdict_gremove:nn {Catalog} { URI }
           }
           {
-             \pdfdict_gput:nnx {Catalog} { URI }{ <</Base ( \l__hyp_tmpa_tl )>> }
+             \pdfgdict_gput:nnx {Catalog} { URI }{ <</Base ( \l__hyp_tmpa_tl )>> }
           }
      }
    ,pdfcenterwindow    .choice:
    ,pdfcenterwindow / false .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences }{ CenterWindow }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences }{ CenterWindow }
      }
    ,pdfcenterwindow / true .code:n =
      {
-       \pdfdict_gput:nnn {Catalog / ViewerPreferences } { CenterWindow }{ true }
+       \pdfgdict_gput:nnn {Catalog / ViewerPreferences } { CenterWindow }{ true }
      }
    ,pdfcenterwindow /  .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences }{ CenterWindow }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences }{ CenterWindow }
      }
    ,pdfcenterwindow / unknown .code:n =
      {
@@ -911,15 +911,15 @@
    ,pdfdirection    .choice:
    ,pdfdirection / L2R .code:n =
      {
-       \pdfdict_gput:nnn {Catalog / ViewerPreferences } { Direction }{ /L2R }
+       \pdfgdict_gput:nnn {Catalog / ViewerPreferences } { Direction }{ /L2R }
      }
    ,pdfdirection / R2L .code:n =
      {
-       \pdfdict_gput:nnn {Catalog / ViewerPreferences } { Direction }{ /R2L }
+       \pdfgdict_gput:nnn {Catalog / ViewerPreferences } { Direction }{ /R2L }
      }
    ,pdfdirection /  .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences } { Direction }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences } { Direction }
      }
    ,pdfdirection / unknown .code:n =
      {
@@ -931,11 +931,11 @@
    ,pdfdisplaydoctitle    .choice:
    ,pdfdisplaydoctitle / false .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences } { DisplayDocTitle }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences } { DisplayDocTitle }
      }
    ,pdfdisplaydoctitle / true .code:n =
      {
-       \pdfdict_gput:nnn {Catalog / ViewerPreferences } { DisplayDocTitle } { true }
+       \pdfgdict_gput:nnn {Catalog / ViewerPreferences } { DisplayDocTitle } { true }
      }
    ,pdfdisplaydoctitle    .default:n = true
    ,pdfduplex    .choices:nn =
@@ -943,7 +943,7 @@
      {
        \pdf_version_compare:NnTF > {1.6}
          {
-           \pdfdict_gput:nnn {Catalog / ViewerPreferences }
+           \pdfgdict_gput:nnn {Catalog / ViewerPreferences }
              { PrintDuplex } { /#1 }
          }
          {
@@ -956,7 +956,7 @@
      }%
    ,pdfduplex /  .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences } { PrintDuplex }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences } { PrintDuplex }
      }
    ,pdfduplex / unknown .code:n =
      {
@@ -968,15 +968,15 @@
    ,pdffitwindow    .choice:
    ,pdffitwindow / false .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences }  { FitWindow }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences }  { FitWindow }
      }
    ,pdffitwindow / true .code:n =
      {
-       \pdfdict_gput:nnn {Catalog / ViewerPreferences } { FitWindow } { true }
+       \pdfgdict_gput:nnn {Catalog / ViewerPreferences } { FitWindow } { true }
      }
    ,pdffitwindow /  .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences } { FitWindow }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences } { FitWindow }
      }
    ,pdffitwindow    .default:n = true
    ,pdffitwindow / unknown .code:n =
@@ -989,25 +989,25 @@
           {
             \tl_if_empty:nTF { #1 }
               {
-                \pdfdict_gremove:nn {Catalog} { Lang }
+                \pdfgdict_gremove:nn {Catalog} { Lang }
               }
               {
-                \pdfdict_gput:nnx {Catalog} { Lang } { (#1) }
+                \pdfgdict_gput:nnx {Catalog} { Lang } { (#1) }
               }
           }
    ,pdfmenubar    .choice:
    ,pdfmenubar / true .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences } { HideMenubar }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences } { HideMenubar }
      }
    ,pdfmenubar / false .code:n =
      {
-       \pdfdict_gput:nn {Catalog / ViewerPreferences }
+       \pdfgdict_gput:nn {Catalog / ViewerPreferences }
           { HideMenubar } { true }
      }
    ,pdfmenubar /  .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences } { HideMenubar }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences } { HideMenubar }
      }
    ,pdfmenubar    .default:n = true
    ,pdfmenubar / unknown .code:n =
@@ -1019,7 +1019,7 @@
    ,pdfnonfullscreenpagemode   .choices:nn =
      { UseNone, UseOutlines, UseThumbs, FullScreen, UseOC } %pdf 1.5
      {
-       \pdfdict_gput:nnx {Catalog / ViewerPreferences }
+       \pdfgdict_gput:nnx {Catalog / ViewerPreferences }
          { NonFullScreenPageMode} {/#1}
      }
    ,pdfnonfullscreenpagemode / UseAttachments .code:n =
@@ -1029,13 +1029,13 @@
            %message
          }
          {
-           \pdfdict_gput:nnx {Catalog / ViewerPreferences }
+           \pdfgdict_gput:nnx {Catalog / ViewerPreferences }
              {NonFullScreenPageMode}{/UseAttachments}
          }
      }
    ,pdfnonfullscreenpagemode /  .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences } { NonFullScreenPageMode }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences } { NonFullScreenPageMode }
      }
    ,pdfnonfullscreenpagemode / unknown .code:n =
      {
@@ -1050,10 +1050,10 @@
          {
            \tl_empty:nTF
              {
-               \pdfdict_gremove:nn {Catalog / ViewerPreferences } { NumCopies }
+               \pdfgdict_gremove:nn {Catalog / ViewerPreferences } { NumCopies }
              }
              {
-               \pdfdict_gput:nnx {Catalog / ViewerPreferences }
+               \pdfgdict_gput:nnx {Catalog / ViewerPreferences }
                  {NumCopies}{#1}
              }
          }
@@ -1067,9 +1067,9 @@
      }
    ,pdfpagelayout .choices:nn =
      { SinglePage, OneColumn, TwoColumnLeft, TwoColumnRight, TwoPageLeft, TwoPageRight}
-     { \pdfdict_gput:nnx {Catalog} { PageLayout }{ /#1 } }
+     { \pdfgdict_gput:nnx {Catalog} { PageLayout }{ /#1 } }
    ,pdfpagelayout / .code:n =
-     { \pdfdict_gremove:nn {Catalog} { PageLayout } }
+     { \pdfgdict_gremove:nn {Catalog} { PageLayout } }
    ,pdfpagelayout / unknown .code:n =
      {
        \msg_warning:nnxxx { hyp } { unknown-choice+empty }
@@ -1079,12 +1079,12 @@
      }
    ,pdfpagemode   .choices:nn =
      { UseNone, UseOutlines, UseThumbs, FullScreen, UseOC } %pdf 1.5
-     { \pdfdict_gput:nnx {Catalog} { PageMode }{ /#1 } }
+     { \pdfgdict_gput:nnx {Catalog} { PageMode }{ /#1 } }
    ,pdfpagemode / UseAttachments .code:n =
      {
        \pdf_version_compare:NnTF > {1.5}
          {
-           \pdfdict_gput:nnx {Catalog} { PageMode }{ /UseAttachments }
+           \pdfgdict_gput:nnx {Catalog} { PageMode }{ /UseAttachments }
          }
          {
            \msg_warning:nnxx
@@ -1106,10 +1106,10 @@
      {
        \tl_if_empty:nTF %or blank?
          {
-           \pdfdict_gremove:nn {Pages} { CropBox }
+           \pdfgdict_gremove:nn {Pages} { CropBox }
          }
          {
-           \pdfdict_gput:nnx {Pages} { CropBox } { [#1] }
+           \pdfgdict_gput:nnx {Pages} { CropBox } { [#1] }
          }
      }
    ,pdfpicktraybypdfsize    .choice:
@@ -1117,7 +1117,7 @@
      {
        \pdf_version_compare:NnTF > {1.6}
          {
-           \pdfdict_gput:nnn {Catalog / ViewerPreferences }
+           \pdfgdict_gput:nnn {Catalog / ViewerPreferences }
              { PickTrayByPDFSize } { true }
          }
          {
@@ -1132,7 +1132,7 @@
      {
        \pdf_version_compare:NnTF > {1.6}
          {
-           \pdfdict_gput:nnn {Catalog / ViewerPreferences }
+           \pdfgdict_gput:nnn {Catalog / ViewerPreferences }
              { PickTrayByPDFSize } { false }
          }
          {
@@ -1145,7 +1145,7 @@
      }
    ,pdfpicktraybypdfsize /  .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences } { PickTrayByPDFSize }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences } { PickTrayByPDFSize }
      }
    ,pdfpicktraybypdfsize / unknown .code:n =
      {
@@ -1158,7 +1158,7 @@
      {
        \pdf_version_compare:NnTF < {2.0}
          {
-           \pdfdict_gput:nnx {Catalog / ViewerPreferences }
+           \pdfgdict_gput:nnx {Catalog / ViewerPreferences }
              { PrintArea } { /#1 }
          }
          {
@@ -1170,7 +1170,7 @@
          }
      }%
    ,pdfprintarea /  .code:n =
-     { \pdfdict_gremove:nn {Catalog / ViewerPreferences } { PrintArea } }
+     { \pdfgdict_gremove:nn {Catalog / ViewerPreferences } { PrintArea } }
    ,pdfprintarea / unknown .code:n =
      {
        \msg_warning:nnxxx { hyp } { unknown-choice+empty }
@@ -1183,7 +1183,7 @@
      {
        \pdf_version_compare:NnTF < {2.0}
          {
-           \pdfdict_gput:nnx {Catalog / ViewerPreferences }
+           \pdfgdict_gput:nnx {Catalog / ViewerPreferences }
              { PrintClip } { /#1 }
          }
          {
@@ -1196,7 +1196,7 @@
      }%
    ,pdfprintclip /  .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences } { PrintClip }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences } { PrintClip }
      }
    ,pdfprintclip / unknown .code:n =
      {
@@ -1211,11 +1211,11 @@
          {
            \tl_if_empty:nTF { #1}
              {
-               \pdfdict_gremove:nn {Catalog / ViewerPreferences }
+               \pdfgdict_gremove:nn {Catalog / ViewerPreferences }
                  { PrintPageRange }
              }
              {
-              \pdfdict_gput:nnx {Catalog / ViewerPreferences }
+              \pdfgdict_gput:nnx {Catalog / ViewerPreferences }
                  {PrintPageRange}{[#1]}
              }
          }
@@ -1232,7 +1232,7 @@
      {
        \pdf_version_compare:NnTF > {1.5}
          {
-           \pdfdict_gput:nnx {Catalog / ViewerPreferences }
+           \pdfgdict_gput:nnx {Catalog / ViewerPreferences }
              { PrintScaling } { /#1 }
          }
          {
@@ -1245,7 +1245,7 @@
      }%
    ,pdfprintscaling /  .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences } {PrintScaling }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences } {PrintScaling }
      }
    ,pdfprintscaling / unknown .code:n =
      {
@@ -1261,10 +1261,10 @@
        \bool_if:nTF
          { \tl_if_empty_p:N \g__hyp_pdfstartpage_tl || \tl_if_empty_p:N \g__hyp_pdfstartview_tl }
          {
-           \pdfdict_gremove:nn {Catalog} { OpenAction }
+           \pdfgdict_gremove:nn {Catalog} { OpenAction }
          }
          {
-           \pdfdict_gput:nnx {Catalog} { OpenAction }
+           \pdfgdict_gput:nnx {Catalog} { OpenAction }
              {
                [\pdf_pageobject_ref:n {\g__hyp_pdfstartpage_tl}~/\g__hyp_pdfstartview_tl]
              }
@@ -1277,10 +1277,10 @@
        \bool_if:nTF
          { \tl_if_empty_p:N \g__hyp_pdfstartpage_tl || \tl_if_empty_p:N \g__hyp_pdfstartview_tl }
          {
-           \pdfdict_gremove:nn {Catalog} { OpenAction }
+           \pdfgdict_gremove:nn {Catalog} { OpenAction }
          }
          {
-           \pdfdict_gput:nnx {Catalog} { OpenAction }
+           \pdfgdict_gput:nnx {Catalog} { OpenAction }
              {
                [\pdf_pageobject_ref:n {\g__hyp_pdfstartpage_tl}~/\g__hyp_pdfstartview_tl]
              }
@@ -1290,16 +1290,16 @@
    ,pdftoolbar    .choice:
    ,pdftoolbar / true .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences } { HideToolbar }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences } { HideToolbar }
      }
    ,pdftoolbar / false .code:n =
      {
-       \pdfdict_gput:nnn {Catalog / ViewerPreferences }
+       \pdfgdict_gput:nnn {Catalog / ViewerPreferences }
          { HideToolbar } { true }
      }
    ,pdftoolbar / true .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences } { HideToolbar }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences } { HideToolbar }
      }
    ,pdftoolbar    .default:n = true
    ,pdftoolbar / unknown .code:n =
@@ -1313,7 +1313,7 @@
      {
        \pdf_version_compare:NnTF < {2.0}
          {
-           \pdfdict_gput:nnn {Catalog / ViewerPreferences }
+           \pdfgdict_gput:nnn {Catalog / ViewerPreferences }
              { ViewArea } { /#1 }
          }
          {
@@ -1326,7 +1326,7 @@
      }%
    ,pdfviewarea /  .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences } { ViewArea }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences } { ViewArea }
      }
    ,pdfviewarea / unknown .code:n =
      {
@@ -1340,7 +1340,7 @@
      {
        \pdf_version_compare:NnTF < {2.0}
          {
-           \pdfdict_gput:nnn {Catalog / ViewerPreferences }
+           \pdfgdict_gput:nnn {Catalog / ViewerPreferences }
              { ViewClip } { /#1 }
          }
          {
@@ -1353,7 +1353,7 @@
      }%
    ,pdfviewclip /  .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences } { ViewClip }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences } { ViewClip }
      }
    ,pdfviewclip / unknown .code:n =
      {
@@ -1365,16 +1365,16 @@
    ,pdfwindowui    .choice:
    ,pdfwindowui / true .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences } { HideWindowUI }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences } { HideWindowUI }
      }
    ,pdfwindowui / false .code:n =
      {
-       \pdfdict_gput:nnn {Catalog / ViewerPreferences }
+       \pdfgdict_gput:nnn {Catalog / ViewerPreferences }
           { HideWindowUI } { true }
      }
    ,pdfwindowui /  .code:n =
      {
-       \pdfdict_gremove:nn {Catalog / ViewerPreferences } {HideWindowUI }
+       \pdfgdict_gremove:nn {Catalog / ViewerPreferences } {HideWindowUI }
      }
    ,pdfwindowui / unknown .code:n =
      {
@@ -1423,7 +1423,7 @@
         pdf#1  .code:n =
           {
             \__hyp_text_convert_info:nN {##1}\l__hyp_tmpa_tl
-            \pdfdict_gput:nnx {Info}{#2}{\l__hyp_tmpa_tl}
+            \pdfgdict_gput:nnx {Info}{#2}{\l__hyp_tmpa_tl}
           }
       }
     \keys_define:nn { hyp / info }
@@ -1431,13 +1431,13 @@
         #2  .code:n =
           {
             \__hyp_text_convert_info:nN {##1}\l__hyp_tmpa_tl
-            \pdfdict_gput:nnx {Info}{#2}{\l__hyp_tmpa_tl}
+            \pdfgdict_gput:nnx {Info}{#2}{\l__hyp_tmpa_tl}
           }
         ,unknown .code:n =
          {
             \__hyp_text_convert_info:nN {##1}\l__hyp_tmpa_tl
             \exp_args:Nnx
-              \pdfdict_gput:nnx {Info}{\exp_args:No\pdftool_name:n{\l_keys_key_str}}{\l__hyp_tmpa_tl}
+              \pdfgdict_gput:nnx {Info}{\exp_args:No\pdftool_name:n{\l_keys_key_str}}{\l__hyp_tmpa_tl}
          }
       }
   }
@@ -1475,7 +1475,7 @@
       }
     ,__pdftrapped  .choices:nn = {TRUE,FALSE,UNKNOWN}
        {
-         \pdfdict_gput:nnx {Info}{Trapped}
+         \pdfgdict_gput:nnx {Info}{Trapped}
            {/
              \str_uppercase:f { \str_head:n { #1 } }
              \str_lowercase:f { \str_tail:n { #1 } }
@@ -1533,10 +1533,10 @@
      {
         \tl_if_blank:nTF { #1 }
           {
-            \pdfdict_gremove:nn {Page}{Dur}
+            \pdfgdict_gremove:nn {Page}{Dur}
           }
           {
-            \pdfdict_gput:nnn {Page}{Dur}{#1}
+            \pdfgdict_gput:nnn {Page}{Dur}{#1}
           }
      }
   }
@@ -1577,7 +1577,7 @@
      {
        \tl_if_blank:nTF {#1}
          {
-           \pdfdict_gremove:nn {Page}{Trans}
+           \pdfgdict_gremove:nn {Page}{Trans}
          }
          {
            \group_begin:
@@ -1586,7 +1586,7 @@
              {
                \pdfdict_map:n {page/Trans}
              }
-           \pdfdict_gput:nnx {Page}{Trans}{\pdf_object_last:}
+           \pdfgdict_gput:nnx {Page}{Trans}{\pdf_object_last:}
            \group_end:
          }
      }
@@ -1791,7 +1791,7 @@
         \Hy at FormObjects
         \prop_map_inline:Nn \g__hyp_AcroForm_Fields_prop
           {
-            \pdfdict_gput:nnx { Catalog / AcroForm } { Fields }{##1}
+            \pdfgdict_gput:nnx { Catalog / AcroForm } { Fields }{##1}
             %\pdfdict_show:n { Catalog / AcroForm }
             %\seq_show:c { g__pdf_/Catalog/AcroForm/Fields_seq} %!!!!!
           }
@@ -1810,24 +1810,24 @@
               }
             \seq_map_inline:Nn \l__hyp_tmpa_seq
              {
-                \pdfdict_gput:nnx { Catalog / AcroForm }
+                \pdfgdict_gput:nnx { Catalog / AcroForm }
                   { CO }
                   {
                     \prop_item:Nn \g__hyp_AcroForm_CoFields_prop {##1}
                   }
              }
           }
-       \pdfdict_gput:nnx {Catalog / AcroForm/DR/Font }
+       \pdfgdict_gput:nnx {Catalog / AcroForm/DR/Font }
          {ZaDb} {\pdf_object_ref:n {l__hyp_font_zapfdingbats_obj} }
-       \pdfdict_gput:nnx {Catalog / AcroForm/DR/Font }
+       \pdfgdict_gput:nnx {Catalog / AcroForm/DR/Font }
          {Helv} {\pdf_object_ref:n {l__hyp_font_helvetica_obj} }
-       \pdfdict_gput:nnx {Catalog /AcroForm}
+       \pdfgdict_gput:nnx {Catalog /AcroForm}
          {DA}{(/Helv~10~Tf~0~g)}
        \legacy_if:nF { Hy at pdfa } %?????? Standards?
          {
            \legacy_if:nT { HyField at NeedAppearances }
              {
-               \pdfdict_gput:nnx {Catalog / AcroForm }{NeedAppearances}{true}
+               \pdfgdict_gput:nnx {Catalog / AcroForm }{NeedAppearances}{true}
              }
          }
        }
diff --git a/newpackages/new-transparent.sty b/newpackages/new-transparent.sty
index 0928efd..7663963 100644
--- a/newpackages/new-transparent.sty
+++ b/newpackages/new-transparent.sty
@@ -53,7 +53,7 @@
   \protected\edef\TRP at pdfpageresources {\pdfvariable pageresources}
   \protected\def\TRP at pdfcolorstack     {\pdfextension colorstack}
 \fi
-\ifcsname pdfdict_gput:nnn\endcsname
+\ifcsname pdfgdict_gput:nnn\endcsname
 \else
 \PackageWarningNoLine{new-transparent}{%
     Loading aborted, because pdf resource management code not found%
@@ -62,12 +62,12 @@
 \fi
 
 \ExplSyntaxOn
-\pdfdict_gput:nnn{Page/Resources/ExtGState}{TRP1}{<</ca~1/CA~1>>}
+\pdfgdict_gput:nnn{Page/Resources/ExtGState}{TRP1}{<</ca~1/CA~1>>}
 \cs_new_protected:Npn \__transparent_use:n #1
  {
    \tl_if_exist:cF { c__transparent_TRP#1_tl }
      {
-       \pdfdict_gput:nnn{Page/Resources/ExtGState}{TRP#1}{<</ca~#1/CA~#1>>}
+       \pdfgdict_gput:nnn{Page/Resources/ExtGState}{TRP#1}{<</ca~#1/CA~#1>>}
        \tl_const:cn { c__transparent_TRP#1_tl }{ /TRP#1~gs }
      }
  }
diff --git a/pdfresources.dtx b/pdfresources.dtx
index 8bb5c5c..0a63b95 100644
--- a/pdfresources.dtx
+++ b/pdfresources.dtx
@@ -1201,7 +1201,7 @@
                   {pdf at abspage}
                   {0}
               }
-            \pdfgdict_if_exist:nF { backend_Page\l_@@_tmpa_tl/Resources/Properties }
+            \__pdfgdict_if_exist:nF { backend_Page\l_@@_tmpa_tl/Resources/Properties }
               {
                 \__pdfgdict_new:n  { backend_Page\l_@@_tmpa_tl/Resources/Properties }
               }
@@ -1236,7 +1236,7 @@
                   {pdf at abspage}
                   {0}
               }
-            \pdfgdict_if_exist:nF { backend_Page\l_@@_tmpa_tl/Resources/Properties }
+            \__pdfgdict_if_exist:nF { backend_Page\l_@@_tmpa_tl/Resources/Properties }
               {
                 \__pdfgdict_new:n { backend_Page\l_@@_tmpa_tl/Resources/Properties }
               }
diff --git a/testfiles-dvips/annot.pvt b/testfiles-dvips/annot.pvt
index 19bbcc6..0ee1de5 100644
--- a/testfiles-dvips/annot.pvt
+++ b/testfiles-dvips/annot.pvt
@@ -3,9 +3,9 @@
 \usepackage{pdfresources}
 \ExplSyntaxOn
 %%% for reproducible tests:
-\pdfdict_gput:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
-\pdfdict_gput:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
-\pdfdict_gput:nnn {Info}{Creator}{(l3build test)}
+\pdfgdict_gput:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
+\pdfgdict_gput:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
+\pdfgdict_gput:nnn {Info}{Creator}{(l3build test)}
 %%%%%
 \ExplSyntaxOff
 \begin{document}
diff --git a/testfiles-dvips/bdc-properties.pvt b/testfiles-dvips/bdc-properties.pvt
index cf27a70..53bea42 100644
--- a/testfiles-dvips/bdc-properties.pvt
+++ b/testfiles-dvips/bdc-properties.pvt
@@ -3,9 +3,9 @@
 \usepackage{l3pdf,pdfresources}
 \ExplSyntaxOn
 %%% for reproducible tests:
-\pdfdict_gput:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
-\pdfdict_gput:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
-\pdfdict_gput:nnn {Info}{Creator}{(l3build test)}
+\pdfgdict_gput:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
+\pdfgdict_gput:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
+\pdfgdict_gput:nnn {Info}{Creator}{(l3build test)}
 %%%%%
 \ExplSyntaxOff
 
diff --git a/testfiles-dvips/catalogAF.pvt b/testfiles-dvips/catalogAF.pvt
index 6de5509..a1c2814 100644
--- a/testfiles-dvips/catalogAF.pvt
+++ b/testfiles-dvips/catalogAF.pvt
@@ -2,9 +2,9 @@
 \RequirePackage[debug]{pdfresources}
 \ExplSyntaxOn
 %%% for reproducible tests:
-\pdfdict_gput:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
-\pdfdict_gput:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
-\pdfdict_gput:nnn {Info}{Creator}{(l3build test)}
+\pdfgdict_gput:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
+\pdfgdict_gput:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
+\pdfgdict_gput:nnn {Info}{Creator}{(l3build test)}
 %%%%%
 \ExplSyntaxOff
 \DeclareDocumentMetaData
@@ -21,8 +21,8 @@
 \pdf_object_new:nn   {filespec2}{dict}
 \pdf_object_write:nn {filespec2} {/Type /Filespec /UF (example2.pdf)}
 
-\pdfdict_gput:nnx { Catalog } {AF} {\pdf_object_ref:n {filespec1}}
-\pdfdict_gput:nnx { Catalog } {AF} {\pdf_object_ref:n {filespec2}}
+\pdfgdict_gput:nnx { Catalog } {AF} {\pdf_object_ref:n {filespec1}}
+\pdfgdict_gput:nnx { Catalog } {AF} {\pdf_object_ref:n {filespec2}}
 \ExplSyntaxOff
 \begin{document}
 \START
diff --git a/testfiles-dvips/ismap.pvt b/testfiles-dvips/ismap.pvt
index 197fa29..613c94b 100644
--- a/testfiles-dvips/ismap.pvt
+++ b/testfiles-dvips/ismap.pvt
@@ -6,9 +6,9 @@
 \begin{document}
 \ExplSyntaxOn
 %%% for reproducible tests:
-\pdfdict_gput:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
-\pdfdict_gput:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
-\pdfdict_gput:nnn {Info}{Creator}{(l3build test)}
+\pdfgdict_gput:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
+\pdfgdict_gput:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
+\pdfgdict_gput:nnn {Info}{Creator}{(l3build test)}
 %%%%%
 \ExplSyntaxOff
 \href[ismap=true]{https://www.latex-project.org#abc~xyz}{xxxxx}
diff --git a/testfiles-dvips/linkhook.pvt b/testfiles-dvips/linkhook.pvt
index fa7947d..e8948a4 100644
--- a/testfiles-dvips/linkhook.pvt
+++ b/testfiles-dvips/linkhook.pvt
@@ -8,9 +8,9 @@
  }
 \ExplSyntaxOn
 %%% for reproducible tests:
-\pdfdict_gput:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
-\pdfdict_gput:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
-\pdfdict_gput:nnn {Info}{Creator}{(l3build test)}
+\pdfgdict_gput:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
+\pdfgdict_gput:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
+\pdfgdict_gput:nnn {Info}{Creator}{(l3build test)}
 %%%%%
 \ExplSyntaxOff
 \input{regression-test}
diff --git a/testfiles-dvips/pagelabels.pvt b/testfiles-dvips/pagelabels.pvt
index 33ddba9..5f4f497 100644
--- a/testfiles-dvips/pagelabels.pvt
+++ b/testfiles-dvips/pagelabels.pvt
@@ -12,9 +12,9 @@
 \renewcommand\thepage{λέγ\arabic{page}}
 \begin{document}
 \ExplSyntaxOn
-\pdfdict_gput:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
-\pdfdict_gput:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
-\pdfdict_gput:nnn {Info}{Creator}{(l3build test)}
+\pdfgdict_gput:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
+\pdfgdict_gput:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
+\pdfgdict_gput:nnn {Info}{Creator}{(l3build test)}
 \ExplSyntaxOff
 abc \newpage abc \newpage abc  \newpage \pagenumbering{roman} abc  \newpage \pagenumbering{Roman}\setcounter{page}{5} abc
 \end{document}
diff --git a/testfiles-dvips/pdffilelink.pvt b/testfiles-dvips/pdffilelink.pvt
index eec6a8a..d5a494c 100644
--- a/testfiles-dvips/pdffilelink.pvt
+++ b/testfiles-dvips/pdffilelink.pvt
@@ -10,9 +10,9 @@
 
 \begin{document}
 \ExplSyntaxOn
-\pdfdict_gput:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
-\pdfdict_gput:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
-\pdfdict_gput:nnn {Info}{Creator}{(l3build test)}
+\pdfgdict_gput:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
+\pdfgdict_gput:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
+\pdfgdict_gput:nnn {Info}{Creator}{(l3build test)}
 \ExplSyntaxOff
 \href{blub.pdf#destination}{pdf}
 
diff --git a/testfiles-noxetex/extgstate-patches.pvt b/testfiles-noxetex/extgstate-patches.pvt
index 316ace6..7287acc 100644
--- a/testfiles-noxetex/extgstate-patches.pvt
+++ b/testfiles-noxetex/extgstate-patches.pvt
@@ -20,6 +20,6 @@
 abc\texttransparent{0.6}{XXXXXXXXXX}
 
 \ExplSyntaxOn
-\pdfdict_gput:nnn{Page/Resources/ExtGState}{bearopacity}{<</ca~0.7/CA~0.7>>}
+\pdfgdict_gput:nnn{Page/Resources/ExtGState}{bearopacity}{<</ca~0.7/CA~0.7>>}
 \ExplSyntaxOff
 \end{document} 
\ No newline at end of file
diff --git a/testfiles-noxetex/metadata.pvt b/testfiles-noxetex/metadata.pvt
index 220d68e..7b487b4 100644
--- a/testfiles-noxetex/metadata.pvt
+++ b/testfiles-noxetex/metadata.pvt
@@ -21,7 +21,7 @@
 \makeatother
 \ExplSyntaxOn
 \pdf_object_new:nn{metadata-obj}{stream}
-\pdfdict_gput:nnx {Catalog} {Metadata}{\pdf_object_ref:n{metadata-obj}}
+\pdfgdict_gput:nnx {Catalog} {Metadata}{\pdf_object_ref:n{metadata-obj}}
 \ExplSyntaxOff
 
  \begin{document}
diff --git a/testfiles-noxetex/test-new-transparent.pvt b/testfiles-noxetex/test-new-transparent.pvt
index e844251..b531811 100644
--- a/testfiles-noxetex/test-new-transparent.pvt
+++ b/testfiles-noxetex/test-new-transparent.pvt
@@ -10,7 +10,7 @@
 \begin{document}
 %\START
 \ExplSyntaxOn
-\pdfdict_gput:nnn{Page/Resources/ExtGState}{duckopacity}{<</ca~0.2/CA~0.2>>}
+\pdfgdict_gput:nnn{Page/Resources/ExtGState}{duckopacity}{<</ca~0.2/CA~0.2>>}
 \ExplSyntaxOff
 \texttransparent{0.5}{xxxxxxxxxxx}
 \texttransparent{0.3}{xxxxxxxxxxx}
diff --git a/testfiles/catalog-remove.luatex.tlg b/testfiles/catalog-remove.luatex.tlg
index 6f1aa67..94ccec1 100644
--- a/testfiles/catalog-remove.luatex.tlg
+++ b/testfiles/catalog-remove.luatex.tlg
@@ -1,42 +1,41 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
-The global dictionary 'Catalog' contains the pairs (without outer braces):
+The dictionary 'Catalog' contains the pairs (without outer braces):
 >  {Lang}  =>  {(de-De)}
 >  {PageLayout}  =>  {/SinglePage}.
 <recently read> }
-l. ...\pdfdict_show:n {Catalog}
-The global dictionary 'Catalog/ViewerPreferences' contains the pairs (without
-outer braces):
+l. ...\pdfgdict_show:n {Catalog}
+The dictionary 'Catalog/ViewerPreferences' contains the pairs (without outer
+braces):
 >  {HideToolbar}  =>  {true}.
 <recently read> }
-l. ...\pdfdict_show:n {Catalog/ViewerPreferences}
-The global dictionary 'Catalog/MarkInfo' contains the pairs (without outer
-braces):
+l. ...\pdfgdict_show:n {Catalog/ViewerPreferences}
+The dictionary 'Catalog/MarkInfo' contains the pairs (without outer braces):
 >  {Marked}  =>  {True}.
 <recently read> }
-l. ...\pdfdict_show:n {Catalog/MarkInfo}
-The global dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without
-outer braces):
+l. ...\pdfgdict_show:n {Catalog/MarkInfo}
+The dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without outer
+braces):
 >  {Name}  =>  {<</ABC/CDE>>}
 >  {NameB}  =>  {<</ABC/CDE>>}.
 <recently read> }
-l. ...\pdfdict_show:n {Catalog/AcroForm/DR/Font}
-The global dictionary 'Catalog' contains the pairs (without outer braces):
+l. ...\pdfgdict_show:n {Catalog/AcroForm/DR/Font}
+The dictionary 'Catalog' contains the pairs (without outer braces):
 >  {Lang}  =>  {(de-De)}.
 <recently read> }
-l. ...\pdfdict_show:n {Catalog}
-The global dictionary 'Catalog/ViewerPreferences' is empty
+l. ...\pdfgdict_show:n {Catalog}
+The dictionary 'Catalog/ViewerPreferences' is empty
 > .
 <recently read> }
-l. ...\pdfdict_show:n {Catalog/ViewerPreferences}
-The global dictionary 'Catalog/MarkInfo' is empty
+l. ...\pdfgdict_show:n {Catalog/ViewerPreferences}
+The dictionary 'Catalog/MarkInfo' is empty
 > .
 <recently read> }
-l. ...\pdfdict_show:n {Catalog/MarkInfo}
-The global dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without
-outer braces):
+l. ...\pdfgdict_show:n {Catalog/MarkInfo}
+The dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without outer
+braces):
 >  {NameB}  =>  {<</ABC/CDE>>}.
 <recently read> }
-l. ...\pdfdict_show:n {Catalog/AcroForm/DR/Font}
+l. ...\pdfgdict_show:n {Catalog/AcroForm/DR/Font}
 [1
 ] (catalog-remove.aux)
diff --git a/testfiles/catalog-remove.tlg b/testfiles/catalog-remove.tlg
index 6f1aa67..94ccec1 100644
--- a/testfiles/catalog-remove.tlg
+++ b/testfiles/catalog-remove.tlg
@@ -1,42 +1,41 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
-The global dictionary 'Catalog' contains the pairs (without outer braces):
+The dictionary 'Catalog' contains the pairs (without outer braces):
 >  {Lang}  =>  {(de-De)}
 >  {PageLayout}  =>  {/SinglePage}.
 <recently read> }
-l. ...\pdfdict_show:n {Catalog}
-The global dictionary 'Catalog/ViewerPreferences' contains the pairs (without
-outer braces):
+l. ...\pdfgdict_show:n {Catalog}
+The dictionary 'Catalog/ViewerPreferences' contains the pairs (without outer
+braces):
 >  {HideToolbar}  =>  {true}.
 <recently read> }
-l. ...\pdfdict_show:n {Catalog/ViewerPreferences}
-The global dictionary 'Catalog/MarkInfo' contains the pairs (without outer
-braces):
+l. ...\pdfgdict_show:n {Catalog/ViewerPreferences}
+The dictionary 'Catalog/MarkInfo' contains the pairs (without outer braces):
 >  {Marked}  =>  {True}.
 <recently read> }
-l. ...\pdfdict_show:n {Catalog/MarkInfo}
-The global dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without
-outer braces):
+l. ...\pdfgdict_show:n {Catalog/MarkInfo}
+The dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without outer
+braces):
 >  {Name}  =>  {<</ABC/CDE>>}
 >  {NameB}  =>  {<</ABC/CDE>>}.
 <recently read> }
-l. ...\pdfdict_show:n {Catalog/AcroForm/DR/Font}
-The global dictionary 'Catalog' contains the pairs (without outer braces):
+l. ...\pdfgdict_show:n {Catalog/AcroForm/DR/Font}
+The dictionary 'Catalog' contains the pairs (without outer braces):
 >  {Lang}  =>  {(de-De)}.
 <recently read> }
-l. ...\pdfdict_show:n {Catalog}
-The global dictionary 'Catalog/ViewerPreferences' is empty
+l. ...\pdfgdict_show:n {Catalog}
+The dictionary 'Catalog/ViewerPreferences' is empty
 > .
 <recently read> }
-l. ...\pdfdict_show:n {Catalog/ViewerPreferences}
-The global dictionary 'Catalog/MarkInfo' is empty
+l. ...\pdfgdict_show:n {Catalog/ViewerPreferences}
+The dictionary 'Catalog/MarkInfo' is empty
 > .
 <recently read> }
-l. ...\pdfdict_show:n {Catalog/MarkInfo}
-The global dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without
-outer braces):
+l. ...\pdfgdict_show:n {Catalog/MarkInfo}
+The dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without outer
+braces):
 >  {NameB}  =>  {<</ABC/CDE>>}.
 <recently read> }
-l. ...\pdfdict_show:n {Catalog/AcroForm/DR/Font}
+l. ...\pdfgdict_show:n {Catalog/AcroForm/DR/Font}
 [1
 ] (catalog-remove.aux)
diff --git a/testfiles/catalog-remove.xetex.tlg b/testfiles/catalog-remove.xetex.tlg
index 6f1aa67..94ccec1 100644
--- a/testfiles/catalog-remove.xetex.tlg
+++ b/testfiles/catalog-remove.xetex.tlg
@@ -1,42 +1,41 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
-The global dictionary 'Catalog' contains the pairs (without outer braces):
+The dictionary 'Catalog' contains the pairs (without outer braces):
 >  {Lang}  =>  {(de-De)}
 >  {PageLayout}  =>  {/SinglePage}.
 <recently read> }
-l. ...\pdfdict_show:n {Catalog}
-The global dictionary 'Catalog/ViewerPreferences' contains the pairs (without
-outer braces):
+l. ...\pdfgdict_show:n {Catalog}
+The dictionary 'Catalog/ViewerPreferences' contains the pairs (without outer
+braces):
 >  {HideToolbar}  =>  {true}.
 <recently read> }
-l. ...\pdfdict_show:n {Catalog/ViewerPreferences}
-The global dictionary 'Catalog/MarkInfo' contains the pairs (without outer
-braces):
+l. ...\pdfgdict_show:n {Catalog/ViewerPreferences}
+The dictionary 'Catalog/MarkInfo' contains the pairs (without outer braces):
 >  {Marked}  =>  {True}.
 <recently read> }
-l. ...\pdfdict_show:n {Catalog/MarkInfo}
-The global dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without
-outer braces):
+l. ...\pdfgdict_show:n {Catalog/MarkInfo}
+The dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without outer
+braces):
 >  {Name}  =>  {<</ABC/CDE>>}
 >  {NameB}  =>  {<</ABC/CDE>>}.
 <recently read> }
-l. ...\pdfdict_show:n {Catalog/AcroForm/DR/Font}
-The global dictionary 'Catalog' contains the pairs (without outer braces):
+l. ...\pdfgdict_show:n {Catalog/AcroForm/DR/Font}
+The dictionary 'Catalog' contains the pairs (without outer braces):
 >  {Lang}  =>  {(de-De)}.
 <recently read> }
-l. ...\pdfdict_show:n {Catalog}
-The global dictionary 'Catalog/ViewerPreferences' is empty
+l. ...\pdfgdict_show:n {Catalog}
+The dictionary 'Catalog/ViewerPreferences' is empty
 > .
 <recently read> }
-l. ...\pdfdict_show:n {Catalog/ViewerPreferences}
-The global dictionary 'Catalog/MarkInfo' is empty
+l. ...\pdfgdict_show:n {Catalog/ViewerPreferences}
+The dictionary 'Catalog/MarkInfo' is empty
 > .
 <recently read> }
-l. ...\pdfdict_show:n {Catalog/MarkInfo}
-The global dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without
-outer braces):
+l. ...\pdfgdict_show:n {Catalog/MarkInfo}
+The dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without outer
+braces):
 >  {NameB}  =>  {<</ABC/CDE>>}.
 <recently read> }
-l. ...\pdfdict_show:n {Catalog/AcroForm/DR/Font}
+l. ...\pdfgdict_show:n {Catalog/AcroForm/DR/Font}
 [1
 ] (catalog-remove.aux)
diff --git a/testfiles/dict_if_empty.lvt b/testfiles/dict_if_empty.lvt
index bf81792..27fd223 100644
--- a/testfiles/dict_if_empty.lvt
+++ b/testfiles/dict_if_empty.lvt
@@ -11,9 +11,10 @@
 \pdfdict_if_empty:nTF{test}{empty}{not empty}\par
 \pdfdict_put:nnn {test}{key}{value}
 \pdfdict_if_empty:nTF{test}{empty}{not empty}\par
-\pdfdict_if_empty:nTF{Page}{empty}{not empty}\par
-\pdfdict_gput:nnn {Page}{Rotate}{90}
-\pdfdict_if_empty:nTF{Page}{empty}{not empty}\par
+
+\pdfgdict_if_empty:nTF{Page}{empty}{not empty}\par
+\pdfgdict_gput:nnn {Page}{Rotate}{90}
+\pdfgdict_if_empty:nTF{Page}{empty}{not empty}\par
 \ExplSyntaxOff
 
 \end{document}
diff --git a/testfiles/infodict.pvt b/testfiles/infodict.pvt
index 31830cd..6639a4f 100644
--- a/testfiles/infodict.pvt
+++ b/testfiles/infodict.pvt
@@ -10,8 +10,8 @@
 {
  \str_set_convert:Nnnn \l_tmpa_str { Grüße }{  } {utf16/string}
 }
-\pdfdict_gput:nnx {Info} {Title}{(\l_tmpa_str)}
-\pdfdict_gput:nnx {Info} {Author}{(Some~Author)}
+\pdfgdict_gput:nnx {Info} {Title}{(\l_tmpa_str)}
+\pdfgdict_gput:nnx {Info} {Author}{(Some~Author)}
 \ExplSyntaxOff
 \begin{document}
 \START
diff --git a/testfiles/mixpageattr.pvt b/testfiles/mixpageattr.pvt
index c4feef6..0505143 100644
--- a/testfiles/mixpageattr.pvt
+++ b/testfiles/mixpageattr.pvt
@@ -5,7 +5,7 @@
 \usepackage{fancyhdr,zref-user}
 \pagestyle{fancy}
 \ExplSyntaxOn \makeatletter
-\lfoot{\pdfdict_gput:nnx {Page} {Rotate}{\ifodd\c at page -90\else 90 \fi}}
+\lfoot{\pdfgdict_gput:nnx {Page} {Rotate}{\ifodd\c at page -90\else 90 \fi}}
 \ExplSyntaxOff
 \usepackage{kantlipsum}
 \begin{document}
@@ -16,7 +16,7 @@ some text \kant
 \ExplSyntaxOn
 \begin{figure}%[p]
 \zlabel{a}\label{a}
-\pdfdict_gput:nnx {ThisPage}{Rotate}{90}
+\pdfgdict_gput:nnx {ThisPage}{Rotate}{90}
 \Huge
 code~is~on~page~\thepage\par
 float~is~on~page~\zpageref{a}\par
diff --git a/testfiles/ocproperties.pvt b/testfiles/ocproperties.pvt
index c188da8..536d094 100644
--- a/testfiles/ocproperties.pvt
+++ b/testfiles/ocproperties.pvt
@@ -49,9 +49,9 @@
   /OFF /Blabla
  }
 
-\pdfdict_gput:nnx { Catalog / OCProperties } {OCGs}{\pdf_object_ref:n {ocg1}}
-\pdfdict_gput:nnx { Catalog / OCProperties } {OCGs}{\pdf_object_ref:n {ocg2}}
-\pdfdict_gput:nnx { Catalog / OCProperties } {D}{\pdf_object_ref:n {ocgd}}
+\pdfgdict_gput:nnx { Catalog / OCProperties } {OCGs}{\pdf_object_ref:n {ocg1}}
+\pdfgdict_gput:nnx { Catalog / OCProperties } {OCGs}{\pdf_object_ref:n {ocg2}}
+\pdfgdict_gput:nnx { Catalog / OCProperties } {D}{\pdf_object_ref:n {ocgd}}
 
 \ExplSyntaxOff
 
diff --git a/testfiles/pageattr.pvt b/testfiles/pageattr.pvt
index bf0c8c6..9de6ff6 100644
--- a/testfiles/pageattr.pvt
+++ b/testfiles/pageattr.pvt
@@ -6,24 +6,24 @@
 \START
 some text
 \ExplSyntaxOn
- \pdfdict_gput:nnn {Page} {Rotate}{90}
+ \pdfgdict_gput:nnn {Page} {Rotate}{90}
 %test local:
-{\pdfdict_gput:nnn {Page} {CropBox}{[0~0~300~350]}}
+{\pdfgdict_gput:nnn {Page} {CropBox}{[0~0~300~350]}}
 
 %test doublette
- \pdfdict_gput:nnn {Page} {Rotate}{90}
+ \pdfgdict_gput:nnn {Page} {Rotate}{90}
 
 %test command:
 \newcommand\attributecontent{(somesetting)}
-\pdfdict_gput:nnx {Page} {SSS}{\attributecontent}
+\pdfgdict_gput:nnx {Page} {SSS}{\attributecontent}
 
 \newpage
-\pdfdict_gremove:nn {Page}{Rotate}
-\pdfdict_gremove:nn {Page}{CropBox}
+\pdfgdict_gremove:nn {Page}{Rotate}
+\pdfgdict_gremove:nn {Page}{CropBox}
 some text more text
 \begin{figure}[p]
 \rule{1cm}{15cm}
-\pdfdict_gput:nnn {ThisPage}{Rotate}{-90}
+\pdfgdict_gput:nnn {ThisPage}{Rotate}{-90}
 \end{figure}
 \newpage
 abbb
diff --git a/testfiles/pagesattr.pvt b/testfiles/pagesattr.pvt
index 2903698..0d0db28 100644
--- a/testfiles/pagesattr.pvt
+++ b/testfiles/pagesattr.pvt
@@ -6,16 +6,16 @@
 \START
 some text
 \ExplSyntaxOn
- \pdfdict_gput:nnn {Pages} {YYY}{(yyy)}
+ \pdfgdict_gput:nnn {Pages} {YYY}{(yyy)}
 %test local:
-{\pdfdict_gput:nnn {Pages} {ZZZ}{(zzz)}}
+{\pdfgdict_gput:nnn {Pages} {ZZZ}{(zzz)}}
 
 %test doublette
- \pdfdict_gput:nnn {Pages} {YYY}{(y22)}
+ \pdfgdict_gput:nnn {Pages} {YYY}{(y22)}
 
 %test command:
 \newcommand\attributecontent{(somesetting)}
-\pdfdict_gput:nnn {Pages} {SSS}{\attributecontent}
+\pdfgdict_gput:nnn {Pages} {SSS}{\attributecontent}
 %\tl_show:N\g__pdf_pagesattr_tl
 \ExplSyntaxOff
 \end{document} 
\ No newline at end of file
diff --git a/testfiles/show.lvt b/testfiles/show.lvt
index efdc857..c6c0dc3 100644
--- a/testfiles/show.lvt
+++ b/testfiles/show.lvt
@@ -7,9 +7,9 @@
 \showoutput
 abbb
 \ExplSyntaxOn
-\pdfdict_show:n{Catalog}
-\pdfdict_show:n{Info}
+\pdfgdict_show:n{Catalog}
+\pdfgdict_show:n{Info}
 \pdfdict_if_exist:nTF {blub}{true}{false}
-\pdfdict_if_exist:nTF {Info}{true}{false}
+\pdfgdict_if_exist:nTF {Info}{true}{false}
 \ExplSyntaxOff
 \end{document}
diff --git a/testfiles/thispageattr.pvt b/testfiles/thispageattr.pvt
index f35388c..744fdc3 100644
--- a/testfiles/thispageattr.pvt
+++ b/testfiles/thispageattr.pvt
@@ -18,7 +18,7 @@
 
 \begin{figure}[p]
 \zlabel{a}\label{a}
-\pdfdict_gput:nnx{ThisPage}{Rotate}{\myrotate{a}}
+\pdfgdict_gput:nnx{ThisPage}{Rotate}{\myrotate{a}}
 \Huge
 code~is~on~page~\thepage\par
 float~is~on~page~\zpageref{a}\par
@@ -27,7 +27,7 @@ float~is~on~page~\zpageref{a}\par
 
 \begin{figure}[p]
 \zlabel{b}
-\pdfdict_gput:nnx{ThisPage}{Rotate}{\myrotate{b}}
+\pdfgdict_gput:nnx{ThisPage}{Rotate}{\myrotate{b}}
 \Huge
 code~is~on~page~\thepage\par
 \label{b}float~is~on~page~\pageref{b}\par
diff --git a/testfiles/xform.pvt b/testfiles/xform.pvt
index b1f7b26..88029ed 100644
--- a/testfiles/xform.pvt
+++ b/testfiles/xform.pvt
@@ -9,7 +9,7 @@ text
 
 \pdf_xform_new:nnn  {myxformA}{/yyy~(bla)}{yyyyy}
 
-\pdfdict_gput:nnn{Page/Resources/ExtGState}{bearopacity}{<</ca~0.7/CA~0.7>>}
+\pdfgdict_gput:nnn{Page/Resources/ExtGState}{bearopacity}{<</ca~0.7/CA~0.7>>}
 
 \pdf_xform_new:nnn  {myxform}{/yyy~(bla)}{xxxxxxxxxx}
 





More information about the latex3-commits mailing list.