listings (11jul13)

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

7 files changed, 140 insertions, 13 deletions

diff --git a/Master/texmf-dist/tex/latex/listings/listings.cfg b/Master/texmf-dist/tex/latex/listings/listings.cfg
index 7302e149c5b..d6198171e82 100644
--- a/Master/texmf-dist/tex/latex/listings/listings.cfg
+++ b/Master/texmf-dist/tex/latex/listings/listings.cfg
@@ -20,7 +20,7 @@
 %% Send comments and ideas on the package, error reports and additional
 %% programming languages to Brooks Moses at <bmoses@dpdx.net>.
 %%
-\ProvidesFile{listings.cfg}[2007/02/22 1.4 listings configuration]
+\ProvidesFile{listings.cfg}[2013/06/27 1.5pre1 listings configuration]
 \def\lstlanguagefiles
     {lstlang0.sty,lstlang1.sty,lstlang2.sty,lstlang3.sty}
 \lstset{defaultdialect=[R/3 6.10]ABAP,
@@ -30,7 +30,7 @@
         defaultdialect=[ANSI]C,
         defaultdialect=[light]Caml,
         defaultdialect=[1985]Cobol,
-defaultdialect=[WinXP]command.com,
+        defaultdialect=[WinXP]command.com,
         defaultdialect=[ISO]C++,
         defaultdialect=[95]Fortran,
         defaultdialect=[5.2]Mathematica,
diff --git a/Master/texmf-dist/tex/latex/listings/listings.sty b/Master/texmf-dist/tex/latex/listings/listings.sty
index 08c19ceb959..602063c2be1 100644
--- a/Master/texmf-dist/tex/latex/listings/listings.sty
+++ b/Master/texmf-dist/tex/latex/listings/listings.sty
@@ -15,8 +15,8 @@
 %% Send comments and ideas on the package, error reports and additional
 %% programming languages to <bmoses@dpdx.net>.
 %%
-\def\filedate{2007/02/22}
-\def\fileversion{1.4}
+\def\filedate{2013/07/10}
+\def\fileversion{1.5}
 \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 d97513f5991..7be04f51fb9 100644
--- a/Master/texmf-dist/tex/latex/listings/lstdoc.sty
+++ b/Master/texmf-dist/tex/latex/listings/lstdoc.sty
@@ -15,8 +15,8 @@
 %% Send comments and ideas on the package, error reports and additional
 %% programming languages to <bmoses@dpdx.net>.
 %%
-\def\filedate{2007/02/22}
-\def\fileversion{1.4}
+\def\filedate{2013/07/10}
+\def\fileversion{1.5}
 \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 40c3f371689..47bbb5ea572 100644
--- a/Master/texmf-dist/tex/latex/listings/lstlang1.sty
+++ b/Master/texmf-dist/tex/latex/listings/lstlang1.sty
@@ -21,7 +21,7 @@
 %% programming languages to Brooks Moses at <bmoses@dpdx.net>.
 %%
 \ProvidesFile{lstlang1.sty}
-    [2004/09/05 1.3 listings language file]
+    [2013/06/27 1.5pre1 listings language file]
 %%
 %% ACSL definition (c) 2000 by Andreas Matthias
 %%
@@ -305,6 +305,15 @@
    morecomment=[l]\#,%
    morestring=[d]"%
   }[keywords,comments,strings]%
+\lst@definelanguage[08]{Fortran}[03]{Fortran}{%
+  morekeywords={ALL, BLOCK, CODIMENSION, CONCURRENT, CONTIGUOUS, CRITICAL,%
+    ERROR, LOCK, SUBMODULE, SYNC, UNLOCK}%
+}%
+\lst@definelanguage[03]{Fortran}[95]{Fortran}{%
+  morekeywords={ABSTRACT, ASSOCIATE, ASYNCHRONOUS, BIND, CLASS, DEFERRED,%
+    ENUM, ENUMERATOR, EXTENDS, FINAL, FLUSH, GENERIC, IMPORT,%
+    NON_OVERRIDABLE, NOPASS, PASS, PROTECTED, VALUE, VOLATILE, WAIT}%
+}%
 \lst@definelanguage[90]{Fortran}[95]{Fortran}{}
 \lst@definelanguage[95]{Fortran}[77]{Fortran}%
   {deletekeywords=SAVE,%
@@ -316,7 +325,8 @@
       TARGET,USE,WHERE,WHILE,BLOCKDATA,DOUBLEPRECISION,%
       ENDBLOCKDATA,ENDFILE,ENDFUNCTION,ENDINTERFACE,%
       ENDMODULE,ENDPROGRAM,ENDSELECT,ENDSUBROUTINE,ENDTYPE,ENDWHERE,%
-      INOUT,SELECTCASE},%
+      INOUT,SELECTCASE,%
+      ELEMENTAL, ELSEWHERE, FORALL, PURE},%
    deletecomment=[f],% no fixed comment line: 1998 Magne Rudshaug
    morecomment=[l]!%
   }%
