summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-10 22:44:08 +0000
committerKarl Berry <karl@freefriends.org>2013-04-10 22:44:08 +0000
commitd019f0c94185b0594b89486f8e44c9c284c421b5 (patch)
treefd267f1f1ab5462eda673244d36814e2d41abc2f /Master
parent0730097276ae76ef9b4c2178d2dd5f974d63f6ee (diff)
showexpl (10apr13)
git-svn-id: svn://tug.org/texlive/trunk@29838 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/showexpl/README2
-rw-r--r--Master/texmf-dist/doc/latex/showexpl/showexpl-test.pdfbin261407 -> 331256 bytes
-rw-r--r--Master/texmf-dist/doc/latex/showexpl/showexpl.cfg50
-rw-r--r--Master/texmf-dist/doc/latex/showexpl/showexpl.pdfbin240984 -> 242552 bytes
-rw-r--r--Master/texmf-dist/source/latex/showexpl/showexpl.dtx26
-rw-r--r--Master/texmf-dist/source/latex/showexpl/showexpl.ins4
-rw-r--r--Master/texmf-dist/tex/latex/showexpl/showexpl.sty10
7 files changed, 31 insertions, 61 deletions
diff --git a/Master/texmf-dist/doc/latex/showexpl/README b/Master/texmf-dist/doc/latex/showexpl/README
index b32d0704b60..d65eb438860 100644
--- a/Master/texmf-dist/doc/latex/showexpl/README
+++ b/Master/texmf-dist/doc/latex/showexpl/README
@@ -4,6 +4,6 @@ code and the related result in the same document. The `listings'
package is required. See `doc/showexpl-test.tex' for the details.
Rolf Niepraschk
- email: Rolf.Niepraschk@ptb.de
+ email: Rolf.Niepraschk@gmx.de
2006-03-26
diff --git a/Master/texmf-dist/doc/latex/showexpl/showexpl-test.pdf b/Master/texmf-dist/doc/latex/showexpl/showexpl-test.pdf
index c85329a5228..fe09737ee02 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.cfg b/Master/texmf-dist/doc/latex/showexpl/showexpl.cfg
deleted file mode 100644
index 4712d03eec7..00000000000
--- a/Master/texmf-dist/doc/latex/showexpl/showexpl.cfg
+++ /dev/null
@@ -1,50 +0,0 @@
-% config file for showexpl.sty
-%
-% Copyright Herbert Voss, 2005
-% Licence: LPPL.
-
-\ProvidesFile{showexpl.cfg}
- [2005/08/28 v0.03 Definitions for the showexpl package (hv)]
-%
-\RequirePackage{xcolor}
-\definecolor{hellgelb}{rgb}{1,1,0.85}
-\definecolor{colKeys}{rgb}{0,0,1}
-\definecolor{colIdentifier}{rgb}{0,0,0}
-\definecolor{colComments}{rgb}{1,0,0}
-\definecolor{colString}{rgb}{0,0.5,0}
-
-\lstset{%
- preset=\centering,%
- rframe={},%
- language=PSTricks,%
-% language=TeX,%
- float=hbp,%
- basicstyle=\footnotesize\ttfamily,%
- identifierstyle=\color{colIdentifier},%
- keywordstyle=\color{colKeys},%
- stringstyle=\color{colString},%
- commentstyle=\itshape\color{colComments},%
-% columns=flexible,%
-% columns=fullflexible,%
- columns=fixed,
- tabsize=4,%
- frame=single,%
- extendedchars=true,%
- showspaces=false,%
- showstringspaces=false,%
- numbers=left,%
- numberstyle=\tiny\ttfamily,%
- numbersep=1em,%
- breaklines=true,%
- breakindent=10pt,%
- backgroundcolor=\color{hellgelb},%
- breakautoindent=true,%
- captionpos=t,%
- xleftmargin=1em,%
- xrightmargin=\fboxsep,%
- numbersep=1em,%
-% xrightmargin=-1cm,%
-% relwidth=0.5,%
-% columnsep=10pt%
-}
-\renewcommand*\SX@Info{}%
diff --git a/Master/texmf-dist/doc/latex/showexpl/showexpl.pdf b/Master/texmf-dist/doc/latex/showexpl/showexpl.pdf
index ee055791d76..c02c9cbff6a 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 53ea2b4b218..3eb49722fda 100644
--- a/Master/texmf-dist/source/latex/showexpl/showexpl.dtx
+++ b/Master/texmf-dist/source/latex/showexpl/showexpl.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2004 -- 2006 by Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
+% Copyright (C) 2004 -- 2006 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
% --------------------------------------------------------------------
%
% This file may be distributed and/or modified under the
@@ -22,7 +22,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{showexpl}
%<*package>
- [2012/09/22 v0.3j Typesetting example code (RN)]
+ [2013/03/21 v0.3k Typesetting example code (RN)]
%</package>
%
%<*driver>
@@ -39,7 +39,7 @@
%</driver>
% \fi
%
-% \CheckSum{830}
+% \CheckSum{845}
%
% \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
@@ -97,7 +97,7 @@
%
% \title{The \textsf{showexpl} package\thanks{This document
% corresponds to \textsf{showexpl}~\fileversion, dated \filedate.}}
-% \author{Rolf Niepraschk (\texttt{Rolf.Niepraschk@ptb.de})}
+% \author{Rolf Niepraschk (\texttt{Rolf.Niepraschk@gmx.de})}
% \date{\filedate}
%
% \maketitle
@@ -518,9 +518,15 @@
\lst@belowskip=\z@
% \end{macrocode}
% Use the ``natural'' width of the result code if ``varwidth'' is
-% true.
+% true.
+% \changes{v0.3k}{2013/03/21}{Setting \cmd{\lst@MakeCaption} to \cmd{\@gobble}
+% again (prevent multiply defined labels; label key)}.
+% \begin{macrocode}
+ \let\SX@MakeCaption\lst@MakeCaption
+ \let\lst@MakeCaption\@gobble{}
+% \end{macrocode}
% \changes{v0.3j}{2012/09/22}{Setting \cmd{\lst@MakeCaption} to
-% \cmd{\@gobble} was a bad idea for hyperlinks. Group added to
+% was a bad idea for hyperlinks. Group added to
% varwidth environment. (Suggestions by Ulrike Fischer.).}
% \begin{macrocode}
\setbox\SX@ResBox\hbox{%
@@ -536,6 +542,7 @@
{\@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
}%
}%
@@ -707,6 +714,13 @@
xleftmargin=1em,columns=flexible,language=[LaTeX]TEX},pos=l,width=-99pt,
overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe=single}
% \end{macrocode}
+% \changes{v0.3k}{2013/03/21}{Definition for ``hyperref''
+% (suggested by Heiko Oberdiek)}.
+% \begin{macrocode}
+\AtBeginDocument{%
+ \def\theHlstnumber{\thelstlisting.\arabic{lstnumber}.\lst@neglisting}%
+}
+% \end{macrocode}
% \changes{v0.1g}{2004/12/10}{Loading of |showexpl.cfg| now at end of
% package (RN).}
% Changing the defaults possible in |showexpl.cfg|.
diff --git a/Master/texmf-dist/source/latex/showexpl/showexpl.ins b/Master/texmf-dist/source/latex/showexpl/showexpl.ins
index 37e454e7d8c..98548e0467f 100644
--- a/Master/texmf-dist/source/latex/showexpl/showexpl.ins
+++ b/Master/texmf-dist/source/latex/showexpl/showexpl.ins
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2004 by Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
+%% Copyright (C) 2004 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.2 of this license
@@ -21,7 +21,7 @@
This is a generated file.
-Copyright (C) 2004 by Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
+Copyright (C) 2004, ... by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
This file may be distributed and/or modified under the conditions of
the LaTeX Project Public License, either version 1.2 of this license
diff --git a/Master/texmf-dist/tex/latex/showexpl/showexpl.sty b/Master/texmf-dist/tex/latex/showexpl/showexpl.sty
index b3d77545a79..65451f40923 100644
--- a/Master/texmf-dist/tex/latex/showexpl/showexpl.sty
+++ b/Master/texmf-dist/tex/latex/showexpl/showexpl.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2004 by Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
+%% Copyright (C) 2004, ... by Rolf Niepraschk <Rolf.Niepraschk@gmx.de>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.2 of this license
@@ -22,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{showexpl}
- [2012/09/22 v0.3j Typesetting example code (RN)]
+ [2013/03/21 v0.3k Typesetting example code (RN)]
\DeclareOption{final}{%
\PassOptionsToPackage{\CurrentOption}{graphicx}%
\PassOptionsToPackage{\CurrentOption}{listings}%
@@ -227,6 +227,8 @@
\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}%
@@ -240,6 +242,7 @@
{\@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
}%
}%
@@ -362,6 +365,9 @@
\lstset{explpreset={numbers=left,numberstyle=\tiny,numbersep=.3em,
xleftmargin=1em,columns=flexible,language=[LaTeX]TEX},pos=l,width=-99pt,
overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe=single}
+\AtBeginDocument{%
+ \def\theHlstnumber{\thelstlisting.\arabic{lstnumber}.\lst@neglisting}%
+}
\InputIfFileExists{showexpl.cfg}{}{}
\endinput
%%