1 files changed, 25 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/showexpl/showexpl.sty b/Master/texmf-dist/tex/latex/showexpl/showexpl.sty
index 084f29dca06..edecf914334 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}
-    [2005/12/06 v0.3d Typesetting example code (RN)]
+    [2006/09/18 v0.3g Typesetting example code (RN)]
 \DeclareOption{final}{%
   \PassOptionsToPackage{\CurrentOption}{graphicx}%
   \PassOptionsToPackage{\CurrentOption}{listings}%
@@ -75,6 +75,7 @@
 \newcommand*\SX@rframe{}
 \newcommand\SX@preset{}
 \newcommand*\SX@explpreset{}
+\newcommand*\SX@@explpreset{}
 \newcommand*\SX@codefile{}\edef\SX@codefile{\jobname.tmp}
 \newcommand*\SX@justification{\raggedright}
 \newcommand*\SX@@preset{%
@@ -84,15 +85,19 @@
   \renewenvironment{figure}[1][]{\def\@captype{figure}}{}%
   \renewenvironment{table}[1][]{\def\@captype{table}}{}%
   \renewcommand\cite[1][]{}%
-  \let\tableofcontens\relax
-  \let\listoffigures\relax
-  \let\listoftables\relax
-  \let\printindex\relax
-  \let\listfiles\relax
-  \let\nofiles\relax
-  \let\index\@gobble
-  \let\label\@gobble
+  \let\tableofcontens\relax \let\listoffigures\relax
+  \let\listoftables\relax \let\printindex\relax
+  \let\listfiles\relax \let\nofiles\relax
+  \let\index\@gobble \let\label\@gobble
   \let\bibliography\@gobble
+  \let\pagestyle\@gobble \let\thispagestyle\@gobble
+  %%\let\immediate\relax \let\write\@gobbletwo
+  %%\let\closeout\@gobble \let\@@input\@gobble
+  \renewcommand\marginpar[2][]{}%
+  \renewcommand\footnote[2][]{}%
+  \let\@footnotetext\@gobble
+  %%\abovedisplayskip=\z@
+  %%\abovedisplayshortskip=\z@
 }
 \newcommand*\SX@eat@version[1][]{}
 \newif\ifSX@wasodd
@@ -244,7 +249,7 @@
 \newcommand\SX@SkipToFirst{%
   \ifeof\@inputcheck\else
     \ifnum \lst@lineno=\lst@firstline\else
-      \read\@inputcheck to\SX@tempa
+      \readline\@inputcheck to\SX@tempa
       \typeout{IGNORE (\the\lst@lineno)}%
       \global\advance\lst@lineno\@ne
       \SX@SkipToFirst
@@ -252,9 +257,11 @@
   \fi
 }
 \newcommand\SX@ProcessResult{%
-  \ifeof\@inputcheck\else
+  \ifeof\@inputcheck
+    \let\SX@tempb\relax
+  \else
     \let\SX@tempb\SX@ProcessResult
-    \ifnum \lst@lineno>\lst@lastline
+    \ifnum \lst@lineno>\lst@lastline\relax
       \ifx\lst@linerange\@empty
         \let\SX@tempb\relax
       \else
@@ -262,13 +269,14 @@
         \SX@SkipToFirst
       \fi
     \else
-      \read\@inputcheck to\SX@tempa
+      \readline\@inputcheck to\SX@tempa
       \typeout{READ (\the\lst@lineno)}%
-      \expandafter\g@addto@macro\expandafter\SX@lines\expandafter{\SX@tempa}%
+      \expandafter\g@addto@macro
+        \expandafter\SX@lines\expandafter{\SX@tempa^^J}%
       \global\advance\lst@lineno\@ne
     \fi
-    \expandafter\SX@tempb
   \fi
+  \SX@tempb
 }
 \newcommand\SX@input[1]{%
   \begingroup
@@ -287,10 +295,11 @@
     \fi
     \lst@GetLineInterval
     \SX@Info
+    \newlinechar=`\^^J\relax
     \SX@SkipToFirst\let\SX@lines\@empty
     \SX@ProcessResult
     \closein\@inputcheck
-    \SX@lines
+    \scantokens\expandafter{\SX@lines}%
   \endgroup
 }
 \newcommand*\SX@Info{%