From 892f3ce16d68ac11d0fc2726b051cc276b47e3c1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 5 Feb 2011 00:17:21 +0000 Subject: pstricks 2.17 (2feb11) git-svn-id: svn://tug.org/texlive/trunk@21291 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/pstricks/pstricks.tex | 64 +++++++++++++++------- 1 file changed, 45 insertions(+), 19 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 bab470b5dcb..bc406da7684 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -57,6 +57,7 @@ \def\:{\global\let\@sptoken= } \: \def\:{\@xifnch} \expandafter\gdef\: {\futurelet\@tempc\@ifnch} \endgroup + \def\endtabular{\crcr\egroup\egroup $\egroup} \fi % % now we have all commands defined, for TeX and LaTeX @@ -65,8 +66,8 @@ \pst@addfams{pstricks} \ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi % -\def\fileversion{2.15} -\def\filedate{2010/11/25} +\def\fileversion{2.17} +\def\filedate{2011/01/30} % % stolen from latex.ltx to make it TeX compatible \newcount\psLoopIndex @@ -137,7 +138,14 @@ \edef\pst@tempa{\pst@tempa,\pst@tempA}% \repeat% \psForeach@ii{#1}{\pst@tempa}{#5}} -% + +\def\psrecur@i#1{\csname ps@rn#1\psrecur@i} +\long\def\ps@rnm#1{\endcsname{#1}#1\global\advance\psLoopIndex by \@ne} +\long\def\ps@rn#1{} +\def\psLoop#1{\global\psLoopIndex=0 + \csname ps@rn\expandafter\psrecur@i + \romannumeral\number\number#1 000\endcsname\endcsname} + % % hv 2007-10-16 to fix the bug in pst-node with \\[name=...] % hv fix bug with empty fnodes in psmatrix @@ -978,13 +986,21 @@ \ifpsshadow 1\else \z@\fi\fi\fi}} % \def\psls@none{} -\def\psls@solid{\psk@linejoin\space setlinejoin \psk@linecap\space setlinecap stroke } +\def\psls@solid{ \psk@linejoin\space setlinejoin \psk@linecap\space setlinecap stroke } +\def\psls@coloreddashed{ \psls@solid grestore gsave \pst@usecolor\psdashcolor \tx@setlinejoin \psls@dashed } % \newdimen\pslinewidth \define@key[psset]{pstricks}{linewidth}[0.8pt]{\pssetlength\pslinewidth{#1}} \psset[pstricks]{linewidth=.8pt} \define@key[psset]{pstricks}{linecolor}[black]{\pst@getcolor{#1}\pslinecolor} \psset[pstricks]{linecolor=black} +% +\newif\ifPst@coloreddashed +\define@key[psset]{pstricks}{dashcolor}[white]{% + \ifx\relax#1\relax\Pst@coloreddashedfalse% + \else\Pst@coloreddashedtrue\pst@getcolor{#1}\psdashcolor + \fi} +\psset{dashcolor=\relax} %\define@key[psset]{pstricks}{linecap}[0]{\pst@getint{#1}\psk@linecap}% hv 2007-12-01 %\psset[pstricks]{linecap=0} >>>>>>>>>>>>> siehe unten \define@key[psset]{pstricks}{linejoin}[0]{\pst@getint{#1}\psk@linejoin}% hv 2007-10-13 @@ -1032,6 +1048,7 @@ \def\tx@DashLine{DashLine } % \def\psls@dashed{ + \ifPst@coloreddashed \psls@solid grestore gsave \pst@usecolor\psdashcolor \tx@setlinejoin \fi \psk@linecap\space setlinecap \ifpsdashadjust [ \psk@dash ] \pst@linetype\space \tx@DashLine @@ -1102,6 +1119,7 @@ % \def\tx@LineFill{LineFill } \def\tx@PenroseFill{PenroseFill } +\def\tx@TruchetFill{TruchetFill } % \def\psfs@none{} \def\psfs@solid{\pst@fill{\pst@usecolor\psfillcolor \tx@setTransparency fill }} @@ -1152,6 +1170,15 @@ \def\psfs@penrose{\pst@fill\pst@penroseFill} \@namedef{psfs@penrose*}{\psfs@solid \psfs@penrose} % +\def\pst@truchetFill{% + gsave % restore in PenroseFill + \pst@number\pslinewidth SLW + \pst@usecolor\pshatchcolor + \psk@psscale + \tx@TruchetFill } +\def\psfs@truchet{ \pst@fill\pst@truchetFill } +\@namedef{psfs@truchet*}{\psfs@solid \psfs@truchet} +% \define@key[psset]{pstricks}{fillstyle}[none]{% \edef\pst@tempg{#1}\def\pst@temph{none}% \ifx\pst@tempg\pst@temph @@ -2572,11 +2599,11 @@ \let\pst@thisbox\relax \long\def\pst@makenotverbbox#1#2{% \edef\pst@mathflag{% - \ifpsmathbox\ifmmode\ifinner 1\else 2\fi\else \z@\fi\else \z@\fi}% + \ifpsmathbox\ifmmode\ifinner 1\else 2\fi\else\z@\fi\else\z@\fi}% \setbox\pst@hbox=\hbox{% \ifcase\pst@mathflag\or$\m@th\textstyle\or$\m@th\displaystyle\fi {\pst@thisbox\the\everypsbox#2}% - \ifnum\pst@mathflag>\z@$\fi% $ + \ifnum\pst@mathflag>\z@$\fi% $ }% #1} % @@ -2679,12 +2706,12 @@ \def\psdblframebox{\def\pst@par{}\pst@object{psdblframebox}} \def\psdblframebox@i{\addto@par{doubleline=true}\psframebox@i} \def\psclip#1{% - \leavevmode - \begingroup - \begin@psclip - \begingroup + \leavevmode% + \begingroup% + \begin@psclip% + \begingroup% \def\use@pscode{% - \pstVerb{% + \pstVerb{ \pst@dict /mtrxc CM def CP CP T @@ -2704,9 +2731,9 @@ \def\@multips(##1)(##2)##3##4{\pst@misplaced\multips}% \def\nc@object##1##2##3##4{\pst@misplaced{node connection}}% \hbox to\z@{#1}% - \endgroup + \endgroup% \def\endpsclip{% - \end@psclip + \end@psclip% \endgroup}% \ignorespaces} \def\endpsclip{\pst@misplaced\endpsclip} @@ -2724,8 +2751,8 @@ \def\clipbox@@#1{% \pssetlength\pst@dimg{#1}% \leavevmode\hbox{% - \begin@psclip - \pst@Verb{% + \begin@psclip% + \pst@Verb{ CM \tx@STV CP T newpath /a \pst@number\pst@dimg def /w \pst@number{\wd\pst@hbox}a add def @@ -2740,8 +2767,8 @@ newpath 0 0 moveto setmatrix}% -\unhbox\pst@hbox -\end@psclip}} + \unhbox\pst@hbox% + \end@psclip}} \def\psshadowbox{\def\pst@par{}\pst@object{psshadowbox}} \def\psshadowbox@i{\pst@makebox\psshadowbox@ii} \def\psshadowbox@ii{% @@ -3059,7 +3086,7 @@ pop \def\psarc{\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)}% + \@ifnextchar(\psarc@iii{\psarc@iii(0,0)}% } \def\psarc@iii(#1)#2#3#4{% \begin@OpenObj @@ -3764,7 +3791,6 @@ pop \use@par% \if@star\pst@starbox\fi% \pstCheckCoorType{#1}% needed for \uput@vii -\typeout{====\the\pst@C@@rType====}% \uput@vi% \psput@{#1}\pst@hbox \endgroup% -- cgit v1.2.3