pst-ob3d (24mar20)

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

7 files changed, 19 insertions, 68 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-ob3d/Changes b/Master/texmf-dist/doc/generic/pst-ob3d/Changes
index 11e67d939d1..644d2979023 100644
--- a/Master/texmf-dist/doc/generic/pst-ob3d/Changes
+++ b/Master/texmf-dist/doc/generic/pst-ob3d/Changes
@@ -1,4 +1,5 @@
 pst-ob3d.dtx --------
+0.22  2020-03-24   Load pst-tools for the random macros (hv)
 0.21  2007-08-22   Updated the style file (hv)
 0.20  2006-11-25   First CTAN release
 0.12  2004-09-29   small fix to the latex-wrapper part (hv)
diff --git a/Master/texmf-dist/doc/generic/pst-ob3d/README b/Master/texmf-dist/doc/generic/pst-ob3d/README
index 97c6faa903d..4ed8eef30b4 100644
--- a/Master/texmf-dist/doc/generic/pst-ob3d/README
+++ b/Master/texmf-dist/doc/generic/pst-ob3d/README
@@ -10,5 +10,7 @@ Run the Makefile or alternative:
 * Run "latex" on pst-ob3d.dtx to generate the documentation
 
 * This is a PSTricks (PostScript Tricks) package, which won't
-  run with pdftex. In this case go to http://PSTricks.de/
+  run with pdftex. In this case go to http://PSTricks.tug.org/
   for some help.
+
+hvoss@tug.org
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/generic/pst-ob3d/pst-ob3d.pdf b/Master/texmf-dist/doc/generic/pst-ob3d/pst-ob3d.pdf
index 73cc90e5c37..d93853a2c20 100644
--- a/Master/texmf-dist/doc/generic/pst-ob3d/pst-ob3d.pdf
+++ b/Master/texmf-dist/doc/generic/pst-ob3d/pst-ob3d.pdf
diff --git a/Master/texmf-dist/source/generic/pst-ob3d/Makefile b/Master/texmf-dist/source/generic/pst-ob3d/Makefile
deleted file mode 100644
index 20d023689b9..00000000000
--- a/Master/texmf-dist/source/generic/pst-ob3d/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-
-# `Makefile' for `pst-ob3d.pdf', hv, 2006/08/11
-
-.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
-
-MAIN = pst-ob3d
-
-LATEX = latex
-
-ARCHNAME = $(MAIN)-$(shell date +%y%m%d)
-
-ARCHFILES = $(MAIN).dtx $(MAIN).ins Makefile
-
-all : $(MAIN).sty doc clean
-
-$(MAIN).sty : $(MAIN).dtx
-%.sty : %.dtx
-	tex $(basename $<).ins
-
-doc: $(MAIN).pdf
-
-$(MAIN).pdf : $(MAIN).ps
-	GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $<
-
-$(MAIN).ps : $(MAIN).dvi
-	dvips $<
-
-$(MAIN).dvi : $(MAIN).dtx
-	$(LATEX) $<
-	if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi
-	if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi
-	makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \
-	  $(basename $<).glo
-	makeindex -s gind.ist -t $(basename $<).ilg -o $(basename $<).ind \
-	  $(basename $<).idx
-	$(LATEX) $<
-
-clean : 
-	$(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out)
-	$(RM) $(addprefix $(MAIN), .dvi .ps)
-
-veryclean : clean
-	$(RM) $(MAIN).pdf
-
-arch :
-	zip $(ARCHNAME).zip $(ARCHFILES)
-
-# EOF
diff --git a/Master/texmf-dist/source/generic/pst-ob3d/pst-ob3d.dtx b/Master/texmf-dist/source/generic/pst-ob3d/pst-ob3d.dtx
index 05f0fdb74fb..1484d181bbb 100644
--- a/Master/texmf-dist/source/generic/pst-ob3d/pst-ob3d.dtx
+++ b/Master/texmf-dist/source/generic/pst-ob3d/pst-ob3d.dtx
@@ -5,7 +5,7 @@
 %% Denis Girou (CNRS/IDRIS - France) <Denis.Girou@idris.fr>
 %% Herbert Voss <hvoss@tug.org>
 %%
-%% August 22, 2007
+%% Mar 24, 2020
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License Distributed from CTAN archives
@@ -17,6 +17,7 @@
 %%
 % \fi
 %
