diff options
19 files changed, 259 insertions, 47 deletions
diff --git a/Master/texmf-dist/doc/latex/listings/Makefile b/Master/texmf-dist/doc/latex/listings/Makefile index d8f94375e53..088bd8e1b60 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 127 2014-03-04 19:54:08Z j_hoffmann $ +# $Id: Makefile 152 2014-09-06 17:28:15Z j_hoffmann $ # # (c) 2007 Brooks Moses # (c) 2013 Jobst Hoffmann @@ -78,6 +78,9 @@ lstdrvrs.pdf: lstdrvrs.dtx acm-tests: cd testing; make acm +bash-tests: + cd testing; make bash + fortran-tests: cd testing; make fortran @@ -139,6 +142,9 @@ tar-dist: $(DISTRIBUTION_FILES) $(MAKE) lstdrvrs.pdf; \ tar cfvz $(PACKAGE)-$(VERSION).tgz $^; +release: + @echo "not implemented yet" + ## Documentation target help:: $(info Usage:) @@ -167,6 +173,10 @@ help:: $(info make tar-dist) $(info $(empty) generates a distributable version of the listings) $(info $(empty) package) + $(info ) + $(info make release) + $(info $(empty) creates a new tagged version of the package based on) + $(info $(empty) the contents of listings.version and announcement.txt) @echo "" # prevents message "nothing to do ..." ### Makefile ends here --- diff --git a/Master/texmf-dist/doc/latex/listings/listings.pdf b/Master/texmf-dist/doc/latex/listings/listings.pdf Binary files differindex 6e654c8ff61..4f6e2cb426d 100644 --- a/Master/texmf-dist/doc/latex/listings/listings.pdf +++ b/Master/texmf-dist/doc/latex/listings/listings.pdf diff --git a/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf b/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf Binary files differindex d246049cd3d..5fdaed4528c 100644 --- a/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf +++ b/Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf diff --git a/Master/texmf-dist/source/latex/listings/listings.dtx b/Master/texmf-dist/source/latex/listings/listings.dtx index 4767819937f..4c715bef717 100644 --- a/Master/texmf-dist/source/latex/listings/listings.dtx +++ b/Master/texmf-dist/source/latex/listings/listings.dtx @@ -30,9 +30,9 @@ % % The package has the LPPL maintenance status "maintained". % -% $Id: listings.dtx 125 2014-03-04 19:53:21Z j_hoffmann $ +% $Id: listings.dtx 149 2014-09-06 17:17:38Z j_hoffmann $ % -% The Current Maintainer is Jobst Hoffmann <j.hoffmann-(at)-fh-aachen.de>. +% The Current Maintainer is Jobst Hoffmann <j.hoffmann(at)fh-aachen.de>. % % end of software license % @@ -115,10 +115,10 @@ % Hoffmann became the maintainer of the \packagename{listings} % package in 2013; see the Preface for details.}~ % % \textless\lstemail\textgreater} -% \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}}} +% \date{2014/09/06\enspace\enspace Version 1.5e\ \box\abstractbox} +% \def\lstemail{\href{mailto:j.hoffmann@fh-aachen.de}{\texttt{j.hoffmann(at)fh-aachen.de}}} % \ifhyper -% \hypersetup{pdfsubject=Package guide,pdfauthor=Jobst Hoffmann <j.hoffmann-(at)-fh-aachen.de>} +% \hypersetup{pdfsubject=Package guide,pdfauthor=Jobst Hoffmann <j.hoffmann(at)fh-aachen.de>} % \fi % % \csname @twocolumntrue\endcsname @@ -900,7 +900,7 @@ % % Sometimes authors of language support provide their own configuration % preferences. These may come either from their personal experience or -% from the settings in an IDE and can be defined as a \packagename{listing} +% from the settings in an IDE and can be defined as a \packagename{listings} % style. From version 1.5b of the \packagename{listings} package on these % styles are provided as files with the name % |listings-|\meta{language}|.prf|, \meta{language} is the name of the @@ -915,8 +915,11 @@ % file |listings-python.prf| resides in the \TeX{} search path. Of course % that file can be changed according to the user's preferences. % -% At the moment there are two such preferences files: +% At the moment there are five such preferences files: % \begin{enumerate} +% \item |listings-acm.prf| +% \item |listings-bash.prf| +% \item |listings-fortran.prf| % \item |listings-lua.prf| % \item |listings-python.prf| % \end{enumerate} @@ -5672,8 +5675,8 @@ % \paragraph{Identification} % All files will have same date and version. % \begin{macrocode} -\def\filedate{2014/03/04} -\def\fileversion{1.5c} +\def\filedate{2014/09/06} +\def\fileversion{1.5e} % \end{macrocode} % What we need and who we are. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx b/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx index 10253633a27..3dd876c7aa2 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 126 2014-03-04 19:53:34Z j_hoffmann $ +% $Id: lstdrvrs.dtx 151 2014-09-06 17:21:33Z 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{2014/03/04\enspace\enspace Version 1.5c\ \box\abstractbox} +% \date{2014/09/06\enspace\enspace Version 1.5e\ \box\abstractbox} % % \hypersetup{pdfsubject=Language definitions,pdfauthor=Jobst Hoffmann % <j.hoffmann-(at)-fh-aachen.de>} @@ -101,6 +101,7 @@ \generate{ \file{listings-acm.prf}{\from{lstdrvrs.dtx}{acm-prf}} + \file{listings-bash.prf}{\from{lstdrvrs.dtx}{bash-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}} @@ -128,7 +129,7 @@ % \endgroup % We mainly define default dialects. % \begin{macrocode} -\ProvidesFile{listings.cfg}[2014/03/04 1.5c listings configuration] +\ProvidesFile{listings.cfg}[2014/09/06 1.5e listings configuration] \def\lstlanguagefiles {lstlang0.sty,lstlang1.sty,lstlang2.sty,lstlang3.sty} \lstset{defaultdialect=[R/3 6.10]ABAP, @@ -170,10 +171,11 @@ %<+lang2>\ProvidesFile{lstlang2.sty} %<+lang3>\ProvidesFile{lstlang3.sty} %<+acm-prf>\ProvidesFile{listings-acm.prf} +%<+bash-prf>\ProvidesFile{listings-bash.prf} %<+fortran-prf>\ProvidesFile{listings-fortran.prf} %<+lua-prf>\ProvidesFile{listings-lua.prf} %<+python-prf>\ProvidesFile{listings-python.prf} -%<-config> [2014/03/04 1.5c listings language file] +%<-config> [2014/09/06 1.5e listings language file] % \end{macrocode} % % @@ -831,6 +833,16 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% % \begin{macrocode} %<*lang1> % \end{macrocode} +% \lstthanks{Michael Fiedler}{post@michael-fiedler.net}{2014/09/04} +% provided the following list of new introduced keywords for C++11. +% \begin{macrocode} +\lst@definelanguage[11]{C++}[ISO]{C++}% + {morekeywords={alignas,alignof,char16_t,char32_t,constexpr,% + decltype,noexcept,nullptr,static_assert,thread_local},% + }% +% \end{macrocode} +% \lstthanks{Michael Piefel}{piefel@informatik.hu-berlin.de}{2001/11/21} +% suggested some more changes and added GNU C++. % For compatibility the `ANSI' language is defined in terms of ISO. % \begin{macrocode} \lst@definelanguage[ANSI]{C++}[ISO]{C++}{}% @@ -1369,22 +1381,30 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% }[keywords,comments,strings]% % \end{macrocode} % Thanks to \lstthanks{Riccardo~Murri}{riccardo.murri@gmx.it}{2003/09/24} -% for the following two definitions. +% for the following two +% definitions. \lstthanks{Scott~Pakin}{scott@pakin.org}{2014/08/08} pointed +% out some missing keywords (|elif|, |in| for |sh|, |caller|, |compopt|, +% |coproc|, |dirs|, |help|, |mapfile|, |readarray| for |bash|) to the +% current maintainer. The |sh| list of keywords was checkead against the +% ``Manual of the Bourne Shell on Version 7'', found at +% \url{http://www.in-ulm.de/~mascheck/bourne/v7/}, last visited on +% 2014/09/06. % \begin{macrocode} %% %% bash,sh definition (c) 2003 Riccardo Murri <riccardo.murri@gmx.it> %% \lst@definelanguage{bash}[]{sh}% - {morekeywords={alias,bg,bind,builtin,command,compgen,complete,% - declare,disown,enable,fc,fg,history,jobs,et,local,logout,printf,% - pushd,popd,select,set,suspend,shopt,source,times,type,typeset,% - ulimit,unalias,wait},% + {morekeywords={alias,bg,bind,builtin,caller,command,compgen,compopt,% + complete,coproc,declare,disown,dirs,enable,fc,fg,help,history,% + jobs,let,local,logout,mapfile,printf,pushd,popd,readarray,select,% + set,suspend,shopt,source,times,type,typeset,ulimit,unalias,wait},% }% \lst@definelanguage{sh}% - {morekeywords={awk,break,case,cat,cd,continue,do,done,echo,else,% - env,eval,exec,expr,exit,export,false,fi,for,function,getopts,% - hash,history,if,kill,nice,nohup,ps,pwd,read,readonly,return,% - sed,shift,test,then,times,trap,true,umask,unset,until,while},% + {morekeywords={awk,break,case,cat,cd,continue,do,done,echo,elif,else,% + env,esac,eval,exec,exit,export,expr,false,fi,for,function,getopts,% + hash,history,if,in,kill,login,newgrp,nice,nohup,ps,pwd,read,% + readonly,return,set,sed,shift,test,then,times,trap,true,type,% + ulimit,umask,unset,until,wait,while},% morecomment=[l]\#,% morestring=[d]"% }[keywords,comments,strings]% @@ -1392,6 +1412,62 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% % \end{macrocode} % \endgroup % +% \begingroup +% Jobst Hoffmann copied the definition of a style for printing Fortran code +% to a style for printing shell programs: +% \begin{macrocode} +%<*bash-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{bash}{% + 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{bashbw}{% + backgroundcolor={},% + basicstyle=\small\ttfamily,% + identifierstyle={},% + keywordstyle=\bfseries,% + stringstyle=\itshape,% + commentstyle=\slshape,% + rulesepcolor=\color{black},% +}% +% \end{macrocode} +% This code is provided in the file |listings-bash.prf|, see section +% 2.4.1 (Preferences) of the \packagename{listings} documentation. +% \begin{macrocode} +%</bash-prf> +% \end{macrocode} +% \endgroup +% % % \subsection{Delphi} % @@ -2327,7 +2403,7 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% % \endgroup % % -% \subsection{Java} +% \subsection{Java and other JVM based languages} % % \lstthanks{Robert~Wenner}{robert.wenner@gmx.de}{2003/03/27} sent in the % first of the following two definitions. @@ -2448,6 +2524,40 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% % \endgroup % % +% \subsubsection{Scala} +% +% \lstthanks{Bastian Germann}{bastian.germann@nordakademie.de}{2013/10/19} +% asked to include the Scala definition provided by Frank Teubler +% (2009). Here it is: +% \begingroup +% \begin{macrocode} +%<*lang3> +% \end{macrocode} +% \begin{macrocode} +\lst@definelanguage{Scala}% + {morekeywords={abstract,case,catch,class,def,% + do,else,extends,false,final,finally,% + for,if,implicit,import,lazy,match,mixin,% + new,null,object,override,package,% + private,protected,requires,return,sealed,% + super,this,trait,true,try,% + type,val,var,while,with,yield},%+ +% otherkeywords={_,:,=,=>,<<:,<\%,>:,\#,@},% + otherkeywords={=,=>,<-,<\%,<:,>:,\#,@},% + sensitive,% + morecomment=[l]//,% + morecomment=[n]{/*}{*/},% + morestring=[b]",% + morestring=[b]',% + morestring=[b]""",% + }[keywords,comments,strings]% +% \end{macrocode} +% \begin{macrocode} +%</lang3> +% \end{macrocode} +% \endgroup +% +% % \subsection{ksh} % % Thanks to \lstthanks{Jeffrey Ratcliffe}{Jeffrey.Ratcliffe@m.eads.net} diff --git a/Master/texmf-dist/source/latex/listings/lstdrvrs.ins b/Master/texmf-dist/source/latex/listings/lstdrvrs.ins index 35958a9f1b5..510673ad8d0 100644 --- a/Master/texmf-dist/source/latex/listings/lstdrvrs.ins +++ b/Master/texmf-dist/source/latex/listings/lstdrvrs.ins @@ -39,6 +39,7 @@ \generate{ \file{listings-acm.prf}{\from{lstdrvrs.dtx}{acm-prf}} + \file{listings-bash.prf}{\from{lstdrvrs.dtx}{bash-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}} @@ -54,7 +55,7 @@ } \endbatchfile - [2014/03/04 1.5c listings language file] + [2014/09/06 1.5e listings language file] \endinput %% %% End of file `lstdrvrs.ins'. diff --git a/Master/texmf-dist/tex/latex/listings/listings-acm.prf b/Master/texmf-dist/tex/latex/listings/listings-acm.prf index 1437efb337b..eca3d271680 100644 --- a/Master/texmf-dist/tex/latex/listings/listings-acm.prf +++ b/Master/texmf-dist/tex/latex/listings/listings-acm.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% \ProvidesFile{listings-acm.prf} - [2014/03/04 1.5c listings language file] + [2014/09/06 1.5e listings language file] \usepackage[rgb, x11names]{xcolor} \definecolor{Comments}{rgb}{0.00,0.50,0.00} diff --git a/Master/texmf-dist/tex/latex/listings/listings-bash.prf b/Master/texmf-dist/tex/latex/listings/listings-bash.prf new file mode 100644 index 00000000000..9b8bfbeb444 --- /dev/null +++ b/Master/texmf-dist/tex/latex/listings/listings-bash.prf @@ -0,0 +1,66 @@ +%% +%% This is file `listings-bash.prf', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lstdrvrs.dtx (with options: `bash-prf') +%% +%% The listings package is copyright 1996--2004 Carsten Heinz, and +%% continued maintenance on the package is copyright 2006--2007 Brooks +%% Moses. From 2013 on the maintenance is done by Jobst Hoffmann. +%% The drivers are copyright 1997/1998/1999/2000/2001/2002/2003/2004/2006/ +%% 2007/2013 any individual author listed in this file. +%% +%% This file is distributed under the terms of the LaTeX Project Public +%% License from CTAN archives in directory macros/latex/base/lppl.txt. +%% Either version 1.3 or, at your option, any later version. +%% +%% This file is completely free and comes without any warranty. +%% +%% Send comments and ideas on the package, error reports and additional +%% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. +%% +\ProvidesFile{listings-bash.prf} + [2014/09/06 1.5e 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{bash}{% + 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{bashbw}{% + backgroundcolor={},% + basicstyle=\small\ttfamily,% + identifierstyle={},% + keywordstyle=\bfseries,% + stringstyle=\itshape,% + commentstyle=\slshape,% + rulesepcolor=\color{black},% +}% +\endinput +%% +%% End of file `listings-bash.prf'. diff --git a/Master/texmf-dist/tex/latex/listings/listings-fortran.prf b/Master/texmf-dist/tex/latex/listings/listings-fortran.prf index f80fffba336..b932a9cae16 100644 --- a/Master/texmf-dist/tex/latex/listings/listings-fortran.prf +++ b/Master/texmf-dist/tex/latex/listings/listings-fortran.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% \ProvidesFile{listings-fortran.prf} - [2014/03/04 1.5c listings language file] + [2014/09/06 1.5e listings language file] \usepackage[rgb, x11names]{xcolor} \lstset{% diff --git a/Master/texmf-dist/tex/latex/listings/listings-lua.prf b/Master/texmf-dist/tex/latex/listings/listings-lua.prf index 7e02a99dac6..efed479ba42 100644 --- a/Master/texmf-dist/tex/latex/listings/listings-lua.prf +++ b/Master/texmf-dist/tex/latex/listings/listings-lua.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% \ProvidesFile{listings-lua.prf} - [2014/03/04 1.5c listings language file] + [2014/09/06 1.5e listings language file] \usepackage[rgb, x11names]{xcolor} \lstdefinestyle{Lua}{% language=[5.2]Lua, diff --git a/Master/texmf-dist/tex/latex/listings/listings-python.prf b/Master/texmf-dist/tex/latex/listings/listings-python.prf index 3cf2c02a01c..7bb4714eb6c 100644 --- a/Master/texmf-dist/tex/latex/listings/listings-python.prf +++ b/Master/texmf-dist/tex/latex/listings/listings-python.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% \ProvidesFile{listings-python.prf} - [2014/03/04 1.5c listings language file] + [2014/09/06 1.5e listings language file] \usepackage{xcolor} \usepackage{textcomp} diff --git a/Master/texmf-dist/tex/latex/listings/listings.cfg b/Master/texmf-dist/tex/latex/listings/listings.cfg index 54f165b0889..cd865576ae4 100644 --- a/Master/texmf-dist/tex/latex/listings/listings.cfg +++ b/Master/texmf-dist/tex/latex/listings/listings.cfg @@ -21,7 +21,7 @@ %% Send comments and ideas on the package, error reports and additional %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% -\ProvidesFile{listings.cfg}[2014/03/04 1.5c listings configuration] +\ProvidesFile{listings.cfg}[2014/09/06 1.5e 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 f1bf1ab74f1..a1a6f5eecb2 100644 --- a/Master/texmf-dist/tex/latex/listings/listings.sty +++ b/Master/texmf-dist/tex/latex/listings/listings.sty @@ -16,8 +16,8 @@ %% Send comments and ideas on the package, error reports and additional %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% -\def\filedate{2014/03/04} -\def\fileversion{1.5c} +\def\filedate{2014/09/06} +\def\fileversion{1.5e} \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 79127afdf69..295815bd750 100644 --- a/Master/texmf-dist/tex/latex/listings/lstdoc.sty +++ b/Master/texmf-dist/tex/latex/listings/lstdoc.sty @@ -16,8 +16,8 @@ %% Send comments and ideas on the package, error reports and additional %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% -\def\filedate{2014/03/04} -\def\fileversion{1.5c} +\def\filedate{2014/09/06} +\def\fileversion{1.5e} \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 177880e56d3..69f4a4a5edb 100644 --- a/Master/texmf-dist/tex/latex/listings/lstlang1.sty +++ b/Master/texmf-dist/tex/latex/listings/lstlang1.sty @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% \ProvidesFile{lstlang1.sty} - [2014/03/04 1.5c listings language file] + [2014/09/06 1.5e listings language file] %% %% ACSL definition (c) 2000 by Andreas Matthias %% @@ -207,6 +207,10 @@ morecomment=[s]{/*}{*/},% morestring=[b]",% }[keywords,comments,strings,keywordcomments] +\lst@definelanguage[11]{C++}[ISO]{C++}% + {morekeywords={alignas,alignof,char16_t,char32_t,constexpr,% + decltype,noexcept,nullptr,static_assert,thread_local},% + }% \lst@definelanguage[ANSI]{C++}[ISO]{C++}{}% \lst@definelanguage[GNU]{C++}[ISO]{C++}% {morekeywords={__attribute__,__extension__,__restrict,__restrict__,% @@ -293,16 +297,17 @@ %% bash,sh definition (c) 2003 Riccardo Murri <riccardo.murri@gmx.it> %% \lst@definelanguage{bash}[]{sh}% - {morekeywords={alias,bg,bind,builtin,command,compgen,complete,% - declare,disown,enable,fc,fg,history,jobs,et,local,logout,printf,% - pushd,popd,select,set,suspend,shopt,source,times,type,typeset,% - ulimit,unalias,wait},% + {morekeywords={alias,bg,bind,builtin,caller,command,compgen,compopt,% + complete,coproc,declare,disown,dirs,enable,fc,fg,help,history,% + jobs,let,local,logout,mapfile,printf,pushd,popd,readarray,select,% + set,suspend,shopt,source,times,type,typeset,ulimit,unalias,wait},% }% \lst@definelanguage{sh}% - {morekeywords={awk,break,case,cat,cd,continue,do,done,echo,else,% - env,eval,exec,expr,exit,export,false,fi,for,function,getopts,% - hash,history,if,kill,nice,nohup,ps,pwd,read,readonly,return,% - sed,shift,test,then,times,trap,true,umask,unset,until,while},% + {morekeywords={awk,break,case,cat,cd,continue,do,done,echo,elif,else,% + env,esac,eval,exec,exit,export,expr,false,fi,for,function,getopts,% + hash,history,if,in,kill,login,newgrp,nice,nohup,ps,pwd,read,% + readonly,return,set,sed,shift,test,then,times,trap,true,type,% + ulimit,umask,unset,until,wait,while},% morecomment=[l]\#,% morestring=[d]"% }[keywords,comments,strings]% diff --git a/Master/texmf-dist/tex/latex/listings/lstlang2.sty b/Master/texmf-dist/tex/latex/listings/lstlang2.sty index 0379c047b26..2514dcb605d 100644 --- a/Master/texmf-dist/tex/latex/listings/lstlang2.sty +++ b/Master/texmf-dist/tex/latex/listings/lstlang2.sty @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% \ProvidesFile{lstlang2.sty} - [2014/03/04 1.5c listings language file] + [2014/09/06 1.5e listings language file] %% %% Abap definition by Knut Lickert %% diff --git a/Master/texmf-dist/tex/latex/listings/lstlang3.sty b/Master/texmf-dist/tex/latex/listings/lstlang3.sty index 22140c1be23..d8fafbd4fba 100644 --- a/Master/texmf-dist/tex/latex/listings/lstlang3.sty +++ b/Master/texmf-dist/tex/latex/listings/lstlang3.sty @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% \ProvidesFile{lstlang3.sty} - [2014/03/04 1.5c listings language file] + [2014/09/06 1.5e 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,% @@ -330,6 +330,22 @@ SUBX,SWAP,TAS,TRAP,TRAPV,TST,UNLK},% morestring=[b]",% morestring=[b]'% }[keywords,comments,strings]% +\lst@definelanguage{Scala}% + {morekeywords={abstract,case,catch,class,def,% + do,else,extends,false,final,finally,% + for,if,implicit,import,lazy,match,mixin,% + new,null,object,override,package,% + private,protected,requires,return,sealed,% + super,this,trait,true,try,% + type,val,var,while,with,yield},%+ +otherkeywords={=,=>,<-,<\%,<:,>:,\#,@},% + sensitive,% + morecomment=[l]//,% + morecomment=[n]{/*}{*/},% + morestring=[b]",% + morestring=[b]',% + morestring=[b]""",% + }[keywords,comments,strings]% \lst@definelanguage{ksh} {morekeywords={alias,awk,cat,echo,else,elif,fi,exec,exit,% for,in,do,done,select,case,esac,while,until,function,% diff --git a/Master/texmf-dist/tex/latex/listings/lstmisc.sty b/Master/texmf-dist/tex/latex/listings/lstmisc.sty index f3c083d63a9..53d7e6763d5 100644 --- a/Master/texmf-dist/tex/latex/listings/lstmisc.sty +++ b/Master/texmf-dist/tex/latex/listings/lstmisc.sty @@ -16,8 +16,8 @@ %% Send comments and ideas on the package, error reports and additional %% programming languages to Jobst Hoffmann at <j.hoffmann@fh-aachen.de>. %% -\def\filedate{2014/03/04} -\def\fileversion{1.5c} +\def\filedate{2014/09/06} +\def\fileversion{1.5e} \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 a13cad0b031..dad2d9a742a 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1493,6 +1493,7 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$'; 'lhcyr', 'lhcyr.*', 'librarian', '(t-)?librarian.(tex|sty)', 'listbib', 'listbib.tex|' . $standardtex, + 'listings', '\.prf|' . $standardtex, 'listings-ext','\.sty', # not .cfg 'logic', 'milstd\.tex|' . $standardtex, 'lollipop', '\.ini|lollipop\.tex|lollipop-.*tex|lollipop.tex', |