listings (29aug13)

git-svn-id: svn://tug.org/texlive/trunk@31543 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 21 insertions, 3 deletions

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