pst-3dplot (1feb14)

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

6 files changed, 66 insertions, 23 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/Changes b/Master/texmf-dist/doc/generic/pst-3dplot/Changes
index 635d954e7f8..e877d6d56e3 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/Changes
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/Changes
@@ -1,4 +1,5 @@
 pst-3dplot.pro --------
+0.32  2014-02-01 - modifications to coorTape=6
 0.31  2014-01-29 - add coorType=6, like 5 with a z axis vice versa
 0.30  2010-01-01 - add the subroutine /tx@ProjThreeD from pst-3d
                    to get rid of the dependency
@@ -18,6 +19,8 @@ pst-3dplot.pro --------
 
 
 pst-3dplot.tex --------
+1.99  2014-02-01  - make the optional arguments IIIDx|y|zTicksPlane
+                    available for label _and_ ticks 
 1.98  2014-01-30  - added coorType=6
 1.97  2012-06-07  - fixed viewpoint for coorType>0
 1.96  2011-12-10  - added \pstThreeDPrism
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/README b/Master/texmf-dist/doc/generic/pst-3dplot/README
index 3e48431a5eb..d6642cec840 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/README
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/README
@@ -1,8 +1,8 @@
 %% Package `pst-3dplot.tex'
 %%
-%% Herbert Voss <voss _at_ pstricks.de> (Germany)
+%% Herbert Voss <hvoss@tug.org> 
 %%
-%% 2004-12-04
+%% 2014-02-01
 %%
 
 PSTricks offers excellent macros to insert more or less complex 
@@ -25,7 +25,7 @@ The pro file should go into $TEXMF$/dvips/pstricks/.
 pst-3dplot uses the extended version of the keyval package. So
 be sure that you 
 - have installed xkeyval with the special pst-xkey
-  (CTAN: tex-archive/macros/latex/contrib/xkeyval/)
+  (CTAN: /macros/latex/contrib/xkeyval/)
 - do not load another package after pst-3dplot, which loads
   the old keyval.sty or pst-key.tex
 
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf
index e3901ef6acd..7e9b00e6f03 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex
index ec63804f6d5..14096e51ce1 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex
@@ -1,6 +1,6 @@
 \input{pst-3dplot-doc.dat}
 
-%% $Id: pst-3dplot-doc.tex 879 2014-01-30 09:44:31Z herbert $
+%% $Id: pst-3dplot-doc.tex 882 2014-02-01 13:12:37Z herbert $
 \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
     headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc}
 \listfiles
@@ -516,6 +516,10 @@ is \Lkeyword{Alpha}. The angle \Lkeyword{Beta} is not valid.
 \end{pspicture}
 \end{LTXexample}
 
+
+
+
+
 With \Lkeyword{coorType}=2 the y--z-axes are orthogonal and the angle between x- and y-axis
 is always 135 degrees and the x-axis is shortened by a factor of $1/\sqrt{2}$. 
 The angle \Lkeyword{Alpha} is only valid for placing the ticks, if any.  The angle \Lkeyword{Beta} is not valid.
@@ -564,14 +568,20 @@ The angle \Lkeyword{Beta} is not valid.
 \end{pspicture}
 \end{LTXexample}
 
-
+%\setIIIDplotDefaults
+\psset{unit=1cm}
 \xLkeyword{coorType}
-\begin{LTXexample}[width=9.75cm]
-\begin{pspicture}(-3,-2)(6,6)
+\begin{LTXexample}[width=9cm]
 \psset{coorType=6}
+\begin{pspicture}(-3,-2)(6,6)
+\psset{IIIDxTicksPlane=xz,IIIDyTicksPlane=yz}
 \pstThreeDCoor[xMin=0,xMax=5,yMin=0,yMax=5, 
-  zMin=0,zMax=5, IIIDticks,spotX=0,IIIDlabels=false,
-  linewidth=1.5pt,linecolor=red]
+  zMin=0,zMax=5,IIIDticks,spotX=180,  
+  IIIDlabels=false,linecolor=red]%
+\multido{\iA=1+1}{4}{\footnotesize%
+  \pstThreeDPut(\iA,-0.3,0.1){\iA}%
+  \pstThreeDPut(-0.3,\iA,0.1){\iA}%
+  \pstThreeDPut(0,-0.3,\iA){\iA}}
 \end{pspicture}
 \end{LTXexample}
 
diff --git a/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro b/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro
index 9829845db6f..f9a25a11b7b 100644
--- a/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro
+++ b/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro
@@ -1,4 +1,4 @@
-%% $Id: pst-3dplot.pro 879 2014-01-30 09:44:31Z herbert $
+%% $Id: pst-3dplot.pro 882 2014-02-01 13:12:37Z herbert $
 %%
 %% This is file `pst-3dplot.pro',
 %%
