summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/generic/mfpic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-04-03 23:09:49 +0000
committerKarl Berry <karl@freefriends.org>2010-04-03 23:09:49 +0000
commit09271d9bf7c7ef58046528d31a8fab85b8eaf36d (patch)
tree57339f57ba439285f65c37b5014af720c84f693e /Master/texmf-dist/source/generic/mfpic
parent36080b5cf06fe9bdde3b1edb30fd795a58e6bf10 (diff)
mfpic update (31mar10)
git-svn-id: svn://tug.org/texlive/trunk@17671 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/generic/mfpic')
-rw-r--r--Master/texmf-dist/source/generic/mfpic/grafbase.dtx97
-rw-r--r--Master/texmf-dist/source/generic/mfpic/mfpic.dtx23
-rw-r--r--Master/texmf-dist/source/generic/mfpic/mfpic.ins2
3 files changed, 61 insertions, 61 deletions
diff --git a/Master/texmf-dist/source/generic/mfpic/grafbase.dtx b/Master/texmf-dist/source/generic/mfpic/grafbase.dtx
index 87cff9829cb..013d7adf8d3 100644
--- a/Master/texmf-dist/source/generic/mfpic/grafbase.dtx
+++ b/Master/texmf-dist/source/generic/mfpic/grafbase.dtx
@@ -1,6 +1,6 @@
% \iffalse
%%% File: grafbase.dtx
-%%% A part of mfpic 1.03 2009/11/18
+%%% A part of mfpic 1.04 2010/03/30
%%%
% -------------------------------------------------------------------
%
@@ -19,7 +19,7 @@
%
%<*driver>
\ProvidesFile{grafbase.dtx}
- [2009/11/18 v1.03. Metafont/post macros to interface with mfpic.]%
+ [2010/03/30 v1.04. Metafont/post macros to interface with mfpic.]%
\documentclass{ltxdoc}
\usepackage{docmfp}
@@ -185,10 +185,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;
@@ -232,7 +233,7 @@ def checkversions (expr g)=
fi
enddef;
-checkversions (103);
+checkversions (104);
% \end{macrocode}
%
@@ -246,6 +247,35 @@ elseif base_name <> "plain": input plain;
fi
% \end{macrocode}
+% \DescribeRoutine{GBdebug}
+% The \gbc{debug} flag is for developers, who should set it before
+% inputing \file{grafbase}.
+% \DescribeRoutine{GBenddebug}
+% These two routines start and end debug messages.
+%
+% \DescribeRoutine{mftitle}
+% The \gbc{mftitle} macro is useful when debugging.
+% It will put its argument, which should be a string, as a TFM comment,
+% and also print it to the terminal and log file.
+% \begin{macrocode}
+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;
+
+% \end{macrocode}
%
% \DescribeVariable{METAPOST}
% We try to determine which of \MF{} or \MP{} is using these macros.
@@ -266,14 +296,12 @@ fi
% \begin{macrocode}
boolean METAPOST;
METAPOST := known color Geamparalele din Babadag;
-numeric metapostversion;
%<*MF>
if METAPOST:
GBerrmsg ("wrong compiler.")
"This file is for Metafont. For Metapost use grafbase.mp.";
fi
-metapostversion := 0;
%</MF>
%<*MP>
@@ -319,34 +347,6 @@ fi
%</MP>
% \end{macrocode}
%
-% \DescribeRoutine{GBdebug}
-% The \gbc{debug} flag is for developers, who should set it before
-% inputing \file{grafbase}.
-% \DescribeRoutine{GBenddebug}
-% These two routines start and end debug messages.
-%
-% \DescribeRoutine{mftitle}
-% The \gbc{mftitle} macro is useful when debugging.
-% It will put its argument, which should be a string, as a TFM comment,
-% and also print it to the terminal and log file.
-% \begin{macrocode}
-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;
-
-% \end{macrocode}
%
% \subsection{Setting up the font, \MF{} only}\label{font}
%
@@ -369,31 +369,30 @@ enddef;
%<*MF>
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#;
diff --git a/Master/texmf-dist/source/generic/mfpic/mfpic.dtx b/Master/texmf-dist/source/generic/mfpic/mfpic.dtx
index 940ee1651f5..ea14d37321c 100644
--- a/Master/texmf-dist/source/generic/mfpic/mfpic.dtx
+++ b/Master/texmf-dist/source/generic/mfpic/mfpic.dtx
@@ -1,6 +1,6 @@
% \iffalse
%%% File: mfpic.dtx
-%%% A part of mfpic 1.03 2009/11/18
+%%% A part of mfpic 1.04 2010/03/30
%%%
% -------------------------------------------------------------------
%
@@ -22,7 +22,7 @@
%</driver>
%<sty>\ProvidesPackage{mfpic}
%<*sty>
- [2009/11/18 v1.03. Macros for drawing with Metafont/MetaPost.]%
+ [2010/03/30 v1.04. Macros for drawing with Metafont/MetaPost.]%
%</sty>
%<*driver>
\documentclass{ltxdoc}
@@ -170,9 +170,9 @@
\ifx\mfpfileversion\UndEfInEd\else\expandafter\endinput\fi%
{%
\catcode\lq\.12 \catcode\lq\/12%
- \gdef\mfpfileversion{1.03}%
- \gdef\mfpfiledate{2009/11/18}%
- \gdef\mfpicversion{103}%
+ \gdef\mfpfileversion{1.04}%
+ \gdef\mfpfiledate{2010/03/30}%
+ \gdef\mfpicversion{104}%
}%
% \end{macrocode}
%
@@ -1484,17 +1484,18 @@
% mismatches. But since older \grafbase{} didn't test this, some
% mismatches will be missed.
%
-% After that (\cs{mfp@init@outfile}) we set the \mfc{mode}, the \mfc{mag}
-% (both ignored by \MP), and arrange for \grafbase{} macros to be loaded.
+% After that (\cs{mfp@init@outfile}) we set the \mfc{mode} and the
+% \mfc{mag} if not known (both ignored by \MP), and arrange for
+% \grafbase{} macros to be loaded.
% \begin{macrocode}
\newdef\mfp@versioninfo{%
\mfp@p\space\mfp@filename.m\mfp@ifmpost{p}{f},
generated by Mfpic, v\mfpfileversion\space\mfpfiledate,\@nl
\mfp@p\space from TeX source "\jobname" on \mfp@now\@nl
- numeric mfpicversion; mfpicversion:=\mfpicversion;\@nl}%
+ numeric mfpicversion; mfpicversion := \mfpicversion;\@nl}%
\newdef\mfp@init@outfile{%
- if unknown mode: mode = localfont; fi\@nl
- if unknown mag: mag = \number\mag/1000; fi\@nl
+ if unknown mode: mode := localfont; fi\@nl
+ if unknown mag: mag := \number\mag/1000; fi\@nl
if unknown grafbase: input grafbase; fi\@nl\@nl}%
% \end{macrocode}
% Then a comparison of the version of this file, stored in
@@ -1503,7 +1504,7 @@
% \grafbase{} with a current \mfpic.
% \begin{macrocode}
\newdef\mfp@versioncheck{%
- if unknown grafbaseversion: grafbaseversion = 0; fi\@nl
+ if unknown grafbaseversion: grafbaseversion := 0; fi\@nl
if grafbaseversion <> mfpicversion :\@nl
GBmsg "Bad mfpic installation: mfpic and grafbase %
versions do not match.";\@nl
diff --git a/Master/texmf-dist/source/generic/mfpic/mfpic.ins b/Master/texmf-dist/source/generic/mfpic/mfpic.ins
index bae706a9a6a..120931a31f6 100644
--- a/Master/texmf-dist/source/generic/mfpic/mfpic.ins
+++ b/Master/texmf-dist/source/generic/mfpic/mfpic.ins
@@ -1,5 +1,5 @@
%%% File: mfpic.ins
-%%% A part of mfpic 1.03 2009/11/18
+%%% A part of mfpic 1.04 2010/03/30
%%%
\input docstrip
\keepsilent