From b3e238cd492685a317cf453cbac604541622a450 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 4 Dec 2012 22:14:04 +0000 Subject: mfpic (4dec12) git-svn-id: svn://tug.org/texlive/trunk@28444 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/mfpic/mfpic.sty | 4 +- Master/texmf-dist/tex/generic/mfpic/mfpic.tex | 173 ++++++++++++----------- Master/texmf-dist/tex/generic/mfpic/mfpicdef.tex | 39 +++++ 3 files changed, 134 insertions(+), 82 deletions(-) create mode 100644 Master/texmf-dist/tex/generic/mfpic/mfpicdef.tex (limited to 'Master/texmf-dist/tex/generic/mfpic') diff --git a/Master/texmf-dist/tex/generic/mfpic/mfpic.sty b/Master/texmf-dist/tex/generic/mfpic/mfpic.sty index 622d081e0ce..bddbccf9b99 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--2011, Daniel H. Luecking +%% Copyright 2002--2012, 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 @@ -22,7 +22,7 @@ %% with mfpic: plain TeX, LaTeX, plain Metafont and plain MetaPost. %% \ProvidesPackage{mfpic} - [2011/03/08 v1.06. Macros for drawing with Metafont/MetaPost.]% + [2012/12/03 v1.10. 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 d2596ed2cd9..11f17953070 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--2011, Daniel H. Luecking +%% Copyright 2002--2012, 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 @@ -24,9 +24,9 @@ \ifx\mfpfileversion\UndEfInEd\else\expandafter\endinput\fi% {% \catcode\lq\.12 \catcode\lq\/12% - \gdef\mfpfileversion{1.06}% - \gdef\mfpfiledate{2011/02/25}% - \gdef\mfpicversion{106}% + \gdef\mfpfileversion{1.10}% + \gdef\mfpfiledate{2012/12/03}% + \gdef\mfpicversion{110}% }% \let\mfpsaveplus\+% \let\+\tabalign% @@ -37,9 +37,9 @@ \catcode96=12 % 96=left quote \catcode`\@=11 \gdef\MFPsavecodes{% - \edef\mfp@restoreNLchar{\newlinechar\number\newlinechar\relax}% - \edef\mfp@restoreELchar{\endlinechar\number\endlinechar\relax}% - \edef\mfp@restoreSP{\catcode32=\number\catcode32\relax}% + \edef\mfp@restoreNLC{\newlinechar\number\newlinechar\relax}% + \edef\mfp@restoreELC{\endlinechar\number\endlinechar\relax}% + \edef\mfp@restoreSPA{\catcode32=\number\catcode32\relax}% \edef\mfp@restoreEOL{\catcode13=\number\catcode13\relax}% \edef\mfp@restoreALL{\mfp@restorecode{=}\mfp@restorecode{@}% \mfp@restorecode{$}\mfp@restorecode{:}\mfp@restorecode{;}% @@ -49,8 +49,8 @@ \mfp@restorecode{>}\mfp@restorecode{*}\mfp@restorecode{/}% \mfp@restorecode{+}\mfp@restorecode{-}\mfp@restorecode{"}% \mfp@restorecode{'}\mfp@restorecode{_}\mfp@restorecode{`}% - \mfp@restoreEOL\mfp@restoreSP\catcode10=\number\catcode10 - \mfp@restoreNLchar\mfp@restoreELchar}}% + \mfp@restoreEOL\mfp@restoreSPA\catcode10=\number\catcode10 + \mfp@restoreNLC\mfp@restoreELC}}% \gdef\mfp@restorecode#1{\catcode`\string#1=\number\catcode`#1\relax}% \ifx\@makeother\UndEfInEd \gdef\@makeother#1{\catcode`#1=12\relax}\fi \gdef\MFPsanitize{\endlinechar13 \newlinechar10 @@ -122,8 +122,14 @@ \mfp@enddef \newif\ifmfp@latex \mfp@latexfalse \mfp@ifdefined\documentstyle - {\ifx \amstexloaded@\relax \mfp@DBlog{AmS-TeX detected.}% - \else \mfp@DBlog{LaTeX detected.}\mfp@latextrue + {\ifx \amstexloaded@\relax % amstex loaded, or a bad check for it + \ifx\NoBlackBoxes\UndEfInEd % amstex not loaded + \mfp@DBlog{LaTeX detected.}\mfp@latextrue + \else % most likely amstex loaded + \mfp@DBlog{AmS-TeX detected.}% + \fi + \else % amstex not loaded + \mfp@DBlog{LaTeX detected.}\mfp@latextrue \fi}% {\mfp@DBlog{Neither LaTeX nor AmS-TeX detected.}}% \newif\ifmfp@latexe \mfp@latexefalse @@ -204,7 +210,7 @@ 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!}}% + \Mfpic@warn{\mfp@b mfploop without \string\mfpuntil!\@nl}}% \newlet\ifmfpmpost\iffalse \newdef\mfp@mposttrue {\global\let\ifmfpmpost\iftrue}% \newdef\mfp@mpostfalse{\global\let\ifmfpmpost\iffalse}% @@ -225,7 +231,7 @@ {\mfp@afteropen@error\mfresolution}% {\mfp@ifmpost{\mfp@noMF@warn\mfresolution}{}}}% \newdef\setmfvariable#1{% - \MFP@sp@def\mfp@tempa{#1}\@setmfvariable\mfp@tempa}% + \mfp@sp@def\mfp@tempa{#1}\@setmfvariable\mfp@tempa}% \newdef\@setmfvariable#1#2#3{% \mfp@ifopengraphsfile% {\mfcmd{set#1 (#2) #3}}% @@ -235,7 +241,7 @@ \newdef\setmfpair {\@setmfvariable{pair}}% \newdef\setmfcolor {\@setmfvariable{color}}% \newdef\globalsetmfvariable#1#2#3{% - \MFP@sp@def\mfp@tempa{#1}% + \mfp@sp@def\mfp@tempa{#1}% \mfp@ifopengraphsfile {\mfcmd{\ifx\mfp@tempa\mfp@C gsetcolor \else gsetvariable (#1) \fi (#2) #3}}% @@ -299,7 +305,7 @@ \newlet\ifmfp@readlog\iffalse \newdef\mfpreadlog{% \mfp@ifopengraphsfile - {\mfp@afteropen@error\mfpreadlog}{\global\let\ifmfp@readlog\iftrue}}% + {\mfp@afteropen@error\mfpreadlog}{\global\let\ifmfp@readlog\iftrue}}% \newdef\mfpicllx{0}% \newdef\mfpiclly{0}% \newdef\normal@setmfpgraphic#1{% @@ -307,7 +313,7 @@ \newdef\nofile@setmfpgraphic#1{% {\edef\mfp@tempa{#1}% \vbox to 0pt{\vss - \rlap{\kern2pt \mfpdraftfont \mfp@sanitized\mfp@tempa}\kern 2pt}}}% + \rlap{\kern2pt \mfpdraftfont \mfp@sanitized\mfp@tempa}\kern 2pt}}}% \mfp@ifdefined\strip@prefix{}{\def\strip@prefix#1>{}}% \newdef\mfp@sanitized{\@xp\strip@prefix\meaning}% \newlet\@setmfpicgraphic\normal@setmfpgraphic @@ -389,20 +395,20 @@ \fi \reserved@c}% {% - \def\:{\global\let\@sptoken= }\: % this makes \@sptoken a space token + \def\:{\global\let\@sptoken= }\: % makes \@sptoken a space token \def\:{\@xifnch}\@xp\gdef\: {\futurelet\@let@token\@ifnch}% }% \mfp@enddef \def\mfp@tempa#1{% - \def\MFP@sp@def##1##2{% - \futurelet\mfp@next\MFP@sp@d##2\@nil\@nil#1\@nil\relax##1}% - \def\MFP@sp@d{% - \ifx\mfp@next\@sptoken \expandafter\MFP@sp@b - \else \expandafter\MFP@sp@b\expandafter#1% + \def\mfp@sp@def##1##2{% + \futurelet\mfp@next\mfp@sp@d##2\@nil\@nil#1\@nil\relax##1}% + \def\mfp@sp@d{% + \ifx\mfp@next\@sptoken \@xp\mfp@sp@b + \else \@xp\mfp@sp@b\@xp#1% \fi}% - \def\MFP@sp@b#1##1 \@nil{\MFP@sp@c##1}}% + \def\mfp@sp@b#1##1 \@nil{\mfp@sp@c##1}}% \mfp@tempa{ }% -\def\MFP@sp@c#1\@nil#2\relax#3{\mfp@toks{#1}\edef#3{\the\mfp@toks}}% +\def\mfp@sp@c#1\@nil#2\relax#3{\mfp@toks{#1}\edef#3{\the\mfp@toks}}% \def\mfp@iftoken#1#2{\@ifnextchar#1{\@firstoftwo{#2}}}% \def\mfp@ifstar#1#2#3{\mfp@iftoken*{#1{#2}}{#1{#3}}}% \def\mfp@ifend{\mfp@iftoken\mfp@end}% @@ -411,15 +417,15 @@ \def\@ifstar#1{\@ifnextchar*{\@firstoftwo{#1}}}% \mfp@enddef {% - \catcode`Q3 \catcode`\~12 - \gdef\mfp@ifempty#1{\if~#1~\@xp\@firstoftwo\else\@xp\@secondoftwo\fi}% - \gdef\mfp@ifexist#1{\if~#1~\@xp\@gobble\else\@xp\@firstofone\fi}% - \gdef\mfp@emptysub#1#2{\if~#1~#2\else#1\fi}% - \long\gdef\@ifmtarg#1{\@xifmtarg#1QQ\@secondoftwo\@firstoftwo\@nil}% - \long\gdef\@xifmtarg#1#2Q#3#4#5\@nil{#4}% +\catcode`Q3 \catcode`\~12 +\gdef\mfp@ifempty#1{\if~#1~\@xp\@firstoftwo\else\@xp\@secondoftwo\fi}% +\gdef\mfp@ifexist#1{\if~#1~\@xp\@gobble\else\@xp\@firstofone\fi}% +\gdef\mfp@emptysub#1#2{\if~#1~#2\else#1\fi}% +\long\gdef\@ifmtarg#1{\@xifmtarg#1QQ\@secondoftwo\@firstoftwo\@nil}% +\long\gdef\@xifmtarg#1#2Q#3#4#5\@nil{#4}% }% \newdef\mfp@defaultopt#1#2{% - \@ifnextchar[{\mfp@ifemptyopt{#1}{#2}}{#1{#2}}}% + \@ifnextchar[{\mfp@ifemptyopt{#1}{#2}}{#1{#2}}}%] \newdef\mfp@ifemptyopt#1#2[#3]{\mfp@ifempty{#3}{#1{#2}}{#1{#3}}}% \newdef\mfp@nullopt#1{\@ifnextchar[{\mfp@getopt{#1}}{#1{}}}% \newdef\mfp@getopt#1[#2]{#1{#2}}% @@ -468,23 +474,9 @@ \newcount\mfp@sequence \newtoks\mfp@toks \newtoks\mfp@verbtex -\newtoks\mfp@commonverbatimtex \newif\ifmfp@switch -\begingroup - \mfp@keeplines\@makeother\#% - \@makeother\%\global\mfp@commonverbatimtex - {\gdef\mpxshipout{\afterassignment\middlempxshipout\setbox0=\hbox}% - \gdef\middlempxshipout{\aftergroup\finishmpxshipout}% - \gdef\finishmpxshipout{\dimen1=\ht0 \dimen2=\dp0 - \dimen0=\dimen1 \advance\dimen0\dimen2 - \setbox0=\hbox{\hbox{\box0 - \ifnum\dimen0>0 \vrule width1sp height\dimen1 depth\dimen2 - \else \vrule width1sp height1sp depth0sp\relax - \fi}}% - \ht0=0pt \dp0=0pt \shipout\hbox{\box0}}% - \def\MFPtext#1{\vbox{\def\\{\cr}\MFPcfont\everylabel - \halign{##\hfil\cr#1\crcr}}}% - }\endgroup% +\let\MFPbegingroup\begingroup +\let\MFPendgroup\endgroup \newdef\mfp@versioninfo{% \mfp@p\space\mfp@filename.m\mfp@ifmpost{p}{f}, % generated by Mfpic, v\mfpfileversion\space\mfpfiledate,\@nl @@ -532,8 +524,8 @@ verbatimtex\@nl \ifmfp@verbtex \the\mfp@verbtex\@nl \fi \relax\@nl - \the\mfp@commonverbatimtex - \def\noexpand\everylabel{\the\mfp@toks}\@nl + \noexpand\input mfpicdef.tex\relax\@nl + \def\noexpand\MFPeverylabel{\the\mfp@toks}\@nl etex;\@nl \mfp@ifdefined\mfp@settemplate\mfp@settemplate{}% }% @@ -597,7 +589,8 @@ {\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}{}% + \mfsrc{% + \@ifmplabels{\@nl verbatimtex #1\def\string#2{#2} etex;\@nl}{}% message "\string\mfpicvalue";\@nl message "\mfp@cmdname#2";\@nl show #3;\@nl @@ -755,7 +748,7 @@ \newdef\colorarray{\setmfarray{color}}% \newdef\rgbcolorarray{\setmfarray{rgbcolor}}% \newdef\cmykcolorarray{\setmfarray{cmykcolor}}% -\newdef\globalsetmfarray#1#2{\mfsrc{gsetarray (#1) (#2)}\mfp@writedata}% +\newdef\globalsetmfarray#1#2{\mfsrc{gsetarray (#1)(#2)}\mfp@writedata}% \newlet\globalsetmparray\globalsetmfarray \newdef\lightershade{\shadespace1.2\shadespace}% \newdef\darkershade{\shadespace.83333\shadespace}% @@ -785,7 +778,7 @@ \newdef\mfp@autorend{\if@mfprend\@xp\mfp@render\fi}% \newdef\mfp@addmac{\mfp@first \mfsrc}% \newdef\mfp@render{\draw[]}% -\newdef\setrender#1{\mfp@def\mfp@render{#1}}% +\newdef\setrender{\mfp@def\mfp@render}% \newdef\mfp@figmacbase{\mfp@first \mfp@autorend \@mfpstarttrue}% \newdef\mfp@figmac{\mfp@figmacbase\mfcmd}% \newdef\mfp@listmac#1{\mfp@figmacbase\mfsrc{#1}\mfp@writedata}% @@ -904,7 +897,7 @@ \mfp@ifmpost {\mfp@ifopengraphsfile {\mfcmd{verbatimtex\@nl - \def\noexpand\everylabel{\the\mfp@toks} etex}}% + \def\noexpand\MFPeverylabel{\the\mfp@toks} etex}}% {}}% {}}% \newdef\every@tlabel{}% @@ -925,7 +918,8 @@ \newdef\mfp@arc@r{pp (\mfp@T)}% \newdef\mfp@arc@q{pp (\mfp@F)}% \newdef\mfpdefinecolor#1#2#3{\setmfcolor{#1}{#2(#3)}}% -\newdef\mfp@defclr#1#2#3{\setmfcolor{#1}{\mfp@ifempty{#2}{#3}{#2(#3)}}}% +\newdef\mfp@defclr#1#2#3{% + \setmfcolor{#1}{\mfp@ifempty{#2}{#3}{#2(#3)}}}% \newdef\mfp@newcolorcmd#1{% \@namedef{#1\mfp@C}{\mfp@nullopt{\mfp@defclr{#1\mfp@C}}}}% \mfp@newcolorcmd{draw}\mfp@newcolorcmd{fill}\mfp@newcolorcmd{tlabel}% @@ -971,7 +965,7 @@ the following letters: x, y, l, b, r, or t. If you proceed, ^^J% x will be assumed.}\def\mfp@axisnum{0}\def\mfp@axisletter{x}}% {\edef\mfp@axisnum{\@nameuse{mfp@axis@#1}}\def\mfp@axisletter{#1}}% - \edef\mfp@defheadlen{% + \edef\mfp@defaultheadlen{% \the\ifnum\mfp@axisnum>1 \sideheadlen\else \axisheadlen\fi}}% \newdef\setaxismarks#1#2{\setmfnumeric{#1tick}{#2}}% \newdef\setxmarks#1{\setaxismarks x{#1}}% @@ -1005,9 +999,13 @@ \mfp@figmac{regularpolygon (##1) (##2) (##3; ##4;)}}% \def\circle{\mfp@switchfalse\mfp@defaultopt\mfp@arccircle{p}}% \newdef\ellipse{\mfp@defaultopt\mfp@ellipse{0}}% + \newdef\quarterellipse##1{\mfp@figmac{quarterellipse (##1)}}% + \newdef\halfellipse##1{\mfp@figmac{halfellipse (##1)}}% + \newdef\fullellipse##1{\mfp@figmac{fullellipse (##1)}}% \newdef\sector##1{\mfp@figmac{sector (##1)}}% \newdef\arc{\mfp@iftoken*{\arccomplement\mfp@arc}{\mfp@arc}}% \newdef\pshcircle{\mfp@ifstar\mfp@pshcircle\mfp@F\mfp@T}% + \newdef\hypergeodesic{\mfp@ifstar\mfp@hypergeodesic{UHP}{UD}}% \newdef\lines{\mfp@listi{polyline}\mfp@F}% \newdef\polygon{\mfp@listi{polyline}\mfp@T}% \newdef\computedspline{\mfp@listi{dospline}\mfp@F}% @@ -1034,7 +1032,6 @@ \newlet\closedconvexcurve\convexcyclic \newdef\fcncurve{\mfp@nullopt\mfp@fcncurve}% \newdef\turtle{\mfp@listmac{turtle}}% - \newdef\brownianmotion##1{\mfp@figmac{brownianpath (##1)}}% \newdef\function{\mfp@fcn{function}s}% \newdef\parafcn{\mfp@fcn{parafcn}s}% \newdef\plrfcn{\mfp@fcn{plrfcn}s}% @@ -1045,6 +1042,9 @@ \def\levelcurve{\mfp@fcn{levelset}p}% \newdef\DEgraph{\mfp@fcn{odeRKIV}s}% \newdef\DEtrajectory{\mfp@fcn{xyRKIV}s}% + \newdef\brownianmotion##1{\mfp@figmac{brownianpath (##1)}}% + \newdef\browniangraph##1{\mfp@figmac{browniangraph (##1)}}% + \newdef\randomwalk##1{\mfp@figmac{randomwalk(##1)}}% \newdef\plotdata{\mfp@nullopt\mfp@plotdata}% \newdef\datafile{\mfp@nullopt\mfp@datafile}% \newdef\store##1##2{\mfp@rendmac{stored (##1)}##2}% @@ -1068,7 +1068,8 @@ \newdef\sinewave {\mfp@defaultopt{\mfp@wiggle{sinewave}}1}% \newdef\coil{\mfp@defaultopt{\mfp@wiggle{corkscrew}}1}% \newlet\corkscrew\coil - \newdef\plot{\mfp@optrendii{doplot}{\the\pointsize,\the\symbolspace}}% + \newdef\plot{% + \mfp@optrendii{doplot}{\the\pointsize,\the\symbolspace}}% \newdef\plotnodes{\mfp@optrendii{plotnodes}{\the\pointsize}}% \newdef\showcontrols{\mfp@optrendii{showcontrols}{\the\pointsize}}% \newdef\bclosed{\mfp@nullopt{\mfp@close b}}% @@ -1086,24 +1087,29 @@ \newdef\rhatch{\mfp@defaultopt\mfp@rhatch{\the\hatchspace}}% \newdef\xhatch{\mfp@defaultopt\mfp@xhatch{\the\hatchspace}}% \newlet\hatch\xhatch + \newdef\gradient{\mfp@rendi{axialgradient}}% + \newdef\areagradient{\mfp@rendi{areagradient}}% + \newdef\radialgradient{\mfp@rendi{radialgradient}}% \newdef\gfill{\mfp@nullopt{\mfp@clroptrend{filled}}}% \newdef\gclear{\mfp@rendmac{unfilled}}% \newdef\gclip{\mfp@rendmac{Clip}}% - \newdef\reverse{\mfp@addmac{reverse}}% + \newdef\reversepath{\mfp@addmac{reverse}}% + \newlet\reverse\reversepath \newdef\xyswappath{\mfp@modmac{xyswappedpath}}% \newdef\rotatepath{\mfp@modi{rotatedpath}}% \newdef\shiftpath{\mfp@modi{shiftedpath}}% \newdef\scalepath{\mfp@modi{scaledpath}}% \newdef\xscalepath{\mfp@modi{xscaledpath}}% \newdef\yscalepath{\mfp@modi{yscaledpath}}% - \newdef\slantpath{\mfp@modi{xslantedpath}}% - \newlet\xslantpath\slantpath + \newdef\xslantpath{\mfp@modi{xslantedpath}}% + \newlet\slantpath\xslantpath \newdef\yslantpath{\mfp@modi{yslantedpath}}% \newdef\reflectpath{\mfp@modi{reflectedpath}}% \newdef\transformpath{\mfp@modi{transformedpath}}% \newdef\parallelpath{\mfp@modi{parapath}}% \newdef\randomizepath{\mfp@modi{randompath}}% \newdef\randomlines{\mfp@modi{randomlines}}% + \newdef\interpolatepath{\mfp@modi{interpolatedpath}}% \newdef\arccomplement{\mfp@modmac{arccomplement}}% \newdef\arrowhead{\mfp@ifstar\mfp@arrowhead\mfp@T\mfp@F}% \def\arrow{\mfp@ifstar\mfp@arrow{x}{}}% @@ -1183,17 +1189,18 @@ \newlet\graphbar\chartbar \newlet\histobar\chartbar \newlet\ganttbar\chartbar + \newdef\gbrace##1{\mfp@figmac{mkbrace(##1)}}% }% end \mfp@grafmacs \def\mfp@abc#1#2#3#4#5#6#7#8/{#6#3#1#2#6#7#6#4#5}% \@namedef{\mfp@abc STAGGER LEE/}{% \mfpic[20]{-2}{2}{-3}{3}% \tile{peter, 1pt, 10, 10, false}% \penwd{1pt}% - \draw[(1,0,0)]\lines{(0,0), (5,5), (10,0)}% - \pointcolor{(0,.8,0)}% + \draw[rgb(1,0,0)]\lines{(0,0), (5,5), (10,0)}% + \pointcolor{rgb(0,.8,0)}% \point[3pt]{(2.5,7.5)}% \endtile - \draw\tess{peter}\gfill[(1,1,0)]\ellipse{(0,0),2,3}% + \draw\tess{peter}\gfill[rgb(1,1,0)]\ellipse{(0,0),2,3}% \endmfpic}% \newdef\mfppiechart{\mfp@defaultopt\mfp@piechart{c}}% \newdef\mfpbarchart{\mfp@defaultopt\mfp@barchart{0,1,1}}% @@ -1210,6 +1217,7 @@ {\mfp@figmac{\arc@or@circle\@nameuse{mfp@arc@#1} (#2)}}}% \newdef\mfp@ellipse#1#2{\mfp@figmac{ellipse (#2, #1)}}% \newdef\mfp@pshcircle#1#2{\mfp@figmac{pshcircle (#1, #2)}}% +\newdef\mfp@hypergeodesic#1#2{\mfp@figmac{#1geodesic (#2)}}% \newdef\mfp@curve#1#2{\mfp@nullopt{\mfp@@curve{#1}{#2}}}% \newdef\mfp@@curve#1#2#3{% \mfp@listmac{\mfp@ifempty{#3}{#1}{t#1 (#3)} (#2)}}% @@ -1297,9 +1305,10 @@ \mfp@hrotate, \mfp@hlocate)}}% \newdef\mfp@turn#1#2{\rotatearound{#1}{#2}}% \newdef\mfp@axis#1#2{\mfp@getaxis#2{(none)}\mfp@end\axis - \mfp@addmac{headpath (\mfp@emptysub{#1}{\mfp@defheadlen}, 0, 0)}% + \mfp@addmac{headpath (\mfp@emptysub{#1}{\mfp@defaultheadlen}, 0, 0)}% \axisline{\mfp@axisletter}}% -\newdef\mfp@doaxes#1#2{\def\mfp@@axis##1{\mfp@axis{#1}{##1}\mfp@@doaxis}% +\newdef\mfp@doaxes#1#2{% + \def\mfp@@axis##1{\mfp@axis{#1}{##1}\mfp@@doaxis}% \mfp@@doaxis#2\mfp@end}% \newdef\mfp@@doaxis{\mfp@ifend{}\mfp@@axis}% \newdef\mfp@marks#1#2{\mfsrc{\@nl #1marks (#2)}\mfp@writedata}% @@ -1366,7 +1375,7 @@ beginmfpic(\number\mfp@count); \mfp@p\space\mfp@lineno. \mfp@ifmpost {\@nl verbatimtex \relax - \bgroup\font\noexpand\MFPcfont=\fontname\@tcurr\relax + \MFPbegingroup\font\noexpand\MFPcfont=\fontname\@tcurr\relax etex;}{}}% \newdef\tlabel{\mfp@nullopt\mfp@label}% \newdef\startbacktext{\let\mfp@restoreOL\@empty @@ -1394,11 +1403,13 @@ \every@mfpic}% End of \@mfpic \newdef\mfp@setconv{% \def\@xconv##1##2{% ##1 = coord. ##2 = dimension register or fdim - {\mfp@scratch=##1\@mfpicunit \advance\mfp@scratch by -\xmin\@mfpicunit + {\mfp@scratch=##1\@mfpicunit + \advance\mfp@scratch by -\xmin\@mfpicunit \mfp@scratch=\xfactor\mfp@scratch \global ##2=\mfp@scratch}}% \def\@yconv##1##2{% ditto - {\mfp@scratch=##1\@mfpicunit \advance\mfp@scratch by -\ymin\@mfpicunit + {\mfp@scratch=##1\@mfpicunit + \advance\mfp@scratch by -\ymin\@mfpicunit \mfp@scratch=\yfactor\mfp@scratch \global ##2=\mfp@scratch}}}% \newdef\mfp@inittlabels{% @@ -1449,11 +1460,11 @@ \endgroup \@yconv{#2}\mfp@scratch \begingroup - \ifcase\tl@vpos \advance\mfp@scratch \tb@totalht % bottom - \advance\mfp@scratch \tlabel@sep - \or \advance\mfp@scratch 0.5\tb@totalht % center - \or \advance\mfp@scratch -\tlabel@sep % top - \else \advance\mfp@scratch \tb@ht % baseline (default) + \ifcase\tl@vpos \advance\mfp@scratch \tb@totalht + \advance\mfp@scratch \tlabel@sep % bottom + \or \advance\mfp@scratch 0.5\tb@totalht % center + \or \advance\mfp@scratch -\tlabel@sep % top + \else \advance\mfp@scratch \tb@ht % baseline (default) \fi \advance\mfp@scratch \tlabel@vadj \ifdim \mfp@scratch>\@tlabelstop @@ -1463,10 +1474,10 @@ \endgroup \begingroup \ifcase\tl@vpos \advance\mfp@scratch \tlabel@sep % bottom - \or \advance\mfp@scratch -0.5\tb@totalht % center - \or \advance\mfp@scratch -\tb@totalht % top - \advance\mfp@scratch -\tlabel@sep - \else \advance\mfp@scratch -\tb@dp % baseline (default) + \or \advance\mfp@scratch -0.5\tb@totalht % center + \or \advance\mfp@scratch -\tb@totalht + \advance\mfp@scratch -\tlabel@sep % top + \else \advance\mfp@scratch -\tb@dp % baseline (default) \fi \advance\mfp@scratch \tlabel@vadj \ifdim \mfp@scratch<\@tlabelsbot @@ -1570,7 +1581,7 @@ \mfp@DBlog{Definition of closure of mfpic environment.}% \newdef\endmfpic{\every@endmfpic \mfsrc{% - \mfp@ifmpost{\@nl verbatimtex \relax\egroup\space etex;}{}\@nl + \mfp@ifmpost{\@nl verbatimtex \relax\MFPendgroup\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 @@ -1627,9 +1638,11 @@ \fi \ifdim\@tlabelsleft < \maxdimen \setbox\@alltlabels\vtop to 0pt{% - \kern \mfpiclly bp \moveleft \mfpicllx bp \box\@alltlabels\vss}% + \kern \mfpiclly bp + \moveleft \mfpicllx bp \box\@alltlabels\vss}% \setbox\@backtext \vtop to 0pt{% - \kern \mfpiclly bp \moveleft \mfpicllx bp \box\@backtext \vss}% + \kern \mfpiclly bp + \moveleft \mfpicllx bp \box\@backtext \vss}% \mfp@adjustdim\@tlabelsleft <\@graphleft \mfpicllx \mfp@adjustdim\@tlabelstop >\@graphtop \mfpiclly \mfp@adjustdim\@tlabelsbot <\@graphbot \mfpiclly diff --git a/Master/texmf-dist/tex/generic/mfpic/mfpicdef.tex b/Master/texmf-dist/tex/generic/mfpic/mfpicdef.tex new file mode 100644 index 00000000000..96d7d8d8cc5 --- /dev/null +++ b/Master/texmf-dist/tex/generic/mfpic/mfpicdef.tex @@ -0,0 +1,39 @@ +%% +%% This is file `mfpicdef.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% mfpic.dtx (with options: `defs') +%% +%% ------------------------------------------------------------------- +%% +%% Copyright 2002--2012, 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 +%% your option) any later version. The latest version of this license is in +%% +%% and version 1.3c or later is part of all distributions of LaTeX version +%% 2008/12/01 or later. +%% +%% Mfpic has maintenance status "author-maintained". The Current Maintainer +%% is Daniel H. Luecking. There are several Base Interpreters associated +%% with mfpic: plain TeX, LaTeX, plain Metafont and plain MetaPost. +%% +\gdef\mpxshipout{\afterassignment\middlempxshipout\setbox0=\hbox}% +\gdef\middlempxshipout{\aftergroup\finishmpxshipout}% +\gdef\finishmpxshipout{\dimen1=\ht0 \dimen2=\dp0 + \dimen0=\dimen1 \advance\dimen0\dimen2 + \setbox0=\hbox{\hbox{\box0 + \ifnum\dimen0>0 \vrule width1sp height\dimen1 depth\dimen2 + \else \vrule width1sp height1sp depth0sp\relax + \fi}}% + \ht0=0pt \dp0=0pt \shipout\hbox{\box0}}% +\def\MFPtext#1{\vbox{\def\\{\cr}\MFPcfont\MFPeverylabel + \halign{##\hfil\cr#1\crcr}}}% +\let\MFPbegingroup\begingroup +\let\MFPendgroup\endgroup +\endinput +%% +%% End of file `mfpicdef.tex'. -- cgit v1.2.3