diff options
author | Karl Berry <karl@freefriends.org> | 2023-03-10 21:52:50 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-03-10 21:52:50 +0000 |
commit | 0e727e6c9dbc6123b83e28236199bf7f84c9ba27 (patch) | |
tree | 6026e3074dde3b73d41106dea61171f8af73f706 /Master/texmf-dist/source | |
parent | c4697422476969d71b1314b64502d287d3ef78f5 (diff) |
pdfmanagement-testphase (10mar23) (branch)
git-svn-id: svn://tug.org/texlive/branches/branch2022.final@66527 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
19 files changed, 136 insertions, 73 deletions
diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/hyperref-generic.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/hyperref-generic.dtx index 58851e7e5af..2e67737df9a 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/hyperref-generic.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/hyperref-generic.dtx @@ -82,7 +82,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % \begin{documentation} @@ -969,7 +969,7 @@ %<@@=hyp> % \end{macrocode} % \begin{macrocode} -\ProvidesFile{hgeneric-testphase.def}[2023-02-20 v0.95w % +\ProvidesFile{hgeneric-testphase.def}[2023-03-09 v0.95x % generic Hyperref driver for the LaTeX PDF management testphase bundle] \RequirePackage{etoolbox} %why? diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3backend-testphase.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3backend-testphase.dtx index e812e75256d..94dddfa8ee6 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3backend-testphase.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3backend-testphase.dtx @@ -45,7 +45,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % @@ -56,27 +56,27 @@ % \begin{macrocode} %<drivers>\ProvidesExplFile %<*dvipdfmx> - {l3backend-testphase-dvipdfmx.def}{2023-02-20}{} + {l3backend-testphase-dvipdfmx.def}{2023-03-09}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx} %</dvipdfmx> %<*dvips> - {l3backend-testphase-dvips.def}{2023-02-20}{} + {l3backend-testphase-dvips.def}{2023-03-09}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvips} %</dvips> %<*dvisvgm> - {l3backend-testphase-dvisvgm.def}{2023-02-20}{} + {l3backend-testphase-dvisvgm.def}{2023-03-09}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm} %</dvisvgm> %<*luatex> - {l3backend-testphase-luatex.def}{2023-02-20}{} + {l3backend-testphase-luatex.def}{2023-03-09}{} {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)} %</luatex> %<*pdftex> - {l3backend-testphase-pdftex.def}{2023-02-20}{} + {l3backend-testphase-pdftex.def}{2023-03-09}{} {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)} %</pdftex> %<*xdvipdfmx> - {l3backend-testphase-xetex.def}{2023-02-20}{} + {l3backend-testphase-xetex.def}{2023-03-09}{} {LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX} %</xdvipdfmx> % \end{macrocode} @@ -1965,6 +1965,7 @@ \pdfmanagement_add:nnn{Info}{Creator}{(TeX)} %</drivers> %<*dvips> + \AddToHook{begindocument}{\pdfmanagement_add:nnn{Info}{Producer}{(pdfTeX+dvips)}} \__kernel_backend_literal:e{!~<</DocumentUUID~(DocumentUUID)>>~setpagedevice} \__kernel_backend_literal:e{!~<</InstanceUUID~(InstanceUUID)>>~setpagedevice} %</dvips> @@ -2006,6 +2007,7 @@ \AddToDocumentProperties[hyperref]{pdfmetadate}{D:20010101205959-00'00'} \AddToDocumentProperties[hyperref]{pdfdate}{D:20010101205959-00'00'} \AddToDocumentProperties[hyperref]{pdfinstanceid}{uuid:0a57c455-157a-4141-8c19-6237d832fc80} + \AddToDocumentProperties[hyperref]{pdfproducer}{\c_sys_engine_exec_str-NN.NN.NN} } %</drivers> % \end{macrocode} @@ -2024,29 +2026,98 @@ % an unnamed object so should be referenced directly with |\pdf_object_ref_last:| % \begin{macrocode} %<*luatex> -\cs_new_protected:Npn \__pdf_backend_metadata_stream:n #1 +\cs_new_protected:Npn \@@_backend_metadata_stream:n #1 { \tex_immediate:D \tex_pdfextension:D obj ~uncompressed~ - \__pdf_backend_object_write:nn {stream} {{/Type~/Metadata~/Subtype~/XML}{#1}} + \@@_backend_object_write:nn {stream} {{/Type~/Metadata~/Subtype~/XML}{#1}} } %</luatex> %<*pdftex> -\cs_new_protected:Npn \__pdf_backend_metadata_stream:n #1 +\cs_new_protected:Npn \@@_backend_metadata_stream:n #1 { \group_begin: \tex_pdfcompresslevel:D 0 \scan_stop: \tex_immediate:D \tex_pdfobj:D - \__pdf_backend_object_write:nn {stream} {{/Type~/Metadata~/Subtype~/XML}{#1}} + \@@_backend_object_write:nn {stream} {{/Type~/Metadata~/Subtype~/XML}{#1}} \group_end: } %</pdftex> %<*xdvipdfmx|dvipdfmx|dvips|dvisvgm> -\cs_new_protected:Npn \__pdf_backend_metadata_stream:n #1 +\cs_new_protected:Npn \@@_backend_metadata_stream:n #1 { \pdf_object_unnamed_write:nn {stream}{{/Type~/Metadata~/Subtype~/XML}{#1}} } %</xdvipdfmx|dvipdfmx|dvips|dvisvgm> % \end{macrocode} +% +% \subsection{Suppressing deprecated PDF features} +% +% \texttt{/ProcSet}, \texttt{/CharSet} and the \texttt{/Info} dictionary +% are deprecated in PDF 2.0. For the pdf/A-4 standard they must be suppressed. +% Not every engine is able to do this, but for pdfTeX and luatex we define suitable +% backend command. \texttt{/ProcSet} is suppressed automatically +% for pdf version 2.0 starting with in texlive 2023. +% \begin{macro}{\@@_backend_omit_charset:n} +% The option to omit /Charset exists already for quite some time for the two +% engines. +% \begin{macrocode} +%<*xdvipdfmx|dvipdfmx|dvips|dvisvgm> +\cs_new_protected:Npn \@@_backend_omit_charset:n #1 {} %#1 number +%</xdvipdfmx|dvipdfmx|dvips|dvisvgm> +%<*pdftex> +\cs_new_protected:Npn \@@_backend_omit_charset:n #1 %#1 number + { + \tex_pdfomitcharset:D = #1 \scan_stop: + } +%</pdftex> +%<*luatex> +\cs_new_protected:Npn \@@_backend_omit_charset:n #1 %#1 number + { + \tex_pdfvariable:D omitcharset = #1 \scan_stop: + } +%</luatex> +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@@_backend_omit_info:n} +% The option to suppress the info dictionary will be available in +% texlive 2023. +% \begin{macrocode} +%<*xdvipdfmx|dvipdfmx|dvips|dvisvgm> +\cs_new_protected:Npn \@@_backend_omit_info:n #1 {} %#1 number +%</xdvipdfmx|dvipdfmx|dvips|dvisvgm> +%<*pdftex> +\bool_lazy_and:nnTF + { \int_compare_p:nNn {\tex_pdftexversion:D } > {139} } + { \int_compare_p:nNn {\tex_pdftexrevision:D } > {24} } + { + \cs_new_protected:Npn \@@_backend_omit_info:n #1 %#1 number + { + \pdfomitinfodict = #1 \scan_stop: + } + } + { + \cs_new_protected:Npn \@@_backend_omit_info:n #1 {}%#1 number + + } +%</pdftex> +%<*luatex> + \int_compare:nNnTF {\directlua{tex.print(status.list()["development_id"])} } > {7560} + { + \cs_new_protected:Npn \@@_backend_omit_info:n #1 %#1 number + { + \tex_pdfvariable:D omitinfodict = #1 \scan_stop: + } + } + { + \cs_new_protected:Npn \@@_backend_omit_info:n #1 {} %#1 number + } +%</luatex> +% \end{macrocode} +% \end{macro} +% + +% % \subsection{lua code for lualatex} % \begin{macrocode} %<*lua> diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfannot.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfannot.dtx index bd62c74dc42..761a2fef581 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfannot.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfannot.dtx @@ -48,7 +48,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % \begin{documentation} @@ -432,7 +432,7 @@ % \begin{macrocode} %<@@=pdfannot> %<*header> -\ProvidesExplPackage{l3pdfannot}{2023-02-20}{0.95w} +\ProvidesExplPackage{l3pdfannot}{2023-03-09}{0.95x} {PDF-annotations} \RequirePackage{l3pdfdict} %</header> diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfdict.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfdict.dtx index b46a87348e6..4a6af666de7 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfdict.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfdict.dtx @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % \begin{documentation} @@ -208,7 +208,7 @@ % \begin{macrocode} %<@@=pdfdict> %<*header> -\ProvidesExplPackage{l3pdfdict}{2023-02-20}{0.95w} +\ProvidesExplPackage{l3pdfdict}{2023-03-09}{0.95x} {Tools for PDF dictionaries (LaTeX PDF management testphase bundle)} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-action.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-action.dtx index f5f653cad78..0a3933eaca7 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-action.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-action.dtx @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-checkbox.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-checkbox.dtx index 34e1d8b8e0a..e5f0b33feda 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-checkbox.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-checkbox.dtx @@ -64,7 +64,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-choice.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-choice.dtx index 8a3711b7976..b2920fcdc42 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-choice.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-choice.dtx @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-pushbutton.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-pushbutton.dtx index f2df427ebfa..5011ea4916b 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-pushbutton.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-pushbutton.dtx @@ -55,7 +55,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-radiobutton.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-radiobutton.dtx index 423231bf7c9..55a230c77e0 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-radiobutton.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-radiobutton.dtx @@ -83,7 +83,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-textfield.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-textfield.dtx index d4a60117505..72f111d55a3 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-textfield.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield-textfield.dtx @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield.dtx index f972c7cf875..c9181a6ed89 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffield.dtx @@ -69,7 +69,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % \begin{documentation} @@ -973,7 +973,7 @@ %<*package> %<@@=pdffield> \NeedsTeXFormat{LaTeX2e} -\ProvidesExplPackage{l3pdffield-testphase}{2023-02-20}{0.95w}% +\ProvidesExplPackage{l3pdffield-testphase}{2023-03-09}{0.95x}% {form fields} % \end{macrocode} % \subsection{hyperref specific command} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffile.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffile.dtx index 4582d4a99d8..fe3ffbd6ef0 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffile.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdffile.dtx @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % \begin{documentation} @@ -398,7 +398,7 @@ % % \begin{macrocode} %<*header> -\ProvidesExplPackage{l3pdffile}{2023-02-20}{0.95w} +\ProvidesExplPackage{l3pdffile}{2023-03-09}{0.95x} {embedding and referencing files in PDF---LaTeX PDF management testphase bundle} \RequirePackage{l3pdftools} %temporarly!! %</header> diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmanagement.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmanagement.dtx index 4fffefa1d73..df5724be087 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmanagement.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmanagement.dtx @@ -57,7 +57,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % \begin{documentation} @@ -632,7 +632,7 @@ %<@@=pdfmanagement> %<*header> % -\ProvidesExplPackage{l3pdfmanagement}{2023-02-20}{0.95w} +\ProvidesExplPackage{l3pdfmanagement}{2023-03-09}{0.95x} {Management of core PDF dictionaries (LaTeX PDF management testphase bundle)} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmeta.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmeta.dtx index ed08282b300..034cf6fd008 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmeta.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfmeta.dtx @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % \begin{documentation} @@ -200,17 +200,18 @@ % tested from TeX, but in a current LaTeX normally ToUnicode are set for all fonts. % \item[|tagged|] that is set in A-2a and A-3a and means that the pdf must be % tagged. This is currently neither tested not enforced somewhere. +% \item[|no_CharSet|] CharSet is deprecated is pdf 2.0 and should not +% be used in A-4. l3pdfmeta will therefore suppress it for the +% engines pdftex and luatex (the other engines have no suitable option) % \item[|Trailer_no_Info|] The \texttt{Info} dictionary % has been deprecated since quite some time. Metadata should be set with % XMP-data instead. In PDF A-4 now the \texttt{Info} dictionary % shall not be present in the trailer dictionary at all % (unless there exists a PieceInfo entry in the Catalog). And if it is present -% it should only contain the \texttt{/ModDate} entry. The engines -% do not offer currently an option to suppress the dictionary completly, -% one can only give the entries the value null (it only works for all entries -% with lualatex and pdflatex). The next pdflatex will offer \cs{pdfomitinfodict}. -% Until then l3pdfmeta does nothing with this requirement. -% +% it should only contain the \texttt{/ModDate} entry. In +% texlive 2023 the engines pdftex and luatex have primitives +% to suppress the dictionary +% and l3pdfmeta will make use of it. % \end{description} % % \subsubsection{Tests with values and special handlers} @@ -562,7 +563,7 @@ % \begin{macrocode} %<@@=pdfmeta> %<*header> -\ProvidesExplPackage{l3pdfmeta}{2023-02-20}{0.95w} +\ProvidesExplPackage{l3pdfmeta}{2023-03-09}{0.95x} {PDF-Standards---LaTeX PDF management testphase bundle} %</header> % \end{macrocode} @@ -746,6 +747,10 @@ { \pdfmeta_standard_verify:nF { annot_flags } { \@@_verify_pdfa_annot_flags: } + \pdfmeta_standard_verify:nF { Trailer_no_Info } + { \__pdf_backend_omit_info:n {1} } + \pdfmeta_standard_verify:nF { no_CharSet } + { \__pdf_backend_omit_charset:n {1} } \pdfmeta_standard_verify:nnF { min_pdf_version } { \pdf_version: } { \msg_warning:nnxxx {pdf}{wrong-pdfversion} @@ -939,6 +944,8 @@ \prop_gput:cnn { g_@@_standard_pdf/A-4_prop }{year}{2020} \prop_gput:cnn + { g_@@_standard_pdf/A-4_prop }{no_CharSet}{} +\prop_gput:cnn { g_@@_standard_pdf/A-4_prop }{Trailer_no_Info}{} \prop_gremove:cn { g_@@_standard_pdf/A-4_prop }{conformance} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdftools.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdftools.dtx index d3ad09cbfbc..8996d741318 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdftools.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdftools.dtx @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % \begin{documentation} @@ -211,7 +211,7 @@ % % \begin{macrocode} %<*header> -\ProvidesExplPackage{l3pdftools}{2023-02-20}{0.95w} +\ProvidesExplPackage{l3pdftools}{2023-03-09}{0.95x} {candidate commands for l3pdf---LaTeX PDF management testphase bundle} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfxform.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfxform.dtx index c12604614d6..4eeb9071ab9 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfxform.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/l3pdfxform.dtx @@ -48,7 +48,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % \begin{documentation} @@ -132,7 +132,7 @@ % \begin{macrocode} %<@@=pdf> %<*header> -\ProvidesExplPackage{l3pdfxform}{2023-02-20}{0.95w} +\ProvidesExplPackage{l3pdfxform}{2023-03-09}{0.95x} {command to create xforms (beta)---LaTeX PDF management testphase bundle} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/ltdocinit.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/ltdocinit.dtx index 5fbd9314e6c..ba3473cb304 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/ltdocinit.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/ltdocinit.dtx @@ -47,7 +47,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % \begin{documentation} @@ -215,7 +215,7 @@ % \begin{macrocode} %<@@=pdfmanagement> %<*header> -\ProvidesExplPackage{ltdocinit}{2023-02-20}{0.95w} +\ProvidesExplPackage{ltdocinit}{2023-03-09}{0.95x} {Initialize document metadata} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-firstaid.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-firstaid.dtx index 2e40ed6814e..23ce50f33d7 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-firstaid.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-firstaid.dtx @@ -47,7 +47,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % \begin{documentation} @@ -63,7 +63,7 @@ % |debug={firstaidoff={name1,name2,...},...}|. % \begin{macrocode} %<*package> -\ProvidesExplPackage{pdfmanagement-firstaid}{2023-02-20}{0.95w} +\ProvidesExplPackage{pdfmanagement-firstaid}{2023-03-09}{0.95x} {LaTeX PDF management testphase bundle / firstaid-patches} %<@@=pdfmanagement> @@ -96,36 +96,21 @@ % \subsection{Fontspec} % When using luaLaTeX opacity is broken (issue \#30) as % fontspec/luaotfload doesn't use the pdfmanagement but write to ExtGState directly -% To repair this some new lua code is needed. This also -% improves the color parsing and allows to use cmyk and spot colors as font colors. -% It is also needed to use a patch version of \texttt{fontspec-luatex.sty} to -% slightly change the way how the Opacity and Color key are handled. -% The patch is only executed if luaotfload is new enough. +% To repair this some new lua code is needed. It also needs a new fontspec +% and a change in the color key. % \begin{macrocode} \sys_if_engine_luatex:T { - \lua_now:n - { - if~not~luaotfload.set_transparent_colorstack~ - then~ - tex.print("\\bool_gset_false:N\\g_@@_firstaid_fontspec_bool")~ - end - } \bool_if:NT \g_@@_firstaid_fontspec_bool { - \msg_info:nnn{pdfmanagement}{firstaid}{fontspec} - \file_if_exist:nT { luaotfload-l3color-tmp.lua } - { - \lua_load_module:n { luaotfload-l3color-tmp.lua } - } - - \declare@file@substitution{fontspec-luatex.sty}{fontspec-luatex-tmp-ltx.sty} - \AddToHook{package/fontspec/after} + \@ifpackagelater{fontspec}{2023-03-10} { - \str_if_eq:vnF{ver@fontspec.sty}{2022/01/15~v2.8a~Font~selection~for~XeLaTeX~and~LuaLaTeX} - {\msg_warn:nnn{pdfmanagement}{firstaid-changed}{fontspec}} - } - } + \__fontspec_keys_define_code:nnn {fontspec} {Color} + { + \tl_set:Nn \l__fontspec_hexcol_tl {#1} + } + }{} + } } % \end{macrocode} % \subsection{Output routine} diff --git a/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.dtx b/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.dtx index 7b8a19d4cb3..15ee3c7d0c1 100644 --- a/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.dtx +++ b/Master/texmf-dist/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.dtx @@ -47,7 +47,7 @@ % }^^A % } % -% \date{Version 0.95w, released 2023-02-20} +% \date{Version 0.95x, released 2023-03-09} % % \maketitle % \begin{documentation} @@ -386,7 +386,7 @@ % \begin{macrocode} %<@@=pdf> %<*package> -\ProvidesExplPackage{pdfmanagement-testphase}{2023-02-20}{0.95w} +\ProvidesExplPackage{pdfmanagement-testphase}{2023-03-09}{0.95x} {LaTeX PDF management testphase bundle} \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} \IfFormatAtLeastTF{2020-10-01}{}{ @@ -414,7 +414,7 @@ % to allow to set it in the document. % \begin{macrocode} %<*header> -\ProvidesExplFile{pdfmanagement-testphase.ltx}{2023-02-20}{0.95w} +\ProvidesExplFile{pdfmanagement-testphase.ltx}{2023-03-09}{0.95x} {PDF~management~code~(testphase)} %</header> %<*package> |