From e7740d51abd575bf156b3ce1f48a2a5543fbc9eb Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Thu, 13 Oct 2011 21:36:00 +0200
Subject: beta 2011.10.13 21:36

---
 metapost/context/base/metafun.mpiv | 58 ++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 28 deletions(-)

(limited to 'metapost/context/base/metafun.mpiv')

diff --git a/metapost/context/base/metafun.mpiv b/metapost/context/base/metafun.mpiv
index b32e301a7..4bc762cf7 100644
--- a/metapost/context/base/metafun.mpiv
+++ b/metapost/context/base/metafun.mpiv
@@ -16,33 +16,33 @@
 %D end even may use a patched version, we prefer to use a
 %D copy.
 
-input mp-base.mpiv ;
-input mp-tool.mp   ;
-input mp-core.mpiv ;
-input mp-page.mp   ;
-input mp-text.mp   ;
-input mp-txts.mp   ;
-input mp-butt.mp   ;
-input mp-shap.mp   ;
-%     mp-char.mpiv ; % there no need to always load this
-%     mp-step.mpiv ; % there no need to always load this
-input mp-grph.mp   ;
-input mp-figs.mp   ;
-input mp-mlib.mpiv ;
-input mp-chem.mpiv ; % there no need to always load this (todo)
-input mp-grid.mp   ;
-input mp-func.mp   ;
-
-string metafunversion ;
-
-metafunversion = "metafun iv"                        & " " &
-                 decimal year                        & "-" &
-                 decimal month                       & "-" &
-                 decimal day                         & " " &
-                 if ((time div 60) < 10)           :   "0" & fi
-                 decimal (time div 60)               & ":" &
-                 if ((time-(time div 60)*60) < 10) :   "0" & fi
-                 decimal (time-(time div 60)*60)   ;
+input "mp-base.mpiv" ;
+input "mp-tool.mpiv" ;
+input "mp-mlib.mpiv" ;
+input "mp-core.mpiv" ; % todo: namespace and cleanup
+input "mp-page.mpiv" ; % todo: namespace and cleanup
+input "mp-butt.mpiv" ; % todo: namespace and cleanup
+input "mp-shap.mpiv" ; % will be improved
+input "mp-grph.mpiv" ; % todo: namespace and cleanup
+input "mp-grid.mpiv" ; % todo: namespace and cleanup
+
+input "mp-figs.mpiv" ; % obsolete, needs checking
+input "mp-text.mpiv" ; % will be redone into a module
+input "mp-func.mpiv" ; % under construction
+
+%     "mp-char.mpiv" ; % loaded on demand
+%     "mp-step.mpiv" ; % loaded on demand
+%     "mp-chem.mpiv" ; % loaded on demand
+
+string metafunversion ; metafunversion =
+    "metafun iv"                        & " " &
+    decimal year                        & "-" &
+    decimal month                       & "-" &
+    decimal day                         & " " &
+    if ((time div 60) < 10)           :   "0" & fi
+    decimal (time div 60)               & ":" &
+    if ((time-(time div 60)*60) < 10) :   "0" & fi
+    decimal (time-(time div 60)*60)   ;
 
 let normalend = end ;
 
@@ -50,4 +50,6 @@ def end =
   ; message "" ; message metafunversion ; message "" ; normalend ;
 enddef ;
 
-dump ; endinput .
+dump ; % obsolete in mplib
+
+endinput
-- 
cgit v1.2.3