diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex')
| -rw-r--r-- | Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex | 58 |
1 files changed, 35 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex index 430743d66fe..f2484f32e49 100644 --- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex +++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex @@ -1,4 +1,4 @@ -%% $Id: pstricks-add.tex 38 2008-07-18 16:23:28Z herbert $ +%% $Id: pstricks-add.tex 39 2008-08-27 21:17:28Z herbert $ %% %% %% This is file `pstricks-add.tex', @@ -29,8 +29,8 @@ \ifx\MultidoLoaded\endinput\else \input multido \fi \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi % -\def\fileversion{3.08} -\def\filedate{2008/08/06} +\def\fileversion{3.10} +\def\filedate{2008/08/27} \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -1047,7 +1047,9 @@ \pst@number\psyunit div /#1.y ED % /#1.y in user coor \pst@number\psxunit div /#1.x ED } % /#1.x in user coor % -\define@key[psset]{pstricks-add}{lineAngle}{\psset{armB=0.5}\def\psk@lineAngle{#1}}% +\define@key[psset]{pstricks-add}{lineAngle}{% + \ifdim#1pt=\z@\else\psset{armB=0.5}\fi + \def\psk@lineAngle{#1}}% %\psset{lineAngle=0}% % \pst@def{NCDiag}<{ @@ -1077,14 +1079,13 @@ } ifelse } if ArmB 0 ne { xB1 yB1 } if - xB2 yB2 - xA2 yA2 - ArmA 0 ne { xA1 yA1 } if + xB2 yB2 xA2 yA2 + ArmA 0 ne { xA1 yA1 } if tx@Dict begin false Line end - /LPutVar [ xB1 yB1 xB2 yB2 xA2 yA2 xA1 yA1 ] cvx def - /LPutPos { LPutLines } def - /HPutPos { HPutLines } def - /VPutPos { VPutLines } def + /LPutVar [ xB1 yB1 xB2 yB2 xA2 yA2 xA1 yA1 ] cvx def + /LPutPos { LPutLines } def + /HPutPos { HPutLines } def + /VPutPos { VPutLines } def }> % hv 2003-12-22 \pst@def{NCDiagg}<{ @@ -2164,7 +2165,7 @@ \setbox\z@=\vbox{% save all in a box \ifcase\psk@xlabelPos \vskip-\pst@xticksizeA\vskip\pslabelsep\or - \vskip-1ex\or + \vskip-1ex\vskip-\pslabelsep\or \vskip-\pst@xticksizeB\vskip-\pslabelsep\vskip-1ex \fi \ifnum\pst@cnta<\z@ \pst@dimb=-\pst@dimb\fi @@ -2218,10 +2219,12 @@ \vbox to \z@{% \vss\hbox to\z@{% \ifcase\psk@ylabelPos% and also check for -0 - \hss\ifdim\nA pt=\z@% - \pst@@@vlabel{0}\else\pst@@@vlabel{\nA}\fi\hskip\pslabelsep\hskip-\pst@yticksizeA\or% - \hskip\pslabelsep\hss\ifdim\nA pt=\z@\pst@@@vlabel{0}\else\pst@@@vlabel{\nA}\fi\hss\or% % right labels - \hskip\pst@yticksizeB\hskip\pslabelsep\ifdim\nA pt=\z@\pst@@@vlabel{0}\else\pst@@@vlabel{\nA}\fi% + \hss\ifdim\nA pt=\z@ \pst@@@vlabel{0}\else\pst@@@vlabel{\nA}\fi% + \hskip\pslabelsep\hskip-\pst@yticksizeA\or% top + \hss\ifdim\nA pt=\z@\pst@@@vlabel{0}\else\pst@@@vlabel{\nA}\fi% + \ifdim\pslabelsep=\z@\hss\else\kern-\pslabelsep\fi\or% axis + \hskip\pst@yticksizeB\hskip\pslabelsep% + \ifdim\nA pt=\z@\pst@@@vlabel{0}\else\pst@@@vlabel{\nA}\fi% bottom \fi}\vss}% }\vss}% } @@ -3350,6 +3353,9 @@ \ifx\chart@option\@empty\else\psk@@chartUserColor#2,#3,\@nil\fi}% \psset[pstricks-add]{userColor={}} +\define@key[psset]{pstricks-add}{chartNodeI}{\def\psk@chartNodeI{#1}} +\define@key[psset]{pstricks-add}{chartNodeO}{\def\psk@chartNodeO{#1}} +\psset[pstricks-add]{chartNodeI=0.75,chartNodeO=1.5} \def\psChart{\pst@object{psChart}} \def\psChart@i#1#2#3{% @@ -3423,20 +3429,24 @@ \global\@chartSepfalse% \psforeach{\chart@tempC}{\psk@chartSepValues}{\ifnum\chart@tempC=\the\pst@cnta \global\@chartSeptrue\fi}% - \if@chartSep + \if@chartSep% \pswedge[linecolor={chartFillColor\the\pst@cnta},fillstyle=solid,fillcolor={chartFillColor\the\pst@cnta}]% (\psk@chartSep pt;\pst@number\pst@dimo){\pst@chartRadius}{\pst@number\pst@dimn}{\pst@number\pst@dimm}% \pst@dima=\pst@chartRadius\advance\pst@dima by \psk@chartSep pt \pnode(\pst@dima;\pst@number\pst@dimo){psChart\the\pst@cnta}% - \pnode(.75\pst@dima;\pst@number\pst@dimo){psChartI\the\pst@cnta}% - \pnode(1.5\pst@dima;\pst@number\pst@dimo){psChartO\the\pst@cnta}% + \pst@dimb=\psk@chartNodeI\pst@dima + \pst@dimc=\psk@chartNodeO\pst@dima + \pnode(\pst@dimb;\pst@number\pst@dimo){psChartI\the\pst@cnta}% + \pnode(\pst@dimc;\pst@number\pst@dimo){psChartO\the\pst@cnta}% \else \pswedge[linecolor={chartFillColor\the\pst@cnta},fillstyle=solid,fillcolor={chartFillColor\the\pst@cnta}]% {\pst@chartRadius}{\pst@number\pst@dimn}{\pst@number\pst@dimm} \pnode(\pst@chartRadius;\pst@number\pst@dimo){psChart\the\pst@cnta}% - \pst@dima=\pst@chartRadius - \pnode(.75\pst@dima;\pst@number\pst@dimo){psChartI\the\pst@cnta}% - \pnode(1.5\pst@dima;\pst@number\pst@dimo){psChartO\the\pst@cnta}% + \pst@dima=\pst@chartRadius% + \pst@dimb=\psk@chartNodeI\pst@dima + \pst@dimc=\psk@chartNodeO\pst@dima + \pnode(\pst@dimb;\pst@number\pst@dimo){psChartI\the\pst@cnta}% + \pnode(\pst@dimc;\pst@number\pst@dimo){psChartO\the\pst@cnta}% \fi% \global\let\chart@alpha\chart@tempA% \global\advance\chart@Toggle by \@ne @@ -3671,7 +3681,9 @@ braceWidth=2\pslinewidth, bracePos=0.5, braceWidthInner=10\pslinewidth, - braceWidthOuter=10\pslinewidth + braceWidthOuter=10\pslinewidth, + chartNodeI=0.75, + chartNodeO=1.5 } \psset{% %%%% pstricks %%%%%%%% |