diff options
author | Karl Berry <karl@freefriends.org> | 2007-04-29 23:34:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2007-04-29 23:34:55 +0000 |
commit | 3182aaa429e0e1e24f5824de116d90a154166b32 (patch) | |
tree | bed5edb8e336ac817456d5d8df22b35b45c47cde /Master/texmf-dist/tex | |
parent | 043c21ab6397e48549c233d3952c0eb26462a00d (diff) |
pstricks update, I hope (12apr07)
git-svn-id: svn://tug.org/texlive/trunk@4215 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/Changes | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pst-node.tex | 50 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pst-plot.tex | 9 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pst-tree.tex | 397 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 22 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pstricks/Changes | 9 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pstricks/pst-all.sty | 12 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pstricks/pstcol.sty | 9 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pstricks/pstricks.sty | 5 |
9 files changed, 275 insertions, 248 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/Changes b/Master/texmf-dist/tex/generic/pstricks/Changes index 44dded9a69e..124160c393b 100644 --- a/Master/texmf-dist/tex/generic/pstricks/Changes +++ b/Master/texmf-dist/tex/generic/pstricks/Changes @@ -1,4 +1,5 @@ pstricks.tex -------- +1.15a 2007-01-05 - \parabola->\psparabola (old name still valid) (hv) 1.15 2006-12-19 - add support for more dot styles (from Etienne Riga) 1.14c 2006-04-29 - add option linecap for dashed lines 1.14b 2006-04-20 - fix a bug in \psset@linetype @@ -25,3 +26,12 @@ pstricks.tex -------- 1.07 2005-05-06 make \nccircle working for counter-clockwise orientation (hv) 1.06 2005-02-24 fix spurious blank in doublestroke (hv) + + +pst-tree.tex -------- +1.15 2007-01-03 - fix bug with \endpsTree (hv) + + +xdvipdfmx.con ------ +0.01 2007-03-11 - first CTAN version, must be renamed to pstricks.con + when used with XeTeX diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-node.tex b/Master/texmf-dist/tex/generic/pstricks/pst-node.tex index 234e94e642e..30fc49962e6 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pst-node.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pst-node.tex @@ -16,7 +16,7 @@ \message{ v\fileversion, \filedate} \csname PSTnodesLoaded\endcsname \let\PSTnodesLoaded\endinput -\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi\relax +\ifx\PSTricksLoaded\endinput\else\input pstricks.tex \fi\relax \edef\TheAtCode{\the\catcode`\@} \catcode`\@=11 \pstheader{pst-node.pro} @@ -64,35 +64,39 @@ end}% \advance\pst@dimg-\dp\pst@hbox \divide\pst@dimg2 \lower\pst@dimg} +% \def\tx@InitPnode{InitPnode } \def\pnode{\@ifnextchar({\pnode@}{\pnode@(0,0)}} \def\pnode@(#1)#2{% -\pst@@getcoor{#1}% -\pst@newnode{#2}{10}{\pst@coor}{\tx@InitPnode}% -\ignorespaces} + \pst@@getcoor{#1}% + \pst@newnode{#2}{10}{\pst@coor}{\tx@InitPnode}% + \ignorespaces} +% \def\tx@InitCnode{InitCnode } \def\cnode{\pst@object{cnode}} \def\cnode@i{\@ifnextchar({\cnode@ii}{\cnode@ii(0,0)}} \def\cnode@ii(#1)#2#3{% -\leavevmode -\hbox{% -\use@par -\pst@@getcoor{#1}% -\pssetlength\pst@dimc{#2}% -\pst@dimg=\psk@dimen\pslinewidth -\advance\pst@dimc-\pst@dimg -\advance\pst@dimc.5\pslinewidth -\ifnodealign -\kern\pst@dimc -\vrule width\z@ height \pst@dimc depth \pst@dimc -\fi -\pscircle@do(#1){#2}% -\pst@newnode{#3}{11}{\pst@coor \pst@number\pst@dimc}{\tx@InitCnode}% -% DG/SR modification begin - Jul. 30, 1997 - Patch 2 -%\ifnodealign \kern\pst@dimc\egroup \fi}% -\ifnodealign\kern\pst@dimc\fi}% -% DG/SR modification end -\ignorespaces} + \leavevmode + \hbox{% + \use@par + \pst@@getcoor{#1}% + \pssetlength\pst@dimc{#2}% + \pst@dimg=\psk@dimen\pslinewidth + \advance\pst@dimc-\pst@dimg + \advance\pst@dimc.5\pslinewidth + \ifnodealign + \kern\pst@dimc + \vrule width\z@ height \pst@dimc depth \pst@dimc + \fi + \pscircle@do(#1){#2}% + \pst@newnode{#3}{11}{\pst@coor \pst@number\pst@dimc}{\tx@InitCnode}% +%% % DG/SR modification begin - Jul. 30, 1997 - Patch 2 +%% %\ifnodealign \kern\pst@dimc\egroup \fi}% + \ifnodealign\kern\pst@dimc\fi% +%% % DG/SR modification end + }% + \ignorespaces} +% \def\Cnode{\pst@object{Cnode}} \def\Cnode@i{\@ifnextchar({\Cnode@ii}{\Cnode@ii(0,0)}} \def\Cnode@ii(#1)#2{\cnode@ii(#1){\psk@radius}{#2}}% diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-plot.tex b/Master/texmf-dist/tex/generic/pstricks/pst-plot.tex index 93284cc9823..a3273fd2228 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pst-plot.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pst-plot.tex @@ -3,8 +3,6 @@ %% Plots and axes with PSTricks 97. %% See the PSTricks User's Guide for documentation. %% -\def\fileversion{97 patch 2} -\def\filedate{1999/12/12} %% %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu. %% @@ -12,8 +10,6 @@ %% of the LaTeX Project Public License Distributed from CTAN %% archives in directory macros/latex/base/lppl.txt. %% -\message{ v\fileversion, \filedate} - \csname PSTplotLoaded\endcsname \let\PSTplotLoaded\endinput @@ -27,6 +23,11 @@ \expandafter\next \fi +\def\fileversion{97 patch 2} +\def\filedate{1999/12/12} +\message{ v\fileversion, \filedate} + + \edef\TheAtCode{\the\catcode`\@} \catcode`\@=11 diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-tree.tex b/Master/texmf-dist/tex/generic/pstricks/pst-tree.tex index 33c1275d9c7..93024663d89 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pst-tree.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pst-tree.tex @@ -1,7 +1,7 @@ %% pst-tree.tex %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu. %% COPYRIGHT 2000-2003 by Denis Girou. -%% Copyright 2004 Herbert Voss +%% Copyright 2004-2007 Herbert Voss % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -22,8 +22,8 @@ \csname PSTreeLoaded\endcsname \let\PSTreeLoaded\endinput \ifx\PSTnodesLoaded\endinput\else\input pst-node.tex\fi\relax -\def\fileversion{97 patch 6} -\def\filedate{2004/07/24} +\def\fileversion{1.00} +\def\filedate{2007/01/03} \message{ v\fileversion, \filedate} % \edef\TheAtCode{\the\catcode`\@} @@ -182,132 +182,140 @@ \newcount\pstreecnt \let\c@pstreecnt\pstreecnt \newcount\pstree@cnt +% \def\pstree{\def\pst@par{}\pst@object{pstree}} \def\pstree@i{\def\pstree@makebox{\pst@@makebox}\pstree@ii} +% \def\psTree{\def\pst@par{}\pst@object{psTree}} \def\psTree@i{\def\pstree@makebox{\pst@makelongbox}\pstree@ii} -\def\endpsTree{\pst@endlongbox\ignorespaces} +% hv --begin 1.00 2007-01-03 make it LaTeX-compatible +%\def\endpsTree{\pst@endlongbox\ignorespaces} +\def\endpsTree{\pst@endlongbox\csname ignorespacesafterend\endcsname} +% hv --end \def\pstree@ii{% -\ifnum\pstreelevel=\z@ -\let\pstree@savedshortput\pst@shortput -\psset@shortput{tab}% -\else -\pst@@killglue -\fi -\begingroup -\begingroup -\def\pstree@node{% -\xdef\pstree@next{% -\noexpand\@psttrue -\noexpand\def\noexpand\pst@tempa{\number\pst@dima}% -\noexpand\def\noexpand\pst@tempb{\number\pst@dimb}% -\noexpand\def\noexpand\pst@tempc{\number\pst@dimc}% -\noexpand\def\noexpand\pst@tempd{\number\pst@dimd}}% -\box\pstree@box}% -\def\pssubtree@horizontal{\pssubtree@horizontal@o}% -\def\pssubtree@vertical{\pssubtree@vertical@o}% -\global\let\pstree@next\relax -\pst@makebox\pstree@iii} + \ifnum\pstreelevel=\z@ + \let\pstree@savedshortput\pst@shortput + \psset@shortput{tab}% + \else + \pst@@killglue + \fi + \begingroup + \begingroup + \def\pstree@node{% + \xdef\pstree@next{% + \noexpand\@psttrue + \noexpand\def\noexpand\pst@tempa{\number\pst@dima}% + \noexpand\def\noexpand\pst@tempb{\number\pst@dimb}% + \noexpand\def\noexpand\pst@tempc{\number\pst@dimc}% + \noexpand\def\noexpand\pst@tempd{\number\pst@dimd}}% + \box\pstree@box}% + \def\pssubtree@horizontal{\pssubtree@horizontal@o}% + \def\pssubtree@vertical{\pssubtree@vertical@o}% + \global\let\pstree@next\relax + \pst@makebox\pstree@iii} +% \def\pstree@iii{% -\global\setbox\pst@boxg=\box\pst@hbox -\endgroup -\setbox\pstree@rootbox=\box\pst@boxg -\@pstfalse -\pstree@next -\if@pst -\ifdim\wd\pstree@rootbox=\z@\else -\@pstrickserr{Extraneous space in root node}\@ehpa -\wd\pstree@rootbox=\z@ -\fi -\else -\@pstrickserr{Missing or bad root node -(level \the\pstreelevel, node \the\psnodecnt)}\@ehpa -\def\pstree@next{% -\def\pst@tempa{0}% -\def\pst@tempb{0}% -\def\pst@tempc{0}% -\def\pst@tempd{0}}% -\wd\pstree@rootbox=\z@ -\fi -\pstree@savevalues -\begingroup -\pstree@initsuccvalues -\pstree@setlevelpar -\pstree@do} + \global\setbox\pst@boxg=\box\pst@hbox + \endgroup + \setbox\pstree@rootbox=\box\pst@boxg + \@pstfalse + \pstree@next + \if@pst + \ifdim\wd\pstree@rootbox=\z@\else + \@pstrickserr{Extraneous space in root node}\@ehpa + \typeout{===>\the\wd\pst@hbox (rootbox)} + \wd\pstree@rootbox=\z@ + \fi + \else + \@pstrickserr{Missing or bad root node + (level \the\pstreelevel, node \the\psnodecnt)}\@ehpa + \def\pstree@next{% + \def\pst@tempa{0}% + \def\pst@tempb{0}% + \def\pst@tempc{0}% + \def\pst@tempd{0}}% + \wd\pstree@rootbox=\z@ + \fi + \pstree@savevalues + \begingroup + \pstree@initsuccvalues + \pstree@setlevelpar + \pstree@do} +% \def\pstree@setlevelpar{% -\advance\pstreelevel1 -\let\psk@thislevelsep\relax -\let\psk@thistreesep\relax -\let\psk@thistreefit\relax -\let\psk@thistreenodesize\relax -\csname pstreehook\romannumeral\pstreelevel\endcsname -\use@par -\ifx\psk@thistreesep\relax -\let\psk@thistreesep\psk@treesep -\fi -\ifx\psk@thistreenodesize\relax -\let\psk@thistreenodesize\psk@treenodesize -\fi -\ifx\psk@thistreefit\relax -\let\psk@thistreefit\psk@treefit -\fi -\ifx\psk@thislevelsep\relax -\let\psk@thislevelsep\psk@levelsep -\let\psk@thislevelsepmode\psk@levelsepmode -\fi -\ifnum\psk@treemode=\pstree@predmode\else -\global\advance\pstreecnt1 -\edef\pstree@thetree{\the\pstreecnt}% -\let\pstree@predmode\psk@treemode -\fi -\ifx\psk@thislevelsepmode\relax -\pst@dimg=\psk@thislevelsep\relax -\pst@cntg=0\@nameuse{% -pstree@levelsepadjust-\pstree@thetree-\the\pstreelevel}% -\advance\pst@dimg\pst@cntg sp -\edef\psk@thislevelsep{\number\pst@dimg sp}% -\fi -\ifnum\psk@treemode>1 -\def\pst@tposflip{1 sub neg }% -\else -\def\pst@tposflip{}% -\fi -\ifx\pstree@bboxadjust\@empty\else -\xdef\pstree@treebboxadjust{% -\pstree@bboxadjust -\ifpsshowbbox\noexpand\pstree@showbbox\fi}% -\gdef\pstree@bboxadjust{}% -\fi -\let\pst@thispsbox\@skiplevelfalse} + \advance\pstreelevel1 + \let\psk@thislevelsep\relax + \let\psk@thistreesep\relax + \let\psk@thistreefit\relax + \let\psk@thistreenodesize\relax + \csname pstreehook\romannumeral\pstreelevel\endcsname + \use@par + \ifx\psk@thistreesep\relax + \let\psk@thistreesep\psk@treesep + \fi + \ifx\psk@thistreenodesize\relax + \let\psk@thistreenodesize\psk@treenodesize + \fi + \ifx\psk@thistreefit\relax + \let\psk@thistreefit\psk@treefit + \fi + \ifx\psk@thislevelsep\relax + \let\psk@thislevelsep\psk@levelsep + \let\psk@thislevelsepmode\psk@levelsepmode + \fi + \ifnum\psk@treemode=\pstree@predmode\else + \global\advance\pstreecnt1 + \edef\pstree@thetree{\the\pstreecnt}% + \let\pstree@predmode\psk@treemode + \fi + \ifx\psk@thislevelsepmode\relax + \pst@dimg=\psk@thislevelsep\relax + \pst@cntg=0\@nameuse{pstree@levelsepadjust-\pstree@thetree-\the\pstreelevel}% + \advance\pst@dimg\pst@cntg sp + \edef\psk@thislevelsep{\number\pst@dimg sp}% + \fi + \ifnum\psk@treemode>1 + \def\pst@tposflip{1 sub neg }% + \else + \def\pst@tposflip{}% + \fi + \ifx\pstree@bboxadjust\@empty\else + \xdef\pstree@treebboxadjust{% + \pstree@bboxadjust + \ifpsshowbbox\noexpand\pstree@showbbox\fi}% + \gdef\pstree@bboxadjust{}% + \fi + \let\pst@thispsbox\@skiplevelfalse} +% \def\pstree@predmode{-1} \def\pstree@savevalues{% -\edef\pstree@restorevalues{% -\noexpand\gdef\noexpand\pstree@theleftprofile{\pstree@theleftprofile}% -\noexpand\gdef\noexpand\pstree@therightprofile{\pstree@therightprofile}% -\noexpand\gdef\noexpand\pstree@theupprofile{\pstree@theupprofile}% -\noexpand\gdef\noexpand\pstree@thedownprofile{\pstree@thedownprofile}% -\noexpand\gdef\noexpand\pstree@tspace{\pstree@tspace}% -\noexpand\gdef\noexpand\pssucc{\pssucc}% -\global\psnodecnt=\the\psnodecnt\relax -\global\pstree@cnt=\the\pstree@cnt\relax}% -\let\pstree@savebboxadjust\pstree@treebboxadjust} + \edef\pstree@restorevalues{% + \noexpand\gdef\noexpand\pstree@theleftprofile{\pstree@theleftprofile}% + \noexpand\gdef\noexpand\pstree@therightprofile{\pstree@therightprofile}% + \noexpand\gdef\noexpand\pstree@theupprofile{\pstree@theupprofile}% + \noexpand\gdef\noexpand\pstree@thedownprofile{\pstree@thedownprofile}% + \noexpand\gdef\noexpand\pstree@tspace{\pstree@tspace}% + \noexpand\gdef\noexpand\pssucc{\pssucc}% + \global\psnodecnt=\the\psnodecnt\relax + \global\pstree@cnt=\the\pstree@cnt\relax}% + \let\pstree@savebboxadjust\pstree@treebboxadjust} \def\pstree@initsuccvalues{% -\def\pstree@therightprofile{\pstree@stop,}% -\let\pstree@theleftprofile\pstree@therightprofile -\let\pstree@theupprofile\pstree@therightprofile -\let\pstree@thedownprofile\pstree@therightprofile -\psnodecnt=\z@ -\pstree@cnt\z@ -\gdef\pstree@tspace{\z@}% -\let\pspred\pssucc} + \def\pstree@therightprofile{\pstree@stop,}% + \let\pstree@theleftprofile\pstree@therightprofile + \let\pstree@theupprofile\pstree@therightprofile + \let\pstree@thedownprofile\pstree@therightprofile + \psnodecnt=\z@ + \pstree@cnt\z@ + \gdef\pstree@tspace{\z@}% + \let\pspred\pssucc} \def\pssucc{T} \pstree@initsuccvalues \def\pstree@down{% -\pstree@succrow -\pstree@makebox{\pstree@vertical{\lower}}} + \pstree@succrow + \pstree@makebox{\pstree@vertical{\lower}}} \def\pstree@up{% -\pstree@succrow -\pstree@makebox{\pstree@vertical{\raise}}} + \pstree@succrow + \pstree@makebox{\pstree@vertical{\raise}}} \def\pstree@levelsepadjust#1#2{% % DG/SR modification begin - May 14, 1997 - Patch 1 % Problem with levelsep=*... @@ -439,52 +447,49 @@ pstree@levelsepadjust-\pstree@thetree-\the\pstreelevel}% \pstree@succcolumn \pstree@makebox\pstree@horizontal} \def\pstree@horizontal{% -\ifdim\wd\pst@hbox=\z@\else -\@pstrickserr{Extraneous space in tree successors}\@ehpa -\fi -\pst@cntg=\ifpstreeflip\ht\else\dp\fi\pst@hbox -\divide\pst@cntg 2 -\pstree@add\pstree@theupprofile -\pstree@add\pstree@thedownprofile + \ifdim\wd\pst@hbox=\z@\else + \@pstrickserr{Extraneous space in tree successors}\@ehpa + \typeout{===>\the\wd\pst@hbox (hbox)} + \fi + \pst@cntg=\ifpstreeflip\ht\else\dp\fi\pst@hbox + \divide\pst@cntg 2 + \pstree@add\pstree@theupprofile + \pstree@add\pstree@thedownprofile % DG/SR modification begin - Sep. 24, 1997 - Patch 3 %\ifx\psk@thislevelsepmode\relax %\pstree@horizlevelsepadjust %\fi % DG/SR modification end -\pst@dimg\psk@thislevelsep\relax -\global\setbox\pstree@box=\hbox{% -\unhbox\pstree@rootbox -\kern\if@psrighttree\else-\fi\pst@dimg -\ifpstreeflip\lower\else\raise\fi\pst@cntg sp\box\pst@hbox}% + \pst@dimg\psk@thislevelsep\relax + \global\setbox\pstree@box=\hbox{% + \unhbox\pstree@rootbox + \kern\if@psrighttree\else-\fi\pst@dimg + \ifpstreeflip\lower\else\raise\fi\pst@cntg sp\box\pst@hbox}% % DG/SR modification begin - Sep. 24, 1997 - Patch 3 -\ifx\psk@thislevelsepmode\relax -\pstree@horizlevelsepadjust -\fi + \ifx\psk@thislevelsepmode\relax + \pstree@horizlevelsepadjust + \fi % DG/SR modification end -\if@psrighttree -\pst@dimh=\pst@dimg -\pstree@max\pstree@therightprofile\pst@cntg -\global\advance\pst@dimh\pst@cntg sp -\global\pst@dimg=\pst@tempa sp -\else -\pstree@max\pstree@theleftprofile\pst@cntg -\global\advance\pst@dimg\pst@cntg sp -\global\pst@dimh=\pst@tempb sp -\fi -\if@skiplevel -\skiplevel@horizontal -\else -\endgroup -\fi -\pst@dima=\pst@dimg -\pst@dimb=\pst@dimh -\edef\pstree@upprofile{\pst@tempc,\pstree@theupprofile}% -\edef\pstree@downprofile{\pst@tempd,\pstree@thedownprofile}% -\dp\pstree@box=\z@ -\ht\pstree@box=\z@ -\wd\pstree@box=\z@ -\ifpsshowbbox -\pstree@max\pstree@upprofile\pst@cntg + \if@psrighttree + \pst@dimh=\pst@dimg + \pstree@max\pstree@therightprofile\pst@cntg + \global\advance\pst@dimh\pst@cntg sp + \global\pst@dimg=\pst@tempa sp + \else + \pstree@max\pstree@theleftprofile\pst@cntg + \global\advance\pst@dimg\pst@cntg sp + \global\pst@dimh=\pst@tempb sp + \fi + \if@skiplevel\skiplevel@horizontal\else\endgroup\fi + \pst@dima=\pst@dimg + \pst@dimb=\pst@dimh + \edef\pstree@upprofile{\pst@tempc,\pstree@theupprofile}% + \edef\pstree@downprofile{\pst@tempd,\pstree@thedownprofile}% + \dp\pstree@box=\z@ + \ht\pstree@box=\z@ + \wd\pstree@box=\z@ + \ifpsshowbbox + \pstree@max\pstree@upprofile\pst@cntg \pst@dimc=\pst@cntg sp \pstree@max\pstree@downprofile\pst@cntg \pst@dimd=\pst@cntg sp @@ -952,56 +957,56 @@ tx@Dict begin \psline@iii pop end % DG/SR modification begin - Aug. 31, 1999 - Patch 4 %\pst@dimc=\pstree@gettop\pstree@theupprofile sp %\pst@dimd=\pstree@gettop\pstree@thedownprofile sp -\edef\pstree@upprofile{\pst@tempc,\pstree@theupprofile}% -\edef\pstree@downprofile{\pst@tempd,\pstree@thedownprofile}% -\pstree@max\pstree@upprofile\pst@cntg -\pst@dimc=\pst@cntg sp -\pstree@max\pstree@downprofile\pst@cntg -\pst@dimd=\pst@cntg sp + \edef\pstree@upprofile{\pst@tempc,\pstree@theupprofile}% + \edef\pstree@downprofile{\pst@tempd,\pstree@thedownprofile}% + \pstree@max\pstree@upprofile\pst@cntg + \pst@dimc=\pst@cntg sp + \pstree@max\pstree@downprofile\pst@cntg + \pst@dimd=\pst@cntg sp % DG/SR modification end -\pstree@treebboxadjust -\gdef\pstree@treebboxadjust{}% -\xdef\pstree@next{% -\noexpand\def\noexpand\pst@tempc{\number\pst@dimc}% -\noexpand\def\noexpand\pst@tempd{\number\pst@dimd}}% -\endgroup -\pstree@next} + \pstree@treebboxadjust + \gdef\pstree@treebboxadjust{}% + \xdef\pstree@next{% + \noexpand\def\noexpand\pst@tempc{\number\pst@dimc}% + \noexpand\def\noexpand\pst@tempd{\number\pst@dimd}}% + \endgroup + \pstree@next} \def\skiplevel@vertical{% % DG/SR modification begin - Aug. 31, 1999 - Patch 4 %\pst@dima=\pstree@gettop\pstree@theleftprofile sp %\pst@dimb=\pstree@gettop\pstree@therightprofile sp -\edef\pstree@leftprofile{\pst@tempa,\pstree@theleftprofile}% -\edef\pstree@rightprofile{\pst@tempb,\pstree@therightprofile}% -\pstree@max\pstree@leftprofile\pst@cntg -\pst@dima=\pst@cntg sp -\pstree@max\pstree@rightprofile\pst@cntg -\pst@dimb=\pst@cntg sp + \edef\pstree@leftprofile{\pst@tempa,\pstree@theleftprofile}% + \edef\pstree@rightprofile{\pst@tempb,\pstree@therightprofile}% + \pstree@max\pstree@leftprofile\pst@cntg + \pst@dima=\pst@cntg sp + \pstree@max\pstree@rightprofile\pst@cntg + \pst@dimb=\pst@cntg sp % DG/SR modification end -\pstree@treebboxadjust -\gdef\pstree@treebboxadjust{}% -\xdef\pstree@next{% -\noexpand\def\noexpand\pst@tempa{\number\pst@dima}% -\noexpand\def\noexpand\pst@tempb{\number\pst@dimb}}% -\endgroup -\pstree@next} + \pstree@treebboxadjust + \gdef\pstree@treebboxadjust{}% + \xdef\pstree@next{% + \noexpand\def\noexpand\pst@tempa{\number\pst@dima}% + \noexpand\def\noexpand\pst@tempb{\number\pst@dimb}}% + \endgroup + \pstree@next} \def\skiplevels{\def\pst@par{}\pst@object{skiplevels}} \def\skiplevels@i#1{% -\pst@@killglue -\begingroup -\pst@cnta=#1\relax -\edef\skiplevels@num{\the\pst@cnta}% -\def\pstree@makebox{\pst@makelongbox}% -\def\endskiplevels{}% -\loop -\ifnum\pst@cnta>\z@ -\advance\pst@cnta-1 -\expandafter\def\expandafter\endskiplevels\expandafter{% -\endskiplevels\pst@endlongbox} -\skiplevel@ii -\repeat -\expandafter\def\expandafter\endskiplevels\expandafter{% -\endskiplevels\endgroup\ignorespaces} -\ignorespaces} + \pst@@killglue + \begingroup + \pst@cnta=#1\relax + \edef\skiplevels@num{\the\pst@cnta}% + \def\pstree@makebox{\pst@makelongbox}% + \def\endskiplevels{}% + \loop + \ifnum\pst@cnta>\z@ + \advance\pst@cnta-1 + \expandafter\def\expandafter\endskiplevels\expandafter{% + \endskiplevels\pst@endlongbox} + \skiplevel@ii + \repeat + \expandafter\def\expandafter\endskiplevels\expandafter{% + \endskiplevels\endgroup\ignorespaces} + \ignorespaces} \catcode`\@=\TheAtCode\relax diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index a291bb50129..5e77b88da65 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -1,7 +1,7 @@ %% pstricks.tex %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu. %% COPYRIGHT 2000-2003 by Denis Girou. -%% Copyright 2004-2006 Herbert Voss +%% Copyright 2004-2007 Herbert Voss % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -20,7 +20,7 @@ % See the PSTricks User's Guide for description. % This uses the header file `pstricks.pro'. % -\def\fileversion{1.15} +\def\fileversion{1.15a} \def\filedate{2006/12/22} % \csname PSTricksLoaded\endcsname @@ -1800,15 +1800,17 @@ grestore}} \ifshowpoints \tx@BezierShowPoints \fi}% \chardef\pst@linetype=1 \end@ClosedObj} +% \def\tx@Parab{Parab } -\def\parabola{\pst@object{parabola}} -\def\parabola@i{\pst@getarrows\parabola@ii} -\def\parabola@ii#1(#2)#3(#4){% -\begin@OpenObj -\pst@getcoor{#2}\pst@tempa -\pst@@getcoor{#4}% -\addto@pscode{\pst@tempa \pst@coor \tx@Parab}% -\end@OpenObj} +\def\psparabola{\pst@object{psparabola}}% 1.15a 2006-01-05 (hv) +\def\psparabola@i{\pst@getarrows\psparabola@ii} +\def\psparabola@ii#1(#2)#3(#4){% + \begin@OpenObj + \pst@getcoor{#2}\pst@tempa + \pst@@getcoor{#4}% + \addto@pscode{\pst@tempa \pst@coor \tx@Parab}% + \end@OpenObj} +\let\parabola\psparabola% compatibility (hv) % \def\psset@gridwidth#1{\pst@getlength{#1}\psk@gridwidth} \psset@gridwidth{.8pt} diff --git a/Master/texmf-dist/tex/latex/pstricks/Changes b/Master/texmf-dist/tex/latex/pstricks/Changes index 485f08d8633..e967adb415e 100644 --- a/Master/texmf-dist/tex/latex/pstricks/Changes +++ b/Master/texmf-dist/tex/latex/pstricks/Changes @@ -1,5 +1,6 @@ pstricks.sty -------- -0.32 2006-08-10 message for loading the pro file +0.33 2007-02-18 set initial color (hv) +0.32 2006-08-10 message for loading the pro file (hv) 0.31 2005-12-19 one more step to a better color support (hv) 0.30 2005-11-15 drop test for pstcol fix bug with xcolor (hv) @@ -12,5 +13,7 @@ pstricks.sty -------- pst-node.sty -------- 2006-01-01 message for loading the pro file -pst-text.sty -------- - 2006-01-01 message for loading the pro file + +pst-all.sty -------- + 2006-12-19 do not load pst-char, it is now part of pst-text +
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-all.sty b/Master/texmf-dist/tex/latex/pstricks/pst-all.sty index 76d9041cdad..d2f7b46a518 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pst-all.sty +++ b/Master/texmf-dist/tex/latex/pstricks/pst-all.sty @@ -4,27 +4,27 @@ %% IMPORTANT NOTICE: %% %% Copyright (C) 1997 Timothy Van Zandt -%% Copyright (C) 2006 Herbert Voss <voss@perce.de> +%% Copyright (C) 2004 Herbert Voss <voss@perce.de> %% Rolf Niepraschk <Rolf.Niepraschk@ptb.de> %% %% This package may be distributed under the terms of the LaTeX Project %% Public License, as described in lppl.txt in the base LaTeX distribution. %% Either version 1.0 or, at your option, any later version. %% -\ProvidesPackage{pst-all}[2006/11/07 the main pstricks tools] +\ProvidesPackage{pst-all}[2006/12/19 the main pstricks tools] \RequirePackage{pstricks} % important % this loads the xcolor package and pstricks in the right order % and does some modification to the color handling. Look at the % doc for the options. % -\RequirePackage{pst-plot} -\RequirePackage{pst-tree} -\RequirePackage{pst-node} -\RequirePackage{pst-3d} \RequirePackage{pst-grad} +\RequirePackage{pst-plot} \RequirePackage{pst-coil} \RequirePackage{pst-text} +\RequirePackage{pst-node} +\RequirePackage{pst-3d} \RequirePackage{pst-eps} \RequirePackage[tiling]{pst-fill} +\RequirePackage{pst-tree} \RequirePackage{multido} \endinput diff --git a/Master/texmf-dist/tex/latex/pstricks/pstcol.sty b/Master/texmf-dist/tex/latex/pstricks/pstcol.sty index 3597ebd03ed..29c4affd9f9 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pstcol.sty +++ b/Master/texmf-dist/tex/latex/pstricks/pstcol.sty @@ -1,11 +1,11 @@ %% %% pstcol.sty Copyright (C) 1994--1996 1999 David Carlisle -%% 2004--2005 Herbert Voss <voss@perce.de> -%% Rolf Niepraschk <Rolf.Niepraschk@ptb.de> +%% 2004--2007 Herbert Voss <voss@perce.de> +%% Rolf Niepraschk <Rolf.Niepraschk@ptb.de> %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pstcol} - [2005/11/16 v1.2 LaTeX wrapper for `PSTricks' (RN,HV)] + [2007/04/11 v1.3 LaTeX wrapper for `PSTricks' (RN,HV)] \DeclareOption*{\PassOptionsToPackage\CurrentOption{color}} \ProcessOptions\relax @@ -17,7 +17,8 @@ \@spaces\string\usepackage{pstricks}\MessageBreak ************************************} -\RequirePackage[noxcolor]{pstricks} +\PassOptionsToPackage{noxcolor}{pstricks} +\RequirePackage{pstricks} \endinput %% diff --git a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty index d5f6287bfd0..e7d3cdc2f6d 100644 --- a/Master/texmf-dist/tex/latex/pstricks/pstricks.sty +++ b/Master/texmf-dist/tex/latex/pstricks/pstricks.sty @@ -5,7 +5,7 @@ %% %% pstricks.sty Copyright (C) 1997 Timothy Van Zandt %% pstcol.sty Copyright (C) 1994-1996 1999 David Carlisle -%% pstricks.sty Copyright (C) 2004-2006 Herbert Voss <voss@perce.de> +%% pstricks.sty Copyright (C) 2004-2007 Herbert Voss <voss@perce.de> %% Rolf Niepraschk <Rolf.Niepraschk@ptb.de> %% %% This package may be distributed under the terms of the LaTeX Project @@ -16,7 +16,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pstricks} - [2006/08/10 v0.32 LaTeX wrapper for `PSTricks' (RN,HV)] + [2007/02/18 v0.33 LaTeX wrapper for `PSTricks' (RN,HV)] % \DeclareOption{plain}{% \input{pstricks.tex} @@ -141,6 +141,7 @@ \renewcommand*\cyan{\color{cyan}} % \AtBeginDocument{% + \psset{fillcolor=white}% hv 0.33 \let\pst@endcolor=\relax% % \let\pst@color=\relax% % LaTeX used `\color@endgroup' instead. RN 2004-05-06 |