beta 2011.10.17 10:36

1 files changed, 7 insertions, 23 deletions

diff --git a/metapost/context/base/mp-form.mpii b/metapost/context/base/mp-form.mpii
index 60ea4cac2..d1dac32db 100644
--- a/metapost/context/base/mp-form.mpii
+++ b/metapost/context/base/mp-form.mpii
@@ -15,31 +15,15 @@
 
 boolean mant_font ; mant_font := true ; % signals graph not to load form
 
-if known mplib :
-    boolean fmt_loaded ; fmt_loaded := true ;
-    expandafter endinput
-fi ;
-
-if   known fmt_loaded : expandafter endinput fi ;
-   boolean fmt_loaded ; fmt_loaded := true ;
+if known context_form : endinput ; fi ;
 
-if unknown fmt_precision :
-   numeric fmt_precision ; fmt_precision := 3 ;
-fi ;
-
-if unknown fmt_initialize :
-   boolean fmt_initialize ; fmt_initialize := true ;
-fi ;
-
-if unknown fmt_separator :
-    string fmt_separator ; fmt_separator := "%" ;
-fi ;
-
-if unknown fmt_zerocheck :
-   boolean fmt_zerocheck ; fmt_zerocheck := false ;
-fi ;
+boolean context_form ; context_form := true ;
 
-boolean fmt_metapost ; fmt_metapost := true ; % == use old method
+if unknown fmt_metapost   : boolean fmt_metapost   ; fmt_metapost   := true  ; fi ; % == use old method
+if unknown fmt_precision  : numeric fmt_precision  ; fmt_precision  := 3     ; fi ;
+if unknown fmt_initialize : boolean fmt_initialize ; fmt_initialize := true  ; fi ;
+if unknown fmt_separator  : string  fmt_separator  ; fmt_separator  := "%"   ; fi ;
+if unknown fmt_zerocheck  : boolean fmt_zerocheck  ; fmt_zerocheck  := false ; fi ;
 
 % As said, all clever code is from John, the more stupid
 % extensions are mine. The following string variables are