2021-07-10 21:49:00

1 files changed, 14 insertions, 8 deletions

diff --git a/metapost/context/base/mpiv/mp-base.mpiv b/metapost/context/base/mpiv/mp-base.mpiv
index 8ca072dcd..9b85d5ffd 100644
--- a/metapost/context/base/mpiv/mp-base.mpiv
+++ b/metapost/context/base/mpiv/mp-base.mpiv
@@ -192,26 +192,32 @@ yellow     := (1,1,0) ;
 
 background := white ; % obsolete
 
-let graypart  = greypart  ;
+let graypart  = greypart ;
 let greycolor = numeric ;
 let graycolor = numeric ;
 
 % color part (will be overloaded)
 
+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
-    elseif defaultcolormodel = 7 :
+    elseif defaultcolormodel = cmykcolormodel :
         (0,0,0,1)
-    elseif defaultcolormodel = 5 :
+    elseif defaultcolormodel = rgbcolormodel :
         black
-    elseif defaultcolormodel = 3 :
+    elseif defaultcolormodel = graycolormodel :
         0
     else :
         false