+% \changes{v0.22}{2020/03/24}{Load pst-tools for random numbers}
 % \changes{v0.21}{2007/08/22}{Updated the style file}
 % \changes{v0.20}{2006/11/25}{First CTAN release}
 % \changes{v0.11 Beta}{2002/05/09}{Fourth packaged release.}
@@ -236,7 +237,7 @@
 %         Scientifique --- Orsay --- France ---
 %         \protect\url{Denis.Girou@idris.fr}.} \and 
 %	Herbert Vo\ss\thanks{\protect\url{hvoss@tug.org} for the \texttt{CTAN} Version}}
-% \date{Version 0.21\\August 22, 2007}
+% \date{Version 0.22\\March 24, 2020}
 %
 % \maketitle
 %
@@ -777,8 +778,8 @@
 %   Who we are.
 %
 %    \begin{macrocode}
-\def\fileversion{0.21}
-\def\filedate{2007/08/22}
+\def\fileversion{0.22}
+\def\filedate{2020/03/24}
 \message{`Pst-Objects3d' v\fileversion, \filedate\space (DG,hv)}
 \csname PstObjectsThreeDLoaded\endcsname
 \let\PstObjectsThreeDLoaded\endinput
@@ -787,15 +788,10 @@
 %   Require the PSTricks, `\textsf{pst-3d}', and `\textsf{pst-xkey}' packages.
 %
 %    \begin{macrocode}
-\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
+\ifx\PSTXKeyLoaded\endinput\else  \input pst-xkey \fi 
+\ifx\PSTricksLoaded\endinput\else \input pstricks.tex\fi
 \ifx\PSTthreeDLoaded\endinput\else\input pst-3d.tex\fi
-\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi 
-%    \end{macrocode}
-%
-%   Donald \textsc{Arseneau} package for random number generation.
-%
-%    \begin{macrocode}
-\input random.tex
+\ifx\PSTtoolsLoaded\endinput\else \input pst-tools \fi
 %    \end{macrocode}
 %
 %   Catcodes changes.
diff --git a/Master/texmf-dist/tex/generic/pst-ob3d/pst-ob3d.tex b/Master/texmf-dist/tex/generic/pst-ob3d/pst-ob3d.tex
index 3bd16decf80..1de52e2906a 100644
--- a/Master/texmf-dist/tex/generic/pst-ob3d/pst-ob3d.tex
+++ b/Master/texmf-dist/tex/generic/pst-ob3d/pst-ob3d.tex
@@ -26,7 +26,7 @@
 %% Denis Girou (CNRS/IDRIS - France) <Denis.Girou@idris.fr>
 %% Herbert Voss <hvoss@tug.org>
 %%
-%% August 22, 2007
+%% Mar 24, 2020
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License Distributed from CTAN archives
@@ -36,15 +36,15 @@
 %%   `pst-ob3d' is a PSTricks package to draw basic three dimensional
 %%   objects with various customizations.
 %%
-\def\fileversion{0.21}
-\def\filedate{2007/08/22}
+\def\fileversion{0.22}
+\def\filedate{2020/03/24}
 \message{`Pst-Objects3d' v\fileversion, \filedate\space (DG,hv)}
 \csname PstObjectsThreeDLoaded\endcsname
 \let\PstObjectsThreeDLoaded\endinput
-\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
+\ifx\PSTXKeyLoaded\endinput\else  \input pst-xkey \fi
+\ifx\PSTricksLoaded\endinput\else \input pstricks.tex\fi
 \ifx\PSTthreeDLoaded\endinput\else\input pst-3d.tex\fi
-\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi
-\input random.tex
+\ifx\PSTtoolsLoaded\endinput\else \input pst-tools \fi
 \edef\PstAtCode{\the\catcode`\@}
 \catcode`\@=11\relax
 \pst@addfams{pst-ob3d}
diff --git a/Master/texmf-dist/tex/latex/pst-ob3d/pst-ob3d.sty b/Master/texmf-dist/tex/latex/pst-ob3d/pst-ob3d.sty
index a6593d1ed58..a9fc0676f39 100644
--- a/Master/texmf-dist/tex/latex/pst-ob3d/pst-ob3d.sty
+++ b/Master/texmf-dist/tex/latex/pst-ob3d/pst-ob3d.sty
@@ -26,7 +26,7 @@
 %% Denis Girou (CNRS/IDRIS - France) <Denis.Girou@idris.fr>
 %% Herbert Voss <hvoss@tug.org>
 %%
-%% August 22, 2007
+%% Mar 24, 2020
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License Distributed from CTAN archives