pst-optexp (2nov14)

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

10 files changed, 846 insertions, 101 deletions

diff --git a/Master/texmf-dist/doc/latex/pst-optexp/Changes b/Master/texmf-dist/doc/latex/pst-optexp/Changes
index 991d4ace6f7..de5c10dbe8e 100644
--- a/Master/texmf-dist/doc/latex/pst-optexp/Changes
+++ b/Master/texmf-dist/doc/latex/pst-optexp/Changes
@@ -1,3 +1,8 @@
+5.0  2014-10-30
+       * Added support for arbitrary interface shapes (experimental,
+           requires the pst-intersect package and pstricks version 2.53.
+       * Added component \parabolicmirror.
+
 4.10 2014-06-04
        * Added value firstcomp to parameter beamalign.
        * Modified \optsource to handle also the beam alignment.
diff --git a/Master/texmf-dist/doc/latex/pst-optexp/Makefile b/Master/texmf-dist/doc/latex/pst-optexp/Makefile
index aac418da1b4..cec090e1b87 100644
--- a/Master/texmf-dist/doc/latex/pst-optexp/Makefile
+++ b/Master/texmf-dist/doc/latex/pst-optexp/Makefile
@@ -5,7 +5,6 @@ PACKAGE = pst-optexp
 LATEX = latex
 
 ARCHNAME = $(PACKAGE)-$(shell date +"%y%m%d")
-ARCHNAME_TDS = $(PACKAGE).tds
 
 ARCHFILES = Makefile README Changes \
 	    $(addprefix $(PACKAGE), -quickref.pdf .dtx .ins .pdf -DE.pdf)
@@ -21,9 +20,11 @@ doc-DE: $(PACKAGE)-DE.pdf
 doc-code: $(PACKAGE)-code.pdf
 quickref: $(PACKAGE)-quickref.pdf
 
-dist : $(ARCHFILES)
-	mkdir -p pst-optexp
+dist: $(ARCHFILES)
+	mkdir -p $(PACKAGE)
 	cp $(ARCHFILES) $(PACKAGE)
+	zip -r $(PACKAGE).zip $(PACKAGE)
+	$(RM) -rf $(PACKAGE)/
 
 $(PACKAGE).dvi: L = english
 $(PACKAGE)-DE.dvi: L = ngerman
@@ -76,30 +77,6 @@ $(PACKAGE).sty $(PACKAGE).pro $(PACKAGE).ist: $(PACKAGE).ins $(PACKAGE).dtx
 Changes: Changes.py $(PACKAGE).dtx
 	python $<
 
-arch : Changes
-	zip $(ARCHNAME).zip $(ARCHFILES)
-
-arch-tds : dist
-	$(RM) $(ARCHNAME_TDS).zip
-	mkdir -p tds/tex/latex/$(PACKAGE)
-	mkdir -p tds/doc/latex/$(PACKAGE)
-	mkdir -p tds/source/latex/$(PACKAGE)
-	mkdir -p tds/dvips/$(PACKAGE)
-	cp $(PACKAGE).sty tds/tex/latex/$(PACKAGE)/
-	cp $(PACKAGE).pro tds/dvips/$(PACKAGE)/
-	cp Changes $(PACKAGE).pdf $(PACKAGE)-DE.pdf \
-          README $(PACKAGE)-quickref.pdf \
-	  tds/doc/latex/$(PACKAGE)/
-	cp $(PACKAGE).dtx $(PACKAGE).ins Makefile \
-	  tds/source/latex/$(PACKAGE)/
-	cd tds ; zip -r ../$(ARCHNAME_TDS).zip tex doc source dvips
-	cd ..
-	rm -rf tds
-
-ctan : dist arch-tds
-	zip -r $(PACKAGE).zip $(ARCHNAME_TDS).zip $(PACKAGE)
-	$(RM) -rf $(PACKAGE)/
-
 clean :
 	$(RM) $(foreach prefix, $(PACKAGE) $(PACKAGE)-code $(PACKAGE)-DE $(PACKAGE)-quickref, \
 	        $(addprefix $(prefix), .dvi .ps .log .aux .bbl .blg .out .tmp \
diff --git a/Master/texmf-dist/doc/latex/pst-optexp/pst-optexp-DE.pdf b/Master/texmf-dist/doc/latex/pst-optexp/pst-optexp-DE.pdf
index 24944427894..8a77d0849b1 100644
--- a/Master/texmf-dist/doc/latex/pst-optexp/pst-optexp-DE.pdf
+++ b/Master/texmf-dist/doc/latex/pst-optexp/pst-optexp-DE.pdf
diff --git a/Master/texmf-dist/doc/latex/pst-optexp/pst-optexp-quickref.pdf b/Master/texmf-dist/doc/latex/pst-optexp/pst-optexp-quickref.pdf
index 52fe47baf23..44424b372e3 100644
--- a/Master/texmf-dist/doc/latex/pst-optexp/pst-optexp-quickref.pdf
+++ b/Master/texmf-dist/doc/latex/pst-optexp/pst-optexp-quickref.pdf
diff --git a/Master/texmf-dist/doc/latex/pst-optexp/pst-optexp.pdf b/Master/texmf-dist/doc/latex/pst-optexp/pst-optexp.pdf
index a809b6198d7..890605105e4 100644
--- a/Master/texmf-dist/doc/latex/pst-optexp/pst-optexp.pdf
+++ b/Master/texmf-dist/doc/latex/pst-optexp/pst-optexp.pdf
diff --git a/Master/texmf-dist/dvips/pst-optexp/pst-optexp.pro b/Master/texmf-dist/dvips/pst-optexp/pst-optexp.pro
index d9e46618c82..e8bfcdb9054 100644
--- a/Master/texmf-dist/dvips/pst-optexp/pst-optexp.pro
+++ b/Master/texmf-dist/dvips/pst-optexp/pst-optexp.pro
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: pst-optexp
-%% Version: 4.10 (2014/06/04)
+%% Version: 5.0 (2014/10/30)
 %% 
 %% Copyright (C) 2007-2014 by Christoph Bersch <usenet@bersch.net>
 %% 
@@ -245,6 +245,11 @@ tx@OptexpDict begin
   3 1 roll mul 1.00001 mul /NAup ED
   mul 1.00001 mul /NAlow ED
 } bind def
+/PathIfc {
+  pop pop /NAup 0 def /NAlow 0 def
+  3 1 roll /Path ED
+  exec 3 -1 roll exec /Y ED /X ED
+} bind def
 /NewCompIfc {
   /scl ED
   /next ED
@@ -893,7 +898,7 @@ tx@OptexpDict begin
     PrevR type /realtype eq {
       /CurrCenter load /PrevCenter ED
     } if
-    IfcNum CompName isCurved {
+    IfcNum CompName isCurvedIfc {
       IfcNum CompName LoadIfc
       tx@Dict begin Pyth end /CurrR ED
       ToVec /CurrCenter ED
@@ -905,7 +910,7 @@ tx@OptexpDict begin
       draw {
         /DrawnSegm DrawnSegm 1 add def
         PrevUp moveto CurrUp lineto
-        IfcNum CompName isCurved {
+        IfcNum CompName isCurvedIfc {
           CurrCenter CurrUp CurrLow
           4 copy 3 -1 roll eq 3 1 roll eq and {
             6 {pop} repeat
@@ -1078,16 +1083,26 @@ tx@OptexpDict begin
     pop pop false
   } ifelse
 } bind def
-/isCurved {
+/isCurvedIfc {
   cvn load begin
     IfcName load /RX known
   end
 } bind def
+/isPathIfc {
+  cvn load begin
+    IfcName load /Path known
+  end
+} bind def
 /HandleInterface {
   (HandleInterface) DebugBegin
   /Yin ED /Xin ED /Y0 ED /X0 ED /n2 ED /mode ED
-  2 copy 2 copy LoadIfc
-  6 -2 roll isCurved { CurvedInterface }{ PlainInterface } ifelse
+  2 copy 2 copy LoadIfc % IfcNum name IfcNum name path
+  dup type /arraytype eq { % is an path interface
+    3 1 roll pop pop PathInterface % IfcNum name X0' Y0' Xout Yout status
+  } {
+    6 -2 roll
+    isCurvedIfc { CurvedInterface }{ PlainInterface } ifelse
+  } ifelse
   dup missed eq not useNA connectifc not and and {
     7 3 roll 2 copy 9 2 roll
     4 2 roll 2 copy
@@ -1095,7 +1110,7 @@ tx@OptexpDict begin
     cvn load begin IfcName load dup /NAlow get exch /NAup get end
     2 copy lt {
       4 2 roll 2 copy LoadIfc NormalizeVec
-      6 -2 roll isCurved {
+      6 -2 roll isCurvedIfc {
         neg exch
       } if
       %% ... X0' Y0' NAlow NAup X Y dXp dYp
@@ -1118,10 +1133,14 @@ tx@OptexpDict begin
   (LoadIfc) DebugBegin
   cvn load begin
     IfcName load begin
-      X Y
-      CompMtrx transform CM itransform
-      currentdict /RX known { RX RY }{ DX DY } ifelse
-      CompMtrx dtransform CM idtransform
+      currentdict /Path known {
+        Path TransformPath
+      } {
+        X Y
+        CompMtrx transform CM itransform
+        currentdict /RX known { RX RY }{ DX DY } ifelse
+        CompMtrx dtransform CM idtransform
+      } ifelse
     end
   end
   DebugEnd
@@ -1384,7 +1403,10 @@ tx@OptexpDict begin
   dup 4 -1 roll mul 3 1 roll mul
 } bind def
 /ToVec {
-    [ 3 1 roll ] cvx
+    ToPnt cvx
+} bind def
+/ToPnt {
+    [ 3 1 roll ]
 } bind def
 /AngToVec {
     dup cos exch sin ToVec
@@ -1523,6 +1545,38 @@ tx@OptexpDict begin
   } ifelse
   DebugEnd
 } bind def
+/PathInterface {
+  (PathInterface) DebugBegin
+  [ [X0 Y0] [X0 Xin add Y0 Yin add] ] exch
+  tx@IntersectDict begin IntersectLinePath end % [pathseg] t [isect]
+  dup length 0 eq {
+    pop pop pop 0 0 missed
+  } {
+    aload pop
+    Xin Yin Xin Yin
+    8 -2 roll exch % I.x I.y Xin Yin Xin Yin t [pathseg]
+    dup length 2 eq { % a line
+      exch pop
+      aload pop aload pop 3 -1 roll aload pop VecSub % I.x I.y Xin Yin Xin Yin dXp dYp
+    } {
+      exch dup cvi sub DeriveCurve
+    } ifelse
+    % the following part is copied from /PlainInterface
+    NormalVec
+    mode trans eq {
+      n1 n2 RefractVec
+      2 copy 0 eq exch 0 eq and { tir } { ok } ifelse
+    } {
+      ReflectVec ok
+    } ifelse
+    /n1 n2 def
+    5 -2 roll 2 copy 7 2 roll X0 Y0 @ABVect Xin Yin DotProd 0 lt
+    PN 1 gt and {
+      pop missed
+    } if
+  } ifelse
+  DebugEnd
+} bind def
 /TransformRefIndex {
   dup bgRefIndex eq { pop 1 } if
 } bind def
@@ -1772,6 +1826,94 @@ tx@OptexpDict begin
   } for
   pop
 } def
+/TransformPath {
+  mark [ 3 -1 roll aload pop
+  counttomark 1 add counttomark 1 add exch 1 roll
+  {
+    counttomark 1 eq { cleartomark exit } if
+    dup /curvetype eq {
+      7 1 roll
+      3 { CompMtrx transform CM itransform 7 2 roll } repeat
+      counttomark -1 roll dup counttomark 1 roll
+      7 roll
+    } {
+      3 1 roll CompMtrx transform CM itransform 3 -1 roll
+      counttomark -1 roll dup counttomark 1 roll
+      3 roll
+    } ifelse
+  } loop
+  ]
+} bind def
+/DeriveCurve {
+  (DeriveCurve) DebugBegin
+  exch dup length 4 eq not {
+    pop pop 0 0
+  } {
+    aload pop 5 -1 roll
+    dup 1 exch sub dup mul -3 mul exch % P0 P1 P2 P3 C0=(-3(1-t)^2) t
+    dup dup -4 mul 1 add exch dup mul 3 mul add 3 mul exch % P0 P1 P2 P3 C0 C1=(3(3t^2-4t+1)) t
+    dup dup 2 mul exch dup mul -3 mul add 3 mul exch % P0 P1 P2 P3 C0 C1 C2=(3(2t-3t^2)) t
+    dup mul 3 mul % P0 P1 P2 P3 C0 C1 C2 C3=3t^2
+    8 copy
+    0 6 -1 3 { -1 roll 0 get 3 -1 roll mul add } for
+    9 1 roll
+    0 6 -1 3 { -1 roll 1 get 3 -1 roll mul add } for
+  } ifelse
+  DebugEnd
+} bind def
+/GetBezierDeriv {  % t on stack
+  10 dict begin % hold all local
+  /t ED
+  /t1 1 t sub def % t1=1-t
+  dup length /BezierOrder exch def
+  /Points exch def
+  /Coeff tx@FuncDict begin Pascal end BezierOrder get def % get the coefficients
+    0 0 % initial values for x y
+    BezierOrder -1 0 { % BezierOrder,...,2,1,0
+      /I ED % I=BezierOrder,...,2,1,0
+      /J BezierOrder I sub def % J=0,1,2,...,BezierOrder
+      I 0 eq {
+        0
+      }{
+        I t I 1 sub exp mul t1 J exp mul        %  i*t^{i-1}*(1-t)^{n-i}
+      } ifelse
+      J 0 eq {
+        0
+      } {
+        J t I exp mul t1 J 1 sub exp mul    % -(n-i)t^i(1-t)^{n-i-1}
+      } ifelse
+      sub Coeff J get mul
+      Points I get aload pop 3 -1 roll VecScale VecAdd
+    } for % x y on stack
+  end
+} bind def
+tx@IntersectDict begin
+/IntersectLinePath {
+  3 dict begin
+    PreparePath
+    2 copy ElongateLine exch 3 -1 roll pop
+    /isect [] def
+    /t -1 def
+    /n -1 def
+    {
+      /n n 1 add def
+      2 copy IntersectBeziers
+      dup 5 1 roll LoadIntersectionPoints
+      dup length 0 gt {
+        /isect exch def
+        0 get dup type /arraytype eq {
+          aload pop add 0.5 mul
+        } if n add /t exch def
+        exch pop
+        exit
+      } {
+        pop pop pop
+      } ifelse
+    } forall
+    t isect
+  end
+} bind def
+end
 /mymax {
   2 copy lt { exch } if pop
 } bind def
diff --git a/Master/texmf-dist/makeindex/pst-optexp/pst-optexp.ist b/Master/texmf-dist/makeindex/pst-optexp/pst-optexp.ist
index 457b69df1e9..8ed1fee0fbb 100644
--- a/Master/texmf-dist/makeindex/pst-optexp/pst-optexp.ist
+++ b/Master/texmf-dist/makeindex/pst-optexp/pst-optexp.ist
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: pst-optexp
-%% Version: 4.10 (2014/06/04)
+%% Version: 5.0 (2014/10/30)
 %% 
 %% Copyright (C) 2007-2014 by Christoph Bersch <usenet@bersch.net>
 %% 
diff --git a/Master/texmf-dist/source/latex/pst-optexp/pst-optexp.dtx b/Master/texmf-dist/source/latex/pst-optexp/pst-optexp.dtx
index 7e3c035baa5..a7a338d24a2 100644
--- a/Master/texmf-dist/source/latex/pst-optexp/pst-optexp.dtx
+++ b/Master/texmf-dist/source/latex/pst-optexp/pst-optexp.dtx
@@ -18,7 +18,7 @@
 %<stylefile>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<stylefile>\ProvidesPackage{pst-optexp}
 %<*stylefile>
-    [2014/06/04 v4.10 Optical experimental setups with PSTricks]
+    [2014/10/30 v5.0 Optical experimental setups with PSTricks]
 %</stylefile>
 %
 %<*driver>
@@ -69,6 +69,7 @@
 \colorlet{DGreen}{green!90!black}
 \usepackage{pst-tree}
 \usepackage{showexpl}
+\usepackage{scrhack}
 \makeatletter\renewcommand*\SX@Info{}\makeatother
 \usepackage{etoolbox}
 \undef{\cs}\undef{\cmd}
@@ -813,8 +814,10 @@
 % \ifGERMAN
 %   \section{Anforderungen}
 %   \LPack{pst-optexp} benötigt \LaTeX{} und aktuelle Versionen der
-%   Pakete \LPack{pst-node}, \LPack{pstricks-add}, \LPack{multido},
-%   \LPack{pst-eucl} und \LPack{environ}.
+%   Pakete \LPack{pstricks} ($\geq 2.53$), \LPack{pst-plot} ($\geq
+%   1.6.1$), \LPack{pst-node}, \LPack{pstricks-add}, \LPack{multido},
+%   \LPack{pst-eucl}, \LPack{pst-intersect} ($\geq 0.4$) und
+%   \LPack{environ}.
 %
 %   Alle PSTricks-Pakete machen regen Gebrauch von der Postscript-Sprache, so
 %   dass der typische Arbeitsfluss \opt{latex}, \opt{dvips} und
@@ -825,8 +828,10 @@
 % \ifENGLISH
 %   \section{Requirements}
 %   \LPack{pst-optexp} requires \LaTeX{} and recent versions of
+%   \LPack{pstricks} ($\geq 2.53$), \LPack{pst-plot} ($\geq 1.61$),
 %   \LPack{pst-node}, \LPack{multido}, \LPack{pstricks-add},
-%   \LPack{pst-eucl}, and \LPack{environ}. 
+%   \LPack{pst-eucl}, \LPack{pst-intersect} ($\geq 0.4$) and
+%   \LPack{environ}.
 %
 %   All PSTricks package rely heavily on the Postscript language so that the
 %   typical workflow involves \opt{latex}, \opt{dvips}, and \opt{ps2pdf}. Of
@@ -3877,6 +3882,58 @@
 % \fi
 % \end{stylelist}
 % 
+% \ifGERMAN\section{Parabolspiegel}\fi
+% \ifENGLISH\section{Parabolic mirror}\fi
+%
+% \begin{ltxsyntax}
+%   \dipoledesc{parabolicmirror}
+% \iffalse
+%<*ignore>
+% \fi
+\begin{LTXexample}
+\begin{pspicture}(3,2)
+  \parabolicmirror(0,1)(2,1){PM}
+\end{pspicture}
+\end{LTXexample}
+% \iffalse
+%</ignore>
+% \fi
+% \end{ltxsyntax}
+%
+% \begin{optionlist}
+%   \numitem[1]{parmirrorwidth}
+%   \ifGERMAN Die Breite des Parabolspiegels.\fi
+%   \ifENGLISH The width of the parabolic mirror.\fi
+%
+%   \numitem[1]{parmirrorheight}
+%   \ifGERMAN Die Höhe des Parabolspiegels.\fi
+%   \ifENGLISH The height of the parabolic mirror.\fi
+% \end{optionlist}
+% 
+% \iffalse
+%<*ignore>
+% \fi
+\begin{LTXexample}
+\begin{pspicture}(0,-2)(3,2)
+  \parabolicmirror[parmirrorheight=4, parmirrorwidth=2](0,0)(3,0)
+  \addtopsstyle{Beam}{beamalign=abs, linewidth=0.2\pslinewidth, beaminsidelast, stopinsidecount=1}
+  \multido{\r=-1.55+0.1}{33}{%
+    \drawbeam[beampos=\r](0,0){1}}
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}
+\begin{pspicture}(0,-1)(3,1)
+  \optplane(0,0)
+  \parabolicmirror[parmirrorheight=2, parmirrorwidth=1.5](0,0)(3,0)
+  \addtopsstyle{Beam}{arrows=->, beamalign=abs}
+  \drawbeam[beampos=0.5, linecolor=red]{1}{2}{1}
+\end{pspicture}
+\end{LTXexample}
+% \iffalse
+%</ignore>
+% \fi
+%
 % \ifGERMAN\section{Strahlteiler}\fi
 % \ifENGLISH\section{Beamsplitter}\fi
 %
@@ -7995,13 +8052,14 @@
   \optprism[prismalign=center, prismangle=59](A)(B)(C)
   \optplane(C)
   \definecolor[ps]{bl}{rgb}{%
-    tx@addDict begin Red Green Blue end}%
+    tx@addDict begin tx@OptexpDict begin
+      Wavelength wavelengthToRGB 
+      Red Green Blue 
+    end end }%
   \addtopsstyle{Beam}{linecolor=bl, linewidth=0.4\pslinewidth, beamalign=abs}
-  \multido{\i=0+1}{60}{%
-    \pstVerb{%
-      \i\space 650 400 sub 59 div mul 400 add 
-      tx@addDict begin wavelengthToRGB end }%
-    \drawbeam[n=\i\space 650 400 sub 59 div mul 400 add Sellmaier]{-}%
+  \multido{\iLambda=400+4}{60}{%
+    \pstVerb{/Wavelength \iLambda\space def }%
+    \drawbeam[n=Wavelength Sellmaier]{-}%
   }%
 \end{pspicture}
 \end{LTXexample}
@@ -8468,7 +8526,7 @@
 % \fi
 % \ifENGLISH
 % Number of segments, which are used inside the last component. This
-% option is in effect only with \Lkeyword{beamsinsidelast} or
+% option is in effect only with \Lkeyword{beaminsidelast} or
 % \Lkeyword{stopinside} set to \opt{true}.
 % \fi
 %
@@ -10893,16 +10951,25 @@
 %</ignore>
 % \fi
 %
-%   \optitem{optdipolecomp}{\prm{macros}}
-%   \ifGERMAN Mit dieser Option kann die Zeichnung einer Komponente
-%   definiert werden, um dann mit \Lcs*{newpsobject} basierend auf
-%   \Lcomp{optdipole} eine neuen Komponente zu definieren.
-%   \fi
-%   \ifENGLISH
-%   This option defines the drawing of a component, and can be used to
-%   define a new component based in \Lcomp{optdipole} with
-%   \Lcs*{newpsobject}.
-%   \fi
+% \ifGERMAN  
+% Weitere Beispiel sind \prettyref{ex:lclv} und
+% \prettyref{ex:absspektr}.
+% \fi
+% \ifENGLISH 
+% Further examples are \prettyref{ex:lclv} and
+% \prettyref{ex:absspektr}.
+% \fi
+% 
+% \optitem{optdipolecomp}{\prm{macros}}
+% \ifGERMAN Mit dieser Option kann die Zeichnung einer Komponente
+% definiert werden, um dann mit \Lcs*{newpsobject} basierend auf
+% \Lcomp{optdipole} eine neuen Komponente zu definieren.
+% \fi
+% \ifENGLISH
+% This option defines the drawing of a component, and can be used to
+% define a new component based in \Lcomp{optdipole} with
+% \Lcs*{newpsobject}.
+% \fi
 %
 % \iffalse
 %<*ignore>
@@ -10923,16 +10990,16 @@
 %</ignore>
 % \fi
 %
-%   \optitem{opttripolecomp}{\prm{macros}}
-%   \ifGERMAN Mit dieser Option kann die Zeichnung einer Komponente
-%   definiert werden, um dann mit \Lcs*{newpsobject} basierend auf
-%   \Lcomp{opttripole} eine neuen Komponente zu definieren.
-%   \fi
-%   \ifENGLISH
-%   This option defines the drawing of a component, and can be used to
-%   define a new component based in \Lcomp{opttripole} with
-%   \Lcs*{newpsobject}.
-%   \fi
+% \optitem{opttripolecomp}{\prm{macros}}
+% \ifGERMAN Mit dieser Option kann die Zeichnung einer Komponente
+% definiert werden, um dann mit \Lcs*{newpsobject} basierend auf
+% \Lcomp{opttripole} eine neuen Komponente zu definieren.
+% \fi
+% \ifENGLISH
+% This option defines the drawing of a component, and can be used to
+% define a new component based in \Lcomp{opttripole} with
+% \Lcs*{newpsobject}.
+% \fi
 %
 % \iffalse
 %<*ignore>
@@ -10952,14 +11019,6 @@
 %</ignore>
 % \fi
 %
-% \ifGERMAN  
-% Weitere Beispiel sind \prettyref{ex:lclv} und
-% \prettyref{ex:absspektr}.
-% \fi
-% \ifENGLISH 
-% Further examples are \prettyref{ex:lclv} and
-% \prettyref{ex:absspektr}.
-% \fi
 % \end{optionlist}
 %
 % \ifGERMAN
@@ -12445,6 +12504,33 @@
     \drawwire{\i}{\ii}}
 \end{pspicture}
 \end{LTXexample}
+
+\begin{LTXexample}[pos=t, caption={caption}]
+\begin{pspicture}(10,3)
+\makeatletter
+\newOptexpTripole{roughsurface}
+\def\roughsurface@nodes{%
+  \pssavepath[linestyle=none, arrows=-,ArrowInside=-]{\oenode@Path{A}}{%
+    \code{0 srand}
+    \moveto(!-3 Rand 0.5 sub 0.1 mul)
+    \multido{\r=-2.7+0.3}{20}{%
+      \lineto(!\r\space Rand 0.5 sub 0.1 mul)}%
+  }%
+  \newOptexpComp{%
+    {0 0} tx@IntersectDict /\PIT@name{\oenode@Path{A}} get 0 0 refl {PathIfc}
+    1 }%
+}%
+\def\roughsurface@comp{%
+  \pstracecurve{\oenode@Path{A}}
+}%
+\makeatother
+\optplane[angle=90](1,3)
+\roughsurface(0,3)(5,0)(10,3)
+\addtopsstyle{Beam}{beamalign=abs, beamangle=-45, arrows=->, arrowscale=2}
+\multido{\r=0+0.3}{6}{%
+\drawbeam[beampos=\r]{1}{2}{1}}
+\end{pspicture}
+\end{LTXexample}
 % \iffalse
 %</ignore>
 % \fi
@@ -13502,6 +13588,12 @@
 %
 % \begin{changelog}
 % \patchcmd{\release}{\setlength{\itemsep}{0pt}}{\setlength{\itemsep}{0pt}\setlength{\parsep}{0pt}}{}{}
+%   \begin{release}{5.0}{2014-10-30}
+%   \item Added support for arbitrary interface shapes (experimental,
+%     requires the \opt{pst-intersect} package and \opt{pstricks}
+%     version 2.53.
+%   \item Added component \cs{parabolicmirror}.
+%   \end{release}
 %   \begin{release}{4.10}{2014-06-04}
 %   \item Added value \opt{firstcomp} to parameter \opt{beamalign}\see{prm:beamalign}
 %   \item Modified \cs{optsource} to handle also the beam alignment\see{comp:optsource}
@@ -13820,6 +13912,7 @@
 \RequirePackage{pst-plot}
 \RequirePackage{multido}
 \RequirePackage{pst-eucl}
+\RequirePackage{pst-intersect}
 \RequirePackage{pstricks-add}
 \RequirePackage{environ}
 %    \end{macrocode}
@@ -14904,6 +14997,21 @@
   mirrorlinewidth=2\pslinewidth
 }%
 %    \end{macrocode}
+%
+% Parabolic mirror
+%    \begin{macrocode}
+\define@key[psset]{optexp}{parmirrorwidth}{%
+  \pst@checknum{#1}\POE@key@parmirrorwidth
+}
+\define@key[psset]{optexp}{parmirrorheight}{%
+  \pst@checknum{#1}\POE@key@parmirrorheight
+}
+\psset[optexp]{%
+  parmirrorwidth=1,
+  parmirrorheight=1
+}%
+%    \end{macrocode}
+%
 % Grating
 %
 % These are the old \opt{optgrid*} parameters, which have been deprecated.
@@ -16787,7 +16895,130 @@
 }%
 %    \end{macrocode}
 % \end{macro}
-% 
+%
+% \begin{macro}{\tx@Drawbeam}
+%    \begin{macrocode}
+\pst@def{Drawbeam}<
+%    \end{macrocode}
+% Remove trailing empty line parts.
+%    \begin{macrocode}
+    { counttomark 6 le {
+        exit
+      } if
+      3 index not {
+        pop pop pop 
+      }{ 
+        exit
+      } ifelse
+    } loop
+%    \end{macrocode}
+% Remove heading empty line parts. Note, that the first point must not have
+% 'draw = true', because it is the starting point which we have to move to.
+%    \begin{macrocode}
+    { counttomark 3 le {
+        exit
+      } if
+      counttomark 3 sub index not {
+        counttomark -3 roll pop pop pop
+      }{
+        exit
+      } ifelse
+    } loop
+%    \end{macrocode}
+%    \begin{macrocode}
+  counttomark 3 le {
+%    \end{macrocode}
+% first ray misses the next interface or is even parallel to the input interface.
+%    \begin{macrocode}
+    cleartomark
+  }{
+%    \end{macrocode}
+% This is the /Line definition from \opt{pstricks-add}, adapted to the beam path
+% structure which includes the boolean values to indicate if a line is drawn, or
+% if we use moveto. There was no way to patch the original definition to account
+% for the moveto parts and avoid duplicating the code.
+%    \begin{macrocode}
+  counttomark 3 div cvi /N ED
+  (\psk@ArrowInside) length 0 gt { 
+    \ifx\psk@arrowA\arrowType@H   % do we have a Hook arrow at the beginning?
+      \pst@number\pshooklength  % yes 
+    \else
+      \psk@arrowsize\space CLW mul add dup \psk@arrowlength\space mul exch \psk@arrowinset mul neg add  
+    \fi
+    /arrowlength exch def 
+    6 copy pop				% copy all four values for the arrow line
+    /y1 ED /x1 ED pop /y2 ED /x2 ED 	% save them
+    /Alpha y2 y1 sub x2 x1 sub Atan def % the gradient of the line
+    pop 3 -1 roll 5 1 roll 
+    ArrowA 
+    x1 Alpha cos arrowlength mul add	% dx add
+    y1 Alpha sin arrowlength mul add	% dy add, to get the current point at the end of the arrow tip
+    5 -1 roll 3 1 roll true
+    /N N 1 sub def
+    N {
+      6 copy pop 
+      /y1 ED /x1 ED pop /y2 ED /x2 ED /draw ED
+%    \end{macrocode}
+% Check for line segment length and draw the arrow only, if the segment is long
+% enough. This is in first place to avoid drawing an inside arrow for the
+% pinhole which has three interfaces instead of one so that it can be used as
+% real spatial filter.
+%    \begin{macrocode}
+      x1 y1 x2 y2 @ABDist dup
+      \POE@key@ArrowInsideMinLength\space\pst@number\psunit mul ge 
+      exch \POE@key@ArrowInsideMaxLength\space\pst@number\psunit mul dup 0 lt 
+        3 1 roll le or and {
+        x1 y1
+        \psk@ArrowInsidePos\space 1 gt {
+          /Alpha y2 y1 sub x2 x1 sub Atan def
+          /ArrowPos \psk@ArrowInsideOffset\space def
+          /dArrowPos \psk@ArrowInsidePos\space abs def
+          \psk@ArrowInsideNo\space cvi {
+            /ArrowPos ArrowPos dArrowPos add def
+            x1 Alpha cos ArrowPos mul add
+            y1 Alpha sin ArrowPos mul add
+            6 index { ArrowInside } if
+            pop pop
+          } repeat
+        }{
+          /ArrowPos \psk@ArrowInsideOffset\space def
+          /dArrowPos \psk@ArrowInsideNo 1 gt {%
+            1.0 \psk@ArrowInsideNo 1.0 add div
+          }{\psk@ArrowInsidePos } ifelse def
+            \psk@ArrowInsideNo\space cvi {
+              /ArrowPos ArrowPos dArrowPos add def
+              x2 x1 sub ArrowPos mul x1 add
+              y2 y1 sub ArrowPos mul y1 add
+              6 index { ArrowInside } if
+              pop pop
+            } repeat
+        } ifelse
+        pop pop
+      } if
+      draw {Lineto}{moveto} ifelse
+    } repeat
+  }{
+    pop 5 copy 3 -1 roll pop 
+    ArrowA pop pop pop pop
+    counttomark 3 idiv -1 2 {
+      pop {
+        lineto
+      }{
+        moveto
+      } ifelse
+    } for
+  } ifelse
+  {CP 4 2 roll ArrowB lineto pop pop } {moveto} ifelse
+%    \end{macrocode}
+% remove the mark
+%    \begin{macrocode}
+  pop
+  } ifelse
+>
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\POE@getcomprange}
 %    \begin{macrocode}
 \def\POE@getcomprange#1-#2\@nil{%
   \ifx\\#2\\%
@@ -16894,7 +17125,8 @@
   \fi
 }%
 %    \end{macrocode}
-%
+% \end{macro}
+% 
 % \begin{macro}{\POE@getcomps}
 %    \begin{macrocode}
 \def\POE@getcomps#1#2{%
@@ -17272,6 +17504,12 @@
 \def\oenode@Origin#1{\oenode{Origin}{#1}}%
 %    \end{macrocode}
 % \end{macro}
+% \begin{macro}{oenode@Path}
+% Use this macro for internal use with \cs{pssavepath}.
+%    \begin{macrocode}
+\def\oenode@Path#1{\oenode{Path@#1}{}}%
+%    \end{macrocode}
+% \end{macro}
 % \begin{macro}{\oenodeIfc}
 %   The node of the interface no. \#1 of component \#2. Only integer
 %   number, N or C are allowed. You should always use this e.g. to
@@ -18495,6 +18733,7 @@
 \newOptexpDipole{optdiode}{allowbeaminside=false}
 \newOptexpDipole{doveprism}
 \newOptexpDipole{glanthompson}
+\newOptexpDipole{parabolicmirror}{position=end, ref@angle=-90}
 %    \end{macrocode}
 % 
 % Define all free-ray tripoles
@@ -19189,6 +19428,39 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \subsubsection{parabolicmirror}
+%
+% \begin{macro}{\parabolicmirror@nodes}
+%    \begin{macrocode}
+\def\parabolicmirror@nodes{%
+  \pssavepath[linestyle=none, arrows=-,ArrowInside=-]{\oenode@Path{A}}{%
+    \parametricplot[algebraic, VarStep, VarStepEpsilon=1e-7, plotstyle=cspline]%
+      {0}{\POE@key@parmirrorheight\space 0.5 mul}%
+      {-\POE@key@parmirrorwidth/(0.25*\POE@key@parmirrorheight^2)*t^2|-t}}
+  \pssavepath[linestyle=none, arrows=-,ArrowInside=-]{\oenode@Path{B}}{%
+    \parametricplot[algebraic, VarStep, VarStepEpsilon=1e-7, plotstyle=cspline]%
+      {0}{\POE@key@parmirrorheight\space 0.5 mul}%
+      {-\POE@key@parmirrorwidth/(0.25*\POE@key@parmirrorheight^2)*t^2|t}}
+  \newOptexpComp{%
+    {-\POE@key@parmirrorwidth\space 0.16 mul \POE@key@parmirrorheight\space -0.2 mul} 
+      tx@IntersectDict /\PIT@name{\oenode@Path{A}} get 0 0 refl {PathIfc}
+    {0 0} {1 0} 0 0 trans {PlainIfc}
+    {-\POE@key@parmirrorwidth\space 0.16 mul \POE@key@parmirrorheight\space 0.2 mul}
+      tx@IntersectDict /\PIT@name{\oenode@Path{B}} get 0 0 refl {PathIfc}
+    1 }%
+\ignorespaces}%
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\parabolicmirror@comp}
+%    \begin{macrocode}
+\def\parabolicmirror@comp{%
+  \pstracecurve{\oenode@Path{A}}
+  \pstracecurve{\oenode@Path{B}}
+\ignorespaces}
+%    \end{macrocode}
+% \end{macro}
+%
 % \subsubsection{lens}
 %
 % \begin{macro}{\lens@ref}
@@ -21756,6 +22028,23 @@ tx@OptexpDict begin
 %    \end{macrocode}
 % \end{macro}
 % 
+% \begin{macro}{PathIfc}
+% Define an interface which is given by an arbitrary path.
+%   \begin{pssyntax}
+%     \PSproc{X Y} \PSarray{path} \PSproc{scl} \PSvar{NAlow NAup} \PSop{PathIfc}
+%   \end{pssyntax}
+%    \begin{macrocode}
+/PathIfc {
+  pop pop /NAup 0 def /NAlow 0 def 
+%    \end{macrocode}
+% This kind of interface doesn't allow to switch off the NA-settings,
+% because the interface is defined only inside the NA.
+%    \begin{macrocode}
+  3 1 roll /Path ED
+  exec 3 -1 roll exec /Y ED /X ED
+} bind def
+%    \end{macrocode}
+% \end{macro}
 % \begin{macro}{NewCompIfc}
 % Defines a new interface of a component, must be called within \PSvar{NewOptexpComp}.
 % \begin{pssyntax}
@@ -21773,8 +22062,7 @@ tx@OptexpDict begin
 % \psargitem{\PSstring{CompName}} The name of the component we are in.
 % \psargitem{\PSstring{Name}} The name of the new interface. It is prefixed by «P@».
 % \psargitem{\PSproc{\ldots Ifc}} Contain the actual procedure to define the
-%   concrete interface type, can be \PSproc{PlainIfc} or
-%   \PSproc{CurvedIfc}.
+%   concrete interface type, can be \PSproc{PlainIfc}, \PSproc{CurvedIfc} or \PSproc{PathIfc}.
 % \end{psarglist}
 %    \begin{macrocode}
 /NewCompIfc {
@@ -22840,7 +23128,7 @@ tx@OptexpDict begin
     PrevR type /realtype eq {
       /CurrCenter load /PrevCenter ED
     } if
-    IfcNum CompName isCurved {
+    IfcNum CompName isCurvedIfc {
       IfcNum CompName LoadIfc
       tx@Dict begin Pyth end /CurrR ED
       ToVec /CurrCenter ED
@@ -22852,7 +23140,7 @@ tx@OptexpDict begin
       draw {
         /DrawnSegm DrawnSegm 1 add def
         PrevUp moveto CurrUp lineto
-        IfcNum CompName isCurved {
+        IfcNum CompName isCurvedIfc {
           CurrCenter CurrUp CurrLow 
           4 copy 3 -1 roll eq 3 1 roll eq and {
             6 {pop} repeat
@@ -23112,13 +23400,13 @@ tx@OptexpDict begin
 %    \end{macrocode}
 % \end{macro}
 % 
-% \begin{macro}{isCurved}
+% \begin{macro}{isCurvedIfc}
 %  Check if interface \PSvar{IfcNum} of componente \PSvar{compname} is curved.
 %   \begin{pssyntax}
-%     \PSvar{IfcNum} \PSstring{compname} \PSop{isCurved} \PSvar{bool}
+%     \PSvar{IfcNum} \PSstring{compname} \PSop{isCurvedIfc} \PSvar{bool}
 %   \end{pssyntax}
 %    \begin{macrocode}
-/isCurved {
+/isCurvedIfc {
   cvn load begin
     IfcName load /RX known
   end
@@ -23126,6 +23414,20 @@ tx@OptexpDict begin
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{isPathIfc}
+%  Check if interface \PSvar{IfcNum} of componente \PSvar{compname} is an arbitrary path.
+%   \begin{pssyntax}
+%     \PSvar{IfcNum} \PSstring{compname} \PSop{isPathIfc} \PSvar{bool}
+%   \end{pssyntax}
+%    \begin{macrocode}
+/isPathIfc {
+  cvn load begin
+    IfcName load /Path known
+  end
+} bind def
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{HandleInterface}
 % \begin{pssyntax}
 % \PSvar{IfcNum} \PSstring{CompName} \PSvar{mode n2 X0 Y0 Xin Yin} 
@@ -23136,8 +23438,13 @@ tx@OptexpDict begin
 /HandleInterface {
   (HandleInterface) DebugBegin
   /Yin ED /Xin ED /Y0 ED /X0 ED /n2 ED /mode ED
-  2 copy 2 copy LoadIfc
-  6 -2 roll isCurved { CurvedInterface }{ PlainInterface } ifelse
+  2 copy 2 copy LoadIfc % IfcNum name IfcNum name path
+  dup type /arraytype eq { % is an path interface
+    3 1 roll pop pop PathInterface % IfcNum name X0' Y0' Xout Yout status
+  } {
+    6 -2 roll 
+    isCurvedIfc { CurvedInterface }{ PlainInterface } ifelse
+  } ifelse
 %    \end{macrocode}
 % IfcNum CompName X0' Y0' Xout Yout status
 %
@@ -23150,7 +23457,7 @@ tx@OptexpDict begin
     cvn load begin IfcName load dup /NAlow get exch /NAup get end
     2 copy lt {
       4 2 roll 2 copy LoadIfc NormalizeVec
-      6 -2 roll isCurved {
+      6 -2 roll isCurvedIfc {
         neg exch
       } if
       %% ... X0' Y0' NAlow NAup X Y dXp dYp
@@ -23181,17 +23488,21 @@ tx@OptexpDict begin
   (LoadIfc) DebugBegin
   cvn load begin
     IfcName load begin
-      X Y
-      CompMtrx transform CM itransform
-      currentdict /RX known { RX RY }{ DX DY } ifelse
-      CompMtrx dtransform CM idtransform
+      currentdict /Path known {
+        Path TransformPath
+      } {
+        X Y
+        CompMtrx transform CM itransform
+        currentdict /RX known { RX RY }{ DX DY } ifelse
+        CompMtrx dtransform CM idtransform
+      } ifelse
     end
   end
   DebugEnd
 } bind def
 %    \end{macrocode}
 % \end{macro}
-% 
+%
 % \begin{macro}{isFreeray}
 %   Check if \PSvar{compname} is a free-ray componente by checking if there is a
 %   refractive index associated with it.
@@ -23655,7 +23966,19 @@ tx@OptexpDict begin
 %   \end{pssyntax}
 %    \begin{macrocode}
 /ToVec {
-    [ 3 1 roll ] cvx
+    ToPnt cvx
+} bind def
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{ToPnt}
+%   Convert two numbers to an array holding the two values.
+%   \begin{pssyntax}
+%     \PSvar{X Y} \PSop{ToPnt} \PSarray{X Y}
+%   \end{pssyntax}
+%    \begin{macrocode}
+/ToPnt {
+    [ 3 1 roll ]
 } bind def
 %    \end{macrocode}
 % \end{macro}
@@ -23915,6 +24238,45 @@ tx@OptexpDict begin
 %    \end{macrocode}
 % \end{macro}
 % 
+% \begin{macro}{PathInterface}
+%   \begin{pssyntax}
+%     \PSarray{path} \PSop{PathInterface} \PSvar{X0' Y0' Xout Yout status}
+%   \end{pssyntax}
+%    \begin{macrocode}
+/PathInterface {
+  (PathInterface) DebugBegin
+  [ [X0 Y0] [X0 Xin add Y0 Yin add] ] exch 
+  tx@IntersectDict begin IntersectLinePath end % [pathseg] t [isect]
+  dup length 0 eq {
+    pop pop pop 0 0 missed
+  } {
+    aload pop
+    Xin Yin Xin Yin 
+    8 -2 roll exch % I.x I.y Xin Yin Xin Yin t [pathseg]
+    dup length 2 eq { % a line
+      exch pop
+      aload pop aload pop 3 -1 roll aload pop VecSub % I.x I.y Xin Yin Xin Yin dXp dYp
+    } {
+      exch dup cvi sub DeriveCurve
+    } ifelse
+    % the following part is copied from /PlainInterface
+    NormalVec
+    mode trans eq {
+      n1 n2 RefractVec
+      2 copy 0 eq exch 0 eq and { tir } { ok } ifelse
+    } {
+      ReflectVec ok
+    } ifelse
+    /n1 n2 def
+    5 -2 roll 2 copy 7 2 roll X0 Y0 @ABVect Xin Yin DotProd 0 lt
+    PN 1 gt and {
+      pop missed
+    } if
+  } ifelse
+  DebugEnd
+} bind def
+%    \end{macrocode}
+% \end{macro}
 % 
 % \begin{macro}{TransformRefIndex}
 %   If the refractive index on the stack is for the background (has value
@@ -24389,8 +24751,143 @@ tx@OptexpDict begin
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{TransformPath}
+%   Transforms a path (as defined by \cs{pssavepath} from
+%   \nxLPack{pst-intersect}) using the \opt{currentmatrix} and the
+%   \opt{CompMtrx} of the component. That is used only by \opt{LoadIfc}.
+%   \begin{pssyntax}
+%     \PSarray{path} \PSop{TransformPath} \PSarray{path'}
+%   \end{pssyntax}
+%    \begin{macrocode}
+/TransformPath {
+  mark [ 3 -1 roll aload pop 
+  counttomark 1 add counttomark 1 add exch 1 roll
+  {
+    counttomark 1 eq { cleartomark exit } if
+    dup /curvetype eq {
+      7 1 roll
+      3 { CompMtrx transform CM itransform 7 2 roll } repeat
+      counttomark -1 roll dup counttomark 1 roll
+      7 roll
+    } {
+      3 1 roll CompMtrx transform CM itransform 3 -1 roll
+      counttomark -1 roll dup counttomark 1 roll
+      3 roll
+    } ifelse
+  } loop
+  ]
+} bind def
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{DeriveCurve}
+%   Calculate the derivative of a curve at its parameter \PSvar{t}. This
+%   works only for the special case of third-order Bezier curves.
+%
+%   \begin{align*}
+%     B(t)  & = (1-t)^3 P_0 + 3(1-t)^2 t P_1 + 3(1-t)t^2 P_2 + t^3 P_3\\
+%     B'(t) & = -3(1-t)^2 P_0 + 3(3t^2–4t+1) P_1 + 3(2t–3t^2) P_2 + 3t^2 P_3
+%   \end{align*}
+%   \begin{pssyntax}
+%     \PSarray{curve} \PSvar{t} \PSop{DeriveCurve} \PSvar{dX dY}
+%   \end{pssyntax}
+%    \begin{macrocode}
+/DeriveCurve {
+  (DeriveCurve) DebugBegin
+  exch dup length 4 eq not {
+    pop pop 0 0
+  } {
+    aload pop 5 -1 roll
+    dup 1 exch sub dup mul -3 mul exch % P0 P1 P2 P3 C0=(-3(1-t)^2) t
+    dup dup -4 mul 1 add exch dup mul 3 mul add 3 mul exch % P0 P1 P2 P3 C0 C1=(3(3t^2-4t+1)) t
+    dup dup 2 mul exch dup mul -3 mul add 3 mul exch % P0 P1 P2 P3 C0 C1 C2=(3(2t-3t^2)) t
+    dup mul 3 mul % P0 P1 P2 P3 C0 C1 C2 C3=3t^2
+    8 copy
+    0 6 -1 3 { -1 roll 0 get 3 -1 roll mul add } for
+    9 1 roll
+    0 6 -1 3 { -1 roll 1 get 3 -1 roll mul add } for
+  } ifelse
+  DebugEnd
+} bind def
+%    \end{macrocode}
+% \end{macro}
+% 
+% \begin{macro}{GetBezierDeriv}
+%   Calculate the derivative of the bezier curve at the coordinate
+%   \PSvar{t}.
+%   \begin{equation}
+%     C(t) = \sum_{i=0}^n B_{i,n}(t)P_i\quad\text{with}\quad B_{i,n}(t) = (n over i) t^i(1-t)^{n-i}
+%   \end{equation}
+%   \begin{equation}
+%     C'(t) = \sum_{i=0}^n B'_{i,n}(t)P_i\quad\text{with}\quad B'_{i,n}(t) = (n over i)(i t^{i-1}(1-t)^{n-i} - (n-i)t^i(1-t)^{n-i-1})
+%   \end{equation}
+%   \begin{pssyntax}
+%     \PSarray{[P0]\ldots[P\_n]} \PSvar{t} \PSop{DeriveBezier} \PSvar{x y}
+%   \end{pssyntax}
+%    \begin{macrocode}
+/GetBezierDeriv { 				% t on stack
+  10 dict begin					% hold all local
+  /t ED
+  /t1 1 t sub def				% t1=1-t
+  dup length /BezierOrder exch def
+  /Points exch def
+  /Coeff tx@FuncDict begin Pascal end BezierOrder get def		% get the coefficients
+    0 0						% initial values for x y
+    BezierOrder -1 0 {				% BezierOrder,...,2,1,0
+      /I ED					% I=BezierOrder,...,2,1,0
+      /J BezierOrder I sub def			% J=0,1,2,...,BezierOrder
+      I 0 eq { 
+        0 
+      }{ 
+        I t I 1 sub exp mul t1 J exp mul        %  i*t^{i-1}*(1-t)^{n-i} 
+      } ifelse
+      J 0 eq {
+        0
+      } {
+        J t I exp mul t1 J 1 sub exp mul    % -(n-i)t^i(1-t)^{n-i-1}
+      } ifelse
+      sub Coeff J get mul
+      Points I get aload pop 3 -1 roll VecScale VecAdd
+    } for					% x y on stack
+  end
+} bind def
+%    \end{macrocode}
+% \end{macro}
+%
+% This fixes a problem in pst-intersect.pro v0.4
+%    \begin{macrocode}
+tx@IntersectDict begin 
+/IntersectLinePath {
+  3 dict begin
+    PreparePath
+    2 copy ElongateLine exch 3 -1 roll pop
+    /isect [] def
+    /t -1 def
+    /n -1 def
+    {
+      /n n 1 add def
+      2 copy IntersectBeziers
+      dup 5 1 roll LoadIntersectionPoints
+      dup length 0 gt {
+        /isect exch def
+        0 get dup type /arraytype eq {
+          aload pop add 0.5 mul 
+        } if n add /t exch def
+        exch pop
+        exit
+      } {
+        pop pop pop
+      } ifelse
+    } forall
+    t isect
+  end
+} bind def
+end
+%    \end{macrocode}
+%
 % \begin{macro}{mymax}
-% For some reason Adobe Distiller crashes if 'max' operator is used with two floats which are very close (4e-5 in one case)
+%   For some reason Adobe Distiller crashes if 'max' operator is used
+%   with two floats which are very close (4e-5 in one case)
 %    \begin{macrocode}
 /mymax {
   2 copy lt { exch } if pop
diff --git a/Master/texmf-dist/source/latex/pst-optexp/pst-optexp.ins b/Master/texmf-dist/source/latex/pst-optexp/pst-optexp.ins
index de9d923d69c..e144691e2b8 100644
--- a/Master/texmf-dist/source/latex/pst-optexp/pst-optexp.ins
+++ b/Master/texmf-dist/source/latex/pst-optexp/pst-optexp.ins
@@ -53,7 +53,7 @@
 This is a generated file.
 
 Project: pst-optexp
-Version: 4.10 (2014/06/04)
+Version: 5.0 (2014/10/30)
 
 Copyright (C) 2007-2014 by Christoph Bersch <usenet@bersch.net>
 
diff --git a/Master/texmf-dist/tex/latex/pst-optexp/pst-optexp.sty b/Master/texmf-dist/tex/latex/pst-optexp/pst-optexp.sty
index 02f6447b991..5e8a6ad2b8e 100644
--- a/Master/texmf-dist/tex/latex/pst-optexp/pst-optexp.sty
+++ b/Master/texmf-dist/tex/latex/pst-optexp/pst-optexp.sty
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: pst-optexp
-%% Version: 4.10 (2014/06/04)
+%% Version: 5.0 (2014/10/30)
 %% 
 %% Copyright (C) 2007-2014 by Christoph Bersch <usenet@bersch.net>
 %% 
@@ -31,7 +31,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{pst-optexp}
-    [2014/06/04 v4.10 Optical experimental setups with PSTricks]
+    [2014/10/30 v5.0 Optical experimental setups with PSTricks]
 \RequirePackage{ifthen}
 \RequirePackage{pstricks}
 \RequirePackage{pst-xkey}
@@ -39,6 +39,7 @@
 \RequirePackage{pst-plot}
 \RequirePackage{multido}
 \RequirePackage{pst-eucl}
+\RequirePackage{pst-intersect}
 \RequirePackage{pstricks-add}
 \RequirePackage{environ}
 \@addtofilelist{pst-optexp.pro}{}%
@@ -950,6 +951,16 @@
   mirrortype=plain,
   mirrorlinewidth=2\pslinewidth
 }%
+\define@key[psset]{optexp}{parmirrorwidth}{%
+  \pst@checknum{#1}\POE@key@parmirrorwidth
+}
+\define@key[psset]{optexp}{parmirrorheight}{%
+  \pst@checknum{#1}\POE@key@parmirrorheight
+}
+\psset[optexp]{%
+  parmirrorwidth=1,
+  parmirrorheight=1
+}%
 \define@key[psset]{optexp}{optgridcount}{%
   \pst@checknum{#1}\POE@key@gratingcount
   \PackageWarning{pst-optexp}{%
@@ -2542,6 +2553,96 @@
     { \tx@NodeScale @NewNode @NewNode } if
   }%
 }%
+\pst@def{Drawbeam}<
+    { counttomark 6 le {
+        exit
+      } if
+      3 index not {
+        pop pop pop
+      }{
+        exit
+      } ifelse
+    } loop
+    { counttomark 3 le {
+        exit
+      } if
+      counttomark 3 sub index not {
+        counttomark -3 roll pop pop pop
+      }{
+        exit
+      } ifelse
+    } loop
+  counttomark 3 le {
+    cleartomark
+  }{
+  counttomark 3 div cvi /N ED
+  (\psk@ArrowInside) length 0 gt {
+    \ifx\psk@arrowA\arrowType@H   % do we have a Hook arrow at the beginning?
+      \pst@number\pshooklength  % yes
+    \else
+      \psk@arrowsize\space CLW mul add dup \psk@arrowlength\space mul exch \psk@arrowinset mul neg add
+    \fi
+    /arrowlength exch def
+    6 copy pop % copy all four values for the arrow line
+    /y1 ED /x1 ED pop /y2 ED /x2 ED  % save them
+    /Alpha y2 y1 sub x2 x1 sub Atan def % the gradient of the line
+    pop 3 -1 roll 5 1 roll
+    ArrowA
+    x1 Alpha cos arrowlength mul add % dx add
+    y1 Alpha sin arrowlength mul add % dy add, to get the current point at the end of the arrow tip
+    5 -1 roll 3 1 roll true
+    /N N 1 sub def
+    N {
+      6 copy pop
+      /y1 ED /x1 ED pop /y2 ED /x2 ED /draw ED
+      x1 y1 x2 y2 @ABDist dup
+      \POE@key@ArrowInsideMinLength\space\pst@number\psunit mul ge
+      exch \POE@key@ArrowInsideMaxLength\space\pst@number\psunit mul dup 0 lt
+        3 1 roll le or and {
+        x1 y1
+        \psk@ArrowInsidePos\space 1 gt {
+          /Alpha y2 y1 sub x2 x1 sub Atan def
+          /ArrowPos \psk@ArrowInsideOffset\space def
+          /dArrowPos \psk@ArrowInsidePos\space abs def
+          \psk@ArrowInsideNo\space cvi {
+            /ArrowPos ArrowPos dArrowPos add def
+            x1 Alpha cos ArrowPos mul add
+            y1 Alpha sin ArrowPos mul add
+            6 index { ArrowInside } if
+            pop pop
+          } repeat
+        }{
+          /ArrowPos \psk@ArrowInsideOffset\space def
+          /dArrowPos \psk@ArrowInsideNo 1 gt {%
+            1.0 \psk@ArrowInsideNo 1.0 add div
+          }{\psk@ArrowInsidePos } ifelse def
+            \psk@ArrowInsideNo\space cvi {
+              /ArrowPos ArrowPos dArrowPos add def
+              x2 x1 sub ArrowPos mul x1 add
+              y2 y1 sub ArrowPos mul y1 add
+              6 index { ArrowInside } if
+              pop pop
+            } repeat
+        } ifelse
+        pop pop
+      } if
+      draw {Lineto}{moveto} ifelse
+    } repeat
+  }{
+    pop 5 copy 3 -1 roll pop
+    ArrowA pop pop pop pop
+    counttomark 3 idiv -1 2 {
+      pop {
+        lineto
+      }{
+        moveto
+      } ifelse
+    } for
+  } ifelse
+  {CP 4 2 roll ArrowB lineto pop pop } {moveto} ifelse
+  pop
+  } ifelse
+>
 \def\POE@getcomprange#1-#2\@nil{%
   \ifx\\#2\\%
     \ifx\\#1\\%
@@ -2864,6 +2965,7 @@
 \def\oenode@TrefA#1{\oenode{@TrefA}{#1}}%
 \def\oenode@TrefB#1{\oenode{@TrefB}{#1}}%
 \def\oenode@Origin#1{\oenode{Origin}{#1}}%
+\def\oenode@Path#1{\oenode{Path@#1}{}}%
 \def\oenodeIfc#1#2{%
   \ifnum9<1#1 %
     \oenode{#1}{#2}%
@@ -3709,6 +3811,7 @@
 \newOptexpDipole{optdiode}{allowbeaminside=false}
 \newOptexpDipole{doveprism}
 \newOptexpDipole{glanthompson}
+\newOptexpDipole{parabolicmirror}{position=end, ref@angle=-90}
 \newOptexpTripole{mirror}
 \newOptexpTripole[ref@angle=45]{beamsplitter}
 \newOptexpTripole{optgrating}
@@ -4242,6 +4345,27 @@
          \fi){0.6}{160}{200}
    \fi
 }%
+\def\parabolicmirror@nodes{%
+  \pssavepath[linestyle=none, arrows=-,ArrowInside=-]{\oenode@Path{A}}{%
+    \parametricplot[algebraic, VarStep, VarStepEpsilon=1e-7, plotstyle=cspline]%
+      {0}{\POE@key@parmirrorheight\space 0.5 mul}%
+      {-\POE@key@parmirrorwidth/(0.25*\POE@key@parmirrorheight^2)*t^2|-t}}
+  \pssavepath[linestyle=none, arrows=-,ArrowInside=-]{\oenode@Path{B}}{%
+    \parametricplot[algebraic, VarStep, VarStepEpsilon=1e-7, plotstyle=cspline]%
+      {0}{\POE@key@parmirrorheight\space 0.5 mul}%
+      {-\POE@key@parmirrorwidth/(0.25*\POE@key@parmirrorheight^2)*t^2|t}}
+  \newOptexpComp{%
+    {-\POE@key@parmirrorwidth\space 0.16 mul \POE@key@parmirrorheight\space -0.2 mul}
+      tx@IntersectDict /\PIT@name{\oenode@Path{A}} get 0 0 refl {PathIfc}
+    {0 0} {1 0} 0 0 trans {PlainIfc}
+    {-\POE@key@parmirrorwidth\space 0.16 mul \POE@key@parmirrorheight\space 0.2 mul}
+      tx@IntersectDict /\PIT@name{\oenode@Path{B}} get 0 0 refl {PathIfc}
+    1 }%
+\ignorespaces}%
+\def\parabolicmirror@comp{%
+  \pstracecurve{\oenode@Path{A}}
+  \pstracecurve{\oenode@Path{B}}
+\ignorespaces}
 \def\lens@ref{%
   \ifdim\POE@key@lensradiusleft pt=0pt
     \edef\@th{0 }%