pstricks 1.22 (17apr08)

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

5 files changed, 283 insertions, 169 deletions

diff --git a/Master/texmf-dist/dvips/pstricks/Changes b/Master/texmf-dist/dvips/pstricks/Changes
index d57551e998c..88a7cebf1bf 100644
--- a/Master/texmf-dist/dvips/pstricks/Changes
+++ b/Master/texmf-dist/dvips/pstricks/Changes
@@ -1,4 +1,5 @@
 ---- pstricks.pro
+1.03  2008-04-15  - only some cosmetics to the code
 1.02  2008-01-01  - added the arrowtype D>, sides as curves (ArrowD)
 		  - added the whole algebraic parser stuff
 		  - added function tan := sin cos div
@@ -17,11 +18,12 @@
 97, patch 5  2005-03-08  bugfix for DashLine
 
 
----- pst-node.pro
-1.00  2008-01-01  code formatting (hv)
+---- pst-text.pro
+1.00  2005-11-29  add a patch for japanese text (hv)
 
 
 ---- pst-dots.pro
+2.01  2008-04-18  add some comments to the code (hv) 
 2.00  2006-12-19  add more dot symbols from Etienne Riga (hv) 
 
 
diff --git a/Master/texmf-dist/dvips/pstricks/pst-algparser.pro b/Master/texmf-dist/dvips/pstricks/pst-algparser.pro
index 398a0ecedd7..a859d0a9825 100644
--- a/Master/texmf-dist/dvips/pstricks/pst-algparser.pro
+++ b/Master/texmf-dist/dvips/pstricks/pst-algparser.pro
@@ -1,10 +1,14 @@
 % $Id: pst-algparser.pro 7 2007-12-29 22:21:13Z herbert $
+%%
+%% PostScript prologue for PSTricks algorithm parser
+%% Version 0.01, 2008/01/01
+%%
+%% This program can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License Distributed from CTAN archives
+%% in directory macros/latex/base/lppl.txt.
+%%
+%%-----------------------------------------------------------------------------%
 %
-% PostScript prologue for PSTricks algorithm parser
-% Version 0.01, 2008/01/01
-% For distribution and copyright, see pstricks.tex.   hv@pstricks.de
-%
-%-----------------------------------------------------------------------------%
 /AlgParser { tx@AlgToPs begin AlgToPs end } def  % Dominique Rodriguez
 %
 /tx@CoreAnalyzerDict 100 dict def tx@CoreAnalyzerDict begin
diff --git a/Master/texmf-dist/dvips/pstricks/pst-dots.pro b/Master/texmf-dist/dvips/pstricks/pst-dots.pro
index 2f98b1777e2..c704de559f5 100644
--- a/Master/texmf-dist/dvips/pstricks/pst-dots.pro
+++ b/Master/texmf-dist/dvips/pstricks/pst-dots.pro
@@ -1,28 +1,33 @@
-% $Id: pst-dots.pro 7 2007-12-29 22:21:13Z herbert $
+% $Id: pst-dots.pro 22 2008-04-18 16:03:12Z herbert $
 %
 %% PostScript prologue for pstricks.tex.
-%% Version 2.00,  2006/12/19
+%% Version 2.01,  2008/04/18
+%%
 %% For distribution, see pstricks.tex.
 %%
 %% Timothy Van Zandt <tvz@Princeton.EDU>
 %%
+%% This program can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License Distributed from CTAN archives
+%% in directory macros/latex/base/lppl.txt.
+%%
 %% 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
+%% Modified by Herbert Voss (hv) - 2008/04/17 
 %
-10 dict dup begin
+10 dict dup begin			% hold local
   /FontType 3 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
+%  /FontBBox [-1000 -1000 1000 1000] def  % See end of file in /BuildGlyph
   /Encoding 256 array def
-  0 1 255 {Encoding exch/.notdef put} for
-  Encoding
-    dup (b) 0 get /Bullet put
+  0 1 255 {Encoding exch /.notdef put} for % fill the array with /.notdef
+  Encoding				   % replace with given dot names
+    dup (b) 0 get /Bullet put		   % get the numerical position of b in ASCII
+%					   % and save /Bullet at this place in Encoding 
     dup (c) 0 get /Circle put
-    dup (C) 0 get /BoldCircle put
+    dup (C) 0 get /BoldCircle put	% 67
     dup (u) 0 get /SolidTriangle put
     dup (t) 0 get /Triangle put
     dup (T) 0 get /BoldTriangle put
