summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/listings/README5
-rw-r--r--Master/texmf-dist/doc/latex/listings/listings.pdfbin715954 -> 715489 bytes
-rw-r--r--Master/texmf-dist/source/latex/listings/Makefile37
-rw-r--r--Master/texmf-dist/source/latex/listings/listings.dtx86
-rw-r--r--Master/texmf-dist/source/latex/listings/listings.ins2
-rw-r--r--Master/texmf-dist/source/latex/listings/lstdrvrs.dtx332
-rw-r--r--Master/texmf-dist/source/latex/listings/lstdrvrs.ins2
-rw-r--r--Master/texmf-dist/tex/latex/listings/listings.cfg4
-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.sty14
-rw-r--r--Master/texmf-dist/tex/latex/listings/lstlang2.sty121
-rw-r--r--Master/texmf-dist/tex/latex/listings/lstlang3.sty2
-rw-r--r--Master/texmf-dist/tex/latex/listings/lstmisc.sty4
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
15 files changed, 507 insertions, 111 deletions
diff --git a/Master/texmf-dist/doc/latex/listings/README b/Master/texmf-dist/doc/latex/listings/README
index c1a436a171e..e2c25d3d04d 100644
--- a/Master/texmf-dist/doc/latex/listings/README
+++ b/Master/texmf-dist/doc/latex/listings/README
@@ -1,7 +1,12 @@
Listings package
+
Copyright 1996--2004 Carsten Heinz (the package)
Copyright 1996--2007 individual authors (language drivers)
Copyright 2006--2007 Brooks Moses (continued maintenance)
+Copyright 2013-- Jobst Hoffmann (continued maintenance)
+
+$Id: README 38 2013-06-16 19:03:21Z j_hoffmann $
+
Released under the LaTeX Project Public License 1.3 or later
The `listings' package is a source code printer for LaTeX.
diff --git a/Master/texmf-dist/doc/latex/listings/listings.pdf b/Master/texmf-dist/doc/latex/listings/listings.pdf
index bf55efbe514..cc433d0f91c 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/source/latex/listings/Makefile b/Master/texmf-dist/source/latex/listings/Makefile
deleted file mode 100644
index 9ecf8b6f552..00000000000
--- a/Master/texmf-dist/source/latex/listings/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file generates files required to use the listings package.
-#
-# (c) 2007 Brooks Moses
-#
-# 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.
-
-.PHONY: listings pdf pdf-devel all
-
-listings: listings.sty
-
-pdf: listings.pdf
-
-pdf-devel: listings-devel.pdf
-
-all: listings pdf pdf-devel
-
-
-listings.sty: listings.dtx listings.ins lstdrvrs.dtx
- tex listings.ins
-
-listings.pdf: listings.sty
- rm -f ltxdoc.cfg
- pdflatex listings.dtx
- makeindex -s gind.ist listings
- pdflatex listings.dtx
- pdflatex listings.dtx
-
-listings-devel.pdf: listings.sty
- rm -rf ltxdoc.cfg
- echo "\AtBeginDocument{\AlsoImplementation}" > ltxdoc.cfg
- pdflatex -jobname=listings-devel listings.dtx
- makeindex -s gind.ist listings-devel
- pdflatex -jobname=listings-devel listings.dtx
- pdflatex -jobname=listings-devel listings.dtx
- rm -rf ltxdoc.cfg
diff --git a/Master/texmf-dist/source/latex/listings/listings.dtx b/Master/texmf-dist/source/latex/listings/listings.dtx
index 1b4baeb34a1..18cc69e9567 100644
--- a/Master/texmf-dist/source/latex/listings/listings.dtx
+++ b/Master/texmf-dist/source/latex/listings/listings.dtx
@@ -16,7 +16,7 @@
% The listings package is copyright 1996--2004 Carsten Heinz, and
% continued maintenance on the package is copyright 2006--2007 Brooks Moses.
% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004/2006/
-% 2007 any individual author listed in the driver files.
+% 2007/2013 any individual author listed in the driver files.
%
% The listings package and its drivers may be distributed and/or modified
% under the conditions of the LaTeX Project Public License, either version
@@ -28,7 +28,9 @@
%
% The package has the LPPL maintenance status "maintained".
%
-% The Current Maintainer is Brooks Moses <bmoses@dpdx.net>.
+% $Id: listings.dtx 40 2013-06-27 04:38:00Z j_hoffmann $
+%
+% The Current Maintainer is Jobst Hoffmann <j.hoffmann-(at)-fh-aachen.de>.
%
% end of software license
%
@@ -106,14 +108,15 @@
% \title{\vspace*{-2\baselineskip}The \textsf{Listings} Package}
% \author{Copyright 1996--2004, Carsten Heinz%
% \\ Copyright 2006--2007, Brooks Moses
-% \\ Maintainer: Brooks Moses\thanks{Brooks %
-% Moses became the maintainer of the \packagename{listings}
-% package in 2006; see the Preface for details.}~ %
+% \\ Copyright 2013--, Jobst Hoffmann
+% \\ Maintainer: Jobst Hoffmann\thanks{Jobst %
+% Hoffmann became the maintainer of the \packagename{listings}
+% package in 2013; see the Preface for details.}~ %
% \textless\lstemail\textgreater}
-% \date{2007/02/22\enspace\enspace Version 1.4\\ \box\abstractbox}
-% \def\lstemail{\href{mailto:bmoses@dpdx.net}{\texttt{bmoses@dpdx.net}}}
+% \date{2013/07/10\enspace\enspace Version 1.5\ \box\abstractbox}
+% \def\lstemail{\href{mailto:j.hoffmann@fh-aachen.de}{\texttt{j.hoffmann-(at)-fh-aachen.de}}}
% \ifhyper
-% \hypersetup{pdfsubject=Package guide,pdfauthor=Brooks Moses <bmoses@dpdx.net>}
+% \hypersetup{pdfsubject=Package guide,pdfauthor=Jobst Hoffmann <j.hoffmann-(at)-fh-aachen.de>}
% \fi
%
% \csname @twocolumntrue\endcsname
@@ -131,53 +134,21 @@
% attempts to reach him had failed, Hendri Adriaens took over maintenance of
% the package in accordance with the LPPL's procedure for abandoned packages.
% He then passed the maintainership of the package to Brooks Moses, who had
-% volunteered for the position while this procedure was going through.
+% volunteered for the position while this procedure was going through. The
+% result is known as listings version 1.4.
+%
+% This release, version 1.5, is a minor maintenance release since
+% I accepted maintainership of the package. I would like to thank Stephan
+% Hennig who supported the Lua language definitions. He is the one who
+% asked for the integration of a new language and gave the impetus to me to
+% become the maintainer of this package.
%
-% This release, version 1.4, is the first substantial bugfix release since
-% I accepted maintainership of the package. I would like to thank the
-% numerous people who reported bugs to me, and particularly those who
-% suggested fixes. Thanks in addition to those who provided
-% new language definitions and suggestions for improvements.
%
% \paragraph{News and changes}
-% Version 1.4 is the fourth bugfix release. There are no substantial changes
-% in this version, but a number of minor changes and fixes. The primary news
-% is that the documentation has been substantially copyedited, and improved
-% in a number of ways to document workarounds and things learned from the
-% recent bug reports.
-%
-% A |numberbychapter| key has been added, to control whether listings are
-% numbered sequentially or by chapter in document classes that provide
-% chapters.
-%
-% The |\lstMakeShortInline| command can be used to define single-character
-% inline-listing macros, much like the \packagename{shortvrb} package
-% allows for verbatim inline text.
-%
-% A new |spaceflexible| column alignment style has been added, which is
-% similar to the |flexible| style except that it only inserts extra space
-% to recover the column alignment at locations where there is already
-% existing space.
-%
-% A |s| string type has been added, akin to the |s| comment type. This is
-% used in the Ruby language definition.
-%
-% The |\lst@for| routine has been sped up substantially, thanks to some code
-% provided by Hendri Adriaens. Hopefully this will result in a significant
-% speedup of the runtime of the overall package.
-%
-% Among the bugs fixed are the |*| option to |texcs|, which was quite badly
-% broken; the interaction of background colors with inline listings and with
-% frames; listing captions being broken in AMS document classes; and better
-% integration of the list of listings with KOMAscript document class and other
-% document clases that use the |\float@addtolists| mechanism.
-%
-% The following languages were added: |command.com| (DOS/Windows) batch files,
-% Common Intermediate Language, Lingo, Postscript, PSTricks, and SPARQL.
-% The following dialects of existing languages were added: Ada (2005),
-% Assembler (Motorola68k), and Mathematica (5.2). The definitions for ABAP,
-% Fortran, Octave, Python, Ruby, and TCL have been improved. Thanks go to the
-% contributers.
+% Version 1.5 is the fifth bugfix release. There are no changes
+% in this version, but two extensions: support of modern Fortran (2003,
+% 2008) and Lua.
+%
%
% \vfill
% \paragraph{Thanks}
@@ -4117,6 +4088,13 @@
% \texttt{listings.dtx}. This creates the whole documentation including User's
% guide, Reference guide, Developer's guide, and Implementation.
%
+% If you can run the (GNU) make program, executing the command
+% \begin{verbatim}
+% make all\end{verbatim}
+% or
+% \begin{verbatim}
+% make listings-devel\end{verbatim}
+% gives the same result---it is called \texttt{listings-devel.pdf}.
%
% \makeatletter
%^^A \def\index@prologue{\section*{Index}\markboth{Index}{Index}}
@@ -5657,8 +5635,8 @@
% \paragraph{Identification}
% All files will have same date and version.
% \begin{macrocode}
-\def\filedate{2007/02/22}
-\def\fileversion{1.4}
+\def\filedate{2013/07/10}
+\def\fileversion{1.5}
% \end{macrocode}
% What we need and who we are.
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/listings/listings.ins b/Master/texmf-dist/source/latex/listings/listings.ins
index 6b1805f229c..a891addd72a 100644
--- a/Master/texmf-dist/source/latex/listings/listings.ins
+++ b/Master/texmf-dist/source/latex/listings/listings.ins
@@ -7,6 +7,8 @@
%%
%% (w)(c) 1996--1999,2002--2004 Carsten Heinz
%%
+%% $Id: listings.ins 25 2013-06-05 08:04:03Z j_hoffmann $
+%%
%% 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.
diff --git a/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx b/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx
index e33c20de561..7693613079a 100644
--- a/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx
+++ b/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx
@@ -1,7 +1,10 @@
% \iffalse
%
+% $Id: lstdrvrs.dtx 43 2013-06-27 15:26:50Z j_hoffmann $
+%
%<*driver>
\documentclass{ltxdoc}
+\usepackage{url}
\EnableCrossrefs
\CodelineIndex
\begin{document}
@@ -20,7 +23,7 @@
% \DoNotIndex{\undefined}
%
%
-% \title{Language, Style and Format drivers\\ for \textsf{Listings 1.3}\\ {\large by Carsten Heinz and individual authors:}}
+% \title{Language, Style and Format drivers\\ for \textsf{Listings 1.5pre1}\\ {\large by Carsten Heinz and individual authors:}}
% \author{\InputIfFileExists{lstdrvrs.tmp}{}{}}
% \date{}
%
@@ -97,7 +100,7 @@
% \endgroup
% We mainly define default dialects.
% \begin{macrocode}
-\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,
@@ -107,7 +110,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,
@@ -138,7 +141,7 @@
%<+lang1>\ProvidesFile{lstlang1.sty}
%<+lang2>\ProvidesFile{lstlang2.sty}
%<+lang3>\ProvidesFile{lstlang3.sty}
-%<-config> [2004/09/05 1.3 listings language file]
+%<-config> [2013/06/27 1.5pre1 listings language file]
% \end{macrocode}
%
%
@@ -1479,10 +1482,31 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
% Mannheim; Leipzig; Wien; Z\"urich: BI-Wiss.-Verlag, 1994;
% ISBN 3-411-16861-7.
% \end{itemize}
+% Another source for Fortran keywords is
+% \url{http://fortranwiki.org/fortran/show/Keywords} where the keywords for
+% Fortran 2003 and 2008 are taken from.
% \begingroup
% \begin{macrocode}
%<*lang1>
% \end{macrocode}
+% The current version of Fortran (Fortran 2008) is defined in ...
+% It contains four keywords consisting of two words: |ERROR STOP|, ^^A
+% |SYNC ALL|, |SYNC IMAGES|, |SYNC MEMORY|, so the lists contains the
+% single parts |ALL|, |IMAGES|, |MEMORY|, and |SYNC|
+% \begin{macrocode}
+\lst@definelanguage[08]{Fortran}[03]{Fortran}{%
+ morekeywords={ALL, BLOCK, CODIMENSION, CONCURRENT, CONTIGUOUS, CRITICAL,%
+ ERROR, LOCK, SUBMODULE, SYNC, UNLOCK}%
+}%
+% \end{macrocode}
+% Fortran 2003 introduces the following keywords:
+% \begin{macrocode}
+\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}%
+}%
+% \end{macrocode}
% \lsthelper{Denis Girou}{Denis.Girou@idris.fr}{1998/07/26}{Fortran 95=90}
% proposed to have Fortran 95 and Fortran 90 to be equivalent.
% \begin{macrocode}
@@ -1503,7 +1527,14 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
TARGET,USE,WHERE,WHILE,BLOCKDATA,DOUBLEPRECISION,%
ENDBLOCKDATA,ENDFILE,ENDFUNCTION,ENDINTERFACE,%
ENDMODULE,ENDPROGRAM,ENDSELECT,ENDSUBROUTINE,ENDTYPE,ENDWHERE,%
- INOUT,SELECTCASE},%
+ INOUT,SELECTCASE,%
+% \end{macrocode}
+% Theses keys were missing from the 1.4 version of listings:
+% \begin{macrocode}
+ ELEMENTAL, ELSEWHERE, FORALL, PURE},%
+% \end{macrocode}
+% and here are the final settings for Fortran
+% \begin{macrocode}
deletecomment=[f],% no fixed comment line: 1998 Magne Rudshaug
morecomment=[l]!%
}%
@@ -1837,7 +1868,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
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,%
@@ -2472,6 +2503,295 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},%
% \endgroup
%
%
+% \subsection{Lua}
+%
+% \lstthanks{Stephan Hennig}{sh2d@arcor.de}{2013/06/14} contributed the Lua
+% keywords.
+% \begingroup
+% \begin{macrocode}
+%<*lang2>
+% \end{macrocode}
+% We begin with the keywords for Lua 5.0:
+% \begin{macrocode}
+%%
+%% Lua definitions (c) 2013 Stephan Hennig
+%%
+\lst@definelanguage[5.0]{Lua}{%
+% \end{macrocode}
+% To enable highlighting of library keywords, the dot needs to be a
+% letter.
+% \begin{macrocode}
+ alsoletter={.},%
+% \end{macrocode}
+% The language definition knows
+% \begin{itemize}
+% \item language keywords
+% \begin{macrocode}
+ morekeywords=[1]{%
+ and, break, do, else, elseif, end, false, for, function, if, in,%
+ local, nil, not, or, repeat, return, then, true, until, while,%
+ },%
+% \end{macrocode}
+% \item the standard library identifiers
+% \begin{macrocode}
+ morekeywords=[2]{%
+% \end{macrocode}
+% \begin{itemize}
+% \item coming from the base library
+% \begin{macrocode}
+ _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,%
+% \end{macrocode}
+% \item coming from the coroutine library
+% \begin{macrocode}
+ coroutine, coroutine.create, coroutine.resume,%
+ coroutine.status, coroutine.wrap, coroutine.yield,%
+% \end{macrocode}
+% \item the debug library
+% \begin{macrocode}
+ _TRACEBACK, debug, debug.debug, debug.gethook, debug.getinfo,%
+ debug.getlocal, debug.getupvalue, debug.sethook, debug.setlocal,%
+ debug.setupvalue,debug.traceback,%
+% \end{macrocode}
+% \item the io library
+% \begin{macrocode}
+ 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,%
+% \end{macrocode}
+% \item the mathematical library
+% \begin{macrocode}
+ __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,%
+% \end{macrocode}
+% \item the os library
+% \begin{macrocode}
+ os, os.clock, os.date, os.difftime, os.execute, os.exit, os.getenv,%
+ os.remove, os.rename, os.setlocale, os.time, os.tmpname,%
+% \end{macrocode}
+% \item the string library
+% \begin{macrocode}
+ 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,%
+% \end{macrocode}
+% \item the table library
+% \begin{macrocode}
+ table, table.concat, table.foreach, table.foreachi, table.getn,%
+ table.insert, table.remove, table.setn, table.sort,%
+ },%
+% \end{macrocode}
+% \end{itemize}
+% and some additional identifiers
+% \begin{macrocode}
+ morekeywords=[2]{%
+ _PROMPT, _PROMPT2, arg,%
+ },%
+% \end{macrocode}
+% These are the common language settings
+% \begin{macrocode}
+ 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]%
+% \end{macrocode}
+% And here are the new definitions for Lua 5.1:
+% \begin{macrocode}
+\lst@definelanguage[5.1]{Lua}[5.0]{Lua}{%
+% \end{macrocode}
+% There are some deletions
+% \begin{macrocode}
+ deletekeywords=[2]{%
+% \end{macrocode}
+% concerning
+% \begin{itemize}
+% \item the base library
+% \begin{macrocode}
+ _LOADED, _REQUIREDNAME, LUA_PATH, gcinfo, loadlib,%
+% \end{macrocode}
+% \item the debug library
+% \begin{macrocode}
+ _TRACEBACK,%
+% \end{macrocode}
+% \item the mathematical library
+% \begin{macrocode}
+ __pow, math.mod,%
+% \end{macrocode}
+% \item the string library
+% \begin{macrocode}
+ string.gfind,%
+% \end{macrocode}
+% \item the table library
+% \begin{macrocode}
+ table.foreach, table.foreachi, table.getn, table.setn,%
+ },%
+% \end{macrocode}
+% \end{itemize}
+% and some new identifiers in standard libraries like
+% \begin{macrocode}
+ morekeywords=[2]{%
+% \end{macrocode}
+% \begin{itemize}
+% \item the base library
+% \begin{macrocode}
+ load, select,%
+% \end{macrocode}
+% \item coroutine library
+% \begin{macrocode}
+ coroutine.running,%
+% \end{macrocode}
+% \item debug library
+% \begin{macrocode}
+ debug.getfenv, debug.getmetatable, debug.getregistry, debug.setfenv,%
+ debug.setmetatable,%
+% \end{macrocode}
+% \item the mathematical library
+% \begin{macrocode}
+ math.cosh, math.fmod, math.huge, math.modf, math.sinh, math.tanh,%
+% \end{macrocode}
+% \item the package library which itself is new in Lua 5.1
+% \begin{macrocode}
+ module, package, package.config, package.cpath, package.loaded,%
+ package.loaders, package.loadlib, package.path, package.preload,%
+ package.seeall,%
+% \end{macrocode}
+% \item the string library and
+% \begin{macrocode}
+ string.gmatch, string.match, string.reverse,%
+% \end{macrocode}
+% \item the table library
+% \begin{macrocode}
+ table.maxn,%
+ },%
+% \end{macrocode}
+% \end{itemize}
+% In Lua 5.1 long bracket comments were introduced also
+% \begin{macrocode}
+ morecomment=[s]{--[=[}{]=]},%
+ morecomment=[s]{--[==[}{]==]},%
+ morecomment=[s]{--[===[}{]===]},%
+ morecomment=[s]{--[====[}{]====]},%
+ morecomment=[s]{--[=====[}{]=====]},%
+ morecomment=[s]{--[======[}{]======]},%
+ morecomment=[s]{--[=======[}{]=======]},%
+ morecomment=[s]{--[========[}{]========]},%
+ morecomment=[s]{--[=========[}{]=========]},%
+ morecomment=[s]{--[==========[}{]==========]},%
+% \end{macrocode}
+% as well as long bracket strings
+% \begin{macrocode}
+ morestring=[s]{[=[}{]=]},%
+ morestring=[s]{[==[}{]==]},%
+ morestring=[s]{[===[}{]===]},%
+ morestring=[s]{[====[}{]====]},%
+ morestring=[s]{[=====[}{]=====]},%
+ morestring=[s]{[======[}{]======]},%
+ morestring=[s]{[=======[}{]=======]},%
+ morestring=[s]{[========[}{]========]},%
+ morestring=[s]{[=========[}{]=========]},%
+ morestring=[s]{[==========[}{]==========]},%
+}[keywords,comments,strings]%
+% \end{macrocode}
+% \end{itemize}
+% Lua 5.2 also has some changed features. These are
+% \begin{macrocode}
+\lst@definelanguage[5.2]{Lua}[5.1]{Lua}{%
+% \end{macrocode}
+% \begin{itemize}
+% \item new language keywords
+% \begin{macrocode}
+ morekeywords=[1]{%
+ goto,%
+ },%
+% \end{macrocode}
+% \item deleted identifiers from the standard libraries like
+% \begin{macrocode}
+ deletekeywords=[2]{%
+% \end{macrocode}
+% \begin{itemize}
+% \item the base library
+% \begin{macrocode}
+ getfenv, loadstring, module, newproxy, setfenv, unpack,%
+% \end{macrocode}
+% \item the debug library
+% \begin{macrocode}
+ debug.getfenv, debug.setfenv,%
+% \end{macrocode}
+% \item the mathematical library
+% \begin{macrocode}
+ math.log10,%
+% \end{macrocode}
+% \item the package library and
+% \begin{macrocode}
+ package.loaders, package.seeall,%
+% \end{macrocode}
+% \item the table library
+% \begin{macrocode}
+ table.maxn,%
+ },%
+% \end{macrocode}
+% \end{itemize}
+% Again there are some new identifiers in the standard libraries
+% \begin{macrocode}
+ morekeywords=[2]{%
+% \end{macrocode}
+% like
+% \begin{itemize}
+% \item the base library
+% \begin{macrocode}
+ rawlen,%
+% \end{macrocode}
+% \item the bit library
+% \begin{macrocode}
+ 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,%
+% \end{macrocode}
+% \item the debug library
+% \begin{macrocode}
+ debug.getuservalue, debug.setuservalue, debug.upvalueid,%
+ debug.upvaluejoin,%
+% \end{macrocode}
+% \item the package library
+% \begin{macrocode}
+ package.searchers, package.searchpath,%
+% \end{macrocode}
+% \item the table library
+% \begin{macrocode}
+ table.pack, table.unpack,%
+ },%
+% \end{macrocode}
+% \end{itemize}
+% There is a new additional identifier
+% \begin{macrocode}
+ morekeywords=[2]{%
+ _ENV,%
+ },%
+% \end{macrocode}
+% and labels are also new in Lua 5.2
+% \begin{macrocode}
+ moredelim=[s][keywordstyle3]{::}{::},%
+}[keywords,comments,strings]%
+% \end{macrocode}
+% \begin{macrocode}
+%</lang2>
+% \end{macrocode}
+% \endgroup
+%
+%
% \subsection{Make}
%
% \lstthanks{Rolf~Niepraschk}{niepraschk@ptb.de}{2000/01/10} sent me the new
diff --git a/Master/texmf-dist/source/latex/listings/lstdrvrs.ins b/Master/texmf-dist/source/latex/listings/lstdrvrs.ins
index 2c6126919e2..d6b85cc02d5 100644
--- a/Master/texmf-dist/source/latex/listings/lstdrvrs.ins
+++ b/Master/texmf-dist/source/latex/listings/lstdrvrs.ins
@@ -46,7 +46,7 @@
}
\endbatchfile
- [2004/09/05 1.3 listings language file]
+ [2013/06/27 1.5pre1 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 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
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 31bee9567e3..5454220e443 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2105,6 +2105,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
'labelcas' => 'latex', # requires interaction
'lastpage' => 'tex',
'lcd' => 'latex -translate-file=empty.tcx', # no 8-bit
+ 'listings' => 'latex', # requires interaction
'lmake' => 'latex', # requires interaction
'luaindex' => 'lualatex --shell-escape',
'mversion' => 'latex', # requires interaction
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 01:41:06 +0000