@@ -16,7 +16,7 @@
 %%   `pst-3dplot' is a PSTricks package to draw 3d curves and graphical objects
 %%
 %%
-%% version 0.31 / 2014-01-29  Herbert Voss <hvoss _at_ tug.org>
+%% version 0.32 / 2014-02-01  Herbert Voss <hvoss _at_ tug.org>
 %% with contributions of Darrell Lamm <darrell.lamm _at_ gtri.gatech.edu<
 %%            
 %
@@ -59,8 +59,8 @@ tx@3DPlotDict begin
       /y2D y z 0.5 mul Alpha sin mul add def 
       exit } if
     coorType 6 le { % coorType |/_ with a 1/2 shortend x-axis and 135 degrees and z into the front
-      /x2D y x neg 0.559 mul Alpha cos mul add def
-      /y2D z x neg 0.559 mul Alpha sin mul add def 
+      /x2D y x -0.559 mul Alpha cos mul add def
+      /y2D z x -0.559 mul Alpha sin mul add def 
       exit } if
   } repeat
 } def
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 5d0b885759d..f987eca30b6 100644
--- a/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex
+++ b/Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-3dplot.tex 879 2014-01-30 09:44:31Z herbert $
+%% $Id: pst-3dplot.tex 881 2014-02-01 11:13:25Z herbert $
 %%
 %% This is file `pst-3dplot.tex',
 %%
@@ -6,7 +6,7 @@
 %%
 %% Package `pst-3dplot.tex'
 %%
-%% Herbert Voss <voss _at_ perce.de>
+%% Herbert Voss <hvoss _at_ tug.org>
 %% with contributions of Darrell Lamm <darrell.lamm _at_ gtri.gatech.edu<
 %%
 %% This program can be redistributed and/or modified under the terms
@@ -27,8 +27,8 @@
 \ifx\PSTMultidoLoaded\endinput\else \input multido.tex\fi
 \ifx\PSTXKeyLoaded\endinput\else    \input pst-xkey \fi
 %
-\def\fileversion{1.98}
-\def\filedate{2013/01/30}
+\def\fileversion{1.99}
+\def\filedate{2013/02/01}
 \message{`PST-3dplot' v\fileversion, \filedate\space (HV,DL)}
 %
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -384,7 +384,12 @@
         \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)%
+          \ifx\psk@IIIDxTicksPlane\ThreeDplot@planeXY
+            \pstThreeDLine[arrows=-](\rB,\pst@tempA,\pst@OffsetZ)(\rB,\pst@tempB,\pst@OffsetZ)%
+          \else
+            \ifx\psk@IIIDxTicksPlane\ThreeDplot@planeXZ
+              \pstThreeDLine[arrows=-](\rB,\pst@OffsetZ,\pst@tempA)(\rB,\pst@OffsetZ,\pst@tempB)%
+          \fi\fi
           \ifPst@IIIDlabels%
             \pstPlanePut[plane=\psk@IIIDxTicksPlane](\rB,\pst@tempE,\pst@OffsetZ){%
               \psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk@xlabelFactor}}%
@@ -408,7 +413,12 @@
         \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)%
