From e2cfcd99f00b7ad1c8dc1e66af880dd0662ce22c Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Mon, 21 Dec 2020 10:10:53 +0100 Subject: 2020-12-21 09:35:00 --- metapost/context/base/mpxl/mp-base.mpxl | 6 +++--- metapost/context/base/mpxl/mp-lmtx.mpxl | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'metapost') diff --git a/metapost/context/base/mpxl/mp-base.mpxl b/metapost/context/base/mpxl/mp-base.mpxl index 2c88ee53a..a111c7337 100644 --- a/metapost/context/base/mpxl/mp-base.mpxl +++ b/metapost/context/base/mpxl/mp-base.mpxl @@ -535,7 +535,7 @@ vardef min(expr u)(text t) = % t is a list of numerics, pairs, or strings elseif string u : string temp_any_u fi ; - temp_any_u = u + temp_any_u := u ; for i = t : if i < temp_any_u : temp_any_u := i ; @@ -551,7 +551,7 @@ vardef max(expr u)(text t) = % t is a list of numerics, pairs, or strings elseif string u : string temp_any_u fi ; - temp_any_u = u + temp_any_u := u ; for i = t : if i > temp_any_u : temp_any_u := i ; @@ -642,7 +642,7 @@ pc := 11.95517 ; cc := 12.79213 ; in := 72 ; -immutable mm, pt, dd, bp, cm, pc, cc, in ; +immutable mm, pt, bp, cm, in ; % we don't protect (yet): dd, pc cc (used as locals) % vardef magstep primary m = % obsolete % mexp(46.67432m) diff --git a/metapost/context/base/mpxl/mp-lmtx.mpxl b/metapost/context/base/mpxl/mp-lmtx.mpxl index 4b2ed7940..f1bdf4fd5 100644 --- a/metapost/context/base/mpxl/mp-lmtx.mpxl +++ b/metapost/context/base/mpxl/mp-lmtx.mpxl @@ -357,9 +357,10 @@ vardef lmt_do_followtext = save scale_up ; string scale_up ; scale_up := getparameter "autoscaleup" ; save scale_down ; string scale_down ; scale_down := getparameter "autoscaledown" ; save followtextalternative ; followtextalternative := if getparameter "spread" : 1 else : 0 fi ; - save tracingfollowtext ; tracingfollowtext := if getparameter "trace" : 1 else : 0 fi ; save autoscaleupfollowtext ; autoscaleupfollowtext := if scale_up = "yes" : 1 elseif scale_up = "max" : 2 else : 0 fi ; save autoscaledownfollowtext ; autoscaledownfollowtext := if scale_down = "yes" : 1 elseif scale_down = "max" : 2 else : 0 fi ; + % save tracingfollowtext ; tracingfollowtext := if getparameter "trace" : 1 else : 0 fi ; + interim tracingfollowtext := if getparameter "trace" : 1 else : 0 fi ; draw followtext ( if (getparameter "reverse") : reverse fi (getparameter "path"), getparameter "text" -- cgit v1.2.3