diff options
author | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-07-12 11:21:11 +0200 |
---|---|---|
committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-07-12 11:21:11 +0200 |
commit | bf7fc74b4f42f6bc1c57488da72bbc142c47f86a (patch) | |
tree | f68db389c0e7902a504f682061d25b1fd103b963 /tex/context/base/mkiv/colo-ini.mkiv | |
parent | 74326d3975653dbc32ce3cd8b431dba40917e7dc (diff) | |
download | context-bf7fc74b4f42f6bc1c57488da72bbc142c47f86a.tar.gz |
2016-07-12 10:18:00
Diffstat (limited to 'tex/context/base/mkiv/colo-ini.mkiv')
-rw-r--r-- | tex/context/base/mkiv/colo-ini.mkiv | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tex/context/base/mkiv/colo-ini.mkiv b/tex/context/base/mkiv/colo-ini.mkiv index c5705643f..8376a9687 100644 --- a/tex/context/base/mkiv/colo-ini.mkiv +++ b/tex/context/base/mkiv/colo-ini.mkiv @@ -909,11 +909,12 @@ \def\colo_basics_define_intermediate_indeed[#1][#2,#3,#4][#5]% {\clf_defineintermediatecolor % not global - {#1}{#2}% - \thecolorattribute{#3} % - \thecolorattribute{#4} % - \thetransparencyattribute{#3} % - \thetransparencyattribute{#4} % + {#1}% + {#2}% + \rawcolorattribute{#3} % + \rawcolorattribute{#4} % + \rawtransparencyattribute{#3} % + \rawtransparencyattribute{#4} % {#5}% \v_colo_freeze_state \relax @@ -1208,6 +1209,9 @@ %def\thecolorattribute #1{\number\csname\??colorattribute \ifcsname\??colorattribute \currentcolorprefix#1\endcsname\currentcolorprefix#1\else\ifcsname\??colorattribute #1\endcsname#1\fi\fi\endcsname} %def\thetransparencyattribute#1{\number\csname\??transparencyattribute\ifcsname\??transparencyattribute\currentcolorprefix#1\endcsname\currentcolorprefix#1\else\ifcsname\??transparencyattribute#1\endcsname#1\fi\fi\endcsname} +\def\rawcolorattribute #1{\ifcsname\??colorattribute \currentcolorprefix#1\endcsname\lastnamedcs\else\ifcsname\??colorattribute #1\endcsname\lastnamedcs\else\zerocount\fi\fi} +\def\rawtransparencyattribute#1{\ifcsname\??transparencyattribute\currentcolorprefix#1\endcsname\lastnamedcs\else\ifcsname\??transparencyattribute#1\endcsname\lastnamedcs\else\zerocount\fi\fi} + \def\thecolorattribute #1{\number\ifcsname\??colorattribute \currentcolorprefix#1\endcsname\lastnamedcs\else\ifcsname\??colorattribute #1\endcsname\lastnamedcs\else\zerocount\fi\fi} \def\thetransparencyattribute#1{\number\ifcsname\??transparencyattribute\currentcolorprefix#1\endcsname\lastnamedcs\else\ifcsname\??transparencyattribute#1\endcsname\lastnamedcs\else\zerocount\fi\fi} \def\internalspotcolorname #1{\clf_spotcolorname \thecolorattribute{#1} } |