CTAN sync 202406030302

6 files changed, 40 insertions, 24 deletions

diff --git a/graphics/pstricks/contrib/pst-optic/Changes b/graphics/pstricks/contrib/pst-optic/Changes
index 9d04151b68..e51864d848 100644
--- a/graphics/pstricks/contrib/pst-optic/Changes
+++ b/graphics/pstricks/contrib/pst-optic/Changes
@@ -1,4 +1,5 @@
 ---- pst-optic.tex
+1.04  2024-06-02  - small fixes to code and documentation
 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
diff --git a/graphics/pstricks/contrib/pst-optic/README b/graphics/pstricks/contrib/pst-optic/README
index 47b0c29eb1..0f33952022 100644
--- a/graphics/pstricks/contrib/pst-optic/README
+++ b/graphics/pstricks/contrib/pst-optic/README
@@ -3,7 +3,7 @@
 %% Manuel Luque <Mluque5130@aol.com> (France)
 %% Herbert Voss <hvoss@tug.org> (Germany)
 %%
-%% 2023-05-07
+%% 2024-06-02
 %%
 
 Save the files
@@ -21,5 +21,6 @@ dvips pst-optic-doc.dvi
 
 to get a PostScript file. But pay attention, that the pst-optic
 files are saved in the above mentioned way, before you run
-latex on the documentation file.
+latex on the documentation file. Or simply use lualatex to get
+directly the pdf.
 
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 740cf6db59..6eea964780 100644
--- a/graphics/pstricks/contrib/pst-optic/doc/pst-optic-doc.bib
+++ b/graphics/pstricks/contrib/pst-optic/doc/pst-optic-doc.bib
@@ -96,7 +96,7 @@
 
 
 @Article{dtk02.1:voss:mathematischen,
-  author	= {Herbert Voß},
+  author	= {Herbert Vo{\ss}},
   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, die die Welt bedeuten",
+  annote	= bretter,
   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,3 +117,10 @@
 		  gezeigt. }
 }
 
+@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,
+}
+
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 35ec09b5b8..182863a16e 100644
--- a/graphics/pstricks/contrib/pst-optic/doc/pst-optic-doc.pdf
+++ b/graphics/pstricks/contrib/pst-optic/doc/pst-optic-doc.pdf
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 96ca28bbec..5ec11a0297 100644
--- a/graphics/pstricks/contrib/pst-optic/doc/pst-optic-doc.tex
+++ b/graphics/pstricks/contrib/pst-optic/doc/pst-optic-doc.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-optic-doc.tex 896 2024-05-17 10:13:27Z herbert $
+%% $Id: pst-optic-doc.tex 903 2024-06-02 06:16:43Z herbert $
 \DocumentMetadata{}
 
 \documentclass[11pt,english,bibliography=totoc,parskip=false,headings=small,
@@ -132,7 +132,7 @@ There are macros for the convergent and divergent lens
 \begin{BDef}
 \Lcs{lens}\OptArgs\\
 \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{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}
@@ -148,7 +148,7 @@ The predefined options for \Lcs{lens} are \texttt{xLeft=-7.5, xRight=7.5, yBotto
 
 
 \subsection{Short forms}
-The two macros \Lcs{lensCVG} and \Lcs{lensDVG} are only short forms of the main macro \Lcs{lens}
+The two macros \Lcs{lensCVG} and \Lcs{lensDVG} draw some more rays as 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}. 
@@ -235,16 +235,17 @@ Using \Lcs{lens}\OptArg{\Lkeyword{lensType}=\ldots} gives the in figures \ref{fi
 	Lense width in cm 		& \Lkeyword{lensWidth}  & 0.5cm\footnotemark\\
 	vertical scale (obsolet)	& \Lkeyword{lensScale}  & 1\\
 	View the lens 			& \Lkeyword{lensGlass}  & \true\\
-	show onyl the rays 		& \Lkeyword{onlyrays}  & \false\\
+	show only the rays 		& \Lkeyword{onlyrays}  & \false\\
 	Second lens			& \Lkeyword{lensTwo}	& \false\\
 	Focus  in cm			& \Lkeyword{focus}	& 2\\
-	Distance $\mathrm{\overline{OA}}$& \Lkeyword{OA}	& -4\\
-	Distance $\mathrm{\overline{AB}}$& \Lkeyword{AB}	& 1.5\\
-	Lens color			& \Lkeyword{lenscolor}  & \black\\
-	Arrow length in cm		& \Lkeyword{lensarrowsize}  & 0.2\\
-	Arrow inset in cm		& \Lkeyword{lensarrowinset} & 0.5\\
+	Distance $\mathrm{\overline{OA}}$& \Lkeyword{OA}	& -3\\
+	Distance $\mathrm{\overline{AB}}$& \Lkeyword{AB}	& 1\\
+	Lens color			& \Lkeyword{lenscolor}\footnotemark  & \black\\
+	Arrow length in cm		& \Lkeyword{lensArrowSize}${}^2$  & 0.2\\
+	Arrow inset in cm		& \Lkeyword{lensArrowInset}${}^2$ & 0.5\\
 \end{tabular}
 \footnotetext{\textsuperscript{1} only for \Lkeyset{lensGlass=true}, otherwise set to \texttt{2\textbackslash pslinewidth}}
+\footnotetext{\textsuperscript{2} only for \Lkeyset{lensGlass=false}}
 \end{minipage}
 \end{table}
 
diff --git a/graphics/pstricks/contrib/pst-optic/tex/pst-optic.tex b/graphics/pstricks/contrib/pst-optic/tex/pst-optic.tex
index f145993fc6..0c06f849b3 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 896 2024-05-17 10:13:27Z herbert $
+%%%% $Id: pst-optic.tex 903 2024-06-02 06:16:43Z herbert $
 %% This is file `pst-optic.tex',
 %% 
 %% IMPORTANT NOTICE:
@@ -8,7 +8,7 @@
 %% Manuel Luque <Mluque5130@aol.com> (France)
 %% Herbert Voss <hvoss@tug.org> (Germany)
 %%
-%% 2024-05-17
+%% 2024-06-02
 %%
 %% 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.03}
-\def\filedate{2024/05/17}
+\def\fileversion{1.04}
+\def\filedate{2024/06/02}
 \message{`PST-Optic' v\fileversion, \filedate\space (Manuel Luque and Herbert Voss)}
 %
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -798,13 +798,19 @@
     \begingroup%
       \ifPst@lensGlass
         \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\lensTypeDVG\psset{arrows=>-<}\else
-          \ifx\psk@optic@lensType\lensTypePDVG\psset{arrows=>-<}\else\psset{arrows=<->}
-	\fi\fi
+	      \ifx\psk@optic@lensType\lensTypeCVG \lensCVG%
+	      \else\ifx\psk@optic@lensType\lensTypePCVG \lensCVG
+ 	        \else\lensDVG
+ 	      \fi\fi}%
+      \else
+        \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]%