texlive[71278] Master/texmf-dist: pst-optic (18may24)
commits+karl at tug.org
commits+karl at tug.org
Sat May 18 00:14:07 CEST 2024
Revision: 71278
https://tug.org/svn/texlive?view=revision&revision=71278
Author: karl
Date: 2024-05-18 00:14:06 +0200 (Sat, 18 May 2024)
Log Message:
-----------
pst-optic (18may24)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/pst-optic/Changes
trunk/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.bib
trunk/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.pdf
trunk/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.tex
trunk/Master/texmf-dist/tex/generic/pst-optic/pst-optic.tex
Modified: trunk/Master/texmf-dist/doc/generic/pst-optic/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-optic/Changes 2024-05-16 23:41:47 UTC (rev 71277)
+++ trunk/Master/texmf-dist/doc/generic/pst-optic/Changes 2024-05-17 22:14:06 UTC (rev 71278)
@@ -1,4 +1,5 @@
---- pst-optic.tex
+1.03 2024-05-17 - small fixes to code and documentation
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]
Modified: trunk/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.bib
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.bib 2024-05-16 23:41:47 UTC (rev 71277)
+++ trunk/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.bib 2024-05-17 22:14:06 UTC (rev 71278)
@@ -96,7 +96,7 @@
@Article{dtk02.1:voss:mathematischen,
- author = {Herbert Vo{\ss}},
+ author = {Herbert Voß},
title = {Die mathematischen {F}unktionen von {P}ostscript},
journal = dtk,
year = 2002,
@@ -105,7 +105,7 @@
altnumber = 14,
month = mar,
pages = {40--47},
- annote = bretter,
+ annote = "Bretter, die die Welt bedeuten",
abstract = { \PS, faktisch genauso alt wie {\TeX}, ist im
Verh{\"a}ltnis dazu allgemein noch weniger bekannt, wenn es
darum geht zu beurteilen, was es denn nun im eigentlichen
@@ -117,10 +117,3 @@
gezeigt. }
}
- at ctan{pstlens:2001,
- Title = {PST-lens - {\PS} macros for Generic TeX},
- Author = {Denis Girou and Manuel Luque},
- url = {/graphics/pstricks/contrib/pst-lens/},
- year = 2001,
-}
-
Modified: trunk/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.tex 2024-05-16 23:41:47 UTC (rev 71277)
+++ trunk/Master/texmf-dist/doc/generic/pst-optic/pst-optic-doc.tex 2024-05-17 22:14:06 UTC (rev 71278)
@@ -1,4 +1,4 @@
-%% $Id: pst-optic-doc.tex 717 2023-05-07 18:46:46Z herbert $
+%% $Id: pst-optic-doc.tex 896 2024-05-17 10:13:27Z herbert $
\DocumentMetadata{}
\documentclass[11pt,english,bibliography=totoc,parskip=false,headings=small,
@@ -10,6 +10,7 @@
\let\belowcaptionskip\abovecaptionskip
%
%\usepackage[style=dtk]{biblatex}
+%\addbibresource[location=remote]{https://mirror.ctan.org/biblio/ctan-bibdata/ctan.bib}
\addbibresource{\jobname.bib}
\begin{document}
@@ -44,7 +45,8 @@
\vfill\noindent
Thanks to: \\
Jean-C\^ome Charpentier,
-Arnaud Schmittbuhl.
+Arnaud Schmittbuhl,
+Keno Wehr
\end{abstract}
\section{General Options}
@@ -129,10 +131,35 @@
There are macros for the convergent and divergent lens
\begin{BDef}
\Lcs{lens}\OptArgs\\
-\Lcs{lensCVG}\OptArgs\% \textbf{C}on\textbf{v}er\textbf{g}ent (Collecting lens ) -- default\\
-\Lcs{lensDVG}\OptArgs\% \textbf{D}i\textbf{v}er\textbf{g}ent (Scatter lens )
+\Lcs{lensCVG} \% \textbf{C}on\textbf{v}er\textbf{g}ent (Collecting lens ) -- default\\
+\Lcs{lensDVG} \% \textbf{D}i\textbf{v}er\textbf{g}ent (Scatter lens )
+\Lcs{pslensCVG}\OptArgs \Largb{lens width}\Largb{lens height}\\
+\Lcs{pslensDVG}\OptArgs \Largb{lens width}\Largb{lens height}\\
\end{BDef}
+
+% \psscalebox{\psk at optic@lensScale}{%
+% \pscustom[linewidth=0.75\pslinewidth]{%
+% \pslensCVG{\psk at optic@lensWidth}{\psk at optic@lensHeight}
+% \fill[fillstyle=solid,fillcolor=BleuVerre]
+
+
+The predefined options for \Lcs{lens} are \texttt{xLeft=-7.5, xRight=7.5, yBottom=-3, yTop=3}.
+
+
+\subsection{Short forms}
+The two macros \Lcs{lensCVG} and \Lcs{lensDVG} are only short forms of the main macro \Lcs{lens}
+with the setting \Lkeyval{lensType}\texttt{=CVG|DVG}.
+The only valid arguments are \Lkeyword{lensScale}, \Lkeyword{lensWidth}, and \Lkeyword{lensHeight},
+which must be set by \Lcs{psset}.
+
+%\begin{verbatim}
+%lensType=CVG, OA=-7, lensHeight=6, lensWidth=1.5, refractB=2
+%\end{verbatim}
+
+The two macros \Lcs{pslensCVG} and \Lcs{pslensDVG} have two mandatory
+arguments: lens width and lens height.
+
\subsection{The Coordinates of the predefined Nodes}
The following figure shows the coordinates of the predefined nodes (see Table~\ref{tab:generalOptions}).
@@ -157,6 +184,9 @@
\end{pspicture*}}
\captionof{figure}{Coodinates of the predefined Nodes}\label{fig:nodes}
+
+\clearpage
+
\subsection{The Lens Type}
\begin{LTXexample}[wide=false]
@@ -171,7 +201,7 @@
\vspace*{-2ex}
\captionof{figure}{Plan Collecting lens}
-\enlargethispage{2ex}
+%\enlargethispage{2ex}
\begin{LTXexample}[wide=false]
\psscalebox{0.75}{\lens[lensType=DVG,focus=-2,spotAi=270,spotBi=90]}
@@ -185,7 +215,7 @@
\vspace*{-2ex}
\captionof{figure}{Plan Scatter lens}
-\clearpage
+%\clearpage
Using \Lcs{lens}\OptArg{\Lkeyword{lensType}=\ldots} gives the in figures \ref{fig:defaultCVG} and
\ref{fig:defaultDVG} shown lenses with the default values from Table~\ref{tab:defaultLens}.
@@ -204,7 +234,7 @@
Lense height in cm & \Lkeyword{lensHeight} & 5cm\\
Lense width in cm & \Lkeyword{lensWidth} & 0.5cm\footnotemark\\
vertical scale (obsolet) & \Lkeyword{lensScale} & 1\\
- View the lens & \Lkeyword{lensGlass} & \false\\
+ View the lens & \Lkeyword{lensGlass} & \true\\
show onyl the rays & \Lkeyword{onlyrays} & \false\\
Second lens & \Lkeyword{lensTwo} & \false\\
Focus in cm & \Lkeyword{focus} & 2\\
@@ -515,7 +545,11 @@
\subsection{\nxLcs{symPlan}}
-\verb|\symPlan| allows to mirroring complete plain graphical objects along a virtual center line. Figure \ref{fig:symPlan} shows that this mirroring is a mathematical one and not a physical one. For more examples look at \cite{pstoptic:2001}. The syntax is:
+\verb|\symPlan| allows to mirroring complete plain graphical objects along a virtual
+center line. Figure \ref{fig:symPlan}
+shows that this mirroring is a mathematical one and not a physical one.
+%For more examples look at \cite{pstoptic:2001}.
+The syntax is:
\begin{BDef}
\Lcs{symPlan}\Largr{node1}\Largr{node2}\Largb{graphic object}
@@ -1071,7 +1105,7 @@
\begin{BDef}
\Lcs{eye}
\end{BDef}
-There are no Options for this symbol of an human eye (Figure~\ref{fig:auge}).
+There are no Options for this symbol of an human eye.
Use the \Lcs{rput}-macro to put the eye elsewhere.
\begin{LTXexample}[width=2cm,pos=l,wide=false]
Modified: trunk/Master/texmf-dist/tex/generic/pst-optic/pst-optic.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-optic/pst-optic.tex 2024-05-16 23:41:47 UTC (rev 71277)
+++ trunk/Master/texmf-dist/tex/generic/pst-optic/pst-optic.tex 2024-05-17 22:14:06 UTC (rev 71278)
@@ -1,4 +1,4 @@
-%%%% $Id: pst-optic.tex 716 2023-05-07 18:37:07Z herbert $
+%%%% $Id: pst-optic.tex 896 2024-05-17 10:13:27Z herbert $
%% This is file `pst-optic.tex',
%%
%% IMPORTANT NOTICE:
@@ -6,9 +6,9 @@
%% Package `pst-optic.tex'
%%
%% Manuel Luque <Mluque5130 at aol.com> (France)
-%% Herbert Voss <voss at perce.de> (Germany)
+%% Herbert Voss <hvoss at tug.org> (Germany)
%%
-%% 2023-05-07
+%% 2024-05-17
%%
%% 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.02a}
-\def\filedate{2023/05/07}
+\def\fileversion{1.03}
+\def\filedate{2024/05/17}
\message{`PST-Optic' v\fileversion, \filedate\space (Manuel Luque and Herbert Voss)}
%
\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -402,8 +402,8 @@
\psset[pst-optic]{lensType=CVG,OA=-7,%
lensHeight=6,%
lensWidth=1.5,%
- refractB=2}
- \ifx\relax#1\relax \else\psset[pst-optic,pstricks]{#1}\fi
+ refractB=2,
+ #1}
\begin{pspicture*}(\psk at optic@xLeft ,\psk at optic@yBottom )
(\psk at optic@xRight ,\psk at optic@yTop)
\pnode(! \psk at optic@xLeft\space 0){xLeft}
@@ -737,8 +737,8 @@
%(#2) est l'abscisse du centre optique
\def\lens{\@ifnextchar[{\pst at lens}{\pst at lens[]}}
\def\pst at lens[#1]{{%
- \psset[pst-optic]{xLeft=-7.5,xRight=7.5,yBottom=-3,yTop=3}%
- \psset[pst-optic,pstricks]{#1}%
+ \psset[pst-optic,pstricks]{xLeft=-7.5,xRight=7.5,yBottom=-3,yTop=3,#1}%
+% \psset[pst-optic,pstricks]{#1}%
\pst at killglue%
% trace les rayons
% calcule la position de l'image
@@ -1999,7 +1999,7 @@
\def\resetOpticOptions{% hv 2006-07-20
\newpsstyle{opticalAxis}{linewidth=0.5pt,linecolor=black,linestyle=solid}
\psset[pst-optic]{%
- lensGlass=false,drawing=true,,lensTwo,rightRay,onlyrays=false,
+ lensGlass=true,drawing=true,lensTwo,rightRay,onlyrays=false,
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,
More information about the tex-live-commits
mailing list.