[latex3-commits] [git/LaTeX3-latex3-pdfresources] rename-coredict: rename boolean, change loading order (0b27b45)
Ulrike Fischer
fischer at troubleshooting-tex.de
Fri Nov 27 16:57:56 CET 2020
Repository : https://github.com/latex3/pdfresources
On branch : rename-coredict
Link : https://github.com/latex3/pdfresources/commit/0b27b45fc5bc3f5a135b5b942c70866264f070bf
>---------------------------------------------------------------
commit 0b27b45fc5bc3f5a135b5b942c70866264f070bf
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Fri Nov 27 16:57:56 2020 +0100
rename boolean, change loading order
>---------------------------------------------------------------
0b27b45fc5bc3f5a135b5b942c70866264f070bf
l3backend-pdf-extra.dtx | 6 +++---
l3pdfinit.dtx | 11 +++++------
l3pdfmanagement.dtx | 11 ++++++-----
pdfresources-patches.dtx | 2 +-
pdfresources.dtx | 10 ++++++----
5 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/l3backend-pdf-extra.dtx b/l3backend-pdf-extra.dtx
index 3cd39c3..2bc8966 100644
--- a/l3backend-pdf-extra.dtx
+++ b/l3backend-pdf-extra.dtx
@@ -778,7 +778,7 @@
\cs_set_protected:Npn \@@_backend_bdc:nn #1 #2
{
- \bool_if:NTF \g_@@_Core_active_bool
+ \bool_if:NTF \g__pdfmanagement_active_bool
{\cs_gset_eq:NN \@@_backend_bdc:nn \@@_backend_bdc_contobj:nn}
{\cs_gset_eq:NN \@@_backend_bdc:nn \@@_backend_bdc_contstream:nn}
\@@_backend_bdc:nn {#1}{#2}
@@ -869,7 +869,7 @@
}
\cs_set_protected:Npn \@@_backend_bdc:nn #1 #2
{
- \bool_if:NTF \g_@@_Core_active_bool
+ \bool_if:NTF \g__pdfmanagement_active_bool
{\cs_gset_eq:NN \@@_backend_bdc:nn \@@_backend_bdc_contobj:nn}
{\cs_gset_eq:NN \@@_backend_bdc:nn \@@_backend_bdc_contstream:nn}
\@@_backend_bdc:nn {#1}{#2}
@@ -978,7 +978,7 @@
}
\cs_set_protected:Npn \@@_backend_bdc:nn #1 #2
{
- \bool_if:NTF \g_@@_Core_active_bool
+ \bool_if:NTF \g__pdfmanagement_active_bool
{\cs_gset_eq:NN \@@_backend_bdc:nn \@@_backend_bdc_contobj:nn}
{\cs_gset_eq:NN \@@_backend_bdc:nn \@@_backend_bdc_contstream:nn}
\@@_backend_bdc:nn {#1}{#2}
diff --git a/l3pdfinit.dtx b/l3pdfinit.dtx
index 16cb140..6627076 100644
--- a/l3pdfinit.dtx
+++ b/l3pdfinit.dtx
@@ -69,7 +69,7 @@
% can be ensured) is incomplete.
% \item[\texttt{xmpmeta}] Boolean. This includes a skeleton XMP-metadata in the pdf. This clashes
% with e.g. hyperxmp, and the code to extend the metadata isn't finished yet.
-% \item[\texttt{core}] Boolean. This activates/deactivates the core management code.
+% \item[\texttt{pdfmanagement}] Boolean. This activates/deactivates the core management code.
% By default the value is true.
% \end{description}
% \end{documentation}
@@ -80,7 +80,7 @@
%
% \begin{macrocode}
%<*package>
-\ProvidesExplPackage {l3pdfinit} {2020-07-15} {0.1}
+\ProvidesExplPackage {l3pdfinit} {2020-11-27} {0.2}
{pdfresources initialisation command}
% \end{macrocode}
% \section{Document metadata}
@@ -99,7 +99,6 @@
% \begin{macrocode}
%<@@=pdf>
%<*package>
-\bool_new:N \g_@@_Core_active_bool
% \end{macrocode}
% \end{variable}
% \begin{function}[updated=2020-07-05]{\DeclareDocumentMetadata}
@@ -120,13 +119,13 @@
\bool_if:NF \g__pdf_Meta_used_bool
{
\keys_set_groups:nnn { pdf / setup} {init}{ #1 }
- \RequirePackage{l3pdf} %should be loader after the backend is set.
+ \RequirePackage{l3pdf} %should be loaded after the backend is set.
% %load backend driver
\ExplSyntaxOn\makeatletter
\file_input:n {l3\g__sys_backend_tl-pdf.def} %should be inside the normal backend
\ExplSyntaxOff\makeatother
\RequirePackage{l3pdfutils}
- \bool_gset_true:N \g__pdf_Core_active_bool
+ \bool_gset_true:N \g__pdfmanagement_active_bool
}
\bool_gset_true:N \g__pdf_Meta_used_bool
\keys_set_filter:nnn { pdf / setup } { init } { #1 }
@@ -166,7 +165,7 @@
{
\msg_warning:nnn{pdf}{unknown-standard}{#1}
}
- ,core .bool_gset:N = \g__pdf_Core_active_bool
+ ,pdfmanagement .bool_gset:N = \g__pdfmanagement_active_bool
}
% \end{macrocode}
% \end{function}
diff --git a/l3pdfmanagement.dtx b/l3pdfmanagement.dtx
index a962616..c028f09 100644
--- a/l3pdfmanagement.dtx
+++ b/l3pdfmanagement.dtx
@@ -506,9 +506,10 @@
% \end{macrocode}
% A predicate to test if the core code should be active
% \begin{macrocode}
+\bool_new:N \g_@@_active_bool
\prg_new_conditional:Npnn \@@_if_active: { p , T , F , TF }
{
- \bool_if:NTF \g__pdf_Core_active_bool
+ \bool_if:NTF \g_@@_active_bool
{ \prg_return_true: }
{ \prg_return_false: }
}
@@ -560,7 +561,7 @@
% \begin{macrocode}
\hook_gput_code:nnn {pdf/management/thispage_shipout} {pdf}
{
- \bool_if:NT \g__pdf_Core_active_bool
+ \bool_if:NT \g_@@_active_bool
{
\exp_args:NV \__pdf_backend_ThisPage_gpush:n { \g_shipout_readonly_int }
\exp_args:NV \__pdf_backend_PageResources_gpush:n { \g_shipout_readonly_int }
@@ -569,7 +570,7 @@
\hook_gput_code:nnn {pdf/management/lastpage_shipout} {pdf}
{
- \bool_if:NT \g__pdf_Core_active_bool
+ \bool_if:NT \g_@@_active_bool
{
\__pdf_backend_PageResources_obj_gpush: %ExtGState etc
}
@@ -577,7 +578,7 @@
\hook_gput_code:nnn {pdf/management/end_run} {pdf}
{
- \bool_if:NT \g__pdf_Core_active_bool
+ \bool_if:NT \g_@@_active_bool
{
\__pdfmanagement_Pages_gpush: %pagesattr
\__pdfmanagement_Info_gpush: %pdfinfo
@@ -818,7 +819,7 @@
\cs_new_protected:cpn { @@_handler/ThisPage/?_gput:nn } #1 #2
{
\prop_gput:cnn { \pdfdict_name:nn { g } { Core/ThisPage } }{ #1 } { #2 }
- \bool_if:NT \g__pdf_Core_active_bool
+ \bool_if:NT \g_@@_active_bool
{
\__pdf_backend_ThisPage_gput:nn { #1 }{ #2 }
}
diff --git a/pdfresources-patches.dtx b/pdfresources-patches.dtx
index 79d04ea..6339404 100644
--- a/pdfresources-patches.dtx
+++ b/pdfresources-patches.dtx
@@ -130,7 +130,7 @@
\cs_set_eq:NN \@@_pgfori_pgfutil at setuppdfresources\pgfutil at setuppdfresources
\def\pgfutil at setuppdfresources
{
- \bool_if:NTF \g_@@_Core_active_bool
+ \pdfmanagement_if_active:TF
{
\@@_pgf_sys_setuppdfresources_plain:
}
diff --git a/pdfresources.dtx b/pdfresources.dtx
index 5873f50..15428d6 100644
--- a/pdfresources.dtx
+++ b/pdfresources.dtx
@@ -236,11 +236,13 @@
% to allow to set it in the document.
% \begin{macrocode}
%<*package>
-\RequirePackage{l3pdfinit} %
-\RequirePackage{l3pdfmeta} %
-\RequirePackage{l3pdfdict}
+\RequirePackage{l3pdfdict} % needed by l3pdfmanagement
+\RequirePackage{l3pdfmanagement} % loads the core code with the boolean
+\RequirePackage{l3pdfinit} % DeclareDocumentMetadata
+% optional?
+\RequirePackage{l3pdfmeta} %
\RequirePackage{l3pdftools}
-\RequirePackage{l3pdfmanagement}
+
%</package>
% \end{macrocode}
%
More information about the latex3-commits
mailing list.