pst-labo (11dec15)

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

18 files changed, 843 insertions, 720 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-labo/Changes b/Master/texmf-dist/doc/generic/pst-labo/Changes
index 05308f3f681..b2ba9b6865a 100644
--- a/Master/texmf-dist/doc/generic/pst-labo/Changes
+++ b/Master/texmf-dist/doc/generic/pst-labo/Changes
@@ -1,10 +1,12 @@
 pst-labo.tex -----------------------------------
+2.04  2015-12-09  fix trailing space in \pst@Ballon@Reflux (ml)
 2.03  2006-08-16  fix typo with middle (hv)
 2.02  2005-10-08  new option glassType (hv)
 2.01  2005-03-13  fix bug with pstcol loaded (HV)
 
 
 pst-laboObj.tex --------------------------------
+2.04  2015-12-09  fix trailing space in \pst@Ballon@Reflux (ml)
 
 
 dcoumentation ----------------------------------
diff --git a/Master/texmf-dist/doc/generic/pst-labo/Makefile b/Master/texmf-dist/doc/generic/pst-labo/Makefile
new file mode 100644
index 00000000000..fa0627424d1
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-labo/Makefile
@@ -0,0 +1,105 @@
+# $Id: Makefile 234 2015-12-10 11:20:02Z herbert $
+
+# `Makefile' for `pst-labo.pdf'
+
+.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps  
+
+PACKAGE = pst-labo
+MAIN = $(PACKAGE)-doc
+LANGUAGES = DE EN FR
+#PRO = $(PACKAGE).pro
+PRO = 
+
+
+empty=
+space=$(empty) $(empty)
+DOC_SOURCES = $(addprefix $(PACKAGE)-doc,$(LANGUAGES)$(space))
+DOC_SOURCES := $(addsuffix .tex, $(DOC_SOURCES))
+DOCS = $(DOC_SOURCES:.tex=.pdf)
+
+TDS = ~/PSTricks/PSTricks-TDS
+
+LATEX  = latex 
+PDFLATEX  = latex 
+OPTIONS= --Iext=.png --Iscale=0.5 --DPI=150 --noImages
+DVIPS = dvips
+PS2PDF = ps2pdf 
+
+ARCHNAME = $(PACKAGE)-$(shell date +%Y%m%d)
+
+ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(DOC_SOURCES) \
+  README Changes Makefile
+
+all : $(DOCS) clean ctan tds
+
+%.pdf : %.tex 
+	$(LATEX) $(basename $<) $(OPTIONS)
+#	makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls $(basename $<).glo
+	makeindex -s pst-doc.ist -t $(basename $<).ilg -o $(basename $<).ind $(basename $<).idx
+	bibtex $(basename $<)
+	$(PDFLATEX) $(basename $<)
+	$(PDFLATEX) $(basename $<)
+	$(DVIPS) $(basename $<)
+	$(PS2PDF)  $(basename $<).ps
+
+clean :
+	$(RM) $(foreach i,$(DOC_SOURCES:.tex=),$(addprefix $i, \
+          .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .bbl .dvi .xcp .ps))
+
+veryclean : clean
+	$(RM) $(foreach i,$(DOC_SOURCES:.tex=),$(addprefix $i, .pdf ))
+
+arch :
+	zip $(ARCHNAME).zip $(ARCHFILES)
+
+ifneq ($(strip $(PRO)),)
+installPRO : 
+	@echo "Installiere PRO-Dateien ($(PRO))..."
+	cp -u Changes        $(TDS)/dvips/$(PACKAGE)/
+	cp -u $(PACKAGE).pro $(TDS)/dvips/$(PACKAGE)/
+	cp -u $(PACKAGE).pro ~/Links/dvips-local/
+else
+installPRO : 
+	@:
+endif
+
+tds : installPRO
+	@echo "Installiere TeX-Zeug..."
+	cp -u Changes     $(TDS)/doc/generic/$(PACKAGE)/
+	cp -u README      $(TDS)/doc/generic/$(PACKAGE)/
+	cp -u *.pdf $(TDS)/doc/generic/$(PACKAGE)/
+#
+	cp -u Changes        $(TDS)/tex/latex/$(PACKAGE)/
+	cp -u $(PACKAGE).sty $(TDS)/tex/latex/$(PACKAGE)/
+#
+	cp -u Changes        $(TDS)/tex/generic/$(PACKAGE)/
+	cp -u $(PACKAGE).tex $(TDS)/tex/generic/$(PACKAGE)/
+#
+	cp -u Changes     $(TDS)/source/$(PACKAGE)/
+	cp -u *-doc??.tex $(TDS)/source/$(PACKAGE)/
+	cp -u $(PACKAGE)8* $(TDS)/source/$(PACKAGE)/
+	cp -u $(MAIN).bib $(TDS)/source/$(PACKAGE)/
+	cp -u Makefile    $(TDS)/source/$(PACKAGE)/
+
+ctan:
+	rm -f .ctan/$(PACKAGE)/latex/*
+	cp -u *.sty .ctan/$(PACKAGE)/latex/
+#	cp -u *.cfg .ctan/$(PACKAGE)/latex/
+	rm -f .ctan/$(PACKAGE)/tex/*
+	cp -u $(PACKAGE).tex .ctan/$(PACKAGE)/tex/
+	cp -u $(PACKAGE)Obj.tex .ctan/$(PACKAGE)/tex/
+#	cp -u *.pro .ctan/$(PACKAGE)/dvips/
+	rm -f .ctan/$(PACKAGE)/doc/*
+	cp -u $(PACKAGE)-doc.bib .ctan/$(PACKAGE)/doc/
+	cp -u $(PACKAGE)-doc??.* .ctan/$(PACKAGE)/doc/
+	cp -u Makefile .ctan/$(PACKAGE)/doc/
+	cp -u $(PACKAGE)8* .ctan/$(PACKAGE)/doc/
+#	rm -fr .ctan/$(PACKAGE)/.svn
+	cp -u Changes     .ctan/$(PACKAGE)/
+	cp -u README      .ctan/$(PACKAGE)/
+	chmod -R a+r .ctan/$(PACKAGE)
+
+debug :
+	@echo $(DOC_SOURCES)
+
+# EOF
diff --git a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.bib b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.bib
index e217a66170f..7167c24d309 100644
--- a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-doc.bib
@@ -7,9 +7,9 @@
 @Book{PSTricks2,
   author	= {Herbert Vo\ss},
   title		= {{\PST} {G}rafik f\"ur \TeX{} und \LaTeX},
-  edition	= {second},
+  edition	= 6,
   publisher	= {DANTE -- Lehmanns},
-  year		= {2005},
+  year		= {2010},
   address	= {Heidelberg/Hamburg}
 }
 
diff --git a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.ltx b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.ltx
deleted file mode 100644
index 1f675cb7980..00000000000
--- a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.ltx
+++ /dev/null
@@ -1,223 +0,0 @@
-\documentclass[11pt,a4paper,ngerman]{article}
-\usepackage[latin1]{inputenc}%
-\usepackage[T1]{fontenc}
-\usepackage{babel}
-\usepackage{lmodern}
-\usepackage{enumerate,longtable,url}
-\let\OldUrl=\url
-\renewcommand\url[1]{\protect\OldUrl{#1}}
-
-\usepackage[scaled]{luximono}
-%
-\usepackage{xspace,nonfloat}
-\usepackage[bottom]{footmisc}
-%
-\usepackage{tabularx}
-\usepackage{longtable}
-\usepackage{ltxtable}
-\usepackage{varioref}
-\usepackage[NewCommands,NewParameters]{ragged2e}
-\usepackage{url}
-\def\UrlFont{\ttfamily}
-\makeatletter
-%\def\verbatim@font{\small\normalfont\ttfamily}
-%
-\usepackage[dvipsnames,prologue,table]{pstricks}
-\colorlet{tableheadcolor}{gray!25}
-\colorlet{tablerowcolor}{gray!12}
-\newcommand\XCBox[1]{\fcolorbox{black}{#1}{\phantom{aa}} \small #1}
-\usepackage{pst-labo}
-\let\PSTfileversion\fileversion
-\SpecialCoor
-\psset{griddots=10,subgriddiv=0,gridlabels=7pt}
-%
-\definecolor{hellgelb}{rgb}{1,1,0.8}
-\definecolor{shadecolor}{rgb}{0.9,0.9,0.9}
-\definecolor{sphgrau}{rgb}{0.40,0.40,0.40}
-%
-% ------------------------------- Namen Abkuerungen ----------------------
-\newcommand{\La}%
-   {L\kern-.36em
-        {\setbox0\hbox{T}%
-         \vbox to\ht0{\hbox{$\m@th$%
-                \csname S@\f@size\endcsname
-                \fontsize\sf@size\z@
-                \math@fontsfalse\selectfont
-                A}%
-            \vss}%
-        }}
-\def\AllTeX{(\La\kern-.075em)\kern-.075em\TeX\xspace}
-\def\AMS{American Mathematical Society\xspace}
-\def\AmS{$\mathcal{A}$\kern-.1667em\lower.5ex\hbox
-    {$\mathcal{M}$}\kern-.125em$\mathcal{S}$}
-\def\AmSLaTeX{\AmS-\LaTeX\xspace}
-\let\latex\LaTeX
-\let\tex\TeX
-%
-\def\BibTeX{\textsc{Bib}\kern-.08em\TeX\index{BiBTeX@Bib\TeX}}
-\def\PT{Plain \TeX\index{Plain TeX@Plain \TeX}\xspace}
-\def\PST{{\texttt{PSTricks}}\xspace}
-\def\CTAN{{\texttt{CTAN}}\index{CTAN}\xspace}
-\def\PDF{{\texttt{PDF}}\xspace}
-\def\pst{{\texttt{pstricks}}\xspace}
-\def\PS{PostScript\xspace}
-\def\CT{Con\TeX t\index{ConTeXt@Con\TeX t}\xspace}
-\def\GS{Ghostscript\index{Ghostscript}\xspace}
-\def\GeX{G\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@}
-\def\at{\char064}
-\def\VTeX{\texttt{V\TeX}\index{VTeX@\texttt{V\protect\TeX}}}
-\newcommand*\CMD[1]{{\texttt{\textbackslash #1}}}
-\newcommand\Paket[1]{\texttt{#1}}
-\providecommand\Programm[1]{\textsf{#1}}
-\providecommand\RaggedRight{\raggedright}
-%
-\def\Index#1{\index{#1}#1}
-\index{Environment|see{Umgebung}}
-\def\eIndex#1{\index{Umgebung!#1@\texttt{#1}}\index{#1@\texttt{#1}}}
-\def\tIndex#1{\index{#1@\texttt{#1}}}
-\def\cIndex#1{\index{#1@\protect\CMD{#1}}}
-\def\pIndex#1{\index{Parameter@\textbf{Parameter}!#1@\texttt{#1}}\index{#1@\texttt{#1}}}
-\def\ppIndex#1{\index{Parameter@\textbf{Parameter}!#1@\texttt{#1}}}
-\def\sIndex#1{\index{Syntax@\textbf{Syntax}!\protect\CMD{#1}}}
-\def\csIndex#1{\sIndex{#1}\cIndex{#1}}
-\def\PIndex#1{\index{Paket@\textbf{Paket}!\texttt{#1}}}
-\def\mIndex#1{\texttt{#1}\tIndex{#1}\pIndex{#1}}
-\def\aref#1{$\rightarrow$\vref{#1}}
-\def\PSindex#1{\index{PostScript!#1}}
-\def\Makroindex#1{\index{Makro!#1@\protect\CMD{#1}}}
-\def\Optindex#1{\index{Parameter@\textbf{Parameter}!\texttt{#1}}}
-\def\ttindex#1{\index{#1@\texttt{#1}}}
-\def\vert{\ensuremath{|}}
-%
-\let\Olddegrees\textdegrees
-\def\textdegrees{\ensuremath{\mbox{\Olddegrees}}}
-\def\sa{\ensuremath{\sphericalangle}\xspace}% needs amssymb
-%
-%
-%%-------------------------------- danger ---------------------------------------------
-\usepackage{manfnt}
-\usepackage{lettrine}
-\newsavebox{\dBox}
-
-\newenvironment{dangerPar*}
-{\gdef\dangerSym{\dbend\,\dbend}\@dangerPar}
-{\end@dangerPar}
-
-\newenvironment{dangerPar}
-{\gdef\dangerSym{\dbend\phantom{\,\dbend}}\@dangerPar}
-{\end@dangerPar}
-
-\def\@dangerPar{%
-  \begin{lrbox}{\dBox}
-    \minipage[c]{\linewidth-\widthof{\dangerSym}-\columnsep}%
-}
-\def\end@dangerPar{%
-    \endminipage
-  \end{lrbox}%
-  \trivlist\item\relax
-    \noindent
-    \minipage[c]{\widthof{\dangerSym}}
-      \raisebox{\height}[.9\height][.1\height]{\dangerSym}% ???
-    \endminipage
-    \hfill
-    \minipage[c]{\wd\dBox}
-      \usebox{\dBox}
-    \endminipage%
-  \endtrivlist
-}
-\newsavebox{\bombbox}
-\sbox\bombbox{%
-  \psset{unit=.55ex}%
-  \begin{pspicture}(-4,-4)(4,4)
-    \pscircle[fillcolor=gray,fillstyle=solid]{4}
-    \rput{45}{\psscaleboxto(6,0){\textsf{\textbf{PS}}}}
-    \psellipse*(0,3.8)(1,.2)
-    \psellipse*(0,5.5)(1,.2)
-    \psframe*(-1,3.8)(1,5.5)
-    \psbezier(0,5.5)(0,7)(1,8)(3.5,8)
-    \multido{\r=-0+40}{9}{\rput{\r}(3.5,8){\psline(0,0)(.4,0)}}
-  \end{pspicture}}
-
-\newcommand\danger{%
-  \lettrine[lines=2,lraise=0.65,nindent=0pt,findent=.5em]{{\small\dbend}}}
-  
-\newcommand\ddanger{%
-  \lettrine[lines=2,lraise=0.65,nindent=0pt,findent=.5em]{%
-    {\small\dbend\,\dbend}}}
-    
-\newcommand\DANGER{%    
-  \lettrine[lines=3,lraise=0.01,lhang=0,nindent=0pt,findent=.75em]{%
-    \usebox\bombbox}}
-%%------------------------------- Rest ------------------------------------------
-\pretolerance=500
-\tolerance=1000 
-\hbadness=3000
-\vbadness=3000
-\hyphenpenalty=400
-
-%-------------------------------- Listings -------------------------------------
-\usepackage{showexpl}% not a real PSTricks package
-%
-\renewcommand{\ttdefault}{ul9}% Luxi Mono
-%\lstset{language=PSTricks,keywordstyle=\small\fontfamily{ul9}\bfseries} 
-\lstset{wide=true} 
-%
-%-------------------------------- Allgemein -------------------------------------
-%\addtolength\belowcaptionskip{-10pt}
-%
-\providecommand\dante{DANTE \eV}
-\providecommand\eV{e.V\kern-.18em\@ifnextchar.{}{.}}
-\def\textat{\protect\makeatletter\texttt{@}\protect\makeatother}
-
-\def\lBrace{\texttt{\{}}
-\def\rBrace{\texttt{\}}}
-\def\lBracket{\texttt{[}}
-\def\rBracket{\texttt{]}}
-%
-\newcounter{SX@refC}% for texlive8
-\def\PSTemph#1{\textit{\texttt{#1}}}
-%
-\def\LPack#1{\texttt{#1}\PIndex{#1}}
-\def\Lmenv#1{\texttt{#1}\eIndex{#1}}
-\def\Lmcs#1{\CMD{#1}\Makroindex{#1}\cIndex{#1}}
-\let\xLcs\Lmcs
-\let\Lcs\CMD
-\let\Lit\texttt
-\def\Loption#1{\texttt{#1}\Optindex{#1}\ttindex{#1}}
-\def\LProg#1{\texttt{#1}\pIndex{#1}}
-\let\Prog\LProg
-\def\LFile#1{\texttt{#1}\tIndex{#1}}
-\def\LColor#1{\texttt{#1}\index{Farbe!#1@\texttt{#1}}}
-\def\Lindex#1{#1\index{#1}}% Ausgeben und in den Index
-\def\Lext#1{\texttt{#1}\index{Dateiendung!#1@\texttt{#1}}}
-\def\LClass#1{\texttt{#1}}
-\def\Lmnotation#1{\texttt{#1}\tIndex{#1}}
-\newcommand\Larga{}
-\DeclareRobustCommand\Larga[1]{$\langle$\PSTemph{#1}$\rangle$}
-\newcommand\LargA{}
-\DeclareRobustCommand\LargA[1]{\lBrace$\langle$\PSTemph{#1}$\rangle$\rBrace}
-\newcommand\Largs{}
-\DeclareRobustCommand\Largs[1]{\lBracket$\langle$\PSTemph{#1}$\rangle$\rBracket}
-\newcommand\Largb{}
-\DeclareRobustCommand\Largb[1]{\lBrace$\langle$\PSTemph{#1}$\rangle$\rBrace}
-\newcommand\Largr{}
-\DeclareRobustCommand\Largr[1]{\PSTemph{({#1})}}
-\DeclareRobustCommand\Largra[1]{(\Larga{#1})}
-\newcommand\Larg{}
-\DeclareRobustCommand\Larg[1]{\lBrace\texttt{#1}\rBrace}
-\def\begEnv#1{\CMD{begin\{#1\}}\tIndex{#1}}
-\def\endEnv#1{\CMD{end\{#1\}}}
-\def\OptArg{\Largs{Optionen}}
-\def\Largrao{($\langle x_0,y_0\rangle$)}
-\def\Largrai{($\langle x_1,y_1\rangle$)}
-\def\Largraii{($\langle x_2,y_2\rangle$)}
-\def\Largraiii{($\langle x_3,y_3\rangle$)}
-\def\Largran{($\langle x_n,y_n\rangle$)}
-%
-\input random
-%
-\begin{document}
-
-\input{pst-labo-docDE}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.pdf b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.pdf
index c19d650e1cc..2fb2fb082a3 100644
--- a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.pdf
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.tex b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.tex
index b7f37fa750e..6cdf7fb3c9b 100644
--- a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.tex
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docDE.tex
@@ -1,10 +1,232 @@
+\documentclass[11pt,a4paper,ngerman]{article}
+\usepackage[latin1]{inputenc}%
+\usepackage[T1]{fontenc}
+\usepackage{babel}
+\usepackage{lmodern}
+\usepackage{enumerate,longtable,url}
+\let\OldUrl=\url
+\renewcommand\url[1]{\protect\OldUrl{#1}}
+
+\usepackage[scaled]{luximono}
+%
+\usepackage{xspace,nonfloat}
+\usepackage[bottom]{footmisc}
+%
+\usepackage{tabularx}
+\usepackage{longtable}
+\usepackage{ltxtable}
+\usepackage{varioref}
+\usepackage[NewCommands,NewParameters]{ragged2e}
+\usepackage{url}
+\def\UrlFont{\ttfamily}
+%\def\verbatim@font{\small\normalfont\ttfamily}
+%
+
+\usepackage{makeidx}\makeindex
+\usepackage[dvipsnames,prologue,table]{pstricks}
+\colorlet{tableheadcolor}{gray!25}
+\colorlet{tablerowcolor}{gray!12}
+\newcommand\XCBox[1]{\fcolorbox{black}{#1}{\phantom{aa}} \small #1}
+\usepackage{pst-labo}
+\let\PSTfileversion\fileversion
+\psset{griddots=10,subgriddiv=0,gridlabels=7pt}
+%
+\definecolor{hellgelb}{rgb}{1,1,0.8}
+\definecolor{shadecolor}{rgb}{0.9,0.9,0.9}
+\definecolor{sphgrau}{rgb}{0.40,0.40,0.40}
+%
+% ------------------------------- Namen Abkuerungen ----------------------
+\makeatletter
+\newcommand{\La}%
+   {L\kern-.36em
+        {\setbox0\hbox{T}%
+         \vbox to\ht0{\hbox{$\m@th$%
+                \csname S@\f@size\endcsname
+                \fontsize\sf@size\z@
+                \math@fontsfalse\selectfont
+                A}%
+            \vss}%
+        }}
+\def\AllTeX{(\La\kern-.075em)\kern-.075em\TeX\xspace}
+\def\AMS{American Mathematical Society\xspace}
+\def\AmS{$\mathcal{A}$\kern-.1667em\lower.5ex\hbox
+    {$\mathcal{M}$}\kern-.125em$\mathcal{S}$}
+\def\AmSLaTeX{\AmS-\LaTeX\xspace}
+\let\latex\LaTeX
+\let\tex\TeX
+%
+%$
+\def\BibTeX{\textsc{Bib}\kern-.08em\TeX\index{BiBTeX@Bib\TeX}}
+\def\PT{Plain \TeX\index{Plain TeX@Plain \TeX}\xspace}
+\def\PST{{\texttt{PSTricks}}\xspace}
+\def\CTAN{{\texttt{CTAN}}\index{CTAN}\xspace}
+\def\PDF{{\texttt{PDF}}\xspace}
+\def\pst{{\texttt{pstricks}}\xspace}
+\def\PS{PostScript\xspace}
+\def\CT{Con\TeX t\index{ConTeXt@Con\TeX t}\xspace}
+\def\GS{Ghostscript\index{Ghostscript}\xspace}
+\def\GeX{G\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@}
+\def\at{\char064}
+\def\VTeX{\texttt{V\TeX}\index{VTeX@\texttt{V\protect\TeX}}}
+\newcommand*\CMD[1]{{\texttt{\textbackslash #1}}}
+\newcommand\Paket[1]{\texttt{#1}}
+\providecommand\Programm[1]{\textsf{#1}}
+\providecommand\RaggedRight{\raggedright}
+%
+\def\Index#1{\index{#1}#1}
+\index{Environment|see{Umgebung}}
+\def\eIndex#1{\index{Umgebung!#1@\texttt{#1}}\index{#1@\texttt{#1}}}
+\def\tIndex#1{\index{#1@\texttt{#1}}}
+\def\cIndex#1{\index{#1@\protect\CMD{#1}}}
+\def\pIndex#1{\index{Parameter@\textbf{Parameter}!#1@\texttt{#1}}\index{#1@\texttt{#1}}}
+\def\ppIndex#1{\index{Parameter@\textbf{Parameter}!#1@\texttt{#1}}}
+\def\sIndex#1{\index{Syntax@\textbf{Syntax}!\protect\CMD{#1}}}
+\def\csIndex#1{\sIndex{#1}\cIndex{#1}}
+\def\PIndex#1{\index{Paket@\textbf{Paket}!\texttt{#1}}}
+\def\mIndex#1{\texttt{#1}\tIndex{#1}\pIndex{#1}}
+\def\aref#1{$\rightarrow$\vref{#1}}
+\def\PSindex#1{\index{PostScript!#1}}
+\def\Makroindex#1{\index{Makro!#1@\protect\CMD{#1}}}
+\def\Optindex#1{\index{Parameter@\textbf{Parameter}!\texttt{#1}}}
+\def\ttindex#1{\index{#1@\texttt{#1}}}
+\def\vert{\ensuremath{|}}
+%
+\let\Olddegrees\textdegrees
+\def\textdegrees{\ensuremath{\mbox{\Olddegrees}}}
+\def\sa{\ensuremath{\sphericalangle}\xspace}% needs amssymb
+%
+%
+%%-------------------------------- danger ---------------------------------------------
+\usepackage{manfnt}
+\usepackage{lettrine}
+\newsavebox{\dBox}
+
+\newenvironment{dangerPar*}
+{\gdef\dangerSym{\dbend\,\dbend}\@dangerPar}
+{\end@dangerPar}
+
+\newenvironment{dangerPar}
+{\gdef\dangerSym{\dbend\phantom{\,\dbend}}\@dangerPar}
+{\end@dangerPar}
+
+\def\@dangerPar{%
+  \begin{lrbox}{\dBox}
+    \minipage[c]{\linewidth-\widthof{\dangerSym}-\columnsep}%
+}
+\def\end@dangerPar{%
+    \endminipage
+  \end{lrbox}%
+  \trivlist\item\relax
+    \noindent
+    \minipage[c]{\widthof{\dangerSym}}
+      \raisebox{\height}[.9\height][.1\height]{\dangerSym}% ???
+    \endminipage
+    \hfill
+    \minipage[c]{\wd\dBox}
+      \usebox{\dBox}
+    \endminipage%
+  \endtrivlist
+}
+\newsavebox{\bombbox}
+\sbox\bombbox{%
+  \psset{unit=.55ex}%
+  \begin{pspicture}(-4,-4)(4,4)
+    \pscircle[fillcolor=gray,fillstyle=solid]{4}
+    \rput{45}{\psscaleboxto(6,0){\textsf{\textbf{PS}}}}
+    \psellipse*(0,3.8)(1,.2)
+    \psellipse*(0,5.5)(1,.2)
+    \psframe*(-1,3.8)(1,5.5)
+    \psbezier(0,5.5)(0,7)(1,8)(3.5,8)
+    \multido{\r=-0+40}{9}{\rput{\r}(3.5,8){\psline(0,0)(.4,0)}}
+  \end{pspicture}}
+
+\newcommand\danger{%
+  \lettrine[lines=2,lraise=0.65,nindent=0pt,findent=.5em]{{\small\dbend}}}
+  
+\newcommand\ddanger{%
+  \lettrine[lines=2,lraise=0.65,nindent=0pt,findent=.5em]{%
+    {\small\dbend\,\dbend}}}
+    
+\newcommand\DANGER{%    
+  \lettrine[lines=3,lraise=0.01,lhang=0,nindent=0pt,findent=.75em]{%
+    \usebox\bombbox}}
+%%------------------------------- Rest ------------------------------------------
+\pretolerance=500
+\tolerance=1000 
+\hbadness=3000
+\vbadness=3000
+\hyphenpenalty=400
+
+%-------------------------------- Listings -------------------------------------
+\usepackage{showexpl}% not a real PSTricks package
+%
+\renewcommand{\ttdefault}{ul9}% Luxi Mono
+%\lstset{language=PSTricks,keywordstyle=\small\fontfamily{ul9}\bfseries} 
+\lstset{wide=true} 
+%
+%-------------------------------- Allgemein -------------------------------------
+%\addtolength\belowcaptionskip{-10pt}
+%
+\providecommand\dante{DANTE \eV}
+\providecommand\eV{e.V\kern-.18em\@ifnextchar.{}{.}}
+\def\textat{\protect\makeatletter\texttt{@}\protect\makeatother}
+
+\def\lBrace{\texttt{\{}}
+\def\rBrace{\texttt{\}}}
+\def\lBracket{\texttt{[}}
+\def\rBracket{\texttt{]}}
+%
+\newcounter{SX@refC}% for texlive8
+\def\PSTemph#1{\textit{\texttt{#1}}}
+%
+\def\LPack#1{\texttt{#1}\PIndex{#1}}
+\def\Lmenv#1{\texttt{#1}\eIndex{#1}}
+\def\Lmcs#1{\CMD{#1}\Makroindex{#1}\cIndex{#1}}
+\let\xLcs\Lmcs
+\let\Lcs\CMD
+\let\Lit\texttt
+\def\Loption#1{\texttt{#1}\Optindex{#1}\ttindex{#1}}
+\def\LProg#1{\texttt{#1}\pIndex{#1}}
+\let\Prog\LProg
+\def\LFile#1{\texttt{#1}\tIndex{#1}}
+\def\LColor#1{\texttt{#1}\index{Farbe!#1@\texttt{#1}}}
+\def\Lindex#1{#1\index{#1}}% Ausgeben und in den Index
+\def\Lext#1{\texttt{#1}\index{Dateiendung!#1@\texttt{#1}}}
+\def\LClass#1{\texttt{#1}}
+\def\Lmnotation#1{\texttt{#1}\tIndex{#1}}
+\newcommand\Larga{}
+\DeclareRobustCommand\Larga[1]{$\langle$\PSTemph{#1}$\rangle$}
+\newcommand\LargA{}
+\DeclareRobustCommand\LargA[1]{\lBrace$\langle$\PSTemph{#1}$\rangle$\rBrace}
+\newcommand\Largs{}
+\DeclareRobustCommand\Largs[1]{\lBracket$\langle$\PSTemph{#1}$\rangle$\rBracket}
+\newcommand\Largb{}
+\DeclareRobustCommand\Largb[1]{\lBrace$\langle$\PSTemph{#1}$\rangle$\rBrace}
+\newcommand\Largr{}
+\DeclareRobustCommand\Largr[1]{\PSTemph{({#1})}}
+\DeclareRobustCommand\Largra[1]{(\Larga{#1})}
+\newcommand\Larg{}
+\DeclareRobustCommand\Larg[1]{\lBrace\texttt{#1}\rBrace}
+\def\begEnv#1{\CMD{begin\{#1\}}\tIndex{#1}}
+\def\endEnv#1{\CMD{end\{#1\}}}
+\def\OptArg{\Largs{Optionen}}
+\def\Largrao{($\langle x_0,y_0\rangle$)}
+\def\Largrai{($\langle x_1,y_1\rangle$)}
+\def\Largraii{($\langle x_2,y_2\rangle$)}
+\def\Largraiii{($\langle x_3,y_3\rangle$)}
+\def\Largran{($\langle x_n,y_n\rangle$)}
+%
+\input random
+%
+\begin{document}
+
 \title{\texttt{PST-Labo} - chemical objects\\
 \footnotesize{version \PSTfileversion}}
 \author{%
 Denis Girou\thanks{\url{Denis.Girou@idris.fr}}, 
 Christophe Jorssen\thanks{\url{Christophe.Jorssen@wanadoo.fr}},
-Manuel Luque\thanks{\url{Mluque5130@aol.com}} and
-Herbert Vo\ss\thanks{\url{voss@pstricks.de}}}
+Manuel Luque\thanks{\url{ManuelLuque27@gmail.com}} and
+Herbert Vo\ss\thanks{\url{hvoss@tug.org}}}
 \date{\today}
 \maketitle
 
@@ -31,7 +253,7 @@ Tabelle~\ref{tab:pst-labo:Parameter} zeigt eine Zusammenstellung der speziellen,
 
 
 \noindent
-\LTXtable{\linewidth}{pstlabo8-tab1-DE.tex}%
+\LTXtable{\linewidth}{pst-labo8-tab1-DE.tex}%
 
 
 
@@ -923,4 +1145,4 @@ Patrick Drechsler | Arnaud Schmittbuhl
 \bibliography{pst-labo-doc}
 
 
-\endinput
\ No newline at end of file
+\end{document}
diff --git a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.ltx b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.ltx
deleted file mode 100644
index 145a0f75fd6..00000000000
--- a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.ltx
+++ /dev/null
@@ -1,224 +0,0 @@
-\documentclass[11pt,a4paper,english]{article}
-\usepackage[latin1]{inputenc}%
-\usepackage[T1]{fontenc}
-\usepackage{babel}
-\usepackage{lmodern}
-\usepackage{enumerate,longtable,url}
-\let\OldUrl=\url
-\renewcommand\url[1]{\protect\OldUrl{#1}}
-
-\usepackage[scaled]{luximono}
-%
-\usepackage{xspace,nonfloat}
-\usepackage[bottom]{footmisc}
-%
-\usepackage{tabularx}
-\usepackage{longtable}
-\usepackage{ltxtable}
-\usepackage{varioref}
-\usepackage[NewCommands,NewParameters]{ragged2e}
-\usepackage{url}
-\def\UrlFont{\ttfamily}
-\makeatletter
-%\def\verbatim@font{\small\normalfont\ttfamily}
-%
-\usepackage[dvipsnames,prologue,table]{pstricks}
-\colorlet{tableheadcolor}{gray!25}
-\colorlet{tablerowcolor}{gray!12}
-\newcommand\XCBox[1]{\fcolorbox{black}{#1}{\phantom{aa}} \small #1}
-\usepackage{pst-labo}
-\let\PSTfileversion\fileversion
-\SpecialCoor
-\psset{griddots=10,subgriddiv=0,gridlabels=7pt}
-%
-\definecolor{hellgelb}{rgb}{1,1,0.8}
-\definecolor{shadecolor}{rgb}{0.9,0.9,0.9}
-\definecolor{sphgrau}{rgb}{0.40,0.40,0.40}
-%
-% ------------------------------- Namen Abkuerungen ----------------------
-\newcommand{\La}%
-   {L\kern-.36em
-        {\setbox0\hbox{T}%
-         \vbox to\ht0{\hbox{$\m@th$%
-                \csname S@\f@size\endcsname
-                \fontsize\sf@size\z@
-                \math@fontsfalse\selectfont
-                A}%
-            \vss}%
-        }}
-\def\AllTeX{(\La\kern-.075em)\kern-.075em\TeX\xspace}
-\def\AMS{American Mathematical Society\xspace}
-\def\AmS{$\mathcal{A}$\kern-.1667em\lower.5ex\hbox
-    {$\mathcal{M}$}\kern-.125em$\mathcal{S}$}
-\def\AmSLaTeX{\AmS-\LaTeX\xspace}
-\let\latex\LaTeX
-\let\tex\TeX
-%
-\def\BibTeX{\textsc{Bib}\kern-.08em\TeX\index{BiBTeX@Bib\TeX}}
-\def\PT{Plain \TeX\index{Plain TeX@Plain \TeX}\xspace}
-\def\PST{{\texttt{PSTricks}}\xspace}
-\def\CTAN{{\texttt{CTAN}}\index{CTAN}\xspace}
-\def\PDF{{\texttt{PDF}}\xspace}
-\def\pst{{\texttt{pstricks}}\xspace}
-\def\PS{PostScript\xspace}
-\def\CT{Con\TeX t\index{ConTeXt@Con\TeX t}\xspace}
-\def\GS{Ghostscript\index{Ghostscript}\xspace}
-\def\GeX{G\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@}
-\def\at{\char064}
-\def\VTeX{\texttt{V\TeX}\index{VTeX@\texttt{V\protect\TeX}}}
-\newcommand*\CMD[1]{{\texttt{\textbackslash #1}}}
-\newcommand\Paket[1]{\texttt{#1}}
-\providecommand\Programm[1]{\textsf{#1}}
-\providecommand\RaggedRight{\raggedright}
-%
-\def\Index#1{\index{#1}#1}
-\index{Environment|see{Umgebung}}
-\def\eIndex#1{\index{Umgebung!#1@\texttt{#1}}\index{#1@\texttt{#1}}}
-\def\tIndex#1{\index{#1@\texttt{#1}}}
-\def\cIndex#1{\index{#1@\protect\CMD{#1}}}
-\def\pIndex#1{\index{Parameter@\textbf{Parameter}!#1@\texttt{#1}}\index{#1@\texttt{#1}}}
-\def\ppIndex#1{\index{Parameter@\textbf{Parameter}!#1@\texttt{#1}}}
-\def\sIndex#1{\index{Syntax@\textbf{Syntax}!\protect\CMD{#1}}}
-\def\csIndex#1{\sIndex{#1}\cIndex{#1}}
-\def\PIndex#1{\index{Paket@\textbf{Paket}!\texttt{#1}}}
-\def\mIndex#1{\texttt{#1}\tIndex{#1}\pIndex{#1}}
-\def\aref#1{$\rightarrow$\vref{#1}}
-\def\PSindex#1{\index{PostScript!#1}}
-\def\Makroindex#1{\index{Makro!#1@\protect\CMD{#1}}}
-\def\Optindex#1{\index{Parameter@\textbf{Parameter}!\texttt{#1}}}
-\def\ttindex#1{\index{#1@\texttt{#1}}}
-\def\vert{\ensuremath{|}}
-%
-\let\Olddegrees\textdegrees
-\def\textdegrees{\ensuremath{\mbox{\Olddegrees}}}
-\def\sa{\ensuremath{\sphericalangle}\xspace}% needs amssymb
-%
-%
-%%-------------------------------- danger ---------------------------------------------
-\usepackage{manfnt}
-\usepackage{lettrine}
-\newsavebox{\dBox}
-
-\newenvironment{dangerPar*}
-{\gdef\dangerSym{\dbend\,\dbend}\@dangerPar}
-{\end@dangerPar}
-
-\newenvironment{dangerPar}
-{\gdef\dangerSym{\dbend\phantom{\,\dbend}}\@dangerPar}
-{\end@dangerPar}
-
-\def\@dangerPar{%
-  \begin{lrbox}{\dBox}
-    \minipage[c]{\linewidth-\widthof{\dangerSym}-\columnsep}%
-}
-\def\end@dangerPar{%
-    \endminipage
-  \end{lrbox}%
-  \trivlist\item\relax
-    \noindent
-    \minipage[c]{\widthof{\dangerSym}}
-      \raisebox{\height}[.9\height][.1\height]{\dangerSym}% ???
-    \endminipage
-    \hfill
-    \minipage[c]{\wd\dBox}
-      \usebox{\dBox}
-    \endminipage%
-  \endtrivlist
-}
-\newsavebox{\bombbox}
-\sbox\bombbox{%
-  \psset{unit=.55ex}%
-  \begin{pspicture}(-4,-4)(4,4)
-    \pscircle[fillcolor=gray,fillstyle=solid]{4}
-    \rput{45}{\psscaleboxto(6,0){\textsf{\textbf{PS}}}}
-    \psellipse*(0,3.8)(1,.2)
-    \psellipse*(0,5.5)(1,.2)
-    \psframe*(-1,3.8)(1,5.5)
-    \psbezier(0,5.5)(0,7)(1,8)(3.5,8)
-    \multido{\r=-0+40}{9}{\rput{\r}(3.5,8){\psline(0,0)(.4,0)}}
-  \end{pspicture}}
-
-\newcommand\danger{%
-  \lettrine[lines=2,lraise=0.65,nindent=0pt,findent=.5em]{{\small\dbend}}}
-  
-\newcommand\ddanger{%
-  \lettrine[lines=2,lraise=0.65,nindent=0pt,findent=.5em]{%
-    {\small\dbend\,\dbend}}}
-    
-\newcommand\DANGER{%    
-  \lettrine[lines=3,lraise=0.01,lhang=0,nindent=0pt,findent=.75em]{%
-    \usebox\bombbox}}
-%%------------------------------- Rest ------------------------------------------
-\pretolerance=500
-\tolerance=1000 
-\hbadness=3000
-\vbadness=3000
-\hyphenpenalty=400
-
-%-------------------------------- Listings -------------------------------------
-\usepackage{showexpl}% not a real PSTricks package
-%
-\renewcommand{\ttdefault}{ul9}% Luxi Mono
-%\lstset{language=PSTricks,keywordstyle=\small\fontfamily{ul9}\bfseries} 
-\lstset{wide=true} 
-%
-%-------------------------------- Allgemein -------------------------------------
-%\addtolength\belowcaptionskip{-10pt}
-%
-\providecommand\dante{DANTE \eV}
-\providecommand\eV{e.V\kern-.18em\@ifnextchar.{}{.}}
-\def\textat{\protect\makeatletter\texttt{@}\protect\makeatother}
-
-\def\lBrace{\texttt{\{}}
-\def\rBrace{\texttt{\}}}
-\def\lBracket{\texttt{[}}
-\def\rBracket{\texttt{]}}
-%
-\newcounter{SX@refC}% for texlive8
-\def\PSTemph#1{\textit{\texttt{#1}}}
-%
-\def\LPack#1{\texttt{#1}}
-\def\Lmenv#1{\texttt{#1}}
-\def\Lmcs#1{\CMD{#1}\Makroindex{#1}\cIndex{#1}}
-\let\xLcs\Lmcs
-\let\Lcs\CMD
-\let\Lit\texttt
-\def\Loption#1{\texttt{#1}\Optindex{#1}\ttindex{#1}}
-\def\LProg#1{\texttt{#1}\pIndex{#1}}
-\let\Prog\LProg
-\def\LFile#1{\texttt{#1}\tIndex{#1}}
-\def\LColor#1{\texttt{#1}\index{Farbe!#1@\texttt{#1}}}
-\def\Lindex#1{#1\index{#1}}% Ausgeben und in den Index
-\def\Lext#1{\texttt{#1}\index{Dateiendung!#1@\texttt{#1}}}
-\def\LClass#1{\texttt{#1}}
-\def\Lmnotation#1{\texttt{#1}\tIndex{#1}}
-\newcommand\Larga{}
-\DeclareRobustCommand\Larga[1]{$\langle$\PSTemph{#1}$\rangle$}
-\newcommand\LargA{}
-\DeclareRobustCommand\LargA[1]{\lBrace$\langle$\PSTemph{#1}$\rangle$\rBrace}
-\newcommand\Largs{}
-\DeclareRobustCommand\Largs[1]{\lBracket$\langle$\PSTemph{#1}$\rangle$\rBracket}
-\newcommand\Largb{}
-\DeclareRobustCommand\Largb[1]{\lBrace$\langle$\PSTemph{#1}$\rangle$\rBrace}
-\newcommand\Largr{}
-\DeclareRobustCommand\Largr[1]{\PSTemph{({#1})}}
-\DeclareRobustCommand\Largra[1]{(\Larga{#1})}
-\newcommand\Larg{}
-\DeclareRobustCommand\Larg[1]{\lBrace\texttt{#1}\rBrace}
-\def\begEnv#1{\CMD{begin\{#1\}}\tIndex{#1}}
-\def\endEnv#1{\CMD{end\{#1\}}}
-\def\OptArg{\Largs{Optionen}}
-\def\Largrao{($\langle x_0,y_0\rangle$)}
-\def\Largrai{($\langle x_1,y_1\rangle$)}
-\def\Largraii{($\langle x_2,y_2\rangle$)}
-\def\Largraiii{($\langle x_3,y_3\rangle$)}
-\def\Largran{($\langle x_n,y_n\rangle$)}
-%
-\input random
-\def\cite#1{}
-%
-\begin{document}
-
-\input{pst-labo-docEN}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.pdf b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.pdf
index cbb5863f015..630bd652e74 100644
--- a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.pdf
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.tex b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.tex
index 2028060ed4c..fde72d8ccf2 100644
--- a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.tex
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docEN.tex
@@ -1,11 +1,233 @@
-%	$Id: pst-labo-docEN.tex,v 1.4 2005/10/13 19:07:24 patrick Exp patrick $	
+\documentclass[11pt,a4paper,english]{article}
+\usepackage[latin1]{inputenc}%
+\usepackage[T1]{fontenc}
+\usepackage{babel}
+\usepackage{lmodern}
+\usepackage{enumerate,longtable,url}
+\let\OldUrl=\url
+\renewcommand\url[1]{\protect\OldUrl{#1}}
+
+\usepackage[scaled]{luximono}
+%
+\usepackage{xspace,nonfloat}
+\usepackage[bottom]{footmisc}
+%
+\usepackage{tabularx}
+\usepackage{longtable}
+\usepackage{ltxtable}
+\usepackage{varioref}
+\usepackage[NewCommands,NewParameters]{ragged2e}
+\usepackage{url}
+\def\UrlFont{\ttfamily}
+
+\usepackage{makeidx}\makeindex
+
+%
+\usepackage[dvipsnames,prologue,table]{pstricks}
+\colorlet{tableheadcolor}{gray!25}
+\colorlet{tablerowcolor}{gray!12}
+\newcommand\XCBox[1]{\fcolorbox{black}{#1}{\phantom{aa}} \small #1}
+\usepackage{pst-labo}
+\let\PSTfileversion\fileversion
+\psset{griddots=10,subgriddiv=0,gridlabels=7pt}
+%
+\definecolor{hellgelb}{rgb}{1,1,0.8}
+\definecolor{shadecolor}{rgb}{0.9,0.9,0.9}
+\definecolor{sphgrau}{rgb}{0.40,0.40,0.40}
+%
+% ------------------------------- Namen Abkuerungen ----------------------
+\makeatletter
+\newcommand{\La}%
+   {L\kern-.36em
+        {\setbox0\hbox{T}%
+         \vbox to\ht0{\hbox{$\m@th$%
+                \csname S@\f@size\endcsname
+                \fontsize\sf@size\z@
+                \math@fontsfalse\selectfont
+                A}%
+            \vss}%
+        }}
+\def\AllTeX{(\La\kern-.075em)\kern-.075em\TeX\xspace}
+\def\AMS{American Mathematical Society\xspace}
+\def\AmS{$\mathcal{A}$\kern-.1667em\lower.5ex\hbox
+    {$\mathcal{M}$}\kern-.125em$\mathcal{S}$}
+\def\AmSLaTeX{\AmS-\LaTeX\xspace}
+\let\latex\LaTeX
+\let\tex\TeX
+%$
+\def\BibTeX{\textsc{Bib}\kern-.08em\TeX\index{BiBTeX@Bib\TeX}}
+\def\PT{Plain \TeX\index{Plain TeX@Plain \TeX}\xspace}
+\def\PST{{\texttt{PSTricks}}\xspace}
+\def\CTAN{{\texttt{CTAN}}\index{CTAN}\xspace}
+\def\PDF{{\texttt{PDF}}\xspace}
+\def\pst{{\texttt{pstricks}}\xspace}
+\def\PS{PostScript\xspace}
+\def\CT{Con\TeX t\index{ConTeXt@Con\TeX t}\xspace}
+\def\GS{Ghostscript\index{Ghostscript}\xspace}
+\def\GeX{G\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@}
+\def\at{\char064}
+\def\VTeX{\texttt{V\TeX}\index{VTeX@\texttt{V\protect\TeX}}}
+\newcommand*\CMD[1]{{\texttt{\textbackslash #1}}}
+\newcommand\Paket[1]{\texttt{#1}}
+\providecommand\Programm[1]{\textsf{#1}}
+\providecommand\RaggedRight{\raggedright}
+%
+\def\Index#1{\index{#1}#1}
+\index{Environment|see{Umgebung}}
+\def\eIndex#1{\index{Umgebung!#1@\texttt{#1}}\index{#1@\texttt{#1}}}
+\def\tIndex#1{\index{#1@\texttt{#1}}}
+\def\cIndex#1{\index{#1@\protect\CMD{#1}}}
+\def\pIndex#1{\index{Parameter@\textbf{Parameter}!#1@\texttt{#1}}\index{#1@\texttt{#1}}}
+\def\ppIndex#1{\index{Parameter@\textbf{Parameter}!#1@\texttt{#1}}}
+\def\sIndex#1{\index{Syntax@\textbf{Syntax}!\protect\CMD{#1}}}
+\def\csIndex#1{\sIndex{#1}\cIndex{#1}}
+\def\PIndex#1{\index{Paket@\textbf{Paket}!\texttt{#1}}}
+\def\mIndex#1{\texttt{#1}\tIndex{#1}\pIndex{#1}}
+\def\aref#1{$\rightarrow$\vref{#1}}
+\def\PSindex#1{\index{PostScript!#1}}
+\def\Makroindex#1{\index{Makro!#1@\protect\CMD{#1}}}
+\def\Optindex#1{\index{Parameter@\textbf{Parameter}!\texttt{#1}}}
+\def\ttindex#1{\index{#1@\texttt{#1}}}
+\def\vert{\ensuremath{|}}
+%
+\let\Olddegrees\textdegrees
+\def\textdegrees{\ensuremath{\mbox{\Olddegrees}}}
+\def\sa{\ensuremath{\sphericalangle}\xspace}% needs amssymb
+%
+%
+%%-------------------------------- danger ---------------------------------------------
+\usepackage{manfnt}
+\usepackage{lettrine}
+\newsavebox{\dBox}
+
+\newenvironment{dangerPar*}
+{\gdef\dangerSym{\dbend\,\dbend}\@dangerPar}
+{\end@dangerPar}
+
+\newenvironment{dangerPar}
+{\gdef\dangerSym{\dbend\phantom{\,\dbend}}\@dangerPar}
+{\end@dangerPar}
+
+\def\@dangerPar{%
+  \begin{lrbox}{\dBox}
+    \minipage[c]{\linewidth-\widthof{\dangerSym}-\columnsep}%
+}
+\def\end@dangerPar{%
+    \endminipage
+  \end{lrbox}%
+  \trivlist\item\relax
+    \noindent
+    \minipage[c]{\widthof{\dangerSym}}
+      \raisebox{\height}[.9\height][.1\height]{\dangerSym}% ???
+    \endminipage
+    \hfill
+    \minipage[c]{\wd\dBox}
+      \usebox{\dBox}
+    \endminipage%
+  \endtrivlist
+}
+\newsavebox{\bombbox}
+\sbox\bombbox{%
+  \psset{unit=.55ex}%
+  \begin{pspicture}(-4,-4)(4,4)
+    \pscircle[fillcolor=gray,fillstyle=solid]{4}
+    \rput{45}{\psscaleboxto(6,0){\textsf{\textbf{PS}}}}
+    \psellipse*(0,3.8)(1,.2)
+    \psellipse*(0,5.5)(1,.2)
+    \psframe*(-1,3.8)(1,5.5)
+    \psbezier(0,5.5)(0,7)(1,8)(3.5,8)
+    \multido{\r=-0+40}{9}{\rput{\r}(3.5,8){\psline(0,0)(.4,0)}}
+  \end{pspicture}}
+
+\newcommand\danger{%
+  \lettrine[lines=2,lraise=0.65,nindent=0pt,findent=.5em]{{\small\dbend}}}
+  
+\newcommand\ddanger{%
+  \lettrine[lines=2,lraise=0.65,nindent=0pt,findent=.5em]{%
+    {\small\dbend\,\dbend}}}
+    
+\newcommand\DANGER{%    
+  \lettrine[lines=3,lraise=0.01,lhang=0,nindent=0pt,findent=.75em]{%
+    \usebox\bombbox}}
+%%------------------------------- Rest ------------------------------------------
+\pretolerance=500
+\tolerance=1000 
+\hbadness=3000
+\vbadness=3000
+\hyphenpenalty=400
+
+%-------------------------------- Listings -------------------------------------
+\usepackage{showexpl}% not a real PSTricks package
+%
+\renewcommand{\ttdefault}{ul9}% Luxi Mono
+%\lstset{language=PSTricks,keywordstyle=\small\fontfamily{ul9}\bfseries} 
+\lstset{wide=true} 
+%
+%-------------------------------- Allgemein -------------------------------------
+%\addtolength\belowcaptionskip{-10pt}
+%
+\providecommand\dante{DANTE \eV}
+\providecommand\eV{e.V\kern-.18em\@ifnextchar.{}{.}}
+\def\textat{\protect\makeatletter\texttt{@}\protect\makeatother}
+
+\def\lBrace{\texttt{\{}}
+\def\rBrace{\texttt{\}}}
+\def\lBracket{\texttt{[}}
+\def\rBracket{\texttt{]}}
+%
+\newcounter{SX@refC}% for texlive8
+\def\PSTemph#1{\textit{\texttt{#1}}}
+%
+\def\LPack#1{\texttt{#1}}
+\def\Lmenv#1{\texttt{#1}}
+\def\Lmcs#1{\CMD{#1}\Makroindex{#1}\cIndex{#1}}
+\let\xLcs\Lmcs
+\let\Lcs\CMD
+\let\Lit\texttt
+\def\Loption#1{\texttt{#1}\Optindex{#1}\ttindex{#1}}
+\def\LProg#1{\texttt{#1}\pIndex{#1}}
+\let\Prog\LProg
+\def\LFile#1{\texttt{#1}\tIndex{#1}}
+\def\LColor#1{\texttt{#1}\index{Farbe!#1@\texttt{#1}}}
+\def\Lindex#1{#1\index{#1}}% Ausgeben und in den Index
+\def\Lext#1{\texttt{#1}\index{Dateiendung!#1@\texttt{#1}}}
+\def\LClass#1{\texttt{#1}}
+\def\Lmnotation#1{\texttt{#1}\tIndex{#1}}
+\newcommand\Larga{}
+\DeclareRobustCommand\Larga[1]{$\langle$\PSTemph{#1}$\rangle$}
+\newcommand\LargA{}
+\DeclareRobustCommand\LargA[1]{\lBrace$\langle$\PSTemph{#1}$\rangle$\rBrace}
+\newcommand\Largs{}
+\DeclareRobustCommand\Largs[1]{\lBracket$\langle$\PSTemph{#1}$\rangle$\rBracket}
+\newcommand\Largb{}
+\DeclareRobustCommand\Largb[1]{\lBrace$\langle$\PSTemph{#1}$\rangle$\rBrace}
+\newcommand\Largr{}
+\DeclareRobustCommand\Largr[1]{\PSTemph{({#1})}}
+\DeclareRobustCommand\Largra[1]{(\Larga{#1})}
+\newcommand\Larg{}
+\DeclareRobustCommand\Larg[1]{\lBrace\texttt{#1}\rBrace}
+\def\begEnv#1{\CMD{begin\{#1\}}\tIndex{#1}}
+\def\endEnv#1{\CMD{end\{#1\}}}
+\def\OptArg{\Largs{Optionen}}
+\def\Largrao{($\langle x_0,y_0\rangle$)}
+\def\Largrai{($\langle x_1,y_1\rangle$)}
+\def\Largraii{($\langle x_2,y_2\rangle$)}
+\def\Largraiii{($\langle x_3,y_3\rangle$)}
+\def\Largran{($\langle x_n,y_n\rangle$)}
+%
+\input random
+\def\cite#1{}
+%
+\begin{document}
+
+%	$Id: pst-labo-docEN.tex 234 2015-12-10 11:20:02Z herbert $	
 \title{\texttt{PST-Labo} - chemical objects\thanks{The english translation was done by Patrick Drechsler}\\
 \footnotesize{version \PSTfileversion}}
 \author{%
 Denis Girou\thanks{\url{Denis.Girou@idris.fr}}, 
 Christophe Jorssen\thanks{\url{Christophe.Jorssen@wanadoo.fr}},
-Manuel Luque\thanks{\url{Mluque5130@aol.com}} and
-Herbert Vo\ss\thanks{\url{voss@pstricks.de}}}
+Manuel Luque\thanks{\url{ManuelLuque27@gmail.com}} and
+Herbert Vo\ss\thanks{\url{hvoss@tug.org}}}
 \date{\today}
 \maketitle
 
@@ -32,7 +254,7 @@ Table~\ref{tab:pst-labo:Parameter} describes all parameters unique to
 \LPack{pst-labo}.
 
 \noindent
-\LTXtable{\linewidth}{pstlabo8-tab1-EN.tex}%
+\LTXtable{\linewidth}{pst-labo8-tab1-EN.tex}%
 
 
 
@@ -916,5 +1138,4 @@ in section~\vref{sec:overlay:Ueberschreiben}.
 \bibliographystyle{plain}
 \bibliography{pst-labo-doc}
 
-
-\endinput
\ No newline at end of file
+\end{document}
diff --git a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.ltx b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.ltx
deleted file mode 100644
index f52b7990c76..00000000000
--- a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.ltx
+++ /dev/null
@@ -1,227 +0,0 @@
-%% bAS 
-\documentclass[11pt,a4paper,frenchb]{article}
-%% eAS
-\usepackage[latin1]{inputenc}%
-\usepackage[T1]{fontenc}
-\usepackage{babel}
-\usepackage{lmodern}
-\usepackage{enumerate,longtable,url}
-\let\OldUrl=\url
-\renewcommand\url[1]{\protect\OldUrl{#1}}
-%% bAS
-\usepackage[scaled]{luximono}
-%% eAS
-%
-\usepackage{xspace,nonfloat}
-\usepackage[bottom]{footmisc}
-%
-\usepackage{tabularx}
-\usepackage{longtable}
-\usepackage{ltxtable}
-\usepackage[french]{varioref}
-\usepackage[NewCommands,NewParameters]{ragged2e}
-\usepackage{url}
-\def\UrlFont{\ttfamily}
-\makeatletter
-%\def\verbatim@font{\small\normalfont\ttfamily}
-%
-\usepackage[dvipsnames,prologue,table]{pstricks}
-\colorlet{tableheadcolor}{gray!25}
-\colorlet{tablerowcolor}{gray!12}
-\newcommand\XCBox[1]{\fcolorbox{black}{#1}{\phantom{aa}} \small #1}
-\usepackage{pst-labo}
-\let\PSTfileversion\fileversion
-\SpecialCoor
-\psset{griddots=10,subgriddiv=0,gridlabels=7pt}
-%
-\definecolor{hellgelb}{rgb}{1,1,0.8}
-\definecolor{shadecolor}{rgb}{0.9,0.9,0.9}
-\definecolor{sphgrau}{rgb}{0.40,0.40,0.40}
-%
-% ------------------------------- Namen Abkuerungen ----------------------
-\newcommand{\La}%
-   {L\kern-.36em
-        {\setbox0\hbox{T}%
-         \vbox to\ht0{\hbox{$\m@th$%
-                \csname S@\f@size\endcsname
-                \fontsize\sf@size\z@
-                \math@fontsfalse\selectfont
-                A}%
-            \vss}%
-        }}
-\def\AllTeX{(\La\kern-.075em)\kern-.075em\TeX\xspace}
-\def\AMS{American Mathematical Society\xspace}
-\def\AmS{$\mathcal{A}$\kern-.1667em\lower.5ex\hbox
-    {$\mathcal{M}$}\kern-.125em$\mathcal{S}$}
-\def\AmSLaTeX{\AmS-\LaTeX\xspace}
-\let\latex\LaTeX
-\let\tex\TeX
-%
-\def\BibTeX{\textsc{Bib}\kern-.08em\TeX\index{BiBTeX@Bib\TeX}}
-\def\PT{Plain \TeX\index{Plain TeX@Plain \TeX}\xspace}
-\def\PST{{\texttt{PSTricks}}\xspace}
-\def\CTAN{{\texttt{CTAN}}\index{CTAN}\xspace}
-\def\PDF{{\texttt{PDF}}\xspace}
-\def\pst{{\texttt{pstricks}}\xspace}
-\def\PS{PostScript\xspace}
-\def\CT{Con\TeX t\index{ConTeXt@Con\TeX t}\xspace}
-\def\GS{Ghostscript\index{Ghostscript}\xspace}
-\def\GeX{G\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@}
-\def\at{\char064}
-\def\VTeX{\texttt{V\TeX}\index{VTeX@\texttt{V\protect\TeX}}}
-\newcommand*\CMD[1]{{\texttt{\textbackslash #1}}}
-\newcommand\Paket[1]{\texttt{#1}}
-\providecommand\Programm[1]{\textsf{#1}}
-\providecommand\RaggedRight{\raggedright}
-%
-\def\Index#1{\index{#1}#1}
-\index{Environment|see{Umgebung}}
-\def\eIndex#1{\index{Umgebung!#1@\texttt{#1}}\index{#1@\texttt{#1}}}
-\def\tIndex#1{\index{#1@\texttt{#1}}}
-\def\cIndex#1{\index{#1@\protect\CMD{#1}}}
-\def\pIndex#1{\index{Parameter@\textbf{Parameter}!#1@\texttt{#1}}\index{#1@\texttt{#1}}}
-\def\ppIndex#1{\index{Parameter@\textbf{Parameter}!#1@\texttt{#1}}}
-\def\sIndex#1{\index{Syntax@\textbf{Syntax}!\protect\CMD{#1}}}
-\def\csIndex#1{\sIndex{#1}\cIndex{#1}}
-\def\PIndex#1{\index{Paket@\textbf{Paket}!\texttt{#1}}}
-\def\mIndex#1{\texttt{#1}\tIndex{#1}\pIndex{#1}}
-\def\aref#1{$\rightarrow$\vref{#1}}
-\def\PSindex#1{\index{PostScript!#1}}
-\def\Makroindex#1{\index{Makro!#1@\protect\CMD{#1}}}
-\def\Optindex#1{\index{Parameter@\textbf{Parameter}!\texttt{#1}}}
-\def\ttindex#1{\index{#1@\texttt{#1}}}
-\def\vert{\ensuremath{|}}
-%
-\let\Olddegrees\textdegrees
-\def\textdegrees{\ensuremath{\mbox{\Olddegrees}}}
-\def\sa{\ensuremath{\sphericalangle}\xspace}% needs amssymb
-%
-%
-%%-------------------------------- danger ---------------------------------------------
-\usepackage{manfnt}
-\usepackage{lettrine}
-\newsavebox{\dBox}
-
-\newenvironment{dangerPar*}
-{\gdef\dangerSym{\dbend\,\dbend}\@dangerPar}
-{\end@dangerPar}
-
-\newenvironment{dangerPar}
-{\gdef\dangerSym{\dbend\phantom{\,\dbend}}\@dangerPar}
-{\end@dangerPar}
-
-\def\@dangerPar{%
-  \begin{lrbox}{\dBox}
-    \minipage[c]{\linewidth-\widthof{\dangerSym}-\columnsep}%
-}
-\def\end@dangerPar{%
-    \endminipage
-  \end{lrbox}%
-  \trivlist\item\relax
-    \noindent
-    \minipage[c]{\widthof{\dangerSym}}
-      \raisebox{\height}[.9\height][.1\height]{\dangerSym}% ???
-    \endminipage
-    \hfill
-    \minipage[c]{\wd\dBox}
-      \usebox{\dBox}
-    \endminipage%
-  \endtrivlist
-}
-\newsavebox{\bombbox}
-\sbox\bombbox{%
-  \psset{unit=.55ex}%
-  \begin{pspicture}(-4,-4)(4,4)
-    \pscircle[fillcolor=gray,fillstyle=solid]{4}
-    \rput{45}{\psscaleboxto(6,0){\textsf{\textbf{PS}}}}
-    \psellipse*(0,3.8)(1,.2)
-    \psellipse*(0,5.5)(1,.2)
-    \psframe*(-1,3.8)(1,5.5)
-    \psbezier(0,5.5)(0,7)(1,8)(3.5,8)
-    \multido{\r=-0+40}{9}{\rput{\r}(3.5,8){\psline(0,0)(.4,0)}}
-  \end{pspicture}}
-
-\newcommand\danger{%
-  \lettrine[lines=2,lraise=0.65,nindent=0pt,findent=.5em]{{\small\dbend}}}
-  
-\newcommand\ddanger{%
-  \lettrine[lines=2,lraise=0.65,nindent=0pt,findent=.5em]{%
-    {\small\dbend\,\dbend}}}
-    
-\newcommand\DANGER{%    
-  \lettrine[lines=3,lraise=0.01,lhang=0,nindent=0pt,findent=.75em]{%
-    \usebox\bombbox}}
-%%------------------------------- Rest ------------------------------------------
-\pretolerance=500
-\tolerance=1000 
-\hbadness=3000
-\vbadness=3000
-\hyphenpenalty=400
-
-%-------------------------------- Listings -------------------------------------
-\usepackage{showexpl}% not a real PSTricks package
-%
-\renewcommand{\ttdefault}{ul9}% Luxi Mono
-\lstset{language=PSTricks,keywordstyle=\small\fontfamily{ul9}\bfseries} 
-\lstset{wide=true} 
-%
-%-------------------------------- Allgemein -------------------------------------
-%\addtolength\belowcaptionskip{-10pt}
-%
-\providecommand\dante{DANTE \eV}
-\providecommand\eV{e.V\kern-.18em\@ifnextchar.{}{.}}
-\def\textat{\protect\makeatletter\texttt{@}\protect\makeatother}
-
-\def\lBrace{\texttt{\{}}
-\def\rBrace{\texttt{\}}}
-\def\lBracket{\texttt{[}}
-\def\rBracket{\texttt{]}}
-%
-\newcounter{SX@refC}% for texlive8
-\def\PSTemph#1{\textit{\texttt{#1}}}
-%
-\def\LPack#1{\texttt{#1}}
-\def\Lmenv#1{\texttt{#1}}
-\def\Lmcs#1{\CMD{#1}\Makroindex{#1}\cIndex{#1}}
-\let\xLcs\Lmcs
-\let\Lcs\CMD
-\let\Lit\texttt
-\def\Loption#1{\texttt{#1}\Optindex{#1}\ttindex{#1}}
-\def\LProg#1{\texttt{#1}\pIndex{#1}}
-\let\Prog\LProg
-\def\LFile#1{\texttt{#1}\tIndex{#1}}
-\def\LColor#1{\texttt{#1}\index{Farbe!#1@\texttt{#1}}}
-\def\Lindex#1{#1\index{#1}}% Ausgeben und in den Index
-\def\Lext#1{\texttt{#1}\index{Dateiendung!#1@\texttt{#1}}}
-\def\LClass#1{\texttt{#1}}
-\def\Lmnotation#1{\texttt{#1}\tIndex{#1}}
-\newcommand\Larga{}
-\DeclareRobustCommand\Larga[1]{$\langle$\PSTemph{#1}$\rangle$}
-\newcommand\LargA{}
-\DeclareRobustCommand\LargA[1]{\lBrace$\langle$\PSTemph{#1}$\rangle$\rBrace}
-\newcommand\Largs{}
-\DeclareRobustCommand\Largs[1]{\lBracket$\langle$\PSTemph{#1}$\rangle$\rBracket}
-\newcommand\Largb{}
-\DeclareRobustCommand\Largb[1]{\lBrace$\langle$\PSTemph{#1}$\rangle$\rBrace}
-\newcommand\Largr{}
-\DeclareRobustCommand\Largr[1]{\PSTemph{({#1})}}
-\DeclareRobustCommand\Largra[1]{(\Larga{#1})}
-\newcommand\Larg{}
-\DeclareRobustCommand\Larg[1]{\lBrace\texttt{#1}\rBrace}
-\def\begEnv#1{\CMD{begin\{#1\}}\tIndex{#1}}
-\def\endEnv#1{\CMD{end\{#1\}}}
-\def\OptArg{\Largs{Optionen}}
-\def\Largrao{($\langle x_0,y_0\rangle$)}
-\def\Largrai{($\langle x_1,y_1\rangle$)}
-\def\Largraii{($\langle x_2,y_2\rangle$)}
-\def\Largraiii{($\langle x_3,y_3\rangle$)}
-\def\Largran{($\langle x_n,y_n\rangle$)}
-%
-\input random
-\def\cite#1{}
-%
-\begin{document}
-
-\input{pst-labo-docFR}
-
-\end{document}
diff --git a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.pdf b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.pdf
index 697f04bb483..592d81d271b 100644
--- a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.pdf
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.tex b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.tex
index ec1762a69fb..46780587545 100644
--- a/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.tex
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo-docFR.tex
@@ -1,11 +1,236 @@
+%% bAS 
+\documentclass[11pt,a4paper,frenchb]{article}
+%% eAS
+\usepackage[latin1]{inputenc}%
+\usepackage[T1]{fontenc}
+\usepackage{babel}
+\usepackage{lmodern}
+\usepackage{enumerate,longtable,url}
+\let\OldUrl=\url
+\renewcommand\url[1]{\protect\OldUrl{#1}}
+%% bAS
+\usepackage[scaled]{luximono}
+%% eAS
+%
+\usepackage{xspace,nonfloat}
+\usepackage[bottom]{footmisc}
+%
+\usepackage{tabularx}
+\usepackage{longtable}
+\usepackage{ltxtable}
+\usepackage[french]{varioref}
+\usepackage[NewCommands,NewParameters]{ragged2e}
+\usepackage{url}
+\def\UrlFont{\ttfamily}
+
+\usepackage{makeidx}\makeindex
+
+%
+\usepackage[dvipsnames,prologue,table]{pstricks}
+\colorlet{tableheadcolor}{gray!25}
+\colorlet{tablerowcolor}{gray!12}
+\newcommand\XCBox[1]{\fcolorbox{black}{#1}{\phantom{aa}} \small #1}
+\usepackage{pst-labo}
+\let\PSTfileversion\fileversion
+\psset{griddots=10,subgriddiv=0,gridlabels=7pt}
+%
+\definecolor{hellgelb}{rgb}{1,1,0.8}
+\definecolor{shadecolor}{rgb}{0.9,0.9,0.9}
+\definecolor{sphgrau}{rgb}{0.40,0.40,0.40}
+%
+\makeatletter
+% ------------------------------- Namen Abkuerungen ----------------------
+\newcommand{\La}%
+   {L\kern-.36em
+        {\setbox0\hbox{T}%
+         \vbox to\ht0{\hbox{$\m@th$%
+                \csname S@\f@size\endcsname
+                \fontsize\sf@size\z@
+                \math@fontsfalse\selectfont
+                A}%
+            \vss}%
+        }}
+\def\AllTeX{(\La\kern-.075em)\kern-.075em\TeX\xspace}
+\def\AMS{American Mathematical Society\xspace}
+\def\AmS{$\mathcal{A}$\kern-.1667em\lower.5ex\hbox
+    {$\mathcal{M}$}\kern-.125em$\mathcal{S}$}
+\def\AmSLaTeX{\AmS-\LaTeX\xspace}
+\let\latex\LaTeX
+\let\tex\TeX
+%$
+\def\BibTeX{\textsc{Bib}\kern-.08em\TeX\index{BiBTeX@Bib\TeX}}
+\def\PT{Plain \TeX\index{Plain TeX@Plain \TeX}\xspace}
+\def\PST{{\texttt{PSTricks}}\xspace}
+\def\CTAN{{\texttt{CTAN}}\index{CTAN}\xspace}
+\def\PDF{{\texttt{PDF}}\xspace}
+\def\pst{{\texttt{pstricks}}\xspace}
+\def\PS{PostScript\xspace}
+\def\CT{Con\TeX t\index{ConTeXt@Con\TeX t}\xspace}
+\def\GS{Ghostscript\index{Ghostscript}\xspace}
+\def\GeX{G\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@}
+\def\at{\char064}
+\def\VTeX{\texttt{V\TeX}\index{VTeX@\texttt{V\protect\TeX}}}
+\newcommand*\CMD[1]{{\texttt{\textbackslash #1}}}
+\newcommand\Paket[1]{\texttt{#1}}
+\providecommand\Programm[1]{\textsf{#1}}
+\providecommand\RaggedRight{\raggedright}
+%
+\def\Index#1{\index{#1}#1}
+\index{Environment|see{Umgebung}}
+\def\eIndex#1{\index{Umgebung!#1@\texttt{#1}}\index{#1@\texttt{#1}}}
+\def\tIndex#1{\index{#1@\texttt{#1}}}
+\def\cIndex#1{\index{#1@\protect\CMD{#1}}}
+\def\pIndex#1{\index{Parameter@\textbf{Parameter}!#1@\texttt{#1}}\index{#1@\texttt{#1}}}
+\def\ppIndex#1{\index{Parameter@\textbf{Parameter}!#1@\texttt{#1}}}
+\def\sIndex#1{\index{Syntax@\textbf{Syntax}!\protect\CMD{#1}}}
+\def\csIndex#1{\sIndex{#1}\cIndex{#1}}
+\def\PIndex#1{\index{Paket@\textbf{Paket}!\texttt{#1}}}
+\def\mIndex#1{\texttt{#1}\tIndex{#1}\pIndex{#1}}
+\def\aref#1{$\rightarrow$\vref{#1}}
+\def\PSindex#1{\index{PostScript!#1}}
+\def\Makroindex#1{\index{Makro!#1@\protect\CMD{#1}}}
+\def\Optindex#1{\index{Parameter@\textbf{Parameter}!\texttt{#1}}}
+\def\ttindex#1{\index{#1@\texttt{#1}}}
+\def\vert{\ensuremath{|}}
+%
+\let\Olddegrees\textdegrees
+\def\textdegrees{\ensuremath{\mbox{\Olddegrees}}}
+\def\sa{\ensuremath{\sphericalangle}\xspace}% needs amssymb
+%
+%
+%%-------------------------------- danger ---------------------------------------------
+\usepackage{manfnt}
+\usepackage{lettrine}
+\newsavebox{\dBox}
+
+\newenvironment{dangerPar*}
+{\gdef\dangerSym{\dbend\,\dbend}\@dangerPar}
+{\end@dangerPar}
+
+\newenvironment{dangerPar}
+{\gdef\dangerSym{\dbend\phantom{\,\dbend}}\@dangerPar}
+{\end@dangerPar}
+
+\def\@dangerPar{%
+  \begin{lrbox}{\dBox}
+    \minipage[c]{\linewidth-\widthof{\dangerSym}-\columnsep}%
+}
+\def\end@dangerPar{%
+    \endminipage
+  \end{lrbox}%
+  \trivlist\item\relax
+    \noindent
+    \minipage[c]{\widthof{\dangerSym}}
+      \raisebox{\height}[.9\height][.1\height]{\dangerSym}% ???
+    \endminipage
+    \hfill
+    \minipage[c]{\wd\dBox}
+      \usebox{\dBox}
+    \endminipage%
+  \endtrivlist
+}
+\newsavebox{\bombbox}
+\sbox\bombbox{%
+  \psset{unit=.55ex}%
+  \begin{pspicture}(-4,-4)(4,4)
+    \pscircle[fillcolor=gray,fillstyle=solid]{4}
+    \rput{45}{\psscaleboxto(6,0){\textsf{\textbf{PS}}}}
+    \psellipse*(0,3.8)(1,.2)
+    \psellipse*(0,5.5)(1,.2)
+    \psframe*(-1,3.8)(1,5.5)
+    \psbezier(0,5.5)(0,7)(1,8)(3.5,8)
+    \multido{\r=-0+40}{9}{\rput{\r}(3.5,8){\psline(0,0)(.4,0)}}
+  \end{pspicture}}
+
+\newcommand\danger{%
+  \lettrine[lines=2,lraise=0.65,nindent=0pt,findent=.5em]{{\small\dbend}}}
+  
+\newcommand\ddanger{%
+  \lettrine[lines=2,lraise=0.65,nindent=0pt,findent=.5em]{%
+    {\small\dbend\,\dbend}}}
+    
+\newcommand\DANGER{%    
+  \lettrine[lines=3,lraise=0.01,lhang=0,nindent=0pt,findent=.75em]{%
+    \usebox\bombbox}}
+%%------------------------------- Rest ------------------------------------------
+\pretolerance=500
+\tolerance=1000 
+\hbadness=3000
+\vbadness=3000
+\hyphenpenalty=400
+
+%-------------------------------- Listings -------------------------------------
+\usepackage{showexpl}% not a real PSTricks package
+%
+\renewcommand{\ttdefault}{ul9}% Luxi Mono
+\lstset{language=PSTricks,keywordstyle=\small\fontfamily{ul9}\bfseries} 
+\lstset{wide=true} 
+%
+%-------------------------------- Allgemein -------------------------------------
+%\addtolength\belowcaptionskip{-10pt}
+%
+\providecommand\dante{DANTE \eV}
+\providecommand\eV{e.V\kern-.18em\@ifnextchar.{}{.}}
+\def\textat{\protect\makeatletter\texttt{@}\protect\makeatother}
+
+\def\lBrace{\texttt{\{}}
+\def\rBrace{\texttt{\}}}
+\def\lBracket{\texttt{[}}
+\def\rBracket{\texttt{]}}
+%
+\newcounter{SX@refC}% for texlive8
+\def\PSTemph#1{\textit{\texttt{#1}}}
+%
+\def\LPack#1{\texttt{#1}}
+\def\Lmenv#1{\texttt{#1}}
+\def\Lmcs#1{\CMD{#1}\Makroindex{#1}\cIndex{#1}}
+\let\xLcs\Lmcs
+\let\Lcs\CMD
+\let\Lit\texttt
+\def\Loption#1{\texttt{#1}\Optindex{#1}\ttindex{#1}}
+\def\LProg#1{\texttt{#1}\pIndex{#1}}
+\let\Prog\LProg
+\def\LFile#1{\texttt{#1}\tIndex{#1}}
+\def\LColor#1{\texttt{#1}\index{Farbe!#1@\texttt{#1}}}
+\def\Lindex#1{#1\index{#1}}% Ausgeben und in den Index
+\def\Lext#1{\texttt{#1}\index{Dateiendung!#1@\texttt{#1}}}
+\def\LClass#1{\texttt{#1}}
+\def\Lmnotation#1{\texttt{#1}\tIndex{#1}}
+\newcommand\Larga{}
+\DeclareRobustCommand\Larga[1]{$\langle$\PSTemph{#1}$\rangle$}
+\newcommand\LargA{}
+\DeclareRobustCommand\LargA[1]{\lBrace$\langle$\PSTemph{#1}$\rangle$\rBrace}
+\newcommand\Largs{}
+\DeclareRobustCommand\Largs[1]{\lBracket$\langle$\PSTemph{#1}$\rangle$\rBracket}
+\newcommand\Largb{}
+\DeclareRobustCommand\Largb[1]{\lBrace$\langle$\PSTemph{#1}$\rangle$\rBrace}
+\newcommand\Largr{}
+\DeclareRobustCommand\Largr[1]{\PSTemph{({#1})}}
+\DeclareRobustCommand\Largra[1]{(\Larga{#1})}
+\newcommand\Larg{}
+\DeclareRobustCommand\Larg[1]{\lBrace\texttt{#1}\rBrace}
+\def\begEnv#1{\CMD{begin\{#1\}}\tIndex{#1}}
+\def\endEnv#1{\CMD{end\{#1\}}}
+\def\OptArg{\Largs{Optionen}}
+\def\Largrao{($\langle x_0,y_0\rangle$)}
+\def\Largrai{($\langle x_1,y_1\rangle$)}
+\def\Largraii{($\langle x_2,y_2\rangle$)}
+\def\Largraiii{($\langle x_3,y_3\rangle$)}
+\def\Largran{($\langle x_n,y_n\rangle$)}
+%
+\input random
+\def\cite#1{}
+%
+\begin{document}
+
 \title{\texttt{PST-Labo} - matériel de chimie\thanks{Traduction française
     réalisée par Arnaud Schmittbuhl}\\
 \footnotesize{version \PSTfileversion}}
 \author{%
 Denis Girou\thanks{\url{Denis.Girou@idris.fr}}, 
 Christophe Jorssen\thanks{\url{Christophe.Jorssen@wanadoo.fr}},
-Manuel Luque\thanks{\url{Mluque5130@aol.com}} and
-Herbert Vo\ss\thanks{\url{voss@pstricks.de}}}
+Manuel Luque\thanks{\url{ManuelLuque27@gmail.com}} and
+Herbert Vo\ss\thanks{\url{hvoss@tug.org}}}
 \date{\today}
 \maketitle
 
@@ -32,7 +257,7 @@ Le tableau~\ref{tab:pst-labo:Parameter} répertorie l'ensemble des paramètres
 propres à \LPack{pst-labo}.
 
 \noindent
-\LTXtable{\linewidth}{pstlabo8-tab1-FR.tex}%
+\LTXtable{\linewidth}{pst-labo8-tab1-FR.tex}%
 
 
 
@@ -913,4 +1138,4 @@ d'une grille de référence (\Lmcs{psgrid}).
 \bibliography{pst-labo-doc}
 
 
-\endinput
+\end{document}
diff --git a/Master/texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-DE.tex b/Master/texmf-dist/doc/generic/pst-labo/pst-labo8-tab1-DE.tex
index baa18da9ac0..baa18da9ac0 100644
--- a/Master/texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-DE.tex
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo8-tab1-DE.tex
diff --git a/Master/texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-EN.tex b/Master/texmf-dist/doc/generic/pst-labo/pst-labo8-tab1-EN.tex
index d2865ea0364..b0e972e8529 100644
--- a/Master/texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-EN.tex
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo8-tab1-EN.tex
@@ -1,4 +1,4 @@
-%	$Id: pstlabo8-tab1-EN.tex,v 1.2 2005/10/10 21:32:42 patrick Exp patrick $	
+%	$Id: pstlabo8-tab1-EN.tex 234 2015-12-10 11:20:02Z herbert $	
 \setlongtables
 \begin{longtable}{@{}>{\ttfamily}l@{}>{\ttfamily}l>{\ttfamily}l>{\RaggedRight\arraybackslash}X@{}}
 \caption{Summary of all parameters available with \texttt{pst-labo}}\label{tab:pst-labo:Parameter} \\
diff --git a/Master/texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-FR.tex b/Master/texmf-dist/doc/generic/pst-labo/pst-labo8-tab1-FR.tex
index 68c1f7d8def..68c1f7d8def 100644
--- a/Master/texmf-dist/doc/generic/pst-labo/pstlabo8-tab1-FR.tex
+++ b/Master/texmf-dist/doc/generic/pst-labo/pst-labo8-tab1-FR.tex
diff --git a/Master/texmf-dist/tex/generic/pst-labo/pst-labo.tex b/Master/texmf-dist/tex/generic/pst-labo/pst-labo.tex
index a3cc93a870c..e23db23efa9 100644
--- a/Master/texmf-dist/tex/generic/pst-labo/pst-labo.tex
+++ b/Master/texmf-dist/tex/generic/pst-labo/pst-labo.tex
@@ -24,8 +24,8 @@
 \ifx\PSTGradLoaded\endinput\else\input pst-grad.tex\fi
 \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex\fi
 %
-\def\fileversion{2.03}
-\def\filedate{2006/08/16}
+\def\fileversion{2.04}
+\def\filedate{2015/12/09}
 %
 \message{`PST-labo8' v\fileversion, \filedate\space (ML/CJ/DG/HV)}
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -35,13 +35,13 @@
 \input random
 \input {pst-laboObj}
 %
-\definecolor{Beige} {rgb}{0.96,0.96,0.86}
-\definecolor{GrisClair} {rgb}{0.8,0.8,0.8}
-\definecolor{GrisTresClair} {rgb}{0.9,0.9,0.9}
+\definecolor{Beige}{cmyk}{0,0,0.1,0.04}
+\definecolor{GrisClair}{cmyk}{0,0,0,0.2}
+\definecolor{GrisTresClair}{cmyk}{0,0,0,0.1}
 \definecolor{OrangeTresPale}{cmyk}{0,0.1,0.3,0}
 \definecolor{OrangePale}{cmyk}{0,0.2,0.4,0}
 \definecolor{BleuClair}{cmyk}{0.2,0,0,0}
-\definecolor{LightBlue}{rgb}{.68,.85,.9}
+\definecolor{LightBlue}{cmyk}{0.22,0.05,0,0.1}
 \definecolor{Copper}{cmyk}{0,0.9,0.9,0.2}
 \definecolor{Marron}{cmyk}{0,0.3,0.5,.3}
 \SpecialCoor
diff --git a/Master/texmf-dist/tex/generic/pst-labo/pst-laboObj.tex b/Master/texmf-dist/tex/generic/pst-labo/pst-laboObj.tex
index 059de731dc6..d678bdc450f 100644
--- a/Master/texmf-dist/tex/generic/pst-labo/pst-laboObj.tex
+++ b/Master/texmf-dist/tex/generic/pst-labo/pst-laboObj.tex
@@ -1,4 +1,21 @@
-%%%%%%%% Les Différents appareils de chimie %%%%%%%%%%%%
+%% Package `pst-laboObj.tex'
+%%
+%% This program can be redistributed and/or modified under
+%% the terms of the LaTeX Project Public License Distributed
+%% from CTAN archives in directory macros/latex/base/lppl.txt.
+%%
+%% DESCRIPTION:
+%%   `pst-labo' is a PSTricks package for 
+%%   chemical objects.
+%%
+%%
+%% Authors  :   Denis Girou <Denis.Girou@idris.fr>
+%%              Christophe Jorsen <Christophe.Jorssen@free.fr>
+%%              Manuel Luque <Mluque5130@aol.com>
+%%              Herbert Voss <hvoss@tug.org>
+%%
+%% version number --> pst-labo.tex
+%%%%%%%% Les Différents appareils de chimie %%%%%%%%%%%%
 
 %%%%%%%%% Dosage %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \def\pst@burette@corps{%
@@ -524,7 +541,7 @@ gradbegin=OrangePale,gradend=yellow]%
 (-1.5,0)(1.5,0)(0.5,2.5)(0.5,3.5)}
 
 \def\pst@Flacon@Corps{%
-{\psset{linewidth=0.053}
+{\psset{linewidth=0.053,arrows=-}
 \psarcn(-0.6,3.4){0.1}{90}{0}
 \psline(-0.5,3.4)(-0.5,3.1)
 \psarcn(-0.6,3.1){0.1}{0}{-90}
@@ -642,22 +659,22 @@ gradbegin=OrangePale,gradend=yellow]%
 %%%%%%%%%%%% Fin de Chauffe-Ballon %%%%%%%%%%%%%%%%%%%%%%
 
 \def\pst@Ballon@Reflux{%
-\psclip{%
-\pscustom[linestyle=none]{\pst@ballon}}
-\pscustom[fillstyle=gradient,gradbegin=cyan,gradend=white,gradmidpoint=0,linecolor=cyan]
-{\pscurve(-1.5,1.5)(-1.375,1.55)%
-(-1.25,1.5)(-1.125,1.45)%
-(-1,1.5)(-.875,1.55)%
-(-.75,1.5)(-.625,1.45)%
-(-.5,1.5)(-.375,1.55)%
-(-.25,1.5)(-0.125,1.45)%
-(0,1.5)(0.125,1.55)%
-(.25,1.5)(0.375,1.45)%
-(0.5,1.5)(0.625,1.55)%
-(0.75,1.5)(0.875,1.45)%
-(1,1.5)(1.125,1.55)%
-(1.25,1.5)(1.375,1.45)(1.5,1.5)%
-\psline(1.5,1.5)(1.5,0)(-1.5,0)(-1.5,1.5)}
-\endpsclip%
-\pst@ballon
+  \psclip{%
+    \pscustom[linestyle=none]{\pst@ballon}}
+    \pscustom[fillstyle=gradient,gradbegin=cyan,gradend=white,gradmidpoint=0,linecolor=cyan]{%
+      \pscurve(-1.5,1.5)(-1.375,1.55)%
+	(-1.25,1.5)(-1.125,1.45)%
+	(-1,1.5)(-.875,1.55)%
+	(-.75,1.5)(-.625,1.45)%
+	(-.5,1.5)(-.375,1.55)%
+	(-.25,1.5)(-0.125,1.45)%
+	(0,1.5)(0.125,1.55)%
+	(.25,1.5)(0.375,1.45)%
+	(0.5,1.5)(0.625,1.55)%
+	(0.75,1.5)(0.875,1.45)%
+	(1,1.5)(1.125,1.55)%
+	(1.25,1.5)(1.375,1.45)(1.5,1.5)
+      \psline(1.5,1.5)(1.5,0)(-1.5,0)(-1.5,1.5)}%
+  \endpsclip
+  \pst@ballon
 }
diff --git a/Master/texmf-dist/tex/latex/pst-labo/pst-labo.sty b/Master/texmf-dist/tex/latex/pst-labo/pst-labo.sty
index 7a4767ef81d..e03726c23bc 100644
--- a/Master/texmf-dist/tex/latex/pst-labo/pst-labo.sty
+++ b/Master/texmf-dist/tex/latex/pst-labo/pst-labo.sty
@@ -1,7 +1,12 @@
 \RequirePackage{pstricks}
-\ProvidesPackage{pst-labo}[2005/03/13 package wrapper for 
-  pst-labo.tex (hv)]
+\ProvidesPackage{pst-labo}[2015/12/09 package wrapper for pst-labo.tex (hv)]
+
 \input{pst-labo.tex}
 \ProvidesFile{pst-labo.tex}
   [\filedate\space v\fileversion\space `PST-labo' (ML,DG,CJ,hv)]
-\endinput
\ No newline at end of file
+\IfFileExists{pst-labo.pro}{%
+  \ProvidesFile{pst-labo.pro}
+    [2012/09/21 v. 1.01,  PostScript prologue file (hv)]
+    \@addtofilelist{pst-labo.pro}}{}%
+\endinput
+