From a76615cfbba78d118357323397a4a7a9e561e2f5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 5 Mar 2014 23:15:14 +0000 Subject: listings (5mar14) git-svn-id: svn://tug.org/texlive/trunk@33095 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/listings/Makefile | 11 +- .../texmf-dist/doc/latex/listings/listings-acm.prf | 53 +++ .../doc/latex/listings/listings-fortran.prf | 66 ++++ .../texmf-dist/doc/latex/listings/listings-lua.prf | 2 +- .../doc/latex/listings/listings-python.prf | 2 +- Master/texmf-dist/doc/latex/listings/listings.pdf | Bin 717293 -> 717262 bytes Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf | Bin 479989 -> 491024 bytes .../texmf-dist/source/latex/listings/listings.dtx | 35 +- .../texmf-dist/source/latex/listings/lstdrvrs.dtx | 373 +++++++++++++++++++-- .../texmf-dist/source/latex/listings/lstdrvrs.ins | 4 +- Master/texmf-dist/tex/latex/listings/listings.cfg | 2 +- Master/texmf-dist/tex/latex/listings/listings.sty | 14 +- Master/texmf-dist/tex/latex/listings/lstdoc.sty | 4 +- Master/texmf-dist/tex/latex/listings/lstlang1.sty | 64 +++- Master/texmf-dist/tex/latex/listings/lstlang2.sty | 122 ++++++- Master/texmf-dist/tex/latex/listings/lstlang3.sty | 6 +- Master/texmf-dist/tex/latex/listings/lstmisc.sty | 4 +- 17 files changed, 698 insertions(+), 64 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/listings/listings-acm.prf create mode 100644 Master/texmf-dist/doc/latex/listings/listings-fortran.prf (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/listings/Makefile b/Master/texmf-dist/doc/latex/listings/Makefile index 37805082dec..d8f94375e53 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 80 2013-08-05 17:46:11Z j_hoffmann $ +# $Id: Makefile 127 2014-03-04 19:54:08Z j_hoffmann $ # # (c) 2007 Brooks Moses # (c) 2013 Jobst Hoffmann @@ -75,18 +75,27 @@ lstdrvrs.pdf: lstdrvrs.dtx $(LATEX) ${<:.sty=.dtx} ## Testing targets +acm-tests: + cd testing; make acm + fortran-tests: cd testing; make fortran gap-tests: cd testing; make gap +hansl-tests: + cd testing; make hansl + llvm-tests: cd testing; make llvm lua-tests: cd testing; make lua +vbscript-tests: + cd testing; make vbscript + tests: cd testing; make all diff --git a/Master/texmf-dist/doc/latex/listings/listings-acm.prf b/Master/texmf-dist/doc/latex/listings/listings-acm.prf new file mode 100644 index 00000000000..1437efb337b --- /dev/null +++ b/Master/texmf-dist/doc/latex/listings/listings-acm.prf @@ -0,0 +1,53 @@ +%% +%% This is file `listings-acm.prf', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lstdrvrs.dtx (with options: `acm-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 . +%% +\ProvidesFile{listings-acm.prf} + [2014/03/04 1.5c listings language file] +\usepackage[rgb, x11names]{xcolor} + +\definecolor{Comments}{rgb}{0.00,0.50,0.00} +\definecolor{KeyWords}{rgb}{0.00,0.00,0.63} +\definecolor{Strings}{rgb}{0.84,0.00,0.00} + +\lstdefinestyle{ACM}{% + basicstyle=\scriptsize\ttfamily,% + keywordstyle=\color{KeyWords},% + showstringspaces=false,% + identifierstyle=\color{black},% + commentstyle=\color{Comments},% + stringstyle=\color{Strings},% + frame=shadowbox,% % for ACM-Code scrartcl commented out + rulesepcolor=\color{black},% + numbers=left,% % left + firstnumber=1,% + stepnumber=5,% + columns=fixed,% % to prevent inserting spaces + fontadjust=true,% + basewidth=0.5em,% + captionpos=t,% + abovecaptionskip=\smallskipamount,% same amount as default + belowcaptionskip=\smallskipamount,% in caption package +}% +\endinput +%% +%% End of file `listings-acm.prf'. diff --git a/Master/texmf-dist/doc/latex/listings/listings-fortran.prf b/Master/texmf-dist/doc/latex/listings/listings-fortran.prf new file mode 100644 index 00000000000..f80fffba336 --- /dev/null +++ b/Master/texmf-dist/doc/latex/listings/listings-fortran.prf @@ -0,0 +1,66 @@ +%% +%% This is file `listings-fortran.prf', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lstdrvrs.dtx (with options: `fortran-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 . +%% +\ProvidesFile{listings-fortran.prf} + [2014/03/04 1.5c listings language file] +\usepackage[rgb, x11names]{xcolor} + +\lstset{% + frame=tlb,% the frame is open on the right side + resetmargins=false,% + rulesepcolor=\color{black},% + numbers=left,% % left + numberstyle=\tiny,% + numbersep=5pt,% + firstnumber=1,% + stepnumber=5,% + columns=fixed,% % to prevent inserting spaces + fontadjust=true,% + keepspaces=true,% + basewidth=0.5em,% + captionpos=t,% + abovecaptionskip=\smallskipamount,% same amount as default + belowcaptionskip=\smallskipamount,% in caption package +} +\lstdefinestyle{fortran}{% + backgroundcolor=\color{yellow!10},% + basicstyle=\small\ttfamily,% + identifierstyle=\color{black},% + keywordstyle=\color{blue},% + keywordstyle={[2]\color{cyan}},% + keywordstyle={[3]\color{olive}},% + stringstyle=\color{teal},% + commentstyle=\itshape\color{orange},% +}% +\lstdefinestyle{fortranbw}{% + backgroundcolor={},% + basicstyle=\small\ttfamily,% + identifierstyle={},% + keywordstyle=\bfseries,% + stringstyle=\itshape,% + commentstyle=\slshape,% + rulesepcolor=\color{black},% +}% +\endinput +%% +%% End of file `listings-fortran.prf'. diff --git a/Master/texmf-dist/doc/latex/listings/listings-lua.prf b/Master/texmf-dist/doc/latex/listings/listings-lua.prf index 05b79095d3f..7e02a99dac6 100644 --- a/Master/texmf-dist/doc/latex/listings/listings-lua.prf +++ b/Master/texmf-dist/doc/latex/listings/listings-lua.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{listings-lua.prf} - [2013/08/26 1.5b listings language file] + [2014/03/04 1.5c listings language file] \usepackage[rgb, x11names]{xcolor} \lstdefinestyle{Lua}{% language=[5.2]Lua, diff --git a/Master/texmf-dist/doc/latex/listings/listings-python.prf b/Master/texmf-dist/doc/latex/listings/listings-python.prf index da85a1210c3..3cf2c02a01c 100644 --- a/Master/texmf-dist/doc/latex/listings/listings-python.prf +++ b/Master/texmf-dist/doc/latex/listings/listings-python.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{listings-python.prf} - [2013/08/26 1.5b listings language file] + [2014/03/04 1.5c listings language file] \usepackage{xcolor} \usepackage{textcomp} diff --git a/Master/texmf-dist/doc/latex/listings/listings.pdf b/Master/texmf-dist/doc/latex/listings/listings.pdf index 2e8f263ba6b..6e654c8ff61 100644 Binary files a/Master/texmf-dist/doc/latex/listings/listings.pdf and b/Master/texmf-dist/doc/latex/listings/listings.pdf differ diff --git a/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf b/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf index 5258adba134..d246049cd3d 100644 Binary files a/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf and b/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf differ diff --git a/Master/texmf-dist/source/latex/listings/listings.dtx b/Master/texmf-dist/source/latex/listings/listings.dtx index b99c0b7aa3b..4767819937f 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 84 2013-08-26 19:50:43Z j_hoffmann $ +% $Id: listings.dtx 125 2014-03-04 19:53:21Z j_hoffmann $ % % The Current Maintainer is Jobst Hoffmann . % @@ -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/26\enspace\enspace Version 1.5b\ \box\abstractbox} +% \date{2014/03/04\enspace\enspace Version 1.5c\ \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 } @@ -5531,7 +5531,7 @@ % \part{Implementation} % % -% \CheckSum{12359} +% \CheckSum{12367} %^^A %^^A Don't index TeX-primitives. %^^A @@ -5672,8 +5672,8 @@ % \paragraph{Identification} % All files will have same date and version. % \begin{macrocode} -\def\filedate{2013/08/26} -\def\fileversion{1.5b} +\def\filedate{2014/03/04} +\def\fileversion{1.5c} % \end{macrocode} % What we need and who we are. % \begin{macrocode} @@ -13424,7 +13424,17 @@ \global\advance\c@lstnumber-\lst@advancelstnum \ifx \lst@firstnumber\c@lstnumber \global\advance\c@lstnumber-\lst@advancelstnum - \fi} + \fi% +% \end{macrocode} +% \lstthanks{Byron~K.~Boulton}{bkboulton@berriehill.com}{2013/11/21} +% reported, that the line numbers are off by one, if the are displayed when +% a linerange is given by patterns and |includerangemarker=false| is +% set. Adding this test corrects this behaviour. +% \begin{macrocode} + \lst@ifincluderangemarker\else% + \global\advance\c@lstnumber by 1% + \fi% + } % \end{macrocode} % % The end-marker is defined if and only if it's not empty. The definition is @@ -14265,7 +14275,18 @@ \def\lst@boxpos{b}% \lsthk@PreSet\lstset{flexiblecolumns,#1}% \lsthk@TextStyle - \@ifnextchar\bgroup{\afterassignment\lst@InlineG \let\@let@token}% + \@ifnextchar\bgroup{% +% \end{macrocode} +% \lstthanks{Luc~Van~Eycken}{Luc.VanEycken@esat.kuleuven.be}{2014/01/22} +% reported, that the experimental implementation of |\lstinline| with +% braces instead of characters surrounding the source code resulted in an +% error if used in a tabular environment. He found that this error comes +% from the master counter (cf. appendix D (Dirty Tricks), item 5. (Brace +% hacks), of the TeXbook (p. 385-386)). Adding the following line remedies +% the wrong behaviour. +% \begin{macrocode} + \ifnum`{=0}\fi% + \afterassignment\lst@InlineG \let\@let@token}% \lstinline@} \def\lstinline@#1{% \lst@Init\relax diff --git a/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx b/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx index 1c790c52ea8..10253633a27 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 85 2013-08-26 19:53:54Z j_hoffmann $ +% $Id: lstdrvrs.dtx 126 2014-03-04 19:53:34Z 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/26\enspace\enspace Version 1.5b\ \box\abstractbox} +% \date{2014/03/04\enspace\enspace Version 1.5c\ \box\abstractbox} % % \hypersetup{pdfsubject=Language definitions,pdfauthor=Jobst Hoffmann % } @@ -100,6 +100,8 @@ } \generate{ + \file{listings-acm.prf}{\from{lstdrvrs.dtx}{acm-prf}} + \file{listings-fortran.prf}{\from{lstdrvrs.dtx}{fortran-prf}} \file{listings-lua.prf}{\from{lstdrvrs.dtx}{lua-prf}} \file{listings-python.prf}{\from{lstdrvrs.dtx}{python-prf}} } @@ -126,7 +128,7 @@ % \endgroup % We mainly define default dialects. % \begin{macrocode} -\ProvidesFile{listings.cfg}[2013/08/26 1.5b listings configuration] +\ProvidesFile{listings.cfg}[2014/03/04 1.5c listings configuration] \def\lstlanguagefiles {lstlang0.sty,lstlang1.sty,lstlang2.sty,lstlang3.sty} \lstset{defaultdialect=[R/3 6.10]ABAP, @@ -167,9 +169,11 @@ %<+lang1>\ProvidesFile{lstlang1.sty} %<+lang2>\ProvidesFile{lstlang2.sty} %<+lang3>\ProvidesFile{lstlang3.sty} +%<+acm-prf>\ProvidesFile{listings-acm.prf} +%<+fortran-prf>\ProvidesFile{listings-fortran.prf} %<+lua-prf>\ProvidesFile{listings-lua.prf} %<+python-prf>\ProvidesFile{listings-python.prf} -%<-config> [2013/08/26 1.5b listings language file] +%<-config> [2014/03/04 1.5c listings language file] % \end{macrocode} % % @@ -267,6 +271,109 @@ % \endgroup % % +% \subsection{ACM} +% +% ACM is the language of the Aspen Custom Modeler +% (\url{http://www.aspentech.com/products/aspen-custom-modeler.aspx}), the +% language definition was provided by \lstthanks{Stefan Pinnow}{Stefan +% Pinnow }{2013/09/08}. It is intended for writing models. +% \begingroup +% \begin{macrocode} +%<*lang2> +% \end{macrocode} +% \begin{macrocode} +%% +%% ACM and ACMscript definition +%% (c) 2013 Stefan Pinnow +%% +\lst@definelanguage{ACM}{ + morekeywords={ + abs,After,acos,And,As,asin,atan,At,Call,Compatibility,Connect,cos,cosh,% + Create,Delay,Difference,Do,Else,ElseIf,End,EndFor,EndIf,EndParallel,% + EndState,EndSwitch,EndText,EndWith,exp,External,Fixed,For,ForEach,Free,% + Global,Hidden,If,Implementation,In,Initial,Input,InterSection,% + IntegerSet,Invoke,Is,Language,Library,Link,Log10,LogE,Max,Min,Model,Of,% + Once,Options,Output,Parallel,Parameter,Pause,Port,Print,Private,% + Procedure,Product,Ramp,Repeat,Restart,Return,Round,Runs,Sigma,sin,sinh,% + Size,SnapShot,sqr,sqrt,SRamp,State,Stream,StringSet,Structure,Switch,% + SubRoutine,SymDiff,tan,tanh,Task,Text,Time,Then,Truncate,Union,Until,% + Uses,Variable,Wait,When,With,WithIn,WorkSpace% + },% + sensitive=false,% + morecomment=[l]{//},% + morecomment=[s]{/*}{*/},% + string=[b]{"},% +}[keywords,comments,strings]% +% \end{macrocode} +% \begin{macrocode} +% +% \end{macrocode} +% \endgroup +% +% In addition to writing models there is a language ACMscript, which is +% similar to VBScript. According to Stefan Pinnow this language is used for +% writing scripts for the models. +% \begingroup +% \begin{macrocode} +%<*lang2> +% \end{macrocode} +% \begin{macrocode} +\lst@definelanguage{ACMscript}[]{VBScript}{% + morekeywords={% + ElseIf,False,In,Resume,True% + },% + deletekeywords={% + Abs,Array,Clear,CreateObject,CStr,Err,ForReading,ForWriting,% + OpenTextFile,Replace,WriteLine% + }% +}[keywords,comments,strings]% +% \end{macrocode} +% \begin{macrocode} +% +% \end{macrocode} +% \endgroup +% +% \begingroup +% Stefan Pinnow also supplied a definition of a style for printing ACM code: +% \begin{macrocode} +%<*acm-prf> +% \end{macrocode} +% \begin{macrocode} +\usepackage[rgb, x11names]{xcolor} + +\definecolor{Comments}{rgb}{0.00,0.50,0.00} +\definecolor{KeyWords}{rgb}{0.00,0.00,0.63} +\definecolor{Strings}{rgb}{0.84,0.00,0.00} + +\lstdefinestyle{ACM}{% + basicstyle=\scriptsize\ttfamily,% + keywordstyle=\color{KeyWords},% + showstringspaces=false,% + identifierstyle=\color{black},% + commentstyle=\color{Comments},% + stringstyle=\color{Strings},% + frame=shadowbox,% % for ACM-Code scrartcl commented out +% frame=l,% % line on the left side + rulesepcolor=\color{black},% + numbers=left,% % left + firstnumber=1,% + stepnumber=5,% + columns=fixed,% % to prevent inserting spaces + fontadjust=true,% + basewidth=0.5em,% + captionpos=t,% + abovecaptionskip=\smallskipamount,% same amount as default + belowcaptionskip=\smallskipamount,% in caption package +}% +% \end{macrocode} +% This code is provided in the file |listings-acm.prf|, see section +% 2.4.1 (Preferences) of the \packagename{listings} documentation. +% \begin{macrocode} +% +% \end{macrocode} +% \endgroup +% +% % \subsection{ACSL} % % This language was provided by \lstthanks{Andreas~Matthias}{amat@kabsi.at} @@ -1528,7 +1635,17 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% % \begin{macrocode} \lst@definelanguage[08]{Fortran}[03]{Fortran}{% morekeywords={ALL, BLOCK, CODIMENSION, CONCURRENT, CONTIGUOUS, CRITICAL,% - ERROR, LOCK, SUBMODULE, SYNC, UNLOCK}% + ERROR, LOCK, SUBMODULE, SYNC, UNLOCK},% +% \end{macrocode} +% New procedures in Fortran 2008: +% \begin{macrocode} + morekeywords=[3]{ACOSH,ASINH,ATANH,ATOMIC_DEFINE,ATOMIC_REF,BESSEL_J0,% + BESSEL_J1,BESSEL_JN,BESSEL_Y0,BESSEL_Y1,BESSEL_YN,BGE,BGT,BLE,BLT,% + C_SIZEOF,COMPILER_OPTIONS,COMPILER_VERSION,DSHIFTL,DSHIFTR,ERF,ERFC,% + ERFC_SCALED,EXECUTE_COMMAND_LINE,GAMMA,HYPOT,IALL,IANY,IMAGE_INDEX,% + IPARITY,LCOBOUND,LEADZ,LOG_GAMMA,MASKL,MASKR,MERGE_BITS,NORM2,% + NUM_IMAGES,PARITY,POPCNT,POPPAR,SHIFTA,SHIFTL,SHIFTR,STORAGE_SIZE,% + THIS_IMAGE,TRAILZ,UCOBOUND}% }% % \end{macrocode} % Fortran 2003 introduces the following keywords: @@ -1536,7 +1653,18 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% \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}% + NON_OVERRIDABLE, NOPASS, PASS, PROTECTED, VALUE, VOLATILE, WAIT},% +% \end{macrocode} +% These are new options/specifiers: +% \begin{macrocode} + morekeywords=[2]{DECIMAL,ENCODING,IOMSG,ROUND},% corrected NML from NMT +% \end{macrocode} +% And also some new procedures: +% \begin{macrocode} + morekeywords=[3]{C_ASSOCIATED,C_F_POINTER,C_F_PROCPOINTER,C_FUNLOC,% + C_LOC,COMMAND_ARGUMENT_COUNT,EXTENDS_TYPE_OF,GET_COMMAND,GET_COMMAND_ARGUMENT,% + GET_ENVIRONMENT_VARIABLE,IS_IOSTAT_END,MOVE_ALLOC,NEW_LINE,SAME_TYPE_AS,% + SELECTED_CHAR_KIND}% }% % \end{macrocode} % \lsthelper{Denis Girou}{Denis.Girou@idris.fr}{1998/07/26}{Fortran 95=90} @@ -1551,11 +1679,11 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% % \begin{macrocode} \lst@definelanguage[95]{Fortran}[77]{Fortran}% {deletekeywords=SAVE,% - morekeywords={ACTION,ADVANCE,ALLOCATE,ALLOCATABLE,ASSIGNMENT,CASE,% - CONTAINS,CYCLE,DEALLOCATE,DEFAULT,DELIM,EXIT,INCLUDE,IN,NONE,IN,% - OUT,INTENT,INTERFACE,IOLENGTH,KIND,LEN,MODULE,NAME,NAMELIST,NMT,% - NULLIFY,ONLY,OPERATOR,OPTIONAL,OUT,PAD,POINTER,POSITION,PRIVATE,% - PUBLIC,READWRITE,RECURSIVE,RESULT,SELECT,SEQUENCE,SIZE,STAT,% + morekeywords={ALLOCATABLE,ALLOCATE,ASSIGNMENT,CASE,% + CONTAINS,CYCLE,DEALLOCATE,DEFAULT,EXIT,INCLUDE,IN,NONE,% + OUT,INTENT,INTERFACE,MODULE,NAMELIST,% + NULLIFY,ONLY,OPERATOR,OPTIONAL,OUT,POINTER,PRIVATE,% + PUBLIC,RECURSIVE,RESULT,SELECT,SEQUENCE,% TARGET,USE,WHERE,WHILE,BLOCKDATA,DOUBLEPRECISION,% ENDBLOCKDATA,ENDFILE,ENDFUNCTION,ENDINTERFACE,% ENDMODULE,ENDPROGRAM,ENDSELECT,ENDSUBROUTINE,ENDTYPE,ENDWHERE,% @@ -1565,8 +1693,23 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% % \begin{macrocode} ELEMENTAL, ELSEWHERE, FORALL, PURE},% % \end{macrocode} -% and here are the final settings for Fortran +% The list of option keywords/specifiers new in Fortran 90 and 95: +% \begin{macrocode} + morekeywords=[2]{ACTION,ADVANCE,DELIM,IOLENGTH,LEN,NAME,% + NML,PAD,POSITION,READWRITE,SIZE,STAT},% corrected NML from NMT +% \end{macrocode} +% and the list of intrinsic procedures new in Fortran 90 and 95: % \begin{macrocode} + morekeywords=[3]{ADJUSTL,ADJUSTR,ALL,ALLOCATED,ANY,ASSOCIATED,BIT_SIZE,% + BTEST,CEILING,COUNT,CPU_TIME,CSHIFT,DATE_AND_TIME,DIGITS,DOT_PRODUCT,% + EOSHIFT,EPSILON,EXPONENT,FLOOR,FRACTION,HUGE,IACHAR,IAND,IBCLR, + IBITS,IBSET,ICHAR,IEOR,IOR,ISHFT,ISHFTC,KIND,LBOUND,LEN_TRIM,% left out LOGICAL + MATMUL,MAXEXPONENT,MAXLOC,MAXVAL,MERGE,MINEXPONENT,MINLOC,MINVAL,% + MODULO,MVBITS,NEAREST,NOT,NULL,PACK,PRECISION,PRESENT,PRODUCT,% + RADIX,RANDOM_NUMBER,RANDOM_SEED,RANGE,RANK,REPEAT,RESHAPE,RRSPACING,% + SCALE,SCAN,SELECTED_INT_KIND,SELECTED_REAL_KIND,SET_EXPONENT,SHAPE,% + SINH,SIZE,SPACING,SPREAD,SUM,SYSTEM_CLOCK,TINY,TRANSFER,TRANSPOSE,% + TRIM,UBOUND,UNPACK,VERIFY},% deletecomment=[f],% no fixed comment line: 1998 Magne Rudshaug morecomment=[l]!% }% @@ -1578,14 +1721,35 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% % more common variants (e.g., `GO TO' and `GOTO'). % \begin{macrocode} \lst@definelanguage[77]{Fortran}% - {morekeywords={ACCESS,ASSIGN,BACKSPACE,BLANK,BLOCK,CALL,CHARACTER,% - CLOSE,COMMON,COMPLEX,CONTINUE,DATA,DIMENSION,DIRECT,DO,DOUBLE,% - ELSE,ELSEIF,END,ENDIF,ENDDO,ENTRY,EOF,EQUIVALENCE,ERR,EXIST,EXTERNAL,% - FILE,FMT,FORM,FORMAT,FORMATTED,FUNCTION,GO,TO,GOTO,IF,IMPLICIT,% - INQUIRE,INTEGER,INTRINSIC,IOSTAT,LOGICAL,NAMED,NEXTREC,NUMBER,% - OPEN,OPENED,PARAMETER,PAUSE,PRECISION,PRINT,PROGRAM,READ,REAL,% - REC,RECL,RETURN,REWIND,SEQUENTIAL,STATUS,STOP,SUBROUTINE,THEN,% - TYPE,UNFORMATTED,UNIT,WRITE,SAVE},% +% \end{macrocode} +% Jobst Hoffmann divided the list of keywords into two lists. The first +% list contains the statement keywords, the second list contains the option +% keywords/specifiers and values. This makes the different meanings of the +% keywords distinguishable. +% \begin{macrocode} + {morekeywords={ASSIGN,BACKSPACE,CALL,CHARACTER,% + CLOSE,COMMON,COMPLEX,CONTINUE,DATA,DIMENSION,DO,DOUBLE,% + ELSE,ELSEIF,END,ENDIF,ENDDO,ENTRY,EQUIVALENCE,EXTERNAL,% + FILE,FORMAT,FUNCTION,GO,TO,GOTO,IF,IMPLICIT,% + INQUIRE,INTEGER,INTRINSIC,LOGICAL,% + OPEN,PARAMETER,PAUSE,PRECISION,PRINT,PROGRAM,READ,REAL,% + RETURN,REWIND,STOP,SUBROUTINE,THEN,% + WRITE,SAVE},% + morekeywords=[2]{ACCESS,BLANK,BLOCK,DIRECT,EOF,ERR,EXIST,% + FMT,FORM,FORMATTED,IOSTAT,NAMED,NEXTREC,NUMBER,OPENED,% + REC,RECL,SEQUENTIAL,STATUS,TYPE,UNFORMATTED,UNIT},% +% \end{macrocode} +% And here is another list: the list of intrinsic procedures (remember: all +% functions belong to the Fortran language specification!) +% \begin{macrocode} + morekeywords=[3]{INT,DBLE,CMPLX,ICHAR,CHAR,AINT,ANINT,% left out real + NINT,ABS,MOD,SIGN,DIM,DPROD,MAX,MIN,AIMAG,CONJG,SQRT,EXP,LOG,% + LOG10,SIN,COS,TAN,ASIN,ACOS,ATAN,ATAN2,SINH,COSH,TANH,LGE,LLE,LLT,% + LEN,INDEX},% +% \end{macrocode} +% And here is the last list: fortran operators: +% \begin{macrocode} + morekeywords=[4]{AND,EQ,EQV,FALSE,GE,GT,OR,LE,LT,NE,NEQV,NOT,TRUE},% sensitive=f,%% not Fortran-77 standard, but allowed in Fortran-95 %% morecomment=[f]*,% morecomment=[f]C,% @@ -1599,6 +1763,61 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% % \end{macrocode} % \endgroup % +% \begingroup +% Jobst Hoffmann supplied a definition of a style for printing Fortran code: +% \begin{macrocode} +%<*fortran-prf> +% \end{macrocode} +% \begin{macrocode} +\usepackage[rgb, x11names]{xcolor} + +% common settings +\lstset{% + frame=tlb,% the frame is open on the right side + resetmargins=false,% + rulesepcolor=\color{black},% + numbers=left,% % left + numberstyle=\tiny,% + numbersep=5pt,% + firstnumber=1,% + stepnumber=5,% + columns=fixed,% % to prevent inserting spaces + fontadjust=true,% + keepspaces=true,% + basewidth=0.5em,% + captionpos=t,% + abovecaptionskip=\smallskipamount,% same amount as default + belowcaptionskip=\smallskipamount,% in caption package +} +% settings for colored printing +\lstdefinestyle{fortran}{% + backgroundcolor=\color{yellow!10},% + basicstyle=\small\ttfamily,% + identifierstyle=\color{black},% + keywordstyle=\color{blue},% + keywordstyle={[2]\color{cyan}},% + keywordstyle={[3]\color{olive}},% + stringstyle=\color{teal},% + commentstyle=\itshape\color{orange},% +}% +% settings for back and white printing +\lstdefinestyle{fortranbw}{% + backgroundcolor={},% + basicstyle=\small\ttfamily,% + identifierstyle={},% + keywordstyle=\bfseries,% + stringstyle=\itshape,% + commentstyle=\slshape,% + rulesepcolor=\color{black},% +}% +% \end{macrocode} +% This code is provided in the file |listings-fortran.prf|, see section +% 2.4.1 (Preferences) of the \packagename{listings} documentation. +% \begin{macrocode} +% +% \end{macrocode} +% \endgroup +% % % \subsection{GAP---Groups, Algorithms, Programming} %\label{sec:gap} @@ -1716,6 +1935,111 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% % \endgroup % % +% \subsection{Hansl/Gretl} +% +% Thanks to \lstthanks{Ignacio +% D\'{i}az-Emparanza}{ignacio.diaz-emparanza@ehu.es}{2013/10/24} for providing +% the definition of hansl. Hansl is the gretl scripting language (see +% \url{http://gretl.sourceforge.net}). +% \begingroup +% \begin{macrocode} +%<*lang2> +% \end{macrocode} +% \begin{macrocode} +%% +%% http://gretl.sourceforge.net/gretl-help/cmdref.html +%% (c) 2013 Ignacio D\'iaz-Emparanza +%% +\lst@definelanguage{hansl}{% + % $-variables are internal functions in hansl + keywordsprefix ={\$}, + morekeywords={ % hansl commands: + add,adf,anova,append,ar,ar1,% + arbond,arch,arima,biprobit,boxplot,break,% + catch,chow,clear,coeffsum,coint,coint2,% + corr,corrgm,cusum,data,dataset,debug,% + delete,diff,difftest,discrete,dpanel,dummify,% + duration,elif,else,end,endif,endloop,% + eqnprint,equation,estimate,fcast,foreign,fractint,% + freq,function,garch,genr,gmm,gnuplot,% + graphpg,hausman,heckit,help,hsk,hurst,% + if,include,info,intreg,join,kalman,% + kpss,labels,lad,lags,ldiff,leverage,% + levinlin,logistic,logit,logs,loop,mahal,% + makepkg,markers,meantest,mle,modeltab,modprint,% + modtest,mpols,negbin,nls,normtest,nulldata,% + ols,omit,open,orthdev,outfile,panel,% + pca,pergm,poisson,print,printf,probit,% + pvalue,qlrtest,qqplot,quantreg,quit,rename,% + reset,restrict,rmplot,run,runs,scatters,% + sdiff,set,setinfo,setobs,setmiss,shell,% + smpl,spearman,sprintf,square,sscanf,store,% + summary,system,tabprint,textplot,tobit,tsls,% + var,varlist,vartest,vecm,vif,wls,% + xcorrgm,xtab,scalar,series,matrix,string},% + morekeywords=[2]{ % Functions + abs,acos,acosh,aggregate,argname,% + asin,asinh,atan,atanh,atof,% + bessel,BFGSmax,bkfilt,boxcox,bwfilt,% + cdemean,cdf,cdiv,ceil,cholesky,% + chowlin,cmult,cnorm,colname,colnames,% + cols,corr,corrgm,cos,cosh,% + cov,critical,cum,deseas,det,% + diag,diagcat,diff,digamma,dnorm,% + dsort,dummify,eigengen,eigensym,eigsolve,% + epochday,errmsg,exp,fcstats,fdjac,% + fft,ffti,filter,firstobs,fixname,% + floor,fracdiff,gammafun,getenv,getline,% + ghk,gini,ginv,halton,hdprod,% + hpfilt,I,imaxc,imaxr,imhof,% + iminc,iminr,inbundle,infnorm,inlist,% + int,inv,invcdf,invmills,invpd,% + irf,irr,isconst,isnan,isnull,% + isodate,iwishart,kdensity,kfilter,ksimul,% + ksmooth,kurtosis,lags,lastobs,ldet,% + ldiff,lincomb,ljungbox,lngamma,log,% + log10,log2,loess,logistic,lower,% + lrvar,max,maxc,maxr,mcorr,% + mcov,mcovg,mean,meanc,meanr,% + median,mexp,min,minc,minr,% + missing,misszero,mlag,mnormal,mols,% + monthlen,movavg,mpols,mrandgen,mread,% + mreverse,mrls,mshape,msortby,muniform,% + mwrite,mxtab,nadarwat,nelem,ngetenv,% + nobs,normal,npv,NRmax,nullspace,% + obs,obslabel,obsnum,ok,onenorm,% + ones,orthdev,pdf,pergm,pmax,% + pmean,pmin,pnobs,polroots,polyfit,% + princomp,prodc,prodr,psd,psdroot,% + pshrink,psum,pvalue,pxsum,qform,% + qnorm,qrdecomp,quadtable,quantile,randgen,% + randgen1,randint,rank,ranking,rcond,% + readfile,regsub,remove,replace,resample,% + round,rownames,rows,sd,sdc,% + sdiff,selifc,selifr,seq,setnote,% + simann,sin,sinh,skewness,sort,% + sortby,sqrt,sscanf,sst,strlen,% + strncmp,strsplit,strstr,strstrip,strsub,% + sum,sumall,sumc,sumr,svd,% + tan,tanh,toepsolv,tolower,toupper,% + tr,transp,trimr,typestr,uniform,% + uniq,unvech,upper,urcpval,values,% + var,varname,varnum,varsimul,vec,% + vech,weekday,wmean,wsd,wvar,% + xmax,xmin,xpx,zeromiss,zeros,% + },% + sensitive=t,% + morecomment=[l]{\#},% + morecomment=[s]{/*}{*/},% + morestring=[b]{"}}% +\lstalias{gretl}{hansl} +% \end{macrocode} +% \begin{macrocode} +% +% \end{macrocode} +% \endgroup +% +% % \subsection{Haskell} % % Thanks to \lstthanks{Peter~Bartke}{bartke@inf.fu-berlin.de}{1999/11/18} for @@ -1948,7 +2272,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% life,list_together,name number,orders,parse_name,plural,% react_after,react_before,short_name,short_name_indef,time_left,% time_out,when_closed,when_open,when_on,when_off,% - with_key}, + with_key},% % % Library routines morekeywords=[6]{Achieved,AfterRoutines,AllowPushDir,Banner,ChangePlayer,% @@ -6580,6 +6904,9 @@ literate=% widehat,widetilde,wlog,wp,wr,xi,Xi,zeta}% }% % \end{macrocode} +% \lsthelper{Herbert Voss}{Herbert.Voss@FU-Berlin.DE}{2013-12-12}{typo} pointed +% to a typo: the \TeX{} primitive is |lineskiplimit| instead of +% |lineskiplimits|. % \begin{macrocode} \lst@definelanguage[primitive]{TeX}% {moretexcs={above,abovedisplayshortskip,abovedisplayskip,aftergroup,% @@ -6605,7 +6932,7 @@ literate=% ignorespaces,immediate,indent,input,insert,insertpenalties,% interlinepenalty,jobname,kern,language,lastbox,lastkern,% lastpenalty,lastskip,lccode,leaders,left,lefthyphenmin,leftskip,% - leqno,let,limits,linepenalty,lineskip,lineskiplimits,long,% + leqno,let,limits,linepenalty,lineskip,lineskiplimit,long,% looseness,lower,lowercase,mag,mark,mathaccent,mathbin,mathchar,% mathchardef,mathchoice,mathclose,mathcode,mathinner,mathop,% mathopen,mathord,mathpunct,mathrel,mathsurround,maxdeadcycles,% @@ -6634,7 +6961,7 @@ literate=% vfilneg,vfuzz,voffset,vrule,vsize,vskip,vsplit,vss,vtop,wd,% widowpenalty,write,xdef,xleaders,xspaceskip,year},% sensitive,% - alsoother={0123456789$_},% + alsoother={0123456789$_},%$ to make Emacs fontlocking happy morecomment=[l]\%% }[keywords,tex,comments]% % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/listings/lstdrvrs.ins b/Master/texmf-dist/source/latex/listings/lstdrvrs.ins index 993ab30b8bd..35958a9f1b5 100644 --- a/Master/texmf-dist/source/latex/listings/lstdrvrs.ins +++ b/Master/texmf-dist/source/latex/listings/lstdrvrs.ins @@ -38,6 +38,8 @@ } \generate{ + \file{listings-acm.prf}{\from{lstdrvrs.dtx}{acm-prf}} + \file{listings-fortran.prf}{\from{lstdrvrs.dtx}{fortran-prf}} \file{listings-lua.prf}{\from{lstdrvrs.dtx}{lua-prf}} \file{listings-python.prf}{\from{lstdrvrs.dtx}{python-prf}} } @@ -52,7 +54,7 @@ } \endbatchfile - [2013/08/26 1.5b listings language file] + [2014/03/04 1.5c 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 b3558440b75..54f165b0889 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 . %% -\ProvidesFile{listings.cfg}[2013/08/26 1.5b listings configuration] +\ProvidesFile{listings.cfg}[2014/03/04 1.5c 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 1ef4c986717..f1bf1ab74f1 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 . %% -\def\filedate{2013/08/26} -\def\fileversion{1.5b} +\def\filedate{2014/03/04} +\def\fileversion{1.5c} \NeedsTeXFormat{LaTeX2e} \AtEndOfPackage{\ProvidesPackage{listings} [\filedate\space\fileversion\space(Carsten Heinz)]} @@ -1489,7 +1489,11 @@ \global\advance\c@lstnumber-\lst@advancelstnum \ifx \lst@firstnumber\c@lstnumber \global\advance\c@lstnumber-\lst@advancelstnum - \fi} + \fi% + \lst@ifincluderangemarker\else% + \global\advance\c@lstnumber by 1% + \fi% + } \def\lst@DefRangeEnd{% \ifx\lst@rangeend\@empty\else \expandafter\lst@CArgX\lst@rangeend\relax\lst@DefRangeE @@ -1884,7 +1888,9 @@ \def\lst@boxpos{b}% \lsthk@PreSet\lstset{flexiblecolumns,#1}% \lsthk@TextStyle - \@ifnextchar\bgroup{\afterassignment\lst@InlineG \let\@let@token}% + \@ifnextchar\bgroup{% + \ifnum`{=0}\fi% + \afterassignment\lst@InlineG \let\@let@token}% \lstinline@} \def\lstinline@#1{% \lst@Init\relax diff --git a/Master/texmf-dist/tex/latex/listings/lstdoc.sty b/Master/texmf-dist/tex/latex/listings/lstdoc.sty index 6a157851531..79127afdf69 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 . %% -\def\filedate{2013/08/26} -\def\fileversion{1.5b} +\def\filedate{2014/03/04} +\def\fileversion{1.5c} \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 d09c04352f8..177880e56d3 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 . %% \ProvidesFile{lstlang1.sty} - [2013/08/26 1.5b listings language file] + [2014/03/04 1.5c listings language file] %% %% ACSL definition (c) 2000 by Andreas Matthias %% @@ -308,38 +308,70 @@ }[keywords,comments,strings]% \lst@definelanguage[08]{Fortran}[03]{Fortran}{% morekeywords={ALL, BLOCK, CODIMENSION, CONCURRENT, CONTIGUOUS, CRITICAL,% - ERROR, LOCK, SUBMODULE, SYNC, UNLOCK}% + ERROR, LOCK, SUBMODULE, SYNC, UNLOCK},% + morekeywords=[3]{ACOSH,ASINH,ATANH,ATOMIC_DEFINE,ATOMIC_REF,BESSEL_J0,% + BESSEL_J1,BESSEL_JN,BESSEL_Y0,BESSEL_Y1,BESSEL_YN,BGE,BGT,BLE,BLT,% + C_SIZEOF,COMPILER_OPTIONS,COMPILER_VERSION,DSHIFTL,DSHIFTR,ERF,ERFC,% + ERFC_SCALED,EXECUTE_COMMAND_LINE,GAMMA,HYPOT,IALL,IANY,IMAGE_INDEX,% + IPARITY,LCOBOUND,LEADZ,LOG_GAMMA,MASKL,MASKR,MERGE_BITS,NORM2,% + NUM_IMAGES,PARITY,POPCNT,POPPAR,SHIFTA,SHIFTL,SHIFTR,STORAGE_SIZE,% + THIS_IMAGE,TRAILZ,UCOBOUND}% }% \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}% + NON_OVERRIDABLE, NOPASS, PASS, PROTECTED, VALUE, VOLATILE, WAIT},% + morekeywords=[2]{DECIMAL,ENCODING,IOMSG,ROUND},% corrected NML from NMT + morekeywords=[3]{C_ASSOCIATED,C_F_POINTER,C_F_PROCPOINTER,C_FUNLOC,% + C_LOC,COMMAND_ARGUMENT_COUNT,EXTENDS_TYPE_OF,GET_COMMAND,GET_COMMAND_ARGUMENT,% + GET_ENVIRONMENT_VARIABLE,IS_IOSTAT_END,MOVE_ALLOC,NEW_LINE,SAME_TYPE_AS,% + SELECTED_CHAR_KIND}% }% \lst@definelanguage[90]{Fortran}[95]{Fortran}{} \lst@definelanguage[95]{Fortran}[77]{Fortran}% {deletekeywords=SAVE,% - morekeywords={ACTION,ADVANCE,ALLOCATE,ALLOCATABLE,ASSIGNMENT,CASE,% - CONTAINS,CYCLE,DEALLOCATE,DEFAULT,DELIM,EXIT,INCLUDE,IN,NONE,IN,% - OUT,INTENT,INTERFACE,IOLENGTH,KIND,LEN,MODULE,NAME,NAMELIST,NMT,% - NULLIFY,ONLY,OPERATOR,OPTIONAL,OUT,PAD,POINTER,POSITION,PRIVATE,% - PUBLIC,READWRITE,RECURSIVE,RESULT,SELECT,SEQUENCE,SIZE,STAT,% + morekeywords={ALLOCATABLE,ALLOCATE,ASSIGNMENT,CASE,% + CONTAINS,CYCLE,DEALLOCATE,DEFAULT,EXIT,INCLUDE,IN,NONE,% + OUT,INTENT,INTERFACE,MODULE,NAMELIST,% + NULLIFY,ONLY,OPERATOR,OPTIONAL,OUT,POINTER,PRIVATE,% + PUBLIC,RECURSIVE,RESULT,SELECT,SEQUENCE,% TARGET,USE,WHERE,WHILE,BLOCKDATA,DOUBLEPRECISION,% ENDBLOCKDATA,ENDFILE,ENDFUNCTION,ENDINTERFACE,% ENDMODULE,ENDPROGRAM,ENDSELECT,ENDSUBROUTINE,ENDTYPE,ENDWHERE,% INOUT,SELECTCASE,% ELEMENTAL, ELSEWHERE, FORALL, PURE},% + morekeywords=[2]{ACTION,ADVANCE,DELIM,IOLENGTH,LEN,NAME,% + NML,PAD,POSITION,READWRITE,SIZE,STAT},% corrected NML from NMT + morekeywords=[3]{ADJUSTL,ADJUSTR,ALL,ALLOCATED,ANY,ASSOCIATED,BIT_SIZE,% + BTEST,CEILING,COUNT,CPU_TIME,CSHIFT,DATE_AND_TIME,DIGITS,DOT_PRODUCT,% + EOSHIFT,EPSILON,EXPONENT,FLOOR,FRACTION,HUGE,IACHAR,IAND,IBCLR, + IBITS,IBSET,ICHAR,IEOR,IOR,ISHFT,ISHFTC,KIND,LBOUND,LEN_TRIM,% left out LOGICAL + MATMUL,MAXEXPONENT,MAXLOC,MAXVAL,MERGE,MINEXPONENT,MINLOC,MINVAL,% + MODULO,MVBITS,NEAREST,NOT,NULL,PACK,PRECISION,PRESENT,PRODUCT,% + RADIX,RANDOM_NUMBER,RANDOM_SEED,RANGE,RANK,REPEAT,RESHAPE,RRSPACING,% + SCALE,SCAN,SELECTED_INT_KIND,SELECTED_REAL_KIND,SET_EXPONENT,SHAPE,% + SINH,SIZE,SPACING,SPREAD,SUM,SYSTEM_CLOCK,TINY,TRANSFER,TRANSPOSE,% + TRIM,UBOUND,UNPACK,VERIFY},% deletecomment=[f],% no fixed comment line: 1998 Magne Rudshaug morecomment=[l]!% }% \lst@definelanguage[77]{Fortran}% - {morekeywords={ACCESS,ASSIGN,BACKSPACE,BLANK,BLOCK,CALL,CHARACTER,% - CLOSE,COMMON,COMPLEX,CONTINUE,DATA,DIMENSION,DIRECT,DO,DOUBLE,% - ELSE,ELSEIF,END,ENDIF,ENDDO,ENTRY,EOF,EQUIVALENCE,ERR,EXIST,EXTERNAL,% - FILE,FMT,FORM,FORMAT,FORMATTED,FUNCTION,GO,TO,GOTO,IF,IMPLICIT,% - INQUIRE,INTEGER,INTRINSIC,IOSTAT,LOGICAL,NAMED,NEXTREC,NUMBER,% - OPEN,OPENED,PARAMETER,PAUSE,PRECISION,PRINT,PROGRAM,READ,REAL,% - REC,RECL,RETURN,REWIND,SEQUENTIAL,STATUS,STOP,SUBROUTINE,THEN,% - TYPE,UNFORMATTED,UNIT,WRITE,SAVE},% + {morekeywords={ASSIGN,BACKSPACE,CALL,CHARACTER,% + CLOSE,COMMON,COMPLEX,CONTINUE,DATA,DIMENSION,DO,DOUBLE,% + ELSE,ELSEIF,END,ENDIF,ENDDO,ENTRY,EQUIVALENCE,EXTERNAL,% + FILE,FORMAT,FUNCTION,GO,TO,GOTO,IF,IMPLICIT,% + INQUIRE,INTEGER,INTRINSIC,LOGICAL,% + OPEN,PARAMETER,PAUSE,PRECISION,PRINT,PROGRAM,READ,REAL,% + RETURN,REWIND,STOP,SUBROUTINE,THEN,% + WRITE,SAVE},% + morekeywords=[2]{ACCESS,BLANK,BLOCK,DIRECT,EOF,ERR,EXIST,% + FMT,FORM,FORMATTED,IOSTAT,NAMED,NEXTREC,NUMBER,OPENED,% + REC,RECL,SEQUENTIAL,STATUS,TYPE,UNFORMATTED,UNIT},% + morekeywords=[3]{INT,DBLE,CMPLX,ICHAR,CHAR,AINT,ANINT,% left out real + NINT,ABS,MOD,SIGN,DIM,DPROD,MAX,MIN,AIMAG,CONJG,SQRT,EXP,LOG,% + LOG10,SIN,COS,TAN,ASIN,ACOS,ATAN,ATAN2,SINH,COSH,TANH,LGE,LLE,LLT,% + LEN,INDEX},% + morekeywords=[4]{AND,EQ,EQV,FALSE,GE,GT,OR,LE,LT,NE,NEQV,NOT,TRUE},% sensitive=f,%% not Fortran-77 standard, but allowed in Fortran-95 %% morecomment=[f]*,% morecomment=[f]C,% diff --git a/Master/texmf-dist/tex/latex/listings/lstlang2.sty b/Master/texmf-dist/tex/latex/listings/lstlang2.sty index 680fee091ea..0379c047b26 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 . %% \ProvidesFile{lstlang2.sty} - [2013/08/26 1.5b listings language file] + [2014/03/04 1.5c listings language file] %% %% Abap definition by Knut Lickert %% @@ -76,6 +76,37 @@ raise,raising}% }[keywords,comments,strings] %% +%% ACM and ACMscript definition +%% (c) 2013 Stefan Pinnow +%% +\lst@definelanguage{ACM}{ + morekeywords={ + abs,After,acos,And,As,asin,atan,At,Call,Compatibility,Connect,cos,cosh,% + Create,Delay,Difference,Do,Else,ElseIf,End,EndFor,EndIf,EndParallel,% + EndState,EndSwitch,EndText,EndWith,exp,External,Fixed,For,ForEach,Free,% + Global,Hidden,If,Implementation,In,Initial,Input,InterSection,% + IntegerSet,Invoke,Is,Language,Library,Link,Log10,LogE,Max,Min,Model,Of,% + Once,Options,Output,Parallel,Parameter,Pause,Port,Print,Private,% + Procedure,Product,Ramp,Repeat,Restart,Return,Round,Runs,Sigma,sin,sinh,% + Size,SnapShot,sqr,sqrt,SRamp,State,Stream,StringSet,Structure,Switch,% + SubRoutine,SymDiff,tan,tanh,Task,Text,Time,Then,Truncate,Union,Until,% + Uses,Variable,Wait,When,With,WithIn,WorkSpace% + },% + sensitive=false,% + morecomment=[l]{//},% + morecomment=[s]{/*}{*/},% + string=[b]{"},% +}[keywords,comments,strings]% +\lst@definelanguage{ACMscript}[]{VBScript}{% + morekeywords={% + ElseIf,False,In,Resume,True% + },% + deletekeywords={% + Abs,Array,Clear,CreateObject,CStr,Err,ForReading,ForWriting,% + OpenTextFile,Replace,WriteLine% + }% +}[keywords,comments,strings]% +%% %% Corba IDL definition (c) 1999 Jens T. Berger Thielemann %% \lst@definelanguage[CORBA]{IDL}% @@ -325,6 +356,93 @@ morestring=[b]',% }[keywords,comments,strings]% %% +%% http://gretl.sourceforge.net/gretl-help/cmdref.html +%% (c) 2013 Ignacio D\'iaz-Emparanza +%% +\lst@definelanguage{hansl}{% + % $-variables are internal functions in hansl + keywordsprefix ={\$}, + morekeywords={ % hansl commands: + add,adf,anova,append,ar,ar1,% + arbond,arch,arima,biprobit,boxplot,break,% + catch,chow,clear,coeffsum,coint,coint2,% + corr,corrgm,cusum,data,dataset,debug,% + delete,diff,difftest,discrete,dpanel,dummify,% + duration,elif,else,end,endif,endloop,% + eqnprint,equation,estimate,fcast,foreign,fractint,% + freq,function,garch,genr,gmm,gnuplot,% + graphpg,hausman,heckit,help,hsk,hurst,% + if,include,info,intreg,join,kalman,% + kpss,labels,lad,lags,ldiff,leverage,% + levinlin,logistic,logit,logs,loop,mahal,% + makepkg,markers,meantest,mle,modeltab,modprint,% + modtest,mpols,negbin,nls,normtest,nulldata,% + ols,omit,open,orthdev,outfile,panel,% + pca,pergm,poisson,print,printf,probit,% + pvalue,qlrtest,qqplot,quantreg,quit,rename,% + reset,restrict,rmplot,run,runs,scatters,% + sdiff,set,setinfo,setobs,setmiss,shell,% + smpl,spearman,sprintf,square,sscanf,store,% + summary,system,tabprint,textplot,tobit,tsls,% + var,varlist,vartest,vecm,vif,wls,% + xcorrgm,xtab,scalar,series,matrix,string},% + morekeywords=[2]{ % Functions + abs,acos,acosh,aggregate,argname,% + asin,asinh,atan,atanh,atof,% + bessel,BFGSmax,bkfilt,boxcox,bwfilt,% + cdemean,cdf,cdiv,ceil,cholesky,% + chowlin,cmult,cnorm,colname,colnames,% + cols,corr,corrgm,cos,cosh,% + cov,critical,cum,deseas,det,% + diag,diagcat,diff,digamma,dnorm,% + dsort,dummify,eigengen,eigensym,eigsolve,% + epochday,errmsg,exp,fcstats,fdjac,% + fft,ffti,filter,firstobs,fixname,% + floor,fracdiff,gammafun,getenv,getline,% + ghk,gini,ginv,halton,hdprod,% + hpfilt,I,imaxc,imaxr,imhof,% + iminc,iminr,inbundle,infnorm,inlist,% + int,inv,invcdf,invmills,invpd,% + irf,irr,isconst,isnan,isnull,% + isodate,iwishart,kdensity,kfilter,ksimul,% + ksmooth,kurtosis,lags,lastobs,ldet,% + ldiff,lincomb,ljungbox,lngamma,log,% + log10,log2,loess,logistic,lower,% + lrvar,max,maxc,maxr,mcorr,% + mcov,mcovg,mean,meanc,meanr,% + median,mexp,min,minc,minr,% + missing,misszero,mlag,mnormal,mols,% + monthlen,movavg,mpols,mrandgen,mread,% + mreverse,mrls,mshape,msortby,muniform,% + mwrite,mxtab,nadarwat,nelem,ngetenv,% + nobs,normal,npv,NRmax,nullspace,% + obs,obslabel,obsnum,ok,onenorm,% + ones,orthdev,pdf,pergm,pmax,% + pmean,pmin,pnobs,polroots,polyfit,% + princomp,prodc,prodr,psd,psdroot,% + pshrink,psum,pvalue,pxsum,qform,% + qnorm,qrdecomp,quadtable,quantile,randgen,% + randgen1,randint,rank,ranking,rcond,% + readfile,regsub,remove,replace,resample,% + round,rownames,rows,sd,sdc,% + sdiff,selifc,selifr,seq,setnote,% + simann,sin,sinh,skewness,sort,% + sortby,sqrt,sscanf,sst,strlen,% + strncmp,strsplit,strstr,strstrip,strsub,% + sum,sumall,sumc,sumr,svd,% + tan,tanh,toepsolv,tolower,toupper,% + tr,transp,trimr,typestr,uniform,% + uniq,unvech,upper,urcpval,values,% + var,varname,varnum,varsimul,vec,% + vech,weekday,wmean,wsd,wvar,% + xmax,xmin,xpx,zeromiss,zeros,% + },% + sensitive=t,% + morecomment=[l]{\#},% + morecomment=[s]{/*}{*/},% + morestring=[b]{"}}% +\lstalias{gretl}{hansl} +%% %% Haskell98 as implemented in Hugs98. See http://www.haskell.org %% All keywords from Prelude and Standard Libraries %% (c) 1999 Peter Bartke @@ -452,7 +570,7 @@ life,list_together,name number,orders,parse_name,plural,% react_after,react_before,short_name,short_name_indef,time_left,% time_out,when_closed,when_open,when_on,when_off,% - with_key}, + with_key},% % % Library routines morekeywords=[6]{Achieved,AfterRoutines,AllowPushDir,Banner,ChangePlayer,% diff --git a/Master/texmf-dist/tex/latex/listings/lstlang3.sty b/Master/texmf-dist/tex/latex/listings/lstlang3.sty index 5b4b9e94a43..22140c1be23 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 . %% \ProvidesFile{lstlang3.sty} - [2013/08/26 1.5b listings language file] + [2014/03/04 1.5c 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,% @@ -1522,7 +1522,7 @@ literate=% ignorespaces,immediate,indent,input,insert,insertpenalties,% interlinepenalty,jobname,kern,language,lastbox,lastkern,% lastpenalty,lastskip,lccode,leaders,left,lefthyphenmin,leftskip,% - leqno,let,limits,linepenalty,lineskip,lineskiplimits,long,% + leqno,let,limits,linepenalty,lineskip,lineskiplimit,long,% looseness,lower,lowercase,mag,mark,mathaccent,mathbin,mathchar,% mathchardef,mathchoice,mathclose,mathcode,mathinner,mathop,% mathopen,mathord,mathpunct,mathrel,mathsurround,maxdeadcycles,% @@ -1551,7 +1551,7 @@ literate=% vfilneg,vfuzz,voffset,vrule,vsize,vskip,vsplit,vss,vtop,wd,% widowpenalty,write,xdef,xleaders,xspaceskip,year},% sensitive,% - alsoother={0123456789$_},% + alsoother={0123456789$_},%$ to make Emacs fontlocking happy morecomment=[l]\%% }[keywords,tex,comments]% %% diff --git a/Master/texmf-dist/tex/latex/listings/lstmisc.sty b/Master/texmf-dist/tex/latex/listings/lstmisc.sty index 6d46c9a2d5b..f3c083d63a9 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 . %% -\def\filedate{2013/08/26} -\def\fileversion{1.5b} +\def\filedate{2014/03/04} +\def\fileversion{1.5c} \ProvidesFile{lstmisc.sty} [\filedate\space\fileversion\space(Carsten Heinz)] \lst@CheckVersion\fileversion -- cgit v1.2.3