[latex3-commits] [git/LaTeX3-latex3-pdfresources] splitting: rename pdfdict_map to pdfdict_use (0e980d6)
Ulrike Fischer
fischer at troubleshooting-tex.de
Mon Jul 6 15:08:05 CEST 2020
Repository : https://github.com/latex3/pdfresources
On branch : splitting
Link : https://github.com/latex3/pdfresources/commit/0e980d67c78b8650d20029963ba439d55421704b
>---------------------------------------------------------------
commit 0e980d67c78b8650d20029963ba439d55421704b
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Mon Jul 6 15:08:05 2020 +0200
rename pdfdict_map to pdfdict_use
>---------------------------------------------------------------
0e980d67c78b8650d20029963ba439d55421704b
experiments/checkbox-test.tex | 2 +-
experiments/field-test.tex | 2 +-
hgeneric-experimental.def | 2 +-
l3backend-pdf-extra.dtx | 6 +++---
l3pdfcoredict.dtx | 14 +++++++-------
l3pdfdict.dtx | 18 +++++++++---------
l3pdffile.dtx | 10 +++++-----
newpackages/new-attachfile.sty | 4 ++--
pdfresources.dtx | 12 ++++++------
9 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/experiments/checkbox-test.tex b/experiments/checkbox-test.tex
index 01f7e80..5b6f9b9 100644
--- a/experiments/checkbox-test.tex
+++ b/experiments/checkbox-test.tex
@@ -155,7 +155,7 @@
\pdf_flag_clear:nn {annot/Field}{Pushbutton} %just in case
\pdf_flag_set:nn {annot/Field}{NoExport}
\pdfdict_put:nnx {annot/Field}{Ff}{\pdf_flag_use:n{annot/Field}}
- \pdf_object_write:nx {annot/Field/Btn/#1} { \pdfdict_map:n {annot/Field} }
+ \pdf_object_write:nx {annot/Field/Btn/#1} { \pdfdict_use:n {annot/Field} }
\pdfcoredict_gput:nnx { Catalog / AcroForm } { Fields }{\pdf_object_ref:n {annot/Field/Btn/#1} }
\group_end:
}
diff --git a/experiments/field-test.tex b/experiments/field-test.tex
index 4911549..3b4b954 100644
--- a/experiments/field-test.tex
+++ b/experiments/field-test.tex
@@ -163,7 +163,7 @@
\pdfdict_put:nnn
{annot/Field}{T}{(#2)}
%write the field object and put in the field entry
- \pdf_object_write:nx {pdf/annot/Field/#1/#2} { \pdfdict_map:n {annot/Field} }
+ \pdf_object_write:nx {pdf/annot/Field/#1/#2} { \pdfdict_use:n {annot/Field} }
%\pdfdict_gput:nnx { Catalog / AcroForm } { Fields }{\pdf_object_ref:n {pdf/annot/Field/#1/#2} }
\group_end:
}
diff --git a/hgeneric-experimental.def b/hgeneric-experimental.def
index 7db2719..0eafc86 100644
--- a/hgeneric-experimental.def
+++ b/hgeneric-experimental.def
@@ -1584,7 +1584,7 @@
\keys_set:nn { hyp / trans }{style=R,#1}
\pdf_object_now:nx { dict }
{
- \pdfdict_map:n {page/Trans}
+ \pdfdict_use:n {page/Trans}
}
\pdfcoredict_gput:nnx {Page}{Trans}{\pdf_object_last:}
\group_end:
diff --git a/l3backend-pdf-extra.dtx b/l3backend-pdf-extra.dtx
index aa17843..a3e85ef 100644
--- a/l3backend-pdf-extra.dtx
+++ b/l3backend-pdf-extra.dtx
@@ -397,7 +397,7 @@
\cs_new_protected:Npn \@@_backend_ThisPage_gpush:n #1
{
\exp_args:Nx \@@_backend_Page_primitive:n
- { \pdfdict_gmap:n {Core/Page} }
+ { \pdfdict_guse:n {Core/Page} }
}
%</dvipdfmx|xdvipdfmx>
%<*dvips>
@@ -436,7 +436,7 @@
\cs_new_protected:Npn \@@_backend_ThisPage_gpush:n #1
{
\exp_args:Nx \@@_backend_Page_primitive:n
- { \pdfdict_gmap:n {Core/Page} }
+ { \pdfdict_guse:n {Core/Page} }
}
%</dvips>
% \end{macrocode}
@@ -521,7 +521,7 @@
{
\@@_backend_object_write:nx
{ Page/Resources/##1 }
- { \pdfdict_gmap:n {Core/Page/Resources/##1} }
+ { \pdfdict_guse:n {Core/Page/Resources/##1} }
}
}
}
diff --git a/l3pdfcoredict.dtx b/l3pdfcoredict.dtx
index 339e58b..6facce8 100644
--- a/l3pdfcoredict.dtx
+++ b/l3pdfcoredict.dtx
@@ -761,7 +761,7 @@
{
\exp_args:Nx \__pdf_backend_Pages_primitive:n
{
- \pdfdict_gmap:n {Core/Pages}
+ \pdfdict_guse:n {Core/Pages}
}
}
@@ -943,7 +943,7 @@
\__pdf_backend_object_new:nn { g_@@_/Catalog/AA_obj } { dict }
\__pdf_backend_object_write:nx
{ g_@@_/Catalog/AA_obj }
- { \pdfdict_gmap:n { Core/Catalog/AA } }
+ { \pdfdict_guse:n { Core/Catalog/AA } }
\exp_args:Nnx
\__pdf_backend_catalog_gput:nn
{AA}
@@ -999,7 +999,7 @@
\exp_args:Nnx
\__pdf_backend_object_write:nn
{ g_@@_/Catalog/AcroForm/DR/Font_obj }
- { \pdfdict_gmap:n { Core/Catalog/AcroForm/DR/Font } }
+ { \pdfdict_guse: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 { Core/Catalog/AcroForm/DR } }
@@ -1012,7 +1012,7 @@
\exp_args:Nnx
\__pdf_backend_object_write:nn
{ g_@@_/Catalog/AcroForm/DR_obj }
- { \pdfdict_gmap:n { Core/Catalog/AcroForm/DR } }
+ { \pdfdict_guse:n { Core/Catalog/AcroForm/DR } }
\exp_args:Nnnx
\prop_gput:cnn %we have to use \prop here to avoid the handler ..
{ \pdfdict_gname:n {Core/Catalog/AcroForm } }
@@ -1025,7 +1025,7 @@
\exp_args:Nnx
\__pdf_backend_object_write:nn
{ g_@@_/Catalog/AcroForm_obj }
- { \pdfdict_gmap:n { Core/Catalog/AcroForm } }
+ { \pdfdict_guse:n { Core/Catalog/AcroForm } }
\exp_args:Nnnx
\@@_handler_gput:nnn
{ Catalog }
@@ -1074,7 +1074,7 @@
\exp_args:Nnx
\__pdf_backend_object_write:nn
{ g_@@_/Catalog/MarkInfo_obj }
- { \pdfdict_gmap:n {Core/Catalog/MarkInfo } }
+ { \pdfdict_guse:n {Core/Catalog/MarkInfo } }
\exp_args:Nnx
\__pdf_backend_catalog_gput:nn
{MarkInfo}
@@ -1196,7 +1196,7 @@
\exp_args:Nnx
\__pdf_backend_object_write:nn
{ g_@@_/Catalog/ViewerPreferences_obj }
- { \pdfdict_gmap:n {Core/Catalog/ViewerPreferences } }
+ { \pdfdict_guse:n {Core/Catalog/ViewerPreferences } }
\exp_args:Nnx
\__pdf_backend_catalog_gput:nn
{ViewerPreferences}
diff --git a/l3pdfdict.dtx b/l3pdfdict.dtx
index 6c60f05..19e2b6c 100644
--- a/l3pdfdict.dtx
+++ b/l3pdfdict.dtx
@@ -120,10 +120,10 @@
% \Arg{value} to be expanded nor not expanded by the backend commands.
% \end{function}
% \begin{function}[EXP,added = 2020-04-21]
-% {\pdfdict_map:n , \pdfdict_gmap:n }
+% {\pdfdict_use:n , \pdfdict_guse:n }
% \begin{syntax}
-% \cs{pdfdict_map:n} \Arg{local dictionary}\\
-% \cs{pdfdict_gmap:n} \Arg{global dictionary}
+% \cs{pdfdict_use:n} \Arg{local dictionary}\\
+% \cs{pdfdict_guse:n} \Arg{global dictionary}
% \end{syntax}
% This outputs the property list of the dictionary as a list of
% \texttt{/key value} pairs.
@@ -638,28 +638,28 @@
%
% \begin{macro}
% {
-% \@@_map:n, \@@_gmap:n
+% \@@_use:n, \@@_guse:n
% }
-% \cs{@@_map:n} and \cs{@@_gmap:n} output a prop as needed in a dictionary:
+% \cs{@@_use:n} and \cs{@@_guse:n} output a prop as needed in a dictionary:
% as a list of /\meta{key} \meta{value} pairs.
% \begin{NOTE}{UF}
% !! is e-expansion the right thing?
% \end{NOTE}
% \begin{macrocode}
%<*package>
-\cs_new:Npn \@@_map:n #1 %dict
+\cs_new:Npn \@@_use:n #1 %dict
{
\prop_map_function:cN { \@@_name:n { #1 } } \__pdf_dict_item:ne
}
-\cs_set_eq:NN \pdfdict_map:n \@@_map:n
+\cs_set_eq:NN \pdfdict_use:n \@@_use:n
-\cs_new:Npn \@@_gmap:n #1 %dict
+\cs_new:Npn \@@_guse:n #1 %dict
{
\prop_map_function:cN { \@@_gname:n { #1 } } \__pdf_dict_item:ne
}
-\cs_set_eq:NN \pdfdict_gmap:n \@@_gmap:n
+\cs_set_eq:NN \pdfdict_guse:n \@@_guse:n
%</package>
% \end{macrocode}
% \end{macro}
diff --git a/l3pdffile.dtx b/l3pdffile.dtx
index 07b6acc..7ed9cee 100644
--- a/l3pdffile.dtx
+++ b/l3pdffile.dtx
@@ -546,12 +546,12 @@
{
{
#2
- \pdfdict_map:n {file}
+ \pdfdict_use:n {file}
\pdfdict_if_empty:nF {file/Params}
{
/Params
<<
- \pdfdict_map:n {file/Params}
+ \pdfdict_use:n {file/Params}
>>
}
}
@@ -571,12 +571,12 @@
{
{
#2
- \pdfdict_map:n {file}
+ \pdfdict_use:n {file}
\pdfdict_if_empty:nF {file/streamParams}
{
/Params
<<
- \pdfdict_map:n {file/streamParams}
+ \pdfdict_use:n {file/streamParams}
>>
}
}
@@ -604,7 +604,7 @@
\pdfdict_put:nnx {file/FileSpec}{UF}{ \l_@@_tmpa_str }
\pdf_object_write:nx { #1 }
{
- \pdfdict_map:n {file/FileSpec}
+ \pdfdict_use:n {file/FileSpec}
\tl_if_empty:nF { #3 }
{
/EF <</F~#3 /UF~#3>>
diff --git a/newpackages/new-attachfile.sty b/newpackages/new-attachfile.sty
index 0abfd4b..034b7ce 100644
--- a/newpackages/new-attachfile.sty
+++ b/newpackages/new-attachfile.sty
@@ -459,12 +459,12 @@
}
}
{
- \pdfdict_map:n {annot/FileAttachment}
+ \pdfdict_use:n {annot/FileAttachment}
\bool_if:NT \l__atfi_annot_appearance_bool
{
/AF
<<
- \pdfdict_map:n {annot/FileAttachment/AF}
+ \pdfdict_use:n {annot/FileAttachment/AF}
>>
}
diff --git a/pdfresources.dtx b/pdfresources.dtx
index 14fcc65..c85edf5 100644
--- a/pdfresources.dtx
+++ b/pdfresources.dtx
@@ -419,7 +419,7 @@
{
/Properties~
<<
- \pdfdict_gmap:n { Core/Xform/Resources/Properties }
+ \pdfdict_guse:n { Core/Xform/Resources/Properties }
>>
}
@@ -502,7 +502,7 @@
{
/Properties~
<<
- \pdfdict_gmap:n { Core/Xform/Resources/Properties }
+ \pdfdict_guse:n { Core/Xform/Resources/Properties }
>>
}
\prop_if_empty:cF
@@ -752,7 +752,7 @@
{
\pdfdict_if_exist:nT { annot/#1 }
{
- \pdfdict_map:n {annot/#1}
+ \pdfdict_use:n {annot/#1}
}
#5
}
@@ -966,7 +966,7 @@
{
\pdfdict_if_exist:nT { annot/Link/#1 }
{
- \pdfdict_map:n {annot/Link/#1}
+ \pdfdict_use:n {annot/Link/#1}
}
}
{
@@ -1022,7 +1022,7 @@
{
\pdfdict_if_exist:nT { annot/Link/#1 }
{
- \pdfdict_map:n {annot/Link/#1}
+ \pdfdict_use:n {annot/Link/#1}
}
}
{ #2 }
@@ -1053,7 +1053,7 @@
\exp_args:Nxx %xetex needs expansion
\@@_backend_link_begin_goto:nnw
{
- \pdfdict_map:n {annot/Link/GoTo}
+ \pdfdict_use:n {annot/Link/GoTo}
}
{ #1 }
More information about the latex3-commits
mailing list.