diff options
author | Karl Berry <karl@freefriends.org> | 2018-09-03 21:13:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-09-03 21:13:01 +0000 |
commit | a2ccafd92ea630542d85873ed29d47dcd386a865 (patch) | |
tree | 0f1217ae7ea7455a5b8bb6e491682b25a1fb8e41 /Master/texmf-dist/tex/latex/listings/listings.sty | |
parent | 579b7021cf07f16cceee7884ce8655037ea1bf9c (diff) |
listings (3sep18)
git-svn-id: svn://tug.org/texlive/trunk@48566 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 | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/latex/listings/listings.sty b/Master/texmf-dist/tex/latex/listings/listings.sty index 613a99c9770..0a463f686e5 100644 --- a/Master/texmf-dist/tex/latex/listings/listings.sty +++ b/Master/texmf-dist/tex/latex/listings/listings.sty @@ -6,7 +6,7 @@ %% %% listings.dtx (with options: `kernel') %% -%% Please read the software license in listings-1.3.dtx or listings-1.3.pdf. +%% Please read the software license in listings.dtx or listings.pdf. %% %% (w)(c) 1996--2004 Carsten Heinz and/or any other author listed %% elsewhere in this file. @@ -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{2015/06/04} -\def\fileversion{1.6} +\def\filedate{2018/09/02} +\def\fileversion{1.7} \NeedsTeXFormat{LaTeX2e} \AtEndOfPackage{\ProvidesPackage{listings} [\filedate\space\fileversion\space(Carsten Heinz)]} @@ -392,14 +392,14 @@ \expandafter\let\expandafter#3% \csname if\ifx #1t}true\else false\fi\endcsname} \def\lstKV@SwitchCases#1#2#3{% - \def\lst@temp##1\\#1&##2\\##3##4\@nil{% + \def\lst@temp##1\\#1:##2\\##3##4\@nil{% \ifx\@empty##3% #3% \else ##2% \fi }% - \lst@temp\\#2\\#1&\\\@empty\@nil} + \lst@temp\\#2\\#1:\\\@empty\@nil} \lst@UserCommand\lstset{\begingroup \lst@setcatcodes \lstset@} \def\lstset@#1{\endgroup \ifx\@empty#1\@empty\else\setkeys{lst}{#1}\fi} \def\lst@setcatcodes{\makeatletter \catcode`\==12\relax} @@ -885,7 +885,7 @@ \ifnum#2=\z@ \expandafter\@gobbletwo \else - \lccode`\~=#2\lccode`\/=#2\lowercase{\lst@CCPut@~{#1/}}% + \begingroup\lccode`\~=#2\lccode`\/=#2\lowercase{\endgroup\lst@CCPut@~{#1/}}% \fi \lst@CCPut#1} \def\lst@CCPut@#1#2{\lst@lAddTo\lst@SelectStdCharTable{\def#1{#2}}} @@ -972,7 +972,7 @@ \let\do\lst@do@noligs \verbatim@nolig@list \lsthk@SelectCharTable \lst@DeveloperSCT -\lst@DefRange + \lst@DefRange \ifx\lst@Backslash\relax\else \lst@LetSaveDef{"5C}\lsts@backslash\lst@Backslash \fi} @@ -1415,10 +1415,10 @@ \lst@AddToHook{PreSet}{\def\lst@firstline{1\relax}% \let\lst@linerange\@empty} \lst@AddToHook{Init} -{\ifx\lst@linerange\@empty - \edef\lst@linerange{{\lst@firstline}-{\lst@lastline},}% - \fi - \lst@GetLineInterval}% + {\ifx\lst@linerange\@empty + \edef\lst@linerange{{\lst@firstline}-{\lst@lastline},}% + \fi% + \lst@GetLineInterval}% \def\lst@GetLineInterval{\expandafter\lst@GLI\lst@linerange\@nil} \def\lst@GLI#1,#2\@nil{\def\lst@linerange{#2}\lst@GLI@#1--\@nil} \def\lst@GLI@#1-#2-#3\@nil{% @@ -1656,9 +1656,9 @@ \let\lst@ifbox\iffalse \lst@Key{float}\relax[\lst@floatplacement]{% \lstKV@SwitchCases{#1}% - {true&\let\lst@floatdefault\lst@floatplacement + {true:\let\lst@floatdefault\lst@floatplacement \let\lst@float\lst@floatdefault\\% - false&\let\lst@floatdefault\relax + false:\let\lst@floatdefault\relax \let\lst@float\lst@floatdefault }{\def\lst@next{\@ifstar{\let\lst@beginfloat\@dblfloat \let\lst@endfloat\end@dblfloat @@ -2201,7 +2201,9 @@ \fi \fi} }\endgroup \lstnewenvironment{lstlisting}[2][] - {\lst@TestEOLChar{#2}% + {% + \leavevmode% + \lst@TestEOLChar{#2}% \lstset{#1}% \csname\@lst @SetFirstNumber\endcsname} {\csname\@lst @SaveFirstNumber\endcsname} |