[latex3-commits] [git/LaTeX3-latex3-pdfresources] main: move modules into a single file (cfb3024)
Ulrike Fischer
fischer at troubleshooting-tex.de
Sun Feb 21 18:29:24 CET 2021
Repository : https://github.com/latex3/pdfresources
On branch : main
Link : https://github.com/latex3/pdfresources/commit/cfb302493a86cf2a8ae4b046ab3931eb5bd3ac9e
>---------------------------------------------------------------
commit cfb302493a86cf2a8ae4b046ab3931eb5bd3ac9e
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Sun Feb 21 18:29:24 2021 +0100
move modules into a single file
>---------------------------------------------------------------
cfb302493a86cf2a8ae4b046ab3931eb5bd3ac9e
build.lua | 2 +-
l3pdfannot.dtx | 4 +-
l3pdfdict.dtx | 4 +-
l3pdffile.dtx | 4 +-
l3pdfmanagement.dtx | 4 +-
l3pdfmeta.dtx | 4 +-
l3pdftools.dtx | 4 +-
l3pdfxform.dtx | 3 +-
ltdocinit.dtx | 4 +-
pdfmanagement-firstaid.dtx | 2 +-
pdfmanagement-testphase.dtx | 47 +++++++++--------
pdfmanagement-testphase.ins | 118 ++++++++++++++++++++++++------------------
testfiles-dvips/embedfile.pvt | 2 +-
testfiles/embedfile.pvt | 2 +-
14 files changed, 117 insertions(+), 87 deletions(-)
diff --git a/build.lua b/build.lua
index a9ecb57..49b5fc1 100644
--- a/build.lua
+++ b/build.lua
@@ -7,7 +7,7 @@ bundle = ""
module = "pdfresources"
-installfiles = {"*.sty","*.cls","*.def","*.lua"}
+installfiles = {"*.sty","*.cls","*.def","*.lua","*.ltx"}
sourcefiles = {"*.dtx","*.ins",
"l3ref-tmp.sty",
"pdfmanagement-regressiontest.sty",
diff --git a/l3pdfannot.dtx b/l3pdfannot.dtx
index 5548578..332d5ae 100644
--- a/l3pdfannot.dtx
+++ b/l3pdfannot.dtx
@@ -297,15 +297,17 @@
% \section{\pkg{l3pdfannot} implementation}
%
% \begin{macrocode}
-%<*package>
%<@@=pdfannot>
+%<*header>
\ProvidesExplPackage {l3pdfannot} {2021-02-22} {0.95a}
{PDF-annotations}
\RequirePackage{l3pdfdict}
+%</header>
% \end{macrocode}
% Annotations have a /F flag, we provide a public
% bitset for it.
% \begin{macrocode}
+%<*package>
\RequirePackage{l3bitset}
\bitset_new:Nn \l_pdfannot_F_bitset
{
diff --git a/l3pdfdict.dtx b/l3pdfdict.dtx
index 98f1ee8..d655e00 100644
--- a/l3pdfdict.dtx
+++ b/l3pdfdict.dtx
@@ -210,10 +210,10 @@
% \section{\pkg{l3pdfdict} implementation}
% \begin{macrocode}
%<@@=pdfdict>
-%<*package>
+%<*header>
\ProvidesExplPackage {l3pdfdict} {2021-02-22} {0.95a}
{Tools for PDF dictionaries (PDFmanagement bundle (testphase))}
-%</package>
+%</header>
% \end{macrocode}
% \subsection{messages}
% \begin{macrocode}
diff --git a/l3pdffile.dtx b/l3pdffile.dtx
index ebbd8ff..32c0403 100644
--- a/l3pdffile.dtx
+++ b/l3pdffile.dtx
@@ -375,13 +375,15 @@
% \section{\pkg{l3pdffile} implementation}
%
% \begin{macrocode}
-%<*package>
+%<*header>
\ProvidesExplPackage {l3pdffile} {2021-02-22} {0.95a}
{embedding and referencing files in PDF---PDFmanagement bundle (testphase)}
\RequirePackage{l3pdftools} %temporarly!!
+%</header>
% \end{macrocode}
%
% \begin{macrocode}
+%<*package>
%<@@=pdffile>
\cs_new_protected:Npn \@@_filename_convert_to_print:nN #1 #2
{\pdf_string_from_unicode:nnN {utf16/hex}{#1}{#2}}
diff --git a/l3pdfmanagement.dtx b/l3pdfmanagement.dtx
index 260c243..85dc045 100644
--- a/l3pdfmanagement.dtx
+++ b/l3pdfmanagement.dtx
@@ -555,13 +555,15 @@
% \section{\pkg{l3pdfmanagement} implementation}
% \begin{macrocode}
%<@@=pdfmanagement>
-%<*package>
+%<*header>
%
\ProvidesExplPackage {l3pdfmanagement} {2021-02-22} {0.95a}
{Management of core PDF dictionaries (PDFmanagement bundle (testphase))}
+%</header>
% \end{macrocode}
% \subsection{Messages}
% \begin{macrocode}
+%<*package>
\msg_new:nnn { pdfmanagement } { unknown-dict }
{ The~PDF~management~resource~'#1'~is~unknown. }
diff --git a/l3pdfmeta.dtx b/l3pdfmeta.dtx
index 01d4355..7fe1d4b 100644
--- a/l3pdfmeta.dtx
+++ b/l3pdfmeta.dtx
@@ -338,13 +338,15 @@
% \section{\pkg{l3pdfmeta} implementation}
%
% \begin{macrocode}
-%<*package>
%<@@=pdfmeta>
+%<*header>
\ProvidesExplPackage {l3pdfmeta} {2021-02-22} {0.95a}
{PDF-Standards---PDFmanagement bundle (testphase)}
+%</header>
% \end{macrocode}
% Message for unknown standards
% \begin{macrocode}
+%<*package>
\msg_new:nnn {pdf }{unknown-standard}{The~standard~'#1'~is~unknown~and~has~been~ignored}
% \end{macrocode}
% \begin{variable}{\l_@@_tmpa_tl,\l_@@_tmpb_tl,\l_@@_tmpa_str}
diff --git a/l3pdftools.dtx b/l3pdftools.dtx
index fbea623..605670d 100644
--- a/l3pdftools.dtx
+++ b/l3pdftools.dtx
@@ -207,13 +207,15 @@
% \section{\pkg{l3pdftools} implementation}
%
% \begin{macrocode}
-%<*package>
+%<*header>
\ProvidesExplPackage {l3pdftools} {2021-02-22} {0.95a}
{candidate commands for l3pdf---PDFmanagement bundle (testphase)}
+%</header>
% \end{macrocode}
%
% \begin{macrocode}
%<@@=pdf>
+%<*package>
% \end{macrocode}
% \subsection{Conversions and export functions}
% \begin{macro}{\pdf_name_from_unicode_e:n,\pdf_name_from_unicode_e:V}
diff --git a/l3pdfxform.dtx b/l3pdfxform.dtx
index ba2773a..1347785 100644
--- a/l3pdfxform.dtx
+++ b/l3pdfxform.dtx
@@ -131,10 +131,11 @@
% \section{\pkg{l3pdfxform} implementation}
%
% \begin{macrocode}
-%<*package>
%<@@=pdf>
+%<*header>
\ProvidesExplPackage {l3pdfxform-beta} {2021-02-22} {0.95a}
{command to create xforms (beta)---PDFmanagement bundle (testphase)}
+%</header>
% \end{macrocode}
% \subsection{Form XObject (pdfxform)}
% \begin{NOTE}{UF}
diff --git a/ltdocinit.dtx b/ltdocinit.dtx
index 51bbad6..183c180 100644
--- a/ltdocinit.dtx
+++ b/ltdocinit.dtx
@@ -162,15 +162,17 @@
% \section{\pkg{ltdocinit} implementation}
% \subsection{\cs{DeclareDocumentMetadata}}
% \begin{macrocode}
-%<*package>
%<@@=pdfmanagement>
+%<*header>
\ProvidesExplPackage {ltdocinit} {2021-02-22} {0.95a}
{Initialize document metadata}
+%</header>
% \end{macrocode}
% \cs{DeclareDocumentMetadata} should for now not be used after
% \cs{documentclass} so we error in this case. It can be used more than once
% but follow-up calls should not do the initialization code.
% \begin{macrocode}
+%<*package>
\msg_new:nnn { document } { setup-after-documentclass }
{
\token_to_str:N \DeclareDocumentMetadata \c_space_tl
diff --git a/pdfmanagement-firstaid.dtx b/pdfmanagement-firstaid.dtx
index 388e847..8198b45 100644
--- a/pdfmanagement-firstaid.dtx
+++ b/pdfmanagement-firstaid.dtx
@@ -67,7 +67,7 @@
% \begin{macrocode}
%<*package>
\ProvidesExplPackage {pdfmanagement-firstaid} {2021-02-22} {0.95a}
- {experimental pdf-resource management / firstaid}
+ {PDFmanagement bundle (testphase) / firstaid-patches}
%<@@=pdfmanagement>
\clist_map_inline:nn {pgf,transparent,hyperxmp,pdflscape,xcolor}
diff --git a/pdfmanagement-testphase.dtx b/pdfmanagement-testphase.dtx
index 38a549e..6b6a684 100644
--- a/pdfmanagement-testphase.dtx
+++ b/pdfmanagement-testphase.dtx
@@ -216,7 +216,9 @@
% not supported.
%
% \section{Modules}
-% The bundle contains a number of modules. The organization and naming is bound
+% The package contains a number of modules. The majority of the modules don't
+% have a stand alone sty, their code is combined
+% in one file and loaded by the package. The organization and naming is bound
% to change over time: For almost all modules the goal is to
% integrate them into the format and the individual style will disappear.
%
@@ -224,47 +226,40 @@
% of the bundles. There doesn't exist in all cases a related |.sty|.
%
% \begin{description}
-% \item[l3pdfdict] This modules provides commands for PDF dictionaries. Its main
-% purpose is to create name spaces. It is used e.g. by \pkg{l3pdfmanagement} and
+% \item[l3pdfdict] This module provides commands for PDF dictionaries. Its main
+% purpose is to create name spaces. The code used e.g. by \pkg{l3pdfmanagement} and
% \pkg{l3pdfannot}.
%
% \item[l3pdfannot] This module provides commands for annotations. Currently mainly
% link annotations, widget annotations will be added later. It doesn't require
-% the PDF management to be active so it is possible to load and test it individually.
+% the PDF management to be active.
%
-% \item[l3pdfmanagement] This is the code code of the PDF management.
-% It should not be loaded directly, but only as described in section~\ref{sec:use}.
+% \item[l3pdfmanagement] This is the core code of the PDF management.
%
% \item[ltdocinit] This package provides the \cs{DeclareDocumentMetadata} command.
-% It should not be loaded directly.
%
% \item[hyperref-generic] This package provides a new generic hyperref driver.
% The driver will
% be loaded automatically by hyperref if the PDF management code is active.
-% It should not be loaded directly.
%
% \item[l3backend-testphase] This module contains backend code needed by the
% PDF management. It will in due time be integrated into l3backend.
-% It should not be loaded directly.
%
% \item[l3pdfmeta] This module contains code to handle PDF standards.
% Currently it handles pdf/A and colorprofiles/outputintents.
-% It is loaded by the bundle, and
-% should not be loaded independently.
%
% \item[l3pdfxform] Commands for form XObjects (xforms).
-% The code is loaded by the bundle.
%
% \item[l3pdftool] A number of commands like text conversion commands and
% bcd/emc. The commands will at some time be moved into the \pkg{l3pdf}
-% module of l3kernel. It should not be loaded independently.
+% module of l3kernel.
%
% \item[l3pdffile] This module provides commands for to embed files.
-% It is currently not loaded automatically, but it requires the PDF management.
%
% \item[pdfmanagement-firstaid] This module provides a number of patches
% for external incompatible packages. This patches will disappear as soon as
% the packages are natively compatible. It is loaded automatically.
+%
% \end{description}
% \section{Incompabilities}
%
@@ -397,16 +392,22 @@
% This loads the core files. The backend should not be loaded
% to allow to set it in the document.
% \begin{macrocode}
+%<*header>
+\ProvidesExplFile
+ {pdfmanagement-testphase.ltx}{2021-02-22}{0.95a}
+ {PDF~management~code~(testphase)}
+%</header>
%<*package>
-\RequirePackage{l3pdfdict} % needed by l3pdfmanagement
-\RequirePackage{l3pdfmanagement} % loads the core code with the boolean
-\RequirePackage{ltdocinit} % DeclareDocumentMetadata,
-% can perhaps be combined or made optional ...
-\RequirePackage{l3pdfannot}
-\RequirePackage{l3pdfxform-beta}
-\RequirePackage{l3pdfmeta} %
-\RequirePackage{l3pdftools}
-
+%\RequirePackage{l3pdfdict} % needed by l3pdfmanagement
+%\RequirePackage{l3pdfmanagement} % loads the core code with the boolean
+%\RequirePackage{ltdocinit} % DeclareDocumentMetadata,
+%% can perhaps be combined or made optional ...
+%\RequirePackage{l3pdfannot}
+%\RequirePackage{l3pdfxform-beta}
+%\RequirePackage{l3pdfmeta} %
+%\RequirePackage{l3pdftools}
+%\RequirePackage{l3pdffile}
+\input{pdfmanagement-testphase.ltx}
%</package>
% \end{macrocode}
% \end{implementation}
diff --git a/pdfmanagement-testphase.ins b/pdfmanagement-testphase.ins
index 14ceb7e..f5314cd 100644
--- a/pdfmanagement-testphase.ins
+++ b/pdfmanagement-testphase.ins
@@ -62,34 +62,34 @@ and all files in that bundle must be distributed together.
}%
}
-\generate{\file{ltdocinit.sty}
- {
- \from{ltdocinit.dtx} {package}
- }
-}
-\generate{\file{l3pdfdict.sty}
- {
- \from{l3pdfdict.dtx} {package}
- }
-}
-
-\generate{\file{l3pdfmanagement.sty}
- {
- \from{l3pdfmanagement.dtx} {package}
- }
-}
-
-\generate{\file{l3pdfmeta.sty}
- {
- \from{l3pdfmeta.dtx} {package}
- }
-}
-
-\generate{\file{l3pdftools.sty}
- {
- \from{l3pdftools.dtx} {package}
- }
-}
+%\generate{\file{ltdocinit.sty}
+% {
+% \from{ltdocinit.dtx} {header,package}
+% }
+%}
+%\generate{\file{l3pdfdict.sty}
+% {
+% \from{l3pdfdict.dtx} {header,package}
+% }
+%}
+%
+%\generate{\file{l3pdfmanagement.sty}
+% {
+% \from{l3pdfmanagement.dtx} {header,package}
+% }
+%}
+%
+%\generate{\file{l3pdfmeta.sty}
+% {
+% \from{l3pdfmeta.dtx} {header,package}
+% }
+%}
+%
+%\generate{\file{l3pdftools.sty}
+% {
+% \from{l3pdftools.dtx} {header,package}
+% }
+%}
\generate
{%
@@ -99,29 +99,29 @@ and all files in that bundle must be distributed together.
}%
}
-\generate
- {%
- \file{l3pdfannot.sty}
- {%
- \from{l3pdfannot.dtx}{package}
- }%
- }
-
-\generate
- {%
- \file{l3pdfxform-beta.sty}
- {%
- \from{l3pdfxform.dtx}{package}
- }%
- }
-
-\generate
- {%
- \file{l3pdffile.sty}
- {%
- \from{l3pdffile.dtx}{package}
- }%
- }
+%\generate
+% {%
+% \file{l3pdfannot.sty}
+% {%
+% \from{l3pdfannot.dtx}{header,package}
+% }%
+% }
+%
+%\generate
+% {%
+% \file{l3pdfxform-beta.sty}
+% {%
+% \from{l3pdfxform.dtx}{header,package}
+% }%
+% }
+%
+%\generate
+% {%
+% \file{l3pdffile.sty}
+% {%
+% \from{l3pdffile.dtx}{header,package}
+% }%
+% }
\generate
{
@@ -185,6 +185,22 @@ and all files in that bundle must be distributed together.
}
}
+\generate
+ {
+ \file {pdfmanagement-testphase.ltx}
+ {
+ \from{pdfmanagement-testphase.dtx}{header}
+ \from{l3pdfdict.dtx}{package}
+ \from{l3pdfmanagement.dtx}{package}
+ \from{ltdocinit.dtx}{package}
+ \from{l3pdfannot.dtx}{package}
+ \from{l3pdfxform.dtx}{package}
+ \from{l3pdfmeta.dtx}{package}
+ \from{l3pdftools.dtx}{package}
+ \from{l3pdffile.dtx}{package}
+ }
+ }
+
\def\MetaPrefix{-- }
\def\defaultpostamble{%
\MetaPrefix^^J%
diff --git a/testfiles-dvips/embedfile.pvt b/testfiles-dvips/embedfile.pvt
index b870350..9aa9329 100644
--- a/testfiles-dvips/embedfile.pvt
+++ b/testfiles-dvips/embedfile.pvt
@@ -4,7 +4,7 @@
\RequirePackage{pdfmanagement-regressiontest}
\documentclass{article}
-\usepackage{l3pdffile}
+
\usepackage{hyperref}
\hypersetup{pdfpagemode=UseAttachments}
diff --git a/testfiles/embedfile.pvt b/testfiles/embedfile.pvt
index b870350..9aa9329 100644
--- a/testfiles/embedfile.pvt
+++ b/testfiles/embedfile.pvt
@@ -4,7 +4,7 @@
\RequirePackage{pdfmanagement-regressiontest}
\documentclass{article}
-\usepackage{l3pdffile}
+
\usepackage{hyperref}
\hypersetup{pdfpagemode=UseAttachments}
More information about the latex3-commits
mailing list.