summaryrefslogtreecommitdiff
path: root/metapost
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2011-11-24 17:20:15 +0200
committerMarius <mariausol@gmail.com>2011-11-24 17:20:15 +0200
commitb0b3f63745dbcd338e4ce549c2f8c4427998ffcf (patch)
tree9bf20816667adef0f781f7a6cfccd8e61f1a7a7b /metapost
parentae4e7c1b2b58b4b089b5eff6e8f41371a309a538 (diff)
downloadcontext-b0b3f63745dbcd338e4ce549c2f8c4427998ffcf.tar.gz
beta 2011.11.24 15:52
Diffstat (limited to 'metapost')
-rw-r--r--metapost/context/base/mp-base.mpiv2
-rw-r--r--metapost/context/base/mp-grph.mpiv4
-rw-r--r--metapost/context/base/mp-tool.mpiv34
3 files changed, 18 insertions, 22 deletions
diff --git a/metapost/context/base/mp-base.mpiv b/metapost/context/base/mp-base.mpiv
index 5ed6fd981..7b3a69bb0 100644
--- a/metapost/context/base/mp-base.mpiv
+++ b/metapost/context/base/mp-base.mpiv
@@ -809,7 +809,7 @@ tertiarydef m thru n =
endfor
enddef ;
-%% Overall adminstration
+%% Overall administration
string extra_beginfig, extra_endfig ;
diff --git a/metapost/context/base/mp-grph.mpiv b/metapost/context/base/mp-grph.mpiv
index 6e450a92a..5917beb17 100644
--- a/metapost/context/base/mp-grph.mpiv
+++ b/metapost/context/base/mp-grph.mpiv
@@ -23,7 +23,7 @@ numeric _fig_nesting_ ; _fig_nesting_ := 0 ;
def beginfig (expr c) =
_fig_nesting_ := _fig_nesting_ + 1 ;
- if _fig_nesting_ = 1 :
+ if _fig_nesting_ = 1 :
begingroup
charcode := c ;
resetfig ;
@@ -34,7 +34,7 @@ enddef ;
def endfig =
; % safeguard
if _fig_nesting_ = 1 :
- scantokens extra_endfig;
+ scantokens extra_endfig ;
shipit ;
endgroup ;
fi ;
diff --git a/metapost/context/base/mp-tool.mpiv b/metapost/context/base/mp-tool.mpiv
index e489e7819..6c6db745a 100644
--- a/metapost/context/base/mp-tool.mpiv
+++ b/metapost/context/base/mp-tool.mpiv
@@ -957,25 +957,25 @@ enddef ;
%D PathPoints.
-def drawpoints expr c = path _c_ ; _c_ := c ; do_drawpoints enddef ;
-def drawcontrolpoints expr c = path _c_ ; _c_ := c ; do_drawcontrolpoints enddef ;
-def drawcontrollines expr c = path _c_ ; _c_ := c ; do_drawcontrollines enddef ;
-def drawpointlabels expr c = path _c_ ; _c_ := c ; do_drawpointlabels enddef ;
+def drawpoints expr c = path _c_ ; _c_ := c ; mfun_draw_points enddef ;
+def drawcontrolpoints expr c = path _c_ ; _c_ := c ; mfun_draw_controlpoints enddef ;
+def drawcontrollines expr c = path _c_ ; _c_ := c ; mfun_draw_controllines enddef ;
+def drawpointlabels expr c = path _c_ ; _c_ := c ; mdun_draw_pointlabels enddef ;
-def do_drawpoints text t =
+def mfun_draw_points text t =
for _i_=0 upto length(_c_) :
normaldraw point _i_ of _c_ _pnt_opt_ t ;
endfor ;
enddef;
-def do_drawcontrolpoints text t =
+def mfun_draw_controlpoints text t =
for _i_=0 upto length(_c_) :
normaldraw precontrol _i_ of _c_ _ctr_opt_ t ;
normaldraw postcontrol _i_ of _c_ _ctr_opt_ t ;
endfor ;
enddef;
-def do_drawcontrollines text t =
+def mfun_draw_controllines text t =
for _i_=0 upto length(_c_) :
normaldraw point _i_ of _c_ -- precontrol _i_ of _c_ _lin_opt_ t ;
normaldraw point _i_ of _c_ -- postcontrol _i_ of _c_ _lin_opt_ t ;
@@ -984,7 +984,7 @@ enddef;
boolean swappointlabels ; swappointlabels := false ;
-def do_drawpointlabels text t =
+def mfun_draw_pointlabels text t =
for _i_=0 upto length(_c_) :
pair _u_ ; _u_ := unitvector(direction _i_ of _c_) rotated if swappointlabels : - fi 90 ;
pair _p_ ; _p_ := (point _i_ of _c_) ;
@@ -1013,13 +1013,13 @@ enddef;
numeric tickstep ; tickstep := 5mm ;
numeric ticklength ; ticklength := 2mm ;
-def drawxticks expr c = path _c_ ; _c_ := c ; do_drawxticks enddef ;
-def drawyticks expr c = path _c_ ; _c_ := c ; do_drawyticks enddef ;
-def drawticks expr c = path _c_ ; _c_ := c ; do_drawticks enddef ;
+def drawxticks expr c = path _c_ ; _c_ := c ; mfun_draw_xticks enddef ;
+def drawyticks expr c = path _c_ ; _c_ := c ; mfun_draw_yticks enddef ;
+def drawticks expr c = path _c_ ; _c_ := c ; mfun_draw_ticks enddef ;
% Adding eps prevents disappearance due to rounding errors.
-def do_drawxticks text t =
+def mfun_draw_xticks text t =
for i=0 step -tickstep until xpart llcorner _c_ - eps :
if (i<=xpart lrcorner _c_) :
normaldraw (i,-ticklength)--(i,ticklength) _ori_opt_ t ;
@@ -1033,7 +1033,7 @@ def do_drawxticks text t =
normaldraw (llcorner _c_ -- ulcorner _c_) shifted (-xpart llcorner _c_,0) _ori_opt_ t ;
enddef ;
-def do_drawyticks text t =
+def mfun_draw_yticks text t =
for i=0 step -tickstep until ypart llcorner _c_ - eps :
if (i<=ypart ulcorner _c_) :
normaldraw (-ticklength,i)--(ticklength,i) _ori_opt_ t ;
@@ -1047,7 +1047,7 @@ def do_drawyticks text t =
normaldraw (llcorner _c_ -- lrcorner _c_) shifted (0,-ypart llcorner _c_) _ori_opt_ t ;
enddef ;
-def do_drawticks text t =
+def mfun_draw_ticks text t =
drawxticks _c_ t ;
drawyticks _c_ t ;
enddef ;
@@ -1936,7 +1936,7 @@ enddef ;
% under construction
-vardef straightpath(expr a, b, method) =
+vardef straightpath (expr a, b, method) =
if (method<1) or (method>6) :
(a--b)
elseif method = 1 :
@@ -2039,10 +2039,6 @@ vardef setunstringed (expr s, v) =
scantokens(cleanstring(s)) := v ;
enddef ;
-vardef setunstringed (expr s, v) =
- scantokens(cleanstring(s)) := v ;
-enddef ;
-
vardef getunstringed (expr s) =
scantokens(cleanstring(s))
enddef ;