From 95e7adbdb6ef9e7564f42b9afd537afdc64f80f2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 29 Dec 2006 00:54:51 +0000 Subject: pst-optic 0.96 (28dec06) git-svn-id: svn://tug.org/texlive/trunk@3001 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pst-optic/Changes | 3 + Master/texmf-dist/doc/generic/pst-optic/README | 3 +- Master/texmf-dist/doc/generic/pst-optic/optic.bib | 56 ------- .../doc/generic/pst-optic/pst-optic-doc.bib | 56 +++++++ .../doc/generic/pst-optic/pst-optic-doc.pdf | Bin 282581 -> 375128 bytes .../doc/generic/pst-optic/pst-optic-doc.tex | 181 ++++++++++++++++++--- .../doc/generic/pst-optic/pst-optic-examples.pdf | Bin 372127 -> 380247 bytes 7 files changed, 218 insertions(+), 81 deletions(-) delete mode 100644 Master/texmf-dist/doc/generic/pst-optic/optic.bib create mode 100644 Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.bib (limited to 'Master/texmf-dist/doc/generic/pst-optic') 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 (France) %% Herbert Voss (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/optic.bib deleted file mode 100644 index 6f777d67d99..00000000000 --- a/Master/texmf-dist/doc/generic/pst-optic/optic.bib +++ /dev/null @@ -1,56 +0,0 @@ -@Book{PostScript, - Author = {Kollock, Nikolai G.}, - Title = {PostScript richtig eingesetzt: vom Konzept zum - praktischen Einsatz}, - Publisher = {IWT}, - Address = {Vaterstetten}, - year = 1989, -} - -@Manual{pstricks, - Title = {PSTricks - {\PS} macros for Generic TeX}, - Author = {Timothy Van Zandt}, - Organization = {}, - Address = {\url{http://www.tug.org/application/PSTricks}}, - Note = {}, - year = 1993, -} - - -@Manual{pdftricks, - Title = {PSTricks Support for pdf}, - Author = {Herbert Voss}, - Organization = {}, - Address = {\url{http://PSTricks.tug.org}}, - Note = {}, - year = 2002, -} - -@Manual{miwi, - Title = {References for \TeX{} and Friends}, - Author = {Michael Wiedmann and Peter Karp}, - Organization = {}, - Address = {\url{http://www.miwie.org/tex-refs/}}, - Note = {}, - year = 2003, -} - - -@Manual{pstlens:2001, - Title = {PST-lens - {\PS} macros for Generic TeX}, - Author = {Denis Girou and Manuel Luque}, - Organization = {}, - Address = {\url{ftp://ftp.dante.de/tex-archive/graphics/pstricks/contrib/pst-lens/}}, - Note = {}, - year = 2001, -} - -@Manual{pstoptic:2001, - Title = {Lentilles convergentes: {PST}-optic v. 0.2}, - Author = {Manuel Luque}, - Organization = {}, - Address = {\url{http://members.aol.com/ManuelLuque2/optique.htm}}, - Note = {}, - year = 2001, -} - diff --git a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.bib b/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.bib new file mode 100644 index 00000000000..6f777d67d99 --- /dev/null +++ b/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.bib @@ -0,0 +1,56 @@ +@Book{PostScript, + Author = {Kollock, Nikolai G.}, + Title = {PostScript richtig eingesetzt: vom Konzept zum + praktischen Einsatz}, + Publisher = {IWT}, + Address = {Vaterstetten}, + year = 1989, +} + +@Manual{pstricks, + Title = {PSTricks - {\PS} macros for Generic TeX}, + Author = {Timothy Van Zandt}, + Organization = {}, + Address = {\url{http://www.tug.org/application/PSTricks}}, + Note = {}, + year = 1993, +} + + +@Manual{pdftricks, + Title = {PSTricks Support for pdf}, + Author = {Herbert Voss}, + Organization = {}, + Address = {\url{http://PSTricks.tug.org}}, + Note = {}, + year = 2002, +} + +@Manual{miwi, + Title = {References for \TeX{} and Friends}, + Author = {Michael Wiedmann and Peter Karp}, + Organization = {}, + Address = {\url{http://www.miwie.org/tex-refs/}}, + Note = {}, + year = 2003, +} + + +@Manual{pstlens:2001, + Title = {PST-lens - {\PS} macros for Generic TeX}, + Author = {Denis Girou and Manuel Luque}, + Organization = {}, + Address = {\url{ftp://ftp.dante.de/tex-archive/graphics/pstricks/contrib/pst-lens/}}, + Note = {}, + year = 2001, +} + +@Manual{pstoptic:2001, + Title = {Lentilles convergentes: {PST}-optic v. 0.2}, + Author = {Manuel Luque}, + Organization = {}, + Address = {\url{http://members.aol.com/ManuelLuque2/optique.htm}}, + Note = {}, + year = 2001, +} + 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 Binary files a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.pdf and b/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.pdf 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[]| 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[]| 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 Binary files a/Master/texmf-dist/doc/generic/pst-optic/pst-optic-examples.pdf and b/Master/texmf-dist/doc/generic/pst-optic/pst-optic-examples.pdf differ -- cgit v1.2.3