diff options
| author | Hans Hagen <pragma@wxs.nl> | 2011-03-25 18:03:00 +0100 |
|---|---|---|
| committer | Hans Hagen <pragma@wxs.nl> | 2011-03-25 18:03:00 +0100 |
| commit | 4ed30744220cf0763f968c837b0ff7dd367f19b2 (patch) | |
| tree | 28d1dce431e679b3a6d28edef78cb38096d4c94f /tex/context/base/colo-ini.mkiv | |
| parent | 3c5dbaefc44f38d6da23a7db2c06a0a4af0996fa (diff) | |
| download | context-4ed30744220cf0763f968c837b0ff7dd367f19b2.tar.gz | |
beta 2011.03.25 18:03
Diffstat (limited to 'tex/context/base/colo-ini.mkiv')
| -rw-r--r-- | tex/context/base/colo-ini.mkiv | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/tex/context/base/colo-ini.mkiv b/tex/context/base/colo-ini.mkiv index b842337a9..24627b68c 100644 --- a/tex/context/base/colo-ini.mkiv +++ b/tex/context/base/colo-ini.mkiv @@ -140,15 +140,15 @@ %D \showsetup{color} %D \showsetup{graycolor} - \def\switchtocolor [#1]{\csname#1\endcsname} +\unexpanded\def\switchtocolor [#1]{\csname#1\endcsname} \unexpanded\def\color [#1]{\groupedcommand{\doactivatecolor{#1}}{}} \unexpanded\def\startcolor [#1]{\begingroup\doactivatecolor{#1}} \unexpanded\def\stopcolor {\endgroup} \unexpanded\def\graycolor [#1]{\groupedcommand{\dosetcolormodel{gray}\getvalue{#1}}{}} \unexpanded\def\colored [#1]{\groupedcommand{\definecolor[@colored@][#1]\doactivatecolor{@colored@}}{}} \unexpanded\def\fastcolored [#1]#2{\begingroup\dodefinefastcolor[@colored@][#1]\doactivatecolor{@colored@}#2\endgroup} - \def\predefinecolor [#1]{\flushatshipout{\hbox{\color[#1]{}}}} - \def\predefineindexcolor[#1]{\flushatshipout{\hbox{\color[#1]{}}}} +\unexpanded\def\predefinecolor [#1]{\flushatshipout{\hbox{\color[#1]{}}}} +\unexpanded\def\predefineindexcolor[#1]{\flushatshipout{\hbox{\color[#1]{}}}} % some of this will go away @@ -156,11 +156,17 @@ \unexpanded\def\stopcolorpage {\stopcolor} \unexpanded\def\startraster [#1]{\dosetrastercolor{#1}} \unexpanded\def\stopraster {} - \def\raster [#1]{\groupedcommand{\dosetrastercolor{#1}}{}} - \def\faststartcolor [#1]{\doactivatecolor{#1}} - \def\faststopcolor {} +\unexpanded\def\raster [#1]{\groupedcommand{\dosetrastercolor{#1}}{}} +\unexpanded\def\faststartcolor [#1]{\doactivatecolor{#1}} +\unexpanded\def\faststopcolor {} \unexpanded\def\dosetcolorattribute#1#2{\ifcsname#1#2\endcsname\doactivatecolor{\csname#1#2\endcsname}\fi} +\def\getcolorattributevalue#1#2% color macro (obsolete again, we have a better method) + {\begingroup + \doactivatecolor{#1}% + \normalexpanded{\endgroup\edef\noexpand#2% + {\ifnum\attribute\colorattribute=\attributeunsetvalue\else\number\attribute\colorattribute\fi}}} + \let\grey\graycolor %D Stacking: @@ -749,7 +755,7 @@ \letvalueempty{(cs:-} \letvalueempty{(ts:-} -\def\doactivatecolor#1% : in currentpalet, maybe not, ugly +\def\doactivatecolor#1% : in currentpalet, maybe not, ugly (some day at the lua end) {\def\currentcolorname{#1}% \ifcsname(cs:\currentpalet#1)\endcsname \csname(cs:\currentpalet#1)\endcsname |