summaryrefslogtreecommitdiff
path: root/metapost/context/base/mpii
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2021-07-10 23:34:30 +0200
committerContext Git Mirror Bot <phg@phi-gamma.net>2021-07-10 23:34:30 +0200
commiteebab79d84255890c1a6d320fba146b1c422c3a6 (patch)
tree1b3b581945b5ac395b36d74b0da10926e9536c9f /metapost/context/base/mpii
parentba4875d8c328257fa3cb4d140d07ced41b8a576c (diff)
downloadcontext-eebab79d84255890c1a6d320fba146b1c422c3a6.tar.gz
2021-07-10 21:49:00
Diffstat (limited to 'metapost/context/base/mpii')
-rw-r--r--metapost/context/base/mpii/mp-base.mpii21
-rw-r--r--metapost/context/base/mpii/mp-tool.mpii6
2 files changed, 14 insertions, 13 deletions
diff --git a/metapost/context/base/mpii/mp-base.mpii b/metapost/context/base/mpii/mp-base.mpii
index 7af4bc436..894af63f1 100644
--- a/metapost/context/base/mpii/mp-base.mpii
+++ b/metapost/context/base/mpii/mp-base.mpii
@@ -122,20 +122,27 @@ yellow = (1,1,0);
background = white; % The user can reset this
% color part selection for within
+
+newinternal nocolormodel ; nocolormodel := 1 ;
+newinternal greycolormodel ; greycolormodel := 3 ;
+newinternal graycolormodel ; graycolormodel := 3 ;
+newinternal rgbcolormodel ; rgbcolormodel := 5 ;
+newinternal cmykcolormodel ; cmykcolormodel := 7 ;
+
def colorpart primary t =
- if colormodel t=7:
+ if colormodel t=cmykcolormodel:
(cyanpart t, magentapart t, yellowpart t, blackpart t)
- elseif colormodel t=5:
+ elseif colormodel t=rgbcolormodel:
(redpart t, greenpart t, bluepart t)
- elseif colormodel t=3:
+ elseif colormodel t=graycolormodel:
(greypart t)
- elseif colormodel t=1:
+ elseif colormodel t=nocolormodel:
false
else:
%%% For clipping and bounding paths, etc.
- if defaultcolormodel=7: (0,0,0,1)
- elseif defaultcolormodel=5: black
- elseif defaultcolormodel=3: 0
+ if defaultcolormodel=cmykcolormodel: (0,0,0,1)
+ elseif defaultcolormodel=rgbcolormodel: black
+ elseif defaultcolormodel=graycolormodel: 0
else: false
fi
fi
diff --git a/metapost/context/base/mpii/mp-tool.mpii b/metapost/context/base/mpii/mp-tool.mpii
index 27c90de38..1e45b6fba 100644
--- a/metapost/context/base/mpii/mp-tool.mpii
+++ b/metapost/context/base/mpii/mp-tool.mpii
@@ -131,12 +131,6 @@ enddef ;
%D Colors:
-newinternal nocolormodel ; nocolormodel := 1 ;
-newinternal greycolormodel ; greycolormodel := 3 ;
-newinternal graycolormodel ; graycolormodel := 3 ;
-newinternal rgbcolormodel ; rgbcolormodel := 5 ;
-newinternal cmykcolormodel ; cmykcolormodel := 7 ;
-
let grayscale = numeric ;
let greyscale = numeric ;