summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-12-29 00:54:51 +0000
committerKarl Berry <karl@freefriends.org>2006-12-29 00:54:51 +0000
commit95e7adbdb6ef9e7564f42b9afd537afdc64f80f2 (patch)
tree2e41601ba0845a7d9b59d14415779931fc1f7e25 /Master
parent1e9809d43549e836919079b0f9db6c7204472da1 (diff)
pst-optic 0.96 (28dec06)
git-svn-id: svn://tug.org/texlive/trunk@3001 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pst-optic/Changes3
-rw-r--r--Master/texmf-dist/doc/generic/pst-optic/README3
-rw-r--r--Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.bib (renamed from Master/texmf-dist/doc/generic/pst-optic/optic.bib)0
-rw-r--r--Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.pdfbin282581 -> 375128 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.tex181
-rw-r--r--Master/texmf-dist/doc/generic/pst-optic/pst-optic-examples.pdfbin372127 -> 380247 bytes
-rw-r--r--Master/texmf-dist/source/generic/pst-optic/Makefile49
-rw-r--r--Master/texmf-dist/tex/generic/pst-optic/pst-optic.tex590
-rw-r--r--Master/texmf-dist/tpm/bibhtml.tpm4
-rw-r--r--Master/texmf-dist/tpm/clefval.tpm2
-rw-r--r--Master/texmf-dist/tpm/context.tpm2
-rw-r--r--Master/texmf-dist/tpm/curve2e.tpm6
-rw-r--r--Master/texmf-dist/tpm/foekfont.tpm4
-rw-r--r--Master/texmf-dist/tpm/iopart-num.tpm6
-rw-r--r--Master/texmf-dist/tpm/ltxmisc.tpm4
-rw-r--r--Master/texmf-dist/tpm/marginnote.tpm4
-rw-r--r--Master/texmf-dist/tpm/movie15.tpm2
-rw-r--r--Master/texmf-dist/tpm/plain.tpm2
-rw-r--r--Master/texmf-dist/tpm/pst-labo.tpm2
-rw-r--r--Master/texmf-dist/tpm/pst-optic.tpm9
-rw-r--r--Master/texmf-dist/tpm/pst-uml.tpm4
-rw-r--r--Master/texmf-dist/tpm/pstricks-add.tpm8
-rw-r--r--Master/texmf-dist/tpm/pstricks.tpm2
-rw-r--r--Master/texmf-dist/tpm/rsc.tpm8
-rw-r--r--Master/texmf-dist/tpm/subfigure.tpm10
-rw-r--r--Master/texmf-dist/tpm/svgcolor.tpm4
-rw-r--r--Master/texmf-dist/tpm/tex4ht.tpm2
-rw-r--r--Master/texmf/lists/pst-optic4
-rw-r--r--Master/texmf/tpm/collection-binextra.tpm2
-rw-r--r--Master/texmf/tpm/collection-latexextra.tpm2
30 files changed, 705 insertions, 214 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-optic/Changes b/Master/texmf-dist/doc/generic/pst-optic/Changes
index f65e8fa6d76..59138a5728b 100644
--- a/Master/texmf-dist/doc/generic/pst-optic/Changes
+++ b/Master/texmf-dist/doc/generic/pst-optic/Changes
@@ -1,4 +1,7 @@
---- pst-optic.tex
+0.96 2006-12-26 - new macros for setting a prism
+ - new option for a plan convex and
+ divergent lens
0.95 2006-07-20 - fix spurious blanks
- use \def instead of \edef
for the keyval definitions
diff --git a/Master/texmf-dist/doc/generic/pst-optic/README b/Master/texmf-dist/doc/generic/pst-optic/README
index 70b9df5af52..fa678ecd64d 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)
%%
-%% 2003-02-16
+%% 2006-12-26
%%
Save the files
@@ -25,7 +25,6 @@ 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/optic.bib b/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.bib
index 6f777d67d99..6f777d67d99 100644
--- a/Master/texmf-dist/doc/generic/pst-optic/optic.bib
+++ b/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.bib
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 04635753653..e0b5bbe4a81 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 e25b54a1c94..95948c38db4 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
@@ -1,6 +1,8 @@
+\listfiles
\documentclass[12pt]{article}
\usepackage[T1]{fontenc}
-\usepackage[latin1]{inputenc}
+\usepackage[latin9]{inputenc}
+\usepackage[scaled=0.9]{luximono}
\usepackage{geometry}
\usepackage{graphicx,lmodern}
\usepackage{subfig}
@@ -8,12 +10,10 @@
\usepackage{pst-text}
\usepackage{pst-optic}
\let\SaveFV\fileversion
-\usepackage{url}
\usepackage{amsmath}
\usepackage{tabularx}
\usepackage{lscape}
\usepackage{fancyhdr}
-\usepackage[scaled=0.9]{luximono}
\pagestyle{fancy}
\lfoot{\small\ttfamily\jobname.tex}
\cfoot{}
@@ -25,17 +25,15 @@
extendedchars=true,numbers=left,numberstyle=\tiny}
\usepackage{multicol}
\let\myPart\part
-\renewcommand{\part}[1]{%
- \clearpage\myPart{#1}%
-}
+\renewcommand{\part}[1]{\clearpage\myPart{#1}}
\newcommand{\PS}{PostScript}
\newcommand\CMD[1]{\texttt{\textbackslash#1}}
\psset{subgriddiv=0,gridlabels=7pt,griddots=5}
-\usepackage[colorlinks,linktocpage]{hyperref}
+\usepackage[ps2pdf,colorlinks,linktocpage]{hyperref}
\usepackage{breakurl}
\begin{document}
-\author{Manuel Luque\thanks{Mluque5130@aol.com} \and Herbert Voß\thanks{voss@perce.de}}
+\author{Manuel Luque\thanks{\url{Mluque5130@aol.com}} \and Herbert Voß\thanks{\url{voss@perce.de}}}
\date{\today}
\title{Lenses and Mirrors: PST-optic v\SaveFV}
\maketitle
@@ -49,6 +47,8 @@ It is also important that after \verb+pst-optic+ no package is loaded, which use
\vspace*{2cm}
\end{abstract}%
+
+
\clearpage
\tableofcontents
@@ -114,6 +114,8 @@ The star version enables the clipping option of \verb|pstricks|:
\end{pspicture}
\end{lstlisting}
+
+
If you need other values for the \verb|pspicture| environment, then use the \verb|\rput|
command to place the macro at any position.
@@ -146,8 +148,8 @@ This macro resets all \verb+pst-optic+ options to the default value.
There are macros for the convergent and divergent lens
\begin{description}
- \item \verb|\lens[CVG]| \textbf{C}on\textbf{v}er\textbf{g}ent (Collecting lens ) - default
- \item \verb|\lens[DVG]| \textbf{D}i\textbf{v}er\textbf{g}ent (Scatter lens )
+ \item \verb|\lensCVG| \textbf{C}on\textbf{v}er\textbf{g}ent (Collecting lens ) - default
+ \item \verb|\lensDVG| \textbf{D}i\textbf{v}er\textbf{g}ent (Scatter lens )
\end{description}
\section{The Coordinates of the predefined Nodes}
@@ -205,19 +207,31 @@ Figure \ref{fig:nodes} shows the coordinates of the predefined nodes (see table
\section{The Lens Type}
\begin{figure}[htb]
- \centering
+\centering
\bgroup
- \psscalebox{0.75}{\lens[lensType=CVG]}\vspace{-0.5cm}
- \caption{\texttt{\textbackslash lens[lensType=CVG]} (Collecting lens)}%
- \label{fig:defaultCVG}
+\psscalebox{0.75}{\lens[lensType=CVG]}\vspace{-0.5cm}
+\caption{\texttt{\textbackslash lens[lensType=CVG]} (Collecting lens)}%
+\label{fig:defaultCVG}
- \psscalebox{0.75}{\lens[lensType=DVG,focus=-2,spotAi=270,spotBi=90]}\vspace{-0.5cm}
+\psscalebox{0.75}{\lens[lensType=PCVG]}\vspace{-0.5cm}
+\caption{\texttt{\textbackslash lens[lensType=PCVG]} (Plan Collecting lens)}%
+\egroup
+\end{figure}
+
+
+
+\begin{figure}[htb]
+\centering
+\bgroup
+\psscalebox{0.75}{\lens[lensType=DVG,focus=-2,spotAi=270,spotBi=90]}\vspace{-0.5cm}
+\caption{\texttt{\textbackslash lens[lensType=DVG,focus=-2,spotAi=270,spotBi=90]} (Scatter lens)}%
+\label{fig:defaultDVG}
+
+\psscalebox{0.75}{\lens[lensType=PDVG,focus=-2,spotAi=270,spotBi=90]}\vspace{-0.5cm}
+\caption{\texttt{\textbackslash lens[lensType=PDVG,focus=-2,spotAi=270,spotBi=90]} (Plan Scatter lens)}%
\egroup
- \caption{\texttt{\textbackslash lens[lensType=DVG,focus=-2,spotAi=270,spotBi=90]} (Scatter lens)}%
- \label{fig:defaultDVG}
\end{figure}
-\par
Using \verb|\lens[<lensType>]| gives the in figure \ref{fig:defaultCVG} and \ref{fig:defaultDVG} shown lenses with the default values from table \ref{tab:defaultLens}.
\par
@@ -228,7 +242,7 @@ Using \verb|\lens[<lensType>]| gives the in figure \ref{fig:defaultCVG} and \ref
\centering
\begin{tabular}{l|l|l}
\textbf{Option} & \textbf{Name} & \textbf{Default}\\\hline
- Lense type & lensType & CVG\\
+ Lense type & lensType & CVG\\
Lense height in cm & lensHeight & 5cm\\
Lense width in cm & lensWidth & 0.5cm\footnotemark\\
vertical scale (obsolet) & lensScale& 1\\
@@ -416,7 +430,6 @@ The two parallel lines are drawn with the \verb|\Parallel|-Macro.
\psset{length=-2,linestyle=dashed}
\Parallel(B'1)(O)(Inter2L2){B2inftyLeft}
\Parallel(B'1)(O)(Inter1L2){B3inftyLeft}
-\psgrid[subgriddiv=0,griddots=5, gridlabels=7pt]
\psline[linestyle=dotted, linewidth=2pt,linecolor=black]{->}(0,-4)(0,+4)
\end{pspicture}%
\egroup
@@ -864,6 +877,129 @@ In the figure the macro was called as
\end{multicols}
+\part{Prism}
+\newcommand\cadre[1]{%
+ \psframebox[fillstyle=solid,fillcolor=black]{\textcolor{white}{\texttt{#1}}}}
+This command allows to simulate the deviation of a mono-chromatic
+light ray with a prism. There are only few parameters. The indicated
+values are the default ones.
+\begin{itemize}
+\item The angle to the top of prism : \cadre{AnglePrism=60}.
+\item The angle between the plane (1), where the tranmitter takes
+ place, and the vertical : \cadre{AnglePlan}. Negative
+ values are allowed.
+\item The angle between the plane (2) (the screen), and the vertical :
+ \cadre{+AnglePlan2=55}. Negative values are allowed.
+\item Position of transmitter relative to choosen origin $C_1$ on the
+ plane : $\overrightarrow{C_1E_1} = k\overrightarrow{u_1}$, \cadre{k=1}.
+\item The wavelength \cadre{lambda=632.8}, in nm.
+\item The plane where transmitting source takes place, with all
+ indications, origin, angle, etc., as well as the screen are
+ displayed by default. This can be useful in order to finalize a
+ figure, but it is possible to deactivate this feature with the
+ option \cadre{[notations=false]}
+\end{itemize}
+Thanks to the \cadre{AnglePlan1}, the incident ray direction can be changed. The incidence spot changes according to \cadre{k}.
+
+The outline of processing we have adopted is the Gernot Hoffmann
+one. He details it in its document :
+\url{http://www.fho-emden.de/~hoffmann/prism16072005.pdf}
+
+\section{Figure with Default Values and Construction Indications}
+
+\begin{lstlisting}
+\psframebox{%
+ \begin{pspicture*}(-8,-2)(8,8)
+ \psprism
+ \end{pspicture*}}
+\end{lstlisting}
+
+
+\begin{center}
+\psframebox{%
+\begin{pspicture*}(-8,-2)(8,8)
+\psprism%
+\end{pspicture*}}
+\end{center}
+
+
+\section{Figure with Default Values, without Construction Indications}
+
+\begin{lstlisting}
+\psframebox{%
+ \begin{pspicture*}(-8,-2)(8,8)
+ \psprism[notations=false]
+ \end{pspicture*}}
+\end{lstlisting}
+
+\begin{center}
+\psframebox{%
+ \begin{pspicture*}(-8,-2)(8,8)
+ \psprism[notations=false]%
+ \end{pspicture*}}
+\end{center}
+
+\section{Color matches Wavelength}
+\begin{lstlisting}
+\begin{pspicture*}(-7,-2)(7,8)
+ \psprismColor[lambda=530]%
+\end{pspicture*}
+\end{lstlisting}
+
+\begin{center}
+\psframebox{%
+ \begin{pspicture*}(-8,-2)(8,8)
+ \psprism[lambda=530]%
+ \end{pspicture*}}
+\end{center}
+
+
+\section{What is not Planned!}
+We have not planned physical impossibilities. When $r_2$ is greater
+than the limit angle, there is no transmission in air, and it's
+impossible to calculate $i_2$. Then, we have a PostScript message:
+
+\begin{lstlisting}
+Displaying page 1
+Displaying page 2
+Displaying page 3
+Displaying page 4
+Error: /rangecheck in --sqrt--
+Operand stack:
+ alpha2 -1.02701 -0.0547467
+\end{lstlisting}
+We remind you that \cadre{alpha2} is $i_2$.
+
+For instance, \cadre{\texttt{AnglePrism=65}}, other default parameters
+remains unchanged.
+
+\begin{lstlisting}
+\psframebox{%
+ \begin{pspicture*}(-7,-2)(7,8)
+ \psprism[AnglePrism=65]
+ \end{pspicture*}}
+\end{lstlisting}
+
+It will become right when we change the incident ray slope:
+
+\begin{lstlisting}
+\psframebox{%
+ \begin{pspicture*}(-7,-2)(7,8)
+ \psprism[AnglePrism=65,AnglePlan1=51,k=-1.5]
+ \end{pspicture*}}
+\end{lstlisting}
+
+\begin{center}
+\psframebox{%
+\begin{pspicture*}(-8,-2)(8,8)
+\psprism[AnglePrism=65,AnglePlan1=51,k=-1.5]
+\end{pspicture*}}
+\end{center}
+
+We choose \cadre{k=-1.5} in order to have a incident ray
+which strikes (?) the input side roudly in its center. But, in these
+particular cases, the physicist know-how is important (\emph{bis repetita}). Isn't it?
+
\part{Spherical Optic}
@@ -1256,7 +1392,6 @@ This macro calculates the coordinates of the given ray $\overline{\mathrm{AB}}$
-
\part{Utility Macros}
\section{\texttt{\textbackslash eye}}
@@ -1721,13 +1856,13 @@ A special option is \verb|arrowOffset|, which makes it possible to draw lines wi
\section{Credits}
-Aranud Schmittbuhl |
+Jean-Come Charpentier | Aranud Schmittbuhl |
\nocite{*}
\bibliographystyle{plain}
-\bibliography{optic}
+\bibliography{pst-optic-doc}
\end{document}
diff --git a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-examples.pdf b/Master/texmf-dist/doc/generic/pst-optic/pst-optic-examples.pdf
index 5c61b3c5116..5121e6d25c4 100644
--- a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-examples.pdf
+++ b/Master/texmf-dist/doc/generic/pst-optic/pst-optic-examples.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/generic/pst-optic/Makefile b/Master/texmf-dist/source/generic/pst-optic/Makefile
new file mode 100644
index 00000000000..73abbdbb307
--- /dev/null
+++ b/Master/texmf-dist/source/generic/pst-optic/Makefile
@@ -0,0 +1,49 @@
+
+# `Makefile' for `pst-coil.pdf', hv, 2006/08/11
+
+.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps
+
+PACKAGE = pst-optic
+
+MAIN = pst-optic-doc
+
+LATEX = latex
+
+ARCHNAME = $(MAIN)-$(shell date +%y%m%d)
+
+ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile
+
+all : doc
+# clean
+doc: $(MAIN).pdf
+
+$(MAIN).pdf : $(MAIN).ps
+ GS_OPTIONS=-dAutoRotatePages=/None ps2pdf $<
+
+$(MAIN).ps : $(MAIN).dvi
+ dvips $<
+
+$(MAIN).dvi : $(MAIN).tex
+ $(LATEX) $<
+ $(LATEX) $<
+ if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi
+ if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi
+ makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \
+ $(basename $<).glo
+ makeindex -t $(basename $<).ilg -o $(basename $<).ind \
+ $(basename $<).idx
+ bibtex $(basename $<)
+ $(LATEX) $<
+ $(LATEX) $<
+
+clean :
+ $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out )
+ $(RM) $(addprefix $(MAIN), .dvi .ps)
+
+veryclean : clean
+ $(RM) $(addprefix $(MAIN), .pdf .bbl .blg)
+
+arch :
+ zip $(ARCHNAME).zip $(ARCHFILES)
+
+# EOF
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 90920f2e1be..8ca214b87a7 100644
--- a/Master/texmf-dist/tex/generic/pst-optic/pst-optic.tex
+++ b/Master/texmf-dist/tex/generic/pst-optic/pst-optic.tex
@@ -19,20 +19,21 @@
%%
\csname PSTopticLoaded\endcsname
\let\PSTopticLoaded\endinput
-% Requires PSTricks, pst-node, pstcol, pst-plot, pst-3d, multido packages
+% 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\PSTMultidoLoaded\endinput\else\input multido.tex\fi
\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi
%
-\def\fileversion{0.95}
-\def\filedate{2006/07/20}
+\def\fileversion{0.96}
+\def\filedate{2006/08/02}
\message{`PST-Optic' v\fileversion, \filedate\space (Manuel Luque and Herbert Voss)}
%
-% DPC interface to the `keyval' package (until keyval based version of PSTricks)
-%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
\pst@addfams{pst-optic}
\SpecialCoor
@@ -78,20 +79,12 @@
%
% ---------------- the if's -----------------
%
-\newif\ifPst@lensTwo% is a second lens present?
-\define@key[psset]{pst-optic}{lensTwo}[false]{\@nameuse{Pst@lensTwo#1}%
-}
-\newif\ifPst@lensGlass% draw a _real_ lens?
-\define@key[psset]{pst-optic}{lensGlass}[true]{\@nameuse{Pst@lensGlass#1}%
-}
-\newif\ifPst@drawing% draw the nodes and rays?
-\define@key[psset]{pst-optic}{drawing}[true]{\@nameuse{Pst@drawing#1}%
-}
-\newif\ifPst@rightRay% a ray on the right side?
-\define@key[psset]{pst-optic}{rightRay}[false]{\@nameuse{Pst@rightRay#1}%
-}
+\define@boolkey[psset]{pst-optic}[Pst@]{lensTwo}[false]{} % is a second lens present?
+\define@boolkey[psset]{pst-optic}[Pst@]{lensGlass}[true]{}% draw a _real_ lens?
+\define@boolkey[psset]{pst-optic}[Pst@]{drawing}[true]{} % draw the nodes and rays?
+\define@boolkey[psset]{pst-optic}[Pst@]{rightRay}[false]{}% a ray on the right side?
%
-\psset[pst-optic]{lensGlass=false,drawing=true}
+\psset[pst-optic]{lensGlass,drawing,lensTwo,rightRay}
%
% ------- the global definitions for the pspicture frame ------
%
@@ -103,12 +96,8 @@
%
% ---------------- the lenses -----------------
%
-\define@key[psset]{pst-optic}{lensType}{% CVG|DVG
- \def\psk@optic@lensType{#1}%
-}
-\define@key[psset]{pst-optic}{lensColor}{%
- \def\psk@optic@lensColor{#1}%
-}
+\define@key[psset]{pst-optic}{lensType}{\def\psk@optic@lensType{#1}}% CVG|DVG|PCVG|PDVG
+\define@key[psset]{pst-optic}{lensColor}{\def\psk@optic@lensColor{#1}}
\define@key[psset]{pst-optic}{lensWidth}{% the thichness of the lens
\def\psk@optic@lensWidth{#1}%
}
@@ -127,7 +116,10 @@
\define@key[psset]{pst-optic}{lensArrowInset}{%
\def\psk@optic@lensArrowInset{#1}%
}
-\def\lensType{CVG}
+\def\lensTypeCVG{CVG}
+\def\lensTypeDVG{DVG}
+\def\lensTypePCVG{PCVG}
+\def\lensTypePDVG{PDVG}
\psset[pst-optic]{lensType=CVG,lensColor=lightgray,lensWidth=0.5,lensDepth=1,
lensHeight=5,lensScale=1,lensArrowSize=0.2,lensArrowInset=0.5}
%
@@ -136,21 +128,13 @@
\define@key[psset]{pst-optic}{mirrorType}{% PLAN|PARAbolic|SPHerical
\def\psk@optic@mirrorType{#1}%
}
-\define@key[psset]{pst-optic}{mirrorDepth}{%
- \def\psk@optic@mirrorDepth{#1}%
-}
+\define@key[psset]{pst-optic}{mirrorDepth}{\def\psk@optic@mirrorDepth{#1}}
\define@key[psset]{pst-optic}{mirrorHeight}{% it's the TOTAL height
\def\psk@optic@mirrorHeight{#1}%
}
-\define@key[psset]{pst-optic}{mirrorWidth}{%
- \def\psk@optic@mirrorWidth{#1}%
-}
-\define@key[psset]{pst-optic}{mirrorColor}{%
- \def\psk@optic@mirrorColor{#1}%
-}
-\define@key[psset]{pst-optic}{mirrorFocus}{%
- \def\psk@optic@mirrorFocus{#1}%
-}
+\define@key[psset]{pst-optic}{mirrorWidth}{\def\psk@optic@mirrorWidth{#1}}
+\define@key[psset]{pst-optic}{mirrorColor}{\def\psk@optic@mirrorColor{#1}}
+\define@key[psset]{pst-optic}{mirrorFocus}{\def\psk@optic@mirrorFocus{#1}}
\define@key[psset]{pst-optic}{posMirrorTwo}{% a sencond mirror? (telescope)
\def\psk@optic@posMirrorTwo{#1}%
}
@@ -467,7 +451,7 @@
/Width \psk@optic@lensWidth\space def
/Width2 Width 2.0 div def
}
- \ifx\psk@optic@lensType\lensType% CVG ?
+ \ifx\psk@optic@lensType\lensTypeCVG% CVG ?
\pnode(!%
/radius Width2 dup mul Height dup mul add Width2 div 2 div def
/XM Width2 radius sub def
@@ -497,7 +481,7 @@
linecolor=\psk@optic@lensColor%
}
\rput(! XO YO){%
- \ifx\psk@optic@lensType\lensType% CVG
+ \ifx\psk@optic@lensType\lensTypeCVG% CVG
\pscustom{%
\parametricplot{\psk@optic@lensHeight}{-\psk@optic@lensHeight}{%
/arg t radius 2.0 mul div def
@@ -546,7 +530,7 @@
\uput[-90](Center){Center}
\psset{linecolor=\psk@optic@rayColor}
\psline[linewidth=1.5\pslinewidth,arrowinset=0]{->}(A)(B)
- \ifx\psk@optic@lensType\lensType
+ \ifx\psk@optic@lensType\lensTypeCVG
% the parallel ray
\lensSPHRay[lensType=CVG]%
(B)(I){\psk@optic@refractA}{\psk@optic@refractB}{PSPH}
@@ -621,7 +605,7 @@
\def\lensSPHRay{\@ifnextchar[{\pst@lensSPHRay}{\pst@lensSPHRay[]}}
\def\pst@lensSPHRay[#1](#2)(#3)#4#5#6{{%
\psset{#1}
- \ifx\psk@optic@lensType\lensType% CVG
+ \ifx\psk@optic@lensType\lensTypeCVG% CVG
\ifPst@rightRay
\ABinterSPHLens(#2)(#3)(Center){#6}
\else
@@ -632,7 +616,7 @@
\fi
% \psline(! Y mT sub X 1 sub neg)(! Y mT add X 1 add neg)
\refractionRay(#2)(#6)(! Y mT sub X 1 sub neg)(! Y mT add X 1 add neg){#4}{#5}{tempSPHRay}
- \ifx\psk@optic@lensType\lensType% CVG
+ \ifx\psk@optic@lensType\lensTypeCVG% CVG
\ifPst@rightRay
\ABinterSPHLens(#6)(tempSPHRay')(Center'){#6'}
\else
@@ -658,7 +642,7 @@
\pst@getcoor{#2}\pst@tempB
\pst@getcoor{#3}\pst@tempm
% calculate the intersection point. we change the coordinates
- \ifx\psk@optic@lensType\lensType% CVG
+ \ifx\psk@optic@lensType\lensTypeCVG% CVG
\pnode(!%
/YA \pst@tempA pop \pst@number\psxunit div def
/XA \pst@tempA exch pop \pst@number\psyunit div neg def
@@ -729,6 +713,62 @@
%\arrowLine[linecolor=blue,arrows=->](#4)(#4'){2}
}
%
+\def\pst@drawDVGRays{%
+ %dessin de l'objet
+ \psline[linewidth=1.5\pslinewidth,arrowinset=0]{->}(A)(B)
+% dessin de l'image
+ \psline[linewidth=1.5\pslinewidth,arrowinset=0,linestyle=dashed]{->}(A')(B')
+%dessin des rayons
+ \psset{linecolor=\psk@optic@rayColor}
+ \Arrows[length=16,arrows=-](B)(O)
+ \Arrows(B)(I)
+ \psline(B)(I)
+ \psOutLine[arrows=->,length=1](B')(I){END1}
+ \psOutLine[length=5](B')(I){END2}
+ \psline[linestyle=dashed](F')(I)
+ \Arrows[arrows=->>](B)(I')
+ \psline(B)(I')
+ \psOutLine[arrows=->>,length=2](B')(I'){END3}
+ \psOutLine[length=10](B')(I'){END4}
+ \psline[linestyle=dashed](B')(I')
+ %\uput[45](I'){I'}
+ %\uput[45](I){I}
+ \uput[\psk@optic@spotA](A){$\mathrm{\psk@optic@nameA}$}%
+ \uput[\psk@optic@spotB](B){$\mathrm{\psk@optic@nameB}$}%
+ \uput[\psk@optic@spotAi](A'){$\mathrm{\psk@optic@nameAi}$}%
+ \uput[\psk@optic@spotBi](B'){$\mathrm{\psk@optic@nameBi}$}%
+ \uput[\psk@optic@spotO](O){$\mathrm{\psk@optic@nameO}$}%
+}
+\def\pst@drawCVGRays{%
+% Position des foyers
+ \psdots[dotstyle=|](F')
+ \uput[\psk@optic@spotFi](F'){$\mathrm{\psk@optic@nameFi}$}
+ \psdots[dotstyle=|](F)
+ \uput[\psk@optic@spotF](F){$\mathrm{\psk@optic@nameF}$}
+%dessin de l'objet
+ \psline[linewidth=1.5\pslinewidth,arrowinset=0]{->}(A)(B)
+% dessin de l'image
+ \psline[linewidth=1.5\pslinewidth,arrowinset=0]{->}(A')(B')
+%dessin des rayons
+ \psset{linecolor=\psk@optic@rayColor}
+ \pcline(B)(B')
+ \Arrows[length=16,arrows=-](B)(O)
+ \Arrows(B)(I)
+ \psline(B)(I)
+ \Arrows[length=10,posStart=0,arrows=-](I)(F')
+ \Arrows[posStart=1,arrows=->](I)(F')
+ \Arrows[arrows=->>](B)(I')
+ \psline(B)(I')(B')
+ \Arrows[length=10,arrows=-](I')(B')
+ \Arrows[length=2,posStart=0.5,arrows=->>](I')(B')
+ %\uput[-45](I'){I'}
+ %\uput[45](I){I}
+ \uput[\psk@optic@spotA](A){$\mathrm{\psk@optic@nameA}$}
+ \uput[\psk@optic@spotB](B){$\mathrm{\psk@optic@nameB}$}
+ \uput[\psk@optic@spotAi](A'){$\mathrm{\psk@optic@nameAi}$}
+ \uput[\psk@optic@spotBi](B'){$\mathrm{\psk@optic@nameBi}$}
+ \uput[\psk@optic@spotO](O){$\mathrm{\psk@optic@nameO}$}
+}
%fin 26 juin 2001
%Lentille convergente : CVG
%(#2) est l'abscisse du centre optique
@@ -793,9 +833,14 @@
\fi%
\begingroup%
\ifPst@lensGlass%
- \rput(! XO YO){\ifx\psk@optic@lensType\lensType\lensCVG\else\lensDVG\fi}%
+ \rput(! XO YO){%
+ \ifx\psk@optic@lensType\lensTypeCVG\lensCVG%
+ \else\ifx\psk@optic@lensType\lensTypePCVG\lensCVG
+ \else\lensDVG\fi\fi}%
\else%
- \ifx\psk@optic@lensType\lensType\psset{arrows=<->}\else\psset{arrows=>-<}\fi%
+ \ifx\psk@optic@lensType\lensTypeDVG\psset{arrows=>-<}\else
+ \ifx\psk@optic@lensType\lensTypePDVG\psset{arrows=>-<}\else\psset{arrows=<->}
+ \fi\fi
\psline[linecolor=\psk@optic@lensColor,
linewidth=\psk@optic@lensWidth,arrowsize=\psk@optic@lensArrowSize,
arrowinset=\psk@optic@lensArrowInset]%
@@ -805,66 +850,14 @@
\psk@optic@lensScale\space mul YO add)%
\fi%
\endgroup%
-\ifPst@drawing
+ \ifPst@drawing
% axe optique
\psline(! \psk@optic@xLeft\space YO)(! \psk@optic@xRight\space YO)
- \ifx\psk@optic@lensType\lensType%
-% Position des foyers
- \psdots[dotstyle=|](F')
- \uput[\psk@optic@spotFi](F'){$\mathrm{\psk@optic@nameFi}$}
- \psdots[dotstyle=|](F)
- \uput[\psk@optic@spotF](F){$\mathrm{\psk@optic@nameF}$}
-%dessin de l'objet
- \psline[linewidth=1.5\pslinewidth,arrowinset=0]{->}(A)(B)
-% dessin de l'image
- \psline[linewidth=1.5\pslinewidth,arrowinset=0]{->}(A')(B')
-%dessin des rayons
- \psset{linecolor=\psk@optic@rayColor}
- \pcline(B)(B')
- \Arrows[length=16,arrows=-](B)(O)
- \Arrows(B)(I)
- \psline(B)(I)
- \Arrows[length=10,posStart=0,arrows=-](I)(F')
- \Arrows[posStart=1,arrows=->](I)(F')
- \Arrows[arrows=->>](B)(I')
- \psline(B)(I')(B')
- \Arrows[length=10,arrows=-](I')(B')
- \Arrows[length=2,posStart=0.5,arrows=->>](I')(B')
- %\uput[-45](I'){I'}
- %\uput[45](I){I}
- \uput[\psk@optic@spotA](A){$\mathrm{\psk@optic@nameA}$}
- \uput[\psk@optic@spotB](B){$\mathrm{\psk@optic@nameB}$}
- \uput[\psk@optic@spotAi](A'){$\mathrm{\psk@optic@nameAi}$}
- \uput[\psk@optic@spotBi](B'){$\mathrm{\psk@optic@nameBi}$}
- \uput[\psk@optic@spotO](O){$\mathrm{\psk@optic@nameO}$}
- \else
- %dessin de l'objet
- \psline[linewidth=1.5\pslinewidth,arrowinset=0]{->}(A)(B)
-% dessin de l'image
- \psline[linewidth=1.5\pslinewidth,arrowinset=0,linestyle=dashed]{->}(A')(B')
-%dessin des rayons
- \psset{linecolor=\psk@optic@rayColor}
- \Arrows[length=16,arrows=-](B)(O)
- \Arrows(B)(I)
- \psline(B)(I)
- \psOutLine[arrows=->,length=1](B')(I){END1}
- \psOutLine[length=5](B')(I){END2}
- \psline[linestyle=dashed](F')(I)
- \Arrows[arrows=->>](B)(I')
- \psline(B)(I')
- \psOutLine[arrows=->>,length=2](B')(I'){END3}
- \psOutLine[length=10](B')(I'){END4}
- \psline[linestyle=dashed](B')(I')
- %\uput[45](I'){I'}
- %\uput[45](I){I}
- \uput[\psk@optic@spotA](A){$\mathrm{\psk@optic@nameA}$}%
- \uput[\psk@optic@spotB](B){$\mathrm{\psk@optic@nameB}$}%
- \uput[\psk@optic@spotAi](A'){$\mathrm{\psk@optic@nameAi}$}%
- \uput[\psk@optic@spotBi](B'){$\mathrm{\psk@optic@nameBi}$}%
- \uput[\psk@optic@spotO](O){$\mathrm{\psk@optic@nameO}$}%
- \fi%
-\fi%
-\end{pspicture*}%
+ \ifx\psk@optic@lensType\lensTypeDVG\pst@drawDVGRays\else
+ \ifx\psk@optic@lensType\lensTypePDVG\pst@drawDVGRays\else
+ \pst@drawCVGRays\fi\fi
+ \fi%
+ \end{pspicture*}%
}\ignorespaces}
%
% 25 december 2002 Herbert <voss@perce.de>
@@ -874,11 +867,12 @@
%
\def\pslensDVG{\pst@object{pslensDVG}}
\def\pslensDVG@i#1#2{%
- \begin@OpenObj
- \pssetlength\pst@dima{#1}%
- \pssetlength\pst@dimb{#2}%
- \addto@pscode{\pslensDVG@ii}%
- \end@OpenObj%
+ \begin@OpenObj
+ \pssetlength\pst@dima{#1}%
+ \pssetlength\pst@dimb{#2}%
+ \ifx\psk@optic@lensType\lensTypeDVG\addto@pscode{\pslensDVG@ii}%
+ \else\addto@pscode{\pslensPDVG@ii}\fi%
+ \end@OpenObj%
}
\def\pslensDVG@ii{%
/w \pst@number\pst@dima def% lensWidth
@@ -894,28 +888,58 @@
x neg y Radius angleA angleB arc
wHalbe h lineto
}
-%
-\def\pslensCVG{\pst@object{pslensCVG}}
-\def\pslensCVG@i#1#2{%
- \begin@OpenObj
- \pssetlength\pst@dima{#1}%
- \pssetlength\pst@dimb{#2}%
- \addto@pscode{\pslensCVG@ii}%
- \end@OpenObj%
-}
-%
-\def\pslensCVG@ii{%
+\def\pslensPDVG@ii{%
/w \pst@number\pst@dima def% lensWidth
/wHalbe w 2 div def% half of the width
/h \pst@number\pst@dimb 2 div def% the half of the height
- /Radius wHalbe dup mul h dup mul add w div def
- /x Radius wHalbe sub def
+ /Radius wHalbe 2 div dup mul h dup mul add wHalbe div def
+ /x Radius wHalbe 2 div add def
/y 0 def
- /angleA h x atan neg def
+ /angleA h x wHalbe sub atan neg def
/angleB angleA neg def
0 h moveto
- x y Radius 180 angleA add 180 angleB add arc
- x neg y Radius angleA angleB arc
+ wHalbe 0 rlineto
+ x y Radius 180 angleA add 180 angleB add arc
+% x neg y Radius angleA angleB arc
+ wHalbe neg 0 rlineto
+ 0 h dup add rlineto
+}
+%
+\def\pslensCVG{\pst@object{pslensCVG}}
+\def\pslensCVG@i#1#2{%
+ \begin@OpenObj
+ \pssetlength\pst@dima{#1}%
+ \pssetlength\pst@dimb{#2}%
+ \ifx\psk@optic@lensType\lensTypeCVG\addto@pscode{\pslensCVG@ii}%
+ \else\addto@pscode{\pslensPCVG@ii}\fi%
+ \end@OpenObj%
+}
+%
+\def\pslensCVG@ii{%
+ /w \pst@number\pst@dima def% lensWidth
+ /wHalbe w 2 div def% half of the width
+ /h \pst@number\pst@dimb 2 div def% the half of the height
+ /Radius wHalbe dup mul h dup mul add w div def
+ /x Radius wHalbe sub def
+ /y 0 def
+ /angleA h x atan neg def
+ /angleB angleA neg def
+ 0 h moveto
+ x y Radius 180 angleA add 180 angleB add arc
+ x neg y Radius angleA angleB arc
+}
+\def\pslensPCVG@ii{%
+ /w \pst@number\pst@dima def% lensWidth
+ /wHalbe w 2 div def% half of the width
+ /h \pst@number\pst@dimb 2 div def% the half of the height
+ /Radius wHalbe dup mul h dup mul add w div def
+ /x Radius wHalbe sub def
+ /y 0 def
+ /angleA h x atan neg def
+ /angleB angleA neg def
+ 0 h neg moveto
+ 0 h dup add rlineto
+ x neg y Radius angleA angleB arc
}
%
%22 juin 2001 / 25 december 2002
@@ -923,21 +947,21 @@
%Le dessin de la lentille
%
\def\lensCVG{%
- \psscalebox{\psk@optic@lensScale}{%
- \pscustom[linewidth=0.75\pslinewidth]{%
- \pslensCVG{\psk@optic@lensWidth}{\psk@optic@lensHeight}
- \fill[fillstyle=solid,fillcolor=BleuVerre]
- }%
+ \psscalebox{\psk@optic@lensScale}{%
+ \pscustom[linewidth=0.75\pslinewidth]{%
+ \pslensCVG{\psk@optic@lensWidth}{\psk@optic@lensHeight}
+ \fill[fillstyle=solid,fillcolor=BleuVerre]
}%
+ }%
}
%
\def\lensDVG{%
- \psscalebox{\psk@optic@lensScale}{%
- \pscustom[linewidth=0.75\pslinewidth]{%
- \pslensDVG{\psk@optic@lensWidth}{\psk@optic@lensHeight}
- \fill[fillstyle=solid,fillcolor=BleuVerre]%
- }%
- }%
+ \psscalebox{\psk@optic@lensScale}{%
+ \pscustom[linewidth=0.75\pslinewidth]{%
+ \pslensDVG{\psk@optic@lensWidth}{\psk@optic@lensHeight}
+ \fill[fillstyle=solid,fillcolor=BleuVerre]%
+ }%
+ }%
}
%Sauvegarde des points pour le cas d'un
%système à deux lentilles (26 juin 2001)
@@ -1001,8 +1025,8 @@
\def\pst@mirrorCVGRay[#1](#2)(#3)#4{{%
\psset{#1}%
\ifx\psk@optic@mirrorType\mirrorType % CVG
-\typeout{====>\mirrorType}
-\typeout{====>\psk@optic@mirrorType}
+%\typeout{====>\mirrorType}
+%\typeout{====>\psk@optic@mirrorType}
\pst@getcoor{#2}\pst@tempA
\pst@getcoor{#3}\pst@tempB
\pnode(!%
@@ -1106,8 +1130,8 @@
} ifelse ){#4''}
\else
%--------------- A Spherical Mirror -----------------
-\typeout{====>\mirrorType}
-\typeout{====>\psk@optic@mirrorType}
+%\typeout{====>\mirrorType}
+%\typeout{====>\psk@optic@mirrorType}
\ABinterSPHLens(#2)(#3)(Center){tempRef0}
\pst@getcoor{tempRef0}\pst@tempA
\pst@getcoor{tempRef0'}\pst@tempB
@@ -1728,9 +1752,289 @@
\fi
}\ignorespaces}
%
+% Prism stuff initiated by Manuel 2006-07-26
+%
+\define@key[psset]{pst-optic}{AnglePrism}{\edef\psk@Prism@AnglePrism{#1}}
+\define@key[psset]{pst-optic}{AnglePlan1}{\edef\psk@Prism@AnglePlanOne{#1}}
+\define@key[psset]{pst-optic}{AnglePlan2}{\edef\psk@Prism@AnglePlanTwo{#1}}
+\define@key[psset]{pst-optic}{lambda}{\edef\psk@Prism@Lambda{#1}}
+\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}
+%
+\def\psprism{\pst@object{psprism}}
+\def\psprism@i{%
+ \begin@SpecialObj
+ \ifPst@Prism@notations
+ \psline{->}(0,8)
+ \uput[90](0,8){$y$}
+ \psline{->}(-6,0)(6,0)
+ \uput[0](6,0){$x$}
+ \fi
+ \pnode(0,0){O}
+ \pnode(!
+ /AnglePrism \psk@Prism@AnglePrism\space 2 div def
+ /AnglePlan1 \psk@Prism@AnglePlanOne\space def
+ /AnglePlan2 \psk@Prism@AnglePlanTwo\space def
+ /lambda \psk@Prism@Lambda\space def
+ % le point C1 sur la droite 1
+ /C1x -6 def
+ /C1y 6 def
+ % le point C2 sur la droite 2
+ /C2x 7 def
+ /C2y 5 def
+ % donne la distance C1E
+ /k \psk@Prism@k\space def
+ %
+ /g1x AnglePrism sin neg def % -sin(A/2)
+ /g1y AnglePrism cos def % cos(A/2)
+ /u1x AnglePlan1 sin neg def
+ /u1y AnglePlan1 cos neg def
+ % le point E émetteur
+ /E1x C1x k u1x mul add def
+ /E1y C1y k u1y mul add def
+ %
+ /n1x AnglePlan1 cos def
+ /n1y AnglePlan1 sin neg def
+ /Lambda {E1x g1y mul E1y g1x mul neg add
+ n1y g1x mul neg n1x g1y mul add
+ div neg} bind def
+ % point I1
+ /i1x {E1x Lambda n1x mul add} bind def
+ /i1y {E1y Lambda n1y mul add} bind def
+ 0 0){Stockage_parametres_prism}
+ \pspolygon[fillstyle=gradient,gradbegin=cyan,gradend=white,gradangle=60,gradmidpoint=0.5](O)%
+ (! 7 90 AnglePrism add cos mul 7 90 AnglePrism add sin mul)
+ (! 7 90 AnglePrism sub cos mul 7 90 AnglePrism sub sin mul)
+ \pnode(!
+ % Les datas
+ % Sellmeier's
+ % glass sf15 : verre flint
+ % n=sqrt(1+B1*L^2/(l^2-C1)+B2*L^2/(l^2-C2)+B3*L^2/(l^2-C3))
+ % Cauchy : /N {1.606 6545 1 mul lambda dup mul div add} bind def
+ /L2 {lambda 1e-3 mul dup mul} bind def % en micromètres
+ /N {1
+ 1.539259 L2 mul L2 0.011931 sub div
+ add
+ 0.247621 L2 mul L2 0.055608 sub div
+ add
+ 1.038164 L2 mul L2 116.416755 sub div
+ add
+ sqrt} bind def
+ /alpha1 AnglePlan1 AnglePrism add def
+ /sinB1 alpha1 sin N div def
+ /B1 sinB1 arcsin def
+ /Delta1 AnglePrism B1 sub def
+ %%%
+ /g2x AnglePrism sin def
+ /g2y AnglePrism cos def
+ /d12x Delta1 cos def % d12x
+ /d12y Delta1 sin def % d12y
+ /Lambda2 {i1x g2y mul i1y g2x mul sub
+ d12y g2x mul d12x g2y mul sub
+ div} bind def
+ % point I2
+ /i2x {i1x Lambda2 d12x mul add} bind def
+ /i2y {i1y Lambda2 d12y mul add} bind def
+ %
+ /B2 AnglePrism 2 mul B1 sub def
+ /sinA2 N B2 sin mul def
+ /alpha2 sinA2 asin def
+ /u2x AnglePlan2 sin def
+ /u2y AnglePlan2 cos neg def
+ /Delta2 alpha2 AnglePrism sub def
+ /d2x Delta2 cos def
+ /d2y Delta2 sin def
+ /DELTA u2x d2y mul neg u2y d2x mul add def
+ /DELTA_X i2x C2x sub d2y mul neg
+ i2y C2y sub d2x mul add def
+ /DELTA_Y u2x i2y C2y sub mul neg
+ u2y i2x C2x sub mul add def
+ /MU DELTA_X DELTA div def
+ /LAMBDA3 DELTA_Y DELTA div def
+ % le point R2
+ /r2x C2x MU u2x mul add def
+ /r2y C2y MU u2y mul add def
+ /a_i {AnglePlan1 neg} bind def
+ /a_r {alpha2 AnglePrism sub} bind def
+ /tan_i {a_i tan} bind def
+ /tan_r {a_r tan} bind def
+ 0 0){factice}
+ \pnode(! C1x C1y){C1}
+ \pnode(! C2x C2y){C2}
+ \pnode(! E1x E1y){E1}
+ \pnode(! i1x i1y){P1}
+ \pnode(! i2x i2y){I2}
+ \pnode(! r2x r2y){R2}
+ \pnode(! /bQ {i1y i1x AnglePrism tan mul sub} bind def
+ /bQ' {i2y i2x AnglePrism tan mul add} bind def
+ /xQ {bQ' bQ sub 2 div AnglePrism tan div} bind def
+ /yQ {bQ bQ' add 2 div} bind def
+ xQ yQ){Q}
+ \pnode(! /bI {i1y i1x tan_i mul sub} bind def
+ /bI'{i2y i2x tan_r mul sub} bind def
+ /xI {bI bI' sub tan_r tan_i sub div} bind def
+ /yI {xI tan_i mul bI add} bind def
+ xI yI){I}
+ \pcline[linestyle=dashed,nodesepB=-2](P1)(I)
+ \pcline[linestyle=dashed,nodesepB=-2](I2)(I)
+ \pcline[linestyle=dashed,nodesepB=-1,nodesepA=-2](P1)(Q)
+ \pcline[linestyle=dashed,nodesepB=-1,nodesepA=-2](I2)(Q)
+ \rput(P1){%
+ \rput{30}(0,0){\psframe*(0,0)(0.2,0.2)}
+ \psarc{<-}(0,0){0.8}{!180 AnglePrism add alpha1 sub}{!180 AnglePrism add}
+ \uput{1}[! 180 AnglePrism add alpha1 2 div sub](0,0){$i_1$}
+ \psarc[linecolor=blue]{<-}(0,0){1}{!AnglePrism B1 sub}{!AnglePrism}
+ \uput{1.2}[! AnglePrism B1 2 div sub](0,0){$r_1$}
+ \uput{0.4}[90](0,0){$I_1$}}
+ \rput(I2){%
+ \rput{60}(0,0){\psframe*(0,0)(0.2,0.2)}
+ \psarc[linecolor=blue]{->}(0,0){0.8}{! AnglePrism neg 180 add}{!AnglePrism neg 180 add B2 add}
+ \uput{1}[!AnglePrism neg 180 add B2 2 div add](0,0){$r_2$}
+ \psarc{->}(0,0){1}{! AnglePrism neg}{!alpha2 AnglePrism sub}
+ \uput{1.2}[!alpha2 2 div AnglePrism sub](0,0){$i_2$}
+ \uput{0.4}[90](0,0){$I_2$}}
+ \psline[linecolor={[wave]{\psk@Prism@Lambda}},arrowscale=2]{->}(P1)(I2)(R2)
+ \psline[linecolor={[wave]{\psk@Prism@Lambda}}](E1)(P1)
+ \psline[linecolor={[wave]{\psk@Prism@Lambda}},arrowscale=2]{->}(E1)(!i1x E1x add 2 div i1y E1y add 2 div)
+ \psarc(0,0){0.8}{!90 AnglePrism sub}{!90 AnglePrism add}
+ \uput[90](0,0.8){$\widehat{A}$}
+ \psdot[dotstyle=o](O)
+ \psdot[dotstyle=o](I)
+ \psdot[dotstyle=o](Q)
+ \rput(I){\psarc{->}(0,0){1}{!a_i}{!a_r}
+ \uput{1.1}[!a_i a_r add 2 div](0,0){$\widehat{D}$}}
+ \ifPst@Prism@notations
+ \pcline[nodesepB=-2,nodesepA=-2](C1)(E1)
+ \uput[180](C1){$C_1$}
+ \uput[180](E1){$E_1$}
+ %
+ \pcline[nodesepB=-2,nodesepA=-2](C2)(R2)
+ \uput[-90](C2){$C_2$}
+ \uput[180](R2){$R_2$}
+ \rput(C1){\psline(0,2)
+ \psarc(0,0){1}{! 90 AnglePlan1 sub}{90}
+ \uput{1.1}[!90 AnglePlan1 2 div sub](0,0){$\rho_1$}
+ \psline[arrowinset=0,linewidth=2\pslinewidth]{->}(!
+ 90 AnglePlan1 sub cos neg 90 AnglePlan1 sub sin neg)
+ \uput[0](! 90 AnglePlan1 sub cos neg 90 AnglePlan1 sub sin neg){$\overrightarrow{u}_1$}
+ \psline[arrowinset=0,linewidth=2\pslinewidth]{->}(! AnglePlan1 neg cos AnglePlan1 neg sin)
+ \uput[90](! AnglePlan1 neg cos AnglePlan1 neg sin){$\overrightarrow{n}_1$}}
+ \rput(C2){\psline(0,2)
+ \psarc(0,0){1}{90}{! 90 AnglePlan2 add}
+ \uput{1.1}[!90 AnglePlan2 2 div add](0,0){$\rho_2$}
+ \psline[arrowinset=0,linewidth=2\pslinewidth]{->}(! AnglePlan2 cos AnglePlan2 sin)
+ \uput[! AnglePlan2](! AnglePlan2 cos AnglePlan2 sin){$\overrightarrow{n}_2$}
+ \psline[arrowinset=0,linewidth=2\pslinewidth]{->}(! 90 AnglePlan2 add cos 90 AnglePlan2 add sin)
+ \uput[-90](! 90 AnglePlan2 add cos 90 AnglePlan2 add sin){$\overrightarrow{u}_2$}}
+ \psdot[dotstyle=o](C1)
+ \psdot[dotstyle=o,linecolor={[wave]{\psk@Prism@Lambda}}](E1)
+ \psdot[dotstyle=o](C2)
+ \psdot[dotstyle=o](R2)
+ \fi%
+ \end@SpecialObj%
+}
+%
+%% Commande \psprismColor
+\def\psprismColor{\pst@object{psprismColor}}
+\def\psprismColor@i{%
+ \begin@SpecialObj
+ \pnode(0,0){O}
+ \pnode(!
+ /AnglePrism \psk@Prism@AnglePrism\space 2 div def
+ /AnglePlan1 \psk@Prism@AnglePlanOne\space def
+ /AnglePlan2 \psk@Prism@AnglePlanTwo\space def
+ % le point C1 sur la droite 1
+ /C1x -8 def
+ /C1y 7 def
+ % le point C2 sur la droite 2
+ /C2x 11 def
+ /C2y 5 def
+ % donne la distance C1E1
+ /k \psk@Prism@k\space def
+ %
+ /g1x AnglePrism sin neg def % -sin(A/2)
+ /g1y AnglePrism cos def % cos(A/2)
+ /u1x AnglePlan1 sin neg def
+ /u1y AnglePlan1 cos neg def
+ % le point E émetteur
+ /E1x C1x k u1x mul add def
+ /E1y C1y k u1y mul add def
+ %
+ /n1x AnglePlan1 cos def
+ /n1y AnglePlan1 sin neg def
+ /Lambda {E1x g1y mul E1y g1x mul neg add
+ n1y g1x mul neg n1x g1y mul add
+ div neg} bind def
+ % point I1
+ /i1x {E1x Lambda n1x mul add} bind def
+ /i1y {E1y Lambda n1y mul add} bind def
+ 0 0){Stockage_parametres_prism}
+ \pspolygon[fillstyle=gradient,gradbegin=cyan,gradend=white,gradangle=60,gradmidpoint=0.5](O)%
+ (! 7 90 AnglePrism add cos mul 7 90 AnglePrism add sin mul)
+ (! 7 90 AnglePrism sub cos mul 7 90 AnglePrism sub sin mul)
+ \multido{\iLAMBDA=400+5}{80}{%
+ \pstVerb{/lambda \iLAMBDA\space def}%
+ \definecolor{prism}{wave}{\iLAMBDA}%
+ \pnode(!
+ % Les datas
+ % Sellmeier's
+ % glass sf15 : verre flint lourd
+ % n=sqrt(1+B1*L^2/(l^2-C1)+B2*L^2/(l^2-C2)+B3*L^2/(l^2-C3))
+ % Cauchy : /N {1.606 6545 1 mul lambda dup mul div add} bind def
+ /L2 {lambda 1e-3 mul dup mul} bind def
+ /N {1
+ 1.539259 L2 mul L2 0.011931 sub div add
+ 0.247621 L2 mul L2 0.055608 sub div add
+ 1.038164 L2 mul L2 116.416755 sub div add
+ sqrt} bind def
+ /alpha1 AnglePlan1 AnglePrism add def
+ /sinB1 alpha1 sin N div def
+ /B1 sinB1 asin def
+ /Delta1 AnglePrism B1 sub def
+ %%%
+ /g2x AnglePrism sin def
+ /g2y AnglePrism cos def
+ /d12x Delta1 cos def % d12x
+ /d12y Delta1 sin def % d12y
+ /Lambda2 {i1x g2y mul i1y g2x mul sub d12y g2x mul d12x g2y mul sub div} bind def
+ % point I2
+ /i2x {i1x Lambda2 d12x mul add} bind def
+ /i2y {i1y Lambda2 d12y mul add} bind def
+ %
+ /B2 AnglePrism 2 mul B1 sub def
+ /sinA2 N B2 sin mul def
+ /alpha2 sinA2 asin def
+ /u2x AnglePlan2 sin def
+ /u2y AnglePlan2 cos neg def
+ /Delta2 alpha2 AnglePrism sub def
+ /d2x Delta2 cos def
+ /d2y Delta2 sin def
+ /s2x i2x C2x sub def
+ /s2y i2y C2y sub def
+ /dA d2x u2y mul d2y u2x mul sub def
+ /dM d2x s2y mul d2y s2x mul sub def
+% le point R2
+ /r2x C2x dM dA div u2x mul add def
+ /r2y C2y dM dA div u2y mul add def
+ 0 0){factice}
+ \pnode(! C1x C1y){C1}
+ \pnode(! C2x C2y){C2}
+ \pnode(! E1x E1y){E1}
+ \pnode(! i1x i1y){I1}
+ \pnode(! i2x i2y){I2}
+ \pnode(! r2x r2y){R2}
+ \psline[linecolor=prism](I1)(I2)(R2)}
+ \psline[linecolor=white,linewidth=0.5mm](E1)(I1)
+ \psline[linecolor=white,linewidth=0.5mm,arrowscale=2]{->}(E1)(!i1x E1x add 2 div i1y E1y add 2 div)
+ \end@SpecialObj%
+}
+%
+%
\def\resetOpticOptions{% hv 2006-07-20
\psset[pst-optic]{%
- lensGlass=false,drawing=true,
+ lensGlass=false,drawing=true,,lensTwo,rightRay,
xLeft=-7.5,xRight=7.5,yBottom=-3.0,yTop=3.0,
lensType=CVG,lensColor=lightgray,lensWidth=0.5,lensDepth=1,
lensHeight=5,lensScale=1,lensArrowSize=0.2,lensArrowInset=0.5,
@@ -1740,11 +2044,11 @@
XO=0,YO=0,OA=-3,posStart=0,length=2,focus=2,AB=1,arrowOffset=0,
nameO=O,spotO=225,nameAi=A',spotAi=90,nameBi=B',spotBi=270,
nameFi=F',spotFi=270,
- rayColor=red}%
+ rayColor=red,%
+ AnglePrism=60,AnglePlan1=25,AnglePlan2=55,k=1,lambda=632.8,notations=true}%
% \gdef\mirrorType{CVG}%
-% \gdef\lensType{CVG}%
+% \gdef\lensTypeCVG{CVG}%
}
-%
\catcode`\@=\PstAtCode\relax
%
%% END: pst-optic.tex
diff --git a/Master/texmf-dist/tpm/bibhtml.tpm b/Master/texmf-dist/tpm/bibhtml.tpm
index 033a9be8ce6..d06eb00c695 100644
--- a/Master/texmf-dist/tpm/bibhtml.tpm
+++ b/Master/texmf-dist/tpm/bibhtml.tpm
@@ -19,10 +19,10 @@ plainhtml.bst, and is derived from the standard plain.bst.
[description copied from TeX Catalogue]
</TPM:Description>
<TPM:Author>Norman Gray</TPM:Author>
- <TPM:Size>202286</TPM:Size>
+ <TPM:Size>204337</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="150032">
+ <TPM:RunFiles size="150074">
texmf-dist/bibtex/bib/bibhtml/bibrefs.bib
texmf-dist/bibtex/bst/bibhtml/alphahtml.bst
texmf-dist/bibtex/bst/bibhtml/alphahtmldate.bst
diff --git a/Master/texmf-dist/tpm/clefval.tpm b/Master/texmf-dist/tpm/clefval.tpm
index da18945a1b7..dc7d5860455 100644
--- a/Master/texmf-dist/tpm/clefval.tpm
+++ b/Master/texmf-dist/tpm/clefval.tpm
@@ -18,7 +18,7 @@ protect them.
[description copied from TeX Catalogue]
</TPM:Description>
<TPM:Author>Yvon Henel, Josselin Noirel</TPM:Author>
- <TPM:Size>399216</TPM:Size>
+ <TPM:Size>399181</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
<TPM:RunFiles size="3921">
diff --git a/Master/texmf-dist/tpm/context.tpm b/Master/texmf-dist/tpm/context.tpm
index 8ac8ca38ccd..eb13b0df226 100644
--- a/Master/texmf-dist/tpm/context.tpm
+++ b/Master/texmf-dist/tpm/context.tpm
@@ -17,7 +17,7 @@ typeset chemical formulas.
<TPM:Size>15025423</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="14552931">
+ <TPM:RunFiles size="14553120">
texmf-dist/bibtex/bst/context/cont-ab.bst
texmf-dist/bibtex/bst/context/cont-au.bst
texmf-dist/bibtex/bst/context/cont-no.bst
diff --git a/Master/texmf-dist/tpm/curve2e.tpm b/Master/texmf-dist/tpm/curve2e.tpm
index 6ce9f8742dc..21a0abb50a6 100644
--- a/Master/texmf-dist/tpm/curve2e.tpm
+++ b/Master/texmf-dist/tpm/curve2e.tpm
@@ -3,20 +3,20 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/curve2e.zip">
<TPM:Name>curve2e</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/11/27 22:09:00</TPM:Date>
+ <TPM:Date>2006/12/26 22:54:17</TPM:Date>
<TPM:Version></TPM:Version>
<TPM:Creator>karl</TPM:Creator>
<TPM:Title>The curve2e package.</TPM:Title>
<TPM:Description></TPM:Description>
<TPM:Author></TPM:Author>
- <TPM:Size>316867</TPM:Size>
+ <TPM:Size>318294</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
<TPM:RunFiles size="22780">
texmf-dist/tex/latex/curve2e/curve2e.sty
texmf-dist/tpm/curve2e.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="222522">
+ <TPM:DocFiles size="222485">
texmf-dist/doc/latex/curve2e/README
texmf-dist/doc/latex/curve2e/curve2e.pdf
texmf-dist/doc/latex/curve2e/manifest.txt
diff --git a/Master/texmf-dist/tpm/foekfont.tpm b/Master/texmf-dist/tpm/foekfont.tpm
index 14fc90b1758..c83e7c474df 100644
--- a/Master/texmf-dist/tpm/foekfont.tpm
+++ b/Master/texmf-dist/tpm/foekfont.tpm
@@ -9,10 +9,10 @@
<TPM:Title>The foekfont package.</TPM:Title>
<TPM:Description></TPM:Description>
<TPM:Author></TPM:Author>
- <TPM:Size>137380</TPM:Size>
+ <TPM:Size>132947</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="13558">
+ <TPM:RunFiles size="13508">
texmf-dist/fonts/map/dvips/foekfont/foekfont.map
texmf-dist/fonts/tfm/public/foekfont/foekfont.tfm
texmf-dist/fonts/type1/public/foekfont/FoekFont.pfb
diff --git a/Master/texmf-dist/tpm/iopart-num.tpm b/Master/texmf-dist/tpm/iopart-num.tpm
index 10207b65ed7..047aba126c7 100644
--- a/Master/texmf-dist/tpm/iopart-num.tpm
+++ b/Master/texmf-dist/tpm/iopart-num.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/iopart-num.zip">
<TPM:Name>iopart-num</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>1970/01/01 00:00:00</TPM:Date>
+ <TPM:Date>2006/12/22 18:56:04</TPM:Date>
<TPM:Version></TPM:Version>
<TPM:Creator>karl</TPM:Creator>
<TPM:Title>Numeric citation style for IOP journals.</TPM:Title>
@@ -14,10 +14,10 @@ including Journal of Physics.
[description copied from TeX Catalogue]
</TPM:Description>
<TPM:Author></TPM:Author>
- <TPM:Size>85230</TPM:Size>
+ <TPM:Size>107075</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="36082">
+ <TPM:RunFiles size="36016">
texmf-dist/bibtex/bst/iopart-num/iopart-num.bst
texmf-dist/tpm/iopart-num.tpm
</TPM:RunFiles>
diff --git a/Master/texmf-dist/tpm/ltxmisc.tpm b/Master/texmf-dist/tpm/ltxmisc.tpm
index 29014c4ade7..e2977e7f64c 100644
--- a/Master/texmf-dist/tpm/ltxmisc.tpm
+++ b/Master/texmf-dist/tpm/ltxmisc.tpm
@@ -9,10 +9,10 @@
<TPM:Title>Miscellaneous LaTeX styles.</TPM:Title>
<TPM:Description></TPM:Description>
<TPM:Author>various</TPM:Author>
- <TPM:Size>507328</TPM:Size>
+ <TPM:Size>509646</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="509646">
+ <TPM:RunFiles size="509696">
texmf-dist/tex/latex/ltxmisc/2in1.sty
texmf-dist/tex/latex/ltxmisc/3parttable.sty
texmf-dist/tex/latex/ltxmisc/a4wide.sty
diff --git a/Master/texmf-dist/tpm/marginnote.tpm b/Master/texmf-dist/tpm/marginnote.tpm
index 464fb1ee5ad..c6e710235be 100644
--- a/Master/texmf-dist/tpm/marginnote.tpm
+++ b/Master/texmf-dist/tpm/marginnote.tpm
@@ -9,10 +9,10 @@
<TPM:Title>The marginnote package.</TPM:Title>
<TPM:Description></TPM:Description>
<TPM:Author></TPM:Author>
- <TPM:Size>157600</TPM:Size>
+ <TPM:Size>189078</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="10621">
+ <TPM:RunFiles size="10583">
texmf-dist/tex/latex/marginnote/marginnote.sty
texmf-dist/tpm/marginnote.tpm
</TPM:RunFiles>
diff --git a/Master/texmf-dist/tpm/movie15.tpm b/Master/texmf-dist/tpm/movie15.tpm
index cf57921768c..2aa9ab0c4b0 100644
--- a/Master/texmf-dist/tpm/movie15.tpm
+++ b/Master/texmf-dist/tpm/movie15.tpm
@@ -15,7 +15,7 @@ played back synchronously.
[description copied from TeX Catalogue]
</TPM:Description>
<TPM:Author>Alexander Grahn</TPM:Author>
- <TPM:Size>920262</TPM:Size>
+ <TPM:Size>920826</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
<TPM:RunFiles size="131373">
diff --git a/Master/texmf-dist/tpm/plain.tpm b/Master/texmf-dist/tpm/plain.tpm
index f6b1afd2a21..06e3a477adb 100644
--- a/Master/texmf-dist/tpm/plain.tpm
+++ b/Master/texmf-dist/tpm/plain.tpm
@@ -16,7 +16,7 @@ described in the TeXbook.
<TPM:Size>158280</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="158280">
+ <TPM:RunFiles size="158281">
texmf-dist/makeindex/plain/plaintex.ist
texmf-dist/tex/plain/base/fontchart.tex
texmf-dist/tex/plain/base/gkpmac.tex
diff --git a/Master/texmf-dist/tpm/pst-labo.tpm b/Master/texmf-dist/tpm/pst-labo.tpm
index 433be8dbc4a..c0d5fc9d220 100644
--- a/Master/texmf-dist/tpm/pst-labo.tpm
+++ b/Master/texmf-dist/tpm/pst-labo.tpm
@@ -9,7 +9,7 @@
<TPM:Title>The pst-labo package.</TPM:Title>
<TPM:Description></TPM:Description>
<TPM:Author></TPM:Author>
- <TPM:Size>3637901</TPM:Size>
+ <TPM:Size>3637894</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
<TPM:RunFiles size="48215">
diff --git a/Master/texmf-dist/tpm/pst-optic.tpm b/Master/texmf-dist/tpm/pst-optic.tpm
index 58375abfba6..d2aa9cce72b 100644
--- a/Master/texmf-dist/tpm/pst-optic.tpm
+++ b/Master/texmf-dist/tpm/pst-optic.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/pst-optic.zip">
<TPM:Name>pst-optic</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/07/21 23:46:03</TPM:Date>
+ <TPM:Date>2006/12/27 22:50:00</TPM:Date>
<TPM:Version>0.9</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>Optic drawings: lenses and mirrors.</TPM:Title>
@@ -12,20 +12,21 @@
<TPM:Size>820304</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="62471">
+ <TPM:RunFiles size="74059">
texmf-dist/tex/generic/pst-optic/pst-optic.tex
texmf-dist/tex/latex/pst-optic/pst-optic.sty
texmf-dist/tpm/pst-optic.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="757833">
+ <TPM:DocFiles size="862563">
texmf-dist/doc/generic/pst-optic/Changes
texmf-dist/doc/generic/pst-optic/README
-texmf-dist/doc/generic/pst-optic/optic.bib
+texmf-dist/doc/generic/pst-optic/pst-optic-doc.bib
texmf-dist/doc/generic/pst-optic/pst-optic-doc.pdf
texmf-dist/doc/generic/pst-optic/pst-optic-doc.tex
texmf-dist/doc/generic/pst-optic/pst-optic-examples.pdf
texmf-dist/doc/generic/pst-optic/pst-optic-examples.tex
</TPM:DocFiles>
+ <TPM:SourceFiles size="1085">texmf-dist/source/generic/pst-optic/Makefile</TPM:SourceFiles>
<TPM:Provides>Package/pst-optic</TPM:Provides>
</rdf:Description>
</rdf:RDF>
diff --git a/Master/texmf-dist/tpm/pst-uml.tpm b/Master/texmf-dist/tpm/pst-uml.tpm
index 938865d313e..2ec27be1f6c 100644
--- a/Master/texmf-dist/tpm/pst-uml.tpm
+++ b/Master/texmf-dist/tpm/pst-uml.tpm
@@ -15,10 +15,10 @@ that provides support for drawing moderately complex UML
[description copied from TeX Catalogue]
</TPM:Description>
<TPM:Author></TPM:Author>
- <TPM:Size>583331</TPM:Size>
+ <TPM:Size>587389</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="29336">
+ <TPM:RunFiles size="29375">
texmf-dist/tex/latex/pst-uml/pst-uml.sty
texmf-dist/tpm/pst-uml.tpm
</TPM:RunFiles>
diff --git a/Master/texmf-dist/tpm/pstricks-add.tpm b/Master/texmf-dist/tpm/pstricks-add.tpm
index 306ebef1532..e6f77e271a2 100644
--- a/Master/texmf-dist/tpm/pstricks-add.tpm
+++ b/Master/texmf-dist/tpm/pstricks-add.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/pstricks-add.zip">
<TPM:Name>pstricks-add</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/11/27 06:06:20</TPM:Date>
+ <TPM:Date>2006/12/26 23:19:14</TPM:Date>
<TPM:Version>1.0</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>
@@ -21,16 +21,16 @@ pst-plot, pst-node, pst-tree and pst-grad.
[description copied from TeX Catalogue]
</TPM:Description>
<TPM:Author>Herbert Voss</TPM:Author>
- <TPM:Size>2024731</TPM:Size>
+ <TPM:Size>2109905</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="140420">
+ <TPM:RunFiles size="140525">
texmf-dist/dvips/pstricks-add/pstricks-add.pro
texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
texmf-dist/tex/latex/pstricks-add/pstricks-add.sty
texmf-dist/tpm/pstricks-add.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="1968393">
+ <TPM:DocFiles size="1968372">
texmf-dist/doc/generic/pstricks-add/Changes
texmf-dist/doc/generic/pstricks-add/README
texmf-dist/doc/generic/pstricks-add/examples/12-1.txt
diff --git a/Master/texmf-dist/tpm/pstricks.tpm b/Master/texmf-dist/tpm/pstricks.tpm
index 73996bc3488..e727e6556ee 100644
--- a/Master/texmf-dist/tpm/pstricks.tpm
+++ b/Master/texmf-dist/tpm/pstricks.tpm
@@ -21,7 +21,7 @@ contains bug-fixes and additions for pstricks (among others).
[description copied from TeX Catalogue]
</TPM:Description>
<TPM:Author>Timothy Van Zandt</TPM:Author>
- <TPM:Size>6996197</TPM:Size>
+ <TPM:Size>6996218</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
<TPM:RunFiles size="250116">
diff --git a/Master/texmf-dist/tpm/rsc.tpm b/Master/texmf-dist/tpm/rsc.tpm
index 375f082070e..9e2e88a5b10 100644
--- a/Master/texmf-dist/tpm/rsc.tpm
+++ b/Master/texmf-dist/tpm/rsc.tpm
@@ -3,16 +3,16 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/rsc.zip">
<TPM:Name>rsc</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>1970/01/01 00:00:00</TPM:Date>
+ <TPM:Date>2006/12/26 23:29:48</TPM:Date>
<TPM:Version></TPM:Version>
<TPM:Creator>karl</TPM:Creator>
<TPM:Title>The rsc package.</TPM:Title>
<TPM:Description></TPM:Description>
<TPM:Author></TPM:Author>
- <TPM:Size>26808</TPM:Size>
+ <TPM:Size>249628</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="39341">
+ <TPM:RunFiles size="39692">
texmf-dist/bibtex/bst/rsc/rsc-mc.bst
texmf-dist/bibtex/bst/rsc/rsc.bst
texmf-dist/tex/latex/rsc/rsc.sty
@@ -23,7 +23,7 @@ texmf-dist/doc/latex/rsc/README
texmf-dist/doc/latex/rsc/rsc.pdf
texmf-dist/doc/latex/rsc/rsc.tex
</TPM:DocFiles>
- <TPM:SourceFiles size="42227">
+ <TPM:SourceFiles size="40631">
texmf-dist/source/latex/rsc/rsc.dtx
texmf-dist/source/latex/rsc/rsc.ins
</TPM:SourceFiles>
diff --git a/Master/texmf-dist/tpm/subfigure.tpm b/Master/texmf-dist/tpm/subfigure.tpm
index 4806cb23237..25fb9216a3e 100644
--- a/Master/texmf-dist/tpm/subfigure.tpm
+++ b/Master/texmf-dist/tpm/subfigure.tpm
@@ -3,7 +3,7 @@
<rdf:Description about="http://texlive.dante.de/texlive/Package/subfigure.zip">
<TPM:Name>subfigure</TPM:Name>
<TPM:Type>Package</TPM:Type>
- <TPM:Date>2006/12/26 23:33:06</TPM:Date>
+ <TPM:Date>2006/12/26 23:33:29</TPM:Date>
<TPM:Version>1.0</TPM:Version>
<TPM:Creator>rahtz</TPM:Creator>
<TPM:Title>Figures divided into subfigures.</TPM:Title>
@@ -21,15 +21,15 @@ subfig instead.
[description copied from TeX Catalogue]
</TPM:Description>
<TPM:Author>Steven Douglas Cochran</TPM:Author>
- <TPM:Size>235144</TPM:Size>
+ <TPM:Size>604549</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="19264">
+ <TPM:RunFiles size="19310">
texmf-dist/tex/latex/subfigure/subfigure.cfg
texmf-dist/tex/latex/subfigure/subfigure.sty
texmf-dist/tpm/subfigure.tpm
</TPM:RunFiles>
- <TPM:DocFiles size="417443">
+ <TPM:DocFiles size="417372">
texmf-dist/doc/latex/subfigure/README
texmf-dist/doc/latex/subfigure/ltxdoc.cfg
texmf-dist/doc/latex/subfigure/subfigure.pdf
@@ -39,7 +39,7 @@ texmf-dist/doc/latex/subfigure/test3.tex
texmf-dist/doc/latex/subfigure/test4.tex
texmf-dist/doc/latex/subfigure/test5.tex
</TPM:DocFiles>
- <TPM:SourceFiles size="167842">
+ <TPM:SourceFiles size="163902">
texmf-dist/source/latex/subfigure/Makefile
texmf-dist/source/latex/subfigure/subfigure.dtx
texmf-dist/source/latex/subfigure/subfigure.ins
diff --git a/Master/texmf-dist/tpm/svgcolor.tpm b/Master/texmf-dist/tpm/svgcolor.tpm
index b2a32298f7f..83320417beb 100644
--- a/Master/texmf-dist/tpm/svgcolor.tpm
+++ b/Master/texmf-dist/tpm/svgcolor.tpm
@@ -9,10 +9,10 @@
<TPM:Title>The svgcolor package.</TPM:Title>
<TPM:Description></TPM:Description>
<TPM:Author></TPM:Author>
- <TPM:Size>17893</TPM:Size>
+ <TPM:Size>18758</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="16373">
+ <TPM:RunFiles size="16409">
texmf-dist/tex/latex/svgcolor/svgcolor.sty
texmf-dist/tpm/svgcolor.tpm
</TPM:RunFiles>
diff --git a/Master/texmf-dist/tpm/tex4ht.tpm b/Master/texmf-dist/tpm/tex4ht.tpm
index 10016db0a1f..e4b4489f3c4 100644
--- a/Master/texmf-dist/tpm/tex4ht.tpm
+++ b/Master/texmf-dist/tpm/tex4ht.tpm
@@ -17,7 +17,7 @@ to hypertext (HTML, XML, etc.), providing a configurable
<TPM:Size>9787532</TPM:Size>
<TPM:License></TPM:License>
<TPM:Build/>
- <TPM:RunFiles size="9163753">
+ <TPM:RunFiles size="9163178">
texmf-dist/tex/generic/tex4ht/2up.4ht
texmf-dist/tex/generic/tex4ht/CJK.4ht
texmf-dist/tex/generic/tex4ht/JHEP.4ht
diff --git a/Master/texmf/lists/pst-optic b/Master/texmf/lists/pst-optic
index 39e64ca0554..6bfbea8ef6b 100644
--- a/Master/texmf/lists/pst-optic
+++ b/Master/texmf/lists/pst-optic
@@ -1,11 +1,11 @@
texmf-dist/doc/generic/pst-optic/Changes
texmf-dist/doc/generic/pst-optic/README
-texmf-dist/doc/generic/pst-optic/optic.bib
+texmf-dist/doc/generic/pst-optic/pst-optic-doc.bib
texmf-dist/doc/generic/pst-optic/pst-optic-doc.pdf
texmf-dist/doc/generic/pst-optic/pst-optic-doc.tex
texmf-dist/doc/generic/pst-optic/pst-optic-examples.pdf
texmf-dist/doc/generic/pst-optic/pst-optic-examples.tex
-
+texmf-dist/source/generic/pst-optic/Makefile
texmf-dist/tex/generic/pst-optic/pst-optic.tex
texmf-dist/tex/latex/pst-optic/pst-optic.sty
texmf-dist/tpm/pst-optic.tpm
diff --git a/Master/texmf/tpm/collection-binextra.tpm b/Master/texmf/tpm/collection-binextra.tpm
index 4699b71edd0..e671c6f6f4e 100644
--- a/Master/texmf/tpm/collection-binextra.tpm
+++ b/Master/texmf/tpm/collection-binextra.tpm
@@ -18,7 +18,7 @@ PerlTeX, patgen, etc.
<TPM:Build>
<TPM:RunPatterns>texmf/tpm/collection-binextra.tpm</TPM:RunPatterns>
</TPM:Build>
- <TPM:RunFiles size="2139">texmf/tpm/collection-binextra.tpm</TPM:RunFiles>
+ <TPM:RunFiles size="2073">texmf/tpm/collection-binextra.tpm</TPM:RunFiles>
<TPM:Requires>
<TPM:Package name="cweb"/>
<TPM:Package name="mkind-english"/>
diff --git a/Master/texmf/tpm/collection-latexextra.tpm b/Master/texmf/tpm/collection-latexextra.tpm
index ca3d7065c0c..ec03b13d17a 100644
--- a/Master/texmf/tpm/collection-latexextra.tpm
+++ b/Master/texmf/tpm/collection-latexextra.tpm
@@ -16,7 +16,7 @@ A large collection of add-on packages for LaTeX.
<TPM:Build>
<TPM:RunPatterns>texmf/tpm/collection-latexextra.tpm</TPM:RunPatterns>
</TPM:Build>
- <TPM:RunFiles size="19230">texmf/tpm/collection-latexextra.tpm</TPM:RunFiles>
+ <TPM:RunFiles size="19267">texmf/tpm/collection-latexextra.tpm</TPM:RunFiles>
<TPM:Requires>
<TPM:Package name="ESIEEcv"/>
<TPM:Package name="GuIT"/>