From c12b06054a9d1a9179a975d16f1be894c06546a7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 19 Nov 2009 18:37:21 +0000 Subject: pstricks.tex 1.30 (26oct09) git-svn-id: svn://tug.org/texlive/trunk@16083 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/pstricks/pstricks.tex | 88 +++++++++++----------- 1 file changed, 44 insertions(+), 44 deletions(-) (limited to 'Master/texmf-dist/tex/generic') diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index 741e314a87c..28e867d638a 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -20,8 +20,8 @@ % See the PSTricks User's Guide for description. % This uses the header file `pstricks.pro'. % -\def\fileversion{1.29} -\def\filedate{2009/05/19} +\def\fileversion{1.30} +\def\filedate{2009/10/25} % \csname PSTricksLoaded\endcsname \let\PSTricksLoaded\endinput @@ -1128,7 +1128,7 @@ } \def\pst@object#1{% \pst@ifstar{% - \@ifnextchar[{\pst@@object{#1}}{\def\pst@par{}\@nameuse{#1@i}}}% + \@ifnextchar[{\pst@@object{#1}}{\@nameuse{#1@i}}}% } \def\pst@@object#1[#2]{% \def\pst@par{#2}% @@ -1365,7 +1365,7 @@ grestore }} % -\def\pscustom{\pst@object{pscustom}} +\def\pscustom{\def\pst@par{}\pst@object{pscustom}} \long\def\pscustom@i#1{% \begin@SpecialObj \solid@star @@ -1485,10 +1485,10 @@ \def\msave{\addto@pscode{\tx@MSave}}% \def\mrestore{\addto@pscode{\tx@MRestore}}% \def\swapaxes{\addto@pscode{-90 rotate -1 1 scale}}% - \def\stroke{\pst@object{stroke}}% - \def\fill{\pst@object{fill}}% - \def\openshadow{\pst@object{openshadow}}% - \def\closedshadow{\pst@object{closedshadow}}% + \def\stroke{\def\pst@par{}\pst@object{stroke}}% + \def\fill{\def\pst@par{}\pst@object{fill}}% + \def\openshadow{\def\pst@par{}\pst@object{openshadow}}% + \def\closedshadow{\def\pst@par{}\pst@object{closedshadow}}% % DG/SR modification begin - Jan. 7, 1998 - Patch 8 % \def\movepath(#1){\pst@@getcoor{#1}\addto@pscode{\pst@coor tx@Shadow}}% \def\movepath(#1){\pst@@getcoor{#1}\addto@pscode{\pst@coor \tx@Shadow}}% @@ -1562,7 +1562,7 @@ \psset@gangle{0} % \def\tx@Diamond{Diamond } -\def\psdiamond{\pst@object{psdiamond}} +\def\psdiamond{\def\pst@par{}\pst@object{psdiamond}} \def\psdiamond@i(#1){\@ifnextchar({\psdiamond@ii(#1)}{\psdiamond@ii(0,0)(#1)}} \def\psdiamond@ii(#1)(#2){% \begin@ClosedObj @@ -1581,7 +1581,7 @@ \end@ClosedObj} % \def\tx@Triangle{Triangle } -\def\pstriangle{\pst@object{pstriangle}} +\def\pstriangle{\def\pst@par{}\pst@object{pstriangle}} \def\pstriangle@i(#1){\@ifnextchar({\pstriangle@ii(#1)}{\pstriangle@ii(0,0)(#1)}} \def\pstriangle@ii(#1)(#2){% \begin@ClosedObj @@ -1621,7 +1621,7 @@ \pst@checknum{#3}\pst@tempi \edef\psk@curvature{\pst@tempg \pst@temph \pst@tempi}} \psset@curvature{1 .1 0} -\def\pscurve{\pst@object{pscurve}} +\def\pscurve{\def\pst@par{}\pst@object{pscurve}} \def\pscurve@i{% \pst@getarrows{% \begin@OpenObj @@ -1637,7 +1637,7 @@ }% \end@OpenObj% } -\def\psecurve{\pst@object{psecurve}} +\def\psecurve{\def\pst@par{}\pst@object{psecurve}} \def\psecurve@i{% \pst@getarrows{% \begin@OpenObj @@ -1648,7 +1648,7 @@ \ifshowpoints true \else false \fi \tx@AltCurve}% \end@OpenObj} -\def\psccurve{\pst@object{psccurve}} +\def\psccurve{\def\pst@par{}\pst@object{psccurve}} \def\psccurve@i{% \begin@ClosedObj \pst@getcoors[\psccurve@ii} @@ -1709,7 +1709,7 @@ \psset@dotscale{1} % DG/SR modification end % -\def\psdot{\pst@object{psdot}} +\def\psdot{\def\pst@par{}\pst@object{psdot}} \def\psdot@i{\@ifnextchar({\psdot@ii}{\psdot@ii(\z@,\z@)}} \def\psdot@ii(#1){% \begin@SpecialObj% @@ -1723,7 +1723,7 @@ \pst@coor Dot}% \end@SpecialObj} % -\def\psdots{\pst@object{psdots}} +\def\psdots{\def\pst@par{}\pst@object{psdots}} \def\psdots@i{% \begin@SpecialObj% \pst@getcoors[\psdots@ii} @@ -1896,7 +1896,7 @@ \def\psset@linearc#1{\pssetlength\pslinearc{#1}} \psset@linearc{0pt} % -\def\psline{\pst@object{psline}} +\def\psline{\def\pst@par{}\pst@object{psline}} \def\psline@i{% \pst@getarrows{% \begin@OpenObj @@ -1922,7 +1922,7 @@ \tx@setlinejoin % hv 2007-10-13 } % -\def\psPline{\pst@object{psPline}}% perpendicular to another line B-C +\def\psPline{\def\pst@par{}\pst@object{psPline}}% perpendicular to another line B-C \def\psPline@i{% \pst@getarrows{% \begin@OpenObj @@ -1956,7 +1956,7 @@ \@nameuse{psls@\pslinestyle}% }% \end@SpecialObj} -\def\pspolygon{\pst@object{pspolygon}} +\def\pspolygon{\def\pst@par{}\pst@object{pspolygon}} \def\pspolygon@i{% \begin@ClosedObj% \def\pst@cp{}% @@ -1995,7 +1995,7 @@ \fi\fi\fi} \psset@dimen{outer} % -\def\psframe{\pst@object{psframe}} +\def\psframe{\def\pst@par{}\pst@object{psframe}} \def\psframe@i(#1){% \@ifnextchar({\psframe@ii(#1)}{\psframe@ii(0,0)(#1)}} \def\psframe@ii(#1)(#2){% @@ -2008,7 +2008,7 @@ \end@ClosedObj% } % -\def\psTextFrame{\pst@object{psTextFrame}} +\def\psTextFrame{\def\pst@par{}\pst@object{psTextFrame}} \def\psTextFrame@i(#1)(#2)#3{% \addbefore@par{ref=c}% to prevent an empty value \leavevmode% @@ -2038,7 +2038,7 @@ \def\tx@BezierCurve{BezierCurve } \def\pst@BezierType{2 } % the default % -\def\psbezier{\pst@object{psbezier}} +\def\psbezier{\def\pst@par{}\pst@object{psbezier}} \def\psbezier@i{% \pst@getarrows{% \begin@OpenObj @@ -2055,7 +2055,7 @@ \tx@OpenBezier \ifshowpoints \tx@BezierShowPoints \fi}% \end@OpenObj} -\def\pscbezier{\pst@object{pscbezier}} +\def\pscbezier{\def\pst@par{}\pst@object{pscbezier}} \def\pscbezier@i{% \begin@ClosedObj \pst@getcoors[\pscbezier@ii} @@ -2073,7 +2073,7 @@ % \def\psBezier#1{% % allowed order is 1 ... 9 \ifnum#1>0 \ifnum#1<10 \def\pst@BezierType{#1 }\fi\fi% - \pst@object{psBezier}} + \def\pst@par{}\pst@object{psBezier}} \def\psBezier@i{% \pst@getarrows{% \begin@OpenObj @@ -2093,7 +2093,7 @@ \psset@pType{0} \def\tx@Parab{Parab }% given by 1 point and the min/max \def\tx@Parabo{Parab1 }% given by 2 points for y-a=(x-b)^2 -\def\psparabola{\pst@object{psparabola}}% 2009-05-19 (hv) +\def\psparabola{\def\pst@par{}\pst@object{psparabola}}% 2009-05-19 (hv) \def\psparabola@i{\pst@getarrows\psparabola@ii} \def\psparabola@ii#1(#2)#3(#4){% #2 P #4 SP \begin@OpenObj @@ -2137,7 +2137,7 @@ \def\tx@Grid{Grid } -\def\psgrid{\pst@object{psgrid}} +\def\psgrid{\def\pst@par{}\pst@object{psgrid}} \def\psgrid@i{\@ifnextchar({\psgrid@ii}{\expandafter\psgrid@iv\pic@coor}} \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)}} @@ -2257,7 +2257,7 @@ \fi \ifpsdoubleline \pst@setdoublesep \fi} % -\def\psframebox{\pst@object{psframebox}} +\def\psframebox{\def\pst@par{}\pst@object{psframebox}} \def\psframebox@i{\pst@makebox\psframebox@ii} \def\psframebox@ii{% \begingroup @@ -2289,7 +2289,7 @@ \leavevmode\box\pst@hbox \endgroup} % -\def\psdblframebox{\pst@object{psdblframebox}} +\def\psdblframebox{\def\pst@par{}\pst@object{psdblframebox}} \def\psdblframebox@i{\addto@par{doubleline=true}\psframebox@i} \def\psclip#1{% \leavevmode @@ -2355,7 +2355,7 @@ setmatrix}% \unhbox\pst@hbox \end@psclip}} -\def\psshadowbox{\pst@object{psshadowbox}} +\def\psshadowbox{\def\pst@par{}\pst@object{psshadowbox}} \def\psshadowbox@i{\pst@makebox\psshadowbox@ii} \def\psshadowbox@ii{% \begingroup @@ -2375,7 +2375,7 @@ \leavevmode \box\pst@hbox \endgroup} -\def\pscirclebox{\pst@object{pscirclebox}} +\def\pscirclebox{\def\pst@par{}\pst@object{pscirclebox}} \def\pscirclebox@i{\pst@makebox\pscirclebox@ii} \def\pscirclebox@ii{% \begingroup @@ -2423,7 +2423,7 @@ newpath \pscirclebox@iv \tx@SD end}% % \let\pst@nodehook\relax % -\def\psCirclebox{\pst@object{psCirclebox}} +\def\psCirclebox{\def\pst@par{}\pst@object{psCirclebox}} \def\psCirclebox@i{\pst@makebox\psCirclebox@ii} \def\psCirclebox@ii{% \begingroup @@ -2449,7 +2449,7 @@ newpath \pscirclebox@iv \tx@SD end}% \hss\vrule width \z@ depth \pst@dimb height \pst@dima \box\pst@hbox\hss}} % -\def\psovalbox{\pst@object{psovalbox}} +\def\psovalbox{\def\pst@par{}\pst@object{psovalbox}} \def\psovalbox@i{\pst@makebox{\psovalbox@ii}} \def\psovalbox@ii{% \begingroup @@ -2493,7 +2493,7 @@ newpath \pscirclebox@iv \tx@SD end}% \advance\pst@dimd\pst@dimb \ht\pst@hbox=\pst@dimd} % -\def\psdiabox{\pst@object{psdiabox}} +\def\psdiabox{\def\pst@par{}\pst@object{psdiabox}} \def\psdiabox@i{\pst@makebox{\psdiabox@ii}} \def\psdiabox@ii{% \begingroup @@ -2551,7 +2551,7 @@ pop \ifx R\pst@tempg 1 \else\ifx D\pst@tempg 2 \else\ifx L\pst@tempg 3 \else 0 \fi\fi\fi}} \psset@trimode{U} -\def\pstribox{\pst@object{pstribox}} +\def\pstribox{\def\pst@par{}\pst@object{pstribox}} \def\pstribox@i{\pst@makebox{\pstribox@ii}} \def\pstribox@ii{% \begingroup @@ -2658,7 +2658,7 @@ pop \psset@arcsep{0} \def\tx@ArcArrow{ArcArrow } % -\def\psarc{\pst@object{psarc}} +\def\psarc{\def\pst@par{}\pst@object{psarc}} \def\psarc@i{\@ifnextchar({\psarc@iii}{\psarc@ii}} \def\psarc@ii#1{\addto@par{arrows=#1}% \@ifnextchar({\psarc@iii}{\psarc@iii(0,0)}% @@ -2737,10 +2737,10 @@ pop CLW 2 div SLW [ \psk@dash\space ] 0 setdash stroke grestore } -\def\psarcn{\pst@object{psarcn}} +\def\psarcn{\def\pst@par{}\pst@object{psarcn}} \def\psarcn@i{\def\psarc@type{1}\psarc@i} % -\def\psarcAB{\pst@object{psarcAB}}% hv 2008-11-26 +\def\psarcAB{\def\pst@par{}\pst@object{psarcAB}}% hv 2008-11-26 \def\psarcAB@i{% \addbefore@par{psscale=1}% be sure, that it is defined \pst@getarrows{% @@ -2775,7 +2775,7 @@ pop \showpointsfalse \end@OpenObj% } -\def\psarcnAB{\pst@object{psarcnAB}} +\def\psarcnAB{\def\pst@par{}\pst@object{psarcnAB}} \def\psarcnAB@i{\def\psarc@type{1}\psarcAB@i} % %------------------ tvz/DG/hv (2004-05-10) begin -------------------%% @@ -2892,7 +2892,7 @@ pop [ \psk@dash\space ] 0 setdash stroke grestore % } -\def\pscircle{\pst@object{pscircle}} +\def\pscircle{\def\pst@par{}\pst@object{pscircle}} \def\pscircle@i{\@ifnextchar({\pscircle@do}{\pscircle@do(0,0)}} \def\pscircle@do(#1)#2{% \if@star{\use@par\qdisk(#1){#2}}% qdisk does not allow @@ -2913,7 +2913,7 @@ pop \fi \ignorespaces} % -\def\pscircleOA{\pst@object{pscircleOA}}% hv 2008-04-14 +\def\pscircleOA{\def\pst@par{}\pst@object{pscircleOA}}% hv 2008-04-14 \def\pscircleOA@i(#1)(#2){% \begin@ClosedObj \pst@getcoor{#1}\pst@tempA @@ -2948,11 +2948,11 @@ pop \def\psset@radius#1{\pst@@getlength{#1}\psk@radius} \psset@radius{.25cm} % -\def\psCircle{\pst@object{psCircle}}% same as \pscircle, but uses \psk@radius +\def\psCircle{\def\pst@par{}\pst@object{psCircle}}% same as \pscircle, but uses \psk@radius \def\psCircle@i{\@ifnextchar({\psCircle@ii}{\psCircle@ii(0,0)}} \def\psCircle@ii(#1){\pscircle@do(#1){\psk@radius}} % -\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% @@ -2975,7 +2975,7 @@ pop \end@ClosedObj% } \def\tx@Ellipse{Ellipse } -\def\psellipse{\pst@object{psellipse}} +\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){% \begin@ClosedObj @@ -3259,7 +3259,7 @@ pop \ignorespaces% } \newif\if@fixedradius -\def\cput{\pst@object{cput}} +\def\cput{\def\pst@par{}\pst@object{cput}} \def\cput@i{\@fixedradiusfalse\cput@ii} \def\cput@ii{\pst@killglue\@ifnextchar({\cput@iv}{\cput@iii}} \def\cput@iii#1{% @@ -3280,7 +3280,7 @@ pop \endgroup \ignorespaces% } -\def\Cput{\pst@object{Cput}} +\def\Cput{\def\pst@par{}\pst@object{Cput}} \def\Cput@i{\@fixedradiustrue\cput@ii} \newdimen\pslabelsep \def\psset@labelsep#1{\pssetlength\pslabelsep{#1}} -- cgit v1.2.3