pst-optexp (22feb13)

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

8 files changed, 65 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/pst-optexp/Changes b/Master/texmf-dist/doc/latex/pst-optexp/Changes
index b9bca7657d2..62c2eb3ac61 100644
--- a/Master/texmf-dist/doc/latex/pst-optexp/Changes
+++ b/Master/texmf-dist/doc/latex/pst-optexp/Changes
@@ -1,3 +1,9 @@
+3.5  2013-02-22
+       * Added option filterangle
+       * Fixed wrong output fiber style in \optcoupler
+       * Fixed strange Postscript error which occured with some
+           interpreters.
+
 3.4  2013-02-03
        * Fixed bugs when using fillstyle for some components
        * Extended option switchsize
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 0865e5598d5..5ad8125d539 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 1cf03c25fc7..9e598a4033b 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 e0267735516..1e5f0338935 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 7394171f9bb..99236bc9f55 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: 3.4alpha (2013/02/03)
+%% Version: 3.5 (2013/02/22)
 %% 
 %% Copyright (C) 2007-2013 by Christoph Bersch <usenet@bersch.net>
 %% 
@@ -1495,13 +1495,13 @@ tx@OptexpDict begin
       end
     grestore
     @ABVect NormalizeVec 2 copy
-    8 -2 roll abs exch abs max -1e-6 mul VecScale
+    8 -2 roll abs exch abs mymax -1e-6 mul VecScale
     8 -2 roll cvn load begin
       IfcName load begin
         X Y VecAdd /YCorr exch def /XCorr exch def
       end
     end
-    4 2 roll abs exch abs max 1e-6 mul VecScale
+    4 2 roll abs exch abs mymax 1e-6 mul VecScale
     4 2 roll cvn load begin
       IfcName load begin
         X Y VecAdd /YCorr exch def /XCorr exch def
@@ -1512,6 +1512,9 @@ tx@OptexpDict begin
   } ifelse
   DebugEnd
 } bind def
+/mymax {
+  2 copy lt { exch } if pop
+} bind def
 /debug {
   /@N ED count dup @N gt @N 0 ge and { pop @N } if
   copy @N { == } repeat
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 0e52d1cb7a8..0c09624c4b1 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>
-    [2013/02/03 v3.4 Optical experimental setups with PSTricks]
+    [2013/02/22 v3.5 Optical experimental setups with PSTricks]
 %</stylefile>
 %
 %<*driver>
@@ -681,7 +681,7 @@
 %
 % \ifGERMAN
 %   \section{Anforderungen}
-%   \LPack{pst-optexp} Version 3.4 benötigt \LaTeX{} und aktuelle Versionen der
+%   \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}.
 %
@@ -693,7 +693,7 @@
 % \fi
 % \ifENGLISH
 %   \section{Requirements}
-%   \LPack{pst-optexp} version 3.4 requires \LaTeX{} and recent versions of
+%   \LPack{pst-optexp} requires \LaTeX{} and recent versions of
 %   \LPack{pst-node}, \LPack{multido}, \LPack{pstricks-add},
 %   \LPack{pst-eucl}, and \LPack{environ}. 
 %
@@ -849,7 +849,7 @@
 % I thank all the people of the PSTricks mailinglist for the continuous help,
 % especially Herbert Voß. Thanks also to various package authors from which I
 % learned and adopted code for this package, Florent Chervet, Rolf Niepraschk
-% and Heiko Oberdiek. Christine Römer convinced my with her article in the
+% and Heiko Oberdiek. Christine Römer convinced me with her article in the
 % german DTK\footnote{Pakete in Deutsch dokumentieren. in Die TeXnische
 % Komödie. Heft 2/2011, S. 28-35.} to provide a german translation of the
 % documentation. The documentation style is a mixture of the \opt{pst-doc} class
@@ -4924,6 +4924,22 @@
 % \iffalse
 %</ignore>
 % \fi
+%
+% \numitem[0]{filterangle}
+% \ifGERMAN Dreht das «Innere» des Filters relativ zum seinem Rahmen.\fi
+% \ifENGLISH Rotates the «inner» part of the filter relativ to its frame.\fi
+% \iffalse
+%<*ignore>
+% \fi
+\begin{LTXexample}[morekeywords={[21]{filterangle}}]
+\begin{pspicture}(2,2)
+  \optfilter(0.5,0)(0.5,2)
+  \optfilter[filterangle=90](1.5,0)(1.5,2)
+\end{pspicture}
+\end{LTXexample}
+% \iffalse
+%</ignore>
+% \fi
 % \end{optionlist}
 %
 % \begin{stylelist}
@@ -10485,6 +10501,11 @@
 % \begin{changelog}
 %\patchcmd{\release}{\setlength{\itemsep}{0pt}}{\setlength{\itemsep}{0pt}\setlength{\parsep}{0pt}}{}{}
 %   ^^A Do not wrap lines inside the \items, otherwise Changes.py does not work properly
+%   \begin{release}{3.5}{2013-02-22}
+%   \item Added option \opt{filterangle}\see{prm:filterangle}
+%   \item Fixed wrong output fiber style in \cs{optcoupler}
+%   \item Fixed strange Postscript error which occured with some interpreters.
+%   \end{release}
 %   \begin{release}{3.4}{2013-02-03}
 %   \item Fixed bugs when using \opt{fillstyle} for some components
 %   \item Extended option \opt{switchsize}\see{cmd:optswitch}
