7 files changed, 29 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/Changes b/Master/texmf-dist/doc/generic/pst-3dplot/Changes
index 0307d0b1103..c1d65fdfb65 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.07  2021-09-23  - fix for lualatex and color values on PS level
 2.06  2020-10-25  - fix for \pstThreeDDot and parameter setting
 2.05  2020-08-04  - fix for hiddenLine
 2.04  2017-04-05  - added coorType=7
diff --git a/Master/texmf-dist/doc/generic/pst-3dplot/README b/Master/texmf-dist/doc/generic/pst-3dplot/README
index e8da34a1684..54f149e557e 100644
--- a/Master/texmf-dist/doc/generic/pst-3dplot/README
+++ b/Master/texmf-dist/doc/generic/pst-3dplot/README
@@ -13,3 +13,6 @@ dimensional graphical objects. pst-3dplot is similiar to the
 pst-plot package for two dimensional objects and mathematical functions.
 
 
+%% This program can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License Distributed from CTAN archives
+%% in directory macros/latex/base/lppl.txt.
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 214aa490220..add73a66651 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 198e93b4c82..7720ed10951 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,8 +1,11 @@
 \input{pst-3dplot-doc.dat}
 
-%% $Id: pst-3dplot-doc.tex 32 2020-10-25 19:18:25Z herbert $
-\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings,
-    headexclude,footexclude,oneside,dvipsnames,svgnames]{pst-doc}
+%% $Id: pst-3dplot-doc.tex 198 2021-09-08 16:11:30Z herbert $
+\errorcontextlines=100
+\RequirePackage{pdfmanagement-testphase}
+\DeclareDocumentMetadata{}
+\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
+    headinclude=false,footinclude=false,twoside,english]{pst-doc}
 \listfiles
 
 \usepackage{pst-grad,pst-3dplot}
@@ -43,7 +46,7 @@
 \date{\today}
 \title{3D plots: pst-3dplot}
 \subtitle{A PSTricks package for drawing 3d objects,  v\pstFV}
-\maketitle
+\settitle
 
 \tableofcontents
 
@@ -1349,6 +1352,8 @@ If you are looking from behind, then change the order of the ditection vectors:
 The origin vector $\vec{o}$ determines the left corner of the box.
 
 
+
+
 \begin{LTXexample}[width=6.25cm]
 \begin{pspicture}(-3,-2)(3,5)
 \psset{Alpha=2,Beta=10}
@@ -1357,6 +1362,9 @@ The origin vector $\vec{o}$ determines the left corner of the box.
 \end{pspicture}
 \end{LTXexample}
 
+
+\end{document}
+
 \begin{LTXexample}[width=6.25cm]
 \begin{pspicture}(-3,-3)(3,3)
 \psset{Beta=50}
@@ -1376,6 +1384,7 @@ The origin vector $\vec{o}$ determines the left corner of the box.
 
 
 
+
 \begin{LTXexample}[width=6.25cm]
 \psset{Beta=10,xyzLight=-7 3 4}
 \begin{pspicture}(-3,-2)(3,4)
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 dbcb6883ada..3a9189b5c5f 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 32 2020-10-25 19:18:25Z herbert $
+%% $Id: pst-3dplot.tex 266 2021-09-24 19:02:30Z herbert $
 %%
 %% This is file `pst-3dplot.tex',
 %%
@@ -27,9 +27,9 @@
 \ifx\PSTMultidoLoaded\endinput\else \input multido.tex\fi
 \ifx\PSTXKeyLoaded\endinput\else    \input pst-xkey \fi
 %
-\def\fileversion{2.06}
+\def\fileversion{2.07}
 \let\IIIDplotfileversion\fileversion
-\def\filedate{2020/10/25}
+\def\filedate{2021/09/23}
 \let\IIIDplotfiledate\filedate
 \message{`PST-3dplot' v\fileversion, \filedate\space (HV,DL)}
 %
@@ -1334,8 +1334,8 @@
   \pst@3ddict /vZ ED /vY ED /vX ED 
   /pas 0.5 def
   /pas10 pas 10 div def
-  /cmyk {} def   % we need only the values
-  \psk@ThreeDplot@SegmentColor\space 
+%  /cmyk {} def   % we need only the values
+   \psgetCMYKColorValues{\psk@ThreeDplot@SegmentColor} 
 %  \psk@ThreeDplot@xyzLight\space          % xLight yLight zLight
 %
   /calculate2DPoint { % four values on stack; x2D y2D are returned
@@ -1397,8 +1397,8 @@
   #1 \pst@number\psunit mul #2 \pst@number\psunit mul #3 \pst@number\psunit mul  
   #4 \pst@number\psunit mul
   \psk@ThreeDplot@increment\space
-  /cmyk {} def   % we need only the values
-  \psk@ThreeDplot@SegmentColor\space 
+%  /cmyk {} def   % we need only the values
+   \psgetCMYKColorValues{\psk@ThreeDplot@SegmentColor} 
   tx@3DPlotDict begin 
     \IIIDplot@variables 
     \tx@setTransparency 
@@ -1509,8 +1509,8 @@
   \pst@number\pst@dimb \pst@number\psyunit div  % Height
   \psk@ThreeDplot@increment			% angle increment
   \psk@ThreeDplot@Hincrement			% height increment
-  /cmyk {} def   % we need only the values
-  \psk@ThreeDplot@SegmentColor\space 
+%  /cmyk {} def   % we need only the values
+   \psgetCMYKColorValues{\psk@ThreeDplot@SegmentColor} 
 %
     \tx@3DPlotDict
     \tx@setTransparency 
@@ -1573,8 +1573,8 @@
   \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
-  /cmyk {} def   % we need only the values
-  \psk@ThreeDplot@SegmentColor\space 
+%  /cmyk {} def   % we need only the values
+   \psgetCMYKColorValues{\psk@ThreeDplot@SegmentColor} 
 %
   /PlaneSequence [ \psk@ThreeD@PlaneSequence ] def
   /ConvBox2d { 	% on stack x y z
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 607847f5e17..f1887faf11d 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -313,7 +313,7 @@ my @TLP_working = qw(
     fetamont fetchcls
     feupphdteses fewerfloatpages feyn feynmf feynmp-auto
     ffcode ffslides fge fgruler
-    fibeamer fifinddo-info fifo-stack
+    fifinddo-info fifo-stack
     fig4latex figbas figbib figchild figflow figsize
     filecontents filecontentsdef filedate filehook fileinfo filemod
     findhyph fink finstrut fira firamath firamath-otf
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index 32609780c60..474cdc1ac2f 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -468,7 +468,6 @@ depend fewerfloatpages
 depend ffcode
 depend ffslides
 depend fgruler
-depend fibeamer
 depend fifo-stack
 depend figsize
 depend filecontents