texlive[71772] Master/texmf-dist: pst-diffraction (11jul24)

commits+karl at tug.org commits+karl at tug.org
Thu Jul 11 21:56:59 CEST 2024


Revision: 71772
          https://tug.org/svn/texlive?view=revision&revision=71772
Author:   karl
Date:     2024-07-11 21:56:59 +0200 (Thu, 11 Jul 2024)
Log Message:
-----------
pst-diffraction (11jul24)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/generic/pst-diffraction/Changes
    trunk/Master/texmf-dist/doc/generic/pst-diffraction/README
    trunk/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.bib
    trunk/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.pdf
    trunk/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.tex
    trunk/Master/texmf-dist/tex/generic/pst-diffraction/pst-diffraction.tex

Modified: trunk/Master/texmf-dist/doc/generic/pst-diffraction/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-diffraction/Changes	2024-07-10 23:41:55 UTC (rev 71771)
+++ trunk/Master/texmf-dist/doc/generic/pst-diffraction/Changes	2024-07-11 19:56:59 UTC (rev 71772)
@@ -1,4 +1,6 @@
 pst-diffraction.tex --------
+2.06  2004-07-10  - fix for missing contrast option for \psdiffractionCircular (Keno Wehr)
+2.05  2024-07-10  - removed unused optional argument gamma
 2.04a 2024-06-29  - bugfix for the documentation header
                   - removed german and french docs
 2.04  2010-01-05  - fix bug with missing \space for keywords

