diff options
author | Karl Berry <karl@freefriends.org> | 2014-03-12 22:32:50 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-03-12 22:32:50 +0000 |
commit | 44df6d09616942cb3a83276fba2978bc9cdee561 (patch) | |
tree | 25d8704f6242db91513074383de6c56a9bcb10fe /Master/texmf-dist/tex/generic/pstricks | |
parent | b2f136b4ef89ad57771cb79327eb0745a7c93bd1 (diff) |
pstricks (12mar14)
git-svn-id: svn://tug.org/texlive/trunk@33160 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pstricks')
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 70 |
1 files changed, 55 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index bf4e83c1847..243aa5ab387 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -109,8 +109,8 @@ \input pgffor.code.tex \let\pgfforeach\foreach % -\def\fileversion{2.51} -\def\filedate{2014/02/03} +\def\fileversion{2.53} +\def\filedate{2014/03/12} \catcode`\@=11\relax \pst@addfams{pstricks} % @@ -788,7 +788,7 @@ }% \def\psput@##1{\pst@@getcoor{##1}\leavevmode\psput@cartesian}% } -\NormalCoor% set to normal read of coors, angles and lengths +%\NormalCoor% set to normal read of coors, angles and lengths % \def\degrees{\@ifnextchar[{\@degrees}{\def\pst@angleunit{}}} \def\@degrees[#1]{% @@ -831,6 +831,8 @@ }% \def\psput@##1{\pst@@getcoor{##1}\leavevmode\psput@special}% } +\SpecialCoor% set to special read of coors, angles and lengths +% \begingroup \catcode`\|=13 \catcode`\;=13 @@ -2209,6 +2211,28 @@ \ifx\pslinestyle\psls@@symbol\def\pslinestyle{none}\fi% \end@ClosedObj} % +\def\pscspline{\pst@object{pscspline}}% Christoph Bersch +\def\pscspline@i{% + \pst@getarrows{% + \begin@OpenObj + \pst@getcoors[\pscspline@ii + }% +} +\def\tx@Spline{Spline } +\def\pscspline@ii{% + \addto@pscode{ + \ifPst@noCurrentPoint\else\pst@cp\fi + \tx@setlinejoin + \ifshowpoints true \else false \fi + \ifx\pslinestyle\psls@@symbol + \psls@symbol OpenSymbolSpline + \else + \tx@Spline + \fi + }% + \end@OpenObj +} +% \define@key[psset]{pstricks}{dotsize}[2pt 2]{% \pst@expandafter\pst@getdimnum{#1} 0 {} {}\@nil% \edef\psk@@dotsize{\pst@number\pst@dimg}% @@ -3182,7 +3206,12 @@ pop \ifx D\pst@tempg 2 % Down \else \ifx L\pst@tempg 3 % Left - \else 0 % Up + \else + \ifx l\pst@tempg 4 % |_ + \else + \ifx r\pst@tempg 5 % _| + \else 0 \fi % Up + \fi \fi \fi \fi}% @@ -3208,10 +3237,19 @@ pop \psline@iii pop 0.5 - \pst@number\pst@dimc \pst@number\pst@dimd - \ifodd\psk@trimode exch \fi + \pst@number\pst@dimc % Width + \pst@number\pst@dimd % Height + \ifcase\psk@trimode + \or %% 0 + exch \or %% 1 + \or %% 2 + exch \or %% 3 + \or %% 4 + \or %% 5 + \fi \psk@trimode -90 mul - \pst@number\pst@dima \pst@number\pst@dimb + \pst@number\pst@dima % x coor for text + \pst@number\pst@dimb % y coor for text \tx@Triangle}% \def\pst@linetype{2}% \end@ClosedObj @@ -3222,10 +3260,10 @@ pop \pst@dimh=\pslinewidth \advance\pst@dimh\psframesep \pst@dimg=\ht\pst@hbox - \advance\pst@dimg-\dp\pst@hbox - \divide\pst@dimg 2 - \edef\pst@tempa{\number\pst@dimg sp}% For use by nodes. - \ifodd\psk@trimode + \advance\pst@dimg-\dp\pst@hbox % totalheight + \divide\pst@dimg 2 % 0.5 totalheight + \edef\pst@tempa{\number\pst@dimg sp}% % For use by nodes. + \ifodd\psk@trimode % \pst@dimb\pst@dimg \else \pst@dima=\wd\pst@hbox @@ -3431,6 +3469,7 @@ pop \pst@@getcoor{#2}% \def\pst@linetype{1}% \addto@pscode{% + \ifx\psk@rot\@empty \else \psk@rot\space rotate \fi \pst@tempa \pst@tempb \pst@coor \pst@tempc moveto @@ -3504,6 +3543,7 @@ pop \end@OpenObj% } \def\psellipticarc@definearg{% + \ifx\psk@rot\@empty \else \psk@rot\space rotate \fi \pst@tempa /yOrig ED /xOrig ED % Origin \pst@tempb % radii. Now adjust: \ifdim\psk@dimen\p@=\z@\else @@ -3685,7 +3725,7 @@ pop \end@ClosedObj \ignorespaces} % -\def\pswedge{\pst@object{pswedge}} +\def\pswedge{\def\pst@par{}\pst@object{pswedge}} \def\pswedge@i{\@ifnextchar({\pswedge@ii}{\pswedge@ii(0,0)}} \def\pswedge@ii(#1)#2#3#4{% \begin@ClosedObj% @@ -3695,6 +3735,7 @@ pop \pst@@getcoor{#1}% \def\pst@linetype{1}% \addto@pscode{ + \ifx\psk@rot\@empty 0 \else \psk@rot \fi rotate \pst@coor 2 copy moveto @@ -3707,9 +3748,8 @@ pop \showpointsfalse% \end@ClosedObj% } -\def\tx@Ellipse{ - \ifx\psk@rot\@empty 0 \else \psk@rot \fi - Ellipse } +\def\tx@Ellipse{ \ifx\psk@rot\@empty 0 \else \psk@rot \fi Ellipse } +% \def\psellipse{\def\pst@par{}\pst@object{psellipse}} \def\psellipse@i(#1){\@ifnextchar({\psellipse@ii(#1)}{\psellipse@ii(0,0)(#1)}} \def\psellipse@ii(#1)(#2){% |