pst-3dplot (8sep23)

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

5 files changed, 31 insertions, 20 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/Changes b/Master/texmf-dist/doc/generic/pst-3dplot/Changes
index f8bb861e485..24dbaf74461 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/Changes
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/Changes
@@ -20,6 +20,7 @@ pst-3dplot.pro --------
 
 
 pst-3dplot.tex --------
+2.08  2023-09-08  - fix bug for consequtive \pstThreeDCircle
 2.07a 2022-01-14  - fix for the documentation
 2.07  2021-09-23  - fix for lualatex and color values on PS level
 2.06  2020-10-25  - fix for \pstThreeDDot and parameter setting
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/README b/Master/texmf-dist/doc/generic/pst-3dplot/README
index 54f149e557e..0b00b225e52 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/README
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/README
@@ -2,7 +2,7 @@
 %%
 %% Herbert Voss <hvoss@tug.org> 
 %%
-%% 2020-10-25
+%% 2023-09-08
 %%
 
 PSTricks offers excellent macros to insert more or less complex 
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 9b811c3a68e..921fbb51885 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
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 605d6aea5fc..5d489370ae9 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,9 +1,9 @@
 \input{pst-3dplot-doc.dat}
 
-%% $Id: pst-3dplot-doc.tex 414 2022-01-14 20:43:27Z herbert $
+%% $Id: pst-3dplot-doc.tex 757 2023-09-08 13:31:12Z herbert $
 \errorcontextlines=100
 %\RequirePackage{pdfmanagement-testphase}
-%\DeclareDocumentMetadata{}
+%\DocumentMetadata{}
 \documentclass[11pt,english,bibliography=totoc,parskip=false,headings=small,
     headinclude=false,footinclude=false,twoside,english,usegeometry]{pst-doc}
 \listfiles
@@ -20,10 +20,10 @@
 \usepackage{biblatex}
 \addbibresource{\jobname.bib}
 
-\makeatletter
-\renewcommand*\l@subsection{\bprot@dottedtocline{2}{1.5em}{3.6em}}
-\renewcommand*\l@subsubsection{\bprot@dottedtocline{3}{3.8em}{4.5em}}
-\makeatother
+%\makeatletter
+%\renewcommand*\l@subsection{\bprot@dottedtocline{2}{1.5em}{3.6em}}
+%\renewcommand*\l@subsubsection{\bprot@dottedtocline{3}{3.8em}{4.5em}}
+%\makeatother
 \def\bgImage{%
 \begin{pspicture}(0,-3)(7,5)
 \pstThreeDCoor[xMax=2,yMax=13,zMin=0,zMax=6,IIIDticks]%
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 cdef212f94e..2593ab594f9 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 414 2022-01-14 20:43:27Z herbert $
+%% $Id: pst-3dplot.tex 758 2023-09-08 13:33:46Z herbert $
 %%
 %% This is file `pst-3dplot.tex',
 %%
@@ -7,7 +7,7 @@
 %% Package `pst-3dplot.tex'
 %%
 %% Herbert Voss <hvoss _at_ tug.org>
-%% with contributions of Darrell Lamm <darrell.lamm _at_ gtri.gatech.edu<
+%% with contributions of Darrell Lamm <darrell.lamm _at_ gtri.gatech.edu
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License Distributed from CTAN archives
@@ -27,9 +27,9 @@
 \ifx\PSTMultidoLoaded\endinput\else \input multido.tex\fi
 \ifx\PSTXKeyLoaded\endinput\else    \input pst-xkey \fi
 %
-\def\fileversion{2.07a}
+\def\fileversion{2.08}
 \let\IIIDplotfileversion\fileversion
-\def\filedate{2022/01/14}
+\def\filedate{2023/09/08}
 \let\IIIDplotfiledate\filedate
 \message{`PST-3dplot' v\fileversion, \filedate\space (HV,DL)}
 %
@@ -1148,7 +1148,11 @@
   \gdef\psplot@init{}%
   \@pstfalse%
   \@nameuse{testqp@\psplotstyle}%
-  \if@pst\pstThreeDEllipse@ii\else\pstThreeDEllipse@iii\fi%
+  \if@pst
+    \pstThreeDEllipse@ii
+  \else
+    \pstThreeDEllipse@iii
+  \fi
   \ignorespaces}
 %
 \def\pstThreeDEllipse@ii{%
@@ -1211,8 +1215,8 @@
     [xB yB zB] exch vector-sub                         % is b-bparallelA=b_orthA
     dup vector-length vecA exch div vector-scale       % is b_orthA with |a| 
     aload pop
-    /zB ED /yB ED /xB ED
-    /vecB [xB yB zB] vector-length def
+    /zBB ED /yBB ED /xBB ED
+    /vecB [xBB yBB zBB] vector-length def
     end
     /aStart \psk@ThreeDplot@beginAngle\space def
     /aEnd \psk@ThreeDplot@endAngle\space def
@@ -1225,18 +1229,24 @@
 %
       /phi angle cvi 90 mod 0 eq { angle } { vecA angle tan mul vecB atan 
         angle 180 div .5 add floor 180 mul add } ifelse def
-      xM xA phi cos mul add xB phi sin mul add 
-      yM yA phi cos mul add yB phi sin mul add 
-      zM zA phi cos mul add zB phi sin mul add 
+      xM xA phi cos mul add xBB phi sin mul add 
+      yM yA phi cos mul add yBB phi sin mul add 
+      zM zA phi cos mul add zBB phi sin mul add 
       saveCoor ConvertTo2D 
       x2D \pst@number\psxunit mul y2D \pst@number\psyunit mul end 
     } def
     /angle aStart def
   }%
   \gdef\psplot@init{}%
-  \@pstfalse%
+  \@pstfalse
   \@nameuse{testqp@\psplotstyle}%
-  \if@pst\pstThreeDEllipse@ii\else\pstThreeDEllipse@iii\fi%
+  \if@pst
+%    \typeout{>>>>> Using Ellipse@ii}%
+    \pstThreeDEllipse@ii
+  \else
+%    \typeout{>>>>> Using Ellipse@iii}%
+    \pstThreeDEllipse@iii
+  \fi
   \ignorespaces}
 %
 \def\pstThreeDPlotFunc{\psplotThreeD}%	only for compatibility
@@ -1653,7 +1663,7 @@
         }%
         \psplotThreeD@xLines@ii
     \else%	curves
-  \endgroup%
+  \endgroup
   \multido{\n@Y=0+1}{\psk@ThreeDplot@yPlotpoints}{%
     \ifPst@hiddenLine\pscustom[style=hiddenStyle]{\fi%
     \@nameuse{beginplot@\psplotstyle}%