[latex3-commits] [git/LaTeX3-latex3-pdfresources] splitting: added prefix to code dictionaries (40cede5)
Ulrike Fischer
fischer at troubleshooting-tex.de
Tue Jul 7 19:16:38 CEST 2020
Repository : https://github.com/latex3/pdfresources
On branch : splitting
Link : https://github.com/latex3/pdfresources/commit/40cede5707ff5a472f23192503117c985d770795
>---------------------------------------------------------------
commit 40cede5707ff5a472f23192503117c985d770795
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Wed Jun 17 23:42:24 2020 +0200
added prefix to code dictionaries
>---------------------------------------------------------------
40cede5707ff5a472f23192503117c985d770795
l3pdfcoredict.dtx | 86 ++++++++++++++++----------------
pdfresources.dtx | 98 ++++++++++++++++++-------------------
testfiles/catalog-remove.luatex.tlg | 23 ++++-----
testfiles/catalog-remove.tlg | 23 ++++-----
testfiles/catalog-remove.xetex.tlg | 23 ++++-----
testfiles/dict_if_empty.lvt | 4 +-
testfiles/show.luatex.tlg | 23 ++++++---
testfiles/show.lvt | 13 ++---
testfiles/show.tlg | 23 ++++++---
testfiles/show.xetex.tlg | 23 ++++++---
10 files changed, 182 insertions(+), 157 deletions(-)
diff --git a/l3pdfcoredict.dtx b/l3pdfcoredict.dtx
index 6f829b2..d73ee23 100644
--- a/l3pdfcoredict.dtx
+++ b/l3pdfcoredict.dtx
@@ -468,7 +468,7 @@
\msg_new:nnn { pdfcoredict } { show-dict }
{
- The~dictionary~'#1'~
+ The~core~dictionary~'#1'~
\tl_if_empty:nTF {#2}
{ is~empty \\>~ . }
{ contains~the~pairs~(without~outer~braces): #2 . }
@@ -481,7 +481,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \pdfcoredict_gput:nnn #1 #2 #3
{
- \pdfdict_if_gexist:nTF { #1 }
+ \pdfdict_if_gexist:nTF { Core/#1 }
{
\@@_handler_gput:nnn { #1 }{ #2 }{ #3 }
}
@@ -537,14 +537,14 @@
% \begin{macrocode}
%global
-\cs_new_protected:Npn \@@_handler_gput:nnn #1 #2 #3 %#1 path, #2 name, #3 value
+\cs_new_protected:Npn \@@_handler_gput:nnn #1 #2 #3 %#1 dict, #2 name, #3 value
{
\tl_if_empty:nTF { #3 }
{
\msg_none:nnn { pdfcoredict }{ empty-value }{ /#1/#2 }
}
{
- \pdfdict_if_gexist:nTF { #1 }
+ \pdfdict_if_gexist:nTF { Core/#1 }
{
\cs_if_exist:cTF
{ @@_handler/#1/?_gput:nn } %general, name independant handler
@@ -555,7 +555,7 @@
{ \use:c {@@_handler/#1/#2_gput:n} {#3} } %special handler
{
\prop_gput:cnn
- { \pdfdict_gname:n { #1 } }{ #2 } { #3 }
+ { \pdfdict_gname:n { Core/#1 } }{ #2 } { #3 }
}
}
}
@@ -571,14 +571,14 @@
\cs_new_protected:Npn \@@_get:nnN #1 #2 #3 %path,key,macro
{
\prop_get:cnN
- { \pdfdict_gname:n { #1 } }
+ { \pdfdict_gname:n { Core/#1 } }
{ #2 } #3
}
\cs_new_protected:Npn \@@_handler_gremove:nn #1 #2 %path,key
{
- \pdfdict_if_gexist:nTF { #1 }
+ \pdfdict_if_gexist:nTF { Core/#1 }
{
\cs_if_exist:cTF
{ @@_handler/#1/?_gremove:n } %general, name independant handler
@@ -589,7 +589,7 @@
{ \use:c {@@_handler/#1/#2_gremove:} } %special handler
{
\prop_gremove:cn
- { \pdfdict_gname:n { #1 } }{ #2 }
+ { \pdfdict_gname:n { Core/#1 } }{ #2 }
}
}
}
@@ -600,13 +600,13 @@
\cs_new_protected:Npn \@@_gremove:nn #1 #2 %path,key
{
- \pdfdict_if_gexist:nTF { #1 }
+ \pdfdict_if_gexist:nTF { Core/#1 }
{
\prop_gremove:cn
- { \pdfdict_gname:n { #1 } }{ #2 }
+ { \pdfdict_gname:n { Core/#1 } }{ #2 }
}
{
- \msg_error:nnn { pdfcoredict } { unknown-dict } { xx4#1 }
+ \msg_error:nnn { pdfcoredict } { unknown-dict } { #1 }
}
}
@@ -617,12 +617,12 @@
{ @@_handler/#2/?_show: } %general, name independant handler
{ \use:c {@@_handler/#2/?_show:} }
{
- \prop_if_exist:cTF { \pdfdict_gname:n { #2 } }
+ \prop_if_exist:cTF { \pdfdict_gname:n { Core/#2 } }
{
#1
{ pdfcoredict } { show-dict }
{ \tl_to_str:n {#2} }
- { \prop_map_function:cN {\pdfdict_gname:n { #2 }} \msg_show_item:nn }
+ { \prop_map_function:cN {\pdfdict_gname:n { Core/#2 }} \msg_show_item:nn }
{ } { }
}
{
@@ -633,7 +633,7 @@
\cs_new_protected:Npn \@@_show:n #1 %path
{
- \prop_show:c { \pdfdict_gname:n { #1 } }
+ \prop_show:c { \pdfdict_gname:n { Core/#1 } }
}
% \end{macrocode}
% \end{macro}
@@ -648,7 +648,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \pdfcoredict_gremove:nn #1 #2
{
- \pdfdict_if_gexist:nTF { #1 }
+ \pdfdict_if_gexist:nTF { Core/#1 }
{
\@@_handler_gremove:nn { #1 }{ #2 }
}
@@ -660,7 +660,7 @@
% \subsection{The Info dictionary}
% Initialization of the dictionary:
% \begin{macrocode}
-\pdfdict_gnew:n {Info}
+\pdfdict_gnew:n {Core/Info}
% \end{macrocode}
%
% \begin{macro}{\@@_Info_gpush:}
@@ -670,15 +670,15 @@
% push to the register command / issue the special
\cs_new_protected:Npn \@@_Info_gpush:
{
- \prop_map_function:cN { \pdfdict_gname:n {Info} } \__pdf_backend_info_gput:nn
- \prop_gclear:c { \pdfdict_gname:n {Info} }
+ \prop_map_function:cN { \pdfdict_gname:n {Core/Info} } \__pdf_backend_info_gput:nn
+ \prop_gclear:c { \pdfdict_gname:n {Core/Info} }
}
% \end{macrocode}
% \end{macro}
% \subsection{The Pages dictionary code}
% At first the initialisation
% \begin{macrocode}
-\pdfdict_gnew:n {Pages}
+\pdfdict_gnew:n {Core/Pages}
% \end{macrocode}
%
% \begin{macro}{\@@_Pages_gpush:}
@@ -690,7 +690,7 @@
{
\exp_args:Nx \__pdf_backend_Pages_primitive:n
{
- \pdfdict_gmap:n {Pages}
+ \pdfdict_gmap:n {Core/Pages}
}
}
@@ -699,8 +699,8 @@
% \subsection{The Page and ThisPage dictionary}
% At first the initialisation.
% \begin{macrocode}
-\pdfdict_gnew:n { Page }
-\pdfdict_gnew:n { ThisPage }
+\pdfdict_gnew:n { Core/Page }
+\pdfdict_gnew:n { Core/ThisPage }
%handler for pdfcoredict
\cs_new_protected:cpn { @@_handler/Page/?_gput:nn } #1 #2
@@ -716,7 +716,7 @@
% handler for pdfcoredict
\cs_new_protected:cpn { @@_handler/ThisPage/?_gput:nn } #1 #2
{
- \prop_gput:cnn { \pdfdict_gname:n { ThisPage } }{ #1 } { #2 }
+ \prop_gput:cnn { \pdfdict_gname:n { Core/ThisPage } }{ #1 } { #2 }
\__pdf_backend_ThisPage_gput:nn { #1 }{ #2 }
}
@@ -767,7 +767,7 @@
% \begin{macro}{ \@@_catalog_XX_gput:n }
% Various commands to handle subentries and special cases.
% \begin{macrocode}
-\pdfdict_gnew:n {Catalog}
+\pdfdict_gnew:n {Core/Catalog}
\clist_const:Nn \c_@@_Catalog_toplevel_clist
{
@@ -804,7 +804,7 @@
\clist_map_inline:Nn \c_@@_Catalog_sub_clist
{
- \pdfdict_gnew:n {Catalog/#1}
+ \pdfdict_gnew:n {Core/Catalog/#1}
}
@@ -852,7 +852,7 @@
\use:c { @@_/Catalog/Requirements_gpush: }
\use:c { @@_/Catalog/ViewerPreferences_gpush: }
% output the single values:
- \prop_map_function:cN { \pdfdict_gname:n {Catalog} } \__pdf_backend_catalog_gput:nn
+ \prop_map_function:cN { \pdfdict_gname:n {Core/Catalog} } \__pdf_backend_catalog_gput:nn
% output names tree:
\use:c { @@_/Catalog/Names/EmbeddedFiles_gpush: }
}
@@ -864,12 +864,12 @@
\cs_new_protected:cpn { @@_/Catalog/AA_gpush: }
{
\prop_if_empty:cF
- { \pdfdict_gname:n { Catalog/AA } }
+ { \pdfdict_gname:n { Core/Catalog/AA } }
{
\__pdf_backend_object_new:nn { g_@@_/Catalog/AA_obj } { dict }
\__pdf_backend_object_write:nx
{ g_@@_/Catalog/AA_obj }
- { \pdfdict_gmap:n { Catalog/AA } }
+ { \pdfdict_gmap:n { Core/Catalog/AA } }
\exp_args:Nnx
\__pdf_backend_catalog_gput:nn
{AA}
@@ -902,7 +902,7 @@
{ \seq_use:cn { g_@@_/Catalog/AcroForm/Fields_seq } {~} }
\exp_args:Nnnx
\prop_gput:cnn %we have to use \prop here to avoid the handler ..
- { \pdfdict_gname:n { Catalog/AcroForm } }
+ { \pdfdict_gname:n { Core/Catalog/AcroForm } }
{ Fields }
{ \__pdf_backend_object_ref:n { g_@@_/Catalog/AcroForm/Fields_obj } }
}
@@ -915,43 +915,43 @@
{ \seq_use:cn { g_@@_/Catalog/AcroForm/CO_seq } {~} }
\exp_args:Nnnx
\prop_gput:cnn %we have to use \prop here to avoid the handler ..
- { \pdfdict_gname:n { Catalog/AcroForm } }
+ { \pdfdict_gname:n { Core/Catalog/AcroForm } }
{ CO }
{ \__pdf_backend_object_ref:n { g_@@_/Catalog/AcroForm/CO_obj } }
}
- \prop_if_empty:cF { \pdfdict_gname:n { Catalog/AcroForm/DR/Font}}
+ \prop_if_empty:cF { \pdfdict_gname:n { Core/Catalog/AcroForm/DR/Font}}
{
\__pdf_backend_object_new:nn { g_@@_/Catalog/AcroForm/DR/Font_obj } {dict}
\exp_args:Nnx
\__pdf_backend_object_write:nn
{ g_@@_/Catalog/AcroForm/DR/Font_obj }
- { \pdfdict_gmap:n { Catalog/AcroForm/DR/Font } }
+ { \pdfdict_gmap:n { Core/Catalog/AcroForm/DR/Font } }
\exp_args:Nnnx
\prop_gput:cnn %we have to use \prop here to avoid the handler ..
- { \pdfdict_gname:n { Catalog/AcroForm/DR } }
+ { \pdfdict_gname:n { Core/Catalog/AcroForm/DR } }
{ Font }
{ \__pdf_backend_object_ref:n { g_@@_/Catalog/AcroForm/DR/Font_obj } }
}
- \prop_if_empty:cF { \pdfdict_gname:n { Catalog/AcroForm/DR}}
+ \prop_if_empty:cF { \pdfdict_gname:n { Core/Catalog/AcroForm/DR}}
{
\__pdf_backend_object_new:nn { g_@@_/Catalog/AcroForm/DR_obj } {dict}
\exp_args:Nnx
\__pdf_backend_object_write:nn
{ g_@@_/Catalog/AcroForm/DR_obj }
- { \pdfdict_gmap:n { Catalog/AcroForm/DR } }
+ { \pdfdict_gmap:n { Core/Catalog/AcroForm/DR } }
\exp_args:Nnnx
\prop_gput:cnn %we have to use \prop here to avoid the handler ..
- { \pdfdict_gname:n { Catalog/AcroForm } }
+ { \pdfdict_gname:n {Core/Catalog/AcroForm } }
{ DR }
{ \__pdf_backend_object_ref:n { g_@@_/Catalog/AcroForm/DR_obj } }
}
- \prop_if_empty:cF { \pdfdict_gname:n { Catalog/AcroForm} }
+ \prop_if_empty:cF { \pdfdict_gname:n { Core/Catalog/AcroForm} }
{
\__pdf_backend_object_new:nn { g_@@_/Catalog/AcroForm_obj } {dict}
\exp_args:Nnx
\__pdf_backend_object_write:nn
{ g_@@_/Catalog/AcroForm_obj }
- { \pdfdict_gmap:n { Catalog/AcroForm } }
+ { \pdfdict_gmap:n { Core/Catalog/AcroForm } }
\exp_args:Nnnx
\@@_handler_gput:nnn
{ Catalog }
@@ -994,13 +994,13 @@
\cs_new_protected:cpn { @@_/Catalog/MarkInfo_gpush: }
{
\prop_if_empty:cF
- { \pdfdict_gname:n { Catalog/MarkInfo } }
+ { \pdfdict_gname:n { Core/Catalog/MarkInfo } }
{
\__pdf_backend_object_new:nn { g_@@_/Catalog/MarkInfo_obj } { dict }
\exp_args:Nnx
\__pdf_backend_object_write:nn
{ g_@@_/Catalog/MarkInfo_obj }
- { \pdfdict_gmap:n {Catalog/MarkInfo } }
+ { \pdfdict_gmap:n {Core/Catalog/MarkInfo } }
\exp_args:Nnx
\__pdf_backend_catalog_gput:nn
{MarkInfo}
@@ -1116,13 +1116,13 @@
\cs_new_protected:cpn { @@_/Catalog/ViewerPreferences_gpush: }
{
\prop_if_empty:cF
- { \pdfdict_gname:n { Catalog/ViewerPreferences } }
+ { \pdfdict_gname:n { Core/Catalog/ViewerPreferences } }
{
\__pdf_backend_object_new:nn { g_@@_/Catalog/ViewerPreferences_obj } { dict }
\exp_args:Nnx
\__pdf_backend_object_write:nn
{ g_@@_/Catalog/ViewerPreferences_obj }
- { \pdfdict_gmap:n {Catalog/ViewerPreferences } }
+ { \pdfdict_gmap:n {Core/Catalog/ViewerPreferences } }
\exp_args:Nnx
\__pdf_backend_catalog_gput:nn
{ViewerPreferences}
@@ -1154,7 +1154,7 @@
% \end{macro}
% \subsection{ xform / Properties }
% \begin{macrocode}
-\pdfdict_gnew:n {Xform/Resources/Properties}
+\pdfdict_gnew:n {Core/Xform/Resources/Properties}
% \end{macrocode}
% \begin{macrocode}
%</package>
diff --git a/pdfresources.dtx b/pdfresources.dtx
index e345164..1bade9e 100644
--- a/pdfresources.dtx
+++ b/pdfresources.dtx
@@ -441,14 +441,14 @@
% sets a lua table with lualatex
\cs_new_protected:Npn \@@_backend_Page_gput:nn #1 #2 %key,value
{
- \pdfdict_gput:nnn {Page}{ #1 }{ #2 }
+ \pdfdict_gput:nnn {Core/Page}{ #1 }{ #2 }
}
% the command to remove a default value.
% Uses a prop with pdflatex + dvi,
% changes a lua table with lualatex
\cs_new_protected:Npn \@@_backend_Page_gremove:n #1
{
- \pdfdict_gremove:nn {Page}{ #1 }
+ \pdfdict_gremove:nn {Core/Page}{ #1 }
}
% the command used in the document.
% direct call of the primitive special with dvips/dvipdfmx
@@ -467,13 +467,13 @@
{pdf at abspage}
{0}
}
- \pdfdict_if_gexist:nF {backend_Page\l_@@_tmpa_tl}
+ \pdfdict_if_gexist:nF {Core/backend_Page\l_@@_tmpa_tl}
{
- \pdfdict_gnew:n {backend_Page\l_@@_tmpa_tl}
+ \pdfdict_gnew:n {Core/backend_Page\l_@@_tmpa_tl}
}
%\__pdfcoredict_handler_gput:nnn {backend_Page\l_@@_tmpa_tl}{ #1 }{ #2 }
%backend_Page has no handler.
- \pdfdict_gput:nnn {backend_Page\l_@@_tmpa_tl}{ #1 }{ #2 }
+ \pdfdict_gput:nnn {Core/backend_Page\l_@@_tmpa_tl}{ #1 }{ #2 }
}
%the code to push the values, used in shipout
%merges the two props and then fills the register in pdflatex
@@ -481,10 +481,10 @@
%issues the values stored in the global prop with dvi
\cs_new_protected:Npn \@@_backend_ThisPage_gpush:n #1
{
- \prop_gset_eq:Nc \g_@@_tmpa_prop { \pdfdict_gname:n { Page } }
- \prop_if_exist:cT { \pdfdict_gname:n { backend_Page#1 } }
+ \prop_gset_eq:Nc \g_@@_tmpa_prop { \pdfdict_gname:n { Core/Page } }
+ \prop_if_exist:cT { \pdfdict_gname:n { Core/backend_Page#1 } }
{
- \prop_map_inline:cn { \pdfdict_gname:n { backend_Page#1 } }
+ \prop_map_inline:cn { \pdfdict_gname:n { Core/backend_Page#1 } }
{
\prop_gput:Nnn \g_@@_tmpa_prop { ##1 }{ ##2 }
}
@@ -576,14 +576,14 @@
% sets a lua table with lualatex
\cs_new_protected:Npn \@@_backend_Page_gput:nn #1 #2
{
- \pdfdict_gput:nnn {Page}{ #1 }{ #2 }
+ \pdfdict_gput:nnn {Core/Page}{ #1 }{ #2 }
}
% the command to remove a default value.
% Uses a prop with pdflatex + dvi,
% changes a lua table with lualatex
\cs_new_protected:Npn \@@_backend_Page_gremove:n #1
{
- \pdfdict_gremove:nn {Page}{ #1 }
+ \pdfdict_gremove:nn {Core/Page}{ #1 }
}
% the command used in the document.
% direct call of the primitive special with dvips/dvipdfmx
@@ -602,7 +602,7 @@
\cs_new_protected:Npn \@@_backend_ThisPage_gpush:n #1
{
\exp_args:Nx \@@_backend_Page_primitive:n
- { \pdfdict_gmap:n {Page} }
+ { \pdfdict_gmap:n {Core/Page} }
}
%</xdvipdfmx>
%<*dvips>
@@ -615,14 +615,14 @@
% sets a lua table with lualatex
\cs_new_protected:Npn \@@_backend_Page_gput:nn #1 #2
{
- \pdfdict_gput:nnn {Page}{ #1 }{ #2 }
+ \pdfdict_gput:nnn {Core/Page}{ #1 }{ #2 }
}
% the command to remove a default value.
% Uses a prop with pdflatex + dvi,
% changes a lua table with lualatex
\cs_new_protected:Npn \@@_backend_Page_gremove:n #1
{
- \pdfdict_gremove:nn {Page}{ #1 }
+ \pdfdict_gremove:nn {Core/Page}{ #1 }
}
% the command used in the document.
% direct call of the primitive special with dvips/dvipdfmx
@@ -641,7 +641,7 @@
\cs_new_protected:Npn \@@_backend_ThisPage_gpush:n #1
{
\exp_args:Nx \@@_backend_Page_primitive:n
- { \pdfdict_gmap:n {Page} }
+ { \pdfdict_gmap:n {Core/Page} }
}
%</dvips>
% \end{macrocode}
@@ -698,7 +698,7 @@
\clist_map_inline:Nn \c_@@_backend_PageResources_clist
{
- \pdfdict_gnew:n {Page/Resources/#1}
+ \pdfdict_gnew:n {Core/Page/Resources/#1}
}
%</drivers>
% pdftex and luatex
@@ -722,7 +722,7 @@
{
\cs_new_protected:Npn \@@_backend_PageResources_gput:nnn #1 #2 #3
{
- \pdfdict_gput:nnn {Page/Resources/#1} { #2 }{ #3 }
+ \pdfdict_gput:nnn {Core/Page/Resources/#1} { #2 }{ #3 }
% luatex must also trigger the lua side
\tex_latelua:D{l3kernel.@@.Page.Resources.#1=true}
\tex_latelua:D
@@ -735,7 +735,7 @@
{ %pdftex
\cs_new_protected:Npn \@@_backend_PageResources_gput:nnn #1 #2 #3
{
- \pdfdict_gput:nnn {Page/Resources/#1} { #2 }{ #3 }
+ \pdfdict_gput:nnn {Core/Page/Resources/#1} { #2 }{ #3 }
}
}
@@ -745,11 +745,11 @@
\clist_map_inline:Nn \c_@@_backend_PageResources_clist
{
\prop_if_empty:cF
- { \pdfdict_gname:n {Page/Resources/##1} }
+ { \pdfdict_gname:n {Core/Page/Resources/##1} }
{
\@@_backend_object_write:nx
{ Page/Resources/##1 }
- { \pdfdict_gmap:n {Page/Resources/##1} }
+ { \pdfdict_gmap:n {Core/Page/Resources/##1} }
}
}
}
@@ -774,7 +774,7 @@
\cs_new_protected:Npn \@@_backend_PageResources_gput:nnn #1 #2 #3
{
% this is not used for output, but there is a test if the resource is empty
- \prop_gput:cnn { \pdfdict_gname:n {Page/Resources/#1} } { #2 }{ #3 }
+ \prop_gput:cnn { \pdfdict_gname:n {Core/Page/Resources/#1} } { #2 }{ #3 }
%objects are not filled with \pdf_object_write as this is not additive!
\@@_backend:x
{
@@ -789,7 +789,7 @@
\cs_new_protected:Npn \@@_backend_PageResources:n #1 {}
\cs_new_protected:Npn \@@_backend_PageResources_gput:nnn #1 #2 #3
{ %only for the show command TEST!!
- \pdfdict_gput:nnn {Page/Resources/#1} { #2 }{ #3 }
+ \pdfdict_gput:nnn {Core/Page/Resources/#1} { #2 }{ #3 }
}
\cs_new_protected:Npn \@@_backend_PageResources_obj_gpush: {}
%</dvips>
@@ -1061,7 +1061,7 @@
{
\clist_map_inline:Nn \c_@@_backend_PageResources_clist
{
- \prop_if_empty:cF { \pdfdict_gname:n {Page/Resources/##1} }
+ \prop_if_empty:cF { \pdfdict_gname:n {Core/Page/Resources/##1} }
{
\__kernel_backend_literal:x
{
@@ -1084,7 +1084,7 @@
\bool_if:NTF \l_@@_backend_xform_bool
{
\exp_args:Nnx\pdfdict_gput:nnn
- { Xform/Resources/Properties }
+ { Core/Xform/Resources/Properties }
{ l3pdf\int_use:N\g_@@_backend_name_int }
{ \@@_backend_object_ref:n { #2 } }
}
@@ -1108,7 +1108,7 @@
\bool_if:NTF \l_@@_backend_xform_bool
{
\exp_args:Nnx\pdfdict_gput:nnn %no handler needed
- { Xform/Resources/Properties }
+ { Core/Xform/Resources/Properties }
{ l3pdf\int_use:N\g_@@_backend_name_int }
{ \@@_backend_object_last: }
}
@@ -1150,7 +1150,7 @@
\bool_if:NTF \l_@@_backend_xform_bool
{
\exp_args:Nnx\pdfdict_gput:nnn %no handler needed
- { Xform/Resources/Properties }
+ { Core/Xform/Resources/Properties }
{ l3pdf\int_use:N\g_@@_backend_resourceid_int }
{ \@@_backend_object_ref:n { #2 } }
}
@@ -1165,12 +1165,12 @@
{pdf at abspage}
{0}
}
- \pdfdict_if_gexist:nF { backend_Page\l_@@_tmpa_tl/Resources/Properties }
+ \pdfdict_if_gexist:nF { Core/backend_Page\l_@@_tmpa_tl/Resources/Properties }
{
- \pdfdict_gnew:n { backend_Page\l_@@_tmpa_tl/Resources/Properties }
+ \pdfdict_gnew:n { Core/backend_Page\l_@@_tmpa_tl/Resources/Properties }
}
\exp_args:Nnx\pdfdict_gput:nnn
- { backend_Page\l_@@_tmpa_tl/Resources/Properties }
+ { Core/backend_Page\l_@@_tmpa_tl/Resources/Properties }
{ l3pdf\int_use:N\g_@@_backend_resourceid_int }
{ \@@_backend_object_ref:n{#2} }
}
@@ -1185,7 +1185,7 @@
\bool_if:NTF \l_@@_backend_xform_bool
{
\exp_args:Nnx\pdfdict_gput:nnn
- { Xform/Resources/Properties }
+ { Core/Xform/Resources/Properties }
{ l3pdf\int_use:N\g_@@_backend_resourceid_int }
{ \@@_backend_object_last: }
}
@@ -1200,12 +1200,12 @@
{pdf at abspage}
{0}
}
- \pdfdict_if_gexist:nF { backend_Page\l_@@_tmpa_tl/Resources/Properties }
+ \pdfdict_if_gexist:nF { Core/backend_Page\l_@@_tmpa_tl/Resources/Properties }
{
- \pdfdict_gnew:n { backend_Page\l_@@_tmpa_tl/Resources/Properties }
+ \pdfdict_gnew:n { Core/backend_Page\l_@@_tmpa_tl/Resources/Properties }
}
\exp_args:Nnx\pdfdict_gput:nnn
- { backend_Page\l_@@_tmpa_tl/Resources/Properties }
+ { Core/backend_Page\l_@@_tmpa_tl/Resources/Properties }
{ l3pdf\int_use:N\g_@@_backend_resourceid_int }
{ \@@_backend_object_last: }
%\pdfdict_show:n { backend_Page\l_@@_tmpa_tl/Resources/Properties }
@@ -1223,7 +1223,7 @@
\cs_new:Npn \@@_backend_PageResources_gpush_aux:n #1 %#1 ExtGState etc
{
\prop_if_empty:cF
- { \pdfdict_gname:n {Page/Resources/#1} }
+ { \pdfdict_gname:n {Core/Page/Resources/#1} }
{
\pdfdict_item:ne { #1 }{ \pdf_object_ref:n {Page/Resources/#1}}
}
@@ -1234,12 +1234,12 @@
\exp_args:NNx \tex_global:D \tex_pdfpageresources:D
{
\prop_if_exist:cT
- { \pdfdict_gname:n { backend_Page#1/Resources/Properties } }
+ { \pdfdict_gname:n { Core/backend_Page#1/Resources/Properties } }
{
/Properties~
<<
\prop_map_function:cN
- { \pdfdict_gname:n { backend_Page#1/Resources/Properties } }
+ { \pdfdict_gname:n { Core/backend_Page#1/Resources/Properties } }
\pdfdict_item:ne
>>
}
@@ -1395,7 +1395,7 @@
\hbox_set:Nn \l_@@_tmpa_box
{
\bool_set_true:N \l_@@_backend_xform_bool
- \prop_gclear:c {\pdfdict_gname:n { Xform/Resources/Properties }}
+ \prop_gclear:c {\pdfdict_gname:n { Core/Xform/Resources/Properties }}
#4
}
%store the dimensions
@@ -1416,33 +1416,33 @@
{
#3
\int_compare:nNnT
- { \prop_count:c { \pdfdict_gname:n { Xform/Resources/Properties } } }
+ { \prop_count:c { \pdfdict_gname:n { Core/Xform/Resources/Properties } } }
>
{ 0 }
{
/Properties~
<<
- \pdfdict_gmap:n { Xform/Resources/Properties }
+ \pdfdict_gmap:n { Core/Xform/Resources/Properties }
>>
}
\prop_if_empty:cF
- { \pdfdict_gname:n { Page/Resources/ExtGState } }
+ { \pdfdict_gname:n { Core/Page/Resources/ExtGState } }
{
/ExtGState~ \pdf_object_ref:n { Page/Resources/ExtGState }
}
\prop_if_empty:cF
- { \pdfdict_gname:n { Page/Resources/Pattern } }
+ { \pdfdict_gname:n { Core/Page/Resources/Pattern } }
{
/Pattern~ \pdf_object_ref:n { Page/Resources/Pattern }
}
\prop_if_empty:cF
- { \pdfdict_gname:n { Page/Resources/Shading } }
+ { \pdfdict_gname:n { Core/Page/Resources/Shading } }
{
/Shading~ \pdf_object_ref:n { Page/Resources/Shading }
}
\prop_if_empty:cF
- { \pdfdict_gname:n { Page/Resources/ColorSpace } }
+ { \pdfdict_gname:n { Core/Page/Resources/ColorSpace } }
{
/ColorSpace~ \pdf_object_ref:n { Page/Resources/ColorSpace }
}
@@ -1479,7 +1479,7 @@
\hbox_set:Nn \l_@@_tmpa_box
{
\bool_set_true:N \l_@@_backend_xform_bool
- \prop_gclear:c { \pdfdict_gname:n { Xform/Resources/Properties } }
+ \prop_gclear:c { \pdfdict_gname:n { Core/Xform/Resources/Properties } }
#4
}
\tl_const:cx
@@ -1499,32 +1499,32 @@
{
#3
\int_compare:nNnT
- {\prop_count:c { \pdfdict_gname:n { Xform/Resources/Properties } }}
+ {\prop_count:c { \pdfdict_gname:n { Core/Xform/Resources/Properties } }}
>
{ 0 }
{
/Properties~
<<
- \pdfdict_gmap:n { Xform/Resources/Properties }
+ \pdfdict_gmap:n { Core/Xform/Resources/Properties }
>>
}
\prop_if_empty:cF
- { \pdfdict_gname:n { Page/Resources/ExtGState } }
+ { \pdfdict_gname:n { Core/Page/Resources/ExtGState } }
{
/ExtGState~ \pdf_object_ref:n { Page/Resources/ExtGState }
}
\prop_if_empty:cF
- { \pdfdict_gname:n { Page/Resources/Pattern } }
+ { \pdfdict_gname:n { Core/Page/Resources/Pattern } }
{
/Pattern~ \pdf_object_ref:n { Page/Resources/Pattern }
}
\prop_if_empty:cF
- { \pdfdict_gname:n { Page/Resources/Shading } }
+ { \pdfdict_gname:n { Core/Page/Resources/Shading } }
{
/Shading~ \pdf_object_ref:n { Page/Resources/Shading }
}
\prop_if_empty:cF
- { \pdfdict_gname:n { Page/Resources/ColorSpace } }
+ { \pdfdict_gname:n { Core/Page/Resources/ColorSpace } }
{
/ColorSpace~ \pdf_object_ref:n { Page/Resources/ColorSpace }
}
diff --git a/testfiles/catalog-remove.luatex.tlg b/testfiles/catalog-remove.luatex.tlg
index 1c06661..7ff950b 100644
--- a/testfiles/catalog-remove.luatex.tlg
+++ b/testfiles/catalog-remove.luatex.tlg
@@ -1,39 +1,40 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-The dictionary 'Catalog' contains the pairs (without outer braces):
+The core dictionary 'Catalog' contains the pairs (without outer braces):
> {Lang} => {(de-De)}
> {PageLayout} => {/SinglePage}.
<recently read> }
l. ...\pdfcoredict_show:n {Catalog}
-The dictionary 'Catalog/ViewerPreferences' contains the pairs (without outer
-braces):
+The core dictionary 'Catalog/ViewerPreferences' contains the pairs (without
+outer braces):
> {HideToolbar} => {true}.
<recently read> }
l. ...\pdfcoredict_show:n {Catalog/ViewerPreferences}
-The dictionary 'Catalog/MarkInfo' contains the pairs (without outer braces):
+The core dictionary 'Catalog/MarkInfo' contains the pairs (without outer
+braces):
> {Marked} => {True}.
<recently read> }
l. ...\pdfcoredict_show:n {Catalog/MarkInfo}
-The dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without outer
-braces):
+The core dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without
+outer braces):
> {Name} => {<</ABC/CDE>>}
> {NameB} => {<</ABC/CDE>>}.
<recently read> }
l. ...\pdfcoredict_show:n {Catalog/AcroForm/DR/Font}
-The dictionary 'Catalog' contains the pairs (without outer braces):
+The core dictionary 'Catalog' contains the pairs (without outer braces):
> {Lang} => {(de-De)}.
<recently read> }
l. ...\pdfcoredict_show:n {Catalog}
-The dictionary 'Catalog/ViewerPreferences' is empty
+The core dictionary 'Catalog/ViewerPreferences' is empty
> .
<recently read> }
l. ...\pdfcoredict_show:n {Catalog/ViewerPreferences}
-The dictionary 'Catalog/MarkInfo' is empty
+The core dictionary 'Catalog/MarkInfo' is empty
> .
<recently read> }
l. ...\pdfcoredict_show:n {Catalog/MarkInfo}
-The dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without outer
-braces):
+The core dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without
+outer braces):
> {NameB} => {<</ABC/CDE>>}.
<recently read> }
l. ...\pdfcoredict_show:n {Catalog/AcroForm/DR/Font}
diff --git a/testfiles/catalog-remove.tlg b/testfiles/catalog-remove.tlg
index e0f17cf..b2fc06f 100644
--- a/testfiles/catalog-remove.tlg
+++ b/testfiles/catalog-remove.tlg
@@ -1,39 +1,40 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-The dictionary 'Catalog' contains the pairs (without outer braces):
+The core dictionary 'Catalog' contains the pairs (without outer braces):
> {Lang} => {(de-De)}
> {PageLayout} => {/SinglePage}.
<recently read> }
l. ...\pdfcoredict_show:n {Catalog}
-The dictionary 'Catalog/ViewerPreferences' contains the pairs (without outer
-braces):
+The core dictionary 'Catalog/ViewerPreferences' contains the pairs (without
+outer braces):
> {HideToolbar} => {true}.
<recently read> }
l. ......oredict_show:n {Catalog/ViewerPreferences}
-The dictionary 'Catalog/MarkInfo' contains the pairs (without outer braces):
+The core dictionary 'Catalog/MarkInfo' contains the pairs (without outer
+braces):
> {Marked} => {True}.
<recently read> }
l. ...\pdfcoredict_show:n {Catalog/MarkInfo}
-The dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without outer
-braces):
+The core dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without
+outer braces):
> {Name} => {<</ABC/CDE>>}
> {NameB} => {<</ABC/CDE>>}.
<recently read> }
l. ......coredict_show:n {Catalog/AcroForm/DR/Font}
-The dictionary 'Catalog' contains the pairs (without outer braces):
+The core dictionary 'Catalog' contains the pairs (without outer braces):
> {Lang} => {(de-De)}.
<recently read> }
l. ...\pdfcoredict_show:n {Catalog}
-The dictionary 'Catalog/ViewerPreferences' is empty
+The core dictionary 'Catalog/ViewerPreferences' is empty
> .
<recently read> }
l. ......oredict_show:n {Catalog/ViewerPreferences}
-The dictionary 'Catalog/MarkInfo' is empty
+The core dictionary 'Catalog/MarkInfo' is empty
> .
<recently read> }
l. ...\pdfcoredict_show:n {Catalog/MarkInfo}
-The dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without outer
-braces):
+The core dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without
+outer braces):
> {NameB} => {<</ABC/CDE>>}.
<recently read> }
l. ......coredict_show:n {Catalog/AcroForm/DR/Font}
diff --git a/testfiles/catalog-remove.xetex.tlg b/testfiles/catalog-remove.xetex.tlg
index e0f17cf..b2fc06f 100644
--- a/testfiles/catalog-remove.xetex.tlg
+++ b/testfiles/catalog-remove.xetex.tlg
@@ -1,39 +1,40 @@
This is a generated file for the l3build validation system.
Don't change this file in any respect.
-The dictionary 'Catalog' contains the pairs (without outer braces):
+The core dictionary 'Catalog' contains the pairs (without outer braces):
> {Lang} => {(de-De)}
> {PageLayout} => {/SinglePage}.
<recently read> }
l. ...\pdfcoredict_show:n {Catalog}
-The dictionary 'Catalog/ViewerPreferences' contains the pairs (without outer
-braces):
+The core dictionary 'Catalog/ViewerPreferences' contains the pairs (without
+outer braces):
> {HideToolbar} => {true}.
<recently read> }
l. ......oredict_show:n {Catalog/ViewerPreferences}
-The dictionary 'Catalog/MarkInfo' contains the pairs (without outer braces):
+The core dictionary 'Catalog/MarkInfo' contains the pairs (without outer
+braces):
> {Marked} => {True}.
<recently read> }
l. ...\pdfcoredict_show:n {Catalog/MarkInfo}
-The dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without outer
-braces):
+The core dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without
+outer braces):
> {Name} => {<</ABC/CDE>>}
> {NameB} => {<</ABC/CDE>>}.
<recently read> }
l. ......coredict_show:n {Catalog/AcroForm/DR/Font}
-The dictionary 'Catalog' contains the pairs (without outer braces):
+The core dictionary 'Catalog' contains the pairs (without outer braces):
> {Lang} => {(de-De)}.
<recently read> }
l. ...\pdfcoredict_show:n {Catalog}
-The dictionary 'Catalog/ViewerPreferences' is empty
+The core dictionary 'Catalog/ViewerPreferences' is empty
> .
<recently read> }
l. ......oredict_show:n {Catalog/ViewerPreferences}
-The dictionary 'Catalog/MarkInfo' is empty
+The core dictionary 'Catalog/MarkInfo' is empty
> .
<recently read> }
l. ...\pdfcoredict_show:n {Catalog/MarkInfo}
-The dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without outer
-braces):
+The core dictionary 'Catalog/AcroForm/DR/Font' contains the pairs (without
+outer braces):
> {NameB} => {<</ABC/CDE>>}.
<recently read> }
l. ......coredict_show:n {Catalog/AcroForm/DR/Font}
diff --git a/testfiles/dict_if_empty.lvt b/testfiles/dict_if_empty.lvt
index d4f0035..2e03282 100644
--- a/testfiles/dict_if_empty.lvt
+++ b/testfiles/dict_if_empty.lvt
@@ -12,9 +12,9 @@
\pdfdict_put:nnn {test}{key}{value}
\pdfdict_if_empty:nTF{test}{empty}{not empty}\par
-\pdfdict_if_gempty:nTF{Page}{empty}{not empty}\par
+\pdfdict_if_gempty:nTF{Core/Page}{empty}{not empty}\par
\pdfcoredict_gput:nnn {Page}{Rotate}{90}
-\pdfdict_if_gempty:nTF{Page}{empty}{not empty}\par
+\pdfdict_if_gempty:nTF{Core/Page}{empty}{not empty}\par
\ExplSyntaxOff
\end{document}
diff --git a/testfiles/show.luatex.tlg b/testfiles/show.luatex.tlg
index 91ab68a..0b46b90 100644
--- a/testfiles/show.luatex.tlg
+++ b/testfiles/show.luatex.tlg
@@ -1,11 +1,12 @@
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 global dictionary 'Core/Catalog' contains the pairs (without outer
+braces):
> {PageMode} => {/UseOutlines}
> {OpenAction} => {[5 0 R /Fit]}.
<recently read> }
-l. ...\pdfdict_show:n{Catalog}
-The global dictionary 'Info' contains the pairs (without outer braces):
+l. ...\pdfdict_show:n{Core/Catalog}
+The global dictionary 'Core/Info' contains the pairs (without outer braces):
> {Creator} =>
{<FEFF004C006100540065005800200077006900740068002000680079007000650072007200650
066>}
@@ -13,16 +14,22 @@ The global dictionary 'Info' contains the pairs (without outer braces):
> {Title} => {<FEFF>}
> {Subject} => {<FEFF>}.
<recently read> }
-l. ...\pdfdict_show:n{Info}
-The local dictionary 'Catalog' contains the pairs (without outer braces):
+l. ...\pdfdict_show:n{Core/Info}
+The local dictionary 'Core/Catalog' contains the pairs (without outer braces):
> {abc} => {blub}.
<recently read> }
-l. ...\pdfdict_show:n{Catalog}
-The global dictionary 'Catalog' contains the pairs (without outer braces):
+l. ...\pdfdict_show:n{Core/Catalog}
+The global dictionary 'Core/Catalog' contains the pairs (without outer
+braces):
> {PageMode} => {/UseOutlines}
> {OpenAction} => {[5 0 R /Fit]}.
<recently read> }
-l. ...\pdfdict_show:n{Catalog}
+l. ...\pdfdict_show:n{Core/Catalog}
+The core dictionary 'Catalog' contains the pairs (without outer braces):
+> {PageMode} => {/UseOutlines}
+> {OpenAction} => {[5 0 R /Fit]}.
+<recently read> }
+l. ...\pdfcoredict_show:n{Catalog}
The dictionary 'blub' is not a declared global or local dictionary.
> .
<recently read> }
diff --git a/testfiles/show.lvt b/testfiles/show.lvt
index 074fb35..e3f2968 100644
--- a/testfiles/show.lvt
+++ b/testfiles/show.lvt
@@ -7,13 +7,14 @@
\showoutput
abbb
\ExplSyntaxOn
-\pdfdict_show:n{Catalog}
-\pdfdict_show:n{Info}
-\pdfdict_new:n {Catalog}
-\pdfdict_put:nnn{Catalog}{abc }{blub}
-\pdfdict_show:n{Catalog}
+\pdfdict_show:n{Core/Catalog}
+\pdfdict_show:n{Core/Info}
+\pdfdict_new:n {Core/Catalog}
+\pdfdict_put:nnn{Core/Catalog}{abc }{blub}
+\pdfdict_show:n{Core/Catalog}
+\pdfcoredict_show:n{Catalog}
\pdfdict_show:n{blub}
\pdfdict_if_exist:nTF {blub}{true}{false}
-\pdfdict_if_gexist:nTF {Info}{true}{false}
+\pdfdict_if_gexist:nTF {Core/Info}{true}{false}
\ExplSyntaxOff
\end{document}
diff --git a/testfiles/show.tlg b/testfiles/show.tlg
index 512cae1..e54d2fb 100644
--- a/testfiles/show.tlg
+++ b/testfiles/show.tlg
@@ -1,27 +1,34 @@
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 global dictionary 'Core/Catalog' contains the pairs (without outer
+braces):
> {PageMode} => {/UseOutlines}
> {OpenAction} => {[5 0 R /Fit]}.
<recently read> }
-l. ...\pdfdict_show:n{Catalog}
-The global dictionary 'Info' contains the pairs (without outer braces):
+l. ...\pdfdict_show:n{Core/Catalog}
+The global dictionary 'Core/Info' contains the pairs (without outer braces):
> {Creator} =>
{<FEFF004C006100540065005800200077006900740068002000680079007000650072007200650066>}
> {Author} => {<FEFF>}
> {Title} => {<FEFF>}
> {Subject} => {<FEFF>}.
<recently read> }
-l. ...\pdfdict_show:n{Info}
-The local dictionary 'Catalog' contains the pairs (without outer braces):
+l. ...\pdfdict_show:n{Core/Info}
+The local dictionary 'Core/Catalog' contains the pairs (without outer braces):
> {abc} => {blub}.
<recently read> }
-l. ...\pdfdict_show:n{Catalog}
-The global dictionary 'Catalog' contains the pairs (without outer braces):
+l. ...\pdfdict_show:n{Core/Catalog}
+The global dictionary 'Core/Catalog' contains the pairs (without outer
+braces):
> {PageMode} => {/UseOutlines}
> {OpenAction} => {[5 0 R /Fit]}.
<recently read> }
-l. ...\pdfdict_show:n{Catalog}
+l. ...\pdfdict_show:n{Core/Catalog}
+The core dictionary 'Catalog' contains the pairs (without outer braces):
+> {PageMode} => {/UseOutlines}
+> {OpenAction} => {[5 0 R /Fit]}.
+<recently read> }
+l. ...\pdfcoredict_show:n{Catalog}
The dictionary 'blub' is not a declared global or local dictionary.
> .
<recently read> }
diff --git a/testfiles/show.xetex.tlg b/testfiles/show.xetex.tlg
index 5c99f6c..3eeb83d 100644
--- a/testfiles/show.xetex.tlg
+++ b/testfiles/show.xetex.tlg
@@ -1,27 +1,34 @@
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 global dictionary 'Core/Catalog' contains the pairs (without outer
+braces):
> {PageMode} => {/UseOutlines}
> {OpenAction} => {[@page1 /Fit]}.
<recently read> }
-l. ...\pdfdict_show:n{Catalog}
-The global dictionary 'Info' contains the pairs (without outer braces):
+l. ...\pdfdict_show:n{Core/Catalog}
+The global dictionary 'Core/Info' contains the pairs (without outer braces):
> {Creator} =>
{<FEFF004C006100540065005800200077006900740068002000680079007000650072007200650066>}
> {Author} => {<FEFF>}
> {Title} => {<FEFF>}
> {Subject} => {<FEFF>}.
<recently read> }
-l. ...\pdfdict_show:n{Info}
-The local dictionary 'Catalog' contains the pairs (without outer braces):
+l. ...\pdfdict_show:n{Core/Info}
+The local dictionary 'Core/Catalog' contains the pairs (without outer braces):
> {abc} => {blub}.
<recently read> }
-l. ...\pdfdict_show:n{Catalog}
-The global dictionary 'Catalog' contains the pairs (without outer braces):
+l. ...\pdfdict_show:n{Core/Catalog}
+The global dictionary 'Core/Catalog' contains the pairs (without outer
+braces):
> {PageMode} => {/UseOutlines}
> {OpenAction} => {[@page1 /Fit]}.
<recently read> }
-l. ...\pdfdict_show:n{Catalog}
+l. ...\pdfdict_show:n{Core/Catalog}
+The core dictionary 'Catalog' contains the pairs (without outer braces):
+> {PageMode} => {/UseOutlines}
+> {OpenAction} => {[@page1 /Fit]}.
+<recently read> }
+l. ...\pdfcoredict_show:n{Catalog}
The dictionary 'blub' is not a declared global or local dictionary.
> .
<recently read> }
More information about the latex3-commits
mailing list.