From 6a598465f500d8ac3a87b812b16358ba0835b1bf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 14 Jun 2015 17:53:48 +0000 Subject: listings (5jun15) git-svn-id: svn://tug.org/texlive/trunk@37534 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/listings/listings-acm.prf | 2 +- .../tex/latex/listings/listings-bash.prf | 2 +- .../tex/latex/listings/listings-fortran.prf | 2 +- .../texmf-dist/tex/latex/listings/listings-lua.prf | 2 +- .../tex/latex/listings/listings-python.prf | 2 +- Master/texmf-dist/tex/latex/listings/listings.cfg | 2 +- Master/texmf-dist/tex/latex/listings/listings.sty | 5 ++--- Master/texmf-dist/tex/latex/listings/lstdoc.sty | 4 ++-- Master/texmf-dist/tex/latex/listings/lstlang1.sty | 6 ++--- Master/texmf-dist/tex/latex/listings/lstlang2.sty | 26 ++++++++++++++++++---- Master/texmf-dist/tex/latex/listings/lstlang3.sty | 4 ++-- Master/texmf-dist/tex/latex/listings/lstmisc.sty | 4 ++-- 12 files changed, 39 insertions(+), 22 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/listings/listings-acm.prf b/Master/texmf-dist/tex/latex/listings/listings-acm.prf index eca3d271680..2f10aaf0b88 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} - [2014/09/06 1.5e listings language file] + [2015/06/04 1.6 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 9b8bfbeb444..06dd4f52abd 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} - [2014/09/06 1.5e listings language file] + [2015/06/04 1.6 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 b932a9cae16..a80108ba9e3 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} - [2014/09/06 1.5e listings language file] + [2015/06/04 1.6 listings language file] \usepackage[rgb, x11names]{xcolor} \lstset{% diff --git a/Master/texmf-dist/tex/latex/listings/listings-lua.prf b/Master/texmf-dist/tex/latex/listings/listings-lua.prf index efed479ba42..b0152174ebf 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} - [2014/09/06 1.5e listings language file] + [2015/06/04 1.6 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 7bb4714eb6c..cbc464e57cf 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} - [2014/09/06 1.5e listings language file] + [2015/06/04 1.6 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 cd865576ae4..5dcd56b7ccd 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}[2014/09/06 1.5e listings configuration] +\ProvidesFile{listings.cfg}[2015/06/04 1.6 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 a1a6f5eecb2..613a99c9770 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{2014/09/06} -\def\fileversion{1.5e} +\def\filedate{2015/06/04} +\def\fileversion{1.6} \NeedsTeXFormat{LaTeX2e} \AtEndOfPackage{\ProvidesPackage{listings} [\filedate\space\fileversion\space(Carsten Heinz)]} @@ -1889,7 +1889,6 @@ \lsthk@PreSet\lstset{flexiblecolumns,#1}% \lsthk@TextStyle \@ifnextchar\bgroup{% - \ifnum`{=0}\fi% \afterassignment\lst@InlineG \let\@let@token}% \lstinline@} \def\lstinline@#1{% diff --git a/Master/texmf-dist/tex/latex/listings/lstdoc.sty b/Master/texmf-dist/tex/latex/listings/lstdoc.sty index 295815bd750..a346490bed5 100644 --- a/Master/texmf-dist/tex/latex/listings/lstdoc.sty +++ b/Master/texmf-dist/tex/latex/listings/lstdoc.sty @@ -16,8 +16,8 @@ %% Send comments and ideas on the package, error reports and additional %% programming languages to Jobst Hoffmann at . %% -\def\filedate{2014/09/06} -\def\fileversion{1.5e} +\def\filedate{2015/06/04} +\def\fileversion{1.6} \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 69f4a4a5edb..82c36020602 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} - [2014/09/06 1.5e listings language file] + [2015/06/04 1.6 listings language file] %% %% ACSL definition (c) 2000 by Andreas Matthias %% @@ -1284,8 +1284,8 @@ morecomment=[l]\#,% morestring=[b]',% morestring=[b]",% - morestring=[s]{'''}{'''},% used for documentation text (mulitiline strings) - morestring=[s]{"""}{"""},% added by Philipp Matthias Hahn + morecomment=[s]{'''}{'''},% used for documentation text (mulitiline strings) + morecomment=[s]{"""}{"""},% added by Philipp Matthias Hahn morestring=[s]{r'}{'},% `raw' strings morestring=[s]{r"}{"},% morestring=[s]{r'''}{'''},% diff --git a/Master/texmf-dist/tex/latex/listings/lstlang2.sty b/Master/texmf-dist/tex/latex/listings/lstlang2.sty index 2514dcb605d..d9a8fa34489 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} - [2014/09/06 1.5e listings language file] + [2015/06/04 1.6 listings language file] %% %% Abap definition by Knut Lickert %% @@ -82,9 +82,9 @@ \lst@definelanguage{ACM}{ morekeywords={ abs,After,acos,And,As,asin,atan,At,Call,Compatibility,Connect,cos,cosh,% - Create,Delay,Difference,Do,Else,ElseIf,End,EndFor,EndIf,EndParallel,% - EndState,EndSwitch,EndText,EndWith,exp,External,Fixed,For,ForEach,Free,% - Global,Hidden,If,Implementation,In,Initial,Input,InterSection,% + Create,Delay,Description,Difference,Do,Else,ElseIf,End,EndFor,EndIf,% + EndParallel,EndState,EndSwitch,EndText,EndWith,exp,External,Fixed,For,% + ForEach,Free,Global,Hidden,If,Implementation,In,Initial,Input,InterSection,% IntegerSet,Invoke,Is,Language,Library,Link,Log10,LogE,Max,Min,Model,Of,% Once,Options,Output,Parallel,Parameter,Pause,Port,Print,Private,% Procedure,Product,Ramp,Repeat,Restart,Return,Round,Runs,Sigma,sin,sinh,% @@ -874,6 +874,24 @@ },% moredelim=[s][keywordstyle3]{::}{::},% }[keywords,comments,strings]% +\lst@definelanguage[5.3]{Lua}[5.2]{Lua}{% + deletekeywords=[2]{% + bit32, bit32.arshift, bit32.band, bit32.bnot, bit32.bor,% + bit32.btest, bit32.bxor, bit32.extract, bit32.lrotate,% + bit32.lshift, bit32.replace, bit32.rrotate, bit32.rshift,% + math.atan2, math.cosh, math.frexp, math.ldexp, math.pow,% + math.sinh, math.tanh,% + },% + morekeywords=[2]{% + coroutine.isyieldable,% + math.maxinteger, math.mininteger, math.tointeger, math.type,% + math.ult,% + string.pack, string.packsize, string.unpack,% + table.move,% + utf8, utf8.char, utf8.charpattern, utf8.codepoint, utf8.codes,% + utf8.len, utf8.offset,% + },% +}[keywords,comments,strings]% %% %% Make definitions (c) 2000 Rolf Niepraschk %% diff --git a/Master/texmf-dist/tex/latex/listings/lstlang3.sty b/Master/texmf-dist/tex/latex/listings/lstlang3.sty index d8fafbd4fba..d4db105558a 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} - [2014/09/06 1.5e listings language file] + [2015/06/04 1.6 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,% @@ -124,7 +124,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% morecomment=[n]{/*}{*/},% morestring=[b]"% }[keywords,comments,strings]% -\lstdefinelanguage{CIL}% +\lst@definelanguage{CIL}% {morekeywords=[1]{assembly,beforefieldinit,class,default,cdecl,cil,corflags,% culture,custom,data,entrypoint,fastcall,field,file,% hidebysig,hash,il,imagebase,locals,managed,marshall,% diff --git a/Master/texmf-dist/tex/latex/listings/lstmisc.sty b/Master/texmf-dist/tex/latex/listings/lstmisc.sty index 53d7e6763d5..6a7e173453c 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{2014/09/06} -\def\fileversion{1.5e} +\def\filedate{2015/06/04} +\def\fileversion{1.6} \ProvidesFile{lstmisc.sty} [\filedate\space\fileversion\space(Carsten Heinz)] \lst@CheckVersion\fileversion -- cgit v1.2.3