pstricks 1.15

git-svn-id: svn://tug.org/texlive/trunk@2850 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 74 insertions, 40 deletions

diff --git a/Master/texmf-dist/tex/generic/pstricks/Changes b/Master/texmf-dist/tex/generic/pstricks/Changes
index 7cea60d5129..44dded9a69e 100644
--- a/Master/texmf-dist/tex/generic/pstricks/Changes
+++ b/Master/texmf-dist/tex/generic/pstricks/Changes
@@ -1,4 +1,5 @@
 pstricks.tex --------
+1.15  2006-12-19  - add support for more dot styles (from Etienne Riga) 
 1.14c 2006-04-29  - add option linecap for dashed lines 
 1.14b 2006-04-20  - fix a bug in \psset@linetype 
 1.14a 2006-02-06  - revert the changes for pslongbox (introduced bug)
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index f9fa9535fcf..ca6bde41f9b 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-2005 Herbert Voss
+%% Copyright 2004-2006 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.14c}
-\def\filedate{2006/04/29}
+\def\fileversion{1.15}
+\def\filedate{2006/12/19}
 %
 \csname PSTricksLoaded\endcsname
 \let\PSTricksLoaded\endinput
@@ -334,20 +334,16 @@
 %
 \def\newgray#1#2{%
   \pst@checknum{#2}\pst@tempg
-  \@newcolor{#1}{\pst@tempg setgray}%
-}
+  \@newcolor{#1}{\pst@tempg setgray}}
 \def\newrgbcolor#1#2{%
   \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil
-  \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi setrgbcolor}%
-}
+  \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi setrgbcolor}}
 \def\newhsbcolor#1#2{%
   \pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil
-  \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi sethsbcolor}%
-}
+  \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi sethsbcolor}}
 \def\newcmykcolor#1#2{%
   \pst@expandafter\pst@getnumiv{#2} {} {} {} {} {}\@nil
-  \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi \pst@tempj setcmykcolor}%
-}
+  \@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi \pst@tempj setcmykcolor}}
 \newgray{black}{0}
 \newgray{darkgray}{.25}
 \newgray{gray}{.5}
@@ -1467,7 +1463,7 @@ grestore}}
 \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 }}
+  /DS \psk@@dotsize \psk@@@dotsize CLW mul add 2 div def }}
 \psset@dotsize{2pt 2}
 \def\psset@dotscale#1{%
 \pst@getscale{#1}\psk@dotscale
@@ -1542,48 +1538,49 @@ n { transform floor .5 add exch floor .5 add exch itransform Dot } repeat}
 \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@o}{%
-/r2 DS CLW sub def
-\pst@gdot{0 0 DS \tx@SD \pst@usecolor\psfillcolor 0 0 r2 \tx@SD}}
+  /r2 DS CLW sub def
+  \pst@gdot{0 0 DS \tx@SD \pst@usecolor\psfillcolor 0 0 r2 \tx@SD}}
 \@namedef{psds@square*}{%
-/r1 DS .886 mul def
-\pst@gdot{r1 \tx@SQ}}
+  /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}}
+  /r1 DS .886 mul def /r2 r1 CLW sub def
+  \pst@gdot{r1 \tx@SQ \pst@usecolor\psfillcolor r2 \tx@SQ}}
 \@namedef{psds@triangle*}{%
-/y1 DS .778 mul neg def /x1 y1 1.732 mul neg def
-\pst@gdot{x1 y1 \tx@ST}}
+  /y1 DS .778 mul neg def /x1 y1 1.732 mul neg def
+  \pst@gdot{x1 y1 \tx@ST}}
 \@namedef{psds@triangle}{%
-/y1 DS .778 mul neg def /x1 y1 1.732 mul neg def
-/y2 y1 CLW add def /x2 y2 1.732 mul neg def
-\pst@gdot{x1 y1 \tx@ST \pst@usecolor\psfillcolor x2 y2 \tx@ST}}
+  /y1 DS .778 mul neg def /x1 y1 1.732 mul neg def
+  /y2 y1 CLW add def /x2 y2 1.732 mul neg def
+  \pst@gdot{x1 y1 \tx@ST \pst@usecolor\psfillcolor x2 y2 \tx@ST}}
 \@namedef{psds@pentagon*}{%
-/r1 DS 1.149 mul def
-\pst@gdot{r1 \tx@SP}}
+  /r1 DS 1.149 mul def
+  \pst@gdot{r1 \tx@SP}}
 \@namedef{psds@pentagon}{%
-DS .93 mul dup 1.236 mul /r1 ED CLW sub 1.236 mul /r2 ED
-\pst@gdot{r1 \tx@SP \pst@usecolor\psfillcolor r2 \tx@SP}}
+  DS .93 mul dup 1.236 mul /r1 ED CLW sub 1.236 mul /r2 ED
+  \pst@gdot{r1 \tx@SP \pst@usecolor\psfillcolor r2 \tx@SP}}
 \@namedef{psds@+}{%
-/DS DS 1.253 mul def
-\pst@gdot{DS 0 moveto DS neg 0 L stroke 0 DS moveto 0 DS neg L stroke}}
+  /DS DS 1.253 mul def
+  \pst@gdot{DS 0 moveto DS neg 0 L stroke 0 DS moveto 0 DS neg L stroke}}
 \@namedef{psds@|}{%
-\psk@tbarsize CLW mul add 2 div /DS ED
-\pst@gdot{0 DS moveto 0 DS neg L stroke}}
+  \psk@tbarsize CLW mul add 2 div /DS ED
+  \pst@gdot{0 DS moveto 0 DS neg L stroke}}
 % DG: end dead code?
