pst-solides3d (12dec16)

git-svn-id: svn://tug.org/texlive/trunk@42686 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2016-12-12 22:52:09 +0000
committer: Karl Berry <karl@freefriends.org> 2016-12-12 22:52:09 +0000
commit: 5440276d0dda2eb514887c87b7d9ab67c49d6a85 (patch)
tree: d049310bacc13fea75165368176f70542756a5e6 /Master/texmf-dist
parent: bb25bb8b4c057e717bace5e04140c0a0c4a75b88 (diff)
139 files changed, 649 insertions, 173 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/Changes b/Master/texmf-dist/doc/generic/pst-solides3d/Changes
index 92a5cbb3427..dae458719e2 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/Changes
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/Changes
@@ -1,4 +1,6 @@
 pst-solides3d.tex --- 
+4.31 2016-12-08  - added macro psImplicitSurface for F(x,y,z)=0
+                 - added pro file pst-implicitplot.pro
 4.30 2015-12-17  - use linewidth in object line (pst-solides3d)
 4.29 2015-06-28  - \psSolid now uses \pst@prepscode and \pst@postpscode 
 4.28 2014-09-05  - use mathLabel for \gridIIID 
@@ -23,10 +25,11 @@ pst-solides3d.tex ---
 
 
 pst-solides3d.sty --- 
+2016-12-10 - added message for pst-implicitplot.pro
 2009-07-25 - current version (hv)
 
 
-solides.pro --- 
+pst-solides.pro --- 
 4.23 2014-06-07  - added Rotations Sequence (ML) 
 4.22 2012-12-18  - translate french color names to english
 4.21 2011-07-13  - take value of resolution into account
@@ -39,4 +42,7 @@ solides.pro ---
 4.12 2008-10-21  - Correction bug sur newparallelepiped (jpv)
 
 
+pst-implicitsurface.pro --- 
+0.01 2016-12-10  - first version 
+
 
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/README b/Master/texmf-dist/doc/generic/pst-solides3d/README
index 4f01a6b55f4..c6c4688cad9 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/README
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/README
@@ -3,7 +3,7 @@
 %% Manuel Luque, Arnaud Schmittbuhl,Jean-Paul Vignault,Jürgen Gilg,
 %% Jean-Michel Sarlat, and Herbert Voss 
 %%
-%% 2016
+%% 2017
 %%
 
 If you are unable to install this package by your package manager
@@ -11,7 +11,8 @@ of the TeX distribution, save the files
 
 pst-solides3d.sty
 pst-solides3d.tex
