summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-03-29 23:27:21 +0000
committerKarl Berry <karl@freefriends.org>2011-03-29 23:27:21 +0000
commit1b69735e67a604bfcff8852bb369f80ed5ada13f (patch)
treed7413597836288775c229bda24a43fb12e8431dc /Master/texmf-dist/tex/generic
parent62184ea5f28527b106ce338a3730f24a234f6eb0 (diff)
pstricks
git-svn-id: svn://tug.org/texlive/trunk@21881 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex47
1 files changed, 32 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index bc406da7684..cb1830485a3 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -66,8 +66,8 @@
\pst@addfams{pstricks}
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi
%
-\def\fileversion{2.17}
-\def\filedate{2011/01/30}
+\def\fileversion{2.19}
+\def\filedate{2011/03/25}
%
% stolen from latex.ltx to make it TeX compatible
\newcount\psLoopIndex
@@ -491,8 +491,8 @@
\def\pst@@@@checknum#1\relax\@nil{\ifx\@nil#1\@nil\else\let\pst@num\z@\fi}
%
\def\pst@getnumii#1 #2 #3\@nil{%
-\pst@checknum{#1}\pst@tempg%
-\pst@checknum{#2}\pst@temph}
+ \pst@checknum{#1}\pst@tempg%
+ \ifx\relax#2\relax\let\pst@temph\pst@tempg\else\pst@checknum{#2}\pst@temph\fi}
\def\pst@getnumiii#1 #2 #3 #4\@nil{%
\pst@checknum{#1}\pst@tempg%
\pst@checknum{#2}\pst@temph%
@@ -1446,8 +1446,8 @@
\psset[pstricks]{arrows=-}
%
\define@key[psset]{pstricks}{arrowscale}[1]{% hv --1.12
- \pst@@arrowscale@i#1 \@nil% hv -- 1.12
- \pst@getscale{\pst@arrowscale}\psk@arrowscale}% hv --1.12
+ \pst@getscale{#1}\psk@arrowscale
+ \pst@@arrowscale@i#1 \@nil}% hv --1.12
\def\pst@@arrowscale@i#1 #2\@nil{\edef\pst@arrowscale{#1}}% hv --1.12
\psset[pstricks]{arrowscale=1}
%
@@ -2558,11 +2558,11 @@
\def\psgrid@ii(#1){\@ifnextchar({\psgrid@iii(#1)}{\psgrid@iv(0,0)(0,0)(#1)}}
\def\psgrid@iii(#1)(#2){\@ifnextchar({\psgrid@iv(#1)(#2)}{\psgrid@iv(#1)(#1)(#2)}}
\def\psgrid@iv(#1)(#2)(#3){%
- \begin@SpecialObj
+ \begin@SpecialObj%
\pst@getcoor{#1}\pst@tempA% hv 1.11
- \pst@getcoor{#2}\pst@tempB % hv 1.11
+ \pst@getcoor{#2}\pst@tempB% hv 1.11
\pst@@getcoor{#3}%
- \ifnum\psk@subgriddiv>1
+ \ifnum\psk@subgriddiv>1\relax
\addto@pscode{
gsave
\psk@subgridwidth SLW
@@ -2576,7 +2576,7 @@
\tx@Grid
grestore
}%
- \fi
+ \fi%
\addto@pscode{
gsave
\psk@gridwidth SLW
@@ -2736,13 +2736,15 @@
\end@psclip%
\endgroup}%
\ignorespaces}
+%
\def\endpsclip{\pst@misplaced\endpsclip}
\let\begin@psclip\relax
\def\end@psclip{\pstVerb{currentpoint initclip moveto}}
+%
\def\AltClipMode{%
-\def\end@psclip{\pstVerb{\pst@grestore}}%
-\def\begin@psclip{\pstVerb{gsave}}}
-\def\clipbox{\@ifnextchar[{\clipbox@}{\clipbox@[\z@]}}
+ \def\end@psclip{\pstVerb{\pst@grestore}}%
+ \def\begin@psclip{\pstVerb{gsave}}}
+ \def\clipbox{\@ifnextchar[{\clipbox@}{\clipbox@[\z@]}}
% DG modification begin - Apr. 3, 1997
% From paulus@immd5.informatik.uni-erlangen.de (Dietrich Paulus)
%\def\clipbox@[#1]{\pst@makebox\clipbox@@{#1}}
@@ -2769,6 +2771,7 @@
setmatrix}%
\unhbox\pst@hbox%
\end@psclip}}
+%
\def\psshadowbox{\def\pst@par{}\pst@object{psshadowbox}}
\def\psshadowbox@i{\pst@makebox\psshadowbox@ii}
\def\psshadowbox@ii{%
@@ -3250,6 +3253,7 @@ pop
\def\psellipticarc@iii(#1){%
\@ifnextchar({\psellipticarc@iv(#1)}{\psellipticarc@iv(0,0)(#1)}}
\def\psellipticarc@iv(#1)(#2)#3#4{%
+% \addbefore@par{correctAngle=false}
\begin@OpenObj
\pst@getcoor{#1}\pst@tempa% origin
\pst@getcoor{#2}\pst@tempb% a,b
@@ -3330,7 +3334,19 @@ pop
xOrig yOrig T
rx ry scale
0 0 moveto
- 0 0 1 \pst@tempc \pst@tempd
+ 0 0 1
+ \pst@tempc
+ \ifPst@correctAngle
+ cvi 90 mod 0 eq { \pst@tempc }
+ { rx ry \tx@UserCoor exch \pst@tempc tan mul exch atan
+ \pst@tempc 180 div .5 add floor 180 mul sub } ifelse
+ \fi
+ \pst@tempd
+ \ifPst@correctAngle
+ cvi 90 mod 0 eq { \pst@tempd }
+ { rx ry \tx@UserCoor exch \pst@tempd tan mul exch atan
+ \pst@tempd 180 div .5 add floor 180 mul sub } ifelse
+ \fi
\ifcase\psarc@type arc \or arcn \fi
closepath
mtrx setmatrix
@@ -3896,7 +3912,8 @@ pop
%
\def\pspicture{\begingroup\pst@ifstar\pst@picture}
\def\pst@picture{\@ifnextchar[{\pst@@picture}{\pst@@picture[]}}
-\def\pst@@picture[#1]#2(#3,#4){\@ifnextchar(%
+\def\pst@@picture[#1]{\@ifnextchar({\pst@@picture@i[#1]}{\pst@@picture@i[#1](10,10)}}%
+\def\pst@@picture@i[#1]#2(#3,#4){\@ifnextchar(% ignore anything between [] and ()
{\pst@@@picture[#1](#3,#4)}%
{\pst@@@picture[#1](0,0)(#3,#4)}}
%