[latex3-commits] [git/LaTeX3-latex3-pdfresources] splitting: correct tests, small typos (b705db9)
Ulrike Fischer
fischer at troubleshooting-tex.de
Tue Jul 7 19:16:04 CEST 2020
Repository : https://github.com/latex3/pdfresources
On branch : splitting
Link : https://github.com/latex3/pdfresources/commit/b705db92fae43008c5bee4503c9a58d1c15528bf
>---------------------------------------------------------------
commit b705db92fae43008c5bee4503c9a58d1c15528bf
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Sun Jun 14 14:52:10 2020 +0200
correct tests, small typos
>---------------------------------------------------------------
b705db92fae43008c5bee4503c9a58d1c15528bf
l3pdfgdict.dtx | 108 +++++++++++++++++++++----------------------
l3pdfmeta.dtx | 2 +-
pdfresources.dtx | 16 +++----
testfiles/catalog-remove.lvt | 38 +++++++--------
testfiles/catalogAF.pvt | 4 +-
5 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/l3pdfgdict.dtx b/l3pdfgdict.dtx
index d35e761..4bf30b2 100644
--- a/l3pdfgdict.dtx
+++ b/l3pdfgdict.dtx
@@ -481,7 +481,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \pdfgdict_gput:nnn #1 #2 #3
{
- \@@_if_global:nTF { #1 }
+ \@@_if_exist:nTF { #1 }
{
\@@_handler_gput:nnn { #1 }{ #2 }{ #3 }
}
@@ -795,7 +795,7 @@
% push to the register command / issue the special
\cs_new_protected:Npn \@@_Info_gpush:
{
- \prop_map_function:cN { \@@_name:n {Info} } \@@_backend_info_gput:nn
+ \prop_map_function:cN { \@@_name:n {Info} } \__pdf_backend_info_gput:nn
\prop_gclear:c { \@@_name:n {Info} }
}
% \end{macrocode}
@@ -830,19 +830,19 @@
%handler for pdfgdict
\cs_new_protected:cpn { @@_handler/Page/?_gput:nn } #1 #2
{
- \@@_backend_Page_gput:nn { #1 }{ #2 }
+ \__pdf_backend_Page_gput:nn { #1 }{ #2 }
}
% remove:
\cs_new_protected:cpn { @@_handler/Page/?_gremove:n } #1
{
- \@@_backend_Page_gremove:n { #1 }
+ \__pdf_backend_Page_gremove:n { #1 }
}
% handler for pdfgdict
\cs_new_protected:cpn { @@_handler/ThisPage/?_gput:nn } #1 #2
{
\prop_gput:cnn { \@@_name:n { ThisPage } }{ #1 } { #2 }
- \@@_backend_ThisPage_gput:nn { #1 }{ #2 }
+ \__pdf_backend_ThisPage_gput:nn { #1 }{ #2 }
}
\cs_new_protected:cpn { @@_handler/ThisPage/?_gremove:n } #1
@@ -862,22 +862,22 @@
% setter: #1 is the name of the resource
\cs_new_protected:cpn { @@_handler/Page/Resources/ExtGState/?_gput:nn } #1 #2
{
- \@@_backend_PageResources_gput:nnn {ExtGState} { #1 }{ #2 }
+ \__pdf_backend_PageResources_gput:nnn {ExtGState} { #1 }{ #2 }
}
\cs_new_protected:cpn { @@_handler/Page/Resources/ColorSpace/?_gput:nn } #1 #2
{
- \@@_backend_PageResources_gput:nnn {ColorSpace} { #1 }{ #2 }
+ \__pdf_backend_PageResources_gput:nnn {ColorSpace} { #1 }{ #2 }
}
\cs_new_protected:cpn { @@_handler/Page/Resources/Shading/?_gput:nn } #1 #2
{
- \@@_backend_PageResources_gput:nnn {Shading} { #1 }{ #2 }
+ \__pdf_backend_PageResources_gput:nnn {Shading} { #1 }{ #2 }
}
\cs_new_protected:cpn { @@_handler/Page/Resources/Pattern/?_gput:nn } #1 #2
{
- \@@_backend_PageResources_gput:nnn {Pattern} { #1 }{ #2 }
+ \__pdf_backend_PageResources_gput:nnn {Pattern} { #1 }{ #2 }
}
% \end{macrocode}
% \begin{variable}[added=2019-08-24]
@@ -977,7 +977,7 @@
\use:c { @@_/Catalog/Requirements_gpush: }
\use:c { @@_/Catalog/ViewerPreferences_gpush: }
% output the single values:
- \prop_map_function:cN { \@@_name:n {Catalog} } \@@_backend_catalog_gput:nn
+ \prop_map_function:cN { \@@_name:n {Catalog} } \__pdf_backend_catalog_gput:nn
% output names tree:
\use:c { @@_/Catalog/Names/EmbeddedFiles_gpush: }
}
@@ -991,15 +991,15 @@
\prop_if_empty:cF
{ \@@_name:n { Catalog/AA } }
{
- \@@_backend_object_new:nn { g_@@_/Catalog/AA_obj } { dict }
- \@@_backend_object_write:nx
+ \__pdf_backend_object_new:nn { g_@@_/Catalog/AA_obj } { dict }
+ \__pdf_backend_object_write:nx
{ g_@@_/Catalog/AA_obj }
{ \@@_map:n { Catalog/AA } }
\exp_args:Nnx
- \@@_backend_catalog_gput:nn
+ \__pdf_backend_catalog_gput:nn
{AA}
{
- \@@_backend_object_ref:n { g_@@_/Catalog/AA_obj }
+ \__pdf_backend_object_ref:n { g_@@_/Catalog/AA_obj }
}
}
}
@@ -1021,67 +1021,67 @@
{
\seq_if_empty:cF { g_@@_/Catalog/AcroForm/Fields_seq }
{
- \@@_backend_object_new:nn { g_@@_/Catalog/AcroForm/Fields_obj } { array }
- \@@_backend_object_write:nx
+ \__pdf_backend_object_new:nn { g_@@_/Catalog/AcroForm/Fields_obj } { array }
+ \__pdf_backend_object_write:nx
{ g_@@_/Catalog/AcroForm/Fields_obj }
{ \seq_use:cn { g_@@_/Catalog/AcroForm/Fields_seq } {~} }
\exp_args:Nnnx
\prop_gput:cnn %we have to use \prop here to avoid the handler ..
{ \@@_name:n { Catalog/AcroForm } }
{ Fields }
- { \@@_backend_object_ref:n { g_@@_/Catalog/AcroForm/Fields_obj } }
+ { \__pdf_backend_object_ref:n { g_@@_/Catalog/AcroForm/Fields_obj } }
}
\seq_if_empty:cF { g_@@_/Catalog/AcroForm/CO_seq }
{
- \@@_backend_object_new:nn { g_@@_/Catalog/AcroForm/CO_obj } { array }
+ \__pdf_backend_object_new:nn { g_@@_/Catalog/AcroForm/CO_obj } { array }
\exp_args:Nnx
- \@@_backend_object_write:nn
+ \__pdf_backend_object_write:nn
{ g_@@_/Catalog/AcroForm/CO_obj }
{ \seq_use:cn { g_@@_/Catalog/AcroForm/CO_seq } {~} }
\exp_args:Nnnx
\prop_gput:cnn %we have to use \prop here to avoid the handler ..
{ \@@_name:n { Catalog/AcroForm } }
{ CO }
- { \@@_backend_object_ref:n { g_@@_/Catalog/AcroForm/CO_obj } }
+ { \__pdf_backend_object_ref:n { g_@@_/Catalog/AcroForm/CO_obj } }
}
\prop_if_empty:cF { \@@_name:n { Catalog/AcroForm/DR/Font}}
{
- \@@_backend_object_new:nn { g_@@_/Catalog/AcroForm/DR/Font_obj } {dict}
+ \__pdf_backend_object_new:nn { g_@@_/Catalog/AcroForm/DR/Font_obj } {dict}
\exp_args:Nnx
- \@@_backend_object_write:nn
+ \__pdf_backend_object_write:nn
{ g_@@_/Catalog/AcroForm/DR/Font_obj }
{ \@@_map:n { Catalog/AcroForm/DR/Font } }
\exp_args:Nnnx
\prop_gput:cnn %we have to use \prop here to avoid the handler ..
{ \@@_name:n { Catalog/AcroForm/DR } }
{ Font }
- { \@@_backend_object_ref:n { g_@@_/Catalog/AcroForm/DR/Font_obj } }
+ { \__pdf_backend_object_ref:n { g_@@_/Catalog/AcroForm/DR/Font_obj } }
}
\prop_if_empty:cF { \@@_name:n { Catalog/AcroForm/DR}}
{
- \@@_backend_object_new:nn { g_@@_/Catalog/AcroForm/DR_obj } {dict}
+ \__pdf_backend_object_new:nn { g_@@_/Catalog/AcroForm/DR_obj } {dict}
\exp_args:Nnx
- \@@_backend_object_write:nn
+ \__pdf_backend_object_write:nn
{ g_@@_/Catalog/AcroForm/DR_obj }
{ \@@_map:n { Catalog/AcroForm/DR } }
\exp_args:Nnnx
\prop_gput:cnn %we have to use \prop here to avoid the handler ..
{ \@@_name:n { Catalog/AcroForm } }
{ DR }
- { \@@_backend_object_ref:n { g_@@_/Catalog/AcroForm/DR_obj } }
+ { \__pdf_backend_object_ref:n { g_@@_/Catalog/AcroForm/DR_obj } }
}
\prop_if_empty:cF { \@@_name:n { Catalog/AcroForm} }
{
- \@@_backend_object_new:nn { g_@@_/Catalog/AcroForm_obj } {dict}
+ \__pdf_backend_object_new:nn { g_@@_/Catalog/AcroForm_obj } {dict}
\exp_args:Nnx
- \@@_backend_object_write:nn
+ \__pdf_backend_object_write:nn
{ g_@@_/Catalog/AcroForm_obj }
{ \@@_map:n { Catalog/AcroForm } }
\exp_args:Nnnx
\@@_handler_gput:nnn
{ Catalog }
{ AcroForm }
- { \@@_backend_object_ref:n { g_@@_/Catalog/AcroForm_obj } }
+ { \__pdf_backend_object_ref:n { g_@@_/Catalog/AcroForm_obj } }
}
}
@@ -1097,16 +1097,16 @@
\seq_if_empty:cF
{ g_@@_/Catalog/AF_seq }
{
- \@@_backend_object_new:nn { g_@@_/Catalog/AF_obj } { array }
+ \__pdf_backend_object_new:nn { g_@@_/Catalog/AF_obj } { array }
\exp_args:Nnx
- \@@_backend_object_write:nn
+ \__pdf_backend_object_write:nn
{ g_@@_/Catalog/AF_obj }
{ \seq_use:cn { g_@@_/Catalog/AF_seq } {~} }
\exp_args:Nnx
- \@@_backend_catalog_gput:nn
+ \__pdf_backend_catalog_gput:nn
{AF}
{
- \@@_backend_object_ref:n {g_@@_/Catalog/AF_obj}
+ \__pdf_backend_object_ref:n {g_@@_/Catalog/AF_obj}
}
}
}
@@ -1121,16 +1121,16 @@
\prop_if_empty:cF
{ \@@_name:n { Catalog/MarkInfo } }
{
- \@@_backend_object_new:nn { g_@@_/Catalog/MarkInfo_obj } { dict }
+ \__pdf_backend_object_new:nn { g_@@_/Catalog/MarkInfo_obj } { dict }
\exp_args:Nnx
- \@@_backend_object_write:nn
+ \__pdf_backend_object_write:nn
{ g_@@_/Catalog/MarkInfo_obj }
{ \@@_map:n {Catalog/MarkInfo } }
\exp_args:Nnx
- \@@_backend_catalog_gput:nn
+ \__pdf_backend_catalog_gput:nn
{MarkInfo}
{
- \@@_backend_object_ref:n {g_@@_/Catalog/MarkInfo_obj}
+ \__pdf_backend_object_ref:n {g_@@_/Catalog/MarkInfo_obj}
}
}
}
@@ -1162,10 +1162,10 @@
>
{ 0 }
{
- \@@_backend_object_new:nn { g_@@_/Catalog/OCProperties_obj } { dict }
+ \__pdf_backend_object_new:nn { g_@@_/Catalog/OCProperties_obj } { dict }
\seq_gpop_left:cN { g_@@_/Catalog/OCProperties/Configs_seq} \l_tmpa_tl
\exp_args:Nnx
- \@@_backend_object_write:nn {g_@@_/Catalog/OCProperties_obj}
+ \__pdf_backend_object_write:nn {g_@@_/Catalog/OCProperties_obj}
{
/OCGs~[ \seq_use:cn { g_@@_/Catalog/OCProperties/OCGs_seq } {~} ]
/D~\l_tmpa_tl~
@@ -1176,9 +1176,9 @@
}
}
\exp_args:Nnx
- \@@_backend_catalog_gput:nn
+ \__pdf_backend_catalog_gput:nn
{ OCProperties }
- { \@@_backend_object_ref:n {g_@@_/Catalog/OCProperties_obj} }
+ { \__pdf_backend_object_ref:n {g_@@_/Catalog/OCProperties_obj} }
}
}
% \end{macrocode}
@@ -1193,16 +1193,16 @@
\seq_if_empty:cF
{ g_@@_/Catalog/OutputIntents_seq }
{
- \@@_backend_object_new:nn { g_@@_/Catalog/OutputIntents_obj } { array }
+ \__pdf_backend_object_new:nn { g_@@_/Catalog/OutputIntents_obj } { array }
\exp_args:Nnx
- \@@_backend_object_write:nn
+ \__pdf_backend_object_write:nn
{ g_@@_/Catalog/OutputIntents_obj }
{ \seq_use:cn { g_@@_/Catalog/OutputIntents_seq } {~} }
\exp_args:Nnx
- \@@_backend_catalog_gput:nn
+ \__pdf_backend_catalog_gput:nn
{OutputIntents}
{
- \@@_backend_object_ref:n {g_@@_/Catalog/OutputIntents_obj}
+ \__pdf_backend_object_ref:n {g_@@_/Catalog/OutputIntents_obj}
}
}
}
@@ -1218,16 +1218,16 @@
\seq_if_empty:cF
{ g_@@_/Catalog/Requirements_seq }
{
- \@@_backend_object_new:nn { g_@@_/Catalog/Requirements_obj } { array }
+ \__pdf_backend_object_new:nn { g_@@_/Catalog/Requirements_obj } { array }
\exp_args:Nnx
- \@@_backend_object_write:nn
+ \__pdf_backend_object_write:nn
{ g_@@_/Catalog/Requirements_obj }
{ \seq_use:cn { g_@@_/Catalog/Requirements_seq } {~} }
\exp_args:Nnx
- \@@_backend_catalog_gput:nn
+ \__pdf_backend_catalog_gput:nn
{Requirements}
{
- \@@_backend_object_ref:n { g_@@_/Catalog/Requirements_obj }
+ \__pdf_backend_object_ref:n { g_@@_/Catalog/Requirements_obj }
}
}
}
@@ -1243,16 +1243,16 @@
\prop_if_empty:cF
{ \@@_name:n { Catalog/ViewerPreferences } }
{
- \@@_backend_object_new:nn { g_@@_/Catalog/ViewerPreferences_obj } { dict }
+ \__pdf_backend_object_new:nn { g_@@_/Catalog/ViewerPreferences_obj } { dict }
\exp_args:Nnx
- \@@_backend_object_write:nn
+ \__pdf_backend_object_write:nn
{ g_@@_/Catalog/ViewerPreferences_obj }
{ \@@_map:n {Catalog/ViewerPreferences } }
\exp_args:Nnx
- \@@_backend_catalog_gput:nn
+ \__pdf_backend_catalog_gput:nn
{ViewerPreferences}
{
- \@@_backend_object_ref:n {g_@@_/Catalog/ViewerPreferences_obj}
+ \__pdf_backend_object_ref:n {g_@@_/Catalog/ViewerPreferences_obj}
}
}
}
@@ -1269,7 +1269,7 @@
{
\seq_if_empty:NF \g__pdf_file_tree_name_seq
{
- \exp_args:Nx \@@_backend_NamesEmbeddedFiles_gpush:n
+ \exp_args:Nx \__pdf_backend_NamesEmbeddedFiles_gpush:n
{
\seq_use:Nn \g__pdf_file_tree_name_seq {~}
}
diff --git a/l3pdfmeta.dtx b/l3pdfmeta.dtx
index 2b6faf8..9d82a4f 100644
--- a/l3pdfmeta.dtx
+++ b/l3pdfmeta.dtx
@@ -118,7 +118,7 @@
}
,lang .code:n =
{
- \pdfdict_gput:nnn {Catalog} {Lang}{(#1)}
+ \pdfgdict_gput:nnn {Catalog} {Lang}{(#1)}
}
,meta .bool_gset:N = \g_@@_meta_bool
,standard .choices:nn =
diff --git a/pdfresources.dtx b/pdfresources.dtx
index d4e0bc0..8bb5c5c 100644
--- a/pdfresources.dtx
+++ b/pdfresources.dtx
@@ -120,7 +120,7 @@
\msg_new:nnn { pdf } { catalog-special }
{
values~to~the~catalog~entry~#1~should~be~added~with~
- \token_to_str:N\pdfdict_gput:nnn
+ \token_to_str:N\pdfgdict_gput:nnn
}
\msg_new:nnn { pdf } { catalog-unknown }
{
@@ -1778,9 +1778,9 @@
\exp_args:Nx
\@@_backend_annotation:nnnn {#2}{#3}{#4}
{
- \@@_dict_if_exist:nT { annot/#1 }
+ \pdfdict_if_exist:nT { annot/#1 }
{
- \@@_dict_map:n {annot/#1}
+ \pdfdict_map:n {annot/#1}
}
#5
}
@@ -2233,13 +2233,13 @@
% is an absolute page number. \Arg{view} a string for the destination
% without the leading slash. Examples are e.g. |XYZ left top zoom| or |Fit|.
% The OpenAction uses (and could also be set directly with)
-% \cs{pdfdict_gput:nnn}|{Catalog}|.
+% \cs{pdfgdict_gput:nnn}|{Catalog}|.
% \end{function}
%
% \begin{macrocode}
\cs_new_protected:Npn \pdf_docview:nn #1 #2
{
- \pdfdict_gput:nnx {Catalog }{ OpenAction }{[\pdf_pageobject_ref:n {#1}~/#2]}
+ \pdfgdict_gput:nnx {Catalog }{ OpenAction }{[\pdf_pageobject_ref:n {#1}~/#2]}
}
% \end{macrocode}
%
@@ -2434,7 +2434,7 @@
\@@_backend_object_write:nn
{__spc_extgstate_op_false}
{/Type /ExtGState~/op~false~/OP~false}
- \pdfdict_gput:nnn
+ \pdfgdict_gput:nnn
{Page/Resources/ExtGState}
{SPCko}
{\@@_backend_object_ref:n {__spc_extgstate_op_false}}
@@ -2442,7 +2442,7 @@
\@@_backend_object_write:nn
{__spc_extgstate_op_true0}
{/Type /ExtGState~/op~true~/OP~true~/OPM~0}%
- \pdfdict_gput:nnn
+ \pdfgdict_gput:nnn
{Page/Resources/ExtGState}
{SPCmz}
{\@@_backend_object_ref:n {__spc_extgstate_op_true0}}
@@ -2450,7 +2450,7 @@
\@@_backend_object_write:nn
{__spc_extgstate_op_true1}
{/Type /ExtGState~/op~true~/OP~true~/OPM~1}%
- \pdfdict_gput:nnn
+ \pdfgdict_gput:nnn
{Page/Resources/ExtGState}
{SPCop}
{\@@_backend_object_ref:n {__spc_extgstate_op_true1}}
diff --git a/testfiles/catalog-remove.lvt b/testfiles/catalog-remove.lvt
index e3abe55..ccd6140 100644
--- a/testfiles/catalog-remove.lvt
+++ b/testfiles/catalog-remove.lvt
@@ -7,25 +7,25 @@
\begin{document}
\START
\ExplSyntaxOn
-\pdfdict_gput:nnn {Catalog } {Lang} {(de-De)}
-\pdfdict_gput:nnn {Catalog } {PageLayout} {/SinglePage}
-\pdfdict_gput:nnn {Catalog / MarkInfo} {Marked} {True}
-\pdfdict_gput:nnn {Catalog / ViewerPreferences}{HideToolbar} {true}
-\pdfdict_gput:nnn {Catalog / AcroForm/DR/Font} {Name} {<</ABC/CDE>>}
-\pdfdict_gput:nnn {Catalog / AcroForm/DR/Font} {NameB} {<</ABC/CDE>>}
-\pdfdict_show:n {Catalog}
-\pdfdict_show:n {Catalog/ViewerPreferences}
-\pdfdict_show:n {Catalog/MarkInfo}
-\pdfdict_show:n {Catalog/AcroForm/DR/Font}
-\pdfdict_gremove:nn {Catalog / ViewerPreferences } {HideToolbar}
-\pdfdict_gremove:nn {Catalog } {PageMode}
-\pdfdict_gremove:nn {Catalog } {PageLayout}
-\pdfdict_gremove:nn {Catalog / MarkInfo } {Marked }
-\pdfdict_gremove:nn {Catalog / AcroForm/DR/Font} {Name}
-\pdfdict_show:n {Catalog}
-\pdfdict_show:n {Catalog/ViewerPreferences}
-\pdfdict_show:n {Catalog/MarkInfo}
-\pdfdict_show:n {Catalog/AcroForm/DR/Font}
+\pdfgdict_gput:nnn {Catalog } {Lang} {(de-De)}
+\pdfgdict_gput:nnn {Catalog } {PageLayout} {/SinglePage}
+\pdfgdict_gput:nnn {Catalog / MarkInfo} {Marked} {True}
+\pdfgdict_gput:nnn {Catalog / ViewerPreferences}{HideToolbar} {true}
+\pdfgdict_gput:nnn {Catalog / AcroForm/DR/Font} {Name} {<</ABC/CDE>>}
+\pdfgdict_gput:nnn {Catalog / AcroForm/DR/Font} {NameB} {<</ABC/CDE>>}
+\pdfgdict_show:n {Catalog}
+\pdfgdict_show:n {Catalog/ViewerPreferences}
+\pdfgdict_show:n {Catalog/MarkInfo}
+\pdfgdict_show:n {Catalog/AcroForm/DR/Font}
+\pdfgdict_gremove:nn {Catalog / ViewerPreferences } {HideToolbar}
+\pdfgdict_gremove:nn {Catalog } {PageMode}
+\pdfgdict_gremove:nn {Catalog } {PageLayout}
+\pdfgdict_gremove:nn {Catalog / MarkInfo } {Marked }
+\pdfgdict_gremove:nn {Catalog / AcroForm/DR/Font} {Name}
+\pdfgdict_show:n {Catalog}
+\pdfgdict_show:n {Catalog/ViewerPreferences}
+\pdfgdict_show:n {Catalog/MarkInfo}
+\pdfgdict_show:n {Catalog/AcroForm/DR/Font}
\ExplSyntaxOff
blub
diff --git a/testfiles/catalogAF.pvt b/testfiles/catalogAF.pvt
index 6e252d5..a0cd0dd 100644
--- a/testfiles/catalogAF.pvt
+++ b/testfiles/catalogAF.pvt
@@ -15,8 +15,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
More information about the latex3-commits
mailing list.