+          \ifx\psk@IIIDxTicksPlane\ThreeDplot@planeXY
+            \pstThreeDLine[arrows=-](\rB,\pst@tempA,\pst@OffsetZ)(\rB,\pst@tempB,\pst@OffsetZ)%
+          \else
+            \ifx\psk@IIIDxTicksPlane\ThreeDplot@planeXZ
+              \pstThreeDLine[arrows=-](\rB,\pst@OffsetY,\pst@tempA)(\rB,\pst@OffsetZ,\pst@tempB)%
+          \fi\fi
           \ifPst@IIIDlabels%
             \pstPlanePut[plane=\psk@IIIDxTicksPlane](\rB,\pst@tempE,\pst@OffsetZ){%
               \psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk@xlabelFactor}}%
@@ -436,7 +446,12 @@
         \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)%
+          \ifx\psk@IIIDyTicksPlane\ThreeDplot@planeXY
+            \pstThreeDLine[arrows=-](\pst@tempA,\rB,\pst@OffsetZ)(\pst@tempB,\rB,\pst@OffsetZ)%
+          \else
+            \ifx\psk@IIIDyTicksPlane\ThreeDplot@planeYZ
+              \pstThreeDLine[arrows=-](\pst@OffsetX,\rB,\pst@tempA)(\pst@OffsetX,\rB,\pst@tempB)%
+          \fi\fi
           \ifPst@IIIDlabels%
             \pstPlanePut[plane=\psk@IIIDyTicksPlane](\pst@tempE,\rB,\pst@OffsetZ){%
               \psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk@ylabelFactor}}%
@@ -460,7 +475,12 @@
         \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)%
+          \ifx\psk@IIIDyTicksPlane\ThreeDplot@planeXY
+            \pstThreeDLine[arrows=-](\pst@tempA,\rB,\pst@OffsetZ)(\pst@tempB,\rB,\pst@OffsetZ)%
+          \else
+            \ifx\psk@IIIDyTicksPlane\ThreeDplot@planeYZ
+              \pstThreeDLine[arrows=-](\pst@OffsetX,\rB,\pst@tempA)(\pst@OffsetX,\rB,\pst@tempB)%
+          \fi\fi
           \ifPst@IIIDlabels%
             \pstPlanePut[plane=\psk@IIIDyTicksPlane](\pst@tempE,\rB,\pst@OffsetZ){%
               \psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk@ylabelFactor}}%
@@ -489,7 +509,12 @@
         \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)%
+          \ifx\psk@IIIDzTicksPlane\ThreeDplot@planeYZ
+            \pstThreeDLine[arrows=-](\pst@OffsetX,\pst@tempA,\rB)(\pst@OffsetX,\pst@tempB,\rB)%
+          \else
+          \ifx\psk@IIIDzTicksPlane\ThreeDplot@planeXZ
+            \pstThreeDLine[arrows=-](\pst@tempA,\pst@OffsetY,\rB)(\pst@tempB,\pst@OffsetY,\rB)%
+          \fi\fi
           \ifPst@IIIDlabels%
 %          \pshlabel{\psk@labelFontSize\expandafter\@LabelComma##1..\@nil\psk@xlabelFactor}%
             \pstPlanePut[plane=\psk@IIIDzTicksPlane](\pst@OffsetX,\pst@tempE,\rB){%
@@ -512,7 +537,12 @@
         \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)%
+          \ifx\psk@IIIDzTicksPlane\ThreeDplot@planeYZ
+            \pstThreeDLine[arrows=-](\pst@OffsetX,\pst@tempA,\rB)(\pst@OffsetX,\pst@tempB,\rB)%
+          \else
+          \ifx\psk@IIIDzTicksPlane\ThreeDplot@planeXZ
+            \pstThreeDLine[arrows=-](\pst@tempA,\pst@OffsetY,\rB)(\pst@tempB,\pst@OffsetY,\rB)%
+          \fi\fi
           \ifPst@IIIDlabels%
             \pstPlanePut[plane=\psk@IIIDzTicksPlane](\pst@OffsetX,\pst@tempE,\rB){%
               \psxyzlabel{\expandafter\@LabelComma\nA..\@nil\psk@zlabelFactor}}%