diff options
author | Karl Berry <karl@freefriends.org> | 2019-02-28 22:37:22 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-02-28 22:37:22 +0000 |
commit | 97eed0e5d61bdb3aa50b351f2cdae80c39e6bad7 (patch) | |
tree | 2a7bdec96bce1add39588436597a6caf8cd715a7 /Master/texmf-dist/tex/latex/listings/listings.sty | |
parent | b37375f523e3b3b381dae4bbda2befbfd776e863 (diff) |
listings (28feb19)
git-svn-id: svn://tug.org/texlive/trunk@50175 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/listings/listings.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/listings/listings.sty | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/latex/listings/listings.sty b/Master/texmf-dist/tex/latex/listings/listings.sty index 0a463f686e5..36b08b58cf5 100644 --- a/Master/texmf-dist/tex/latex/listings/listings.sty +++ b/Master/texmf-dist/tex/latex/listings/listings.sty @@ -16,8 +16,8 @@ %% Send comments and ideas on the package, error reports and additional %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% -\def\filedate{2018/09/02} -\def\fileversion{1.7} +\def\filedate{2019/02/27} +\def\fileversion{1.8b} \NeedsTeXFormat{LaTeX2e} \AtEndOfPackage{\ProvidesPackage{listings} [\filedate\space\fileversion\space(Carsten Heinz)]} @@ -2003,16 +2003,20 @@ \def\lstinputlisting{% \begingroup \lst@setcatcodes \lst@inputlisting} \newcommand\lst@inputlisting[2][]{% - \endgroup - \def\lst@set{#1}% - \IfFileExists{\lst@inputpath#2}% - {\expandafter\lst@InputListing\expandafter{\lst@inputpath#2}}% - {\filename@parse{\lst@inputpath#2}% - \edef\reserved@a{\noexpand\lst@MissingFileError - {\filename@area\filename@base}% - {\ifx\filename@ext\relax tex\else\filename@ext\fi}}% - \reserved@a}% - \lst@doendpe \@newlistfalse \ignorespaces} + \endgroup + \bgroup\def\lst@set{#1}% + \expandafter\lstset\expandafter{\lst@set}% + \IfFileExists{\lst@inputpath#2}% + {\lst@InputListing{\lst@inputpath#2}}% + {\filename@parse{\lst@inputpath#2}% + \edef\reserved@a{\noexpand\lst@MissingFileError + {\filename@area\filename@base}% + {\ifx\filename@ext\relax tex\else\filename@ext\fi}}% + \reserved@a + \let\lst@doendpe\@empty}% + \egroup + \lst@doendpe \@newlistfalse \ignorespaces% +} \def\lst@MissingFileError#1#2{% \typeout{^^J! Package Listings Error: File `#1(.#2)' not found.^^J% ^^JType X to quit or <RETURN> to proceed,^^J% @@ -2129,7 +2133,7 @@ {\PackageError{Listings}{Environment `#1' already defined}\@eha \@gobbletwo}} \def\@tempa#1#2#3{% -\gdef\lstnewenvironment@##1##2##3##4##5{% + \gdef\lstnewenvironment@##1##2##3##4##5{% \begingroup \global\@namedef{end##2}{\lstenv@Error{##2}}% \global\@namedef{##2}{\def\lstenv@name{##2}% @@ -2200,13 +2204,14 @@ \let\lst@insertargs\@empty \fi \fi} }\endgroup -\lstnewenvironment{lstlisting}[2][] - {% - \leavevmode% +\lstnewenvironment{lstlisting}[2][]{% \lst@TestEOLChar{#2}% \lstset{#1}% - \csname\@lst @SetFirstNumber\endcsname} - {\csname\@lst @SaveFirstNumber\endcsname} + \csname\@lst @SetFirstNumber\endcsname% + }{% + \let\if@nobreak\iffalse% + \csname\@lst @SaveFirstNumber\endcsname% + } \lst@Key{fancyvrb}\relax[t]{% \lstKV@SetIf{#1}\lst@iffancyvrb \lstFV@fancyvrb} |