From 55575b7cad42dac55b4a5f699c33363489cb502d Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Fri, 25 Jan 2019 20:34:48 +0100 Subject: 2019-01-25 20:15:00 --- metapost/context/base/mpii/mp-text.mpii | 3 +-- metapost/context/base/mpiv/mp-grph.mpiv | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'metapost') diff --git a/metapost/context/base/mpii/mp-text.mpii b/metapost/context/base/mpii/mp-text.mpii index 5f96f6788..b7787a42d 100644 --- a/metapost/context/base/mpii/mp-text.mpii +++ b/metapost/context/base/mpii/mp-text.mpii @@ -56,12 +56,11 @@ boolean hobbiestextext ; hobbiestextext := false ; % enddef ; vardef textext@#(expr txt) = - save _s_ ; string _s_ ; interim labeloffset := textextoffset ; noftexpictures := noftexpictures + 1 ; if string txt : if hobbiestextext : % the tex.mp method as fallback (see tex.mp) - write _s_ & "btex " & txt & " etex" to "mptextmp.mp" ; + write "btex " & txt & " etex" to "mptextmp.mp" ; write EOF to "mptextmp.mp" ; scantokens "input mptextmp" else : diff --git a/metapost/context/base/mpiv/mp-grph.mpiv b/metapost/context/base/mpiv/mp-grph.mpiv index 3c042f83c..d4316eb91 100644 --- a/metapost/context/base/mpiv/mp-grph.mpiv +++ b/metapost/context/base/mpiv/mp-grph.mpiv @@ -172,16 +172,16 @@ def mfun_graphic_text_indeed(expr t) text rest = draw outlinetext.f(t)(mfun_gt_shade) rest; elseif mfun_gt_color_fill and mfun_gt_color_draw : if mfun_gt_reverse_fill : - draw outlinetext.r(t)(mfun_gt_default mfun_gt_fill rest)(mfun_gt_default mfun_gt_draw rest) ; + draw outlinetext.r(t)(mfun_gt_default mfun_gt_fill)(mfun_gt_default mfun_gt_draw) rest; else : - draw outlinetext.b(t)(mfun_gt_default mfun_gt_draw rest)(mfun_gt_default mfun_gt_fill rest); + draw outlinetext.b(t)(mfun_gt_default mfun_gt_draw)(mfun_gt_default mfun_gt_fill) rest; fi ; elseif mfun_gt_color_fill : - draw outlinetext.f(t)(mfun_gt_default mfun_gt_fill rest) ; + draw outlinetext.f(t)(mfun_gt_default mfun_gt_fill) rest; elseif mfun_gt_color_draw : - draw outlinetext.d(t)(mfun_gt_default mfun_gt_draw rest) ; + draw outlinetext.d(t)(mfun_gt_default mfun_gt_draw) rest ; else : - draw outlinetext.d(t)(mfun_gt_default rest) ; + draw outlinetext.d(t)(mfun_gt_default) rest ; fi ; % endgroup ; -- cgit v1.2.3