summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-05-21 23:04:53 +0000
committerKarl Berry <karl@freefriends.org>2013-05-21 23:04:53 +0000
commitd543e9db99b507da1878899c0efc4586ed6edb14 (patch)
tree113cfd76337ca0fbbce093c7e268f2022df3eaef /Master
parentb7f351186e14a82b2d9ad697752a86e073d04fc6 (diff)
pst-optexp (21may13)
git-svn-id: svn://tug.org/texlive/trunk@30617 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/pst-optexp/Changes3
-rw-r--r--Master/texmf-dist/doc/latex/pst-optexp/pst-optexp-DE.pdfbin2264756 -> 2267213 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pst-optexp/pst-optexp-quickref.pdfbin48861 -> 48811 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pst-optexp/pst-optexp.pdfbin2234044 -> 2235673 bytes
-rw-r--r--Master/texmf-dist/dvips/pst-optexp/pst-optexp.pro2
-rw-r--r--Master/texmf-dist/source/latex/pst-optexp/pst-optexp.dtx67
-rw-r--r--Master/texmf-dist/source/latex/pst-optexp/pst-optexp.ins2
-rw-r--r--Master/texmf-dist/tex/latex/pst-optexp/pst-optexp.sty43
8 files changed, 64 insertions, 53 deletions
diff --git a/Master/texmf-dist/doc/latex/pst-optexp/Changes b/Master/texmf-dist/doc/latex/pst-optexp/Changes
index 3dc4e2ed3ba..99885ffcf94 100644
--- a/Master/texmf-dist/doc/latex/pst-optexp/Changes
+++ b/Master/texmf-dist/doc/latex/pst-optexp/Changes
@@ -1,3 +1,6 @@
+4.1 2013-05-21
+ * Added option prismtype.
+
4.0 2013-04-15
* Added electrical components.
* Added wire connections with \drawwire.
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 c5dd1aa4e5e..32523730460 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
Binary files differ
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 511dd15bbd6..1f449240ebf 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
Binary files differ
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 4d1aa407e96..312891f8fa5 100644
--- a/Master/texmf-dist/doc/latex/pst-optexp/pst-optexp.pdf
+++ b/Master/texmf-dist/doc/latex/pst-optexp/pst-optexp.pdf
Binary files differ
diff --git a/Master/texmf-dist/dvips/pst-optexp/pst-optexp.pro b/Master/texmf-dist/dvips/pst-optexp/pst-optexp.pro
index 57f69b67c2f..261e916190c 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: 4.0 (2013/04/15)
+%% Version: 4.1 (2013/05/21)
%%
%% Copyright (C) 2007-2013 by Christoph Bersch <usenet@bersch.net>
%%
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 521555ee4b8..1edf01610ad 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/04/15 v4.0 Optical experimental setups with PSTricks]
+ [2013/05/21 v4.1 Optical experimental setups with PSTricks]
%</stylefile>
%
%<*driver>
@@ -4050,6 +4050,29 @@
%</ignore>
% \fi
%
+% \choitem[transmittive]{prismtype}{transmittive, reflective}
+% \ifGERMAN Ist dieser Parameter auf \opt{reflective} gesetzt, so wird
+% die Grundfläche als zusätzliche, reflektierende Grenzfläche
+% verwendet.
+% \fi
+% \ifENGLISH If this parameter is set to \opt{reflective}, the prism
+% base is used as additional, reflective interface.
+% \fi
+% \iffalse
+%<*ignore>
+% \fi
+\begin{LTXexample}[morekeywords={[21]prismtype}]
+\begin{pspicture}(1.5,0.6)(5.1,2.2)
+ \optprism[prismtype=reflective](0,1)(3,1.1)(6,1)
+ \lens(1,2)(\oenodeIfc{2}{1})
+ \lens(\oenodeIfc{2}{1})(5,2)
+ \drawwidebeam[beamwidth=0.3, fillstyle=solid, fillcolor=green, opacity=0.3](1,2){2}{1}{3}(5,2)
+\end{pspicture}
+\end{LTXexample}
+% \iffalse
+%</ignore>
+% \fi
+%
% \choitem[auto]{prismalign}{auto,center}
% \ifENGLISH Sets the vertical alignment of the prism with respect to the
% «reflection» node \prm{center}. For \opt{auto}, the prism is shifted such,
@@ -12027,6 +12050,9 @@
%
% \begin{changelog}
%\patchcmd{\release}{\setlength{\itemsep}{0pt}}{\setlength{\itemsep}{0pt}\setlength{\parsep}{0pt}}{}{}
+% \begin{release}{4.1}{2013-05-21}
+% \item Added option \opt{prismtype}\see{prm:prismtype}
+% \end{release}
% \begin{release}{4.0}{2013-04-15}
% \item Added electrical components\see{chap:electrcomp}
% \item Added wire connections with \cs{drawwire}\see{sec:drawwire}
@@ -12422,6 +12448,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}
@@ -13402,14 +13429,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
}%
% \end{macrocode}
%
@@ -17890,28 +17917,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{}}
}%
% \end{macrocode}
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 4553e8a9124..d9726477de6 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: 4.0 (2013/04/15)
+Version: 4.1 (2013/05/21)
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 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 <usenet@bersch.net>
%%
@@ -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{%