2021-07-21 19:53:00

5 files changed, 28 insertions, 91 deletions

diff --git a/metapost/context/base/mpiv/mp-back.mpiv b/metapost/context/base/mpiv/mp-back.mpiv
index e77b3f0d9..dccae92e8 100644
--- a/metapost/context/base/mpiv/mp-back.mpiv
+++ b/metapost/context/base/mpiv/mp-back.mpiv
@@ -33,6 +33,23 @@ def some_hash ( expr hash_width     ,
     endgroup ;
 enddef ;
 
+% \starttext
+%
+% \startMPpage
+%     input "mp-back"
+%
+%     some_double_back (1, 4.5cm, 1.5cm, .25cm, 1mm, .5white, .8white, .7white, .6white, .7white, .6white) currentpicture := currentpicture shifted (0,-3cm) ;
+%     some_double_back (2, 4.5cm, 1.5cm, .25cm, 1mm, .5white, .8white, .7white, .6white,   white,   white) currentpicture := currentpicture shifted (0,-3cm) ;
+%     some_double_back (3, 4.5cm, 1.5cm, .25cm, 1mm, .5white, .8white, .7white,  white,    white,   white) currentpicture := currentpicture shifted (0,-3cm) ;
+%     some_double_back (4, 4.5cm, 1.5cm, .25cm, 1mm, .5white, .8white, .7white,  white,    white,   white) currentpicture := currentpicture shifted (0,-3cm) ;
+%     some_double_back (5, 4.5cm, 1.5cm, .25cm, 1mm, .5white, .8white, .7white,  white,    white,   white) currentpicture := currentpicture shifted (0,-3cm) ;
+%     some_double_back (6, 4.5cm, 1.5cm, .25cm, 1mm, .5white, .8white, .7white,  white,    white,   white) currentpicture := currentpicture shifted (0,-3cm) ;
+%     some_double_back (7, 4.5cm, 1.5cm, .25cm, 1mm, .5white, .8white, .7white,  white,    white,   white) currentpicture := currentpicture shifted (0,-3cm) ;
+%     some_double_back (8, 4.5cm, 1.5cm, .25cm, 1mm, .5white, .8white, .7white,  white,    white,   white)
+% \stopMPpage
+
+% \stoptext
+
 def some_double_back (expr back_type        ,
                            back_width       ,
                            back_height      ,
@@ -163,49 +180,3 @@ def some_double_back (expr back_type        ,
 
     endgroup;
 enddef ;
-
-% endinput ;
-%
-% beginfig (1) ;
-%
-% some_double_back (1, 4.5cm, 1.5cm, .25cm, 1mm,
-%            .5white, .8white, .7white, .6white, .7white, .6white)
-%
-% currentpicture := currentpicture shifted (0,-3cm) ;
-%
-% some_double_back (2, 4.5cm, 1.5cm, .25cm, 1mm,
-%            .5white, .8white, .7white, .6white, white, white)
-%
-% currentpicture := currentpicture shifted (0,-3cm) ;
-%
-% some_double_back (3, 4.5cm, 1.5cm, .25cm, 1mm,
-%            .5white, .8white, .7white, white, white, white)
-%
-% currentpicture := currentpicture shifted (0,-3cm) ;
-%
-% some_double_back (4, 4.5cm, 1.5cm, .25cm, 1mm,
-%            .5white, .8white, .7white, white, white, white)
-%
-% currentpicture := currentpicture shifted (0,-3cm) ;
-%
-% some_double_back (5, 4.5cm, 1.5cm, .25cm, 1mm,
-%            .5white, .8white, .7white, white, white, white)
-%
-% currentpicture := currentpicture shifted (0,-3cm) ;
-%
-% some_double_back (6, 4.5cm, 1.5cm, .25cm, 1mm,
-%            .5white, .8white, .7white, white, white, white)
-%
-% currentpicture := currentpicture shifted (0,-3cm) ;
-%
-% some_double_back (7, 4.5cm, 1.5cm, .25cm, 1mm,
-%            .5white, .8white, .7white, white, white, white)
-%
-% currentpicture := currentpicture shifted (0,-3cm) ;
-%
-% some_double_back (8, 4.5cm, 1.5cm, .25cm, 1mm,
-%            .5white, .8white, .7white, white, white, white)
-%
-% endfig ;
-%
-% end .
diff --git a/metapost/context/base/mpiv/mp-idea.mpiv b/metapost/context/base/mpiv/mp-idea.mpiv
deleted file mode 100644
index d417ab51f..000000000
--- a/metapost/context/base/mpiv/mp-idea.mpiv
+++ /dev/null
@@ -1,44 +0,0 @@
-% redpart (1,1,0,0) crashes
-
-% let normalredpart     = redpart ;
-% let normalgreenpart   = greenpart ;
-% let normalbluepart    = bluepart ;
-% let normalcyanpart    = cyanpart ;
-% let normalmagentapart = magentapart ;
-% let normalyellowpart  = yellowpart ;
-% let normalblackpart   = blackpart ;
-
-% vardef redpart     expr p = if cmykcolor p : 1 - normalcyanpart    p elseif rgbcolor p :     normalredpart   p else : p fi enddef ;
-% vardef greenpart   expr p = if cmykcolor p : 1 - normalmagentapart p elseif rgbcolor p :     normalgreenpart p else : p fi enddef ;
-% vardef bluepart    expr p = if cmykcolor p : 1 - normalyellowpart  p elseif rgbcolor p :     normalbluepart  p else : p fi enddef ;
-% vardef cyanpart    expr p = if cmykcolor p :     normalcyanpart    p elseif rgbcolor p : 1 - normalredpart   p else : p fi enddef ;
-% vardef magentapart expr p = if cmykcolor p :     normalmagentapart p elseif rgbcolor p : 1 - normalgreenpart p else : p fi enddef ;
-% vardef yellowpart  expr p = if cmykcolor p :     normalyellowpart  p elseif rgbcolor p : 1 - normalbluepart  p else : p fi enddef ;
-% vardef blackpart   expr p = if cmykcolor p :     normalblackpart   p elseif rgbcolor p :                     0 else : p fi enddef ;
-
-vardef rcomponent expr p = if rgbcolor  p : redpart     p elseif cmykcolor p : 1 - cyanpart    p else : p fi enddef ;
-vardef gcomponent expr p = if rgbcolor  p : greenpart   p elseif cmykcolor p : 1 - magentapart p else : p fi enddef ;
-vardef bcomponent expr p = if rgbcolor  p : bluepart    p elseif cmykcolor p : 1 - yellowpart  p else : p fi enddef ;
-vardef ccomponent expr p = if cmykcolor p : cyanpart    p elseif rgbcolor  p : 1 - redpart     p else : p fi enddef ;
-vardef mcomponent expr p = if cmykcolor p : magentapart p elseif rgbcolor  p : 1 - greenpart   p else : p fi enddef ;
-vardef ycomponent expr p = if cmykcolor p : yellowpart  p elseif rgbcolor  p : 1 - bluepart    p else : p fi enddef ;
-vardef bcomponent expr p = if cmykcolor p : blackpart   p elseif rgbcolor  p :                 0 else : p fi enddef ;
-
-vardef somecolor = (1,1,0,0) enddef ;
-
-fill OverlayBox withcolor (rcomponent somecolor,gcomponent somecolor,bcomponent somecolor) ;
-fill OverlayBox withcolor (ccomponent somecolor,mcomponent somecolor,ycomponent somecolor,bcomponent somecolor) ;
-
-% def newcolor     text v = forsuffixes i=v : save i ; color     i ; endfor ; enddef ;
-% def newnumeric   text v = forsuffixes i=v : save i ; numeric   i ; endfor ; enddef ;
-% def newboolean   text v = forsuffixes i=v : save i ; boolean   i ; endfor ; enddef ;
-% def newtransform text v = forsuffixes i=v : save i ; transform i ; endfor ; enddef ;
-% def newpath      text v = forsuffixes i=v : save i ; path      i ; endfor ; enddef ;
-% def newpicture   text v = forsuffixes i=v : save i ; picture   i ; endfor ; enddef ;
-% def newstring    text v = forsuffixes i=v : save i ; string    i ; endfor ; enddef ;
-
-% width := 10 ;
-% beginfig(1) ;
-%   newpath width, height ; width := origin -- cycle ;
-% endfig ;
-% width := 10 ;
diff --git a/metapost/context/base/mpiv/mp-xbox.mpiv b/metapost/context/base/mpiv/mp-xbox.mpiv
index 4b4c4c3cd..be5630a5e 100644
--- a/metapost/context/base/mpiv/mp-xbox.mpiv
+++ b/metapost/context/base/mpiv/mp-xbox.mpiv
@@ -284,6 +284,11 @@ def boxes_init_all =
     def boxes_clear_all = enddef;
 enddef ;
 
+def boxjoin(text t) =
+    def boxes_prevbox = _ enddef;
+    def boxes_dojoin(suffix a,b) = t enddef;
+enddef;
+
 extra_beginfig := extra_beginfig & "boxes_init_all;";
 extra_endfig   := "boxes_clear_all;" & extra_endfig;
 
diff --git a/metapost/context/base/mpxl/mp-tool.mpxl b/metapost/context/base/mpxl/mp-tool.mpxl
index a6f931fbd..05302493b 100644
--- a/metapost/context/base/mpxl/mp-tool.mpxl
+++ b/metapost/context/base/mpxl/mp-tool.mpxl
@@ -32,7 +32,7 @@ if not known mpversion : string mpversion ; mpversion := "0.641" ; fi ;
 
 % newinternal metapostversion ; metapostversion := scantokens(mpversion) ;
 
-newinternal metapostversion ; metapostversion := 2.0 ; permanent metapostversion ;
+newinternal metapostversion ; metapostversion := 3.0 ; permanent metapostversion ;
 
 %D We always want \EPS\ conforming output, so we say:
 
diff --git a/metapost/context/base/mpxl/mp-xbox.mpxl b/metapost/context/base/mpxl/mp-xbox.mpxl
index 65a3da775..2b8b94c27 100644
--- a/metapost/context/base/mpxl/mp-xbox.mpxl
+++ b/metapost/context/base/mpxl/mp-xbox.mpxl
@@ -283,6 +283,11 @@ def boxes_init_all =
     def boxes_clear_all = enddef;
 enddef ;
 
+def boxjoin(text t) =
+    def boxes_prevbox = _ enddef;
+    def boxes_dojoin(suffix a,b) = t enddef;
+enddef;
+
 extra_beginfig := extra_beginfig & "boxes_init_all;";
 extra_endfig   := "boxes_clear_all;" & extra_endfig;