From a76615cfbba78d118357323397a4a7a9e561e2f5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 5 Mar 2014 23:15:14 +0000 Subject: listings (5mar14) git-svn-id: svn://tug.org/texlive/trunk@33095 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/listings/listings.dtx | 35 +++++++++++++++++----- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/source/latex/listings/listings.dtx') diff --git a/Master/texmf-dist/source/latex/listings/listings.dtx b/Master/texmf-dist/source/latex/listings/listings.dtx index b99c0b7aa3b..4767819937f 100644 --- a/Master/texmf-dist/source/latex/listings/listings.dtx +++ b/Master/texmf-dist/source/latex/listings/listings.dtx @@ -30,7 +30,7 @@ % % The package has the LPPL maintenance status "maintained". % -% $Id: listings.dtx 84 2013-08-26 19:50:43Z j_hoffmann $ +% $Id: listings.dtx 125 2014-03-04 19:53:21Z j_hoffmann $ % % The Current Maintainer is Jobst Hoffmann . % @@ -115,7 +115,7 @@ % Hoffmann became the maintainer of the \packagename{listings} % package in 2013; see the Preface for details.}~ % % \textless\lstemail\textgreater} -% \date{2013/08/26\enspace\enspace Version 1.5b\ \box\abstractbox} +% \date{2014/03/04\enspace\enspace Version 1.5c\ \box\abstractbox} % \def\lstemail{\href{mailto:j.hoffmann@fh-aachen.de}{\texttt{j.hoffmann-(at)-fh-aachen.de}}} % \ifhyper % \hypersetup{pdfsubject=Package guide,pdfauthor=Jobst Hoffmann } @@ -5531,7 +5531,7 @@ % \part{Implementation} % % -% \CheckSum{12359} +% \CheckSum{12367} %^^A %^^A Don't index TeX-primitives. %^^A @@ -5672,8 +5672,8 @@ % \paragraph{Identification} % All files will have same date and version. % \begin{macrocode} -\def\filedate{2013/08/26} -\def\fileversion{1.5b} +\def\filedate{2014/03/04} +\def\fileversion{1.5c} % \end{macrocode} % What we need and who we are. % \begin{macrocode} @@ -13424,7 +13424,17 @@ \global\advance\c@lstnumber-\lst@advancelstnum \ifx \lst@firstnumber\c@lstnumber \global\advance\c@lstnumber-\lst@advancelstnum - \fi} + \fi% +% \end{macrocode} +% \lstthanks{Byron~K.~Boulton}{bkboulton@berriehill.com}{2013/11/21} +% reported, that the line numbers are off by one, if the are displayed when +% a linerange is given by patterns and |includerangemarker=false| is +% set. Adding this test corrects this behaviour. +% \begin{macrocode} + \lst@ifincluderangemarker\else% + \global\advance\c@lstnumber by 1% + \fi% + } % \end{macrocode} % % The end-marker is defined if and only if it's not empty. The definition is @@ -14265,7 +14275,18 @@ \def\lst@boxpos{b}% \lsthk@PreSet\lstset{flexiblecolumns,#1}% \lsthk@TextStyle - \@ifnextchar\bgroup{\afterassignment\lst@InlineG \let\@let@token}% + \@ifnextchar\bgroup{% +% \end{macrocode} +% \lstthanks{Luc~Van~Eycken}{Luc.VanEycken@esat.kuleuven.be}{2014/01/22} +% reported, that the experimental implementation of |\lstinline| with +% braces instead of characters surrounding the source code resulted in an +% error if used in a tabular environment. He found that this error comes +% from the master counter (cf. appendix D (Dirty Tricks), item 5. (Brace +% hacks), of the TeXbook (p. 385-386)). Adding the following line remedies +% the wrong behaviour. +% \begin{macrocode} + \ifnum`{=0}\fi% + \afterassignment\lst@InlineG \let\@let@token}% \lstinline@} \def\lstinline@#1{% \lst@Init\relax -- cgit v1.2.3