+%
 \def\psset@dotstyle#1{%
 \@ifundefined{psds@#1}%
 {\@pstrickserr{Dot style `#1' not defined}\@eha}%
 {\edef\psk@dotstyle{#1}}}
 \psset@dotstyle{*}
+%
 \def\tx@FontDot{FontDot }
 \def\newpsfontdot#1[#2]#3#4{%
   \@namedef{psds@#1}{%
     /#3 \psk@@dotangle [#2] \tx@FontDot
 % DG/SR modification begin - Dec. 12, 1999 - Patch 14
 %/Dot { moveto #4 show } bind def }}
-   /Dot { moveto gsave \psk@dotscale #4 show grestore } bind def 
-  }%
-}
+    /Dot { moveto gsave \psk@dotscale #4 show grestore } bind def 
+}}
 % DG/SR modification end
 \def\newpsfontdotH#1[#2]#3#4#5{%
   \@namedef{psds@#1}{%
@@ -1600,8 +1597,8 @@ DS .93 mul dup 1.236 mul /r1 ED CLW sub 1.236 mul /r2 ED
       gsave \psk@dotscale #4 show grestore
 % DG/SR modification end
     } bind def 
-  }%
-}
+}}
+%
 \pstheader{pst-dots.pro}
 \newpsfontdot{*}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(b)}
 \newpsfontdotH{o}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(c)}{(b)}
@@ -1632,21 +1629,57 @@ DS .93 mul dup 1.236 mul /r1 ED CLW sub 1.236 mul /r2 ED
 \newpsfontdot{asterisk}[2.43309 0.0 0.0 2.43309 -0.609489 -1.14477]{Times-Roman}{<2A>}
 \newpsfontdot{B+}[2.3 0.0 0.0 2.3 -0.6555 -0.5819]{Times-Bold}{<2B>}
 \newpsfontdot{Basterisk}[2.29358 0.0 0.0 2.29358 -0.576835 -1.08486]{Times-Bold}{<2A>}
-\newpsfontdot{|}%
+\newpsfontdot{|}[1.98413 0.0 0.0 1.38 -0.258929 -0.5]{Helvetica}{(|)}
 % DG/SR modification begin - Oct. 27, 1997 - Patch 7
 %[1.98413 0.0 0.0 1.98413 -0.258929 -0.712302]{Helvetica}{(|)}
-[1.98413 0.0 0.0 1.38 -0.258929 -0.5]{Helvetica}{(|)}
 % DG/SR modification end
-\newpsfontdot{B|}%
+\newpsfontdot{B|}[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{Helvetica-Bold}{(|)}%
 % DG/SR modification begin - Oct. 27, 1997 - Patch 7
 %[1.98413 0.0 0.0 1.98413 -0.277778 -0.78302]{Helvetica-Bold}{(|)}
-[1.98413 0.0 0.0 1.38 -0.277778 -0.5]{Helvetica-Bold}{(|)}
+
 % DG/SR modification end
 \iffalse
 \newpsfontdot{*}[2.77778 0.0 0.0 2.77778 -0.638889 -0.813889]{Symbol}{<B7>}
 \newpsfontdot{o}[3.33333 0.0 0.0 3.33333 -0.666667 -1.78167]{Symbol}{<B0>}
 \newpsfontdot{Bo}[4.69484 0.0 0.0 4.69484 -0.78169 -2.97418]{Times-Bold}{<CA>}
 \fi
+% Etienne Riga
+\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{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)}
+%
+\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)}
+\newpsfontdotH{BoldCircle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(C)}{(b)}
+%\newpsfontdot{SolidCircle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(u)}
+\newpsfontdotH{Triangle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(t)}{(u)}
+\newpsfontdotH{BoldTriangle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(T)}{(u)}
+\newpsfontdot{SolidTriangle}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(u)}
+\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)}
+\newpsfontdot{BoldMul}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(X)}
+\newpsfontdotH{Oplus}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(m)}{(b)}
+\newpsfontdotH{BoldOplus}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(M)}{(b)}
+\newpsfontdotH{SolidOplus}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(e)}{(b)}
+\newpsfontdotH{Otimes}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(n)}{(b)}
+\newpsfontdotH{BoldOtimes}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(N)}{(b)}
+\newpsfontdotH{SolidOtimes}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(E)}{(b)}
+\newpsfontdot{Bar}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(i)}
+\newpsfontdot{BoldBar}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(I)}
+\newpsfontdotH{Diamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(d)}{(l)}
+\newpsfontdotH{BoldDiamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(D)}{(l)}
+\newpsfontdot{SolidDiamond}[1.0 0.0 0.0 1.0 0.0 0.0]{PSTricksDotFont}{(l)}
+%%
 \newdimen\pslinearc
 \def\psset@linearc#1{\pssetlength\pslinearc{#1}}
 \psset@linearc{0pt}