From 36a6053cce7d24aac7a97aa8cbe3b7dd67c2d526 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 26 Aug 2009 23:57:01 +0000 Subject: pstricks update (25aug09) git-svn-id: svn://tug.org/texlive/trunk@14872 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/pstricks/pst-plot.tex | 11 +++-- .../texmf-dist/tex/generic/pstricks/pstricks.tex | 53 +++++++++++++--------- 2 files changed, 38 insertions(+), 26 deletions(-) (limited to 'Master/texmf-dist/tex/generic') diff --git a/Master/texmf-dist/tex/generic/pstricks/pst-plot.tex b/Master/texmf-dist/tex/generic/pstricks/pst-plot.tex index 86b59f11ad4..11dd9385fef 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pst-plot.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pst-plot.tex @@ -18,8 +18,8 @@ \ifx\PSTricksLoaded\endinput\else\input pstricks.tex \fi \ifx\MultidoLoaded\endinput\else \input multido.tex \fi % -\def\fileversion{1.03} -\def\filedate{2009/06/01} +\def\fileversion{1.04} +\def\filedate{2009/06/08} \message{ v\fileversion, \filedate} % \edef\TheAtCode{\the\catcode`\@} @@ -642,6 +642,7 @@ n 0 eq not \fi} % % Knows \pst@dimb and \pst@cnta +\def\pst@minusZero{-0} \def\pst@@hlabels{% \vbox to\z@{% \ifdim\pst@dimd>\z@\vskip\pslabelsep\else\vss\fi @@ -652,7 +653,8 @@ n 0 eq not {\nA=\psk@Ox+\psk@Dx}% {\pst@cnta}% {\hskip\pst@dimb\hbox to \z@{% - \hss\ifdim\nA pt=\z@ \pshlabel{0}\else\pshlabel{\nA}\fi + \hss\ifx\nA\pst@minusZero \pshlabel{0}\else\pshlabel{\nA}\fi +% \hss\ifdim\nA pt=\z@ \pshlabel{0}\else\pshlabel{\nA}\fi \hss}}% prevent "-0" \hss}% \ifdim\pst@dimd>\z@\vss\else\vskip\pslabelsep\fi}}% @@ -694,7 +696,8 @@ n 0 eq not {\pst@cnta}% {\vbox to\pst@dima{\vss}\vbox to \z@{\vss\hbox to\z@{% \ifdim\pst@dimc>\z@\hss\else\hskip\pslabelsep\fi - \ifdim\nA sp=\z@ \psvlabel{0}\else\psvlabel{\nA}\fi% prevent -0, doesn't work with \ifnum + \ifx\nA\pst@minusZero \psvlabel{0}\else\psvlabel{\nA}\fi% +% \ifdim\nA sp=\z@ \psvlabel{0}\else\psvlabel{\nA}\fi% prevent -0, doesn't work with \ifnum \ifdim\pst@dimc>\z@\hskip\pslabelsep\else\hss\fi}\vss}}% \vss}} % diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 5b28c6a631b..741e314a87c 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -20,8 +20,8 @@ % See the PSTricks User's Guide for description. % This uses the header file `pstricks.pro'. % -\def\fileversion{1.27} -\def\filedate{2009/01/25} +\def\fileversion{1.29} +\def\filedate{2009/05/19} % \csname PSTricksLoaded\endcsname \let\PSTricksLoaded\endinput @@ -456,7 +456,7 @@ } \def\psset@unit#1{% \pssetlength\psunit{#1}% - \psxunit=\psunit + \psxunit=\psunit% \psyunit=\psunit% } \def\psset@runit#1{\pssetlength\psrunit{#1}} @@ -465,7 +465,7 @@ % v 1.05 begin \def\psset@PstDebug#1{\pst@getint{#1}{\Pst@Debug}}% hv 2004-06-22 \psset{PstDebug=0} -\def\psDEBUG{\@ifnextchar[\psDEBUG@i{\psDEBUG@i[PSTricks]}} +\def\psDEBUG{\@ifnextchar[\psDEBUG@i{\psDEBUG@i[PSTricks]}}% \def\psDEBUG@i[#1]#2{\ifnum\Pst@Debug>0 \expandafter\typeout{<#1>: #2}\fi}% % end \def\pst@getlength#1#2{% @@ -478,6 +478,7 @@ } \def\pst@getcoor#1#2{\pst@@getcoor{#1}\let#2\pst@coor} \def\pst@coor{0 0 } +% \def\pst@getcoors#1#2{% \def\pst@aftercoors{\addto@pscode{#1 \pst@coors }#2}% \def\pst@coors{}% @@ -517,6 +518,7 @@ \pst@checknum{#1}\pst@tempg \edef\pst@angleunit{360 \pst@tempg div mul }% \ignorespaces} +% \def\radians{\def\pst@angleunit{57.2956 mul }} \def\pst@angleunit{} % @@ -526,15 +528,14 @@ \pst@activecoor% \xdef\pst@tempg{##1}% \endgroup% - \expandafter\special@coor\pst@tempg||\@nil% - }% + \expandafter\special@coor\pst@tempg||\@nil}% \def\pssetlength##1##2{% - \begingroup + \begingroup% \pst@activecoor% \xdef\pst@tempg{##2}% \endgroup% \expandafter\special@length\pst@tempg\@nil{##1}% - } + \ignorespaces}% \def\pst@@getangle##1{% \begingroup% \pst@activecoor% @@ -560,9 +561,8 @@ \ifx#3|\relax \mixed@coor{#1}{#2}% \else - \special@@coor#1;;\@nil - \fi% -} + \special@@coor#1;;\@nil% + \fi} % \def\special@@coor#1{% \ifcat#1a\relax% node names should start with a letter @@ -1746,7 +1746,8 @@ \@namedef{psds@*}{\pst@gdot{0 0 DS \tx@SD}} \@namedef{psds@o}{% /r2 DS CLW sub def - \pst@gdot{0 0 DS \tx@SD \pst@usecolor\psfillcolor 0 0 r2 \tx@SD}} + \pst@gdot{0 0 DS \tx@SD \pst@usecolor\psfillcolor SLW + 0 0 r2 \tx@SD}} \@namedef{psds@square*}{% /r1 DS .886 mul def \pst@gdot{r1 \tx@SQ}} @@ -1998,12 +1999,12 @@ \def\psframe@i(#1){% \@ifnextchar({\psframe@ii(#1)}{\psframe@ii(0,0)(#1)}} \def\psframe@ii(#1)(#2){% - \begin@ClosedObj - \pst@getcoor{#1}\pst@tempa + \begin@ClosedObj% + \pst@getcoor{#1}\pst@tempa% \pst@@getcoor{#2}% - \addto@pscode{\psk@cornersize \pst@tempa \pst@coor \psk@dimen \tx@Frame}% + \addto@pscode{ \psk@cornersize \pst@tempa \pst@coor \psk@dimen \tx@Frame }% \def\pst@linetype{2}% - \showpointsfalse + \showpointsfalse% \end@ClosedObj% } % @@ -2088,17 +2089,25 @@ \end@OpenObj} \fi % -\def\tx@Parab{Parab } -\def\psparabola{\pst@object{psparabola}}% 1.15a 2006-01-05 (hv) +\def\psset@pType#1{\pst@cntg=#1\relax\edef\psk@pType{\the\pst@cntg}} +\psset@pType{0} +\def\tx@Parab{Parab }% given by 1 point and the min/max +\def\tx@Parabo{Parab1 }% given by 2 points for y-a=(x-b)^2 +\def\psparabola{\pst@object{psparabola}}% 2009-05-19 (hv) \def\psparabola@i{\pst@getarrows\psparabola@ii} -\def\psparabola@ii#1(#2)#3(#4){% +\def\psparabola@ii#1(#2)#3(#4){% #2 P #4 SP \begin@OpenObj \pst@getcoor{#2}\pst@tempa \pst@@getcoor{#4}% - \addto@pscode{\pst@tempa \pst@coor \tx@Parab}% + \addto@pscode{\pst@tempa \pst@coor + \ifcase\psk@pType + \tx@Parab \or + \tx@Parabo + \fi}% \end@OpenObj} \let\parabola\psparabola% compatibility (hv) % +% \def\psset@gridwidth#1{\pst@getlength{#1}\psk@gridwidth} \psset@gridwidth{.8pt} \def\psset@griddots#1{% @@ -3466,8 +3475,8 @@ pop \lower\pst@dimd% \box\pst@hbox% \kern\pst@dimc}% - \if@star\setbox\pst@hbox=\hbox{\clipbox@@\z@}\fi - \leavevmode\box\pst@hbox + \if@star\setbox\pst@hbox=\hbox{\clipbox@@\z@}\fi% + \leavevmode\box\pst@hbox% \endgroup% \psset@shift{0}% reset value } -- cgit v1.2.3