summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/Changes2
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Changes2
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Letter.ist (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/Letter.ist)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Makefile (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/Makefile)33
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Pyramid-couleurs.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/Pyramid-couleurs.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Pyramid-faces.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/Pyramid-faces.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Pyramid-io.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/Pyramid-io.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Pyramid-sommets.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/Pyramid-sommets.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/README18
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/chapter-1-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/chapter-1-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/chapter-2-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/chapter-2-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubeHexagone-couleurs.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubeHexagone-couleurs.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubeHexagone-faces.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubeHexagone-faces.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubeHexagone-io.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubeHexagone-io.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubeHexagone-sommets.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubeHexagone-sommets.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubecolor-couleurs.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubecolor-couleurs.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubecolor-faces.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubecolor-faces.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubecolor-io.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubecolor-io.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubecolor-sommets.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubecolor-sommets.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/faces_nefer.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/faces_nefer.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/faces_nefer_levres.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/faces_nefer_levres.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/faces_nefer_sourcils.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/faces_nefer_sourcils.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/faces_nefer_yeux.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/faces_nefer_yeux.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/fusee62-couleurs.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/fusee62-couleurs.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/fusee62-faces.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/fusee62-faces.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/fusee62-io.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/fusee62-io.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/fusee62-sommets.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/fusee62-sommets.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/geodedual44-couleurs.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/geodedual44-couleurs.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/geodedual44-faces.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/geodedual44-faces.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/geodedual44-io.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/geodedual44-io.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/geodedual44-sommets.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/geodedual44-sommets.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/horoptere-couleurs.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/horoptere-couleurs.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/horoptere-faces.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/horoptere-faces.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/horoptere-io.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/horoptere-io.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/horoptere-sommets.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/horoptere-sommets.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/kepler.eps (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/kepler.eps)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-acknowledgements-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-acknowledgements-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-affinage-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-affinage-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-anneaux-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-anneaux-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-annoterschema-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-annoterschema-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-axes3D-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-axes3D-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-chanfrein-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-chanfrein-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-codejps-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-codejps-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-colorierfacettes-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-colorierfacettes-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-commandestrace-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-commandestrace-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-couleurs-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-couleurs-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-courbeR3-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-courbeR3-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-cylindres-cones-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-cylindres-cones-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-datfile-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-datfile-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-definirfonction-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-definirfonction-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-definirplanquelconque-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-definirplanquelconque-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-definitionmaillage-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-definitionmaillage-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-eclairageponctuel-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-eclairageponctuel-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-enleverfacettes-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-enleverfacettes-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-extensions-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-extensions-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-face-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-face-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-fusion-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-fusion-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-fusionjps-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-fusionjps-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-geode-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-geode-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-grille-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-grille-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-keywords-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-keywords-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-ligne3D-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-ligne3D-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-lignedeniveau-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-lignedeniveau-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-modes-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-modes-en.tex)5
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-new-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-new-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-nommersolide-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-nommersolide-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-numeroterfacettes-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-numeroterfacettes-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-opacity-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-opacity-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-parametres-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-parametres-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-plan-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-plan-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-poems-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-poems-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-point-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-point-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-pointagesommets-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-pointagesommets-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-positionnerpointconnu-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-positionnerpointconnu-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-positionnersolide-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-positionnersolide-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-prisme-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-prisme-en.tex)74
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectionangledroit-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectionangledroit-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectioncercle-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectioncercle-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectioncourbe-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectioncourbe-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectiondroite-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectiondroite-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectionligne-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectionligne-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectionpoint-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectionpoint-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectionpolygone-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectionpolygone-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectiontexte-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectiontexte-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectionvecteur-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectionvecteur-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectionvisibility-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectionvisibility-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projpresentation-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projpresentation-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-ruban-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-ruban-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-section-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-section-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-solidescreux-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-solidescreux-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-solidespredefinis-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-solidespredefinis-en.tex)26
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-surfaces-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-surfaces-en.tex)25
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-surfacesparametrees-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-surfacesparametrees-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-tracerpolygone-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-tracerpolygone-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-transform-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-transform-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-transformpointconnu-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-transformpointconnu-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-tronque-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-tronque-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-tube-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-tube-en.tex)4
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-vecteur-en.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-vecteur-en.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/paraboloid-couleurs.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/paraboloid-couleurs.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/paraboloid-faces.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/paraboloid-faces.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/paraboloid-io.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/paraboloid-io.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/paraboloid-sommets.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/paraboloid-sommets.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/pst-solides3d-doc.bib (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/pst-solides3d-doc.bib)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/pst-solides3d-doc.brf0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/pst-solides3d-doc.tex (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/pst-solides3d-doc.tex)55
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/rocket.obj (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/rocket.obj)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/slicePyramid-couleurs.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/slicePyramid-couleurs.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/slicePyramid-faces.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/slicePyramid-faces.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/slicePyramid-io.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/slicePyramid-io.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/slicePyramid-sommets.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/slicePyramid-sommets.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/sommets_nefer.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/sommets_nefer.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/sommets_nefer0.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/sommets_nefer0.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tex-files-all.zip (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tex-files-all.zip)bin116992 -> 116992 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1836-couleurs.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1836-couleurs.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1836-faces.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1836-faces.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1836-io.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1836-io.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1836-sommets.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1836-sommets.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860-couleurs.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860-couleurs.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860-faces.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860-faces.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860-io.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860-io.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860-sommets.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860-sommets.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860lemniscate-couleurs.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860lemniscate-couleurs.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860lemniscate-faces.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860lemniscate-faces.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860lemniscate-io.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860lemniscate-io.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860lemniscate-sommets.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860lemniscate-sommets.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860ovales-couleurs.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860ovales-couleurs.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860ovales-faces.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860ovales-faces.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860ovales-io.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860ovales-io.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860ovales-sommets.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860ovales-sommets.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860part-couleurs.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860part-couleurs.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860part-faces.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860part-faces.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860part-io.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860part-io.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860part-sommets.dat (renamed from Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860part-sommets.dat)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/doc-src/pst-solides3d-doc-EN-corr-mode.tex505
-rw-r--r--Master/texmf-dist/doc/generic/pst-solides3d/pst-solides3d-doc.pdfbin4701225 -> 5015614 bytes
-rw-r--r--Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro (renamed from Master/texmf-dist/dvips/pst-solides3d/solides.pro)38
-rw-r--r--Master/texmf-dist/tex/generic/pst-solides3d/pst-solides3d.tex219
-rw-r--r--Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty8
139 files changed, 292 insertions, 722 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/Changes b/Master/texmf-dist/doc/generic/pst-solides3d/Changes
index 795abdf59b8..edbc7b0ae94 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.19 2010-04-30 - add keyword numsep
+ - add \psResetSolidKeys for all key defaults
4.18 2010-04-14 - set "ngrid=" to an empty value
- some modifcations to the code
4.17 2009-12-14 - moved the algebraic option into the base pstricks.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Changes b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Changes
new file mode 100644
index 00000000000..c0a57c0562a
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Changes
@@ -0,0 +1,2 @@
+pst-solides3d.tex ---
+2010-04-24 - new Makefile
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/Letter.ist b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Letter.ist
index a6da86bc349..a6da86bc349 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/Letter.ist
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Letter.ist
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/Makefile b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Makefile
index 8c16dc68445..44d9b736eec 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/Makefile
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Makefile
@@ -1,55 +1,56 @@
-# `Makefile' for `pst-solides3d-doc.pdf', hv, 2008/08/01
-.SUFFIXES : .tex .dvi .ps .pdf .eps
+# `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
-TDS = ~/PSTricks/PSTricks-TDS
-
-all : doc clean
+all : doc clean tds
doc: $(MAIN).pdf
$(MAIN).pdf : $(MAIN).ps
GS_OPTIONS=-dAutoRotatePages=/None 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
- makeindex -s Letter.ist -t $(basename $<).ilg -o $(basename $<).ind \
- $(basename $<).idx
bibtex $(basename $<)
$(LATEX) $<
$(LATEX) $<
clean :
- $(RM) $(addprefix $(MAIN), .log .aux .bbl .blg .glg .glo .gls .ilg .idx .ind .tmp .toc .out )
- $(RM) $(addprefix $(MAIN), .dvi .ps .brf)
+ $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .Roessler .bbl )
+ $(RM) $(addprefix $(MAIN), .dvi .ps .xcp)
+ $(RM) data3d.Roessler
veryclean : clean
- $(RM) $(addprefix $(MAIN), .pdf )
+ $(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)/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)/
@@ -59,10 +60,12 @@ tds:
#
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 Changes $(TDS)/source/$(PACKAGE)/
cp -u $(MAIN).tex $(TDS)/source/$(PACKAGE)/
cp -u $(MAIN).bib $(TDS)/source/$(PACKAGE)/
cp -u Makefile $(TDS)/source/$(PACKAGE)/
+
# EOF
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/Pyramid-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Pyramid-couleurs.dat
index 10e63400ed9..10e63400ed9 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/Pyramid-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Pyramid-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/Pyramid-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Pyramid-faces.dat
index f7c22b10c3d..f7c22b10c3d 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/Pyramid-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Pyramid-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/Pyramid-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Pyramid-io.dat
index a36e8419282..a36e8419282 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/Pyramid-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Pyramid-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/Pyramid-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Pyramid-sommets.dat
index e2833cd2eb8..e2833cd2eb8 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/Pyramid-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/Pyramid-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/README b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/README
new file mode 100644
index 00000000000..a9d2b236b63
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/README
@@ -0,0 +1,18 @@
+%% Package `pst-solides3d.tex'
+%%
+If you like to get the documentation file in another format run
+
+latex pst-solides3d-doc.tex
+bibtex pst-solides3d-doc
+latex pst-solides3d-doc.tex
+dvips pst-solides3d-doc.dvi
+
+to get a PostScript file. But pay attention, that the pst-solides3d
+files are saved in the above mentioned way, before you run
+latex on the documentation file.
+
+The intermediate DVI file works only with viewers which can
+interprete the embedded PostScript code.
+
+For another PDF output read the introduction from
+the documentation.
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/chapter-1-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/chapter-1-en.tex
index e7149df8399..e7149df8399 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/chapter-1-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/chapter-1-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/chapter-2-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/chapter-2-en.tex
index ea4f40130fa..ea4f40130fa 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/chapter-2-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/chapter-2-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubeHexagone-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubeHexagone-couleurs.dat
index 6338c59f8d0..6338c59f8d0 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubeHexagone-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubeHexagone-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubeHexagone-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubeHexagone-faces.dat
index b21b44fb7f6..b21b44fb7f6 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubeHexagone-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubeHexagone-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubeHexagone-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubeHexagone-io.dat
index 27f7ff02f2e..27f7ff02f2e 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubeHexagone-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubeHexagone-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubeHexagone-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubeHexagone-sommets.dat
index 857d598aa6c..857d598aa6c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubeHexagone-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubeHexagone-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubecolor-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubecolor-couleurs.dat
index d4de66278c1..d4de66278c1 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubecolor-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubecolor-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubecolor-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubecolor-faces.dat
index 8f7f196800c..8f7f196800c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubecolor-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubecolor-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubecolor-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubecolor-io.dat
index 37bf237daf3..37bf237daf3 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubecolor-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubecolor-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubecolor-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubecolor-sommets.dat
index 594638cf953..594638cf953 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/cubecolor-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/cubecolor-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/faces_nefer.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/faces_nefer.dat
index a3dae0aa7e2..a3dae0aa7e2 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/faces_nefer.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/faces_nefer.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/faces_nefer_levres.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/faces_nefer_levres.dat
index 19dec09e906..19dec09e906 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/faces_nefer_levres.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/faces_nefer_levres.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/faces_nefer_sourcils.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/faces_nefer_sourcils.dat
index d462760f754..d462760f754 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/faces_nefer_sourcils.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/faces_nefer_sourcils.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/faces_nefer_yeux.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/faces_nefer_yeux.dat
index 5f6f8809088..5f6f8809088 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/faces_nefer_yeux.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/faces_nefer_yeux.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/fusee62-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/fusee62-couleurs.dat
index ff0a2f86d82..ff0a2f86d82 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/fusee62-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/fusee62-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/fusee62-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/fusee62-faces.dat
index d3bbe3b94d0..d3bbe3b94d0 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/fusee62-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/fusee62-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/fusee62-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/fusee62-io.dat
index f4305c8e0a0..f4305c8e0a0 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/fusee62-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/fusee62-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/fusee62-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/fusee62-sommets.dat
index e929c1b8ca4..e929c1b8ca4 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/fusee62-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/fusee62-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/geodedual44-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/geodedual44-couleurs.dat
index 4c15d20a0bb..4c15d20a0bb 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/geodedual44-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/geodedual44-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/geodedual44-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/geodedual44-faces.dat
index 619bedce90c..619bedce90c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/geodedual44-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/geodedual44-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/geodedual44-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/geodedual44-io.dat
index bddf046eaeb..bddf046eaeb 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/geodedual44-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/geodedual44-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/geodedual44-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/geodedual44-sommets.dat
index cff3eb81b26..cff3eb81b26 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/geodedual44-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/geodedual44-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/horoptere-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/horoptere-couleurs.dat
index 6e14f9ddc16..6e14f9ddc16 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/horoptere-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/horoptere-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/horoptere-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/horoptere-faces.dat
index 41b430437f1..41b430437f1 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/horoptere-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/horoptere-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/horoptere-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/horoptere-io.dat
index 7135bda4823..7135bda4823 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/horoptere-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/horoptere-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/horoptere-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/horoptere-sommets.dat
index e70fb3bd063..e70fb3bd063 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/horoptere-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/horoptere-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/kepler.eps b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/kepler.eps
index 0271e14f075..0271e14f075 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/kepler.eps
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/kepler.eps
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-acknowledgements-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-acknowledgements-en.tex
index 5083c50db02..5083c50db02 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-acknowledgements-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-acknowledgements-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-affinage-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-affinage-en.tex
index cc50e0a9838..cc50e0a9838 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-affinage-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-affinage-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-anneaux-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-anneaux-en.tex
index 8a12bc143a6..8a12bc143a6 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-anneaux-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-anneaux-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-annoterschema-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-annoterschema-en.tex
index c9ffc38d205..c9ffc38d205 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-annoterschema-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-annoterschema-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-axes3D-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-axes3D-en.tex
index dee70040fd6..dee70040fd6 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-axes3D-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-axes3D-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-chanfrein-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-chanfrein-en.tex
index c44e0a2e932..c44e0a2e932 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-chanfrein-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-chanfrein-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-codejps-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-codejps-en.tex
index f484a845a8c..f484a845a8c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-codejps-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-codejps-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-colorierfacettes-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-colorierfacettes-en.tex
index f66e01bdb1c..f66e01bdb1c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-colorierfacettes-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-colorierfacettes-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-commandestrace-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-commandestrace-en.tex
index 65da4797234..65da4797234 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-commandestrace-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-commandestrace-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-couleurs-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-couleurs-en.tex
index f23d12c178d..f23d12c178d 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-couleurs-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-couleurs-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-courbeR3-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-courbeR3-en.tex
index b81d3af3207..b81d3af3207 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-courbeR3-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-courbeR3-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-cylindres-cones-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-cylindres-cones-en.tex
index 2f5c695d14e..2f5c695d14e 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-cylindres-cones-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-cylindres-cones-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-datfile-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-datfile-en.tex
index d7e144594c7..d7e144594c7 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-datfile-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-datfile-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-definirfonction-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-definirfonction-en.tex
index 77709168984..77709168984 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-definirfonction-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-definirfonction-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-definirplanquelconque-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-definirplanquelconque-en.tex
index 5d58437c67d..5d58437c67d 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-definirplanquelconque-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-definirplanquelconque-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-definitionmaillage-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-definitionmaillage-en.tex
index 0649345a7a1..0649345a7a1 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-definitionmaillage-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-definitionmaillage-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-eclairageponctuel-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-eclairageponctuel-en.tex
index 4b73bbad211..4b73bbad211 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-eclairageponctuel-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-eclairageponctuel-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-enleverfacettes-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-enleverfacettes-en.tex
index 584dda32490..584dda32490 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-enleverfacettes-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-enleverfacettes-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-extensions-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-extensions-en.tex
index d07b4ce825b..d07b4ce825b 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-extensions-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-extensions-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-face-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-face-en.tex
index 336a8e24599..336a8e24599 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-face-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-face-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-fusion-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-fusion-en.tex
index f53bed63614..f53bed63614 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-fusion-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-fusion-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-fusionjps-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-fusionjps-en.tex
index 34a4e05050f..34a4e05050f 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-fusionjps-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-fusionjps-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-geode-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-geode-en.tex
index 20b2027289a..20b2027289a 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-geode-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-geode-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-grille-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-grille-en.tex
index f69da2f468e..f69da2f468e 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-grille-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-grille-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-keywords-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-keywords-en.tex
index 58d7cab3624..58d7cab3624 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-keywords-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-keywords-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-ligne3D-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-ligne3D-en.tex
index 0632869a50b..0632869a50b 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-ligne3D-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-ligne3D-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-lignedeniveau-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-lignedeniveau-en.tex
index a1081a17c9b..a1081a17c9b 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-lignedeniveau-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-lignedeniveau-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-modes-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-modes-en.tex
index 633badc57c2..755db834811 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-modes-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-modes-en.tex
@@ -5,13 +5,14 @@ We can setup the key values to \texttt{\Lkeyword{mode}=0, 1, 2, 3 or 4} which al
This permits us to have a draft version of a solid with \texttt{\Lkeyword{mode}=0} (fewer calculations) and then refine it with \texttt{\Lkeyword{mode}=4} for the final version.
+\psResetSolidKeys
%% avec mode = 0
\begin{center}
-\psset{lightsrc=10 5 0,viewpoint=50 20 -40 rtp2xyz,Decran=35,unit=0.5,%
+\psset{lightsrc=10 5 0,viewpoint=50 20 -40 rtp2xyz,Decran=35,unit=0.5cm,%
incolor=white,fillcolor=green!50,r0=5,r1=2,h=5,object=troncconecreux,r0=5,r1=2,h=5}
\begin{pspicture}(-5,-5)(5,5)
\psframe(-5,-5)(5,5)
-\psSolid[mode=0]%
+\psSolid[mode=0]
\rput(0,-4.5){\psframebox[fillstyle=solid,fillcolor=black]{\small \textcolor{white}{\texttt{[mode=0]}}}}
\end{pspicture}
%
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-new-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-new-en.tex
index 2a4d201229f..2a4d201229f 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-new-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-new-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-nommersolide-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-nommersolide-en.tex
index 0c534dcf1a5..0c534dcf1a5 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-nommersolide-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-nommersolide-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-numeroterfacettes-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-numeroterfacettes-en.tex
index e8eaf331ce3..e8eaf331ce3 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-numeroterfacettes-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-numeroterfacettes-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-opacity-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-opacity-en.tex
index 0f59166c0cf..0f59166c0cf 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-opacity-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-opacity-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-parametres-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-parametres-en.tex
index cff403cbab4..cff403cbab4 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-parametres-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-parametres-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-plan-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-plan-en.tex
index 347ff175073..347ff175073 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-plan-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-plan-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-poems-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-poems-en.tex
index 10348097e0e..10348097e0e 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-poems-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-poems-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-point-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-point-en.tex
index 859d4a0f330..859d4a0f330 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-point-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-point-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-pointagesommets-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-pointagesommets-en.tex
index 01b3ba47b15..01b3ba47b15 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-pointagesommets-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-pointagesommets-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-positionnerpointconnu-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-positionnerpointconnu-en.tex
index 9459490057b..9459490057b 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-positionnerpointconnu-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-positionnerpointconnu-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-positionnersolide-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-positionnersolide-en.tex
index 4b8a6569b78..4b8a6569b78 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-positionnersolide-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-positionnersolide-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-prisme-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-prisme-en.tex
index 8f6c5e8b13b..a6420117f9e 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-prisme-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-prisme-en.tex
@@ -49,15 +49,16 @@ A prism is determined by two parameters:
\end{center}
+
\subsubsection{Example 2: a \Index{right prism} with cross-section a rounded square}
-\psset{lightsrc=10 -20 50,viewpoint=50 -20 30 rtp2xyz,Decran=50}
\begin{LTXexample}[width=6.5cm]
-\psset{unit=0.5}
+\psset{unit=0.5cm}
+\psset{lightsrc=10 -20 50,viewpoint=50 -20 30 rtp2xyz,Decran=50}
\begin{pspicture}(-5,-4)(3,9)
\psSolid[object=grille,base=-4 4 -4 4,action=draw]
\psSolid[object=prisme,h=6,fillcolor=yellow,
- base=%
+ base=
0 10 90 {/i exch def i cos 1 add i sin 1 add } for
90 10 180 {/i exch def i cos 1 sub i sin 1 add} for
180 10 270 {/i exch def i cos 1 sub i sin 1 sub} for
@@ -66,12 +67,33 @@ A prism is determined by two parameters:
\end{pspicture}
\end{LTXexample}
-\clearpage
+
+\subsubsection{Example 4: a prism with an elliptic section}
+
+\psResetSolidKeys
+\begin{LTXexample}[width=6.5cm]
+\psset{unit=0.5cm}
+\begin{pspicture}(-6,-5)(4,12)
+\psset{lightsrc=10 20 30,viewpoint=50 20 25 rtp2xyz,Decran=50}
+\psSolid[object=grille,base=-6 6 -4 4,action=draw]
+\defFunction{FuncI}(t){t cos 4 mul}{t sin 2 mul}{}
+\psSolid[object=prisme,h=8,fillcolor=green!20,
+ base=0 350 {FuncI} CourbeR2+]%
+\defFunction{FuncII}(t){t cos 4 mul}{t sin 2 mul}{8}
+\psSolid[object=courbe,r=0,
+ function=FuncII,range=0 360,
+ linewidth=2\pslinewidth,
+ linecolor=green]
+\axesIIID(6,4,8)(8,6,10)
+\end{pspicture}
+\end{LTXexample}
+
+\psset{unit=1cm}
\subsubsection{Example 3: a right prism with a star-shaped section}
\begin{LTXexample}[width=6.5cm]
-\psset{unit=0.5}
+\psset{unit=0.5cm}
\psset{lightsrc=10 -20 50,viewpoint=50 -20 30 rtp2xyz,Decran=50}
\begin{pspicture*}(-5,-4)(6,9)
\defFunction{F}(t){3 t cos 3 exp mul}{3 t sin 3 exp mul}{}
@@ -84,52 +106,12 @@ A prism is determined by two parameters:
\end{LTXexample}
-\subsubsection{Example 4: a prism with an elliptic section}
-
-%\begin{minipage}{6.5cm}
-\begin{LTXexample}[width=6.5cm]
-\psset{unit=0.5}
-\begin{pspicture}(-6,-5)(4,12)
-\psSolid[object=grille,base=-6 6 -4 4,action=draw]
-\psset{lightsrc=10 20 30,viewpoint=50 20 25 rtp2xyz,Decran=50}
-\defFunction{FI}(t){t cos 4 mul}{t sin 2 mul}{}
-\psSolid[object=prisme,h=8,fillcolor=green!20,
- base=0 350 {FI} CourbeR2+]%
-\defFunction{FII}(t){t cos 4 mul}{t sin 2 mul}{8}
-\psSolid[object=courbe,r=0,
- function=FII,range=0 360,
- linewidth=2\pslinewidth,
- linecolor=green]
-\axesIIID(6,4,8)(8,6,10)
-\end{pspicture}
-\end{LTXexample}
-\iffalse
-\end{minipage}\hfill
-\begin{minipage}{10cm}
-\begin{lstlisting}[basiscstyle=\small]
-\psset{unit=0.5}
-\begin{pspicture}(-6,-5)(4,12)
-\psSolid[object=grille,base=-6 6 -4 4,action=draw]
-\psset{lightsrc=10 20 30,viewpoint=50 20 25 rtp2xyz,Decran=50}
-\defFunction{F1}(t){t cos 4 mul}{t sin 2 mul}{}
-\psSolid[object=prisme,h=8,fillcolor=green!20,
- base=0 350 {F1} CourbeR2+]%
-\defFunction{F2}(t){t cos 4 mul}{t sin 2 mul}{8}
-\psSolid[object=courbe,r=0,
- function=F2,range=0 360,
- linewidth=2\pslinewidth,
- linecolor=green]
-\axesIIID(6,4,8)(8,6,10)
-\end{pspicture}
-\end{lstlisting}
-\end{minipage}
-\fi
\clearpage
\subsubsection{Example 5: a \Index{roof gutter} with a semi-circular section}
\begin{LTXexample}[width=7cm]
-\psset{unit=0.35}
+\psset{unit=0.35cm}
\psset{lightsrc=10 20 30,viewpoint=50 30 25 rtp2xyz,Decran=50}
\begin{pspicture}(-10,-5)(6,10)
\defFunction[algebraic]{F}(t)
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectionangledroit-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectionangledroit-en.tex
index 7f2c7ce697b..7f2c7ce697b 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectionangledroit-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectionangledroit-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectioncercle-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectioncercle-en.tex
index 9993f01c6e0..9993f01c6e0 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectioncercle-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectioncercle-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectioncourbe-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectioncourbe-en.tex
index 93234f94e7e..93234f94e7e 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectioncourbe-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectioncourbe-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectiondroite-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectiondroite-en.tex
index b4259d89b2f..b4259d89b2f 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectiondroite-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectiondroite-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectionligne-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectionligne-en.tex
index de720bbe7bc..de720bbe7bc 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectionligne-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectionligne-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectionpoint-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectionpoint-en.tex
index 520083b7052..520083b7052 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectionpoint-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectionpoint-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectionpolygone-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectionpolygone-en.tex
index 74f2f1dcee3..74f2f1dcee3 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectionpolygone-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectionpolygone-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectiontexte-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectiontexte-en.tex
index b4b2f47c9c9..b4b2f47c9c9 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectiontexte-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectiontexte-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectionvecteur-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectionvecteur-en.tex
index ec850c1abba..ec850c1abba 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectionvecteur-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectionvecteur-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectionvisibility-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectionvisibility-en.tex
index 5b65e65c9d2..5b65e65c9d2 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projectionvisibility-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projectionvisibility-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projpresentation-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projpresentation-en.tex
index 55fe418aa49..55fe418aa49 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-projpresentation-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-projpresentation-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-ruban-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-ruban-en.tex
index 70714407f10..70714407f10 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-ruban-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-ruban-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-section-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-section-en.tex
index 85c06bf7698..85c06bf7698 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-section-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-section-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-solidescreux-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-solidescreux-en.tex
index 5d83ee53b64..5d83ee53b64 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-solidescreux-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-solidescreux-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-solidespredefinis-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-solidespredefinis-en.tex
index 8d6f5019b46..a8374ed4d80 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-solidespredefinis-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-solidespredefinis-en.tex
@@ -357,7 +357,7 @@ base=-1 1 -1.5 1.5]
\end{tabular}
&
\begin{pspicture}(-2,-3)(5,3)
-\psset{unit=0.5}
+\psset{unit=0.5cm}
\psset{lightsrc=42 24 13,viewpoint=50 30 15 rtp2xyz,Decran=50}
\psSolid[object=calottesphere,r=3,ngrid=16 18,
fillcolor=cyan!50,incolor=yellow,theta=45,phi=-30,hollow,RotY=-80]%
@@ -385,7 +385,7 @@ base=-1 1 -1.5 1.5]
&
\begin{pspicture}(-2,-2)(2,2.35)
\psset{lightsrc=42 24 13,viewpoint=50 30 15 rtp2xyz}
- \psset{Decran=30,unit=0.9}
+ \psset{Decran=30,unit=0.9cm}
\psSolid[r1=2.5,r0=1.5,object=tore,ngrid=18 36,fillcolor=green!30,action=draw**]%
\axesIIID(4,4,0)(5,5,4)
\end{pspicture}
@@ -416,7 +416,7 @@ base=-1 1 -1.5 1.5]
\end{tabular}
&
\begin{pspicture}(-2,-2)(2,2.35)
-%\psset{unit=0.44}
+%\psset{unit=0.44cm}
\psset{lightsrc=42 24 13,viewpoint=50 30 15 rtp2xyz}
\psset{Decran=30}
\psSolid[object=anneau,fillcolor=yellow,h=1.5,r1=4,r0=3]%
@@ -554,7 +554,7 @@ base=-1 1 -1.5 1.5]
&
\begin{pspicture}(-2,-2)(2,3)
\psset{lightsrc=10 20 30,viewpoint=50 20 30 rtp2xyz}
- \psset{Decran=30,unit=0.9}
+ \psset{Decran=30,unit=0.9cm}
\psSolid[object=prisme,action=draw*,linecolor=red,h=4,fillcolor=gray!50]%
\psSolid[object=grille,base=-3 3 -3 3,action=draw]%
\axesIIID(3,3,4)(5,5,5)
@@ -592,7 +592,7 @@ base=-1 1 -1.5 1.5]
&
\begin{pspicture}(-1.5,-2)(2,3)
\psset{lightsrc=10 20 30,viewpoint=50 20 30 rtp2xyz}
- \psset{Decran=30,unit=0.9}
+ \psset{Decran=30,unit=0.9cm}
\psSolid[object=grille,base=-5 5 -3 3]%
\axesIIID(5,3,0)(6,4,4)
\end{pspicture}
@@ -645,7 +645,7 @@ base=-1 1 -1.5 1.5]
\end{tabular}
&
\begin{pspicture}(-2,-2)(3,2)
-\psset{unit=0.4}
+\psset{unit=0.4cm}
\psset{viewpoint=50 -20 30 rtp2xyz,Decran=50}
\psSolid[object=grille,base=-4 6 -4 4,action=draw,linecolor=gray](0,0,0)
\psSolid[object=face,fillcolor=yellow,
@@ -691,7 +691,7 @@ base=-1 1 -1.5 1.5]
\end{tabular}
&
\begin{pspicture}(-2,-2)(5,3)
-\psset{lightsrc=10 0 10,viewpoint=50 -20 30 rtp2xyz,Decran=50,unit=0.5}
+\psset{lightsrc=10 0 10,viewpoint=50 -20 30 rtp2xyz,Decran=50,unit=0.5cm}
\psSolid[object=grille,base=-4 6 -2 4,action=draw,linecolor=gray](0,0,0)
\psSolid[object=ruban,h=3,fillcolor=red!50,
base=0 0 2 2 4 0 6 2,
@@ -734,7 +734,7 @@ base=-1 1 -1.5 1.5]
%% sur un plan
%% \end{tabular}
%% &
-%% \psset{unit=0.4}
+%% \psset{unit=0.4cm}
%% \begin{pspicture}(-2,-5)(6,8)%
%% \psframe*[linecolor=blue!50](-6,-5)(6,7)
%% \psset{lightsrc=50 20 20,viewpoint=50 30 15,Decran=60}
@@ -834,9 +834,7 @@ base=-1 1 -1.5 1.5]
\end{tabular}
&
\begin{pspicture}(-2,-3)(3,3)
-\psset{unit=0.4}
-\psset{lightsrc=30 30 25}
-\psset{viewpoint=50 40 30 rtp2xyz,Decran=50}
+\psset{unit=0.4cm,lightsrc=30 30 25,viewpoint=50 40 30 rtp2xyz,Decran=50}
\psSurface[ngrid=.25 .25,incolor=white,axesboxed](-4,-4)(4,4){%
x dup mul y dup mul 3 mul sub x mul 32 div}
\end{pspicture}
@@ -864,7 +862,7 @@ base=-1 1 -1.5 1.5]
&
\begin{pspicture}(-2,-2)(2,4)
-\psset{unit=0.4}
+\psset{unit=0.4cm}
\psset{viewpoint=50 -20 30 rtp2xyz,Decran=50}
\psSolid[object=new,
action=draw,
@@ -934,7 +932,7 @@ base=-1 1 -1.5 1.5]
&
\begin{pspicture}(-2,-1)(1.75,2.7)
-\psset{unit=0.35}
+\psset{unit=0.35cm}
\psset{lightsrc=10 -20 50,viewpoint=50 -20 20 rtp2xyz,Decran=50}
%\psframe*[linecolor=blue!50](-6,-3)(6,8)
\psSolid[object=grille,base=-4 4 -4 4,linecolor=red,linewidth=0.5\pslinewidth]%
@@ -971,7 +969,7 @@ base=-1 1 -1.5 1.5]
%% \'{e}quations param\'{e}triques\\
%% \end{tabular}
%% &
-%% \psset{unit=0.4}
+%% \psset{unit=0.4cm}
%% \begin{pspicture}(-6,-7)(6,6)
%% \psframe*[linecolor=yellow!50](-6,-6)(6,6)
%% \psset{SphericalCoor,viewpoint=50 -20 30,Decran=50}
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-surfaces-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-surfaces-en.tex
index a3bebad11bf..dba1ed299d1 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-surfaces-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-surfaces-en.tex
@@ -220,4 +220,29 @@ respectively, of two values.
\end{pspicture}
\end{LTXexample}
+\section{Example 8: a surface with the equation $z = \left(1-\frac{x^2+y^2}{2}\right)^2$}% $
+
+\begin{LTXexample}[width=7.5cm]
+\psset{unit=0.5cm,viewpoint=50 60 30 rtp2xyz,Decran=50}
+\psset{lightsrc=viewpoint}
+\begin{pspicture}(-4,-5)(6,8)
+ \psSurface[ngrid=.25 .25,incolor=yellow,linewidth=0.5\pslinewidth,
+ base= -2 2 -2 2, axesboxed, Zmin=-5,Zmax=2,hue=0 1](-5,-5)(5,5){%
+ 1 0.5 x dup mul y dup mul add mul sub dup -5 lt { pop -5 }if }
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=7.5cm]
+\psset{unit=0.5cm,viewpoint=50 60 30 rtp2xyz,Decran=50,
+ lightsrc=viewpoint}
+\begin{pspicture}(-4,-5)(6,8)
+ \psSurface*[ngrid=.25 .25,incolor=yellow,
+ linewidth=0.5\pslinewidth,
+ r = 3 sqrt 2 mul, axesboxed, Zmin=-5,Zmax=2,hue=0 1](-5,-5)(5,5){%
+ 1 0.5 x dup mul y dup mul add mul sub dup -5 lt { pop -5 }if }
+\end{pspicture}
+\end{LTXexample}
+
+
+
\endinput
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-surfacesparametrees-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-surfacesparametrees-en.tex
index 5e3448591bd..5e3448591bd 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-surfacesparametrees-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-surfacesparametrees-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-tracerpolygone-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-tracerpolygone-en.tex
index 6e5b7f6a5bb..6e5b7f6a5bb 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-tracerpolygone-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-tracerpolygone-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-transform-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-transform-en.tex
index 3b536481f7c..3b536481f7c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-transform-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-transform-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-transformpointconnu-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-transformpointconnu-en.tex
index 90175709d0c..90175709d0c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-transformpointconnu-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-transformpointconnu-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-tronque-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-tronque-en.tex
index 53a51656b5c..53a51656b5c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-tronque-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-tronque-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-tube-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-tube-en.tex
index a425dff8065..0721a363238 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-tube-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-tube-en.tex
@@ -189,7 +189,7 @@ To deactivate that security option, more or less temporarily, here the two corre
\end{LTXexample}
-
+\clearpage
\subsection{Some other examples}
@@ -231,6 +231,8 @@ To deactivate that security option, more or less temporarily, here the two corre
\end{pspicture}
\end{LTXexample}
+\clearpage
+
\subsubsection{The spring of Gaston}
\begin{LTXexample}[width=7cm]
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-vecteur-en.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-vecteur-en.tex
index ca9ccc36ddf..ca9ccc36ddf 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/par-vecteur-en.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/par-vecteur-en.tex
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/paraboloid-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/paraboloid-couleurs.dat
index 1eaf3d68507..1eaf3d68507 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/paraboloid-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/paraboloid-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/paraboloid-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/paraboloid-faces.dat
index 6cbc64161b7..6cbc64161b7 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/paraboloid-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/paraboloid-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/paraboloid-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/paraboloid-io.dat
index 1bb84d3de28..1bb84d3de28 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/paraboloid-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/paraboloid-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/paraboloid-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/paraboloid-sommets.dat
index ad3b56f4d56..ad3b56f4d56 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/paraboloid-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/paraboloid-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/pst-solides3d-doc.bib b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/pst-solides3d-doc.bib
index c96eef7409f..c96eef7409f 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/pst-solides3d-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/pst-solides3d-doc.bib
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/pst-solides3d-doc.brf b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/pst-solides3d-doc.brf
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/pst-solides3d-doc.brf
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/pst-solides3d-doc.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/pst-solides3d-doc.tex
index 3b26298c507..92586c581d3 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/pst-solides3d-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/pst-solides3d-doc.tex
@@ -328,9 +328,7 @@ Apricot&Aquamarine%
\chapter{Setting the layout of the scenery}
\Input{chapter-2-en}
-
\Input{par-eclairageponctuel-en}
-
\Input{par-axes3D-en}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -339,7 +337,6 @@ Apricot&Aquamarine%
\chapter{Predefined solids and their positioning}
\Input{par-solidespredefinis-en}
-
\Input{par-positionnersolide-en}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -347,112 +344,72 @@ Apricot&Aquamarine%
\chapter{More options of \textbackslash{}psSolid}
\Input{par-commandestrace-en}
-
\Input{par-solidescreux-en}
-
\Input{par-numeroterfacettes-en}
-
\Input{par-enleverfacettes-en}
-
\Input{par-pointagesommets-en}
-
\Input{par-couleurs-en}
-
\Input{par-colorierfacettes-en}
-
\Input{par-opacity-en}
-
\Input{par-definitionmaillage-en}
\Input{par-modes-en}
\Input{par-tronque-en}
-
\Input{par-affinage-en}
-
\Input{par-chanfrein-en}
-
\Input{par-transform-en}
-
\Input{par-lignedeniveau-en}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\chapter{Usage of external files}
\Input{par-datfile-en}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\chapter{Some special objects}
-%\Input{par-grille-en
+\Input{par-grille-en}
\Input{par-point-en}
-
\Input{par-vecteur-en}
\Input{par-plan-en}
-
\Input{par-geode-en}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\chapter{Generating some new solids}
\Input{par-codejps-en}
-
\Input{par-definirfonction-en}
-
\Input{par-courbeR3-en}
-
\Input{par-tube-en}
-
\Input{par-prisme-en}
-
\Input{par-new-en}
-
\Input{par-face-en}
-
\Input{par-ruban-en}
-
\Input{par-anneaux-en}
-
\Input{par-cylindres-cones-en}
-
\Input{par-surfacesparametrees-en}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\chapter{Surfaces defined by a function of the form $z=f(x,y)$}
\Input{par-surfaces-en}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\chapter{Advanced usage}
\Input{par-nommersolide-en}
-
\Input{par-section-en}
-
\Input{par-fusion-en}
-
\Input{par-fusionjps-en}
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\chapter{Interaction with PSTricks}
\Input{par-positionnerpointconnu-en}
-
\Input{par-ligne3D-en}
-
\Input{par-tracerpolygone-en}
-
\Input{par-transformpointconnu-en}
-
\Input{par-annoterschema-en}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -460,29 +417,19 @@ Apricot&Aquamarine%
\chapter{Projections}
\Input{par-projpresentation-en}
-
\Input{par-projectionvisibility-en}
-
\Input{par-definirplanquelconque-en}
-
\Input{par-projectionpoint-en}
-
\Input{par-projectionvecteur-en}
-
\Input{par-projectiondroite-en}
%\newpage
\Input{par-projectioncercle-en}
-
\Input{par-projectionpolygone-en}
-
\Input{par-projectionligne-en}
%\newpage
-
\Input{par-projectionangledroit-en}
-
\Input{par-projectioncourbe-en}
-
\Input{par-projectiontexte-en}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/rocket.obj b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/rocket.obj
index 4ecc0d252f2..4ecc0d252f2 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/rocket.obj
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/rocket.obj
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/slicePyramid-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/slicePyramid-couleurs.dat
index 31df6430d76..31df6430d76 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/slicePyramid-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/slicePyramid-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/slicePyramid-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/slicePyramid-faces.dat
index 8b2edcbc3fb..8b2edcbc3fb 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/slicePyramid-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/slicePyramid-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/slicePyramid-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/slicePyramid-io.dat
index f391be39b0b..f391be39b0b 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/slicePyramid-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/slicePyramid-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/slicePyramid-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/slicePyramid-sommets.dat
index 586409421f6..586409421f6 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/slicePyramid-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/slicePyramid-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/sommets_nefer.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/sommets_nefer.dat
index ecdc368742f..ecdc368742f 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/sommets_nefer.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/sommets_nefer.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/sommets_nefer0.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/sommets_nefer0.dat
index ecdc368742f..ecdc368742f 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/sommets_nefer0.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/sommets_nefer0.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tex-files-all.zip b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tex-files-all.zip
index 0a9eb3d1801..0a9eb3d1801 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tex-files-all.zip
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tex-files-all.zip
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1836-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1836-couleurs.dat
index 5da771beaef..5da771beaef 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1836-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1836-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1836-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1836-faces.dat
index b634a183b0c..b634a183b0c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1836-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1836-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1836-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1836-io.dat
index 74d7e54460c..74d7e54460c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1836-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1836-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1836-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1836-sommets.dat
index a178619ff58..a178619ff58 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1836-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1836-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860-couleurs.dat
index f36da37a1d5..f36da37a1d5 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860-faces.dat
index 5ff8eb92fc8..5ff8eb92fc8 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860-io.dat
index 9a456f7439c..9a456f7439c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860-sommets.dat
index 275af85daf8..275af85daf8 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860lemniscate-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860lemniscate-couleurs.dat
index f2d20fcdbcb..f2d20fcdbcb 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860lemniscate-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860lemniscate-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860lemniscate-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860lemniscate-faces.dat
index 1d73d567337..1d73d567337 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860lemniscate-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860lemniscate-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860lemniscate-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860lemniscate-io.dat
index 34953e4e77c..34953e4e77c 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860lemniscate-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860lemniscate-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860lemniscate-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860lemniscate-sommets.dat
index 78ca14048aa..78ca14048aa 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860lemniscate-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860lemniscate-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860ovales-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860ovales-couleurs.dat
index 9dbe8bd74bc..9dbe8bd74bc 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860ovales-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860ovales-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860ovales-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860ovales-faces.dat
index 9b4f939da22..9b4f939da22 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860ovales-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860ovales-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860ovales-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860ovales-io.dat
index a71f32c9d6d..a71f32c9d6d 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860ovales-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860ovales-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860ovales-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860ovales-sommets.dat
index 3ed05ae4969..3ed05ae4969 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860ovales-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860ovales-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860part-couleurs.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860part-couleurs.dat
index bed7d705411..bed7d705411 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860part-couleurs.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860part-couleurs.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860part-faces.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860part-faces.dat
index 87ade361b57..87ade361b57 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860part-faces.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860part-faces.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860part-io.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860part-io.dat
index 06ba3eeca2e..06ba3eeca2e 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860part-io.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860part-io.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860part-sommets.dat b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860part-sommets.dat
index 97d067acf79..97d067acf79 100644
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/tore1860part-sommets.dat
+++ b/Master/texmf-dist/doc/generic/pst-solides3d/doc-en/tore1860part-sommets.dat
diff --git a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/pst-solides3d-doc-EN-corr-mode.tex b/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/pst-solides3d-doc-EN-corr-mode.tex
deleted file mode 100644
index 1954d231911..00000000000
--- a/Master/texmf-dist/doc/generic/pst-solides3d/doc-src/pst-solides3d-doc-EN-corr-mode.tex
+++ /dev/null
@@ -1,505 +0,0 @@
-\listfiles % Writes out the package versions in the log file
-\documentclass[%
- 11pt, % normal font size (default, alias for fontsize=11pt)
- BCOR10mm, % 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)
- parskip, % use one base line vertical inter-paragraph space and
- % at least 1 em horizontal space at the end of paragraphs
- % instead of indenting first line of paragraphs
- twoside, % use twosided layout (default)
- smallheadings, % use smaller font sizes for headings (but at least
- % \normalsize) with less vertical above and below headings
- % (deprecated, use: headings=small)
- 1.1headlines, % set head height to 1.1\baselineskip of \normalsize
- % (deprecated, use: headlines=1.1)
- headexclude, % page head is part of the margins not the type area
- % (default, deprecated, use: headinclude=false)
- footexclude, % page foot is part of the margins not the type area
- % (default, deprecated, use: footinclude=false)
- mpexclude % margin notes are part of the margins not the type area
- % (default, deprecated, use: mpinclude=false)
- ]{scrbook}
-
-\usepackage[latin1]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{lmodern}
-\usepackage{scrpage2}
-\pagestyle{scrheadings}
-
-%\usepackage{arev}
-%\usepackage{manfnt}
-%\usepackage[garamond]{mathdesign}
-%\renewcommand{\ttdefault}{lmtt}
-
-\usepackage{multicol} % Intermix single and multiple columns
-\usepackage{longtable} % Allows tables to flow over page boundaries
-\usepackage{array} % Extending the array and tabular environments
-\usepackage{arrayjob} % Management of arrays
-\usepackage{url} % Verbatim with URL-sensitive line breaks
-\usepackage[a4paper,dvips,hmargin=2cm,vmargin=3cm]{geometry} % Flexible and complete interface to document dimensions
-\usepackage{framed} % Framed or shaded regions that can break across pages
-\usepackage{amsmath,amssymb} % allows multiple maths-environments
-\usepackage{ragged2e}
-\usepackage{titlesec} % Select alternative section titles
-
-
-%%%%%%%
-%%%%%%% Loading the necessary graphic packages
-\usepackage[dvipsnames,svgnames,table]{pstricks} % Loads the basic packages of 'PSTricks'
- % with predefined color schemes from 'xcolor'
-\usepackage[final]{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
- % figures using LaTeX macros for specifying mathematical constraints.
- % It is thus possible to build point using common transformations or intersections.
- % The use of coordinates is limited to points which controlled the figure.
-\usepackage{pst-solides3d} % The package is designed to draw solids in 3D perspective.
-\let\PSTfileversion\fileversion
-\let\PSTfiledate\filedate
-\usepackage{pstricks-add} % A collection of add-ons and bugfixes for PSTricks.
- % Allows 'algebraic notation' instead of the PostScript
- % native RPN (Revers Polish Notation).
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Note: 'pstricks-add' always needs to be loaded last. %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\DeclareFixedFont{\timesnormal}{T1}{ptm}{m}{n}{2cm}
-\raggedbottom
-\makeatletter
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% adapt\'{e} de \psRandom du package pstricks-add
-%% pour rendre al\'{e}atoire la taille des \'{e}toiles
-%% Manuel Luque
-\newdimen\pssizeStar
-\def\psset@sizeStar#1{\pssetlength\pssizeStar{#1}}
-\psset@sizeStar{1pt}
-\def\psRandomStar{\pst@object{psRandomStar}}%
-\def\psRandomStar@i{\@ifnextchar({\psRandomStar@ii}{\psRandomStar@iii(0,0)(1,1)}}
-\def\psRandomStar@ii(#1){\@ifnextchar({\psRandomStar@iii(#1)}{\psRandomStar@iii(0,0)(#1)}}
-\def\psRandomStar@iii(#1)(#2)#3{%
- \def\pst@tempA{#3}%
- \ifx\pst@tempA\pst@empty\psclip{\psframe(#2)}\else\psclip{#3}\fi
- \pst@getcoor{#1}\pst@tempA
- \pst@getcoor{#2}\pst@tempB
- \begin@SpecialObj
- \addto@pscode{
- \pst@tempA\space /yMin exch def
- /xMin exch def
- \pst@tempB\space /yMax exch def
- /xMax exch def
- /dy yMax yMin sub def
- /dx xMax xMin sub def
- rrand srand % initializes the random generator
- /getRandReal { rand 2147483647 div } def
- \psk@randomPoints {
- /DS \pst@number\pssizeStar\space getRandReal mul def
- \@nameuse{psds@\psk@dotstyle}
- \ifPst@color getRandReal 1 1 sethsbcolor \fi
- getRandReal dx mul xMin add
- getRandReal dy mul yMin add
- Dot
- \ifx\psk@fillstyle\psfs@solid fill \fi stroke
- } repeat
- }%
- \end@SpecialObj
- \endpsclip
- \ignorespaces
-}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% macro H.Voss sur :
-%%http://tug.org/mailman/htdig/pstricks/2007/004640.html
-
-\def\GetCenter#1{ tx@NodeDict begin /N@#1 load GetCenter end
- \pst@number\psyunit div /#1.y ED
- \pst@number\psxunit div /#1.x ED }
-\makeatother
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Jean-Michel Sarlat et Guillaume Connan
-\newenvironment{gbar}{%
- \def\FrameCommand{{\color{red}\vrule width 2pt}\colorbox{yellow!30}}%
- \MakeFramed {\advance\hsize-\width \FrameRestore}}%
-{\endMakeFramed}
-
-%%%%%%%
-%%%%%%% Setting the Chapter layout
-\titleformat{\chapter}[display] % {command}[shape]
- {\usekomafont{chapter}\Large \color{OrangeReddy}} % format
- { % label
- \LARGE\MakeUppercase{\chaptertitlename} \Huge \thechapter \filright%
- }%}
- {1pt} % sep (from chapternumber)
- {\titlerule \vspace{0.9pc} \filright \color{OrangeReddy}} % {before}[after] (before chaptertitle and after)
- [\color{OrangeReddy} \vspace{0.9pc} \filright {\titlerule}]
-
-
-%%%%%%%
-%%%%%%% Highlight some expressions
-\newcommand\Cadre[1]{\psframebox[fillstyle=solid,fillcolor=gray!20,linecolor=gray!20]{\texttt{#1}}}
-
-%%%%%%%
-%%%%%%% Box and highlight some notes
-\newcommand\encadre[1]{
-\psframebox[fillstyle=solid,fillcolor=gray!20,linecolor=gray!20]{
- \begin{minipage}{\textwidth}
- {\textbf{\textcolor{OrangeReddy}{Note:}}\qquad #1}
- \end{minipage}}
-}
-
-
-%%%%%%%
-%%%%%%% Highlight the table of the predefined solids
-\newcommand\toptableau{
-\rowcolor{gray!20}
- \textbf{Solid} & \begin{tabular}{c}
- \textbf{Default}\\
- \textbf{Parameters}
- \end{tabular} &
- \begin{minipage}{4cm}
- \centerline{\textbf{View}}
- \end{minipage}&
- \begin{minipage}{4cm}
- \centerline{\textbf{Code}}
- \end{minipage}}
-%%%%%%%
-%%%%%%% Color array
-\newarray\colors
-\readarray{colors}{%
-Apricot&Aquamarine%
-&Bittersweet&Black&Blue&BlueGreen&BlueViolet&BrickRed&Brown&BurntOrange%
-&CadetBlue&CarnationPink&Cerulean&CornflowerBlue&Cyan&Dandelion&DarkOrchid%
-&Emerald&ForestGreen&Fuchsia&Goldenrod&Gray&Green&GreenYellow&JungleGreen%
-&Lavender&LimeGreen&Magenta&Mahogany&Maroon&Melon&MidnightBlue&Mulberry%
-&NavyBlue&OliveGreen&Orange&OrangeRed&Orchid&Peach&Periwinkle&PineGreen%
-&Plum&ProcessBlue&Purple&RawSienna&Red&RedOrange&RedViolet&Rhodamine&RoyalBlue%
-&RoyalPurple&RubineRed&Salmon&SeaGreen&Sepia&SkyBlue&SpringGreen&Tan&TealBlue%
-&Thistle&Turquoise&Violet&VioletRed&White&WildStrawberry&Yellow&YellowGreen&YellowOrange}
-
-\edef\colorfaces{}%
-\multido{\i=0+1}{67}{%
- \checkcolors(\i)
-\xdef\colorfaces{\colorfaces\i\space(\cachedata)\space}}
-
-\definecolor{bleuciel}{rgb}{0.78,0.84,0.99}
-\definecolor{OrangeReddy}{rgb}{0.73,0.00,0.00}
-
-%%%%%%%
-%%%%%%% Highlight some commands with backslashes (the three macros)
-\newcommand{\bs}[1]{%
- \psframebox[fillstyle=solid,fillcolor=gray!20,
- linecolor=gray!20]{\texttt{\textbackslash#1}}}
-
-%%%%%%%
-%%%%%%% Positioning the viewpoint
-\def\PointEcran(#1,#2,#3)#4{% position of the viewpoint on the screen
-\pstVerb{/xM #1 def /yM #2 def /zM #3 def
- /kC dE dup mul xM xE mul yM yE mul zM zE mul add add sub
- xV xE mul xM xE mul sub
- yV yE mul yM yE mul sub add
- zV zE mul zM zE mul sub add
- div def
- /x_E kC xV xM sub mul xM add def
- /y_E kC yV yM sub mul yM add def
- /z_E kC zV zM sub mul zM add def}%
-\psPoint(x_E,y_E,z_E){#4}}
-
-
-%%%%%%%
-%%%%%%% Defining the path for the input files
-\def \datapath{%
-% ../doc/}
-}
-
-%%%%%%%
-%%%%%%% Layout of the verbatim listing of showexamples
-\lstset{%
- basicstyle=\ttfamily\footnotesize,
- commentstyle=\color{PineGreen}\slshape\footnotesize,
- showspaces=false,
- showstringspaces=false,
- breaklines=true,
- backgroundcolor=\color{gray!20},
- breakautoindent=true,
- captionpos=t,
- language=TeX,
- emph={\begin,\codejps,\end},
- emphstyle=\color{RoyalBlue},
- emph={[2]pspicture},
- emphstyle={[2]\color{OrangeReddy}},
- numbersep=5pt
-}
-
-%%%%%%%
-%%%%%%% Title Page
-\title{\texttt{pst-solides3d}:\\
- The Documentation -- The Basics
- \\[0.5cm]
-{\normalsize v. \PSTfileversion\ (\PSTfiledate)}\\[20pt]
-\includegraphics[scale=0.6]{kepler}
-}
-\author{Jean-Paul \textsc{Vignault}, Manuel \textsc{Luque}, Arnaud
-\textsc{Schmittbuhl}\\
-{\small
- \url{<jpv@melusine.eu.org>}, \url{<manuel.luque27@gmail.com>},
- \url{<aschmittbuhl@libertysurf.fr>}}
-\thanks{With the additional help of:\newline
- J\"{u}rgen \textsc{Gilg} \url{<gilg@acrotex.net>},\newline
- Jean-Michel \textsc{Sarlat} \url{<jm.sarlat@gmail.com>},\newline
- Herbert \textsc{Voss} \url{<herbert.voss@fu-berlin.de>}.
-}}
-\date{\today}
-
-
-
-\usepackage[
-% colors for the links
- colorlinks=true, % color links
- urlcolor=OrangeReddy, % color of URL links
- filecolor=black, % color of file links
- linkcolor=OrangeReddy, % color of links
-% Links
- %raiselinks=true, % raise up links (for HyperTeX backend)
- %backref=page, % do bibliographical back refenrernces
- pagebackref=true, % back reference by page numbers
- verbose, % be chatty
- hyperindex=true, % set up hyperlink indices
- linktocpage=true, % make page number, not text, be linked on TOC, LOF, LOT
- hyperfootnotes=false, % do not set up hyperlink footnotes
-% Bookmarks
- bookmarks=true, % Generating Bookmarks for the PDF-Viewer
- bookmarksopenlevel=1, % Level to which Bookmarks are opened
- bookmarksopen=true, % Open up Bookmarks tree
- bookmarksnumbered=true, % Put section numbers in Bookmarks
- %bookmarkstype=toc, % Specify which TOC file to mimic
-% Anchors
- plainpages=false, % do not page number anchors as plain arabic
- pageanchor=true % put an anchor on every page
- ]{hyperref}
-
-%%%%%%%
-%%%%%%% PDF Informations
-\hypersetup{%
- pdftitle={pst-solides3d - The Documentation}, % Text for the PDF title field
- pdfauthor={Jean-Paul Vignault, Manuel Luque, Arnaud Schmittbuhl}, % Text for the PDF author field
- pdfcreator={LaTeX, hyperref, KOMA-Script}, % Text for the PDF creator field
- %pdfproducer={pdfeTeX 1.10b-2.1} % Text for the PDF producer field
- pdfstartview=FitH, % Fits the width of the page to the window.
- pdfpagemode=UseOutlines, % Show Bookmarks in the Viewer
- pdfpagelabels=true % set PDF page labels
- }
-\usepackage{breakurl} % Line-breakable \url-like links in hyperref when compiling via dvips/ps2pdf
-
-%%%%%%%%% Herbert
-%\usepackage{underscore}
-\ofoot{\pagemark}
-\def\Input#1#2{\ifoot{{\footnotesize#2}}\input{#1#2}}
-% doesnt wotrk with underscores in filename
-
-
-\begin{document}
-\maketitle
-
-\tableofcontents
-
-\newpage
-
-%\chapter{Basics for the package}
-%\Input \datapath {chapter-1-en}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\chapter{Setting the layout of the scenery}
-\Input \datapath {chapter-2-en}
-
-\Input \datapath {par-eclairageponctuel-en}
-
-\Input \datapath {par-axes3d-en}
-\end{document}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\chapter{Predefined solids and their positioning}
-
-\Input \datapath {par-solidespredefinis-en}
-
-\Input \datapath {par-positionnersolide-en}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\chapter{More options of \textbackslash{}psSolid}
-\Input \datapath {par-commandestrace-en}
-
-\Input \datapath {par-solidescreux-en}
-
-\Input \datapath {par-numeroterfacettes-en}
-
-\Input \datapath {par-en}leverfacettes-en}
-
-\Input \datapath {par-pointagesommets-en}
-
-\Input \datapath {par-couleurs-en}
-
-\Input \datapath {par-colorierfacettes-en}
-
-\Input \datapath {par-opacity-en}
-
-\Input \datapath {par-definitionmaillage-en}
-
-\Input \datapath {par-modes-en}
-
-\Input \datapath {par-tronque-en}
-
-\Input \datapath {par-affinage-en}
-
-\Input \datapath {par-chanfrein-en}
-
-\Input \datapath {par-transform-en}
-
-\Input \datapath {par-lignedeniveau-en}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\chapter{Usage of external files}
-\Input \datapath {par-datfile-en}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\chapter{Some special objects}
-%\Input \datapath {par-grille-en}
-\Input \datapath {par-point-en}
-
-\Input \datapath {par-vecteur-en}
-
-\Input \datapath {par-plan-en}
-
-\Input \datapath {par-geode-en}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\chapter{Generating some new solids}
-\Input \datapath {par-codejps-en}
-
-\Input \datapath {par-definirfonction-en}
-
-\Input \datapath {par-courbeR3-en}
-
-\Input \datapath {par-tube-en}
-
-\Input \datapath {par-prisme-en}
-
-\Input \datapath {par-new-en}
-
-\Input \datapath {par-face-en}
-
-\Input \datapath {par-ruban-en}
-
-\Input \datapath {par-anneaux-en}
-
-\Input \datapath {par-cylindres-cones-en}
-
-\Input \datapath {par-surfacesparametrees-en}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\chapter{Surfaces defined by a function of the form $z=f(x,y)$}
-\Input \datapath {par-surfaces-en}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\chapter{Advanced usage}
-\Input \datapath {par-nommersolide-en}
-
-\Input \datapath {par-section-en}
-
-\Input \datapath {par-fusion-en}
-
-\Input \datapath {par-fusionjps-en}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\chapter{Interaction with PSTricks}
-
-\Input \datapath {par-positionnerpointconnu-en}
-
-\Input \datapath {par-ligne3D-en}
-
-\Input \datapath {par-tracerpolygone-en}
-
-\Input \datapath {par-transformpointconnu-en}
-
-\Input \datapath {par-annoterschema-en}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\chapter{Projections}
-\Input \datapath {par-projpresentation-en}
-
-\Input \datapath {par-projectionvisibility-en}
-
-\Input \datapath {par-definirplanquelconque-en}
-
-\Input \datapath {par-projectionpoint-en}
-
-\Input \datapath {par-projectionvecteur-en}
-
-\Input \datapath {par-projectiondroite-en}
-
-%\newpage
-\Input \datapath {par-projectioncercle-en}
-
-\Input \datapath {par-projectionpolygone-en}
-
-\Input \datapath {par-projectionligne-en}
-%\newpage
-
-\Input \datapath {par-projectionangledroit-en}
-
-\Input \datapath {par-projectioncourbe-en}
-
-\Input \datapath {par-projectiontexte-en}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\chapter{Possible extensions}
-\Input \datapath {par-extensions-en}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\appendix
-\chapter{Appendix}
-\Input \datapath {par-parametres-en}
-
-\Input \datapath {par-keywords-en}
-
-\Input \datapath {par-acknowledgements-en}
-
-\Input \datapath {par-poems-en}
-
-
-\nocite{*}
-\bgroup
-\RaggedRight
-\bibliographystyle{plain}
-\bibliography{pst-solides3d-doc}
-\egroup
-
-\end{document}
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 a468873a787..e38380aaca1 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
Binary files differ
diff --git a/Master/texmf-dist/dvips/pst-solides3d/solides.pro b/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro
index 2680568f365..456b984a364 100644
--- a/Master/texmf-dist/dvips/pst-solides3d/solides.pro
+++ b/Master/texmf-dist/dvips/pst-solides3d/pst-solides3d.pro
@@ -1,8 +1,9 @@
%!
% PostScript prologue for pst-solides3d.tex.
-% Version 4.16, 2010/01/07
+% Version 4.20, 2010/04/27
%
-%% COPYRIGHT 2009 by Jean-Paul Vignault
+%% COPYRIGHT 2009/10 by Jean-Paul Vignault
+%% opacity changes by Herbert Voss
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
@@ -5246,6 +5247,7 @@ end
} def
%%%%% ### solidnumsommets ###
+/solidnumsep 15 def
/solidnumsommets {
8 dict begin
% Font findfont 10 scalefont setfont
@@ -5279,7 +5281,7 @@ end
%% le sommet i est dans la face j
sol j solidcentreface /G defpoint3d
G S vecteur3d normalize3d
- 15 dup ptojpoint pop
+ solidnumsep dup ptojpoint pop
mulv3d
S addv3d
3dto2d cctext
@@ -5389,9 +5391,17 @@ end
%% G
%% solid 2 i solidgetsommetface
%% vecteur3d
-
+%
/n solid i solidfacenombresommets def
- solid i solidcentreface /G defpoint3d
+ n 3 ge {
+ [
+ solid 0 i solidgetsommetface
+ solid 1 i solidgetsommetface
+ solid 2 i solidgetsommetface
+ ] isobarycentre3d /G defpoint3d
+ } {
+ solid i solidcentreface /G defpoint3d
+ } ifelse
%% debug %% G 3dto2d point
G
solid 0 i solidgetsommetface
@@ -8446,7 +8456,7 @@ end
%% tableau des sommets
/S [
- 0 0 0
+ 0 0 0 0 f_surface
1 1 nx {
/j exch def
1 1 ny {
@@ -10727,6 +10737,22 @@ end
gere_pstricks_opt
} def
+/pst-Surface* {
+ r
+ ngrid length 2 ge {
+ [ngrid 0 get ngrid 1 get]
+ } {
+ ngrid length 1 eq {
+ [ngrid 0 get dup]
+ } ifelse
+ } ifelse
+ {f} newsurface*
+ solidbiface {
+ dup videsolid
+ } if
+ gere_pstricks_opt
+} def
+
/pst-surface {
base
base aload pop
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 2ee7116c91e..e80033298db 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,2009 by Manuel Luque, Arnaud Schmittbuhl,
+%% COPYRIGHT 2008-2010 by Manuel Luque, Arnaud Schmittbuhl,
%% Jean-Paul Vignault, Herbert Voss.
%%
%% This work may be distributed and/or modified under the
@@ -33,11 +33,11 @@
\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi
\ifx\MultidoLoaded\endinput\else \input multido.tex \fi
% JPV & ML & AS & HV
-\def\fileversion{4.18}
-\def\filedate{2010/04/07}
+\def\fileversion{4.19}
+\def\filedate{2010/04/30}
\message{`PSTSOLIDESIIID' v\fileversion, \filedate}
%
-\pstheader{solides.pro}
+\pstheader{pst-solides3d.pro}
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
\pst@addfams{pst-solides3d}
@@ -228,7 +228,8 @@ trunccoeff=.25,chanfreincoeff=.8,affinagecoeff=.8,dualregcoeff=1,intersectiontyp
\psset[pst-solides3d]{faces={}}% valeurs par defaut
%% numerotation des faces
\define@key[psset]{pst-solides3d}{numfaces}{\def\pst@solides@numfaces{#1}}
-\psset[pst-solides3d]{numfaces=}% pas de numerotation par defaut
+\define@key[psset]{pst-solides3d}{numsep}{\pst@getlength{#1}\pst@solides@numsep}
+\psset[pst-solides3d]{numfaces=,numsep=15pt}% pas de numerotation par defaut
%% troncature des sommets
\define@key[psset]{pst-solides3d}{trunc}{\def\pst@solides@trunc{#1}}
\psset[pst-solides3d]{trunc=}% pas de troncature par defaut
@@ -252,23 +253,6 @@ trunccoeff=.25,chanfreincoeff=.8,affinagecoeff=.8,dualregcoeff=1,intersectiontyp
\define@key[psset]{pst-solides3d}{lightintensity}{\def\pst@solides@lightintensity{#1}}
\psset[pst-solides3d]{lightintensity=2}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Code \@for (Stolen from LaTeX file: latex.ltx)
-%% thanks to Herbert Voss
-\expandafter\ifx\csname @latexerr\endcsname\relax% do we have LaTeX?
- \immediate\write17{We are running tex and have to define some LaTeX commands ...}
- \def\@fornoop#1\@@#2#3{}
- \long\def\@for#1:=#2\do#3{%
- \expandafter\def\expandafter\@fortmp\expandafter{#2}%
- \ifx\@fortmp\@empty \else
- \expandafter\@forloop#2,\@nil,\@nil\@@#1{#3}\fi}
- \long\def\@forloop#1,#2,#3\@@#4#5{\def#4{#1}\ifx #4\@nnil \else
- #5\def#4{#2}\ifx #4\@nnil \else#5\@iforloop #3\@@#4{#5}\fi\fi}
- \long\def\@iforloop#1,#2\@@#3#4{\def#3{#1}\ifx #3\@nnil
- \expandafter\@fornoop \else
- #4\relax\expandafter\@iforloop\fi#2\@@#3{#4}}%
-\fi
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Reservation des noms de macros
% #1=type de reservation (action, object...) associee a une liste qui
% doit forcement etre du type pst@solides@list@#1
@@ -301,7 +285,7 @@ trunccoeff=.25,chanfreincoeff=.8,affinagecoeff=.8,dualregcoeff=1,intersectiontyp
tore,cube,tetrahedron,octahedron,icosahedron,dodecahedron,sphere,%
cylindre,cylindrecreux,cone,conecreux,tronccone,troncconecreux,%
grille,prisme,anneau,parallelepiped,prismecreux,ruban,calottesphere,face,%
-Surface,surface,calottespherecreuse,polygoneregulier,fusion,new,chemin,courbeR2,courbe,%
+Surface,Surface*,surface,calottespherecreuse,polygoneregulier,fusion,new,chemin,courbeR2,courbe,%
surfaceparametree,texte,trigospherique,vecteur,line,objfile,datfile,surface*,%
plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle}
%
@@ -444,16 +428,16 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
\pst@def{optionssolides}<%
-/PSfont {\pst@solides@PSfont} def
-/pst@fill { \psk@opacityalpha .setopacityalpha fill } def
-/strokeopacity \psk@opacityalpha def
-/fillopacity \psk@opacityalpha def
-/xunit {\pst@number\psunit } def
+ /PSfont {\pst@solides@PSfont} def
+ /pst@fill { \psk@opacityalpha .setopacityalpha fill } def
+ /strokeopacity \psk@opacityalpha def
+ /fillopacity \psk@opacityalpha def
+ /xunit {\pst@number\psunit } def
%% /cm {\pst@number\psunit mul} def
%% /cm_1 {\pst@number\psunit div} def
-/decal \pst@solides@decal\space def % decalage
-/viewpointXYZ {\pst@solides@viewpoint} def
-/Decran \pst@solides@Decran\space def % distance de l'ecran
+ /decal \pst@solides@decal\space def % decalage
+ /viewpointXYZ {\pst@solides@viewpoint} def
+ /Decran \pst@solides@Decran\space def % distance de l'ecran
%
/RotX \psk@solides@RotX\space def
/RotY \psk@solides@RotY\space def
@@ -519,33 +503,13 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle}
\fi
%
/rmfaces [\pst@solides@CoordinatesRm] def
-%
-\ifx\pst@solides@plansepare\@empty\else
- /plansepare {\pst@solides@plansepare} def
-\fi
-%
-\ifx\pst@solides@transform\@empty\else
- /pst-transformoption { \pst@solides@transform} def
-\fi
-%
-\ifx\pst@solides@name\@empty\else
- /solidname (\pst@solides@name) def
-\fi
-\ifx\pst@solides@file\@empty\else
- /solidfilename (\pst@solides@file) def
-\fi
-%
-\ifx\pst@solides@planname\@empty\else
- /solidplanname (\pst@solides@planname) def
-\fi
-%
-\ifx\pst@solides@load\@empty\else
- /solidloadname {\pst@solides@load} def
-\fi
-%
-\ifx\pst@solides@fcolor\@empty\else
- /solidfcolor (\pst@solides@fcolor) def
-\fi
+\ifx\pst@solides@plansepare\@empty\else/plansepare {\pst@solides@plansepare} def\fi
+\ifx\pst@solides@transform\@empty\else/pst-transformoption { \pst@solides@transform} def\fi
+\ifx\pst@solides@name\@empty\else/solidname (\pst@solides@name) def\fi
+\ifx\pst@solides@file\@empty\else/solidfilename (\pst@solides@file) def\fi
+\ifx\pst@solides@planname\@empty\else/solidplanname (\pst@solides@planname) def\fi
+\ifx\pst@solides@load\@empty\else/solidloadname {\pst@solides@load} def\fi
+\ifx\pst@solides@fcolor\@empty\else/solidfcolor (\pst@solides@fcolor) def\fi
%
/fcol [\pst@solides@fcol] def
/solidhue [\pst@solides@hue] def
@@ -560,6 +524,7 @@ plan,offfile,geode,load,plantype,point,pie,droite,polygone,cercle,rightangle}
/faces [\pst@solides@faces] def
/solidshow [\pst@solides@show] def
/solidnum [\pst@solides@num] def
+SolidesDict begin /solidnumsep \pst@solides@numsep\space def end
/solidnumf [\pst@solides@numfaces] def
/solidtrunc [\pst@solides@trunc] def
/solidaffinage [\pst@solides@affinage] def
@@ -767,40 +732,55 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
\endgroup%
\ignorespaces%
}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% la macro \psSurface
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\psSurface{\pst@object{psSurface}}
-\def\psSurface@i(#1,#2)(#3,#4)#5{%
-%% \def\hue{0 1 #3 #1 sub \pst@solides@dx\space div
-%% #4 #2 sub \pst@solides@dy\space div mul
-%% {/iF ED iF [1 iF #3 #1 sub \pst@solides@dx\space div
-%% #4 #2 sub \pst@solides@dy\space div
+\def\psSurface{\@ifnextchar*{\@startrue\psSurface@i}{\@starfalse\psSurface@i*}}
+\def\psSurface@i*{\@ifnextchar[{\psSurface@ii}{\psSurface@ii[]}}
+\def\psSurface@ii[#1](#2,#3)(#4,#5)#6{%
+%% \def\hue{0 1 #4 #2 sub \pst@solides@dx\space div
+%% #5 #3 sub \pst@solides@dy\space div mul
+%% {/iF ED iF [1 iF #4 #2 sub \pst@solides@dx\space div
+%% #5 #3 sub \pst@solides@dy\space div
%% mul div sub 0.75 1] (sethsbcolor) astr2str} for}
- \ifPst@solidmemory\begingroup\use@par\else\begin@ClosedObj\fi
+ \pst@killglue%
+ \begingroup%
+ \psset{#1}%
+ \init@pscode%
\addto@pscode{
1 setlinejoin
\tx@optionssolides
SolidesDict begin
/CX 0 def /CY 0 def /CZ 0 def
- /base [ #1 #3 #2 #4 ] def
+ /base [ #2 #4 #3 #5 ] def
\ifPst@algebraic
- /fonction (#5) tx@AlgToPs begin AlgToPs end cvx def
+ /fonction (#6) tx@AlgToPs begin AlgToPs end cvx def
\else
- /fonction { #5 } def
+ /fonction { #6 } def
\fi
/f {2 dict begin
/y exch def
/x exch def
fonction end
} def
- pst-Surface
+ \if@star pst-Surface* \else pst-Surface \fi
end
}% fin du code ps
- \ifPst@axesboxed\gridIIID(#1,#3)(#2,#4)\fi
- \ifPst@solidmemory\endgroup\else\end@ClosedObj\fi%
+ \@starfalse
+ \ifPst@axesboxed\gridIIID(#2,#4)(#3,#5)\fi
+ \ifPst@solidmemory\else%
+ \ifpsshadow \pst@closedshadow \fi
+ \ifdim\psk@border\p@>\z@ \pst@addborder \fi
+ \psk@fillstyle
+ \pst@stroke
+ \ifpsdoubleline \pst@doublestroke \fi
+ \ifshowpoints\pst@OpenShowPoints\fi
+ \use@pscode%
+ \fi%
+ \endgroup%
\ignorespaces}
-
+%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% la macro \defFunction
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1079,9 +1059,98 @@ XpointVue YpointVue ZpointVue /viewpoint defpoint3d
\ignorespaces%
\SpecialCoor%
}
-
+%
+\def\psResetSolidKeys{%
+\psset[pst-solides3d]{%
+action=draw**,%
+affinage=,% pas de affinage par defaut
+affinagerm=true,
+args=,%
+axe=0 0 1,% vecteur definissant la direction de l'axe du prisme
+axesboxed=false,%
+axisemph=,
+axisnames={x,y,z},
+base=-1 -1 1 -1 0 1,% coordonnees d'un triangle, base triangulaire par defaut
+biface=true,%
+chanfrein=false,
+color1=cyan,
+color2=magenta,
+color3=blue,
+color4=red,
+deactivatecolor=false,%
+decal=-2,% decalage par defaut
+definition=,%
+dualreg=false,
+faces={},% valeurs par defaut
+fcolor=,% pas de couleur par defaut
+fcol=,% pas de faces par defaut
+file=,% pas de fichier par defaut
+function=,% pas de valeur par defaut
+geode=false,
+grid=true,
+hollow=false,
+hue=,% pas de degrade externe par defaut
+incolor=green,
+inhue=,% pas de degrade interne par defaut
+inouthue=,% pas de degrade total par defaut
+intersectioncolor=(rouge),%
+intersectionlinewidth=1,%
+intersectionplan=[0 0 1 0],%
+isolatin=true,
+lightintensity=2,
+lightsrc=,% pas de coordonnees par defaut
+load=,% pas de load par defaut
+mathLabel,
+mode=2,%
+name=,% pas de nom par defaut
+ngrid=,% pas de faces par defaut
+normal=0 0 1,
+numfaces=,
+numsep=15pt,% pas de numerotation par defaut
+num=,% pas de numerotation defaut
+object=tore,%
+origine=0 0 0,%
+path=newpath 0 0 moveto,% valeur par defaut
+plangrid=false,%
+planmarks=false,%
+planname=,% pas de nom par defaut
+plan=,% pas de plan par defaut
+plansection=,% pas de section par defaut
+plansepare=,% pas de separation par defaut
+pos=cc,% centre par defaut
+PSfont=Times-Roman,fontsize=10,
+R=4,r1=4,r0=1.5,r=2,no=0,a=4,b=a,c=a,h=6,phi=0,theta=90,resolution=36,%
+range=-5 5,% le range par defaut
+rm=,% pas de faces par defaut
+RotationAngleText=0,%
+RotZ=0,RotX=0,RotY=0,Decran=50,% valeurs par defaut
+section=\Sol@Section,% coordonnees des sommets de la section
+showbase=false,%
+showBase=false,%
+showOrigin,
+show=,% pas de pointage par defaut
+solidmemory=false,
+solidname=,% pas de nom par defaut
+sommets=,% pas de sommet par defaut
+spotX=dr,
+spotY=dl,
+spotZ=l,
+QZ=0,
+Zmin=-4,
+Zmax=4,
+stepX=1,
+stepY=1,
+stepZ=1,
+ticklength=0.2,% the step for the axes labels
+tablez=,%
+text=,% pas de texte par defaut
+transform=,%
+trunc=,% pas de troncature par defaut
+viewpoint=10 10 10,% coordonnees cartesiennes
+visibility=true,
+zcolor=}
+}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\catcode`\@=\PstAtCode\relax
-
-
+%
\endinput
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 f1b3daefd9d..0d7b1bd126f 100644
--- a/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty
+++ b/Master/texmf-dist/tex/latex/pst-solides3d/pst-solides3d.sty
@@ -4,8 +4,8 @@
\input{pst-solides3d.tex}
\ProvidesFile{pst-solides3d.tex}
[\filedate\space v\fileversion\space `PST-solides3D']
-\IfFileExists{solides.pro}{%
- \ProvidesFile{solides.pro}
- [2010/01/07 v. 4.16, PostScript prologue file]
- \@addtofilelist{solides.pro}}{}%
+\IfFileExists{pst-solides3d.pro}{%
+ \ProvidesFile{pst-solides3d.pro}
+ [2010/04/27 v. 4.20, PostScript prologue file]
+ \@addtofilelist{pst-solides3d.pro}}{}%
\endinput