docshots (2feb24)

git-svn-id: svn://tug.org/texlive/trunk@69676 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 16 insertions, 10 deletions

diff --git a/Master/texmf-dist/doc/latex/docshots/docshots.pdf b/Master/texmf-dist/doc/latex/docshots/docshots.pdf
index e24ef6c4f54..8f92d6f13cb 100644
--- a/Master/texmf-dist/doc/latex/docshots/docshots.pdf
+++ b/Master/texmf-dist/doc/latex/docshots/docshots.pdf
diff --git a/Master/texmf-dist/source/latex/docshots/docshots.dtx b/Master/texmf-dist/source/latex/docshots/docshots.dtx
index 04a7402a2b9..031708e2860 100644
--- a/Master/texmf-dist/source/latex/docshots/docshots.dtx
+++ b/Master/texmf-dist/source/latex/docshots/docshots.dtx
@@ -50,7 +50,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{docshots}
 %<*package>
-[2024-01-13 0.4.2 TeX Samples Next to Their PDF Snapshots in DTX]
+[2024-02-02 0.4.3 TeX Samples Next to Their PDF Snapshots in DTX]
 %</package>
 %<*driver>
 \documentclass{ltxdoc}
@@ -660,8 +660,10 @@ Hello, world!
   \begin{minipage}[t]{\docshots@right}%
     \vspace{0pt}%
     \ifdefined\docshots@lstinputlisting%
-      \expandafter\lstinputlisting\expandafter[\docshots@opts]
-        {\docshots@tmpdir/\jobname/\hash.tex}%
+      \ifdefined\docshots@opts%
+        \expandafter\lstset\expandafter{\docshots@opts}%
+      \fi%
+      \lstinputlisting{\docshots@tmpdir/\jobname/\hash.tex}%
     \else\ifdefined\docshots@inputminted%
       \expandafter\inputminted\expandafter[\docshots@opts]
         {\docshots@inputminted}
@@ -679,7 +681,7 @@ Hello, world!
         \fvset{fontsize=\scriptsize}%
       \fi%
       \ifdefined\docshots@opts%
-        \fvset{\docshots@opts}%
+        \expandafter\fvset\expandafter{\docshots@opts}%
       \fi%
       \VerbatimInput{\docshots@tmpdir/\jobname/\hash.tex}%
     \fi\fi%
@@ -733,6 +735,10 @@ Hello, world!
 %    \end{macrocode}
 % \end{macro}
 
+%    \begin{macrocode}
+\endinput
+%    \end{macrocode}
+
 % \Finale
 
 %\clearpage
diff --git a/Master/texmf-dist/tex/latex/docshots/docshots.sty b/Master/texmf-dist/tex/latex/docshots/docshots.sty
index daaaa933080..47f7fc64c40 100644
--- a/Master/texmf-dist/tex/latex/docshots/docshots.sty
+++ b/Master/texmf-dist/tex/latex/docshots/docshots.sty
@@ -31,7 +31,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{docshots}
-[2024-01-13 0.4.2 TeX Samples Next to Their PDF Snapshots in DTX]
+[2024-02-02 0.4.3 TeX Samples Next to Their PDF Snapshots in DTX]
 
 
 
@@ -185,8 +185,10 @@
   \begin{minipage}[t]{\docshots@right}%
     \vspace{0pt}%
     \ifdefined\docshots@lstinputlisting%
-      \expandafter\lstinputlisting\expandafter[\docshots@opts]
-        {\docshots@tmpdir/\jobname/\hash.tex}%
+      \ifdefined\docshots@opts%
+        \expandafter\lstset\expandafter{\docshots@opts}%
+      \fi%
+      \lstinputlisting{\docshots@tmpdir/\jobname/\hash.tex}%
     \else\ifdefined\docshots@inputminted%
       \expandafter\inputminted\expandafter[\docshots@opts]
         {\docshots@inputminted}
@@ -204,7 +206,7 @@
         \fvset{fontsize=\scriptsize}%
       \fi%
       \ifdefined\docshots@opts%
-        \fvset{\docshots@opts}%
+        \expandafter\fvset\expandafter{\docshots@opts}%
       \fi%
       \VerbatimInput{\docshots@tmpdir/\jobname/\hash.tex}%
     \fi\fi%
@@ -240,8 +242,6 @@
 }
 \makeatother
 
-
-
 \endinput
 %%
 %% End of file `docshots.sty'.