summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-11-30 01:13:51 +0000
committerKarl Berry <karl@freefriends.org>2009-11-30 01:13:51 +0000
commit9d8c1dc9df0e8265e2984812053d70a09740961b (patch)
tree137ce083213dc8882151ebcd95aad6a9361c40f5 /Master/texmf-dist/tex
parentdc614c4d56f5d6c8fbf4d6f8bb0781ba17347f97 (diff)
pstricks update
git-svn-id: svn://tug.org/texlive/trunk@16241 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex62
1 files changed, 30 insertions, 32 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 28e867d638a..68310975004 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -1,7 +1,7 @@
%% pstricks.tex
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
%% COPYRIGHT 2000-2003 by Denis Girou.
-%% Copyright 2004-2009 Herbert Voss
+%% Copyright 2004-2010 Herbert Voss
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -20,8 +20,8 @@
% See the PSTricks User's Guide for description.
% This uses the header file `pstricks.pro'.
%
-\def\fileversion{1.30}
-\def\filedate{2009/10/25}
+\def\fileversion{1.31}
+\def\filedate{2009/11/27}
%
\csname PSTricksLoaded\endcsname
\let\PSTricksLoaded\endinput
@@ -249,15 +249,13 @@
\def\pst@number#1{\pst@@dimtonum#1\space}
\def\pst@checknum#1#2{%
\edef\ps@next{#1}%
- \ifx\ps@next\@empty
- \let\pst@num\z@
- \else
- \expandafter\pst@@checknum\ps@next..\@nil
- \fi
+ \ifx\ps@next\@empty\let\pst@num\z@%
+ \else\expandafter\pst@@checknum\ps@next..\@nil%
+ \fi%
\ifnum\pst@num=\z@
- \@pstrickserr{Bad number: `#1'. 0 substituted.}\@ehpa
+ \@pstrickserr{Bad number: `#1'. 0 substituted.}\@ehpa%
\def#2{0 }%
- \else
+ \else%
\edef#2{\ifnum\pst@num=\tw@-\fi\the\pst@cntg.%
\expandafter\@gobble\the\pst@cnth\space}%
\fi}
@@ -268,21 +266,21 @@
}
%
\def\pst@@@checknum#1.#2.#3\@nil{%
-\afterassignment\pst@@@@checknum\pst@cntg=0#1\relax\@nil
+\afterassignment\pst@@@@checknum\pst@cntg=0#1\relax\@nil%
\afterassignment\pst@@@@checknum\pst@cnth=1#2\relax\@nil}
\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{#1}\pst@tempg%
\pst@checknum{#2}\pst@temph}
\def\pst@getnumiii#1 #2 #3 #4\@nil{%
-\pst@checknum{#1}\pst@tempg
-\pst@checknum{#2}\pst@temph
+\pst@checknum{#1}\pst@tempg%
+\pst@checknum{#2}\pst@temph%
\pst@checknum{#3}\pst@tempi}
\def\pst@getnumiv#1 #2 #3 #4 #5\@nil{%
-\pst@checknum{#1}\pst@tempg
-\pst@checknum{#2}\pst@temph
-\pst@checknum{#3}\pst@tempi
+\pst@checknum{#1}\pst@tempg%
+\pst@checknum{#2}\pst@temph%
+\pst@checknum{#3}\pst@tempi%
\pst@checknum{#4}\pst@tempj}
\def\pst@getdimnum#1 #2 #3\@nil{%
\pssetlength\pst@dimg{#1}%
@@ -1127,18 +1125,21 @@
\fi%
}
\def\pst@object#1{%
+ \def\pst@par{}%
\pst@ifstar{%
\@ifnextchar[{\pst@@object{#1}}{\@nameuse{#1@i}}}%
}
\def\pst@@object#1[#2]{%
\def\pst@par{#2}%
- \@ifnextchar+{\@nameuse{#1@i}}{\@nameuse{#1@i}}}
+ \@ifnextchar+{\@nameuse{#1@i}}{\@nameuse{#1@i}}%
+}
\def\newpsobject#1#2#3{%
\@ifundefined{#2@i}%
{\@pstrickserr{Graphics object `#2' not defined}\@eha}{%
\@namedef{#1}{\pst@object{#1}}%
\@namedef{#1@i}{\addbefore@par{#3}\@nameuse{#2@i}}}%
\ignorespaces}
+%
\def\pst@getarrows#1{\@ifnextchar({#1}{\pst@@getarrows{#1}}}
% ------------------------- hv 1.10 beg ------------------------
%\def\pst@@getarrows#1#2{\addto@par{arrows=#2}#1}
@@ -1660,11 +1661,11 @@
\def\pst@linetype{1}%
\end@ClosedObj}
\def\psset@dotsize#1{%
-\pst@expandafter\pst@getdimnum{#1} 0 {} {}\@nil
-\edef\psk@@dotsize{\pst@number\pst@dimg}%
-\let\psk@@@dotsize\pst@tempg
-\edef\psk@dotsize{%
- /DS \psk@@dotsize \psk@@@dotsize CLW mul add 2 div def }}
+ \pst@expandafter\pst@getdimnum{#1} 0 {} {}\@nil%
+ \edef\psk@@dotsize{\pst@number\pst@dimg}%
+ \let\psk@@@dotsize\pst@tempg%
+ \edef\psk@dotsize{%
+ /DS \psk@@dotsize \psk@@@dotsize CLW mul add 2 div def }}
\psset@dotsize{2pt 2}
\def\psset@dotscale#1{%
\pst@getscale{#1}\psk@dotscale
@@ -1728,29 +1729,26 @@
\begin@SpecialObj%
\pst@getcoors[\psdots@ii}
\def\psdots@ii{%
- \addto@pscode{false \tx@NArray \psdots@iii}%
+ \addto@pscode{ false \tx@NArray \psdots@iii }%
\end@SpecialObj}
\def\psdots@iii{%
\psk@dotsize
\@nameuse{psds@\psk@dotstyle}
newpath
- n { transform floor .5 add exch floor .5 add exch itransform Dot } repeat}
+ n { transform floor .5 add exch floor .5 add exch itransform Dot } repeat }
%
% DG: dead code (to suppress until \psset@dotstyle) ? - Aug. 4, 1997
\def\tx@SQ{SQ }
\def\tx@ST{ST }
\def\tx@SP{SP }
%
-\def\pst@gdot#1{/Dot { gsave T \psk@dotangle \psk@dotscale #1 grestore } def }
+\def\pst@gdot#1{ /Dot { gsave T \psk@dotangle \psk@dotscale #1 grestore } def }
%
-\@namedef{psds@*}{\pst@gdot{0 0 DS \tx@SD}}
+\@namedef{psds@*}{\pst@gdot{ 0 0 DS \tx@SD }}
\@namedef{psds@o}{%
/r2 DS CLW sub def
- \pst@gdot{0 0 DS \tx@SD \pst@usecolor\psfillcolor SLW
- 0 0 r2 \tx@SD}}
-\@namedef{psds@square*}{%
- /r1 DS .886 mul def
- \pst@gdot{r1 \tx@SQ}}
+ \pst@gdot{ 0 0 DS \tx@SD \pst@usecolor\psfillcolor SLW 0 0 r2 \tx@SD }}
+\@namedef{psds@square*}{ /r1 DS .886 mul def \pst@gdot{r1 \tx@SQ }}
\@namedef{psds@square}{%
/r1 DS .886 mul def /r2 r1 CLW sub def
\pst@gdot{r1 \tx@SQ \pst@usecolor\psfillcolor r2 \tx@SQ}}