diff --git a/Master/texmf-dist/tex/latex/listings/lstlang2.sty b/Master/texmf-dist/tex/latex/listings/lstlang2.sty
index aea935ae1df..ab296a3e372 100644
--- a/Master/texmf-dist/tex/latex/listings/lstlang2.sty
+++ b/Master/texmf-dist/tex/latex/listings/lstlang2.sty
@@ -21,7 +21,7 @@
 %% programming languages to Brooks Moses at <bmoses@dpdx.net>.
 %%
 \ProvidesFile{lstlang2.sty}
-    [2004/09/05 1.3 listings language file]
+    [2013/06/27 1.5pre1 listings language file]
 %%
 %% Abap definition by Knut Lickert
 %%
@@ -423,7 +423,7 @@
                 static,supporter,switchable,talkable,transparent,visited,%
                 workflag,worn},%
     %
-    % Libary properties
+    % Library properties
     morekeywords=[5]{n_to,s_to,e_to,w_to,ne_to,nw_to,se_to,sw_to,in_to,%
                 out_to,u_to,d_to,add_to_scope,after,article,articles,before,%
                 cant_go,capacity,daemon,describe,description,door_dir,door_to,%
@@ -619,6 +619,123 @@
    morestring=[b]"%
   }[keywords,comments,strings]%
 %%
