summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/mfpic
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2009-11-25 21:47:49 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2009-11-25 21:47:49 +0000
commit10448afa6c23c9403daf4f67ebd5d01b556b531a (patch)
tree3b3708480f44540b1e076379209c8dea7a098f88 /Master/texmf-dist/tex/generic/mfpic
parent69aadba877d0390d6f7305803b6bb80bd5251c0d (diff)
mfpic update (1.02 2009/10/29)
Also prevent ctan2tds from using MAKEflatten with a tds-ready tree. git-svn-id: svn://tug.org/texlive/trunk@16164 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/mfpic')
-rw-r--r--Master/texmf-dist/tex/generic/mfpic/mfpic.sty4
-rw-r--r--Master/texmf-dist/tex/generic/mfpic/mfpic.tex17
-rw-r--r--Master/texmf-dist/tex/generic/mfpic/mfppatch.tex4
3 files changed, 13 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/generic/mfpic/mfpic.sty b/Master/texmf-dist/tex/generic/mfpic/mfpic.sty
index c70a1325105..37b29b10756 100644
--- a/Master/texmf-dist/tex/generic/mfpic/mfpic.sty
+++ b/Master/texmf-dist/tex/generic/mfpic/mfpic.sty
@@ -22,10 +22,10 @@
%% with mfpic: plain TeX, LaTeX, plain Metafont and plain MetaPost.
%%
%%% File: mfpic.dtx
-%%% A part of mfpic 1.00 2009/09/22
+%%% A part of mfpic 1.02 2009/10/29
%%%
\ProvidesPackage{mfpic}
- [2009/09/22 v1.00. Macros for drawing with Metafont/MetaPost.]%
+ [2009/10/29 v1.02. 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 7cabca9b5bf..a57afbb51d5 100644
--- a/Master/texmf-dist/tex/generic/mfpic/mfpic.tex
+++ b/Master/texmf-dist/tex/generic/mfpic/mfpic.tex
@@ -22,14 +22,14 @@
%% with mfpic: plain TeX, LaTeX, plain Metafont and plain MetaPost.
%%
%%% File: mfpic.dtx
-%%% A part of mfpic 1.00 2009/09/22
+%%% A part of mfpic 1.02 2009/10/29
%%%
\ifx\mfpfileversion\UndEfInEd\else\expandafter\endinput\fi%
{%
\catcode\lq\.12 \catcode\lq\/12%
- \gdef\mfpfileversion{1.00}%
- \gdef\mfpfiledate{2009/09/22}%
- \gdef\mfpicversion{100}%
+ \gdef\mfpfileversion{1.02}%
+ \gdef\mfpfiledate{2009/10/29}%
+ \gdef\mfpicversion{102}%
}%
\let\mfpsaveplus\+%
\let\+\tabalign%
@@ -526,7 +526,8 @@
if unknown Apricot: input dvipsnam.mp; fi\@nl
verbatimtex\@nl
\ifmfp@verbtex \the\mfp@verbtex\@nl \fi
- \the\mfp@commonverbatimtex\@nl
+ \relax\@nl
+ \the\mfp@commonverbatimtex
\def\noexpand\everylabel{\the\mfp@toks}\@nl
etex;\@nl
\mfp@ifdefined\mfp@settemplate\mfp@settemplate{}%
@@ -1357,7 +1358,7 @@
\@nl
beginmfpic(\number\mfp@count); \mfp@p\space\mfp@lineno.
\mfp@ifmpost
- {\@nl verbatimtex
+ {\@nl verbatimtex \relax
\bgroup\font\noexpand\MFPcfont=\fontname\@tcurr\relax
etex;}{}}%
\newdef\tlabel{\mfp@nullopt\mfp@label}%
@@ -1561,7 +1562,7 @@
#1\mfp@scratch}%
\mfp@DBlog{Definition of closure of mfpic environment.}%
\newdef\endmfpic{\every@endmfpic
- \mfsrc{\mfp@ifmpost{\@nl verbatimtex \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
@@ -1746,7 +1747,7 @@
\endgroup
\mfp@ifopengraphsfile
{\mfp@ifmpost
- {\mfsrc{ verbatimtex\@nl \the\mfp@toks}\mfcmd{etex}}%
+ {\mfcmd{verbatimtex\@nl\the\mfp@toks\@nl\mfp@p\@nl etex}}%
{\mfp@noMP@error\mfpverbtex}%
\global\mfp@verbtexfalse\global\mfp@verbtex{}}%
{\edef\mfp@tempa{\the\mfp@verbtex\the\mfp@toks}%
diff --git a/Master/texmf-dist/tex/generic/mfpic/mfppatch.tex b/Master/texmf-dist/tex/generic/mfpic/mfppatch.tex
index b0bc7f5f5c6..520905b1159 100644
--- a/Master/texmf-dist/tex/generic/mfpic/mfppatch.tex
+++ b/Master/texmf-dist/tex/generic/mfpic/mfppatch.tex
@@ -1,7 +1,7 @@
%%% File: mfppatch.tex
-%%% A part of mfpic 1.00 2009/09/22
+%%% A part of mfpic 1.02 2009/10/29
%%%
-\def\mfp@versionpatched{1.00}%
+\def\mfp@versionpatched{1.02}%
\def\mfp@patchinfo{%
\Mfpic@warn{This patch is only for mfpic version \mfp@versionpatched!\@nl}}%
\let\mfp@dopatches\endinput