showexpl (28may20)

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

4 files changed, 26 insertions, 9 deletions

diff --git a/Master/texmf-dist/doc/latex/showexpl/showexpl-test.pdf b/Master/texmf-dist/doc/latex/showexpl/showexpl-test.pdf
index a645e087aeb..1d114a4b8c4 100644
--- a/Master/texmf-dist/doc/latex/showexpl/showexpl-test.pdf
+++ b/Master/texmf-dist/doc/latex/showexpl/showexpl-test.pdf
diff --git a/Master/texmf-dist/doc/latex/showexpl/showexpl.pdf b/Master/texmf-dist/doc/latex/showexpl/showexpl.pdf
index 31c0ffac2e6..ece9531dc4e 100644
--- a/Master/texmf-dist/doc/latex/showexpl/showexpl.pdf
+++ b/Master/texmf-dist/doc/latex/showexpl/showexpl.pdf
diff --git a/Master/texmf-dist/source/latex/showexpl/showexpl.dtx b/Master/texmf-dist/source/latex/showexpl/showexpl.dtx
index 4102c6b8ddc..6219774f7b4 100644
--- a/Master/texmf-dist/source/latex/showexpl/showexpl.dtx
+++ b/Master/texmf-dist/source/latex/showexpl/showexpl.dtx
@@ -22,7 +22,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{showexpl}
 %<*package>
-    [2020/05/04 v0.3p Typesetting example code (RN)]
+    [2020/05/26 v0.3q Typesetting example code (RN)]
 %</package>
 %
 %<*driver>
@@ -39,7 +39,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{880}
+% \CheckSum{889}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -328,6 +328,7 @@
   \let\listoftables\relax \let\printindex\relax
   \let\listfiles\relax \let\nofiles\relax
   \let\index\@gobble \let\label\@gobble
+  \let\refstepcounter=\@gobble
   \let\bibliography\@gobble
   \let\pagestyle\@gobble \let\thispagestyle\@gobble
   %%\let\immediate\relax \let\write\@gobbletwo
@@ -696,20 +697,31 @@
         \fi
       \fi
       \let\SX@lst@Init=\lst@Init
-%    \end{macrocode}      
+%    \end{macrocode}
+%  \changes{v0.3p}{2020/05/04}{Better handling of floats (RN).}
+%  \changes{v0.3q}{2020/05/06}{Floats should always be numbered 0 (RN).}      
 %  Prevents float environments from floating. This is not enough for floating
 %  listing environments! Why?
-%  \changes{v0.3p}{2020/05/04}{Better handling of floats (RN).}
 %    \begin{macrocode}
-      \def\@xfloat##1[##2]{\@float@HH{##1}[H]}%
+      \def\@xfloat##1[##2]{%
+        \def\@captype{##1}% 
+        \@namedef{the\@captype}{0}%
+        \@float@HH{##1}[H]}%
 %    \end{macrocode}
 %  Special handling of floating listing environments.
 %    \begin{macrocode}
       \def\lst@Init{%
         \let\lst@float=\relax
+        \setcounter\@captype{-1}%
         \SX@lst@Init
       }
+%    \end{macrocode}
+%  Typeset the Code.
+%    \begin{macrocode}
       \SX@tempb{\SX@tempa{\SX@codefile}}\par
+%    \end{macrocode}
+%  Restore the regular numbering of floats outside of `LTXexample'. 
+%    \begin{macrocode}
     \endgroup
   \else
     \expandafter\includegraphics\expandafter[\SX@graphicparam]%
@@ -750,7 +762,7 @@
 % \changes{v0.1h}{2005/06/03}{New macro \cmd{\LTXinputExample} (RN).}
 %    \begin{macrocode}
 \newcommand*\LTXinputExample[2][]{%
-  \g@addto@macro\SX@@explpreset{#1,codefile=#2}%
+  \g@addto@macro\SX@@explpreset{float=false,#1,codefile=#2}%
   \SX@put@code@result}%
 %    \end{macrocode}
 % All the default values.
diff --git a/Master/texmf-dist/tex/latex/showexpl/showexpl.sty b/Master/texmf-dist/tex/latex/showexpl/showexpl.sty
index 7a54531d0fc..dfa1b14e666 100644
--- a/Master/texmf-dist/tex/latex/showexpl/showexpl.sty
+++ b/Master/texmf-dist/tex/latex/showexpl/showexpl.sty
@@ -22,7 +22,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{showexpl}
-    [2020/05/04 v0.3p Typesetting example code (RN)]
+    [2020/05/26 v0.3q Typesetting example code (RN)]
 \DeclareOption{final}{%
   \PassOptionsToPackage{\CurrentOption}{graphicx}%
   \PassOptionsToPackage{\CurrentOption}{listings}%
@@ -94,6 +94,7 @@
   \let\listoftables\relax \let\printindex\relax
   \let\listfiles\relax \let\nofiles\relax
   \let\index\@gobble \let\label\@gobble
+  \let\refstepcounter=\@gobble
   \let\bibliography\@gobble
   \let\pagestyle\@gobble \let\thispagestyle\@gobble
   %%\let\immediate\relax \let\write\@gobbletwo
@@ -358,9 +359,13 @@
         \fi
       \fi
       \let\SX@lst@Init=\lst@Init
-      \def\@xfloat##1[##2]{\@float@HH{##1}[H]}%
+      \def\@xfloat##1[##2]{%
+        \def\@captype{##1}%
+        \@namedef{the\@captype}{0}%
+        \@float@HH{##1}[H]}%
       \def\lst@Init{%
         \let\lst@float=\relax
+        \setcounter\@captype{-1}%
         \SX@lst@Init
       }
       \SX@tempb{\SX@tempa{\SX@codefile}}\par
@@ -383,7 +388,7 @@
   \endgroup
 }%
 \newcommand*\LTXinputExample[2][]{%
-  \g@addto@macro\SX@@explpreset{#1,codefile=#2}%
+  \g@addto@macro\SX@@explpreset{float=false,#1,codefile=#2}%
   \SX@put@code@result}%
 \lstset{explpreset={numbers=left,numberstyle=\tiny,numbersep=.3em,
   xleftmargin=1em,columns=flexible,language=[LaTeX]TEX},pos=l,width=-99pt,