showexpl (23sep12)

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

3 files changed, 16 insertions, 11 deletions

diff --git a/Master/texmf-dist/doc/latex/showexpl/showexpl.pdf b/Master/texmf-dist/doc/latex/showexpl/showexpl.pdf
index 890b56426f1..ee055791d76 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 cadecb70cda..53ea2b4b218 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>
-    [2011/08/22 v0.3i Typesetting example code (RN)]
+    [2012/09/22 v0.3j Typesetting example code (RN)]
 %</package>
 %
 %<*driver>
@@ -39,7 +39,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{837}
+% \CheckSum{830}
 %
 % \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
@@ -453,6 +453,7 @@
 % \changes{v0.2a}{2005/07/16}{``varwidth'' package used (RN).}
 % \changes{v0.2b}{2005/07/30}{Check if \cmd{\SX@put@}\texttt{?} 
 %   is defined (RN).}
+% \begin{macro}{\SX@put@code@result}
 %    \begin{macrocode}
 \newcommand*\SX@put@code@result{%
   \begingroup
@@ -515,23 +516,26 @@
           \let\lst@ifdisplaystyle=\iftrue
           \SX@KillAboveCaptionskip\lst@MakeCaption{t}%
           \lst@belowskip=\z@
-          \let\SX@MakeCaption\lst@MakeCaption
-          \let\lst@MakeCaption\@gobble
 %    \end{macrocode}
 % Use the ``natural'' width of the result code if ``varwidth'' is 
 % true. 
+% \changes{v0.3j}{2012/09/22}{Setting \cmd{\lst@MakeCaption} to 
+%   \cmd{\@gobble} was a bad idea for hyperlinks. Group added to 
+%   varwidth environment. (Suggestions by Ulrike Fischer.).}
 %    \begin{macrocode}
           \setbox\SX@ResBox\hbox{%
             \SX@frame{%
               \@nameuse{\if@SX@varwidth varwidth\else minipage\fi}%
-                \SX@width\relax\SX@resultInput%
+                  \SX@width\relax
+                \begingroup
+                  \SX@resultInput
+                \endgroup
               \@nameuse{end\if@SX@varwidth varwidth\else minipage\fi}}}%
           \edef\SX@width{\the\wd\SX@ResBox}%
           \@ifundefined{SX@put@\SX@pos}%
             {\@latex@error{Parameter `\SX@pos' undefined}\@ehd}%
           {\@nameuse{SX@put@\SX@pos}%
             {\SX@width}{\box\SX@ResBox}{\SX@codeInput}}%
-          \let\lst@MakeCaption\SX@MakeCaption
           \lst@MakeCaption{b}\SX@KillBelowCaptionskip
         }%
       }%
@@ -541,6 +545,7 @@
   \endgroup
 }
 %    \end{macrocode}
+% \end{macro}
 % \changes{v0.3g}{2006/09/05}{\cmd{\SX@ProcessResult} is now working 
 % correctly
 % using \cmd{\readline} and \cmd{\scantokens}. Thanks to Ulrich Diez 
diff --git a/Master/texmf-dist/tex/latex/showexpl/showexpl.sty b/Master/texmf-dist/tex/latex/showexpl/showexpl.sty
index 312ee16d7e4..b3d77545a79 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}
-    [2011/08/22 v0.3i Typesetting example code (RN)]
+    [2012/09/22 v0.3j Typesetting example code (RN)]
 \DeclareOption{final}{%
   \PassOptionsToPackage{\CurrentOption}{graphicx}%
   \PassOptionsToPackage{\CurrentOption}{listings}%
@@ -227,19 +227,19 @@
           \let\lst@ifdisplaystyle=\iftrue
           \SX@KillAboveCaptionskip\lst@MakeCaption{t}%
           \lst@belowskip=\z@
-          \let\SX@MakeCaption\lst@MakeCaption
-          \let\lst@MakeCaption\@gobble
           \setbox\SX@ResBox\hbox{%
             \SX@frame{%
               \@nameuse{\if@SX@varwidth varwidth\else minipage\fi}%
-                \SX@width\relax\SX@resultInput%
+                  \SX@width\relax
+                \begingroup
+                  \SX@resultInput
+                \endgroup
               \@nameuse{end\if@SX@varwidth varwidth\else minipage\fi}}}%
           \edef\SX@width{\the\wd\SX@ResBox}%
           \@ifundefined{SX@put@\SX@pos}%
             {\@latex@error{Parameter `\SX@pos' undefined}\@ehd}%
           {\@nameuse{SX@put@\SX@pos}%
             {\SX@width}{\box\SX@ResBox}{\SX@codeInput}}%
-          \let\lst@MakeCaption\SX@MakeCaption
           \lst@MakeCaption{b}\SX@KillBelowCaptionskip
         }%
       }%