+%% Lua definitions (c) 2013 Stephan Hennig
+%%
+\lst@definelanguage[5.0]{Lua}{%
+  alsoletter={.},%
+  morekeywords=[1]{%
+    and, break, do, else, elseif, end, false, for, function, if, in,%
+    local, nil, not, or, repeat, return, then, true, until, while,%
+  },%
+  morekeywords=[2]{%
+    _G, _LOADED, _REQUIREDNAME, _VERSION, LUA_PATH,%
+    assert, collectgarbage, dofile, error, gcinfo, getfenv,%
+    getmetatable, ipairs, loadfile, loadlib, loadstring, newproxy,%
+    next, pairs, pcall, print, rawequal, rawget, rawset, require,%
+    setfenv, setmetatable, tonumber, tostring, type, unpack, xpcall,%
+    coroutine, coroutine.create, coroutine.resume,%
+    coroutine.status, coroutine.wrap, coroutine.yield,%
+    _TRACEBACK, debug, debug.debug, debug.gethook, debug.getinfo,%
+    debug.getlocal, debug.getupvalue, debug.sethook, debug.setlocal,%
+    debug.setupvalue,debug.traceback,%
+    io, io.close, io.flush, io.input, io.lines, io.open, io.output,%
+    io.popen, io.read, io.stderr, io.stdin, io.stdout, io.tmpfile,%
+    io.type, io.write,%
+    __pow, math, math.abs, math.acos, math.asin, math.atan, math.atan2,%
+    math.ceil, math.cos, math.deg, math.exp, math.floor, math.frexp,%
+    math.ldexp, math.log, math.log10, math.max, math.min, math.mod,%
+    math.pi, math.pow, math.rad, math.random, math.randomseed, math.sin,%
+    math.sqrt, math.tan,%
+    os, os.clock, os.date, os.difftime, os.execute, os.exit, os.getenv,%
+    os.remove, os.rename, os.setlocale, os.time, os.tmpname,%
+    string, string.byte, string.char, string.dump, string.find,%
+    string.format, string.gfind, string.gsub, string.len, string.lower,%
+    string.rep, string.sub, string.upper,%
+    table, table.concat, table.foreach, table.foreachi, table.getn,%
+    table.insert, table.remove, table.setn, table.sort,%
+  },%
+  morekeywords=[2]{%
+    _PROMPT, _PROMPT2, arg,%
+  },%
+  sensitive=true,%
+  % single line comments
+  morecomment=[l]{--},%
+  % multi line comments
+  morecomment=[s]{--[[}{]]},%
+  % backslash escaped strings
+  morestring=[b]",%
+  morestring=[b]',%
+  % multi line strings
+  morestring=[s]{[[}{]]},%
+}[keywords,comments,strings]%
+\lst@definelanguage[5.1]{Lua}[5.0]{Lua}{%
+  deletekeywords=[2]{%
+    _LOADED, _REQUIREDNAME, LUA_PATH, gcinfo, loadlib,%
+    _TRACEBACK,%
+    __pow, math.mod,%
+    string.gfind,%
+    table.foreach, table.foreachi, table.getn, table.setn,%
+  },%
+  morekeywords=[2]{%
+    load, select,%
+    coroutine.running,%
+    debug.getfenv, debug.getmetatable, debug.getregistry, debug.setfenv,%
+    debug.setmetatable,%
+    math.cosh, math.fmod, math.huge, math.modf, math.sinh, math.tanh,%
+    module, package, package.config, package.cpath, package.loaded,%
+    package.loaders, package.loadlib, package.path, package.preload,%
+    package.seeall,%
+    string.gmatch, string.match, string.reverse,%
+    table.maxn,%
+  },%
+  morecomment=[s]{--[=[}{]=]},%
+  morecomment=[s]{--[==[}{]==]},%
+  morecomment=[s]{--[===[}{]===]},%
+  morecomment=[s]{--[====[}{]====]},%
+  morecomment=[s]{--[=====[}{]=====]},%
+  morecomment=[s]{--[======[}{]======]},%
+  morecomment=[s]{--[=======[}{]=======]},%
+  morecomment=[s]{--[========[}{]========]},%
+  morecomment=[s]{--[=========[}{]=========]},%
+  morecomment=[s]{--[==========[}{]==========]},%
+  morestring=[s]{[=[}{]=]},%
+  morestring=[s]{[==[}{]==]},%
+  morestring=[s]{[===[}{]===]},%
+  morestring=[s]{[====[}{]====]},%
+  morestring=[s]{[=====[}{]=====]},%
+  morestring=[s]{[======[}{]======]},%
+  morestring=[s]{[=======[}{]=======]},%
+  morestring=[s]{[========[}{]========]},%
+  morestring=[s]{[=========[}{]=========]},%
+  morestring=[s]{[==========[}{]==========]},%
+}[keywords,comments,strings]%
+\lst@definelanguage[5.2]{Lua}[5.1]{Lua}{%
+  morekeywords=[1]{%
+    goto,%
+  },%
+  deletekeywords=[2]{%
+    getfenv, loadstring, module, newproxy, setfenv, unpack,%
+    debug.getfenv, debug.setfenv,%
+    math.log10,%
+    package.loaders, package.seeall,%
+    table.maxn,%
+  },%
+  morekeywords=[2]{%
+    rawlen,%
+    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,%
+    debug.getuservalue, debug.setuservalue, debug.upvalueid,%
+    debug.upvaluejoin,%
+    package.searchers, package.searchpath,%
+    table.pack, table.unpack,%
+  },%
+  morekeywords=[2]{%
+    _ENV,%
+  },%
+  moredelim=[s][keywordstyle3]{::}{::},%
+}[keywords,comments,strings]%
+%%
 %% Make definitions (c) 2000 Rolf Niepraschk
 %%
 \lst@definelanguage[gnu]{make}%
diff --git a/Master/texmf-dist/tex/latex/listings/lstlang3.sty b/Master/texmf-dist/tex/latex/listings/lstlang3.sty
index 726bfa51d1f..a94bae47021 100644
--- a/Master/texmf-dist/tex/latex/listings/lstlang3.sty
+++ b/Master/texmf-dist/tex/latex/listings/lstlang3.sty
@@ -21,7 +21,7 @@
 %% programming languages to Brooks Moses at <bmoses@dpdx.net>.
 %%
 \ProvidesFile{lstlang3.sty}
-    [2004/09/05 1.3 listings language file]
+    [2013/06/27 1.5pre1 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 d76fd44e845..0b8e55d65d4 100644
--- a/Master/texmf-dist/tex/latex/listings/lstmisc.sty
+++ b/Master/texmf-dist/tex/latex/listings/lstmisc.sty
@@ -15,8 +15,8 @@
 %% Send comments and ideas on the package, error reports and additional
 %% programming languages to <bmoses@dpdx.net>.
 %%
-\def\filedate{2007/02/22}
-\def\fileversion{1.4}
+\def\filedate{2013/07/10}
+\def\fileversion{1.5}
 \ProvidesFile{lstmisc.sty}
              [\filedate\space\fileversion\space(Carsten Heinz)]
 \lst@CheckVersion\fileversion