vdmlisting (10nov20)

git-svn-id: svn://tug.org/texlive/trunk@56905 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 66 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/latex/vdmlisting/README b/Master/texmf-dist/doc/latex/vdmlisting/README
index 66383edd176..ec31c3b2d60 100644
--- a/Master/texmf-dist/doc/latex/vdmlisting/README
+++ b/Master/texmf-dist/doc/latex/vdmlisting/README
@@ -1,5 +1,5 @@
 VdmListing package
-Copyright 2012--2013 Kenneth Lausdahl (the package)
+Copyright 2012--2020 Kenneth Lausdahl (the package)
 Released under the LaTeX Project Public License 1.3 or later
 
 The `vdmlisting' package is an extension for the 'listings' 
diff --git a/Master/texmf-dist/doc/latex/vdmlisting/vdmlisting.pdf b/Master/texmf-dist/doc/latex/vdmlisting/vdmlisting.pdf
index 136708dbd58..d856550a16e 100644
--- a/Master/texmf-dist/doc/latex/vdmlisting/vdmlisting.pdf
+++ b/Master/texmf-dist/doc/latex/vdmlisting/vdmlisting.pdf
diff --git a/Master/texmf-dist/doc/latex/vdmlisting/vdmlisting.tex b/Master/texmf-dist/doc/latex/vdmlisting/vdmlisting.tex
index 673b61a6aa2..057e083cdb0 100644
--- a/Master/texmf-dist/doc/latex/vdmlisting/vdmlisting.tex
+++ b/Master/texmf-dist/doc/latex/vdmlisting/vdmlisting.tex
@@ -4,7 +4,7 @@
 
 \usepackage{vdmlisting}
 \usepackage{hyperref}
-\usepackage{vdm}
+%\usepackage{vdm}
 \def\vdmlisting{\texttt{vdmlisting}}
 \def\envvdmsl{\texttt{vdmsl}}
 \def\envvdmpp{\texttt{vdmpp}}
@@ -15,9 +15,9 @@
 Dept. of Engineering\\
 Aarhus University\\
 Denmark.\\
-\texttt{lausdahl@cs.au.dk}}
-\date{10 April 2013 \\
-Version 1.0}
+\texttt{kenneth@lausdahl.com}}
+\date{10 Novemberl 2020 \\
+Version 1.1}
 
 
 
@@ -112,10 +112,15 @@ This package defined three listing environments that can be used to typeset VDM.
 \end{vdmrt}
 
 
+
 \end{description}
 
 Furthermore, the environments are configured with \texttt{escapeinside=\{(*@\}\{@*)\}} enabling the command \texttt{\textbackslash vdmnotcovered\{ VDM specification\}} to be used to mark execution coverage for the VDM specification displayed.
 
+\subsection{Previous versions}
+
+This package includes all environments from the previous version \texttt{1.0} of this package. All environments and language definitions can be post fixed with \texttt{\_10} to get the previous version.
+
 \section{Package loading}
 As usual in \LaTeX, the package is loaded by \texttt{\textbackslash usepackage[optionsi]\{vdmlisting\}},
 where [optionsi] is optional and gives a comma separated list of options:
@@ -137,6 +142,6 @@ style files (your system administrator will know where this is).
 
 
 \section{The License}
-The vdmlisting.sty and vdmlisting.tex file is copyright 2012--2013 Kenneth Lausdahl and is released under the LaTeX Project Public License 1.3 or later.
+The vdmlisting.sty and vdmlisting.tex file is copyright 2012--2020 Kenneth Lausdahl and is released under the LaTeX Project Public License 1.3 or later.
 
 \end{document}
diff --git a/Master/texmf-dist/tex/latex/vdmlisting/vdmlisting.sty b/Master/texmf-dist/tex/latex/vdmlisting/vdmlisting.sty
index 619fb34df2a..7bf4a72a73d 100644
--- a/Master/texmf-dist/tex/latex/vdmlisting/vdmlisting.sty
+++ b/Master/texmf-dist/tex/latex/vdmlisting/vdmlisting.sty
@@ -9,8 +9,8 @@
 %% (c) 2013 Kenneth Lausdahl
 %%
 %%
-\def\filedate{2013/04/10}
-\def\fileversion{1.0}
+\def\filedate{2020/11/10}
+\def\fileversion{1.1}
 \NeedsTeXFormat{LaTeX2e}
 \AtEndOfPackage{\ProvidesPackage{vdmlisting}
              [\filedate\space\fileversion\space(Kenneth Lausdahl)]}
@@ -53,8 +53,7 @@
 %
 %configure listing style and language
 %
-
-\lstdefinelanguage{VDM_SL}
+\lstdefinelanguage{VDM_SL_10}
   {morekeywords={RESULT, abs, all, always, and, as, be, be st, bool, by, card, cases, char, comp, compose, 
 conc, dcl, def, definitions, dinter, div, dlmodule, do, dom, dunion, elems, else, elseif, end,
  error, errs, exists, exists1, exit, exports, ext, false, floor, for, for all, forall, from, 
@@ -69,8 +68,20 @@ conc, dcl, def, definitions, dinter, div, dlmodule, do, dom, dunion, elems, else
    morestring=[b]",
    morestring=[b]',
   }[keywords,comments,strings]
+  
+\lstdefinelanguage{VDM_SL}
+  {morekeywords={RESULT,\#else,\#endif,\#ifdef,\#ifndef,abs,all,always,and,as,atomic,be,be st,bool,by,card,cases,char,comp,compose,conc,dcl,def,definitions,dinter,div,dlmodule,do,dom,dunion,
+  elems,else,elseif,end,eq,error,errs,exists,exists1,exit,exports,ext,false,floor,for,for all,forall,from,functions,hd,if,imports,in,in set,inds,init,inmap,int,inter,inv,inverse,iota,is,is not yet specified,is\_,lambda,len,let,map,measure,merge,mk\_,mod,module,mu,munion,nat,nat1,nil,not,not in set,of,operations,or,ord,others,post,power,pre,psubset,pure,rat,rd,real,rem,renamed,return,reverse,rng,
+  seq,seq1,set,set1,skip,specified,st,state,struct,subset,then,tixe,tl,to,token,traces,trap,true,types,undefined,
+  union,uselib,values,while,with,wr,yet
+},
+   sensitive,
+   morecomment=[l]--,
+   morestring=[b]",
+   morestring=[b]',
+  }[keywords,comments,strings]
 
-\lstdefinelanguage{VDM_PP}
+\lstdefinelanguage{VDM_PP_10}
   {morekeywords={\#act, \#active, \#fin, \#req, \#waiting, 
  RESULT, abs, all, always, and, async, atomic, be, be st, bool, by, card, cases, char, class, 
  comp, compose, conc, dcl, def, dinter, div, do, dom, dunion, elems, else, elseif, end, error, 
@@ -87,8 +98,23 @@ conc, dcl, def, definitions, dinter, div, dlmodule, do, dom, dunion, elems, else
    morestring=[b]",
    morestring=[b]',
   }[keywords,comments,strings]
+
+\lstdefinelanguage{VDM_PP}
+  {morekeywords={RESULT,\#act,\#active,\#else,\#endif,\#fin,\#ifdef,\#ifndef,\#req,\#waiting,abs,all,always,and,async,atomic,be,be st,bool,by,card,cases,char,class,comp,compose,conc,dcl,def,dinter,div,do,dom,dunion,elems,else,elseif,end,
+  eq,error,errs,exists,exists1,exit,ext,false,floor,for,for all,forall,from,functions,hd,if,in,in set,inds,init,inmap,instance,instance variables,int,inter,inv,inverse,iota,is,is not yet specified,is subclass of,is subclass responsibility,is\_,isofbaseclass,isofclass,lambda,len,let,map,measure,merge,mk\_,mod,mu,munion,mutex,narrow\_,
+  nat,nat1,new,nil,not,not in set,obj\_,of,operations,or,ord,others,per,periodic,post,power,pre,private,protected,psubset,public,pure,rat,rd,real,rem,
+  responsibility,return,reverse,rng,samebaseclass,sameclass,self,seq,seq1,set,set1,skip,specified,sporadic,st,start,
+  startlist,static,stop,stoplist,subclass,subset,sync,then,thread,threadid,tixe,tl,to,token,traces,trap,true,types,undefined,
+  union,values,variables,while,with,wr,yet
+ },
+   sensitive,
+   morecomment=[l]--,
+   morestring=[b]",
+   morestring=[b]',
+  }[keywords,comments,strings]
   
-\lstdefinelanguage{VDM_RT}
+
+\lstdefinelanguage{VDM_RT_10}
   {morekeywords={\#act, \#active, \#fin, \#req, \#waiting, 
 RESULT, abs, all, always, and, async, atomic, be, be st, bool, by, card, cases, 
 char, class, comp, compose, conc, cycles, dcl, def, dinter, div, do, dom, dunion, 
@@ -107,6 +133,20 @@ floor, for, for all, forall, from, functions, hd, if, in, in set, inds, inmap, i
    morestring=[b]',
   }[keywords,comments,strings]
 
+\lstdefinelanguage{VDM_RT}
+  {morekeywords={RESULT,\#act,\#active,\#else,\#endif,\#fin,\#ifdef,\#ifndef,\#req,\#waiting,abs,all,always,and,async,atomic,be,be st,bool,by,card,cases,char,class,comp,compose,conc,cycles,dcl,def,dinter,div,do,dom,dunion,duration,elems,
+  else,elseif,end,eq,error,errs,exists,exists1,exit,ext,false,floor,for,for all,forall,from,functions,hd,if,in,in set,inds,init,inmap,instance,instance variables,int,inter,inv,inverse,iota,is,is not yet specified,is subclass of,is subclass responsibility,is\_,isofbaseclass,isofclass,lambda,len,let,map,measure,merge,mk\_,mod,mu,munion,mutex,narrow\_,
+  nat,nat1,new,nil,not,not in set,obj\_,of,operations,or,ord,others,per,periodic,post,power,pre,private,protected,psubset,public,pure,rat,rd,real,
+  rem,responsibility,return,reverse,rng,samebaseclass,sameclass,self,seq,seq1,set,set1,skip,specified,sporadic,
+  st,start,startlist,static,stop,stoplist,subclass,subset,sync,system,then,thread,threadid,time,tixe,tl,to,token,traces,
+  trap,true,types,undefined,union,values,variables,while,with,wr,yet
+ },
+   sensitive,
+   morecomment=[l]--,
+   morestring=[b]",
+   morestring=[b]',
+  }[keywords,comments,strings]
+
 
 %
 % Define  listing for the VDM language
@@ -142,12 +182,21 @@ floor, for, for all, forall, from, functions, hd, if, in, in set, inds, inmap, i
 \lstnewenvironment{vdmsl}[1][]{\lstset{style=overtureLanguageStyle}\lstset{language=VDM_SL}\lstset{#1}}
 {}
 
+\lstnewenvironment{vdmsl_10}[1][]{\lstset{style=overtureLanguageStyle}\lstset{language=VDM_SL_10}\lstset{#1}}
+{}
+
 \lstnewenvironment{vdmpp}[1][]{\lstset{style=overtureLanguageStyle}\lstset{language=VDM_PP}\lstset{#1}}
 {}
 
+\lstnewenvironment{vdmpp_10}[1][]{\lstset{style=overtureLanguageStyle}\lstset{language=VDM_PP_10}\lstset{#1}}
+{}
+
 \lstnewenvironment{vdmrt}[1][]{\lstset{style=overtureLanguageStyle}\lstset{language=VDM_RT}\lstset{#1}}
 {}
 
+\lstnewenvironment{vdmrt_10}[1][]{\lstset{style=overtureLanguageStyle}\lstset{language=VDM_RT_10}\lstset{#1}}
+{}
+
 % Environment definition for test coverage use by VDM Tools
 \lstnewenvironment{vdmrealtimeinfo}{}
 {}