summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/listings
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-08-30 19:33:47 +0000
committerKarl Berry <karl@freefriends.org>2013-08-30 19:33:47 +0000
commit01312ede8e1f6790ec0410527c08006e9d176fcf (patch)
tree8e6a63e2450301b8c3cf14a76bc79c15ad0a7c50 /Master/texmf-dist/tex/latex/listings
parentfb7e1604fc90300b3b2fb00d79dbfe98cb929227 (diff)
listings (29aug13)
git-svn-id: svn://tug.org/texlive/trunk@31543 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/listings')
-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.sty24
-rw-r--r--Master/texmf-dist/tex/latex/listings/lstlang2.sty2
-rw-r--r--Master/texmf-dist/tex/latex/listings/lstlang3.sty2
-rw-r--r--Master/texmf-dist/tex/latex/listings/lstmisc.sty4
7 files changed, 30 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/listings/listings.cfg b/Master/texmf-dist/tex/latex/listings/listings.cfg
index eb594329b6b..b3558440b75 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}[2013/08/05 1.5a listings configuration]
+\ProvidesFile{listings.cfg}[2013/08/26 1.5b 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 ea40d47c06a..1ef4c986717 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{2013/08/05}
-\def\fileversion{1.5a}
+\def\filedate{2013/08/26}
+\def\fileversion{1.5b}
\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 664df2a4889..6a157851531 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{2013/08/05}
-\def\fileversion{1.5a}
+\def\filedate{2013/08/26}
+\def\fileversion{1.5b}
\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 a4ef4d02577..d09c04352f8 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}
- [2013/08/05 1.5a listings language file]
+ [2013/08/26 1.5b listings language file]
%%
%% ACSL definition (c) 2000 by Andreas Matthias
%%
@@ -1228,17 +1228,35 @@
}[keywords,directives,comments,strings]%
%%
%% Python definition (c) 1998 Michael Weber
+%% Additional definitions (2013) Alexis Dimitriadis
%%
\lst@definelanguage{Python}%
{morekeywords={access,and,break,class,continue,def,del,elif,else,%
except,exec,finally,for,from,global,if,import,in,is,lambda,not,%
or,pass,print,raise,return,try,while},%
+ % Built-ins
+ morekeywords=[2]{abs,all,any,basestring,bin,bool,bytearray,callable,chr,
+ classmethod,cmp,compile,complex,delattr,dict,dir,divmod,enumerate,eval,
+ execfile,file,filter,float,format,frozenset,getattr,globals,hasattr,hash,
+ help,hex,id,input,int,isinstance,issubclass,iter,len,list,locals,long,map,
+ max,memoryview,min,next,object,oct,open,ord,pow,property,range,raw_input,
+ reduce,reload,repr,reversed,round,set,setattr,slice,sorted,staticmethod,str,
+ sum,super,tuple,type,unichr,unicode,vars,xrange,zip,apply,buffer,coerce,
+ intern},
sensitive=true,%
morecomment=[l]\#,%
morestring=[b]',%
morestring=[b]",%
- morecomment=[s]{'''}{'''},% used for documentation text
- morecomment=[s]{"""}{"""}% added by Philipp Matthias Hahn
+ morestring=[s]{'''}{'''},% used for documentation text (mulitiline strings)
+ morestring=[s]{"""}{"""},% added by Philipp Matthias Hahn
+ morestring=[s]{r'}{'},% `raw' strings
+ morestring=[s]{r"}{"},%
+ morestring=[s]{r'''}{'''},%
+ morestring=[s]{r"""}{"""},%
+ morestring=[s]{u'}{'},% unicode strings
+ morestring=[s]{u"}{"},%
+ morestring=[s]{u'''}{'''},%
+ morestring=[s]{u"""}{"""}%
}%
%%
%% Scilab definition (c) 2002,2003 Jean-Philippe Grivet
diff --git a/Master/texmf-dist/tex/latex/listings/lstlang2.sty b/Master/texmf-dist/tex/latex/listings/lstlang2.sty
index 4a69722b82c..680fee091ea 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}
- [2013/08/05 1.5a listings language file]
+ [2013/08/26 1.5b 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 9cc44697b2c..5b4b9e94a43 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}
- [2013/08/05 1.5a listings language file]
+ [2013/08/26 1.5b 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 06f9ea3cfe6..6d46c9a2d5b 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{2013/08/05}
-\def\fileversion{1.5a}
+\def\filedate{2013/08/26}
+\def\fileversion{1.5b}
\ProvidesFile{lstmisc.sty}
[\filedate\space\fileversion\space(Carsten Heinz)]
\lst@CheckVersion\fileversion