tikz-3dplot update (13apr10)

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

4 files changed, 17 insertions, 49 deletions

diff --git a/Master/texmf-dist/doc/latex/tikz-3dplot/README b/Master/texmf-dist/doc/latex/tikz-3dplot/README
index 7a33bf2fef7..658efae4220 100644
--- a/Master/texmf-dist/doc/latex/tikz-3dplot/README
+++ b/Master/texmf-dist/doc/latex/tikz-3dplot/README
@@ -4,4 +4,10 @@ Author Name:  Jeff Hein
 
 License: LaTeX Project Public License
 
-Description: The tikz-3dplot package provides straightforward ways to define three-dimensional coordinate frames through which to plot in TikZ. The user can specify the orientation of the main coordinate frame, and use standard TikZ commands and coordinates to render their tikzfigure. A secondary coordinate frame is provided to allow rotations and translations with respect to the main coordinate frame. In addition, The tikz-3dplot package can also handle plotting user-specified functions in spherical polar coordinates, where both the radius and fill color can be expressed as parametric functions of polar angles.
+Description: The tikz-3dplot package provides straightforward ways to define three-dimensional 
+coordinate frames through which to plot in TikZ. The user can specify the orientation of the 
+main coordinate frame, and use standard TikZ commands and coordinates to render their 
+tikzfigure. A secondary coordinate frame is provided to allow rotations and translations with 
+respect to the main coordinate frame. In addition, The tikz-3dplot package can also handle 
+plotting user-specified functions in spherical polar coordinates, where both the radius and 
+fill color can be expressed as parametric functions of polar angles.
diff --git a/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.pdf b/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.pdf
index 09bd2a4ae96..43cc1d5d215 100644
--- a/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.pdf
+++ b/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.pdf
diff --git a/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.tex b/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.tex
index 0e01284c0c5..7a11d07c64a 100644
--- a/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.tex
+++ b/Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.tex
@@ -20,7 +20,7 @@
 
 %tikz-3dplot_documentation.tex - documentation for tikz-3dplot.sty: package for plotting three dimensional axes and coordinates in TikZ.  The user can specify orientation of the display, and also define rotated coordinate systems within the 3d display coordinate system.  
 
-%Created 2009-11-07 by Jeff Hein.  Last updated: 2010-01-24
+%Created 2009-11-07 by Jeff Hein.  Last updated: 2010-04-13
 %----------------------------------------------------------
 
 %Requirements
@@ -140,6 +140,7 @@
 		\item[2010-01-20]		Added the following commands: \verb|\tdplotgetpolarcoords|, \verb|\tdplotcrossprod|, \verb|\tdplotcalctransformrotmain|, \verb|\tdplotcalctransformmainrot|, \verb|\tdplottransformrotmain|,  \verb|\tdplottransformmainrot|, and \verb|\tdplotdrawpolytopearc|.
 		\item[2010-01-24]		Added the ability to hue 3d polar plots based on radius using the \verb|\tdplotr| macro.
 		\item[2010-03-16]		Added the \verb|\tdplotcalctransformmainscreen| and \verb|\tdplottransformmainscreen| commands.
+		\item[2010-04-13]		Performed minor bug fixes with \verb|\tdplotsphericalsurfaceplot|, and did some slight code cleanup.
 	\end{description}	
 
 	\vfill
@@ -156,47 +157,6 @@
 	\clearpage
 }
 
