texlive[42677] Master/texmf-dist: showexpl (11dec16)
commits+karl at tug.org
commits+karl at tug.org
Sun Dec 11 23:29:27 CET 2016
Revision: 42677
http://tug.org/svn/texlive?view=revision&revision=42677
Author: karl
Date: 2016-12-11 23:29:27 +0100 (Sun, 11 Dec 2016)
Log Message:
-----------
showexpl (11dec16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/showexpl/showexpl-test.pdf
trunk/Master/texmf-dist/doc/latex/showexpl/showexpl.pdf
trunk/Master/texmf-dist/source/latex/showexpl/showexpl.dtx
trunk/Master/texmf-dist/tex/latex/showexpl/showexpl.sty
Modified: trunk/Master/texmf-dist/doc/latex/showexpl/showexpl-test.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/showexpl/showexpl.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/showexpl/showexpl.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/showexpl/showexpl.dtx 2016-12-11 22:29:13 UTC (rev 42676)
+++ trunk/Master/texmf-dist/source/latex/showexpl/showexpl.dtx 2016-12-11 22:29:27 UTC (rev 42677)
@@ -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 at ltxexample\@ne \advance\c at lstlisting\@ne
- \expandafter\lstset\expandafter{\SX at explpreset,#1}%
- \edef\x{\endgroup
- \def\noexpand\SX at codefile{\SX at codefile}%
- \def\noexpand\SX at graphicname{\SX at graphicname}%
- \def\noexpand\SX at graphicparam{\SX at graphicparam}}%
+ \advance\c at ltxexample\@ne \advance\c at lstlisting\@ne
+ \expandafter\lstset\expandafter{\SX at explpreset,#1}%
+ \edef\x{\endgroup
+ \def\noexpand\SX at codefile{\SX at codefile}%
+ \def\noexpand\SX at graphicname{\SX at graphicname}%
+ \def\noexpand\SX at graphicparam{\SX at graphicparam}}%
\x
- \xdef\SX@@explpreset{\the\@temptokena,codefile=\SX at codefile,
+ \xdef\SX@@explpreset{\the\@temptokena,codefile=\SX at codefile,%
graphic={[\SX at graphicparam]{\SX at graphicname}}}%
- \begingroup
- \let\UTFviii at defined=\@gobble
- \let\@inpenc at undefined@=\@gobble
+ \setbox\@tempboxa=\hbox\bgroup
\lst at BeginWriteFile{\SX at codefile}%
-}%
+}
{%
- \lst at EndWriteFile\endgroup
+ \lst at EndWriteFile\egroup
\SX at put@code at result
}
% \end{macrocode}
@@ -539,7 +536,6 @@
\let\@addtofilelist\@gobble
\let\lst at ifdisplaystyle=\iftrue
\SX at KillAboveCaptionskip\lst at MakeCaption{t}%
- \let\lst at belowskip=\z@
% \end{macrocode}
% Use the ``natural'' width of the result code if ``varwidth'' is
% true.
@@ -729,8 +725,8 @@
\g at addto@macro\SX@@explpreset{,xleftmargin=0pt,xrightmargin=0pt}%
\fi
\SX at Info
- \expandafter\lstinputlisting\expandafter%
- [\SX@@explpreset,nolol=true,caption={}]{\SX at codefile}%
+ \expandafter\lstinputlisting\expandafter[\SX@@explpreset,nolol=true,%
+ caption={},belowskip=\z@,aboveskip=\z@]{\SX at codefile}%
\endgroup
}%
% \end{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/showexpl/showexpl.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/showexpl/showexpl.sty 2016-12-11 22:29:13 UTC (rev 42676)
+++ trunk/Master/texmf-dist/tex/latex/showexpl/showexpl.sty 2016-12-11 22:29:27 UTC (rev 42677)
@@ -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 at ltxexample\@ne \advance\c at lstlisting\@ne
- \expandafter\lstset\expandafter{\SX at explpreset,#1}%
- \edef\x{\endgroup
- \def\noexpand\SX at codefile{\SX at codefile}%
- \def\noexpand\SX at graphicname{\SX at graphicname}%
- \def\noexpand\SX at graphicparam{\SX at graphicparam}}%
+ \advance\c at ltxexample\@ne \advance\c at lstlisting\@ne
+ \expandafter\lstset\expandafter{\SX at explpreset,#1}%
+ \edef\x{\endgroup
+ \def\noexpand\SX at codefile{\SX at codefile}%
+ \def\noexpand\SX at graphicname{\SX at graphicname}%
+ \def\noexpand\SX at graphicparam{\SX at graphicparam}}%
\x
- \xdef\SX@@explpreset{\the\@temptokena,codefile=\SX at codefile,
+ \xdef\SX@@explpreset{\the\@temptokena,codefile=\SX at codefile,%
graphic={[\SX at graphicparam]{\SX at graphicname}}}%
- \begingroup
- \let\UTFviii at defined=\@gobble
- \let\@inpenc at undefined@=\@gobble
+ \setbox\@tempboxa=\hbox\bgroup
\lst at BeginWriteFile{\SX at codefile}%
-}%
+}
{%
- \lst at EndWriteFile\endgroup
+ \lst at EndWriteFile\egroup
\SX at put@code at result
}
\newcommand*\SX at put@code at result{%
@@ -232,7 +230,6 @@
\let\@addtofilelist\@gobble
\let\lst at ifdisplaystyle=\iftrue
\SX at KillAboveCaptionskip\lst at MakeCaption{t}%
- \let\lst at belowskip=\z@
\let\SX at MakeCaption\lst at MakeCaption
\let\lst at MakeCaption\@gobble{}
\setbox\SX at ResBox\hbox{%
@@ -372,8 +369,8 @@
\g at addto@macro\SX@@explpreset{,xleftmargin=0pt,xrightmargin=0pt}%
\fi
\SX at Info
- \expandafter\lstinputlisting\expandafter%
- [\SX@@explpreset,nolol=true,caption={}]{\SX at codefile}%
+ \expandafter\lstinputlisting\expandafter[\SX@@explpreset,nolol=true,%
+ caption={},belowskip=\z@,aboveskip=\z@]{\SX at codefile}%
\endgroup
}%
\newcommand*\LTXinputExample[2][]{%
More information about the tex-live-commits
mailing list