From f7542e8c8eb40cdaf2f500bae11970fa96a3b11b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 6 Aug 2013 22:25:34 +0000 Subject: listings (6aug13) git-svn-id: svn://tug.org/texlive/trunk@31366 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/listings/listings.dtx | 30 ++- .../texmf-dist/source/latex/listings/lstdrvrs.dtx | 234 ++++++++++++++++++--- .../texmf-dist/source/latex/listings/lstdrvrs.ins | 9 +- 3 files changed, 229 insertions(+), 44 deletions(-) (limited to 'Master/texmf-dist/source/latex/listings') diff --git a/Master/texmf-dist/source/latex/listings/listings.dtx b/Master/texmf-dist/source/latex/listings/listings.dtx index 18cc69e9567..4efad5f3c49 100644 --- a/Master/texmf-dist/source/latex/listings/listings.dtx +++ b/Master/texmf-dist/source/latex/listings/listings.dtx @@ -14,9 +14,11 @@ % that file are `drivers'. % % 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/2013 any individual author listed in the driver files. +% continued maintenance on the package is copyright 2006--2007 Brooks +% Moses. From 2013 on copyright is Jobst Hoffmann, who is the maintainer +% since july 2013. The drivers are copyright 1997/1998/1999/2000/2001/ +% 2002/2003/2004/2006/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 +30,7 @@ % % The package has the LPPL maintenance status "maintained". % -% $Id: listings.dtx 40 2013-06-27 04:38:00Z j_hoffmann $ +% $Id: listings.dtx 62 2013-08-03 09:32:27Z j_hoffmann $ % % The Current Maintainer is Jobst Hoffmann . % @@ -113,7 +115,7 @@ % Hoffmann became the maintainer of the \packagename{listings} % package in 2013; see the Preface for details.}~ % % \textless\lstemail\textgreater} -% \date{2013/07/10\enspace\enspace Version 1.5\ \box\abstractbox} +% \date{2013/08/05\enspace\enspace Version 1.5a\ \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 } @@ -886,6 +888,13 @@ % Note that the arguments \meta{language} and \meta{dialect} are case % insensitive and that spaces have no effect. % +% There is at least one language (VDM, Vienna Development Language, +% \url{http://www.vdmportal.org}) which is not directly supported by the +% \packagename{listings} package. It needs a package for its own: +% \packagename{vdmlisting}. On the other hand \packagename{vdmlisting} uses +% the \packagename{listings} package and so it should be mentioned in this +% context. +% % % \subsection{Special characters}\label{uSpecialCharacters} % @@ -5626,17 +5635,18 @@ %% (w)(c) 1996--2004 Carsten Heinz and/or any other author listed %% elsewhere in this file. %% (c) 2006 Brooks Moses +%% (c) 2013- Jobst Hoffmann %% %% Send comments and ideas on the package, error reports and additional -%% programming languages to . +%% programming languages to Jobst Hoffmann at . %% % \end{macrocode} % % \paragraph{Identification} % All files will have same date and version. % \begin{macrocode} -\def\filedate{2013/07/10} -\def\fileversion{1.5} +\def\filedate{2013/08/05} +\def\fileversion{1.5a} % \end{macrocode} % What we need and who we are. % \begin{macrocode} @@ -14933,7 +14943,7 @@ % % scans \marg{input files}$\setminus$\marg{don't input} for language % definitions. The available languages are stored in \meta{list macro} -% using the form \meta{language}|(|\meta{dialtect}|),|. +% using the form \meta{language}|(|\meta{dialect}|),|. % % \item[0.21] |\lstprintlanguages|\meta{list macro} % @@ -16485,6 +16495,8 @@ % \item several new and updated language definitions % \item many small documentation improvements % \item new keys, multicharacter string delimiters, short inline listings, and more. +% \item[1.5] 2013/06/27 +% \item new maintainership % \end{itemize} % \endgroup % diff --git a/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx b/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx index 7693613079a..77784847eb9 100644 --- a/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx +++ b/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx @@ -1,10 +1,10 @@ % \iffalse % -% $Id: lstdrvrs.dtx 43 2013-06-27 15:26:50Z j_hoffmann $ +% $Id: lstdrvrs.dtx 64 2013-08-03 10:00:54Z j_hoffmann $ % %<*driver> \documentclass{ltxdoc} -\usepackage{url} +\usepackage{lstdoc, textcomp} \EnableCrossrefs \CodelineIndex \begin{document} @@ -23,9 +23,19 @@ % \DoNotIndex{\undefined} % % -% \title{Language, Style and Format drivers\\ for \textsf{Listings 1.5pre1}\\ {\large by Carsten Heinz and individual authors:}} +% \newbox\abstractbox +% \setbox\abstractbox=\vbox{ +% \begin{abstract} +% This article describes the implementation of the language drivers for +% the \packagename{listings} package. +% \end{abstract}} +% +% \title{Language, Style and Format drivers\\ for \textsf{Listings}\\ {\large by Carsten Heinz and individual authors:}} % \author{\InputIfFileExists{lstdrvrs.tmp}{}{}} -% \date{} +% \date{2013/08/05\enspace\enspace Version 1.5a\ \box\abstractbox} +% +% \hypersetup{pdfsubject=Language definitions,pdfauthor=Jobst Hoffmann +% } % % \maketitle % @@ -34,17 +44,28 @@ % \gdef\lstthanksb#1#2#3{#1\lstwrite{\string\and\space#1}} % \gdef\lstwrite#1{\begingroup\let~\space\def\"{\string\"}\def\'{\string\'}\immediate\write\authors{#1}\endgroup} % -% \newcommand*\lsthelper[4]{#1} +% \renewcommand*\lsthelper[4]{#1} +% +% \newif\ifmulticols +% \IfFileExists{multicol.sty}{\multicolstrue}{} +% +% \ifmulticols +% \addtocontents{toc}{\protect\begin{multicols}{2}} +% \fi +% +% \tableofcontents % % % \section{Installation and configuration} +% \label{sec:installation} % % \begingroup % \begin{macrocode} %% The listings package is copyright 1996--2004 Carsten Heinz, and -%% continued maintenance on the package is copyright 2006--2007 Brooks Moses. +%% 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 any individual author listed in this file. +%% 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. @@ -53,7 +74,7 @@ %% This file is completely free and comes without any warranty. %% %% Send comments and ideas on the package, error reports and additional -%% programming languages to Brooks Moses at . +%% programming languages to Jobst Hoffmann at . %% % \end{macrocode} % \endgroup @@ -100,7 +121,7 @@ % \endgroup % We mainly define default dialects. % \begin{macrocode} -\ProvidesFile{listings.cfg}[2013/06/27 1.5pre1 listings configuration] +\ProvidesFile{listings.cfg}[2013/08/05 1.5a listings configuration] \def\lstlanguagefiles {lstlang0.sty,lstlang1.sty,lstlang2.sty,lstlang3.sty} \lstset{defaultdialect=[R/3 6.10]ABAP, @@ -141,7 +162,7 @@ %<+lang1>\ProvidesFile{lstlang1.sty} %<+lang2>\ProvidesFile{lstlang2.sty} %<+lang3>\ProvidesFile{lstlang3.sty} -%<-config> [2013/06/27 1.5pre1 listings language file] +%<-config> [2013/08/05 1.5a listings language file] % \end{macrocode} % % @@ -390,6 +411,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% }[keywords,comments,strings] % % \end{macrocode} +% \endgroup % % Credits go to \lstthanks{Andrew~Zabolotny}{zap@cobra.ru}{2002/07/05}. % \begingroup @@ -1468,6 +1490,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% % % % \subsection{Fortran} +% \label{sec:fortran} % % Took things from % \begin{itemize} @@ -1489,10 +1512,12 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% % \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| +% The current version of Fortran (Fortran 2008) is defined by ISO/IEC +% 1539-1:2010. It contains nine new keywords, four of them consisting of +% two words: ^^A +% |ERROR STOP|, |SYNC ALL|, |SYNC IMAGES|, |SYNC MEMORY|, so +% the list of keywords contains the single parts |ALL|, |ERROR|, |IMAGES|, +% |MEMORY|, and |SYNC|. % \begin{macrocode} \lst@definelanguage[08]{Fortran}[03]{Fortran}{% morekeywords={ALL, BLOCK, CODIMENSION, CONCURRENT, CONTIGUOUS, CRITICAL,% @@ -1568,6 +1593,46 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% % \endgroup % % +% \subsection{GAP---Groups, Algorithms, Programming} +%\label{sec:gap} +% +% GAP is a System for Computational Discrete Algebra, a description can be +% found at \url{http://www.gap-system.org/}. \lstthanks{Heiko +% Oberdiek}{heiko.oberdiek@googlemail.com}{2013/07/18} provided a +% language definition without knowing this language, so any error should be +% announced to the current maintainer of the \packagename{listings} package. +% \begingroup +% \begin{macrocode} +%<*lang2> +% \end{macrocode} +% \begin{macrocode} +%% +%% GAP definition +%% (c) 2013 Heiko Oberdiek +%% +\lst@definelanguage{GAP}{% + morekeywords={% + Assert,Info,IsBound,QUIT,% + TryNextMethod,Unbind,and,break,% + continue,do,elif,% + else,end,false,fi,for,% + function,if,in,local,% + mod,not,od,or,% + quit,rec,repeat,return,% + then,true,until,while% + },% + sensitive,% + morecomment=[l]\#,% + morestring=[b]",% + morestring=[b]',% +}[keywords,comments,strings] +% \end{macrocode} +% \begin{macrocode} +% +% \end{macrocode} +% \endgroup +% +% % \subsection{Guarded Command Language (GCL)} % % As you can read below, \lstthanks{Mark~van~Eijk}{mark@luon.net}{2002/10/30} @@ -2462,6 +2527,104 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% % \endgroup % % +% \subsection{LLVM} +%\label{sec:llvm} +% +% LLVM provides a collection of modular and reusable compiler and toolchain +% technologies, all further information can be found at its home page +% \url{http://llvm.org/}. \lstthanks{Scott Pakin}{scott@pakin.org}{2013/07/31} provided a +% language definition for the LLVM intermediate presentation according to +% \url{http://llvm.org/docs/}.\footnote{In this section `I' is Scott +% Pakin.} The language provides +% \begingroup +% \begin{macrocode} +%<*lang3> +% \end{macrocode} +% \begin{macrocode} +\lst@definelanguage{LLVM}{% + morekeywords={% +% \end{macrocode} +% \begin{itemize} +% \item Instructions +% \begin{macrocode} + ret,br,switch,indirectbr,invoke,resume,unreachable,% + add,fadd,sub,fsub,mul,fmul,udiv,sdiv,fdiv,urem,srem,frem,% + shl,lshr,ashr,and,or,xor,% + extractelement,insertelement,shufflevector,% + extractvalue,insertvalue,% + alloca,load,store,fence,cmpxchg,atomicrmw,getelementptr,% + trunc,zext,sext,fptrunc,fpext,fptoui,fptosi,uitofp,sitofp,ptrtoint,% + inttoptr,bitcast,to,% + icmp,fcmp,phi,select,call,va_arg,landingpad,% +% \end{macrocode} +% \item Atomic operations -- some duplication with the above +% \begin{macrocode} + xchg,add,sub,and,nand,or,xor,max,min,umax,umin,% +% \end{macrocode} +% \item Comparisons +% \begin{macrocode} + eq,ne,ugt,uge,ult,ule,sgt,sge,slt,sle,% + false,oeq,ogt,oge,olt,ole,one,ord,ueq,ugt,uge,ult,ule,une,uno,true,% +% \end{macrocode} +% \item Linkage types +% \begin{macrocode} + private,linker_private,linker_private_weak,linker_private_weak_def_auto,% + internal,available_externally,linkonce,common,weak,appending,extern_weak,% + linkonce_odr,weak_odr,external,dllimport,dllexport,% +% \end{macrocode} +% \item Function headers +% \begin{macrocode} + define,declare,% +% \end{macrocode} +% \item Parameter attributes +% \begin{macrocode} + zeroext,signext,inreg,byval,sret,noalias,nocapture,next,% +% \end{macrocode} +% \item Garbage collector names +% \begin{macrocode} + gc,% +% \end{macrocode} +% \item Function attributes +% \begin{macrocode} + address_safety,alignstack,alwaysinline,nonlazybind,inlinehint,naked,% + noimplicitfloat,noinline,noredzone,noreturn,nounwind,optsize,readnone,% + readonly,returns_twice,ssp,sspreq,uwtable,% +% \end{macrocode} +% \item Module-level inline assembly +% \begin{macrocode} + module,asm,% +% \end{macrocode} +% \item Data layout +% \begin{macrocode} + target,datalayout,% +% \end{macrocode} +% \item Inline assembler expressions +% \begin{macrocode} + sideeffect,alignstack,% +% \end{macrocode} +% \item Other keywords -- I'm probably missing some here. +% \begin{macrocode} + nuw,nsw,exact,inbounds,unnamed_addr},% + morekeywords=[2]{% +% \end{macrocode} +% \item Types +% \begin{macrocode} + i1,i2,i4,i8,i16,i32,i64,i128,i256,i512,i1024,% <-- Most common integers + half,float,double,x86_fp80,fp128,ppc_fp128,x86mmx,% + void,label,metadata},% + alsoletter=.,% + sensitive=false,% + morecomment=[l];,% + morestring=[b]"% +} +% \end{macrocode} +% \end{itemize} +% \begin{macrocode} +% +% \end{macrocode} +% \endgroup +% +% % \subsection{Logo} % % I don't know where the keywords are from and what kind of Logo it is. @@ -2532,12 +2695,12 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% local, nil, not, or, repeat, return, then, true, until, while,% },% % \end{macrocode} -% \item the standard library identifiers +% \item the standard library identifiers % \begin{macrocode} morekeywords=[2]{% % \end{macrocode} -% \begin{itemize} -% \item coming from the base library +% \begin{itemize} +% \item coming from the base library % \begin{macrocode} _G, _LOADED, _REQUIREDNAME, _VERSION, LUA_PATH,% assert, collectgarbage, dofile, error, gcinfo, getfenv,% @@ -2545,24 +2708,24 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% next, pairs, pcall, print, rawequal, rawget, rawset, require,% setfenv, setmetatable, tonumber, tostring, type, unpack, xpcall,% % \end{macrocode} -% \item coming from the coroutine library +% \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 +% \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 +% \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 +% \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,% @@ -2570,23 +2733,24 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% math.pi, math.pow, math.rad, math.random, math.randomseed, math.sin,% math.sqrt, math.tan,% % \end{macrocode} -% \item the os library +% \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 +% \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 +% \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} % \end{itemize} % and some additional identifiers % \begin{macrocode} @@ -2608,7 +2772,9 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% morestring=[s]{[[}{]]},% }[keywords,comments,strings]% % \end{macrocode} +% \endgroup % And here are the new definitions for Lua 5.1: +% \begingroup % \begin{macrocode} \lst@definelanguage[5.1]{Lua}[5.0]{Lua}{% % \end{macrocode} @@ -2705,8 +2871,9 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% morestring=[s]{[==========[}{]==========]},% }[keywords,comments,strings]% % \end{macrocode} -% \end{itemize} +% \endgroup % Lua 5.2 also has some changed features. These are +% \begingroup % \begin{macrocode} \lst@definelanguage[5.2]{Lua}[5.1]{Lua}{% % \end{macrocode} @@ -2721,28 +2888,29 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% % \begin{macrocode} deletekeywords=[2]{% % \end{macrocode} -% \begin{itemize} -% \item the base library +% \begin{itemize} +% \item the base library % \begin{macrocode} getfenv, loadstring, module, newproxy, setfenv, unpack,% % \end{macrocode} -% \item the debug library +% \item the debug library % \begin{macrocode} debug.getfenv, debug.setfenv,% % \end{macrocode} -% \item the mathematical library +% \item the mathematical library % \begin{macrocode} math.log10,% % \end{macrocode} -% \item the package library and +% \item the package library and % \begin{macrocode} package.loaders, package.seeall,% % \end{macrocode} -% \item the table library +% \item the table library % \begin{macrocode} table.maxn,% },% % \end{macrocode} +% \end{itemize} % \end{itemize} % Again there are some new identifiers in the standard libraries % \begin{macrocode} @@ -6691,6 +6859,10 @@ literate=% % \endgroup % % +% \ifmulticols +% \addtocontents{toc}{\protect\end{multicols}} +% \fi +% %^^A \setcounter{IndexColumns}{2} %^^A \PrintIndex % diff --git a/Master/texmf-dist/source/latex/listings/lstdrvrs.ins b/Master/texmf-dist/source/latex/listings/lstdrvrs.ins index d6b85cc02d5..77c185a953a 100644 --- a/Master/texmf-dist/source/latex/listings/lstdrvrs.ins +++ b/Master/texmf-dist/source/latex/listings/lstdrvrs.ins @@ -7,9 +7,10 @@ %% lstdrvrs.dtx (with options: `install') %% %% The listings package is copyright 1996--2004 Carsten Heinz, and -%% continued maintenance on the package is copyright 2006--2007 Brooks Moses. +%% 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 any individual author listed in this file. +%% 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. @@ -18,7 +19,7 @@ %% This file is completely free and comes without any warranty. %% %% Send comments and ideas on the package, error reports and additional -%% programming languages to Brooks Moses at . +%% programming languages to Jobst Hoffmann at . %% \input docstrip \preamble @@ -46,7 +47,7 @@ } \endbatchfile - [2013/06/27 1.5pre1 listings language file] + [2013/08/05 1.5a listings language file] \endinput %% %% End of file `lstdrvrs.ins'. -- cgit v1.2.3