From 82e9f26bbf74949e3df6c4b857b3cbd1bc16232c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 1 Aug 2008 00:28:01 +0000 Subject: pstricks update (31jul08) git-svn-id: svn://tug.org/texlive/trunk@9966 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/pstricks/pstricks.tex | 53 +++++++++++++++------- 1 file changed, 36 insertions(+), 17 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 83cf7585a81..d1faa16d836 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.25} -\def\filedate{2008/06/26} +\def\fileversion{1.26} +\def\filedate{2008/07/31} % \csname PSTricksLoaded\endcsname \let\PSTricksLoaded\endinput @@ -217,7 +217,7 @@ \pstheader{pst-algparser.pro} % \def\pst@dict{tx@Dict begin } -\def\pst@theheaders{pstricks.pro pst-algparser.pro} +\def\pst@theheaders{pstricks.pro, pst-algparser.pro} \def\pst@Verb#1{\pstVerb{\pst@dict #1 end}} \def\tx@Atan{Atan } \def\tx@Div{Div } @@ -461,7 +461,7 @@ \def\psset@PstDebug#1{\pst@getint{#1}{\Pst@Debug}}% hv 2004-06-22 \psset{PstDebug=0} \def\psDEBUG{\@ifnextchar[\psDEBUG@i{\psDEBUG@i[PSTricks]}} -\def\psDEBUG@i[#1]#2{\ifnum\Pst@Debug>0 \expandafter\typeout{<#1>: #2}\fi} +\def\psDEBUG@i[#1]#2{\ifnum\Pst@Debug>0 \expandafter\typeout{<#1>: #2}\fi}% % end \def\pst@getlength#1#2{% \pssetlength\pst@dimg{#1}% @@ -597,7 +597,7 @@ #1 \pst@number\psyunit mul exch \pst@number\psxunit mul exch }} % \def\alg@coor#1;#2\@nil{\expandafter\alg@@@coor#1} -\def\alg@@@coor#1#2{% algebraic PostScript code +\def\alg@@@coor#1 #2{% algebraic PostScript code \edef\pst@coor{% % #1 /yArg exch def /x exch def /x #1 def @@ -678,6 +678,7 @@ \psset@doublesep{1.25\pslinewidth} \def\psset@doublecolor#1{\pst@getcolor{#1}\psdoublecolor} \psset@doublecolor{white} +% \newif\ifpsshadow \def\psset@shadow#1{% \@nameuse{psshadow#1}% @@ -694,6 +695,7 @@ \edef\pst@repeatarrowsflag{% \ifdim\psk@border\p@>\z@ 1\else\ifpsdoubleline 1\else \ifpsshadow 1\else \z@\fi\fi\fi}} +% \def\psls@none{} \newdimen\pslinewidth \def\psset@linewidth#1{\pssetlength\pslinewidth{#1}} @@ -750,6 +752,7 @@ \else [ \psk@dash ] 0 setdash stroke \fi} +% \def\psset@dotsep#1{\pst@getlength{#1}\psk@dotsep} \psset@dotsep{3pt} \def\tx@DotLine{DotLine } @@ -983,12 +986,19 @@ false \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@Arrow 0 h T gsave newpath false \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@Arrow - CP grestore CP newpath moveto 2 copy L stroke moveto + CP grestore CP newpath moveto 2 copy + CLW \pst@arrowscale\space div SLW % set the original line width + L stroke moveto } \@namedef{psas@<}{true \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@Arrow} \@namedef{psas@<<}{ true \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@Arrow - CP newpath moveto 0 a neg L stroke 0 h neg T + CP newpath moveto 0 a neg + gsave + CLW \pst@arrowscale\space div SLW % set the original line width + L stroke + grestore + 0 h neg T false \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@Arrow } \@namedef{psas@D>}{ false \psk@arrowinset \psk@arrowlength \psk@arrowsize \tx@ArrowD }% hv 20071211 @@ -1290,7 +1300,7 @@ \ifnum\pst@repeatarrowsflag>\z@ /Arrow#1c [ 6 2 roll ] cvx def Arrow#1c \fi - \tx@BeginArrow + \tx@BeginArrow \psk@arrowscale \@nameuse{psas@\@nameuse{psk@arrow#1}} \tx@EndArrow @@ -2571,12 +2581,14 @@ pop \setbox\pst@hbox\hbox to \pst@dimc{% \hss\box\pst@hbox\kern\psframesep\kern\pslinewidth}% \fi} +% \def\psset@arcsepA#1{\pst@getlength{#1}\psk@arcsepA} \def\psset@arcsepB#1{\pst@getlength{#1}\psk@arcsepB} \def\psset@arcsep#1{% \psset@arcsepA{#1}\let\psk@arcsepB\psk@arcsepA} \psset@arcsep{0} \def\tx@ArcArrow{ArcArrow } +% \def\psarc{\pst@object{psarc}} \def\psarc@i{\@ifnextchar({\psarc@iii}{\psarc@ii}} \def\psarc@ii#1{\addto@par{arrows=#1}% @@ -2585,12 +2597,16 @@ pop \def\psarc@iii(#1)#2#3#4{% \begin@OpenObj \pst@getangle{#3}\pst@tempa + \psDEBUG[psarc]{angleA=\pst@tempa}% \pst@getangle{#4}\pst@tempb - \pst@@getcoor{#1}% - \pssetlength\pst@dima{#2}% - \addto@pscode{\psarc@iv \psarc@v}% - \gdef\psarc@type{0}% - \showpointsfalse + \psDEBUG[psarc]{angleB=\pst@tempb}% + \ifx\pst@tempa\pst@tempb \else + \pst@@getcoor{#1}% + \pssetlength\pst@dima{#2}% + \addto@pscode{\psarc@iv \psarc@v}% + \gdef\psarc@type{0}% + \showpointsfalse + \fi \end@OpenObj% } \def\psarc@iv{% @@ -2600,12 +2616,12 @@ pop /angleA \pst@tempa \psk@arcsepA c mul 2 div - \ifcase \psarc@type add \or sub \fi + \ifcase\psarc@type add \or sub \fi def /angleB \pst@tempb \psk@arcsepB c mul 2 div - \ifcase \psarc@type sub \or add \fi + \ifcase\psarc@type sub \or add \fi def \ifshowpoints\psarc@showpoints\fi \ifx\psk@arrowA\@empty @@ -2616,6 +2632,7 @@ pop \fi} % hv ---- 1.10 2005-05-05 ----------------------> hv begin \def\psarc@v{% + /angleAtoB angleB angleA gt { true }{ false } ifelse def x y r angleA \ifx\psk@arrowA\@empty\else @@ -2625,6 +2642,7 @@ pop { \ifcase\psarc@type sub \or add \fi } \psrbrace ifelse % { \ifcase\psarc@type add \or sub \fi } \tx@ArcArrow +% dup AngleA gt AngleAtoB exor { neg } fi \fi angleB \ifx\psk@arrowB\@empty\else @@ -2633,7 +2651,8 @@ pop { \ifcase\psarc@type sub \or add \fi } \psrbrace\pslbrace { \ifcase\psarc@type add \or sub \fi } \psrbrace ifelse % { \ifcase\psarc@type sub \or add \fi } - \tx@ArcArrow + \tx@ArcArrow + dup angleA gt angleAtoB xor { pop angleA } if \fi \ifcase\psarc@type arc \or arcn \fi} % hv ----- 1.10 2005-05-05 ------------------------> end @@ -3339,7 +3358,7 @@ pop %\lower\pst@dimd %\fi %----- end Orig - \ifPst@shift@star\typeout{==pstricks== old behaviour of the shift option}% shift=* + \ifPst@shift@star%\typeout{==pstricks== old behaviour of the shift option}% shift=* \advance\pst@dimd-\pst@dimb \pst@dimd=0.5\pst@dimd \else\pst@dimd-\pst@shift\fi -- cgit v1.2.3