pstricks 1.15

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

3 files changed, 127 insertions, 103 deletions

diff --git a/Master/texmf-dist/dvips/pstricks/Changes b/Master/texmf-dist/dvips/pstricks/Changes
index e93b5fb61ae..2974ffd99ce 100644
--- a/Master/texmf-dist/dvips/pstricks/Changes
+++ b/Master/texmf-dist/dvips/pstricks/Changes
@@ -10,4 +10,7 @@
 
 
 ---- pst-text.pro
-1.00  2005-11-29  (hv) add a patch for japanese text
\ No newline at end of file
+1.00  2005-11-29  (hv) add a patch for japanese text
+
+---- pst-dots.pro
+2.00  2006-12-19  add more dot symbols from Etienne Riga (hv) 
diff --git a/Master/texmf-dist/dvips/pstricks/pst-dots.pro b/Master/texmf-dist/dvips/pstricks/pst-dots.pro
index 8c83b963525..e8297d814e0 100644
--- a/Master/texmf-dist/dvips/pstricks/pst-dots.pro
+++ b/Master/texmf-dist/dvips/pstricks/pst-dots.pro
@@ -1,16 +1,23 @@
-%!PS-Adobe-2.0
-%%Title: Dot Font for PSTricks
-%%Creator: Timothy Van Zandt <tvz@Princeton.EDU>
-%%Creation Date: May 7, 1993
-%% Version 97 patch 1, 99/12/16
-%% Modified by Etienne Riga <etienne.riga@skynet.be> - Dec. 16, 1999
+%!
+%% PostScript prologue for pstricks.tex.
+%% Version 2.00,                                    Suggestion of 2006/12/19
+%% For distribution, see pstricks.tex.
+%%
+%% Timothy Van Zandt <tvz@Princeton.EDU>
+%%
+%% Modified by Etienne Riga  - Dec. 16, 1999
+%% Modified by Herbert Voss (hv) - 2004/12/27 
+%% Modified by Etienne Riga  - 2005/01/01 (er)
 %% to add /Diamond, /SolidDiamond and /BoldDiamond
+%
 10 dict dup begin
   /FontType 3 def
-  /FontMatrix [ .001 0 0 .001 0 0 ] def
-  /FontBBox [ 0 0 0 0 ] def
+  /FontMatrix [.001 0 0 .001 0 0] def
+  /FontBBox [-571.5 -742.5 571.5 742.5] def
+%  /FontBBox [-1000 -1000 1000 1000] def
+%                See end of file in /BuildGlyph
   /Encoding 256 array def
-  0 1 255 { Encoding exch /.notdef put } for
+  0 1 255 {Encoding exch/.notdef put} for
   Encoding
     dup (b) 0 get /Bullet put
     dup (c) 0 get /Circle put
@@ -24,101 +31,111 @@
     dup (q) 0 get /SolidPentagon put
     dup (p) 0 get /Pentagon put
     dup (P) 0 get /BoldPentagon put
-% DG/SR modification begin - Dec. 16, 1999 - From Etienne Riga
+%%%		  
+    dup (k) 0 get /Asterisk put
+    dup (K) 0 get /BoldAsterisk put
+    dup (J) 0 get /SolidAsterisk put
+    dup (h) 0 get /Hexagon put
+    dup (H) 0 get /BoldHexagon put
+    dup (G) 0 get /SolidHexagon put
+    dup (a) 0 get /Add put
+    dup (A) 0 get /BoldAdd put
+    dup (x) 0 get /Mul put
+    dup (X) 0 get /BoldMul put
+    dup (m) 0 get /Oplus put
+    dup (M) 0 get /BOplus put
+    dup (e) 0 get /SolidOplus put
+    dup (n) 0 get /Otimes put
+    dup (N) 0 get /BOtimes put
+    dup (E) 0 get /SolidOtimes put
+    dup (i) 0 get /Bar put
+    dup (I) 0 get /BoldBar put
     dup (l) 0 get /SolidDiamond put
     dup (d) 0 get /Diamond put
         (D) 0 get /BoldDiamond put
