From ab56ea38d2f4f5b521ef097bac92812f6070ef55 Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Thu, 27 Jul 2017 17:53:52 +0200
Subject: 2017-07-27 16:23:00

---
 metapost/context/base/mpiv/mp-mlib.mpiv | 42 ++++++++++++---------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

(limited to 'metapost')

diff --git a/metapost/context/base/mpiv/mp-mlib.mpiv b/metapost/context/base/mpiv/mp-mlib.mpiv
index 0638ee3e1..df60f6adc 100644
--- a/metapost/context/base/mpiv/mp-mlib.mpiv
+++ b/metapost/context/base/mpiv/mp-mlib.mpiv
@@ -1245,33 +1245,21 @@ vardef properties(text t) =
     image(draw unitcircle t)
 enddef ;
 
-% if metapostversion < 1.770  :
-%
-%     def withproperties expr p =
-%         if colormodel p = 3 :
-%             withcolor greypart p
-%         elseif colormodel p = 5 :
-%             withcolor (redpart p,greenpart p,bluepart p)
-%         elseif colormodel p = 7 :
-%             withcolor (cyanpart p,magentapart p,yellowpart p,blackpart p)
-%         fi
-%     enddef ;
-%
-% else :
-
-    def withproperties expr p =
-        if colormodel p = 3 :
-            withcolor greypart p
-        elseif colormodel p = 5 :
-            withcolor (redpart p,greenpart p,bluepart p)
-        elseif colormodel p = 7 :
-            withcolor (cyanpart p,magentapart p,yellowpart p,blackpart p)
-        fi
-        withprescript prescriptpart p
-        withpostscript postscriptpart p
-    enddef ;
-
-% fi ;
+def withproperties expr p =
+    if colormodel p = 3 :
+        withcolor greypart p
+    elseif colormodel p = 5 :
+        withcolor (redpart p,greenpart p,bluepart p)
+    elseif colormodel p = 7 :
+        withcolor (cyanpart p,magentapart p,yellowpart p,blackpart p)
+    fi
+    withpen penpart p
+    if dashpart p <> nullpicture :
+        dashed dashpart p
+    fi
+    withprescript prescriptpart p
+    withpostscript postscriptpart p
+enddef ;
 
 % Experimental:
 
-- 
cgit v1.2.3