From 7bd9b1903189de6f39e6f6bcc94b5fc146a57f79 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 28 Aug 2009 00:18:28 +0000 Subject: pst-3dplot 1.85 git-svn-id: svn://tug.org/texlive/trunk@14897 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/pst-3dplot/pst-3dplot.tex | 33 +++++++++++----------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/tex/generic') 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 662a740dda1..a6857d694de 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 121 2009-07-28 18:03:37Z herbert $ +%% $Id: pst-3dplot.tex 123 2009-08-27 06:53:23Z herbert $ %% %% This is file `pst-3dplot.tex', %% @@ -25,8 +25,8 @@ \ifx\PSTricksAddLoaded\endinput\else\input pstricks-add.tex\fi% loads node and plot \ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi % -\def\fileversion{1.84} -\def\filedate{2009/04/20} +\def\fileversion{1.85} +\def\filedate{2009/07/29} \message{`PST-3dplot' v\fileversion, \filedate\space (HV,DL)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -147,16 +147,12 @@ % \define@key[psset]{pst-3dplot}{xPlotpoints}{\def\psk@ThreeDplot@xPlotpoints{#1}} \define@key[psset]{pst-3dplot}{yPlotpoints}{\def\psk@ThreeDplot@yPlotpoints{#1}} -\define@key[psset]{pst-3dplot}{beginAngle}{% for ellipse/circle arc - \def\psk@ThreeDplot@beginAngle{#1}} -\define@key[psset]{pst-3dplot}{endAngle}{% for ellipse/circle arc - \def\psk@ThreeDplot@endAngle{#1}} -\define@key[psset]{pst-3dplot}{linejoin}{% how lines come together 0,1,2 - \def\psk@ThreeDplot@linejoin{#1 }} -\define@key[psset]{pst-3dplot}{plane}{% xy,xz,yz - \edef\psk@ThreeDplot@plane{#1}} % must be expanded -\define@key[psset]{pst-3dplot}{pOrigin}{% combination of (lr)(tBb) - \def\psk@ThreeDplot@pOrigin{#1}} +\define@key[psset]{pst-3dplot}{beginAngle}{\def\psk@ThreeDplot@beginAngle{#1}}% for ellipse/circle arc +\define@key[psset]{pst-3dplot}{endAngle}{\def\psk@ThreeDplot@endAngle{#1}}% for ellipse/circle arc +\define@key[psset]{pst-3dplot}{linejoin}{\def\psk@ThreeDplot@linejoin{#1 }}% how lines come together 0,1,2 +\define@key[psset]{pst-3dplot}{plane}{\edef\psk@ThreeDplot@plane{#1}}% xy,xz,yz +% must be expanded +\define@key[psset]{pst-3dplot}{pOrigin}{\def\psk@ThreeDplot@pOrigin{#1}}% combination of (lr)(tBb) \define@key[psset]{pst-3dplot}{IIIDdAlpha}{\def\psk@IIIDdAlpha{#1 }} \def\ThreeDplot@planeXY{xy} \def\ThreeDplot@planeXZ{xz} @@ -220,6 +216,7 @@ \define@boolkey[psset]{pst-3dplot}[PstThreeDplot@]{showInside}[true]{} \define@key[psset]{pst-3dplot}{SegmentColor}{\pst@getcolor{#1}\psk@ThreeDplot@SegmentColor} \define@key[psset]{pst-3dplot}{increment}{\pst@checknum{#1}\psk@ThreeDplot@increment} +\define@key[psset]{pst-3dplot}{Hincrement}{\pst@checknum{#1}\psk@ThreeDplot@Hincrement} %\define@key[psset]{pst-3dplot}{CMYK}{\def\psk@ThreeDplot@CMYK{#1}} \define@key[psset]{pst-3dplot}{xyzLight}{\def\psk@ThreeDplot@xyzLight{#1 }} % @@ -265,7 +262,8 @@ planecorr=none, planeGrid=xy,planeGridOffset=0,%subticks=10, leftHanded=false,coorType=0,IIIDdAlpha=0, - xyzLight=1 1 2,showInside=true,SegmentColor={[cmyk]{0.2,0.6,1,0}},increment=10 + xyzLight=1 1 2,showInside=true,SegmentColor={[cmyk]{0.2,0.6,1,0}}, + increment=10,Hincrement=0.5, }% \def\pst@linetype{2}% to prevent an unknown linetyp with dash } @@ -481,7 +479,8 @@ \pst@getlength\psk@planeGridOffset\pst@dima \pst@cntx=\psk@xsubticks \advance\pst@cntx by \@ne \pst@cnty=\psk@ysubticks \advance\pst@cnty by \@ne - \psset{unit=1pt,planeGridOffset=\pst@dima}% we need everything in pt + \psset{unit=1pt} + \psset[pst-3dplot]{planeGridOffset=\pst@dima}% we need everything in pt \ifx\psk@planeGrid\ThreeDplot@planeXY \multido{\rA=\strip@pt\pst@dimz+\strip@pt\pst@dx}{\pst@cntx}{% \pstThreeDLine(\rA,\strip@pt\pst@dimx,\psk@planeGridOffset)% @@ -1295,7 +1294,7 @@ \pst@number\pst@dima \pst@number\psxunit div % Radius \pst@number\pst@dimb \pst@number\psyunit div % Height \psk@ThreeDplot@increment % angle increment - 0.5 % height increment + \psk@ThreeDplot@Hincrement % height increment /cmyk {} def % we need only the values \psk@ThreeDplot@SegmentColor\space % @@ -1354,7 +1353,7 @@ \IIIDplot@variables \psk@ThreeDplot@linejoin setlinejoin % - #1 #2 #3 + #1 2 div #2 2 div #3 2 div % wieso 1/2 ???? \pst@number\pst@dima \pst@number\psxunit div % Width \pst@number\pst@dimb \pst@number\psyunit div % Height \pst@number\pst@dimc \pst@number\psyunit div % Depth -- cgit v1.2.3