diff options
| author | Hans Hagen <pragma@wxs.nl> | 2001-07-11 00:00:00 +0200 |
|---|---|---|
| committer | Hans Hagen <pragma@wxs.nl> | 2001-07-11 00:00:00 +0200 |
| commit | 60cc55d63b06031c0c852888fddeaff74a209011 (patch) | |
| tree | e36f74ebcb4f47a78b72756fbafc50315d19601d /tex/context/base/colo-ini.tex | |
| parent | 8e7b17b0b24641743f62d3f5779e79c2c25b67e0 (diff) | |
| download | context-60cc55d63b06031c0c852888fddeaff74a209011.tar.gz | |
stable 2001.07.11
Diffstat (limited to 'tex/context/base/colo-ini.tex')
| -rw-r--r-- | tex/context/base/colo-ini.tex | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/tex/context/base/colo-ini.tex b/tex/context/base/colo-ini.tex index bb896e0fa..95baa0067 100644 --- a/tex/context/base/colo-ini.tex +++ b/tex/context/base/colo-ini.tex @@ -661,20 +661,18 @@ \beginTEX -\def\colorcsname#1\endcsname - {\csname\??cr - \@EA\ifx\csname\??cr\currentpalet#1\endcsname\relax\else\currentpalet\fi - #1\endcsname} - \def\doifcolorelse#1% - {\@EA\ifx\colorcsname#1\endcsname + {\@EA\ifx\csname\??cr\@EA\ifx\csname\??cr\currentpalet#1\endcsname\relax\else\currentpalet\fi#1\endcsname\relax \expandafter\secondoftwoarguments \else \expandafter\firstoftwoarguments \fi} \def\getcurrentcolorspecs#1% - {\edef\currentcolorspecs{\colorcsname#1\endcsname}} + {\edef\currentcolorspecs% + {\csname\??cr\@EA + \ifx\csname\??cr\currentpalet#1\endcsname\relax\else\currentpalet\fi + #1\endcsname}} \endTEX @@ -1424,18 +1422,15 @@ \newif\ifMPcmyk % \MPcmykfalse -% \def\MPcolor#1% -% {\ifMPgraphics -% \@EA\@EA\@EA\doMPcolor\csname\??cr#1\endcsname:::::\end -% \else -% #1% -% \fi} - \beginTEX \def\MPcolor#1% {\ifMPgraphics - \@EA\@EA\@EA\doMPcolor\colorcsname#1\endcsname:::::\end + \@EA\@EA\@EA\doMPcolor + \csname\??cr\@EA + \ifx\csname\??cr\currentpalet#1\endcsname\relax\else\currentpalet\fi + #1\endcsname + :::::\end \else #1% \fi} @@ -1457,7 +1452,6 @@ \endETEX - \def\doMPcolor#1:#2:#3:#4:#5:#6\end {\if #1R(#2,#3,#4)% \else\if#1C\ifMPcmyk cmyk(#2,#3,#4,#5)\else(1-#2-#5,1-#3-#5,1-#4-#5)\fi |