9 files changed, 758 insertions, 206 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/Changes b/Master/texmf-dist/doc/generic/pst-diffraction/Changes
index 94384ed2e46..570ea66d998 100755
--- a/Master/texmf-dist/doc/generic/pst-diffraction/Changes
+++ b/Master/texmf-dist/doc/generic/pst-diffraction/Changes
@@ -1,4 +1,6 @@
 pst-diffraction.tex --------
+2.02  2007-09-25  - add IIID option for all macros
+                  - new option showFunc
 2.01  2007-09-13  first CTAN version 
 
 
diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/README b/Master/texmf-dist/doc/generic/pst-diffraction/README
index 707444a3f9e..e642ddc6fb1 100644
--- a/Master/texmf-dist/doc/generic/pst-diffraction/README
+++ b/Master/texmf-dist/doc/generic/pst-diffraction/README
@@ -31,13 +31,20 @@ be sure that you
 - do not load another package after pst-diffraction, which loads
   the old keyval.sty or pst-key.tex
 
+You can run the documentation with 
+make DE
+make E
+make FR
+
+or for all make all  ;-) this will take a lot of time, because
+the images are very big.
 
 If you like to get the documentation file in another format run 
 
-latex pst-diffraction-docE.tex
-bibtex pst-diffraction-docE
-latex pst-diffraction-docE.tex
-dvips pst-diffraction-docE.dvi
+latex pst-diffraction-docX.tex
+bibtex pst-diffraction-docX
+latex pst-diffraction-docX.tex
+dvips pst-diffraction-docX.dvi
 
 to get a PostScript file. But pay attention, that the pst-diffraction
 files are saved in the above mentioned way, before you run
diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.bib b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.bib
index 69cdd1245a2..737b6dbba99 100644
--- a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.bib
@@ -89,7 +89,7 @@
 }
 
 @Book{diffraction,
-  author	= {Bouasse, H. and Carrière, Z.},
+  author	= {Bouasse, H. and Carri\`ere, Z.},
   title	= 	{Diffraction}, 
   publisher={Delagrave},
   year	={1923},
@@ -98,3 +98,22 @@
 }
 
 
+@book{tutorial,
+ title = {The New Physical Optics Notebook Tutorials in Fourier Optics},
+ isbn	={0819401307},
+ author	={Reynolds, George O. and Develis, John B. and Parrent, George B. and Thompson, Bria},
+ url = {\url{http://www.langtoninfo.co.uk/de/showitem.asp?isbn=0819401307}},
+ year= 1989,
+ publisher = {Society of {P}hoto {O}ptical}
+}
+
+@Manual{Fresnel,
+  Title          = {Augustin Fresnel},
+  Author         = {Manuel Luque},
+  Organization   = {},
+  Address        = {\url{http://melusine.eu.org/syracuse/mluque/fresnel/augustin/fresnel.html}},
+  Note           = {},
+  year           = 2004
+}
+
+
diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docDE.pdf b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docDE.pdf
index 31ba9b23925..08199e91ec2 100644
--- a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docDE.pdf
+++ b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docDE.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docDE.tex b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docDE.tex
index 15e73c2bc07..27f528fcff0 100644
--- a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docDE.tex
+++ b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docDE.tex
@@ -1,4 +1,4 @@
-\documentclass[dvips,ngerman,a4paper]{article}
+\documentclass[ngerman,a4paper]{article}
 \usepackage[T1]{fontenc}
 \usepackage[utf8]{inputenc}
 \usepackage[bmargin=2cm,tmargin=2cm]{geometry}
@@ -11,12 +11,25 @@
 \usepackage{ccfonts}
 \usepackage[euler-digits]{eulervm}
 \usepackage[scaled=0.85]{luximono}
+\usepackage{xspace}
 \def\UrlFont{\small\ttfamily}
+\newcommand*\psp{\texttt{pspicture}\xspace}
 \makeatletter
 \def\verbatim@font{\small\normalfont\ttfamily}
 \makeatother
+\usepackage{showexpl}
+\lstdefinestyle{syntax}{backgroundcolor=\color{blue!20},numbers=none,xleftmargin=0pt,xrightmargin=0pt,
+    frame=single}
+\lstdefinestyle{example}{backgroundcolor=\color{red!20},numbers=none,xleftmargin=0pt,xrightmargin=0pt,
+    frame=single}
+\lstset{wide=true,language=PSTricks,
+    morekeywords={psdiffractionCircular,psdiffractionRectangle,psdiffractionTriangle}}
+
+
 \usepackage{prettyref}
 \usepackage{fancyhdr}
+\usepackage{multicol}
+
 \usepackage{babel}
 \usepackage[colorlinks,linktocpage]{hyperref}
 
@@ -38,7 +51,7 @@
 \title{\texttt{pst-diffraction}\\[6pt]
 \mbox{}\\[1cm]
 Beugungsmuster für Beugung an kreisförmigen, rechteckigen und dreieckigen
-Öffnungen
+Öffnungen\\[10pt]
 ---\\[10pt]
 {\normalsize v. \PSTfileversion (\PSTfiledate)}}
 \author{%
@@ -66,6 +79,8 @@ Beiträge und Anmerkungen lieferten: Julien Cubizolles.
 \begin{pspicture}(0,-3)(12,3)
 \pnode(0,0){S}   \pnode(4,1){L'1}  \pnode(4,-1){L'2}  \pnode(6,1){E'1}   \pnode(6,-1){E'2}
 \pnode(6,0.5){E1}\pnode(6,-0.5){E2}\pnode(8.5,1.5){L1}\pnode(8.5,0.5){L2}\pnode(11.5,1.25){P}
+\pspolygon[linestyle=none,fillstyle=vlines,
+    hatchcolor=yellow](S)(L'1)(E'1)(E1)(L1)(P)(L2)(E2)(E'2)(L'2)
 % lentille L'
 \pscustom[fillstyle=gradient,linecolor=blue,gradend=white]{%
   \code{0.5 0.83333 scale}
@@ -76,8 +91,6 @@ Beiträge und Anmerkungen lieferten: Julien Cubizolles.
   \code{1 1.5 scale}
   \psarc(4.5,0){4.176}{-16.699}{16.699}
   \psarc(12.5,0){4.176}{163.30}{196.699}}
-\pspolygon[linestyle=none,fillstyle=vlines,
-    hatchcolor=yellow](S)(L'1)(E'1)(E1)(L1)(P)(L2)(E2)(E'2)(L'2)
 \uput[90](4,1){$L'$}\uput[90](8.5,2){$L$}
 \psdot(S)\uput[180](S){S}
 \psline(S)(12,0)\psline[linewidth=2\pslinewidth](6,2)(6,0.5)\psline[linewidth=2\pslinewidth](6,-2)(6,-0.5)
@@ -117,11 +130,11 @@ Es gibt drei Befehle, jeweils einen für rechteckige, kreisförmige und
 dreieckige Öffnungen:
 
 
-\begin{verbatim}
+\begin{lstlisting}[style=syntax]
 \psdiffractionRectangle[<Optionen>]
 \psdiffractionCircular[<Optionen>]
 \psdiffractionTriangle[<Optionen>]
-\end{verbatim}
+\end{lstlisting}
 
 
 \section{Die Farbe}
@@ -161,117 +174,242 @@ verwendet, \texttt{[colorMode=1]} liefert das zugehörige Negativ. Die Optionen
 CMYK-Farbmodell bzw. RGB-Farbmodell.
 
 Defaultmä"sig sind folgende Werte voreingestellt:
-\begin{itemize}
-  \item \texttt{[a=0.2e-3]} in m ;
-  \item \texttt{[k=1]} ;
-  \item \texttt{[f=5]} in m ;
-  \item \texttt{[lambda=650]} in nm ;
-  \item \texttt{[pixel=0.5]} ;
-  \item \texttt{[contrast=38]}, Maximalwert  ;
-  \item \texttt{[colorMode=3]}.
-\end{itemize}
 
-\begin{center}
-\begin{pspicture}(-4,-4)(4,4)
+\begin{tabular}{@{}lll@{}}
+\texttt{[a=0.2e-3]} in m;    & \texttt{[k=1]};       &  \texttt{[f=5]} in m;\\
+\texttt{[lambda=650]} in nm; & \texttt{[pixel=0.5]}; &   \texttt{[contrast=38]}, Maximalwert;\\
+\texttt{[colorMode=3]};   &   \texttt{[IIID=false]}.
+\end{tabular}
+
+\bigskip
+\noindent
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
 \psdiffractionRectangle[f=2.5]
-\uput[270](0,-3.5){$\backslash$\texttt{psdiffractionRectangle[f=2.5]}}
 \end{pspicture}
-\end{center}
-\begin{center}
-\begin{pspicture}(-2,-4.5)(2,4.5)
+\hfill
+\begin{pspicture}(-1.5,-2.5)(3.5,3.5)
+\psdiffractionRectangle[IIID,Alpha=30,f=2.5]
+\end{pspicture}
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
+\psdiffractionRectangle[f=2.5]
+\end{pspicture}
+\hfill
+\begin{pspicture}(-1.5,-2.5)(3.5,3.5)
+\psdiffractionRectangle[IIID,Alpha=30,f=2.5]
+\end{pspicture}
+\end{lstlisting}
+
+
+
+\noindent\begin{pspicture}(-2,-4)(2,4)
 \psdiffractionRectangle[a=0.5e-3,k=0.5,f=4,pixel=0.5,colorMode=0]
-\uput[270](0,-4.5){$\backslash$\texttt{psdiffractionRectangle[a=0.5e-3,k=0.5,f=4,colorMode=0]}}
 \end{pspicture}
-\end{center}
-\begin{center}
-\begin{pspicture}(-4,-2.5)(4,3)
+\hfill
+\begin{pspicture}(0,-3)(4,4)
+\psdiffractionRectangle[IIID,a=0.5e-3,k=0.5,f=4,pixel=0.5,colorMode=0]
+\end{pspicture}
+
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-2,-4)(2,4)
+\psdiffractionRectangle[a=0.5e-3,k=0.5,f=4,pixel=0.5,colorMode=0]
+\end{pspicture}
+\hfill
+\begin{pspicture}(0,-3)(4,4)
+\psdiffractionRectangle[IIID,a=0.5e-3,k=0.5,f=4,pixel=0.5,colorMode=0]
+\end{pspicture}
+\end{lstlisting}
+
+
+
+\noindent
+\begin{pspicture}(-2.5,-2.5)(3.5,3)
 \psdiffractionRectangle[a=0.5e-3,k=2,f=10,lambda=515,colorMode=1]
-\uput[270](0,-2){$\backslash$\texttt{psdiffractionRectangle[a=0.5e-3,k=2,f=10,lambda=515,colorMode=1]}}
 \end{pspicture}
-\end{center}
-\begin{center}
-\begin{pspicture}(-4,-1)(4,1)
-\psdiffractionRectangle[a=0.5e-3,k=20,f=10,pixel=0.5,lambda=450]
-\uput[270](0,-0.5){$\backslash$\texttt{psdiffractionRectangle[a=0.5e-3,k=20,f=10,lambda=450]}}
+\hfill
+\begin{pspicture}(-1.5,-2)(3.5,3)
+\psdiffractionRectangle[IIID,Alpha=20,a=0.5e-3,k=2,f=10,lambda=515,colorMode=1]
 \end{pspicture}
-\end{center}
 
 
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-2.5,-2.5)(3.5,3)
+\psdiffractionRectangle[a=0.5e-3,k=2,f=10,lambda=515,colorMode=1]
+\end{pspicture}
+\hfill
+\begin{pspicture}(-1.5,-2)(3.5,3)
+\psdiffractionRectangle[IIID,Alpha=20,a=0.5e-3,k=2,f=10,lambda=515,colorMode=1]
+\end{pspicture}
+\end{lstlisting}
+
+
+\noindent
+\begin{pspicture}(-3.5,-1)(3.5,1)
+\psdiffractionRectangle[a=0.5e-3,k=20,f=10,pixel=0.5,lambda=450]
+\end{pspicture}
+\hfill
+\begin{pspicture}(-3.5,-1)(3.5,4)
+\psdiffractionRectangle[IIID,Alpha=10,a=0.5e-3,k=20,f=10,pixel=0.5,lambda=450]
+\end{pspicture}
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3.5,-1)(3.5,1)
+\psdiffractionRectangle[a=0.5e-3,k=20,f=10,pixel=0.5,lambda=450]
+\end{pspicture}
+\hfill
+\begin{pspicture}(-3.5,-1)(3.5,4)
+\psdiffractionRectangle[IIID,Alpha=10,a=0.5e-3,k=20,f=10,pixel=0.5,lambda=450]
+\end{pspicture}
+\end{lstlisting}
 
 \section{Beugung an zwei rechteckigen Blendenöffnungen}
 
-%\begin{shaded}
-%Diese Simulation wurde von Julien
-%\textsc{Cubizolles} erstellt.
-%\end{shaded}
+\begin{shaded}
+Der Code für diese Simulation wurde von Julien \textsc{Cubizolles} erstellt.
+\end{shaded}
 Man kann auch das Beugungsmuster zweier kongruenter Rechtecke (so nebeneinander
 angeordnet, da"s ihre Grundlinie auf der $x$-Achse liegt) erstellen,
 indem man zusätzlich
 zu den Angaben für den Fall nur eines Rechtecks die Option \texttt{[twoSlit]} angibt.
 Defaultmä"sig ist \texttt{[twoSlit]} deaktiviert. Den Abstand zwischen den beiden
 Rechtecken kann man über die Option $s$ einstellen. Sie wird, wenn nichts anderes angegeben
-wird, mit dem Wert
-$\texttt{12e-3}\,\mathrm{m}$ belegt.
+wird, mit dem Wert $12e^{-3}\,\mathrm{m}$ belegt.
+
 \begin{center}
+\noindent
 \begin{pspicture}(-4,-1)(4,1)
 \psdiffractionRectangle[a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3]
-\uput[270](0,-0.5){$\backslash
-$\texttt{psdiffractionRectangle[a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3]}}
 \end{pspicture}
 \end{center}
-\clearpage
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-4,-1)(4,1)
+\psdiffractionRectangle[a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3]
+\end{pspicture}
+\end{lstlisting}
+
+\begin{center}
+\begin{pspicture}(-2,-1)(4,4)
+\psdiffractionRectangle[IIID,Alpha=20,a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3]
+\end{pspicture}
+\end{center}
+
+\begin{lstlisting}[pos=t,style=example,wide=false]
+\begin{pspicture}(-2,-1)(4,4)
+\psdiffractionRectangle[IIID,Alpha=20,a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3]
+\end{pspicture}
+\end{lstlisting}
 
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Beugung an einer kreisförmigen Blendenöffnung}
 Der Lochradius wird über den Buchstaben \texttt{r} angesprochen, beispielsweise
 \texttt{[r=1e-3]}. Der Default ist $r=1$ mm. Im ersten Quadranten wird der Graph der
 Intensitätsverteilung abgebildet (das Maximum in der Mitte wird abgeschnitten,
-falls es über den oberen Rand der \texttt{pspicture}-Umgebung hinausgeht).
+falls es über den oberen Rand der \psp-Umgebung hinausgeht).
 
 \begin{center}
-\begin{pspicture}(-5,-5)(5,5)
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
 \psdiffractionCircular[r=0.5e-3,f=10,pixel=0.5,lambda=520]
-\uput[270](0,-5){$\backslash$\texttt{psdiffractionCircular[r=0.5e-3,f=10,lambda=520]}}
+\end{pspicture}
+%
+\begin{pspicture}(-3.5,-1.5)(3.5,3.5)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,pixel=0.5,lambda=520]
 \end{pspicture}
 \end{center}
 
+
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
+\psdiffractionCircular[r=0.5e-3,f=10,pixel=0.5,lambda=520]
+\end{pspicture}
+%
+\begin{pspicture}(-3.5,-1.5)(3.5,3.5)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,pixel=0.5,lambda=520]
+\end{pspicture}
+\end{lstlisting}
+
+
+
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Beugung an zwei kreisförmigen Blendenöffnungen}
 Es ist nur der Fall gleich gro"ser Radien vorgesehen, diesen gemeinsamen Radius
 spezifiziert man wie vorher über \texttt{[r=\dots]}. Au"serdem muss man den
 halben Abstand der beiden Kreismitten festlegen vermöge \texttt{[d=\dots]},
 beispielsweise \texttt{[d=3e-3]}. Zusätzlich muss man die Option
-\texttt{[twoHole]} verwenden.\\
-Der Bildaufbau kann in diesem Fall etwas länger dauern\dots
+\texttt{[twoHole]} verwenden. Der Bildaufbau kann in diesem Fall etwas länger dauern\dots
 
-\begin{center}
-\begin{pspicture}(-5,-5)(5,4)
+\begin{pspicture}(-3,-3.5)(3.5,3.5)
 \psdiffractionCircular[r=0.5e-3,f=10,d=3e-3,lambda=515,twoHole]
-\uput[270](0,-4){$\backslash$\texttt{psdiffractionCircular[r=0.5e-3,f=10,d=3e-3,lambda=515,twoHole]}}
 \end{pspicture}
-\end{center}
-\begin{center}
-\begin{pspicture}(-6,-6)(6,6)
+%
+\begin{pspicture}(-3.5,-1.5)(3.5,3.5)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=3e-3,lambda=515,twoHole]
+\end{pspicture}
+
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3,-3.5)(3.5,3.5)
+\psdiffractionCircular[r=0.5e-3,f=10,d=3e-3,lambda=515,twoHole]
+\end{pspicture}
+%
+\begin{pspicture}(-3.5,-1.5)(3.5,3.5)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=3e-3,lambda=515,twoHole]
+\end{pspicture}
+\end{lstlisting}
+
+
+\hspace*{-1cm}%
+\begin{pspicture}(-3,-3)(3.5,4)
 \psdiffractionCircular[r=0.5e-3,f=10,d=2e-3,lambda=700,twoHole,colorMode=0]
-\uput[270](0,-5){$\backslash$\texttt{psdiffractionCircular[r=0.5e-3,f=10,d=2e-3,lambda=700,twoHole,colorMode=0]}}
 \end{pspicture}
-\end{center}
+%
+\begin{pspicture}(-3.5,-2)(3.5,3.5)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=2e-3,lambda=700,twoHole,colorMode=0]
+\end{pspicture}
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3.5,-3)(3.5,4)
+\psdiffractionCircular[r=0.5e-3,f=10,d=2e-3,lambda=700,twoHole,colorMode=0]
+\end{pspicture}
+%
+\begin{pspicture}(-3.5,-2)(3.5,3.5)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=2e-3,lambda=700,twoHole,colorMode=0]
+\end{pspicture}
+\end{lstlisting}
 
 Nicht in jedem Fall ergibt sich im mittleren Kreis ein Streifenmuster. Die Anzahl $N$ der Streifen
 im Inneren ist gegeben durch $N=2,44\frac{d}{r}$. Man kann diesen Effekt also erst für
 $N\geq2$ bzw. ab $d=\frac{2r}{1,22}$ beobachten (siehe
 \url{http://www.unice.fr/DeptPhys/optique/diff/trouscirc/diffrac.html}).
-\begin{center}
-\begin{pspicture}(-5,-6)(5,5)
+
+
+\hspace*{-1cm}%
+\begin{pspicture}(-3,-3.5)(3,3.5)
 \psdiffractionCircular[r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]
-\uput[270](0,-5){$\backslash$
-\texttt{psdiffractionCircular[r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]}}
 \end{pspicture}
-\end{center}
+%
+\begin{pspicture}(-3.5,-1.5)(3.5,3)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]
+\end{pspicture}
+
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3,-3.5)(3,3.5)
+\psdiffractionCircular[r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]
+\end{pspicture}
+%
+\begin{pspicture}(-3.5,-1.5)(3.5,3)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]
+\end{pspicture}
+\end{lstlisting}
+
 
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Brechung an einer dreieckigen Blendenöffnung}
 Es ist nur der Fall eines gleichseitigen Dreiecks vorgesehen. Als Option gibt man dessen Höhe
 \texttt{[h]} an, welche sich bekanntlich über $h=\frac{\sqrt{3}}{2}s$ aus der Seitenlänge $s$
@@ -283,29 +421,63 @@ des Dreiecks berechnet. Ein Schwarzweissbild erhält man mit \texttt{[colorMode=
 \pcline{|-|}(-0.732,-1)(0,-1)
 \Aput{$h$}
 \end{pspicture}
-
-\vspace{1cm}
-$\backslash$\texttt{psdiffractionTriangle[f=10,h=1e-3,contrast=38,colorMode=]}
+\end{center}
 
 \makebox[\linewidth]{%
-\begin{pspicture}(-3,-3)(3,3)
+\begin{pspicture}(-3,-3)(3,2.5)
 \psdiffractionTriangle[f=10,h=1e-3,lambda=515,contrast=38]
-\uput[270](0,-2.5){default color mode (>1)}
 \end{pspicture}
 \quad
-\begin{pspicture}(-3,-3)(3,3)
+\begin{pspicture}(-3,-3)(3,2.5)
 \psdiffractionTriangle[f=10,h=1e-3,colorMode=1,contrast=38,lambda=515]
-\uput[270](0,-2.5){\texttt{colorMode=1}}
 \end{pspicture}
 \quad
-\begin{pspicture}(-3,-3)(3,3)
+\begin{pspicture}(-3,-3)(3,2.5)
 \psdiffractionTriangle[f=10,h=1e-3,colorMode=0,contrast=38,lambda=515]
-\uput[270](0,-2.5){\texttt{colorMode=0}}
 \end{pspicture}}
 
-\end{center}
 
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3,-3)(3,2.5)
+\psdiffractionTriangle[f=10,h=1e-3,lambda=515,contrast=38]
+\end{pspicture}
+\quad
+\begin{pspicture}(-3,-3)(3,2.5)
+\psdiffractionTriangle[f=10,h=1e-3,colorMode=1,contrast=38,lambda=515]
+\end{pspicture}
+\quad
+\begin{pspicture}(-3,-3)(3,2.5)
+\psdiffractionTriangle[f=10,h=1e-3,colorMode=0,contrast=38,lambda=515]
+\end{pspicture}
+\end{lstlisting}
+
+
+\makebox[\linewidth]{%
+\begin{pspicture}(-3,-2)(3,3.5)
+\psdiffractionTriangle[IIID,f=10,h=1e-3,lambda=515,contrast=38]
+\end{pspicture}
+\quad
+\begin{pspicture}(-3,-2)(3,3.5)
+\psdiffractionTriangle[IIID,f=10,h=1e-3,colorMode=1,contrast=38,lambda=515]
+\end{pspicture}
+\quad
+\begin{pspicture}(-3,-2)(3,3.5)
+\psdiffractionTriangle[IIID,f=10,h=1e-3,colorMode=0,contrast=38,lambda=515]
+\end{pspicture}}
 
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3,-2)(3,3.5)
+\psdiffractionTriangle[IIID,f=10,h=1e-3,lambda=515,contrast=38]
+\end{pspicture}
+\quad
+\begin{pspicture}(-3,-2)(3,3.5)
+\psdiffractionTriangle[IIID,f=10,h=1e-3,colorMode=1,contrast=38,lambda=515]
+\end{pspicture}
+\quad
+\begin{pspicture}(-3,-2)(3,3.5)
+\psdiffractionTriangle[IIID,f=10,h=1e-3,colorMode=0,contrast=38,lambda=515]
+\end{pspicture}
+\end{lstlisting}
 
 
 %\section{Credits}
diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docE.pdf b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docE.pdf
index 30c9587ce01..f68036fd2ac 100644
--- a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docE.pdf
+++ b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docE.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docE.tex b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docE.tex
index 6ff5cacf745..1dc2d35e4c3 100644
--- a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docE.tex
+++ b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docE.tex
@@ -1,5 +1,5 @@
 \documentclass[dvips,english,a4paper]{article}
-\usepackage[latin9]{inputenc}%
+\usepackage[utf8]{inputenc}%
 \usepackage[T1]{fontenc}
 \usepackage[bmargin=2cm,tmargin=2cm]{geometry}
 %
@@ -11,12 +11,22 @@
 \usepackage{ccfonts}
 \usepackage[euler-digits]{eulervm}
 \usepackage[scaled=0.85]{luximono}
+\usepackage{xspace}
+\newcommand*\psp{\texttt{pspicture}\xspace}
 \def\UrlFont{\small\ttfamily}
 \makeatletter
 \def\verbatim@font{\small\normalfont\ttfamily}
 \makeatother
-\usepackage{prettyref}
+\usepackage{prettyref,multicol}
 \usepackage{fancyhdr}
+\usepackage{showexpl}
+\lstdefinestyle{syntax}{backgroundcolor=\color{blue!20},numbers=none,xleftmargin=0pt,xrightmargin=0pt,
+    frame=single}
+\lstdefinestyle{example}{backgroundcolor=\color{red!20},numbers=none,xleftmargin=0pt,xrightmargin=0pt,
+    frame=single}
+\lstset{wide=true,language=PSTricks,
+    morekeywords={psdiffractionCircular,psdiffractionRectangle,psdiffractionTriangle}}
+
 \usepackage{babel}
 \usepackage[colorlinks,linktocpage]{hyperref}
 
@@ -114,11 +124,11 @@ of the light (the associated color will be given automatically by the package).
 
 There are three commands, for rectangular, circular and triangular openings respectively:
 
-\begin{verbatim}
+\begin{lstlisting}[style=syntax]
 \psdiffractionRectangle[<Optionen>]
 \psdiffractionCircular[<Optionen>]
 \psdiffractionTriangle[<Optionen>]
-\end{verbatim}
+\end{lstlisting}
 
 
 \section{The color}
@@ -155,61 +165,137 @@ the option \texttt{[colorMode=1]} provides the associated negative pattern. The
 CMYK and RGB color model respectively.
 
 By default the settings are as follows: 
-\begin{itemize}
-  \item \texttt{[a=0.2e-3]} in m ;
-  \item \texttt{[k=1]} ;
-  \item \texttt{[f=5]} in m ;
-  \item \texttt{[lambda=650]} in nm ;
-  \item \texttt{[pixel=0.5]} ;
-  \item \texttt{[contrast=38]}, maximal value ;
-  \item \texttt{[colorMode=3]}.
-\end{itemize}
 
-\begin{center}
-\begin{pspicture}(-4,-4)(4,4)
+
+\begin{tabular}{@{}lll@{}}
+\texttt{[a=0.2e-3]} in m;    & \texttt{[k=1]};       &  \texttt{[f=5]} in m;\\
+\texttt{[lambda=650]} in nm; & \texttt{[pixel=0.5]}; &   \texttt{[contrast=38]}, greates value;\\
+\texttt{[colorMode=3]};   &   \texttt{[IIID=false]}.
+\end{tabular}
+
+\bigskip
+\noindent
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
 \psdiffractionRectangle[f=2.5]
-\uput[270](0,-3.5){$\backslash$\texttt{psdiffractionRectangle[f=2.5]}}
 \end{pspicture}
-\end{center}
-\begin{center}
-\begin{pspicture}(-2,-4.5)(2,4.5)
+\hfill
+\begin{pspicture}(-1.5,-2.5)(3.5,3.5)
+\psdiffractionRectangle[IIID,Alpha=30,f=2.5]
+\end{pspicture}
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
+\psdiffractionRectangle[f=2.5]
+\end{pspicture}
+\hfill
+\begin{pspicture}(-1.5,-2.5)(3.5,3.5)
+\psdiffractionRectangle[IIID,Alpha=30,f=2.5]
+\end{pspicture}
+\end{lstlisting}
+
+
+
+\noindent\begin{pspicture}(-2,-4)(2,4)
 \psdiffractionRectangle[a=0.5e-3,k=0.5,f=4,pixel=0.5,colorMode=0]
-\uput[270](0,-4.5){$\backslash$\texttt{psdiffractionRectangle[a=0.5e-3,k=0.5,f=4,colorMode=0]}}
 \end{pspicture}
-\end{center}
-\begin{center}
-\begin{pspicture}(-4,-2.5)(4,3)
+\hfill
+\begin{pspicture}(0,-3)(4,4)
+\psdiffractionRectangle[IIID,a=0.5e-3,k=0.5,f=4,pixel=0.5,colorMode=0]
+\end{pspicture}
+
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-2,-4)(2,4)
+\psdiffractionRectangle[a=0.5e-3,k=0.5,f=4,pixel=0.5,colorMode=0]
+\end{pspicture}
+\hfill
+\begin{pspicture}(0,-3)(4,4)
+\psdiffractionRectangle[IIID,a=0.5e-3,k=0.5,f=4,pixel=0.5,colorMode=0]
+\end{pspicture}
+\end{lstlisting}
+
+
+
+\noindent
+\begin{pspicture}(-2.5,-2.5)(3.5,3)
 \psdiffractionRectangle[a=0.5e-3,k=2,f=10,lambda=515,colorMode=1]
-\uput[270](0,-2){$\backslash$\texttt{psdiffractionRectangle[a=0.5e-3,k=2,f=10,lambda=515,colorMode=1]}}
 \end{pspicture}
-\end{center}
-\begin{center}
-\begin{pspicture}(-4,-1)(4,1)
+\hfill
+\begin{pspicture}(-1.5,-2)(3.5,3)
+\psdiffractionRectangle[IIID,Alpha=20,a=0.5e-3,k=2,f=10,lambda=515,colorMode=1]
+\end{pspicture}
+
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-2.5,-2.5)(3.5,3)
+\psdiffractionRectangle[a=0.5e-3,k=2,f=10,lambda=515,colorMode=1]
+\end{pspicture}
+\hfill
+\begin{pspicture}(-1.5,-2)(3.5,3)
+\psdiffractionRectangle[IIID,Alpha=20,a=0.5e-3,k=2,f=10,lambda=515,colorMode=1]
+\end{pspicture}
+\end{lstlisting}
+
+
+\noindent
+\begin{pspicture}(-3.5,-1)(3.5,1)
 \psdiffractionRectangle[a=0.5e-3,k=20,f=10,pixel=0.5,lambda=450]
-\uput[270](0,-0.5){$\backslash$\texttt{psdiffractionRectangle[a=0.5e-3,k=20,f=10,lambda=450]}}
 \end{pspicture}
-\end{center}
+\hfill
+\begin{pspicture}(-3.5,-1)(3.5,4)
+\psdiffractionRectangle[IIID,Alpha=10,a=0.5e-3,k=20,f=10,pixel=0.5,lambda=450]
+\end{pspicture}
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3.5,-1)(3.5,1)
+\psdiffractionRectangle[a=0.5e-3,k=20,f=10,pixel=0.5,lambda=450]
+\end{pspicture}
+\hfill
+\begin{pspicture}(-3.5,-1)(3.5,4)
+\psdiffractionRectangle[IIID,Alpha=10,a=0.5e-3,k=20,f=10,pixel=0.5,lambda=450]
+\end{pspicture}
+\end{lstlisting}
 
 \section{Diffraction from two rectangular apertures}
 
-%\begin{shaded}
-%This simulation was provided by Julien
-%\textsc{Cubizolles}.
-%\end{shaded}
+\begin{shaded}
+This simulation was provided by Julien
+\textsc{Cubizolles}.
+\end{shaded}
 It is also possible to render the diffraction pattern of two congruent rectangles
 (placed parallel such that their base is located on the $x$-axis)
 by using the option \texttt{[twoSlit]}.
 By default this option is deactivated.
 The distance of the two rectangles is specified by the option $s$.
-The default for $s$ is $\texttt{12e-3}\,\mathrm{m}$.
+The default for $s$ is $12e^{-3}\,\mathrm{m}$.
+
+
 \begin{center}
+\noindent
 \begin{pspicture}(-4,-1)(4,1)
 \psdiffractionRectangle[a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3]
-\uput[270](0,-0.5){$\backslash
-$\texttt{psdiffractionRectangle[a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3]}}
 \end{pspicture}
 \end{center}
-\clearpage
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-4,-1)(4,1)
+\psdiffractionRectangle[a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3]
+\end{pspicture}
+\end{lstlisting}
+
+\begin{center}
+\begin{pspicture}(-2,-1)(4,4)
+\psdiffractionRectangle[IIID,Alpha=20,a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3]
+\end{pspicture}
+\end{center}
+
+\begin{lstlisting}[pos=t,style=example,wide=false]
+\begin{pspicture}(-2,-1)(4,4)
+\psdiffractionRectangle[IIID,Alpha=20,a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3]
+\end{pspicture}
+\end{lstlisting}
+
+
 
 
 
@@ -218,14 +304,19 @@ $\texttt{psdiffractionRectangle[a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,
 The radius of the circular opening can be chosen via the letter \texttt{r}, e.g.
 \texttt{[r=1e-3]}. The default is $r=1$ mm. In the first quadrant
 PSTricks displays the graph of the intensity distribution (the maximum in the center will be
-cropped if its height exceeds the margin of the \texttt{pspicture}-environment).
+cropped if its height exceeds the margin of the \psp-environment).
 
-\begin{center}
-\begin{pspicture}(-5,-5)(5,5)
+\hspace*{-1cm}%
+\begin{LTXexample}[pos=t,style=example,wide=false]
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
 \psdiffractionCircular[r=0.5e-3,f=10,pixel=0.5,lambda=520]
-\uput[270](0,-5){$\backslash$\texttt{psdiffractionCircular[r=0.5e-3,f=10,lambda=520]}}
 \end{pspicture}
-\end{center}
+%
+\begin{pspicture}(-3.5,-1.5)(3.5,3.5)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,pixel=0.5,lambda=520]
+\end{pspicture}
+\end{LTXexample}
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Diffraction from two circular apertures}
@@ -236,30 +327,71 @@ Furthermore one has to give the half distance of the circles measured from their
 \texttt{[twoHole]} has to be used.\\
 The rendering process could take some time in this case\dots
 
-\begin{center}
-\begin{pspicture}(-5,-5)(5,4)
+
+\begin{pspicture}(-3,-3.5)(3.5,3.5)
 \psdiffractionCircular[r=0.5e-3,f=10,d=3e-3,lambda=515,twoHole]
-\uput[270](0,-4){$\backslash$\texttt{psdiffractionCircular[r=0.5e-3,f=10,d=3e-3,lambda=515,twoHole]}}
 \end{pspicture}
-\end{center}
-\begin{center}
-\begin{pspicture}(-6,-6)(6,6)
+%
+\begin{pspicture}(-3.5,-1.5)(3.5,3.5)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=3e-3,lambda=515,twoHole]
+\end{pspicture}
+
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3,-3.5)(3.5,3.5)
+\psdiffractionCircular[r=0.5e-3,f=10,d=3e-3,lambda=515,twoHole]
+\end{pspicture}
+%
+\begin{pspicture}(-3.5,-1.5)(3.5,3.5)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=3e-3,lambda=515,twoHole]
+\end{pspicture}
+\end{lstlisting}
+
+
+\hspace*{-1cm}%
+\begin{pspicture}(-3,-3)(3.5,4)
 \psdiffractionCircular[r=0.5e-3,f=10,d=2e-3,lambda=700,twoHole,colorMode=0]
-\uput[270](0,-5){$\backslash$\texttt{psdiffractionCircular[r=0.5e-3,f=10,d=2e-3,lambda=700,twoHole,colorMode=0]}}
 \end{pspicture}
-\end{center}
+%
+\begin{pspicture}(-3.5,-2)(3.5,3.5)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=2e-3,lambda=700,twoHole,colorMode=0]
+\end{pspicture}
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3.5,-3)(3.5,4)
+\psdiffractionCircular[r=0.5e-3,f=10,d=2e-3,lambda=700,twoHole,colorMode=0]
+\end{pspicture}
+%
+\begin{pspicture}(-3.5,-2)(3.5,3.5)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=2e-3,lambda=700,twoHole,colorMode=0]
+\end{pspicture}
+\end{lstlisting}
 
 Not in every case bands occur in the central circle. The number $N$ of those inner
 bands is given by $N=2.44\frac{d}{r}$. Thus this effect is not observable until $N\geq2$
-or $d=\frac{2r}{1.22}$ (see \url{http://www.unice.fr/DeptPhys/optique/diff/trouscirc/diffrac.html}).
+or $d=\frac{2r}{1.22}$ (see 
+\url{http://www.unice.fr/DeptPhys/optique/diff/trouscirc/diffrac.html}).
 
-\begin{center}
-\begin{pspicture}(-5,-6)(5,5)
+\hspace*{-1cm}%
+\begin{pspicture}(-3,-3.5)(3,3.5)
 \psdiffractionCircular[r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]
-\uput[270](0,-5){$\backslash$
-\texttt{psdiffractionCircular[r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]}}
 \end{pspicture}
-\end{center}
+%
+\begin{pspicture}(-3.5,-1.5)(3.5,3)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]
+\end{pspicture}
+
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3,-3.5)(3,3.5)
+\psdiffractionCircular[r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]
+\end{pspicture}
+%
+\begin{pspicture}(-3.5,-1.5)(3.5,3)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]
+\end{pspicture}
+\end{lstlisting}
+
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -271,34 +403,70 @@ its side by $h=\frac{\sqrt{3}}{2}s$. A black and white picture can be obtained b
 option \texttt{[colorMode=0]}.
 
 
+
 \begin{center}
 \begin{pspicture}(-1,-1)(1,1)
 \pspolygon*(0,0)(1;150)(1;210)
 \pcline{|-|}(-0.732,-1)(0,-1)
 \Aput{$h$}
 \end{pspicture}
-
-\vspace{1cm}
-$\backslash$\texttt{psdiffractionTriangle[f=10,h=1e-3,contrast=38,colorMode=]}
+\end{center}
 
 \makebox[\linewidth]{%
-\begin{pspicture}(-3,-3)(3,3)
+\begin{pspicture}(-3,-3)(3,2.5)
 \psdiffractionTriangle[f=10,h=1e-3,lambda=515,contrast=38]
-\uput[270](0,-2.5){default color mode (>1)}
 \end{pspicture}
 \quad
-\begin{pspicture}(-3,-3)(3,3)
+\begin{pspicture}(-3,-3)(3,2.5)
 \psdiffractionTriangle[f=10,h=1e-3,colorMode=1,contrast=38,lambda=515]
-\uput[270](0,-2.5){\texttt{colorMode=1}}
 \end{pspicture}
 \quad
-\begin{pspicture}(-3,-3)(3,3)
+\begin{pspicture}(-3,-3)(3,2.5)
 \psdiffractionTriangle[f=10,h=1e-3,colorMode=0,contrast=38,lambda=515]
-\uput[270](0,-2.5){\texttt{colorMode=0}}
 \end{pspicture}}
 
-\end{center}
 
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3,-3)(3,2.5)
+\psdiffractionTriangle[f=10,h=1e-3,lambda=515,contrast=38]
+\end{pspicture}
+\quad
+\begin{pspicture}(-3,-3)(3,2.5)
+\psdiffractionTriangle[f=10,h=1e-3,colorMode=1,contrast=38,lambda=515]
+\end{pspicture}
+\quad
+\begin{pspicture}(-3,-3)(3,2.5)
+\psdiffractionTriangle[f=10,h=1e-3,colorMode=0,contrast=38,lambda=515]
+\end{pspicture}
+\end{lstlisting}
+
+
+\makebox[\linewidth]{%
+\begin{pspicture}(-3,-2)(3,3.5)
+\psdiffractionTriangle[IIID,f=10,h=1e-3,lambda=515,contrast=38]
+\end{pspicture}
+\quad
+\begin{pspicture}(-3,-2)(3,3.5)
+\psdiffractionTriangle[IIID,f=10,h=1e-3,colorMode=1,contrast=38,lambda=515]
+\end{pspicture}
+\quad
+\begin{pspicture}(-3,-2)(3,3.5)
+\psdiffractionTriangle[IIID,f=10,h=1e-3,colorMode=0,contrast=38,lambda=515]
+\end{pspicture}}
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3,-2)(3,3.5)
+\psdiffractionTriangle[IIID,f=10,h=1e-3,lambda=515,contrast=38]
+\end{pspicture}
+\quad
+\begin{pspicture}(-3,-2)(3,3.5)
+\psdiffractionTriangle[IIID,f=10,h=1e-3,colorMode=1,contrast=38,lambda=515]
+\end{pspicture}
+\quad
+\begin{pspicture}(-3,-2)(3,3.5)
+\psdiffractionTriangle[IIID,f=10,h=1e-3,colorMode=0,contrast=38,lambda=515]
+\end{pspicture}
+\end{lstlisting}
 
 
 
diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docFR.pdf b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docFR.pdf
index 17c89328f41..5059c652a5e 100644
--- a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docFR.pdf
+++ b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docFR.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docFR.tex b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docFR.tex
index f7203cd4c19..0f59dfe1556 100644
--- a/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docFR.tex
+++ b/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-docFR.tex
@@ -1,4 +1,4 @@
-\documentclass[dvips,a4paper]{article}
+\documentclass[frenchb,dvips,a4paper]{article}
 \usepackage[latin9]{inputenc}%
 \usepackage[T1]{fontenc}
 \usepackage[bmargin=2cm,tmargin=2cm]{geometry}
@@ -11,13 +11,26 @@
 \usepackage{ccfonts}
 \usepackage[euler-digits]{eulervm}
 \usepackage[scaled=0.85]{luximono}
+\usepackage{xspace}
+\newcommand*\psp{\texttt{pspicture}\xspace}
 \def\UrlFont{\small\ttfamily}
 \makeatletter
 \def\verbatim@font{\small\normalfont\ttfamily}
 \makeatother
-\usepackage{prettyref}
+\usepackage{prettyref,multicol}
 \usepackage{fancyhdr}
 
+\usepackage{showexpl}
+\lstdefinestyle{syntax}{backgroundcolor=\color{blue!20},numbers=none,xleftmargin=0pt,xrightmargin=0pt,
+    frame=single}
+\lstdefinestyle{example}{backgroundcolor=\color{red!20},numbers=none,xleftmargin=0pt,xrightmargin=0pt,
+    frame=single}
+\lstset{wide=true,language=PSTricks,
+    morekeywords={psdiffractionCircular,psdiffractionRectangle,psdiffractionTriangle}}
+
+\usepackage{babel}
+\usepackage[colorlinks,linktocpage]{hyperref}
+
 \pagestyle{fancy}
 \def\Lcs#1{{\ttfamily\textbackslash #1}}
 \lfoot{\small\ttfamily\jobname.tex}
@@ -118,17 +131,18 @@ divers paramètres du montage.
 Il y a trois commandes, l'une pour les ouvertures rectangulaires, l'autre
 pour les ouvertures circulaires et la dernière pour une ouverture
 triangulaire.
-\begin{verbatim}
+\begin{lstlisting}[style=syntax]
 \psdiffractionRectangle[<liste de paramètres>]
 \psdiffractionCircular[<liste de paramètres>]
 \psdiffractionTriangle[<liste de paramètres>]
-\end{verbatim}
+\end{lstlisting}
+
 Nous allons passer en revue ces différentes commandes et leurs paramètres.
 \section{La couleur de la radiation}
 La longueur d'onde est définie par le paramètres \texttt{[lambda=632]} (si
 l'on veut du rouge  de longueur d'onde~:~ $\lambda=632$~nm), cette valeur est donc en~nm. La
 conversion de la longueur d'onde dans le système \texttt{rgb} est une adaptation en
-postscript de celle qu'on trouve sur~:
+postscript de celle qu'on trouve sur~:\\  
 \url{http://www.physics.sfasu.edu/astro/color.html}.
 
 
@@ -154,97 +168,230 @@ negativ avec \texttt{[colorMode=1]} ou cmyk couleur avec \texttt{[colorMode=2]}
 rgb avec \texttt{[colorMode=3]}.
 
 Par défaut les paramètres ont les valeurs suivantes :
-\begin{itemize}
-  \item \texttt{[a=0.2e-3]} en m ;
-  \item \texttt{[k=1]} ;
-  \item \texttt{[f=5]} en m ;
-  \item \texttt{[lambda=650]} en nm ;
-  \item \texttt{[pixel=0.5]} ;
-  \item \texttt{[contrast=38]}, valeur maximale  ;
-  \item \texttt{[colorMode=3]}.
-\end{itemize}
 
-\begin{center}
-\begin{pspicture}(-4,-4)(4,4)
+\begin{tabular}{@{}lll@{}}
+\texttt{[a=0.2e-3]} en m;    & \texttt{[k=1]};       &  \texttt{[f=5]} en m;\\
+\texttt{[lambda=650]} en nm; & \texttt{[pixel=0.5]}; &   \texttt{[contrast=38]}, valeur maximale;\\
+\texttt{[colorMode=3]};   &   \texttt{[IIID=false]}.
+\end{tabular}
+
+\bigskip
+\noindent
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
 \psdiffractionRectangle[f=2.5]
-\uput[270](0,-3.5){$\backslash$\texttt{psdiffractionRectangle[f=2.5]}}
 \end{pspicture}
-\end{center}
-\begin{center}
-\begin{pspicture}(-2,-4.5)(2,4.5)
+\hfill
+\begin{pspicture}(-1.5,-2.5)(3.5,3.5)
+\psdiffractionRectangle[IIID,Alpha=30,f=2.5]
+\end{pspicture}
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
+\psdiffractionRectangle[f=2.5]
+\end{pspicture}
+\hfill
+\begin{pspicture}(-1.5,-2.5)(3.5,3.5)
+\psdiffractionRectangle[IIID,Alpha=30,f=2.5]
+\end{pspicture}
+\end{lstlisting}
+
+
+
+\noindent\begin{pspicture}(-2,-4)(2,4)
 \psdiffractionRectangle[a=0.5e-3,k=0.5,f=4,pixel=0.5,colorMode=0]
-\uput[270](0,-4.5){$\backslash$\texttt{psdiffractionRectangle[a=0.5e-3,k=0.5,f=4,colorMode=0]}}
 \end{pspicture}
-\end{center}
-\begin{center}
-\begin{pspicture}(-4,-2.5)(4,3)
+\hfill
+\begin{pspicture}(0,-3)(4,4)
+\psdiffractionRectangle[IIID,a=0.5e-3,k=0.5,f=4,pixel=0.5,colorMode=0]
+\end{pspicture}
+
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-2,-4)(2,4)
+\psdiffractionRectangle[a=0.5e-3,k=0.5,f=4,pixel=0.5,colorMode=0]
+\end{pspicture}
+\hfill
+\begin{pspicture}(0,-3)(4,4)
+\psdiffractionRectangle[IIID,a=0.5e-3,k=0.5,f=4,pixel=0.5,colorMode=0]
+\end{pspicture}
+\end{lstlisting}
+
+
+
+\noindent
+\begin{pspicture}(-2.5,-2.5)(3.5,3)
 \psdiffractionRectangle[a=0.5e-3,k=2,f=10,lambda=515,colorMode=1]
-\uput[270](0,-2){$\backslash$\texttt{psdiffractionRectangle[a=0.5e-3,k=2,f=10,lambda=515,colorMode=1]}}
 \end{pspicture}
-\end{center}
-\begin{center}
-\begin{pspicture}(-4,-1)(4,1)
+\hfill
+\begin{pspicture}(-1.5,-2)(3.5,3)
+\psdiffractionRectangle[IIID,Alpha=20,a=0.5e-3,k=2,f=10,lambda=515,colorMode=1]
+\end{pspicture}
+
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-2.5,-2.5)(3.5,3)
+\psdiffractionRectangle[a=0.5e-3,k=2,f=10,lambda=515,colorMode=1]
+\end{pspicture}
+\hfill
+\begin{pspicture}(-1.5,-2)(3.5,3)
+\psdiffractionRectangle[IIID,Alpha=20,a=0.5e-3,k=2,f=10,lambda=515,colorMode=1]
+\end{pspicture}
+\end{lstlisting}
+
+
+\noindent
+\begin{pspicture}(-3.5,-1)(3.5,1)
 \psdiffractionRectangle[a=0.5e-3,k=20,f=10,pixel=0.5,lambda=450]
-\uput[270](0,-0.5){$\backslash$\texttt{psdiffractionRectangle[a=0.5e-3,k=20,f=10,lambda=450]}}
 \end{pspicture}
-\end{center}
+\hfill
+\begin{pspicture}(-3.5,-1)(3.5,4)
+\psdiffractionRectangle[IIID,Alpha=10,a=0.5e-3,k=20,f=10,pixel=0.5,lambda=450]
+\end{pspicture}
 
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3.5,-1)(3.5,1)
+\psdiffractionRectangle[a=0.5e-3,k=20,f=10,pixel=0.5,lambda=450]
+\end{pspicture}
+\hfill
+\begin{pspicture}(-3.5,-1)(3.5,4)
+\psdiffractionRectangle[IIID,Alpha=10,a=0.5e-3,k=20,f=10,pixel=0.5,lambda=450]
+\end{pspicture}
+\end{lstlisting}
 
 \section{Diffraction par deux ouverture rectangulaire}
 
-%\begin{shaded}
-%This simulation was provided by Julien
-%\textsc{Cubizolles}.
-%\end{shaded}
+\begin{shaded}
+This simulation was provided by Julien \textsc{Cubizolles}.
+\end{shaded}
+
 \begin{center}
+\noindent
 \begin{pspicture}(-4,-1)(4,1)
 \psdiffractionRectangle[a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3]
-\uput[270](0,-0.5){$\backslash
-$\texttt{psdiffractionRectangle[a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3]}}
 \end{pspicture}
 \end{center}
 
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-4,-1)(4,1)
+\psdiffractionRectangle[a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3]
+\end{pspicture}
+\end{lstlisting}
+
+\begin{center}
+\begin{pspicture}(-2,-1)(4,4)
+\psdiffractionRectangle[IIID,Alpha=20,a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3]
+\end{pspicture}
+\end{center}
+
+\begin{lstlisting}[pos=t,style=example,wide=false]
+\begin{pspicture}(-2,-1)(4,4)
+\psdiffractionRectangle[IIID,Alpha=20,a=0.5e-3,k=10,f=10,pixel=0.5,lambda=650,twoSlit,s=2e-3]
+\end{pspicture}
+\end{lstlisting}
+
 
 
 \section{Diffraction par une ouverture circulaire}
 On donnera le rayon du trou : \texttt{[r=1e-3]}, $r=1$ mm par défaut. Les
 variations de l'intensité sont superposées à la figure de diffraction dans
 le premier quadrant (le maximum au centre a été écrêté).
+
+
 \begin{center}
-\begin{pspicture}(-5,-5)(5,5)
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
 \psdiffractionCircular[r=0.5e-3,f=10,pixel=0.5,lambda=520]
-\uput[270](0,-5){$\backslash$\texttt{psdiffractionCircular[r=0.5e-3,f=10,lambda=520]}}
+\end{pspicture}
+%
+\begin{pspicture}(-3.5,-1.5)(3.5,3.5)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,pixel=0.5,lambda=520]
 \end{pspicture}
 \end{center}
 
 
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
+\psdiffractionCircular[r=0.5e-3,f=10,pixel=0.5,lambda=520]
+\end{pspicture}
+%
+\begin{pspicture}(-3.5,-1.5)(3.5,3.5)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,pixel=0.5,lambda=520]
+\end{pspicture}
+\end{lstlisting}
+
+
+
 \section{Diffraction par deux trous circulaires}
 Les deux trous sont identiques, outre le rayon commun des trous on fixera la
 demi-distance entre les centres des deux trous avec : \texttt{[d]} et pour
 ce cas de figure on activera l'option \texttt{[twoHole]}. On notera que
 les temps de calculs d'allongent\ldots
-\begin{center}
-\begin{pspicture}(-5,-5)(5,4)
+
+
+\begin{pspicture}(-3,-3.5)(3.5,3.5)
 \psdiffractionCircular[r=0.5e-3,f=10,d=3e-3,lambda=515,twoHole]
-\uput[270](0,-4){$\backslash$\texttt{psdiffractionCircular[r=0.5e-3,f=10,d=3e-3,lambda=515,twoHole]}}
 \end{pspicture}
-\end{center}
-\begin{center}
-\begin{pspicture}(-6,-6)(6,6)
+%
+\begin{pspicture}(-3.5,-1.5)(3.5,3.5)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=3e-3,lambda=515,twoHole]
+\end{pspicture}
+
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3,-3.5)(3.5,3.5)
+\psdiffractionCircular[r=0.5e-3,f=10,d=3e-3,lambda=515,twoHole]
+\end{pspicture}
+%
+\begin{pspicture}(-3.5,-1.5)(3.5,3.5)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=3e-3,lambda=515,twoHole]
+\end{pspicture}
+\end{lstlisting}
+
+
+\hspace*{-1cm}%
+\begin{pspicture}(-3,-3)(3.5,4)
 \psdiffractionCircular[r=0.5e-3,f=10,d=2e-3,lambda=700,twoHole,colorMode=0]
-\uput[270](0,-5){$\backslash$\texttt{psdiffractionCircular[r=0.5e-3,f=10,d=2e-3,lambda=700,twoHole,colorMode=0]}}
 \end{pspicture}
-\end{center}
+%
+\begin{pspicture}(-3.5,-2)(3.5,3.5)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=2e-3,lambda=700,twoHole,colorMode=0]
+\end{pspicture}
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3.5,-3)(3.5,4)
+\psdiffractionCircular[r=0.5e-3,f=10,d=2e-3,lambda=700,twoHole,colorMode=0]
+\end{pspicture}
+%
+\begin{pspicture}(-3.5,-2)(3.5,3.5)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=2e-3,lambda=700,twoHole,colorMode=0]
+\end{pspicture}
+\end{lstlisting}
+
 Le cas limite d'obtention de franges se vérifie avec $\displaystyle d
-=\frac{a}{1.22}$. Voir~:
+=\frac{a}{1.22}$. Voir~:\\
+\url{http://www.unice.fr/DeptPhys/optique/diff/trouscirc/diffrac.html}).
 
-\url{http://www.unice.fr\DeptPhys\optique\optique.html}.
-\begin{center}
-\begin{pspicture}(-5,-6)(5,5)
+\hspace*{-1cm}%
+\begin{pspicture}(-3,-3.5)(3,3.5)
 \psdiffractionCircular[r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]
-\uput[270](0,-5){$\backslash$\texttt{psdiffractionCircular[r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]}}
 \end{pspicture}
-\end{center}
+%
+\begin{pspicture}(-3.5,-1.5)(3.5,3)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]
+\end{pspicture}
+
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3,-3.5)(3,3.5)
+\psdiffractionCircular[r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]
+\end{pspicture}
+%
+\begin{pspicture}(-3.5,-1.5)(3.5,3)
+\psdiffractionCircular[IIID,r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]
+\end{pspicture}
+\end{lstlisting}
+
+
 
 \section{Diffraction par un trou triangulaire équilatéral}
 Le triangle équilatéral est défini par sa hauteur \texttt{[h]} en m. Pour le
@@ -253,33 +400,70 @@ triangle, on peut obtenir la figure en niveaux de gris avec l'option
 \textsc{Airy}, on la trouve dans le livre d'Henri \textsc{Bouasse} sur la
 diffraction, pages 114 et 115.
 
+
 \begin{center}
 \begin{pspicture}(-1,-1)(1,1)
 \pspolygon*(0,0)(1;150)(1;210)
 \pcline{|-|}(-0.732,-1)(0,-1)
 \Aput{$h$}
 \end{pspicture}
-
-\vspace{1cm}
-$\backslash$\texttt{psdiffractionTriangle[f=10,h=1e-3,contrast=38,colorMode=]}
+\end{center}
 
 \makebox[\linewidth]{%
-\begin{pspicture}(-3,-3)(3,3)
+\begin{pspicture}(-3,-3)(3,2.5)
 \psdiffractionTriangle[f=10,h=1e-3,lambda=515,contrast=38]
-\uput[270](0,-2.5){default color mode (>1)}
 \end{pspicture}
-%
-\begin{pspicture}(-3,-3)(3,3)
+\quad
+\begin{pspicture}(-3,-3)(3,2.5)
 \psdiffractionTriangle[f=10,h=1e-3,colorMode=1,contrast=38,lambda=515]
-\uput[270](0,-2.5){\texttt{colorMode=1}}
 \end{pspicture}
-%
-\begin{pspicture}(-3,-3)(3,3)
+\quad
+\begin{pspicture}(-3,-3)(3,2.5)
 \psdiffractionTriangle[f=10,h=1e-3,colorMode=0,contrast=38,lambda=515]
-\uput[270](0,-2.5){\texttt{colorMode=0}}
 \end{pspicture}}
 
-\end{center}
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3,-3)(3,2.5)
+\psdiffractionTriangle[f=10,h=1e-3,lambda=515,contrast=38]
+\end{pspicture}
+\quad
+\begin{pspicture}(-3,-3)(3,2.5)
+\psdiffractionTriangle[f=10,h=1e-3,colorMode=1,contrast=38,lambda=515]
+\end{pspicture}
+\quad
+\begin{pspicture}(-3,-3)(3,2.5)
+\psdiffractionTriangle[f=10,h=1e-3,colorMode=0,contrast=38,lambda=515]
+\end{pspicture}
+\end{lstlisting}
+
+
+\makebox[\linewidth]{%
+\begin{pspicture}(-3,-2)(3,3.5)
+\psdiffractionTriangle[IIID,f=10,h=1e-3,lambda=515,contrast=38]
+\end{pspicture}
+\quad
+\begin{pspicture}(-3,-2)(3,3.5)
+\psdiffractionTriangle[IIID,f=10,h=1e-3,colorMode=1,contrast=38,lambda=515]
+\end{pspicture}
+\quad
+\begin{pspicture}(-3,-2)(3,3.5)
+\psdiffractionTriangle[IIID,f=10,h=1e-3,colorMode=0,contrast=38,lambda=515]
+\end{pspicture}}
+
+\begin{lstlisting}[style=example]
+\begin{pspicture}(-3,-2)(3,3.5)
+\psdiffractionTriangle[IIID,f=10,h=1e-3,lambda=515,contrast=38]
+\end{pspicture}
+\quad
+\begin{pspicture}(-3,-2)(3,3.5)
+\psdiffractionTriangle[IIID,f=10,h=1e-3,colorMode=1,contrast=38,lambda=515]
+\end{pspicture}
+\quad
+\begin{pspicture}(-3,-2)(3,3.5)
+\psdiffractionTriangle[IIID,f=10,h=1e-3,colorMode=0,contrast=38,lambda=515]
+\end{pspicture}
+\end{lstlisting}