From ed06debf5f768921e0fe0fd466866d881c2d4ea6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 25 Mar 2020 21:10:48 +0000 Subject: listings (25mar20) git-svn-id: svn://tug.org/texlive/trunk@54545 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/listings/listings-acm.prf | 2 +- Master/texmf-dist/tex/latex/listings/listings-bash.prf | 2 +- .../texmf-dist/tex/latex/listings/listings-fortran.prf | 2 +- .../texmf-dist/tex/latex/listings/listings-hansl.prf | 2 +- Master/texmf-dist/tex/latex/listings/listings-lua.prf | 2 +- .../texmf-dist/tex/latex/listings/listings-python.prf | 2 +- Master/texmf-dist/tex/latex/listings/listings.cfg | 2 +- Master/texmf-dist/tex/latex/listings/listings.sty | 18 ++++++++++++++---- Master/texmf-dist/tex/latex/listings/lstdoc.sty | 4 ++-- Master/texmf-dist/tex/latex/listings/lstlang1.sty | 2 +- Master/texmf-dist/tex/latex/listings/lstlang2.sty | 2 +- Master/texmf-dist/tex/latex/listings/lstlang3.sty | 2 +- Master/texmf-dist/tex/latex/listings/lstmisc.sty | 4 ++-- 13 files changed, 28 insertions(+), 18 deletions(-) (limited to 'Master/texmf-dist/tex/latex/listings') diff --git a/Master/texmf-dist/tex/latex/listings/listings-acm.prf b/Master/texmf-dist/tex/latex/listings/listings-acm.prf index ee75a1b4d2c..cb8dd68689f 100644 --- a/Master/texmf-dist/tex/latex/listings/listings-acm.prf +++ b/Master/texmf-dist/tex/latex/listings/listings-acm.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{listings-acm.prf} - [2019/09/10 1.8c listings language file] + [2020/03/24 1.8d listings language file] \usepackage[rgb, x11names]{xcolor} \definecolor{Comments}{rgb}{0.00,0.50,0.00} diff --git a/Master/texmf-dist/tex/latex/listings/listings-bash.prf b/Master/texmf-dist/tex/latex/listings/listings-bash.prf index e0e2cbbb9b7..708e90d4ff2 100644 --- a/Master/texmf-dist/tex/latex/listings/listings-bash.prf +++ b/Master/texmf-dist/tex/latex/listings/listings-bash.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{listings-bash.prf} - [2019/09/10 1.8c listings language file] + [2020/03/24 1.8d listings language file] \usepackage[rgb, x11names]{xcolor} \lstset{% diff --git a/Master/texmf-dist/tex/latex/listings/listings-fortran.prf b/Master/texmf-dist/tex/latex/listings/listings-fortran.prf index 36d5ac5bb2d..29039ce2507 100644 --- a/Master/texmf-dist/tex/latex/listings/listings-fortran.prf +++ b/Master/texmf-dist/tex/latex/listings/listings-fortran.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{listings-fortran.prf} - [2019/09/10 1.8c listings language file] + [2020/03/24 1.8d listings language file] \usepackage[rgb, x11names]{xcolor} \lstset{% diff --git a/Master/texmf-dist/tex/latex/listings/listings-hansl.prf b/Master/texmf-dist/tex/latex/listings/listings-hansl.prf index 5dabb52c222..a9dbb8804c7 100644 --- a/Master/texmf-dist/tex/latex/listings/listings-hansl.prf +++ b/Master/texmf-dist/tex/latex/listings/listings-hansl.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{listings-hansl.prf} - [2019/09/10 1.8c listings language file] + [2020/03/24 1.8d listings language file] \usepackage[rgb, x11names]{xcolor} \lstdefinestyle{hanslbw}{% diff --git a/Master/texmf-dist/tex/latex/listings/listings-lua.prf b/Master/texmf-dist/tex/latex/listings/listings-lua.prf index c52020d4059..093f7107eae 100644 --- a/Master/texmf-dist/tex/latex/listings/listings-lua.prf +++ b/Master/texmf-dist/tex/latex/listings/listings-lua.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{listings-lua.prf} - [2019/09/10 1.8c listings language file] + [2020/03/24 1.8d listings language file] \usepackage[rgb, x11names]{xcolor} \lstdefinestyle{Lua}{% language=[5.2]Lua, diff --git a/Master/texmf-dist/tex/latex/listings/listings-python.prf b/Master/texmf-dist/tex/latex/listings/listings-python.prf index 74110def45e..704c7cf3194 100644 --- a/Master/texmf-dist/tex/latex/listings/listings-python.prf +++ b/Master/texmf-dist/tex/latex/listings/listings-python.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{listings-python.prf} - [2019/09/10 1.8c listings language file] + [2020/03/24 1.8d listings language file] \usepackage{xcolor} \usepackage{textcomp} diff --git a/Master/texmf-dist/tex/latex/listings/listings.cfg b/Master/texmf-dist/tex/latex/listings/listings.cfg index 4fc94ce55ca..3afb948c328 100644 --- a/Master/texmf-dist/tex/latex/listings/listings.cfg +++ b/Master/texmf-dist/tex/latex/listings/listings.cfg @@ -21,7 +21,7 @@ %% Send comments and ideas on the package, error reports and additional %% programming languages to Jobst Hoffmann at . %% -\ProvidesFile{listings.cfg}[2019/09/10 1.8c listings configuration] +\ProvidesFile{listings.cfg}[2020/03/24 1.8d listings configuration] \def\lstlanguagefiles {lstlang0.sty,lstlang1.sty,lstlang2.sty,lstlang3.sty} \lstset{defaultdialect=[R/3 6.10]ABAP, diff --git a/Master/texmf-dist/tex/latex/listings/listings.sty b/Master/texmf-dist/tex/latex/listings/listings.sty index b938be3b362..be08438220c 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 . %% -\def\filedate{2019/09/10} -\def\fileversion{1.8c} +\def\filedate{2020/03/24} +\def\fileversion{1.8d} \NeedsTeXFormat{LaTeX2e} \AtEndOfPackage{\ProvidesPackage{listings} [\filedate\space\fileversion\space(Carsten Heinz)]} @@ -927,7 +927,7 @@ \lst@ProcessOther {"27}{\lst@ifupquote \textquotesingle \else \char39\relax \fi} \lst@ProcessOther {"2A}{\lst@ttfamily*\textasteriskcentered} - \lst@ProcessOther {"2D}{\lst@ttfamily{-{}}{$-$}} + \lst@ProcessOther {"2D}{\lst@ttfamily{-{}}{\textminus}} \lst@ProcessOther {"3C}{\lst@ttfamily<\textless} \lst@ProcessOther {"3E}{\lst@ttfamily>\textgreater} \lst@ProcessOther {"5C}{\lst@ttfamily{\char92}\textbackslash} @@ -2067,11 +2067,21 @@ \else \expandafter\lst@BOLGobble \fi} + \lst@Key{consecutivenumbers}{true}[t]{\lstKV@SetIf{#1}\lst@ifconsecutivenumbers} + \def\lst@DisplayConsecutiveNumbersOrNot{% + \lst@ifconsecutivenumbers\typeout{consecutive:}\else% + \typeout{non-consecutive:} + \c@lstnumber=\numexpr-1+\lst@lineno %\relax % this enforces the + %displayed line numbers to always be the + %input line numbers + \fi% +} \def\lst@MSkipToFirst{% \global\advance\lst@lineno\@ne \ifnum \lst@lineno=\lst@firstline \lst@LeaveMode \global\lst@newlines\z@ \lsthk@InitVarsBOL + \lst@DisplayConsecutiveNumbersOrNot \expandafter\lst@BOLGobble \fi} \def\lstenv@DroppedWarning{% @@ -2210,7 +2220,7 @@ \lstset{#1}% \csname\@lst @SetFirstNumber\endcsname% }{% - \let\if@nobreak\iffalse% + \@nobreakfalse \csname\@lst @SaveFirstNumber\endcsname% } \lst@Key{fancyvrb}\relax[t]{% diff --git a/Master/texmf-dist/tex/latex/listings/lstdoc.sty b/Master/texmf-dist/tex/latex/listings/lstdoc.sty index e4ba3109c43..6312fe017e7 100644 --- a/Master/texmf-dist/tex/latex/listings/lstdoc.sty +++ b/Master/texmf-dist/tex/latex/listings/lstdoc.sty @@ -6,8 +6,8 @@ %% %% listings.dtx (with options: `doc') %% -\def\filedate{2019/09/10} -\def\fileversion{1.8c} +\def\filedate{2020/03/24} +\def\fileversion{1.8d} \ProvidesPackage{lstdoc} [\filedate\space\fileversion\space(Carsten Heinz)] \let\lstdoc@currversion\fileversion diff --git a/Master/texmf-dist/tex/latex/listings/lstlang1.sty b/Master/texmf-dist/tex/latex/listings/lstlang1.sty index b53b79ff510..673f56c0a14 100644 --- a/Master/texmf-dist/tex/latex/listings/lstlang1.sty +++ b/Master/texmf-dist/tex/latex/listings/lstlang1.sty @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{lstlang1.sty} - [2019/09/10 1.8c listings language file] + [2020/03/24 1.8d listings language file] %% %% ACSL definition (c) 2000 by Andreas Matthias %% diff --git a/Master/texmf-dist/tex/latex/listings/lstlang2.sty b/Master/texmf-dist/tex/latex/listings/lstlang2.sty index 6d841c6bb2f..04fdc713497 100644 --- a/Master/texmf-dist/tex/latex/listings/lstlang2.sty +++ b/Master/texmf-dist/tex/latex/listings/lstlang2.sty @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{lstlang2.sty} - [2019/09/10 1.8c listings language file] + [2020/03/24 1.8d listings language file] %% %% Abap definition by Knut Lickert %% diff --git a/Master/texmf-dist/tex/latex/listings/lstlang3.sty b/Master/texmf-dist/tex/latex/listings/lstlang3.sty index 3482b3c4c3b..02957f30b7c 100644 --- a/Master/texmf-dist/tex/latex/listings/lstlang3.sty +++ b/Master/texmf-dist/tex/latex/listings/lstlang3.sty @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{lstlang3.sty} - [2019/09/10 1.8c listings language file] + [2020/03/24 1.8d listings language file] \lst@definelanguage[68]{Algol}% {morekeywords={abs,and,arg,begin,bin,bits,bool,by,bytes,case,channel,% char,co,comment,compl,conj,divab,do,down,elem,elif,else,empty,% diff --git a/Master/texmf-dist/tex/latex/listings/lstmisc.sty b/Master/texmf-dist/tex/latex/listings/lstmisc.sty index 77514c532ff..3756865c0a3 100644 --- a/Master/texmf-dist/tex/latex/listings/lstmisc.sty +++ b/Master/texmf-dist/tex/latex/listings/lstmisc.sty @@ -16,8 +16,8 @@ %% Send comments and ideas on the package, error reports and additional %% programming languages to Jobst Hoffmann at . %% -\def\filedate{2019/09/10} -\def\fileversion{1.8c} +\def\filedate{2020/03/24} +\def\fileversion{1.8d} \ProvidesFile{lstmisc.sty} [\filedate\space\fileversion\space(Carsten Heinz)] \lst@CheckVersion\fileversion -- cgit v1.2.3