diff options
author | Karl Berry <karl@freefriends.org> | 2011-02-28 23:27:35 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-02-28 23:27:35 +0000 |
commit | da776f4f7bb7e1e8867f53c9db6d6be0d713dcea (patch) | |
tree | 311a5231900f594c7da4b75239102e4095852ffe /Master | |
parent | a0b9fe01b11de01686c8e02891c57fff5f9a96f1 (diff) |
tikz-3dplot (28feb11)
git-svn-id: svn://tug.org/texlive/trunk@21549 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/tikz-3dplot/CHANGELOG | 5 | ||||
-rwxr-xr-x | Master/texmf-dist/doc/latex/tikz-3dplot/externalize_images.bat | 7 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.pdf | bin | 454064 -> 450917 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/tikz-3dplot/tikz-3dplot_documentation.tex | 16 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/tikz-3dplot/tikz-3dplot.sty | 29 |
5 files changed, 34 insertions, 23 deletions
diff --git a/Master/texmf-dist/doc/latex/tikz-3dplot/CHANGELOG b/Master/texmf-dist/doc/latex/tikz-3dplot/CHANGELOG new file mode 100644 index 00000000000..951f54c75a8 --- /dev/null +++ b/Master/texmf-dist/doc/latex/tikz-3dplot/CHANGELOG @@ -0,0 +1,5 @@ +Package Name: tikz-3dplot +Author Name: Jeff Hein +License: LaTeX Project Public License + +Changes: see tikz-3dplot_changelog.tex for details diff --git a/Master/texmf-dist/doc/latex/tikz-3dplot/externalize_images.bat b/Master/texmf-dist/doc/latex/tikz-3dplot/externalize_images.bat new file mode 100755 index 00000000000..775bce70abe --- /dev/null +++ b/Master/texmf-dist/doc/latex/tikz-3dplot/externalize_images.bat @@ -0,0 +1,7 @@ +rem to externalize a figure, un-rem the figure you wish, and run this batch file. + +rem pdflatex --jobname=Figures/threedsurfaceplot tikz-3dplot_documentation.tex +rem pdflatex --jobname=Figures/examplesurfaceplot tikz-3dplot_documentation.tex +rem pdflatex --jobname=Figures/examplesurfaceplotrange tikz-3dplot_documentation.tex +rem pdflatex --jobname=Figures/exampleshowargcolorguide tikz-3dplot_documentation.tex +pdflatex --jobname=Figures/alphabetagamma tikz-3dplot_documentation.tex 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 Binary files differindex 84b3b1de92e..cbbe92912f3 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 aef5ef9d6af..dcafb44821a 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 @@ -79,7 +79,6 @@ \newif\ifscratch %for doing scratchpad work, this cuts out the rest of the document - %**************** Example Box ********************* \definecolor{shadecolor}{rgb}{0.90,0.90,0.90} @@ -130,19 +129,8 @@ \cleardoublepage { - Document Version History - - \begin{description} - \item[2009-11-09] Initial release - \item[2009-11-21] Added spherical polar parametric surface plotting functionality with the \verb|\tdplotsphericalsurfaceplot| command. - \item[2009-12-04] Touched up on a few drawing issues in \verb|\tdplotsphericalsurfaceplot|, and added the \verb|\tdplotshowargcolorguide| command. - \item[2010-01-17] Changed package name from \texttt{3dplot} to \texttt{\tdplot}, and updated document accordingly. - \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. - \item[2010-07-30] Fixed a bug with using arrowheads in the \verb|\tdplotdrawarc| command. Additional arrowheads will no longer be rendered beside the arc label node. - \end{description} + + \input{ tikz-3dplot_changelog.tex } \vfill \parindent=0pt 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 a4849d4b2e7..ab642ab963b 100644 --- a/Master/texmf-dist/tex/latex/tikz-3dplot/tikz-3dplot.sty +++ b/Master/texmf-dist/tex/latex/tikz-3dplot/tikz-3dplot.sty @@ -89,10 +89,15 @@ %#5: false condition result \newcommand{\tdplotcheckdiff}[5]{% % - \pgfmathsubtract{#2}{#1} - \pgfmathparse{ abs(#2 - #1)} - \pgfmathparse{ abs(#2 - #1)<#3} - \ifthenelse{\equal{\pgfmathresult}{1.0}}{#4}{#5} + %\pgfmathsubtract{#2}{#1} + %\pgfmathparse{ abs(#2 - #1)} + + %\typeout{ #2, #1, \pgfmathresult, #3 } + + \pgfmathparse{ abs(#2 - #1)<#3 } + + %\typeout{ \pgfmathresult } + \ifthenelse{\equal{\pgfmathresult}{1}}{#4}{#5} } %\tdplotsetdisplay{\theta_d}{\phi_d} @@ -426,7 +431,6 @@ %#5: end angle %#6: label options %#7: label -%#8: arc arrowhead style % \tdplotdrawarc{(O)}{0.2}{0}{\phivec}{anchor=north}{$\phi$} \newcommand{\tdplotdrawarc}[7][tdplot_main_coords]{% \pgfmathsetmacro{\tdplottemp}{#5 + #4} @@ -544,7 +548,8 @@ \pgfmathsetmacro{\viewphistep}{\leftright * \origviewphistep} \pgfmathsetmacro{\viewphiinc}{\viewphistart + \viewphistep} \pgfmathsetmacro{\viewphiend}{\viewphistart + \leftright * 90 - \viewphistep} - + + %sweep over phi \foreach \curphi in{\viewphistart,\viewphiinc,...,\viewphiend} { %draw upper and lower parts individually, starting at the point opposite display angle @@ -560,16 +565,18 @@ \fi \pgfmathsetmacro{\viewthetainc}{\viewthetastart + \viewthetastep} - %perform the rendering + %perform the rendering of each slice of phi over a range of theta angles \tdplotdosurfaceplot{#4}{#7}{#8}{#5}{#6}{#1} } } } + + %now that the back half is done, draw the z axis \begin{scope}[opacity=1] #9 %draw z axis content \end{scope} - %draw front part of shape, doing left and right sides individually + %next, draw front part of shape, doing left and right sides individually. This is essentially the same process as before \pgfmathsetmacro{\tdplotsuperfudge}{\originaltheta < 90} \foreach \leftright in {1,-1} { @@ -577,7 +584,8 @@ \pgfmathsetmacro{\viewphistart}{\originalphi + \leftright * 90} \pgfmathsetmacro{\viewphiinc}{\viewphistart + \viewphistep} \pgfmathsetmacro{\viewphiend}{\viewphistart + \leftright * 90 - \viewphistep} - + + %sweep over phi \foreach \curphi in{\viewphistart,\viewphiinc,...,\viewphiend} { %draw upper and lower parts individually, starting at the either the north or south pole @@ -624,6 +632,9 @@ \pgfmathsetmacro{\nextphi}{\curphi + \tdplotsuperfudge*\viewphistep} \begin{scope}[opacity=1] + + %\typeout{ ----------------------------------- } + %check if the current phi angle is in position to draw the x axis \tdplotcheckdiff{\nextphi}{360}{\origviewphistep}{#2}{} \tdplotcheckdiff{\nextphi}{0}{\origviewphistep}{#2}{} |