From 5eaeb0a62717f47efd6054e4390f8b707e9cf584 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 24 Oct 2018 20:29:56 +0000 Subject: pgf-cmykshadings (24oct18) git-svn-id: svn://tug.org/texlive/trunk@48982 c570f23f-e606-0410-a88d-b1316a301751 --- .../pgfsys-cmykshadings-common-postscript.def | 83 +++++++++++----------- 1 file changed, 42 insertions(+), 41 deletions(-) (limited to 'Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-common-postscript.def') diff --git a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-common-postscript.def b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-common-postscript.def index 12a5eb0ecac..585e69a7a7b 100644 --- a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-common-postscript.def +++ b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-common-postscript.def @@ -25,7 +25,7 @@ %% pgf-cmykshadings.dtx, README.md, and the derived files %% - pgf-cmykshadings.sty %% - pgfsys-cmykshadings-pdftex.def -%% - pgfsys-cmykshadgins-xetex.def +%% - pgfsys-cmykshadings-xetex.def %% - pgfsys-cmykshadings-luatex.def %% - pgfsys-cmykshadings-dvipdfmx.def %% - pgfsys-cmykshadings-dvipdfm.def @@ -42,24 +42,25 @@ %% shadings. %% \ProvidesFile{pgfsys-cmykshadings-common-postscript.def}% - [2018/10/23 CMYK shadings support for PGF PostScript driver (DCP)] + [2018/10/24 + CMYK and grayscale shadings support for PGF PostScript driver (DCP)] \def\pgfsys@horishading#1#2#3{% {% \pgf@parsefunc{#3}% \pgfmathsetlength\pgf@x{#2}% - \pgf@xa=\pgf@x% + \pgf@xa=\pgf@x \pgf@sys@bp@correct{\pgf@x}% - \pgf@y=\pgf@max% + \pgf@y=\pgf@max \pgf@sys@bp@correct{\pgf@y}% \expandafter\xdef\csname @pgfshading#1!\endcsname{\hbox to \the\pgf@max{% - \noexpand\vrule width0pt height\the\pgf@xa% - \noexpand\pgfsys@beginpurepicture% + \noexpand\vrule width0pt height\the\pgf@xa + \noexpand\pgfsys@beginpurepicture \noexpand\pgfsys@rect{0pt}{0pt}{\the\pgf@max}{\the\pgf@xa}% - \noexpand\pgfsys@clipnext% - \noexpand\pgfsys@discardpath% + \noexpand\pgfsys@clipnext + \noexpand\pgfsys@discardpath \noexpand\pgfsys@invoke{\pgf@domb\space \pgf@sys@tonumber{\pgf@x} pgfH\pgf@shading@model\space \pgf@psfuncs\space pop}% - \hss% + \hss \noexpand\pgfsys@endpurepicture}}% \expandafter\xdef\csname @pgfshading#1@model!\endcsname{% \pgf@shading@model}% @@ -69,19 +70,19 @@ {% \pgf@parsefunc{#3}% \pgfmathsetlength\pgf@x{#2}% - \pgf@xa=\pgf@x% + \pgf@xa=\pgf@x \pgf@sys@bp@correct{\pgf@x}% - \pgf@y=\pgf@max% + \pgf@y=\pgf@max \pgf@sys@bp@correct{\pgf@y}% \expandafter\xdef\csname @pgfshading#1!\endcsname{\hbox to\the\pgf@xa{% - \noexpand\vrule width0pt height\the\pgf@max% - \noexpand\pgfsys@beginpurepicture% + \noexpand\vrule width0pt height\the\pgf@max + \noexpand\pgfsys@beginpurepicture \noexpand\pgfsys@rect{0pt}{0pt}{\the\pgf@xa}{\the\pgf@max}% - \noexpand\pgfsys@clipnext% - \noexpand\pgfsys@discardpath% + \noexpand\pgfsys@clipnext + \noexpand\pgfsys@discardpath \noexpand\pgfsys@invoke{\pgf@domb\space \pgf@sys@tonumber{\pgf@x} pgfV\pgf@shading@model\space \pgf@psfuncs\space pop}% - \hss% + \hss \noexpand\pgfsys@endpurepicture}}% \expandafter\xdef\csname @pgfshading#1@model!\endcsname{% \pgf@shading@model}% @@ -93,20 +94,20 @@ \pgf@process{#2}% \pgf@sys@bp@correct{\pgf@x}% \pgf@sys@bp@correct{\pgf@y}% - \pgf@xa=2\pgf@max% + \pgf@xa=2\pgf@max \pgf@sys@bp@correct{\pgf@max}% - \advance\pgf@x by \pgf@max% - \advance\pgf@y by \pgf@max% + \advance\pgf@x by \pgf@max + \advance\pgf@y by \pgf@max \expandafter\xdef\csname @pgfshading#1!\endcsname{\hbox to \the\pgf@xa{% - \noexpand\vrule width0pt height\the\pgf@xa% - \noexpand\pgfsys@beginpurepicture% + \noexpand\vrule width0pt height\the\pgf@xa + \noexpand\pgfsys@beginpurepicture \noexpand\pgfsys@invoke{% \pgf@domb\space \pgf@sys@tonumber{\pgf@y} \pgf@sys@tonumber{\pgf@x} \pgf@sys@tonumber{\pgf@max} pgfR1\pgf@shading@model\space \pgf@psfuncs\space \pgf@firstcolor\space \pgf@doma\space pgfR2\pgf@shading@model}% - \hss% + \hss \noexpand\pgfsys@endpurepicture}}% \expandafter\xdef\csname @pgfshading#1@model!\endcsname{% \pgf@shading@model}% @@ -115,22 +116,22 @@ \def\pgfsys@functionalshading#1#2#3#4{% {% \pgf@process{#2}% - \pgf@xa=\pgf@x% - \pgf@ya=\pgf@y% + \pgf@xa=\pgf@x + \pgf@ya=\pgf@y \pgf@process{#3}% - \pgf@xb=\pgf@x% - \pgf@yb=\pgf@y% - \advance\pgf@x by-\pgf@xa% - \advance\pgf@y by-\pgf@ya% + \pgf@xb=\pgf@x + \pgf@yb=\pgf@y + \advance\pgf@x by-\pgf@xa + \advance\pgf@y by-\pgf@ya \pgf@sys@bp@correct{\pgf@xa}% \pgf@sys@bp@correct{\pgf@ya}% \pgf@sys@bp@correct{\pgf@xb}% \pgf@sys@bp@correct{\pgf@yb}% - \pgf@xc=-\pgf@xa% - \pgf@yc=-\pgf@ya% + \pgf@xc=-\pgf@xa + \pgf@yc=-\pgf@ya \expandafter\xdef\csname @pgfshading#1!\endcsname{% \hbox to\the\pgf@x{\vbox to\the\pgf@y{\vfil - \noexpand\pgfsys@beginpurepicture% + \noexpand\pgfsys@beginpurepicture \noexpand\pgfsys@invoke{% \pgf@sys@tonumber{\pgf@xc} \pgf@sys@tonumber{\pgf@yc} translate 1.1 setlinewidth [] 0 setdash 0 setlinecap @@ -157,11 +158,11 @@ \pgf@sys@postscript@header{/pgfVrgb { pgfV } bind def}% \pgf@sys@postscript@header{/pgfR1rgb { pgfR1 } bind def}% \pgf@sys@postscript@header{/pgfR2rgb { pgfR2 } bind def}% - \pgf@sys@postscript@header{/pgfHcmyk{% + \pgf@sys@postscript@header{/pgfHcmyk{ /pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfshade {pgfAcmyk} def /pgfdir { dup 0 moveto dup 6 index lineto } bind def} bind def}% - \pgf@sys@postscript@header{/pgfVcmyk{% + \pgf@sys@postscript@header{/pgfVcmyk{ /pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfshade {pgfAcmyk} def /pgfdir { dup 0 exch moveto dup 6 index exch lineto } bind def} bind def}% @@ -183,7 +184,7 @@ 5 -1 roll .5 sub % x += 0.5 } repeat mark 19 1 roll cleartomark exch pop % leave only start x on stack - }bind def } + }bind def }% \pgf@sys@postscript@header{/pgfR1cmyk{ newpath dup dup dup 0 360 arc clip newpath dup /pgfendx exch def @@ -196,7 +197,7 @@ /pgfdiffx pgfendx pgfstartx sub def /pgfdiffy pgfendy pgfstarty sub def dup /pgfdomb exch def - }bind def } + }bind def }% \pgf@sys@postscript@header{/pgfR2cmyk{ newpath 0.5 add pgfcircx pgfcircy 3 2 roll 0 360 arc setcmykcolor fill pop}bind def }% @@ -226,12 +227,12 @@ /pgfcircy pgfcircy pgfystep add def } repeat mark 18 1 roll cleartomark exch pop % leave only start x on stack - }bind def} - \pgf@sys@postscript@header{/pgfHgray{% + }bind def}% + \pgf@sys@postscript@header{/pgfHgray{ /pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfshade {pgfAgray} def /pgfdir { dup 0 moveto dup 3 index lineto } bind def} bind def}% - \pgf@sys@postscript@header{/pgfVgray{% + \pgf@sys@postscript@header{/pgfVgray{ /pgfheight exch def 0.75 setlinewidth [] 0 setdash /pgfshade {pgfAgray} def /pgfdir { dup 0 exch moveto dup 3 index exch lineto } bind def} bind def}% @@ -247,7 +248,7 @@ exch .5 sub % x += 0.5 } repeat mark 7 1 roll cleartomark exch pop % leave only start x on stack - }bind def } + }bind def }% \pgf@sys@postscript@header{/pgfR1gray{ newpath dup dup dup 0 360 arc clip newpath dup /pgfendx exch def @@ -260,7 +261,7 @@ /pgfdiffx pgfendx pgfstartx sub def /pgfdiffy pgfendy pgfstarty sub def dup /pgfdomb exch def - }bind def } + }bind def }% \pgf@sys@postscript@header{/pgfR2gray{ newpath 0.5 add pgfcircx pgfcircy 3 2 roll 0 360 arc setgray fill pop}bind def }% @@ -284,7 +285,7 @@ /pgfcircy pgfcircy pgfystep add def } repeat mark 6 1 roll cleartomark exch pop % leave only start x on stack - }bind def} + }bind def}% } %% %% -- cgit v1.2.3