-% DG/SR modification end
-  /Metrics 13 dict def
-  Metrics begin
-    /Bullet        1000   def
-    /Circle        1000   def
-    /BoldCircle    1000   def
-    /SolidTriangle 1344   def
-    /Triangle      1344   def
-    /BoldTriangle  1344   def
-    /SolidSquare    886   def
-    /Square         886   def
-    /BoldSquare     886   def
-    /SolidPentagon 1093.2 def
-    /Pentagon      1093.2 def
-    /BoldPentagon  1093.2 def
-% DG/SR modification begin - Dec. 16, 1999 - From Etienne Riga
-    /SolidDiamond  1008   def
-    /Diamond       1008   def
-    /BoldDiamond   1008   def
-% DG/SR modification end
-    /.notdef 0 def
-  end
-  /BBoxes 13 dict def
-  BBoxes begin
-    /Circle        { -550 -550 550 550 } def
-    /BoldCircle    /Circle load def
-    /Bullet        /Circle load def
-    /Triangle      { -571.5 -330 571.5 660 } def
-    /BoldTriangle  /Triangle load def
-    /SolidTriangle /Triangle load def
-    /Square        { -450 -450 450 450 } def
-    /BoldSquare    /Square load def
-    /SolidSquare   /Square load def
-    /Pentagon      { -546.6 -465 546.6 574.7 } def
-    /BoldPentagon  /Pentagon load def
-    /SolidPentagon /Pentagon load def
-% DG/SR modification begin - Dec. 16, 1999 - From Etienne Riga
-    /Diamond       { -428.5 -742.5 428.5 742.5 } def
-    /BoldDiamond   /Diamond load def
-    /SolidDiamond  /Diamond load def
-% DG/SR modification end
-    /.notdef { 0 0 0 0 } def
-  end
-  /CharProcs 20 dict def
+%%%  
+/CharProcs 47 dict def
   CharProcs begin