@@ -40,7 +45,7 @@
     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 (A) 0 get /BoldAdd put 		% 65
     dup (x) 0 get /Mul put
     dup (X) 0 get /BoldMul put
     dup (m) 0 get /Oplus put
@@ -56,95 +61,101 @@
         (D) 0 get /BoldDiamond put
 %%%  
 /CharProcs 47 dict def
-  CharProcs begin
-    /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
+CharProcs begin
+  /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
+  /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
-       0 0
+  /.notdef { } def
+end
+%
+/BuildGlyph {
+  exch
+  begin 		
+%  Metrics 1 index get exec 0
+    0 0
 %      BBoxes 3 index get exec
-      -1000 -1000 1000 1000
+    -1000 -1000 1000 1000
 %     -571.5 -742.5 571.5 742.5
-      setcachedevice
-      CharProcs begin load exec end
-    end
-  } def
-  /BuildChar {
-    1 index /Encoding get exch get
-    1 index /BuildGlyph get exec
-  } bind def
+    setcachedevice
+    CharProcs begin load exec end
+  end
+} def
+%
+/BuildChar {
+  1 index /Encoding get exch get
+  1 index /BuildGlyph get exec
+} bind def
+
 end
 /PSTricksDotFont exch definefont pop
 
+%% end
\ No newline at end of file
diff --git a/Master/texmf-dist/dvips/pstricks/pst-node.pro b/Master/texmf-dist/dvips/pstricks/pst-node.pro
index 85c44dde388..aa9d39dbe0d 100644
--- a/Master/texmf-dist/dvips/pstricks/pst-node.pro
+++ b/Master/texmf-dist/dvips/pstricks/pst-node.pro
@@ -1,11 +1,14 @@
-% $Id: pst-node.pro 7 2007-12-29 22:21:13Z herbert $
-%
-% PostScript prologue for pst-node.tex.
-% Version 1.00, 2008/01/01.
-% For distribution, see pstricks.tex.
+% $Id: pst-node.pro 11 2008-01-24 13:37:27Z herbert $
+%%
+%% PostScript prologue for pst-node.tex.
+%% Version 1.00, 2008/01/01.
+%%
+%% This program can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License Distributed from CTAN archives
+%% in directory macros/latex/base/lppl.txt.
 %
 /tx@NodeDict 400 dict def tx@NodeDict begin
-tx@Dict begin 
+tx@Dict begin 			% from main pstricks dict
  /T /translate load def 
 end
 /NewNode { % on stack: { x y } boolean N@name type InitXnode 
@@ -34,14 +37,23 @@ end
   /NodePos { NodeSep r add dup Cos mul exch Sin mul } def 
 } def
 %
-/GetRnodePos { Cos 0 gt { /dx r NodeSep add def } { /dx l NodeSep sub def
-} ifelse Sin 0 gt { /dy u NodeSep add def } { /dy d NodeSep sub def }
-ifelse dx Sin mul abs dy Cos mul abs gt { dy Cos mul Sin div dy } { dx
-dup Sin mul Cos Div } ifelse } def
-/InitRnode { /Y ED /X ED X sub /r ED /l X neg def Y add neg /d ED Y sub
-/u ED /NodePos { GetRnodePos } def } def
-/DiaNodePos { w h mul w Sin mul abs h Cos mul abs add Div NodeSep add dup
-Cos mul exch Sin mul } def
+/GetRnodePos { 
+  Cos 0 gt { /dx r NodeSep add def } { /dx l NodeSep sub def } ifelse 
+  Sin 0 gt { /dy u NodeSep add def } { /dy d NodeSep sub def } ifelse 
+  dx Sin mul abs dy 
+  Cos mul abs gt { dy Cos mul Sin div dy } { dx dup Sin mul Cos Div } ifelse 
+} def
+%
+/InitRnode { 
+  /Y ED /X ED X sub /r ED /l X neg def Y add neg /d ED Y sub /u ED 
+  /NodePos { GetRnodePos } def 
+} def
+%
+/DiaNodePos { 
+  w h mul w Sin mul abs h Cos mul abs add Div NodeSep add dup
+  Cos mul exch Sin mul 
+} def
+%
 /TriNodePos { Sin s lt { d NodeSep sub dup Cos mul Sin Div exch } { w h
 mul w Sin mul h Cos abs mul add Div NodeSep add dup Cos mul exch Sin mul
 } ifelse } def
