summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pst-optic/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pst-optic/README3
-rw-r--r--Master/texmf-dist/doc/generic/pst-optic/more_docs/dtk.pdfbin0 -> 197088 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-optic/more_docs/pst-optic-examples.pdf (renamed from Master/texmf-dist/doc/generic/pst-optic/pst-optic-examples.pdf)bin290331 -> 290331 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-optic/more_docs/pst-optic-examples.tex (renamed from Master/texmf-dist/doc/generic/pst-optic/pst-optic-examples.tex)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.pdfbin435503 -> 418303 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.tex9
-rw-r--r--Master/texmf-dist/tex/generic/pst-optic/pst-optic.tex74
8 files changed, 44 insertions, 43 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-optic/Changes b/Master/texmf-dist/doc/generic/pst-optic/Changes
index e74873c0281..0b2827a8369 100644
--- a/Master/texmf-dist/doc/generic/pst-optic/Changes
+++ b/Master/texmf-dist/doc/generic/pst-optic/Changes
@@ -1,4 +1,5 @@
---- pst-optic.tex
+1.01 2010-07-23 - bugfixes for \psset[pst-optic,pstricks]
1.00 2009-02-10 - new style opticalAxis to allow different line styles
- cosmetic changes to the code and the documentation
0.97 2007-01-07 - new option rayWidth for psprism
diff --git a/Master/texmf-dist/doc/generic/pst-optic/README b/Master/texmf-dist/doc/generic/pst-optic/README
index fa678ecd64d..70b9df5af52 100644
--- a/Master/texmf-dist/doc/generic/pst-optic/README
+++ b/Master/texmf-dist/doc/generic/pst-optic/README
@@ -3,7 +3,7 @@
%% Manuel Luque <Mluque5130@aol.com> (France)
%% Herbert Voss <voss@perce.de> (Germany)
%%
-%% 2006-12-26
+%% 2003-02-16
%%
Save the files
@@ -25,6 +25,7 @@ latex on the documentation file.
It is nearly the same for the example file pst-optic-examples.tex
+
The intermediate DVI file works only with viewers which can
interprete the embedded PostScript code, like the one from KDE.
diff --git a/Master/texmf-dist/doc/generic/pst-optic/more_docs/dtk.pdf b/Master/texmf-dist/doc/generic/pst-optic/more_docs/dtk.pdf
new file mode 100644
index 00000000000..ffc4552f1a1
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/pst-optic/more_docs/dtk.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-examples.pdf b/Master/texmf-dist/doc/generic/pst-optic/more_docs/pst-optic-examples.pdf
index fe144aa86b7..fe144aa86b7 100644
--- a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-examples.pdf
+++ b/Master/texmf-dist/doc/generic/pst-optic/more_docs/pst-optic-examples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-examples.tex b/Master/texmf-dist/doc/generic/pst-optic/more_docs/pst-optic-examples.tex
index bd0464c9835..bd0464c9835 100644
--- a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-examples.tex
+++ b/Master/texmf-dist/doc/generic/pst-optic/more_docs/pst-optic-examples.tex
diff --git a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.pdf b/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.pdf
index d905d98dac7..e73c9db388f 100644
--- a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.tex b/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.tex
index 719cea89bb0..ea1bf3a18e6 100644
--- a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.tex
@@ -2,7 +2,8 @@
\documentclass[11pt,english,BCOR10mm,DIV13,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\usepackage[utf8]{inputenc}
-\usepackage{pst-optic,pst-text}
+\usepackage{pst-text}
+\usepackage{pst-optic}
\let\pstOpticFV\fileversion
\lstset{pos=t,wide=true,language=PSTricks,basicstyle=\footnotesize\ttfamily}
\let\belowcaptionskip\abovecaptionskip
@@ -32,9 +33,7 @@ of having older versions, go to \url{http://www.CTAN.org/} and load the newest v
\vfill\noindent
Thanks to: \\
Jean-C\^ome Charpentier,
-Arnaud Schmittbuhl,
-and
-Timothy Van Zandt
+Arnaud Schmittbuhl.
\end{abstract}
\section{General Options}
@@ -445,7 +444,7 @@ predefined nodes anf three default rays.
\enlargethispage{13mm}
-\begin{LTXexample}
+\begin{LTXexample}[wide]
\begin{pspicture*}[showgrid=true](-4,-4)(6,4)
\rput(0,0){\mirrorCVG[drawing=false,mirrorDepth=0.75,mirrorHeight=7]}
\qdisk(Focus){2pt} \rput(6,2.5){\eye}
diff --git a/Master/texmf-dist/tex/generic/pst-optic/pst-optic.tex b/Master/texmf-dist/tex/generic/pst-optic/pst-optic.tex
index 74d9c2a3e04..e5dd1b3bfd8 100644
--- a/Master/texmf-dist/tex/generic/pst-optic/pst-optic.tex
+++ b/Master/texmf-dist/tex/generic/pst-optic/pst-optic.tex
@@ -8,7 +8,7 @@
%% Manuel Luque <Mluque5130@aol.com> (France)
%% Herbert Voss <voss@perce.de> (Germany)
%%
-%% 2006-07-20
+%% 2010-07-23
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -21,17 +21,17 @@
\let\PSTopticLoaded\endinput
% Requires PSTricks, pst-node, pst-plot, pst-grad, pst-3d,
% pst-math, pst-xkey, multido packages
-\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
-\ifx\PSTnodesLoaded\endinput\else\input pst-node.tex\fi
-\ifx\PSTplotLoaded\endinput\else\input pst-plot.tex\fi % parametric-plot
-\ifx\PSTthreeDLoaded\endinput\else\input pst-3d.tex\fi % symplan
-\ifx\PSTGradLoaded\endinput\else\input pst-grad.tex\fi
-\ifx\PSTmathLoaded\endinput\else\input pst-math.tex\fi
+\ifx\PSTricksLoaded\endinput\else \input pstricks.tex\fi
+\ifx\PSTnodesLoaded\endinput\else \input pst-node.tex\fi
+\ifx\PSTplotLoaded\endinput\else \input pst-plot.tex\fi % parametric-plot
+\ifx\PSTthreeDLoaded\endinput\else \input pst-3d.tex\fi % symplan
+\ifx\PSTGradLoaded\endinput\else \input pst-grad.tex\fi
+\ifx\PSTmathLoaded\endinput\else \input pst-math.tex\fi
\ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi
-\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi
+\ifx\PSTXKeyLoaded\endinput\else \input pst-xkey\fi
%
-\def\fileversion{0.97}
-\def\filedate{2007/01/07}
+\def\fileversion{1.01}
+\def\filedate{2010/07/23}
\message{`PST-Optic' v\fileversion, \filedate\space (Manuel Luque and Herbert Voss)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -398,11 +398,11 @@
%
\def\lensSPH{\@ifnextchar[{\pst@lensSPH}{\pst@lensSPH[]}}
\def\pst@lensSPH[#1]{{%
- \psset{lensType=CVG,OA=-7,%
+ \psset[pst-optic]{lensType=CVG,OA=-7,%
lensHeight=6,%
lensWidth=1.5,%
refractB=2}
- \psset{#1}
+ \ifx\relax#1\relax \else\psset[pst-optic,pstricks]{#1}\fi
\begin{pspicture*}(\psk@optic@xLeft ,\psk@optic@yBottom )
(\psk@optic@xRight ,\psk@optic@yTop)
\pnode(! \psk@optic@xLeft\space 0){xLeft}
@@ -566,7 +566,7 @@
%
\def\lensSPHRay{\@ifnextchar[{\pst@lensSPHRay}{\pst@lensSPHRay[]}}
\def\pst@lensSPHRay[#1](#2)(#3)#4#5#6{{%
- \psset{#1}
+ \psset[pst-optic,pstricks]{#1}
\ifx\psk@optic@lensType\lensTypeCVG% CVG
\ifPst@rightRay
\ABinterSPHLens(#2)(#3)(Center){#6}
@@ -736,8 +736,8 @@
%(#2) est l'abscisse du centre optique
\def\lens{\@ifnextchar[{\pst@lens}{\pst@lens[]}}
\def\pst@lens[#1]{{%
- \psset{xLeft=-7.5,xRight=7.5,yBottom=-3,yTop=3}%
- \psset{#1}%
+ \psset[pst-optic]{xLeft=-7.5,xRight=7.5,yBottom=-3,yTop=3}%
+ \psset[pst-optic,pstricks]{#1}%
\pst@killglue%
% trace les rayons
% calcule la position de l'image
@@ -985,7 +985,7 @@
%
\def\mirrorCVGRay{\@ifnextchar[{\pst@mirrorCVGRay}{\pst@mirrorCVGRay[]}}% Herbert 2003/01/05
\def\pst@mirrorCVGRay[#1](#2)(#3)#4{{%
- \psset{#1}%
+ \ifx\relax#1\relax \else\psset[pst-optic,pstricks]{#1}\fi%
\ifx\psk@optic@mirrorType\mirrorType % CVG
%\typeout{====>\mirrorType}
%\typeout{====>\psk@optic@mirrorType}
@@ -1118,7 +1118,7 @@
/X2 exch \pst@number\psxunit div def
XP X1 sub abs 0.01 gt {X1 Y1}{X2 Y2} ifelse ){#4'}
\reflectionRay[#1](tempRef1)(#4'){#4''}
- \psset{mirrorType=CVG}% restore
+ \psset[pst-optic]{mirrorType=CVG}% restore
\fi
\ifPst@drawing
\psline[#1](#2)(#4)
@@ -1130,14 +1130,14 @@
%
\def\mirrorCVG{\@ifnextchar[{\pst@mirrorCVG}{\pst@mirrorCVG[]}}% Herbert Voss 2003/01/05
\def\pst@mirrorCVG[#1]{{%
- \psset{AB=1.25,OA=4.5,XO=0,YO=0,xLeft=-5,xRight=5,yBottom=-3,yTop=3,%
- mirrorHeight=5,mirrorDepth=1,mirrorWidth=0.2}%
- \psset{#1}
+ \psset[pst-optic]{AB=1.25,OA=4.5,XO=0,YO=0,xLeft=-5,xRight=5,yBottom=-3,yTop=3,
+ mirrorHeight=5,mirrorDepth=1,mirrorWidth=0.2}%
+ \ifx\relax#1\relax \else\psset[pst-optic,pstricks]{#1}\fi%
\def\mirrorType{CVG}%
\begin{pspicture}(\psk@optic@xLeft,\psk@optic@yBottom)(\psk@optic@xRight,\psk@optic@yTop)
\pnode(\psk@optic@xLeft, 0){xLeft}
\pnode(\psk@optic@xRight, 0){xRight}
- \pstVerb{%
+ \pstVerb{
/Height \psk@optic@mirrorHeight\space 2.0 div def
/Depth \psk@optic@mirrorDepth\space def
/Width \psk@optic@mirrorWidth\space def
@@ -1158,7 +1158,7 @@
\pnode(! radius XO add YO){Center}
\pnode(! radius 2 div XO add YO){Focus}
\fi
- \pscustom[fillstyle=solid,fillcolor=\psk@optic@mirrorColor,%
+ \pscustom[fillstyle=solid,fillcolor=\psk@optic@mirrorColor,
linecolor=\psk@optic@mirrorColor]{%
% (d,h/2)->(d-w,h/2)
\psline(!%
@@ -1182,15 +1182,15 @@
\psk@optic@mirrorDepth\space \psk@optic@mirrorHeight\space 2 div neg)
% (w/2,-h/2)->(w/2,h/2)
\ifx\psk@optic@mirrorType\mirrorType % CVG or SPH
- \parametricplot{-\psk@optic@mirrorHeight}{\psk@optic@mirrorHeight}{%
+ \parametricplot{-\psk@optic@mirrorHeight}{\psk@optic@mirrorHeight}{
2 \psk@optic@mirrorHeight\space div dup mul \psk@optic@mirrorDepth\space mul
t 2 exp 4 div mul t 2 div }
\else
- \parametricplot{-\psk@optic@mirrorHeight}{\psk@optic@mirrorHeight}{%
+ \parametricplot{-\psk@optic@mirrorHeight}{\psk@optic@mirrorHeight}{
radius dup dup mul t 2 div dup mul sub sqrt sub t 2 div }
\fi
\fill
- }
+ }%
\ifPst@drawing
\psline[style=opticalAxis](O)(xRight)
\ifx\psk@optic@mirrorType\mirrorType\qdisk(Center){1.5pt}\uput{0.2}[-90](Center){Center}\fi
@@ -1240,11 +1240,11 @@
\def\mirrorDVG{\@ifnextchar[{% Herbert Voss 2003/01/05
\pst@mirrorDVG}{\pst@mirrorDVG[]}}
\def\pst@mirrorDVG[#1]{{%
- \psset{% the defaults
+ \psset[pst-optic]{% the defaults
AB=1.25,OA=4,XO=0,YO=0,xLeft=-5,xRight=5,yBottom=-3,yTop=3,%
mirrorHeight=5,mirrorDepth=1,mirrorWidth=0.2,mirrorType=DVG}%
\def\mirrorType{DVG}%
- \psset{#1}%
+ \psset[pst-optic,pstricks]{#1}%
\pstVerb{
/Height \psk@optic@mirrorHeight\space 2 div def
/Depth \psk@optic@mirrorDepth\space def
@@ -1337,7 +1337,7 @@
%
\def\mirrorDVGRay{\@ifnextchar[{\pst@mirrorDVGRay}{\pst@mirrorDVGRay[]}}% Herbert Voss 2003/01/05
\def\pst@mirrorDVGRay[#1](#2)(#3)#4{{%
- \psset{#1}%
+ \psset[pst-optic,pstricks]{#1}%
\pnode(!%
\psk@optic@mirrorHeight\space dup mul 16 div
\psk@optic@mirrorDepth\space div neg 0){Focus}
@@ -1416,9 +1416,9 @@
%
\def\beamLight{\@ifnextchar[{\pst@beamLight}{\pst@beamLight[]}}
\def\pst@beamLight[#1]{{%
- \psset{xLeft=-5,xRight=5,yBottom=-5,yTop=5,%
+ \psset[pst-optic]{xLeft=-5,xRight=5,yBottom=-5,yTop=5,%
drawing=false}% the defaults
- \psset{#1}%
+ \psset[pst-optic,pstricks]{#1}%
\begin{pspicture*}(\psk@optic@xLeft,\psk@optic@yBottom)(\psk@optic@xRight,\psk@optic@yTop)
\rput(0,0){%
\mirrorCVG[#1]%
@@ -1454,9 +1454,9 @@
%
\def\telescope{\@ifnextchar[{\pst@telescope}{\pst@telescope[]}}
\def\pst@telescope[#1]{{%
- \psset{xLeft=-0.5,xRight=11,yBottom=-6,yTop=2}% the default
+ \psset[pst-optic]{xLeft=-0.5,xRight=11,yBottom=-6,yTop=2}% the default
\def\@tempa{#1}%
- \ifx\@tempa\@empty\else\psset{#1}\fi%
+ \ifx\@tempa\@empty\else\psset[pst-optic,pstricks]{#1}\fi%
\pstVerb{%
/mirrorFocus \psk@optic@mirrorFocus\space def
/Coeff mirrorFocus 4 mul def
@@ -1604,9 +1604,9 @@
X1 Y1){Factice}%
\pst@Verb{%
{ [ax by cx dy tx ty] concat
- } \tx@TMChange}%
+ } tx@3Ddict begin TMChange end }%
\box\pst@hbox
- \pst@Verb{\tx@TMRestore}}%
+ \pst@Verb{ tx@3Ddict begin TMRestore end }}%
}\ignorespaces}
%
% refractionRay[options](A)(B)(C)(D){rNoA}{rNoB}{E}
@@ -1620,7 +1620,7 @@
%
\def\refractionRay{\@ifnextchar[{\pst@refractionRay}{\pst@refractionRay[]}}
\def\pst@refractionRay[#1](#2)(#3)(#4)(#5)#6#7#8{{%
- \psset{#1}
+ \psset[pst-optic,pstricks]{#1}
\pst@getcoor{#2}\pst@tempA
\pst@getcoor{#3}\pst@tempB
\pst@getcoor{#4}\pst@tempc
@@ -1683,7 +1683,7 @@
%
\def\reflectionRay{\@ifnextchar[{\pst@reflectionRay}{\pst@reflectionRay[]}}
\def\pst@reflectionRay[#1](#2)(#3)#4{{%
- \psset{#1}
+ \psset[pst-optic,pstricks]{#1}
\pst@getcoor{#2}\pst@tempA% the starting point
\pst@getcoor{#3}\pst@tempp% the point on the mirror
\pst@getcoor{Center}\pst@tempc% the center/focus of the mirror
@@ -1723,7 +1723,7 @@
\define@key[psset]{pst-optic}{k}{\edef\psk@Prism@k{#1}}
\define@boolkey[psset]{pst-optic}[Pst@Prism@]{notations}[true]{}
%
-\psset{AnglePrism=60,AnglePlan1=25,AnglePlan2=55,k=1,lambda=632.8,notations=true}
+\psset[pst-optic]{AnglePrism=60,AnglePlan1=25,AnglePlan2=55,k=1,lambda=632.8,notations=true}
%
\def\psprism{\pst@object{psprism}}
\def\psprism@i{%
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-14 00:44:59 +0000