texlive[48982] Master/texmf-dist: pgf-cmykshadings (24oct18)
commits+karl at tug.org
commits+karl at tug.org
Wed Oct 24 22:29:56 CEST 2018
Revision: 48982
http://tug.org/svn/texlive?view=revision&revision=48982
Author: karl
Date: 2018-10-24 22:29:56 +0200 (Wed, 24 Oct 2018)
Log Message:
-----------
pgf-cmykshadings (24oct18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/pgf-cmykshadings/README.md
trunk/Master/texmf-dist/doc/latex/pgf-cmykshadings/pgf-cmykshadings.pdf
trunk/Master/texmf-dist/source/latex/pgf-cmykshadings/pgf-cmykshadings.dtx
trunk/Master/texmf-dist/source/latex/pgf-cmykshadings/pgf-cmykshadings.ins
trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgf-cmykshadings.sty
trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-common-postscript.def
trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfm.def
trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfmx.def
trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvips.def
trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-luatex.def
trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-pdftex.def
trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-textures.def
trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-vtex.def
trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-xetex.def
Modified: trunk/Master/texmf-dist/doc/latex/pgf-cmykshadings/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/pgf-cmykshadings/README.md 2018-10-24 00:18:04 UTC (rev 48981)
+++ trunk/Master/texmf-dist/doc/latex/pgf-cmykshadings/README.md 2018-10-24 20:29:56 UTC (rev 48982)
@@ -75,7 +75,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
Modified: trunk/Master/texmf-dist/doc/latex/pgf-cmykshadings/pgf-cmykshadings.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/pgf-cmykshadings/pgf-cmykshadings.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/pgf-cmykshadings/pgf-cmykshadings.dtx 2018-10-24 00:18:04 UTC (rev 48981)
+++ trunk/Master/texmf-dist/source/latex/pgf-cmykshadings/pgf-cmykshadings.dtx 2018-10-24 20:29:56 UTC (rev 48982)
@@ -27,7 +27,7 @@
%
% \title{The \pkg{pgf-cmykshadings} package}
% \author{David Purton\thanks{Email: \url{dcpurton at marshwiggle.net}}}
-% \date{2018/10/23 v1.1}
+% \date{2018/10/24 v1.1a}
%
% \maketitle
%
@@ -139,7 +139,7 @@
% \begin{description}
% \item[\mdseries |cmyk|] (default) to use CMYK shadings when the \pkg{xcolor}
% package |natural| colour model is in use.
-% \item[\mdseries |rgb|] to use the RGB shadings when the \pkg{xcolor} package
+% \item[\mdseries |rgb|] to use RGB shadings when the \pkg{xcolor} package
% |natural| colour model is in use.
% \end{description}
%
@@ -561,7 +561,8 @@
%
% \begin{macrocode}
\ProvidesPackage{pgf-cmykshadings}%
- [2018/10/23 CMYK shadings support for PGF (DCP)]
+ [2018/10/24
+ CMYK and grayscale shadings support for PGF (DCP)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -804,9 +805,12 @@
\def\pgf at grabsemicolor;{%
\edef\pgf at conv{\pgf at conv; }\pgf at convert}
\def\pgf at gobblec c{\pgf at convert}
-\def\pgf at savecolor#1{
+% \end{macrocode}
+%\changes{v1.1a}{2018/10/24}{Fix missing percent sign}
+% \begin{macrocode}
+\def\pgf at savecolor#1{%
\pgfutil at extractcolorspec{pgf at tempcol}{\pgf at tempcolor}%
- \expandafter\pgfutil at convertcolorspec\pgf at tempcolor%
+ \expandafter\pgfutil at convertcolorspec\pgf at tempcolor
{\pgf at shading@model}{\pgf at color}%
\expandafter\pgf at convget@\expandafter{\pgf at color}{#1}%
}
@@ -852,7 +856,7 @@
\pgf at sys@tonumber{\pgf at xc}\space}%
\expandafter\edef\csname\string#2black\endcsname{%
\pgf at sys@tonumber{\pgf at xd}\space}%
- \escapechar\c at pgf@counta%
+ \escapechar\c at pgf@counta
}
\def\pgfshading at cmyk#1,#2,#3,#4\relax{%
\pgf at xa=#1pt%
@@ -871,13 +875,13 @@
\pgfutil at colorlet{pgf at tempcol}{#1}%
\pgfutil at extractcolorspec{pgf at tempcol}{\pgf at tempcolor}%
\expandafter\pgfutil at convertcolorspec\pgf at tempcolor{gray}{\pgf at graycolor}%
- \expandafter\pgfshading at gray\pgf at graycolor\relax%
+ \expandafter\pgfshading at gray\pgf at graycolor\relax
\edef#2{\pgf at sys@tonumber{\pgf at xa}\space}%
- \c at pgf@counta\escapechar%
- \escapechar-1\relax%
+ \c at pgf@counta\escapechar
+ \escapechar-1\relax
\expandafter\edef\csname\string#2gray\endcsname{%
\pgf at sys@tonumber{\pgf at xa}\space}%
- \escapechar\c at pgf@counta%
+ \escapechar\c at pgf@counta
}
\def\pgfshading at gray#1\relax{%
\pgf at xa=#1pt%
@@ -902,7 +906,7 @@
\pgf at declareradialshading{\pgf at declareradialshading[]}}
\def\pgfdeclarefunctionalshading{%
\pgf at setup@model
- \pgfutil at ifnextchar[
+ \pgfutil at ifnextchar[%
\pgf at declarefunctionalshading{\pgf at declarefunctionalshading[]}}
% \end{macrocode}
%
@@ -919,7 +923,7 @@
{%
{%
\pgf at setup@model
- \pgfutil at globalcolorsfalse%
+ \pgfutil at globalcolorsfalse
\def\pgf at shade@adds{}%
\pgfutil at ifundefined{pgf at deps\pgf at shadingname}%
{}%
@@ -931,7 +935,7 @@
{}{\applycolormixins{\@temp}}%
\pgfutil at extractcolorspec{\@temp}{\pgf at tempcolor}%
\expandafter\pgfutil at ifundefined\expandafter{%
- \pgf at shadingsavedmodel}
+ \pgf at shadingsavedmodel}%
{\expandafter\pgfutil at convertcolorspec\pgf at tempcolor{%
\pgf at shading@model}{\pgf at color}}%
{\expandafter\pgfutil at convertcolorspec\pgf at tempcolor{%
@@ -947,12 +951,12 @@
\expandafter\def\expandafter\@temp\expandafter{%
\csname pgf at func\pgf at shadingname\endcsname}%
\edef\@args{{\pgf at basename\pgf at shade@adds}}%
- \expandafter\expandafter\expandafter\def%
- \expandafter\expandafter\expandafter\@@args%
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter\@@args
\expandafter\expandafter\expandafter{%
\csname pgf at args\pgf at shadingname\endcsname}%
\expandafter\expandafter\expandafter\@temp
- \expandafter\@args\@@args%
+ \expandafter\@args\@@args
}%
}%
{}%
@@ -990,7 +994,7 @@
\ifpgfcmykshadingdefault
\def\pgf at shading@functional at range{0 1 0 1 0 1 0 1}%
\def\pgf at shading@device{/DeviceCMYK}%
- \def\pgf at shading@ps at device{setcmykcolor}%
+ \def\pgf at shading@ps at device{setcmykcolor}%
\def\pgf at shading@model{cmyk}%
\pgfshadingmodelrgbfalse
\pgfshadingmodelcmyktrue
@@ -1099,7 +1103,7 @@
%
% \begin{macrocode}
\def\pgfutilgetcmykshadingsdriver{%
- \expandafter\pgfutil at getcmykshadingsdriver\pgfsysdriver[
+ \expandafter\pgfutil at getcmykshadingsdriver\pgfsysdriver[%
}
\def\pgfutil at getcmykshadingsdriver pgfsys-#1[{%
\edef\pgfsyscmykshadingsdriver{pgfsys-cmykshadings-#1}%
@@ -1140,7 +1144,8 @@
%
% \begin{macrocode}
\ProvidesFile{pgfsys-cmykshadings-pdftex.def}%
- [2018/10/17 CMYK shadings support for PGF pdftex driver (DCP)]
+ [2018/10/24
+ CMYK and grayscale shadings support for PGF pdftex driver (DCP)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -1190,11 +1195,11 @@
\setbox\pgfutil at tempboxa=\hbox to2\pgf at max{%
\vbox to2\pgf at max{\vfil\pgfsys at invoke{/Sh sh}}\hfil}%
\pgf at process{#2}%
- \pgf at xa=\pgf at x%
- \pgf at ya=\pgf at y%
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
\pgf at process{\pgfpoint{\pgf at max}{\pgf at max}}%
- \advance\pgf at xa by \pgf at x%
- \advance\pgf at ya by \pgf at y%
+ \advance\pgf at xa by \pgf at x
+ \advance\pgf at ya by \pgf at y
\pgf at sys@bp at correct{\pgf at x}%
\pgf at sys@bp at correct{\pgf at y}%
\pgf at sys@bp at correct{\pgf at xa}%
@@ -1220,13 +1225,13 @@
\def\pgfsys at functionalshading#1#2#3#4{%
{%
\pgf at process{#2}%
- \pgf at xa=\pgf at x%
- \pgf at ya=\pgf at y%
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
\pgf at process{#3}%
- \pgf at xb=\pgf at x%
- \pgf at yb=\pgf at y%
- \advance\pgf at x by-\pgf at xa%
- \advance\pgf at y by-\pgf at ya%
+ \pgf at xb=\pgf at x
+ \pgf at yb=\pgf at y
+ \advance\pgf at x by-\pgf at xa
+ \advance\pgf at y by-\pgf at ya
\setbox\pgfutil at tempboxa=\hbox to\pgf at x{%
\vbox to\pgf at y{\vfil\pgfsys at invoke{/Sh sh}}\hfil}%
\pgf at sys@bp at correct{\pgf at xa}%
@@ -1233,8 +1238,8 @@
\pgf at sys@bp at correct{\pgf at ya}%
\pgf at sys@bp at correct{\pgf at xb}%
\pgf at sys@bp at correct{\pgf at yb}%
- \pgf at xc=-\pgf at xa%
- \pgf at yc=-\pgf at ya%
+ \pgf at xc=-\pgf at xa
+ \pgf at yc=-\pgf at ya
% Now build the function
\pdfobj
stream
@@ -1283,7 +1288,8 @@
%
% \begin{macrocode}
\ProvidesFile{pgfsys-cmykshadings-xetex.def}%
- [2018/10/17 CMYK shadings support for PGF xetex driver (DCP)]
+ [2018/10/24
+ CMYK and grayscale shadings support for PGF xetex driver (DCP)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -1302,7 +1308,8 @@
%
% \begin{macrocode}
\ProvidesFile{pgfsys-cmykshadings-luatex.def}%
- [2018/10/17 CMYK shadings support for PGF luatex driver (DCP)]
+ [2018/10/24
+ CMYK and grayscale shadings support for PGF luatex driver (DCP)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -1352,11 +1359,11 @@
\setbox\pgfutil at tempboxa=\hbox to2\pgf at max{%
\vbox to2\pgf at max{\vfil\pgfsys at invoke{/Sh sh}}\hfil}%
\pgf at process{#2}%
- \pgf at xa=\pgf at x%
- \pgf at ya=\pgf at y%
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
\pgf at process{\pgfpoint{\pgf at max}{\pgf at max}}%
- \advance\pgf at xa by \pgf at x%
- \advance\pgf at ya by \pgf at y%
+ \advance\pgf at xa by \pgf at x
+ \advance\pgf at ya by \pgf at y
\pgf at sys@bp at correct{\pgf at x}%
\pgf at sys@bp at correct{\pgf at y}%
\pgf at sys@bp at correct{\pgf at xa}%
@@ -1382,13 +1389,13 @@
\def\pgfsys at functionalshading#1#2#3#4{%
{%
\pgf at process{#2}%
- \pgf at xa=\pgf at x%
- \pgf at ya=\pgf at y%
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
\pgf at process{#3}%
- \pgf at xb=\pgf at x%
- \pgf at yb=\pgf at y%
- \advance\pgf at x by-\pgf at xa%
- \advance\pgf at y by-\pgf at ya%
+ \pgf at xb=\pgf at x
+ \pgf at yb=\pgf at y
+ \advance\pgf at x by-\pgf at xa
+ \advance\pgf at y by-\pgf at ya
\setbox\pgfutil at tempboxa=\hbox to\pgf at x{%
\vbox to\pgf at y{\vfil\pgfsys at invoke{/Sh sh}}\hfil}%
\pgf at sys@bp at correct{\pgf at xa}%
@@ -1395,8 +1402,8 @@
\pgf at sys@bp at correct{\pgf at ya}%
\pgf at sys@bp at correct{\pgf at xb}%
\pgf at sys@bp at correct{\pgf at yb}%
- \pgf at xc=-\pgf at xa%
- \pgf at yc=-\pgf at ya%
+ \pgf at xc=-\pgf at xa
+ \pgf at yc=-\pgf at ya
% Now build the function
\pdfextension obj
stream
@@ -1445,7 +1452,8 @@
%
% \begin{macrocode}
\ProvidesFile{pgfsys-cmykshadings-dvipdfmx.def}%
- [2018/10/17 CMYK shadings support for PGF dvipdfmx driver (DCP)]
+ [2018/10/24
+ CMYK and grayscale shadings support for PGF dvipdfmx driver (DCP)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -1501,22 +1509,22 @@
\expandafter\xdef\csname @pgfshading#1 at model!\endcsname{%
\pgf at shading@model}%
}%
- \global\advance\pgfsys at objnum\@ne%
+ \global\advance\pgfsys at objnum\@ne
}
\def\pgfsys at radialshading#1#2#3{%
{%
\pgf at parsefunc{#3}%
\pgf at process{#2}%
- \pgf at xa=\pgf at x%
- \pgf at ya=\pgf at y%
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
\pgf at process{\pgfpoint{\pgf at max}{\pgf at max}}%
- \advance\pgf at xa by \pgf at x%
- \advance\pgf at ya by \pgf at y%
+ \advance\pgf at xa by \pgf at x
+ \advance\pgf at ya by \pgf at y
\pgf at sys@bp at correct{\pgf at x}%
\pgf at sys@bp at correct{\pgf at y}%
\pgf at sys@bp at correct{\pgf at xa}%
\pgf at sys@bp at correct{\pgf at ya}%
- \pgfutil at tempdima=2\pgf at max%
+ \pgfutil at tempdima=2\pgf at max
\edef\@tempa{\noexpand\pgfutil at insertatbegincurrentpagefrombox{%
\special{pdf:bxobj @pgfshade\the\pgfsys at objnum\space
width \the\pgfutil at tempdima\space height \the\pgfutil at tempdima}%
@@ -1541,16 +1549,16 @@
\expandafter\xdef\csname @pgfshading#1 at model!\endcsname{%
\pgf at shading@model}%
}%
- \global\advance\pgfsys at objnum\@ne%
+ \global\advance\pgfsys at objnum\@ne
}
\def\pgfsys at functionalshading#1#2#3#4{%
{%
\pgf at process{#2}%
- \pgf at xa=\pgf at x%
- \pgf at ya=\pgf at y%
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
\pgf at process{#3}%
- \pgf at xb=\pgf at x%
- \pgf at yb=\pgf at y%
+ \pgf at xb=\pgf at x
+ \pgf at yb=\pgf at y
\advance\pgf at x by-\pgf at xa%
\advance\pgf at y by-\pgf at ya%
\pgf at sys@bp at correct{\pgf at xa}%
@@ -1557,8 +1565,8 @@
\pgf at sys@bp at correct{\pgf at ya}%
\pgf at sys@bp at correct{\pgf at xb}%
\pgf at sys@bp at correct{\pgf at yb}%
- \pgf at xc=-\pgf at xa%
- \pgf at yc=-\pgf at ya%
+ \pgf at xc=-\pgf at xa
+ \pgf at yc=-\pgf at ya
% Now build the function
\edef\@tempa{\noexpand\pgfutil at insertatbegincurrentpagefrombox{%
\special{pdf:stream @pgfstream\the\pgfsys at objnum\space({#4})
@@ -1587,7 +1595,7 @@
\expandafter\xdef\csname @pgfshading#1 at model!\endcsname{%
\pgf at shading@model}%
}%
- \global\advance\pgfsys at objnum\@ne%
+ \global\advance\pgfsys at objnum\@ne
}
% \end{macrocode}
%
@@ -1605,7 +1613,8 @@
%
% \begin{macrocode}
\ProvidesFile{pgfsys-cmykshadings-dvipdfm.def}%
- [2018/10/18 CMYK shadings support for PGF dvipdfm driver (DCP)]
+ [2018/10/24
+ CMYK and grayscale shadings support for PGF dvipdfm driver (DCP)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -1615,7 +1624,7 @@
\pgf at process{\pgfpoint{\pgf at max}{#2}}%
\edef\@temp{\noexpand\pgfutil at insertatbegincurrentpage{%
\special{pdf: beginxobj @pgfshade#1 width \the\pgf at max\space
- height \the\pgf at y}}}\@temp%
+ height \the\pgf at y}}}\@temp
\edef\@temp{\noexpand\pgfutil at insertatbegincurrentpage{%
\special{pdf: put @resources <<
/Shading << /Sh << /ShadingType 2
@@ -1639,7 +1648,7 @@
\pgf at process{\pgfpoint{\pgf at max}{#2}}%
\edef\@temp{\noexpand\pgfutil at insertatbegincurrentpage{%
\special{pdf: beginxobj @pgfshade#1 width \the\pgf at y\space
- height \the\pgf at max\space}}}\@temp%
+ height \the\pgf at max\space}}}\@temp
\edef\@temp{\noexpand\pgfutil at insertatbegincurrentpage{%
\special{pdf: put @resources <<
/Shading << /Sh << /ShadingType 2
@@ -1661,16 +1670,16 @@
{%
\pgf at parsefunc{#3}%
\pgf at process{#2}%
- \pgf at xa=\pgf at x%
- \pgf at ya=\pgf at y%
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
\pgf at process{\pgfpoint{\pgf at max}{\pgf at max}}%
- \advance\pgf at xa by \pgf at x\relax%
- \advance\pgf at ya by \pgf at y\relax%
+ \advance\pgf at xa by \pgf at x\relax
+ \advance\pgf at ya by \pgf at y\relax
\pgf at sys@bp at correct{\pgf at x}%
\pgf at sys@bp at correct{\pgf at y}%
\pgf at sys@bp at correct{\pgf at xa}%
\pgf at sys@bp at correct{\pgf at ya}%
- \pgfutil at tempdima=2\pgf at max\relax%
+ \pgfutil at tempdima=2\pgf at max\relax
\edef\@temp{\noexpand\pgfutil at insertatbegincurrentpage{%
\special{pdf: beginxobj @pgfshade#1 width
\the\pgfutil at tempdima\space height \the\pgfutil at tempdima}}}\@temp%
@@ -1709,7 +1718,8 @@
%
% \begin{macrocode}
\ProvidesFile{pgfsys-cmykshadings-dvips.def}%
- [2018/10/23 CMYK shadings support for PGF dvips driver (DCP)]
+ [2018/10/24
+ CMYK and grayscale shadings support for PGF dvips driver (DCP)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -1728,7 +1738,8 @@
%
% \begin{macrocode}
\ProvidesFile{pgfsys-cmykshadings-textures.def}%
- [2018/10/23 CMYK shadings support for PGF textures driver (DCP)]
+ [2018/10/24
+ CMYK and grayscale shadings support for PGF textures driver (DCP)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -1747,7 +1758,8 @@
%
% \begin{macrocode}
\ProvidesFile{pgfsys-cmykshadings-vtex.def}%
- [2018/10/23 CMYK shadings support for PGF vtex driver (DCP)]
+ [2018/10/24
+ CMYK and grayscale shadings support for PGF vtex driver (DCP)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -1766,7 +1778,8 @@
%
% \begin{macrocode}
\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)]
% \end{macrocode}
%
% \TeX\space shading macros.
@@ -1776,19 +1789,19 @@
{%
\pgf at parsefunc{#3}%
\pgfmathsetlength\pgf at x{#2}%
- \pgf at xa=\pgf at x%
+ \pgf at xa=\pgf at x
\pgf at sys@bp at correct{\pgf at x}%
- \pgf at y=\pgf at max%
+ \pgf at y=\pgf at max
\pgf at sys@bp at correct{\pgf at y}%
\expandafter\xdef\csname @pgfshading#1!\endcsname{\hbox to \the\pgf at max{%
- \noexpand\vrule width0pt height\the\pgf at xa%
- \noexpand\pgfsys at beginpurepicture%
+ \noexpand\vrule width0pt height\the\pgf at xa
+ \noexpand\pgfsys at beginpurepicture
\noexpand\pgfsys at rect{0pt}{0pt}{\the\pgf at max}{\the\pgf at xa}%
- \noexpand\pgfsys at clipnext%
- \noexpand\pgfsys at discardpath%
+ \noexpand\pgfsys at clipnext
+ \noexpand\pgfsys at discardpath
\noexpand\pgfsys at invoke{\pgf at domb\space \pgf at sys@tonumber{\pgf at x}
pgfH\pgf at shading@model\space \pgf at psfuncs\space pop}%
- \hss%
+ \hss
\noexpand\pgfsys at endpurepicture}}%
\expandafter\xdef\csname @pgfshading#1 at model!\endcsname{%
\pgf at shading@model}%
@@ -1798,19 +1811,19 @@
{%
\pgf at parsefunc{#3}%
\pgfmathsetlength\pgf at x{#2}%
- \pgf at xa=\pgf at x%
+ \pgf at xa=\pgf at x
\pgf at sys@bp at correct{\pgf at x}%
- \pgf at y=\pgf at max%
+ \pgf at y=\pgf at max
\pgf at sys@bp at correct{\pgf at y}%
\expandafter\xdef\csname @pgfshading#1!\endcsname{\hbox to\the\pgf at xa{%
- \noexpand\vrule width0pt height\the\pgf at max%
- \noexpand\pgfsys at beginpurepicture%
+ \noexpand\vrule width0pt height\the\pgf at max
+ \noexpand\pgfsys at beginpurepicture
\noexpand\pgfsys at rect{0pt}{0pt}{\the\pgf at xa}{\the\pgf at max}%
- \noexpand\pgfsys at clipnext%
- \noexpand\pgfsys at discardpath%
+ \noexpand\pgfsys at clipnext
+ \noexpand\pgfsys at discardpath
\noexpand\pgfsys at invoke{\pgf at domb\space \pgf at sys@tonumber{\pgf at x}
pgfV\pgf at shading@model\space \pgf at psfuncs\space pop}%
- \hss%
+ \hss
\noexpand\pgfsys at endpurepicture}}%
\expandafter\xdef\csname @pgfshading#1 at model!\endcsname{%
\pgf at shading@model}%
@@ -1822,13 +1835,13 @@
\pgf at process{#2}%
\pgf at sys@bp at correct{\pgf at x}%
\pgf at sys@bp at correct{\pgf at y}%
- \pgf at xa=2\pgf at max%
+ \pgf at xa=2\pgf at max
\pgf at sys@bp at correct{\pgf at max}%
- \advance\pgf at x by \pgf at max%
- \advance\pgf at y by \pgf at max%
+ \advance\pgf at x by \pgf at max
+ \advance\pgf at y by \pgf at max
\expandafter\xdef\csname @pgfshading#1!\endcsname{\hbox to \the\pgf at xa{%
- \noexpand\vrule width0pt height\the\pgf at xa%
- \noexpand\pgfsys at beginpurepicture%
+ \noexpand\vrule width0pt height\the\pgf at xa
+ \noexpand\pgfsys at beginpurepicture
\noexpand\pgfsys at invoke{%
\pgf at domb\space \pgf at sys@tonumber{\pgf at y}
\pgf at sys@tonumber{\pgf at x}
@@ -1835,7 +1848,7 @@
\pgf at sys@tonumber{\pgf at max} pgfR1\pgf at shading@model\space
\pgf at psfuncs\space \pgf at firstcolor\space \pgf at doma\space
pgfR2\pgf at shading@model}%
- \hss%
+ \hss
\noexpand\pgfsys at endpurepicture}}%
\expandafter\xdef\csname @pgfshading#1 at model!\endcsname{%
\pgf at shading@model}%
@@ -1844,22 +1857,22 @@
\def\pgfsys at functionalshading#1#2#3#4{%
{%
\pgf at process{#2}%
- \pgf at xa=\pgf at x%
- \pgf at ya=\pgf at y%
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
\pgf at process{#3}%
- \pgf at xb=\pgf at x%
- \pgf at yb=\pgf at y%
- \advance\pgf at x by-\pgf at xa%
- \advance\pgf at y by-\pgf at ya%
+ \pgf at xb=\pgf at x
+ \pgf at yb=\pgf at y
+ \advance\pgf at x by-\pgf at xa
+ \advance\pgf at y by-\pgf at ya
\pgf at sys@bp at correct{\pgf at xa}%
\pgf at sys@bp at correct{\pgf at ya}%
\pgf at sys@bp at correct{\pgf at xb}%
\pgf at sys@bp at correct{\pgf at yb}%
- \pgf at xc=-\pgf at xa%
- \pgf at yc=-\pgf at ya%
+ \pgf at xc=-\pgf at xa
+ \pgf at yc=-\pgf at ya
\expandafter\xdef\csname @pgfshading#1!\endcsname{%
\hbox to\the\pgf at x{\vbox to\the\pgf at y{\vfil
- \noexpand\pgfsys at beginpurepicture%
+ \noexpand\pgfsys at beginpurepicture
\noexpand\pgfsys at invoke{%
\pgf at sys@tonumber{\pgf at xc} \pgf at sys@tonumber{\pgf at yc} translate
1.1 setlinewidth [] 0 setdash 0 setlinecap
@@ -1901,11 +1914,11 @@
% Define CMYK PostScript® shding functions.
%
% \begin{macrocode}
- \pgf at sys@postscript at header{/pgfHcmyk{%
+ \pgf at sys@postscript at 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 at sys@postscript at header{/pgfVcmyk{%
+ \pgf at sys@postscript at 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}%
@@ -1927,7 +1940,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 at sys@postscript at header{/pgfR1cmyk{
newpath dup dup dup 0 360 arc clip newpath
dup /pgfendx exch def
@@ -1940,7 +1953,7 @@
/pgfdiffx pgfendx pgfstartx sub def
/pgfdiffy pgfendy pgfstarty sub def
dup /pgfdomb exch def
- }bind def }
+ }bind def }%
\pgf at sys@postscript at header{/pgfR2cmyk{
newpath 0.5 add pgfcircx pgfcircy 3 2 roll 0 360 arc
setcmykcolor fill pop}bind def }%
@@ -1970,17 +1983,17 @@
/pgfcircy pgfcircy pgfystep add def
} repeat
mark 18 1 roll cleartomark exch pop % leave only start x on stack
- }bind def}
+ }bind def}%
% \end{macrocode}
%
% Define grayscale PostScript® shding functions.
%
% \begin{macrocode}
- \pgf at sys@postscript at header{/pgfHgray{%
+ \pgf at sys@postscript at 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 at sys@postscript at header{/pgfVgray{%
+ \pgf at sys@postscript at 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}%
@@ -1996,7 +2009,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 at sys@postscript at header{/pgfR1gray{
newpath dup dup dup 0 360 arc clip newpath
dup /pgfendx exch def
@@ -2009,7 +2022,7 @@
/pgfdiffx pgfendx pgfstartx sub def
/pgfdiffy pgfendy pgfstarty sub def
dup /pgfdomb exch def
- }bind def }
+ }bind def }%
\pgf at sys@postscript at header{/pgfR2gray{
newpath 0.5 add pgfcircx pgfcircy 3 2 roll 0 360 arc
setgray fill pop}bind def }%
@@ -2033,7 +2046,7 @@
/pgfcircy pgfcircy pgfystep add def
} repeat
mark 6 1 roll cleartomark exch pop % leave only start x on stack
- }bind def}
+ }bind def}%
}
% \end{macrocode}
%
Modified: trunk/Master/texmf-dist/source/latex/pgf-cmykshadings/pgf-cmykshadings.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/pgf-cmykshadings/pgf-cmykshadings.ins 2018-10-24 00:18:04 UTC (rev 48981)
+++ trunk/Master/texmf-dist/source/latex/pgf-cmykshadings/pgf-cmykshadings.ins 2018-10-24 20:29:56 UTC (rev 48982)
@@ -36,7 +36,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
Modified: trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgf-cmykshadings.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgf-cmykshadings.sty 2018-10-24 00:18:04 UTC (rev 48981)
+++ trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgf-cmykshadings.sty 2018-10-24 20:29:56 UTC (rev 48982)
@@ -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,7 +42,8 @@
%% shadings.
%%
\ProvidesPackage{pgf-cmykshadings}%
- [2018/10/23 CMYK shadings support for PGF (DCP)]
+ [2018/10/24
+ CMYK and grayscale shadings support for PGF (DCP)]
\RequirePackage{pgf}
\def\pgf at parsefunc#1{%
\edef\temp{{#1}}%
@@ -247,9 +248,9 @@
\def\pgf at grabsemicolor;{%
\edef\pgf at conv{\pgf at conv; }\pgf at convert}
\def\pgf at gobblec c{\pgf at convert}
-\def\pgf at savecolor#1{
+\def\pgf at savecolor#1{%
\pgfutil at extractcolorspec{pgf at tempcol}{\pgf at tempcolor}%
- \expandafter\pgfutil at convertcolorspec\pgf at tempcolor%
+ \expandafter\pgfutil at convertcolorspec\pgf at tempcolor
{\pgf at shading@model}{\pgf at color}%
\expandafter\pgf at convget@\expandafter{\pgf at color}{#1}%
}
@@ -289,7 +290,7 @@
\pgf at sys@tonumber{\pgf at xc}\space}%
\expandafter\edef\csname\string#2black\endcsname{%
\pgf at sys@tonumber{\pgf at xd}\space}%
- \escapechar\c at pgf@counta%
+ \escapechar\c at pgf@counta
}
\def\pgfshading at cmyk#1,#2,#3,#4\relax{%
\pgf at xa=#1pt%
@@ -301,13 +302,13 @@
\pgfutil at colorlet{pgf at tempcol}{#1}%
\pgfutil at extractcolorspec{pgf at tempcol}{\pgf at tempcolor}%
\expandafter\pgfutil at convertcolorspec\pgf at tempcolor{gray}{\pgf at graycolor}%
- \expandafter\pgfshading at gray\pgf at graycolor\relax%
+ \expandafter\pgfshading at gray\pgf at graycolor\relax
\edef#2{\pgf at sys@tonumber{\pgf at xa}\space}%
- \c at pgf@counta\escapechar%
- \escapechar-1\relax%
+ \c at pgf@counta\escapechar
+ \escapechar-1\relax
\expandafter\edef\csname\string#2gray\endcsname{%
\pgf at sys@tonumber{\pgf at xa}\space}%
- \escapechar\c at pgf@counta%
+ \escapechar\c at pgf@counta
}
\def\pgfshading at gray#1\relax{%
\pgf at xa=#1pt%
@@ -326,7 +327,7 @@
\pgf at declareradialshading{\pgf at declareradialshading[]}}
\def\pgfdeclarefunctionalshading{%
\pgf at setup@model
- \pgfutil at ifnextchar[
+ \pgfutil at ifnextchar[%
\pgf at declarefunctionalshading{\pgf at declarefunctionalshading[]}}
\def\pgfuseshading#1{%
\edef\pgf at shadingname{@pgfshading#1}%
@@ -337,7 +338,7 @@
{%
{%
\pgf at setup@model
- \pgfutil at globalcolorsfalse%
+ \pgfutil at globalcolorsfalse
\def\pgf at shade@adds{}%
\pgfutil at ifundefined{pgf at deps\pgf at shadingname}%
{}%
@@ -349,7 +350,7 @@
{}{\applycolormixins{\@temp}}%
\pgfutil at extractcolorspec{\@temp}{\pgf at tempcolor}%
\expandafter\pgfutil at ifundefined\expandafter{%
- \pgf at shadingsavedmodel}
+ \pgf at shadingsavedmodel}%
{\expandafter\pgfutil at convertcolorspec\pgf at tempcolor{%
\pgf at shading@model}{\pgf at color}}%
{\expandafter\pgfutil at convertcolorspec\pgf at tempcolor{%
@@ -365,12 +366,12 @@
\expandafter\def\expandafter\@temp\expandafter{%
\csname pgf at func\pgf at shadingname\endcsname}%
\edef\@args{{\pgf at basename\pgf at shade@adds}}%
- \expandafter\expandafter\expandafter\def%
- \expandafter\expandafter\expandafter\@@args%
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter\@@args
\expandafter\expandafter\expandafter{%
\csname pgf at args\pgf at shadingname\endcsname}%
\expandafter\expandafter\expandafter\@temp
- \expandafter\@args\@@args%
+ \expandafter\@args\@@args
}%
}%
{}%
@@ -395,7 +396,7 @@
\ifpgfcmykshadingdefault
\def\pgf at shading@functional at range{0 1 0 1 0 1 0 1}%
\def\pgf at shading@device{/DeviceCMYK}%
- \def\pgf at shading@ps at device{setcmykcolor}%
+ \def\pgf at shading@ps at device{setcmykcolor}%
\def\pgf at shading@model{cmyk}%
\pgfshadingmodelrgbfalse
\pgfshadingmodelcmyktrue
@@ -486,7 +487,7 @@
4 3 roll
}
\def\pgfutilgetcmykshadingsdriver{%
- \expandafter\pgfutil at getcmykshadingsdriver\pgfsysdriver[
+ \expandafter\pgfutil at getcmykshadingsdriver\pgfsysdriver[%
}
\def\pgfutil at getcmykshadingsdriver pgfsys-#1[{%
\edef\pgfsyscmykshadingsdriver{pgfsys-cmykshadings-#1}%
Modified: trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-common-postscript.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-common-postscript.def 2018-10-24 00:18:04 UTC (rev 48981)
+++ trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-common-postscript.def 2018-10-24 20:29:56 UTC (rev 48982)
@@ -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 at horishading#1#2#3{%
{%
\pgf at parsefunc{#3}%
\pgfmathsetlength\pgf at x{#2}%
- \pgf at xa=\pgf at x%
+ \pgf at xa=\pgf at x
\pgf at sys@bp at correct{\pgf at x}%
- \pgf at y=\pgf at max%
+ \pgf at y=\pgf at max
\pgf at sys@bp at correct{\pgf at y}%
\expandafter\xdef\csname @pgfshading#1!\endcsname{\hbox to \the\pgf at max{%
- \noexpand\vrule width0pt height\the\pgf at xa%
- \noexpand\pgfsys at beginpurepicture%
+ \noexpand\vrule width0pt height\the\pgf at xa
+ \noexpand\pgfsys at beginpurepicture
\noexpand\pgfsys at rect{0pt}{0pt}{\the\pgf at max}{\the\pgf at xa}%
- \noexpand\pgfsys at clipnext%
- \noexpand\pgfsys at discardpath%
+ \noexpand\pgfsys at clipnext
+ \noexpand\pgfsys at discardpath
\noexpand\pgfsys at invoke{\pgf at domb\space \pgf at sys@tonumber{\pgf at x}
pgfH\pgf at shading@model\space \pgf at psfuncs\space pop}%
- \hss%
+ \hss
\noexpand\pgfsys at endpurepicture}}%
\expandafter\xdef\csname @pgfshading#1 at model!\endcsname{%
\pgf at shading@model}%
@@ -69,19 +70,19 @@
{%
\pgf at parsefunc{#3}%
\pgfmathsetlength\pgf at x{#2}%
- \pgf at xa=\pgf at x%
+ \pgf at xa=\pgf at x
\pgf at sys@bp at correct{\pgf at x}%
- \pgf at y=\pgf at max%
+ \pgf at y=\pgf at max
\pgf at sys@bp at correct{\pgf at y}%
\expandafter\xdef\csname @pgfshading#1!\endcsname{\hbox to\the\pgf at xa{%
- \noexpand\vrule width0pt height\the\pgf at max%
- \noexpand\pgfsys at beginpurepicture%
+ \noexpand\vrule width0pt height\the\pgf at max
+ \noexpand\pgfsys at beginpurepicture
\noexpand\pgfsys at rect{0pt}{0pt}{\the\pgf at xa}{\the\pgf at max}%
- \noexpand\pgfsys at clipnext%
- \noexpand\pgfsys at discardpath%
+ \noexpand\pgfsys at clipnext
+ \noexpand\pgfsys at discardpath
\noexpand\pgfsys at invoke{\pgf at domb\space \pgf at sys@tonumber{\pgf at x}
pgfV\pgf at shading@model\space \pgf at psfuncs\space pop}%
- \hss%
+ \hss
\noexpand\pgfsys at endpurepicture}}%
\expandafter\xdef\csname @pgfshading#1 at model!\endcsname{%
\pgf at shading@model}%
@@ -93,13 +94,13 @@
\pgf at process{#2}%
\pgf at sys@bp at correct{\pgf at x}%
\pgf at sys@bp at correct{\pgf at y}%
- \pgf at xa=2\pgf at max%
+ \pgf at xa=2\pgf at max
\pgf at sys@bp at correct{\pgf at max}%
- \advance\pgf at x by \pgf at max%
- \advance\pgf at y by \pgf at max%
+ \advance\pgf at x by \pgf at max
+ \advance\pgf at y by \pgf at max
\expandafter\xdef\csname @pgfshading#1!\endcsname{\hbox to \the\pgf at xa{%
- \noexpand\vrule width0pt height\the\pgf at xa%
- \noexpand\pgfsys at beginpurepicture%
+ \noexpand\vrule width0pt height\the\pgf at xa
+ \noexpand\pgfsys at beginpurepicture
\noexpand\pgfsys at invoke{%
\pgf at domb\space \pgf at sys@tonumber{\pgf at y}
\pgf at sys@tonumber{\pgf at x}
@@ -106,7 +107,7 @@
\pgf at sys@tonumber{\pgf at max} pgfR1\pgf at shading@model\space
\pgf at psfuncs\space \pgf at firstcolor\space \pgf at doma\space
pgfR2\pgf at shading@model}%
- \hss%
+ \hss
\noexpand\pgfsys at endpurepicture}}%
\expandafter\xdef\csname @pgfshading#1 at model!\endcsname{%
\pgf at shading@model}%
@@ -115,22 +116,22 @@
\def\pgfsys at functionalshading#1#2#3#4{%
{%
\pgf at process{#2}%
- \pgf at xa=\pgf at x%
- \pgf at ya=\pgf at y%
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
\pgf at process{#3}%
- \pgf at xb=\pgf at x%
- \pgf at yb=\pgf at y%
- \advance\pgf at x by-\pgf at xa%
- \advance\pgf at y by-\pgf at ya%
+ \pgf at xb=\pgf at x
+ \pgf at yb=\pgf at y
+ \advance\pgf at x by-\pgf at xa
+ \advance\pgf at y by-\pgf at ya
\pgf at sys@bp at correct{\pgf at xa}%
\pgf at sys@bp at correct{\pgf at ya}%
\pgf at sys@bp at correct{\pgf at xb}%
\pgf at sys@bp at correct{\pgf at yb}%
- \pgf at xc=-\pgf at xa%
- \pgf at yc=-\pgf at ya%
+ \pgf at xc=-\pgf at xa
+ \pgf at yc=-\pgf at ya
\expandafter\xdef\csname @pgfshading#1!\endcsname{%
\hbox to\the\pgf at x{\vbox to\the\pgf at y{\vfil
- \noexpand\pgfsys at beginpurepicture%
+ \noexpand\pgfsys at beginpurepicture
\noexpand\pgfsys at invoke{%
\pgf at sys@tonumber{\pgf at xc} \pgf at sys@tonumber{\pgf at yc} translate
1.1 setlinewidth [] 0 setdash 0 setlinecap
@@ -157,11 +158,11 @@
\pgf at sys@postscript at header{/pgfVrgb { pgfV } bind def}%
\pgf at sys@postscript at header{/pgfR1rgb { pgfR1 } bind def}%
\pgf at sys@postscript at header{/pgfR2rgb { pgfR2 } bind def}%
- \pgf at sys@postscript at header{/pgfHcmyk{%
+ \pgf at sys@postscript at 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 at sys@postscript at header{/pgfVcmyk{%
+ \pgf at sys@postscript at 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 at sys@postscript at 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 at sys@postscript at 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 at sys@postscript at header{/pgfHgray{%
+ }bind def}%
+ \pgf at sys@postscript at 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 at sys@postscript at header{/pgfVgray{%
+ \pgf at sys@postscript at 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 at sys@postscript at 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 at sys@postscript at 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}%
}
%%
%%
Modified: trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfm.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfm.def 2018-10-24 00:18:04 UTC (rev 48981)
+++ trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfm.def 2018-10-24 20:29:56 UTC (rev 48982)
@@ -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,7 +42,8 @@
%% shadings.
%%
\ProvidesFile{pgfsys-cmykshadings-dvipdfm.def}%
- [2018/10/18 CMYK shadings support for PGF dvipdfm driver (DCP)]
+ [2018/10/24
+ CMYK and grayscale shadings support for PGF dvipdfm driver (DCP)]
\def\pgfsys at horishading#1#2#3{%
{%
\pgf at parsefunc{#3}%
@@ -49,7 +50,7 @@
\pgf at process{\pgfpoint{\pgf at max}{#2}}%
\edef\@temp{\noexpand\pgfutil at insertatbegincurrentpage{%
\special{pdf: beginxobj @pgfshade#1 width \the\pgf at max\space
- height \the\pgf at y}}}\@temp%
+ height \the\pgf at y}}}\@temp
\edef\@temp{\noexpand\pgfutil at insertatbegincurrentpage{%
\special{pdf: put @resources <<
/Shading << /Sh << /ShadingType 2
@@ -73,7 +74,7 @@
\pgf at process{\pgfpoint{\pgf at max}{#2}}%
\edef\@temp{\noexpand\pgfutil at insertatbegincurrentpage{%
\special{pdf: beginxobj @pgfshade#1 width \the\pgf at y\space
- height \the\pgf at max\space}}}\@temp%
+ height \the\pgf at max\space}}}\@temp
\edef\@temp{\noexpand\pgfutil at insertatbegincurrentpage{%
\special{pdf: put @resources <<
/Shading << /Sh << /ShadingType 2
@@ -95,16 +96,16 @@
{%
\pgf at parsefunc{#3}%
\pgf at process{#2}%
- \pgf at xa=\pgf at x%
- \pgf at ya=\pgf at y%
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
\pgf at process{\pgfpoint{\pgf at max}{\pgf at max}}%
- \advance\pgf at xa by \pgf at x\relax%
- \advance\pgf at ya by \pgf at y\relax%
+ \advance\pgf at xa by \pgf at x\relax
+ \advance\pgf at ya by \pgf at y\relax
\pgf at sys@bp at correct{\pgf at x}%
\pgf at sys@bp at correct{\pgf at y}%
\pgf at sys@bp at correct{\pgf at xa}%
\pgf at sys@bp at correct{\pgf at ya}%
- \pgfutil at tempdima=2\pgf at max\relax%
+ \pgfutil at tempdima=2\pgf at max\relax
\edef\@temp{\noexpand\pgfutil at insertatbegincurrentpage{%
\special{pdf: beginxobj @pgfshade#1 width
\the\pgfutil at tempdima\space height \the\pgfutil at tempdima}}}\@temp%
Modified: trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfmx.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfmx.def 2018-10-24 00:18:04 UTC (rev 48981)
+++ trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfmx.def 2018-10-24 20:29:56 UTC (rev 48982)
@@ -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,7 +42,8 @@
%% shadings.
%%
\ProvidesFile{pgfsys-cmykshadings-dvipdfmx.def}%
- [2018/10/17 CMYK shadings support for PGF dvipdfmx driver (DCP)]
+ [2018/10/24
+ CMYK and grayscale shadings support for PGF dvipdfmx driver (DCP)]
\def\pgfsys at horishading#1#2#3{%
{%
\pgf at parsefunc{#3}%
@@ -95,22 +96,22 @@
\expandafter\xdef\csname @pgfshading#1 at model!\endcsname{%
\pgf at shading@model}%
}%
- \global\advance\pgfsys at objnum\@ne%
+ \global\advance\pgfsys at objnum\@ne
}
\def\pgfsys at radialshading#1#2#3{%
{%
\pgf at parsefunc{#3}%
\pgf at process{#2}%
- \pgf at xa=\pgf at x%
- \pgf at ya=\pgf at y%
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
\pgf at process{\pgfpoint{\pgf at max}{\pgf at max}}%
- \advance\pgf at xa by \pgf at x%
- \advance\pgf at ya by \pgf at y%
+ \advance\pgf at xa by \pgf at x
+ \advance\pgf at ya by \pgf at y
\pgf at sys@bp at correct{\pgf at x}%
\pgf at sys@bp at correct{\pgf at y}%
\pgf at sys@bp at correct{\pgf at xa}%
\pgf at sys@bp at correct{\pgf at ya}%
- \pgfutil at tempdima=2\pgf at max%
+ \pgfutil at tempdima=2\pgf at max
\edef\@tempa{\noexpand\pgfutil at insertatbegincurrentpagefrombox{%
\special{pdf:bxobj @pgfshade\the\pgfsys at objnum\space
width \the\pgfutil at tempdima\space height \the\pgfutil at tempdima}%
@@ -135,16 +136,16 @@
\expandafter\xdef\csname @pgfshading#1 at model!\endcsname{%
\pgf at shading@model}%
}%
- \global\advance\pgfsys at objnum\@ne%
+ \global\advance\pgfsys at objnum\@ne
}
\def\pgfsys at functionalshading#1#2#3#4{%
{%
\pgf at process{#2}%
- \pgf at xa=\pgf at x%
- \pgf at ya=\pgf at y%
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
\pgf at process{#3}%
- \pgf at xb=\pgf at x%
- \pgf at yb=\pgf at y%
+ \pgf at xb=\pgf at x
+ \pgf at yb=\pgf at y
\advance\pgf at x by-\pgf at xa%
\advance\pgf at y by-\pgf at ya%
\pgf at sys@bp at correct{\pgf at xa}%
@@ -151,8 +152,8 @@
\pgf at sys@bp at correct{\pgf at ya}%
\pgf at sys@bp at correct{\pgf at xb}%
\pgf at sys@bp at correct{\pgf at yb}%
- \pgf at xc=-\pgf at xa%
- \pgf at yc=-\pgf at ya%
+ \pgf at xc=-\pgf at xa
+ \pgf at yc=-\pgf at ya
% Now build the function
\edef\@tempa{\noexpand\pgfutil at insertatbegincurrentpagefrombox{%
\special{pdf:stream @pgfstream\the\pgfsys at objnum\space({#4})
@@ -181,7 +182,7 @@
\expandafter\xdef\csname @pgfshading#1 at model!\endcsname{%
\pgf at shading@model}%
}%
- \global\advance\pgfsys at objnum\@ne%
+ \global\advance\pgfsys at objnum\@ne
}
%%
%%
Modified: trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvips.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvips.def 2018-10-24 00:18:04 UTC (rev 48981)
+++ trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvips.def 2018-10-24 20:29:56 UTC (rev 48982)
@@ -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,7 +42,8 @@
%% shadings.
%%
\ProvidesFile{pgfsys-cmykshadings-dvips.def}%
- [2018/10/23 CMYK shadings support for PGF dvips driver (DCP)]
+ [2018/10/24
+ CMYK and grayscale shadings support for PGF dvips driver (DCP)]
\input pgfsys-cmykshadings-common-postscript.def
%%
%%
Modified: trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-luatex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-luatex.def 2018-10-24 00:18:04 UTC (rev 48981)
+++ trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-luatex.def 2018-10-24 20:29:56 UTC (rev 48982)
@@ -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,7 +42,8 @@
%% shadings.
%%
\ProvidesFile{pgfsys-cmykshadings-luatex.def}%
- [2018/10/17 CMYK shadings support for PGF luatex driver (DCP)]
+ [2018/10/24
+ CMYK and grayscale shadings support for PGF luatex driver (DCP)]
\def\pgfsys at horishading#1#2#3{%
{%
\pgf at parsefunc{#3}%
@@ -89,11 +90,11 @@
\setbox\pgfutil at tempboxa=\hbox to2\pgf at max{%
\vbox to2\pgf at max{\vfil\pgfsys at invoke{/Sh sh}}\hfil}%
\pgf at process{#2}%
- \pgf at xa=\pgf at x%
- \pgf at ya=\pgf at y%
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
\pgf at process{\pgfpoint{\pgf at max}{\pgf at max}}%
- \advance\pgf at xa by \pgf at x%
- \advance\pgf at ya by \pgf at y%
+ \advance\pgf at xa by \pgf at x
+ \advance\pgf at ya by \pgf at y
\pgf at sys@bp at correct{\pgf at x}%
\pgf at sys@bp at correct{\pgf at y}%
\pgf at sys@bp at correct{\pgf at xa}%
@@ -119,13 +120,13 @@
\def\pgfsys at functionalshading#1#2#3#4{%
{%
\pgf at process{#2}%
- \pgf at xa=\pgf at x%
- \pgf at ya=\pgf at y%
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
\pgf at process{#3}%
- \pgf at xb=\pgf at x%
- \pgf at yb=\pgf at y%
- \advance\pgf at x by-\pgf at xa%
- \advance\pgf at y by-\pgf at ya%
+ \pgf at xb=\pgf at x
+ \pgf at yb=\pgf at y
+ \advance\pgf at x by-\pgf at xa
+ \advance\pgf at y by-\pgf at ya
\setbox\pgfutil at tempboxa=\hbox to\pgf at x{%
\vbox to\pgf at y{\vfil\pgfsys at invoke{/Sh sh}}\hfil}%
\pgf at sys@bp at correct{\pgf at xa}%
@@ -132,8 +133,8 @@
\pgf at sys@bp at correct{\pgf at ya}%
\pgf at sys@bp at correct{\pgf at xb}%
\pgf at sys@bp at correct{\pgf at yb}%
- \pgf at xc=-\pgf at xa%
- \pgf at yc=-\pgf at ya%
+ \pgf at xc=-\pgf at xa
+ \pgf at yc=-\pgf at ya
% Now build the function
\pdfextension obj
stream
Modified: trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-pdftex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-pdftex.def 2018-10-24 00:18:04 UTC (rev 48981)
+++ trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-pdftex.def 2018-10-24 20:29:56 UTC (rev 48982)
@@ -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,7 +42,8 @@
%% shadings.
%%
\ProvidesFile{pgfsys-cmykshadings-pdftex.def}%
- [2018/10/17 CMYK shadings support for PGF pdftex driver (DCP)]
+ [2018/10/24
+ CMYK and grayscale shadings support for PGF pdftex driver (DCP)]
\def\pgfsys at horishading#1#2#3{%
{%
\pgf at parsefunc{#3}%
@@ -89,11 +90,11 @@
\setbox\pgfutil at tempboxa=\hbox to2\pgf at max{%
\vbox to2\pgf at max{\vfil\pgfsys at invoke{/Sh sh}}\hfil}%
\pgf at process{#2}%
- \pgf at xa=\pgf at x%
- \pgf at ya=\pgf at y%
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
\pgf at process{\pgfpoint{\pgf at max}{\pgf at max}}%
- \advance\pgf at xa by \pgf at x%
- \advance\pgf at ya by \pgf at y%
+ \advance\pgf at xa by \pgf at x
+ \advance\pgf at ya by \pgf at y
\pgf at sys@bp at correct{\pgf at x}%
\pgf at sys@bp at correct{\pgf at y}%
\pgf at sys@bp at correct{\pgf at xa}%
@@ -119,13 +120,13 @@
\def\pgfsys at functionalshading#1#2#3#4{%
{%
\pgf at process{#2}%
- \pgf at xa=\pgf at x%
- \pgf at ya=\pgf at y%
+ \pgf at xa=\pgf at x
+ \pgf at ya=\pgf at y
\pgf at process{#3}%
- \pgf at xb=\pgf at x%
- \pgf at yb=\pgf at y%
- \advance\pgf at x by-\pgf at xa%
- \advance\pgf at y by-\pgf at ya%
+ \pgf at xb=\pgf at x
+ \pgf at yb=\pgf at y
+ \advance\pgf at x by-\pgf at xa
+ \advance\pgf at y by-\pgf at ya
\setbox\pgfutil at tempboxa=\hbox to\pgf at x{%
\vbox to\pgf at y{\vfil\pgfsys at invoke{/Sh sh}}\hfil}%
\pgf at sys@bp at correct{\pgf at xa}%
@@ -132,8 +133,8 @@
\pgf at sys@bp at correct{\pgf at ya}%
\pgf at sys@bp at correct{\pgf at xb}%
\pgf at sys@bp at correct{\pgf at yb}%
- \pgf at xc=-\pgf at xa%
- \pgf at yc=-\pgf at ya%
+ \pgf at xc=-\pgf at xa
+ \pgf at yc=-\pgf at ya
% Now build the function
\pdfobj
stream
Modified: trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-textures.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-textures.def 2018-10-24 00:18:04 UTC (rev 48981)
+++ trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-textures.def 2018-10-24 20:29:56 UTC (rev 48982)
@@ -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,7 +42,8 @@
%% shadings.
%%
\ProvidesFile{pgfsys-cmykshadings-textures.def}%
- [2018/10/23 CMYK shadings support for PGF textures driver (DCP)]
+ [2018/10/24
+ CMYK and grayscale shadings support for PGF textures driver (DCP)]
\input pgfsys-cmykshadings-common-postscript.def
%%
%%
Modified: trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-vtex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-vtex.def 2018-10-24 00:18:04 UTC (rev 48981)
+++ trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-vtex.def 2018-10-24 20:29:56 UTC (rev 48982)
@@ -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,7 +42,8 @@
%% shadings.
%%
\ProvidesFile{pgfsys-cmykshadings-vtex.def}%
- [2018/10/23 CMYK shadings support for PGF vtex driver (DCP)]
+ [2018/10/24
+ CMYK and grayscale shadings support for PGF vtex driver (DCP)]
\input pgfsys-cmykshadings-common-postscript.def
%%
%%
Modified: trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-xetex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-xetex.def 2018-10-24 00:18:04 UTC (rev 48981)
+++ trunk/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-xetex.def 2018-10-24 20:29:56 UTC (rev 48982)
@@ -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,7 +42,8 @@
%% shadings.
%%
\ProvidesFile{pgfsys-cmykshadings-xetex.def}%
- [2018/10/17 CMYK shadings support for PGF xetex driver (DCP)]
+ [2018/10/24
+ CMYK and grayscale shadings support for PGF xetex driver (DCP)]
\input pgfsys-cmykshadings-dvipdfmx.def
%%
%%
More information about the tex-live-commits
mailing list