-    /Adjust {
-      2 copy dtransform floor .5 add exch floor .5 add exch idtransform
-      3 -1 roll div 3 1 roll exch div exch scale
-    } def
-    /CirclePath    { 0 0 500 0 360 arc closepath } def
-    /Bullet        { 500 500 Adjust CirclePath fill } def
-    /Circle        { 500 500 Adjust CirclePath .9 .9 scale CirclePath
-                     eofill } def
-    /BoldCircle    { 500 500 Adjust CirclePath .8 .8 scale CirclePath
-                     eofill } def
-    /BoldCircle    { CirclePath .8 .8 scale CirclePath eofill } def
-    /TrianglePath  { 0  660 moveto -571.5 -330 lineto 571.5 -330 lineto
-                     closepath } def
-    /SolidTriangle { TrianglePath fill } def
-    /Triangle      { TrianglePath .85 .85 scale TrianglePath eofill } def
-    /BoldTriangle  { TrianglePath .7 .7 scale TrianglePath eofill } def
-    /SquarePath    { -450 450 moveto 450 450 lineto 450 -450 lineto
-                     -450 -450 lineto closepath } def
-    /SolidSquare   { SquarePath fill } def
-    /Square        { SquarePath .89 .89 scale SquarePath eofill } def
-    /BoldSquare    { SquarePath .78 .78 scale SquarePath eofill } def
-    /PentagonPath  {
-      -337.8 -465   moveto
-       337.8 -465   lineto
-       546.6  177.6 lineto
-         0    574.7 lineto
-      -546.6  177.6 lineto
-      closepath
-    } def
-    /SolidPentagon { PentagonPath fill } def
-    /Pentagon      { PentagonPath .89 .89 scale PentagonPath eofill } def
-    /BoldPentagon  { PentagonPath .78 .78 scale PentagonPath eofill } def
-% DG/SR modification begin - Dec. 16, 1999 - From Etienne Riga
-    /DiamondPath   { 0 742.5 moveto -428.5 0 lineto 0 -742.5 lineto
-                     428.5 0 lineto closepath } def
-    /SolidDiamond  { DiamondPath fill } def
-    /Diamond       { DiamondPath .85 .85 scale DiamondPath eofill } def
-    /BoldDiamond   { DiamondPath .7 .7 scale DiamondPath eofill } def
-% DG/SR modification end
+    /CirclePath {0 0 500 0 360 arc closepath} def
+      /Bullet {CirclePath fill} def
+	  /Circle {CirclePath .9 .9 scale CirclePath eofill} def
+	  /BoldCircle {CirclePath .8 .8 scale CirclePath eofill} def
+    /TrianglePath {0 660 moveto -571.5 -330 lineto 571.5 -330 lineto
+		closepath} def
+	  /SolidTriangle {TrianglePath fill} def
+      /Triangle {TrianglePath .85 .85 scale TrianglePath eofill} def
+      /BoldTriangle {TrianglePath .7 .7 scale TrianglePath eofill} def
+    /SquarePath {-450 450 moveto 450 450 lineto 450 -450 lineto -450 -450 lineto
+		closepath} def
+      /SolidSquare {SquarePath fill} def
+      /Square {SquarePath .89 .89 scale SquarePath eofill} def
+      /BoldSquare {SquarePath .78 .78 scale SquarePath eofill} def
+    /PentagonPath {-337.8 -465 moveto 337.8 -465 lineto 546.6 177.6 lineto
+		0 574.7 lineto -546.6 177.6 lineto closepath} def
+      /SolidPentagon {PentagonPath fill} def
+      /Pentagon {PentagonPath .89 .89 scale PentagonPath eofill} def
+      /BoldPentagon {PentagonPath .78 .78 scale PentagonPath eofill} def
+%-------------- hv begin 2004/07/25   from: er 2003/03/24
+    /HexagonPath {0 550 moveto -476 275 lineto -476 -275 lineto
+		0 -550 lineto 476 -275 lineto 476 275 lineto closepath} def
+      /SolidHexagon {HexagonPath fill} def
+      /Hexagon {HexagonPath .89 .89 scale HexagonPath eofill} def
+      /BoldHexagon {HexagonPath .79 .79 scale HexagonPath eofill} def
+	/AsteriskPath {20 0 moveto 10 250 180 500 0 500 curveto
+		-180 500 -10 250 -20 0 curveto closepath} def
+      /Asterisk {AsteriskPath 60 rotate AsteriskPath 60 rotate AsteriskPath
+	    60 rotate AsteriskPath 60 rotate AsteriskPath 60 rotate AsteriskPath 
+		fill} def
+	/Basterp {50 250 220 500 0 500 curveto
+        -220 500 -50 250 -50 30 cos 100 mul curveto} def
+	/BoldAsteriskPath {50 30 cos 100 mul moveto  Basterp
+                     60 rotate Basterp 60 rotate Basterp
+                     60 rotate Basterp 60 rotate Basterp
+                     60 rotate Basterp closepath} def
+      /BoldAsterisk {BoldAsteriskPath fill} def
+	  /SolidAsterisk {CirclePath .9 .9 scale BoldAsteriskPath eofill} def
+    /CrossPath {40 550 moveto -40 550 lineto -40 40 lineto -550 40 lineto
+        -550 -40 lineto -40 -40 lineto -40 -550 lineto 40 -550 lineto 
+		40 -40 lineto 550 -40 lineto 550 40 lineto 40 40 lineto closepath} def
+    /BoldCrossPath {80 550 moveto -80 550 lineto -80 80 lineto -550 80 lineto
+        -550 -80 lineto -80 -80 lineto -80 -550 lineto 80 -550 lineto 
+		80 -80 lineto 550 -80 lineto 550 80 lineto 80 80 lineto closepath} def
+      /Add {CrossPath fill} def
+      /Mul {45 rotate CrossPath fill} def
+      /BoldAdd {BoldCrossPath fill} def
+      /BoldMul {45 rotate BoldCrossPath fill} def
+	  /Oplus {CirclePath .9 .9 scale CirclePath eofill
+		.775 .775 scale CrossPath  fill} def 
+	  /SolidOplus {CirclePath .775 .775 scale BoldCrossPath eofill} def 
+	  /BOplus {CirclePath .8 .8 scale CirclePath eofill
+		.775 .775 scale BoldCrossPath fill} def 
+	  /Otimes {CirclePath .9 .9 scale CirclePath eofill
+		45 rotate .775 .775 scale CrossPath fill} def 
+	  /BOtimes {CirclePath .8 .8 scale CirclePath eofill
+		45 rotate .775 .775 scale BoldCrossPath  fill } def 
+	  /SolidOtimes {CirclePath 45 rotate .775 .775 scale BoldCrossPath eofill} def 
+    /BarPath {40 660 moveto -40 660 lineto -40 -660 lineto 40 -660 lineto
+		closepath} def
+      /Bar {BarPath fill} def
+    /BoldBarPath {80 660 moveto -80 660 lineto -80 -660 lineto 80 -660 lineto
+		closepath} def
+      /BoldBar {BoldBarPath fill} def
+    /DiamondPath {0 742.5 moveto -428.5 0 lineto 0 -742.5 lineto 
+		428.5 0 lineto closepath} def
+      /SolidDiamond {DiamondPath fill} def
+      /Diamond {DiamondPath .865 .865 scale DiamondPath eofill} def
+      /BoldDiamond {DiamondPath .73 .73 scale DiamondPath eofill} def
+%%%
     /.notdef { } def
   end
   /BuildGlyph {
     exch
     begin
-      Metrics 1 index get exec 0
-      BBoxes 3 index get exec
+%      Metrics 1 index get exec 0
+       0 0
+%      BBoxes 3 index get exec
+      -1000 -1000 1000 1000
+%     -571.5 -742.5 571.5 742.5
       setcachedevice
       CharProcs begin load exec end
     end
@@ -129,4 +146,4 @@
   } bind def
 end
 /PSTricksDotFont exch definefont pop
