summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-01-30 22:57:32 +0000
committerKarl Berry <karl@freefriends.org>2014-01-30 22:57:32 +0000
commitf9b6fc357ce2d792bde2938759b2c77efd98c6d1 (patch)
tree2c65376c15fb46b0d28b1f2b7b833692500113b9
parenta2f64a193fa3d36e97770a8254b905bd2d009d05 (diff)
pst-3dplot (30jan14)
git-svn-id: svn://tug.org/texlive/trunk@32824 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pst-3dplot/Changes2
-rw-r--r--Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.pdfbin2957864 -> 2963607 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-3dplot/pst-3dplot-doc.tex27
-rw-r--r--Master/texmf-dist/doc/generic/pst-3dplot/tb72voss3d.pdf (renamed from Master/texmf-dist/doc/generic/pst-3dplot/more_docs/tb72voss3d.pdf)bin542949 -> 542949 bytes
-rw-r--r--Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro12
-rw-r--r--Master/texmf-dist/source/generic/pst-3dplot/Makefile71
-rw-r--r--Master/texmf-dist/tex/generic/pst-3dplot/pst-3dplot.tex15
7 files changed, 47 insertions, 80 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/Changes b/Master/texmf-dist/doc/generic/pst-3dplot/Changes
index 1927cd54c86..635d954e7f8 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.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
0.29 2009-10-06 add option SphericalCoorType
@@ -17,6 +18,7 @@ pst-3dplot.pro --------
pst-3dplot.tex --------
+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
1.95 2011-08-10 - fix bug with setting drawstyle for htlatex
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 2ce11c53689..e3901ef6acd 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
Binary files 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 d3b83ab9c34..ec63804f6d5 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 467 2011-03-01 21:04:36Z herbert $
+%% $Id: pst-3dplot-doc.tex 879 2014-01-30 09:44:31Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc}
\listfiles
@@ -551,6 +551,31 @@ The angles \Lkeyword{Alpha} and \Lkeyword{Beta} are not valid.
\end{pspicture}
\end{LTXexample}
+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.
+
+\xLkeyval{yz}\xLkeyword{coorType}
+\begin{LTXexample}[width=9.75cm]
+\psset{coorType=5,Alpha=30,
+ IIIDxTicksPlane=yz}
+\begin{pspicture}(-2,-2)(3,3)
+\pstThreeDCoor[IIIDticks,zMax=3]%
+\end{pspicture}
+\end{LTXexample}
+
+
+\xLkeyword{coorType}
+\begin{LTXexample}[width=9.75cm]
+\begin{pspicture}(-3,-2)(6,6)
+\psset{coorType=6}
+\pstThreeDCoor[xMin=0,xMax=5,yMin=0,yMax=5,
+ zMin=0,zMax=5, IIIDticks,spotX=0,IIIDlabels=false,
+ linewidth=1.5pt,linecolor=red]
+\end{pspicture}
+\end{LTXexample}
+
+
\clearpage
\section{Rotation}
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/more_docs/tb72voss3d.pdf b/Master/texmf-dist/doc/generic/pst-3dplot/tb72voss3d.pdf
index ef3bc1f69bb..ef3bc1f69bb 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/more_docs/tb72voss3d.pdf
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/tb72voss3d.pdf
Binary files differ
diff --git a/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro b/Master/texmf-dist/dvips/pst-3dplot/pst-3dplot.pro
index f860fcba763..9829845db6f 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 467 2011-03-01 21:04:36Z herbert $
+%% $Id: pst-3dplot.pro 879 2014-01-30 09:44:31Z 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 / 2010-02-20 Herbert Voss <hvoss _at_ tug.org>
+%% version 0.31 / 2014-01-29 Herbert Voss <hvoss _at_ tug.org>
%% with contributions of Darrell Lamm <darrell.lamm _at_ gtri.gatech.edu<
%%
%
@@ -54,6 +54,14 @@ tx@3DPlotDict begin
/x2D x -0.5 mul y 1 mul add def
/y2D x -0.5 mul y -0.25 mul add z 1 mul add def
exit } if
+ coorType 5 le { % coorType |/_ with a 1/2 shortend x-axis and 135 degrees
+ /x2D x z 0.5 mul Alpha cos mul add def
+ /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
+ exit } if
} repeat
} def
/ConvertTo2D { true 3Dto2D } def
diff --git a/Master/texmf-dist/source/generic/pst-3dplot/Makefile b/Master/texmf-dist/source/generic/pst-3dplot/Makefile
deleted file mode 100644
index 9b01cfa343a..00000000000
--- a/Master/texmf-dist/source/generic/pst-3dplot/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-
-# `Makefile' for `pst-3dplot.pdf', hv, 2007/03/17
-
-.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
-
-PACKAGE = pst-3dplot
-
-MAIN = $(PACKAGE)-doc
-
-TDS = ~/PSTricks/PSTricks-TDS
-
-LATEX = latex
-
-ARCHNAME = $(MAIN)-$(shell date +%y%m%d)
-
-ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile
-
-all : doc clean tds
-doc: $(MAIN).pdf
-
-$(MAIN).pdf : $(MAIN).ps
- GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $<
-
-$(MAIN).ps : $(MAIN).dvi
- dvips $<
-
-$(MAIN).dvi : $(MAIN).tex
- $(LATEX) $<
- $(LATEX) $<
- if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi
- if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi
- makeindex -t $(basename $<).ilg -s pst-doc.ist -o $(basename $<).ind $(basename $<).idx
- makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \
- $(basename $<).glo
- bibtex $(basename $<)
- $(LATEX) $<
- $(LATEX) $<
-
-clean :
- $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .Roessler .bbl )
- $(RM) $(addprefix $(MAIN), .dvi .ps .xcp)
- $(RM) data3d.Roessler
-
-veryclean : clean
- $(RM) $(addprefix $(MAIN), .pdf .bbl .blg)
-
-arch :
- zip $(ARCHNAME).zip $(ARCHFILES)
-
-tds:
- cp -u Changes $(TDS)/doc/generic/$(PACKAGE)/
- cp -u README $(TDS)/doc/generic/$(PACKAGE)/
- cp -u $(MAIN).pdf $(TDS)/doc/generic/$(PACKAGE)/
-#
- cp -u Changes $(TDS)/tex/latex/$(PACKAGE)/
- cp -u $(PACKAGE).sty $(TDS)/tex/latex/$(PACKAGE)/
-#
- cp -u Changes $(TDS)/tex/generic/$(PACKAGE)/
- cp -u $(PACKAGE).tex $(TDS)/tex/generic/$(PACKAGE)/
-#
- cp -u Changes $(TDS)/dvips/$(PACKAGE)/
- cp -u $(PACKAGE).pro $(TDS)/dvips/$(PACKAGE)/
- cp -u $(PACKAGE).pro ~/Links/dvips-local/
-#
- cp -u Changes $(TDS)/source/$(PACKAGE)/
- cp -u $(MAIN).tex $(TDS)/source/$(PACKAGE)/
- cp -u $(MAIN).bib $(TDS)/source/$(PACKAGE)/
- cp -u Makefile $(TDS)/source/$(PACKAGE)/
-
-
-# EOF
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 4f37d13deb8..5d0b885759d 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 694 2012-06-07 12:07:50Z herbert $
+%% $Id: pst-3dplot.tex 879 2014-01-30 09:44:31Z herbert $
%%
%% This is file `pst-3dplot.tex',
%%
@@ -27,8 +27,8 @@
\ifx\PSTMultidoLoaded\endinput\else \input multido.tex\fi
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
%
-\def\fileversion{1.97}
-\def\filedate{2012/06/07}
+\def\fileversion{1.98}
+\def\filedate{2013/01/30}
\message{`PST-3dplot' v\fileversion, \filedate\space (HV,DL)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -61,8 +61,10 @@
\def\psk@ThreeDplot@Alpha{45}
\or %4
% \def\psk@ThreeDplot@Alpha{135}
+ \or %5
+ \or %6
+ \def\psk@ThreeDplot@Alpha{26.565}
\else
-%
\fi}
% 0 default
% 1 z y are orthogonal and angle x|y is Alpha, Beta has no meaning
@@ -905,7 +907,7 @@
\pst@killglue%
\begingroup%
\addbefore@par{linestyle=\psk@ThreeDplot@invisibleLineStyle}%
- \use@par%
+ \use@keep@par%
\def\pst@tempX{#1 }%
\def\pst@tempY{#2 }%
\def\pst@tempZ{#3 }%
@@ -915,7 +917,8 @@
\iftrue
\pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#4,#5,#6)(#7,#8,#9)% lower square
\pstThreeDSquare(\pst@tempX,\pst@tempY,\pst@tempZ)(#1,#2,#3)(#4,#5,#6)% back square
- \psset{linestyle=\psk@ThreeDplot@visibleLineStyle}%
+ \addto@par{linestyle=dashed}%\psk@ThreeDplot@invisibleLineStyle}%
+% \psset{linestyle=\psk@ThreeDplot@visibleLineStyle}%
\pstThreeDSquare(\pst@tempX #4 add,\pst@tempY #5 add,\pst@tempZ #6 add)(#1,#2,#3)(#7,#8,#9)% left square
\pstThreeDSquare(\pst@tempX #1 add,\pst@tempY #2 add,\pst@tempZ #3 add)(#4,#5,#6)(#7,#8,#9)% top square
\pstThreeDSquare(\pst@tempX #7 add,\pst@tempY #8 add,\pst@tempZ #9 add)(#1,#2,#3)(#4,#5,#6)% front square