pst-3dplot 1.90 (18feb10)

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

1 files changed, 46 insertions, 15 deletions

diff --git a/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex b/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex
index 146b6fbf4ba..7b3fb7d8c83 100644
--- a/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex
+++ b/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex
@@ -22,12 +22,13 @@
 % Requires PSTricks, pst-node, pst-plot, multido packages
 \ifx\PSTricksLoaded\endinput\else   \input pstricks.tex\fi
 \ifx\PSTnodesLoaded\endinput\else   \input pst-3d.tex\fi
-\ifx\PSTricksAddLoaded\endinput\else\input pstricks-add.tex\fi% loads node and plot
+\ifx\PSTplotLoaded\endinput\else    \input pst-plot.tex\fi
+\ifx\PSTnodeLoaded\endinput\else    \input pst-node.tex\fi
 \ifx\PSTMultidoLoaded\endinput\else \input multido.tex\fi
 \ifx\PSTXKeyLoaded\endinput\else    \input pst-xkey \fi
 %
-\def\fileversion{1.89}
-\def\filedate{2010/01/28}
+\def\fileversion{1.90}
+\def\filedate{2010/02/17}
 \message{`PST-3dplot' v\fileversion, \filedate\space (HV,DL)}
 %
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -373,12 +374,15 @@
         \pst@dimm=\pst@tempD pt\edef\pst@tempD{\strip@pt\pst@dimm}% strip the 00... from fp
         \pstFPadd\pst@tempE{\psk@IIIDxticksep}{\pst@OffsetY}
         \pstFPdiv\pst@tempE\pst@tempE\psk@ThreeDplot@yThreeDunit
+        \edef\@xyDecimals{\psk@xDecimals}%
         \multido{\nA=\pst@tempD+\psk@Dx,
                  \rB=\pst@tempC+\psk@ThreeDplot@deltax}
                 {\the\pst@cntx}{%
           \pstThreeDLine[arrows=-](\rB,\pst@tempA,\pst@OffsetZ)(\rB,\pst@tempB,\pst@OffsetZ)%
           \ifPst@IIIDlabels%
-            \pstPlanePut[plane=\psk@IIIDxTicksPlane](\rB,\pst@tempE,\pst@OffsetZ){\psxyzlabel{\nA\psk@xlabelFactor}}%
+            \pstPlanePut[plane=\psk@IIIDxTicksPlane](\rB,\pst@tempE,\pst@OffsetZ){%
+              \psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk@xlabelFactor}}%
+%              \psxyzlabel{\nA\psk@xlabelFactor}}%
           \fi%
         }% end of multido
       \fi% 
@@ -394,12 +398,15 @@
         \pst@dimm=\pst@tempD pt\edef\pst@tempD{\strip@pt\pst@dimm}% strip the 00... from fp
         \pstFPadd\pst@tempE{\psk@IIIDxticksep}{\pst@OffsetY}
         \pstFPdiv\pst@tempE\pst@tempE\psk@ThreeDplot@yThreeDunit
+        \edef\@xyDecimals{\psk@xDecimals}%
         \multido{\nA=\pst@tempD+-\psk@Dx,
                  \rB=\pst@tempC+-\psk@ThreeDplot@deltax}
                 {\the\pst@cntx}{%
           \pstThreeDLine[arrows=-](\rB,\pst@tempA,\pst@OffsetZ)(\rB,\pst@tempB,\pst@OffsetZ)%
           \ifPst@IIIDlabels%
-            \pstPlanePut[plane=\psk@IIIDxTicksPlane](\rB,\pst@tempE,\pst@OffsetZ){\psxyzlabel{\nA\psk@xlabelFactor}}%
+            \pstPlanePut[plane=\psk@IIIDxTicksPlane](\rB,\pst@tempE,\pst@OffsetZ){%
+              \psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk@xlabelFactor}}%
+%              \psxyzlabel{\nA\psk@xlabelFactor}}%
           \fi%
         }% end of multido and the x ticks and labels
       \fi
@@ -419,12 +426,15 @@
         \pst@dimm=\pst@tempD pt\edef\pst@tempD{\strip@pt\pst@dimm}% strip the 00... from fp
         \pstFPadd\pst@tempE{\psk@IIIDyticksep}{\pst@OffsetX}
         \pstFPdiv\pst@tempE\pst@tempE\psk@ThreeDplot@xThreeDunit
+        \edef\@xyDecimals{\psk@xDecimals}%
         \multido{\nA=\pst@tempD+\psk@Dy,
                  \rB=\pst@tempC+\psk@ThreeDplot@deltay}
                 {\the\pst@cnty}{%
           \pstThreeDLine[arrows=-](\pst@tempA,\rB,\pst@OffsetZ)(\pst@tempB,\rB,\pst@OffsetZ)%
           \ifPst@IIIDlabels%
-            \pstPlanePut[plane=\psk@IIIDyTicksPlane](\pst@tempE,\rB,\pst@OffsetZ){\psxyzlabel{\nA\psk@ylabelFactor}}%
+            \pstPlanePut[plane=\psk@IIIDyTicksPlane](\pst@tempE,\rB,\pst@OffsetZ){%
+              \psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk@ylabelFactor}}%
+%            \psxyzlabel{\nA\psk@ylabelFactor}}%
           \fi%
         }% end of multido
       \fi% 
@@ -440,12 +450,15 @@
         \pst@dimm=\pst@tempD pt\edef\pst@tempD{\strip@pt\pst@dimm}% strip the 00... from fp
         \pstFPadd\pst@tempE{\psk@IIIDyticksep}{\pst@OffsetX}
         \pstFPdiv\pst@tempE\pst@tempE\psk@ThreeDplot@xThreeDunit
+        \edef\@xyDecimals{\psk@xDecimals}%
         \multido{\nA=\pst@tempD+-\psk@Dy,%
                  \rB=\pst@tempC+-\psk@ThreeDplot@deltay}
                 {\the\pst@cnty}{%
           \pstThreeDLine[arrows=-](\pst@tempA,\rB,\pst@OffsetZ)(\pst@tempB,\rB,\pst@OffsetZ)%
           \ifPst@IIIDlabels%
-            \pstPlanePut[plane=\psk@IIIDyTicksPlane](\pst@tempE,\rB,\pst@OffsetZ){\psxyzlabel{\nA\psk@ylabelFactor}}%
+            \pstPlanePut[plane=\psk@IIIDyTicksPlane](\pst@tempE,\rB,\pst@OffsetZ){%
+              \psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk@ylabelFactor}}%
+%              \psxyzlabel{\nA\psk@ylabelFactor}}%
           \fi
         }% end of multido and y ticks and labels
       \fi
@@ -466,12 +479,15 @@
         \pst@dimm=\pst@tempD pt\edef\pst@tempD{\strip@pt\pst@dimm}% strip the 00... from fp
         \pstFPadd\pst@tempE{\psk@IIIDzticksep}{\pst@OffsetY}
         \pstFPdiv\pst@tempE\pst@tempE\psk@ThreeDplot@yThreeDunit
+        \edef\@xyDecimals{\psk@xDecimals}%
         \multido{\nA=\pst@tempD+\psk@Dz,
                  \rB=\pst@tempC+\psk@ThreeDplot@deltaz}%
                 {\the\pst@cntz}{%
           \pstThreeDLine[arrows=-](\pst@OffsetX,\pst@tempA,\rB)(\pst@OffsetX,\pst@tempB,\rB)%
           \ifPst@IIIDlabels%
-            \pstPlanePut[plane=\psk@IIIDzTicksPlane](\pst@OffsetX,\pst@tempE,\rB){\psxyzlabel{\nA\psk@zlabelFactor}}%
+%          \pshlabel{\psk@labelFontSize\expandafter\@LabelComma##1..\@nil\psk@xlabelFactor}%
+            \pstPlanePut[plane=\psk@IIIDzTicksPlane](\pst@OffsetX,\pst@tempE,\rB){%
+              \psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk@zlabelFactor}}%
           \fi%
         }%
       \fi
@@ -487,11 +503,14 @@
         \pst@dimm=\pst@tempD pt\edef\pst@tempD{\strip@pt\pst@dimm}% strip the 00... from fp
         \pstFPadd\pst@tempE{\psk@IIIDzticksep}{\pst@OffsetY}
         \pstFPdiv\pst@tempE\pst@tempE\psk@ThreeDplot@yThreeDunit
+        \edef\@xyDecimals{\psk@xDecimals}%
         \multido{\nA=\pst@tempD+-\psk@Dz,%
                  \rB=\pst@tempC+-\psk@ThreeDplot@deltaz}{\the\pst@cntz}{%
           \pstThreeDLine[arrows=-](\pst@OffsetX,\pst@tempA,\rB)(\pst@OffsetX,\pst@tempB,\rB)%
           \ifPst@IIIDlabels%
-            \pstPlanePut[plane=\psk@IIIDzTicksPlane](\pst@OffsetX,\pst@tempE,\rB){\psxyzlabel{\nA\psk@zlabelFactor}}%
+            \pstPlanePut[plane=\psk@IIIDzTicksPlane](\pst@OffsetX,\pst@tempE,\rB){%
+              \psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk@zlabelFactor}}%
+%              \psxyzlabel{\nA\psk@zlabelFactor}}%
           \fi%
         }% end \multido
       \fi% end \ifdim\psk@ThreeDplot@zMin
@@ -1445,7 +1464,9 @@
       \addto@pscode{
         \IIIDplot@variables
         /func { #5 } def
-        \ifPst@algebraic /Func ( #5 ) tx@addDict begin AlgParser end cvx def \fi 
+        \ifPst@algebraic /Func ( #5 ) %tx@Dict begin 
+        AlgParser %end 
+        cvx def \fi 
         /xMin #1 def
         /x xMin def
         /x1 #2 def
@@ -1470,7 +1491,9 @@
     \addto@pscode{
       \IIIDplot@variables
       /func { #5 } def
-      \ifPst@algebraic /Func ( #5 ) tx@addDict begin AlgParser end cvx def \fi 
+      \ifPst@algebraic /Func ( #5 ) %tx@addDict begin 
+      AlgParser %end 
+      cvx def \fi 
       /xMin #1 def
       /x xMin def
       /x1 #2 def
@@ -1541,7 +1564,9 @@
     \addto@pscode{%
       \IIIDplot@variables
       /func { #5 } def
-      \ifPst@algebraic /Func (#5) tx@addDict begin AlgParser end cvx def \fi 
+      \ifPst@algebraic /Func (#5) %tx@addDict begin 
+      AlgParser %end 
+      cvx def \fi 
       /x #1 def
       /x1 #2 def
       /yMin #3 def
@@ -1566,7 +1591,9 @@
       \addto@pscode{%
         \IIIDplot@variables
         /func { #5 } def
-        \ifPst@algebraic /Func (#5) tx@addDict begin AlgParser end cvx def \fi 
+        \ifPst@algebraic /Func (#5) %tx@addDict begin 
+        AlgParser %end 
+        cvx def \fi 
         /yMin #3 def
         /y yMin def
         /y1 #4 def
@@ -1646,7 +1673,9 @@
     \def\pslinetype{0}%
     \addto@pscode{%
       \IIIDplot@variables
-      \ifPst@algebraic /Func (#5) tx@addDict begin AlgParser end cvx def \fi 
+      \ifPst@algebraic /Func (#5) %tx@addDict begin 
+      AlgParser %end 
+      cvx def \fi 
       /tMin #1 def
       /t tMin def
       /t1 #2 def
@@ -1671,7 +1700,9 @@
       \@nameuse{beginplot@\psplotstyle}%
       \addto@pscode{%
         \IIIDplot@variables
-        \ifPst@algebraic /Func (#5) tx@addDict begin AlgParser end cvx def \fi 
+        \ifPst@algebraic /Func (#5) %tx@addDict begin 
+        AlgParser %end 
+        cvx def \fi 
         /tMin #1 def
         /t tMin def
         /t1 #2 def