diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/pst-optexp/Changes | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/pst-optexp/pst-optexp-DE.pdf | bin | 1367330 -> 1367235 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/pst-optexp/pst-optexp-quickref.pdf | bin | 45211 -> 45212 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/pst-optexp/pst-optexp.pdf | bin | 1341835 -> 1341696 bytes | |||
-rw-r--r-- | Master/texmf-dist/dvips/pst-optexp/pst-optexp.pro | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/pst-optexp/pst-optexp.dtx | 76 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/pst-optexp/pst-optexp.ins | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/pst-optexp/pst-optexp.sty | 68 |
8 files changed, 81 insertions, 75 deletions
diff --git a/Master/texmf-dist/doc/latex/pst-optexp/Changes b/Master/texmf-dist/doc/latex/pst-optexp/Changes index 8a36bcc9441..21074183ef0 100644 --- a/Master/texmf-dist/doc/latex/pst-optexp/Changes +++ b/Master/texmf-dist/doc/latex/pst-optexp/Changes @@ -1,3 +1,7 @@ +3.3a 2012-09-18 + * Fixed bug which was exposed by an update of pst-node. + * Fixed trailing spaces. + 3.3 2012-08-17 * Extended \opttripole and \optdipole * Modified reference angle for label of \opttripole 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 Binary files differindex 0fdbf7c6cb1..9c36fc20df9 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 Binary files differindex a0b61c48928..36491b63736 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 Binary files differindex 0f2175cd30b..8c69a3e9777 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 5ea7fb628ee..89ba5598d3b 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.3 (2012/08/17) +%% Version: 3.3a (2012/09/18) %% %% Copyright (C) 2007-2012 by Christoph Bersch <usenet@bersch.net> %% @@ -1162,10 +1162,10 @@ tx@OptexpDict begin dup 3 1 roll div 3 1 roll div exch } bind def /@ABVect { - tx@EcldDict begin ABVect end + 3 -1 roll exch sub 3 1 roll sub exch } bind def /@ABDist { - tx@EcldDict begin ABDist end + 3 -1 roll sub dup mul 3 1 roll sub dup mul add sqrt } bind def /@InterLines { tx@EcldDict begin 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 1a5d8f93647..5745c237a83 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> - [2012/08/17 v3.3 Optical experimental setups with PSTricks] + [2012/09/18 v3.3a Optical experimental setups with PSTricks] %</stylefile> % %<*driver> @@ -10436,6 +10436,10 @@ % \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.3a}{2012-09-18} +% \item Fixed bug which was exposed by an update of pst-node. +% \item Fixed trailing spaces. +% \end{release} % \begin{release}{3.3}{2012-08-17} % \item Extended \cs{opttripole} and \cs{optdipole}\see{cmd:optdipole} % \item Modified reference angle for label of \cs{opttripole}\see{sec:bwd-comp-3.3} @@ -11212,7 +11216,7 @@ \pst@expandafter\POE@psset@@crystalsize{#1} {} {} {}\@nil }% \def\POE@psset@@crystalsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \PackageWarning{pst-optexp}{% Parameter 'crystalsize' requires two numbers}% \fi @@ -11251,7 +11255,7 @@ \pst@expandafter\POE@psset@@optboxsize{#1} {} {} {}\@nil }% \def\POE@psset@@optboxsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \PackageWarning{pst-optexp}{% Parameter 'optboxsize' requires two numbers}% \fi @@ -11286,7 +11290,7 @@ \pst@expandafter\POE@psset@@platesize{#1} {} {} {}\@nil }% \def\POE@psset@@platesize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \PackageWarning{pst-optexp}{% Parameter 'platesize' requires two numbers}% \fi @@ -11300,7 +11304,7 @@ \pst@expandafter\POE@psset@@detsize{#1} {} {} {}\@nil }% \def\POE@psset@@detsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \pst@checknum{#1}\POE@key@detsize \else \let\POE@key@detsize\@empty @@ -11358,7 +11362,7 @@ \pst@expandafter\POE@psset@@doveprismsize{#1} {} {} {}\@nil }% \def\POE@psset@@doveprismsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \pst@checknum{#1}\POE@key@doveprismheight \pstFPmul\POE@key@doveprismwidth{3}{#1} \else @@ -11383,7 +11387,7 @@ \pst@expandafter\POE@psset@@glanthompsonsize{#1} {} {} {}\@nil }% \def\POE@psset@@glanthompsonsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \PackageWarning{pst-optexp}{% Parameter 'glanthompsonsize' requires two numbers}% \fi @@ -11427,7 +11431,7 @@ }% \def\POE@psset@@mirrorradius#1 #2 #3\@nil{% \pst@checknum{#1}\POE@key@mirrorradius - \ifx\\#2\\ + \ifx\\#2\\% \def\POE@key@mirrorradiusB{}% \else \pst@checknum{#2}\POE@key@mirrorradiusB @@ -11570,7 +11574,7 @@ \pst@expandafter\POE@psset@@optdipolesize{#1} {} {} {}\@nil }% \def\POE@psset@@optdipolesize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \def\POE@key@optdipoleheight{0}% \else \pst@checknum{#2}\POE@key@optdipoleheight @@ -11632,7 +11636,7 @@ \pst@expandafter\POE@psset@@optampsize{#1} {} {} {}\@nil }% \def\POE@psset@@optampsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \pst@checknum{#1}\POE@key@optampheight \pstFPmul\POE@key@optampwidth{0.866}{#1} \else @@ -11648,7 +11652,7 @@ \pst@expandafter\POE@psset@@optmzmsize{#1} {} {} {}\@nil }% \def\POE@psset@@optmzmsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \pst@checknum{#1}\POE@key@optmzmheight \pstFPmul\POE@key@optmzmwidth{1.6}{#1} \else @@ -11664,7 +11668,7 @@ \pst@expandafter\POE@psset@@isolatorsize{#1} {} {} {}\@nil }% \def\POE@psset@@isolatorsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \pst@checknum{#1}\POE@key@isolatorheight \pstFPmul\POE@key@isolatorwidth{1.6}{#1} \else @@ -11680,7 +11684,7 @@ \pst@expandafter\POE@psset@@fiberpolsize{#1} {} {} {}\@nil }% \def\POE@psset@@fiberpolsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \pst@checknum{#1}\POE@key@fiberpolheight \pstFPmul\POE@key@fiberpolwidth{1.6}{#1} \else @@ -11710,7 +11714,7 @@ \pst@expandafter\POE@psset@@fdlsize{#1} {} {} {}\@nil }% \def\POE@psset@@fdlsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \pst@checknum{#1}\POE@key@fdlheight \pstFPmul\POE@key@fdlwidth{1.6}{#1} \else @@ -11726,7 +11730,7 @@ \pst@expandafter\POE@psset@@fibercolsize{#1} {} {} {}\@nil }% \def\POE@psset@@fibercolsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \pst@checknum{#1}\POE@key@fibercolheight \pstFPmul\POE@key@fibercolwidth{0.866}{#1} \else @@ -11753,9 +11757,9 @@ \def\POE@psset@@optcircangle#1 #2 #3\@nil{% \edef\POE@tempA{#1}% \edef\POE@tempB{#2}% - \ifx\\#2\\ + \ifx\\#2\\% \PackageError{pst-optexp}{optcircangle requires two numbers}% - \else\ifx\\#1\\ + \else\ifx\\#1\\% \PackageError{pst-optexp}{optcircangle requires two numbers}% \else \psset[optexp]{optcircangleA=#1, optcircangleB=#2}% @@ -11774,7 +11778,7 @@ \pst@expandafter\POE@psset@@couplersize{#1} {} {} {}\@nil }% \def\POE@psset@@couplersize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \pstFPmul\POE@key@couplerheight{0.8}{#1} \pstFPmul\POE@key@couplerwidth{2}{#1} \else @@ -11835,7 +11839,7 @@ }% \def\POE@psset@@fiberboxsize#1 #2 #3\@nil{% \psset[optexp]{fiberboxwidth=#1} - \ifx\\#2\\ + \ifx\\#2\\% \psset[optexp]{fiberboxheight=0}% \else \psset[optexp]{fiberboxheight=#2}% @@ -11851,12 +11855,12 @@ \pst@expandafter\POE@psset@@fiberboxcount#1\@nil }% \def\POE@psset@@fiberboxcount#1x#2\@nil{% - \ifx\\#1\\ + \ifx\\#1\\% \def\POE@key@fiberboxcountin{1}% \else \def\POE@key@fiberboxcountin{#1}% \fi - \ifx\\#2\\ + \ifx\\#2\\% \def\POE@key@fiberboxcountout{1}% \else \def\POE@key@fiberboxcountout{#2} @@ -12036,13 +12040,13 @@ } \def\POE@psset@fibercheck#1#2\@nil{% \ifx#1*\relax - \ifx\\#2\\ + \ifx\\#2\\% \psset[optexp]{fiber@preset=all}% \else \psset[optexp]{fiber@preset=#2}% \fi \else\ifx#1+\relax - \ifx\\#2\\ + \ifx\\#2\\% \psset[optexp]{fiber@all=all}% \else \psset[optexp]{fiber@all=#2}% @@ -12072,7 +12076,7 @@ }% \def\POE@psset@@fiberpreset#1#2,#3,#4\@nil{% \POE@getfiberpreset@all - \ifx\\#3\\ + \ifx\\#3\\% \@nameuse{POE@getfiberpreset@#1}% \@nameuse{POE@getfiberpreset@#2}% \fi @@ -12216,16 +12220,16 @@ \egroup \gdef\POE@complist{}\global\POE@cnt=\POE@oldcnt\relax \psset[optexp]{backlayer=false, frontlayer=true}% - #1}% + #1\ignorespaces}% % \end{macrocode} % \begin{macro}{\backlayer} % \begin{macrocode} -\def\backlayer#1{\ifPOE@backlayer #1\fi\ignorespaces} +\def\backlayer#1{\ifPOE@backlayer #1\fi\ignorespaces}% % \end{macrocode} % \end{macro} % \begin{macro}{\frontlayer} % \begin{macrocode} -\def\frontlayer#1{\ifPOE@frontlayer #1\fi\ignorespaces} +\def\frontlayer#1{\ifPOE@frontlayer #1\fi\ignorespaces}% % \end{macrocode} % \end{macro} % @@ -14129,7 +14133,7 @@ \fi \fi \ifPOE@backlayer - \ifx\\#3#4\\ + \ifx\\#3#4\\% \POE@regNodes{#1}{#2} \POE@Verb{/@@inht 0 def /@@outht 0 def}% \else @@ -14160,7 +14164,7 @@ \fi \POE@drawcomponent[fiberbox]{#5}\fiberbox@ii \ifPOE@backlayer - \ifx\\#3#4\\ + \ifx\\#3#4\\% % \end{macrocode} % Connect only, if the fiberbox has a single related interface node. % \begin{macrocode} @@ -14277,7 +14281,7 @@ \pst@getcoor{#1}\POE@temp% \pnode(!% \POE@temp /YDiff ED /XDiff ED % - /N@#2 load GetCenter /YShifted ED /XShifted ED + \pst@nodedict /N@#2 load GetCenter end /YShifted ED /XShifted ED /rot@angle #4 \POE@key@labelrefangle\space add def /XDiff@Rot rot@angle cos XDiff mul rot@angle sin YDiff mul add def /YDiff@Rot rot@angle cos YDiff mul rot@angle sin XDiff mul sub def @@ -14855,7 +14859,7 @@ \ifx\POE@key@mirrortype\POE@str@mirrortype@piezo \POE@setref{/@@y0 \pst@number\psyunit def}% \bgroup - \psset{style=PiezoMirror} + \psset{style=PiezoMirror}% \POE@setref{% \pst@number\psyunit @@y0 div \POE@key@mirrorwidth\space 0.5 mul mul 2.5 div /@@y0 ED @@ -14864,13 +14868,13 @@ \else \POE@setref{/@@x \POE@key@mirrorwidth\space 0.5 mul def}% \ifx\POE@key@mirrortype\POE@str@mirrortype@plain\else - \POE@setref{\POE@key@mirrordepth\space 0.5 mul dup /@@y0 ED /@@y ED} + \POE@setref{\POE@key@mirrordepth\space 0.5 mul dup /@@y0 ED /@@y ED}% \fi \fi \else \POE@setref{/@@x \POE@key@mirrorwidth\space 0.5 mul def}% \ifx\POE@key@mirrortype\POE@str@mirrortype@plain\else - \POE@setref{\POE@key@mirrordepth\space 0.5 mul dup /@@y0 ED /@@y ED} + \POE@setref{\POE@key@mirrordepth\space 0.5 mul dup /@@y0 ED /@@y ED}% \fi \fi }% @@ -18533,25 +18537,23 @@ tx@OptexpDict begin % \end{macro} % % \begin{macro}{@ABVect} -% Shorthand definition for \PSvar{ABVect} procedure of the \nxLPack{pst-eucl} package. % \begin{pssyntax} % \PSvar{Xa Ya Xb Yb} \PSop{@ABVect} \PSvar{dX dY} % \end{pssyntax} % \begin{macrocode} /@ABVect { - tx@EcldDict begin ABVect end + 3 -1 roll exch sub 3 1 roll sub exch } bind def % \end{macrocode} % \end{macro} % % \begin{macro}{@ABDist} -% Shorthand definition for \PSvar{ABDist} procedure of the \nxLPack{pst-eucl} package. % \begin{pssyntax} % \PSvar{Xa Ya Xb Yb} \PSop{@ABDist} \PSvar{dist} % \end{pssyntax} % \begin{macrocode} /@ABDist { - tx@EcldDict begin ABDist end + 3 -1 roll sub dup mul 3 1 roll sub dup mul add sqrt } bind def % \end{macrocode} % \end{macro} 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 845168754ce..12a8a78b766 100644 --- a/Master/texmf-dist/source/latex/pst-optexp/pst-optexp.ins +++ b/Master/texmf-dist/source/latex/pst-optexp/pst-optexp.ins @@ -51,7 +51,7 @@ This is a generated file. Project: pst-optexp -Version: 3.3 (2012/08/17) +Version: 3.3a (2012/09/18) Copyright (C) 2007-2012 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 bdbd986a77f..4ba71859a7b 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.3 (2012/08/17) +%% Version: 3.3a (2012/09/18) %% %% Copyright (C) 2007-2012 by Christoph Bersch <usenet@bersch.net> %% @@ -31,7 +31,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{pst-optexp} - [2012/08/17 v3.3 Optical experimental setups with PSTricks] + [2012/09/18 v3.3a Optical experimental setups with PSTricks] \RequirePackage{pstricks} \RequirePackage{pst-xkey} \RequirePackage{pst-node} @@ -540,7 +540,7 @@ \pst@expandafter\POE@psset@@crystalsize{#1} {} {} {}\@nil }% \def\POE@psset@@crystalsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \PackageWarning{pst-optexp}{% Parameter 'crystalsize' requires two numbers}% \fi @@ -576,7 +576,7 @@ \pst@expandafter\POE@psset@@optboxsize{#1} {} {} {}\@nil }% \def\POE@psset@@optboxsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \PackageWarning{pst-optexp}{% Parameter 'optboxsize' requires two numbers}% \fi @@ -605,7 +605,7 @@ \pst@expandafter\POE@psset@@platesize{#1} {} {} {}\@nil }% \def\POE@psset@@platesize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \PackageWarning{pst-optexp}{% Parameter 'platesize' requires two numbers}% \fi @@ -616,7 +616,7 @@ \pst@expandafter\POE@psset@@detsize{#1} {} {} {}\@nil }% \def\POE@psset@@detsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \pst@checknum{#1}\POE@key@detsize \else \let\POE@key@detsize\@empty @@ -662,7 +662,7 @@ \pst@expandafter\POE@psset@@doveprismsize{#1} {} {} {}\@nil }% \def\POE@psset@@doveprismsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \pst@checknum{#1}\POE@key@doveprismheight \pstFPmul\POE@key@doveprismwidth{3}{#1} \else @@ -684,7 +684,7 @@ \pst@expandafter\POE@psset@@glanthompsonsize{#1} {} {} {}\@nil }% \def\POE@psset@@glanthompsonsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \PackageWarning{pst-optexp}{% Parameter 'glanthompsonsize' requires two numbers}% \fi @@ -722,7 +722,7 @@ }% \def\POE@psset@@mirrorradius#1 #2 #3\@nil{% \pst@checknum{#1}\POE@key@mirrorradius - \ifx\\#2\\ + \ifx\\#2\\% \def\POE@key@mirrorradiusB{}% \else \pst@checknum{#2}\POE@key@mirrorradiusB @@ -844,7 +844,7 @@ \pst@expandafter\POE@psset@@optdipolesize{#1} {} {} {}\@nil }% \def\POE@psset@@optdipolesize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \def\POE@key@optdipoleheight{0}% \else \pst@checknum{#2}\POE@key@optdipoleheight @@ -893,7 +893,7 @@ \pst@expandafter\POE@psset@@optampsize{#1} {} {} {}\@nil }% \def\POE@psset@@optampsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \pst@checknum{#1}\POE@key@optampheight \pstFPmul\POE@key@optampwidth{0.866}{#1} \else @@ -906,7 +906,7 @@ \pst@expandafter\POE@psset@@optmzmsize{#1} {} {} {}\@nil }% \def\POE@psset@@optmzmsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \pst@checknum{#1}\POE@key@optmzmheight \pstFPmul\POE@key@optmzmwidth{1.6}{#1} \else @@ -919,7 +919,7 @@ \pst@expandafter\POE@psset@@isolatorsize{#1} {} {} {}\@nil }% \def\POE@psset@@isolatorsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \pst@checknum{#1}\POE@key@isolatorheight \pstFPmul\POE@key@isolatorwidth{1.6}{#1} \else @@ -932,7 +932,7 @@ \pst@expandafter\POE@psset@@fiberpolsize{#1} {} {} {}\@nil }% \def\POE@psset@@fiberpolsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \pst@checknum{#1}\POE@key@fiberpolheight \pstFPmul\POE@key@fiberpolwidth{1.6}{#1} \else @@ -956,7 +956,7 @@ \pst@expandafter\POE@psset@@fdlsize{#1} {} {} {}\@nil }% \def\POE@psset@@fdlsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \pst@checknum{#1}\POE@key@fdlheight \pstFPmul\POE@key@fdlwidth{1.6}{#1} \else @@ -969,7 +969,7 @@ \pst@expandafter\POE@psset@@fibercolsize{#1} {} {} {}\@nil }% \def\POE@psset@@fibercolsize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \pst@checknum{#1}\POE@key@fibercolheight \pstFPmul\POE@key@fibercolwidth{0.866}{#1} \else @@ -993,9 +993,9 @@ \def\POE@psset@@optcircangle#1 #2 #3\@nil{% \edef\POE@tempA{#1}% \edef\POE@tempB{#2}% - \ifx\\#2\\ + \ifx\\#2\\% \PackageError{pst-optexp}{optcircangle requires two numbers}% - \else\ifx\\#1\\ + \else\ifx\\#1\\% \PackageError{pst-optexp}{optcircangle requires two numbers}% \else \psset[optexp]{optcircangleA=#1, optcircangleB=#2}% @@ -1010,7 +1010,7 @@ \pst@expandafter\POE@psset@@couplersize{#1} {} {} {}\@nil }% \def\POE@psset@@couplersize#1 #2 #3\@nil{% - \ifx\\#2\\ + \ifx\\#2\\% \pstFPmul\POE@key@couplerheight{0.8}{#1} \pstFPmul\POE@key@couplerwidth{2}{#1} \else @@ -1066,7 +1066,7 @@ }% \def\POE@psset@@fiberboxsize#1 #2 #3\@nil{% \psset[optexp]{fiberboxwidth=#1} - \ifx\\#2\\ + \ifx\\#2\\% \psset[optexp]{fiberboxheight=0}% \else \psset[optexp]{fiberboxheight=#2}% @@ -1082,12 +1082,12 @@ \pst@expandafter\POE@psset@@fiberboxcount#1\@nil }% \def\POE@psset@@fiberboxcount#1x#2\@nil{% - \ifx\\#1\\ + \ifx\\#1\\% \def\POE@key@fiberboxcountin{1}% \else \def\POE@key@fiberboxcountin{#1}% \fi - \ifx\\#2\\ + \ifx\\#2\\% \def\POE@key@fiberboxcountout{1}% \else \def\POE@key@fiberboxcountout{#2} @@ -1250,13 +1250,13 @@ } \def\POE@psset@fibercheck#1#2\@nil{% \ifx#1*\relax - \ifx\\#2\\ + \ifx\\#2\\% \psset[optexp]{fiber@preset=all}% \else \psset[optexp]{fiber@preset=#2}% \fi \else\ifx#1+\relax - \ifx\\#2\\ + \ifx\\#2\\% \psset[optexp]{fiber@all=all}% \else \psset[optexp]{fiber@all=#2}% @@ -1286,7 +1286,7 @@ }% \def\POE@psset@@fiberpreset#1#2,#3,#4\@nil{% \POE@getfiberpreset@all - \ifx\\#3\\ + \ifx\\#3\\% \@nameuse{POE@getfiberpreset@#1}% \@nameuse{POE@getfiberpreset@#2}% \fi @@ -1415,9 +1415,9 @@ \egroup \gdef\POE@complist{}\global\POE@cnt=\POE@oldcnt\relax \psset[optexp]{backlayer=false, frontlayer=true}% - #1}% -\def\backlayer#1{\ifPOE@backlayer #1\fi\ignorespaces} -\def\frontlayer#1{\ifPOE@frontlayer #1\fi\ignorespaces} + #1\ignorespaces}% +\def\backlayer#1{\ifPOE@backlayer #1\fi\ignorespaces}% +\def\frontlayer#1{\ifPOE@frontlayer #1\fi\ignorespaces}% \def\POE@getnode#1#2\@nil{% \ifx(#1\relax%) \POE@getcoor#1#2 @@ -2841,7 +2841,7 @@ \fi \fi \ifPOE@backlayer - \ifx\\#3#4\\ + \ifx\\#3#4\\% \POE@regNodes{#1}{#2} \POE@Verb{/@@inht 0 def /@@outht 0 def}% \else @@ -2872,7 +2872,7 @@ \fi \POE@drawcomponent[fiberbox]{#5}\fiberbox@ii \ifPOE@backlayer - \ifx\\#3#4\\ + \ifx\\#3#4\\% \ifPOE@fiberpreset@ \ifnum\POE@key@fiberboxcountin=1 \ifPOE@fiberpresetin@ @@ -2943,7 +2943,7 @@ \pst@getcoor{#1}\POE@temp% \pnode(!% \POE@temp /YDiff ED /XDiff ED % - /N@#2 load GetCenter /YShifted ED /XShifted ED + \pst@nodedict /N@#2 load GetCenter end /YShifted ED /XShifted ED /rot@angle #4 \POE@key@labelrefangle\space add def /XDiff@Rot rot@angle cos XDiff mul rot@angle sin YDiff mul add def /YDiff@Rot rot@angle cos YDiff mul rot@angle sin XDiff mul sub def @@ -3363,7 +3363,7 @@ \ifx\POE@key@mirrortype\POE@str@mirrortype@piezo \POE@setref{/@@y0 \pst@number\psyunit def}% \bgroup - \psset{style=PiezoMirror} + \psset{style=PiezoMirror}% \POE@setref{% \pst@number\psyunit @@y0 div \POE@key@mirrorwidth\space 0.5 mul mul 2.5 div /@@y0 ED @@ -3372,13 +3372,13 @@ \else \POE@setref{/@@x \POE@key@mirrorwidth\space 0.5 mul def}% \ifx\POE@key@mirrortype\POE@str@mirrortype@plain\else - \POE@setref{\POE@key@mirrordepth\space 0.5 mul dup /@@y0 ED /@@y ED} + \POE@setref{\POE@key@mirrordepth\space 0.5 mul dup /@@y0 ED /@@y ED}% \fi \fi \else \POE@setref{/@@x \POE@key@mirrorwidth\space 0.5 mul def}% \ifx\POE@key@mirrortype\POE@str@mirrortype@plain\else - \POE@setref{\POE@key@mirrordepth\space 0.5 mul dup /@@y0 ED /@@y ED} + \POE@setref{\POE@key@mirrordepth\space 0.5 mul dup /@@y0 ED /@@y ED}% \fi \fi }% |