mfpic 1.06 (21mar11)

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

3 files changed, 45 insertions, 55 deletions

diff --git a/Master/texmf-dist/tex/generic/mfpic/mfpic.sty b/Master/texmf-dist/tex/generic/mfpic/mfpic.sty
index 733961888dc..622d081e0ce 100644
--- a/Master/texmf-dist/tex/generic/mfpic/mfpic.sty
+++ b/Master/texmf-dist/tex/generic/mfpic/mfpic.sty
@@ -8,7 +8,7 @@
 %% 
 %% -------------------------------------------------------------------
 %% 
-%% Copyright 2002--2010, Daniel H. Luecking
+%% Copyright 2002--2011, Daniel H. Luecking
 %% 
 %% Mfpic may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License, either version 1.3c of this license or (at
@@ -21,11 +21,8 @@
 %% is Daniel H. Luecking. There are several Base Interpreters associated
 %% with mfpic: plain TeX, LaTeX, plain Metafont and plain MetaPost.
 %% 
-%%% File: mfpic.dtx
-%%% A part of mfpic 1.05 2010/06/10
-%%%
 \ProvidesPackage{mfpic}
-  [2010/06/10 v1.05. Macros for drawing with Metafont/MetaPost.]%
+  [2011/03/08 v1.06. Macros for drawing with Metafont/MetaPost.]%
 \DeclareOption{draft}{\mfpicdraft}%
 \DeclareOption{final}{%
   \mfpicfinal\PassOptionsToPackage{final}{graphics}}%
diff --git a/Master/texmf-dist/tex/generic/mfpic/mfpic.tex b/Master/texmf-dist/tex/generic/mfpic/mfpic.tex
index fc6efa8e1cc..d2596ed2cd9 100644
--- a/Master/texmf-dist/tex/generic/mfpic/mfpic.tex
+++ b/Master/texmf-dist/tex/generic/mfpic/mfpic.tex
@@ -8,7 +8,7 @@
 %% 
 %% -------------------------------------------------------------------
 %% 
-%% Copyright 2002--2010, Daniel H. Luecking
+%% Copyright 2002--2011, Daniel H. Luecking
 %% 
 %% Mfpic may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License, either version 1.3c of this license or (at
@@ -21,15 +21,12 @@
 %% is Daniel H. Luecking. There are several Base Interpreters associated
 %% with mfpic: plain TeX, LaTeX, plain Metafont and plain MetaPost.
 %% 
-%%% File: mfpic.dtx
-%%% A part of mfpic 1.05 2010/06/10
-%%%
 \ifx\mfpfileversion\UndEfInEd\else\expandafter\endinput\fi%
 {%
   \catcode\lq\.12 \catcode\lq\/12%
-  \gdef\mfpfileversion{1.05}%
-  \gdef\mfpfiledate{2010/06/10}%
-  \gdef\mfpicversion{105}%
+  \gdef\mfpfileversion{1.06}%
+  \gdef\mfpfiledate{2011/02/25}%
+  \gdef\mfpicversion{106}%
 }%
 \let\mfpsaveplus\+%
 \let\+\tabalign%
@@ -109,18 +106,20 @@
     \else \@xp\@secondoftwo
     \fi}%
 \mfp@enddef
-\mfp@ifdefined\g@addto@macro{}{%
+\mfp@ifundefined\g@addto@macro
   \long\def\g@addto@macro#1#2{%
     \begingroup
       \toks@\@xp{#1#2}%
       \xdef#1{\the\toks@}%
-    \endgroup}}%
-\mfp@ifdefined\g@prependto@macro{}{%
+    \endgroup}%
+\mfp@enddef
+\mfp@ifundefined\g@prependto@macro
   \long\def\g@prependto@macro#1#2{%
     \begingroup
       \toks@{#2}\toks2\@xp{#1}%
       \xdef#1{\the\toks@\the\toks2}%
-    \endgroup}}%
+    \endgroup}%
+\mfp@enddef
 \newif\ifmfp@latex \mfp@latexfalse
 \mfp@ifdefined\documentstyle
  {\ifx \amstexloaded@\relax \mfp@DBlog{AmS-TeX detected.}%
@@ -202,7 +201,7 @@
 \newdef\mfp@justify@error{%
     \mfp@errmsg{Invalid justification parameter for text label}%
      {The optional argument for an mfpic text label must be^^J%
-      one of B, b, c or t, followed by^^J
+      one of B, b, c or t, followed by^^J%
       one of l, r or c, optionally followed by an angle.}}%
 \newdef\mfp@untilwarn{%
   \Mfpic@warn{\mfp@b mfploop without \string\mfpuntil!}}%
@@ -259,7 +258,7 @@
   \ifmfp@latex
     \ifmfp@centcapt \centering \else \raggedright \fi
   \else
-    \rightskip 0pt plus 1fil
+    \rightskip 0pt plus 1fil\relax
     \ifmfp@centcapt
       \leftskip 0pt plus 1fil
       \parfillskip 0pt plus 1fil\relax
@@ -408,6 +407,9 @@
 \def\mfp@ifstar#1#2#3{\mfp@iftoken*{#1{#2}}{#1{#3}}}%
 \def\mfp@ifend{\mfp@iftoken\mfp@end}%
 \def\mfp@ifendorcomma#1#2#3{\mfp@ifend{#1}{\mfp@iftoken,{#2}{#3}}}%
+\mfp@ifundefined\@ifstar
+  \def\@ifstar#1{\@ifnextchar*{\@firstoftwo{#1}}}%
+\mfp@enddef
 {%
   \catcode`Q3 \catcode`\~12
   \gdef\mfp@ifempty#1{\if~#1~\@xp\@firstoftwo\else\@xp\@secondoftwo\fi}%
@@ -438,6 +440,10 @@
     {\mfp@nooutput@error{#1}}\endgroup}%
 \newdef\mfp@cmd#1{\mfp@src\mfcmd{#1;}}%
 \newdef\mfp@wlist#1{\mfp@src\mflist{(#1);}}%
+\def\mfp@safe@activestrue{%
+  \mfp@ifdefined\@safe@activestrue\@safe@activestrue{}}%
+\def\mfp@safe@activesfalse{%
+  \mfp@ifdefined\@safe@activesfalse\@safe@activesfalse{}}%
 \edef\mfp@p{\@xp\@gobble\string\%}%   percent (%)
 \edef\mfp@s{\@xp\@gobble\string\#}%   sharp (#)
 \edef\mfp@b{\@xp\@gobble\string\\}%   backslash (\)
@@ -480,7 +486,7 @@
         \halign{##\hfil\cr#1\crcr}}}%
     }\endgroup%
 \newdef\mfp@versioninfo{%
-  \mfp@p\space\mfp@filename.m\mfp@ifmpost{p}{f},
+  \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}%
@@ -550,7 +556,7 @@
   \endgroup
   \mfp@ifopengraphsfile%
    {\Mfpic@warn
-     {\@nl An attempt has been made to open a graph file,
+     {\@nl An attempt has been made to open a graph file, %
       \mfp@sanitized\mfp@tempa\@msgbreak
       while another, \mfp@filename, is still open. \@msgbreak
       Closing \mfp@filename.}\mfp@closegraphsfile}%
@@ -588,8 +594,8 @@
   #1\edef#2{%
     \@ifundefined{\mfp@cmdname#2}{???}{\@nameuse{\mfp@cmdname#2}}}%
   \@ifundefined{\mfp@cmdname#2}%
-    {\mfp@msg{}\Mfpic@msg{No value for \string#2\ifin@mfpicenv\space in
-    mfpic figure \number\mfp@count\fi.\@nl}}%
+    {\mfp@msg{}\Mfpic@msg{No value for \string#2\ifin@mfpicenv\space
+    in mfpic figure \number\mfp@count\fi.\@nl}}%
     {}%
   \mfsrc{\@ifmplabels{\@nl verbatimtex #1\def\string#2{#2} etex;\@nl}{}%
     message "\string\mfpicvalue";\@nl
@@ -865,7 +871,7 @@
   \mfp@local\edef\tl@rot{#2}%
   \@ifmplabels{}%
    {\mfp@ifexist{#2}%
-     {\Mfpic@warn{Rotation of labels is not supported without the
+     {\Mfpic@warn{Rotation of labels is not supported without the %
         mplabels\@msgbreak option. Rotation setting\on@line\space
         may be ignored.}}%
    }}%
@@ -932,7 +938,7 @@
   \mfp@ifmpost
    {\mfp@local\mfp@linetype0
     \mfp@def\mfp@setstyle{\draw[getcolor \number\mfp@linetype]}}%
-   {\Mfpic@warn{You can't use \mfp@b coloredlines in
+   {\Mfpic@warn{You can't use \mfp@b coloredlines in %
       Metafont.\@msgbreak Using \dashedlines instead}%
     \dashedlines}}%
 \newdef\pointedlines{\mfp@local\mfp@linetype0
@@ -1037,6 +1043,8 @@
   \newdef\belowfcn{\mfp@fcn{belowfcn}p}%
   \newdef\plrregion{\mfp@fcn{plrregion}p}%
   \def\levelcurve{\mfp@fcn{levelset}p}%
+  \newdef\DEgraph{\mfp@fcn{odeRKIV}s}%
+  \newdef\DEtrajectory{\mfp@fcn{xyRKIV}s}%
   \newdef\plotdata{\mfp@nullopt\mfp@plotdata}%
   \newdef\datafile{\mfp@nullopt\mfp@datafile}%
   \newdef\store##1##2{\mfp@rendmac{stored (##1)}##2}%
@@ -1277,15 +1285,15 @@
   \mfp@ifexist{#1}{\mfp@@arropt#1\mfp@end}\mfp@@arr}%
 \newdef\mfp@@arropt#1#2\mfp@end{%
   \mfp@ifempty{#2}%
-   {\Mfpic@warn{Arrow option #1 has no value\on@line;
+   {\Mfpic@warn{Arrow option #1 has no value\on@line; %
       it will be ignored.}}%
    {\@ifundefined{mfp@arr@#1}%
-     {\Mfpic@warn{Arrow option #1 invalid \on@line;
+     {\Mfpic@warn{Arrow option #1 invalid \on@line; %
         it will be ignored}}%
      {\@nameuse{mfp@arr@#1}{#2}}%
    }}%
 \newdef\mfp@doarrow{%
-  \mfp@addmac{\mfp@clropt{\mfp@hcolour}{\mfp@hcommand} (\mfp@hlength,
+  \mfp@addmac{\mfp@clropt{\mfp@hcolour}{\mfp@hcommand} (\mfp@hlength, %
     \mfp@hrotate, \mfp@hlocate)}}%
 \newdef\mfp@turn#1#2{\rotatearound{#1}{#2}}%
 \newdef\mfp@axis#1#2{\mfp@getaxis#2{(none)}\mfp@end\axis
@@ -1330,7 +1338,7 @@
   \save@mfpicdimens
   \begingroup % ended near end of \endmfpic
   \@mfpicunit\mfpicunit
-  \@nameuse{@safe@activestrue}%
+  \mfp@safe@activestrue
   \mfp@ifopengraphsfile{}%
    {\ifmfp@nowrite\else \mfp@nooutput@error\mfpic
       \def\mfp@src##1##2{\endgroup}%
@@ -1417,7 +1425,7 @@
     (\tl@points)}}%
 \newdef\set@textbox#1{%
   \setbox\@textbox\vbox{\def\\{\cr}\mfp@restorepar
-    \@tcurr\@nameuse{@safe@activesfalse}\every@tlabel
+    \mfp@safe@activesfalse\@tcurr\every@tlabel
     \halign{##\hfil\cr#1\crcr}}}%
 \newdef\tex@tlabel{\@xp\@textlabel\tl@points\mfp@end}%
 \newdef\@textlabel{\mfp@ifendorcomma{}\@textlabel\@@textlabel}%
@@ -1488,7 +1496,7 @@
 \newdef\tlabelpath@{\@ifmplabels{}{\measure@textbox{\the\mfp@toks}}%
   \mfp@setMPpos
   \mfcmd{text\mfp@name x (\mfp@MPpos)\@nl
-    (\@ifmplabels{origin, \mfp@btex{\the\mfp@toks}}{\tb@ll, \tb@ur},
+    (\@ifmplabels{origin, \mfp@btex{\the\mfp@toks}}{\tb@ll, \tb@ur}, %
       \mfp@param) (\tl@points)}%
   \ifmfp@switch\else \mfp@thelabel\fi \endgroup}%
 \newdef\measure@textbox#1{\set@textbox{#1}%
@@ -1534,17 +1542,17 @@
   \def\mfp@docaption{%
     \setbox\@textbox
       \hbox{\def\\{\hskip\@M\p@\let\\\relax}\mfp@restorepar
-       \@nameuse{@safe@activesfalse}\@tcurr#3}%
+       \mfp@safe@activesfalse\@tcurr#3}%
     \mfp@scratch\wd\@wholegraph
     \ifdim\tb@wd>#1\mfp@scratch
       \setbox\@textbox
       \hbox{%
         \vbox{%
           \hsize#2\mfp@scratch \mfp@restorepar
-          \leftskip0pt
-          \rightskip0pt
+          \leftskip0pt \rightskip0pt\relax
           \mfp@capsettings
-          \@nameuse{@safe@activesfalse}\noindent\@tcurr #3%
+          \mfp@safe@activesfalse
+          \noindent\@tcurr #3%
         }% End vbox.
       }% End hbox.
     \fi
@@ -1561,7 +1569,8 @@
   #1\mfp@scratch}%
 \mfp@DBlog{Definition of closure of mfpic environment.}%
 \newdef\endmfpic{\every@endmfpic
-  \mfsrc{\mfp@ifmpost{\@nl verbatimtex \relax\egroup\space etex;}{}\@nl
+  \mfsrc{%
+    \mfp@ifmpost{\@nl verbatimtex \relax\egroup\space etex;}{}\@nl
     endmfpic; \mfp@p\space(\number\mfp@count) \mfp@lineno.\@nl
     \mfp@p\mfp@d\mfp@d\mfp@d\@nl}%
   \ifmfpicdebug\wlog{}\wlog{Mfpic: ENTERED endmfpic.}\wlog{}\fi
@@ -1593,7 +1602,7 @@
      {\@graphright\wd\@wholegraph
       \@graphtop\ht\@wholegraph}{}%
     \ifmfpicdebug
-      \wlog{Mfpic debug: Dimensions of wholegraph before labels
+      \wlog{Mfpic debug: Dimensions of wholegraph before labels %
         are added, and before truebbox adjustments:}%
       \wlog{Mfpic: graphleft  = \the\@graphleft}%
       \wlog{Mfpic: graphright = \the\@graphright}%
@@ -1605,7 +1614,7 @@
       \wlog{}%
     \fi
     \ifmfpicdebug
-      \wlog{Mfpic debug: Dimensions of alltlabels, before
+      \wlog{Mfpic debug: Dimensions of alltlabels, before %
         truebbox adjustments:}%
       \mfp@scratch\mfpicllx bp\relax
       \wlog{Mfpic: mfpicllx     = \the\mfp@scratch}%
@@ -1632,7 +1641,7 @@
       \fi
     \fi
     \ifmfpicdebug
-      \wlog{Mfpic debug: Dimensions of alltlabels after
+      \wlog{Mfpic debug: Dimensions of alltlabels after %
         truebbox adjustments:}%
       \wlog{Mfpic: tlabelsleft  = \the\@tlabelsleft}%
       \wlog{Mfpic: tlabelstop   = \the\@tlabelstop}%
@@ -1646,7 +1655,7 @@
       \hbox{\kern-\@graphleft\box\@wholegraph}%
       \kern-\@graphbot}% End vbox.
     \ifmfpicdebug
-      \wlog{Mfpic debug: Dimensions of wholegraph after
+      \wlog{Mfpic debug: Dimensions of wholegraph after %
         labels are added:}%
       \wlog{Mfpic: graphleft  = \the\@graphleft}%
       \wlog{Mfpic: graphright = \the\@graphright}%
@@ -1754,7 +1763,6 @@
   \endgroup
 }%
 \mfpicnumber{1}%
-\InputIfFileExists{mfppatch.tex}{}{}%
 \mfp@ifdefined\mfpdraftfont{}{\newdef\mfpdraftfont{\tt}}%
 \mfp@DBlog{Punctuation, etc., will revert to old catcodes now.}%
 \let\+\mfpsaveplus
diff --git a/Master/texmf-dist/tex/generic/mfpic/mfppatch.tex b/Master/texmf-dist/tex/generic/mfpic/mfppatch.tex
deleted file mode 100644
index f11c19525ed..00000000000
--- a/Master/texmf-dist/tex/generic/mfpic/mfppatch.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-%%% File: mfppatch.tex
-%%% A part of mfpic 1.05 2010/06/10
-%%%
-\def\mfp@versionpatched{1.05}%
-\def\mfp@patchinfo{%
-  \Mfpic@warn{This patch is only for mfpic version \mfp@versionpatched!\@nl}}%
-\let\mfp@dopatches\endinput
-\ifx\mfpfileversion\mfp@versionpatched
-  \def\mfp@patchinfo{}% Make this issue a message when patches occur.
-  \def\mfp@dopatches{}%
-\fi
-\mfp@patchinfo
-\mfp@dopatches
-% None at this time.
-\endinput