texlive[50585] Master/texmf-dist: colorspace (25mar19)
commits+karl at tug.org
commits+karl at tug.org
Mon Mar 25 21:46:22 CET 2019
Revision: 50585
http://tug.org/svn/texlive?view=revision&revision=50585
Author: karl
Date: 2019-03-25 21:46:21 +0100 (Mon, 25 Mar 2019)
Log Message:
-----------
colorspace (25mar19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/colorspace/colorspace.pdf
trunk/Master/texmf-dist/doc/latex/colorspace/colorspace.tex
trunk/Master/texmf-dist/tex/latex/colorspace/colorspace.sty
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/colorspace/README.md
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/colorspace/README
Deleted: trunk/Master/texmf-dist/doc/latex/colorspace/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/colorspace/README 2019-03-25 17:27:50 UTC (rev 50584)
+++ trunk/Master/texmf-dist/doc/latex/colorspace/README 2019-03-25 20:46:21 UTC (rev 50585)
@@ -1,29 +0,0 @@
-colorspace
------------
-
-This package provides some tools related to PDF color spaces and color
-management. It requires xcolor, which is loaded if it has not been
-before.
-
-Currently it supports what I think are the most common tools:
-
-* Spot colors (CMYK and CIE LAB)
-* Mixed spot and process colors (up to 4)
-* ICC based default CMYK, RGB and Gray spaces
-* Overprinting
-
-Currently only pdftex and luatex are supported. It seems to work with tikz.
-
-For example, to define a spot color, just say something like:
-
-\definespotcolor{foo}{BarTone 555 GN}{.3, .4, .5, .6}
-
-That's all.
-
-What's new
-----------
-
-* 1.2.0 CIE LAB spot colors (including mixed inks with a CMYK alternative)
-* 1.1.1 is compatible with luatex 0.95
-
-2016-10-05
\ No newline at end of file
Added: trunk/Master/texmf-dist/doc/latex/colorspace/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/colorspace/README.md (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/colorspace/README.md 2019-03-25 20:46:21 UTC (rev 50585)
@@ -0,0 +1,38 @@
+## colorspace
+
+This package provides some tools related to PDF color spaces and color
+management. It requires xcolor, which is loaded if it has not been
+before.
+
+Currently it supports what I think are the most common tools:
+
+* Spot colors (CMYK and CIE LAB)
+* Mixed spot and process colors (up to 4)
+* ICC based default CMYK, RGB and Gray spaces
+* Overprinting
+
+Currently only pdftex and luatex are supported. It seems to work with tikz.
+
+For example, to define a spot color, just say something like:
+
+\definespotcolor{foo}{BarTone 555 GN}{.3, .4, .5, .6}
+
+That's all.
+
+### Latest changes
+
+```
+* 1.3 Fixes several incompatibilities with pgf/tikz
+* 1.2.0 CIE LAB spot colors (including mixed inks with a
+ CMYK alternative)
+* 1.1.1 is compatible with luatex 0.95
+```
+
+License: MIT
+
+Repository: https://github.com/jbezos/colorspace
+
+________
+Javier Bezos --- http://www.texnia.com
+
+2019-03-25
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/latex/colorspace/README.md
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/colorspace/colorspace.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/colorspace/colorspace.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/colorspace/colorspace.tex 2019-03-25 17:27:50 UTC (rev 50584)
+++ trunk/Master/texmf-dist/doc/latex/colorspace/colorspace.tex 2019-03-25 20:46:21 UTC (rev 50585)
@@ -1,32 +1,20 @@
-% +--------------------------------------------------+
-% | Typeset this file to get the documentation. |
-% +--------------------------------------------------+
%
-%% Copyright (C) 2015-2016 Javier Bezos
-%% All Rights Reserved
-%% http://www.texnia.com
-%%
-%% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3 of this
-%% license or (at your option) any later version. The latest version
-%% of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
-%%
-%% This work has the LPPL maintenance status "maintained".
-%%
-%% This Current Maintainer of this work is Javier Bezos.
-%%
-%% This work consists of the files colorspace.tex and colorspace.sty.
+% Copyright (C) 2015-2019 Javier Bezos http://www.texnia.com
+%
+% This file may be distributed and/or modified under the conditions of
+% the MIT License. A version can be found at the end of this file.
+%
+% Repository: https://github.com/jbezos/colorspace
+%
+
\documentclass[a4paper]{ltxguide}
-\title{\textsf{colorspace}\\\large Version 1.2.0}
+\title{\textsf{colorspace}\\\large Version 1.3}
\author{Javier Bezos\\\texttt{http://www.texnia.com}}
-\date{2016-10-05}
-
+\date{2019-03-25}
+
\raggedright
\parskip=.8ex
\advance\oddsidemargin-.7cm
@@ -78,7 +66,7 @@
{\fontsize{48}{48}\selectfont colorspace\par}
{\LARGE Spot colors, mixed inks and more\par}
\vspace*{1ex}
-Version 1.2.0 (2016-10-05)\par
+Version 1.3 (2019-03-25)\par
Javier Bezos (\texttt{http://www.texnia.com})
\vspace*{6ex}
@@ -119,7 +107,9 @@
This package is still evolving, but the basic behaviour described here
will be preserved in future versions. However, some functions from
-\textsf{xcolor} might not work yet (for example \verb|\selectcolormodel|).
+\textsf{xcolor} might not work yet (for example
+\verb|\selectcolormodel| and the corresponding package options |cmyk|
+and the like).
Declarations are global and should go in the preamble.
@@ -510,7 +500,6 @@
\resetpagecolorspace
\end{verbatim}
-
\end{example}
\section{Overprinting}
@@ -547,11 +536,28 @@
1.2.0. CIE LAB spot colors and |illuminant|. Manual rewritten.
+1.3. Fixes several incompatibilities with \textsf{pgf}/\textsf{tikz}.
+
\end{document}
+MIT License
+-----------
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
-
-
-
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Modified: trunk/Master/texmf-dist/tex/latex/colorspace/colorspace.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/colorspace/colorspace.sty 2019-03-25 17:27:50 UTC (rev 50584)
+++ trunk/Master/texmf-dist/tex/latex/colorspace/colorspace.sty 2019-03-25 20:46:21 UTC (rev 50585)
@@ -1,28 +1,13 @@
-% +--------------------------------------------------+
-% | Typeset colorspace.tex to get the documentation. |
-% +--------------------------------------------------+
%
-%% Copyright (C) 2015-2016 Javier Bezos
-%% All Rights Reserved
-%% http://www.texnia.com
-%%
-%% This work may be distributed and/or modified under the conditions
-%% of the LaTeX Project Public License, either version 1.3 of this
-%% license or (at your option) any later version. The latest version
-%% of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
-%%
-%% This work has the LPPL maintenance status "maintained".
-%%
-%% This Current Maintainer of this work is Javier Bezos.
-%%
-%% This work consists of the files colorspace.tex and colorspace.sty.
+% Copyright (C) 2015-2019 Javier Bezos http://www.texnia.com
+%
+% This file may be distributed and/or modified under the conditions of
+% the MIT License. A version can be found at the end of this file.
+%
+% Repository: https://github.com/jbezos/colorspace
+%
-\ProvidesPackage{colorspace}
- [2016/10/05 v1.2.0 PDF color spaces (spot colors...) for
- pdftex and luatex]
+\ProvidesPackage{colorspace}[2019/03/25 v1.3 PDF color spaces]
\edef\spc at savedcatcodes{%
\catcode`\noexpand\/=\the\catcode`\/
@@ -49,7 +34,7 @@
\protected\def\spc at Colorstack{\pdfextension colorstack}
\def\spc at Colorstackinit{\pdffeedback colorstackinit}
\fi
-
+
\def\spc at unknown#1#2{%
\@ifundefined{#1}%
{\PackageError{colorspace}{Unknown #2}%
@@ -73,6 +58,9 @@
\XC at sdef\XC at mod@&spot{&spot}
\def\color@&spot#1#2{%
+ \ifx\spc at ir\@undefined
+ \expandafter\spc at getref\current at color\@@
+ \fi
\c at lor@arg{#2}%
\edef#1{\spc at ir\space cs \spc at ir\space CS #2 sc #2 SC}}
\def\XC at clr@&spot at white{0}
@@ -146,7 +134,7 @@
\def\spc at tempd##1,{% comma -> space
\ifx\@empty##1\else##1 \expandafter\spc at tempd\fi}%
\edef\spc at lab@values{\expandafter\spc at tempd\spc at lab@values,\@empty,}}
-
+
\def\spc at defsc@i#1#2#3#4{%
\def\spc at tempc##1 ##2{% Converts spaces to #20
##1%
@@ -183,8 +171,16 @@
\let\spc at elt\relax
\xdef\spc at csall{\spc at csall\spc at elt2{#1}}}
+% The pgf stuff *must* go before \resetpagecolorspace
\AtBeginDocument{%
- \ifx\spc at csall\@empty\else % ie, if spot/iccbased colors
+ \ifx\spc at csall\@empty\else % ie, if spot/iccbased colors only
+ \ifx\pgf at sys@pgf at resource@list at colorspaces\@undefined\else
+ \def\spc at everycs{\pgf at sys@pgf at resource@list at colorspaces}%
+ \edef\spc at tempa{% Remove pgf "static" ColorSpace
+ \noexpand\spc at remcs\the\spc at Pageresources
+ \noexpand\spc at remcs{\pgf at sys@pdf at colrospaces@objnum}}%
+ \spc at tempa
+ \fi
\resetpagecolorspace
\fi}
@@ -204,7 +200,7 @@
\DeclareOption{illuminant=d55}{\spc at illum@obj{0.9568 1 0.9214}}
\DeclareOption{illuminant=d65}{\spc at illum@obj{0.9504 1 1.0888}}
\DeclareOption{illuminant=d75}{\spc at illum@obj{0.9497 1 1.2261}}
-
+
% Page color spaces. The arrays mapping the spot colors to the obj
% refs are saved into the pdf as objects, and then we also save its
% reference for later recovery. Well, \pdfpageresources is not
@@ -218,6 +214,8 @@
\let\spc at currcs\@empty
\let\spc at cs@\@empty
+\let\spc at everycs\@empty
+
\newcommand\pagecolorspace[1]{%
\protected at edef\spc at tempa{{#1}}%
\expandafter\spc at pagecs\spc at tempa}
@@ -224,10 +222,10 @@
\def\spc at pagecs#1{%
\ifx\spc at currcs\@empty\else
- \edef\tempa{%
+ \edef\spc at tempa{%
\noexpand\spc at remcs\the\spc at Pageresources
\noexpand\spc at remcs{\spc at currcs}}%
- \tempa
+ \spc at tempa
\fi
\let\spc at tempd\@empty % list with known spaces
\@for\spc at tempa:=#1\do{%
@@ -248,7 +246,7 @@
\fi}%
\spc at csall % Uses \spc at elt
\@ifundefined{spc at cs@\spc at tempc}%
- {\immediate\spc at Obj{<< \spc at tempb>>}%
+ {\immediate\spc at Obj{<< \spc at everycs\space\spc at tempb>>}%
\expandafter\xdef\csname spc at cs@\spc at tempc\endcsname{\the\spc at Lastobj}}%
{}%
\expandafter\let\expandafter\spc at currcs\csname spc at cs@\spc at tempc\endcsname
@@ -534,7 +532,6 @@
/Default\spc@@space\space\the\spc at Lastobj\space 0 R}%
\endgroup}
-
% ==== Overprint/Knokout ====
\DeclareOption{overprint}{\def\spc at op{1}}
@@ -568,10 +565,13 @@
\immediate\spc at Obj{<< /Type /ExtGState /op true /OP true /OPM 1 >>}%
\edef\spc at tempa{\spc at tempa/SPCop \the\spc at Lastobj\space 0 R }%
\immediate\spc at Obj{<< \spc at tempa>>}%
-\edef\spc at tempa{\global\spc at Pageresources{\the\spc at Pageresources
- \space /ExtGState \the\spc at Lastobj\space 0 R }}
-\spc at tempa
+\edef\spc at op@saveobj{\the\spc at Lastobj}
+\AtBeginDocument{%
+ \edef\spc at tempa{\global\spc at Pageresources{\the\spc at Pageresources
+ \space /ExtGState \spc at op@saveobj\space 0 R }}%
+ \spc at tempa}
+
\def\spc at setop{%
\spc at Colorstack\spc at opstack push{\spc at getop}%
\aftergroup\spc at resetop}
@@ -590,3 +590,25 @@
\spc at savedcatcodes
\endinput
+
+MIT License
+-----------
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
More information about the tex-live-commits
mailing list