From a1fe712ff99988a2935a9c903b7880c52080d62b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 4 Jan 2014 23:43:38 +0000 Subject: pstricks-add (4jan14) git-svn-id: svn://tug.org/texlive/trunk@32574 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/pstricks-add/pstricks-add.tex | 36 ++++++---------------- 1 file changed, 10 insertions(+), 26 deletions(-) (limited to 'Master/texmf-dist/tex/generic/pstricks-add') 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 106280bbb54..5521824f448 100644 --- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex +++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex @@ -1,5 +1,4 @@ -%% $Id: pstricks-add.tex 858 2013-12-14 14:38:20Z herbert $ -%% +%% $Id: pstricks-add.tex 866 2014-01-04 08:38:01Z herbert $ %% %% This is file `pstricks-add.tex', %% @@ -31,8 +30,8 @@ \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi \ifx\PSTmathLoaded\endinput\else \input pst-math \fi % -\def\fileversion{3.63} -\def\filedate{2013/12/14} +\def\fileversion{3.64} +\def\filedate{2014/01/03} \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -2354,37 +2353,23 @@ a add \pnode(#1){E@Cntr}% center of ellipse \pnode(#2){@@TMP}% semimajor, semiminor \pnode(#3){@@@TMP}% viewpt - \pnode(! - \psGetNodeCenter{E@Cntr} - \psGetNodeCenter{@@@TMP} - /Dx E@Cntr.x @@@TMP.x sub def - /Dy E@Cntr.y @@@TMP.y sub def - /Radius Dx Dy Pyth def - Dx 30 cos Radius mul sub @@@TMP.x add - Dy 30 sin Radius mul sub @@@TMP.y add - ){@@@@TMP}% viewpt - \psdot[linecolor=red](@@@@TMP)% -% \pst@getcoor{#3}\my@tempC% external viewpoint - \pst@getcoor{@@@@TMP}\my@tempC% external viewpoint - \AtoB(E@Cntr)(@@@@TMP){@TMP}% center to viewpoint + \pst@getcoor{#3}\my@tempC% external viewpoint + \AtoB(E@Cntr)(@@@TMP){@TMP}% center to viewpoint \ifnum\Pst@Debug>0 \shownode(E@Cntr)% \shownode(@TMP)% \shownode(@@@TMP)% - \shownode(@@@@TMP)% \fi% \pnode(! - \psGetNodeCenter{@@TMP} + \psGetNodeCenter{@@TMP}\space /B @@TMP.y def% semiminor /A @@TMP.x def% semimajor /A2 A dup mul def /B2 B dup mul def /C2 B A div dup mul def - \psGetNodeCenter{@TMP} + \psGetNodeCenter{@TMP}\space /Xp @TMP.x def /Yp @TMP.y def % center to viewpoint /Xp2 Xp dup mul def /Yp2 Yp dup mul def - \psGetNodeCenter{E@Cntr} - gsave - 30 rotate + \psGetNodeCenter{E@Cntr}\space /Xc E@Cntr.x def /Yc E@Cntr.y def /R Xp2 A2 sub C2 mul Yp2 add Sqrt def % R=Sqrt{(Xp2-A2) C2 + Yp2} /Q C2 Xp2 mul Yp2 add def % C2 Xp2 + Yp2 @@ -2394,9 +2379,8 @@ a add /Ytb Yp Xp R mul A div sub B2 mul Q div def 0 Xta Yp mul Yta Xp mul sub gt % swap a, b { /A Xta def /B Yta def /Xta Xtb def /Yta Ytb def /Xtb A def /Ytb B def } if - Xta Xc add Yta Yc add - grestore ){#42}% - \pnode(! Xtb Xc add Ytb Yc add ){#41}% + Xta Xc add Yta Yc add ) {#42}% + \pnode(! Xtb Xc add Ytb Yc add ) {#41}% \ignorespaces}% % \define@key[psset]{pstricks-add}{rotate}{\def\psk@rotate{#1 }} -- cgit v1.2.3