@@ -11666,8 +11687,12 @@
    {bandstop,bandpass,lowpass,highpass}%
    {\def\POE@key@filtertype{#1}}%
    {\PackageError{pst-optexp}{Unknown value '\val' for filtertype}}
+\define@key[psset]{optexp}{filterangle}{%
+  \pst@checknum{#1}\POE@key@filterangle
+}
 \newpsstyle{FilterStyle}{}
 \psset[optexp]{%
+  filterangle=0,
   filtersize=0.8,
   filtertype=bandpass
 }%
@@ -14018,7 +14043,7 @@
         \fi
         \ifPOE@fiberpresetout@
           \ifPOE@fiberpresetout@top
-            \drawfiber@{FiberOut}[startnode=3]{\POE@key@compname}%
+            \drawfiber@{FiberOut1}[startnode=3]{\POE@key@compname}%
                                               {(#3)}
           \fi
           \ifPOE@fiberpresetout@bottom
@@ -16045,7 +16070,7 @@
       90 add cos 0.2 \@sz mul mul}%
   }%
   \psframe[dimen=outer](! \@sz neg dup)(! \@sz dup)
-  \bgroup
+  \psrotate(\oenodeCenter{}){\POE@key@filterangle}{%
   \psset{style=FilterStyle}%
     \ifx\POE@key@filtertype\POE@str@filtertype@bandpass
       \psline(! -0.3 \@sz mul -0.65 \@sz mul)%
@@ -16098,7 +16123,7 @@
         \rput(0, 0){\filter@curve}
         \rput(! 0 -0.5 \@sz mul){\filter@curve}
   \fi\fi\fi\fi
-  \egroup
+  }%
 \ignorespaces}%
 %    \end{macrocode}
 % \end{macro}
@@ -19283,13 +19308,13 @@ tx@OptexpDict begin
 % approximately 8 digits, so in order to have an effect, the nodes must
 % be separated by $10^{-7}$ times the maximum coordinate value.
 %    \begin{macrocode}
-    8 -2 roll abs exch abs max -1e-6 mul VecScale
+    8 -2 roll abs exch abs mymax -1e-6 mul VecScale
     8 -2 roll cvn load begin
       IfcName load begin 
         X Y VecAdd /YCorr exch def /XCorr exch def
       end
     end
-    4 2 roll abs exch abs max 1e-6 mul VecScale
+    4 2 roll abs exch abs mymax 1e-6 mul VecScale
     4 2 roll cvn load begin
       IfcName load begin
         X Y VecAdd /YCorr exch def /XCorr exch def
@@ -19303,6 +19328,15 @@ tx@OptexpDict begin
 %    \end{macrocode}
 % \end{macro}
 %
+% \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)
+%    \begin{macrocode}
+/mymax {
+  2 copy lt { exch } if pop
+} bind def
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}{debug}
 %   Print out the last \opt{N} elements from the stack, checks for
 %   stackunderflow. I \opt{N} is negative, the complete stack is
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 ad20b175b0b..0475c86c55f 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: 3.4alpha (2013/02/03)
+Version: 3.5 (2013/02/22)
 
 Copyright (C) 2007-2013 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 332ee17a450..b3d4416dad4 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: 3.4alpha (2013/02/03)
+%% Version: 3.5 (2013/02/22)
 %% 
 %% Copyright (C) 2007-2013 by Christoph Bersch <usenet@bersch.net>
 %% 
@@ -31,7 +31,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{pst-optexp}
-    [2013/02/03 v3.4 Optical experimental setups with PSTricks]
+    [2013/02/22 v3.5 Optical experimental setups with PSTricks]
 \RequirePackage{pstricks}
 \RequirePackage{pst-xkey}
 \RequirePackage{pst-node}
@@ -874,8 +874,12 @@
    {bandstop,bandpass,lowpass,highpass}%
    {\def\POE@key@filtertype{#1}}%
    {\PackageError{pst-optexp}{Unknown value '\val' for filtertype}}
+\define@key[psset]{optexp}{filterangle}{%
+  \pst@checknum{#1}\POE@key@filterangle
+}
 \newpsstyle{FilterStyle}{}
 \psset[optexp]{%
+  filterangle=0,
   filtersize=0.8,
   filtertype=bandpass
 }%
@@ -2681,7 +2685,7 @@
         \fi
         \ifPOE@fiberpresetout@
           \ifPOE@fiberpresetout@top
-            \drawfiber@{FiberOut}[startnode=3]{\POE@key@compname}%
+            \drawfiber@{FiberOut1}[startnode=3]{\POE@key@compname}%
                                               {(#3)}
           \fi
           \ifPOE@fiberpresetout@bottom
@@ -4165,7 +4169,7 @@
       90 add cos 0.2 \@sz mul mul}%
   }%
   \psframe[dimen=outer](! \@sz neg dup)(! \@sz dup)
-  \bgroup
+  \psrotate(\oenodeCenter{}){\POE@key@filterangle}{%
   \psset{style=FilterStyle}%
     \ifx\POE@key@filtertype\POE@str@filtertype@bandpass
       \psline(! -0.3 \@sz mul -0.65 \@sz mul)%
@@ -4218,7 +4222,7 @@
         \rput(0, 0){\filter@curve}
         \rput(! 0 -0.5 \@sz mul){\filter@curve}
   \fi\fi\fi\fi
-  \egroup
+  }%
 \ignorespaces}%
 \def\optamp@ref{%
   \POE@setref{/@@x \POE@key@optampwidth\space 0.5 mul def