From d019f0c94185b0594b89486f8e44c9c284c421b5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 10 Apr 2013 22:44:08 +0000 Subject: showexpl (10apr13) git-svn-id: svn://tug.org/texlive/trunk@29838 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/showexpl/showexpl.dtx | 26 +++++++++++++++++----- .../texmf-dist/source/latex/showexpl/showexpl.ins | 4 ++-- 2 files changed, 22 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/source') 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 +% Copyright (C) 2004 -- 2006 by Rolf Niepraschk % -------------------------------------------------------------------- % % This file may be distributed and/or modified under the @@ -22,7 +22,7 @@ %\NeedsTeXFormat{LaTeX2e}[1999/12/01] %\ProvidesPackage{showexpl} %<*package> - [2012/09/22 v0.3j Typesetting example code (RN)] + [2013/03/21 v0.3k Typesetting example code (RN)] % % %<*driver> @@ -39,7 +39,7 @@ % % \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 +%% Copyright (C) 2004 by Rolf Niepraschk %% %% 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 +Copyright (C) 2004, ... by Rolf Niepraschk This file may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.2 of this license -- cgit v1.2.3