summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-12-11 22:29:27 +0000
committerKarl Berry <karl@freefriends.org>2016-12-11 22:29:27 +0000
commit517d416b7c47a92e71e8f6d2a3bc5f0d81acfdae (patch)
tree75d86722d8db32fbf0beec32f0abf058134409e4
parentd37c6883e597645a04f685a5e473402cd4ff9944 (diff)
showexpl (11dec16)
git-svn-id: svn://tug.org/texlive/trunk@42677 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/showexpl/showexpl-test.pdfbin331161 -> 332458 bytes
-rw-r--r--Master/texmf-dist/doc/latex/showexpl/showexpl.pdfbin243401 -> 243219 bytes
-rw-r--r--Master/texmf-dist/source/latex/showexpl/showexpl.dtx36
-rw-r--r--Master/texmf-dist/tex/latex/showexpl/showexpl.sty29
4 files changed, 29 insertions, 36 deletions
diff --git a/Master/texmf-dist/doc/latex/showexpl/showexpl-test.pdf b/Master/texmf-dist/doc/latex/showexpl/showexpl-test.pdf
index e562e504e0c..ed08ca09e95 100644
--- a/Master/texmf-dist/doc/latex/showexpl/showexpl-test.pdf
+++ b/Master/texmf-dist/doc/latex/showexpl/showexpl-test.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/showexpl/showexpl.pdf b/Master/texmf-dist/doc/latex/showexpl/showexpl.pdf
index 2a5ddea14f6..31c82aad6d3 100644
--- a/Master/texmf-dist/doc/latex/showexpl/showexpl.pdf
+++ b/Master/texmf-dist/doc/latex/showexpl/showexpl.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/showexpl/showexpl.dtx b/Master/texmf-dist/source/latex/showexpl/showexpl.dtx
index ab8118255ac..a7c3c966774 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>
- [2016/11/20 v0.3n Typesetting example code (RN)]
+ [2016/12/11 v0.3o Typesetting example code (RN)]
%</package>
%
%<*driver>
@@ -39,7 +39,7 @@
%</driver>
% \fi
%
-% \CheckSum{891}
+% \CheckSum{887}
%
% \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
@@ -194,13 +194,12 @@
% the given width of the result area. With a number as value the formatted
% text will be scaled by this number.
% \end{description}
-%
% In addition to these options the kind of the result box (default: |\fbox|)
% can be changed. For example:
% \begin{verbatim}
% \renewcommand\ResultBox{\fcolorbox{green}{lightgray}}
-% \setlength\ResultBoxSep{5mm}
-% \setlength\ResultBoxRule{2mm}
+% \setlength\ResultBoxSep{5mm}% default: \fboxsep
+% \setlength\ResultBoxRule{2mm}% default: \fboxrule
% \end{verbatim}
%
% \StopEventually{}
@@ -448,22 +447,20 @@
% For "codefile=..."/"graphic=..." if \cmd{\theltxexample} or
% \cmd{\thelstlisting} is part of the filename.
% \begin{macrocode}
- \advance\c@ltxexample\@ne \advance\c@lstlisting\@ne
- \expandafter\lstset\expandafter{\SX@explpreset,#1}%
- \edef\x{\endgroup
- \def\noexpand\SX@codefile{\SX@codefile}%
- \def\noexpand\SX@graphicname{\SX@graphicname}%
- \def\noexpand\SX@graphicparam{\SX@graphicparam}}%
+ \advance\c@ltxexample\@ne \advance\c@lstlisting\@ne
+ \expandafter\lstset\expandafter{\SX@explpreset,#1}%
+ \edef\x{\endgroup
+ \def\noexpand\SX@codefile{\SX@codefile}%
+ \def\noexpand\SX@graphicname{\SX@graphicname}%
+ \def\noexpand\SX@graphicparam{\SX@graphicparam}}%
\x
- \xdef\SX@@explpreset{\the\@temptokena,codefile=\SX@codefile,
+ \xdef\SX@@explpreset{\the\@temptokena,codefile=\SX@codefile,%
graphic={[\SX@graphicparam]{\SX@graphicname}}}%
- \begingroup
- \let\UTFviii@defined=\@gobble
- \let\@inpenc@undefined@=\@gobble
+ \setbox\@tempboxa=\hbox\bgroup
\lst@BeginWriteFile{\SX@codefile}%
-}%
+}
{%
- \lst@EndWriteFile\endgroup
+ \lst@EndWriteFile\egroup
\SX@put@code@result
}
% \end{macrocode}
@@ -539,7 +536,6 @@
\let\@addtofilelist\@gobble
\let\lst@ifdisplaystyle=\iftrue
\SX@KillAboveCaptionskip\lst@MakeCaption{t}%
- \let\lst@belowskip=\z@
% \end{macrocode}
% Use the ``natural'' width of the result code if ``varwidth'' is
% true.
@@ -729,8 +725,8 @@
\g@addto@macro\SX@@explpreset{,xleftmargin=0pt,xrightmargin=0pt}%
\fi
\SX@Info
- \expandafter\lstinputlisting\expandafter%
- [\SX@@explpreset,nolol=true,caption={}]{\SX@codefile}%
+ \expandafter\lstinputlisting\expandafter[\SX@@explpreset,nolol=true,%
+ caption={},belowskip=\z@,aboveskip=\z@]{\SX@codefile}%
\endgroup
}%
% \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/showexpl/showexpl.sty b/Master/texmf-dist/tex/latex/showexpl/showexpl.sty
index 6b5b542a4ec..f236f704e0b 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}
- [2016/11/20 v0.3n Typesetting example code (RN)]
+ [2016/12/11 v0.3o Typesetting example code (RN)]
\DeclareOption{final}{%
\PassOptionsToPackage{\CurrentOption}{graphicx}%
\PassOptionsToPackage{\CurrentOption}{listings}%
@@ -173,22 +173,20 @@
\lstnewenvironment{LTXexample}[1][]{%
\@temptokena{#1}%
\begingroup
- \advance\c@ltxexample\@ne \advance\c@lstlisting\@ne
- \expandafter\lstset\expandafter{\SX@explpreset,#1}%
- \edef\x{\endgroup
- \def\noexpand\SX@codefile{\SX@codefile}%
- \def\noexpand\SX@graphicname{\SX@graphicname}%
- \def\noexpand\SX@graphicparam{\SX@graphicparam}}%
+ \advance\c@ltxexample\@ne \advance\c@lstlisting\@ne
+ \expandafter\lstset\expandafter{\SX@explpreset,#1}%
+ \edef\x{\endgroup
+ \def\noexpand\SX@codefile{\SX@codefile}%
+ \def\noexpand\SX@graphicname{\SX@graphicname}%
+ \def\noexpand\SX@graphicparam{\SX@graphicparam}}%
\x
- \xdef\SX@@explpreset{\the\@temptokena,codefile=\SX@codefile,
+ \xdef\SX@@explpreset{\the\@temptokena,codefile=\SX@codefile,%
graphic={[\SX@graphicparam]{\SX@graphicname}}}%
- \begingroup
- \let\UTFviii@defined=\@gobble
- \let\@inpenc@undefined@=\@gobble
+ \setbox\@tempboxa=\hbox\bgroup
\lst@BeginWriteFile{\SX@codefile}%
-}%
+}
{%
- \lst@EndWriteFile\endgroup
+ \lst@EndWriteFile\egroup
\SX@put@code@result
}
\newcommand*\SX@put@code@result{%
@@ -232,7 +230,6 @@
\let\@addtofilelist\@gobble
\let\lst@ifdisplaystyle=\iftrue
\SX@KillAboveCaptionskip\lst@MakeCaption{t}%
- \let\lst@belowskip=\z@
\let\SX@MakeCaption\lst@MakeCaption
\let\lst@MakeCaption\@gobble{}
\setbox\SX@ResBox\hbox{%
@@ -372,8 +369,8 @@
\g@addto@macro\SX@@explpreset{,xleftmargin=0pt,xrightmargin=0pt}%
\fi
\SX@Info
- \expandafter\lstinputlisting\expandafter%
- [\SX@@explpreset,nolol=true,caption={}]{\SX@codefile}%
+ \expandafter\lstinputlisting\expandafter[\SX@@explpreset,nolol=true,%
+ caption={},belowskip=\z@,aboveskip=\z@]{\SX@codefile}%
\endgroup
}%
\newcommand*\LTXinputExample[2][]{%