pst-optic (6sep16)

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

10 files changed, 144 insertions, 862 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-optic/Changes b/Master/texmf-dist/doc/generic/pst-optic/Changes
index 0b2827a8369..1983e9e73a9 100644
--- a/Master/texmf-dist/doc/generic/pst-optic/Changes
+++ b/Master/texmf-dist/doc/generic/pst-optic/Changes
@@ -1,4 +1,5 @@
 ---- pst-optic.tex
+1.02  2016-07-10  - added option onlyrays, preset to false
 1.01  2010-07-23  - bugfixes for \psset[pst-optic,pstricks]
 1.00  2009-02-10  - new style opticalAxis to allow different line styles
                   - cosmetic changes to the code and the documentation
diff --git a/Master/texmf-dist/doc/generic/pst-optic/README b/Master/texmf-dist/doc/generic/pst-optic/README
index 70b9df5af52..ae99fe4a5b4 100644
--- a/Master/texmf-dist/doc/generic/pst-optic/README
+++ b/Master/texmf-dist/doc/generic/pst-optic/README
@@ -1,9 +1,9 @@
 %% Package `pst-optic.tex'
 %%
 %% Manuel Luque <Mluque5130@aol.com> (France)
-%% Herbert Voss <voss@perce.de> (Germany)
+%% Herbert Voss <hvoss@tug.org> (Germany)
 %%
-%% 2003-02-16
+%% 2016-07-10
 %%
 
 Save the files
@@ -15,7 +15,7 @@ in any place, where latex or any other TeX program will find it.
 If you like to get the documentation file in another format run 
 
 latex pst-optic-doc.tex
-bibtex pst-optic.doc
+biber pst-optic.doc
 latex pst-optic-doc.tex
 dvips pst-optic-doc.dvi
 
@@ -23,11 +23,3 @@ to get a PostScript file. But pay attention, that the pst-optic
 files are saved in the above mentioned way, before you run
 latex on the documentation file.
 
-It is nearly the same for the example file pst-optic-examples.tex
-
-
-The intermediate DVI file works only with viewers which can 
-interprete the embedded PostScript code, like the one from KDE.
-
-For another PDF output read the Introduction from
-the documentation.
diff --git a/Master/texmf-dist/doc/generic/pst-optic/more_docs/dtk.pdf b/Master/texmf-dist/doc/generic/pst-optic/more_docs/dtk.pdf
deleted file mode 100644
index ffc4552f1a1..00000000000
--- a/Master/texmf-dist/doc/generic/pst-optic/more_docs/dtk.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/pst-optic/more_docs/pst-optic-examples.pdf b/Master/texmf-dist/doc/generic/pst-optic/more_docs/pst-optic-examples.pdf
deleted file mode 100644
index fe144aa86b7..00000000000
--- a/Master/texmf-dist/doc/generic/pst-optic/more_docs/pst-optic-examples.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/generic/pst-optic/more_docs/pst-optic-examples.tex b/Master/texmf-dist/doc/generic/pst-optic/more_docs/pst-optic-examples.tex
deleted file mode 100644
index bd0464c9835..00000000000
--- a/Master/texmf-dist/doc/generic/pst-optic/more_docs/pst-optic-examples.tex
+++ /dev/null
@@ -1,653 +0,0 @@
-%% $Id: pst-func-doc.tex 64 2008-12-08 22:14:27Z herbert $
-\documentclass[11pt,english,BCOR10mm,DIV13,bibliography=totoc,parskip=false,smallheadings
-    headexclude,footexclude,oneside]{pst-doc}
-\usepackage[utf8]{inputenc}
-\usepackage{pst-optic,pst-text}
-\usepackage{hyperref}
-\let\pstOpticFV\fileversion
-\lstset{pos=t,wide=true,language=PSTricks,basicstyle=\footnotesize\ttfamily}
-\let\belowcaptionskip\abovecaptionskip
-%
-\begin{document}
-
-\title{\texttt{pst-optic}}
-\subtitle{Lenses and Mirrors -- examples; v.\pstOpticFV}
-
-\author{Manuel Luque \\Herbert Vo\ss}
-\docauthor{Herbert Vo\ss}
-\date{\today}
-\maketitle
-
-\tableofcontents
-
-\clearpage
-
-\part{Lenses}
-\section{A simple colored System}
-
-\begin{itemize}
-\item $\mathrm{\overline{AB} = 2\ cm}$
-\item $\mathrm{\overline{OA} = -10\ cm}$
-\item $\mathrm{\overline{OF'} = 3,333\ cm}$
-\item $\mathrm{\overline{XO} = 2\ cm}$
-\end{itemize}
-
-\begin{LTXexample}
-\begin{pspicture}(-8.5,-3)(8.5,3)
-\rput(0,0){\lens[focus=3.333,OA=-10,AB=2,XO=2,xLeft=-8.5,xRight=8.5,rayColor=red]}
-\pnode(!XO 2.5){L1} \pnode(!XO -2.5){L2}
-\psOutLine[length=2](L1)(B'){END} \psBeforeLine[length=2](B')(L2){START}
-\pspolygon[style=rayuresJaunes,linestyle=none](B)(L1)(END)(START)(L2)
-\rput(0,0){\lens[focus=3.333,OA=-10,AB=2,XO=2,xLeft=-8.5,xRight=8.5,rayColor=red,arrowsize=0.2]}
-\end{pspicture}
-\end{LTXexample}
-\xLcs{psOutLine}\xLcs{psBeforeLine}
-
-\clearpage
-\section{A Magnifier}
-
-\begin{LTXexample}
-\begin{pspicture}(-8,-5)(8,3)
-\rput(0,0){\lens[lensGlass=true,lensWidth=0.4,focus=4,AB=0.5,OA=-2.8,XO=2,drawing=false]
-  \psline[linewidth=0.5pt](xLeft)(xRight)}
-\pnode(!XO 2.5){L1} \pnode(!XO -2.5){L2}
-\psOutLine[length=5.5,linestyle=none](B')(L1){END1}
-\psBeforeLine[length=6,linestyle=none](L2)(B'){START}
-\pspolygon[style=rayuresJaunes,linestyle=none](B)(L1)(END1)(START)(L2)
-\psline[linewidth=1.5\pslinewidth,arrowinset=0]{->}(A)(B)
-\uput[270](A){A} \uput[90](B){B}
-\psline[linewidth=1.5\pslinewidth,arrowinset=0,linestyle=dashed]{->}(A')(B')
-\uput[270](A'){$\mathrm{A'}$} \uput[90](B'){$\mathrm{B'}$}
-\psset{linecolor=red,arrowsize=0.2}
-\pcline[nodesepB=-4](B)(O)%			Mittelpunktstrahl
-\psline[linecolor=red,linestyle=dashed](B)(B')%	ruckwaertige Verlaengerung
-\Arrows(B)(O)%					Mittelpunktstrahl
-\psOutLine[length=2,arrows=->](B)(O){END6}%	Mittelpunktstrahl
-\psline(B)(I)(F')\psOutLine(I)(F'){END2}\Arrows(I)(F')\Arrows(B)(I)
-\psOutLine[length=1,linestyle=dashed](I')(B'){END3}
-\psline[linestyle=dashed](B)(F)\psline(B)(I')\Arrows[arrows=->>](B)(I')
-\psline[linestyle=dashed](B')(I')\psline[linestyle=dashed](B')(I)
-\psOutLine[length=2,arrows=->>](B')(I'){END4}\psOutLine[length=4](B')(I'){END5}
-\rput(8,0){\psset{linecolor=black}\eye}
-\end{pspicture}
-\end{LTXexample}
-\xLcs{psOutLine}\xLcs{psBeforeLine}\xLcs{eye}\xLcs{lens}\xLcs{Arrows}
-
-\clearpage
-\section{Two Lenses}
-
-This is a simple system with two lenses, where the \Lcs{lens} macro is used only once. 
-The second lense (the left one) is drawn by the \Lcs{psline} macro.
-
-\begin{LTXexample}
-\begin{pspicture}(-8,-5)(8,3)
-\rput(0,0){\lens[lensScale=0.6,drawing=false,focus=1.5,OA=-1,XO=5,nameF={},nameFi={},AB=-1]
-  \psline[linewidth=1pt](xLeft)(xRight)} %image intermediaire A1B1 au foyer F'1
-\psline{->}(4,0)(4,-1) %lentille 2
-%	\psline[linewidth=2\pslinewidth,linecolor=blue]{<->}(5,1.5)(5,-1.5)
-%On place les points essentiels
-\pnode(-6,0){O1} \pnode(-6,2.5){E1L1} \pnode(-6,-2.5){E2L1}
-\pnode(4,0){A1} \pnode(4,-1){B1}
-\rayInterLens(O1)(B1){5}{Inter1L2}%intersection de O1 avec la lentille L2
-\pcline[nodesepB=-2](Inter1L2)(O1)%rayon venant de l'infini jusqu'e la lentille L2
-\Parallel(B1)(O1)(E1L1){B1infty}%rayon parallele au precedent et passant par E1L1
-\Parallel(B1)(O1)(E2L1){B2infty}%rayon passant par E2L2
-%intersection de la droite passant par E1L1 et B1 avec la lentille L2
-\rayInterLens(E1L1)(B1){5}{InterE1B1L2}\psline(E1L1)(InterE1B1L2)
-%intersection de la droite passant par E2L2 et B1 avec la lentille L2
-\rayInterLens(E2L1)(B1){5}{InterE2B1L2}
-\psline(E2L1)(InterE2B1L2)
-\psline[linestyle=dashed]{->}(A')(B')\psline[linestyle=dashed](InterE1B1L2)(B')
-\psline[linestyle=dashed](InterE2B1L2)(B')\psline[linestyle=dotted](B')(O)
-\psOutLine[length=3](B')(InterE1B1L2){END}\psBeforeLine[length=3](InterE2B1L2)(B'){START}
-\pspolygon[style=rayuresJaunes,linestyle=none](B1infty)(E1L1)(InterE1B1L2)%
-  (END)(START)(InterE2B1L2)(E2L1)(B2infty)
-\uput[90](A'){$\mathrm{A'}$}\uput[270](B'){$\mathrm{B'}$}
-\uput[90](A1){$\mathrm{A_1}$}\uput[270](B1){$\mathrm{B_1}$}
-\uput[225](O1){O1}\uput[45](O){O2}\uput[90](F){$\mathrm{F_2}$}
-\uput{0.4}[150](F'){$\mathrm{F'_2}$}\uput{0.6}[90](A1){$\mathrm{F'_1}$}
-\psline[linecolor=red](B1infty)(E1L1)(InterE1B1L2)(END)
-\psline[linecolor=red](B2infty)(E2L1)(InterE2B1L2)(START)
-\rput(8,0){\eye}
-\psline[linewidth=2\pslinewidth,linecolor=blue,arrowsize=0.2,arrowinset=0.5]{<->}(-6,-2.5)(-6,2.5)
-\end{pspicture}
-\end{LTXexample}
-\xLcs{psOutLine}\xLcs{psBeforeLine}\xLcs{eye}\xLcs{lens}\xLcs{Arrows}\xLcs{rayInterLens}
-
-\clearpage
-\section{Real Image}
-
-\begin{LTXexample}
-\begin{pspicture*}(-7.5,-3)(7.5,3)
-\rput(0,0){\lens[lensGlass=true,lensWidth=0.5,lensType=DVG,XO=0,AB=2,OA=-4,focus=-6,spotAi=270,spotBi=90]%
-  \psline[linewidth=1pt](xLeft)(xRight)}
-\psline[linecolor=red,linestyle=dashed](I')(F)% Verlaengerung des Brennstrahls
-\psOutLine[length=7](B')(I){END}\psBeforeLine[length=7](I')(B'){START}% permet de definir START
-\pspolygon[style=rayuresJaunes,linestyle=none](B)(I)(END)(START)(I')
-\psline(B)(I)(END) \psline(B)(I')(START)
-\end{pspicture*}
-\end{LTXexample}
-\xLcs{psOutLine}\xLcs{psBeforeLine}\xLcs{lens}
-
-\clearpage
-\section{Virtual Image}
-
-\begin{LTXexample}
-\begin{pspicture*}(-7.5,-6.5)(7.5,7.5)
-\rput(0,0){\lens[lensType=DVG,lensWidth=0.75,lensHeight=7,focus=-2,OA=-6,AB=4,XO=-1,lensGlass=true,
-    rayColor=red,yBottom=-5,yTop=5,drawing=false]
-  \psline[linewidth=1pt](xLeft)(xRight)}
-\pnode(!XO 2.9){L1} \pnode(!XO -2.5){L2}
-{ \psset{length=4,linestyle=none}
-  \psOutLine(B')(L1){A1}  \psOutLine(B')(L2){A2}
-  \pspolygon[style=rayuresJaunes,linestyle=none](B)(L1)(A1)(A2)(L2)
-  \psset{linecolor=red,linestyle=solid}
-  \psline(B)(L1)(A1)  \psline(B)(L2)(A2) \psline[linestyle=dashed](B')(L1)
-  \psline[linestyle=dashed](B')(L2) }
-\psline[linestyle=dashed]{->}(A)(B) \psline{->}(A')(B')
-\uput[90](B){B}\uput[90](B'){$\mathrm{B'}$}\uput[270](A){A}\uput[270](A'){$\mathrm{A'}$}
-\end{pspicture*}
-\end{LTXexample}
-\xLcs{psOutLine}\xLcs{psBeforeLine}\xLcs{lens}
-
-\clearpage
-\section{A Microscope}
-
-\begin{LTXexample}
-\begin{pspicture}(-7.5,-5.5)(7.5,3)
-\rput(0,0){\lens[focus=1.5,OA=-2,AB=0.5,XO=-5,lensGlass=true,lensWidth=0.4,
-   yBottom=-4,yTop=4,drawing=false,lensScale=0.4,nameF=F_1,nameFi=F'_1]
-  \psline[linewidth=1pt](xLeft)(xRight)}
-\pnode(! XO 1){UPlens1} \pnode(! XO -1){DOWNlens1}
-\Transform
-\rput(0,0){\lens[focus=2,XO=3,lensGlass=true,lensWidth=0.4,yBottom=-4,yTop=4,drawing=false,
-        nameF=F_2,nameFi=F'_2,spotF=90,spotFi=90]}
-\psline{->}(A1)(B1)\psline{->}(A'1)(B'1)\uput[270](A1){A}\uput[90](B1){B}
-\uput[270](B'1){$\mathrm{B_1}$}\uput{0.7}[90](A'1){$\mathrm{A_1}$}
-{\psset{linecolor=red}
- \rayInterLens(I11)(B'1){3}{Inter1L2}\rayInterLens(B1)(O1){3}{Inter2L2}
- \rayInterLens(UPlens1)(B'1){3}{Inter3L2}\rayInterLens(DOWNlens1)(B'1){3}{Inter4L2}
- \psline(B1)(I11)(B'1)(Inter1L2)\psline(B1)(Inter2L2)\psline(B1)(UPlens1)(Inter3L2)
- \psline(B1)(DOWNlens1)(Inter4L2)
- \psset{length=5}
- \Parallel(B'1)(O)(Inter3L2){B1inftyRigth}\Parallel(B'1)(O)(Inter4L2){B2inftyRigth}
- \Parallel(B'1)(O)(Inter2L2){B3inftyRigth}\Parallel(B'1)(O)(Inter1L2){B3inftyRigth}
- {\psset{length=-5,linestyle=dashed}
-  \Parallel(B'1)(O)(Inter3L2){B1inftyLeft}\Parallel(B'1)(O)(Inter4L2){B2inftyLeft}
-  \Parallel(B'1)(O)(Inter2L2){B3inftyLeft}\Parallel(B'1)(O)(Inter1L2){B3inftyLeft}
-  \pcline[nodesep=6](B'1)(O)}
- \pspolygon[style=rayuresJaunes,linestyle=none](B1)(UPlens1)(Inter3L2)%
- 	(B1inftyRigth)(B2inftyRigth)(Inter4L2)(DOWNlens1)
- \psline(B1)(UPlens1)(Inter3L2)(B1inftyRigth)\psline(B2inftyRigth)(Inter4L2)(DOWNlens1)(B1)}
-\rput(7,0){\eye}
-\end{pspicture}%
-\end{LTXexample}
-\xLcs{psOutLine}\xLcs{psBeforeLine}\xLcs{lens}\xLcs{rayInterLens}\xLcs{Parallel}
-
-
-\clearpage
-\section{Telescope}
-
-\begin{LTXexample}[wide=false]
-\telescope[mirrorFocus=10,posMirrorTwo=8,yBottom=-8]
-\end{LTXexample}
-
-\xLcs{telescope}
-\begin{LTXexample}[wide=false]
-\telescope[mirrorFocus=6,posMirrorTwo=5,yBottom=-5]
-\end{LTXexample}
-
-\clearpage
-\section{Lightspeed measured by Foucault}
-1849 Foucault (1819-1868) determines with the following configuration the speed of the light.
-
-
-
-\begin{LTXexample}
-\begin{pspicture}(-8,-3.2)(7,4.5)
-\rput(0,0){\lens[lensWidth=1,lensGlass=true,lensHeight=6,focus=4,drawing=false,AB=2.5]}
-{\psset{linewidth=0.5pt,linestyle=dashed,arrowsize=5pt,arrows=|<->|}
- \psline(-8,0)(4,0)\pcline(-7.75,-3)(0,-3)\lput*{:U}{2f} 
- \pcline(0,-3)(4,-3)\lput*{:U}{f}\pcline(7,0)(7,4)\lput*{:U}{f}
- \pcline(4,5)(5,5)\lput*{:U}{s}\pcline(5.25,2.3)(5.25,2.8)\lput*{:U}{s} }
-\uput[90](0,3){\Large L}\uput[45](-7.7,3){\Large B}\uput[45](-7.7,-2){\Large E}
-\uput[270](3,-0.5){\Large D}\uput[-45](4,0){\Large A=F}\uput[270](3,2){\Large S}
-\uput[90](4,4){\Large Sp}\uput[90](3.5,3.25){\Large B'}\uput[0](6.3,2.25){\Large B''}
-\uput[-90](6,1.1){\Large M}\psarc[linewidth=0.5pt](-7.75,2.5){0.5}{-90}{0}\qdisk(-7.55,2.3){1pt}
-\rput{210}(F'){\mirrorTwo}
-{\psset{fillstyle=solid,fillcolor=lightgray}
- \rput{210}(4,2.5){\psframe(-1,0)(1,0.2)}\psframe(-8,-3)(-7.75,3)
- \psframe(3,4)(3.8,4.2)\psframe(4.2,4)(5,4.2) }
-{\psset{linewidth=1pt,linecolor=red,arrows=->,arrowsize=5pt}
- \arrowLine[linecolor=blue,arrowOffset=-0.2](F')(4,2.5){2}
- \arrowLine[linecolor=blue,arrowOffset=-0.2](4,2.3)(6,2.3){1}
- \qdisk(6,2.3){2pt}
- \psline[linestyle=dashed,arrows=-](F')(5.1,4)\psline[linestyle=dashed,arrows=-](5,2.8)(6,2.8)
- \arrowLine(4,4)(F'){3}\arrowLine[linecolor=blue,arrowOffset=-0.2](I)(F'){2}
- \arrowLine(F')(I){2}\arrowLine[linecolor=blue,arrowOffset=-0.3](-7.75,2.5)(I){3}
- \arrowLine(I)(-7.75,2.5){3} }
-\psframe(5.5,1.1)(6.5,3.5)
-\multido{\r=1.3+0.2}{12}{\psline(6.1,\r)(6.5,\r)}
-\end{pspicture}
-\end{LTXexample}
-
-Sp chink; \\
-D rotating mirror;\\
-L collecting lens;\\
-E end mirror;\\
-S half diaphanous mirror;\\
-M scale
-
-
-\clearpage
-\part{Mirrors}
-
-\section{High Beam Light\label{beamlight}}
-\begin{LTXexample}
-\begin{pspicture}(-1.5,-5.5)(10,5.5)
-\rput(0,0){\beamLight[drawing=false,mirrorDepth=4.75,mirrorWidth=0.1,mirrorHeight=10,linecolor=lightgray]}
-\makeatletter
-\pst@getcoor{Focus}\pst@tempf
-\psset{linewidth=1pt,linecolor=red}
-\multido{\n=60+5}{18}{%
-  \mirrorCVGRay[linecolor=red,mirrorDepth=4.75,mirrorHeight=10,linewidth=1pt](Focus)(!%
-    /XF \pst@tempf pop \pst@number\psxunit div def \n\space cos XF add \n\space sin neg){Endd1}
-  \psOutLine[arrows=->,length=.25](Endd1)(Endd1''){Endd2}%
-  \mirrorCVGRay[linecolor=red,mirrorDepth=4.75,mirrorHeight=10,linewidth=1pt](Focus)(!%
-    /XF \pst@tempf pop \pst@number\psxunit div def \n\space cos XF add \n\space sin ){End1}
-  \psOutLine[arrows=->,length=.25](End1)(End1''){End2}}
-\makeatletter
-\end{pspicture}
-\end{LTXexample}
-\xLcs{beamLight}\xLcs{mirrorCVGRay}\xLcs{psOutLine}
-\clearpage
-\section{Low Beam Light}
-
-
-\begin{LTXexample}
-\begin{pspicture}(-1.5,-5)(10,5)
-\rput(0,0){\beamLight[drawing=false,mirrorDepth=4.75,mirrorWidth=0.1,mirrorHeight=10,linecolor=lightgray]}
-\psset{linewidth=1pt,linecolor=red}
-\multido{\n=70+5}{20}{%
-   \psline(2.75,-0.2)(! \n\space cos 2.75 add \n\space sin )
-   \mirrorCVGRay[linecolor=red,mirrorDepth=4.75,mirrorHeight=10,linewidth=1pt](2.75,-0.2)%
-     (!  \n\space cos 2.75 add \n\space sin ){End1}
- \psOutLine[arrows=->,length=.25](End1)(End1''){End2}}
-\end{pspicture}
-\end{LTXexample}
-\xLcs{beamLight}\xLcs{mirrorCVGRay}\xLcs{psOutLine}\xLkeyword{mirrorDepth}\xLkeyword{mirrorHeight}
-
-
-
-\clearpage
-\part{Refraction}
-
-\section{Vertical Medium}
-
-Refrectionnumbers are $n_1=1$ and $n_2=1.5$:
-
-\begin{LTXexample}
-\begin{pspicture}[showgrid=true](-5,-3)(5,3)
-\pnode(-1,-2.5){A}\pnode(1,-2.5){B}\pnode(1,2.5){C}\pnode(-1,2.5){D}
-%	\rotateFrame(A)(B)(C)(D){10}
-\uput[-135](A){A}\uput[-45](B){B}\uput[45](C){C}\uput[135](D){D}
-\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)(D)
-% 1.
-\refractionRay(-3,-3)(-2,-2)(D)(A){1}{1.5}{END}
-\psset{linecolor=red,linewidth=2pt,arrowsize=5pt,arrows=->}
-\arrowLine(-3,-3)(END){2}\ABinterCD(END)(END')(C)(B){Out}
-\arrowLine(END)(Out){1}\refractionRay(END)(Out)(C)(B){1.5}{1}{Q}
-\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End}
-% 2.
-\refractionRay(-3,0)(-2,0)(A)(D){1}{1.5}{END}
-\psset{linecolor=green,linewidth=2pt,arrowsize=5pt,arrows=->}
-\arrowLine(-3,0)(END){2}\ABinterCD(END)(END')(C)(B){Out}
-\arrowLine(END)(Out){1}\refractionRay(END)(Out)(C)(B){1.5}{1}{Q}
-\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End}
-% 3.
-\refractionRay(-3,3)(-2,2)(D)(A){1}{1.5}{END}
-\psset{linecolor=blue,linewidth=2pt,arrowsize=5pt,arrows=->}
-\arrowLine(-3,3)(END){2}\ABinterCD(END)(END')(C)(B){Out}
-\arrowLine(END)(Out){1}\refractionRay(END)(Out)(C)(B){1.5}{1}{Q}
-\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End}
-\end{pspicture}
-\end{LTXexample}
-\xLcs{refractionRay}\xLcs{arrowLine}\xLcs{ABinterCD}\xLkeyword{length}
-
-\clearpage
-\section{Horizontal Medium}
-Refrectionnumbers are $n_1=1$ and $n_2=1.5$:
-
-\begin{LTXexample}
-\begin{pspicture}[showgrid=true](-5,-4)(5,3)
-\pnode(-2.5,-1){A}\pnode(2.5,-1){B}\pnode(2.5,1){C}\pnode(-2.5,1){D}
-%\rotateFrame(A)(B)(C)(D){10}
-\uput[-135](A){A}\uput[-45](B){B}\uput[45](C){C}\uput[135](D){D}
-\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)(D)
-% 1.
-\refractionRay(-3,3)(-2,2)(C)(D){1}{1.5}{END}
-\psset{linecolor=red,linewidth=2pt,arrowsize=5pt,arrows=->}
-\arrowLine(-3,3)(END){2}\ABinterCD(END)(END')(B)(A){Out}
-\arrowLine(END)(Out){1}\refractionRay(END)(Out)(B)(A){1.5}{1}{Q}
-\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End}
-% 2.
-\refractionRay(0,3)(0,1)(C)(D){1}{1.5}{END}
-\psset{linecolor=green,linewidth=2pt,arrowsize=5pt,arrows=->}
-\arrowLine(0,3)(END){2}\ABinterCD(END)(END')(A)(B){Out}
-\arrowLine(END)(Out){1}\refractionRay(END)(Out)(B)(A){1.5}{1}{Q}
-\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End}
-% 3.
-\refractionRay(3,3)(2,2)(C)(D){1}{1.5}{END}
-\psset{linecolor=blue,linewidth=2pt,arrowsize=5pt,arrows=->}
-\arrowLine(3,3)(END){2}\ABinterCD(END)(END')(B)(A){Out}
-\arrowLine(END)(Out){1}\refractionRay(END)(Out)(B)(A){1.5}{1}{Q}
-\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End}
-\end{pspicture}
-\end{LTXexample}
-\xLcs{refractionRay}\xLcs{arrowLine}\xLcs{ABinterCD}
-
-\clearpage
-
-\section{Parallel Rays and a sloping medium}
-Refrectionnumbers are $n_1=1$ and $n_2=1.5$:
-
-\begin{LTXexample}
-\begin{pspicture}[showgrid=true](-7,-1)(5,6)
-\pnode(0,0){A}\pnode(2,0){B}\pnode(2,5){C}\pnode(0,5){D}
-\rotateFrame(A)(B)(C)(D){40}
-\uput[-135](A){A}\uput[-45](B){B}\uput[30](C){C}\uput[135](D){D}
-\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)(D)
-\psset{linecolor=red,linewidth=2pt,arrowsize=5pt,arrows=->}
-\multido{\r=1.10+0.28}{8}{%
-  \refractionRay(-6.00,\r)(-3.00,\r)(A)(D){1}{1.5}{End}
-  \arrowLine(-6.00,\r)(End){2}\ABinterCD(End)(End')(C)(B){Out}
-  \arrowLine(End)(Out){1}\refractionRay(End)(Out)(C)(B){1.5}{1}{Q}
-  \psline(Q)(Q')\psOutLine[length=3](Q)(Q'){End}}
-\end{pspicture}
-\end{LTXexample}
-\xLcs{refractionRay}\xLcs{arrowLine}\xLcs{ABinterCD}\xLcs{polygon}
-
-\clearpage
-
-\section{A Prisma}
-Refrectionnumbers are $n_1=1$ and $n_2=1.5$:
-
-
-\begin{LTXexample}
-\begin{pspicture}[showgrid=true](-7,0)(5,6)
-\pnode(-3,1){A}\pnode(1,1){B}\pnode(-1,5){C}\uput[-135](A){A}\uput[-45](B){B}\uput[30](C){C}
-\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)
-\psset{linecolor=red,linewidth=2pt,arrowsize=5pt,arrows=->}
-\multido{\rA=0.6+0.2,\rB=1.5+0.2}{7}{%
-  \refractionRay(-6,\rA)(-4,\rB)(C)(A){1}{1.5}{END}\arrowLine(-6,\rA)(END){2}
-  \ABinterCD(END)(END')(C)(B){Out}\arrowLine(END)(Out){1}
-  \refractionRay(END)(Out)(C)(B){1.5}{1}{Q}\psline(Q)(Q')\psOutLine[length=3](Q)(Q'){End}}
-\end{pspicture}
-\end{LTXexample}
-\xLcs{refractionRay}\xLcs{arrowLine}\xLcs{ABinterCD}\xLcs{psOutLine}
-
-
-\section{A Prisma for Dispersion}
-The following figure shows the light dispersion with realistic values for the refractions numbers of the different light colors.
-\bigskip
-
-\begin{tabular}{ @{}l l l l l l @{}}
- & darkblue & bluegreen & yellow & red & darkred \\
-$n$ for glass & 1.528 & 1.523 & 1.517 & 1.514 & 1.511 
-\end{tabular} 
-
-\begin{landscape}
-\begin{LTXexample}[wide=false]
-\begin{pspicture}[showgrid=true](-7,0)(14,6)
-\pnode(-6,1){A}\pnode(-2,1){B}\pnode(-4,5){C}\uput[-135](A){A}\uput[-45](B){B}\uput[30](C){C}
-\pnode(12.5,0.5){E1}\pnode(12.5,5.5){E2}
-\psframe[fillcolor=lightgray,fillstyle=solid](E1)(12.75,5.5)\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)
-\psset{linecolor=black,linewidth=2pt,arrowsize=5pt,arrows=->}
-\pnode(-7,1){P1}\pnode(-6,2){P2}\ABinterCD(P1)(P2)(C)(A){END}\arrowLine(P1)(END){2}
-\psset{linecolor=blue,linewidth=0.5pt,arrowsize=2pt,}
-\refractionRay(P1)(P2)(C)(A){1}{1.528}{END}\ABinterCD(END)(END')(C)(B){Out}\arrowLine(END)(Out){1}
-\refractionRay(END)(Out)(C)(B){1.528}{1}{Q}\psline(Q)(Q')\ABinterCD(Q)(Q')(E1)(E2){END}\arrowLine(Q)(END){4}\qdisk(END){1.5pt}
-\psset{linecolor=green}
-\refractionRay(P1)(P2)(C)(A){1}{1.523}{END}\ABinterCD(END)(END')(C)(B){Out}\arrowLine(END)(Out){1}
-\refractionRay(END)(Out)(C)(B){1.523}{1}{Q}\psline(Q)(Q')\ABinterCD(Q)(Q')(E1)(E2){END}\arrowLine(Q)(END){4}\qdisk(END){1.5pt}
-\psset{linecolor=yellow}
-\refractionRay(P1)(P2)(C)(A){1}{1.517}{END}\ABinterCD(END)(END')(C)(B){Out}\arrowLine(END)(Out){1}
-\refractionRay(END)(Out)(C)(B){1.517}{1}{Q}\psline(Q)(Q')\ABinterCD(Q)(Q')(E1)(E2){END}\arrowLine(Q)(END){4}\qdisk(END){1.5pt}
-\psset{linecolor=red}
-\refractionRay(P1)(P2)(C)(A){1}{1.511}{END}\ABinterCD(END)(END')(C)(B){Out}\arrowLine(END)(Out){1}
-\refractionRay(END)(Out)(C)(B){1.511}{1}{Q}\psline(Q)(Q')\ABinterCD(Q)(Q')(E1)(E2){END}\arrowLine(Q)(END){4}\qdisk(END){1.5pt}
-\end{pspicture}
-\end{LTXexample}
-\end{landscape}
-
-
-\clearpage
-\section{Refration with different Angles}
-Refrectionnumbers are $n_1=1$ and $n_2=1.5$:
-
-\begin{LTXexample}
-\begin{pspicture}[showgrid=true](-6,-5)(6,5)
-\pnode(-6,-1){A}\pnode(6,-1){B}\pnode(6,1){C}\pnode(-6,1){D}
-\uput[-135](A){A}\uput[-45](B){B}\uput[30](C){C}\uput[135](D){D}
-\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)(D)
-\psline[linewidth=0.5pt](0,-5)(0,5)
-\psset{linecolor=red,linewidth=1.5pt,arrowsize=5pt,arrows=->}
-\multido{\n=30+5}{25}{%
-  \refractionRay(5;\n)(0,1)(C)(D){1}{1.5}{END}\arrowLine(5;\n)(END){2}
-  \ABinterCD(END)(END')(B)(A){Out}\arrowLine(END)(Out){1}
-  \refractionRay(END)(Out)(B)(A){1.5}{1}{Q}\psline(Q)(Q')\psOutLine[length=3](Q)(Q'){End}}
-\end{pspicture}
-\end{LTXexample}
-
-
-
-
-
-\clearpage
-\section{Great difference in the Refractionsnumbers}
-
-Refrectionnumbers are $n_1=1$ and $n_2=4$:
-
-
-\begin{LTXexample}
-\begin{pspicture}[showgrid=true](-5,-1)(2,6)
-\pnode(0,0){A}\pnode(2,0){B}\pnode(2,5){C}\pnode(0,5){D}\rotateFrame(A)(B)(C)(D){45}
-\uput[-135](A){A}\uput[-40](B){B}\uput[45](C){C}\uput[135](D){D}
-\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)(D)
-\refractionRay(-2.5,-1)(-2,1)(A)(D){1}{4}{END}
-\psset{linecolor=red,linewidth=2pt,arrowsize=5pt,arrows=->}
-\arrowLine(-2.5,-1)(END){2}\ABinterCD(END)(END')(C)(B){Out}\arrowLine(END)(Out){1}
-\refractionRay(END)(Out)(C)(B){4}{1}{Q}\arrowLine(Q)(Q'){1}\psOutLine[length=2](Q)(Q'){End}
-\end{pspicture}
-\end{LTXexample}
-
-
-\clearpage
-
-\section{Total Reflection}
-
-Refrectionnumbers are $n_1=2$ and $n_2=1$:
-
-\begin{LTXexample}
-\begin{pspicture}[showgrid=true](-8,-3)(8,6)
-\pnode(-8,1.5){A}\pnode(8,1.5){B}\uput[45](A){A}\uput[135](B){B}\pnode(0,0){START}
-\psframe[fillcolor=lightgray,fillstyle=solid,linecolor=blue](-8,-1.5)(B)
-\psset{linecolor=red,linewidth=1.5pt,arrowsize=5pt,arrows=->}
-%	\multido{\n=20+5}{16}{%
-\multido{\n=20+5}{29}{%
- \refractionRay(START)(1;\n)(A)(B){1.5}{1}{END}\arrowLine(START)(END){2}
- \arrowLine(END)(END'){1}\psOutLine[length=3](END)(END'){Q}\arrowLine(END')(Q){3}}
-\end{pspicture}
-\end{LTXexample}
-
-\clearpage
-
-
-\section{Total Reflection with a sloping medium}
-
-Refrectionnumbers are $n_1=2$ and $n_2=1$:
-
-
-\begin{LTXexample}
-\begin{pspicture}[showgrid=true](-8,-6)(8,6)
-\pnode(-6,1.5){A}\pnode(6,1.5){B}\pnode(6,-1.5){C}\pnode(-6,-1.5){D}
-\rotateFrame(A)(B)(C)(D){30}\uput[90](A){A}\uput[135](B){B}\pnode(0,0){START}
-\pspolygon[fillcolor=lightgray,fillstyle=solid,linecolor=blue](A)(B)(C)(D)
-\psset{linecolor=red,linewidth=1.5pt,arrowsize=5pt,arrows=->}
-\multido{\n=50+5}{29}{%
-  \refractionRay(START)(1;\n)(A)(B){2}{1}{END}\arrowLine(START)(END){2}
-  \arrowLine(END)(END'){1}\psOutLine[length=3](END)(END'){Q}\arrowLine(END')(Q){3}}
-\end{pspicture}
-\end{LTXexample}
-
-\clearpage
-
-\part{Spherical Optic}
-
-
-\section{Refraction at a Spherical Surface}
-
-\subsection[Simple Example]{Construction for finding the position of the image point P' of a point object P formed by refraction at a sperical surface}
-
-
-\begin{LTXexample}
-\begin{pspicture*}[showgrid=true](-10,-4)(3,4)
-\rput(0,0){\lensSPH[lensType=CVG,lensHeight=12,lensWidth=10,yBottom=-6,yTop=6,xLeft=-6,xRight=6,drawing=false]}
-\psset{linecolor=red,linewidth=1.5pt,dotstyle=|}
-\pnode(-9,0){P}\psdots(P)\uput[-90](P){P}\psline(P)(xRight)\lensSPHRay(P)(-5,2){1}{9}{Q}
-\psline(P)(Q)(Q')\psdots(Q)\uput[90](Q){B}\ABinterCD(Q)(Q')(0,0)(5,0){P'}
-\psdots(Q')\uput[-90](P'){P'}\psline[linewidth=0.5pt,linecolor=black](Center')(Q)
-\psline[linewidth=0.5pt,linecolor=black](Q)(Q|0,0)\psdots(Center')\uput[-90](Center'){C}
-\end{pspicture*}
-\end{LTXexample}
-\xLcs{lensSPH}\xLcs{lensSPHRay}\xLcs{ABinterCD}
-
-
-\clearpage
-\subsection[Height of an Image]{Construction for determining the height of an image formed by refraction at a sperical surface}
-
-\begin{LTXexample}
-\begin{pspicture*}[showgrid=true](-13,-3)(3,5)
-\rput(0,0){\lensSPH[lensType=CVG,lensHeight=12,lensWidth=10,yBottom=-4,yTop=4,xLeft=-5,xRight=5,drawing=false]}
-\psset{linecolor=red,linewidth=1.5pt,dotstyle=|}
-\pnode(-12,0){P}\psdots(P)\uput[-90](P){P}\pnode(-12,4){Q}\psdots(Q)\uput[90](Q){Q}
-\psline[linecolor=blue,linewidth=3pt,arrows=->](P)(Q)\psline(P)(xRight)
-\lensSPHRay(Q)(Center'){1}{9}{S1}\lensSPHRay(Q)(-5,0){1}{9}{S2}%
-\psline(Q)(S1')\psline(Q)(S2)(S2')\ABinterCD(Q)(S1')(S2)(S2'){Q'}
-\pnode(Q'|0,0){P'}\psline[linecolor=blue,linewidth=3pt,arrows=->](P')(Q')
-\uput[90](P'){P'}\uput[-90](Q'){Q'}\psdots(Center')\uput[90](Center'){C}
-\end{pspicture*}
-\end{LTXexample}
-\xLcs{lensSPH}\xLcs{lensSPHRay}\xLcs{ABinterCD}
-
-
-\clearpage
-\section{Thin Convergent Lenses}
-
-If the two spherical surfaces are close enough we can call such a lense a 
-\textbf{thin lens}. The following figure shows the behaviour of such a lense with real rays.
-
-\begin{LTXexample}
-\psset{xunit=0.75cm}
-\begin{pspicture*}[showgrid=true](-10,-4)(10,4)
-\rput(0,0){\lensSPH[lensType=CVG,lensHeight=7,lensWidth=1.25,yBottom=-5,yTop=5,xLeft=-12,xRight=12,%
-  AB=2,OA=-9,refractA=1,refractB=2,drawing=true,rayColor=red]}
-\end{pspicture*}
-\end{LTXexample}
-\xLkeyword{refractA}\xLkeyword{refractB}\xLkeyset{lensType=CVG}\xLkeyword{AB}
-
-\clearpage
-
-\section{Thick Convergent Lenses}
-
-There is no real image possible.
-
-\begin{LTXexample}
-\begin{pspicture}(-10,-4)(10,4)
-\rput(0,0){\lensSPH[lensType=CVG,lensHeight=7,lensWidth=2,yBottom=-5,yTop=5,xLeft=-12,xRight=12,%
-  AB=2,OA=-9,refractA=1,refractB=2,drawing=true,rayColor=red]}
-\end{pspicture}
-\end{LTXexample}
-\xLkeyword{refractA}\xLkeyword{refractB}\xLkeyset{lensType=CVG}\xLkeyword{AB}
-
-
-\clearpage
-
-\section{Thin Divergent Lenses}
-If the two spherical surfaces are close enough we can call such a lense a \textbf{thin lens}. The following figure shows the behaviour of such a lense with real rays.
-
-\psset{unit=1cm}
-\begin{LTXexample}
-\begin{pspicture*}[showgrid=true](-6,-3)(6,3)
-\rput(0,0){\lensSPH[lensType=DVG,lensWidth=0.1,lensDepth=0.2,AB=1,OA=-5,drawing=true,rayColor=red]}
-\end{pspicture*}
-\end{LTXexample}
-\xLcs{lensSPH}\xLkeyset{lensType=DVG}\xLkeyword{AB}
-
-
-\clearpage
-
-\section{Thick Divergent Lenses}
-
-There is no real image possible.
-
-\begin{LTXexample}
-\begin{pspicture*}[showgrid=true](-6,-3)(6,3)
-\rput(0,0){\lensSPH[lensType=DVG,lensWidth=1,lensDepth=1,AB=1,OA=-5,drawing=true,rayColor=red]}
-\end{pspicture*}
-\end{LTXexample}
-\xLcs{lensSPH}\xLkeyset{lensType=DVG}\xLkeyword{AB}
-
-\clearpage
-\section{\nxLcs{mirrorCVG}}
-
-\begin{LTXexample}
-\begin{pspicture*}[showgrid=true](-1,-5)(8,5)
-\rput(0,0){\mirrorCVG[mirrorType=SPH,drawing=false,yBottom=-4,yTop=4,mirrorHeight=8,mirrorDepth=3]
-  \qdisk(Center){2pt}\qdisk(Focus){2pt}
-  \uput[-90](Center){Center}\uput[-90](Focus){F}\psline(O)(xRight)}
-\multido{\rA=-3.50+0.25}{5}{%
-  \mirrorCVGRay[mirrorType=SPH,linecolor=red](6,\rA)(4,\rA){E}
-  \psOutLine[linecolor=red,length=4](E')(E''){EEnd}}
-\multido{\rA=-2.25+0.25}{19}{%
-  \ABinterSPHLens(6,\rA)(4,\rA)(Center){Ptemp}
-  \reflectionRay[mirrorType=SPH](5,\rA)(Ptemp){E}
-  \psline[linecolor=red](6,\rA)(Ptemp)(E)\psOutLine[linecolor=red,length=6](Ptemp)(E){EEnd}}
-\multido{\rA=2.50+0.25}{5}{%
-  \mirrorCVGRay[mirrorType=SPH,linecolor=red](6,\rA)(4,\rA){E}
-  \psOutLine[linecolor=red,length=4](E')(E''){EEnd}}
-\end{pspicture*}
-\end{LTXexample}
-\xLcs{mirrorCVG}\xLkeyset{mirrorType=SPH}\xLcs{ABinterSPHLens}\xLcs{refractionRay}
-
-
-\clearpage
-\section{\nxLcs{mirrorDVG}}
-
-
-\begin{LTXexample}
-\begin{pspicture*}[showgrid=true](-5,-5)(8,5)
-\rput(0,0){%
-  \mirrorDVG[mirrorType=SPH,drawing=false,yBottom=-4,yTop=4,mirrorHeight=8,mirrorWidth=0.25,mirrorDepth=2.5]
-  \qdisk(Center){2pt}\qdisk(Focus){2pt}\uput[-90](Center){C}\uput[-90](Focus){F}
-  \psline(xLeft)(xRight)}
-\multido{\rA=-3.00+0.25}{25}{%
-  \ABinterSPHLens(7,\rA)(4,\rA)(Center){Ptemp}\reflectionRay[mirrorType=SPH](5,\rA)(Ptemp){E}
-  \arrowLine[linecolor=red,linewidth=1.5pt](7,\rA)(Ptemp){1}
-  \psline[linecolor=red,arrows=->,linewidth=1.5pt](Ptemp)(E)
-  \psOutLine[linecolor=red,length=6,linewidth=1.5pt,arrows=->](Ptemp)(E){EEnd}
-  \psOutLine[linecolor=red,length=3,linestyle=dashed,linewidth=0.5pt](E)(Ptemp){EEnd}}
-\end{pspicture*}
-\end{LTXexample}
-\xLcs{mirrorDVG}\xLkeyset{mirrorType=SPH}\xLcs{ABinterSPHLens}\xLcs{refractionRay}
-
-\bgroup
-\raggedright
-\nocite{*}
-\bibliographystyle{plain}
-\bibliography{pst-optic-doc}
-\egroup
-
-\printindex
-
-\end{document}
diff --git a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.bib b/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.bib
index 85aea905da3..f45040c1fe7 100644
--- a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.bib
@@ -1,81 +1,99 @@
+@STRING{tugboat	= {TUGboat} }
 @STRING{dtk	= {{D}ie {\TeX}nische {K}om{\"o}die} }
 
+@Book{companion,
+  author	= {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Vo\ss},
+  title		= {The {\LaTeX} {G}raphics {C}ompanion},
+  publisher	= {{Addison-Wesley Publishing Company}},
+  edition	= 2,
+  year		= {2007},
+  address	= {Boston, Mass.}
+}
+
+@Article{girou:01:,
+  author	= {Denis Girou},
+  title		= {Pr\'esentation de {PST}ricks},
+  journal	= {Cahier {GUT}enberg},
+  year		= 1994,
+  volume	= {16},
+  month		= apr,
+  pages		= {21-70}
+}
+
+@Article{girou:02:,
+  author	= {{Timothy Van} Zandt and Denis Girou},
+  title		= {Inside {PST}ricks},
+  journal	= TUGboat,
+  year		= 1994,
+  volume	= {15},
+  month		= sep,
+  pages		= {239-246}
+}
+
 @Book{PostScript,
   Author         = {Kollock, Nikolai G.},
-  Title          = {PostScript richtig eingesetzt: vom Konzept zum
-                   praktischen Einsatz},
+  Title          = {Post{S}cript richtig eingesetzt: vom {K}onzept zum
+                   praktischen {E}insatz},
   Publisher      = {IWT},
   Address        = {Vaterstetten},
   year           = 1989,
 }
 
-@Manual{pstricks,
-  Title          = {PSTricks - {\PS} macros for Generic TeX},
-  Author         = {Timothy Van Zandt},
-  Organization   = {},
-  Address        = {\url{http://www.tug.org/application/PSTricks}},
-  Note           = {},
-  year           = 1993,
+@ctan{multido,
+  Title          = {\texttt{multido.tex} - a loop macro, that supports fixed-point addition},
+  Author         = {{Timothy Van} Zandt},
+  url        = {/macros/generic/multido.tex},
+  year           = 1997
 }
 
-
-@Manual{pdftricks,
-  Title          = {PSTricks Support for pdf},
-  Author         = {Herbert Voss},
-  Organization   = {},
-  Address        = {\url{http://PSTricks.de/pdf/pdfoutput.phtml}},
-  Note           = {},
-  year           = 2002,
+@Book{PSTricks2,
+  author	= {Herbert Vo\ss{}},
+  title		= {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
+  edition	= {7},
+  publisher	= {DANTE -- Lehmanns},
+  year		= {2016},
+  address	= {Heidelberg/Hamburg}
 }
 
-@Manual{miwi,
-  Title          = {References for \TeX{} and Friends},
-  Author         = {Michael Wiedmann and Peter Karp},
-  Organization   = {},
-  Address        = {\url{http://www.miwie.org/tex-refs/}},
-  Note           = {},
-  year           = 2003,
+@Book{PSTricksE,
+  author	= {Herbert Vo\ss{}},
+  title		= {\texttt{PSTricks} -- {G}raphics and {P}ost{S}cript for \LaTeX},
+  edition	= {1},
+  publisher	= {UIT},
+  year		= {2011},
+  address	= {Cambridge -- UK}
 }
 
-
-@Manual{pstlens:2001,
-  Title          = {PST-lens - {\PS} macros for Generic TeX},
-  Author         = {Denis Girou and Manuel Luque},
-  Organization   = {},
-  Address        = {\url{ftp://ftp.dante.de/tex-archive/graphics/pstricks/contrib/pst-lens/}},
-  Note           = {},
-  year           = 2001,
+@Book{LTXquick,
+  author	= {Herbert Vo\ss{}},
+  title		= {{\LaTeX} quick reference},
+  edition	= {1},
+  publisher	= {UIT},
+  year		= {2012},
+  address	= {Cambridge -- UK}
 }
 
-@Manual{vue3d:2002,
-  Title          = {Vue en 3D},
-  Author         = {Manuel Luque},
-  Organization   = {},
-  Address        = {\url{http://members.aol.com/Mluque5130/vue3d16112002.zip}},
-  Note           = {},
-  year           = 2002,
+@Book{presentations,
+  author	= {Herbert Vo\ss},
+  title		= {Presentations with \LaTeX},
+  edition	= {1},
+  publisher	= {DANTE -- Lehmanns Media},
+  year		= {2012},
+  address	= {Heidelberg/Berlin}
 }
 
-@Article{dtk02.2:jackson.voss:plot-funktionen,
-  author	= {Laura E. Jackson and Herbert Vo{\ss}},
-  title		= {Die {P}lot-{F}unktionen von {\texttt{pst-plot}}},
-  journal	= dtk,
-  year		= 2002,
-  volume	= {2/02},
-  altvolume	= 2,
-  altnumber	= 14,
-  month		= jun,
-  pages		= {27--34},
-  annote	= bretter,
-  keywords	= {},
-  abstract	= { Im letzten Heft wurden die mathematischen Funktionen von
-		  \PS~im Zusammenhang mit dem {\LaTeX}-Paket
-		  \texttt{pst-plot} zum Zeichnen von Funktionen beschrieben
-		  und durch Beispiele erl{\"a}utert. In diesem Teil werden
-		  die bislang nur erw{\"a}hnten Plot-Funktionen f{\"u}r
-		  externe Daten behandelt. }
+
+@Book{tbt,
+  author	= {Victor Eijkhout},
+  title		= {\TeX\ by Topic -- {A} \TeX{}nician Reference},
+  edition	= {1},
+  publisher	= {DANTE -- lehmanns media},
+  year		= {2014},
+  address	= {Heidelberg/Berlin}
 }
 
+
+
 @Article{dtk02.1:voss:mathematischen,
   author	= {Herbert Vo{\ss}},
   title		= {Die mathematischen {F}unktionen von {P}ostscript},
@@ -85,9 +103,8 @@
   altvolume	= 1,
   altnumber	= 14,
   month		= mar,
-  pages		= {40-47},
+  pages		= {40--47},
   annote	= bretter,
-  keywords	= {},
   abstract	= { \PS, faktisch genauso alt wie {\TeX}, ist im
 		  Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es
 		  darum geht zu beurteilen, was es denn nun im eigentlichen
@@ -99,30 +116,10 @@
 		  gezeigt. }
 }
 
-
-@Book{companion,
-  author	= {Michel Goosens and Frank Mittelbach and Serbastian Rahtz and Denis Roegel and Herbert Vo\ss},
-  title		= {The {\LaTeX} {G}raphics {C}ompanion},
-  publisher	= {{Addison-Wesley Publishing Company}},
-  year		= {2007},
-  edition	= {2nd},
-  address	= {Reading, Mass.}
-}
-
-@Book{PSTricks2,
-  author	= {Herbert Vo\ss},
-  title		= {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
-  edition	= {5.},
-  publisher	= {DANTE -- Lehmanns},
-  year		= {2008},
-  address	= {Heidelberg/Hamburg}
-}
-
-@Book{voss:math,
-  author	= {Herbert Vo\ss},
-  title		= {\LaTeX\ in {M}athematik und {N}aturwissenschaften},
-  publisher	= {{Franzis-Verlag}},
-  year		= {2006},
-  address	= {Poing}
+@ctan{pstlens:2001,
+  Title          = {PST-lens - {\PS} macros for Generic TeX},
+  Author         = {Denis Girou and Manuel Luque},
+  url        = {/graphics/pstricks/contrib/pst-lens/},
+  year           = 2001,
 }
 
diff --git a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.pdf b/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.pdf
index e73c9db388f..5af7957040d 100644
--- a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.tex b/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.tex
index ea1bf3a18e6..60ed1261f68 100644
--- a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.tex
@@ -8,6 +8,9 @@
 \lstset{pos=t,wide=true,language=PSTricks,basicstyle=\footnotesize\ttfamily}
 \let\belowcaptionskip\abovecaptionskip
 %
+\usepackage[style=dtk]{biblatex}
+\addbibresource{\jobname.bib}
+
 \begin{document}
 
 \title{\texttt{pst-optic}}
@@ -16,6 +19,13 @@
 \author{Manuel Luque \\Herbert Vo\ss}
 \docauthor{Herbert Vo\ss}
 \date{\today}
+\def\bgImage{\begin{pspicture*}(-0.5,-4)(8,4)
+  \rput(0,0){\mirrorCVG[mirrorHeight=8,mirrorDepth=4,drawing=false]}
+  \multido{\rY=-4.00+0.25}{33}{%
+    \mirrorCVGRay[linewidth=0.5pt,mirrorHeight=8,
+      mirrorDepth=4](10,\rY)(1,\rY){Dummy}}
+\end{pspicture*}}
+
 \maketitle
 
 \tableofcontents
@@ -88,7 +98,7 @@ command to place the macro at any position.
 \begin{LTXexample}
 \begin{pspicture}[showgrid=true](-5,-2.2)(7,4)
 \rput(1.5,1.5){%
-  \lens[lensType=DVG,lensGlass=true,lensWidth=0.5,rayColor=red,
+  \lens[lensType=DVG,lensGlass,lensWidth=0.5,rayColor=red,
       focus=-2,AB=2,spotAi=270,spotBi=90]}
 \end{pspicture}
 \end{LTXexample}
@@ -194,6 +204,7 @@ Using \Lcs{lens}\OptArg{\Lkeyword{lensType}=\ldots} gives the in figures \ref{fi
 	Lense width in cm 		& \Lkeyword{lensWidth}  & 0.5cm\footnotemark\\
 	vertical scale (obsolet)	& \Lkeyword{lensScale}  & 1\\
 	View the lens 			& \Lkeyword{lensGlass}  & \false\\
+	show onyl the rays 		& \Lkeyword{onlyrays}  & \false\\
 	Second lens			& \Lkeyword{lensTwo}	& \false\\
 	Focus  in cm			& \Lkeyword{focus}	& 2\\
 	Distance $\mathrm{\overline{OA}}$& \Lkeyword{OA}	& -4\\
@@ -245,8 +256,8 @@ With the option \Lkeyset{lensTwo=true} it is possible to chain the different ray
 
 \begin{LTXexample}[wide=false]
 \begin{pspicture*}(-7.5,-2.75)(7.5,3)
-\rput(0,0){\lens[lensScale=0.6,XO=-4,focus=1,OA=-2,lensGlass=true, lensWidth=0.5]}
-\rput(0,0){\lens[lensScale=1.2,XO=2,focus=2,lensGlass=true,lensWidth=0.5]}
+\rput(0,0){\lens[lensScale=0.6,XO=-4,focus=1,OA=-2,lensGlass, lensWidth=0.5]}
+\rput(0,0){\lens[lensScale=1.2,XO=2,focus=2,lensGlass,lensWidth=0.5]}
 \end{pspicture*}
 \end{LTXexample}
 \vspace*{-2ex}
@@ -254,9 +265,9 @@ With the option \Lkeyset{lensTwo=true} it is possible to chain the different ray
 
 \begin{LTXexample}[wide=false]
 \begin{pspicture*}(-7.5,-2.75)(7.5,3)
-\rput(0,0){\lens[lensScale=0.6,XO=-4,focus=1,OA=-2,lensGlass=, lensWidth=0.5]}
+\rput(0,0){\lens[lensScale=0.6,XO=-4,focus=1,OA=-2,lensGlass, lensWidth=0.5]}
 \Transform
-\rput(0,0){\lens[lensScale=1.2,XO=2,focus=2,lensTwo=true,lensGlass=true,lensWidth=0.5]}
+\rput(0,0){\lens[lensScale=1.2,XO=2,focus=2,lensTwo=true,lensGlass,lensWidth=0.5]}
 \end{pspicture*}
 \end{LTXexample}
 \vspace*{-2ex}
@@ -265,12 +276,12 @@ With the option \Lkeyset{lensTwo=true} it is possible to chain the different ray
 \begin{LTXexample}[wide=false]
 \begin{pspicture*}(-7.5,-2.75)(7.5,3)
 \rput(0,0){\lens[lensScale=0.6,XO=-4,nameF=F_1,nameA=A_1,nameB=B_1,
-  nameFi=F'_1,nameAi={ },nameBi={},nameO=O_1,focus=1,OA=-2,lensGlass=true, lensWidth=0.5]}
+  nameFi=F'_1,nameAi={ },nameBi={},nameO=O_1,focus=1,OA=-2,lensGlass, lensWidth=0.5]}
 \pspolygon[style=rayuresJaunes,linestyle=none](B)(I)(B')(I')(B)
 \Transform
 \rput(0,0){\lens[lensScale=1.2,XO=2,focus=2,nameA=A'_1,spotA=90,nameB=B'_1,spotB=270,
   nameO=O_2,nameAi=A'_2,spotAi=270,nameBi=B'_2,spotBi=90,nameF=F_2,nameFi=F'_2,
-  lensTwo=true,lensGlass=true,lensWidth=0.5]}
+  lensTwo=true,lensGlass,lensWidth=0.5]}
 \pspolygon[style=rayuresJaunes,linestyle=none](B)(I)(B')(I')(B)
 \end{pspicture*}
 \end{LTXexample}
@@ -1148,7 +1159,7 @@ the name of the calculated line end.
   \psOutLine[linecolor=red,length=9](0,\nCountA)(FF){P2}}
 \psline[linecolor=blue](A)(FF)
 \psOutLine[linecolor=blue,length=5](A)(FF){END1}
-\rput(0,0){\lens[yBottom=-3.5,yTop=3.5,lensGlass=true,lensHeight=6.5,drawing=false,
+\rput(0,0){\lens[yBottom=-3.5,yTop=3.5,lensGlass,lensHeight=6.5,drawing=false,
     spotFi=315,lensWidth=0.5]
   \psline[linewidth=1pt](xLeft)(xRight)
   \psline[length=2,linewidth=2pt,arrows=->](F')(FF)}
@@ -1307,8 +1318,7 @@ different arrows. By default the arrows are placed symetrically. This can be mov
 \bgroup
 \raggedright
 \nocite{*}
-\bibliographystyle{plain}
-\bibliography{pst-optic-doc}
+\printbibliography
 \egroup
 
 \printindex
diff --git a/Master/texmf-dist/source/generic/pst-optic/Makefile b/Master/texmf-dist/source/generic/pst-optic/Makefile
deleted file mode 100644
index ead807fb781..00000000000
--- a/Master/texmf-dist/source/generic/pst-optic/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-# `Makefile' for `pst-circ.pdf', hv, 2007/03/17
-
-.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
-
-PACKAGE = pst-optic
-
-MAIN = $(PACKAGE)-doc
-
-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 tds
-doc: $(MAIN).pdf
-
-$(MAIN).pdf : $(MAIN).ps
-	GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $<
-
-$(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 -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \
-	  $(basename $<).glo
-	makeindex -t $(basename $<).ilg -o $(basename $<).ind \
-	  $(basename $<).idx
-	bibtex $(basename $<)
-	$(LATEX) $<
-	$(LATEX) $<
-
-clean : 
-	$(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .Roessler .bbl )
-	$(RM) $(addprefix $(MAIN), .dvi .ps)
-
-veryclean : clean
-	$(RM) $(addprefix $(MAIN), .pdf .bbl .blg)
-
-arch :
-	zip $(ARCHNAME).zip $(ARCHFILES)
-
-tds:
-	cp -u Changes     $(TDS)/doc/generic/$(PACKAGE)/
-	cp -u README      $(TDS)/doc/generic/$(PACKAGE)/
-	cp -u $(MAIN).pdf $(TDS)/doc/generic/$(PACKAGE)/
-#
-	cp -u Changes        $(TDS)/tex/latex/$(PACKAGE)/
-	cp -u $(PACKAGE).sty $(TDS)/tex/latex/$(PACKAGE)/
-#
-	cp -u Changes        $(TDS)/tex/generic/$(PACKAGE)/
-	cp -u $(PACKAGE).tex $(TDS)/tex/generic/$(PACKAGE)/
-#
-#	cp -u Changes        $(TDS)/dvips/$(PACKAGE)/
-#	cp -u $(PACKAGE).pro $(TDS)/dvips/$(PACKAGE)/
-#
-	cp -u 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/tex/generic/pst-optic/pst-optic.tex b/Master/texmf-dist/tex/generic/pst-optic/pst-optic.tex
index e5dd1b3bfd8..c9906a52b4c 100644
--- a/Master/texmf-dist/tex/generic/pst-optic/pst-optic.tex
+++ b/Master/texmf-dist/tex/generic/pst-optic/pst-optic.tex
@@ -30,8 +30,8 @@
 \ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi
 \ifx\PSTXKeyLoaded\endinput\else   \input pst-xkey\fi
 %
-\def\fileversion{1.01}
-\def\filedate{2010/07/23}
+\def\fileversion{1.02}
+\def\filedate{2016/07/10}
 \message{`PST-Optic' v\fileversion, \filedate\space (Manuel Luque and Herbert Voss)}
 %
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -81,10 +81,11 @@
 %
 \define@boolkey[psset]{pst-optic}[Pst@]{lensTwo}[false]{} % is a second lens present?
 \define@boolkey[psset]{pst-optic}[Pst@]{lensGlass}[true]{}% draw a _real_ lens? 
+\define@boolkey[psset]{pst-optic}[Pst@]{onlyrays}[true]{}% draw only the rays? 
 \define@boolkey[psset]{pst-optic}[Pst@]{drawing}[true]{}  % draw the nodes and rays?
 \define@boolkey[psset]{pst-optic}[Pst@]{rightRay}[false]{}% a ray on the right side?
 %
-\psset[pst-optic]{lensGlass,drawing,lensTwo,rightRay}
+\psset[pst-optic]{lensGlass,drawing,lensTwo,rightRay,onlyrays=false}
 %
 % ------- the global definitions for the pspicture frame ------
 %
@@ -367,7 +368,7 @@
     	/YA \pst@tempA exch pop \pst@number\psyunit div def
 	/XA \pst@tempA pop \pst@number\psxunit div def
 	YA 0 eq XA 0 eq and {0 0}{
-	    /r XA dup mul YA dup mul add sqrt def
+	    /r XA dup mul YA dup mul add Sqrt def
 	    /AlphaOld YA XA atan def
 	    /AlphaNew AlphaOld \pst@optic@angle\space add def
 	    r AlphaNew cos mul r AlphaNew sin mul
@@ -447,13 +448,13 @@
 		\pscustom{%
               \parametricplot{\psk@optic@lensHeight}{-\psk@optic@lensHeight}{%
                   /arg t radius 2.0 mul div def 
-                  arg 1 arg dup mul sub sqrt atan 
+                  arg 1 arg dup mul sub Sqrt atan 
                   cos 1 sub radius mul neg Width2 sub
                   t 2.0 div
 		   }
               \parametricplot{-\psk@optic@lensHeight}{\psk@optic@lensHeight}{%
                   /arg t radius 2.0 mul div def 
-                  arg 1 arg dup mul sub sqrt atan 
+                  arg 1 arg dup mul sub Sqrt atan 
                   cos 1 sub radius mul neg Width2 sub neg
                   t 2.0 div
 		   }
@@ -466,7 +467,7 @@
 	        % (-d-w/2,h/2)->(-d-w/2,-h/2)
 	        \parametricplot{\psk@optic@lensHeight}{-\psk@optic@lensHeight}{%
                   /arg t 2.0 div radius div def 
-                  arg 1 arg dup mul sub sqrt atan cos 1 sub radius mul Width2 sub 
+                  arg 1 arg dup mul sub Sqrt atan cos 1 sub radius mul Width2 sub 
                   t 2.0 div
 	        }
 	        % (-d-w/2,-h/2)(d+w/2,-h/2)
@@ -474,7 +475,7 @@
 	        % (d+w/2,-h/2)->(d+w/2,h/2)
 	        \parametricplot{-\psk@optic@lensHeight}{\psk@optic@lensHeight}{%
                   /arg t 2.0 div radius div def 
-                  1 arg 1 arg dup mul sub sqrt atan cos sub radius mul Width2 add 
+                  1 arg 1 arg dup mul sub Sqrt atan cos sub radius mul Width2 add 
                   t 2.0 div
 	        }
 	        \fill
@@ -616,11 +617,11 @@
       /dX XB XA sub def
       dX abs 0.01 lt {
 % a horizontal line 
-        /Y YM radius dup mul XA dup mul sub sqrt YM 0 gt {sub}{add}ifelse def
-        /YSecond YM radius dup mul XA dup mul sub sqrt YM 0 gt {add}{sub}ifelse def
+        /Y YM radius dup mul XA dup mul sub Sqrt YM 0 gt {sub}{add}ifelse def
+        /YSecond YM radius dup mul XA dup mul sub Sqrt YM 0 gt {add}{sub}ifelse def
         /X XA def
         /XSecond XA def
-        /mT XA radius dup mul XA dup mul sub sqrt div YM 0 lt {neg}if def
+        /mT XA radius dup mul XA dup mul sub Sqrt div YM 0 lt {neg}if def
         Y X neg
       }{
         /dY YB YA sub def
@@ -629,12 +630,12 @@
         /klammer YM m XA mul add YA sub def
         /p2neg klammer m mul m21 div def
         /q klammer dup mul radius dup mul sub m21 div def
-        /root p2neg dup mul q sub sqrt def
+        /root p2neg dup mul q sub Sqrt def
         /X p2neg root YM m mul 0 gt {sub}{add}ifelse def
         /XSecond p2neg root YM m mul 0 gt {add}{sub}ifelse def
         /Y m X XA sub mul YA add def
         /YSecond m XSecond XA sub mul YA add def
-        /mT X radius dup mul X dup mul sub sqrt div YM 0 lt {neg}if def
+        /mT X radius dup mul X dup mul sub Sqrt div YM 0 lt {neg}if def
         Y X neg
       } ifelse){#4}
   \else% DVG
@@ -649,10 +650,10 @@
       /dX XB XA sub def
       dX abs 0.01 lt {
 % a horizontal line 
-        /Y YM radius dup mul XA dup mul sub sqrt YM 0 gt {sub}{add}ifelse def
-        /YSecond YM radius dup mul XA dup mul sub sqrt YM 0 gt {add}{sub}ifelse def
+        /Y YM radius dup mul XA dup mul sub Sqrt YM 0 gt {sub}{add}ifelse def
+        /YSecond YM radius dup mul XA dup mul sub Sqrt YM 0 gt {add}{sub}ifelse def
         /X XA def
-        /mT XA radius dup mul XA dup mul sub sqrt div YM 0 lt {neg}if def
+        /mT XA radius dup mul XA dup mul sub Sqrt div YM 0 lt {neg}if def
         /XSecond XA def
         Y X neg
       }{
@@ -662,12 +663,12 @@
         /klammer YM m XA mul add YA sub def
         /p2neg klammer m mul m21 div def
         /q klammer dup mul radius dup mul sub m21 div def
-        /root p2neg dup mul q sub sqrt def
+        /root p2neg dup mul q sub Sqrt def
         /X p2neg root YM m mul 0 gt {sub}{add}ifelse def
         /XSecond p2neg root YM m mul 0 gt {add}{sub}ifelse def
         /Y m X XA sub mul YA add def
         /YSecond m XSecond XA sub mul YA add def
-        /mT X radius dup mul X dup mul sub sqrt div YM 0 lt {neg}if def
+        /mT X radius dup mul X dup mul sub Sqrt div YM 0 lt {neg}if def
         Y X neg
       } ifelse){#4}
   \fi
@@ -793,8 +794,9 @@
       \pnode(! \psk@optic@xRight\space A'B' YO add){I1}%
       \pnode(! \psk@optic@xRight\space neg A'B' YO add){I2}%
     \fi%
+    \ifPst@onlyrays\else
     \begingroup%
-      \ifPst@lensGlass%
+      \ifPst@lensGlass
         \rput(! XO YO){%
 	  \ifx\psk@optic@lensType\lensTypeCVG\lensCVG%
 	  \else\ifx\psk@optic@lensType\lensTypePCVG\lensCVG
@@ -811,14 +813,15 @@
           (! XO 0.5 \psk@optic@lensHeight\space mul 
              \psk@optic@lensScale\space mul YO add)%
 	 \fi%
-    \endgroup%
+    \endgroup
+    \fi
   \ifPst@drawing
 % axe optique
     \psline[style=opticalAxis](! \psk@optic@xLeft\space YO)(! \psk@optic@xRight\space YO)
     \ifx\psk@optic@lensType\lensTypeDVG\pst@drawDVGRays\else
       \ifx\psk@optic@lensType\lensTypePDVG\pst@drawDVGRays\else
         \pst@drawCVGRays\fi\fi
-  \fi%
+  \fi
   \end{pspicture*}%
 }\ignorespaces}
 %
@@ -1005,7 +1008,7 @@
 	  XB XA sub abs 0.01 lt {A XA dup mul mul XA neg}{
 	    /m YB YA sub XB XA sub div def
 	    /m2a m A div 2 div def
-	    /Root m2a dup mul m XA mul YA sub A div sub sqrt def
+	    /Root m2a dup mul m XA mul YA sub A div sub Sqrt def
 	    /Xp m2a Root add XA sub def
 	    /Xn m2a Root sub XA sub def
 	    /YSp m Xp mul YA add def
@@ -1055,7 +1058,7 @@
 		    /NoMoreReflection false def 
 % pq Formel anwenden
 		    /m2a m A div 2 div def
-		    /Root m2a dup mul m XA mul YA sub A div sub sqrt def
+		    /Root m2a dup mul m XA mul YA sub A div sub Sqrt def
 		    /X1 m2a Root add def
 		    /X2 m2a Root sub def
 % be sure, that we get the right point
@@ -1173,7 +1176,7 @@
       \else
         \parametricplot{\psk@optic@mirrorHeight}{-\psk@optic@mirrorHeight}{%
             /radD radius \psk@optic@mirrorWidth\space add def
-            radius \psk@optic@mirrorWidth\space sub radD dup mul t 2 div dup mul sub sqrt sub t 2 div }
+            radius \psk@optic@mirrorWidth\space sub radD dup mul t 2 div dup mul sub Sqrt sub t 2 div }
       \fi
 	% (d-w,-h/2)(d,-h/2)
       \psline(!%
@@ -1187,7 +1190,7 @@
 	    t 2 exp 4 div mul t 2 div }
       \else
 	  \parametricplot{-\psk@optic@mirrorHeight}{\psk@optic@mirrorHeight}{
-            radius dup dup mul t 2 div dup mul sub sqrt sub t 2 div }
+            radius dup dup mul t 2 div dup mul sub Sqrt sub t 2 div }
       \fi
       \fill
     }%
@@ -1278,7 +1281,7 @@
       	    Depth Height dup mul div t 2 exp 4 div mul neg t 2 div }
 	\else
 	  \parametricplot{\psk@optic@mirrorHeight}{-\psk@optic@mirrorHeight}{%
-	    radius dup mul t 2 div dup mul sub sqrt radius sub t 2 div }
+	    radius dup mul t 2 div dup mul sub Sqrt radius sub t 2 div }
 	\fi
 	% (d-w,-h/2)(d,-h/2)
 	\psline(! Depth Width add neg Height neg)(! Depth neg Height neg)%
@@ -1288,7 +1291,7 @@
 	    Depth Height dup mul div t 2 exp 4 div mul neg Width sub t 2 div }
 	\else
  	  \parametricplot{-\psk@optic@mirrorHeight}{\psk@optic@mirrorHeight}{%
-	    radius Width sub dup mul t 2 div dup mul sub sqrt radius sub t 2 div }
+	    radius Width sub dup mul t 2 div dup mul sub Sqrt radius sub t 2 div }
 	\fi
         \fill%
   }
@@ -1356,7 +1359,7 @@
 		/Xmax \psk@optic@mirrorHeight\space 2 div def
 		/m YB YA sub XB XA sub div def
 		/m2a m A div 2 div def
-		/Root m2a dup mul m XA mul YA sub A div sub sqrt def
+		/Root m2a dup mul m XA mul YA sub A div sub Sqrt def
 		/X1 m2a Root add def
 		/X2 m2a Root sub def
 		/X XB X1 sub abs XB X2 sub abs lt 
@@ -1565,7 +1568,7 @@
     def
     /xA' 2 xH mul XA sub def
     /yA' 2 yH mul YA sub def
-    /D12 Dx Dx mul Dy Dy mul add sqrt def
+    /D12 Dx Dx mul Dy Dy mul add Sqrt def
     xA' yA' moveto
     xH yH rlineto
     xA' yA'){#4}
@@ -1660,7 +1663,7 @@
 % sin(Beta)>1 is a total reflection instead of a refraction
 	/sinBeta \pst@optic@cIn\space \pst@optic@cOut\space div Alpha sin mul def
 	sinBeta abs 1 le{
-		/Root 1 sinBeta dup mul sub sqrt def
+		/Root 1 sinBeta dup mul sub Sqrt def
 		/Beta sinBeta Root atan def
 	}{
 		/Beta 180 Alpha sub def
@@ -1700,7 +1703,7 @@
         /dX1 XA XP sub def
 	   /signum YP 0 lt {-1}{1}ifelse def
 % the gradient of the point. radius must be defined
-        /root radius dup mul XP dup mul sub sqrt def
+        /root radius dup mul XP dup mul sub Sqrt def
         /Gamma XP signum mul root atan 180 sub def
 % the angle of the incoming ray
         /AlphaStrich dY1 dX1 atan 180 sub def
@@ -1773,7 +1776,7 @@
   % Les datas
   % Sellmeier's
   % glass sf15 : verre flint
-  % n=sqrt(1+B1*L^2/(l^2-C1)+B2*L^2/(l^2-C2)+B3*L^2/(l^2-C3))
+  % n=Sqrt(1+B1*L^2/(l^2-C1)+B2*L^2/(l^2-C2)+B3*L^2/(l^2-C3))
   %  Cauchy :  /N {1.606 6545 1 mul lambda dup mul div add} bind def
     /L2 {lambda 1e-3 mul dup mul} bind def % en micromètres
     /N {1
@@ -1783,7 +1786,7 @@
          add
          1.038164 L2 mul L2 116.416755 sub div
          add
-         sqrt} bind def
+         Sqrt} bind def
     /alpha1 AnglePlan1 AnglePrism add def
     /sinB1 alpha1 sin N div def
     /B1 sinB1 arcsin def
@@ -1943,14 +1946,14 @@
         % Les datas
         % Sellmeier's
         % glass sf15 : verre flint lourd
-        % n=sqrt(1+B1*L^2/(l^2-C1)+B2*L^2/(l^2-C2)+B3*L^2/(l^2-C3))
+        % n=Sqrt(1+B1*L^2/(l^2-C1)+B2*L^2/(l^2-C2)+B3*L^2/(l^2-C3))
         % Cauchy : /N {1.606 6545 1 mul lambda dup mul div add} bind def
         /L2 {lambda 1e-3 mul dup mul} bind def
         /N {1
           1.539259 L2 mul L2 0.011931 sub div add
           0.247621 L2 mul L2 0.055608 sub div add
           1.038164 L2 mul L2 116.416755 sub div add
-          sqrt} bind def
+          Sqrt} bind def
         /alpha1 AnglePlan1 AnglePrism add def
         /sinB1 alpha1 sin N div def
         /B1 sinB1 asin def
@@ -1997,7 +2000,7 @@
 \def\resetOpticOptions{%		hv 2006-07-20
   \newpsstyle{opticalAxis}{linewidth=0.5pt,linecolor=black,linestyle=solid}
   \psset[pst-optic]{%
-  lensGlass=false,drawing=true,,lensTwo,rightRay,
+  lensGlass=false,drawing=true,,lensTwo,rightRay,onlyrays=false,
   xLeft=-7.5,xRight=7.5,yBottom=-3.0,yTop=3.0,
   lensType=CVG,lensColor=lightgray,lensWidth=0.5,lensDepth=1,
   lensHeight=5,lensScale=1,lensArrowSize=0.2,lensArrowInset=0.5,