diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfmx.def')
-rw-r--r-- | Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfmx.def | 57 |
1 files changed, 31 insertions, 26 deletions
diff --git a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfmx.def b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfmx.def index beadfff3bf1..672d791e389 100644 --- a/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfmx.def +++ b/Master/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-dvipdfmx.def @@ -1,4 +1,5 @@ % Copyright 2006 by Till Tantau +% CMYK and grayscale shadings adaptation copyright 2019 by David Purton % % This file may be distributed and/or modified % @@ -94,7 +95,7 @@ \pgfsys@dvipdfmx@start@force@reset@color% \pgf@sys@bp@correct\pgf@pt@x% \pgf@sys@bp@correct\pgf@pt@y% - \special{pdf:btrans matrix \pgf@pt@aa\space \pgf@pt@ab\space \pgf@pt@ba\space \pgf@pt@bb\space + \special{pdf:btrans matrix \pgf@pt@aa\space \pgf@pt@ab\space \pgf@pt@ba\space \pgf@pt@bb\space \pgf@sys@tonumber{\pgf@pt@x} \pgf@sys@tonumber{\pgf@pt@y}}% \box#1% \special{pdf:etrans}% @@ -122,7 +123,7 @@ \special{pdf:put @resources << /Shading << /Sh << /ShadingType 2 - /ColorSpace /DeviceRGB + /ColorSpace \pgf@shading@device\space /Domain [\pgf@pdfparseddomain] /Coords [\pgf@doma\space0 \pgf@domb\space0] /Function \pgf@pdfparsedfunction @@ -130,9 +131,10 @@ >>}% \pgfsys@invoke{/Sh sh}% \special{pdf:exobj}}}\@tempa% << - \expandafter\xdef\csname @pgfshading#1!\endcsname{% + \xdef\pgfutil@tempa{% \hbox to\the\pgf@max{\vbox to\pgfmathresult pt{\vfil\special{pdf:uxobj @pgfshade\the\pgfsys@objnum}}\hfil}}% }% + \global\expandafter\let\csname @pgfshading#1!\endcsname=\pgfutil@tempa \global\advance\pgfsys@objnum\@ne% } \def\pgfsys@vertshading#1#2#3{% @@ -145,7 +147,7 @@ \special{pdf:put @resources << /Shading << /Sh << /ShadingType 2 - /ColorSpace /DeviceRGB + /ColorSpace \pgf@shading@device\space /Domain [\pgf@pdfparseddomain] /Coords [0 \pgf@doma\space0 \pgf@domb] /Function \pgf@pdfparsedfunction @@ -153,9 +155,10 @@ >>}% \pgfsys@invoke{/Sh sh}% \special{pdf:exobj}}}\@tempa% << - \expandafter\xdef\csname @pgfshading#1!\endcsname{% - \hbox to\pgfmathresult pt{\vbox to\the\pgf@max{\vfil\special{pdf:uxobj @pgfshade\the\pgfsys@objnum}}\hfil}}% + \xdef\pgfutil@tempa{% + \hbox to\pgfmathresult pt{\vbox to\the\pgf@max{\vfil\special{pdf:uxobj @pgfshade\the\pgfsys@objnum}}\hfil}}% }% + \global\expandafter\let\csname @pgfshading#1!\endcsname=\pgfutil@tempa \global\advance\pgfsys@objnum\@ne% } \def\pgfsys@radialshading#1#2#3{% @@ -177,7 +180,7 @@ \special{pdf:put @resources << /Shading << /Sh << /ShadingType 3 - /ColorSpace /DeviceRGB + /ColorSpace \pgf@shading@device\space /Domain [\pgf@pdfparseddomain] /Coords [\pgf@sys@tonumber{\pgf@xa} \pgf@sys@tonumber{\pgf@ya} \pgf@doma\space \pgf@sys@tonumber{\pgf@x} \pgf@sys@tonumber{\pgf@y} \pgf@domb] /Function \pgf@pdfparsedfunction @@ -185,9 +188,10 @@ >>}% \pgfsys@invoke{/Sh sh}% \special{pdf:exobj}}}\@tempa% << - \expandafter\xdef\csname @pgfshading#1!\endcsname{% - \hbox to\the\pgfutil@tempdima{\vbox to\the\pgfutil@tempdima{\vfil\special{pdf:uxobj @pgfshade\the\pgfsys@objnum}}\hfil}}% + \xdef\pgfutil@tempa{% + \hbox to\the\pgfutil@tempdima{\vbox to\the\pgfutil@tempdima{\vfil\special{pdf:uxobj @pgfshade\the\pgfsys@objnum}}\hfil}}% }% + \global\expandafter\let\csname @pgfshading#1!\endcsname=\pgfutil@tempa \global\advance\pgfsys@objnum\@ne% } \def\pgfsys@functionalshading#1#2#3#4{% @@ -210,19 +214,20 @@ \edef\@tempa{\noexpand\pgfutil@insertatbegincurrentpagefrombox{% \special{pdf:stream @pgfstream\the\pgfsys@objnum\space({#4}) <</FunctionType 4 /Domain [\pgf@sys@tonumber{\pgf@xa}\space\pgf@sys@tonumber{\pgf@xb}\space\pgf@sys@tonumber{\pgf@ya}\space\pgf@sys@tonumber{\pgf@yb}] - /Range [0 1 0 1 0 1]>>}}}\@tempa% + /Range [\pgf@shading@functional@range]>>}}}\@tempa% \edef\@tempa{\noexpand\pgfutil@insertatbegincurrentpagefrombox{% \special{pdf:bxobj @pgfshade\the\pgfsys@objnum\space width \the\pgf@x\space height \the\pgf@y}% \special{pdf:put @resources <</Shading <</Sh <</ShadingType 1 - /ColorSpace /DeviceRGB + /ColorSpace \pgf@shading@device\space /Matrix [1 0 0 1 \pgf@sys@tonumber{\pgf@xc}\space\pgf@sys@tonumber{\pgf@yc}] /Domain [\pgf@sys@tonumber{\pgf@xa}\space\pgf@sys@tonumber{\pgf@xb}\space\pgf@sys@tonumber{\pgf@ya}\space\pgf@sys@tonumber{\pgf@yb}] /Function @pgfstream\the\pgfsys@objnum>> >> >>}% \pgfsys@invoke{/Sh sh}% \special{pdf:exobj}}}\@tempa% << - \expandafter\xdef\csname @pgfshading#1!\endcsname{% - \leavevmode\hbox to\the\pgf@x{\vbox to\the\pgf@y{\vfil\special{pdf:uxobj @pgfshade\the\pgfsys@objnum}}\hfil}}% + \xdef\pgfutil@tempa{% + \hbox to\the\pgf@x{\vbox to\the\pgf@y{\vfil\special{pdf:uxobj @pgfshade\the\pgfsys@objnum}}\hfil}}% }% + \global\expandafter\let\csname @pgfshading#1!\endcsname=\pgfutil@tempa \global\advance\pgfsys@objnum\@ne% } @@ -347,23 +352,23 @@ \pgf@sys@bp@correct\pgf@yc% % Now create the pattern object: \pgfsys@dvipdfmx@patternobj{% - \pgfsys@dvipdfmx@stream{@pgfpatternobject#1}{#8}{% - /Type /Pattern - /PatternType 1 - /PaintType \ifnum#9=0 2 \else 1 \fi - /TilingType 1 - /BBox [\pgf@sys@tonumber\pgf@xa\space\pgf@sys@tonumber\pgf@ya\space\pgf@sys@tonumber\pgf@xb\space\pgf@sys@tonumber\pgf@yb] - /XStep \pgf@sys@tonumber\pgf@xc\space - /YStep \pgf@sys@tonumber\pgf@yc\space - /Resources << >> %<< - }% + \pgfsys@dvipdfmx@stream{@pgfpatternobject#1}{#8}{% + /Type /Pattern + /PatternType 1 + /PaintType \ifnum#9=0 2 \else 1 \fi + /TilingType 1 + /BBox [\pgf@sys@tonumber\pgf@xa\space\pgf@sys@tonumber\pgf@ya\space\pgf@sys@tonumber\pgf@xb\space\pgf@sys@tonumber\pgf@yb] + /XStep \pgf@sys@tonumber\pgf@xc\space + /YStep \pgf@sys@tonumber\pgf@yc\space + /Resources << >> %<< + }% }% \pgfutil@addpdfresource@patterns{/pgfpat#1\space @pgfpatternobject#1}% } % hook for xdvipdfmx: \def\pgfsys@dvipdfmx@patternobj#1{% - #1% + #1% }% % hook for xdvipdfmx: @@ -493,6 +498,6 @@ \endinput -%%% Local Variables: +%%% Local Variables: %%% mode: latex -%%% End: +%%% End: |