From e32f57c9c5968f0c09130f6e24e28a96d6e1393d Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Sun, 2 Apr 2017 20:46:19 +0200
Subject: 2017-04-02 19:57:00

---
 metapost/context/base/mpii/mp-tool.mpii | 76 +++++++++++++++++----------------
 metapost/context/base/mpiv/mp-base.mpiv |  4 +-
 metapost/context/base/mpiv/mp-mlib.mpiv | 28 ++++++------
 metapost/context/base/mpiv/mp-tool.mpiv |  4 +-
 4 files changed, 58 insertions(+), 54 deletions(-)

(limited to 'metapost')

diff --git a/metapost/context/base/mpii/mp-tool.mpii b/metapost/context/base/mpii/mp-tool.mpii
index f476361c7..a3300f5bb 100644
--- a/metapost/context/base/mpii/mp-tool.mpii
+++ b/metapost/context/base/mpii/mp-tool.mpii
@@ -28,7 +28,9 @@ let @## = @# ;
 
 if not known mpversion : string mpversion ; mpversion := "0.641" ; fi ;
 
-newinternal metapostversion ; metapostversion := scantokens(mpversion) ;
+% newinternal metapostversion ; metapostversion := scantokens(mpversion) ;
+
+newinternal metapostversion ; metapostversion := 2.0 ;
 
 % vardef mpversiongt(expr s) =
 %     scantokens (mpversion & " > " & if numeric s : decimal s else : s fi)
@@ -2661,41 +2663,41 @@ vardef undecorated (text imagedata) text decoration =
 enddef ;
 
 
-if metapostversion < 1.770  :
-
-    vardef decorated (text imagedata) text decoration =
-        save mfun_decorated_path, currentpicture ;
-        picture mfun_decorated_path, currentpicture ;
-        currentpicture := nullpicture ;
-        imagedata ;
-        mfun_decorated_path := currentpicture ;
-        currentpicture := nullpicture ;
-        for i within mfun_decorated_path :
-            addto currentpicture
-                if stroked i :
-                    doublepath pathpart i
-                    dashed dashpart i
-                    withpen penpart i
-                    withcolor colorpart i
-                    decoration
-                elseif filled i :
-                    contour pathpart i
-                    withpen penpart i
-                    withcolor colorpart i
-                    decoration
-                elseif textual i :
-                    also i
-                    withcolor colorpart i
-                    decoration
-                else :
-                    also i
-                fi
-            ;
-        endfor ;
-        currentpicture
-    enddef ;
-
-else:
+% if metapostversion < 1.770  :
+%
+%     vardef decorated (text imagedata) text decoration =
+%         save mfun_decorated_path, currentpicture ;
+%         picture mfun_decorated_path, currentpicture ;
+%         currentpicture := nullpicture ;
+%         imagedata ;
+%         mfun_decorated_path := currentpicture ;
+%         currentpicture := nullpicture ;
+%         for i within mfun_decorated_path :
+%             addto currentpicture
+%                 if stroked i :
+%                     doublepath pathpart i
+%                     dashed dashpart i
+%                     withpen penpart i
+%                     withcolor colorpart i
+%                     decoration
+%                 elseif filled i :
+%                     contour pathpart i
+%                     withpen penpart i
+%                     withcolor colorpart i
+%                     decoration
+%                 elseif textual i :
+%                     also i
+%                     withcolor colorpart i
+%                     decoration
+%                 else :
+%                     also i
+%                 fi
+%             ;
+%         endfor ;
+%         currentpicture
+%     enddef ;
+%
+% else:
 
     vardef decorated (text imagedata) text decoration =
         save mfun_decorated_path, currentpicture ;
@@ -2735,7 +2737,7 @@ else:
         currentpicture
     enddef ;
 
-fi ;
+% fi ;
 
 vardef redecorated (text imagedata) text decoration =
     save mfun_decorated_path, currentpicture ;
diff --git a/metapost/context/base/mpiv/mp-base.mpiv b/metapost/context/base/mpiv/mp-base.mpiv
index ecc9497da..0cc209302 100644
--- a/metapost/context/base/mpiv/mp-base.mpiv
+++ b/metapost/context/base/mpiv/mp-base.mpiv
@@ -66,8 +66,8 @@ def stop expr s =
     gobble readstring
 enddef ;
 
-warningcheck     :=1 ;
-tracinglostchars :=1 ;
+warningcheck     := 1 ;
+tracinglostchars := 1 ;
 
 def interact = % sets up to make "show" commands stop
     hide (
diff --git a/metapost/context/base/mpiv/mp-mlib.mpiv b/metapost/context/base/mpiv/mp-mlib.mpiv
index 3ad7d0efb..0638ee3e1 100644
--- a/metapost/context/base/mpiv/mp-mlib.mpiv
+++ b/metapost/context/base/mpiv/mp-mlib.mpiv
@@ -1245,19 +1245,19 @@ 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 :
+% 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 :
@@ -1271,7 +1271,7 @@ else :
         withpostscript postscriptpart p
     enddef ;
 
-fi ;
+% fi ;
 
 % Experimental:
 
diff --git a/metapost/context/base/mpiv/mp-tool.mpiv b/metapost/context/base/mpiv/mp-tool.mpiv
index be35b9795..cd04b8dcb 100644
--- a/metapost/context/base/mpiv/mp-tool.mpiv
+++ b/metapost/context/base/mpiv/mp-tool.mpiv
@@ -26,7 +26,9 @@ let @## = @# ;
 
 if not known mpversion : string mpversion ; mpversion := "0.641" ; fi ;
 
-newinternal metapostversion ; metapostversion := scantokens(mpversion) ;
+% newinternal metapostversion ; metapostversion := scantokens(mpversion) ;
+
+newinternal metapostversion ; metapostversion := 2.0 ;
 
 %D We always want \EPS\ conforming output, so we say:
 
-- 
cgit v1.2.3