From 09271d9bf7c7ef58046528d31a8fab85b8eaf36d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 3 Apr 2010 23:09:49 +0000 Subject: mfpic update (31mar10) git-svn-id: svn://tug.org/texlive/trunk@17671 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/metafont/mfpic/grafbase.mf | 61 ++++++++++++++-------------- 1 file changed, 30 insertions(+), 31 deletions(-) (limited to 'Master/texmf-dist/metafont') diff --git a/Master/texmf-dist/metafont/mfpic/grafbase.mf b/Master/texmf-dist/metafont/mfpic/grafbase.mf index 8afc8894fea..dcc1619c3e2 100644 --- a/Master/texmf-dist/metafont/mfpic/grafbase.mf +++ b/Master/texmf-dist/metafont/mfpic/grafbase.mf @@ -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,32 +60,23 @@ 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 -boolean METAPOST; -METAPOST := known color Geamparalele din Babadag; -numeric metapostversion; - -if METAPOST: - GBerrmsg ("wrong compiler.") - "This file is for Metafont. For Metapost use grafbase.mp."; -fi -metapostversion := 0; - if not boolean debug: boolean debug; debug := false; fi def GBdebug = begingroup - save >>; def >> = message enddef; - >> "Grafbase DEBUG"; + save >>; def >> = message " " & enddef; + message "Grafbase DEBUG"; enddef; def GBenddebug = - >> "End DEBUG"; + message "End DEBUG"; + >> ""; endgroup enddef; @@ -92,33 +84,40 @@ vardef mftitle expr t = if string t: t; message t; fi enddef; +boolean METAPOST; +METAPOST := known color Geamparalele din Babadag; + +if METAPOST: + GBerrmsg ("wrong compiler.") + "This file is for Metafont. For Metapost use grafbase.mp."; +fi + if unknown mode: GBerrmsg ("Metafont mode is unknown.") - "Set mode to a known mode. Perhaps localfont or ljfour. " - & "If you proceed, a generic 600dpi mode will be used."; - if known localfont: mode := localfont; + "Set mode to a known mode, perhaps ljfour. " + & "If you proceed, localfont will be tried. " + & "If that is unknown, a generic mode will be tried."; + if known localfont: mode := localfont; else: + if unknown GBresolution: GBresolution := 600 fi; mode_def GBgeneric = - proofing := 0; - fontmaking := 1; - tracingtitles := 0; - if unknown pixels_per_inch: - pixels_per_inch := 600; - fi - blacker := 0; - fillin := 0; - o_correction := 1; + mode_param (pixels_per_inch, GBresolution); + mode_param (blacker, 0); + mode_param (fillin, 0); + mode_param (o_correction, 1); + mode_common_setup_; enddef; mode := GBgeneric; fi fi - mode_setup; + if debug: GBdebug; >> "pixels_per_inch = " & decimal pixels_per_inch; GBenddebug; fi + font_identifier := "MFpic graphics"; font_coding_scheme := "Arbitrary"; interim designsize := 128pt#; -- cgit v1.2.3