From 062fe54d426465fe5a5450f7338ccbe2d165d5d1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 13 Mar 2024 20:08:51 +0000 Subject: listings (12mar24) git-svn-id: svn://tug.org/texlive/trunk@70624 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/listings/listings-devel.pdf | Bin 1451811 -> 1451842 bytes Master/texmf-dist/doc/latex/listings/listings.pdf | Bin 1026570 -> 1026586 bytes Master/texmf-dist/doc/latex/listings/lstdrvrs.pdf | Bin 755742 -> 761854 bytes .../texmf-dist/source/latex/listings/listings.dtx | 7 +- .../texmf-dist/source/latex/listings/lstdrvrs.dtx | 247 ++++++++++++++------- .../texmf-dist/source/latex/listings/lstdrvrs.ins | 3 +- .../texmf-dist/tex/latex/listings/listings-acm.prf | 2 +- .../tex/latex/listings/listings-bash.prf | 2 +- .../tex/latex/listings/listings-fortran.prf | 2 +- .../tex/latex/listings/listings-hansl.prf | 2 +- .../texmf-dist/tex/latex/listings/listings-lua.prf | 2 +- .../tex/latex/listings/listings-python.prf | 2 +- .../tex/latex/listings/listings-rexx.prf | 50 +++++ Master/texmf-dist/tex/latex/listings/listings.cfg | 2 +- Master/texmf-dist/tex/latex/listings/listings.sty | 4 +- Master/texmf-dist/tex/latex/listings/lstdoc.sty | 4 +- Master/texmf-dist/tex/latex/listings/lstlang1.sty | 34 +-- Master/texmf-dist/tex/latex/listings/lstlang2.sty | 62 +++--- Master/texmf-dist/tex/latex/listings/lstlang3.sty | 72 +++--- Master/texmf-dist/tex/latex/listings/lstmisc.sty | 4 +- Master/texmf-dist/tex/latex/listings/lstpatch.sty | 1 + 21 files changed, 322 insertions(+), 180 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/listings/listings-rexx.prf diff --git a/Master/texmf-dist/doc/latex/listings/listings-devel.pdf b/Master/texmf-dist/doc/latex/listings/listings-devel.pdf index 77335799e18..5cf9af1ff8d 100644 Binary files a/Master/texmf-dist/doc/latex/listings/listings-devel.pdf and b/Master/texmf-dist/doc/latex/listings/listings-devel.pdf differ diff --git a/Master/texmf-dist/doc/latex/listings/listings.pdf b/Master/texmf-dist/doc/latex/listings/listings.pdf index 6c0b7ece78d..41c366106af 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 c0a320d0958..e5ded0321c7 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 c336295db5c..06f881726bb 100644 --- a/Master/texmf-dist/source/latex/listings/listings.dtx +++ b/Master/texmf-dist/source/latex/listings/listings.dtx @@ -135,7 +135,7 @@ % Hoffmann became the maintainer of the \packagename{listings} % package in 2013; see the Preface for details.}~ % % \textless\lstemail\textgreater} -% \date{2024/02/21\enspace\enspace Version 1.10\ \box\abstractbox} +% \date{2024/03/11\enspace\enspace Version 1.10a\ \box\abstractbox} % \def\lstemail{\href{mailto:j.hoffmann@fh-aachen.de}{\texttt{j.hoffmann(at)fh-aachen.de}}} % \ifhyper % \hypersetup{pdftitle=The Listings Package, @@ -6122,8 +6122,8 @@ % All files will have same date and version. % \begin{macrocode} %<*kernel|misc|doc> -\def\filedate{2024/02/21} -\def\fileversion{1.10} +\def\filedate{2024/03/11} +\def\fileversion{1.10a} % % \end{macrocode} % What we need and who we are. @@ -6165,6 +6165,7 @@ \ProvidesFile{lstpatch.sty} [\filedate\space\fileversion\space(Carsten Heinz)] \lst@CheckVersion\lst@version{} +%%% intentionally empty % % \end{macrocode} % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx b/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx index 02dc1ea88ac..56c2a926424 100644 --- a/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx +++ b/Master/texmf-dist/source/latex/listings/lstdrvrs.dtx @@ -1,6 +1,6 @@ % \iffalse % -% Time-stamp: <2024-02-17 18:25:08 ax006ho> +% Time-stamp: <2024-03-12 09:33:03 ax006ho> % %<*driver> \documentclass{ltxdoc} @@ -33,7 +33,7 @@ % \title{Language, Style and Format drivers\\ for \textsf{Listings}\\ % {\large by Carsten Heinz and individual authors:}} % \author{\InputIfFileExists{lstdrvrs.tmp}{}{}} -% \date{2024/02/21\enspace\enspace Version 1.10\ \box\abstractbox} +% \date{2024/03/11\enspace\enspace Version 1.10a\ \box\abstractbox} % % \ifhyper % \hypersetup{pdftitle={Language, Style and Format drivers for the @@ -113,6 +113,7 @@ \file{listings-hansl.prf}{\from{lstdrvrs.dtx}{hansl-prf}} \file{listings-lua.prf}{\from{lstdrvrs.dtx}{lua-prf}} \file{listings-python.prf}{\from{lstdrvrs.dtx}{python-prf}} + \file{listings-rexx.prf}{\from{lstdrvrs.dtx}{rexx-prf}} } @@ -137,7 +138,7 @@ % \endgroup % We mainly define default dialects. % \begin{macrocode} -\ProvidesFile{listings.cfg}[2024/02/21 1.10 listings configuration] +\ProvidesFile{listings.cfg}[2024/03/11 1.10a listings configuration] \def\lstlanguagefiles {lstlang0.sty,lstlang1.sty,lstlang2.sty,lstlang3.sty} \lstset{defaultdialect=[R/3 6.10]ABAP, @@ -184,7 +185,8 @@ %<+hansl-prf>\ProvidesFile{listings-hansl.prf} %<+lua-prf>\ProvidesFile{listings-lua.prf} %<+python-prf>\ProvidesFile{listings-python.prf} -%<-config> [2024/02/21 1.10 listings language file] +%<+rexx-prf>\ProvidesFile{listings-rexx.prf} +%<-config> [2024/03/11 1.10a listings language file] % \end{macrocode} % % @@ -320,7 +322,7 @@ morecomment=[l]{//},% morecomment=[s]{/*}{*/},% string=[b]{"},% -}[keywords,comments,strings]% +}[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -343,7 +345,7 @@ Abs,Array,Clear,CreateObject,CStr,Err,ForReading,ForWriting,% OpenTextFile,Replace,WriteLine% }% -}[keywords,comments,strings]% +}[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -462,7 +464,7 @@ morecomment=[l]--,% morestring=[m]",% percent not defined as stringizer so far morestring=[m]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -628,7 +630,7 @@ morecomment=[l]//,% morecomment=[s]{/*}{*/},% morestring=[b]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] % % \end{macrocode} % \endgroup @@ -809,7 +811,7 @@ morecomment=[l]//,% missing comma: Markus Pahlow morecomment=[n]{/*}{*/},% morestring=[b]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] % % \end{macrocode} % \endgroup @@ -990,7 +992,7 @@ morecomment=[s]{/*}{*/},% morecomment=[l]//,% morestring=[b]" - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -1091,7 +1093,7 @@ sensitive=true,% morecomment=[l]{//},% morestring=[b]"% -}[keywords,comments,strings]% +}[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -1173,7 +1175,7 @@ sensitive=f,% ??? morecomment=[f][commentstyle][6]*,% morestring=[d]"% ??? doubled - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \texttt{commentstyle} (not the surrounding brackets) have been added after % a bug report by \lsthelper{Stephen Reindl}{Stephen.Reindl@vodafone.de} @@ -1208,7 +1210,7 @@ sensitive=f,% ??? morecomment=[l]//,% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -1247,7 +1249,7 @@ morecomment=[l]{REm},% morecomment=[l]{REM},% morestring=[d]"% -}[keywords,comments,strings]% +}[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -1369,7 +1371,7 @@ sensitive=false,% morecomment=[l]\%,% morestring=[m]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -1398,7 +1400,7 @@ sqrt,BEGIN,END},% morecomment=[l]\#,% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % Thanks to \lstthanks{Riccardo~Murri}{riccardo.murri@gmx.it}{2003/09/24} % for the following two @@ -1429,7 +1431,7 @@ morecomment=[l]\#,% morestring=[d]",% morestring=[d]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] % % \end{macrocode} % \endgroup @@ -1547,7 +1549,7 @@ morecomment=[s]{\{}{\}},% morecomment=[l]{//},% 2001 Christian Gudrian morestring=[d]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -1581,7 +1583,7 @@ sensitive,% morecomment=[l]--,% morestring=[d]",% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % The key=value \texttt{stringtest=false} has been removed after a bug % report from \lsthelper{Xavier~Cr\'egut}{cregut@enseeiht.fr}{2002/09/09} @@ -1623,7 +1625,7 @@ replacerow,replacecolumn,replaceelement,transp,errorsstop,stop},% sensitive,% morestring=[d]"% - }[keywords,strings]% + }[keywords,strings] % \end{macrocode} % \begin{macrocode} % @@ -1657,7 +1659,7 @@ morecomment=[l]\%,% morestring=[b]",% morestring=[b]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -1693,7 +1695,7 @@ morecomment=[l]--,% morestring=[d]',% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -1888,7 +1890,7 @@ morecomment=[l]!% morecomment=[f]c,% morestring=[d]",%% not Fortran-77 standard, but allowed in Fortran-95 %% morestring=[d]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -2027,7 +2029,7 @@ morecomment=[l]!% morestring=[b]',% morestring=[b]",% morestring=[s]{`}{`},% -}[keywords,comments,strings]% +}[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -2066,7 +2068,7 @@ morecomment=[l]!% sensitive=f,% morecomment=[s]{\{}{\}},% morestring=[d]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -2105,7 +2107,7 @@ morecomment=[l]!% comment=[l]\#,% morestring=[b]",% morestring=[b]',% - }[keywords,comments,strings]% + }[keywords,comments,strings] % % \end{macrocode} % \endgroup @@ -2333,7 +2335,7 @@ morecomment=[l]!% morecomment=[l]--,% morecomment=[n]{\{-}{-\}},% morestring=[b]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -2425,7 +2427,7 @@ morecomment=[l]!% sensitive=f,% morecomment=[l];,% morestring=[d]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -2447,7 +2449,7 @@ morecomment=[l]!% %% %% Inform definition (c) 2003 Jonathan Sauer %% -\lst@definelanguage{inform}{% +\lst@definelanguage{Inform}{% % Language keywords morekeywords={breakdo,else,false,for,has,hasnt,if,% in,indirect,jump,notin,nothing,NULL,objectloop,ofclass,% @@ -2530,7 +2532,7 @@ morecomment=[l]!% sensitive=false,% morestring=[d]{"},% morecomment=[l]{!}% -}[keywords,comments,strings]% +}[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -2606,7 +2608,7 @@ morecomment=[l]!% morecomment=[s]{/*}{*/},% morestring=[b]",% morestring=[b]',% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \lsthelper{Herbert Voss}{Herbert.Voss@alumni.TU-Berlin.de}{2002/07/30} % {missing keyword label} added the keyword \texttt{label}. @@ -2615,6 +2617,9 @@ morecomment=[l]!% % \end{macrocode} % \endgroup % +% +% \subsubsection[JVMIS---Java bytecode instructions]{JVMIS---The Java bytecode instructions} +% % \lstthanks{Martine~Gautier}{Martine.Gautier@loria.fr}{2004/03/30} made the % following contribution. % \begingroup @@ -2663,29 +2668,52 @@ morecomment=[l]!% % % \lstthanks{Bastian Germann}{bastian.germann@nordakademie.de}{2013/10/19} % asked to include the Scala definition provided by Frank Teubler -% (2009). Here it is: +% (2009). Here it is---the definition has got a small overhaul according to +% the Scala syntax published for version 2.13 +% (\url{https://scala-lang.org/files/archive/spec/2.13/spec.pdf}): % \begingroup % \begin{macrocode} %<*lang3> % \end{macrocode} % \begin{macrocode} -\lst@definelanguage{Scala}% - {morekeywords={abstract,case,catch,class,def,% +\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,% + for,forSome,if,implicit,import,lazy,macro,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]% + otherkeywords={_, :, =, =>, <-, <\%, <:, >:, \#, @},% + sensitive,% + morecomment=[l]//,% + morecomment=[n]{/*}{*/},% + morestring=[b]",% + morestring=[b]',% + morestring=[b]""",% +}[keywords,comments,strings] +% \end{macrocode} +% Remark: This definition contains the keywords |mixin| and |requires|, +% which don't belong to the official Scala 2.13 language definition, the +% keywords |forSome|, |macro|, and |throw|, which were missing in listings +% prior than v1.10a, are added silently. The Unicode operators |\u21D2| and +% |\u2190|, which have the ASCII equivalents |=>| and |<-|, are also +% reserved but cannot be used with PDF\TeX. +% +% \lstthanks{Deloo}{lucadelu97@gmail.com}{2024-03-02} asked for Scala 3.0 +% support. The following code according to +% \url{https://docs.scala-lang.org/scala3/reference/syntax.html} is a +% simple approach, \textsf{listings} cannot correctly support soft +% keywords, because they are context dependent. +% \begin{macrocode} +\lst@definelanguage[3.0]{Scala}[]{Scala}{% + morekeywords={as, derives, end, enum, export, extension, given}, + morekeywords=[2]{infix, inline, opaque, open, transparent} + otherkeywords={=>>, ?=>, =>}, % =>> isn't recognized, even after + % the keyword => is deleted + alsoletter={*, +, -, |}, + deletekeywords={<\%, _, forSome, macro, mixin, requires, this}, +}[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -2715,7 +2743,8 @@ morecomment=[l]!% morestring=[d]",% morestring=[d]',% morestring=[d]`% - }[keywords,comments,strings]% + }[keywords,comments,strings] +% \end{macrocode} % \begin{macrocode} % % \end{macrocode} @@ -2938,7 +2967,7 @@ morecomment=[l]!% sensitive=false,% morecomment=[l]{--},% morestring=[b]",% -}[keywords,comments,strings]% +}[keywords,comments,strings] % \begin{macrocode} % % \end{macrocode} @@ -3011,7 +3040,7 @@ morecomment=[l]!% morecomment=[l];,% morecomment=[s]{\#|}{|\#},% 1997 Aslak Raanes morestring=[b]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -3120,7 +3149,7 @@ morecomment=[l]!% morecomment=[l];,% morecomment=[l];;,% morestring=[b]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -3148,7 +3177,7 @@ morecomment=[l]!% morecomment=[l];,% morecomment=[l];;,% morestring=[b]"% -}[keywords,comments,strings]% +}[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -3399,7 +3428,7 @@ morecomment=[l]!% morestring=[b]',% % multi line strings morestring=[s]{[[}{]]},% -}[keywords,comments,strings]% +}[keywords,comments,strings] % \end{macrocode} % \endgroup % And here are the new definitions for Lua 5.1: @@ -3498,7 +3527,7 @@ morecomment=[l]!% morestring=[s]{[========[}{]========]},% morestring=[s]{[=========[}{]=========]},% morestring=[s]{[==========[}{]==========]},% -}[keywords,comments,strings]% +}[keywords,comments,strings] % \end{macrocode} % \endgroup % @@ -3582,7 +3611,7 @@ morecomment=[l]!% % and labels are also new in Lua 5.2 % \begin{macrocode} moredelim=[s][keywordstyle3]{::}{::},% -}[keywords,comments,strings]% +}[keywords,comments,strings] % \end{macrocode} % \endgroup % @@ -3642,7 +3671,7 @@ morecomment=[l]!% utf8, utf8.char, utf8.charpattern, utf8.codepoint, utf8.codes,% utf8.len, utf8.offset,% },% -}[keywords,comments,strings]% +}[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -3816,7 +3845,7 @@ morecomment=[l]!% sensitive,% morecomment=[l]\%,% morestring=[m]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -5972,7 +6001,7 @@ morecomment=[l]!% sensitive,% morecomment=[s]{(*}{*)},% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -6012,7 +6041,7 @@ morecomment=[l]!% morecomment=[s]{/*}{*/},% morestring=[bd]",% morestring=[bd]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -6131,7 +6160,7 @@ morecomment=[l]!% sensitive,% morecomment=[l]||,% morestring=[b]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -6201,7 +6230,7 @@ morecomment=[l]!% sensitive,% morecomment=[n]{(*}{*)},% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -6237,7 +6266,7 @@ morecomment=[l]!% morecomment=[n]{(*}{*)},% morestring=[d]',% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -6328,7 +6357,7 @@ morecomment=[l]!% morecomment=[n]{(*}{*)},% morestring=[d]',% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -6406,7 +6435,7 @@ morecomment=[l]!% sensitive=t,% morecomment=[l]--,% morestring=[d]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % After a bug report by \lsthelper{Martin~S\"u\ss kraut}{Edon.Myder@web.de} % {2003/01/30}{morerdkeywords doesn't exist any more} \texttt{morerdkeywords} @@ -6506,7 +6535,7 @@ morecomment=[l]!% morecomment=[l]\%,% morestring=[m]',% morestring=[m]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -6539,7 +6568,7 @@ morecomment=[l]!% morecomment=[s]{/*}{*/},% morestring=[b]",% morestring=[d]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -6617,7 +6646,7 @@ morecomment=[l]!% morecomment=[s]{(*}{*)},% morecomment=[s]{\{}{\}},% morestring=[d]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -6667,7 +6696,7 @@ morecomment=[l]!% morestring=[b]',% MoreSelectCharTable=% \lst@ReplaceInput{\$\#}{\lst@ProcessOther\$\lst@ProcessOther\#}% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -7268,7 +7297,7 @@ morecomment=[l]!% morecomment=[s]{/*}{*/},% morestring=[b]",% morestring=[b]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -7358,7 +7387,7 @@ morecomment=[l]!% morecomment=[s]{\%}{\%},% morestring=[b]',% literate={~}{{$\sim$}}{1} {^}{$\wedge$}{1},% - }[keywords,directives,comments,strings]% + }[keywords,directives,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -7398,7 +7427,7 @@ morecomment=[l]!% sensitive=f,% morecomment=[s]{/*}{*/},% morestring=[d]'% -}[keywords,comments,strings]% +}[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -7558,7 +7587,7 @@ morecomment=[l]!% morecomment=[l]//,% morecomment=[s]{/*}{*/},% morestring=[d]",% - }[keywords,directives,comments,strings]% + }[keywords,directives,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -7593,7 +7622,7 @@ morecomment=[l]!% morecomment=[s]{/*}{*/},% morestring=[bd]",% morestring=[bd]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -7932,7 +7961,7 @@ morecomment=[l]!% morecomment=[n]{/*}{*/},% morestring=[d]{'},% morestring=[d]{"},% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -7971,11 +8000,15 @@ morecomment=[l]!% morestring=[d]",% morestring=[d]',% morecomment=[s]{/*}{*/},% -}[keywords,comments,strings]% +}[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % % \end{macrocode} +% \lstthanks{Shmuel (Seymour J.) Metz}{smetz3@gmu.edu}{% +% 2023-10-30} pointed out the previously unsupported special variables +% |result| etc.. He also gave the advice to complete the definitions +% for OORexx in the following section. % \endgroup % % @@ -8002,6 +8035,54 @@ morecomment=[l]!% % \endgroup % % +% \begingroup +% Jobst Hoffmann added the following configuration for printing +% Rexx code which is similar to the colors used by the Fortran preferences file. +% \begin{macrocode} +%<*rexx-prf> +% \end{macrocode} +% \begin{macrocode} +\usepackage{xcolor} +\usepackage{textcomp} + +%% Actual colors from idlelib/config-highlight.def +%% --> corrected to ``web-safe'' +%% strings = #00aa00 / 0,170,0 (a darker green) +%% builtins = #900090 / 144,0,144 (purple-ish) +%% keywords = #FF7700 / 255,119,0 (quite close to plain `orange') +%\definecolor{IDLEorange}{RGB}{255,119,0} % pretty close to real orange +%\definecolor{IDLEpurple}{RGB}{144,0,144} +%\definecolor{IDLEgreen}{RGB}{0,170,0} +%\definecolor{IDLEred}{RGB}{221,0,0} +%% Corrected to ``web-safe'' +%\definecolor{orange2}{RGB}{255,102,0} +\definecolor{purple2}{RGB}{153,0,153} % there's actually no standard purple +\definecolor{green2}{RGB}{0,153,0} % a darker green +%\definecolor{red2}{RGB}{221,0,0} + +% Except for green and purple, the other colors are pretty good in standard +% hue +\lstdefinestyle{python-idle-code}{% + language=Python, % the language + basicstyle=\normalsize\ttfamily, % size of the fonts for the code + % Color settings to match IDLE style + keywordstyle=\color{orange}, % core keywords + keywordstyle={[2]\color{purple2}}, % built-ins + stringstyle=\color{green2},% + commentstyle=\color{red},% + upquote=true, % requires textcomp +} +% Unimplemented IDLE syntax: function/class names being defined should be +% blue +% \end{macrocode} +% This code is provided in the file |listings-rexx.prf|, see section +% 2.4.1 (Preferences) of the \packagename{listings} documentation. +% \begin{macrocode} +% +% \end{macrocode} +% \endgroup +% +% % \subsection{Reduce} % % was provided by \lstthanks{Geraint~Paul~Bevan}{geraint@users.sf.net} @@ -8064,7 +8145,7 @@ morecomment=[l]!% morecomment=[s]{COMMENT}{;},% morecomment=[s]{COMMENT}{$},% morestring="% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -8232,7 +8313,7 @@ literate=% morestring=[s]{\%Q(}{)},% morestring=[s]{\%Q[}{]},% morestring=[s]{\%Q-}{-}% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \begin{macrocode} % % \end{macrocode} @@ -8408,7 +8489,7 @@ literate=% morecomment=[l]//,% morestring=[b]",% morestring=[m]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -8485,7 +8566,7 @@ literate=% keywordcommentsemicolon={end}{else,end,otherwise,when}{comment},% morestring=[d]",% morestring=[d]'% - }[keywords,keywordcomments,strings]% + }[keywords,keywordcomments,strings] % \end{macrocode} % \begin{macrocode} % @@ -8516,7 +8597,7 @@ literate=% morecomment=[l]\#,% morestring=[d]',% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -8581,7 +8662,7 @@ literate=% morecomment=[s]{/*}{*/},% morestring=[d]',% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -8743,7 +8824,7 @@ literate=% morecomment=[l]{;\#},% morecomment=[l]{[\#},% morecomment=[l]{\{\#}% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % And after receiving a bug report from \lsthelper{Vitaly A. Repin} % {vitaly@radio.hop.stu.neva.ru}{2002/04/08}{undefined control sequence @@ -9188,7 +9269,7 @@ literate=% sensitive=f,% morecomment=[l]',% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -9248,7 +9329,7 @@ literate=% morecomment=[s]{/*}{*/},% morecomment=[l]//,% nonstandard morestring=[b]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % \begin{macrocode} % @@ -9287,7 +9368,7 @@ literate=% sensitive=f,% 1998 Gaurav Aggarwal morecomment=[l]--,% morestring=[d]{"}% - }[keywords,comments,strings]% + }[keywords,comments,strings] % \end{macrocode} % The VHDL-AMS dialect has been added by \lstthanks{Steffen~Klupsch} % {steffen@vlsi.informatik.tu-darmstadt.de}{2001/10/05}. diff --git a/Master/texmf-dist/source/latex/listings/lstdrvrs.ins b/Master/texmf-dist/source/latex/listings/lstdrvrs.ins index 2489a4deb40..12234d80f90 100644 --- a/Master/texmf-dist/source/latex/listings/lstdrvrs.ins +++ b/Master/texmf-dist/source/latex/listings/lstdrvrs.ins @@ -44,6 +44,7 @@ \file{listings-hansl.prf}{\from{lstdrvrs.dtx}{hansl-prf}} \file{listings-lua.prf}{\from{lstdrvrs.dtx}{lua-prf}} \file{listings-python.prf}{\from{lstdrvrs.dtx}{python-prf}} + \file{listings-rexx.prf}{\from{lstdrvrs.dtx}{rexx-prf}} } \ifToplevel{ @@ -56,7 +57,7 @@ } \endbatchfile - [2024/02/21 1.10 listings language file] + [2024/03/11 1.10a 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 e7fd45af68d..9c3ebd57d2a 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 . %% \ProvidesFile{listings-acm.prf} - [2024/02/21 1.10 listings language file] + [2024/03/11 1.10a 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 index 765a2da9e23..27d22ea3208 100644 --- a/Master/texmf-dist/tex/latex/listings/listings-bash.prf +++ b/Master/texmf-dist/tex/latex/listings/listings-bash.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{listings-bash.prf} - [2024/02/21 1.10 listings language file] + [2024/03/11 1.10a listings language file] \usepackage[rgb, x11names]{xcolor} \lstset{% diff --git a/Master/texmf-dist/tex/latex/listings/listings-fortran.prf b/Master/texmf-dist/tex/latex/listings/listings-fortran.prf index d6f6f298a5b..e2e1673efe6 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 . %% \ProvidesFile{listings-fortran.prf} - [2024/02/21 1.10 listings language file] + [2024/03/11 1.10a listings language file] \usepackage[rgb, x11names]{xcolor} \lstset{% diff --git a/Master/texmf-dist/tex/latex/listings/listings-hansl.prf b/Master/texmf-dist/tex/latex/listings/listings-hansl.prf index c4511d59929..eebc2c9dabc 100644 --- a/Master/texmf-dist/tex/latex/listings/listings-hansl.prf +++ b/Master/texmf-dist/tex/latex/listings/listings-hansl.prf @@ -22,7 +22,7 @@ %% programming languages to Jobst Hoffmann at . %% \ProvidesFile{listings-hansl.prf} - [2024/02/21 1.10 listings language file] + [2024/03/11 1.10a listings language file] \usepackage[rgb, x11names]{xcolor} \lstdefinestyle{hanslbw}{% diff --git a/Master/texmf-dist/tex/latex/listings/listings-lua.prf b/Master/texmf-dist/tex/latex/listings/listings-lua.prf index dbdda8dcdb6..49c4dd300aa 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 . %% \ProvidesFile{listings-lua.prf} - [2024/02/21 1.10 listings language file] + [2024/03/11 1.10a 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 9990947994e..82f0285871d 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 . %% \ProvidesFile{listings-python.prf} - [2024/02/21 1.10 listings language file] + [2024/03/11 1.10a listings language file] \usepackage{xcolor} \usepackage{textcomp} diff --git a/Master/texmf-dist/tex/latex/listings/listings-rexx.prf b/Master/texmf-dist/tex/latex/listings/listings-rexx.prf new file mode 100644 index 00000000000..d29a0751c01 --- /dev/null +++ b/Master/texmf-dist/tex/latex/listings/listings-rexx.prf @@ -0,0 +1,50 @@ +%% +%% This is file `listings-rexx.prf', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lstdrvrs.dtx (with options: `rexx-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.3c 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-rexx.prf} + [2024/03/11 1.10a listings language file] +\usepackage{xcolor} +\usepackage{textcomp} + +%% Actual colors from idlelib/config-highlight.def +%% --> corrected to ``web-safe'' +%% strings = #00aa00 / 0,170,0 (a darker green) +%% builtins = #900090 / 144,0,144 (purple-ish) +%% keywords = #FF7700 / 255,119,0 (quite close to plain `orange') +%% Corrected to ``web-safe'' +\definecolor{purple2}{RGB}{153,0,153} % there's actually no standard purple +\definecolor{green2}{RGB}{0,153,0} % a darker green + +\lstdefinestyle{python-idle-code}{% + language=Python, % the language + basicstyle=\normalsize\ttfamily, % size of the fonts for the code + % Color settings to match IDLE style + keywordstyle=\color{orange}, % core keywords + keywordstyle={[2]\color{purple2}}, % built-ins + stringstyle=\color{green2},% + commentstyle=\color{red},% + upquote=true, % requires textcomp +} +\endinput +%% +%% End of file `listings-rexx.prf'. diff --git a/Master/texmf-dist/tex/latex/listings/listings.cfg b/Master/texmf-dist/tex/latex/listings/listings.cfg index f1a7a9651e0..cf27aefe593 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}[2024/02/21 1.10 listings configuration] +\ProvidesFile{listings.cfg}[2024/03/11 1.10a 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 172b369c4ac..4d75d821e7a 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{2024/02/21} -\def\fileversion{1.10} +\def\filedate{2024/03/11} +\def\fileversion{1.10a} \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 c5927734e15..0eae560d662 100644 --- a/Master/texmf-dist/tex/latex/listings/lstdoc.sty +++ b/Master/texmf-dist/tex/latex/listings/lstdoc.sty @@ -6,8 +6,8 @@ %% %% listings.dtx (with options: `doc') %% -\def\filedate{2024/02/21} -\def\fileversion{1.10} +\def\filedate{2024/03/11} +\def\fileversion{1.10a} \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 7cb1435295f..938f7ef1405 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} - [2024/02/21 1.10 listings language file] + [2024/03/11 1.10a listings language file] %% %% ACSL definition (c) 2000 by Andreas Matthias %% @@ -56,7 +56,7 @@ morecomment=[l]--,% morestring=[m]",% percent not defined as stringizer so far morestring=[m]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% awk definitions (c) Christoph Giess %% @@ -75,7 +75,7 @@ morecomment=[l]//,% morecomment=[s]{/*}{*/},% morestring=[b]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% Visual Basic definition (c) 2002 Robert Frank %% @@ -279,7 +279,7 @@ morecomment=[s]{/*}{*/},% morecomment=[l]//,% morestring=[b]" - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% csh definition (c) 1998 Kai Below %% @@ -292,7 +292,7 @@ sqrt,BEGIN,END},% morecomment=[l]\#,% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% bash,sh definition (c) 2003 Riccardo Murri %% @@ -311,7 +311,7 @@ morecomment=[l]\#,% morestring=[d]",% morestring=[d]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] \lst@definelanguage[18]{Fortran}[08]{Fortran}{% morekeywords={FAIL, IMAGE, NON_RECURSIVE},% morekeywords=[3]{GET_TEAM, TEAM_NUMBER, IMAGE_TEAMS, NUM_IMAGES, @@ -401,7 +401,7 @@ morecomment=[l]!% morecomment=[f]c,% morestring=[d]",%% not Fortran-77 standard, but allowed in Fortran-95 %% morestring=[d]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] \lst@definelanguage{HTML}% {morekeywords={A,ABBR,ACRONYM,ADDRESS,APPLET,AREA,B,BASE,BASEFONT,% BDO,BIG,BLOCKQUOTE,BODY,BR,BUTTON,CAPTION,CENTER,CITE,CODE,COL,% @@ -481,7 +481,7 @@ morecomment=[l]!% morecomment=[s]{/*}{*/},% morestring=[b]",% morestring=[b]',% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% ByteCodeJava definition (c) 2004 Martine Gautier %% @@ -583,7 +583,7 @@ morecomment=[l]!% sensitive,% morecomment=[l]\%,% morestring=[m]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] \lst@definelanguage[11.0]{Mathematica}[5.2]{Mathematica}{% morekeywords={ "AASTriangle", "AbelianGroup", "Abort", "AbortKernels",% @@ -2710,7 +2710,7 @@ morecomment=[l]!% sensitive,% morecomment=[s]{(*}{*)},% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% Octave definition (c) 2001,2002 Ulrich G. Wortmann %% @@ -2789,7 +2789,7 @@ morecomment=[l]!% morecomment=[l]\%,% morestring=[m]',% morestring=[m]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] \lst@definelanguage[XSC]{Pascal}[Standard]{Pascal} {deletekeywords={alfa,byte,pack,unpack},% 1998 Andreas Stephan morekeywords={dynamic,external,forward,global,module,nil,operator,% @@ -2846,7 +2846,7 @@ morecomment=[l]!% morecomment=[s]{(*}{*)},% morecomment=[s]{\{}{\}},% morestring=[d]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] \lst@definelanguage{Perl}% {morekeywords={abs,accept,alarm,atan2,bind,binmode,bless,caller,% chdir,chmod,chomp,chop,chown,chr,chroot,close,closedir,connect,% @@ -2879,7 +2879,7 @@ morecomment=[l]!% morestring=[b]',% MoreSelectCharTable=% \lst@ReplaceInput{\$\#}{\lst@ProcessOther\$\lst@ProcessOther\#}% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% POV definition (c) 1999 Berthold H\"ollmann %% @@ -2940,7 +2940,7 @@ morecomment=[l]!% morecomment=[l]//,% morecomment=[s]{/*}{*/},% morestring=[d]",% - }[keywords,directives,comments,strings]% + }[keywords,directives,comments,strings] %% %% Python definition (c) 1998 Michael Weber %% Additional definitions (2013) Alexis Dimitriadis @@ -3135,7 +3135,7 @@ morecomment=[l]!% morecomment=[l]//,% morestring=[b]",% morestring=[m]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% SQL definition (c) 1998 Christian Haul %% (c) 2002 Neil Conway @@ -3176,7 +3176,7 @@ morecomment=[l]!% morecomment=[s]{/*}{*/},% morestring=[d]',% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% VHDL definition (c) 1997 Kai Wollenweber %% @@ -3195,7 +3195,7 @@ morecomment=[l]!% sensitive=f,% 1998 Gaurav Aggarwal morecomment=[l]--,% morestring=[d]{"}% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% VHDL-AMS definition (c) Steffen Klupsch %% diff --git a/Master/texmf-dist/tex/latex/listings/lstlang2.sty b/Master/texmf-dist/tex/latex/listings/lstlang2.sty index 3b2358b6fd3..020d30ac310 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} - [2024/02/21 1.10 listings language file] + [2024/03/11 1.10a listings language file] %% %% Abap definition by Knut Lickert %% @@ -98,7 +98,7 @@ morecomment=[l]{//},% morecomment=[s]{/*}{*/},% string=[b]{"},% -}[keywords,comments,strings]% +}[keywords,comments,strings] \lst@definelanguage{ACMscript}[]{VBScript}{% morekeywords={% ElseIf,False,In,Resume,True% @@ -107,7 +107,7 @@ Abs,Array,Clear,CreateObject,CStr,Err,ForReading,ForWriting,% OpenTextFile,Replace,WriteLine% }% -}[keywords,comments,strings]% +}[keywords,comments,strings] %% %% Corba IDL definition (c) 1999 Jens T. Berger Thielemann %% @@ -209,7 +209,7 @@ sensitive=f,% ??? morecomment=[f][commentstyle][6]*,% morestring=[d]"% ??? doubled - }[keywords,comments,strings]% + }[keywords,comments,strings] \lst@definelanguage{Delphi}% {morekeywords={and,as,asm,array,begin,case,class,const,constructor,% destructor,div,do,downto,else,end,except,exports,file,finally,% @@ -256,7 +256,7 @@ morecomment=[s]{\{}{\}},% morecomment=[l]{//},% 2001 Christian Gudrian morestring=[d]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] \lst@definelanguage{Eiffel}% {morekeywords={alias,all,and,as,BIT,BOOLEAN,CHARACTER,check,class,% creation,Current,debug,deferred,do,DOUBLE,else,elseif,end,% @@ -269,7 +269,7 @@ sensitive,% morecomment=[l]--,% morestring=[d]",% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% Euphoria definition (c) 1998 Detlef Reimers %% @@ -288,7 +288,7 @@ morecomment=[l]--,% morestring=[d]',% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% GAP definition %% (c) 2013 Heiko Oberdiek @@ -331,7 +331,7 @@ sensitive=f,% morecomment=[s]{\{}{\}},% morestring=[d]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% gnuplot definition (c) Christoph Giess %% @@ -356,7 +356,7 @@ comment=[l]\#,% morestring=[b]",% morestring=[b]',% - }[keywords,comments,strings]% + }[keywords,comments,strings] \lst@definelanguage{hansl}{% showstringspaces = false, % morekeywords={ % hansl commands: @@ -514,7 +514,7 @@ morecomment=[l]--,% morecomment=[n]{\{-}{-\}},% morestring=[b]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% IDL definition (c) 1998 Juergen Heim %% @@ -527,11 +527,11 @@ sensitive=f,% morecomment=[l];,% morestring=[d]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% Inform definition (c) 2003 Jonathan Sauer %% -\lst@definelanguage{inform}{% +\lst@definelanguage{Inform}{% % Language keywords morekeywords={breakdo,else,false,for,has,hasnt,if,% in,indirect,jump,notin,nothing,NULL,objectloop,ofclass,% @@ -614,7 +614,7 @@ sensitive=false,% morestring=[d]{"},% morecomment=[l]{!}% -}[keywords,comments,strings]% +}[keywords,comments,strings] \lst@definelanguage{Lisp}% {morekeywords={abort,abs,acons,acos,acosh,adjoin,alphanumericp,alter,% append,apply,apropos,aref,arrayp,ash,asin,asinh,assoc,atan,atanh,% @@ -658,7 +658,7 @@ morecomment=[l];,% morecomment=[s]{\#|}{|\#},% 1997 Aslak Raanes morestring=[b]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% AutoLISP/VisualLISP - Stefan Lagotzki, info@lagotzki.de %% @@ -753,7 +753,7 @@ morecomment=[l];,% morecomment=[l];;,% morestring=[b]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] \lst@definelanguage{elisp}[]{Lisp}{% morekeywords={begin, car, cdr, cons, define, display, drop, filter,% hash-ref, hash-set, if, load-file, lambda, length, map, message,% @@ -766,7 +766,7 @@ morecomment=[l];,% morecomment=[l];;,% morestring=[b]"% -}[keywords,comments,strings]% +}[keywords,comments,strings] %% %% Lua definitions (c) 2013 Stephan Hennig %% @@ -816,7 +816,7 @@ morestring=[b]',% % multi line strings morestring=[s]{[[}{]]},% -}[keywords,comments,strings]% +}[keywords,comments,strings] \lst@definelanguage[5.1]{Lua}[5.0]{Lua}{% deletekeywords=[2]{% _LOADED, _REQUIREDNAME, LUA_PATH, gcinfo, loadlib,% @@ -857,7 +857,7 @@ morestring=[s]{[========[}{]========]},% morestring=[s]{[=========[}{]=========]},% morestring=[s]{[==========[}{]==========]},% -}[keywords,comments,strings]% +}[keywords,comments,strings] \lst@definelanguage[5.2]{Lua}[5.1]{Lua}{% morekeywords=[1]{% goto,% @@ -883,7 +883,7 @@ _ENV,% },% moredelim=[s][keywordstyle3]{::}{::},% -}[keywords,comments,strings]% +}[keywords,comments,strings] \lst@definelanguage[5.3]{Lua}[5.2]{Lua}{% deletekeywords=[2]{% bit32, bit32.arshift, bit32.band, bit32.bnot, bit32.bor,% @@ -901,7 +901,7 @@ utf8, utf8.char, utf8.charpattern, utf8.codepoint, utf8.codes,% utf8.len, utf8.offset,% },% -}[keywords,comments,strings]% +}[keywords,comments,strings] %% %% Make definitions (c) 2000 Rolf Niepraschk %% @@ -954,7 +954,7 @@ morecomment=[s]{/*}{*/},% morestring=[bd]",% morestring=[bd]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% Miranda definition (c) 1998 Peter Bartke %% @@ -977,7 +977,7 @@ sensitive,% morecomment=[l]||,% morestring=[b]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% ML definition (c) 1999 Torben Hoffmann %% @@ -989,7 +989,7 @@ sensitive,% morecomment=[n]{(*}{*)},% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% Oz definition (c) Andres Becerra Sandoval %% @@ -1006,7 +1006,7 @@ morecomment=[s]{/*}{*/},% morestring=[b]",% morestring=[d]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% PHP definition by Luca Balzerani %% @@ -1591,7 +1591,7 @@ morecomment=[s]{/*}{*/},% morestring=[b]",% morestring=[b]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% Prolog definition (c) 1997 Dominique de Waleffe %% @@ -1609,7 +1609,7 @@ morecomment=[s]{/*}{*/},% morestring=[bd]",% morestring=[bd]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% classic rexx listings definition %% by Patrick TJ McPhee @@ -1623,7 +1623,7 @@ morecomment=[n]{/*}{*/},% morestring=[d]{'},% morestring=[d]{"},% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% REXX keywords from System Product Interpreter Reference, VM/XA SP Release 1 %% and Release 2 @@ -1644,7 +1644,7 @@ morestring=[d]",% morestring=[d]',% morecomment=[s]{/*}{*/},% -}[keywords,comments,strings]% +}[keywords,comments,strings] %% %% ooREXX keywords (http://www.oorexx.org/) \lst@definelanguage[]{OORexx}[VM/XA]{Rexx}{% @@ -1677,7 +1677,7 @@ morestring=[s]{\%Q(}{)},% morestring=[s]{\%Q[}{]},% morestring=[s]{\%Q-}{-}% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% SHELXL definition (c) 1999 Aidan Philip Heerdegen %% @@ -1781,7 +1781,7 @@ morecomment=[l]{;\#},% morecomment=[l]{[\#},% morecomment=[l]{\{\#}% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% VBScript definition (c) 2000 Sonja Weidmann %% @@ -1830,7 +1830,7 @@ sensitive=f,% morecomment=[l]',% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% VRML definition (c) 2001 Oliver Baum %% diff --git a/Master/texmf-dist/tex/latex/listings/lstlang3.sty b/Master/texmf-dist/tex/latex/listings/lstlang3.sty index fdff27f5a59..2eaced05fd3 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} - [2024/02/21 1.10 listings language file] + [2024/03/11 1.10a 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,% @@ -124,7 +124,7 @@ morecomment=[l]//,% missing comma: Markus Pahlow morecomment=[n]{/*}{*/},% morestring=[b]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] \lst@definelanguage{CIL}{% morekeywords=[1]{assembly, beforefieldinit, class, default, cdecl, cil,% corflags, culture, custom, data, entrypoint, fastcall, field, file,% @@ -161,7 +161,7 @@ sensitive=true,% morecomment=[l]{//},% morestring=[b]"% -}[keywords,comments,strings]% +}[keywords,comments,strings] \lst@definelanguage{Comal 80}% {morekeywords={AND,AUTO,CASE,DATA,DEL,DIM,DIV,DO,ELSE,ENDCASE,ENDIF,% ENDPROC,ENDWHILE,EOD,EXEC,FALSE,FOR,GOTO,IF,INPUT,INT,LIST,LOAD,% @@ -170,7 +170,7 @@ sensitive=f,% ??? morecomment=[l]//,% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] \lst@definelanguage[WinXP]{command.com}% {morekeywords={assoc,at,attrib,bootcfg,break,cacls,call,cd,chcp,chdir,% chkdsk,chkntfs,cls,cmd,cmdextversion,color,comp,compact,convert,copy,% @@ -192,7 +192,7 @@ morecomment=[l]{REm},% morecomment=[l]{REM},% morestring=[d]"% -}[keywords,comments,strings]% +}[keywords,comments,strings] \lst@definelanguage{Comsol}% {morekeywords={% adaption,arc1,arc2,arrayr,assemble,asseminit,beziercurve2,block2,% @@ -292,7 +292,7 @@ sensitive=false,% morecomment=[l]\%,% morestring=[m]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] \lst@definelanguage{Elan}% {morekeywords={ABS,AND,BOOL,CAND,CASE,CAT,COLUMNS,CONCR,CONJ,CONST,% COR,DECR,DEFINES,DET,DIV,DOWNTO,ELIF,ELSE,END,ENDIF,ENDOP,% @@ -310,7 +310,7 @@ replacerow,replacecolumn,replaceelement,transp,errorsstop,stop},% sensitive,% morestring=[d]"% - }[keywords,strings]% + }[keywords,strings] %% %% Erlang definition (c) 2003 Daniel Gazard %% @@ -329,7 +329,7 @@ morecomment=[l]\%,% morestring=[b]",% morestring=[b]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% Go definition %% (c) 2018 Christian Maurer @@ -348,23 +348,31 @@ morestring=[b]',% morestring=[b]",% morestring=[s]{`}{`},% -}[keywords,comments,strings]% -\lst@definelanguage{Scala}% - {morekeywords={abstract,case,catch,class,def,% +}[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,% + for,forSome,if,implicit,import,lazy,macro,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]% + otherkeywords={_, :, =, =>, <-, <\%, <:, >:, \#, @},% + sensitive,% + morecomment=[l]//,% + morecomment=[n]{/*}{*/},% + morestring=[b]",% + morestring=[b]',% + morestring=[b]""",% +}[keywords,comments,strings] +\lst@definelanguage[3.0]{Scala}[]{Scala}{% + morekeywords={as, derives, end, enum, export, extension, given}, + morekeywords=[2]{infix, inline, opaque, open, transparent} + otherkeywords={=>>, ?=>, =>}, % =>> isn't recognized, even after + % the keyword => is deleted + alsoletter={*, +, -, |}, + deletekeywords={<\%, _, forSome, macro, mixin, requires, this}, +}[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,% @@ -378,7 +386,7 @@ otherkeywords={=,=>,<-,<\%,<:,>:,\#,@},% morestring=[d]",% morestring=[d]',% morestring=[d]`% - }[keywords,comments,strings]% + }[keywords,comments,strings] \lst@definelanguage{Lingo}{% morekeywords={abort, after, and, before, do, down, halt, me, new, not,% of, on, or, otherwise, pass, put, result, return, set, tell, the, then,% @@ -583,7 +591,7 @@ otherkeywords={=,=>,<-,<\%,<:,>:,\#,@},% sensitive=false,% morecomment=[l]{--},% morestring=[b]",% -}[keywords,comments,strings]% +}[keywords,comments,strings] \lst@definelanguage{LLVM}{% morekeywords={% ret,br,switch,indirectbr,invoke,resume,unreachable,% @@ -744,7 +752,7 @@ otherkeywords={=,=>,<-,<\%,<:,>:,\#,@},% morecomment=[n]{(*}{*)},% morestring=[d]',% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] \lst@definelanguage{MuPAD}{% morekeywords={end,next,break,if,then,elif,else,end_if,case,end_case,% otherwise,for,from,to,step,downto,in,end_for,while,end_while,% @@ -785,7 +793,7 @@ otherkeywords={=,=>,<-,<\%,<:,>:,\#,@},% morecomment=[n]{(*}{*)},% morestring=[d]',% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% OCL definition (c) 2000 Achim D. Brucker %% @@ -813,7 +821,7 @@ otherkeywords={=,=>,<-,<\%,<:,>:,\#,@},% sensitive=t,% morecomment=[l]--,% morestring=[d]'% - }[keywords,comments,strings]% + }[keywords,comments,strings] \lst@definelanguage{Plasm}% {sensitive=false,% morekeywords={aa,abs,ac,acolor,acos,actor,al,alias,align,and,% @@ -887,7 +895,7 @@ otherkeywords={=,=>,<-,<\%,<:,>:,\#,@},% morecomment=[s]{\%}{\%},% morestring=[b]',% literate={~}{{$\sim$}}{1} {^}{$\wedge$}{1},% - }[keywords,directives,comments,strings]% + }[keywords,directives,comments,strings] \lst@definelanguage{PL/I}{% morekeywords={ABS, ATAN, AUTOMATIC, AUTO, ATAND, BEGIN, BINARY, BIN, BIT,% BUILTIN, BY, CALL, CHARACTER, CHAR, CHECK, COLUMN, COL, COMPLEX, CPLX,% @@ -905,7 +913,7 @@ otherkeywords={=,=>,<-,<\%,<:,>:,\#,@},% sensitive=f,% morecomment=[s]{/*}{*/},% morestring=[d]'% -}[keywords,comments,strings]% +}[keywords,comments,strings] %% %% PostScript language definition (c) 2005 Christophe Jorssen. %% @@ -1166,7 +1174,7 @@ write,ws,wtlevel,% morecomment=[s]{COMMENT}{;},% morecomment=[s]{COMMENT}{$},% morestring="% - }[keywords,comments,strings]% + }[keywords,comments,strings] %% %% RSL definition (c) 2004 Brian Christensen %% @@ -1288,7 +1296,7 @@ literate=% keywordcommentsemicolon={end}{else,end,otherwise,when}{comment},% morestring=[d]",% morestring=[d]'% - }[keywords,keywordcomments,strings]% + }[keywords,keywordcomments,strings] %% %% SPARQL definition (c) 2006 Christoph Kiefer %% @@ -1301,7 +1309,7 @@ literate=% morecomment=[l]\#,% morestring=[d]',% morestring=[d]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] \lst@definelanguage{Swift}{% morekeywords={associatedtype,class,deinit,enum,extension,fileprivate,% func,import,init,inout,internal,let,open,operator,private,protocol,% @@ -1684,7 +1692,7 @@ literate=% morecomment=[s]{/*}{*/},% morecomment=[l]//,% nonstandard morestring=[b]"% - }[keywords,comments,strings]% + }[keywords,comments,strings] \endinput %% %% End of file `lstlang3.sty'. diff --git a/Master/texmf-dist/tex/latex/listings/lstmisc.sty b/Master/texmf-dist/tex/latex/listings/lstmisc.sty index 8b0bc5fe04a..b39168f2717 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{2024/02/21} -\def\fileversion{1.10} +\def\filedate{2024/03/11} +\def\fileversion{1.10a} \ProvidesFile{lstmisc.sty} [\filedate\space\fileversion\space(Carsten Heinz)] \lst@CheckVersion\fileversion% diff --git a/Master/texmf-dist/tex/latex/listings/lstpatch.sty b/Master/texmf-dist/tex/latex/listings/lstpatch.sty index 1b0b3ef7a59..99bbdf6dbff 100644 --- a/Master/texmf-dist/tex/latex/listings/lstpatch.sty +++ b/Master/texmf-dist/tex/latex/listings/lstpatch.sty @@ -9,6 +9,7 @@ \ProvidesFile{lstpatch.sty} [\filedate\space\fileversion\space(Carsten Heinz)] \lst@CheckVersion\lst@version{} +%%% intentionally empty \endinput %% %% End of file `lstpatch.sty'. -- cgit v1.2.3