From 8058bd27fa381c2e259ce7387b40737d752a405b Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 30 Jul 2014 02:02:11 +0000 Subject: pstricks base (29Jul) git-svn-id: svn://tug.org/texlive/trunk@34772 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/pstricks/pstricks.tex | 43 ++++++++++++++++++++-- 1 file changed, 39 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/tex/generic/pstricks') diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 7f9bd3fff10..8c56d1f3af2 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.54a} -\def\filedate{2014/05/19} +\def\fileversion{2.55} +\def\filedate{2014/07/28} \catcode`\@=11\relax \pst@addfams{pstricks} % @@ -1213,8 +1213,17 @@ /Multiply \or /HardLight \or /Darken \or - /Ligten \or - /Difference + /Lighten \or + /Difference\or + /ColorDodge\or + /ColorBurn\or + /SoftLight\or + /Hue\or + /Saturation\or + /Luminosity\or + /Overlay\or + /Exclusion\or + /Color \else /Normal \fi @@ -3779,6 +3788,32 @@ pop \def\pst@linetype{2}% \end@ClosedObj% } +\def\psellipseAB{\def\pst@par{}\pst@object{psellipseAB}} +\def\psellipseAB@i(#1)(#2)#3{% + \begin@ClosedObj + \pst@getcoor{#1}\pst@tempa + \pst@getcoor{#2}\pst@tempb + \addto@pscode{ + 0 360 + #3 \pst@number\psxunit mul + \pst@tempa /yA ED /xA ED + \pst@tempb /yB ED /xB ED + xA xB sub dup mul + yA yB sub dup mul add sqrt 2 div + \ifdim\psk@dimen\p@=\z@\else + \psk@dimen CLW mul + dup 4 -1 roll sub neg 3 1 roll sub + \fi + xA xB add 2 div yA yB add 2 div + translate 0 0 + xB xA sub yA yB sub atan + Ellipse % on stack is rotate coordinates + \ifPst@variableLW \pst@flattenpath \fi + closepath + }% + \def\pst@linetype{2}% + \end@ClosedObj +} \def\multips{\@ifnextchar({\def\pst@par{}\multips@ii}{\multips@i}} \def\multips@i#1{\def\pst@par{rot=#1}\multips@ii} \def\multips@ii(#1){\@ifnextchar({\multips@iii(#1)}{\multips@iii(\z@,\z@)(#1)}} -- cgit v1.2.3