summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-06-05 23:33:30 +0000
committerKarl Berry <karl@freefriends.org>2010-06-05 23:33:30 +0000
commit9781545424b21ca99a7a8a7b669433733488e6b0 (patch)
tree0efb58df43a69fce31c252d647c8dc8762eb3c1b /Master/texmf-dist/tex/generic
parent0bbc7abe057dfa3e5955f66f2cee744ad99d6df5 (diff)
pstricks 2.07 (5jun10)
git-svn-id: svn://tug.org/texlive/trunk@18760 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex101
1 files changed, 57 insertions, 44 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index e46fe6e679b..52d3f97566e 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -65,8 +65,8 @@
\pst@addfams{pstricks}
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi
%
-\def\fileversion{2.05}
-\def\filedate{2010/04/26}
+\def\fileversion{2.07}
+\def\filedate{2010/05/24}
%
% stolen from latex.ltx to make it TeX compatible
\newcount\psLoopIndex
@@ -246,15 +246,14 @@
\fi%
}
\def\pst@getydimdim#1 #2 #3\@nil{%
- \def\pst@tempA{#2}
+ \def\pst@tempA{#2}%
\ifx\pst@tempA\@empty
- \pssetylength\pst@dimn{#1}
- \pst@dimm=\z@
+ \pssetylength\pst@dimn{#1}%
+ \pst@dimm=\z@%
\else
\pssetylength\pst@dimm{#1}%
\pssetylength\pst@dimn{#2}%
- \fi%
-}
+ \fi}
%
% A modulo macro for integer values
% \pst@mod{34}{6}\value ==> \value is 4
@@ -1987,10 +1986,8 @@
\newpsfontdotH{Bpentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(P)}{(q)}
\newpsfontdot{pentagon*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(q)}
% DG/SR modification begin - Mar. 18, 1997 and Dec. 16, 1999 - Patch 14
-%\newpsfontdot{diamond*}%
-%[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{Symbol}{<E0>}
-%\newpsfontdot{diamond}%
-%[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{Symbol}{<A8>}
+%\newpsfontdot{diamond*}[1.9 0.0 0.0 1.9 -0.4598 -0.70775]{Symbol}{<E0>}
+%\newpsfontdot{diamond}[2.3 0.0 0.0 2.3 -0.8533 -0.5336]{Symbol}{<A8>}
% D.G. modification begin - Jan. 17, 2000
\newpsfontdotH{diamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(d)}{(l)}
\newpsfontdotH{Bdiamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(D)}{(l)}
@@ -2071,7 +2068,7 @@
}
\def\psline@ii{%
\ifx\pslinestyle\psls@@symbol\addto@pscode{ \psls@symbol SymbolLine }%
- \else
+ \else%
\addto@pscode{
\pst@cp % current point
\psline@iii % arc and lineto type
@@ -2080,7 +2077,7 @@
\fi%
\end@OpenObj%
}
-\def\psline@iii{%
+\def\psline@iii{
\ifdim\pslinearc>\z@
/r \pst@number\pslinearc def
/Lineto { \tx@Arcto } def
@@ -2093,24 +2090,25 @@
%
\def\pst@isnum#1{\pst@isnum@i\zap@space#1 \@empty\@nil}%
\def\pst@isnum@i#1\@nil{%
- \if!\ifnum9<1#1!\else_\fi
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi
-}
+ \if!\ifnum9<1#1!\else_\fi%
+ \expandafter\@firstoftwo%
+ \else%
+ \expandafter\@secondoftwo%
+ \fi}
+%
\def\psset@@symbol#1#2#3#4\@nil{%
\ifx\relax#4\relax\def\psk@symbol{(#1)}%
- \else
+ \else%
\pst@isnum{#1#2#3}{%
- \pst@cnta='#1#2#3\relax
- \ifnum\pst@cnta>'377\relax
- \@pstrickserr{Number too large!}\@ehpb
- \else
+ \pst@cnta='#1#2#3\relax%
+ \ifnum\pst@cnta>'377\relax%
+ \@pstrickserr{Number too large!}\@ehpb%
+ \else%
\def\psk@symbol{(\@backslashchar#1#2#3)}%
\fi%
- }{\@pstrickserr{Not a number!}\@ehpb}
+}{\@pstrickserr{Not a number!}\@ehpb}%
\fi}
+%
\define@key[psset]{pstricks}{symbol}[a]{\expandafter\psset@@symbol#1!!\@nil}
\psset[pstricks]{symbol=a}
%
@@ -3474,23 +3472,21 @@ pop
\pst@rotate\psk@rot\pst@hbox%
\psput@{#1}\pst@hbox%
\endgroup%
- \ignorespaces%
-}
+ \ignorespaces}
+%
\def\multirput{%
\def\pst@par{}%
- \pst@ifstar{\@ifnextchar[{\multirput@i}{\multirput@ii}}%
-}
+ \pst@ifstar{\@ifnextchar[{\multirput@i}{\multirput@ii}}}
\def\multirput@i[#1]{\addto@par{ref={#1}}\multirput@ii}
\def\multirput@ii{\@ifnextchar({\multirput@iv}{\multirput@iii}}
\def\multirput@iii#1{\addto@par{rot={#1}}\multirput@iv}
\def\multirput@iv(#1){%
- \@ifnextchar({\multirput@v(#1)}{\multirput@v(\z@,\z@)(#1)}%
-}
+ \@ifnextchar({\multirput@v(#1)}{\multirput@v(\z@,\z@)(#1)}}
\def\multirput@v(#1,#2)(#3,#4)#5{%
- \pst@makebox{\multirput@vi(#1,#2)(#3,#4){#5}}%
-}
+ \pst@makebox{\multirput@vi(#1,#2)(#3,#4){#5}}}
\def\multirput@vi(#1,#2)(#3,#4)#5{%
- \pst@killglue
+ \pst@killglue%
+ \global\psLoopIndex=\@ne\relax
\begingroup
\use@par
\if@star\pst@starbox\fi
@@ -3501,7 +3497,6 @@ pop
\pssetxlength\pst@dimc{#3}%
\pssetylength\pst@dimd{#4}%
\pst@cntg=#5\relax
- \pst@cnth=\@ne
\leavevmode
\loop
\vbox to \z@{%
@@ -3509,12 +3504,12 @@ pop
\hbox to \z@{\kern\pst@dima\copy\pst@hbox\hss}%
\vskip\pst@dimb%
}%
- \ifnum\pst@cntg>\pst@cnth
+ \ifnum\pst@cntg>\psLoopIndex
\advance\pst@dima\pst@dimc
\advance\pst@dimb\pst@dimd
- \advance\pst@cnth\@ne
+ \global\advance\psLoopIndex by \@ne
\repeat
- \endgroup
+ \endgroup
\ignorespaces%
}
\newif\if@fixedradius
@@ -3546,15 +3541,31 @@ pop
\psset[pstricks]{labelsep=5pt}
\define@key[psset]{pstricks}{refangle}[0]{\pst@expandafter\psset@@refangle{#1}\@nil}
\def\psset@@refangle#1\@nil{%
- \def\ps@next##1@#1=##2"##3@##4\@nil{%
+ \def\next##1@#1=##2"##3@##4\@nil{%
\ifx\relax##2%
\pst@getangle{#1}\psk@refangle
\def\psk@uputref{}%
\else
\def\psk@refangle{##2 }%
\def\psk@uputref{##3}%
- \fi}%
- \expandafter\ps@next\pst@refangletable @#1=\relax"@\@nil}
+ \fi%
+ \pst@Verb{ gsave STV CP T /ps@refangle \psk@refangle\space def grestore }}%ADDED (MJS)
+%
+\expandafter\next\pst@refangletable @#1=\relax"@\@nil}
+% Fix \uput@vii
+\def\uput@vii#1#2{%
+ \edef\pst@coor{%
+ \pst@number\pslabelsep
+ #2%
+ \pst@number{\wd\pst@hbox}%
+ \pst@number{\ht\pst@hbox}%
+ \pst@number{\dp\pst@hbox}%
+ ps@refangle % CHANGED (MJS) FROM \psk@refangle\space
+ \ifx\psk@rot\@empty\else\psk@rot\space sub \fi
+ \tx@Uput #1}%
+ \setbox\pst@hbox=\hbox to\z@{\hss\vbox to\z@{\vss\box\pst@hbox\vss}\hss}%
+ \setbox\pst@hbox=\psput@special\pst@hbox
+ \ifx\psk@rot\@empty\else\pst@rotate\psk@rot\pst@hbox\fi}
%
\def\pst@refangletable{%
@r=0"20%
@@ -3593,17 +3604,19 @@ pop
\ifx\psk@rot\@empty\expandafter\uput@viii\psk@uputref%
\else\uput@vii\tx@UUput{}\fi%
\fi}
+% Fix \uput@vii
\def\uput@vii#1#2{%
\edef\pst@coor{
\pst@number\pslabelsep
- #2%
+ #2
\pst@number{\wd\pst@hbox}
\pst@number{\ht\pst@hbox}
\pst@number{\dp\pst@hbox}
- \psk@refangle\space \ifx\psk@rot\@empty\else\psk@rot\space sub \fi
+ ps@refangle % CHANGED (MJS) FROM \psk@refangle\space
+ \ifx\psk@rot\@empty\else\psk@rot\space sub \fi
\tx@Uput #1}%
\setbox\pst@hbox=\hbox to\z@{\hss\vbox to\z@{\vss\box\pst@hbox\vss}\hss}%
- \setbox\pst@hbox=\psput@special\pst@hbox%
+ \setbox\pst@hbox=\psput@special\pst@hbox
\ifx\psk@rot\@empty\else\pst@rotate\psk@rot\pst@hbox\fi}
%
\def\uput@viii#1#2{%