From 599c5089a184d1967ec8dc66307de52378e911d4 Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Mon, 12 Jul 2004 00:00:00 +0200
Subject: stable 2004.07.12

---
 metapost/context/base/mp-tool.mp | 109 ++++++++++++++++++++++++++-------------
 1 file changed, 73 insertions(+), 36 deletions(-)

(limited to 'metapost')

diff --git a/metapost/context/base/mp-tool.mp b/metapost/context/base/mp-tool.mp
index d78ee43ea..3064cf239 100644
--- a/metapost/context/base/mp-tool.mp
+++ b/metapost/context/base/mp-tool.mp
@@ -1499,17 +1499,21 @@ enddef ;
 % nice: currentpicture := inverted currentpicture ;
 
 primarydef p uncolored c =
-  image
-    (for i within p :
-       addto currentpicture
-       if stroked i or filled i :
-         if filled i : contour else : doublepath fi pathpart i
-         dashed dashpart i withpen penpart i
-       else :
-         also i
-       fi
-       withcolor c-(redpart i, greenpart i, bluepart i) ;
-     endfor ; )
+  if color p :
+    c - p
+  else :
+      image
+        (for i within p :
+           addto currentpicture
+           if stroked i or filled i :
+             if filled i : contour else : doublepath fi pathpart i
+             dashed dashpart i withpen penpart i
+           else :
+             also i
+           fi
+           withcolor c-(redpart i, greenpart i, bluepart i) ;
+         endfor ; )
+  fi
 enddef ;
 
 vardef inverted primary p =
@@ -1517,34 +1521,67 @@ vardef inverted primary p =
 enddef ;
 
 primarydef p softened c =
-  image
-    (save cc ; color cc ; cc := tripled(c) ;
-     for i within p :
-       addto currentpicture
-       if stroked i or filled i :
-         if filled i : contour else : doublepath fi pathpart i
-         dashed dashpart i withpen penpart i
-       else :
-        also i
-       fi
-       withcolor (redpart   cc * redpart   i,
-                  greenpart cc * greenpart i,
-                  bluepart  cc * bluepart  i) ;
-     endfor ;)
+  if color p :
+    tripled(c) * p
+  else :
+    image
+      (save cc ; color cc ; cc := tripled(c) ;
+       for i within p :
+         addto currentpicture
+         if stroked i or filled i :
+           if filled i : contour else : doublepath fi pathpart i
+           dashed dashpart i withpen penpart i
+         else :
+          also i
+         fi
+         withcolor (redpart   cc * redpart   i,
+                    greenpart cc * greenpart i,
+                    bluepart  cc * bluepart  i) ;
+       endfor ;)
+  fi
+enddef ;
+
+primarydef p softened c =
+  begingroup
+  save cc ; color cc ; cc := tripled(c) ;
+  if color p :
+    (redpart   cc * redpart   p,
+     greenpart cc * greenpart p,
+     bluepart  cc * bluepart  p)
+  else :
+    image
+      (for i within p :
+         addto currentpicture
+         if stroked i or filled i :
+           if filled i : contour else : doublepath fi pathpart i
+           dashed dashpart i withpen penpart i
+         else :
+          also i
+         fi
+         withcolor (redpart   cc * redpart   i,
+                    greenpart cc * greenpart i,
+                    bluepart  cc * bluepart  i) ;
+       endfor ;)
+  fi
+  endgroup
 enddef ;
 
 vardef grayed primary p =
-  image
-    (for i within p :
-       addto currentpicture
-       if stroked i or filled i :
-         if filled i : contour else : doublepath fi pathpart i
-         dashed dashpart i withpen penpart i
-       else :
-         also i
-       fi
-       withcolor tripled(.30redpart i+.59greenpart i+.11bluepart i) ;
-     endfor ; )
+  if color p :
+    tripled(.30redpart p+.59greenpart p+.11bluepart p)
+  else :
+    image
+      (for i within p :
+         addto currentpicture
+         if stroked i or filled i :
+           if filled i : contour else : doublepath fi pathpart i
+           dashed dashpart i withpen penpart i
+         else :
+           also i
+         fi
+         withcolor tripled(.30redpart i+.59greenpart i+.11bluepart i) ;
+       endfor ; )
+  fi
 enddef ;
 
 % yes or no: "text" infont "cmr12" at 24pt ;
-- 
cgit v1.2.3