2014-01-03 00:42:00

1 files changed, 4 insertions, 67 deletions

diff --git a/metapost/context/base/mp-base.mpiv b/metapost/context/base/mp-base.mpiv
index 0b655ef47..2887cc462 100644
--- a/metapost/context/base/mp-base.mpiv
+++ b/metapost/context/base/mp-base.mpiv
@@ -323,7 +323,7 @@ primarydef w dotprod z =
 enddef ;
 
 primarydef x**y =
-    if y = 2 :
+    if y=2 :
         x*x
     else :
         takepower y of x
@@ -348,46 +348,11 @@ def takepower expr y of x =
                 endfor
             fi
         else :
-            hide(errmessage "Undefined power: " & decimal x & "**" & decimal y)
+            hide(errmessage "Undefined power: " & decimal x&"**"&decimal y)
         fi
     fi
 enddef ;
 
-% for big number systems:
-%
-% primarydef x**y =
-%     if y = 1 :
-%         x
-%     elseif y = 2 :
-%         x*x
-%     elseif y = 3 :
-%         x*x*x
-%     else :
-%         takepower y of x
-%     fi
-% enddef ;
-%
-% vardef takepower expr y of x =
-%     if (x=0) and (y>0) :
-%         0
-%     else :
-%         1
-%         if y = floor y :
-%             if y >= 0 :
-%                 for n=1 upto y :
-%                     *x
-%                 endfor
-%             else :
-%                 for n=-1 downto y :
-%                     /x
-%                 endfor
-%             fi
-%         else :
-%             hide(errmessage "Undefined power: " & decimal x & "**" & decimal y)
-%         fi
-%     fi
-% enddef ;
-
 vardef direction expr t of p =
     postcontrol t of p - precontrol t of p
 enddef ;
@@ -629,36 +594,8 @@ def filldraw expr c =
     addto currentpicture contour c withpen currentpen _op_
 enddef ;
 
-% def drawdot expr z =
-%     addto currentpicture contour makepath currentpen shifted z _op_
-% enddef ;
-%
-% testcase DEK:
-%
-% for j=1 upto 9 :
-%     pickup pencircle xscaled .4 yscaled .2 ;
-%     drawdot (10j,0) withpen pencircle xscaled .5j yscaled .25j rotated 45 ;
-%     pickup pencircle xscaled .5j yscaled .25j rotated 45 ;
-%     drawdot (10j,10);
-% endfor ;
-%
-% or:
-%
-%\startMPpage
-%
-% def drawdot expr z =
-%     addto currentpicture contour (makepath currentpen shifted z) _op_
-% enddef;
-%
-% drawdot origin shifted (0,-3cm) withpen pencircle scaled 2cm ;
-% pickup pencircle scaled 2cm ; drawdot origin withcolor red ;
-
-def drawdot expr p =
-    if pair p :
-        addto currentpicture doublepath p withpen currentpen _op_
-    else :
-        errmessage("drawdot only accepts a pair expression")
-    fi
+def drawdot expr z =
+    addto currentpicture contour makepath currentpen shifted z _op_
 enddef ;
 
 def unfill     expr c = fill     c withcolor background enddef ;