diff options
author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2009-11-25 21:47:49 +0000 |
---|---|---|
committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2009-11-25 21:47:49 +0000 |
commit | 10448afa6c23c9403daf4f67ebd5d01b556b531a (patch) | |
tree | 3b3708480f44540b1e076379209c8dea7a098f88 /Master/texmf-dist/source/generic | |
parent | 69aadba877d0390d6f7305803b6bb80bd5251c0d (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/source/generic')
-rw-r--r-- | Master/texmf-dist/source/generic/mfpic/grafbase.dtx | 60 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/mfpic/mfpic.dtx | 21 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/mfpic/mfpic.ins | 2 |
3 files changed, 47 insertions, 36 deletions
diff --git a/Master/texmf-dist/source/generic/mfpic/grafbase.dtx b/Master/texmf-dist/source/generic/mfpic/grafbase.dtx index 9d7c4bd010b..2f37e8a20ef 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.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% % ------------------------------------------------------------------- % @@ -19,7 +19,7 @@ % %<*driver> \ProvidesFile{grafbase.dtx} - [2009/09/22 v1.00. Metafont/post macros to interface with mfpic.]% + [2009/10/29 v1.02. Metafont/post macros to interface with mfpic.]% \documentclass[draft]{ltxdoc} \usepackage{docmfp} @@ -185,7 +185,7 @@ fi boolean grafbase; grafbase := true; string fileversion, filedate; -fileversion := "1.00"; filedate := "2009/09/22"; +fileversion := "1.02"; filedate := "2009/10/29"; message " Loading grafbase macros, version " & fileversion & " " & filedate & "."; @@ -232,7 +232,7 @@ def checkversions (expr g)= fi enddef; -checkversions (100); +checkversions (102); % \end{macrocode} % @@ -4899,17 +4899,27 @@ def axes (expr hlen) = xaxis (hlen); yaxis (hlen); enddef; % \begin{macrocode} laxis := baxis := raxis := taxis := 0; -vardef axisline.x = (xneg + laxis, 0)--(xpos - raxis, 0) enddef; -vardef axisline.y = (0, yneg + baxis)--(0, ypos - taxis) enddef; -vardef axisline.l = axisline.y shifted (xneg + laxis, 0) enddef; -vardef axisline.b = axisline.x shifted (0, yneg + baxis) enddef; -vardef axisline.r = axisline.y shifted (xpos - raxis, 0) enddef; -vardef axisline.t = axisline.x shifted (0, ypos - taxis) enddef; +vardef xlow = xneg + laxis enddef; +vardef xhigh = xpos - raxis enddef; +vardef ylow = yneg + baxis enddef; +vardef yhigh = ypos - taxis enddef; + +vardef axisline.x = (xlow, 0)--(xhigh, 0) enddef; +vardef axisline.y = (0, ylow)--(0, yhigh) enddef; +vardef axisline.l = axisline.y shifted (xlow, 0) enddef; +vardef axisline.b = axisline.x shifted (0, ylow) enddef; +vardef axisline.r = axisline.y shifted (xhigh, 0) enddef; +vardef axisline.t = axisline.x shifted (0, yhigh) enddef; vardef axis@# (expr len) = headpath (len, 0, 0) axisline@# enddef; vardef borderrect = - rect((xneg+laxis,yneg+baxis),(xpos-raxis,ypos-taxis)) + rect((xlow,ylow),(xhigh,yhigh)) +enddef; + +vardef inbounds (expr Z) = + (xpart Z >= xlow ) and (ypart Z >= ylow ) and + (xpart Z <= xhigh) and (ypart Z <= yhigh) enddef; % \end{macrocode} @@ -5021,10 +5031,10 @@ enddef; % \begin{macrocode} def xmarks = axismarks ( 90, xtick, origin, right) enddef; def ymarks = axismarks (-90, ytick, origin, up) enddef; -def lmarks = axismarks (-90, ltick, (xneg + laxis, 0), up) enddef; -def bmarks = axismarks ( 90, btick, (0, yneg + baxis), right) enddef; -def rmarks = axismarks ( 90, rtick, (xpos - raxis, 0), up) enddef; -def tmarks = axismarks (-90, ttick, (0, ypos - taxis), right) enddef; +def lmarks = axismarks (-90, ltick, (xlow, 0), up) enddef; +def bmarks = axismarks ( 90, btick, (0, ylow), right) enddef; +def rmarks = axismarks ( 90, rtick, (xhigh, 0), up) enddef; +def tmarks = axismarks (-90, ttick, (0, yhigh), right) enddef; % \end{macrocode} % @@ -5044,8 +5054,8 @@ vardef vargrid (expr dsize, xsp, ysp) = save gdot, gridpic; picture gdot, gridpic; gdot := setdot (griddotpath, dsize); gridpic := nullpicture; - for n = ceiling ((xneg + laxis)/xsp) upto floor ((xpos - raxis)/xsp): - for m = ceiling ((yneg + baxis)/ysp) upto floor ((ypos - taxis)/ysp): + for n = ceiling ((xlow)/xsp) upto floor ((xhigh)/xsp): + for m = ceiling ((ylow)/ysp) upto floor ((yhigh)/ysp): picdot (gridpic, gdot, zconv ((n*xsp, m*ysp))); endfor endfor @@ -5063,13 +5073,13 @@ def vgrid = vargrid enddef; % \DescribeRoutine{gridlines}\gbc{gridlines} draws both. % \begin{macrocode} def hgridlines (expr ysp) = - for n = ceiling ((yneg + baxis)/ysp) upto floor ((ypos - taxis)/ysp): - safedraw zconv ((xneg + laxis, n*ysp)--(xpos - raxis, n*ysp)); + for n = ceiling ((ylow)/ysp) upto floor ((yhigh)/ysp): + safedraw zconv ((xlow, n*ysp)--(xhigh, n*ysp)); endfor enddef; def vgridlines (expr xsp) = - for n = ceiling ((xneg + laxis)/xsp) upto floor ((xpos - raxis)/xsp): - safedraw zconv ((n*xsp, yneg + baxis)--(n*xsp, ypos - taxis)); + for n = ceiling ((xlow)/xsp) upto floor ((xhigh)/xsp): + safedraw zconv ((n*xsp, ylow)--(n*xsp, yhigh)); endfor enddef; def gridlines (expr xsp, ysp) = @@ -5110,8 +5120,8 @@ def vectorfield (expr len, xsp, ysp) (text fcn) (text cond) = enddef; vardef mkvectorfield (expr len, xsp, ysp) (suffix vf, isOK) = - for n = ceiling ((xneg + laxis)/xsp) upto floor ((xpos - raxis)/xsp): - for m = ceiling ((yneg + baxis)/ysp) upto floor ((ypos - taxis)/ysp): + for n = ceiling ((xlow)/xsp) upto floor ((xhigh)/xsp): + for m = ceiling ((ylow)/ysp) upto floor ((yhigh)/ysp): if isOK (n*xsp,m*ysp): arrowdraw (len) (vf(n*xsp,m*ysp)); fi endfor endfor @@ -5119,8 +5129,8 @@ enddef; def plrvectorfield (expr len, rsp, tsp) (text fcn) (text cond) = save _vf, _is_OK, _A, _B, _C, _D; - _A := xneg + laxis; _B := xpos + raxis; - _C := yneg + baxis; _D := ypos + taxis; + _A := xlow; _B := xhigh; + _C := ylow; _D := yhigh; vardef _vf (expr r,t) = ((0,0)--(fcn)) shifted (r*dir t) enddef; vardef _is_OK (expr r,t) = save _X, _Y; _X := r*cosd t; _Y := r*sind t; diff --git a/Master/texmf-dist/source/generic/mfpic/mfpic.dtx b/Master/texmf-dist/source/generic/mfpic/mfpic.dtx index fcc42f917cb..6fa82af9255 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.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% % ------------------------------------------------------------------- % @@ -22,7 +22,7 @@ %</driver> %<sty>\ProvidesPackage{mfpic} %<*sty> - [2009/09/22 v1.00. Macros for drawing with Metafont/MetaPost.]% + [2009/10/29 v1.02. Macros for drawing with Metafont/MetaPost.]% %</sty> %<*driver> \documentclass[draft]{ltxdoc} @@ -136,7 +136,7 @@ % % This file documents the source code. See \file{mfpic-doc.pdf} (source % \file{mfpic.doc.tex} for the user documentation or \file{mfpguide.pdf} -% (source \file{}mfpguide.tex}) for an introductory guide. +% (source \file{mfpguide.tex}) for an introductory guide. % \end{abstract} % % \StopEventually{\PrintIndex} @@ -170,9 +170,9 @@ \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}% }% % \end{macrocode} % @@ -1577,7 +1577,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{}% @@ -5242,7 +5243,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;}{}}% % \end{macrocode} @@ -5917,7 +5918,7 @@ % \begin{macrocode} \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 @@ -6315,7 +6316,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/source/generic/mfpic/mfpic.ins b/Master/texmf-dist/source/generic/mfpic/mfpic.ins index c980a7c1dbb..baf542747d9 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.00 2009/09/22 +%%% A part of mfpic 1.02 2009/10/29 %%% \input docstrip \keepsilent |