From d543e9db99b507da1878899c0efc4586ed6edb14 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 21 May 2013 23:04:53 +0000 Subject: pst-optexp (21may13) git-svn-id: svn://tug.org/texlive/trunk@30617 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/pst-optexp/pst-optexp.sty | 43 +++++++++------------- 1 file changed, 17 insertions(+), 26 deletions(-) (limited to 'Master/texmf-dist/tex/latex/pst-optexp') 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 1e25eabec7f..3516f6be687 100644 --- a/Master/texmf-dist/tex/latex/pst-optexp/pst-optexp.sty +++ b/Master/texmf-dist/tex/latex/pst-optexp/pst-optexp.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: pst-optexp -%% Version: 4.0 (2013/04/15) +%% Version: 4.1 (2013/05/21) %% %% Copyright (C) 2007-2013 by Christoph Bersch %% @@ -31,7 +31,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{pst-optexp} - [2013/04/15 v4.0 Optical experimental setups with PSTricks] + [2013/05/21 v4.1 Optical experimental setups with PSTricks] \RequirePackage{ifthen} \RequirePackage{pstricks} \RequirePackage{pst-xkey} @@ -129,6 +129,7 @@ \def\POE@str@center{center} \def\POE@str@circle{circle} \def\POE@str@closed{closed} +\def\POE@str@coupling{coupling} \def\POE@str@cross{cross} \def\POE@str@cube{cube} \def\POE@str@custom{custom} @@ -982,14 +983,14 @@ {\def\POE@key@prismalign{#1}}% {\PackageError{pst-optexp}{Unknown value '\val' for prismalign}}% \define@choicekey+[psset]{optexp}{prismtype}[\val\nr]% - {transmission, coupling}% + {transmittive, reflective, coupling}% {\def\POE@key@prismtype{#1}}% {\PackageError{pst-optexp}{Unknown value '\val' for prismtype}}% \psset[optexp]{% prismsize=1, prismangle=60, prismalign=auto, - prismtype=transmission + prismtype=transmittive }% \define@key[psset]{optexp}{optdipolesize}{% \pst@expandafter\POE@psset@@optdipolesize{#1} {} {} {}\@nil @@ -4358,28 +4359,18 @@ 0 \fi }% - \def\POE@tempA{transmission}% - \ifx\POE@key@prismtype\POE@tempA - \newOptexpComp{% - {\@sz -0.6 mul \@ang tan mul \@hshift neg} - {90 \@ang sub dup cos exch sin} - \@sz \@ang cos div dup -0.4 mul exch 0.6 mul trans {PlainIfc} - {\@sz 0.6 mul \@ang tan mul \@hshift neg} - {90 \@ang add dup cos exch sin} - \@sz \@ang cos div dup -0.4 mul exch 0.6 mul trans {PlainIfc} - \POE@key@n true }% - \else - \newOptexpCompAmb{% - {\@sz -0.6 mul \@ang tan mul \@hshift neg} - {90 \@ang sub dup cos exch sin} - \@sz \@ang cos div dup -0.4 mul exch 0.6 mul trans {PlainIfc} - {0 \@sz -0.4 mul \@hshift sub } {1 0} \@ang tan \@sz mul dup neg exch - trans {PlainIfc} - {\@sz 0.6 mul \@ang tan mul \@hshift neg} - {90 \@ang add dup cos exch sin} - \@sz \@ang cos div dup -0.4 mul exch 0.6 mul trans {PlainIfc} - 2 \POE@key@n true }% - \fi + \newOptexpComp{% + {\@sz -0.6 mul \@ang tan mul \@hshift neg} + {90 \@ang sub dup cos exch sin} + \@sz \@ang cos div dup -0.4 mul exch 0.6 mul trans {PlainIfc} + \ifx\POE@key@prismtype\POE@str@transmittive\else + {0 \@sz -0.4 mul \@hshift sub } + {1 0} \@ang tan \@sz mul dup neg exch refl {PlainIfc} + \fi + {\@sz 0.6 mul \@ang tan mul \@hshift neg} + {90 \@ang add dup cos exch sin} + \@sz \@ang cos div dup -0.4 mul exch 0.6 mul trans {PlainIfc} + \POE@key@n true }% \pnode(! 0 \@hshift neg){\oenodeCenter{}} }% \def\optprism@comp{% -- cgit v1.2.3