summaryrefslogtreecommitdiff
path: root/metapost
diff options
context:
space:
mode:
Diffstat (limited to 'metapost')
-rw-r--r--metapost/context/base/mp-base.mp5
-rw-r--r--metapost/context/base/mp-spec.mp8
-rw-r--r--metapost/context/base/mp-tool.mp3
3 files changed, 9 insertions, 7 deletions
diff --git a/metapost/context/base/mp-base.mp b/metapost/context/base/mp-base.mp
index 41eb7aa96..d0b3991c8 100644
--- a/metapost/context/base/mp-base.mp
+++ b/metapost/context/base/mp-base.mp
@@ -521,7 +521,7 @@ tertiarydef m thru n =
%% Overall adminstration
string extra_beginfig, extra_endfig;
-extra_beginfig = extra_endfig = "";
+extra_beginfig = extra_endfig = "" ;
def beginfig(expr c) =
begingroup
@@ -533,8 +533,9 @@ def beginfig(expr c) =
enddef;
def endfig =
+ ; % added by HH
scantokens extra_endfig;
- shipit;
+ shipit ;
endgroup
enddef;
diff --git a/metapost/context/base/mp-spec.mp b/metapost/context/base/mp-spec.mp
index f28e5a5d3..21e5e4e1c 100644
--- a/metapost/context/base/mp-spec.mp
+++ b/metapost/context/base/mp-spec.mp
@@ -113,9 +113,11 @@ boolean insidefigure ; insidefigure := false ;
extra_beginfig :=
" insidefigure := true ; " &
" reset_extra_specials ; " &
- extra_beginfig ;
+ extra_beginfig &
+ " ; " ;
extra_endfig :=
+ " ; " &
" add_special_signal ; " &
extra_endfig &
" add_extra_specials ; " &
@@ -474,7 +476,7 @@ enddef ;
_cmyk_counter_ := 0 ;
-extra_endfig := " resetcmykcolors ; " & extra_endfig ;
+extra_endfig := " ; resetcmykcolors ; " & extra_endfig ;
def resetcmykcolors =
numeric cmykcolorhash[][][][] ;
@@ -522,7 +524,7 @@ enddef ;
_spotcolor_counter_ := 0 ;
_spotcolor_number_ := 0 ;
-extra_endfig := " resetspotcolors ; " & extra_endfig ;
+extra_endfig := " ; resetspotcolors ; " & extra_endfig ;
def resetspotcolors =
numeric spotcolorhash[][] ;
diff --git a/metapost/context/base/mp-tool.mp b/metapost/context/base/mp-tool.mp
index f80c867b9..aa3d77f26 100644
--- a/metapost/context/base/mp-tool.mp
+++ b/metapost/context/base/mp-tool.mp
@@ -1018,7 +1018,7 @@ enddef ;
% not yet ok
-def leftrightpath(expr p, l) =
+def leftrightpath(expr p, l) = % used in s-pre-19
save q, r, t, b ; path q, r ; pair t, b ;
t := (ulcorner p -- urcorner p) intersection_point p ;
b := (llcorner p -- lrcorner p) intersection_point p ;
@@ -1027,7 +1027,6 @@ def leftrightpath(expr p, l) =
q := q if xpart point 0 of r > 0 : &
r fi cutafter if l: b else: t fi ;
q
- x
enddef ;
vardef leftpath expr p = leftrightpath(p,true ) enddef ;