summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/listings
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-09-07 21:02:21 +0000
committerKarl Berry <karl@freefriends.org>2014-09-07 21:02:21 +0000
commitaa82b39fdf2a2273eea8f0f990ebf8c51cbc7d19 (patch)
treeb05c6021356f1d21250fb08224b9d04a7e50bad5 /Master/texmf-dist/tex/latex/listings
parentff0be2556ec1f7fbde7f75caeed672f326246d37 (diff)
listings
git-svn-id: svn://tug.org/texlive/trunk@35124 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/listings')
-rw-r--r--Master/texmf-dist/tex/latex/listings/listings-acm.prf2
-rw-r--r--Master/texmf-dist/tex/latex/listings/listings-bash.prf66
-rw-r--r--Master/texmf-dist/tex/latex/listings/listings-fortran.prf2
-rw-r--r--Master/texmf-dist/tex/latex/listings/listings-lua.prf2
-rw-r--r--Master/texmf-dist/tex/latex/listings/listings-python.prf2
-rw-r--r--Master/texmf-dist/tex/latex/listings/listings.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/listings/listings.sty4
-rw-r--r--Master/texmf-dist/tex/latex/listings/lstdoc.sty4
-rw-r--r--Master/texmf-dist/tex/latex/listings/lstlang1.sty23
-rw-r--r--Master/texmf-dist/tex/latex/listings/lstlang2.sty2
-rw-r--r--Master/texmf-dist/tex/latex/listings/lstlang3.sty18
-rw-r--r--Master/texmf-dist/tex/latex/listings/lstmisc.sty4
12 files changed, 109 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/latex/listings/listings-acm.prf b/Master/texmf-dist/tex/latex/listings/listings-acm.prf
index 1437efb337b..eca3d271680 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 <j.hoffmann@fh-aachen.de>.
%%
\ProvidesFile{listings-acm.prf}
- [2014/03/04 1.5c listings language file]
+ [2014/09/06 1.5e 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
new file mode 100644
index 00000000000..9b8bfbeb444
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/listings/listings-bash.prf
@@ -0,0 +1,66 @@
+%%
+%% This is file `listings-bash.prf',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lstdrvrs.dtx (with options: `bash-prf')
+%%
+%% The listings package is copyright 1996--2004 Carsten Heinz, and
+%% continued maintenance on the package is copyright 2006--2007 Brooks
+%% Moses. From 2013 on the maintenance is done by Jobst Hoffmann.
+%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004/2006/
+%% 2007/2013 any individual author listed in this file.
+%%
+%% This file is distributed under the terms of the LaTeX Project Public
+%% License from CTAN archives in directory macros/latex/base/lppl.txt.
+%% Either version 1.3 or, at your option, any later version.
+%%
+%% This file is completely free and comes without any warranty.
+%%
+%% Send comments and ideas on the package, error reports and additional
+%% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>.
+%%
+\ProvidesFile{listings-bash.prf}
+ [2014/09/06 1.5e listings language file]
+\usepackage[rgb, x11names]{xcolor}
+
+\lstset{%
+ frame=tlb,% the frame is open on the right side
+ resetmargins=false,%
+ rulesepcolor=\color{black},%
+ numbers=left,% % left
+ numberstyle=\tiny,%
+ numbersep=5pt,%
+ firstnumber=1,%
+ stepnumber=5,%
+ columns=fixed,% % to prevent inserting spaces
+ fontadjust=true,%
+ keepspaces=true,%
+ basewidth=0.5em,%
+ captionpos=t,%
+ abovecaptionskip=\smallskipamount,% same amount as default
+ belowcaptionskip=\smallskipamount,% in caption package
+}
+\lstdefinestyle{bash}{%
+ backgroundcolor=\color{yellow!10},%
+ basicstyle=\small\ttfamily,%
+ identifierstyle=\color{black},%
+ keywordstyle=\color{blue},%
+ keywordstyle={[2]\color{cyan}},%
+ keywordstyle={[3]\color{olive}},%
+ stringstyle=\color{teal},%
+ commentstyle=\itshape\color{orange},%
+}%
+\lstdefinestyle{bashbw}{%
+ backgroundcolor={},%
+ basicstyle=\small\ttfamily,%
+ identifierstyle={},%
+ keywordstyle=\bfseries,%
+ stringstyle=\itshape,%
+ commentstyle=\slshape,%
+ rulesepcolor=\color{black},%
+}%
+\endinput
+%%
+%% End of file `listings-bash.prf'.
diff --git a/Master/texmf-dist/tex/latex/listings/listings-fortran.prf b/Master/texmf-dist/tex/latex/listings/listings-fortran.prf
index f80fffba336..b932a9cae16 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 <j.hoffmann@fh-aachen.de>.
%%
\ProvidesFile{listings-fortran.prf}
- [2014/03/04 1.5c listings language file]
+ [2014/09/06 1.5e 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 7e02a99dac6..efed479ba42 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 <j.hoffmann@fh-aachen.de>.
%%
\ProvidesFile{listings-lua.prf}
- [2014/03/04 1.5c listings language file]
+ [2014/09/06 1.5e 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 3cf2c02a01c..7bb4714eb6c 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 <j.hoffmann@fh-aachen.de>.
%%
\ProvidesFile{listings-python.prf}
- [2014/03/04 1.5c listings language file]
+ [2014/09/06 1.5e 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 54f165b0889..cd865576ae4 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 <j.hoffmann@fh-aachen.de>.
%%
-\ProvidesFile{listings.cfg}[2014/03/04 1.5c listings configuration]
+\ProvidesFile{listings.cfg}[2014/09/06 1.5e 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 f1bf1ab74f1..a1a6f5eecb2 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{2014/03/04}
-\def\fileversion{1.5c}
+\def\filedate{2014/09/06}
+\def\fileversion{1.5e}
\NeedsTeXFormat{LaTeX2e}
\AtEndOfPackage{\ProvidesPackage{listings}
[\filedate\space\fileversion\space(Carsten Heinz)]}
diff --git a/Master/texmf-dist/tex/latex/listings/lstdoc.sty b/Master/texmf-dist/tex/latex/listings/lstdoc.sty
index 79127afdf69..295815bd750 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 <j.hoffmann@fh-aachen.de>.
%%
-\def\filedate{2014/03/04}
-\def\fileversion{1.5c}
+\def\filedate{2014/09/06}
+\def\fileversion{1.5e}
\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 177880e56d3..69f4a4a5edb 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 <j.hoffmann@fh-aachen.de>.
%%
\ProvidesFile{lstlang1.sty}
- [2014/03/04 1.5c listings language file]
+ [2014/09/06 1.5e listings language file]
%%
%% ACSL definition (c) 2000 by Andreas Matthias
%%
@@ -207,6 +207,10 @@
morecomment=[s]{/*}{*/},%
morestring=[b]",%
}[keywords,comments,strings,keywordcomments]
+\lst@definelanguage[11]{C++}[ISO]{C++}%
+ {morekeywords={alignas,alignof,char16_t,char32_t,constexpr,%
+ decltype,noexcept,nullptr,static_assert,thread_local},%
+ }%
\lst@definelanguage[ANSI]{C++}[ISO]{C++}{}%
\lst@definelanguage[GNU]{C++}[ISO]{C++}%
{morekeywords={__attribute__,__extension__,__restrict,__restrict__,%
@@ -293,16 +297,17 @@
%% bash,sh definition (c) 2003 Riccardo Murri <riccardo.murri@gmx.it>
%%
\lst@definelanguage{bash}[]{sh}%
- {morekeywords={alias,bg,bind,builtin,command,compgen,complete,%
- declare,disown,enable,fc,fg,history,jobs,et,local,logout,printf,%
- pushd,popd,select,set,suspend,shopt,source,times,type,typeset,%
- ulimit,unalias,wait},%
+ {morekeywords={alias,bg,bind,builtin,caller,command,compgen,compopt,%
+ complete,coproc,declare,disown,dirs,enable,fc,fg,help,history,%
+ jobs,let,local,logout,mapfile,printf,pushd,popd,readarray,select,%
+ set,suspend,shopt,source,times,type,typeset,ulimit,unalias,wait},%
}%
\lst@definelanguage{sh}%
- {morekeywords={awk,break,case,cat,cd,continue,do,done,echo,else,%
- env,eval,exec,expr,exit,export,false,fi,for,function,getopts,%
- hash,history,if,kill,nice,nohup,ps,pwd,read,readonly,return,%
- sed,shift,test,then,times,trap,true,umask,unset,until,while},%
+ {morekeywords={awk,break,case,cat,cd,continue,do,done,echo,elif,else,%
+ env,esac,eval,exec,exit,export,expr,false,fi,for,function,getopts,%
+ hash,history,if,in,kill,login,newgrp,nice,nohup,ps,pwd,read,%
+ readonly,return,set,sed,shift,test,then,times,trap,true,type,%
+ ulimit,umask,unset,until,wait,while},%
morecomment=[l]\#,%
morestring=[d]"%
}[keywords,comments,strings]%
diff --git a/Master/texmf-dist/tex/latex/listings/lstlang2.sty b/Master/texmf-dist/tex/latex/listings/lstlang2.sty
index 0379c047b26..2514dcb605d 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 <j.hoffmann@fh-aachen.de>.
%%
\ProvidesFile{lstlang2.sty}
- [2014/03/04 1.5c listings language file]
+ [2014/09/06 1.5e 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 22140c1be23..d8fafbd4fba 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 <j.hoffmann@fh-aachen.de>.
%%
\ProvidesFile{lstlang3.sty}
- [2014/03/04 1.5c listings language file]
+ [2014/09/06 1.5e 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,%
@@ -330,6 +330,22 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
morestring=[b]",%
morestring=[b]'%
}[keywords,comments,strings]%
+\lst@definelanguage{Scala}%
+ {morekeywords={abstract,case,catch,class,def,%
+ do,else,extends,false,final,finally,%
+ for,if,implicit,import,lazy,match,mixin,%
+ new,null,object,override,package,%
+ private,protected,requires,return,sealed,%
+ super,this,trait,true,try,%
+ type,val,var,while,with,yield},%+
+otherkeywords={=,=>,<-,<\%,<:,>:,\#,@},%
+ sensitive,%
+ morecomment=[l]//,%
+ morecomment=[n]{/*}{*/},%
+ morestring=[b]",%
+ morestring=[b]',%
+ morestring=[b]""",%
+ }[keywords,comments,strings]%
\lst@definelanguage{ksh}
{morekeywords={alias,awk,cat,echo,else,elif,fi,exec,exit,%
for,in,do,done,select,case,esac,while,until,function,%
diff --git a/Master/texmf-dist/tex/latex/listings/lstmisc.sty b/Master/texmf-dist/tex/latex/listings/lstmisc.sty
index f3c083d63a9..53d7e6763d5 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 <j.hoffmann@fh-aachen.de>.
%%
-\def\filedate{2014/03/04}
-\def\fileversion{1.5c}
+\def\filedate{2014/09/06}
+\def\fileversion{1.5e}
\ProvidesFile{lstmisc.sty}
[\filedate\space\fileversion\space(Carsten Heinz)]
\lst@CheckVersion\fileversion