summaryrefslogtreecommitdiff
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
parentfb7e1604fc90300b3b2fb00d79dbfe98cb929227 (diff)
listings (29aug13)
git-svn-id: svn://tug.org/texlive/trunk@31543 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/listings/Makefile8
-rw-r--r--Master/texmf-dist/doc/latex/listings/listings-lua.prf39
-rw-r--r--Master/texmf-dist/doc/latex/listings/listings-python.prf49
-rw-r--r--Master/texmf-dist/doc/latex/listings/listings.pdfbin715984 -> 717293 bytes
-rw-r--r--Master/texmf-dist/doc/latex/listings/lstdrvrs.pdfbin474219 -> 479989 bytes
-rw-r--r--Master/texmf-dist/source/latex/listings/listings.dtx35
-rw-r--r--Master/texmf-dist/source/latex/listings/lstdrvrs.dtx127
-rw-r--r--Master/texmf-dist/source/latex/listings/lstdrvrs.ins7
-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
15 files changed, 280 insertions, 27 deletions
diff --git a/Master/texmf-dist/doc/latex/listings/Makefile b/Master/texmf-dist/doc/latex/listings/Makefile
index 0ae8d1a1cdc..37805082dec 100644
--- a/Master/texmf-dist/doc/latex/listings/Makefile
+++ b/Master/texmf-dist/doc/latex/listings/Makefile
@@ -2,7 +2,7 @@
#
# This file generates files required to use the listings package.
#
-# $Id: Makefile 65 2013-08-03 11:02:22Z j_hoffmann $
+# $Id: Makefile 80 2013-08-05 17:46:11Z j_hoffmann $
#
# (c) 2007 Brooks Moses
# (c) 2013 Jobst Hoffmann
@@ -97,13 +97,13 @@ clean:
-rm -f *.bbl *.blg *.brf
clean-results:
- -rm -f *.cfg *.pdf *.sty
+ -rm -f *.cfg *.pdf *.prf *.sty
realclean: clean clean-results
### create packed files
tar-src:
- $(MAKE) realclean; \
+ @$(MAKE) realclean; \
sed -i -e "s+fileversion{[a-z0-9\.\-]*}+fileversion{$(VERSION)}+g" \
-e "s+filedate{[0-9/]*}+filedate{$(DATE)}+g" \
-e "s+date{[0-9/]*\\\\enspace+date{$(DATE)\\\\enspace+g" \
@@ -116,7 +116,7 @@ tar-src:
cd ..; tar $(EXsvn) -czvf $(PACKAGE)/$(TAR_SRC) $(PACKAGE)
tar-dist: $(DISTRIBUTION_FILES)
- $(MAKE) realclean; \
+ @$(MAKE) realclean; \
sed -i -e "s+fileversion{[a-z0-9\.\-]*}+fileversion{$(VERSION)}+g" \
-e "s+filedate{[0-9/]*}+filedate{$(DATE)}+g" \
-e "s+date{[0-9/]*\\\\enspace+date{$(DATE)\\\\enspace+g" \
diff --git a/Master/texmf-dist/doc/latex/listings/listings-lua.prf b/Master/texmf-dist/doc/latex/listings/listings-lua.prf
new file mode 100644
index 00000000000..05b79095d3f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/listings/listings-lua.prf
@@ -0,0 +1,39 @@
+%%
+%% This is file `listings-lua.prf',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lstdrvrs.dtx (with options: `lua-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-lua.prf}
+ [2013/08/26 1.5b listings language file]
+\usepackage[rgb, x11names]{xcolor}
+\lstdefinestyle{Lua}{%
+ language=[5.2]Lua,
+ basicstyle=\ttfamily,
+ columns=spaceflexible,
+ keywordstyle=\bfseries\color{Blue4},% language keywords
+ keywordstyle=[2]\bfseries\color{RoyalBlue3},% std. library identifiers
+ keywordstyle=[3]\bfseries\color{Purple3},% labels
+ stringstyle=\bfseries\color{Coral4},% strings
+ commentstyle=\itshape\color{Green4},% comments
+}
+\endinput
+%%
+%% End of file `listings-lua.prf'.
diff --git a/Master/texmf-dist/doc/latex/listings/listings-python.prf b/Master/texmf-dist/doc/latex/listings/listings-python.prf
new file mode 100644
index 00000000000..da85a1210c3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/listings/listings-python.prf
@@ -0,0 +1,49 @@
+%%
+%% This is file `listings-python.prf',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% lstdrvrs.dtx (with options: `python-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-python.prf}
+ [2013/08/26 1.5b listings language file]
+\usepackage{xcolor}
+\usepackage{textcomp}
+
+%% Actual colors from idlelib/config-highlight.def --> corrected to ``web-safe''
+%% strings = #00aa00 / 0,170,0 (a darker green)
+%% builtins = #900090 / 144,0,144 (purple-ish)
+%% keywords = #FF7700 / 255,119,0 (quite close to plain `orange')
+%% Corrected to ``web-safe''
+\definecolor{purple2}{RGB}{153,0,153} % there's actually no standard purple
+\definecolor{green2}{RGB}{0,153,0} % a darker green
+
+\lstdefinestyle{python-idle-code}{%
+ language=Python, % the language
+ basicstyle=\normalsize\ttfamily, % size of the fonts for the code
+ % Color settings to match IDLE style
+ keywordstyle=\color{orange}, % core keywords
+ keywordstyle={[2]\color{purple2}}, % built-ins
+ stringstyle=\color{green2},
+ commentstyle=\color{red},
+ upquote=true, % requires textcomp
+}
+\endinput
+%%
+%% End of file `listings-python.prf'.
diff --git a/Master/texmf-dist/doc/latex/listings/listings.pdf b/Master/texmf-dist/doc/latex/listings/listings.pdf
index a28605f59af..2e8f263ba6b 100644
--- a/Master/texmf-dist/doc/latex/listings/listings.pdf
+++ b/Master/texmf-dist/doc/latex/listings/listings.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf b/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf
index e9f2f3bad5c..5258adba134 100644
--- a/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf
+++ b/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/listings/listings.dtx b/Master/texmf-dist/source/latex/listings/listings.dtx
index 4efad5f3c49..b99c0b7aa3b 100644
--- a/Master/texmf-dist/source/latex/listings/listings.dtx
+++ b/Master/texmf-dist/source/latex/listings/listings.dtx
@@ -30,7 +30,7 @@
%
% The package has the LPPL maintenance status "maintained".
%
-% $Id: listings.dtx 62 2013-08-03 09:32:27Z j_hoffmann $
+% $Id: listings.dtx 84 2013-08-26 19:50:43Z j_hoffmann $
%
% The Current Maintainer is Jobst Hoffmann <j.hoffmann-(at)-fh-aachen.de>.
%
@@ -115,7 +115,7 @@
% Hoffmann became the maintainer of the \packagename{listings}
% package in 2013; see the Preface for details.}~ %
% \textless\lstemail\textgreater}
-% \date{2013/08/05\enspace\enspace Version 1.5a\ \box\abstractbox}
+% \date{2013/08/26\enspace\enspace Version 1.5b\ \box\abstractbox}
% \def\lstemail{\href{mailto:j.hoffmann@fh-aachen.de}{\texttt{j.hoffmann-(at)-fh-aachen.de}}}
% \ifhyper
% \hypersetup{pdfsubject=Package guide,pdfauthor=Jobst Hoffmann <j.hoffmann-(at)-fh-aachen.de>}
@@ -896,6 +896,33 @@
% context.
%
%
+% \subsubsection{Preferences}\label{uPreferences}
+%
+% Sometimes authors of language support provide their own configuration
+% preferences. These may come either from their personal experience or
+% from the settings in an IDE and can be defined as a \packagename{listing}
+% style. From version 1.5b of the \packagename{listings} package on these
+% styles are provided as files with the name
+% |listings-|\meta{language}|.prf|, \meta{language} is the name of the
+% supported programming language in lowercase letters.
+%
+% So if an user of the \packagename{listings} package wants to use these
+% preferences, she/he can say for example when using Python
+% \begin{quote}
+% |\input{listings-python.prf}|
+% \end{quote}
+% at the end of her/his |listings.cfg| configuration file as long as the
+% file |listings-python.prf| resides in the \TeX{} search path. Of course
+% that file can be changed according to the user's preferences.
+%
+% At the moment there are two such preferences files:
+% \begin{enumerate}
+% \item |listings-lua.prf|
+% \item |listings-python.prf|
+% \end{enumerate}
+% All contributors are invited to supply more personal preferences.
+%
+%
% \subsection{Special characters}\label{uSpecialCharacters}
%
%
@@ -5645,8 +5672,8 @@
% \paragraph{Identification}
% All files will have same date and version.
% \begin{macrocode}
-\def\filedate{2013/08/05}
-\def\fileversion{1.5a}
+\def\filedate{2013/08/26}
+\def\fileversion{1.5b}
% \end{macrocode}
% What we need and who we are.
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx b/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx
index 77784847eb9..1c790c52ea8 100644
--- a/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx
+++ b/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx
@@ -1,6 +1,6 @@
% \iffalse
%
-% $Id: lstdrvrs.dtx 64 2013-08-03 10:00:54Z j_hoffmann $
+% $Id: lstdrvrs.dtx 85 2013-08-26 19:53:54Z j_hoffmann $
%
%<*driver>
\documentclass{ltxdoc}
@@ -32,7 +32,7 @@
%
% \title{Language, Style and Format drivers\\ for \textsf{Listings}\\ {\large by Carsten Heinz and individual authors:}}
% \author{\InputIfFileExists{lstdrvrs.tmp}{}{}}
-% \date{2013/08/05\enspace\enspace Version 1.5a\ \box\abstractbox}
+% \date{2013/08/26\enspace\enspace Version 1.5b\ \box\abstractbox}
%
% \hypersetup{pdfsubject=Language definitions,pdfauthor=Jobst Hoffmann
% <j.hoffmann-(at)-fh-aachen.de>}
@@ -99,6 +99,11 @@
\file{lstlang3.sty}{\from{lstdrvrs.dtx}{lang3}}
}
+\generate{
+ \file{listings-lua.prf}{\from{lstdrvrs.dtx}{lua-prf}}
+ \file{listings-python.prf}{\from{lstdrvrs.dtx}{python-prf}}
+}
+
\ifToplevel{
\Msg{*}
@@ -121,7 +126,7 @@
% \endgroup
% We mainly define default dialects.
% \begin{macrocode}
-\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,
@@ -162,7 +167,9 @@
%<+lang1>\ProvidesFile{lstlang1.sty}
%<+lang2>\ProvidesFile{lstlang2.sty}
%<+lang3>\ProvidesFile{lstlang3.sty}
-%<-config> [2013/08/05 1.5a listings language file]
+%<+lua-prf>\ProvidesFile{listings-lua.prf}
+%<+python-prf>\ProvidesFile{listings-python.prf}
+%<-config> [2013/08/26 1.5b listings language file]
% \end{macrocode}
%
%
@@ -2959,6 +2966,31 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
% \end{macrocode}
% \endgroup
%
+% \begingroup
+% Stephan Hennig also supplied a definition of a style for printing Lua code:
+% \begin{macrocode}
+%<*lua-prf>
+% \end{macrocode}
+% \begin{macrocode}
+\usepackage[rgb, x11names]{xcolor}
+\lstdefinestyle{Lua}{%
+ language=[5.2]Lua,
+ basicstyle=\ttfamily,
+ columns=spaceflexible,
+ keywordstyle=\bfseries\color{Blue4},% language keywords
+ keywordstyle=[2]\bfseries\color{RoyalBlue3},% std. library identifiers
+ keywordstyle=[3]\bfseries\color{Purple3},% labels
+ stringstyle=\bfseries\color{Coral4},% strings
+ commentstyle=\itshape\color{Green4},% comments
+}
+% \end{macrocode}
+% This code is provided in the file |listings-lua.prf|, see section
+% 2.4.1 (Preferences) of the \packagename{listings} documentation.
+% \begin{macrocode}
+%</lua-prf>
+% \end{macrocode}
+% \endgroup
+%
%
% \subsection{Make}
%
@@ -5384,6 +5416,10 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
% \lstthanks{Stephen Kelly}{-}{2007/01/14} reported some problems that indicated
% that the comment definitions needed to be moved after the string definitions
% to work correctly.
+%
+% In August 2013
+% \lstthanks{Alexis~Dimitriadis}{A.Dimitriadis@uu.nl}{2013/08/15} reworked
+% the definition by supplying the builtins.
% \begingroup
% \begin{macrocode}
%<*lang1>
@@ -5391,17 +5427,48 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
% \begin{macrocode}
%%
%% 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},%
+% \end{macrocode}
+% Python has a long list of builtin-in functions
+% (\url{http://docs.python.org/2/library/functions.html}) and it is a good
+% idea to make them visible in printed code
+% \begin{macrocode}
+ % 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
+% \end{macrocode}
+% According to PEP (Python Enhancement Proposals) comment should be
+% distinguished from documentation strings, so we define
+% \begin{macrocode}
+ morestring=[s]{'''}{'''},% used for documentation text (mulitiline strings)
+ morestring=[s]{"""}{"""},% added by Philipp Matthias Hahn
+% \end{macrocode}
+% Python now supports so called \emph{raw strings} and also Unicode
+% strings. Here is the definition of these strings:
+% \begin{macrocode}
+ 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"""}{"""}%
}%
% \end{macrocode}
% \lsthelper{Philipp Matthias Hahn}{pmhahn@titan.lahn.de}{2002/04/18}{}
@@ -5417,6 +5484,54 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
% \endgroup
%
%
+% \begingroup
+% Alexis Dimitriadis also proposes the following configuration for printing
+% Python code which simulates colorizing the code as it's done by the IDLE
+% GUI:
+% \begin{macrocode}
+%<*python-prf>
+% \end{macrocode}
+% \begin{macrocode}
+\usepackage{xcolor}
+\usepackage{textcomp}
+
+%% Actual colors from idlelib/config-highlight.def --> corrected to ``web-safe''
+%% strings = #00aa00 / 0,170,0 (a darker green)
+%% builtins = #900090 / 144,0,144 (purple-ish)
+%% keywords = #FF7700 / 255,119,0 (quite close to plain `orange')
+%\definecolor{IDLEorange}{RGB}{255,119,0} % pretty close to real orange
+%\definecolor{IDLEpurple}{RGB}{144,0,144}
+%\definecolor{IDLEgreen}{RGB}{0,170,0}
+%\definecolor{IDLEred}{RGB}{221,0,0}
+%% Corrected to ``web-safe''
+%\definecolor{orange2}{RGB}{255,102,0}
+\definecolor{purple2}{RGB}{153,0,153} % there's actually no standard purple
+\definecolor{green2}{RGB}{0,153,0} % a darker green
+%\definecolor{red2}{RGB}{221,0,0}
+
+% Except for green and purple, the other colors are pretty good in standard
+% hue
+\lstdefinestyle{python-idle-code}{%
+ language=Python, % the language
+ basicstyle=\normalsize\ttfamily, % size of the fonts for the code
+ % Color settings to match IDLE style
+ keywordstyle=\color{orange}, % core keywords
+ keywordstyle={[2]\color{purple2}}, % built-ins
+ stringstyle=\color{green2},
+ commentstyle=\color{red},
+ upquote=true, % requires textcomp
+}
+% Unimplemented IDLE syntax: function/class names being defined should be
+% blue
+% \end{macrocode}
+% This code is provided in the file |listings-python.prf|, see section
+% 2.4.1 (Preferences) of the \packagename{listings} documentation.
+% \begin{macrocode}
+%</python-prf>
+% \end{macrocode}
+% \endgroup
+%
+%
% \subsection{Rexx}
%
% \lstthanks{Patrick~TJ~McPhee}{ptjm@interlog.com}{2003/10/24} provided this
diff --git a/Master/texmf-dist/source/latex/listings/lstdrvrs.ins b/Master/texmf-dist/source/latex/listings/lstdrvrs.ins
index 77c185a953a..993ab30b8bd 100644
--- a/Master/texmf-dist/source/latex/listings/lstdrvrs.ins
+++ b/Master/texmf-dist/source/latex/listings/lstdrvrs.ins
@@ -37,6 +37,11 @@
\file{lstlang3.sty}{\from{lstdrvrs.dtx}{lang3}}
}
+\generate{
+ \file{listings-lua.prf}{\from{lstdrvrs.dtx}{lua-prf}}
+ \file{listings-python.prf}{\from{lstdrvrs.dtx}{python-prf}}
+}
+
\ifToplevel{
\Msg{*}
\Msg{* You probably need to move all created `.sty' and `.cfg'}
@@ -47,7 +52,7 @@
}
\endbatchfile
- [2013/08/05 1.5a listings language file]
+ [2013/08/26 1.5b listings language file]
\endinput
%%
%% End of file `lstdrvrs.ins'.
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