texlive[42053] Master/texmf-dist: colorspace (13sep16)
commits+karl at tug.org
commits+karl at tug.org
Tue Sep 13 23:51:47 CEST 2016
Revision: 42053
http://tug.org/svn/texlive?view=revision&revision=42053
Author: karl
Date: 2016-09-13 23:51:46 +0200 (Tue, 13 Sep 2016)
Log Message:
-----------
colorspace (13sep16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/colorspace/README
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/colorspaceshade.png
Modified: trunk/Master/texmf-dist/doc/latex/colorspace/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/colorspace/README 2016-09-13 10:10:45 UTC (rev 42052)
+++ trunk/Master/texmf-dist/doc/latex/colorspace/README 2016-09-13 21:51:46 UTC (rev 42053)
@@ -8,7 +8,7 @@
* ICC based default CMYK, RGB and Gray spaces
* overprinting
-It requires xcolor and currently only pdftex and luatex.
+It requires xcolor and currently only supports pdftex and luatex.
For example, to define a spot color, just say:
@@ -20,4 +20,6 @@
the basic behaviour described here will be preserved in future
versions.
-2015-06-01
\ No newline at end of file
+Version 1.1.1 is compatible with luatex 0.95
+
+2016-06-19
\ No newline at end of file
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 2016-09-13 10:10:45 UTC (rev 42052)
+++ trunk/Master/texmf-dist/doc/latex/colorspace/colorspace.tex 2016-09-13 21:51:46 UTC (rev 42053)
@@ -2,9 +2,9 @@
% | Typeset this file to get the documentation. |
% +--------------------------------------------------+
%
-%% Copyright (C) 2015 Javier Bezos
+%% Copyright (C) 2015-2016 Javier Bezos
%% All Rights Reserved
-%% http://www.tex-tipografia.com
+%% 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
@@ -19,50 +19,109 @@
%% This Current Maintainer of this work is Javier Bezos.
%%
%% This work consists of the files colorspace.tex and colorspace.sty.
-\documentclass{article}
+\documentclass[a4paper]{ltxguide}
-\title{\textsf{colorspace}\\\large Version 1.1.0}
+\title{\textsf{colorspace}\\\large Version 1.1.1}
- \author{Javier Bezos\\\texttt{http://www.tex-tipografia.com}}
+\author{Javier Bezos\\\texttt{http://www.texnia.com}}
+
+\date{2016-09-12}
\raggedright
-\parskip=1ex
+\parskip=.8ex
-\date{2015-06-01}
+\newif\ifcolorspace
+\newif\iftikz
+\usepackage{graphicx}
+
+\IfFileExists{colorspace.sty}{%
+ \usepackage{colorspace}%
+ \definespotcolor{foo}{BarTone 555 GN}{.8,.2,.5,.3}%
+ \definespotcolor{foob}{BarTone 666 GN}[rgb]{.8, .2, .4}%
+%
+ \definecolorspace{fooshaded}{mixed}{foo,black}%
+%
+ \definecolor{sfoo}{fooshaded}{1,0}
+ \definecolor{sblack}{fooshaded}{0,1}
+ \definecolorseries{shseries}{fooshaded}{last}{sfoo!40}{sblack}
+ \colorspacetrue}{}
+
+\IfFileExists{tikz.sty}{%
+ \catcode`|=12
+ \usepackage{tikz}%
+ \catcode`|=\active
+ \tikztrue}{}
+
+\def\showclr#1#{\testclr{#1}}
+\def\testclr#1#2{{\fboxsep0pt\fbox{\colorbox#1{#2}{\phantom{XX}}}}}
+
\begin{document}
\maketitle
-This package is built on the previous attempts to provide spot colors
-and other additional features by Jens Elstner, Stephan Lehmke and Siep
-Kroonenberg (with some inspiration from \textsf{ConTeXt}, too). It
-requires \textsf{xcolor}, which is loaded if it has not been before.
+The aim of this package is, as the name implies, to provide tools for
+PDF color spaces. It requires \textsf{xcolor}, which is loaded if it
+has not been before. It seems to work with \textsf{tikz}.
-It provides a clean user interface, with a single command for defining
-a spot color. It seems to work with \textsf{tikz}. Currently only
-\textsf{pdftex} and \textsf{luatex} are supported.
+Currently it supports what I think are the most common tools:
+\begin{itemize}
+\item Spot colors, with a clean user interface, and including tints
+ (with the |!| notation).
+\item Proper switching of color spaces.
+\item Mixed spot and process colors (up to 4), like shades (ie, a spot
+ color with black).
+\item ICC based default CMYK, RGB and Gray spaces.
+\item Overprinting (across pages, using the color stack).
+\end{itemize}
+Currently only \textsf{pdftex} and \textsf{luatex} are
+supported. Support for \textsf{xetex} is on the `to do' list, but due
+to the limitations of this engine this task is somewhat challenging
+and I'm not sure all features will be implemented.
-Mixing spot colors (with process colors or other spots colors) is
-supported to some extent (see below). You can also assign ICC profiles
-to the default CMYK, RGB and Gray spaces. Other functions related to
-the PDF color spaces (indexed, calibrated, Lab spaces) are not yet
-suported, but they are\texttt{} under study. They apply to text and
-line art only, not external images. Declarations are global. Using
-\verb|\selectcolormodel| does not work yet.
+Other functions related to the PDF color spaces (indexed, calibrated,
+Lab spaces) are not yet suported, but they are under study. Calibrated
+colors, although not directly supported, can be defined with an ICC
+profile created with
+LPROF\footnote{\texttt{http://lprof.sourceforge.net/}} and then
+assigned to a default space as described below.
-Those docs, like the package itself, are still somewhat tentative (as
-you very likely have noticed), but the basic behaviour described here
-will be preserved in future versions.
+They apply to text and line art only, not external images. For the
+latter, \textsf{graphicx} provides a plea of (undocumented)
+transformations: \texttt{interpolate}, \texttt{decodearray},
+\texttt{maskarray}, \texttt{intent}, \texttt{ocobjnum}, and
+\texttt{ocobjref}. For transparencies, see \textsf{transparent}, by
+Heiko Oberdiek.
-For transparencies, see \textsf{transparent}, by Heiko Oberdiek.
+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|).
+Declarations are global and should go in the preamble.
+
+This package is built on the previous attempts to provide spot colors
+and other additional features by Jens Elstner, Stephan Lehmke and Siep
+Kroonenberg (with some inspiration from \textsf{ConTeXt}, too).
+
+It does not provide a list of Pantone, TrueMatch, Folcoltone, Toyo,
+etc., colors. Currently you can find quite easily CMYK equivalents on
+the web, and after all they are intended to be used with a
+``physical'' palette (and not, as sometimes done, just picking a color
+just because looks nice on screen).
+
\section{Spot colors}
+\begin{decl}
+|\definespotcolor{<latex-name>}{<PDF-name>}{<CMYK-equivalent>}|
+\end{decl}
+
Write, for example:
\begin{verbatim}
-\definespotcolor{foo}{BarTone 555 GN}{.3,.4,.5,.6}
+\definespotcolor{foo}{BarTone 555 GN}{.8,.2,.5,.3}
\end{verbatim}
+\ifcolorspace
+ for \showclr{foo}.
+\fi
That's all. Here \verb|foo| is the \LaTeX{} name, as used in
\verb|\color| and the like, \verb|BarTone 555 GN| is the PDF name
@@ -73,10 +132,13 @@
You can use tints as usual in \textsf{xcolor}, like:
\begin{verbatim}
-\color{foo!60}
-\colorlet{foo60}{foo!60}
+\color{foo!50}
+\colorlet{foo60}{foo!50}
\end{verbatim}
-and even set tints from other tints. To mix inks, see below.
+\ifcolorspace
+ which would produce \showclr{foo!50}, and
+\fi
+even set tints from other tints. To mix inks, see below.
The special PDF names \verb|All| (for all plates) and \verb|None| work
as expected:
@@ -84,24 +146,23 @@
\definespotcolor{registration}{All}{1,1,1,1}
\end{verbatim}
-Internally, only CMYK is used, but you can define the equivalent color
-with another name space, which is then converted:
+Internally, only CMYK is used for the equivalent color, but you can define
+the latter with another name space, which is then converted:
\begin{verbatim}
-\definespotcolor{foo}{BarTone 555 GN}[rgb]{.5, .4, .3}
+\definespotcolor{foob}{BarTone 666 GN}[rgb]{.8, .2, .4}
\end{verbatim}
+\ifcolorspace
+which yields \showclr{foob}.
+\fi
+Remember as far PDF is concerned a spot color is a color space on its
+own.
-To change the color space for a page and the subsequent ones, you can
-set something like:
-\begin{verbatim}
-\pagecolorspace{name1,name2,name3}
-\end{verbatim}
-(It can be empty.) To return to the default color space, which
-contains all the defined spot colors, use \verb|\resetpagecolorspace|.
-Use this macro with care, because of the asynchronous nature of \TeX{}
--- remember it affects the whole current page.
-
\section{Mixing spot colors}
+\begin{decl}
+ |\definecolorspace{<latex-name>}{mixed}{<color-list>}|
+\end{decl}
+
To mix spot colors you must first declare a color space (or model)
including them. This is done with something like:
\begin{verbatim}
@@ -115,24 +176,27 @@
\end{verbatim}
A typical usage, for shades, would be:
\begin{verbatim}
-\definecolorspace{shaded1}{mixed}{spot1,black}
+\definecolorspace{fooshaded}{mixed}{foo,black}
\end{verbatim}
-Due to internal limitations of \textsf{xcolor}, no more than four
-colors are allowed. The alternate color space in the PDF file is that
-of the spot colors (which means currently it is CMYK).
-
Then, you can define a color with:
\begin{verbatim}
\definecolor{mix12y}{spot12y}{.5,.4,.6}
-\definecolor{sh1}{shaded1}{.6,.3}
+\definecolor{darkfoo}{fooshaded}{.6,.3}
\end{verbatim}
or set it with
\begin{verbatim}
\color[spot12y]{.5,.4,.3}
-\color[shaded1]{.6,.3}
+\color[fooshaded]{.6,.3}
\end{verbatim}
-As in spot colors, the only operation allowed is \verb|!| for tints
+
+Due to internal limitations of \textsf{xcolor}, no more than four
+colors are allowed.
+
+The alternate color space in the PDF file is that of the spot colors
+(which means currently it is CMYK).
+
+As with spot colors, the only operation allowed is \verb|!| for tints
(ie, \verb|color!num|). But there is an easy trick to mix colors with
\verb|!| and \verb|color,num| -- just define an ortogonal set of
colors based on the new color model:
@@ -147,34 +211,104 @@
\color{spot12y:xspot1,3;xspot2,2;xyellow,1}
\end{verbatim}
Of course, it is just a trick and a better and direct interface is
-under study.
+under study (none of those provided by \textsf{xcolor} fits really
+with the new |mixed| models).
-Color series are also partially supported. For example:
+Color series (see the \textsf{xcolor} documentation) are also
+partially supported. For example:
\begin{verbatim}
\definecolorseries{test}{spot12y}{grad}[spot12y]{.95,.85,.55}{3,11,17}
\definecolorseries{test}{spot12y}{last}{xyellow!50}{xspotA}
\end{verbatim}
-(The key is not to mix the new model with other color models.)
+\ifcolorspace
+Here is a example with some of the described
+techniques, based on the |fooshaded| space defined above (figure 1
+shows the |foo| plate):
+\begin{verbatim}
+\definecolor{sfoo}{fooshaded}{1,0}
+\definecolor{sblack}{fooshaded}{0,1}
+\definecolorseries{shseries}{fooshaded}{last}{sfoo!40}{sblack}
+\def\testclr#1{{\fboxsep0pt\fbox{\colorbox{#1}{\phantom{XX}}}}}
+\resetcolorseries[8]{shseries}
+\begin{tabular}{cccccccc}
+0 \testclr{shseries!!+} &
+1 \testclr{shseries!!+} &
+2 \testclr{shseries!!+} &
+3 \testclr{shseries!!+} &
+4 \testclr{shseries!!+} &
+5 \testclr{shseries!!+} &
+6 \testclr{shseries!!+} &
+7 \testclr{shseries!!+}
+\end{tabular}
+\end{verbatim}
+
+\begingroup
+\def\testclr#1{{\fboxsep0pt\fbox{\colorbox{#1}{\phantom{XX}}}}}
+\resetcolorseries[8]{shseries}
+\begin{tabular}{cccccccc}
+0 \testclr{shseries!!+} &
+1 \testclr{shseries!!+} &
+2 \testclr{shseries!!+} &
+3 \testclr{shseries!!+} &
+4 \testclr{shseries!!+} &
+5 \testclr{shseries!!+} &
+6 \testclr{shseries!!+} &
+7 \testclr{shseries!!+}
+\end{tabular}
+\endgroup
+\fi
+
+\begin{figure}
+\fbox{\includegraphics[width=\linewidth]{colorspaceshade.png}}
+\caption{Plate for the \texttt{foo} spot color as shown by Adobe
+Acrobat. Note the \texttt{foob} spot color defined in this document
+is listed, too.}
+\end{figure}
+
+The key is not to mix a |mixed| model with other color models.
+
+\section{Page color spaces}
+
+Each PDF page must know which colors will be used (other than the
+predefined CMYK, RGB and Gray). By default, \textsf{colorspace} turn
+on for every page all newly defined colors, and that will be fine in
+most cases. However, you may want to set explicitly the list. Use this
+feature with care, because (1) the asynchronous nature of \TeX{}
+(remember it affects the whole current page), and (2) each
+distinct color list creates a PDF resource.
+
+\begin{decl}
+|\pagecolorspace{<color-list>}|\\
+|\resetpagecolorspace|
+\end{decl}
+
+To change the color space for a page and the subsequent ones, you can
+set something like:
+\begin{verbatim}
+\pagecolorspace{name1,name2,name3}
+\end{verbatim}
+(It can be empty.) To return to the default color space, which
+contains all the defined spot colors, use \verb|\resetpagecolorspace|.
+
\section{ICC Based spaces}
+\begin{decl}
+ |\definecolorspace*{<latex-name>}{iccbased}{<icc-file>}|
+\end{decl}
The starred version \verb|\definecolorspace*| does not define a new
color model, but sets the behaviour of the three basic color spaces
-(\verb|cmyk|, \verb|rgb| and \verb|gray|). When belonging to the same
-space, the last one for that space takes precedence. It cannot be used
-to define new colors or set them. Currently, only a type is supported --
-\verb|iccbased|. For example,
+(CMYK, RGB and Gray). When belonging to the same space, the last
+definition for that space takes precedence and its considered the
+default one. It cannot be used to define new colors or set
+them. Currently, only a type is supported -- \verb|iccbased|. For
+example,
\begin{verbatim}
\definecolorspace*{sRGB}{iccbased}{sRGB Profile.icc}
\end{verbatim}
-The space it applies to is read from the ICC profile. The name can be
-used in \verb|\pagecolorspace| (and must, if you want it to be
-active). Alternatively, there are 3 reserved names: \verb|*rgb|,
-\verb|*gray|, \verb|*cmyk|, which stand for the current default
-spaces. The former are not set by \verb|\resetpagecolorspace|, but the
-starred named are.
+The space it applies to is read from the ICC profile.
Note those ICC spaces does not go to the output intent dictionary (see
the \textsf{pdfx} package). The latter, as the PDF reference explains,
@@ -181,13 +315,21 @@
supplements rather than replaces the ICC profiles in a default color
space.
+The name can be used in \verb|\pagecolorspace|. Alternatively, there
+are 3 reserved names: \verb|*rgb|, \verb|*gray|, \verb|*cmyk|, which
+stand for the current default spaces. Named ICC based spaces are not
+set by \verb|\resetpagecolorspace|, but the starred named are. On the
+other hand, the starred names are not set automatically by
+|\pagecolorspace|, and you must set them explicitly if you want them
+to be active.
+
\section{Overprinting}
-This is usually a pre-print task, but by setting it in the document you
-will get a better idea of how the colors are actually
-overlapped. However, remember the effect produced is device-dependent,
-and colorant overprint decisions should be made at output time
-(according to the PDF reference).
+This is usually a pre-print task, but by setting it in the document
+you will get a better idea of how the colors are actually overlapped
+in soft proofing. However, remember the effect produced is
+device-dependent, and colorant overprint decisions should be made at
+output time (according to the PDF reference).
Very often, it is set for the whole document with the package options
\verb|knockout| (no overprint), and \verb|overprint|. By default, the
@@ -204,6 +346,11 @@
Since the color stack is used, pdf\TeX{} $\ge$ 1.40 is required.
+\section{Version}
+
+1.1.1. No new features. Just internal changes related to
+\textsc{luatex} and new manual.
+
\end{document}
Added: trunk/Master/texmf-dist/doc/latex/colorspace/colorspaceshade.png
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/colorspace/colorspaceshade.png
===================================================================
--- trunk/Master/texmf-dist/doc/latex/colorspace/colorspaceshade.png 2016-09-13 10:10:45 UTC (rev 42052)
+++ trunk/Master/texmf-dist/doc/latex/colorspace/colorspaceshade.png 2016-09-13 21:51:46 UTC (rev 42053)
Property changes on: trunk/Master/texmf-dist/doc/latex/colorspace/colorspaceshade.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/png
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/colorspace/colorspace.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/colorspace/colorspace.sty 2016-09-13 10:10:45 UTC (rev 42052)
+++ trunk/Master/texmf-dist/tex/latex/colorspace/colorspace.sty 2016-09-13 21:51:46 UTC (rev 42053)
@@ -2,9 +2,9 @@
% | Typeset colorspace.tex to get the documentation. |
% +--------------------------------------------------+
%
-%% Copyright (C) 2015 Javier Bezos
+%% Copyright (C) 2015-2016 Javier Bezos
%% All Rights Reserved
-%% http://www.tex-tipografia.com
+%% 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
@@ -21,7 +21,8 @@
%% This work consists of the files colorspace.tex and colorspace.sty.
\ProvidesPackage{colorspace}
- [2015/06/01 v1.1.0 PDF color spaces (spot colors...) for pdfTeX]
+ [2016/09/12 v1.1.1 PDF color spaces (spot colors...) for
+ pdftex and luatex]
\edef\spc at savedcatcodes{%
\catcode`\noexpand\/=\the\catcode`\/
@@ -33,6 +34,24 @@
\catcode`\<=12
\catcode`\&=11 % we use it in macro names
+% pdftex vs luatex compatibility
+
+\ifx\pdfextension\@undefined
+ \let\spc at Pageresources\pdfpageresources
+ \let\spc at Obj\pdfobj
+ \let\spc at Lastobj\pdflastobj
+ \let\spc at Colorstack\pdfcolorstack
+ \let\spc at Colorstackinit\pdfcolorstackinit
+\else
+ \edef\spc at Pageresources{\pdfvariable pageresources}
+ \protected\def\spc at Obj{\pdfextension obj }
+ \protected\def\spc at Lastobj{\numexpr\pdffeedback lastobj\relax}
+ \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}%
@@ -128,11 +147,11 @@
\spc at csall
\definecolor{#1}{cmyk:#3}{#4}% internally always cmyk
\expandafter\spc at cmyktospot{#1}\spc at tempb % Convert from cmyk to spot
- \immediate\pdfobj{[ /Separation /\spc at tempb\space
+ \immediate\spc at Obj{[ /Separation /\spc at tempb\space
/DeviceCMYK << /FunctionType 2 /Domain [0 1]
/C0 [0 0 0 0] /C1 [\spc at tempa] /N 1 >> ]}% pdf separation
\expandafter\xdef\csname spc at ir@#1\endcsname{%
- /&\spc at tempb\space\the\pdflastobj\space 0 R}% save ref to obj
+ /&\spc at tempb\space\the\spc at Lastobj\space 0 R}% save ref to obj
\let\spc at elt\relax
\xdef\spc at csall{\spc at csall\spc at elt2{#1}}}
@@ -161,7 +180,7 @@
\def\spc at pagecs#1{%
\ifx\spc at currcs\@empty\else
\edef\tempa{%
- \noexpand\spc at remcs\the\pdfpageresources
+ \noexpand\spc at remcs\the\spc at Pageresources
\noexpand\spc at remcs{\spc at currcs}}%
\tempa
\fi
@@ -184,13 +203,13 @@
\fi}%
\spc at csall % Uses \spc at elt
\@ifundefined{spc at cs@\spc at tempc}%
- {\immediate\pdfobj{<< \spc at tempb>>}%
- \expandafter\xdef\csname spc at cs@\spc at tempc\endcsname{\the\pdflastobj}}%
+ {\immediate\spc at Obj{<< \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
\ifx\spc at currcs\@empty\else
- \edef\spc at tempa{\pdfpageresources{%
- \the\pdfpageresources\space/ColorSpace \@nameuse{spc at cs@\spc at tempc} 0 R}}%
+ \edef\spc at tempa{\spc at Pageresources{%
+ \the\spc at Pageresources\space/ColorSpace \@nameuse{spc at cs@\spc at tempc} 0 R}}%
\spc at tempa
\fi}
@@ -201,7 +220,7 @@
\def\spc at remcs#1\spc at remcs#2{%
\def\spc at tempc##1 /ColorSpace #2 ##2 R##3\spc at tempc{%
- \pdfpageresources{##1##3}}%
+ \spc at Pageresources{##1##3}}%
\spc at tempc#1\spc at tempc}
% Support for pgf (I hope--)
@@ -321,6 +340,8 @@
{\spc at dflttrue\spc at defcs}%
{\spc at dfltfalse\spc at defcs}}
+\@onlypreamble\definecolorspace
+
\def\spc at defcs#1#2#3{%
\@ifundefined{spc at defcs@#2}%
{\spc at unknown{spc at defcs@#2}{color space type `#2'}}%
@@ -389,7 +410,7 @@
\csname spc at ascmyk@\spc at tempa\endcsname\@@
\advance\@tempcntb-4\relax
\fi}%
- \immediate\pdfobj stream attr
+ \immediate\spc at Obj stream attr
{/FunctionType 4
/Domain [ \spc at pdfdoms]
/Range [ 0 1 0 1 0 1 0 1 ]}%
@@ -400,11 +421,11 @@
\spc@@Pblack\spc@@black neg 1.0 add\spc at nl
\the\numexpr4+\@tempcntb\relax\space 4 roll\spc@@pops
\space\string}}%
- \immediate\pdfobj{[ /DeviceN [\spc at pdfdevn\space] /DeviceCMYK
- \the\pdflastobj\space0 R
+ \immediate\spc at Obj{[ /DeviceN [\spc at pdfdevn\space] /DeviceCMYK
+ \the\spc at Lastobj\space0 R
<< /Colorants <<\spc at pdfclrnts\space >> >> ]}%
\expandafter\xdef\csname spc at ir@#1\endcsname{%
- /\spc at name\space\the\pdflastobj\space 0 R}% save ref to obj
+ /\spc at name\space\the\spc at Lastobj\space 0 R}% save ref to obj
\let\spc at elt\relax
\xdef\spc at csall{\spc at csall\spc at elt2{#1}}%
\xdef\spc at tempa{%
@@ -414,7 +435,7 @@
\endgroup
\spc at tempa}
-% === ICC based dafault spaces ===
+% === ICC based default spaces ===
% luatex removed pdffiledump, so we use lua code.
@@ -447,13 +468,13 @@
{\PackageError{colorspace}{Unsupported ICC space}%
{Currently, only Gray, RGB and CMYK are supported}}%
{\edef\spc at tempa{\@nameuse{spc@@\spc at tempa}}}%
- \immediate\pdfobj
+ \immediate\spc at Obj
stream attr {\ifcase\spc at tempa
/N 1 /Alternate /DeviceGray\or
/N 3 /Alternate /DeviceRGB\or
/N 4 /Alternate /DeviceCMYK\fi}%
file {#2}%
- \immediate\pdfobj{[ /ICCBased \the\pdflastobj\space 0 R ]}%
+ \immediate\spc at Obj{[ /ICCBased \the\spc at Lastobj\space 0 R ]}%
% to the default color list, add an intermediate name *<model>
% (only once) containing the last setting (add also the
% actual name with flag 1 instead of 2)
@@ -462,10 +483,10 @@
{\xdef\spc at csall{\spc at csall\spc at elt2{*\spc@@spacelc}}}%
{} % -- do nothing
\expandafter\xdef\csname spc at ir@*\spc@@spacelc\endcsname{%
- /Default\spc@@space\space\the\pdflastobj\space 0 R}%
+ /Default\spc@@space\space\the\spc at Lastobj\space 0 R}%
\xdef\spc at csall{\spc at csall\spc at elt1{#1}}%
\expandafter\xdef\csname spc at ir@#1\endcsname{%
- /Default\spc@@space\space\the\pdflastobj\space 0 R}%
+ /Default\spc@@space\space\the\spc at Lastobj\space 0 R}%
\endgroup}
@@ -495,21 +516,21 @@
\newcommand\textoverprint[2][\spc at opm]{{\overprintstate{#1}#2}}
-\immediate\pdfobj{<< /Type /ExtGState /op false /OP false >>}%
-\edef\spc at tempa{/SPCko \the\pdflastobj\space 0 R }%
-\immediate\pdfobj{<< /Type /ExtGState /op true /OP true /OPM 0 >>}%
-\edef\spc at tempa{\spc at tempa/SPCmz \the\pdflastobj\space 0 R }%
-\immediate\pdfobj{<< /Type /ExtGState /op true /OP true /OPM 1 >>}%
-\edef\spc at tempa{\spc at tempa/SPCop \the\pdflastobj\space 0 R }%
-\immediate\pdfobj{<< \spc at tempa>>}%
-\edef\spc at tempa{\global\pdfpageresources{\the\pdfpageresources
- \space /ExtGState \the\pdflastobj\space 0 R }}
+\immediate\spc at Obj{<< /Type /ExtGState /op false /OP false >>}%
+\edef\spc at tempa{/SPCko \the\spc at Lastobj\space 0 R }%
+\immediate\spc at Obj{<< /Type /ExtGState /op true /OP true /OPM 0 >>}%
+\edef\spc at tempa{\spc at tempa/SPCmz \the\spc at Lastobj\space 0 R }%
+\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
\def\spc at setop{%
- \pdfcolorstack\spc at opstack push{\spc at getop}%
+ \spc at Colorstack\spc at opstack push{\spc at getop}%
\aftergroup\spc at resetop}
-\def\spc at resetop{\pdfcolorstack\spc at opstack pop\relax}
+\def\spc at resetop{\spc at Colorstack\spc at opstack pop\relax}
\def\spc at getop{%
\ifcase\spc at op
/SPCmz gs
@@ -519,7 +540,7 @@
/SPCko gs
\fi}
-\chardef\spc at opstack\pdfcolorstackinit page direct{\spc at getop}
+\chardef\spc at opstack\spc at Colorstackinit page direct{\spc at getop}
\spc at savedcatcodes
More information about the tex-live-commits
mailing list