[latex3-commits] [git/LaTeX3-latex3-pdfresources] main: make pdfdict_name internal (3b8b9ac)
Ulrike Fischer
fischer at troubleshooting-tex.de
Sun Feb 14 00:10:16 CET 2021
Repository : https://github.com/latex3/pdfresources
On branch : main
Link : https://github.com/latex3/pdfresources/commit/3b8b9ac02046ad79d8ffbab7261c702a7e674402
>---------------------------------------------------------------
commit 3b8b9ac02046ad79d8ffbab7261c702a7e674402
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Sun Feb 14 00:10:16 2021 +0100
make pdfdict_name internal
>---------------------------------------------------------------
3b8b9ac02046ad79d8ffbab7261c702a7e674402
l3backend-pdf-extra.dtx | 42 +++++++++++++--------------
l3pdfdict.dtx | 76 ++++++++++++++-----------------------------------
l3pdfmanagement.dtx | 48 +++++++++++++++----------------
resave.bat | 10 -------
4 files changed, 67 insertions(+), 109 deletions(-)
diff --git a/l3backend-pdf-extra.dtx b/l3backend-pdf-extra.dtx
index 53083ca..f7bbfab 100644
--- a/l3backend-pdf-extra.dtx
+++ b/l3backend-pdf-extra.dtx
@@ -332,10 +332,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_name:n { g_@@_Core/Page } }
- \prop_if_exist:cT { \pdfdict_name:n { g_@@_Core/backend_Page#1 } }
+ \prop_gset_eq:Nc \g_@@_tmpa_prop { \__kernel_pdfdict_name:n { g_@@_Core/Page } }
+ \prop_if_exist:cT { \__kernel_pdfdict_name:n { g_@@_Core/backend_Page#1 } }
{
- \prop_map_inline:cn { \pdfdict_name:n { g_@@_Core/backend_Page#1 } }
+ \prop_map_inline:cn { \__kernel_pdfdict_name:n { g_@@_Core/backend_Page#1 } }
{
\prop_gput:Nnn \g_@@_tmpa_prop { ##1 }{ ##2 }
}
@@ -589,7 +589,7 @@
\clist_map_inline:Nn \c_@@_backend_PageResources_clist
{
\prop_if_empty:cF
- { \pdfdict_name:n { g_@@_Core/Page/Resources/##1} }
+ { \__kernel_pdfdict_name:n { g_@@_Core/Page/Resources/##1} }
{
\@@_backend_object_write:nx
{ Page/Resources/##1 }
@@ -622,7 +622,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_name:n { g_@@_Core/Page/Resources/#1} } { #2 }{ #3 }
+ \prop_gput:cnn { \__kernel_pdfdict_name:n { g_@@_Core/Page/Resources/#1} } { #2 }{ #3 }
%objects are not filled with \pdf_object_write as this is not additive!
\@@_backend:x
{
@@ -801,7 +801,7 @@
{
\clist_map_inline:Nn \c_@@_backend_PageResources_clist
{
- \prop_if_empty:cF { \pdfdict_name:n { g_@@_Core/Page/Resources/##1} }
+ \prop_if_empty:cF { \__kernel_pdfdict_name:n { g_@@_Core/Page/Resources/##1} }
{
\__kernel_backend_literal:x
{
@@ -999,7 +999,7 @@
\cs_new:Npn \@@_backend_PageResources_gpush_aux:n #1 %#1 ExtGState etc
{
\prop_if_empty:cF
- { \pdfdict_name:n { g_@@_Core/Page/Resources/#1} }
+ { \__kernel_pdfdict_name:n { g_@@_Core/Page/Resources/#1} }
{
\pdfdict_item:ne { #1 }{ \pdf_object_ref:n {Page/Resources/#1}}
}
@@ -1010,12 +1010,12 @@
\exp_args:NNx \tex_global:D \tex_pdfpageresources:D
{
\prop_if_exist:cT
- { \pdfdict_name:n { g_@@_Core/backend_Page#1/Resources/Properties } }
+ { \__kernel_pdfdict_name:n { g_@@_Core/backend_Page#1/Resources/Properties } }
{
/Properties~
<<
\prop_map_function:cN
- { \pdfdict_name:n { g_@@_Core/backend_Page#1/Resources/Properties } }
+ { \__kernel_pdfdict_name:n { g_@@_Core/backend_Page#1/Resources/Properties } }
\pdfdict_item:ne
>>
}
@@ -1168,7 +1168,7 @@
\hbox_set:Nn \l_@@_backend_tmpa_box
{
\bool_set_true:N \l_@@_backend_xform_bool
- \prop_gclear:c {\pdfdict_name:n { g_@@_Core/Xform/Resources/Properties }}
+ \prop_gclear:c {\__kernel_pdfdict_name:n { g_@@_Core/Xform/Resources/Properties }}
#4
}
%store the dimensions
@@ -1189,7 +1189,7 @@
{
#3
\int_compare:nNnT
- { \prop_count:c { \pdfdict_name:n { g_@@_Core/Xform/Resources/Properties } } }
+ { \prop_count:c { \__kernel_pdfdict_name:n { g_@@_Core/Xform/Resources/Properties } } }
>
{ 0 }
{
@@ -1200,22 +1200,22 @@
}
\prop_if_empty:cF
- { \pdfdict_name:n { g_@@_Core/Page/Resources/ExtGState } }
+ { \__kernel_pdfdict_name:n { g_@@_Core/Page/Resources/ExtGState } }
{
/ExtGState~ \pdf_object_ref:n { Page/Resources/ExtGState }
}
\prop_if_empty:cF
- { \pdfdict_name:n { g_@@_Core/Page/Resources/Pattern } }
+ { \__kernel_pdfdict_name:n { g_@@_Core/Page/Resources/Pattern } }
{
/Pattern~ \pdf_object_ref:n { Page/Resources/Pattern }
}
\prop_if_empty:cF
- { \pdfdict_name:n { g_@@_Core/Page/Resources/Shading } }
+ { \__kernel_pdfdict_name:n { g_@@_Core/Page/Resources/Shading } }
{
/Shading~ \pdf_object_ref:n { Page/Resources/Shading }
}
\prop_if_empty:cF
- { \pdfdict_name:n { g_@@_Core/Page/Resources/ColorSpace } }
+ { \__kernel_pdfdict_name:n { g_@@_Core/Page/Resources/ColorSpace } }
{
/ColorSpace~ \pdf_object_ref:n { Page/Resources/ColorSpace }
}
@@ -1250,7 +1250,7 @@
\hbox_set:Nn \l_@@_backend_tmpa_box
{
\bool_set_true:N \l_@@_backend_xform_bool
- \prop_gclear:c { \pdfdict_name:n { g_@@_Core/Xform/Resources/Properties } }
+ \prop_gclear:c { \__kernel_pdfdict_name:n { g_@@_Core/Xform/Resources/Properties } }
#4
}
\tl_const:cx
@@ -1270,7 +1270,7 @@
{
#3
\int_compare:nNnT
- {\prop_count:c { \pdfdict_name:n { g_@@_Core/Xform/Resources/Properties } }}
+ {\prop_count:c { \__kernel_pdfdict_name:n { g_@@_Core/Xform/Resources/Properties } }}
>
{ 0 }
{
@@ -1280,22 +1280,22 @@
>>
}
\prop_if_empty:cF
- { \pdfdict_name:n { g_@@_Core/Page/Resources/ExtGState } }
+ { \__kernel_pdfdict_name:n { g_@@_Core/Page/Resources/ExtGState } }
{
/ExtGState~ \pdf_object_ref:n { Page/Resources/ExtGState }
}
\prop_if_empty:cF
- { \pdfdict_name:n { g_@@_Core/Page/Resources/Pattern } }
+ { \__kernel_pdfdict_name:n { g_@@_Core/Page/Resources/Pattern } }
{
/Pattern~ \pdf_object_ref:n { Page/Resources/Pattern }
}
\prop_if_empty:cF
- { \pdfdict_name:n { g_@@_Core/Page/Resources/Shading } }
+ { \__kernel_pdfdict_name:n { g_@@_Core/Page/Resources/Shading } }
{
/Shading~ \pdf_object_ref:n { Page/Resources/Shading }
}
\prop_if_empty:cF
- { \pdfdict_name:n { g_@@_Core/Page/Resources/ColorSpace } }
+ { \__kernel_pdfdict_name:n { g_@@_Core/Page/Resources/ColorSpace } }
{
/ColorSpace~ \pdf_object_ref:n { Page/Resources/ColorSpace }
}
diff --git a/l3pdfdict.dtx b/l3pdfdict.dtx
index a665fab..967e9ef 100644
--- a/l3pdfdict.dtx
+++ b/l3pdfdict.dtx
@@ -74,7 +74,7 @@
% \cs{pdfdict_new:n} \Arg{dictionary name}
% \end{syntax}
% This function create a new local or global dictionary. Which one depends on
-% \Arg{dictionary name}: If it begins with the standard |g| the dictionary is global.
+% \meta{dictionary name}: If it begins with the standard |g| the dictionary is global.
% With |l| the dictionary is local. Other begins will give an error. It is recommended
% to begin the name in the standard expl3 naming scheme with a module name, so |g_module_XXXX|
% or |g__module_XXXX|.
@@ -86,34 +86,24 @@
% \cs{pdfdict_set_eq:nn} \Arg{local dictionary name_1} \Arg{dictionary name_2}\\
% \cs{pdfdict_gset_eq:nn} \Arg{global dictionary name_1}\Arg{dictionary name_2}
% \end{syntax}
-% This functions copy \Arg{dictionary name_2} into
-% \Arg{local/global dictionary name_1} locally or globally. If the
-% dictionary \Arg{local/global dictionary name_1} doesn't exist yet, it will be created.
-% If \Arg{dictionary name_2} doesn't exist yet, an error will be raised.
+% This functions copy \meta{dictionary name_2} into
+% \meta{local/global dictionary name_1} locally or globally. If the
+% dictionary \meta{local/global dictionary name_1} doesn't exist yet, it will be created.
+% If \meta{dictionary name_2} doesn't exist yet, an error will be raised.
%
% \end{function}
-% \begin{function}[EXP,updated = 2020-12-03]
-% {\pdfdict_name:n}
-% \begin{syntax}
-% \cs{pdfdict_name:n} \Arg{dictionary name}
-% \end{syntax}
-% These command expand to the internal name. With these commands
-% 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]
% {\pdfdict_put:nnn, \pdfdict_gput:nnn}
% \begin{syntax}
% \cs{pdfdict_put:nnn} \Arg{local dictionary} \Arg{name} \Arg{value} \\
% \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} created with \cs{pdfdict_new:n}.
+% This function puts key \meta{name} and value \meta{value} locally or globally in the
+% \meta{dictionary} created with \cs{pdfdict_new: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
% 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
+% \meta{value} should be a valid PDF value for this name in the
% target dictionary. The value is \emph{neither} converted \emph{nor} escaped automatically.
% If the value is blank nothing is added to the dictionary.
%
@@ -121,10 +111,10 @@
% of the backends can differ. Some backends expand a
% value always fully when writing to the PDF, with other backends commands
% could end as strings in the PDF. So one should neither rely on
-% \Arg{value} to be expanded nor not expanded by the backend commands.
+% \meta{value} to be expanded nor not expanded by the backend commands.
% \end{function}
% \begin{function}[EXP,added = 2020-12-04]
-% { \pdfdict_item:nn, pdfdict_item:ne }
+% { \pdfdict_item:nn, \pdfdict_item:ne }
% \begin{syntax}
% \cs{pdfdict_item:nn} \Arg{key} \Arg{value}
% \end{syntax}
@@ -141,7 +131,7 @@
% \cs{pdfdict_use:n} \Arg{dictionary}
% \end{syntax}
% This outputs the property list of the dictionary as a list of
-% \texttt{/key value} pairs.
+% |/key value| pairs.
% This can be used e.g. when writing a dictionary object with
% \cs{pdf_object_write:nx}
% \end{function}
@@ -150,7 +140,7 @@
% \begin{syntax}
% \cs{pdfdict_show:n} \Arg{dictionary}
% \end{syntax}
-% This shows the content of \Arg{dictionary} in the log and on the terminal.
+% This shows the content of \meta{dictionary} in the log and on the terminal.
%\end{function}
%\begin{function}[EXP, pTF,updated = 2020-12-03]
% { \pdfdict_if_exist:n }
@@ -189,43 +179,15 @@
% \cs{pdfdict_remove:nn} \Arg{local dictionary} \Arg{name}\\
% \cs{pdfdict_gremove:nn} \Arg{global dictionary} \Arg{name}
% \end{syntax}
-% Removes |/|\meta{name} and its associated \meta{value} from
+% Removes \meta{name} and its associated \meta{value} from
% the \Arg{dictionary}
% The removal is local from local dictionaries
% and global from global dictionaries.
% If \meta{name} is not found no change occurs,
% \emph{i.e}~there is no need to test for the existence of a name before
-% trying to remove it. \Arg{name} is first converted
+% trying to remove it. \meta{name} is first converted
% with \cs{str_convert_pdfname}.
% \end{function}
-% \subsection{Predeclared dictionaries}
-% The module predeclares a number of local dictionaries and fills them with
-% some standard values. Some are not more than templates. But others are used
-% in core commands and can be used to change their settings.
-% For example an link created with \cs{pdfannot_link:nnn}
-% will use the \texttt{annot/Link/URI} dictionary. By adding or changing entries
-% in this dictionary user or packages can for example adapt the border color or
-% add keys needed for ocg layers.
-%
-%
-% The following tabular summarize the predeclared dictionaries.
-% \begin{NOTE}{UF}
-% Check which (local) dictionaries should be predefined.
-% Check also if the reset idea makes sense. (Removed for now)
-% Move page/Trans to hyperref driver. Belongs imho there
-% \end{NOTE}
-%
-% \medskip
-% \noindent
-% \begin{tabular}{p{\dimexpr0.25\textwidth-6\tabcolsep}p{0.25\textwidth}>{\raggedright}p{0.5\textwidth}}
-% name & default keys & notes \tabularnewline\hline
-% l_annot/Link/Goto &F (Flag)& used in GoTo links (internal references) \tabularnewline
-% l_annot/Link/URI &F (Flag)& used in URI links (external uri references) \tabularnewline
-% l_annot/Link/GotoR &F (Flag)& used in GoToR links (file references) \tabularnewline
-% l_annot/Link/Named &F (Flag)& used in Named actions (menu calls) \tabularnewline
-% l_annot/Link/Launch &F (Flag)& used in Launch links (application calls) \tabularnewline
-% \end{tabular}
-
% \end{documentation}
%
% \begin{implementation}
@@ -289,20 +251,26 @@
%
% \begin{macro}
% {
-% \@@_name:n, \pdfdict_name:n,
+% \@@_name:n, \__kernel_pdfdict_name:n,
% \@@_new:n, \pdfdict_new:n,
% }
%
% This are the commands to create new dictionaries and to access their internal
% name. All internal names start with |g__pdfdict_/| or |l__pdfdict_/|.
%
+% For the other modules we also need a kernel command to access the internal
+% name to speed up the code and allow the use standard commands
+% of the \texttt{prop} module to deal with the dictionaries. For example\\
+% |\prop_clear:c { \__kernel_pdfdict_name:n { name }}|
+% \end{function}
+%
% \begin{macrocode}
%<*package>
\cs_new:Npn \@@_name:n #1 % #1 dictionary name
{
\str_head:n{#1}_@@_/#1_prop
}
-\cs_set_eq:NN \pdfdict_name:n \@@_name:n
+\cs_set_eq:NN \__kernel_pdfdict_name:n \@@_name:n
\cs_new_protected:Npn \@@_new:n #1
{
diff --git a/l3pdfmanagement.dtx b/l3pdfmanagement.dtx
index 46da951..556c69e 100644
--- a/l3pdfmanagement.dtx
+++ b/l3pdfmanagement.dtx
@@ -731,7 +731,7 @@
{ \use:c {@@_handler/#1/#2_gput:n} {#3} } %special handler
{
\prop_gput:cnn
- { \pdfdict_name:n { g__pdf_Core/#1 } }{ #2 } { #3 }
+ { \__kernel_pdfdict_name:n { g__pdf_Core/#1 } }{ #2 } { #3 }
}
}
}
@@ -747,7 +747,7 @@
\cs_new_protected:Npn \@@_get:nnN #1 #2 #3 %path,key,macro
{
\prop_get:cnN
- { \pdfdict_name:n { g__pdf_Core/#1 } }
+ { \__kernel_pdfdict_name:n { g__pdf_Core/#1 } }
{ #2 } #3
}
@@ -765,7 +765,7 @@
{ \use:c {@@_handler/#1/#2_gremove:} } %special handler
{
\prop_gremove:cn
- { \pdfdict_name:n { g__pdf_Core/#1 } }{ #2 }
+ { \__kernel_pdfdict_name:n { g__pdf_Core/#1 } }{ #2 }
}
}
}
@@ -779,7 +779,7 @@
\pdfdict_if_exist:nTF { g__pdf_Core/#1 }
{
\prop_gremove:cn
- { \pdfdict_name:n { g__pdf_Core/#1 } }{ #2 }
+ { \__kernel_pdfdict_name:n { g__pdf_Core/#1 } }{ #2 }
}
{
\msg_error:nnn { pdfmanagement } { unknown-dict } { #1 }
@@ -793,12 +793,12 @@
{ @@_handler/#2/?_show: } %general, name independant handler
{ \use:c {@@_handler/#2/?_show:} }
{
- \prop_if_exist:cTF { \pdfdict_name:n { g__pdf_Core/#2 } }
+ \prop_if_exist:cTF { \__kernel_pdfdict_name:n { g__pdf_Core/#2 } }
{
#1
{ pdfmanagement } { show-dict }
{ \tl_to_str:n {#2} }
- { \prop_map_function:cN {\pdfdict_name:n { g__pdf_Core/#2 }} \msg_show_item:nn }
+ { \prop_map_function:cN {\__kernel_pdfdict_name:n { g__pdf_Core/#2 }} \msg_show_item:nn }
{ } { }
}
{
@@ -809,7 +809,7 @@
\cs_new_protected:Npn \@@_show:n #1 %path
{
- \prop_show:c { \pdfdict_name:n { g__pdf_Core/#1 } }
+ \prop_show:c { \__kernel_pdfdict_name:n { g__pdf_Core/#1 } }
}
% \end{macrocode}
% \end{macro}
@@ -858,8 +858,8 @@
% push to the register command / issue the special
\cs_new_protected:Npn \@@_Info_gpush:
{
- \prop_map_function:cN { \pdfdict_name:n { g__pdf_Core/Info} } \__pdf_backend_info_gput:nn
- \prop_gclear:c { \pdfdict_name:n { g__pdf_Core/Info} }
+ \prop_map_function:cN { \__kernel_pdfdict_name:n { g__pdf_Core/Info} } \__pdf_backend_info_gput:nn
+ \prop_gclear:c { \__kernel_pdfdict_name:n { g__pdf_Core/Info} }
}
% \end{macrocode}
% \end{macro}
@@ -910,7 +910,7 @@
% handler for pdfmanagement
\cs_new_protected:cpn { @@_handler/ThisPage/?_gput:nn } #1 #2
{
- \prop_gput:cnn { \pdfdict_name:n { g__pdf_Core/ThisPage } }{ #1 } { #2 }
+ \prop_gput:cnn { \__kernel_pdfdict_name:n { g__pdf_Core/ThisPage } }{ #1 } { #2 }
\bool_if:NT \g_@@_active_bool
{
\__pdf_backend_ThisPage_gput:nn { #1 }{ #2 }
@@ -1064,7 +1064,7 @@
\use:c { @@_/Catalog/Requirements_gpush: }
\use:c { @@_/Catalog/ViewerPreferences_gpush: }
% output the single values:
- \prop_map_function:cN { \pdfdict_name:n { g__pdf_Core/Catalog} } \__pdf_backend_catalog_gput:nn
+ \prop_map_function:cN { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog} } \__pdf_backend_catalog_gput:nn
% output names tree:
\use:c { @@_/Catalog/Names/EmbeddedFiles_gpush: }
}
@@ -1076,7 +1076,7 @@
\cs_new_protected:cpn { @@_/Catalog/AA_gpush: }
{
\prop_if_empty:cF
- { \pdfdict_name:n { g__pdf_Core/Catalog/AA } }
+ { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AA } }
{
\__pdf_backend_object_new:nn { g_@@_/Catalog/AA_obj } { dict }
\__pdf_backend_object_write:nx
@@ -1114,7 +1114,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_name:n { g__pdf_Core/Catalog/AcroForm } }
+ { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm } }
{ Fields }
{ \__pdf_backend_object_ref:n { g_@@_/Catalog/AcroForm/Fields_obj } }
}
@@ -1127,11 +1127,11 @@
{ \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_name:n { g__pdf_Core/Catalog/AcroForm } }
+ { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm } }
{ CO }
{ \__pdf_backend_object_ref:n { g_@@_/Catalog/AcroForm/CO_obj } }
}
- \prop_if_empty:cF { \pdfdict_name:n { g__pdf_Core/Catalog/AcroForm/DR/Font}}
+ \prop_if_empty:cF { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm/DR/Font}}
{
\__pdf_backend_object_new:nn { g_@@_/Catalog/AcroForm/DR/Font_obj } {dict}
\exp_args:Nnx
@@ -1140,11 +1140,11 @@
{ \pdfdict_use:n { g__pdf_Core/Catalog/AcroForm/DR/Font } }
\exp_args:Nnnx
\prop_gput:cnn %we have to use \prop here to avoid the handler ..
- { \pdfdict_name:n { g__pdf_Core/Catalog/AcroForm/DR } }
+ { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm/DR } }
{ Font }
{ \__pdf_backend_object_ref:n { g_@@_/Catalog/AcroForm/DR/Font_obj } }
}
- \prop_if_empty:cF { \pdfdict_name:n { g__pdf_Core/Catalog/AcroForm/DR}}
+ \prop_if_empty:cF { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm/DR}}
{
\__pdf_backend_object_new:nn { g_@@_/Catalog/AcroForm/DR_obj } {dict}
\exp_args:Nnx
@@ -1153,11 +1153,11 @@
{ \pdfdict_use:n { g__pdf_Core/Catalog/AcroForm/DR } }
\exp_args:Nnnx
\prop_gput:cnn %we have to use \prop here to avoid the handler ..
- { \pdfdict_name:n { g__pdf_Core/Catalog/AcroForm } }
+ { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm } }
{ DR }
{ \__pdf_backend_object_ref:n { g_@@_/Catalog/AcroForm/DR_obj } }
}
- \prop_if_empty:cF { \pdfdict_name:n { g__pdf_Core/Catalog/AcroForm} }
+ \prop_if_empty:cF { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/AcroForm} }
{
\__pdf_backend_object_new:nn { g_@@_/Catalog/AcroForm_obj } {dict}
\exp_args:Nnx
@@ -1206,7 +1206,7 @@
\cs_new_protected:cpn { @@_/Catalog/MarkInfo_gpush: }
{
\prop_if_empty:cF
- { \pdfdict_name:n { g__pdf_Core/Catalog/MarkInfo } }
+ { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/MarkInfo } }
{
\__pdf_backend_object_new:nn { g_@@_/Catalog/MarkInfo_obj } { dict }
\exp_args:Nnx
@@ -1328,7 +1328,7 @@
\cs_new_protected:cpn { @@_/Catalog/ViewerPreferences_gpush: }
{
\prop_if_empty:cF
- { \pdfdict_name:n { g__pdf_Core/Catalog/ViewerPreferences } }
+ { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/ViewerPreferences } }
{
\__pdf_backend_object_new:nn { g_@@_/Catalog/ViewerPreferences_obj } { dict }
\exp_args:Nnx
@@ -1386,7 +1386,7 @@
{
\iow_newline:
The~Catalog~contains~in~the~top~level~the~single~value~entries
- \prop_map_function:cN {\pdfdict_name:n { g__pdf_Core/Catalog }} \msg_show_item:nn
+ \prop_map_function:cN {\__kernel_pdfdict_name:n { g__pdf_Core/Catalog }} \msg_show_item:nn
}
\clist_map_inline:Nn \c_@@_Catalog_seq_clist
{
@@ -1401,12 +1401,12 @@
}
\clist_map_inline:Nn \c_@@_Catalog_sub_clist
{
- \prop_if_empty:cF { \pdfdict_name:n { g__pdf_Core/Catalog/##1 } }
+ \prop_if_empty:cF { \__kernel_pdfdict_name:n { g__pdf_Core/Catalog/##1 } }
{
\iow_term:x
{
The~Catalog~subdirectory~'##1'~contains~the~single~value~entries
- \prop_map_function:cN {\pdfdict_name:n { g__pdf_Core/Catalog/##1 }} \msg_show_item:nn
+ \prop_map_function:cN {\__kernel_pdfdict_name:n { g__pdf_Core/Catalog/##1 }} \msg_show_item:nn
}
}
}
diff --git a/resave.bat b/resave.bat
index 33695d1..ff9449e 100644
--- a/resave.bat
+++ b/resave.bat
@@ -3,13 +3,3 @@ rem l3build save -e\2 \1
rem l3build save -cconfig-dvips \1
rem l3build save -cconfig-luatex -e\2 \1
rem l3build save -cconfig-noxetex -e\2 \1
-
-l3build save -cconfig-dvips annot-last
-l3build save -cconfig-dvips catalogAF
-l3build save -cconfig-dvips destination-options
-l3build save -cconfig-dvips dict_if_empty
-l3build save -cconfig-dvips pagelabels-log
-l3build save -cconfig-dvips pdf_pageobject_ref
-l3build save -cconfig-dvips show
-l3build save -cconfig-dvips text-convert
-l3build save -cconfig-dvips version-compare
More information about the latex3-commits
mailing list.