Modified: trunk/Master/texmf-dist/doc/generic/pst-diffraction/README
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-diffraction/README	2024-07-10 23:41:55 UTC (rev 71771)
+++ trunk/Master/texmf-dist/doc/generic/pst-diffraction/README	2024-07-11 19:56:59 UTC (rev 71772)
@@ -1,9 +1,9 @@
 %% Package `pst-diffraction.tex'
 %%
-%% Manuel Luque (ml _at_ pstricks.de) (France)
-%% Herbert Voss (hv _at_ pstricks.de) (Germany)
+%% Manuel Luque  (France)
+%% Herbert Voss (hvoss _at_ tug.org) (Germany)
 %%
-%% 2024-06-29
+%% 2024-07-10
 %%
 
 PSTricks offers excellent macros to insert more or less complex 
@@ -19,24 +19,14 @@
 
 pst-diffraction.sty 
 pst-diffraction.tex
-pst-diffraction.pro
 
 in any place, where latex or any other TeX program will find it.
-The pro file should go into $TEXMF$/dvips/pstricks/.
 
-pst-diffraction uses the extended version of the keyval package. So
-be sure that you 
-- have installed xkeyval with the special pst-xkey
-  (CTAN: tex-archive/macros/latex/contrib/xkeyval/)
-- 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
+make
+
+or for all make all  ;-) this may take some time, because
 the images are very big.
 
 If you like to get the documentation file in another format run 
@@ -50,8 +40,7 @@
 files are saved in the above mentioned way, before you run
 latex on the documentation file.
 
-The intermediate DVI file works only with viewers which can 
-interprete the embedded PostScript code.
+Running the files with lualatex is possible, but may take a lot of
+time in fact of the heavy calculations.
 
-For another PDF output read the introduction from
-the documentation.
+hvoss at tug.org

Modified: trunk/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.bib
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.bib	2024-07-10 23:41:55 UTC (rev 71771)
+++ trunk/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.bib	2024-07-11 19:56:59 UTC (rev 71772)
@@ -1,45 +1,105 @@
- at STRING{dtk	= {{D}ie {\TeX}nische {K}om{\"o}die} }
+ at STRING{tugboat	= {TUGboat} }
+ at STRING{dtk	= {Die {\TeX}nische Komödie} }
+ at STRING{bretter	= {Bretter, die die Welt bedeuten } }
 
+ at Book{companion,
+  author	= {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Voß},
+  title		= {The {\LaTeX} Graphics Companion},
+  publisher	= {Lehmanns Media},
+  edition	= {2},
+  date		= {2022},
+  location	= {Berlin},
+  note={Preprint of the english version, 2nd edition}
+}
+
+ at Article{girou:01:,
+  author	= {Denis Girou},
+  title		= {Présentation de PSTricks},
+  journal	= {Cahier {GUT}enberg},
+  year		= 1994,
+  volume	= {16},
+  month		= apr,
+  pages		= {21-70}
+}
+
+ at 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          = {PostScript richtig eingesetzt: vom Konzept zum praktischen Einsatz},
   Publisher      = {IWT},
   Address        = {Vaterstetten},
   year           = 1989,
 }
 
- at 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,
+ at ctan{multido,
+title = {The Multido package},
+subtitle = {A loop facility for Generic TeX},
+author = {Van Zandt, Timothy and Voß, Herbert and  Niepraschk, Rolf},
+url = {macros/latex/multido},
+urldate = {2018-09-01}, 
+version = {1.42}
 }
 
 
- at Manual{pdftricks,
-  Title          = {PSTricks Support for pdf},
-  Author         = {Herbert Voss},
-  Organization   = {},
-  Address        = {\url{http://PSTricks.de/pdf/pdfoutput.phtml}},
-  Note           = {},
-  year           = 2002,
+ at Book{PSTricks2,
+  author	= {Herbert Voß},
+  title		= {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
+  edition	= {7},
+  publisher	= {DANTE {\eV} and Lehmanns Media},
+  date		= {2016},
+  address	= {Heidelberg and Hamburg}
 }
 
- at 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,
+ at Book{PSTricksE,
+  author	= {Herbert Voß},
+  title		= {\texttt{PSTricks} -- Graphics and PostScript for \LaTeX},
+  edition	= {1},
+  publisher	= {UIT},
+  date		= {2011},
+  address	= {Cambridge -- UK}
 }
 
+ at Book{LTXquick,
+  author	= {Herbert Voß},
+  title		= {{\LaTeX} quick reference},
+  edition	= {1},
+  publisher	= {UIT},
+  year		= {2012},
+  address	= {Cambridge -- UK}
+}
 
+ at Book{presentations,
+  author	= {Herbert Voß},
+  title		= {Presentations with \LaTeX},
+  edition	= {2},
+  publisher	= {DANTE {\eV} and Lehmanns Media},
+  year		= {2019},
+  address	= {Heidelberg and Berlin}
+}
+
+
+ at Book{tbt,
+  author	= {Victor Eijkhout},
+  title		= {\TeX\ by Topic -- {A} \TeX{}nician Reference},
+  edition	= {1},
+  publisher	= {DANTE {\eV} and Lehmanns Media},
+  year		= {2014},
+  address	= {Heidelberg and Berlin}
+}
+
+
+
 @Article{dtk02.1:voss:mathematischen,
-  author	= {Herbert Vo{\ss}},
+  author	= {Herbert Voß},
   title		= {Die mathematischen {F}unktionen von {P}ostscript},
   journal	= dtk,
   year		= 2002,
@@ -49,7 +109,6 @@
   month		= mar,
   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
@@ -61,31 +120,30 @@
 		  gezeigt. }
 }
 
- at Book{companion,
-  author	= {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}},
-  title		= {The {\LaTeX} {G}raphics {C}ompanion},
-  publisher	= {{Addison-Wesley Publishing Company}},
-  edition	= 2,
-  year		= {2007},
-  address	= {Reading, Mass.}
+
+ at Book{PostScript,
+  Author         = {Kollock, Nikolai G.},
+  Title          = {PostScript richtig eingesetzt: vom Konzept zum
+                   praktischen Einsatz},
+  Publisher      = {IWT},
+  Address        = {Vaterstetten},
+  year           = 1989,
 }
 
- at Book{PSTricks2,
-  author	= {Herbert Vo\ss},
-  title		= {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
-  edition	= {4.},
-  publisher	= {DANTE -- Lehmanns},
-  year		= {2007},
-  address	= {Heidelberg/Hamburg}
+ at online{pstricks,
+  Title          = {PSTricks - {\PS} macros for Generic TeX},
+  Author         = {Timothy Van Zandt},
+  Organization   = {},
+  url        = {http://www.tug.org/application/PSTricks},
+  year           = 1993,
 }
 
- at Book{LaTeXRef,
-  author	= {Herbert Vo\ss},
-  title		= {\LaTeX\ Referenz},
-  edition	= {1.},
-  publisher	= {DANTE -- Lehmanns},
-  year		= {2007},
-  address	= {Heidelberg/Hamburg}
+
+ at online{pdftricks,
+  Title          = {PSTricks Support for pdf},
+  Author         = {Herbert Voß},
+  url        = {http://PSTricks.de/pdf/pdfoutput.phtml},
+  year           = 2002,
 }
 
 @Book{diffraction,
@@ -107,12 +165,11 @@
  publisher = {Society of {P}hoto {O}ptical}
 }
 
- at Manual{Fresnel,
+ at online{Fresnel,
   Title          = {Augustin Fresnel},
   Author         = {Manuel Luque},
   Organization   = {},
-  Address        = {\url{http://melusine.eu.org/syracuse/mluque/fresnel/augustin/fresnel.html}},
-  Note           = {},
+  url        = {http://melusine.eu.org/syracuse/mluque/fresnel/augustin/fresnel.html},
   year           = 2004
 }
 

Modified: trunk/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.tex	2024-07-10 23:41:55 UTC (rev 71771)
+++ trunk/Master/texmf-dist/doc/generic/pst-diffraction/pst-diffraction-doc.tex	2024-07-11 19:56:59 UTC (rev 71772)
@@ -1,13 +1,16 @@
 %% $Id: pst-diffraction-docE.tex 134 2009-09-27 12:28:50Z herbert $
-\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings,
-    headexclude,footexclude,oneside]{pst-doc}
-\usepackage{pst-grad,pst-diffraction}
-\let\pstDiffractionFV\fileversion
+\documentclass[11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false,headings=small,
+    headinclude=false,footinclude=false,twoside,english]{pst-doc}
 
 \usepackage{libertinus}
 \usepackage{biblatex}
 \addbibresource{pst-diffraction-doc.bib}
 
+\usepackage{pst-grad,pst-diffraction}
+\let\pstDiffractionFV\fileversion
+
+
+
 \lstset{pos=t,wide=true,language=PSTricks,
     morekeywords={psdiffractionRectangle,psdiffractionCircle,psdiffractionCircular},basicstyle=\footnotesize\ttfamily}
 \lstdefinestyle{syntax}{backgroundcolor=\color{blue!20},numbers=none,xleftmargin=0pt,xrightmargin=0pt,
@@ -16,6 +19,15 @@
     frame=single}
 \newcommand*\psp{\texttt{pspicture}\xspace}
 %
+
+\renewcommand\bgImage{%
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
+\psdiffractionCircular[f=10,showFunc=true]
+\end{pspicture}
+}
+
+\def\eV{e.\kern-1pt{}V\kern-1pt}
+
 \begin{document}
 
 \title{\texttt{pst-diffraction}}
@@ -24,22 +36,19 @@
 \author{Manuel Luque \\ Herbert Vo\ss}
 \docauthor{Herbert Voß}
 \date{\today}
-\maketitle
+%\maketitle
+\settitle
 
 \tableofcontents
+\psset{unit=1cm}
 
-\clearpage
-
-\begin{abstract}
-\noindent
-
 \vfill\noindent
 Thanks to: Julien Cubizolles,
 Doris Wagner, 
 Timothy Van Zandt, Keno Wehr,
 Michael Zedler.
-\end{abstract}
 
+
 \section{Optical setup}
 
 \begin{center}
@@ -136,7 +145,7 @@
 
 \begin{tabular}{@{}lll@{}}
 \Lkeyword{a}=0.2e-3 in m;    & \Lkeyword{k}=1;       &  \Lkeyword{f}=5 in m;\\
-\Lkeyword{lambda}=650 in nm; & \Lkeyword{pixel}=0.5; &   \Lkeyword{contrast}=38, greates value;\\
+\Lkeyword{lambda}=650 in nm; & \Lkeyword{pixel}=0.5; &   \Lkeyword{contrast}=38, greatest value;\\
 \Lkeyword{colorMode}=3;   &   \Lkeyword{IIID}=\false.
 \end{tabular}
 
@@ -156,7 +165,7 @@
 \end{pspicture}
 \hfill
 \begin{pspicture}(-1.5,-2.5)(3.5,3.5)
-\psdiffractionRectangle[IIID,Alpha=30,f=2.5]
+\psdiffractionRectangle[IIID,Alpha=30,f=2.5]% for Alpha see package pst-3dplot
 \end{pspicture}
 \end{lstlisting}
 
@@ -200,6 +209,7 @@
 \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]
+%  % for Alpha see package pst-3dplot
 \end{pspicture}
 \end{lstlisting}
 
@@ -211,6 +221,7 @@
 \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]
+%  % for Alpha see package pst-3dplot
 \end{pspicture}
 
 \begin{lstlisting}[style=example]
@@ -220,6 +231,7 @@
 \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]
+%  % for Alpha see package pst-3dplot
 \end{pspicture}
 \end{lstlisting}
 
@@ -230,7 +242,7 @@
 by using the option \Lkeyword{twoSlit}.
 By default this option is deactivated.
 The distance of the two rectangles is specified by the option $s$.
-The default for $s$ is $12e^{-3}\,\mathrm{m}$.
+The default for $s$ is $12\cdot10^{-3}\,\mathrm{m}$.
 
 
 \begin{center}
@@ -249,6 +261,7 @@
 \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]
+%  % for Alpha see package pst-3dplot
 \end{pspicture}
 \end{center}
 
@@ -255,6 +268,7 @@
 \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]
+%  % for Alpha see package pst-3dplot
 \end{pspicture}
 \end{lstlisting}
 
@@ -281,6 +295,20 @@
 \end{LTXexample}
 
 
+\begin{LTXexample}[pos=t,style=example,wide=false]
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
+\psdiffractionCircular[f=10]
+\end{pspicture}
+\hfill
+\begin{pspicture}(-3.5,-3.5)(3.5,3.5)
+\psdiffractionCircular[f=10,showFunc=true]
+\end{pspicture}
+\end{LTXexample}
+
+
+
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \section{Diffraction from two circular apertures}
 Only the case of equal radii is provided, this common radius can be defined like in the
@@ -291,7 +319,7 @@
 The rendering process could take some time in this case\dots
 
 
-\begin{pspicture}(-3,-3.5)(3.5,3.5)
+\begin{pspicture}(-3.5,-3.5)(4,3.5)
 \psdiffractionCircular[r=0.5e-3,f=10,d=3e-3,lambda=515,twoHole]
 \end{pspicture}
 %
@@ -312,7 +340,7 @@
 
 
 \hspace*{-1cm}%
-\begin{pspicture}(-3,-3)(3.5,4)
+\begin{pspicture}(-4,-3)(4,4)
 \psdiffractionCircular[r=0.5e-3,f=10,d=2e-3,lambda=700,twoHole,colorMode=0]
 \end{pspicture}
 %
@@ -336,21 +364,22 @@
 \url{http://www.unice.fr/DeptPhys/optique/diff/trouscirc/diffrac.html}).
 
 \hspace*{-1cm}%
-\begin{pspicture}(-3,-3.5)(3,3.5)
+\begin{pspicture}(-4,-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)
+\begin{pspicture}(-5,-1.5)(3.5,3)
 \psdiffractionCircular[IIID,r=0.5e-3,f=10,d=4.1e-4,lambda=632,twoHole]
 \end{pspicture}
 
 
+\bigskip
 \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)
+\begin{pspicture}(-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}
@@ -377,7 +406,7 @@
 
 \makebox[\linewidth]{%
 \begin{pspicture}(-3,-3)(3,2.5)
-\psdiffractionTriangle[f=10,h=1e-3,lambda=515,contrast=38]
+\psdiffractionTriangle[f=10,h=1e-3,lambda=515,contrast=18]
 \end{pspicture}
 \quad
 \begin{pspicture}(-3,-3)(3,2.5)
@@ -391,7 +420,7 @@
 
 \begin{lstlisting}[style=example]
 \begin{pspicture}(-3,-3)(3,2.5)
-\psdiffractionTriangle[f=10,h=1e-3,lambda=515,contrast=38]
+\psdiffractionTriangle[f=10,h=1e-3,lambda=515,contrast=18]
 \end{pspicture}
 \quad
 \begin{pspicture}(-3,-3)(3,2.5)
@@ -433,9 +462,8 @@
 
 
 
-\clearpage
-\section{List of all optional arguments for \texttt{pst-diff}}
-\Loption{pst-diff} is the short form for the keywords in the package \LPack{pst-diffraction}.
+\section{List of all optional arguments for \texttt{pst-diffraction}}
+%\Loption{pst-diff} is the short form for the keywords in the package \LPack{pst-diffraction}.
 
 \xkvview{family=pst-diff,columns={key,type,default}}
 
@@ -444,7 +472,6 @@
 \raggedright
 \nocite{*}
 \printbibliography
-%\bibliography{pst-diffraction-doc}
 
 \printindex
 

Modified: trunk/Master/texmf-dist/tex/generic/pst-diffraction/pst-diffraction.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-diffraction/pst-diffraction.tex	2024-07-10 23:41:55 UTC (rev 71771)
+++ trunk/Master/texmf-dist/tex/generic/pst-diffraction/pst-diffraction.tex	2024-07-11 19:56:59 UTC (rev 71772)
@@ -25,8 +25,8 @@
 \ifx\PSTThreeDplotLoaded\endinput\else\input pst-3dplot.tex\fi
 \ifx\PSTXKeyLoaded\endinput\else      \input pst-xkey.tex \fi
 %
-\def\fileversion{2.04a}
-\def\filedate{2024/06/29}
+\def\fileversion{2.06}
+\def\filedate{2024/07/10}
 \message{`PST-diffraction v\fileversion, \filedate\space (ML,hv)}%
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
 \pst at addfams{pst-diff}
