From 5a7a91f039bd6de20d95df710fc788298813679e Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 8 May 2023 03:04:06 +0000 Subject: CTAN sync 202305080304 --- graphics/pstricks/contrib/pst-optic/Changes | 1 + graphics/pstricks/contrib/pst-optic/README | 2 +- .../contrib/pst-optic/doc/pst-optic-doc.bib | 7 ++-- .../contrib/pst-optic/doc/pst-optic-doc.pdf | Bin 446888 -> 463729 bytes .../contrib/pst-optic/doc/pst-optic-doc.tex | 44 ++++++++++++++------- .../pstricks/contrib/pst-optic/latex/pst-optic.sty | 1 + .../pstricks/contrib/pst-optic/tex/pst-optic.tex | 39 +++++++++--------- 7 files changed, 55 insertions(+), 39 deletions(-) (limited to 'graphics/pstricks') diff --git a/graphics/pstricks/contrib/pst-optic/Changes b/graphics/pstricks/contrib/pst-optic/Changes index 1983e9e73a..a078ae43c3 100644 --- a/graphics/pstricks/contrib/pst-optic/Changes +++ b/graphics/pstricks/contrib/pst-optic/Changes @@ -1,4 +1,5 @@ ---- pst-optic.tex +1.02a 2023-05-07 - fix documentation for \psRefractionRay 1.02 2016-07-10 - added option onlyrays, preset to false 1.01 2010-07-23 - bugfixes for \psset[pst-optic,pstricks] 1.00 2009-02-10 - new style opticalAxis to allow different line styles diff --git a/graphics/pstricks/contrib/pst-optic/README b/graphics/pstricks/contrib/pst-optic/README index ae99fe4a5b..47b0c29eb1 100644 --- a/graphics/pstricks/contrib/pst-optic/README +++ b/graphics/pstricks/contrib/pst-optic/README @@ -3,7 +3,7 @@ %% Manuel Luque (France) %% Herbert Voss (Germany) %% -%% 2016-07-10 +%% 2023-05-07 %% Save the files diff --git a/graphics/pstricks/contrib/pst-optic/doc/pst-optic-doc.bib b/graphics/pstricks/contrib/pst-optic/doc/pst-optic-doc.bib index f45040c1fe..6eea964780 100644 --- a/graphics/pstricks/contrib/pst-optic/doc/pst-optic-doc.bib +++ b/graphics/pstricks/contrib/pst-optic/doc/pst-optic-doc.bib @@ -4,10 +4,11 @@ @Book{companion, author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Dennis Roegel and Herbert Vo\ss}, title = {The {\LaTeX} {G}raphics {C}ompanion}, - publisher = {{Addison-Wesley Publishing Company}}, + subtitle = {Reprint of the 2nd edition}, + publisher = {Lehmanns Media}, edition = 2, - year = {2007}, - address = {Boston, Mass.} + year = {2023}, + address = {Heidelberg and Berlin}, } @Article{girou:01:, diff --git a/graphics/pstricks/contrib/pst-optic/doc/pst-optic-doc.pdf b/graphics/pstricks/contrib/pst-optic/doc/pst-optic-doc.pdf index 5af7957040..a3e3c438ae 100644 Binary files a/graphics/pstricks/contrib/pst-optic/doc/pst-optic-doc.pdf and b/graphics/pstricks/contrib/pst-optic/doc/pst-optic-doc.pdf differ diff --git a/graphics/pstricks/contrib/pst-optic/doc/pst-optic-doc.tex b/graphics/pstricks/contrib/pst-optic/doc/pst-optic-doc.tex index 60ed1261f6..275db43b5a 100644 --- a/graphics/pstricks/contrib/pst-optic/doc/pst-optic-doc.tex +++ b/graphics/pstricks/contrib/pst-optic/doc/pst-optic-doc.tex @@ -1,14 +1,15 @@ -%% $Id: pst-func-doc.tex 64 2008-12-08 22:14:27Z herbert $ -\documentclass[11pt,english,BCOR10mm,DIV13,bibliography=totoc,parskip=false,smallheadings - headexclude,footexclude,oneside]{pst-doc} -\usepackage[utf8]{inputenc} +%% $Id: pst-optic-doc.tex 717 2023-05-07 18:46:46Z herbert $ +\DocumentMetadata{} + +\documentclass[11pt,english,bibliography=totoc,parskip=false,headings=small, + headinclude=false,footinclude=false,twoside,usegeometry]{pst-doc} \usepackage{pst-text} \usepackage{pst-optic} \let\pstOpticFV\fileversion \lstset{pos=t,wide=true,language=PSTricks,basicstyle=\footnotesize\ttfamily} \let\belowcaptionskip\abovecaptionskip % -\usepackage[style=dtk]{biblatex} +%\usepackage[style=dtk]{biblatex} \addbibresource{\jobname.bib} \begin{document} @@ -595,18 +596,18 @@ The macro uses the law of Snell \frac{n_1}{n_2}&=\frac{\sin \beta}{\sin \alpha}\label{snell} \end{align} -where the $n_1$ and $n_2$ are the refraction numbers with the predefined values - -\begin{align} - n_1 &= 1 \\ - n_2 &= 1.41 -\end{align} - +where the $n_1$ and $n_2$ are the refraction numbers % with the predefined values +% +%\begin{align} +% n_1 &= 1 \\ +% n_2 &= 1.41 +%\end{align} +% and $\alpha$ the incoming abd $\beta$ the outgoing angle of the ray. -The refractionnumbers have the internal names \Lnotation{refractA} and \Lnotation{refractB}. +%The refractionnumbers have the internal names \Lnotation{refractA} and \Lnotation{refractB}. -A total reflection instead of a refraction is possible, +A total reflection instead of a normal refraction is possible, when the ray starts in a medium with a higher refrectionnumber. This happens when $\sin\beta>1$ in Equ.~\ref{snell}. In this case we have $\alpha =\beta$, a total reflection. @@ -632,7 +633,8 @@ total reflection. \end{LTXexample} The macro needs the values for the four nodes, the two refractionnumbers and the name for -the end node. As you can see in the figure the end node of the ray is the intermediate +the end node which is on the intermediate line of $n_1$ and $n_2$. +As you can see in the figure the end node of the ray is the intermediate point between the linear ray and the linear medium. The end node of the refracted ray has the same name with an additional single quotation mark. In the figure the macro was called as @@ -640,8 +642,17 @@ the same name with an additional single quotation mark. In the figure the macro \Lcs{refractionRay}\Largr{A}\Largr{B}\Largr{C}\Largr{D}\Largb{1}\Largb{4}\Largb{E} \end{BDef} +with + \begin{align}n_1&}(E)(E') +\end{lstlisting} It is no problem to draw a ray which is going straight through another medium. It can be done by using the macro twice as shown in the following examples. @@ -712,6 +723,8 @@ The outline of processing we have adopted is the Gernot Hoffmann one. For more details look into the document: \url{http://www.fho-emden.de/~hoffmann/prism16072005.pdf} + +\clearpage \subsection{Figure with default values and construction indications} @@ -730,6 +743,7 @@ one. For more details look into the document: \end{pspicture*} \end{LTXexample} +\clearpage \subsection{Color matches wavelength} \begin{LTXexample}[wide=false] diff --git a/graphics/pstricks/contrib/pst-optic/latex/pst-optic.sty b/graphics/pstricks/contrib/pst-optic/latex/pst-optic.sty index 5cab95a102..6f368b6106 100644 --- a/graphics/pstricks/contrib/pst-optic/latex/pst-optic.sty +++ b/graphics/pstricks/contrib/pst-optic/latex/pst-optic.sty @@ -1,3 +1,4 @@ +%%%% $Id: pst-optic.sty 716 2023-05-07 18:37:07Z herbert $ \RequirePackage{pstricks} \ProvidesPackage{pst-optic}[2004/10/18 package wrapper for pst-optic.tex (hv)] diff --git a/graphics/pstricks/contrib/pst-optic/tex/pst-optic.tex b/graphics/pstricks/contrib/pst-optic/tex/pst-optic.tex index c9906a52b4..444d075411 100644 --- a/graphics/pstricks/contrib/pst-optic/tex/pst-optic.tex +++ b/graphics/pstricks/contrib/pst-optic/tex/pst-optic.tex @@ -1,4 +1,4 @@ -%% +%%%% $Id: pst-optic.tex 716 2023-05-07 18:37:07Z herbert $ %% This is file `pst-optic.tex', %% %% IMPORTANT NOTICE: @@ -8,7 +8,7 @@ %% Manuel Luque (France) %% Herbert Voss (Germany) %% -%% 2010-07-23 +%% 2023-05-07 %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -30,8 +30,8 @@ \ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey\fi % -\def\fileversion{1.02} -\def\filedate{2016/07/10} +\def\fileversion{1.02a} +\def\filedate{2023/05/07} \message{`PST-Optic' v\fileversion, \filedate\space (Manuel Luque and Herbert Voss)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -1578,11 +1578,11 @@ % \def\symPlan(#1)(#2){\pst@killglue\pst@makebox{\symPlan@(#1)(#2)}}% \def\symPlan@(#1)(#2){{% - \pst@getcoor{#1}\pst@tempA% - \pst@getcoor{#2}\pst@tempB% + \pst@getcoor{#1}\pst@tempA + \pst@getcoor{#2}\pst@tempB \leavevmode \hbox{% - \pnode(!% + \pnode(! \pst@tempA /Y1 exch def /X1 exch def \pst@tempB /Y2 exch def @@ -1605,30 +1605,29 @@ D12 div def X1 Y1){Factice}% - \pst@Verb{% - { [ax by cx dy tx ty] concat - } tx@3Ddict begin TMChange end }% + \pst@Verb{ + { [ax by cx dy tx ty] concat } tx@3Ddict begin TMChange end }% \box\pst@hbox \pst@Verb{ tx@3Ddict begin TMRestore end }}% -}\ignorespaces} + }\ignorespaces} % -% refractionRay[options](A)(B)(C)(D){rNoA}{rNoB}{E} -% (A)(B) the ray nodes -% (C)(D) the nodes of the other material -% {rNoA}{rNoB} the refraction numbers -% {E} the intermediate node of the ray and the material -% {E'} the end node of the ray +% psrefractionRay[options](A)(B)(C)(D){rNoA}{rNoB}{E} +% (A)(B) the ray nodes #2 #3 +% (C)(D) the nodes of the other material #4 #5 +% {rNoA}{rNoB} the refraction numbers (n1=#6, n2=#7) +% {E} the intermediate node of the ray and the material (E=#8) +% {E'} the end node of the ray (internal) % % Herbert Voss 2003-01-26 % \def\refractionRay{\@ifnextchar[{\pst@refractionRay}{\pst@refractionRay[]}} \def\pst@refractionRay[#1](#2)(#3)(#4)(#5)#6#7#8{{% - \psset[pst-optic,pstricks]{#1} + \psset[pst-optic,pstricks]{#1}% \pst@getcoor{#2}\pst@tempA \pst@getcoor{#3}\pst@tempB \pst@getcoor{#4}\pst@tempc \pst@getcoor{#5}\pst@tempd - \ABinterCD(#2)(#3)(#4)(#5){#8} + \ABinterCD(#2)(#3)(#4)(#5){#8}% %\psset{linecolor=black} %\qdisk(#8){2pt} % #8 is the point on the material @@ -1672,7 +1671,7 @@ /BetaStrich 90 Gamma sub Beta add def % Determine the intermediate point XP BetaStrich cos sub - YP BetaStrich sin add ){#8'} + YP BetaStrich sin add ){#8'}% %\qdisk(#8){5pt} }\ignorespaces} % -- cgit v1.2.3