-%END pst-dots.pro
+
diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro
index 3418879b649..9a527fb6cff 100644
--- a/Master/texmf-dist/dvips/pstricks/pstricks.pro
+++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro
@@ -14,8 +14,8 @@
 /T /translate load def
 /TMatrix { } def
 /RAngle { 0 } def
-/Sqrt { dup 0 lt { pop 0 } { sqrt } ifelse } def% return 0 for negative arguments 
-/Atan { /atan load stopped { pop pop 0 } if } def% return 0 if atan not known
+/Sqrt { dup 0 lt { pop 0 } { sqrt } ifelse } def  % return 0 for negative arguments 
+/Atan { /atan load stopped { pop pop 0 } if } def % return 0 if atan not known
 /ATAN1 {neg -1 atan 180 sub } def		% atan(x) (only one parameter)
 /Div { dup 0 eq { pop } { div } ifelse } def  	% control the division
 /NET { neg exch neg exch T } def	      	% change coordinate system to the negative one		
@@ -138,11 +138,15 @@ CLW moveto } def
 curveto -.35 0 -.85 .5 -1 1 curveto mtrx setmatrix stroke 0 CLW moveto }
 def
 /SD { 0 360 arc fill } def
-/EndDot { { /z DS def } { /z 0 def } ifelse /b ED 0 z DS SD b { 0 z DS
-CLW sub SD } if 0 DS z add CLW 4 div sub moveto } def
+/EndDot { % DS is the dot size 
+  { /z DS def } { /z 0 def } ifelse 
+  /b ED 0 z DS SD b { 0 z DS CLW sub SD } if 
+  0 DS z add CLW 4 div sub moveto } def
+%
 /Shadow { [ { /moveto load } { /lineto load } { /curveto load } {
-/closepath load } /pathforall load stopped { pop pop pop pop CP /moveto
-load } if ] cvx newpath 3 1 roll T exec } def
+  /closepath load } /pathforall load stopped { pop pop pop pop CP /moveto
+  load } if ] cvx newpath 3 1 roll T exec } def
+%
 /NArray { aload length 2 div dup dup cvi eq not { exch pop } if /n exch
 cvi def } def
 /NArray { % holds the coordinates and on top of stack the showpoints boolean