diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic/pstricks/pstricks.tex')
| -rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 49 |
1 files changed, 31 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex index dcb89080527..c13f0f0ff6b 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.22} -\def\filedate{2008/04/14} +\def\fileversion{1.23} +\def\filedate{2008/05/23} % \csname PSTricksLoaded\endcsname \let\PSTricksLoaded\endinput @@ -581,6 +581,7 @@ \endgroup% \let\pst@coor\pst@tempg% } +% \def\polar@coor#1#2{% % \pssetlength\pst@dimg{#1}% \pssetlength\pst@dimb{#1}% hv 2007-10-16 g is already used in get@@angle @@ -588,17 +589,21 @@ % \edef\pst@coor{\pst@number\pst@dimg \pst@angle \tx@PtoC}% dito \edef\pst@coor{\pst@number\pst@dimb \pst@angle \tx@PtoC}% } +% \def\raw@coor#1;#2\@nil{% PostScript code \edef\pst@coor{% - #1 \pst@number\psyunit mul exch \pst@number\psxunit mul exch }% -} -\def\alg@coor#1 #2;#3\@nil{% algebraic PostScript code + #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 \edef\pst@coor{% - /x #1 def +% #1 /yArg exch def /x exch def + /x #1 def +% /yArg load 200 string cvs /Arg exch def /Func (#2) AlgParser cvx def x Func - \pst@number\psyunit mul exch \pst@number\psxunit mul exch }% -} + \pst@number\psyunit mul exch \pst@number\psxunit mul exch }} +% \def\node@coor#1\@nil{% \@pstrickserr{You must load `pst-node.tex' to use node coordinates.}\@ehps \def\pst@coor{0 0 }% @@ -779,12 +784,13 @@ /Screen \or /Multiply %\or % /Hardlight + \else + /Normal \fi .setblendmode \psk@shapealpha .setshapealpha > % %--------------------------------- hv 2007-09-09 begin --------------------- % transparency needs a run through latex -> dvips -> ps2pdf14(!) -% use transpalpha=<mumber> to the the opacity level % \def\psset@fillcolor#1{\pst@getcolor{#1}\psfillcolor} \psset@fillcolor{white} @@ -883,7 +889,7 @@ \def\psk@arrowA{} \def\psk@arrowB{} %\def\pst@arrowtable{,<->,<<->>,>-<,>>-<<,(-),[-]} -\def\pst@arrowtable{,<->,<<->>,>-<,>>-<<,(-),[-],)-(,]-[,|>-<|,<D-D>,<D<D-D>D>} % hv --1.16 +\def\pst@arrowtable{,<->,<<->>,>-<,>>-<<,(-),[-],)-(,]-[,|>-<|,<D-D>,D>-<D,<D<D-D>D>} % hv --1.16 \begingroup \catcode`\<=13 \catcode`\>=13 @@ -1626,6 +1632,7 @@ \edef\psk@dotangle{\psk@@dotangle rotate }% % DG/SR modification end \fi} +% \psset@dotangle{0} \def\pst@getdotsize{% \pst@dimg=\psk@@@dotsize\pslinewidth @@ -1637,6 +1644,7 @@ % DG/SR modification begin - Oct. 17, 1997 - Patch 5 \psset@dotscale{1} % DG/SR modification end +% \def\psdot{\pst@object{psdot}} \def\psdot@i{\@ifnextchar({\psdot@ii}{\psdot@ii(\z@,\z@)}} \def\psdot@ii(#1){% @@ -1650,6 +1658,7 @@ \@nameuse{psds@\psk@dotstyle}% \pst@coor Dot}% \end@SpecialObj} +% \def\psdots{\pst@object{psdots}} \def\psdots@i{% \begin@SpecialObj% @@ -1716,19 +1725,19 @@ /Dot { moveto gsave \psk@dotscale #4 show grestore } bind def }} % DG/SR modification end -\def\newpsfontdotH#1[#2]#3#4#5{% +\def\newpsfontdotH#1[#2]#3#4#5{% for filled objects \@namedef{psds@#1}{% /#3 \psk@@dotangle [#2] \tx@FontDot /Dot { moveto - \iftrue +% \iftrue % DG/SR modification begin - Dec. 23, 1999 - Patch 14 %gsave \pst@usecolor\psfillcolor #5 show grestore %\fi %#4 show - gsave \psk@dotscale \pst@usecolor\psfillcolor #5 show grestore - \fi - gsave \psk@dotscale #4 show grestore + gsave \psk@dotscale \pst@usecolor\psfillcolor #5 show grestore % fill first +% \fi + gsave \psk@dotscale #4 show grestore % show the unfilled one % DG/SR modification end } bind def }} @@ -1781,9 +1790,16 @@ \newpsfontdot{Asterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(k)} \newpsfontdot{BoldAsterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(K)} \newpsfontdotH{SolidAsterisk}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(J)}{(b)} +% +\newpsfontdotH{Pentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(p)}{(q)} +\newpsfontdotH{BoldPentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(P)}{(q)} +\newpsfontdot{SolidPentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(q)} \newpsfontdotH{Hexagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(h)}{(G)} \newpsfontdotH{BoldHexagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(H)}{(G)} \newpsfontdot{SolidHexagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(G)} +\newpsfontdotH{Octogon}[1 0 0 1 0 0]{PSTricksDotFont}{(f)}{(g)} +\newpsfontdotH{BoldOctogon}[1 0 0 1 0 0]{PSTricksDotFont}{(F)}{(g)} +\newpsfontdot{SolidOctogon}[1 0 0 1 0 0]{PSTricksDotFont}{(g)} % \newpsfontdot{Bullet}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(b)} \newpsfontdotH{Circle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(c)}{(b)} @@ -1795,9 +1811,6 @@ \newpsfontdotH{Square}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(s)}{(r)} \newpsfontdotH{BoldSquare}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(S)}{(r)} \newpsfontdot{SolidSquare}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(r)} -\newpsfontdotH{Pentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(p)}{(q)} -\newpsfontdotH{BoldPentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(P)}{(q)} -\newpsfontdot{SolidPentagon}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(q)} \newpsfontdot{Add}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(a)} \newpsfontdot{BoldAdd}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(A)} \newpsfontdot{Mul}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(x)} |