diff options
author | Hans Hagen <pragma@wxs.nl> | 2017-04-02 20:46:19 +0200 |
---|---|---|
committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2017-04-02 20:46:19 +0200 |
commit | e32f57c9c5968f0c09130f6e24e28a96d6e1393d (patch) | |
tree | 476d22407b719a74b18a849d83fb8464f9a042c4 /metapost/context/base/mpiv | |
parent | 30ea6ac75b1cf62ea8e17228c07d54824285acfa (diff) | |
download | context-e32f57c9c5968f0c09130f6e24e28a96d6e1393d.tar.gz |
2017-04-02 19:57:00
Diffstat (limited to 'metapost/context/base/mpiv')
-rw-r--r-- | metapost/context/base/mpiv/mp-base.mpiv | 4 | ||||
-rw-r--r-- | metapost/context/base/mpiv/mp-mlib.mpiv | 28 | ||||
-rw-r--r-- | metapost/context/base/mpiv/mp-tool.mpiv | 4 |
3 files changed, 19 insertions, 17 deletions
diff --git a/metapost/context/base/mpiv/mp-base.mpiv b/metapost/context/base/mpiv/mp-base.mpiv index ecc9497da..0cc209302 100644 --- a/metapost/context/base/mpiv/mp-base.mpiv +++ b/metapost/context/base/mpiv/mp-base.mpiv @@ -66,8 +66,8 @@ def stop expr s = gobble readstring enddef ; -warningcheck :=1 ; -tracinglostchars :=1 ; +warningcheck := 1 ; +tracinglostchars := 1 ; def interact = % sets up to make "show" commands stop hide ( diff --git a/metapost/context/base/mpiv/mp-mlib.mpiv b/metapost/context/base/mpiv/mp-mlib.mpiv index 3ad7d0efb..0638ee3e1 100644 --- a/metapost/context/base/mpiv/mp-mlib.mpiv +++ b/metapost/context/base/mpiv/mp-mlib.mpiv @@ -1245,19 +1245,19 @@ vardef properties(text t) = image(draw unitcircle t) enddef ; -if metapostversion < 1.770 : - - def withproperties expr p = - if colormodel p = 3 : - withcolor greypart p - elseif colormodel p = 5 : - withcolor (redpart p,greenpart p,bluepart p) - elseif colormodel p = 7 : - withcolor (cyanpart p,magentapart p,yellowpart p,blackpart p) - fi - enddef ; - -else : +% if metapostversion < 1.770 : +% +% def withproperties expr p = +% if colormodel p = 3 : +% withcolor greypart p +% elseif colormodel p = 5 : +% withcolor (redpart p,greenpart p,bluepart p) +% elseif colormodel p = 7 : +% withcolor (cyanpart p,magentapart p,yellowpart p,blackpart p) +% fi +% enddef ; +% +% else : def withproperties expr p = if colormodel p = 3 : @@ -1271,7 +1271,7 @@ else : withpostscript postscriptpart p enddef ; -fi ; +% fi ; % Experimental: diff --git a/metapost/context/base/mpiv/mp-tool.mpiv b/metapost/context/base/mpiv/mp-tool.mpiv index be35b9795..cd04b8dcb 100644 --- a/metapost/context/base/mpiv/mp-tool.mpiv +++ b/metapost/context/base/mpiv/mp-tool.mpiv @@ -26,7 +26,9 @@ let @## = @# ; if not known mpversion : string mpversion ; mpversion := "0.641" ; fi ; -newinternal metapostversion ; metapostversion := scantokens(mpversion) ; +% newinternal metapostversion ; metapostversion := scantokens(mpversion) ; + +newinternal metapostversion ; metapostversion := 2.0 ; %D We always want \EPS\ conforming output, so we say: |