diff --git a/Master/texmf-dist/dvips/pstricks/pstricks.pro b/Master/texmf-dist/dvips/pstricks/pstricks.pro
index 12b81d67af3..73e4f2a9dc7 100644
--- a/Master/texmf-dist/dvips/pstricks/pstricks.pro
+++ b/Master/texmf-dist/dvips/pstricks/pstricks.pro
@@ -1,16 +1,22 @@
-% $Id: pstricks.pro 10 2008-01-18 13:31:24Z herbert $
+% $Id: pstricks.pro 21 2008-04-18 13:40:08Z herbert $
 %
-% PostScript prologue for pstricks.tex.
-% Version 1.03, 2008/01/01
-% For distribution and copyright, see pstricks.tex.
+%% PostScript prologue for pstricks.tex.
+%% Version 1.03, 2008/04/15
+%%
+%% This program can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License Distributed from CTAN archives
+%% in directory macros/latex/base/lppl.txt.
 %
 %
+% Define the follwing gs-functions if not known, eg when using distiller
+%
 systemdict /.setopacityalpha known not {/.setopacityalpha { pop } def } if
 systemdict /.setblendmode known not {/.setblendmode { pop } def } if
 systemdict /.setshapealpha known not {/.setshapealpha { pop } def } if
 %
-/tx@Dict 200 dict def tx@Dict begin
-/ADict 25 dict def
+/tx@Dict 200 dict def 				% the main PSTricks dictionary
+tx@Dict begin
+/ADict 25 dict def				% The arrow dictionaray
 /CM { matrix currentmatrix } bind def
 /SLW /setlinewidth load def
 /CLW /currentlinewidth load def
@@ -46,16 +52,22 @@ systemdict /.setshapealpha known not {/.setshapealpha { pop } def } if
 /TwoPi 6.28318530718 def
 /Euler 2.71828182846 def 
 %/e Euler bind def
-/RadtoDeg { 180 mul Pi div } bind def % convert from radian to degrees
-/DegtoRad { Pi mul 180 div } bind def % viceversa
+/RadtoDeg { 180 mul Pi div } bind def 		% convert from radian to degrees
+/DegtoRad { Pi mul 180 div } bind def 		% viceversa
 %----------------- hv end---------------------------
 /PathLength@ { /z z y y1 sub x x1 sub Pyth add def /y1 y def /x1 x def } def