@@ -40,7 +40,7 @@
 \define at key[psset]{pst-diff}{s}{\def\psk at Diffraction@Slit at s{#1 }} % distance entre les fentes
 \define at key[psset]{pst-diff}{lambda}{\pst at checknum{#1}\psk at Diffraction@Slit at Lambda }% en nm
 \define at key[psset]{pst-diff}{f}{\pst at checknum{#1}\psk at Diffraction@Slit at F }% focus en m
-\define at key[psset]{pst-diff}{gamma}{\pst at checknum{#1}\psk at Diffraction@gamma at G }
+%\define at key[psset]{pst-diff}{gamma}{\pst at checknum{#1}\psk at Diffraction@gamma at G }
 \define at key[psset]{pst-diff}{pixel}{\pst at checknum{#1}\psk at Diffraction@Slit at pixel }
 \define at key[psset]{pst-diff}{colorMode}{\pst at getint{#1}\psk at Diffraction@colorMode }
 % 0 black and white inverse
@@ -65,7 +65,8 @@
 \psset[pst-diff]{a=0.2e-3,f=5,k=1,r=1e-3,
     d=6e-3,s=12e-3,h=0.5e-3,
     lambda=650,pixel=0.5,
-    contrast=38,gamma=0.8,twoHole=false,twoSlit=false,colorMode=3, scale=1,
+    contrast=38,%gamma=0.8,
+    twoHole=false,twoSlit=false,colorMode=3, scale=1,
     IIID=false, showFunc=false}
 %
 % load the pstricks-add.pro only, if not already done
@@ -82,7 +83,7 @@
     /focus \psk at Diffraction@Slit at F def
     /widthSlit \psk at Diffraction@Slit at A def
     /heightSlit \psk at Diffraction@Slit at k widthSlit mul def
-    /Gamma \psk at Diffraction@gamma at G def
+    %/Gamma \psk at Diffraction@gamma at G def
     /pixel \psk at Diffraction@Slit at pixel def
     /SlitSeparation \psk at Diffraction@Slit at s def
     \psk at Diffraction@Slit at Lambda tx at addDict begin wavelengthToRGB Red Green Blue end
@@ -162,7 +163,7 @@
   \addto at pscode{%
     % les dimensions sont en m\xE8tres
     /focus \psk at Diffraction@Slit at F def
-    /Gamma \psk at Diffraction@gamma at G def
+    %/Gamma \psk at Diffraction@gamma at G def
     /pixel \psk at Diffraction@Slit at pixel def
     /contrast 1e\psk at Diffraction@Slit at contrast def
     /r \psk at Diffraction@Circular at r def
@@ -253,7 +254,8 @@
           /y { yPts 2845 div } bind def
           /R { x dup mul y dup mul add sqrt } bind def % R en m
           /m Coeff R mul def
-  	  1 1e38 m J1Card Facteur x mul cos dup mul mul neg exp sub
+      % 1 1e38 m J1Card Facteur x mul cos dup mul mul neg exp sub
+      1 contrast m J1Card Facteur x mul cos dup mul mul neg exp sub % fix by Keno Wehr
           dup /intensity ED
   	  dup dup
 	  Red mul 3 -1 roll
@@ -283,7 +285,7 @@
       \ifPst at Diffraction@IIID \else 
         newpath
         R_limite neg %1.5 mul 
-	cm dup moveto
+        cm dup moveto
         R_limite 2 mul cm 0 rlineto
         0 R_limite 2 mul cm  rlineto
         R_limite neg 2 mul cm 0 rlineto
@@ -294,7 +296,8 @@
        R_limite -0.001 0 {
         /Radius exch def
         /m Coeff Radius 0.01 mul mul def
-        1 1e38 m J1Card neg exp sub 
+%        1 1e38 m J1Card neg exp sub 
+         1 contrast m J1Card neg exp sub % fix by keno wehr
 	dup /intensity ED
 	dup dup
 	Red mul 3 -1 roll 	% R
@@ -396,7 +399,7 @@
      % les dimensions sont en m\xE8tres
     /f \psk at Diffraction@Slit at F def
     /h \psk at Diffraction@Triangle at h def
-    /Gamma \psk at Diffraction@gamma at G def
+    %/Gamma \psk at Diffraction@gamma at G def
     /L { \psk at Diffraction@Slit at Lambda 1e-9 mul} bind def % longueur d'onde en m
     /pixel \psk at Diffraction@Slit at pixel def
     /k { TwoPi f L mul div } bind def



More information about the tex-live-commits mailing list.