diff options
14 files changed, 160 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/latex/pgf-cmykshadings/README.md b/Master/texmf-dist/doc/latex/pgf-cmykshadings/README.md index ecb448ff59a..4af6b8b5c86 100644 --- a/Master/texmf-dist/doc/latex/pgf-cmykshadings/README.md +++ b/Master/texmf-dist/doc/latex/pgf-cmykshadings/README.md @@ -1,5 +1,10 @@ # pgf-cmykshadings — Support for CMYK and grayscale shadings in PGF/TikZ +> **Note: This package is now deprecated. Support for CMYK and grayscale +> shadings was added to `pgf` in version 3.1.3. Attempting to load it with +> recent versions of `pgf` only changes the default shading colour model with +> the `xcolor` `natural` colour model to CMYK.** + The `pgf-cmykshadings` package provides support for CMYK and grayscale shadings for the `pgf` package. By default `pgf` only supports RGB shadings. `pgf-cmykshadings` attempts to produce shadings consistent with the currently @@ -58,7 +63,7 @@ l3build install --full ## Licence ``` -Copyright (c) 2018 David Purton <dcpurton@marshwiggle.net> +Copyright (c) 2018-2019 David Purton <dcpurton@marshwiggle.net> This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license diff --git a/Master/texmf-dist/doc/latex/pgf-cmykshadings/pgf-cmykshadings.pdf b/Master/texmf-dist/doc/latex/pgf-cmykshadings/pgf-cmykshadings.pdf Binary files differindex 8997be41a27..ad93e7325c1 100644 --- a/Master/texmf-dist/doc/latex/pgf-cmykshadings/pgf-cmykshadings.pdf +++ b/Master/texmf-dist/doc/latex/pgf-cmykshadings/pgf-cmykshadings.pdf diff --git a/Master/texmf-dist/source/latex/pgf-cmykshadings/pgf-cmykshadings.dtx b/Master/texmf-dist/source/latex/pgf-cmykshadings/pgf-cmykshadings.dtx index 4690901981e..4842cd1edad 100644 --- a/Master/texmf-dist/source/latex/pgf-cmykshadings/pgf-cmykshadings.dtx +++ b/Master/texmf-dist/source/latex/pgf-cmykshadings/pgf-cmykshadings.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%Copyright (c) 2018 David Purton <dcpurton@marshwiggle.net> +%Copyright (c) 2018-2019 David Purton <dcpurton@marshwiggle.net> % %This work may be distributed and/or modified under the conditions of %the LaTeX Project Public License, either version 1.3c of this license @@ -24,14 +24,21 @@ % \fi % % \changes{v1.0}{2018/10/17}{First public release} +% \changes{v1.2}{2019/11/05}{Deprecate package} % % \title{The \pkg{pgf-cmykshadings} package} % \author{David Purton\thanks{Email: \url{dcpurton@marshwiggle.net}}} -% \date{2018/10/24 v1.1a} +% \date{2019/11/05 v1.2} % % \maketitle % % \begin{abstract} +% \textbf{Note: This package is now deprecated. Support for CMYK and grayscale +% shadings was added to \pkg{pgf} in version 3.1.3. Attempting to load it with +% recent versions of \pkg{pgf} only changes the default shading colour model +% with the \pkg{xcolor} |natural| colour model to CMYK. This documentation +% applies to versions of \pkg{pgf} prior to 3.1.3.}\medskip +% % The \pkg{pgf-cmykshadings} package provides support for CMYK and grayscale % shadings for the \pkg{pgf} package. By default \pkg{pgf} only supports RGB % shadings. \pkg{pgf-cmykshadings} attempts to produce shadings consistent @@ -134,7 +141,7 @@ % % \subsubsection{Package options} % -% \pkg{pgd-cmykshadings} supports the following package options: +% \pkg{pgf-cmykshadings} supports the following package options: % % \begin{description} % \item[\mdseries |cmyk|] (default) to use CMYK shadings when the \pkg{xcolor} @@ -561,7 +568,7 @@ % % \begin{macrocode} \ProvidesPackage{pgf-cmykshadings}% - [2018/10/24 + [2019/11/05 CMYK and grayscale shadings support for PGF (DCP)] % \end{macrocode} % @@ -569,6 +576,74 @@ \RequirePackage{pgf} % \end{macrocode} % +% Set colour model to CMYK by default if version of \pkg{pgf} is at least +% 3.1.3 then |\endinput|. +% +% \begin{macrocode} +\@ifpackagelater{pgf}{2019/05/14}{% + \PackageWarning{pgf-cmykshadings}{% + Package `pgf-cmykshadings' is now deprecated.}% + \newif\ifpgfcmykshadingdefault + \DeclareOption{cmyk}{% + \pgfcmykshadingdefaulttrue + } + \DeclareOption{rgb}{% + \pgfcmykshadingdefaultfalse + } + \ExecuteOptions{cmyk} + \ProcessOptions\relax + \def\pgf@setup@shading@model{% + \pgfshadingmodelrgbtrue + \pgfshadingmodelcmykfalse + \pgfshadingmodelgrayfalse + \XC@sdef\pgf@mod@test{\XC@tgt@mod{natural}}% + \def\pgf@shading@device{/DeviceRGB}% + \def\pgf@shading@ps@device{setrgbcolor}% + \def\pgf@shading@functional@range{0 1 0 1 0 1}% + \def\pgf@shading@model{rgb}% + \ifx\pgf@mod@test\XC@mod@natural + \ifpgfcmykshadingdefault + \def\pgf@shading@functional@range{0 1 0 1 0 1 0 1}% + \def\pgf@shading@device{/DeviceCMYK}% + \def\pgf@shading@ps@device{setcmykcolor}% + \def\pgf@shading@model{cmyk}% + \pgfshadingmodelrgbfalse + \pgfshadingmodelcmyktrue + \else + \def\pgf@shading@functional@range{0 1 0 1 0 1}% + \def\pgf@shading@device{/DeviceRGB}% + \def\pgf@shading@ps@device{setrgbcolor}% + \def\pgf@shading@model{rgb}% + \fi + \fi + \ifx\pgf@mod@test\XC@mod@cmyk + \def\pgf@shading@device{/DeviceCMYK}% + \def\pgf@shading@ps@device{setcmykcolor}% + \def\pgf@shading@functional@range{0 1 0 1 0 1 0 1}% + \def\pgf@shading@model{cmyk}% + \pgfshadingmodelrgbfalse + \pgfshadingmodelcmyktrue + \fi + \ifx\pgf@mod@test\XC@mod@gray + \def\pgf@shading@device{/DeviceGray}% + \def\pgf@shading@ps@device{setgray}% + \def\pgf@shading@functional@range{0 1}% + \def\pgf@shading@model{gray}% + \pgfshadingmodelrgbfalse + \pgfshadingmodelgraytrue + \fi + \edef\pgf@sys@driver@dvisvgm{pgfsys-dvisvgm.def}% + \ifx\pgfsysdriver\pgf@sys@driver@dvisvgm + \def\pgf@shading@model{rgb}% + \fi + \edef\pgf@sys@driver@texforht{pgfsys-tex4ht.def}% + \ifx\pgfsysdriver\pgf@sys@driver@texforht + \def\pgf@shading@model{rgb}% + \fi + }% + \endinput}{} +% \end{macrocode} +% % \noindent Replace dependence on \cs{pgf@convertrgbstring} and % \cs{pgf@rgbconv} with generic macros \cs{pgf@convertstring} and % \cs{pgf@conv}. diff --git a/Master/texmf-dist/source/latex/pgf-cmykshadings/pgf-cmykshadings.ins b/Master/texmf-dist/source/latex/pgf-cmykshadings/pgf-cmykshadings.ins index 8225b0f4caf..09cf29f420b 100644 --- a/Master/texmf-dist/source/latex/pgf-cmykshadings/pgf-cmykshadings.ins +++ b/Master/texmf-dist/source/latex/pgf-cmykshadings/pgf-cmykshadings.ins @@ -1,6 +1,6 @@ \iffalse meta-comment -Copyright (c) 2018 David Purton <dcpurton@marshwiggle.net> +Copyright (c) 2018-2019 David Purton <dcpurton@marshwiggle.net> This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license @@ -19,7 +19,7 @@ version 2005/12/01 or later. This is a generated file. -Copyright (c) 2018 David Purton <dcpurton@marshwiggle.net> +Copyright (c) 2018-2019 David Purton <dcpurton@marshwiggle.net> This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license diff --git a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgf-cmykshadings.sty b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgf-cmykshadings.sty index 3ff21fe898a..8114b3f4849 100644 --- a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgf-cmykshadings.sty +++ b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgf-cmykshadings.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (c) 2018 David Purton <dcpurton@marshwiggle.net> +%% Copyright (c) 2018-2019 David Purton <dcpurton@marshwiggle.net> %% %% This work may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3c of this license @@ -42,9 +42,71 @@ %% shadings. %% \ProvidesPackage{pgf-cmykshadings}% - [2018/10/24 + [2019/11/05 CMYK and grayscale shadings support for PGF (DCP)] \RequirePackage{pgf} +\@ifpackagelater{pgf}{2019/05/14}{% + \PackageWarning{pgf-cmykshadings}{% + Package `pgf-cmykshadings' is now deprecated.}% + \newif\ifpgfcmykshadingdefault + \DeclareOption{cmyk}{% + \pgfcmykshadingdefaulttrue + } + \DeclareOption{rgb}{% + \pgfcmykshadingdefaultfalse + } + \ExecuteOptions{cmyk} + \ProcessOptions\relax + \def\pgf@setup@shading@model{% + \pgfshadingmodelrgbtrue + \pgfshadingmodelcmykfalse + \pgfshadingmodelgrayfalse + \XC@sdef\pgf@mod@test{\XC@tgt@mod{natural}}% + \def\pgf@shading@device{/DeviceRGB}% + \def\pgf@shading@ps@device{setrgbcolor}% + \def\pgf@shading@functional@range{0 1 0 1 0 1}% + \def\pgf@shading@model{rgb}% + \ifx\pgf@mod@test\XC@mod@natural + \ifpgfcmykshadingdefault + \def\pgf@shading@functional@range{0 1 0 1 0 1 0 1}% + \def\pgf@shading@device{/DeviceCMYK}% + \def\pgf@shading@ps@device{setcmykcolor}% + \def\pgf@shading@model{cmyk}% + \pgfshadingmodelrgbfalse + \pgfshadingmodelcmyktrue + \else + \def\pgf@shading@functional@range{0 1 0 1 0 1}% + \def\pgf@shading@device{/DeviceRGB}% + \def\pgf@shading@ps@device{setrgbcolor}% + \def\pgf@shading@model{rgb}% + \fi + \fi + \ifx\pgf@mod@test\XC@mod@cmyk + \def\pgf@shading@device{/DeviceCMYK}% + \def\pgf@shading@ps@device{setcmykcolor}% + \def\pgf@shading@functional@range{0 1 0 1 0 1 0 1}% + \def\pgf@shading@model{cmyk}% + \pgfshadingmodelrgbfalse + \pgfshadingmodelcmyktrue + \fi + \ifx\pgf@mod@test\XC@mod@gray + \def\pgf@shading@device{/DeviceGray}% + \def\pgf@shading@ps@device{setgray}% + \def\pgf@shading@functional@range{0 1}% + \def\pgf@shading@model{gray}% + \pgfshadingmodelrgbfalse + \pgfshadingmodelgraytrue + \fi + \edef\pgf@sys@driver@dvisvgm{pgfsys-dvisvgm.def}% + \ifx\pgfsysdriver\pgf@sys@driver@dvisvgm + \def\pgf@shading@model{rgb}% + \fi + \edef\pgf@sys@driver@texforht{pgfsys-tex4ht.def}% + \ifx\pgfsysdriver\pgf@sys@driver@texforht + \def\pgf@shading@model{rgb}% + \fi + }% + \endinput}{} \def\pgf@parsefunc#1{% \edef\temp{{#1}}% \expandafter\pgf@convertstring\temp% 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 585e69a7a7b..4ffb3dc4282 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 @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (c) 2018 David Purton <dcpurton@marshwiggle.net> +%% Copyright (c) 2018-2019 David Purton <dcpurton@marshwiggle.net> %% %% This work may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3c of this license diff --git a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfm.def b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfm.def index 49768f0be21..a407a2e8362 100644 --- a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfm.def +++ b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfm.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (c) 2018 David Purton <dcpurton@marshwiggle.net> +%% Copyright (c) 2018-2019 David Purton <dcpurton@marshwiggle.net> %% %% This work may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3c of this license diff --git a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfmx.def b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfmx.def index 89cf7f18190..2e3553eb1cb 100644 --- a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvipdfmx.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (c) 2018 David Purton <dcpurton@marshwiggle.net> +%% Copyright (c) 2018-2019 David Purton <dcpurton@marshwiggle.net> %% %% This work may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3c of this license diff --git a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvips.def b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvips.def index b4756167c3a..9559944bfbf 100644 --- a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvips.def +++ b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-dvips.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (c) 2018 David Purton <dcpurton@marshwiggle.net> +%% Copyright (c) 2018-2019 David Purton <dcpurton@marshwiggle.net> %% %% This work may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3c of this license diff --git a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-luatex.def b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-luatex.def index 91da115559b..93184de8dc6 100644 --- a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-luatex.def +++ b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-luatex.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (c) 2018 David Purton <dcpurton@marshwiggle.net> +%% Copyright (c) 2018-2019 David Purton <dcpurton@marshwiggle.net> %% %% This work may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3c of this license diff --git a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-pdftex.def b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-pdftex.def index 6073ffea8e2..9d28dbece54 100644 --- a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-pdftex.def +++ b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-pdftex.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (c) 2018 David Purton <dcpurton@marshwiggle.net> +%% Copyright (c) 2018-2019 David Purton <dcpurton@marshwiggle.net> %% %% This work may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3c of this license diff --git a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-textures.def b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-textures.def index c58ceb607fe..0b8f85b9ec4 100644 --- a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-textures.def +++ b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-textures.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (c) 2018 David Purton <dcpurton@marshwiggle.net> +%% Copyright (c) 2018-2019 David Purton <dcpurton@marshwiggle.net> %% %% This work may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3c of this license diff --git a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-vtex.def b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-vtex.def index fe39c7eaa26..7e2fb8569e1 100644 --- a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-vtex.def +++ b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-vtex.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (c) 2018 David Purton <dcpurton@marshwiggle.net> +%% Copyright (c) 2018-2019 David Purton <dcpurton@marshwiggle.net> %% %% This work may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3c of this license diff --git a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-xetex.def b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-xetex.def index 0f9d33c271b..c11b21d1dbf 100644 --- a/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-xetex.def +++ b/Master/texmf-dist/tex/latex/pgf-cmykshadings/pgfsys-cmykshadings-xetex.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (c) 2018 David Purton <dcpurton@marshwiggle.net> +%% Copyright (c) 2018-2019 David Purton <dcpurton@marshwiggle.net> %% %% This work may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3c of this license |