-/PathLength { flattenpath /z 0 def 
-  { /y1 ED /x1 ED /y2 y1 def /x2 x1 def
-  }{ /y ED /x ED PathLength@ } {} { /y y2 def /x x2 def PathLength@ }
-  /pathforall load stopped { pop pop pop pop } if z } def
-/STP { .996264 dup scale } def
-/STV { SDict begin normalscale end STP  } def
+/PathLength { 
+  flattenpath /z 0 def 
+  { /y1 ED /x1 ED /y2 y1 def /x2 x1 def }
+  { /y ED /x ED PathLength@ } 
+  {} 
+  { /y y2 def /x x2 def PathLength@ }
+  /pathforall load stopped { pop pop pop pop } if 
+  z 
+} def
+%
+/STP { .996264 dup scale } def			% BP/PT scaling
+/STV { SDict begin normalscale end STP  } def	% 
 %
 %%-------------- DG begin patch 15 ---------------%%
 %/DashLine { dup 0 gt { /a .5 def PathLength exch div } { pop /a 1 def
@@ -143,7 +155,8 @@ systemdict /.setshapealpha known not {/.setshapealpha { pop } def } if
 %pop pop } def
 %% DG/SR modification end
 %
-/BeginArrow { ADict begin 
+/BeginArrow { 
+  ADict begin 			% hold it local, for end see EndArrow
   /@mtrx CM def 
   gsave 
   2 copy T 
@@ -152,7 +165,7 @@ systemdict /.setshapealpha known not {/.setshapealpha { pop } def } if
   rotate newpath 
 } def
 %
-/EndArrow { @mtrx setmatrix CP grestore end } def
+/EndArrow { @mtrx setmatrix CP grestore end } def % end the ADict
 %
 /Arrow { 
   CLW mul add dup 
@@ -232,6 +245,7 @@ systemdict /.setshapealpha known not {/.setshapealpha { pop } def } if
   n eq not { exch pop } if
   showpoints { ] aload /Points ED } { n 2 mul 1 add -1 roll pop } ifelse 
 } def
+%
 /Line { 
   NArray n 0 eq not 
     { n 1 eq { 0 0 /n 2 def } if ArrowA /n n 2 sub def 
@@ -239,8 +253,14 @@ systemdict /.setshapealpha known not {/.setshapealpha { pop } def } if
       CP 4 2 roll ArrowB L pop pop 
     } if 
 } def
-/Arcto { /a [ 6 -2 roll ] cvx def a r /arcto load stopped { 5 } { 4 }
-  ifelse { pop } repeat a } def
+%
+/Arcto { 
+  /a [ 6 -2 roll ] cvx def 
+  a r 
+  /arcto load stopped { 5 } { 4 } ifelse { pop } repeat 
+  a 
+} def
+%
 /CheckClosed { dup n 2 mul 1 sub index eq 2 index n 2 mul 1 add index eq
   and { pop pop /n n 1 sub def } if } def
 /Polygon { NArray n 2 eq { 0 0 /n 3 def } if n 3 lt { n { pop pop }
@@ -277,36 +297,71 @@ d /ArrowA { moveto } def /ArrowB { } def false Line closepath mtrx
 % setmatrix } def
 setmatrix pop } def
 % DG/SR modification end
-/CCA { /y ED /x ED 2 copy y sub /dy1 ED x sub /dx1 ED /l1 dx1 dy1 Pyth
-def } def
-/CCA { /y ED /x ED 2 copy y sub /dy1 ED x sub /dx1 ED /l1 dx1 dy1 Pyth
-def } def
-/CC { /l0 l1 def /x1 x dx sub def /y1 y dy sub def /dx0 dx1 def /dy0 dy1
-def CCA /dx dx0 l1 c exp mul dx1 l0 c exp mul add def /dy dy0 l1 c exp
-mul dy1 l0 c exp mul add def /m dx0 dy0 Atan dx1 dy1 Atan sub 2 div cos
-abs b exp a mul dx dy Pyth Div 2 div def /x2 x l0 dx mul m mul sub def
-/y2 y l0 dy mul m mul sub def /dx l1 dx mul m mul neg def /dy l1 dy mul
-m mul neg def } def
-/IC { /c c 1 add def c 0 lt { /c 0 def } { c 3 gt { /c 3 def } if }
-ifelse /a a 2 mul 3 div 45 cos b exp div def CCA /dx 0 def /dy 0 def }
-def
+%
+/CCA { 
+  /y ED /x ED 
+  2 copy y sub /dy1 ED 
+  x sub /dx1 ED 
+  /l1 dx1 dy1 Pyth def 
+} def
+%
+/CC { 
+  /l0 l1 def 
+  /x1 x dx sub def 
+  /y1 y dy sub def 
+  /dx0 dx1 def 
+  /dy0 dy1 def 
+  CCA 
+  /dx dx0 l1 c exp mul dx1 l0 c exp mul add def 
+  /dy dy0 l1 c exp mul dy1 l0 c exp mul add def 
+  /m dx0 dy0 Atan dx1 dy1 Atan sub 2 div cos abs b exp a mul dx dy Pyth Div 2 div def 
+  /x2 x l0 dx mul m mul sub def
+  /y2 y l0 dy mul m mul sub def 
+  /dx l1 dx mul m mul neg def 
+  /dy l1 dy mul m mul neg def 
+} def
+%
+/IC { 
+  /c c 1 add def 
+  c 0 lt { /c 0 def } { c 3 gt { /c 3 def } if } ifelse 
+  /a a 2 mul 3 div 45 cos b exp div def 
+  CCA 
+  /dx 0 def 
+  /dy 0 def 
+} def
+%
 /BOC { IC CC x2 y2 x1 y1 ArrowA CP 4 2 roll x y curveto } def
 /NC { CC x1 y1 x2 y2 x y curveto } def
 /EOC { x dx sub y dy sub 4 2 roll ArrowB 2 copy curveto } def
 /BAC { IC CC x y moveto CC x1 y1 CP ArrowA } def
 /NAC { x2 y2 x y curveto CC x1 y1 } def
 /EAC { x2 y2 x y ArrowB curveto pop pop } def
+%
 /OpenCurve { 
   NArray n 3 lt 
     { n { pop pop } repeat } 
     { BOC /n n 3 sub def n { NC } repeat EOC } ifelse 
 } def
-/AltCurve { { false NArray n 2 mul 2 roll [ n 2 mul 3 sub 1 roll ] aload
-/Points ED n 2 mul -2 roll } { false NArray } ifelse n 4 lt { n { pop
-pop } repeat } { BAC /n n 4 sub def n { NAC } repeat EAC } ifelse } def
-/ClosedCurve { NArray n 3 lt { n { pop pop } repeat } { n 3 gt {
-CheckClosed } if 6 copy n 2 mul 6 add 6 roll IC CC x y moveto n { NC }
-repeat closepath pop pop } ifelse } def
+%
+/AltCurve { 
+  { false NArray n 2 mul 2 roll 
+    [ n 2 mul 3 sub 1 roll ] aload
+    /Points ED 
+    n 2 mul -2 roll } 
+  { false NArray } ifelse 
+  n 4 lt { n { pop pop } repeat } { BAC /n n 4 sub def n { NAC } repeat EAC } ifelse 
+} def
+%
+/ClosedCurve { 
+  NArray n 3 lt 
+    { n { pop pop } repeat } 
+    { n 3 gt { CheckClosed } if 
+      6 copy n 2 mul 6 add 6 roll 
+      IC CC x y moveto n { NC } repeat 
+      closepath pop pop 
+    } ifelse 
+} def
+%
 /SQ { /r ED r r moveto r r neg L r neg r neg L r neg r L fill } def
 /ST { /y ED /x ED x y moveto x neg y L 0 x L fill } def
 /SP { /r ED gsave 0 r moveto 4 { 72 rotate 0 r L } repeat fill grestore }
@@ -324,21 +379,51 @@ ifelse } def
 /Frame { CLW mul /a ED 3 -1 roll 2 copy gt { exch } if a sub /y2 ED a add
 /y1 ED 2 copy gt { exch } if a sub /x2 ED a add /x1 ED 1 index 0 eq {
 pop pop Rect } { OvalFrame } ifelse } def
