From a666990707592b9edaf9d900454b6567a1f59b70 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 6 Apr 2017 00:28:00 +0000 Subject: pst-3dplot (6Apr) git-svn-id: svn://tug.org/texlive/trunk@43703 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pst-3dplot/Changes | 6 +- .../doc/generic/pst-3dplot/pst-3dplot-doc.bib | 148 ++++++++++++--------- .../doc/generic/pst-3dplot/pst-3dplot-doc.dat | 2 +- .../doc/generic/pst-3dplot/pst-3dplot-doc.pdf | Bin 2938814 -> 3020360 bytes .../doc/generic/pst-3dplot/pst-3dplot-doc.tex | 44 ++++-- Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro | 8 +- .../tex/generic/pst-3dplot/pst-3dplot.tex | 109 +++++++++++---- .../texmf-dist/tex/latex/pst-3dplot/pst-3dplot.sty | 4 +- 8 files changed, 215 insertions(+), 106 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/Changes b/Master/texmf-dist/doc/generic/pst-3dplot/Changes index ea479211b6e..baa9872ce34 100644 --- a/Master/texmf-dist/doc/generic/pst-3dplot/Changes +++ b/Master/texmf-dist/doc/generic/pst-3dplot/Changes @@ -1,5 +1,6 @@ pst-3dplot.pro -------- -0.32 2014-02-01 - modifications to coorTape=6 +0.33 2017-04-05 - added coorType=7 +0.32 2014-02-01 - modifications to coorType=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 @@ -19,6 +20,9 @@ pst-3dplot.pro -------- pst-3dplot.tex -------- +2.04 2017-04-05 - added coorType=7 +2.03 2014-12-01 - modifications to coorType=6 +2.02 2014-09-01 - use the alternative for hidden lines of \psThreeDBox 2.01 2014-08-25 - bugfix for \lineIIID@i which is defines by pst-solides3d, too. 2.00 2014-03-26 - enable opacity setting for sphere and cylinder diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.bib b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.bib index c784df43c7d..2fecc6ffd36 100644 --- a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.bib +++ b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.bib @@ -1,52 +1,114 @@ +%% -*-bibtex-*- +@STRING{tugboat = {TUGboat} } @STRING{dtk = {{D}ie {\TeX}nische {K}om{\"o}die} } +@Book{companion, + author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Vo\ss}, + title = {The {\LaTeX} {G}raphics {C}ompanion}, + publisher = {{Addison-Wesley Publishing Company}}, + edition = {second}, + year = {2007}, + address = {Boston, Mass.} +} + +@Article{girou:01:, + author = {Denis Girou}, + title = {Pr\'esentation de {PST}ricks}, + journal = {Cahier {GUT}enberg}, + year = 1994, + volume = {16}, + month = apr, + pages = {21-70} +} + +@Article{girou:02:, + author = {{Timothy Van} Zandt and Denis Girou}, + title = {Inside {PST}ricks}, + journal = TUGboat, + year = 1994, + volume = {15}, + month = sep, + pages = {239-246} +} + @Book{PostScript, Author = {Kollock, Nikolai G.}, - Title = {PostScript richtig eingesetzt: vom Konzept zum - praktischen Einsatz}, + Title = {Post{S}cript richtig eingesetzt: vom {K}onzept zum + praktischen {E}insatz}, Publisher = {IWT}, Address = {Vaterstetten}, year = 1989, } -@Manual{pstricks, - Title = {PSTricks - {\PS} macros for Generic TeX}, +@ctan{multido, + Title = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition}, Author = {Timothy Van Zandt}, - Organization = {}, - Address = {\url{http://www.tug.org/application/PSTricks}}, + url = {/macros/generic/multido.tex}, Note = {}, - year = 1993, + year = 1997 } +@Book{PSTricks2, + author = {Herbert Vo\ss{}}, + title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX}, + edition = {7}, + publisher = {DANTE -- Lehmanns}, + year = {2016}, + location = {Heidelberg and Berlin} +} + +@Book{PSTricksE, + author = {Herbert Vo\ss{}}, + title = {\texttt{PSTricks} -- {G}raphics and {P}ost{S}cript for \LaTeX}, + edition = {1}, + publisher = {UIT}, + year = {2011}, + address = {Cambridge -- UK} +} + +@Book{LTXquick, + author = {Herbert Vo\ss{}}, + title = {{\LaTeX} quick reference}, + edition = {1}, + publisher = {UIT}, + year = {2012}, + address = {Cambridge -- UK} +} + +@Book{presentations, + author = {Herbert Vo\ss}, + title = {Presentations with \LaTeX}, + edition = {2}, + publisher = {DANTE -- Lehmanns Media}, + year = {2017}, + location = {Heidelberg and Berlin} +} + + +@Book{tbt, + author = {Victor Eijkhout}, + title = {\TeX\ by Topic -- {A} \TeX{}nician Reference}, + edition = {1}, + publisher = {DANTE -- lehmanns media}, + year = {2014}, + location = {Heidelberg and Berlin} +} -@Manual{pdftricks, +@online{pdftricks, Title = {PSTricks Support for pdf}, Author = {Herbert Voss}, - Organization = {}, - Address = {\url{http://PSTricks.de/pdf/pdfoutput.phtml}}, - Note = {}, + url = {http://PSTricks.de/pdf/pdfoutput.phtml}, year = 2002, } -@Manual{miwi, +@online{miwi, Title = {References for \TeX{} and Friends}, Author = {Michael Wiedmann and Peter Karp}, - Organization = {}, - Address = {\url{http://www.miwie.org/tex-refs/}}, - Note = {}, + url = {http://www.miwie.org/tex-refs/}, year = 2003, } -@Manual{vue3d:2002, - Title = {Vue en 3D}, - Author = {Manuel Luque}, - Organization = {}, - Address = {\url{http://members.aol.com/Mluque5130/vue3d16112002.zip}}, - Note = {}, - year = 2002, -} - @Article{dtk02.2:jackson.voss:plot-funktionen, author = {Laura E. Jackson and Herbert Vo{\ss}}, title = {Die {P}lot-{F}unktionen von {\texttt{pst-plot}}}, @@ -58,7 +120,6 @@ month = jun, pages = {27--34}, annote = bretter, - keywords = {}, abstract = { Im letzten Heft wurden die mathematischen Funktionen von \PS~im Zusammenhang mit dem {\LaTeX}-Paket \texttt{pst-plot} zum Zeichnen von Funktionen beschrieben @@ -78,7 +139,6 @@ month = mar, pages = {40-47}, annote = bretter, - keywords = {}, abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es darum geht zu beurteilen, was es denn nun im eigentlichen @@ -90,39 +150,3 @@ gezeigt. } } -@Book{companion, - author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}}, - title = {The {\LaTeX} {G}raphics {C}ompanion}, - publisher = {{Addison-Wesley Publishing Company}}, - edition = second, - year = {2007}, - address = {Reading, Mass.} -} - -@Book{PSTricks2, - author = {Herbert Vo\ss{}}, - title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX}, - edition = {6.}, - publisher = {DANTE -- Lehmanns}, - year = {2010}, - address = {Heidelberg/Hamburg} -} - -@Book{PSTricksE, - author = {Herbert Vo\ss{}}, - title = {\texttt{PSTricks} -- {G}raphics and {P}ost{S}cript for \LaTeX}, - edition = {1.}, - publisher = {UIT}, - year = {2011}, - address = {Cambridge -- UK} -} - -@Book{LTXquick, - author = {Herbert Vo\ss{}}, - title = {{\LaTeX} quick reference}, - edition = {1.}, - publisher = {UIT}, - year = {2012}, - address = {Cambridge -- UK} -} - diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.dat b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.dat index af0b9818b25..4e3d8c3ee8a 100644 --- a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.dat +++ b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.dat @@ -1,4 +1,4 @@ -%% $Id: pst-3dplot-doc.dat 236 2009-12-31 08:59:43Z herbert $ +%% $Id: pst-3dplot-doc.dat 402 2017-04-05 06:58:06Z herbert $ \begin{filecontents}{data3D.Roessler} 2.0, 0.0, 0.0 1.9737089990827656, 0.31348417289942826, 0.024766924774833776 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 ed7dd28cd81..5445581f931 100644 Binary files a/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf and b/Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdf differ 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 14096e51ce1..f44958f1811 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,11 +1,15 @@ \input{pst-3dplot-doc.dat} -%% $Id: pst-3dplot-doc.tex 882 2014-02-01 13:12:37Z herbert $ +%% $Id: pst-3dplot-doc.tex 401 2017-04-05 06:57:36Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc} \listfiles \usepackage[utf8]{inputenc} + +\usepackage{biblatex} +\addbibresource{\jobname.bib} + \usepackage{pst-grad,pst-3dplot} \let\pstFV\fileversion \let\belowcaptionskip\abovecaptionskip @@ -15,6 +19,7 @@ %\usepackage{tabularx} %\usepackage{longtable} % + \makeatletter \renewcommand*\l@subsection{\bprot@dottedtocline{2}{1.5em}{3.6em}} \renewcommand*\l@subsubsection{\bprot@dottedtocline{3}{3.8em}{4.5em}} @@ -511,7 +516,7 @@ is \Lkeyword{Alpha}. The angle \Lkeyword{Beta} is not valid. \label{exa:coorType}\xLkeyword{coorType} \begin{LTXexample}[width=9.75cm] \psset{coorType=1,Alpha=135} -\begin{pspicture}(-2,-3)(3,3) +\begin{pspicture}(-2,-3)(3,3.5) \pstThreeDCoor[IIIDticks,zMax=3]% \end{pspicture} \end{LTXexample} @@ -528,7 +533,7 @@ The angle \Lkeyword{Alpha} is only valid for placing the ticks, if any. The ang \begin{LTXexample}[width=9.75cm] \psset{coorType=2,Alpha=90, IIIDxTicksPlane=yz} -\begin{pspicture}(-2,-2)(3,3) +\begin{pspicture}(-2,-2)(3,3.5) \pstThreeDCoor[IIIDticks,zMax=3]% \end{pspicture} \end{LTXexample} @@ -540,7 +545,7 @@ The angle \Lkeyword{Alpha} is only valid for placing the ticks, if any. The ang \begin{LTXexample}[width=9.75cm] \psset{coorType=3,Alpha=90, IIIDxTicksPlane=yz} -\begin{pspicture}(-2,-2)(3,3) +\begin{pspicture}(-2,-2)(3,3.5) \pstThreeDCoor[IIIDticks,zMax=3]% \end{pspicture} \end{LTXexample} @@ -550,12 +555,12 @@ The angles \Lkeyword{Alpha} and \Lkeyword{Beta} are not valid. \begin{LTXexample}[width=9.75cm] \psset{coorType=4,IIIDxTicksPlane=yz} -\begin{pspicture}(-2,-2)(3,3) +\begin{pspicture}(-2,-2)(3,3.5) \pstThreeDCoor[IIIDticks,zMax=3]% \end{pspicture} \end{LTXexample} -With \Lkeyword{coorType}=5 the y--z-axes are orthogonal and the angle between x- and y-axis +With \Lkeyword{coorType}=5 the $y$-$z$-axes are orthogonal and the angle between x- and y-axis is variable but should be 30 or 45 degrees and the x-axis is shortened by a factor of $0.5$. The angle \Lkeyword{Beta} is not valid. @@ -563,11 +568,14 @@ The angle \Lkeyword{Beta} is not valid. \begin{LTXexample}[width=9.75cm] \psset{coorType=5,Alpha=30, IIIDxTicksPlane=yz} -\begin{pspicture}(-2,-2)(3,3) +\begin{pspicture}(-2,-2)(3,4) \pstThreeDCoor[IIIDticks,zMax=3]% \end{pspicture} \end{LTXexample} + +For \Lkeyword{coorType}=6 the $x$-axis us shortend by 0.559. + %\setIIIDplotDefaults \psset{unit=1cm} \xLkeyword{coorType} @@ -585,7 +593,24 @@ The angle \Lkeyword{Beta} is not valid. \end{pspicture} \end{LTXexample} +For \Lkeyword{coorType}=7 the $x$-axis us shortend by 0.5. +%\setIIIDplotDefaults +\psset{unit=1cm} +\xLkeyword{coorType} +\begin{LTXexample}[width=9cm] +\psset{coorType=7} +\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=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} \clearpage \section{Rotation} @@ -2457,9 +2482,8 @@ coordinates of the vector $\vec{C}=\vec{A}-\vec{B}$. \bgroup \nocite{*} -\raggedright -\bibliographystyle{plain} -\bibliography{pst-3dplot-doc} +\RaggedRight +\printbibliography \egroup \printindex diff --git a/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro b/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro index f9a25a11b7b..fdb8e0d8d28 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 882 2014-02-01 13:12:37Z herbert $ +%% $Id: pst-3dplot.pro 401 2017-04-05 06:57:36Z 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.32 / 2014-02-01 Herbert Voss +%% version 0.33 / 2017-04-05 Herbert Voss %% with contributions of Darrell Lamm