mfpic update (31mar10)

git-svn-id: svn://tug.org/texlive/trunk@17671 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 24 insertions, 23 deletions

diff --git a/Master/texmf-dist/metapost/mfpic/dvipsnam.mp b/Master/texmf-dist/metapost/mfpic/dvipsnam.mp
index 0096bea903f..2d0552256c1 100644
--- a/Master/texmf-dist/metapost/mfpic/dvipsnam.mp
+++ b/Master/texmf-dist/metapost/mfpic/dvipsnam.mp
@@ -22,7 +22,7 @@
 %% with mfpic: plain TeX, LaTeX, plain Metafont and plain MetaPost.
 %% 
 %%% File: grafbase.dtx
-%%% A part of mfpic 1.03 2009/11/18
+%%% A part of mfpic 1.04 2010/03/30
 %%%
 if unknown grafbaseversion:
   if unknown mpversion:
diff --git a/Master/texmf-dist/metapost/mfpic/grafbase.mp b/Master/texmf-dist/metapost/mfpic/grafbase.mp
index 4fc1256f1f4..d67ae28f685 100644
--- a/Master/texmf-dist/metapost/mfpic/grafbase.mp
+++ b/Master/texmf-dist/metapost/mfpic/grafbase.mp
@@ -22,7 +22,7 @@
 %% with mfpic: plain TeX, LaTeX, plain Metafont and plain MetaPost.
 %% 
 %%% File: grafbase.dtx
-%%% A part of mfpic 1.03 2009/11/18
+%%% A part of mfpic 1.04 2010/03/30
 %%%
 if (known grafbaseversion) or (known grafbase):
   message "Grafbase (" & jobname & "): You have loaded grafbase more "
@@ -32,10 +32,11 @@ fi
 boolean grafbase; grafbase := true;
 
 string fileversion, filedate;
-fileversion := "1.03";  filedate := "2009/11/18";
+fileversion := "1.04";  filedate := "2010/03/30";
 
-message " Loading grafbase macros, version " & fileversion & " " &
-   filedate & ".";
+message " Loading grafbase macros version " &
+  fileversion & ", " & filedate & ".";
+message " ";
 
 def GBmsg expr s =  message "Grafbase (" & jobname & "): " & s;  enddef;
 def GBwarn expr s =  GBmsg "Warning, " & s;  enddef;
@@ -59,16 +60,32 @@ def checkversions (expr g)=
   fi
 enddef;
 
-checkversions (103);
+checkversions (104);
 
 if unknown base_name       :  input plain;
 elseif not string base_name:  input plain;
 elseif base_name <> "plain":  input plain;
 fi
 
+if not boolean debug:  boolean debug;  debug := false;  fi
+
+def GBdebug =
+  begingroup
+    save >>;  def >> =  message  "  " &  enddef;
+    message "Grafbase DEBUG";
+enddef;
+def GBenddebug =
+    message "End DEBUG";
+    >> "";
+  endgroup
+enddef;
+
+vardef mftitle expr t =
+  if string t:  t;  message t;  fi
+enddef;
+
 boolean METAPOST;
 METAPOST := known color Geamparalele din Babadag;
-numeric metapostversion;
 
 
 if not METAPOST:
@@ -98,22 +115,6 @@ else:
   fi
 fi
 
-if not boolean debug:  boolean debug;  debug := false;  fi
-
-def GBdebug =
-  begingroup
-    save >>;  def >> =  message  enddef;
-    >> "Grafbase DEBUG";
-enddef;
-def GBenddebug =
-    >> "End DEBUG";
-  endgroup
-enddef;
-
-vardef mftitle expr t =
-  if string t:  t;  message t;  fi
-enddef;
-
 pt# := pt;  bp# := bp;
 def t_ =  transformed currenttransform  enddef;
 if unknown aspect_ratio:  aspect_ratio := 1;  fi