-/BezierNArray { /f ED counttomark 2 div dup cvi /n ED n eq not { exch pop
-} if n 1 sub neg 3 mod 3 add 3 mod { 0 0 /n n 1 add def } repeat f { ]
-aload /Points ED } { n 2 mul 1 add -1 roll pop } ifelse } def
-/OpenBezier { BezierNArray n 1 eq { pop pop } { ArrowA n 4 sub 3 idiv { 6
-2 roll 4 2 roll curveto } repeat 6 2 roll 4 2 roll ArrowB curveto }
-ifelse } def
-/ClosedBezier { BezierNArray n 1 eq { pop pop } { moveto n 1 sub 3 idiv {
-6 2 roll 4 2 roll curveto } repeat closepath } ifelse } def
-/BezierShowPoints { gsave Points aload length 2 div cvi /n ED moveto n 1
-sub { lineto } repeat CLW 2 div SLW [ 4 4 ] 0 setdash stroke grestore }
-def
-/Parab { /y0 exch def /x0 exch def /y1 exch def /x1 exch def /dx x0 x1
-sub 3 div def /dy y0 y1 sub 3 div def x0 dx sub y0 dy add x1 y1 ArrowA
-x0 dx add y0 dy add x0 2 mul x1 sub y1 ArrowB curveto /Points [ x1 y1 x0
-y0 x0 2 mul x1 sub y1 ] def } def
+%
+/BezierNArray { 
+  /f ED 
+  counttomark 2 div dup cvi /n ED 
+  n eq not { exch pop } if 
+  n 1 sub neg 3 mod 3 add 3 mod { 0 0 /n n 1 add def } repeat 
+  f { ] aload /Points ED } { n 2 mul 1 add -1 roll pop } ifelse 
+} def
+%
+/OpenBezier { 
+  BezierNArray 
+  n 1 eq 
+    { pop pop } 
+    { ArrowA n 4 sub 3 idiv 
+      { 6 2 roll 4 2 roll curveto } repeat 
+      6 2 roll 4 2 roll ArrowB curveto } ifelse 
+} def
+%
+/ClosedBezier { 
+  BezierNArray 
+  n 1 eq 
+    { pop pop } 
+    { moveto n 1 sub 3 idiv 
+      { 6 2 roll 4 2 roll curveto } repeat 
+      closepath } ifelse 
+} def
+%
+/BezierShowPoints { 
+  gsave 
+  Points aload length 2 div cvi /n ED 
+  moveto 
+  n 1 sub { lineto } repeat 
+  CLW 2 div SLW [ 4 4 ] 0 setdash stroke 
+  grestore 
+} def
+%
+/Parab { 
+  /y0 ED /x0 ED /y1 ED /x1 ED 
+  /dx x0 x1 sub 3 div def 
+  /dy y0 y1 sub 3 div def 
+  x0 dx sub y0 dy add x1 y1 ArrowA
+  x0 dx add y0 dy add x0 2 mul x1 sub y1 ArrowB 
+  curveto 
+  /Points [ x1 y1 x0 y0 x0 2 mul x1 sub y1 ] def 
+} def
 %
 /Grid { 
   newpath