[latex3-commits] [git/LaTeX3-latex3-pdfresources] renamedict77: remove info commands (613b808)
Ulrike Fischer
fischer at troubleshooting-tex.de
Wed Apr 8 23:59:07 CEST 2020
Repository : https://github.com/latex3/pdfresources
On branch : renamedict77
Link : https://github.com/latex3/pdfresources/commit/613b808a1586dce48531d665e08282a4e762de9a
>---------------------------------------------------------------
commit 613b808a1586dce48531d665e08282a4e762de9a
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Wed Apr 8 23:59:07 2020 +0200
remove info commands
>---------------------------------------------------------------
613b808a1586dce48531d665e08282a4e762de9a
hgeneric-experimental.def | 34 +++++++++++++++++-----------------
pdfresources.dtx | 32 ++++++++++++++++----------------
testfiles-dvips/annot.pvt | 6 +++---
testfiles-dvips/catalogAF.pvt | 6 +++---
testfiles-dvips/ismap.pvt | 6 +++---
testfiles-dvips/linkhook.pvt | 6 +++---
testfiles-dvips/pagelabels.pvt | 6 +++---
testfiles-dvips/pdffilelink.pvt | 6 +++---
testfiles/infodict.pvt | 4 ++--
9 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/hgeneric-experimental.def b/hgeneric-experimental.def
index 23b2cc5..c1cb633 100644
--- a/hgeneric-experimental.def
+++ b/hgeneric-experimental.def
@@ -1329,29 +1329,29 @@
\pdf at ifdraftmode{}{
\Hy at UseMaketitleInfos %get Title/Author from \title if pdfusetitle is true
\__hyp_info_generate_addons:
- \pdf_info_string_gput:no
- {Author} {\@pdfauthor}
- \pdf_info_string_gput:no
- {Title} {\@pdftitle}
- \pdf_info_string_gput:no
- {Subject}{\@pdfsubject}
- \pdf_info_string_gput:no
- {Creator}{\@pdfcreator}
- \pdf_info_string_gput:no
- {CreationDate}{\@pdfcreationdate}
- \pdf_info_string_gput:no
- {ModDate}{\@pdfmoddate}
+ \pdfdict_put:nnx {Info}
+ {Author} {(\@pdfauthor)}
+ \pdfdict_put:nnx {Info}
+ {Title} {(\@pdftitle)}
+ \pdfdict_put:nnx {Info}
+ {Subject}{(\@pdfsubject)}
+ \pdfdict_put:nnx {Info}
+ {Creator}{(\@pdfcreator)}
+ \pdfdict_put:nnx {Info}
+ {CreationDate}{(\@pdfcreationdate)}
+ \pdfdict_put:nnx {Info}
+ {ModDate}{(\@pdfmoddate)}
\tl_if_exist:NT \@pdfproducer %special, as \relax is default
{
- \pdf_info_string_gput:no
- {Producer}{\@pdfproducer}
+ \pdfdict_put:nnx {Info}
+ {Producer}{(\@pdfproducer)}
}
- \pdf_info_string_gput:no
- {Keywords}{\@pdfkeywords}
+ \pdfdict_put:nnx {Info}
+ {Keywords}{(\@pdfkeywords)}
\tl_if_empty:NF
\@pdftrapped
{
- \pdf_info_gput:nn
+ \pdfdict_put:nnx {Info}
{Trapped}{/\@pdftrapped}
}
}
diff --git a/pdfresources.dtx b/pdfresources.dtx
index 0716c0c..758b6fb 100644
--- a/pdfresources.dtx
+++ b/pdfresources.dtx
@@ -39,7 +39,7 @@
\RequirePackage{xparse,l3pdf}
%\RequirePackage{tmpl3shipout}
\RequirePackage{atbegshi,zref-lastpage}
-\ProvidesExplPackage {pdfresources} {2020-03-15} {0.4}
+\ProvidesExplPackage {pdfresources} {2020-04-08} {0.5}
{experimental pdf-resource management}
\DeclareOption { debug }
{
@@ -810,9 +810,9 @@
% but with dvips/dvipdfmx this would disable removing entries.
% So we issue the push code only at the end of the document.
% \end{NOTE}
-% \begin{function}{}
+% \begin{function}{pdfdict: Pages (global)}
% \begin{syntax}
-% \cs{pdfdict_put:nnn} { Pages }\Arg{name} \Arg{value}
+% \cs{pdfdict_put:nnn} \{Pages\} \Arg{name} \Arg{value}
% \end{syntax}
%
% Adds |/|\meta{name} \meta{value} to the |/Pages| dictionary.
@@ -1183,7 +1183,7 @@
% \end{macrocode}
%
-% \subsection{The info dictionary}
+% \subsection{pdfdict: \enquote{Info} (pdfinfo)}
% \begin{NOTE}{UF}
% path: Info
% The info dictionary is filled by e.g. \cs{pdfinfo}. Multiple appearances of
@@ -1201,11 +1201,11 @@
% this is needed anyway.
% \end{NOTE}
%
-% \subsubsection{info/backend}
+% \subsubsection{\enquote{Info}/backend}
% The backend code is already in expl3.
% \cs{@@_backend_info_gput:nn} inserts one name/value pair.
%
-% \subsubsection{info/management}
+% \subsubsection{\enquote{Info}/management}
% \potentialclash If the primitive commands are used additionally there will
% be double entries in the pdf with the backend pdftex and luatex.
% How pdf viewer handles this is unpredictable.
@@ -1250,10 +1250,10 @@
% \begin{macrocode}
\@@_dict_gnew:n {Info}
-\cs_new_protected:Npn \pdf_info_gput:nn #1 #2 %#1 key without /, #2 content
- {
- \@@_dict_put:nnn {Info}{ #1 }{ #2 }
- }
+%\cs_new_protected:Npn \pdf_info_gput:nn #1 #2 %#1 key without /, #2 content
+% {
+% \@@_dict_put:nnn {Info}{ #1 }{ #2 }
+% }
% should #2 be inside a some escaping command? (no)
% hyperref passes them through
@@ -1261,12 +1261,12 @@
% \HyPsd at XeTeXBigCharstrue
% \HyPsd at PrerenderUnicode{#1}%
% \pdfstringdef\@pdftitle{#1}%
-\cs_new_protected:Npn \pdf_info_string_gput:nn #1 #2 %#1 key without /, #2 content
- {
- \@@_dict_put:nnn { Info }{ #1 }{ (#2) }
- }
-
-\cs_generate_variant:Nn \pdf_info_string_gput:nn {no}
+%\cs_new_protected:Npn \pdf_info_string_gput:nn #1 #2 %#1 key without /, #2 content
+% {
+% \@@_dict_put:nnn { Info }{ #1 }{ (#2) }
+% }
+%
+%\cs_generate_variant:Nn \pdf_info_string_gput:nn {no}
% \end{macrocode}
%
% \begin{macro}{\@@_Info_gpush:}
diff --git a/testfiles-dvips/annot.pvt b/testfiles-dvips/annot.pvt
index 41ea81e..dfd2e0c 100644
--- a/testfiles-dvips/annot.pvt
+++ b/testfiles-dvips/annot.pvt
@@ -3,9 +3,9 @@
\usepackage{pdfresources}
\ExplSyntaxOn
%%% for reproducible tests:
-\pdf_info_gput:nn{CreationDate}{(D:20200202111111+01'00')}
-\pdf_info_gput:nn{ModDate}{(D:20200202111111+01'00')}
-\pdf_info_gput:nn{Creator}{(l3build test)}
+\pdfdict_put:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
+\pdfdict_put:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
+\pdfdict_put:nnn {Info}{Creator}{(l3build test)}
%%%%%
\ExplSyntaxOff
\begin{document}
diff --git a/testfiles-dvips/catalogAF.pvt b/testfiles-dvips/catalogAF.pvt
index 793bf87..9f5a95e 100644
--- a/testfiles-dvips/catalogAF.pvt
+++ b/testfiles-dvips/catalogAF.pvt
@@ -2,9 +2,9 @@
\RequirePackage[debug]{pdfresources}
\ExplSyntaxOn
%%% for reproducible tests:
-\pdf_info_gput:nn{CreationDate}{(D:20200202111111+01'00')}
-\pdf_info_gput:nn{ModDate}{(D:20200202111111+01'00')}
-\pdf_info_gput:nn{Creator}{(l3build test)}
+\pdfdict_put:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
+\pdfdict_put:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
+\pdfdict_put:nnn {Info}{Creator}{(l3build test)}
%%%%%
\ExplSyntaxOff
\DeclareDocumentMetaData
diff --git a/testfiles-dvips/ismap.pvt b/testfiles-dvips/ismap.pvt
index cd445f2..82a9151 100644
--- a/testfiles-dvips/ismap.pvt
+++ b/testfiles-dvips/ismap.pvt
@@ -5,9 +5,9 @@
\begin{document}
\ExplSyntaxOn
%%% for reproducible tests:
-\pdf_info_gput:nn{CreationDate}{(D:20200202111111+01'00')}
-\pdf_info_gput:nn{ModDate}{(D:20200202111111+01'00')}
-\pdf_info_gput:nn{Creator}{(l3build test)}
+\pdfdict_put:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
+\pdfdict_put:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
+\pdfdict_put:nnn {Info}{Creator}{(l3build test)}
%%%%%
\ExplSyntaxOff
\href[ismap=true]{https://www.latex-project.org#abc~xyz}{xxxxx}
diff --git a/testfiles-dvips/linkhook.pvt b/testfiles-dvips/linkhook.pvt
index 506f109..cca9233 100644
--- a/testfiles-dvips/linkhook.pvt
+++ b/testfiles-dvips/linkhook.pvt
@@ -8,9 +8,9 @@
}
\ExplSyntaxOn
%%% for reproducible tests:
-\pdf_info_gput:nn{CreationDate}{(D:20200202111111+01'00')}
-\pdf_info_gput:nn{ModDate}{(D:20200202111111+01'00')}
-\pdf_info_gput:nn{Creator}{(l3build test)}
+\pdfdict_put:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
+\pdfdict_put:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
+\pdfdict_put:nnn {Info}{Creator}{(l3build test)}
%%%%%
\ExplSyntaxOff
\input{regression-test}
diff --git a/testfiles-dvips/pagelabels.pvt b/testfiles-dvips/pagelabels.pvt
index 61cf9a0..ba4beb2 100644
--- a/testfiles-dvips/pagelabels.pvt
+++ b/testfiles-dvips/pagelabels.pvt
@@ -12,9 +12,9 @@
\renewcommand\thepage{λέγ\arabic{page}}
\begin{document}
\ExplSyntaxOn
-\pdf_info_gput:nn{CreationDate}{(D:20200202111111+01'00')}
-\pdf_info_gput:nn{ModDate}{(D:20200202111111+01'00')}
-\pdf_info_gput:nn{Creator}{(l3build test)}
+\pdfdict_put:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
+\pdfdict_put:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
+\pdfdict_put:nnn {Info}{Creator}{(l3build test)}
\ExplSyntaxOff
abc \newpage abc \newpage abc \newpage \pagenumbering{roman} abc \newpage \pagenumbering{Roman}\setcounter{page}{5} abc
\end{document}
diff --git a/testfiles-dvips/pdffilelink.pvt b/testfiles-dvips/pdffilelink.pvt
index c2e0c4d..419e841 100644
--- a/testfiles-dvips/pdffilelink.pvt
+++ b/testfiles-dvips/pdffilelink.pvt
@@ -9,9 +9,9 @@
\begin{document}
\ExplSyntaxOn
-\pdf_info_gput:nn{CreationDate}{(D:20200202111111+01'00')}
-\pdf_info_gput:nn{ModDate}{(D:20200202111111+01'00')}
-\pdf_info_gput:nn{Creator}{(l3build test)}
+\pdfdict_put:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
+\pdfdict_put:nnn {Info}{ModDate}{(D:20200202111111+01'00')}
+\pdfdict_put:nnn {Info}{Creator}{(l3build test)}
\ExplSyntaxOff
\href{blub.pdf#destination}{pdf}
diff --git a/testfiles/infodict.pvt b/testfiles/infodict.pvt
index 936173b..35266b1 100644
--- a/testfiles/infodict.pvt
+++ b/testfiles/infodict.pvt
@@ -10,8 +10,8 @@
{
\str_set_convert:Nnnn \l_tmpa_str { Grüße }{ } {utf8/string}
}
-\pdf_info_string_gput:no {Title}{\l_tmpa_str}
-\pdf_info_string_gput:nn {Author}{Some~Author}
+\pdfdict_put:nnx {Info} {Title}{(\l_tmpa_str)}
+\pdfdict_put:nnx {Info} {Author}{(Some~Author)}
\ExplSyntaxOff
\begin{document}
\START
More information about the latex3-commits
mailing list.