From 5a923dc5ac055164721b40a58e4d1614fc7f2aa1 Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Wed, 13 Jul 2016 16:28:12 +0200 Subject: 2016-07-13 15:15:00 --- metapost/context/base/mpiv/mp-tool.mpiv | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'metapost/context/base/mpiv/mp-tool.mpiv') diff --git a/metapost/context/base/mpiv/mp-tool.mpiv b/metapost/context/base/mpiv/mp-tool.mpiv index d5793d086..09cf24103 100644 --- a/metapost/context/base/mpiv/mp-tool.mpiv +++ b/metapost/context/base/mpiv/mp-tool.mpiv @@ -825,20 +825,31 @@ enddef ; let normalwithcolor = withcolor ; -def withcolor primary c = +def withcolor expr c = normalwithcolor if string c : resolvedcolor(c) else : c fi enddef ; -def colortype(expr c) = - if cmykcolor c : cmykcolor elseif rgbcolor c : rgbcolor else : grayscale fi +vardef colortype expr c = + if cmykcolor c : cmykcolor + elseif rgbcolor c : rgbcolor + elseif numeric c : grayscale + fi enddef ; -vardef whitecolor(expr c) = - if cmykcolor c : (0,0,0,0) elseif rgbcolor c : (1,1,1) else : 1 fi +vardef whitecolor expr c = + if cmykcolor c : (0,0,0,0) + elseif rgbcolor c : (1,1,1) + elseif numeric c : 1 + elseif string c : whitecolor resolvedcolor(c) + fi enddef ; vardef blackcolor expr c = - if cmykcolor c : (0,0,0,1) elseif rgbcolor c : (0,0,0) else : 0 fi + if cmykcolor c : (0,0,0,1) + elseif rgbcolor c : (0,0,0) + elseif numeric c : 0 + elseif string c : blackcolor resolvedcolor(c) + fi enddef ; vardef complementary expr c = @@ -1653,7 +1664,7 @@ enddef ; % nice: currentpicture := inverted currentpicture ; -primarydef p uncolored c = +primarydef p uncolored c = % not complete ... needs text and scripts and ... if color p : c - p else : -- cgit v1.2.3