diff options
author | Karl Berry <karl@freefriends.org> | 2022-01-28 22:24:07 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-01-28 22:24:07 +0000 |
commit | ce464e29726d9a7c36c2d6e27b4db5bed61f0bd8 (patch) | |
tree | c12c25a5d56144317d04c6ac025e02a3033c3694 /Master/texmf-dist/tex | |
parent | c0bec20cbae9f7aeefe9349bdd9c67863e0a2d49 (diff) |
pdfmanagement-testphase (28jan22)
git-svn-id: svn://tug.org/texlive/trunk@61775 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
16 files changed, 74 insertions, 45 deletions
diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty index 9ea89b54e13..b530980baaa 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty @@ -12,7 +12,9 @@ %% %% %% color.dtx Copyright (C) 1994--1999 David Carlisle -%% Copyright (C) 2005-2020 David Carlisle, LaTeX3 Project +%% Copyright (C) 2005-2022 +%% The LaTeX Project and any individual authors listed elsewhere +%% in this file. %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public @@ -22,8 +24,8 @@ %% This file has the LPPL maintenance status "maintained". %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{color-ltx}[2022-01-13 v0.95j - Standard LaTeX Color (patched for l3color, part of pdfmanagement-testphase, original version 2021/03/07 v1.2e) (DPC)] +\ProvidesPackage{color-ltx}[2022-01-28 v0.95k + Standard LaTeX Color (patched for l3color, part of pdfmanagement-testphase, original version 2022/01/06 v1.3d) (DPC)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax @@ -58,7 +60,7 @@ \def\c@lor@namefile{dvipsnam.def}} \DeclareOption{xdvi}{\ExecuteOptions{dvips,monochrome}} \DeclareOption{dvipdf}{\def\Gin@driver{dvipdf.def}} -\DeclareOption{dvipdfm}{\def\Gin@driver{dvipdfm.def}} +\DeclareOption{dvipdfm}{\def\Gin@driver{dvipdfmx.def}} \DeclareOption{dvipdfmx}{\def\Gin@driver{dvipdfmx.def}} \DeclareOption{pdftex}{\def\Gin@driver{pdftex.def}} \DeclareOption{luatex}{\def\Gin@driver{luatex.def}} @@ -82,7 +84,7 @@ \let\c@lor@usename\@gobble \DeclareOption{usenames}{% \def\c@lor@usename#1{% - \expandafter\color@named\csname\string\color @#1\endcsname{#1}}} + \expandafter\color@named\csname\@backslashchar color@#1\endcsname{#1}}} \DeclareRobustCommand\color{% \@ifnextchar[\@undeclaredcolor\@declaredcolor} \def\@undeclaredcolor[#1]#2{% @@ -92,10 +94,10 @@ \set@color}% \ignorespaces} \def\@declaredcolor#1{% - \@ifundefined{\string\color @#1}% + \@ifundefined{\@backslashchar color@#1}% {\c@lor@error{`#1'}}% {\expandafter\let\expandafter\current@color - \csname\string\color @#1\endcsname + \csname\@backslashchar color@#1\endcsname \set@color}% \ignorespaces} \protected\def\textcolor#1#{\@textcolor{#1}} @@ -107,7 +109,7 @@ \color} \protected\def\nopagecolor{% \@ifundefined{no@page@color}{% - \PackageInfo{color}{\string\nopagecolor\space is not supported}% + \PackageInfo{color}{\@backslashchar nopagecolor\space is not supported}% }{% \no@page@color }% @@ -115,12 +117,12 @@ \protected\def\definecolor#1#2#3{% \@ifundefined{color@#2}% {\c@lor@error{model `#2'}}% - {\@ifundefined{\string\color @#1}{}% + {\@ifundefined{\@backslashchar color@#1}{}% {\PackageInfo{color}{Redefining color #1}}% \csname color@#2\expandafter\endcsname - \csname\string\color @#1\endcsname{#3}}% - \@expl@color@set@@nnn{#1}{#2}{#3}% - } + \csname\@backslashchar color@#1\endcsname{#3}}% + \@expl@color@set@@nnn{#1}{#2}{#3}% + } \protected\def\DefineNamedColor#1#2#3#4{% \@ifundefined{define@color@#1}% {\c@lor@error{model `#1'}}% @@ -188,6 +190,7 @@ \dimen@\dp\z@\advance\dimen@\fboxsep\dp\z@\dimen@ {#1{#2\color@block{\wd\z@}{\ht\z@}{\dp\z@}% \box\z@}}} +\InputIfFileExists{mathcolor.ltx}{}{} \def\color@setgroup{\begingroup\set@color} \let\color@begingroup\begingroup \def\color@endgroup{\endgraf\endgroup} diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def index c14036e6a64..3e2d091f291 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def @@ -20,7 +20,7 @@ %% %% File: hyperref-generic.dtx -\ProvidesFile{hgeneric-testphase.def}[2022-01-13 v0.95j % +\ProvidesFile{hgeneric-testphase.def}[2022-01-28 v0.95k % generic Hyperref driver for the LaTeX PDF management testphase bundle] \RequirePackage{etoolbox} %why? diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty index a1bc3caddb7..c056293ec07 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty @@ -19,7 +19,7 @@ % % for those people who are interested. \NeedsTeXFormat{LaTeX2e}[2020/10/01] -\ProvidesExplPackage{hyperxmp-patches-tmp-ltx}{2022-01-13}{0.95j} +\ProvidesExplPackage{hyperxmp-patches-tmp-ltx}{2022-01-28}{0.95k} {Store hyperref metadata in XMP format / temporay patches to test pdfresource management ... UF} \cs_if_exist:NT \pdfmanagement_add:nnn diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def index 45754cdcb5c..c898fd19465 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-dvipdfmx.def}{2022-01-13}{} + {l3backend-testphase-dvipdfmx.def}{2022-01-28}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx} \RequirePackage{l3ref-tmp} \cs_generate_variant:Nn \ref_label:nn {en} diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def index 85dce6a1431..a92574979bc 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-dvips.def}{2022-01-13}{} + {l3backend-testphase-dvips.def}{2022-01-28}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvips} \RequirePackage{l3ref-tmp} \cs_generate_variant:Nn \ref_label:nn {en} @@ -158,6 +158,9 @@ } \cs_new_protected:Npn \__pdf_backend_link_off:{} \cs_new_protected:Npn \__pdf_backend_link_on: {} +\tl_new:N \l__pdf_backend_xform_tmpwd_tl +\tl_new:N \l__pdf_backend_xform_tmpdp_tl +\tl_new:N \l__pdf_backend_xform_tmpht_tl \cs_new_protected:Npn\__pdf_backend_xform_new:nnnn #1 #2 #3 #4 % #1 name, #2 attribute, #4 content { \int_gincr:N \g__pdf_backend_object_int @@ -181,31 +184,51 @@ \tl_const:cx { c__pdf_backend_xform_dp_ \tl_to_str:n {#1} _tl } { \tex_the:D \box_dp:N \l__pdf_backend_tmpa_box } - %mirror the box - \box_scale:Nnn \l__pdf_backend_tmpa_box {1} {-1} + %store content dimensions in DPI units (Dots) (code from issue 25) + \tl_set:Nx\l__pdf_backend_xform_tmpwd_tl + { + \dim_to_decimal_in_sp:n{ \box_wd:N \l__pdf_backend_tmpa_box }~ + 65536~div~72.27~div~DVImag~mul~Resolution~mul~ + } + \tl_set:Nx\l__pdf_backend_xform_tmpht_tl + { + \dim_to_decimal_in_sp:n{ \box_ht:N \l__pdf_backend_tmpa_box }~ + 65536~div~72.27~div~DVImag~mul~VResolution~mul~ + } + \tl_set:Nx\l__pdf_backend_xform_tmpdp_tl + { + \dim_to_decimal_in_sp:n{ \box_dp:N \l__pdf_backend_tmpa_box }~ + 65536~div~72.27~div~DVImag~mul~VResolution~mul~ + } + % mirror the box + %\box_scale:Nnn \l__pdf_backend_tmpa_box {1} {-1} \hbox_set:Nn\l__pdf_backend_tmpb_box { \__kernel_backend_postscript:x { - gsave~currentpoint~translate~ + gsave~currentpoint~ + initclip~ % restore default clipping path (page device/whole page) + clippath~pathbbox~newpath~pop~pop~ + \tl_use:N\l__pdf_backend_xform_tmpdp_tl~add~translate~ mark~ - /_objdef~{ pdf.obj \int_use:N\g__pdf_backend_object_int }\c_space_tl~ - /BBox[ - currentpoint~\dim_to_decimal:n{\box_dp:N \l__pdf_backend_tmpa_box}~72.27~div~VResolution~mul~add~ - currentpoint~ - exch~\dim_to_decimal:n{\box_wd:N \l__pdf_backend_tmpa_box}~72.27~div~Resolution~mul~add~ - exch~\dim_to_decimal:n{\box_ht:N \l__pdf_backend_tmpa_box}~72.27~div~VResolution~mul~sub~ - ] - \str_if_eq:eeF{#1}{} - { - product~(Distiller)~search~{pop~pop~pop~#2}{pop}ifelse~ - } - /BP~pdfmark~grestore~ + /_objdef~{ pdf.obj \int_use:N\g__pdf_backend_object_int }\c_space_tl~ + /BBox[ + 0~ + \tl_use:N\l__pdf_backend_xform_tmpht_tl~ + \tl_use:N\l__pdf_backend_xform_tmpwd_tl~ + \tl_use:N\l__pdf_backend_xform_tmpdp_tl~ + neg + ] + \str_if_eq:eeF{#1}{} + { + product~(Distiller)~search~{pop~pop~pop~#2}{pop}ifelse~ + } + /BP~pdfmark~1~-1~scale~neg~exch~neg~exch~translate } \box_use_drop:N\l__pdf_backend_tmpa_box \__kernel_backend_postscript:n { - mark ~ /EP~pdfmark + mark ~ /EP~pdfmark ~ grestore } \str_if_eq:eeF{#1}{} { diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def index a2f70adf247..a715135af09 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-dvisvgm.def}{2022-01-13}{} + {l3backend-testphase-dvisvgm.def}{2022-01-28}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm} \RequirePackage{l3ref-tmp} \cs_generate_variant:Nn \ref_label:nn {en} diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def index 6ac246c9e27..4184e4e2bec 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-luatex.def}{2022-01-13}{} + {l3backend-testphase-luatex.def}{2022-01-28}{} {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)} \RequirePackage{l3ref-tmp} \cs_generate_variant:Nn \ref_label:nn {en} diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def index 0188aa55b8a..d4e7214158d 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-pdftex.def}{2022-01-13}{} + {l3backend-testphase-pdftex.def}{2022-01-28}{} {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)} \RequirePackage{l3ref-tmp} \cs_generate_variant:Nn \ref_label:nn {en} diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def index 160d37b9882..ed5877cb600 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-xetex.def}{2022-01-13}{} + {l3backend-testphase-xetex.def}{2022-01-28}{} {LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX} \RequirePackage{l3ref-tmp} \cs_generate_variant:Nn \ref_label:nn {en} diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty index 3c045da7bcc..677a628120f 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty @@ -27,7 +27,7 @@ %% File: l3pdffield.dtx \NeedsTeXFormat{LaTeX2e} -\ProvidesExplPackage{l3pdffield-testphase}{2022-01-13}{0.95j}% +\ProvidesExplPackage{l3pdffield-testphase}{2022-01-28}{0.95k}% {form fields} \csname HyField@NeedAppearancesfalse\endcsname % suppress NeedAppearances \str_new:N \l__pdffield_tmpa_str diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdflscape-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdflscape-ltx.sty index 677e3fe40e5..f9e901c52b8 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdflscape-ltx.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdflscape-ltx.sty @@ -22,7 +22,7 @@ %% This work consists of the main source file pdflscape-ltx.sty %% \NeedsTeXFormat{LaTeX2e} -\ProvidesExplPackage{pdflscape-ltx}{2022-01-13}{0.95j} +\ProvidesExplPackage{pdflscape-ltx}{2022-01-28}{0.95k} {Display of landscape pages in PDF - adaption of pdflscape to the PDFmanagement bundle (testphase)} \DeclareOption*{\PassOptionsToPackage\CurrentOption{graphics}} diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty index 9bff4c5cdb6..63217144c6b 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: pdfmanagement-firstaid.dtx -\ProvidesExplPackage{pdfmanagement-firstaid}{2022-01-13}{0.95j} +\ProvidesExplPackage{pdfmanagement-firstaid}{2022-01-28}{0.95k} {LaTeX PDF management testphase bundle / firstaid-patches} \clist_map_inline:nn {pgf,transparent,hyperxmp,pdflscape,xcolor,color,beamer,output} diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx index 3ac88ac680f..e9fd89dc7af 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx @@ -27,7 +27,7 @@ %% and all files in that bundle must be distributed together. %% %% File: pdfmanagement-testphase.dtx -\ProvidesExplFile{pdfmanagement-testphase.ltx}{2022-01-13}{0.95j} +\ProvidesExplFile{pdfmanagement-testphase.ltx}{2022-01-28}{0.95k} {PDF~management~code~(testphase)} %% File: l3pdfdict.dtx \cs_new:Npn \__pdfdict_get_type:n #1 diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty index 4c34d556cc9..0dbade66d5b 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: pdfmanagement-testphase.dtx -\ProvidesExplPackage{pdfmanagement-testphase}{2022-01-13}{0.95j} +\ProvidesExplPackage{pdfmanagement-testphase}{2022-01-28}{0.95k} {LaTeX PDF management testphase bundle} \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} \IfFormatAtLeastTF{2020-10-01}{}{ diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/transparent-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/transparent-ltx.sty index f9987ba4436..4b4cc8907ee 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/transparent-ltx.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/transparent-ltx.sty @@ -3,7 +3,7 @@ %% a replacement for transparent sty from Heiko Oberdiek %% \NeedsTeXFormat{LaTeX2e}[2020/10/01] -\ProvidesExplPackage{transparent-ltx}{2022-01-13}{0.95j} +\ProvidesExplPackage{transparent-ltx}{2022-01-28}{0.95k} {Transparency with color stacks (replacement for transparent.sty from Heiko Oberdiek)}% \RequirePackage{l3opacity} diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty index 5ff2ef09972..c131c9a922e 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty @@ -1,6 +1,6 @@ %% LaTeX2e file `xcolor-patches.sty' %% -\ProvidesPackage{xcolor-patches-tmp-ltx}[2022-01-13 v0.95j patch xcolor for l3color] +\ProvidesPackage{xcolor-patches-tmp-ltx}[2022-01-28 v0.95k patch xcolor for l3color] \@ifundefined{color_set:nn}{\RequirePackage{l3color}}{} \ExplSyntaxOn @@ -43,10 +43,13 @@ \cs_generate_variant:Nn \__pdfmanagement_firstaid_xcolor_set:nnnn {nonn} \cs_set_eq:NN \@expl@xcolor@set@@nonn \__pdfmanagement_firstaid_xcolor_set:nonn \cs_generate_variant:Nn \color_set:nn {ne} +\tl_new:N\l__pdfmanagement_firstaid_tmpa_tl +% the color name should be sanitized to avoid problems with e.g. french making ! active \cs_new_protected:Npn \@expl@xcolor@set@@ne #1 #2 { - \exp_args:Nx \__color_if_defined:nT {#2} - { \color_set:ne {#1}{#2} } + \XC@edef\l__pdfmanagement_firstaid_tmpa_tl{#2} + \exp_args:NV \__color_if_defined:nT \l__pdfmanagement_firstaid_tmpa_tl + { \color_set:ne {#1}{\l__pdfmanagement_firstaid_tmpa_tl} } } \ExplSyntaxOff %\pretocmd{\XC@col@rlet} {\@expl@color@set@@ne{#2}{#4}}{}{\fail} |