-solides3d.pro
+pst-solides3d.pro
+pst-implicitsurface.pro
 
 in any place, where latex or any other TeX program will find it.
 If you like to get the documentation file in another format run 
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/Pyramid-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/Pyramid-couleurs.dat
index 10e63400ed9..10e63400ed9 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/Pyramid-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/Pyramid-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/Pyramid-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/Pyramid-faces.dat
index f7c22b10c3d..f7c22b10c3d 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/Pyramid-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/Pyramid-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/Pyramid-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/Pyramid-io.dat
index a36e8419282..a36e8419282 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/Pyramid-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/Pyramid-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/Pyramid-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/Pyramid-sommets.dat
index e2833cd2eb8..e2833cd2eb8 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/Pyramid-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/Pyramid-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/cubeHexagone-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/cubeHexagone-couleurs.dat
index 6338c59f8d0..6338c59f8d0 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/cubeHexagone-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/cubeHexagone-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/cubeHexagone-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/cubeHexagone-faces.dat
index b21b44fb7f6..b21b44fb7f6 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/cubeHexagone-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/cubeHexagone-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/cubeHexagone-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/cubeHexagone-io.dat
index 27f7ff02f2e..27f7ff02f2e 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/cubeHexagone-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/cubeHexagone-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/cubeHexagone-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/cubeHexagone-sommets.dat
index 857d598aa6c..857d598aa6c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/cubeHexagone-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/cubeHexagone-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/cubecolor-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/cubecolor-couleurs.dat
index d4de66278c1..d4de66278c1 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/cubecolor-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/cubecolor-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/cubecolor-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/cubecolor-faces.dat
index 8f7f196800c..8f7f196800c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/cubecolor-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/cubecolor-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/cubecolor-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/cubecolor-io.dat
index 37bf237daf3..37bf237daf3 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/cubecolor-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/cubecolor-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/cubecolor-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/cubecolor-sommets.dat
index 594638cf953..594638cf953 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/cubecolor-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/cubecolor-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/faces_nefer.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/faces_nefer.dat
index a3dae0aa7e2..a3dae0aa7e2 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/faces_nefer.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/faces_nefer.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/faces_nefer_levres.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/faces_nefer_levres.dat
index 19dec09e906..19dec09e906 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/faces_nefer_levres.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/faces_nefer_levres.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/faces_nefer_sourcils.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/faces_nefer_sourcils.dat
index d462760f754..d462760f754 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/faces_nefer_sourcils.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/faces_nefer_sourcils.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/faces_nefer_yeux.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/faces_nefer_yeux.dat
index 5f6f8809088..5f6f8809088 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/faces_nefer_yeux.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/faces_nefer_yeux.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/fusee62-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/fusee62-couleurs.dat
index ff0a2f86d82..ff0a2f86d82 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/fusee62-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/fusee62-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/fusee62-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/fusee62-faces.dat
index d3bbe3b94d0..d3bbe3b94d0 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/fusee62-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/fusee62-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/fusee62-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/fusee62-io.dat
index f4305c8e0a0..f4305c8e0a0 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/fusee62-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/fusee62-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/fusee62-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/fusee62-sommets.dat
index e929c1b8ca4..e929c1b8ca4 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/fusee62-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/fusee62-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/geodedual44-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/geodedual44-couleurs.dat
index 4c15d20a0bb..4c15d20a0bb 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/geodedual44-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/geodedual44-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/geodedual44-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/geodedual44-faces.dat
index 619bedce90c..619bedce90c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/geodedual44-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/geodedual44-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/geodedual44-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/geodedual44-io.dat
index bddf046eaeb..bddf046eaeb 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/geodedual44-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/geodedual44-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/geodedual44-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/geodedual44-sommets.dat
index cff3eb81b26..cff3eb81b26 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/geodedual44-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/geodedual44-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/horoptere-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/horoptere-couleurs.dat
index 6e14f9ddc16..6e14f9ddc16 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/horoptere-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/horoptere-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/horoptere-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/horoptere-faces.dat
index 41b430437f1..41b430437f1 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/horoptere-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/horoptere-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/horoptere-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/horoptere-io.dat
index 7135bda4823..7135bda4823 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/horoptere-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/horoptere-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/horoptere-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/horoptere-sommets.dat
index e70fb3bd063..e70fb3bd063 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/horoptere-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/horoptere-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/paraboloid-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/paraboloid-couleurs.dat
index 1eaf3d68507..1eaf3d68507 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/paraboloid-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/paraboloid-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/paraboloid-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/paraboloid-faces.dat
index 6cbc64161b7..6cbc64161b7 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/paraboloid-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/paraboloid-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/paraboloid-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/paraboloid-io.dat
index 1bb84d3de28..1bb84d3de28 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/paraboloid-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/paraboloid-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/paraboloid-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/paraboloid-sommets.dat
index ad3b56f4d56..ad3b56f4d56 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/paraboloid-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/paraboloid-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/rocket.obj b/Master/texmf-dist/doc/generic/pst-solides3d/data/rocket.obj
index 4ecc0d252f2..4ecc0d252f2 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/rocket.obj
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/rocket.obj
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/slicePyramid-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/slicePyramid-couleurs.dat
index 31df6430d76..31df6430d76 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/slicePyramid-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/slicePyramid-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/slicePyramid-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/slicePyramid-faces.dat
index 8b2edcbc3fb..8b2edcbc3fb 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/slicePyramid-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/slicePyramid-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/slicePyramid-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/slicePyramid-io.dat
index f391be39b0b..f391be39b0b 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/slicePyramid-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/slicePyramid-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/slicePyramid-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/slicePyramid-sommets.dat
index 586409421f6..586409421f6 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/slicePyramid-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/slicePyramid-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/sommets_nefer.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/sommets_nefer.dat
index ecdc368742f..ecdc368742f 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/sommets_nefer.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/sommets_nefer.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/sommets_nefer0.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/sommets_nefer0.dat
index ecdc368742f..ecdc368742f 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/sommets_nefer0.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/sommets_nefer0.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1836-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1836-couleurs.dat
index 5da771beaef..5da771beaef 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1836-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1836-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1836-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1836-faces.dat
index b634a183b0c..b634a183b0c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1836-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1836-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1836-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1836-io.dat
index 74d7e54460c..74d7e54460c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1836-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1836-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1836-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1836-sommets.dat
index a178619ff58..a178619ff58 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1836-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1836-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860-couleurs.dat
index f36da37a1d5..f36da37a1d5 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860-faces.dat
index 5ff8eb92fc8..5ff8eb92fc8 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860-io.dat
index 9a456f7439c..9a456f7439c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860-sommets.dat
index 275af85daf8..275af85daf8 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860lemniscate-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860lemniscate-couleurs.dat
index f2d20fcdbcb..f2d20fcdbcb 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860lemniscate-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860lemniscate-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860lemniscate-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860lemniscate-faces.dat
index 1d73d567337..1d73d567337 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860lemniscate-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860lemniscate-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860lemniscate-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860lemniscate-io.dat
index 34953e4e77c..34953e4e77c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860lemniscate-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860lemniscate-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860lemniscate-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860lemniscate-sommets.dat
index 78ca14048aa..78ca14048aa 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860lemniscate-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860lemniscate-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860ovales-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860ovales-couleurs.dat
index 9dbe8bd74bc..9dbe8bd74bc 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860ovales-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860ovales-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860ovales-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860ovales-faces.dat
index 9b4f939da22..9b4f939da22 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860ovales-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860ovales-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860ovales-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860ovales-io.dat
index a71f32c9d6d..a71f32c9d6d 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860ovales-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860ovales-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860ovales-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860ovales-sommets.dat
index 3ed05ae4969..3ed05ae4969 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860ovales-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860ovales-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860part-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860part-couleurs.dat
index bed7d705411..bed7d705411 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860part-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860part-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860part-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860part-faces.dat
index 87ade361b57..87ade361b57 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860part-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860part-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860part-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860part-io.dat
index 06ba3eeca2e..06ba3eeca2e 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860part-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860part-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860part-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860part-sommets.dat
index 97d067acf79..97d067acf79 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/data/tore1860part-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/data/tore1860part-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/images/kepler.eps b/Master/texmf-dist/doc/generic/pst-solides3d/images/kepler.eps
index 8fe19decfec..8fe19decfec 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/images/kepler.eps
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/images/kepler.eps
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/images/parrot.eps b/Master/texmf-dist/doc/generic/pst-solides3d/images/parrot.eps
index db66fc7df4f..db66fc7df4f 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/images/parrot.eps
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/images/parrot.eps
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/images/tiger.eps b/Master/texmf-dist/doc/generic/pst-solides3d/images/tiger.eps
index 70d6124a420..70d6124a420 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/images/tiger.eps
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/images/tiger.eps
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/pst-solides3d-doc.bib b/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.bib
index 5ca018bf7ec..729db47e5be 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/pst-solides3d-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.bib
@@ -32,10 +32,10 @@
 @Book{PSTricks2,
   author	= {Herbert Vo\ss{}},
   title		= {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
-  edition	= {6.},
+  edition	= {7.},
   publisher	= {DANTE -- Lehmanns},
-  year		= {2010},
-  address	= {Heidelberg/Hamburg}
+  year		= {2016},
+  address	= {Heidelberg/Berlin}
 }
 
 @Book{PSTricksE,
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdf b/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdf
index 5fd5dbbed11..4d6cf9741d8 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/pst-solides3d-doc.tex b/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.tex
index d0666f4b990..1c540b10743 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/pst-solides3d-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.tex
@@ -1,9 +1,6 @@
 \listfiles % Writes out the package versions in the log file
 \documentclass[%
     11pt,           % normal font size  (default, alias for fontsize=11pt)
-    BCOR=10mm,       % binding correction (deprecated, use: BCOR=10mm)
-    DIV12,          % divison factor for page layout contrution
-                    % (deprecated, use: DIV=12)
     bibtotoc,       % add unnumbered entry for the bibliography to the table
                     % of contents (deprecated, use: toc=bibliography or
                     % bibliography=totoc)
@@ -16,32 +13,18 @@
                     % (deprecated, use: headings=small)
     1.1headlines,   % set head height to 1.1\baselineskip of \normalsize
                     % (deprecated, use: headlines=1.1)
-    headinclude=false,    % page head is part of the margins not the type area
-                    % (default, deprecated, use: headinclude=false)
-    footinclude=false,    % page foot is part of the margins not the type area
-                    % (default, deprecated, use: footinclude=false)
-    mpinclude=false       % margin notes are part of the margins not the type area
-                    % (default, deprecated, use: mpinclude=false)
     ]{scrbook}
 
+
 %\graphicspath{{images/}}
-\usepackage{iftex}
-\ifXeTeX
-  \usepackage{amsmath,amssymb} % allows multiple maths-environments
-  \usepackage{unicode-math}
-  \usepackage{libertine}
-  \setmonofont[Scale=0.81]{Bitstream Vera Sans Mono}
-  \setmathfont{XITS Math}
-\else
   \usepackage[utf8]{inputenc}
   \usepackage[T1]{fontenc}
   \usepackage[scale=0.95]{tgpagella}
   \usepackage[scale=0.92]{tgheros}
   \usepackage[scaled=0.83]{beramono}
   \usepackage{amsmath,amssymb} % allows multiple maths-environments
-\fi
 \usepackage[a4paper,hmargin=2cm,vmargin=3cm]{geometry}    % Flexible and complete interface to document dimensions
-\usepackage{scrpage2}
+\usepackage{scrlayer-scrpage}
 \pagestyle{scrheadings}
 \usepackage{makeidx}
 \makeindex
@@ -65,7 +48,8 @@
 %%%%%%%
 %%%%%%% Loading the necessary graphic packages
 \usepackage[dvipsnames,svgnames,x11names,prologue,table]{pstricks} % Loads 'PSTricks' and xcolor
-                                           % with predefined color schemes from 'xcolor'
+
+%\usepackage{animate}
 \usepackage{showexpl}   % Typesetting LaTeX source code
 \usepackage{pst-plot}  % Macros for plotting functions and data records
 \usepackage{pst-eucl}  % The 'pst-eucl' package allow the drawing of Euclidean geometric
@@ -250,23 +234,6 @@ Apricot&Aquamarine&Bittersweet&Black&Blue&BlueGreen&BlueViolet&BrickRed&Brown&Bu
     rframe={}%
 }
 
-%%%%%%%
-%%%%%%% Title Page
-\title{\texttt{pst-solides3d}:\\
-       The Documentation -- The Basics
-        \\[0.5cm]
-{\normalsize v. \PSTfileversion\ (\PSTfiledate)}\\[20pt]
-\includegraphics[scale=0.6]{images/kepler}}
-\author{Jean-Paul Vignault\thanks{\url{<jpv@melusine.eu.org>}}
-\and Manuel Luque\thanks{\url{<manuel.luque27@gmail.com>}}
-\and Arnaud Schmittbuhl\thanks{\url{<aschmittbuhl@libertysurf.fr>}}
-\and Jürgen Gilg\thanks{\url{<gilg@acrotex.net>}}
-\and Jean-Michel Sarlat\thanks{\url{<jm.sarlat@gmail.com>}}
-\and Herbert Voß\thanks{\url{<herbert.voss@fu-berlin.de>}}}
-\date{\today}
-
-
-
 \usepackage[
 % colors for the links
    colorlinks=true,         % color links
@@ -303,7 +270,7 @@ Apricot&Aquamarine&Bittersweet&Black&Blue&BlueGreen&BlueViolet&BrickRed&Brown&Bu
    pdfpagemode=UseOutlines, % Show Bookmarks in the Viewer
    pdfpagelabels=true       % set PDF page labels
    }
-\ifXeTeX\else\usepackage{breakurl}\fi   % Line-breakable \url-like links in hyperref when compiling via dvips/ps2pdf
+\usepackage{breakurl}   % Line-breakable \url-like links in hyperref when compiling via dvips/ps2pdf
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%% Herbert %%%%%%%%%%%%%%%%%%%%%%%%%%
 \pagestyle{scrheadings}
@@ -319,10 +286,27 @@ Apricot&Aquamarine&Bittersweet&Black&Blue&BlueGreen&BlueViolet&BrickRed&Brown&Bu
   \index{#1@\texttt{#1}}\index{Value!#1@\texttt{#1}}}
 \def\Index#1{#1\index{#1}}
 
+
+%%%%%%%
+%%%%%%% Title Page
+\title{\texttt{pst-solides3d}:\\
+       The Documentation -- The Basics
+        \\[0.5cm]
+{\normalsize v. \PSTfileversion\ (\PSTfiledate)}\\[20pt]
+%\includegraphics[scale=0.6]{images/kepler}
+}
+\author{Jean-Paul Vignault\thanks{\protect\url{<jpv@melusine.eu.org>}}
+\and Manuel Luque\thanks{\protect\url{<manuel.luque27@gmail.com>}}
+\and Arnaud Schmittbuhl\thanks{\protect\url{<aschmittbuhl@libertysurf.fr>}}
+\and Jürgen Gilg\thanks{\protect\url{<gilg@acrotex.net>}}
+\and Jean-Michel Sarlat\thanks{\protect\url{<jm.sarlat@gmail.com>}}
+\and Herbert Voß\thanks{\protect\url{<herbert.voss@fu-berlin.de>}}}
+\date{\today}
+
 \begin{document}
 \maketitle
 
-\tableofcontents
+%\tableofcontents
 
 \newpage
 
@@ -337,6 +321,10 @@ Apricot&Aquamarine&Bittersweet&Black&Blue&BlueGreen&BlueViolet&BrickRed&Brown&Bu
 \Input{par-eclairageponctuel-en}
 \Input{par-axes3D-en}
 
+
+
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -399,6 +387,9 @@ Apricot&Aquamarine&Bittersweet&Black&Blue&BlueGreen&BlueViolet&BrickRed&Brown&Bu
 \chapter{Surfaces defined by a function of the form $z=f(x,y)$}
 \Input{par-surfaces-en}
 
+\clearpage
+\Input{par-implicitsurface-en}%% hc 2016-12-11
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \chapter{Advanced usage}
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/Letter.ist b/Master/texmf-dist/doc/generic/pst-solides3d/src/Letter.ist
deleted file mode 100644
index a6da86bc349..00000000000
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/Letter.ist
+++ /dev/null
@@ -1,36 +0,0 @@
-%%
-%% This is file `Letter.ist',
-%%
-%% The idea is from Ingo Kloeckl, Latex2e:
-%% Herbert Voss 000726
-%% 
-%% This is a MAKEINDEX style file which should be used to
-%% generate the formatted change history for use with the doc
-%% package. The TeX commands used below are defined in
-%% doc.sty.  The commands for MAKEINDEX like `level'
-%% `item_x1' are described in `` Makeindex, A General
-%% Purpose, Formatter-Independent Index Processor'' by
-%% Pehong Chen.
-%%
-headings_flag       1		% headings yes
-heading_prefix   "\\textbf{" 	% boldfont
-heading_suffix   "}\n"		% newline
-quote		'"'
-%%level		'>'
-preamble
-  "\\begin{theindex}\n"
-item_1
-  "\\par\\leavevmode\\hangindent10pt\\makebox[10pt][l]{--}"
-item_01
-  "\\par\\leavevmode\\hangindent10pt\\makebox[10pt][l]{--}"
-item_x1
-  "\\par\\leavevmode\\hangindent10pt\\makebox[10pt][l]{--}"
-item_2
-  "\\par\\leavevmode\\hangindent20pt\\makebox[20pt][l]{-- -- }"
-item_12
-  "\\par\\leavevmode\\hangindent20pt\\makebox[20pt][l]{-- -- }"
-item_x2
-  "\\par\\leavevmode\\hangindent20pt\\makebox[20pt][l]{-- -- }"
-%% 
-%%
-%% End of file `Letter.ist'.
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/Makefile b/Master/texmf-dist/doc/generic/pst-solides3d/src/Makefile
deleted file mode 100644
index d72d2f55f99..00000000000
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-
-# `Makefile' for `pst-3dplot.pdf', hv, 2007/03/17
-
-.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
-
-PACKAGE = pst-solides3d
-
-MAIN = $(PACKAGE)-doc
-
-TDS = ~/Links/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 -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -dAutoRotatePages=/All -sOutputFile=$(MAIN).pdf -dNOSAFER -c .setpdfwrite -f $(MAIN).ps
-#	GS_OPTIONS="-dAutoRotatePages=/None -dNoSAFER" ps2pdf $<
-	mv $(MAIN).pdf ..
-
-$(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) $<
-
-clean : 
-	$(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .Roessler .bbl )
-	$(RM) $(addprefix $(MAIN), .dvi .ps .xcp .brf)
-	$(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 Letter.ist $(TDS)/source/$(PACKAGE)/
-	cp -uR text $(TDS)/source/$(PACKAGE)/
-	cp -uR data $(TDS)/source/$(PACKAGE)/
-	cp -uR images $(TDS)/source/$(PACKAGE)/
-	cp -u Makefile    $(TDS)/source/$(PACKAGE)/
-
-
-# EOF
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/chapter-1-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/chapter-1-en.tex
index 2b242dd85d9..2b242dd85d9 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/chapter-1-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/chapter-1-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/chapter-2-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/chapter-2-en.tex
index ea4f40130fa..ea4f40130fa 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/chapter-2-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/chapter-2-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-acknowledgements-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-acknowledgements-en.tex
index 5083c50db02..5083c50db02 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-acknowledgements-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-acknowledgements-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-affinage-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-affinage-en.tex
index d227922dc96..d227922dc96 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-affinage-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-affinage-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-anneaux-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-anneaux-en.tex
index d5707139cd4..d5707139cd4 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-anneaux-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-anneaux-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-annoterschema-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-annoterschema-en.tex
index c9ffc38d205..c9ffc38d205 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-annoterschema-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-annoterschema-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-axes3D-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-axes3D-en.tex
index 97ffe24497e..97ffe24497e 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-axes3D-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-axes3D-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-chanfrein-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-chanfrein-en.tex
index c44e0a2e932..c44e0a2e932 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-chanfrein-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-chanfrein-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-codejps-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-codejps-en.tex
index f484a845a8c..f484a845a8c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-codejps-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-codejps-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-colorierfacettes-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-colorierfacettes-en.tex
index 0971fab7e7e..0971fab7e7e 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-colorierfacettes-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-colorierfacettes-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-commandestrace-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-commandestrace-en.tex
index 939256bd115..939256bd115 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-commandestrace-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-commandestrace-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-couleurs-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-couleurs-en.tex
index ee33402a187..ee33402a187 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-couleurs-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-couleurs-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-courbeR3-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-courbeR3-en.tex
index b81d3af3207..b81d3af3207 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-courbeR3-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-courbeR3-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-cylindres-cones-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-cylindres-cones-en.tex
index 2f5c695d14e..4a8330bbccb 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-cylindres-cones-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-cylindres-cones-en.tex
@@ -180,7 +180,7 @@ distance between these two planes.
 \end{pspicture}
 \end{LTXexample}
 
-\subsection{Cone or \Index{conic area}}
+\subsection{Cone or conic area}
 This paragraph generalizes the  notion of a cone, or a conic
 area\footnote{This was written by
 Maxime \textsc{Chupin}, as the result of a question on the list
@@ -271,6 +271,6 @@ below, the routing curve is a parabolic arc, situated in the plane $z=-2$.
 be a plane horizontal curve, as the following example, written by Maxime
 \textsc{Chupin}, will show.}
 
-\centerline{\url{http://melusine.eu.org/lab/bpst/pst-solides3d/cone/cone-dir_02.pst}}
+\url{http://melusine.eu.org/lab/bpst/pst-solides3d/cone/cone-dir_02.pst}
 
 \endinput
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-datfile-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-datfile-en.tex
index 112592b4607..112592b4607 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-datfile-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-datfile-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-definirfonction-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-definirfonction-en.tex
index 91d8b208546..91d8b208546 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-definirfonction-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-definirfonction-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-definirplanquelconque-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-definirplanquelconque-en.tex
index 5d58437c67d..5d58437c67d 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-definirplanquelconque-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-definirplanquelconque-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-definitionmaillage-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-definitionmaillage-en.tex
index 0649345a7a1..0649345a7a1 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-definitionmaillage-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-definitionmaillage-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-eclairageponctuel-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-eclairageponctuel-en.tex
index 2a7423a4124..2a7423a4124 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-eclairageponctuel-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-eclairageponctuel-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-enleverfacettes-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-enleverfacettes-en.tex
index 584dda32490..584dda32490 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-enleverfacettes-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-enleverfacettes-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-extensions-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-extensions-en.tex
index d07b4ce825b..d07b4ce825b 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-extensions-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-extensions-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-face-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-face-en.tex
index 336a8e24599..336a8e24599 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-face-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-face-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-fusion-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-fusion-en.tex
index f53bed63614..f53bed63614 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-fusion-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-fusion-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-fusionjps-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-fusionjps-en.tex
index 0f6c965ee44..0f6c965ee44 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-fusionjps-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-fusionjps-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-geode-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-geode-en.tex
index 34e6104d6ff..34e6104d6ff 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-geode-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-geode-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-grille-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-grille-en.tex
index f69da2f468e..f69da2f468e 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-grille-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-grille-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-image2d-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-image2d-en.tex
index 72b5067426d..72b5067426d 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-image2d-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-image2d-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/text/par-implicitsurface-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-implicitsurface-en.tex
new file mode 100644
index 00000000000..1f697ad1e52
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-implicitsurface-en.tex
@@ -0,0 +1,137 @@
+
+\section{Implicit defined three dimensional function \textit{F(x,y,z)=0}}
+
+The command has the following syntax:
+\begin{verbatim}
+\psImplicitSurface[options](x0,y0,z0)
+\end{verbatim}
+
+The argument \texttt{(x0,y0,z0)} for the image offset is optional and preset with \texttt{(0,0,0)}
+The options are the same which apply to solids, and these additional ones:
+
+\begin{itemize}
+  \item \Lkeyword{algebraic}: this option allows you to write the implicit defined function $F(x,y,z)$ in
+algebraic notation; \texttt{pst-algparser.pro} contains the code \texttt{AlgToPs}.
+
+     \item \Lkeyword{XMinMax}: three values devided by a space: minimum maximum step;
+     \item \Lkeyword{YMinMax}: three values devided by a space: minimum maximum step;
+     \item \Lkeyword{ZMinMax}: three values devided by a space: minimum maximum step;
+     \item \Lkeyword{ImplFunction}: the function $F(x,y,z)=0$ where only $F(x,y,z)$ is written in
+	PostScript notation, or with the optional argument \Lkeyword{algebraic} in 
+    algebraic notation.
+\end{itemize}
+
+The internal PostScript code of \texttt{pst-implicitsurface.pro} is based on Paul Bourkes "'Polygonising a scalar field"`
+at \url{http://paulbourke.net/geometry/polygonise/}.
+
+
+
+
+\iffalse
+\small
+\begin{verbatim}
+\begin{animateinline}[controls,autoplay,loop,
+  begin={\begin{pspicture}(-6,-5)(6,4)},end={\end{pspicture}}]{5}
+  \multiframe{18}{iA=0+20}{%
+  \psset{lightsrc=viewpoint,viewpoint=40 \iA\space 15 rtp2xyz,Decran=50}
+  \psSolid[object=grille,base=-4 4 -4 4,ngrid=8 8,linecolor=black!10](0,0,-2)
+  \psImplicitSurface[
+    XMinMax=-2.0 2.0 0.15,YMinMax=-2.0 2.0 0.15,ZMinMax=-2.0 2.0 0.15,
+    algebraic,
+    ImplFunction=4*x^4+4*y^4+8*y^2*z^2+4*z^4+17*x^2*y^2+17*x^2*z^2-20*x^2-20*y^2-20*z^2+17,
+    fillcolor=cyan!20,hue=.1 .8 0.5 1,
+    linewidth=0.01pt]%
+}
+\end{animateinline}
+\end{verbatim}
+\normalsize
+
+\begin{animateinline}[controls,autoplay,loop,
+  begin={\begin{pspicture}(-6,-5)(6,4)},
+  end={\end{pspicture}}]{5}
+  \multiframe{18}{iA=0+20}{%
+  \psset{lightsrc=viewpoint,viewpoint=40 \iA\space 15 rtp2xyz,Decran=50}
+  \psSolid[object=grille,base=-4 4 -4 4,ngrid=8 8,linecolor=black!10](0,0,-2)
+  \psImplicitSurface[
+    XMinMax=-2.0 2.0 0.15,YMinMax=-2.0 2.0 0.15,ZMinMax=-2.0 2.0 0.15,
+    algebraic,
+    ImplFunction=4*x^4+4*y^4+8*y^2*z^2+4*z^4+17*x^2*y^2+17*x^2*z^2-20*x^2-20*y^2-20*z^2+17,
+    fillcolor=cyan!20,hue=.1 .8 0.5 1,
+    linewidth=0.01pt]%
+}
+\end{animateinline}
+\else
+\begin{LTXexample}[pos=t]
+\begin{pspicture}(-6,-5)(6,4)
+\psset{lightsrc=viewpoint,viewpoint=40 80 15 rtp2xyz,Decran=50}
+\psSolid[object=grille,base=-4 4 -4 4,ngrid=8 8,linecolor=black!10](0,0,-2)
+\psImplicitSurface[
+    XMinMax=-2.0 2.0 0.15,YMinMax=-2.0 2.0 0.15,ZMinMax=-2.0 2.0 0.15,
+    algebraic,
+    ImplFunction=4*x^4+4*y^4+8*y^2*z^2+4*z^4+17*x^2*y^2+17*x^2*z^2-20*x^2-20*y^2-20*z^2+17,
+    fillcolor=cyan!20,hue=.1 .8 0.5 1,
+    linewidth=0.01pt]%
+\end{pspicture}
+\end{LTXexample}
+\fi
+
+
+\begin{LTXexample}[pos=t]
+\begin{pspicture}(-5,-4)(5,4)
+\psset{lightsrc=viewpoint,viewpoint=50 90 30 rtp2xyz,Decran=50}
+\psSolid[object=grille,base=-4 4 -4 4,ngrid=8 8,linecolor=black!20](0,0,-1)
+\psImplicitSurface[%hollow,
+    hue=1 0 0.5 1,
+    XMinMax=-4 4 0.2,YMinMax=-4 4 0.2,ZMinMax=-4 4 0.2,
+    algebraic,
+    ImplFunction=1/((x+0.75)^2+y^2+z^2)+1/((x-0.75)^2+y^2+z^2)-1,
+    fillcolor=cyan!20,linewidth=0.05pt]
+\end{pspicture}
+\end{LTXexample}
+
+
+\begin{LTXexample}[pos=t]
+\begin{pspicture}(-6,-3)(6,4)
+\psset{lightsrc=10 20 20 rtp2xyz,viewpoint=100 60 50 rtp2xyz,Decran=150}
+\pstVerb{
+  /RConst 1 def
+  /rConst 0.25 def
+  /torusImplicit {
+    X dup mul Y dup mul add z dup mul add dup mul
+    -2 RConst dup mul rConst dup mul add mul X dup mul Y dup mul add mul 
+    add
+    2 RConst dup mul rConst dup mul sub mul z dup mul mul
+    add
+    RConst dup mul rConst dup mul sub add
+  } def
+  /tripleTorus {
+    0 120 240 {
+      /i exch def
+      /X {x 1.5 i cos mul sub} def
+      /Y {y 1.5 i sin mul sub} def
+      torusImplicit
+    } for
+    mul mul
+    10 sub
+  } def
+}%
+\psImplicitSurface[
+  ImplFunction=tripleTorus,linewidth=0.01pt,
+  fillcolor=red!60!green!40,linecolor=black!10,
+  lightintensity=5,
+  XMinMax=-3 3 0.1,YMinMax=-3 3 0.1,ZMinMax=-0.5 0.5 0.1]
+\end{pspicture}
+\end{LTXexample}
+
+
+
+A lot of examples can be found here: \url{http://www-sop.inria.fr/galaad/surface/}. A list of Steiner surfaces
+at \url{http://www-sop.inria.fr/galaad/surface/steiner/index.html} and a list of surfaces with isolated singularities
+at \url{http://www-sop.inria.fr/galaad/surface/classification/index.html}.
+
+
+
+
+\endinput
+
+
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-keywords-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-keywords-en.tex
index 90d4a8db49f..90d4a8db49f 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-keywords-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-keywords-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-ligne3D-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-ligne3D-en.tex
index 0632869a50b..0632869a50b 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-ligne3D-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-ligne3D-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-lignedeniveau-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-lignedeniveau-en.tex
index a1081a17c9b..a1081a17c9b 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-lignedeniveau-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-lignedeniveau-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-modes-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-modes-en.tex
index 755db834811..755db834811 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-modes-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-modes-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-new-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-new-en.tex
index cc29fb6e98f..cc29fb6e98f 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-new-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-new-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-nommersolide-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-nommersolide-en.tex
index 0c534dcf1a5..0c534dcf1a5 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-nommersolide-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-nommersolide-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-numeroterfacettes-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-numeroterfacettes-en.tex
index e8eaf331ce3..e8eaf331ce3 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-numeroterfacettes-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-numeroterfacettes-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-opacity-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-opacity-en.tex
index 0f59166c0cf..0f59166c0cf 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-opacity-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-opacity-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-parametres-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-parametres-en.tex
index cff403cbab4..cff403cbab4 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-parametres-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-parametres-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-plan-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-plan-en.tex
index 347ff175073..347ff175073 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-plan-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-plan-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-poems-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-poems-en.tex
index 10348097e0e..10348097e0e 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-poems-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-poems-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-point-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-point-en.tex
index 859d4a0f330..859d4a0f330 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-point-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-point-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-pointagesommets-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-pointagesommets-en.tex
index 01b3ba47b15..01b3ba47b15 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-pointagesommets-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-pointagesommets-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-positionnerpointconnu-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-positionnerpointconnu-en.tex
index 9459490057b..9459490057b 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-positionnerpointconnu-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-positionnerpointconnu-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-positionnersolide-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-positionnersolide-en.tex
index 2e1a4086bda..2e1a4086bda 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-positionnersolide-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-positionnersolide-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-prisme-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-prisme-en.tex
index a6420117f9e..a6420117f9e 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-prisme-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-prisme-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectionangledroit-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectionangledroit-en.tex
index 7f2c7ce697b..7f2c7ce697b 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectionangledroit-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectionangledroit-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectioncercle-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectioncercle-en.tex
index 9993f01c6e0..9993f01c6e0 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectioncercle-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectioncercle-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectioncourbe-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectioncourbe-en.tex
index 93234f94e7e..93234f94e7e 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectioncourbe-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectioncourbe-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectiondroite-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectiondroite-en.tex
index b4259d89b2f..b4259d89b2f 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectiondroite-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectiondroite-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectionligne-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectionligne-en.tex
index de720bbe7bc..de720bbe7bc 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectionligne-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectionligne-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectionpoint-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectionpoint-en.tex
index 520083b7052..520083b7052 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectionpoint-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectionpoint-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectionpolygone-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectionpolygone-en.tex
index 74f2f1dcee3..74f2f1dcee3 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectionpolygone-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectionpolygone-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectiontexte-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectiontexte-en.tex
index b4b2f47c9c9..b4b2f47c9c9 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectiontexte-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectiontexte-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectionvecteur-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectionvecteur-en.tex
index ec850c1abba..ec850c1abba 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectionvecteur-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectionvecteur-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectionvisibility-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectionvisibility-en.tex
index 5b65e65c9d2..5b65e65c9d2 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projectionvisibility-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projectionvisibility-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projpresentation-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projpresentation-en.tex
index 55fe418aa49..55fe418aa49 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-projpresentation-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-projpresentation-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-ruban-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-ruban-en.tex
index 70714407f10..70714407f10 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-ruban-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-ruban-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-section-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-section-en.tex
index 82e1765bbc8..82e1765bbc8 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-section-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-section-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-solidescreux-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-solidescreux-en.tex
index 5d83ee53b64..5d83ee53b64 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-solidescreux-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-solidescreux-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-solidespredefinis-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-solidespredefinis-en.tex
index 1d71e41486a..1d71e41486a 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-solidespredefinis-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-solidespredefinis-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-surfaces-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-surfaces-en.tex
index bf4e4923f00..bf4e4923f00 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-surfaces-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-surfaces-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-surfacesparametrees-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-surfacesparametrees-en.tex
index 5e3448591bd..a1180577727 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-surfacesparametrees-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-surfacesparametrees-en.tex
@@ -161,7 +161,7 @@ Any other choice of $u$ and $v$ are accepted. Let's remind that the argument of
 \subsection{An advised website}
 You will find on the website:
 
-\centerline{\url{http://k3dsurf.sourceforge.net/}}
+\url{http://k3dsurf.sourceforge.net/}
 
 an excellent software to represent surfaces with numerous examples of parameterised surfaces and others.
 
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-tracerpolygone-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-tracerpolygone-en.tex
index 6e5b7f6a5bb..6e5b7f6a5bb 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-tracerpolygone-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-tracerpolygone-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-transform-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-transform-en.tex
index 3b536481f7c..3b536481f7c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-transform-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-transform-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-transformpointconnu-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-transformpointconnu-en.tex
index 90175709d0c..90175709d0c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-transformpointconnu-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-transformpointconnu-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-tronque-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-tronque-en.tex
index 53a51656b5c..53a51656b5c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-tronque-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-tronque-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-tube-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-tube-en.tex
index e75b9c82423..e75b9c82423 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-tube-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-tube-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-vecteur-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-vecteur-en.tex
index ca9ccc36ddf..ca9ccc36ddf 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/src/text/par-vecteur-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/text/par-vecteur-en.tex
diff --git a/Master/texmf-dist/dvips/pst-solides3d/pst-implicitsurface.pro b/Master/texmf-dist/dvips/pst-solides3d/pst-implicitsurface.pro
new file mode 100644
index 00000000000..6c711efd953
--- /dev/null
+++ b/Master/texmf-dist/dvips/pst-solides3d/pst-implicitsurface.pro
@@ -0,0 +1,414 @@
+%
+% Based on Paul Bourke's implementation
+% http://paulbourke.net/geometry/polygonise/
+%
+%% Manuel Luque/ Herbert Voß
+%
+%% version 0.01  2016/12/10
+%
+SolidesDict begin% Part of pst-solides3d
+%
+/MarchingCubes {
+% 10 dict begin
+  /edgeTable[0 265 515 778 1030 1295 1541 1804
+           2060 2309 2575 2822 3082 3331 3593 3840
+           400 153 915 666 1430 1183 1941 1692
+           2460 2197 2975 2710 3482 3219 3993 3728
+           560 825 51 314 1590 1855 1077 1340
+           2620 2869 2111 2358 3642 3891 3129 3376
+           928 681 419 170 1958 1711 1445 1196
+           2988 2725 2479 2214 4010 3747 3497 3232
+           1120 1385 1635 1898 102 367 613 876
+           3180 3429 3695 3942 2154 2403 2665 2912
+           1520 1273 2035 1786 502 255 1013 764
+           3580 3317 4095 3830 2554 2291 3065 2800
+           1616 1881 1107 1370 598 863 85 348
+           3676 3925 3167 3414 2650 2899 2137 2384
+           1984 1737 1475 1226 966 719 453 204
+           4044 3781 3535 3270 3018 2755 2505 2240
+           2240 2505 2755 3018 3270 3535 3781 4044
+           204 453 719 966 1226 1475 1737 1984
+           2384 2137 2899 2650 3414 3167 3925 3676
+           348 85 863 598 1370 1107 1881 1616
+           2800 3065 2291 2554 3830 4095 3317 3580
+           764 1013 255 502 1786 2035 1273 1520
+           2912 2665 2403 2154 3942 3695 3429 3180
+           876 613 367 102 1898 1635 1385 1120
+           3232 3497 3747 4010 2214 2479 2725 2988
+           1196 1445 1711 1958 170 419 681 928
+           3376 3129 3891 3642 2358 2111 2869 2620
+           1340 1077 1855 1590 314 51 825 560
+           3728 3993 3219 3482 2710 2975 2197 2460
+           1692 1941 1183 1430 666 915 153 400
+           3840 3593 3331 3082 2822 2575 2309 2060
+           1804 1541 1295 1030 778 515 265 0] def
+  /triTable [
+      []
+      [0 8 3]
+      [0 1 9]
+      [1 8 3 9 8 1]
+      [1 2 10]
+      [0 8 3 1 2 10]
+      [9 2 10 0 2 9]
+      [2 8 3 2 10 8 10 9 8]
+      [3 11 2]
+      [0 11 2 8 11 0]
+      [1 9 0 2 3 11]
+      [1 11 2 1 9 11 9 8 11]
+      [3 10 1 11 10 3]
+      [0 10 1 0 8 10 8 11 10]
+      [3 9 0 3 11 9 11 10 9]
+      [9 8 10 10 8 11]
+      [4 7 8]
+      [4 3 0 7 3 4]
+      [0 1 9 8 4 7]
+      [4 1 9 4 7 1 7 3 1]
+      [1 2 10 8 4 7]
+      [3 4 7 3 0 4 1 2 10]
+      [9 2 10 9 0 2 8 4 7]
+      [2 10 9 2 9 7 2 7 3 7 9 4]
+      [8 4 7 3 11 2]
+      [11 4 7 11 2 4 2 0 4]
+      [9 0 1 8 4 7 2 3 11]
+      [4 7 11 9 4 11 9 11 2 9 2 1]
+      [3 10 1 3 11 10 7 8 4]
+      [1 11 10 1 4 11 1 0 4 7 11 4]
+      [4 7 8 9 0 11 9 11 10 11 0 3]
+      [4 7 11 4 11 9 9 11 10]
+      [9 5 4]
+      [9 5 4 0 8 3]
+      [0 5 4 1 5 0]
+      [8 5 4 8 3 5 3 1 5]
+      [1 2 10 9 5 4]
+      [3 0 8 1 2 10 4 9 5]
+      [5 2 10 5 4 2 4 0 2]
+      [2 10 5 3 2 5 3 5 4 3 4 8]
+      [9 5 4 2 3 11]
+      [0 11 2 0 8 11 4 9 5]
+      [0 5 4 0 1 5 2 3 11]
+      [2 1 5 2 5 8 2 8 11 4 8 5]
+      [10 3 11 10 1 3 9 5 4]
+      [4 9 5 0 8 1 8 10 1 8 11 10]
+      [5 4 0 5 0 11 5 11 10 11 0 3]
+      [5 4 8 5 8 10 10 8 11]
+      [9 7 8 5 7 9]
+      [9 3 0 9 5 3 5 7 3]
+      [0 7 8 0 1 7 1 5 7]
+      [1 5 3 3 5 7]
+      [9 7 8 9 5 7 10 1 2]
+      [10 1 2 9 5 0 5 3 0 5 7 3]
+      [8 0 2 8 2 5 8 5 7 10 5 2]
+      [2 10 5 2 5 3 3 5 7]
+      [7 9 5 7 8 9 3 11 2]
+      [9 5 7 9 7 2 9 2 0 2 7 11]
+      [2 3 11 0 1 8 1 7 8 1 5 7]
+      [11 2 1 11 1 7 7 1 5]
+      [9 5 8 8 5 7 10 1 3 10 3 11]
+      [5 7 0 5 0 9 7 11 0 1 0 10 11 10 0]
+      [11 10 0 11 0 3 10 5 0 8 0 7 5 7 0]
+      [11 10 5 7 11 5]
+      [10 6 5]
+      [0 8 3 5 10 6]
+      [9 0 1 5 10 6]
+      [1 8 3 1 9 8 5 10 6]
+      [1 6 5 2 6 1]
+      [1 6 5 1 2 6 3 0 8]
+      [9 6 5 9 0 6 0 2 6]
+      [5 9 8 5 8 2 5 2 6 3 2 8]
+      [2 3 11 10 6 5]
+      [11 0 8 11 2 0 10 6 5]
+      [0 1 9 2 3 11 5 10 6]
+      [5 10 6 1 9 2 9 11 2 9 8 11]
+      [6 3 11 6 5 3 5 1 3]
+      [0 8 11 0 11 5 0 5 1 5 11 6]
+      [3 11 6 0 3 6 0 6 5 0 5 9]
+      [6 5 9 6 9 11 11 9 8]
+      [5 10 6 4 7 8]
+      [4 3 0 4 7 3 6 5 10]
+      [1 9 0 5 10 6 8 4 7]
+      [10 6 5 1 9 7 1 7 3 7 9 4]
+      [6 1 2 6 5 1 4 7 8]
+      [1 2 5 5 2 6 3 0 4 3 4 7]
+      [8 4 7 9 0 5 0 6 5 0 2 6]
+      [7 3 9 7 9 4 3 2 9 5 9 6 2 6 9]
+      [3 11 2 7 8 4 10 6 5]
+      [5 10 6 4 7 2 4 2 0 2 7 11]
+      [0 1 9 4 7 8 2 3 11 5 10 6]
+      [9 2 1 9 11 2 9 4 11 7 11 4 5 10 6]
+      [8 4 7 3 11 5 3 5 1 5 11 6]
+      [5 1 11 5 11 6 1 0 11 7 11 4 0 4 11]
+      [0 5 9 0 6 5 0 3 6 11 6 3 8 4 7]
+      [6 5 9 6 9 11 4 7 9 7 11 9]
+      [10 4 9 6 4 10]
+      [4 10 6 4 9 10 0 8 3]
+      [10 0 1 10 6 0 6 4 0]
+      [8 3 1 8 1 6 8 6 4 6 1 10]
+      [1 4 9 1 2 4 2 6 4]
+      [3 0 8 1 2 9 2 4 9 2 6 4]
+      [0 2 4 4 2 6]
+      [8 3 2 8 2 4 4 2 6]
+      [10 4 9 10 6 4 11 2 3]
+      [0 8 2 2 8 11 4 9 10 4 10 6]
+      [3 11 2 0 1 6 0 6 4 6 1 10]
+      [6 4 1 6 1 10 4 8 1 2 1 11 8 11 1]
+      [9 6 4 9 3 6 9 1 3 11 6 3]
+      [8 11 1 8 1 0 11 6 1 9 1 4 6 4 1]
+      [3 11 6 3 6 0 0 6 4]
+      [6 4 8 11 6 8]
+      [7 10 6 7 8 10 8 9 10]
+      [0 7 3 0 10 7 0 9 10 6 7 10]
+      [10 6 7 1 10 7 1 7 8 1 8 0]
+      [10 6 7 10 7 1 1 7 3]
+      [1 2 6 1 6 8 1 8 9 8 6 7]
+      [2 6 9 2 9 1 6 7 9 0 9 3 7 3 9]
+      [7 8 0 7 0 6 6 0 2]
+      [7 3 2 6 7 2]
+      [2 3 11 10 6 8 10 8 9 8 6 7]
+      [2 0 7 2 7 11 0 9 7 6 7 10 9 10 7]
+      [1 8 0 1 7 8 1 10 7 6 7 10 2 3 11]
+      [11 2 1 11 1 7 10 6 1 6 7 1]
+      [8 9 6 8 6 7 9 1 6 11 6 3 1 3 6]
+      [0 9 1 11 6 7]
+      [7 8 0 7 0 6 3 11 0 11 6 0]
+      [7 11 6]
+      [7 6 11]
+      [3 0 8 11 7 6]
+      [0 1 9 11 7 6]
+      [8 1 9 8 3 1 11 7 6]
+      [10 1 2 6 11 7]
+      [1 2 10 3 0 8 6 11 7]
+      [2 9 0 2 10 9 6 11 7]
+      [6 11 7 2 10 3 10 8 3 10 9 8]
+      [7 2 3 6 2 7]
+      [7 0 8 7 6 0 6 2 0]
+      [2 7 6 2 3 7 0 1 9]
+      [1 6 2 1 8 6 1 9 8 8 7 6]
+      [10 7 6 10 1 7 1 3 7]
+      [10 7 6 1 7 10 1 8 7 1 0 8]
+      [0 3 7 0 7 10 0 10 9 6 10 7]
+      [7 6 10 7 10 8 8 10 9]
+      [6 8 4 11 8 6]
+      [3 6 11 3 0 6 0 4 6]
+      [8 6 11 8 4 6 9 0 1]
+      [9 4 6 9 6 3 9 3 1 11 3 6]
+      [6 8 4 6 11 8 2 10 1]
+      [1 2 10 3 0 11 0 6 11 0 4 6]
+      [4 11 8 4 6 11 0 2 9 2 10 9]
+      [10 9 3 10 3 2 9 4 3 11 3 6 4 6 3]
+      [8 2 3 8 4 2 4 6 2]
+      [0 4 2 4 6 2]
+      [1 9 0 2 3 4 2 4 6 4 3 8]
+      [1 9 4 1 4 2 2 4 6]
+      [8 1 3 8 6 1 8 4 6 6 10 1]
+      [10 1 0 10 0 6 6 0 4]
+      [4 6 3 4 3 8 6 10 3 0 3 9 10 9 3]
+      [10 9 4 6 10 4]
+      [4 9 5 7 6 11]
+      [0 8 3 4 9 5 11 7 6]
+      [5 0 1 5 4 0 7 6 11]
+      [11 7 6 8 3 4 3 5 4 3 1 5]
+      [9 5 4 10 1 2 7 6 11]
+      [6 11 7 1 2 10 0 8 3 4 9 5]
+      [7 6 11 5 4 10 4 2 10 4 0 2]
+      [3 4 8 3 5 4 3 2 5 10 5 2 11 7 6]
+      [7 2 3 7 6 2 5 4 9]
+      [9 5 4 0 8 6 0 6 2 6 8 7]
+      [3 6 2 3 7 6 1 5 0 5 4 0]
+      [6 2 8 6 8 7 2 1 8 4 8 5 1 5 8]
+      [9 5 4 10 1 6 1 7 6 1 3 7]
+      [1 6 10 1 7 6 1 0 7 8 7 0 9 5 4]
+      [4 0 10 4 10 5 0 3 10 6 10 7 3 7 10]
+      [7 6 10 7 10 8 5 4 10 4 8 10]
+      [6 9 5 6 11 9 11 8 9]
+      [3 6 11 0 6 3 0 5 6 0 9 5]
+      [0 11 8 0 5 11 0 1 5 5 6 11]
+      [6 11 3 6 3 5 5 3 1]
+      [1 2 10 9 5 11 9 11 8 11 5 6]
+      [0 11 3 0 6 11 0 9 6 5 6 9 1 2 10]
+      [11 8 5 11 5 6 8 0 5 10 5 2 0 2 5]
+      [6 11 3 6 3 5 2 10 3 10 5 3]
+      [5 8 9 5 2 8 5 6 2 3 8 2]
+      [9 5 6 9 6 0 0 6 2]
+      [1 5 8 1 8 0 5 6 8 3 8 2 6 2 8]
+      [1 5 6 2 1 6]
+      [1 3 6 1 6 10 3 8 6 5 6 9 8 9 6]
+      [10 1 0 10 0 6 9 5 0 5 6 0]
+      [0 3 8 5 6 10]
+      [10 5 6]
+      [11 5 10 7 5 11]
+      [11 5 10 11 7 5 8 3 0]
+      [5 11 7 5 10 11 1 9 0]
+      [10 7 5 10 11 7 9 8 1 8 3 1]
+      [11 1 2 11 7 1 7 5 1]
+      [0 8 3 1 2 7 1 7 5 7 2 11]
+      [9 7 5 9 2 7 9 0 2 2 11 7]
+      [7 5 2 7 2 11 5 9 2 3 2 8 9 8 2]
+      [2 5 10 2 3 5 3 7 5]
+      [8 2 0 8 5 2 8 7 5 10 2 5]
+      [9 0 1 5 10 3 5 3 7 3 10 2]
+      [9 8 2 9 2 1 8 7 2 10 2 5 7 5 2]
+      [1 3 5 3 7 5]
+      [0 8 7 0 7 1 1 7 5]
+      [9 0 3 9 3 5 5 3 7]
+      [9 8 7 5 9 7]
+      [5 8 4 5 10 8 10 11 8]
+      [5 0 4 5 11 0 5 10 11 11 3 0]
+      [0 1 9 8 4 10 8 10 11 10 4 5]
+      [10 11 4 10 4 5 11 3 4 9 4 1 3 1 4]
+      [2 5 1 2 8 5 2 11 8 4 5 8]
+      [0 4 11 0 11 3 4 5 11 2 11 1 5 1 11]
+      [0 2 5 0 5 9 2 11 5 4 5 8 11 8 5]
+      [9 4 5 2 11 3]
+      [2 5 10 3 5 2 3 4 5 3 8 4]
+      [5 10 2 5 2 4 4 2 0]
+      [3 10 2 3 5 10 3 8 5 4 5 8 0 1 9]
+      [5 10 2 5 2 4 1 9 2 9 4 2]
+      [8 4 5 8 5 3 3 5 1]
+      [0 4 5 1 0 5]
+      [8 4 5 8 5 3 9 0 5 0 3 5]
+      [9 4 5]
+      [4 11 7 4 9 11 9 10 11]
+      [0 8 3 4 9 7 9 11 7 9 10 11]
+      [1 10 11 1 11 4 1 4 0 7 4 11]
+      [3 1 4 3 4 8 1 10 4 7 4 11 10 11 4]
+      [4 11 7 9 11 4 9 2 11 9 1 2]
+      [9 7 4 9 11 7 9 1 11 2 11 1 0 8 3]
+      [11 7 4 11 4 2 2 4 0]
+      [11 7 4 11 4 2 8 3 4 3 2 4]
+      [2 9 10 2 7 9 2 3 7 7 4 9]
+      [9 10 7 9 7 4 10 2 7 8 7 0 2 0 7]
+      [3 7 10 3 10 2 7 4 10 1 10 0 4 0 10]
+      [1 10 2 8 7 4]
+      [4 9 1 4 1 7 7 1 3]
+      [4 9 1 4 1 7 0 8 1 8 7 1]
+      [4 0 3 7 4 3]
+      [4 8 7]
+      [9 10 8 10 11 8]
+      [3 0 9 3 9 11 11 9 10]
+      [0 1 10 0 10 8 8 10 11]
+      [3 1 10 11 3 10]
+      [1 2 11 1 11 9 9 11 8]
+      [3 0 9 3 9 11 1 2 9 2 11 9]
+      [0 2 11 8 0 11]
+      [3 2 11]
+      [2 3 8 2 8 10 10 8 9]
+      [9 10 2 0 9 2]
+      [2 3 8 2 8 10 0 1 8 1 10 8]
+      [1 10 2]
+      [1 3 8 9 1 8]
+      [0 9 1]
+      [0 3 8]
+      []
+  ] def
+  % les 10 arêtes du cube : numéros des sommets des extrémités Paul Bourke
+  /edgeIndex[ [0 1] [1 2] [2 3] [3 0] [4 5] [5 6] [6 7] [7 4] [0 4] [1 5] [2 6] [3 7] ] def
+%
+  /makeVolume {% isosurface => min & max & dt  (extraire les plages de variations et les pas)
+    /baseX plagesXYZ 0 get def
+    /xMin baseX 0 get def
+    /xMax baseX 1 get def
+    /dx baseX 2 get def
+    /baseY plagesXYZ 1 get def
+    /yMin baseY 0 get def
+    /yMax baseY 1 get def
+    /dy baseY 2 get def
+    /baseZ plagesXYZ 2 get def
+    /zMin baseZ 0 get def
+    /zMax baseZ 1 get def
+    /dz baseZ 2 get def
+  } def
+%
+  /calculs {
+    20 dict begin
+    makeVolume
+    % les cubes
+    /cubes [% les sommets
+      zMin dz zMax { /z exch def
+        yMin dy yMax { /y exch def
+          xMin dx xMax { 
+            /x exch def
+	    [% un cube
+	      [x y z]                      % 0
+	      [x y dy add z ]              % 1
+	      [x dx add y dy add z]        % 2
+	      [x dx add y z]               % 3
+	      [x y z dz add]               % 4
+	      [x y dy add z dz add]        % 5
+	      [x dx add y dy add z dz add] % 6
+	      [x dx add y z dz add]        % 7
+	    ]
+	  } for
+        } for
+      } for
+    ] def
+%
+    /valeurs [% les isovaleurs
+      zMin dz zMax {/z exch def
+        yMin dy yMax {/y exch def
+	  xMin dx xMax {/x exch def
+	    [ x y z function                      % 0
+	      x y dy add z function               % 1
+	      x dx add y dy add z function        % 2
+	      x dx add y z function               % 3
+	      x y z dz add function               % 4
+	      x y dy add z dz add function        % 5
+	      x dx add y dy add z dz add function % 6
+	      x dx add y z dz add function        % 7
+	    ]
+          } for
+        } for
+      } for
+    ] def
+    % quelques idées du codage ont été prises à https://mikolalysenko.github.io/Isosurface/
+    /aretes 12 array def % 12 aretes
+    /sommets[] def
+    /Faces[] def
+    % parcourir tous les mini-cubes
+    0 1 cubes length 1 sub {
+      /i exch def
+      /cube cubes i get def % le cube et les 8 sommets
+      /valeur valeurs i get def % les valeurs des sommets
+      /cube_index 0 def
+      0 1 7 { 
+        /j exch def
+        /v valeur j get def
+        v 0 gt { /cube_index cube_index 2 j exp cvi or def} if %
+      } for
+      /edge_mask edgeTable cube_index get cvi def
+      edge_mask 0 ne {
+        0 1 11 {
+	  /k exch def
+          edge_mask 2 k exp cvi and 0 ne {
+	    aretes k sommets length cvi put
+	    /nv [0 0 0] def
+	    /e edgeIndex k get def
+	    /p0 cube e 0 get get def
+	    /p1 cube e 1 get get def
+	    /v0 valeur e 0 get get def
+	    /v1 valeur e 1 get get def
+	    /dv v0 v1 sub def
+	    /mu 0 def
+	    dv abs 1e-6 gt { /mu v0 dv div def } if
+	    0 1 2 {
+	      /J exch def
+	      nv J p0 J get mu p1 J get p0 J get sub mul add put
+	    } for
+	    [ sommets aload pop nv ] /sommets exch def
+	  } if
+        } for
+      } if
+      % add faces
+      /f triTable cube_index get def
+      0 3 f length 3 sub {
+        /I exch def
+        [ Faces aload pop [ aretes f I 2 add get get aretes f I 1 add get get aretes f I get get ]] 
+        /Faces exch def
+      } for
+    } for
+    Faces
+    sommets
+    end
+  } def  % end /calculs
+} def    % end /MarchingCubes
+%
+end % SolidesDict
diff --git a/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex b/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
index d333af5bc4c..513d314b2e4 100644
--- a/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
+++ b/Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex
@@ -1,5 +1,5 @@
 %%
-%% COPYRIGHT 2008-2016 by Manuel Luque, Arnaud Schmittbuhl, 
+%% COPYRIGHT 2008-2017 by Manuel Luque, Arnaud Schmittbuhl, 
 %%                        Jean-Paul Vignault, Herbert Voss.
 %%
 %% This work may be distributed and/or modified under the
@@ -16,15 +16,6 @@
 %% for Generic TeX.
 %% See the PSTricks User's Guide for description.
 %
-% etex detection by looking for the \ifcsname macro
-\expandafter\ifx\csname ifcsname\endcsname\relax
- \newlinechar`\^^J
- \message{^^J*****************************************}
- \message{etex is needed to work with pst-solides3d}
- \message{*****************************************}
- \catcode`\ =11\relax
- \Compile With etex Please
-\fi
 \csname PSTSOLIDESIIIDLoaded\endcsname
 \let\PSTSOLIDESIIIDLoaded\endinput
 % Requires PSTricks, pst-xkey and pst-node packages
@@ -33,11 +24,12 @@
 \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
 \ifx\MultidoLoaded\endinput\else \input multido.tex \fi 
 % JPV & ML & AS & HV
-\def\fileversion{4.30}
-\def\filedate{2015/12/17}
+\def\fileversion{4.31}
+\def\filedate{2016/12/10}
 \message{`PSTSOLIDESIIID' v\fileversion, \filedate}
 %
 \pstheader{pst-solides3d.pro}
+\pstheader{pst-implicitsurface.pro}
 
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
 \pst@addfams{pst-solides3d}
@@ -1116,6 +1108,49 @@ restore
   \ifPst@solidmemory\else\end@ClosedObj\fi}\ignorespaces%
 }
 %
+\define@key[psset]{pst-solides3d}{XMinMax}{\def\pst@solides@XMinMax{#1}}
+\define@key[psset]{pst-solides3d}{YMinMax}{\def\pst@solides@YMinMax{#1}}
+\define@key[psset]{pst-solides3d}{ZMinMax}{\def\pst@solides@ZMinMax{#1}}
+\define@key[psset]{pst-solides3d}{ImplFunction}{\def\pst@solides@ImplFunction{#1}}
+\psset{XMinMax=-2 2 0.2,YMinMax=-2 2 0.2,ZMinMax=-2 2 0.2,ImplFunction=x dup mul y dup mul add}
+%
+\def\psImplicitSurface{\pst@object{psImplicitSurface}}
+\def\psImplicitSurface@i{\@ifnextchar(\psImplicitSurface@ii{\psImplicitSurface@ii(0,0,0)}}%
+\def\psImplicitSurface@ii(#1){%
+  \begin@SpecialObj
+  \addto@pscode{
+    \ifPst@algebraic
+      /ImplFunction ( \pst@solides@ImplFunction ) tx@AlgToPs begin AlgToPs end cvx def
+    \else
+      /ImplFunction  { \pst@solides@ImplFunction } def
+    \fi
+    SolidesDict begin
+    MarchingCubes
+    /plagesXYZ [% min  max  dx
+      [\pst@solides@XMinMax][\pst@solides@YMinMax][\pst@solides@ZMinMax]
+    ] def
+    /function {
+      3 dict begin
+      /z exch def /y exch def /x exch def
+      ImplFunction
+      end
+    } def
+    calculs
+    /Sommets exch def
+    /Faces exch def
+    /lesPoints {
+      0 1 Sommets length 1 sub {/iP exch def
+         Sommets iP get aload pop
+      } for
+    } def
+    end
+   }%
+  \psSolid[object=new,faces={Faces aload pop},sommets=lesPoints](#1)%
+  \end@SpecialObj
+  \ignorespaces
+}
+
+%
 \def\psResetSolidKeys{%
 \psset[pst-solides3d]{%
 action=draw**,%
diff --git a/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty b/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty
index 5816909618f..b5835272a13 100644
--- a/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty
+++ b/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty
@@ -1,5 +1,5 @@
 \RequirePackage{pstricks}
-\ProvidesPackage{pst-solides3d}[2009/07/25 package wrapper for
+\ProvidesPackage{pst-solides3d}[2016/12/10 package wrapper for
   pst-solides3d]
 \input{pst-solides3d.tex}
 \ProvidesFile{pst-solides3d.tex}
@@ -8,4 +8,8 @@
    \ProvidesFile{pst-solides3d.pro}
      [2014/06/07 v. 4.23,  PostScript prologue file]
      \@addtofilelist{pst-solides3d.pro}}{}%
+\IfFileExists{pst-implicitsurface.pro}{%
+   \ProvidesFile{pst-implicitsurface.pro}
+     [2016/12/10 v. 0.01,  PostScript prologue file]
+     \@addtofilelist{pst-implicitsurface.pro}}{}%
 \endinput
author	Karl Berry <karl@freefriends.org>	2016-12-12 22:52:09 +0000
committer	Karl Berry <karl@freefriends.org>	2016-12-12 22:52:09 +0000
commit	5440276d0dda2eb514887c87b7d9ab67c49d6a85 (patch)
tree	d049310bacc13fea75165368176f70542756a5e6 /Master/texmf-dist
parent	bb25bb8b4c057e717bace5e04140c0a0c4a75b88 (diff)