stable 2003.04.22

3 files changed, 29 insertions, 0 deletions

diff --git a/metapost/context/base/metafun.mp b/metapost/context/base/metafun.mp
index 474a10eb3..f8cab41bf 100644
--- a/metapost/context/base/metafun.mp
+++ b/metapost/context/base/metafun.mp
@@ -44,4 +44,19 @@ input mp-grph.mp ;
 input mp-grid.mp ; 
 input mp-func.mp ; 
 
+string metafunversion ;
+
+metafunversion = "metafun"                       & " " &
+                 decimal year                    & "-" &
+                 decimal month                   & "-" &
+                 decimal day                     & " " &
+                 decimal (time div 60)           & ":" &
+                 decimal (time-(time div 60)*60) ;
+
+let normalend = end ;
+
+def end =
+  message "" ; message metafunversion ; message "" ; normalend ;
+enddef ;
+
 dump ; endinput .
diff --git a/metapost/context/base/mp-core.mp b/metapost/context/base/mp-core.mp
index 148d13f49..72347734f 100644
--- a/metapost/context/base/mp-core.mp
+++ b/metapost/context/base/mp-core.mp
@@ -356,6 +356,8 @@ boolean snap_multi_par_tops   ; snap_multi_par_tops   := true ;
 boolean local_multi_par_area  ; local_multi_par_area  := false ; 
 boolean ignore_multi_par_page ; ignore_multi_par_page := false ; 
 
+boolean one_piece_multi_par   ; one_piece_multi_par   := false ; 
+
 def simplify_multi_pars = % boundingbox ipv shape als optie
   for i := 1 upto nofmultipars :
     multipars[i] := boundingbox multipars[i] ;
@@ -966,6 +968,10 @@ fi ;
     endgroup ;
   fi ;
 
+  % quick hack for gb: 
+
+  one_piece_multi_par := (nofmultipars=1) and (pn=tn) ;
+
 enddef ;
 
 color   boxgridcolor     ; boxgridcolor     := .8red ;
diff --git a/metapost/context/base/mp-page.mp b/metapost/context/base/mp-page.mp
index 05a433395..af63b921b 100644
--- a/metapost/context/base/mp-page.mp
+++ b/metapost/context/base/mp-page.mp
@@ -27,6 +27,10 @@ if unknown OnRightPage :
   boolean OnRightPage ; OnRightPage := true ;
 fi ;
 
+if unknown OnOddPage :
+  boolean OnOddPage ; OnOddPage := true ;
+fi ;
+
 if unknown InPageBody :
   boolean InPageBody ; InPageBody := false ;
 fi ;
@@ -240,6 +244,10 @@ RightEdgeWidth      :=    0.0pt     ;
 PageOffset          :=    0.0pt     ; 
 PageDepth           :=    0.0pt     ; 
 
+LayoutColumns       :=    0         ;
+LayoutColumnDistance:=    0.0pt     ;              
+LayoutColumnWidth   :=    0.0pt     ;
+
 LeftEdge             :=  -4 ; Top             := -40 ;
 LeftEdgeSeparator    :=  -3 ; TopSeparator    := -30 ; 
 LeftMargin           :=  -2 ; Header          := -20 ;