pstricks (15nov10)

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

2 files changed, 41 insertions, 41 deletions

diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 05f5a9efc3c..0f4344284d8 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.13}
-\def\filedate{2010/11/01}
+\def\fileversion{2.14}
+\def\filedate{2010/11/14}
 %
 % stolen from latex.ltx to make it TeX compatible
 \newcount\psLoopIndex
@@ -191,6 +191,7 @@
 \chardef\f@ur=4
 %
 \newbox\pst@hbox
+\newbox\pst@ibox
 \newbox\pst@boxg
 \newcount\pst@cnta
 \newcount\pst@cntb
@@ -335,17 +336,15 @@
   \advance\pst@dimd\pst@dimg
   \divide\pst@dimd 2\relax}
 %
-% ----- the old pst@pyth begin -----
-\iffalse
-\def\pst@pyth#1#2#3{\ifdim#1>#2\pst@@pyth#1#2#3\else\pst@@pyth#2#1#3\fi}
-\def\pst@@pyth#1#2#3{%
-  \ifdim4#1>9#2%
+% ----- the old pst@pyth begin -----  did not use dimens
+\def\pst@Pyth#1#2#3{\ifdim#1>#2\pst@@Pyth#1#2#3\else\pst@@Pyth#2#1#3\fi}
+\def\pst@@Pyth#1#2#3{%
+  \ifdim4#1>9#2
     #3=#1\advance#3 .2122#2%
   \else
     #3=.8384#1\advance#3 .5758#2%
   \fi%
 }
-\fi
 % ----- the old pst@pyth end -----
 %
 %------ new version \pst@divide ̣-------- by Michael Sharpe
@@ -2631,12 +2630,12 @@
 \psset[pstricks]{boxsep}
 %
 \def\pst@useboxpar{%
-  \use@par
-  \if@star
-    \let\pslinecolor\psfillcolor
-    \solid@star
+  \use@par%
+  \if@star%
+    \let\pslinecolor\psfillcolor%
+    \solid@star%
     \let\solid@star\relax
-  \fi
+  \fi%
   \ifpsdoubleline \pst@setdoublesep \fi}
 %
 \def\psframebox{\def\pst@par{}\pst@object{psframebox}}
@@ -2757,7 +2756,8 @@
 \leavevmode
 \box\pst@hbox
 \endgroup}
-\def\pscirclebox{\def\pst@par{}\pst@object{pscirclebox}}
+%
+\def\pscirclebox{\pst@object{pscirclebox}}
 \def\pscirclebox@i{\pst@makebox\pscirclebox@ii}
 \def\pscirclebox@ii{%
 \begingroup
@@ -2770,38 +2770,37 @@
 \leavevmode
 \box\pst@hbox
 \endgroup}
+%
 \def\pscirclebox@iii{%
-\if@star
-\pslinewidth\z@
-\pstverb{\pst@dict \tx@STP \pst@usecolor\psfillcolor
-newpath \pscirclebox@iv \tx@SD end}%
-\else
-\begin@ClosedObj
-\def\pst@linetype{4}\showpointsfalse
-\addto@pscode{%
-\pscirclebox@iv CLW 2 div add 0 360 arc closepath}%
-\end@ClosedObj
-\fi}
+  \if@star
+    \pslinewidth\z@
+    \pstverb{\pst@dict \tx@STP \pst@usecolor\psfillcolor
+             newpath \pscirclebox@iv \tx@SD end}%
+  \else
+    \begin@ClosedObj
+    \def\pst@linetype{4}\showpointsfalse
+    \addto@pscode{ \pscirclebox@iv\space CLW 2 div add 0 360 arc closepath}%
+    \end@ClosedObj
+  \fi}
 %
-\def\pscirclebox@iv{%
-  \pst@number{\wd\pst@hbox}2 div
-  \pst@number{\ht\pst@hbox}\pst@number{\dp\pst@hbox}add 2 div
-  2 copy \pst@number{\dp\pst@hbox}sub 4 2 roll
+\def\pscirclebox@iv{
+  \pst@number{\wd\pst@hbox} 2 div
+  \pst@number{\ht\pst@hbox} \pst@number{\dp\pst@hbox} add 2 div
+  2 copy \pst@number{\dp\pst@hbox} sub 4 2 roll
   \tx@Pyth \pst@number\psframesep add }
 %
 \def\pscirclebox@sep{%
-  \pst@dimb=\ht\pst@hbox
-  \advance\pst@dimb\dp\pst@hbox
-  \divide\pst@dimb 2
-  \pst@dima=.5\wd\pst@hbox
-  \pst@pyth\pst@dima\pst@dimb\pst@dimc
-  \advance\pst@dimc\pslinewidth
-  \advance\pst@dimc\psframesep
-  \advance\pst@dimb-\pst@dimc
-  \setbox\pst@hbox=\hbox to2\pst@dimc{%
-    \hss\vbox{\kern-\pst@dimb\box\pst@hbox}\hss}%
-  \advance\pst@dimb-\dp\pst@hbox
-  \dp\pst@hbox=-\pst@dimb}
+  \pst@dimn=\ht\pst@hbox    
+  \advance\pst@dimn by \dp\pst@hbox 
+  \divide\pst@dimn by 2		
+  \pst@dimm=0.5\wd\pst@hbox
+  \pst@Pyth\pst@dimm\pst@dimn\pst@dimo
+  \advance\pst@dimo by \pslinewidth
+  \advance\pst@dimo by \psframesep
+  \advance\pst@dimn by -\pst@dimo
+  \setbox\pst@hbox=\hbox to 2\pst@dimo{\hss\vbox{\kern-\pst@dimn\box\pst@hbox}\hss}%
+  \advance\pst@dimn by -\dp\pst@hbox
+  \dp\pst@hbox=-\pst@dimn}
 %  
 \let\pst@nodehook\relax
 %
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks97.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks97.tex
index 875bea2d335..6f169c67ce5 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks97.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks97.tex
@@ -1756,6 +1756,7 @@ setmatrix}%
 \leavevmode
 \box\pst@hbox
 \endgroup}
+%$
 \def\pscirclebox{\pst@object{pscirclebox}}
 \def\pscirclebox@i{\pst@makebox\pscirclebox@ii}
 \def\pscirclebox@ii{%