-%copyright page, ripped from PGF manual
-%{
-%  \vbox{}
-%  %\vskip0pt plus 1fill
-%  %Für meinen Vater, damit er noch viele schöne \TeX-Graphiken
-%  erschaffen kann.
-%  %\vskip1em
-%  %\hfill\emph{Till}
-%  \vskip0pt plus 3fill
-%
-%  \parindent=0pt
-%  Copyright 2009 by Jeff Hein
-%
-%  \medskip  
-%  Permission is granted to copy, distribute and/or modify \emph{the documentation}
-%  under the terms of the \textsc{gnu} Free Documentation License, Version 1.2
-%  or any later version published by the Free Software Foundation;
-%  with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-%  %A copy of the license is included in the section entitled \textsc{gnu}
-%  Free Documentation License.
-%
-%  \medskip  
-%  Permission is granted to copy, distribute and/or modify \emph{the
-%    code of the package} under the terms of the \textsc{gnu} Public License, Version 2
-%  or any later version published by the Free Software Foundation.
-%  %A copy of the license is included in the section entitled \textsc{gnu}
-%  Public License.
-%
-%  \medskip  
-%  Permission is also granted to distribute and/or modify \emph{both
-%    the documentation and the code} under the conditions of the LaTeX
-%  Project Public License, either version 1.3 of this license or (at
-%  your option) any later version. %A copy of the license is included in
-%  the section entitled \LaTeX\ Project Public License. 
-%
-%  \vbox{}
-%  \clearpage
-%}
-
-
-
 \pagenumbering{roman}
 \tableofcontents
 \cleardoublepage
diff --git a/Master/texmf-dist/tex/latex/tikz-3dplot/tikz-3dplot.sty b/Master/texmf-dist/tex/latex/tikz-3dplot/tikz-3dplot.sty
index 6b92c48a855..b5a8ae8fad1 100644
--- a/Master/texmf-dist/tex/latex/tikz-3dplot/tikz-3dplot.sty
+++ b/Master/texmf-dist/tex/latex/tikz-3dplot/tikz-3dplot.sty
@@ -20,7 +20,7 @@
 
 %tikz-3dplot.sty - package for plotting three dimensional axes and coordinates in TikZ.  The user can specify orientation of the display, and also define rotated coordinate systems within the 3d display coordinate system.  
 
-%Created 2009-11-07 by Jeff Hein.  Last updated: 2010-01-20
+%Created 2009-11-07 by Jeff Hein.  Last updated: 2010-04-03
 %----------------------------------------------------------
 
 %Requirements
@@ -107,9 +107,9 @@
 \pgfmathsetmacro{\tdplotmaintheta}{#1}
 \pgfmathsetmacro{\tdplotmainphi}{#2}
 %
-
+%
 \tdplotcalctransformmainscreen
-
+%
 %now here is where the output is performed
 \tikzset{tdplot_main_coords/.style={x={(\raarot cm,\rbarot cm)},y={(\rabrot cm, \rbbrot cm)},z={(\racrot cm, \rbcrot cm)}}}%
 }
@@ -117,7 +117,7 @@
 
 %This performs the calculation to define the main coordinate frame orientation style, and is also used to transform a coordinate from the main coordinate frame the the screen coordinate frame
 \newcommand{\tdplotcalctransformmainscreen}{%
-
+%
 %TODO: choose less obvious macro names?  or look into scoping?
 \tdplotsinandcos{\sintheta}{\costheta}{\tdplotmaintheta}%
 \tdplotsinandcos{\sinphi}{\cosphi}{\tdplotmainphi}%
@@ -140,8 +140,6 @@
 \pgfmathsetmacro{\rcbrot}{-\stcp}%
 \pgfmathsetmacro{\rccrot}{\costheta}%
 %
-
-
 }
 
 
@@ -696,6 +694,8 @@
 
 		%if using fill color parametric to angles
 		\ifthenelse{\equal{#6}{parametricfill}}{%
+			%and, if it's being plotted
+			\ifthenelse{\equal{\logictest}{1.0}}{%
 			\pgfmathsetmacro{\radius}{#1}
 			\pgfmathsetmacro{\tdplotr}{\radius*360}  %factor of 360 lets the radius change hue through one full cycle for each unit radius
 			
@@ -712,6 +712,7 @@
 			\pgfmathdivide{\colorarg}{360}
 			\definecolor{tdplotfillcolor}{hsb}{\pgfmathresult, 1, 1}
 			\color{tdplotfillcolor}
+			}{}%
 		}%
 		{%
 			\pgfsetfillcolor{#5}
@@ -724,6 +725,7 @@
 			}{}
 		%\fi
 
+		%if this section is being plotted
 		\ifthenelse{\equal{\logictest}{1.0}}{%
 		\pgfmathsetmacro{\radius}{abs(#1)}
 		\pgfpathmoveto{\pgfpointspherical{\curlongitude}{\curlatitude}{\radius}}