[latex3-commits] [git/LaTeX3-latex3-pdfresources] splitting: correct small error and test files (9cd59f9)
Ulrike Fischer
fischer at troubleshooting-tex.de
Tue Jul 7 19:16:12 CEST 2020
Repository : https://github.com/latex3/pdfresources
On branch : splitting
Link : https://github.com/latex3/pdfresources/commit/9cd59f9e6b9e3a376a7ecfa90845ed68a0330f83
>---------------------------------------------------------------
commit 9cd59f9e6b9e3a376a7ecfa90845ed68a0330f83
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Mon Jun 15 22:54:03 2020 +0200
correct small error and test files
>---------------------------------------------------------------
9cd59f9e6b9e3a376a7ecfa90845ed68a0330f83
l3pdfdict.dtx | 97 +++++-------
l3pdfgdict.dtx | 180 ++++++----------------
pdfresources.dtx | 95 ++++++------
testfiles-noxetex/extgstate-patches.pdftex.tpf | 30 ++--
testfiles-noxetex/extgstate-patches.tpf | 34 ++--
testfiles-noxetex/pgfpatches.pdftex.tpf | 36 ++---
testfiles-noxetex/pgfpatches.tpf | 44 +++---
testfiles-noxetex/test-new-transparent.pdftex.tpf | 16 +-
testfiles-noxetex/transparent-tikz.pdftex.tpf | 42 ++---
testfiles-noxetex/transparent-tikz.tpf | 34 ++--
testfiles/infodict.luatex.tpf | 4 +-
testfiles/infodict.tpf | 4 +-
testfiles/show.lvt | 2 +-
testfiles/xform.tpf | 16 +-
14 files changed, 264 insertions(+), 370 deletions(-)
diff --git a/l3pdfdict.dtx b/l3pdfdict.dtx
index 42adc73..532bf28 100644
--- a/l3pdfdict.dtx
+++ b/l3pdfdict.dtx
@@ -49,18 +49,18 @@
%
% \section{\pkg{l3pdfdict} documentation}
% Many PDF objects are or contain dictionaries -- structures
-% containing a number of (pdf-)Name/value pairs.
+% containing a number of \mbox{(pdf-)}Name/value pairs.
% Examples are attributes of links,
% filespec dictionaries, xform dictionaries, the catalog, the info dictionary.
% The commands in this module offer an number of
% tools to handle such dictionaries. The module setups a namespace for the
% dictionary names and offers some commands to output dictionaries.
%
-% The dictionaries are implemented with property lists. But the keys are always
+% The dictionaries are implemented with property lists. The keys are always
% converted with \cs{str_convert_pdfname} to get a correct PDF name, and empty
% values will be ignored.
%
-% Local and global dictionaries can be created and for most commands both
+% Local and global dictionaries can be created and for a number of commands both
% a local and a global version exists.
% \begin{NOTE}{UF}
% Check which (local) dictionaries should be predefined.
@@ -91,8 +91,8 @@
% \cs{pdfdict_name:n} \Arg{local dictionary name}\\
% \cs{pdfdict_gname:n} \Arg{global dictionary name}\\
% \end{syntax}
-% This expands to the internal name. With it is possible to use standard commands
-% of the \texttt{prop} module to deak with the dictionaries. For example
+% This expands to the internal name. With it it is possible to use standard commands
+% of the \texttt{prop} module to deal with the dictionaries. For example\\
% |\prop_clear:c { \pdfdict_name:n { name }}|
% \end{function}
% \begin{function}[added = 2020-04-06]
@@ -102,12 +102,12 @@
% \cs{pdfdict_gput:nnn} \Arg{global dictionary} \Arg{name} \Arg{value}
% \end{syntax}
% This function puts \Arg{name} \Arg{value} locally or globally in the
-% \Arg{dictionary} setup with \cs{pdfdict_new:n} or \cs{pdfdict_gnew:n}
+% \Arg{dictionary} created with \cs{pdfdict_new:n} or \cs{pdfdict_gnew:n}.
% \Arg{name} should be a PDF Name without the starting slash. It will be stored
% with \cs{str_convert_pdfname}, so will be automatically correctly escaped in case
-% in contains slashes, spaces or other chars not allowed in a PDF name.
-% \Arg{value} should be a valid PDF value for this Name in the
-% target dictionary. The value is \emph{not} converted or escaped automatically.
+% it contains slashes, spaces or other chars not allowed in a PDF name.
+% \Arg{value} should be a valid PDF value for this name in the
+% target dictionary. The value is \emph{not} converted nor escaped automatically.
%
% When adding a value keep in mind that the expansion behaviour
% of the backends can differ. Some backends expand a
@@ -240,48 +240,11 @@
}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\pdfdict_put:nnn,\pdfdict_gput:nnn}
-% \begin{macrocode}
-\cs_new_protected:Npn \pdfdict_put:nnn #1 #2 #3
- {
- \@@_if_exist:nTF { #1 }
- {
- \@@_put:nnn { #1 }{ #2 }{ #3 }
- }
- {
- \msg_error:nnnn{pdfdict}{unknown-dict}{#1}{local}
- }
- }
-
-\cs_generate_variant:Nn \pdfdict_put:nnn {nnx,nno}
-
-\cs_new_protected:Npn \pdfdict_gput:nnn #1 #2 #3
- {
- \@@_if_gexist:nTF { #1 }
- {
- \@@_gput:nnn { #1 }{ #2 }{ #3 }
- }
- {
- \msg_error:nnnn{pdfdict}{unknown-dict}{#1}{global}
- }
- }
-\cs_generate_variant:Nn \pdfdict_gput:nnn {nnx,nno}
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{ \pdfdict_item:nn }
-% \begin{macrocode}
-\cs_new:Npn \pdfdict_item:nn #1 #2
- {
- \@@_item:nn {#1} {#2}
- }
-\cs_generate_variant:Nn \pdfdict_item:nn {ne,nx}
-% \end{macrocode}
-% \end{macro}
% \subsection{Internal dictionary Code}
-% \begin{macro}{\@@_item:nn}
+% \begin{macro}{\@@_item:nn,\@@_item:ne,\@@_item:nx}
% Commands to output dict entries: The arguments are \meta{name}\meta{value}.
% \meta{name} should be a valid pdf name without the slash.
% The commands don't check if the arguments are empty or valid. This should be done
@@ -292,6 +255,13 @@
% \begin{macrocode}
\cs_new:Npn \@@_item:nn #1 #2 { \tl_if_blank:nF {#2} { /#1~#2~} } %name, value
+\cs_generate_variant:Nn \@@_item:nn {ne,nx}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{ \pdfdict_item:nn, \pdfdict_item:nx, \pdfdict_item:ne }
+% \begin{macrocode}
+\cs_set_eq:NN \pdfdict_item:nn \@@_item:nn
+\cs_generate_variant:Nn \pdfdict_item:nn {ne,nx}
% \end{macrocode}
% \end{macro}
% \begin{macro}
@@ -374,7 +344,7 @@
{ \prg_return_false: }
}
-\prg_set_eq_conditional:NNn \pdfdict_if_gexist:n \@@_if_exist:n { p , T , F , TF }
+\prg_set_eq_conditional:NNn \pdfdict_if_gexist:n \@@_if_gexist:n { p , T , F , TF }
\prg_new_conditional:Npnn \@@_if_empty:n #1 { p , T , F , TF }
{
@@ -400,7 +370,8 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{
-% \@@_put:nnn,
+% \@@_put:nnn,\@@_gput:nnn,
+% \pdfdict_put:nnn,\pdfdict_gput:nnn,
% \@@_get:nnN,
% \@@_remove:nn,
% \@@_show:n
@@ -427,6 +398,10 @@
}
}
+\cs_set_eq:NN \pdfdict_put:nnn \@@_put:nnn
+
+\cs_generate_variant:Nn \pdfdict_put:nnn {nnx,nno}
+
\cs_new_protected:Npn \@@_gput:nnn #1 #2 #3 %#1 path, #2 name, #3 value
{
\tl_if_empty:nTF { #3 }
@@ -434,9 +409,9 @@
\msg_none:nnn { pdfdict }{ empty-value }{ /#1/#2 }
}
{
- \@@_if_exist:nTF { #1 }
+ \@@_if_gexist:nTF { #1 }
{
- \exp_argx:Npx \prop_gput:cnn
+ \exp_args:Nnx \prop_gput:cnn
{ \@@_gname:n { #1 } }{ \str_convert_pdfname:n { #2 } } { #3 }
}
{
@@ -445,6 +420,9 @@
}
}
+\cs_set_eq:NN \pdfdict_gput:nnn \@@_gput:nnn
+\cs_generate_variant:Nn \pdfdict_gput:nnn {nnx,nno}
+
\cs_new_protected:Npn \@@_get:nnN #1 #2 #3 %path,key,macro
{
\prop_get:cnN
@@ -468,7 +446,7 @@
\cs_new_protected:Npn \@@_gremove:nn #1 #2 %path,key
{
- \@@_if_exist:nTF { #1 }
+ \@@_if_gexist:nTF { #1 }
{
\exp_args:Nnx \prop_gremove:cn
{ \@@_gname:n { #1 } }{ \str_convert_pdfname:n { #2 } }
@@ -510,8 +488,8 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{ \@@_map:n }
-% \cs{@@_map:n} outputs a prop as needed in a dictionary:
+% \begin{macro}{ \@@_map:n, \@@_gmap:n }
+% \cs{@@_map:n} and \cs{@@_gmap:n} output a prop as needed in a dictionary:
% as a list of /\meta{key} \meta{value} pairs.
% \begin{macrocode}
% !! is e-expansion the right thing?
@@ -519,14 +497,17 @@
{
\prop_map_function:cN { \@@_name:n { #1 } } \@@_item:ne
}
+
+\cs_new:Npn \@@_gmap:n #1 %path
+ {
+ \prop_map_function:cN { \@@_gname:n { #1 } } \@@_item:ne
+ }
% \end{macrocode}
% \end{macro}
%
% \begin{macrocode}
-\cs_new:Npn \pdfdict_map:n #1
- {
- \@@_map:n { #1 }
- }
+\cs_set_eq:NN \pdfdict_map:n \@@_map:n
+\cs_set_eq:NN \pdfdict_gmap:n \@@_gmap:n
% \end{macrocode}
%
% \begin{macrocode}
diff --git a/l3pdfgdict.dtx b/l3pdfgdict.dtx
index f32c7a6..4dd5cb7 100644
--- a/l3pdfgdict.dtx
+++ b/l3pdfgdict.dtx
@@ -481,7 +481,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \pdfgdict_gput:nnn #1 #2 #3
{
- \@@_if_exist:nTF { #1 }
+ \pdfdict_if_gexist:nTF { #1 }
{
\@@_handler_gput:nnn { #1 }{ #2 }{ #3 }
}
@@ -520,70 +520,11 @@
% /Page/Resources/Pattern
% /Page/Resources/Shading
% /Page/Resources/Properties
-% /xform/Resources/Properties
+% /Xform/Resources/Properties
% \end{verbatim}
-% \begin{macro}
-% {
-% \@@_name:n,
-% \@@_new:n,
-% \g_@@_names_seq,
-% }
-% \begin{macrocode}
-\seq_new:N \g_@@_names_seq
-
-\cs_new:Npn \@@_name:n #1 % path name without the leading /
- {
- g_@@_/#1_prop
- }
-
-\cs_new_protected:Npn \@@_new:n #1
- {
- \@@_if_exist:nTF { #1 }
- {
- \msg_error:nnx
- { pdfgdict }
- { dict-already-defined }
- { #1}
- }
- {
- \prop_new:c { \@@_name:n { #1 } }
- \seq_gput_right:Nn \g_@@_names_seq { #1 }
- }
- }
-
-% test existence
-\prg_new_conditional:Npnn \@@_if_exist:n #1 { p , T , F , TF }
- {
- \prop_if_exist:cTF
- { \@@_name:n { #1 } }
- { \prg_return_true: }
- { \prg_return_false: }
- }
-
-\prg_new_conditional:Npnn \@@_if_empty:n #1 { p , T , F , TF }
- {
- \prop_if_empty:cTF
- { \@@_name:n { #1 } }
- { \prg_return_true: }
- { \prg_return_false: }
- }
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\@@_gclear:n}
-% \begin{macrocode}
- \cs_new_protected:Npn \@@_gclear:n #1
- {
- \@@_if_exist:nT { #1 }
- {
- \prop_gclear:c { \@@_name:n { #1 } }
- }
- }
-% \end{macrocode}
-% \end{macro}
% \begin{macro}{
% \@@_handler_gput:nnn,
-% \@@_gput:nnn,
% \@@_get:nnN,
% \@@_gremove:nn,
% \@@_show:n
@@ -603,7 +544,7 @@
\msg_none:nnn { pdfgdict }{ empty-value }{ /#1/#2 }
}
{
- \@@_if_exist:nTF { #1 }
+ \pdfdict_if_gexist:nTF { #1 }
{
\cs_if_exist:cTF
{ @@_handler/#1/?_gput:nn } %general, name independant handler
@@ -613,8 +554,8 @@
{ @@_handler/#1/#2_gput:n }
{ \use:c {@@_handler/#1/#2_gput:n} {#3} } %special handler
{
- \use:c { prop_gput:cnn }
- { \@@_name:n { #1 } }{ #2 } { #3 }
+ \prop_gput:cnn
+ { \pdfdict_gname:n { #1 } }{ #2 } { #3 }
}
}
}
@@ -627,35 +568,17 @@
\cs_generate_variant:Nn \@@_handler_gput:nnn {nxx}
-\cs_new_protected:Npn \@@_gput:nnn #1 #2 #3 %#1 path, #2 name, #3 value
- {
- \tl_if_empty:nTF { #3 }
- {
- \msg_none:nnn { pdfgdict }{ empty-value }{ /#1/#2 }
- }
- {
- \@@_if_exist:nTF { #1 }
- {
- \use:c { prop_gput:cnn }
- { \@@_name:n { #1 } }{ #2 } { #3 }
- }
- {
- \msg_error:nnn { pdfgdict } { unknown-dict } { #1 }
- }
- }
- }
-
\cs_new_protected:Npn \@@_get:nnN #1 #2 #3 %path,key,macro
{
\prop_get:cnN
- { \@@_name:n { #1 } }
+ { \pdfdict_gname:n { #1 } }
{ #2 } #3
}
\cs_new_protected:Npn \@@_handler_gremove:nn #1 #2 %path,key
{
- \@@_if_exist:nTF { #1 }
+ \pdfdict_if_gexist:nTF { #1 }
{
\cs_if_exist:cTF
{ @@_handler/#1/?_gremove:n } %general, name independant handler
@@ -666,7 +589,7 @@
{ \use:c {@@_handler/#1/#2_gremove:} } %special handler
{
\prop_gremove:cn
- { \@@_name:n { #1 } }{ #2 }
+ { \pdfdict_gname:n { #1 } }{ #2 }
}
}
}
@@ -677,13 +600,13 @@
\cs_new_protected:Npn \@@_gremove:nn #1 #2 %path,key
{
- \@@_if_exist:nTF { #1 }
+ \pdfdict_if_gexist:nTF { #1 }
{
\prop_gremove:cn
- { \@@_name:n { #1 } }{ #2 }
+ { \pdfdict_gname:n { #1 } }{ #2 }
}
{
- \msg_error:nnn { pdfgdict } { unknown-dict } { #1 }
+ \msg_error:nnn { pdfgdict } { unknown-dict } { xx4#1 }
}
}
@@ -694,12 +617,12 @@
{ @@_handler/#2/?_show: } %general, name independant handler
{ \use:c {@@_handler/#2/?_show:} }
{
- \prop_if_exist:cTF { \@@_name:n { #2 } }
+ \prop_if_exist:cTF { \pdfdict_gname:n { #2 } }
{
#1
{ pdfgdict } { show-dict }
{ \tl_to_str:n {#2} }
- { \prop_map_function:cN {\@@_name:n { #2 }} \msg_show_item:nn }
+ { \prop_map_function:cN {\pdfdict_gname:n { #2 }} \msg_show_item:nn }
{ } { }
}
{
@@ -710,22 +633,11 @@
\cs_new_protected:Npn \@@_show:n #1 %path
{
- \prop_show:c { \@@_name:n { #1 } }
+ \prop_show:c { \pdfdict_gname:n { #1 } }
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{ \@@_map:n }
-% \cs{@@_map:n} outputs a prop as needed in a dictionary:
-% as a list of /\meta{key} \meta{value} pairs.
-% \begin{macrocode}
-% !! is e-expansion the right thing?
-\cs_new:Npn \@@_map:n #1 %path
- {
- \prop_map_function:cN { \@@_name:n { #1 } } \pdfdict_item:ne
- }
-% \end{macrocode}
-% \end{macro}
%
% \begin{macro}{ \@@_gmerge:nnN }
% \cs{@@_gmerge:nnN} merges at first the property \meta{name_1}
@@ -734,10 +646,10 @@
\cs_new_protected:Npn \@@_gmerge:nnN #1 #2 #3
{
- \prop_gset_eq:Nc #3 { \@@_name:n { #1 } }
- \prop_if_exist:cT { \@@_name:n { #2 } }
+ \prop_gset_eq:Nc #3 { \pdfdict_gname:n { #1 } }
+ \prop_if_exist:cT { \pdfdict_gname:n { #2 } }
{
- \prop_map_inline:cn { \@@_name:n { #2 } }
+ \prop_map_inline:cn { \pdfdict_gname:n { #2 } }
{
\prop_gput:Nnn #3 { ##1 }{ ##2 }
}
@@ -754,7 +666,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \pdfgdict_gremove:nn #1 #2
{
- \@@_if_exist:nTF { #1 }
+ \pdfdict_if_gexist:nTF { #1 }
{
\@@_handler_gremove:nn { #1 }{ #2 }
}
@@ -766,7 +678,7 @@
% \subsection{The Info dictionary}
% Initialization of the dictionary:
% \begin{macrocode}
-\@@_new:n {Info}
+\pdfdict_gnew:n {Info}
% \end{macrocode}
%
% \begin{macro}{\@@_Info_gpush:}
@@ -776,15 +688,15 @@
% push to the register command / issue the special
\cs_new_protected:Npn \@@_Info_gpush:
{
- \prop_map_function:cN { \@@_name:n {Info} } \__pdf_backend_info_gput:nn
- \prop_gclear:c { \@@_name:n {Info} }
+ \prop_map_function:cN { \pdfdict_gname:n {Info} } \__pdf_backend_info_gput:nn
+ \prop_gclear:c { \pdfdict_gname:n {Info} }
}
% \end{macrocode}
% \end{macro}
% \subsection{The Pages dictionary code}
% At first the initialisation
% \begin{macrocode}
-\@@_new:n {Pages}
+\pdfdict_gnew:n {Pages}
% \end{macrocode}
%
% \begin{macro}{\@@_Pages_gpush:}
@@ -796,7 +708,7 @@
{
\exp_args:Nx \__pdf_backend_Pages_primitive:n
{
- \@@_map:n {Pages}
+ \pdfdict_gmap:n {Pages}
}
}
@@ -805,8 +717,8 @@
% \subsection{The Page and ThisPage dictionary}
% At first the initialisation.
% \begin{macrocode}
-\@@_new:n { Page }
-\@@_new:n { ThisPage }
+\pdfdict_gnew:n { Page }
+\pdfdict_gnew:n { ThisPage }
%handler for pdfgdict
\cs_new_protected:cpn { @@_handler/Page/?_gput:nn } #1 #2
@@ -822,7 +734,7 @@
% handler for pdfgdict
\cs_new_protected:cpn { @@_handler/ThisPage/?_gput:nn } #1 #2
{
- \prop_gput:cnn { \@@_name:n { ThisPage } }{ #1 } { #2 }
+ \prop_gput:cnn { \pdfdict_gname:n { ThisPage } }{ #1 } { #2 }
\__pdf_backend_ThisPage_gput:nn { #1 }{ #2 }
}
@@ -873,7 +785,7 @@
% \begin{macro}{ \@@_catalog_XX_gput:n }
% Various commands to handle subentries and special cases.
% \begin{macrocode}
-\@@_new:n {Catalog}
+\pdfdict_gnew:n {Catalog}
\clist_const:Nn \c_@@_Catalog_toplevel_clist
{
@@ -910,7 +822,7 @@
\clist_map_inline:Nn \c_@@_Catalog_sub_clist
{
- \@@_new:n {Catalog/#1}
+ \pdfdict_gnew:n {Catalog/#1}
}
@@ -958,7 +870,7 @@
\use:c { @@_/Catalog/Requirements_gpush: }
\use:c { @@_/Catalog/ViewerPreferences_gpush: }
% output the single values:
- \prop_map_function:cN { \@@_name:n {Catalog} } \__pdf_backend_catalog_gput:nn
+ \prop_map_function:cN { \pdfdict_gname:n {Catalog} } \__pdf_backend_catalog_gput:nn
% output names tree:
\use:c { @@_/Catalog/Names/EmbeddedFiles_gpush: }
}
@@ -970,12 +882,12 @@
\cs_new_protected:cpn { @@_/Catalog/AA_gpush: }
{
\prop_if_empty:cF
- { \@@_name:n { Catalog/AA } }
+ { \pdfdict_gname:n { Catalog/AA } }
{
\__pdf_backend_object_new:nn { g_@@_/Catalog/AA_obj } { dict }
\__pdf_backend_object_write:nx
{ g_@@_/Catalog/AA_obj }
- { \@@_map:n { Catalog/AA } }
+ { \pdfdict_gmap:n { Catalog/AA } }
\exp_args:Nnx
\__pdf_backend_catalog_gput:nn
{AA}
@@ -1008,7 +920,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 ..
- { \@@_name:n { Catalog/AcroForm } }
+ { \pdfdict_gname:n { Catalog/AcroForm } }
{ Fields }
{ \__pdf_backend_object_ref:n { g_@@_/Catalog/AcroForm/Fields_obj } }
}
@@ -1021,43 +933,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 ..
- { \@@_name:n { Catalog/AcroForm } }
+ { \pdfdict_gname:n { Catalog/AcroForm } }
{ CO }
{ \__pdf_backend_object_ref:n { g_@@_/Catalog/AcroForm/CO_obj } }
}
- \prop_if_empty:cF { \@@_name:n { Catalog/AcroForm/DR/Font}}
+ \prop_if_empty:cF { \pdfdict_gname:n { 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 }
- { \@@_map:n { Catalog/AcroForm/DR/Font } }
+ { \pdfdict_gmap: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 } }
+ { \pdfdict_gname:n { Catalog/AcroForm/DR } }
{ Font }
{ \__pdf_backend_object_ref:n { g_@@_/Catalog/AcroForm/DR/Font_obj } }
}
- \prop_if_empty:cF { \@@_name:n { Catalog/AcroForm/DR}}
+ \prop_if_empty:cF { \pdfdict_gname:n { 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 }
- { \@@_map:n { Catalog/AcroForm/DR } }
+ { \pdfdict_gmap:n { Catalog/AcroForm/DR } }
\exp_args:Nnnx
\prop_gput:cnn %we have to use \prop here to avoid the handler ..
- { \@@_name:n { Catalog/AcroForm } }
+ { \pdfdict_gname:n { Catalog/AcroForm } }
{ DR }
{ \__pdf_backend_object_ref:n { g_@@_/Catalog/AcroForm/DR_obj } }
}
- \prop_if_empty:cF { \@@_name:n { Catalog/AcroForm} }
+ \prop_if_empty:cF { \pdfdict_gname:n { Catalog/AcroForm} }
{
\__pdf_backend_object_new:nn { g_@@_/Catalog/AcroForm_obj } {dict}
\exp_args:Nnx
\__pdf_backend_object_write:nn
{ g_@@_/Catalog/AcroForm_obj }
- { \@@_map:n { Catalog/AcroForm } }
+ { \pdfdict_gmap:n { Catalog/AcroForm } }
\exp_args:Nnnx
\@@_handler_gput:nnn
{ Catalog }
@@ -1100,13 +1012,13 @@
\cs_new_protected:cpn { @@_/Catalog/MarkInfo_gpush: }
{
\prop_if_empty:cF
- { \@@_name:n { Catalog/MarkInfo } }
+ { \pdfdict_gname:n { Catalog/MarkInfo } }
{
\__pdf_backend_object_new:nn { g_@@_/Catalog/MarkInfo_obj } { dict }
\exp_args:Nnx
\__pdf_backend_object_write:nn
{ g_@@_/Catalog/MarkInfo_obj }
- { \@@_map:n {Catalog/MarkInfo } }
+ { \pdfdict_gmap:n {Catalog/MarkInfo } }
\exp_args:Nnx
\__pdf_backend_catalog_gput:nn
{MarkInfo}
@@ -1222,13 +1134,13 @@
\cs_new_protected:cpn { @@_/Catalog/ViewerPreferences_gpush: }
{
\prop_if_empty:cF
- { \@@_name:n { Catalog/ViewerPreferences } }
+ { \pdfdict_gname:n { Catalog/ViewerPreferences } }
{
\__pdf_backend_object_new:nn { g_@@_/Catalog/ViewerPreferences_obj } { dict }
\exp_args:Nnx
\__pdf_backend_object_write:nn
{ g_@@_/Catalog/ViewerPreferences_obj }
- { \@@_map:n {Catalog/ViewerPreferences } }
+ { \pdfdict_gmap:n {Catalog/ViewerPreferences } }
\exp_args:Nnx
\__pdf_backend_catalog_gput:nn
{ViewerPreferences}
@@ -1260,7 +1172,7 @@
% \end{macro}
% \subsection{ xform / Properties }
% \begin{macrocode}
-\@@_new:n {xform/Resources/Properties}
+\pdfdict_gnew:n {Xform/Resources/Properties}
% \end{macrocode}
% \begin{macrocode}
%</package>
diff --git a/pdfresources.dtx b/pdfresources.dtx
index d563287..22083fc 100644
--- a/pdfresources.dtx
+++ b/pdfresources.dtx
@@ -330,8 +330,8 @@
%</package>
%<*package>
% \begin{macrocode}
-\RequirePackage{l3pdfgdict}
\RequirePackage{l3pdfdict}
+\RequirePackage{l3pdfgdict}
% \end{macrocode}
@@ -491,14 +491,14 @@
% sets a lua table with lualatex
\cs_new_protected:Npn \@@_backend_Page_gput:nn #1 #2 %key,value
{
- \__pdfgdict_gput:nnn {Page}{ #1 }{ #2 }
+ \pdfdict_gput:nnn {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
{
- \__pdfgdict_gremove:nn {Page}{ #1 }
+ \pdfdict_gremove:nn {Page}{ #1 }
}
% the command used in the document.
% direct call of the primitive special with dvips/dvipdfmx
@@ -516,9 +516,9 @@
{pdf at abspage}
{0}
}
- \__pdfgdict_if_exist:nF {backend_Page\l_@@_tmpa_tl}
+ \pdfdict_if_gexist:nF {backend_Page\l_@@_tmpa_tl}
{
- \__pdfgdict_new:n {backend_Page\l_@@_tmpa_tl}
+ \pdfdict_gnew:n {backend_Page\l_@@_tmpa_tl}
}
\__pdfgdict_handler_gput:nnn {backend_Page\l_@@_tmpa_tl}{ #1 }{ #2 }
}
@@ -616,14 +616,14 @@
% sets a lua table with lualatex
\cs_new_protected:Npn \@@_backend_Page_gput:nn #1 #2
{
- \__pdfgdict_gput:nnn {Page}{ #1 }{ #2 }
+ \pdfdict_gput:nnn {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
{
- \__pdfgdict_gremove:nn {Page}{ #1 }
+ \pdfdict_gremove:nn {Page}{ #1 }
}
% the command used in the document.
% direct call of the primitive special with dvips/dvipdfmx
@@ -642,7 +642,7 @@
\cs_new_protected:Npn \@@_backend_ThisPage_gpush:n #1
{
\exp_args:Nx \@@_backend_Page_primitive:n
- { \__pdfgdict_map:n {Page} }
+ { \pdfdict_gmap:n {Page} }
}
%</xdvipdfmx>
%<*dvips>
@@ -655,14 +655,14 @@
% sets a lua table with lualatex
\cs_new_protected:Npn \@@_backend_Page_gput:nn #1 #2
{
- \__pdfgdict_gput:nnn {Page}{ #1 }{ #2 }
+ \pdfdict_gput:nnn {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
{
- \__pdfgdict_gremove:nn {Page}{ #1 }
+ \pdfdict_gremove:nn {Page}{ #1 }
}
% the command used in the document.
% direct call of the primitive special with dvips/dvipdfmx
@@ -681,7 +681,7 @@
\cs_new_protected:Npn \@@_backend_ThisPage_gpush:n #1
{
\exp_args:Nx \@@_backend_Page_primitive:n
- { \__pdfgdict_map:n {Page} }
+ { \pdfdict_gmap:n {Page} }
}
%</dvips>
% \end{macrocode}
@@ -739,7 +739,7 @@
\clist_map_inline:Nn \c_@@_backend_PageResources_clist
{
- \__pdfgdict_new:n {Page/Resources/#1}
+ \pdfdict_gnew:n {Page/Resources/#1}
}
%</drivers>
% pdftex and luatex
@@ -763,7 +763,7 @@
{
\cs_new_protected:Npn \@@_backend_PageResources_gput:nnn #1 #2 #3
{
- \__pdfgdict_gput:nnn {Page/Resources/#1} { #2 }{ #3 }
+ \pdfdict_gput:nnn {Page/Resources/#1} { #2 }{ #3 }
% luatex must also trigger the lua side
\tex_latelua:D{l3kernel.@@.Page.Resources.#1=true}
\tex_latelua:D
@@ -775,7 +775,7 @@
{ %pdftex
\cs_new_protected:Npn \@@_backend_PageResources_gput:nnn #1 #2 #3
{
- \__pdfgdict_gput:nnn {Page/Resources/#1} { #2 }{ #3 }
+ \pdfdict_gput:nnn {Page/Resources/#1} { #2 }{ #3 }
}
}
@@ -785,11 +785,11 @@
\clist_map_inline:Nn \c_@@_backend_PageResources_clist
{
\prop_if_empty:cF
- { \__pdfgdict_name:n {Page/Resources/##1} }
+ { \pdfdict_gname:n {Page/Resources/##1} }
{
\@@_backend_object_write:nx
{ Page/Resources/##1 }
- { \__pdfgdict_map:n {Page/Resources/##1} }
+ { \pdfdict_gmap:n {Page/Resources/##1} }
}
}
}
@@ -814,7 +814,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 { \__pdfgdict_name:n {Page/Resources/#1} } { #2 }{ #3 }
+ \prop_gput:cnn { \pdfdict_gname:n {Page/Resources/#1} } { #2 }{ #3 }
%objects are not filled with \pdf_object_write as this is not additive!
\@@_backend:x
{
@@ -829,7 +829,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!!
- \__pdfgdict_gput:nnn {Page/Resources/#1} { #2 }{ #3 }
+ \pdfdict_gput:nnn {Page/Resources/#1} { #2 }{ #3 }
}
\cs_new_protected:Npn \@@_PageResources_gpush: {}
%</dvips>
@@ -1097,7 +1097,7 @@
{
\clist_map_inline:Nn \c_@@_backend_PageResources_clist
{
- \prop_if_empty:cF { \__pdfgdict_name:n {Page/Resources/##1} }
+ \prop_if_empty:cF { \pdfdict_gname:n {Page/Resources/##1} }
{
\__kernel_backend_literal:x
{
@@ -1120,7 +1120,7 @@
\bool_if:NTF \l_@@_backend_xform_bool
{
\exp_args:Nnx\__pdfgdict_handler_gput:nnn
- { xform/Resources/Properties }
+ { Xform/Resources/Properties }
{ l3pdf\int_use:N\g_@@_backend_name_int }
{ \@@_backend_object_ref:n { #2 } }
}
@@ -1144,7 +1144,7 @@
\bool_if:NTF \l_@@_backend_xform_bool
{
\__pdfgdict_handler_gput:nxx
- { xform/Resources/Properties }
+ { Xform/Resources/Properties }
{ l3pdf\int_use:N\g_@@_backend_name_int }
{ \@@_backend_object_last: }
}
@@ -1186,7 +1186,7 @@
\bool_if:NTF \l_@@_backend_xform_bool
{
\__pdfgdict_handler_gput:nxx
- { xform/Resources/Properties }
+ { Xform/Resources/Properties }
{ l3pdf\int_use:N\g_@@_backend_resourceid_int }
{ \@@_backend_object_ref:n { #2 } }
}
@@ -1201,9 +1201,9 @@
{pdf at abspage}
{0}
}
- \__pdfgdict_if_exist:nF { backend_Page\l_@@_tmpa_tl/Resources/Properties }
+ \pdfdict_if_gexist:nF { backend_Page\l_@@_tmpa_tl/Resources/Properties }
{
- \__pdfgdict_new:n { backend_Page\l_@@_tmpa_tl/Resources/Properties }
+ \pdfdict_gnew:n { backend_Page\l_@@_tmpa_tl/Resources/Properties }
}
\__pdfgdict_handler_gput:nxx
{ backend_Page\l_@@_tmpa_tl/Resources/Properties }
@@ -1221,7 +1221,7 @@
\bool_if:NTF \l_@@_backend_xform_bool
{
\__pdfgdict_handler_gput:nxx
- { xform/Resources/Properties }
+ { Xform/Resources/Properties }
{ l3pdf\int_use:N\g_@@_backend_resourceid_int }
{ \@@_backend_object_last: }
}
@@ -1236,9 +1236,9 @@
{pdf at abspage}
{0}
}
- \__pdfgdict_if_exist:nF { backend_Page\l_@@_tmpa_tl/Resources/Properties }
+ \pdfdict_if_gexist:nF { backend_Page\l_@@_tmpa_tl/Resources/Properties }
{
- \__pdfgdict_new:n { backend_Page\l_@@_tmpa_tl/Resources/Properties }
+ \pdfdict_gnew:n { backend_Page\l_@@_tmpa_tl/Resources/Properties }
}
\__pdfgdict_handler_gput:nxx
{ backend_Page\l_@@_tmpa_tl/Resources/Properties }
@@ -1259,7 +1259,7 @@
\cs_new:Npn \@@_backend_PageResources_gpush_aux:n #1 %#1 ExtGState etc
{
\prop_if_empty:cF
- { \__pdfgdict_name:n {Page/Resources/#1} }
+ { \pdfdict_gname:n {Page/Resources/#1} }
{
\pdfdict_item:ne { #1 }{ \pdf_object_ref:n {Page/Resources/#1}}
}
@@ -1270,12 +1270,12 @@
\exp_args:NNx \tex_global:D \tex_pdfpageresources:D
{
\prop_if_exist:cT
- { \__pdfgdict_name:n { backend_Page#1/Resources/Properties } }
+ { \pdfdict_gname:n { backend_Page#1/Resources/Properties } }
{
/Properties~
<<
\prop_map_function:cN
- { \__pdfgdict_name:n { backend_Page#1/Resources/Properties } }
+ { \pdfdict_gname:n { backend_Page#1/Resources/Properties } }
\pdfdict_item:ne
>>
}
@@ -1432,7 +1432,7 @@
\hbox_set:Nn \l_@@_tmpa_box
{
\bool_set_true:N \l_@@_backend_xform_bool
- \__pdfgdict_gclear:n {xform/Resources/Properties}
+ \prop_gclear:c {\pdfdict_gname:n{Xform/Resources/Properties}}
#4
}
%store the dimensions
@@ -1453,33 +1453,33 @@
{
#3
\int_compare:nNnT
- { \prop_count:c { \__pdfgdict_name:n {xform/Resources/Properties} } }
+ { \prop_count:c { \pdfdict_gname:n {Xform/Resources/Properties} } }
>
{ 0 }
{
/Properties~
<<
- \__pdfgdict_map:n {xform/Resources/Properties}
+ \pdfdict_gmap:n {Xform/Resources/Properties}
>>
}
\prop_if_empty:cF
- { \__pdfgdict_name:n {Page/Resources/ExtGState} }
+ { \pdfdict_gname:n {Page/Resources/ExtGState} }
{
/ExtGState~ \pdf_object_ref:n {Page/Resources/ExtGState}
}
\prop_if_empty:cF
- { \__pdfgdict_name:n {Page/Resources/Pattern} }
+ { \pdfdict_gname:n {Page/Resources/Pattern} }
{
/Pattern~ \pdf_object_ref:n {Page/Resources/Pattern}
}
\prop_if_empty:cF
- { \__pdfgdict_name:n {Page/Resources/Shading} }
+ { \pdfdict_gname:n {Page/Resources/Shading} }
{
/Shading~ \pdf_object_ref:n {Page/Resources/Shading}
}
\prop_if_empty:cF
- { \__pdfgdict_name:n {Page/Resources/ColorSpace} }
+ { \pdfdict_gname:n {Page/Resources/ColorSpace} }
{
/ColorSpace~ \pdf_object_ref:n {Page/Resources/ColorSpace}
}
@@ -1516,7 +1516,7 @@
\hbox_set:Nn \l_@@_tmpa_box
{
\bool_set_true:N \l_@@_backend_xform_bool
- \__pdfgdict_gclear:n {xform/Resources/Properties}
+ \prop_gclear:c {\pdfdict_gname:n{Xform/Resources/Properties}}
#4
}
\tl_const:cx
@@ -1536,32 +1536,32 @@
{
#3
\int_compare:nNnT
- {\prop_count:c { \__pdfgdict_name:n {xform/Resources/Properties} }}
+ {\prop_count:c { \pdfdict_gname:n {Xform/Resources/Properties} }}
>
{ 0 }
{
/Properties~
<<
- \__pdfgdict_map:n {xform/Resources/Properties}
+ \pdfdict_gmap:n {Xform/Resources/Properties}
>>
}
\prop_if_empty:cF
- { \__pdfgdict_name:n {Page/Resources/ExtGState} }
+ { \pdfdict_gname:n {Page/Resources/ExtGState} }
{
/ExtGState~ \pdf_object_ref:n {Page/Resources/ExtGState}
}
\prop_if_empty:cF
- { \__pdfgdict_name:n {Page/Resources/Pattern} }
+ { \pdfdict_gname:n {Page/Resources/Pattern} }
{
/Pattern~ \pdf_object_ref:n {Page/Resources/Pattern}
}
\prop_if_empty:cF
- { \__pdfgdict_name:n {Page/Resources/Shading} }
+ { \pdfdict_gname:n {Page/Resources/Shading} }
{
/Shading~ \pdf_object_ref:n {Page/Resources/Shading}
}
\prop_if_empty:cF
- { \__pdfgdict_name:n {Page/Resources/ColorSpace} }
+ { \pdfdict_gname:n {Page/Resources/ColorSpace} }
{
/ColorSpace~ \pdf_object_ref:n {Page/Resources/ColorSpace}
}
@@ -2370,15 +2370,16 @@
\cs_new:Npn \@@_patch_pgfextgs:w #1/#2<<#3>>#4\q_stop
{
- \@@_backend_PageResources_gput:nnn {ExtGState}{#2}{<<#3>>}
+ \exp_args:Nne \@@_backend_PageResources_gput:nnn {ExtGState}{\tl_trim_spaces:n{#2}}{<<#3>>}
}
\cs_new:Npn \@@_patch_pgfpatterns:w #1/#2\space#3\q_stop
{
- \exp_args:Nnnx \@@_backend_PageResources_gput:nnn {Pattern}{#2}{#3}
+ \exp_args:Nnxx \@@_backend_PageResources_gput:nnn {Pattern}{\tl_trim_spaces:n{#2}}{#3}
}
\cs_new:Npn \@@_patch_pgfcolorspaces:w #1/#2[#3]#4\q_stop
{
- \@@_backend_PageResources_gput:nnn {ColorSpace}{#2}{[#3]}
+ \exp_args:Nne
+ \@@_backend_PageResources_gput:nnn {ColorSpace}{\tl_trim_spaces:n{#2}}{[#3]}
}
% \end{macrocode}
diff --git a/testfiles-noxetex/extgstate-patches.pdftex.tpf b/testfiles-noxetex/extgstate-patches.pdftex.tpf
index 217a4e4..7e314f2 100644
--- a/testfiles-noxetex/extgstate-patches.pdftex.tpf
+++ b/testfiles-noxetex/extgstate-patches.pdftex.tpf
@@ -22,10 +22,10 @@ endobj
<< /Type/ExtGState /op true /OP true /OPM 1 >>
endobj
1 0 obj
-<< /TRP1 <</ca 1/CA 1>> /SPCko 9 0 R /SPCmz 10 0 R /SPCop 11 0 R /pgf at CA0.4 << /CA 0.4 >> /pgf at ca0.4 << /ca 0.4 >> /TRP0.6 <</ca 0.6/CA 0.6>> /bearopacity <</ca 0.7/CA 0.7>> >>
+<< /TRP1 <</ca 1/CA 1>> /SPCko 9 0 R /SPCmz 10 0 R /SPCop 11 0 R /pgf at CA0.4 << /CA 0.4 >> /pgf at ca0.4 << /ca 0.4 >> /TRP0.6 <</ca 0.6/CA 0.6>> /bearopacity <</ca 0.7/CA 0.7>> >>
endobj
2 0 obj
-<< /pgfprgb [/Pattern /DeviceRGB] >>
+<< /pgfprgb [/Pattern /DeviceRGB] >>
endobj
14 0 obj
<<
@@ -83,7 +83,7 @@ endobj
endobj
12 0 obj
<<
-/ExtGState 1 0 R/ColorSpace 2 0 R
+/ExtGState 1 0 R /ColorSpace 2 0 R
/Font << /F8 15 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -151,7 +151,7 @@ xref
0 22
0000000003 65535 f
0000000442 00000 n
-0000000637 00000 n
+0000000635 00000 n
0000000004 00000 f
0000000000 00000 f
0000000015 00000 n
@@ -161,21 +161,21 @@ xref
0000000259 00000 n
0000000316 00000 n
0000000379 00000 n
-0000001288 00000 n
-0000001180 00000 n
-0000000691 00000 n
-0000011581 00000 n
-0000011720 00000 n
-0000001391 00000 n
-0000001676 00000 n
-0000011354 00000 n
-0000011779 00000 n
-0000011830 00000 n
+0000001285 00000 n
+0000001177 00000 n
+0000000688 00000 n
+0000011580 00000 n
+0000011719 00000 n
+0000001390 00000 n
+0000001675 00000 n
+0000011353 00000 n
+0000011778 00000 n
+0000011829 00000 n
trailer
<< /Size 22
/Root 20 0 R
/Info 21 0 R
>>
startxref
-11902
+11901
%%EOF
diff --git a/testfiles-noxetex/extgstate-patches.tpf b/testfiles-noxetex/extgstate-patches.tpf
index 7a9f800..674314b 100644
--- a/testfiles-noxetex/extgstate-patches.tpf
+++ b/testfiles-noxetex/extgstate-patches.tpf
@@ -22,10 +22,10 @@ endobj
<< /Type/ExtGState /op true /OP true /OPM 1 >>
endobj
1 0 obj
-<< /TRP1 <</ca 1/CA 1>> /SPCko 9 0 R /SPCmz 10 0 R /SPCop 11 0 R /pgf at CA0.4 << /CA 0.4 >> /pgf at ca0.4 << /ca 0.4 >> /TRP0.6 <</ca 0.6/CA 0.6>> /bearopacity <</ca 0.7/CA 0.7>> >>
+<< /TRP1 <</ca 1/CA 1>> /SPCko 9 0 R /SPCmz 10 0 R /SPCop 11 0 R /pgf at CA0.4 << /CA 0.4 >> /pgf at ca0.4 << /ca 0.4 >> /TRP0.6 <</ca 0.6/CA 0.6>> /bearopacity <</ca 0.7/CA 0.7>> >>
endobj
2 0 obj
-<< /pgfprgb [/Pattern /DeviceRGB] >>
+<< /pgfprgb [/Pattern /DeviceRGB] >>
endobj
14 0 obj
<< /Length 513 >>
@@ -150,7 +150,7 @@ xref
0 25
0000000003 65535 f
0000000447 00000 n
-0000000642 00000 n
+0000000640 00000 n
0000000004 00000 f
0000000000 00000 f
0000000020 00000 n
@@ -160,21 +160,21 @@ xref
0000000264 00000 n
0000000321 00000 n
0000000384 00000 n
-0000001379 00000 n
-0000001269 00000 n
-0000000696 00000 n
-0000003900 00000 n
-0000004254 00000 n
-0000001483 00000 n
-0000002856 00000 n
-0000001559 00000 n
-0000001634 00000 n
-0000003092 00000 n
-0000004054 00000 n
-0000004316 00000 n
-0000004367 00000 n
+0000001376 00000 n
+0000001266 00000 n
+0000000693 00000 n
+0000003897 00000 n
+0000004251 00000 n
+0000001480 00000 n
+0000002853 00000 n
+0000001556 00000 n
+0000001631 00000 n
+0000003089 00000 n
+0000004051 00000 n
+0000004313 00000 n
+0000004364 00000 n
trailer
<< /Size 25 /Root 23 0 R /Info 24 0 R >>
startxref
-4439
+4436
%%EOF
diff --git a/testfiles-noxetex/pgfpatches.pdftex.tpf b/testfiles-noxetex/pgfpatches.pdftex.tpf
index e864eae..9a9f73f 100644
--- a/testfiles-noxetex/pgfpatches.pdftex.tpf
+++ b/testfiles-noxetex/pgfpatches.pdftex.tpf
@@ -145,7 +145,7 @@ endobj
endobj
12 0 obj
<<
-/ExtGState 1 0 R/ColorSpace 2 0 R/Pattern 3 0 R
+/ExtGState 1 0 R /ColorSpace 2 0 R /Pattern 3 0 R
/Font << /F8 16 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -160,10 +160,10 @@ q 0.6875 0.76562 0.86718 rg 0.0 0.0 7.97021 7.97021 re f 0.93437 0.93828 0.94336
endstream
endobj
1 0 obj
-<< /pgf at CA0.5 << /CA 0.5 >> /pgf at ca0.5 << /ca 0.5 >> >>
+<< /pgf at CA0.5 << /CA 0.5 >> /pgf at ca0.5 << /ca 0.5 >> >>
endobj
2 0 obj
-<< /pgfprgb [/Pattern /DeviceRGB] >>
+<< /pgfprgb [/Pattern /DeviceRGB] >>
endobj
3 0 obj
<< /pgfpat3 10 0 R /pgfpat13 11 0 R /pgfpat20 18 0 R >>
@@ -232,7 +232,7 @@ endobj
endobj
19 0 obj
<<
-/ExtGState 1 0 R/ColorSpace 2 0 R/Pattern 3 0 R
+/ExtGState 1 0 R /ColorSpace 2 0 R /Pattern 3 0 R
/Font << /F8 16 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -314,8 +314,8 @@ endobj
xref
0 31
0000000004 65535 f
-0000003591 00000 n
-0000003665 00000 n
+0000003594 00000 n
+0000003666 00000 n
0000003719 00000 n
0000000000 00000 f
0000000046 00000 n
@@ -329,26 +329,26 @@ xref
0000001038 00000 n
0000002074 00000 n
0000002132 00000 n
-0000014727 00000 n
-0000014867 00000 n
-0000002308 00000 n
+0000014730 00000 n
+0000014870 00000 n
+0000002311 00000 n
0000004526 00000 n
0000004359 00000 n
0000003791 00000 n
0000004467 00000 n
-0000004643 00000 n
-0000004693 00000 n
-0000005100 00000 n
-0000014500 00000 n
-0000014932 00000 n
-0000015045 00000 n
-0000015081 00000 n
-0000015245 00000 n
+0000004646 00000 n
+0000004696 00000 n
+0000005103 00000 n
+0000014503 00000 n
+0000014935 00000 n
+0000015048 00000 n
+0000015084 00000 n
+0000015248 00000 n
trailer
<< /Size 31
/Root 29 0 R
/Info 30 0 R
>>
startxref
-15435
+15438
%%EOF
diff --git a/testfiles-noxetex/pgfpatches.tpf b/testfiles-noxetex/pgfpatches.tpf
index 7cd6541..01904ba 100644
--- a/testfiles-noxetex/pgfpatches.tpf
+++ b/testfiles-noxetex/pgfpatches.tpf
@@ -137,10 +137,10 @@ q 0.6875 0.76562 0.86718 rg 0.0 0.0 7.97021 7.97021 re f 0.93437 0.93828 0.94336
endstream
endobj
1 0 obj
-<< /pgf at CA0.5 << /CA 0.5 >> /pgf at ca0.5 << /ca 0.5 >> >>
+<< /pgf at CA0.5 << /CA 0.5 >> /pgf at ca0.5 << /ca 0.5 >> >>
endobj
2 0 obj
-<< /pgfprgb [/Pattern /DeviceRGB] >>
+<< /pgfprgb [/Pattern /DeviceRGB] >>
endobj
3 0 obj
<< /pgfpat3 10 0 R /pgfpat13 11 0 R /pgfpat20 18 0 R >>
@@ -283,8 +283,8 @@ xref
0 34
0000000004 65535 f
0000003642 00000 n
-0000003716 00000 n
-0000003770 00000 n
+0000003714 00000 n
+0000003767 00000 n
0000000000 00000 f
0000000051 00000 n
0000000152 00000 n
@@ -297,26 +297,26 @@ xref
0000001045 00000 n
0000002119 00000 n
0000002179 00000 n
-0000007075 00000 n
-0000007429 00000 n
+0000007072 00000 n
+0000007426 00000 n
0000002358 00000 n
-0000004623 00000 n
-0000004452 00000 n
-0000003842 00000 n
-0000004562 00000 n
-0000004741 00000 n
-0000004791 00000 n
-0000006045 00000 n
-0000004857 00000 n
-0000004932 00000 n
-0000006281 00000 n
-0000007229 00000 n
-0000007497 00000 n
-0000007614 00000 n
-0000007650 00000 n
-0000007814 00000 n
+0000004620 00000 n
+0000004449 00000 n
+0000003839 00000 n
+0000004559 00000 n
+0000004738 00000 n
+0000004788 00000 n
+0000006042 00000 n
+0000004854 00000 n
+0000004929 00000 n
+0000006278 00000 n
+0000007226 00000 n
+0000007494 00000 n
+0000007611 00000 n
+0000007647 00000 n
+0000007811 00000 n
trailer
<< /Size 34 /Root 32 0 R /Info 33 0 R >>
startxref
-8004
+8001
%%EOF
diff --git a/testfiles-noxetex/test-new-transparent.pdftex.tpf b/testfiles-noxetex/test-new-transparent.pdftex.tpf
index bda618f..e6ded7b 100644
--- a/testfiles-noxetex/test-new-transparent.pdftex.tpf
+++ b/testfiles-noxetex/test-new-transparent.pdftex.tpf
@@ -106,18 +106,18 @@ xref
0000000508 00000 n
0000000397 00000 n
0000000171 00000 n
-0000008980 00000 n
-0000009119 00000 n
-0000000592 00000 n
-0000000999 00000 n
-0000008759 00000 n
-0000009176 00000 n
-0000009226 00000 n
+0000008981 00000 n
+0000009120 00000 n
+0000000593 00000 n
+0000001000 00000 n
+0000008760 00000 n
+0000009177 00000 n
+0000009227 00000 n
trailer
<< /Size 15
/Root 13 0 R
/Info 14 0 R
>>
startxref
-9298
+9299
%%EOF
diff --git a/testfiles-noxetex/transparent-tikz.pdftex.tpf b/testfiles-noxetex/transparent-tikz.pdftex.tpf
index 06a69b6..304548e 100644
--- a/testfiles-noxetex/transparent-tikz.pdftex.tpf
+++ b/testfiles-noxetex/transparent-tikz.pdftex.tpf
@@ -28,7 +28,7 @@ endobj
endobj
5 0 obj
<<
-/ExtGState 1 0 R/ColorSpace 2 0 R
+/ExtGState 1 0 R /ColorSpace 2 0 R
/Font << /F8 8 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -83,16 +83,16 @@ endobj
endobj
10 0 obj
<<
-/ExtGState 1 0 R/ColorSpace 2 0 R
+/ExtGState 1 0 R /ColorSpace 2 0 R
/Font << /F8 8 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
1 0 obj
-<< /TRP1 <</ca 1/CA 1>> /pgf at CA0.5 << /CA 0.5 >> /pgf at ca0.5 << /ca 0.5 >> /TRP0.5 <</ca 0.5/CA 0.5>> /TRP0.3 <</ca 0.3/CA 0.3>> >>
+<< /TRP1 <</ca 1/CA 1>> /pgf at CA0.5 << /CA 0.5 >> /pgf at ca0.5 << /ca 0.5 >> /TRP0.5 <</ca 0.5/CA 0.5>> /TRP0.3 <</ca 0.3/CA 0.3>> >>
endobj
2 0 obj
-<< /pgfprgb [/Pattern /DeviceRGB] >>
+<< /pgfprgb [/Pattern /DeviceRGB] >>
endobj
15 0 obj
<<
@@ -126,7 +126,7 @@ endobj
endobj
13 0 obj
<<
-/ExtGState 1 0 R/ColorSpace 2 0 R
+/ExtGState 1 0 R /ColorSpace 2 0 R
/Font << /F8 8 0 R >>
/ProcSet [ /PDF /Text ]
>>
@@ -193,31 +193,31 @@ endobj
xref
0 21
0000000003 65535 f
-0000001013 00000 n
-0000001162 00000 n
+0000001017 00000 n
+0000001164 00000 n
0000000004 00000 f
0000000000 00000 f
0000000308 00000 n
0000000204 00000 n
0000000015 00000 n
-0000012415 00000 n
-0000012554 00000 n
-0000000911 00000 n
-0000000804 00000 n
-0000000409 00000 n
-0000001571 00000 n
-0000001464 00000 n
-0000001216 00000 n
-0000001673 00000 n
-0000002080 00000 n
-0000012178 00000 n
-0000012625 00000 n
-0000012675 00000 n
+0000012418 00000 n
+0000012557 00000 n
+0000000913 00000 n
+0000000806 00000 n
+0000000411 00000 n
+0000001572 00000 n
+0000001465 00000 n
+0000001217 00000 n
+0000001676 00000 n
+0000002083 00000 n
+0000012181 00000 n
+0000012628 00000 n
+0000012678 00000 n
trailer
<< /Size 21
/Root 19 0 R
/Info 20 0 R
>>
startxref
-12747
+12750
%%EOF
diff --git a/testfiles-noxetex/transparent-tikz.tpf b/testfiles-noxetex/transparent-tikz.tpf
index 9fd7f12..9deb18b 100644
--- a/testfiles-noxetex/transparent-tikz.tpf
+++ b/testfiles-noxetex/transparent-tikz.tpf
@@ -67,10 +67,10 @@ endobj
<< /ExtGState 1 0 R/ColorSpace 2 0 R /Font << /F25 8 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
1 0 obj
-<< /TRP1 <</ca 1/CA 1>> /pgf at CA0.5 << /CA 0.5 >> /pgf at ca0.5 << /ca 0.5 >> /TRP0.5 <</ca 0.5/CA 0.5>> /TRP0.3 <</ca 0.3/CA 0.3>> >>
+<< /TRP1 <</ca 1/CA 1>> /pgf at CA0.5 << /CA 0.5 >> /pgf at ca0.5 << /ca 0.5 >> /TRP0.5 <</ca 0.5/CA 0.5>> /TRP0.3 <</ca 0.3/CA 0.3>> >>
endobj
2 0 obj
-<< /pgfprgb [/Pattern /DeviceRGB] >>
+<< /pgfprgb [/Pattern /DeviceRGB] >>
endobj
15 0 obj
<< /Length 296 >>
@@ -173,30 +173,30 @@ xref
0 24
0000000003 65535 f
0000001067 00000 n
-0000001216 00000 n
+0000001214 00000 n
0000000004 00000 f
0000000000 00000 f
0000000344 00000 n
0000000238 00000 n
0000000020 00000 n
-0000004584 00000 n
-0000004937 00000 n
+0000004581 00000 n
+0000004934 00000 n
0000000964 00000 n
0000000855 00000 n
0000000446 00000 n
-0000001735 00000 n
-0000001626 00000 n
-0000001270 00000 n
-0000001838 00000 n
-0000003512 00000 n
-0000001930 00000 n
-0000002005 00000 n
-0000003748 00000 n
-0000004737 00000 n
-0000005011 00000 n
-0000005061 00000 n
+0000001732 00000 n
+0000001623 00000 n
+0000001267 00000 n
+0000001835 00000 n
+0000003509 00000 n
+0000001927 00000 n
+0000002002 00000 n
+0000003745 00000 n
+0000004734 00000 n
+0000005008 00000 n
+0000005058 00000 n
trailer
<< /Size 24 /Root 22 0 R /Info 23 0 R >>
startxref
-5133
+5130
%%EOF
diff --git a/testfiles/infodict.luatex.tpf b/testfiles/infodict.luatex.tpf
index 6f30eb8..e1cca13 100644
--- a/testfiles/infodict.luatex.tpf
+++ b/testfiles/infodict.luatex.tpf
@@ -85,7 +85,7 @@ endobj
<< /Type /Catalog /Pages 9 0 R >>
endobj
17 0 obj
-<< /Producer (LuaTeX)/Title (Gr\303\274\303\237e)/Author (Some Author) /Creator (TeX) /Trapped /False >>
+<< /Producer (LuaTeX)/Title (\376\377\000G\000r\000\374\000\337\000e)/Author (Some Author) /Creator (TeX) /Trapped /False >>
endobj
xref
0 18
@@ -110,5 +110,5 @@ xref
trailer
<< /Size 18 /Root 16 0 R /Info 17 0 R >>
startxref
-3712
+3732
%%EOF
diff --git a/testfiles/infodict.tpf b/testfiles/infodict.tpf
index 956c8ba..9db1884 100644
--- a/testfiles/infodict.tpf
+++ b/testfiles/infodict.tpf
@@ -79,7 +79,7 @@ endobj
endobj
14 0 obj
<<
-/Producer (pdfTeX)/Title (Gr\303\274\303\237e)/Author (Some Author)
+/Producer (pdfTeX)/Title (\376\377\000G\000r\000\374\000\337\000e)/Author (Some Author)
/Creator (TeX)
/Trapped /False
>>
@@ -107,5 +107,5 @@ trailer
/Info 14 0 R
>>
startxref
-12186
+12206
%%EOF
diff --git a/testfiles/show.lvt b/testfiles/show.lvt
index c6c0dc3..d744dc3 100644
--- a/testfiles/show.lvt
+++ b/testfiles/show.lvt
@@ -10,6 +10,6 @@ abbb
\pdfgdict_show:n{Catalog}
\pdfgdict_show:n{Info}
\pdfdict_if_exist:nTF {blub}{true}{false}
-\pdfgdict_if_exist:nTF {Info}{true}{false}
+\pdfdict_if_gexist:nTF {Info}{true}{false}
\ExplSyntaxOff
\end{document}
diff --git a/testfiles/xform.tpf b/testfiles/xform.tpf
index 462394d..bec05a4 100644
--- a/testfiles/xform.tpf
+++ b/testfiles/xform.tpf
@@ -165,23 +165,23 @@ xref
0000000000 00000 f
0000000015 00000 n
0000000251 00000 n
-0000013770 00000 n
+0000013771 00000 n
0000000318 00000 n
0000000561 00000 n
0000001186 00000 n
0000001071 00000 n
0000000699 00000 n
-0000013909 00000 n
-0000001308 00000 n
-0000001725 00000 n
-0000013524 00000 n
-0000013968 00000 n
-0000014019 00000 n
+0000013910 00000 n
+0000001309 00000 n
+0000001726 00000 n
+0000013525 00000 n
+0000013969 00000 n
+0000014020 00000 n
trailer
<< /Size 19
/Root 17 0 R
/Info 18 0 R
>>
startxref
-14091
+14092
%%EOF
More information about the latex3-commits
mailing list.