Set standard visible website to release v0.1-RC1.

Signed-off-by: Dennis Hendriks <dh_tue@hotmail.com>
diff --git a/chi/eclipse-escet-incubation-chi-manual.pdf b/chi/eclipse-escet-incubation-chi-manual.pdf
index cc45b69..de85dc8 100644
--- a/chi/eclipse-escet-incubation-chi-manual.pdf
+++ b/chi/eclipse-escet-incubation-chi-manual.pdf
Binary files differ
diff --git a/chi/index.html b/chi/index.html
index b6faa58..995b81e 100644
--- a/chi/index.html
+++ b/chi/index.html
@@ -4,8 +4,8 @@
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="generator" content="Asciidoctor 2.0.10">
-<meta name="author" content="Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation">
+<meta name="generator" content="Asciidoctor 2.0.12">
+<meta name="author" content="Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation">
 <link rel="icon" type="image/png" href="favicon.png">
 <title>Chi documentation (Incubation)</title>
 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
@@ -49,7 +49,7 @@
 table{border-collapse:collapse;border-spacing:0}
 *,*::before,*::after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
 html,body{font-size:100%}
-body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
+body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;word-wrap:anywhere;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
 a:hover{cursor:pointer}
 img,object,embed{max-width:100%;height:auto}
 object,embed{height:100%}
@@ -64,10 +64,8 @@
 img,object,svg{display:inline-block;vertical-align:middle}
 textarea{height:auto;min-height:50px}
 select{width:100%}
-.center{margin-left:auto;margin-right:auto}
-.stretch{width:100%}
 .subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em}
-div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0;direction:ltr}
+div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0}
 a{color:#2156a5;text-decoration:underline;line-height:inherit}
 a:hover,a:focus{color:#1d4b8f}
 a img{border:0}
@@ -107,19 +105,22 @@
 h2{font-size:2.3125em}
 h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
 h4{font-size:1.4375em}}
-table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede}
+table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede;word-wrap:normal}
 table thead,table tfoot{background:#f7f8f7}
 table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left}
 table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
 table tr.even,table tr.alt{background:#f8f8f7}
-table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{display:table-cell;line-height:1.6}
+table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6}
 h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
 h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
+.center{margin-left:auto;margin-right:auto}
+.stretch{width:100%}
 .clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table}
 .clearfix::after,.float-group::after{clear:both}
-:not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed;word-wrap:break-word}
-:not(pre)>code.nobreak{word-wrap:normal}
-:not(pre)>code.nowrap{white-space:nowrap}
+:not(pre).nobreak{word-wrap:normal}
+:not(pre).nowrap{white-space:nowrap}
+:not(pre).pre-wrap{white-space:pre-wrap}
+:not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed}
 pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
 pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
 pre>code{display:block}
@@ -184,7 +185,7 @@
 #content #toc{border-style:solid;border-width:1px;border-color:#e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;-webkit-border-radius:4px;border-radius:4px}
 #content #toc>:first-child{margin-top:0}
 #content #toc>:last-child{margin-bottom:0}
-#footer{max-width:100%;background:rgba(0,0,0,.8);padding:1.25em}
+#footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em}
 #footer-text{color:rgba(255,255,255,.8);line-height:1.44}
 #content{margin-bottom:.625em}
 .sect1{padding-bottom:.625em}
@@ -207,7 +208,7 @@
 .admonitionblock>table td.icon{text-align:center;width:80px}
 .admonitionblock>table td.icon img{max-width:none}
 .admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
-.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6)}
+.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6);word-wrap:anywhere}
 .admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
 .exampleblock>.content{border-style:solid;border-width:1px;border-color:#e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;-webkit-border-radius:4px;border-radius:4px}
 .exampleblock>.content>:first-child{margin-top:0}
@@ -217,7 +218,7 @@
 .sidebarblock>:last-child{margin-bottom:0}
 .sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
 .exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
-.literalblock pre,.listingblock>.content>pre{-webkit-border-radius:4px;border-radius:4px;word-wrap:break-word;overflow-x:auto;padding:1em;font-size:.8125em}
+.literalblock pre,.listingblock>.content>pre{-webkit-border-radius:4px;border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em}
 @media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}}
 @media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}}
 .literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class="highlight"],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
@@ -263,21 +264,20 @@
 .quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0}
 .quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem}
 .quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;text-align:left;margin-right:0}
-table.tableblock{max-width:100%;border-collapse:separate}
 p.tableblock:last-child{margin-bottom:0}
+td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere}
 td.tableblock>.content>:last-child{margin-bottom:-1.25em}
-td.tableblock>.content>:last-child.sidebarblock{margin-bottom:0}
 table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
-table.grid-all>thead>tr>.tableblock,table.grid-all>tbody>tr>.tableblock{border-width:0 1px 1px 0}
-table.grid-all>tfoot>tr>.tableblock{border-width:1px 1px 0 0}
-table.grid-cols>*>tr>.tableblock{border-width:0 1px 0 0}
-table.grid-rows>thead>tr>.tableblock,table.grid-rows>tbody>tr>.tableblock{border-width:0 0 1px}
-table.grid-rows>tfoot>tr>.tableblock{border-width:1px 0 0}
-table.grid-all>*>tr>.tableblock:last-child,table.grid-cols>*>tr>.tableblock:last-child{border-right-width:0}
-table.grid-all>tbody>tr:last-child>.tableblock,table.grid-all>thead:last-child>tr>.tableblock,table.grid-rows>tbody>tr:last-child>.tableblock,table.grid-rows>thead:last-child>tr>.tableblock{border-bottom-width:0}
+table.grid-all>*>tr>*{border-width:1px}
+table.grid-cols>*>tr>*{border-width:0 1px}
+table.grid-rows>*>tr>*{border-width:1px 0}
 table.frame-all{border-width:1px}
+table.frame-ends{border-width:1px 0}
 table.frame-sides{border-width:0 1px}
-table.frame-topbot,table.frame-ends{border-width:1px 0}
+table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0}
+table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0}
+table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0}
+table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0}
 table.stripes-all tr,table.stripes-odd tr:nth-of-type(odd),table.stripes-even tr:nth-of-type(even),table.stripes-hover tr:hover{background:#f8f8f7}
 th.halign-left,td.halign-left{text-align:left}
 th.halign-right,td.halign-right{text-align:right}
@@ -286,7 +286,7 @@
 th.valign-bottom,td.valign-bottom{vertical-align:bottom}
 th.valign-middle,td.valign-middle{vertical-align:middle}
 table thead th,table tfoot th{font-weight:bold}
-tbody tr th{display:table-cell;line-height:1.6;background:#f7f8f7}
+tbody tr th{background:#f7f8f7}
 tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
 p.tableblock>code:only-child{background:none;padding:0}
 p.tableblock{font-size:1em}
@@ -315,6 +315,7 @@
 .hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
 td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
 td.hdlist1{font-weight:bold;padding-bottom:1.25em}
+td.hdlist2{word-wrap:anywhere}
 .literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
 .colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
 .colist td:not([class]):first-child img{max-width:none}
@@ -387,7 +388,7 @@
 .admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
 .admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
 .admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
-.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);-webkit-border-radius:100px;border-radius:100px;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
+.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);-webkit-border-radius:50%;border-radius:50%;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
 .conum[data-value] *{color:#fff!important}
 .conum[data-value]+b{display:none}
 .conum[data-value]::after{content:attr(data-value)}
@@ -414,6 +415,7 @@
 svg{max-width:100%}
 p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
 h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
+#header,#content,#footnotes,#footer{max-width:none}
 #toc,.sidebarblock,.exampleblock>.content{background:none!important}
 #toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important}
 body.book #header{text-align:center}
@@ -439,7 +441,7 @@
 </style>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
@@ -483,8 +485,8 @@
 <div id="header">
 <h1>Chi documentation (Incubation)</h1>
 <div class="details">
-<span id="author" class="author">Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation</span><br>
-<span id="revnumber">version 0.1.0.20210126-175926</span>
+<span id="author" class="author">Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation</span><br>
+<span id="revnumber">version 0.1.0.20210305-171633</span>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
@@ -528,7 +530,7 @@
 </li>
 <li><a href="#release-notes-chapter-index">Chi release notes</a>
 <ul class="sectlevel2">
-<li><a href="#version-0-1-unreleased">Version 0.1 (unreleased)</a></li>
+<li><a href="#version-0-1">Version 0.1</a></li>
 </ul>
 </li>
 <li><a href="#legal-chapter-index">Legal</a></li>
@@ -546,8 +548,10 @@
 program, with a syntax much inspired by the well-known Python language.</p>
 </div>
 <div class="paragraph">
-<p>Chi is one of the tools of the
-<a href="https://eclipse.org/escet">Eclipse ESCET&#8482; project</a>.</p>
+<p>Chi is one of the tools of the Eclipse ESCET&#8482; project. Visit the
+<a href="https://eclipse.org/escet">project website</a> for downloads,
+installation instructions, source code, general tool usage information,
+information on how to contribute, and more.</p>
 </div>
 <div class="admonitionblock warning">
 <table>
@@ -926,8 +930,8 @@
 <p>Construct the following program in a project in your workspace:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">model M():
-    writeln(&quot;It works!&quot;)
+<pre class="highlight"><code class="language-chi" data-lang="chi">model M():
+    writeln("It works!")
 end</code></pre>
 </div>
 </div>
@@ -950,8 +954,8 @@
 <p>Construct the following program in the same manner:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">model M(string s):
-    write(&quot;%s\n&quot;)
+<pre class="highlight"><code class="language-chi" data-lang="chi">model M(string s):
+    write("%s\n")
 end</code></pre>
 </div>
 </div>
@@ -985,7 +989,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">...
+<pre class="highlight"><code class="language-chi" data-lang="chi">...
 int i;
 real r;
 ...</code></pre>
@@ -1005,7 +1009,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">...
+<pre class="highlight"><code class="language-chi" data-lang="chi">...
 int  i = 2, j;
 real r = 1.50, s;
 
@@ -1205,7 +1209,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">enum TrafficColor = {RED, ORANGE, GREEN};
+<pre class="highlight"><code class="language-chi" data-lang="chi">enum TrafficColor = {RED, ORANGE, GREEN};
 
 TrafficColor light = RED;</code></pre>
 </div>
@@ -1438,7 +1442,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">type person = tuple(string name; int age)</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">type person = tuple(string name; int age)</code></pre>
 </div>
 </div>
 </div>
@@ -1450,8 +1454,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">person eva  = (&quot;eva&quot; , 29),
-       adam = (&quot;adam&quot;, 27);</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">person eva  = ("eva" , 29),
+       adam = ("adam", 27);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1461,7 +1465,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">ae = eva.age;
+<pre class="highlight"><code class="language-chi" data-lang="chi">ae = eva.age;
 eva.age = eva.age + 1;</code></pre>
 </div>
 </div>
@@ -1475,7 +1479,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">string name;
+<pre class="highlight"><code class="language-chi" data-lang="chi">string name;
 int age;
 
 name, age = eva</code></pre>
@@ -1612,7 +1616,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">pop([7, 8, 3]) -&gt; (7, [8, 3])</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">pop([7, 8, 3]) -&gt; (7, [8, 3])</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1630,7 +1634,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">pop({8, 7, 3}) -&gt; (7, {3, 8}) or
+<pre class="highlight"><code class="language-chi" data-lang="chi">pop({8, 7, 3}) -&gt; (7, {3, 8}) or
 pop({8, 7, 3}) -&gt; (3, {7, 8}) or
 pop({8, 7, 3}) -&gt; (8, {3, 7})</code></pre>
 </div>
@@ -1648,8 +1652,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">pop({&quot;a&quot; : 32, &quot;b&quot; : 34}) -&gt; (&quot;a&quot;, 32, {&quot;b&quot; : 34}) or
-pop({&quot;a&quot; : 32, &quot;b&quot; : 34}) -&gt; (&quot;b&quot;, 34, {&quot;a&quot; : 32})</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">pop({"a" : 32, "b" : 34}) -&gt; ("a", 32, {"b" : 34}) or
+pop({"a" : 32, "b" : 34}) -&gt; ("b", 34, {"a" : 32})</code></pre>
 </div>
 </div>
 </li>
@@ -1681,7 +1685,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">xs[0]  -&gt; 7
+<pre class="highlight"><code class="language-chi" data-lang="chi">xs[0]  -&gt; 7
 xs[3]  -&gt; 5
 xs[5]  -&gt; ERROR (there is no element at position 5)
 xs[-1] -&gt; xs[5 - 1] -&gt; xs[4] -&gt; 9
@@ -1724,7 +1728,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">xs[1:3] -&gt; [8, 3]
+<pre class="highlight"><code class="language-chi" data-lang="chi">xs[1:3] -&gt; [8, 3]
 xs[:2]  -&gt; [7, 8]
 xs[1:]  -&gt; [8, 3, 5, 9]
 xs[:-1] -&gt; [7, 8, 3, 5]
@@ -1755,7 +1759,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">[7, 8, 3] + [5, 9] -&gt; [7, 8, 3, 5, 9]</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">[7, 8, 3] + [5, 9] -&gt; [7, 8, 3, 5, 9]</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1766,7 +1770,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">[7, 8, 3] + [5] -&gt; [7, 8, 3, 5]
+<pre class="highlight"><code class="language-chi" data-lang="chi">[7, 8, 3] + [5] -&gt; [7, 8, 3, 5]
 [5] + [7, 8, 3] -&gt; [5, 7, 8, 3]</code></pre>
 </div>
 </div>
@@ -1785,7 +1789,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">[1, 4, 2, 4, 5] - [2] -&gt; [1, 4, 4, 5]
+<pre class="highlight"><code class="language-chi" data-lang="chi">[1, 4, 2, 4, 5] - [2] -&gt; [1, 4, 4, 5]
 [1, 4, 2, 4, 5] - [4] -&gt; [1, 2, 4, 5]
 [1, 4, 2, 4, 5] - [8] -&gt; [1, 4, 2, 4, 5]</code></pre>
 </div>
@@ -1805,7 +1809,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">    [1, 2, 3, 4, 5] - [6, 4, 2, 3]
+<pre class="highlight"><code class="language-chi" data-lang="chi">    [1, 2, 3, 4, 5] - [6, 4, 2, 3]
 -&gt; ([1, 2, 3, 4, 5] - [6]) - [4, 2, 3]
 -&gt;  [1, 2, 3, 4, 5] - [4, 2, 3]
 -&gt; ([1, 2, 3, 4, 5] - [4]) - [2, 3]
@@ -1825,7 +1829,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">xs == [7, 8, 3] -&gt; true
+<pre class="highlight"><code class="language-chi" data-lang="chi">xs == [7, 8, 3] -&gt; true
 xs == [7, 7, 7] -&gt; false</code></pre>
 </div>
 </div>
@@ -1835,7 +1839,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">6 in xs -&gt; false
+<pre class="highlight"><code class="language-chi" data-lang="chi">6 in xs -&gt; false
 7 in xs -&gt; true
 8 in xs -&gt; true</code></pre>
 </div>
@@ -1848,7 +1852,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">list int xs;</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">list int xs;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1859,7 +1863,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">list(2) int ys</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">list(2) int ys</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1870,7 +1874,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">list(4) list(2) int zm</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">list(4) list(2) int zm</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1929,7 +1933,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">{3, 7, 8} + {5, 9} -&gt; {3, 5, 7, 8, 9}</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">{3, 7, 8} + {5, 9} -&gt; {3, 5, 7, 8, 9}</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1943,7 +1947,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">{3, 7, 8} + {7, 9} -&gt; {3, 7, 8, 9}</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">{3, 7, 8} + {7, 9} -&gt; {3, 7, 8, 9}</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1953,7 +1957,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">{3, 7, 8} * {5, 9} -&gt; &lt;int&gt;{}   # no common element
+<pre class="highlight"><code class="language-chi" data-lang="chi">{3, 7, 8} * {5, 9} -&gt; &lt;int&gt;{}   # no common element
 {3, 7, 8} * {7, 9} -&gt; {7}       # only 7 in common</code></pre>
 </div>
 </div>
@@ -1966,7 +1970,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">{3, 7, 8} - {5, 9} -&gt; {3, 7, 8}
+<pre class="highlight"><code class="language-chi" data-lang="chi">{3, 7, 8} - {5, 9} -&gt; {3, 7, 8}
 {3, 7, 8} - {7, 9} -&gt; {3, 9}</code></pre>
 </div>
 </div>
@@ -1975,7 +1979,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">3 in {3, 7, 8} -&gt; true
+<pre class="highlight"><code class="language-chi" data-lang="chi">3 in {3, 7, 8} -&gt; true
 9 in {3, 7, 8} -&gt; false</code></pre>
 </div>
 </div>
@@ -1999,10 +2003,10 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">dict (string : int) d =
-    {&quot;jim&quot;  : 32,
-     &quot;john&quot; : 34,
-     &quot;adam&quot; : 25}</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">dict (string : int) d =
+    {"jim"  : 32,
+     "john" : 34,
+     "adam" : 25}</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2010,8 +2014,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">d[&quot;john&quot;] -&gt; 34
-d[&quot;adam&quot;] -&gt; 25</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">d["john"] -&gt; 34
+d["adam"] -&gt; 25</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2022,7 +2026,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">d[&quot;john&quot;] = 35</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">d["john"] = 35</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2031,7 +2035,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">d[&quot;lisa&quot;] = 19</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">d["lisa"] = 19</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2039,8 +2043,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">&quot;jim&quot; in d -&gt; true
-&quot;peter&quot; in d -&gt; false</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">"jim" in d -&gt; true
+"peter" in d -&gt; false</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2049,7 +2053,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">{1 : 1, 2 : 2} + {1 : 5, 3 : 3} -&gt; {1 : 5, 2 : 2, 3 : 3}</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">{1 : 1, 2 : 2} + {1 : 5, 3 : 3} -&gt; {1 : 5, 2 : 2, 3 : 3}</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2062,7 +2066,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">p - {1 : 3, 5 : 5} -&gt; {2 : 2}
+<pre class="highlight"><code class="language-chi" data-lang="chi">p - {1 : 3, 5 : 5} -&gt; {2 : 2}
 p - {1, 7} -&gt; {2 : 2}
 p - [2, 8] -&gt; {1 : 1}</code></pre>
 </div>
@@ -2089,7 +2093,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">type item = real;</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">type item = real;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2097,7 +2101,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">item box, product;
+<pre class="highlight"><code class="language-chi" data-lang="chi">item box, product;
 
 box = 4.0; product = 120.5;</code></pre>
 </div>
@@ -2111,7 +2115,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">type step   = tuple(string name; real process_time),
+<pre class="highlight"><code class="language-chi" data-lang="chi">type step   = tuple(string name; real process_time),
      recipe = tuple(int id; list step steps);</code></pre>
 </div>
 </div>
@@ -2128,9 +2132,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">recipe plate, bread;
-plate = (34, [(&quot;s&quot;, 10.8), (&quot;w&quot;, 13.7), (&quot;s&quot;, 25.6)]);
-bread = (90, [(&quot;flour&quot;, 16.3), (&quot;yeast&quot;, 6.9)]);</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">recipe plate, bread;
+plate = (34, [("s", 10.8), ("w", 13.7), ("s", 25.6)]);
+bread = (90, [("flour", 16.3), ("yeast", 6.9)]);</code></pre>
 </div>
 </div>
 </div>
@@ -2143,7 +2147,7 @@
 What is the result of the following expressions:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">-5 ^ 3
+<pre class="highlight"><code class="language-chi" data-lang="chi">-5 ^ 3
 -5 * 3
 5 mod 3</code></pre>
 </div>
@@ -2154,8 +2158,8 @@
 Given are tuple type <code>box</code> and variable <code>x</code> of type <code>box</code>:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">type box = tuple(string name; real weight);
-box x = (&quot;White&quot;, 12.5);</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">type box = tuple(string name; real weight);
+box x = ("White", 12.5);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2163,7 +2167,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">x.name
+<pre class="highlight"><code class="language-chi" data-lang="chi">x.name
 x.real
 x</code></pre>
 </div>
@@ -2175,7 +2179,7 @@
 Determine the outcome of:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">xs[0]
+<pre class="highlight"><code class="language-chi" data-lang="chi">xs[0]
 xs[1:]
 size(xs)
 xs + [3]
@@ -2214,7 +2218,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">y = x + 10</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">y = x + 10</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2234,7 +2238,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">i = 2;
+<pre class="highlight"><code class="language-chi" data-lang="chi">i = 2;
 j = j + 1</code></pre>
 </div>
 </div>
@@ -2245,7 +2249,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">i, j = 2, j + 1</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">i, j = 2, j + 1</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2259,7 +2263,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">x, y = y, x;</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">x, y = y, x;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2275,7 +2279,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">if x &lt; 0:
+<pre class="highlight"><code class="language-chi" data-lang="chi">if x &lt; 0:
     y = -x
 end</code></pre>
 </div>
@@ -2291,7 +2295,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">if a &gt; 0:
+<pre class="highlight"><code class="language-chi" data-lang="chi">if a &gt; 0:
     c = a
 else:
     c = b
@@ -2309,17 +2313,17 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">if i &lt; 0:
-    writeln(&quot;i &lt; 0&quot;)
+<pre class="highlight"><code class="language-chi" data-lang="chi">if i &lt; 0:
+    writeln("i &lt; 0")
 else:
     if i == 0:
-        writeln(&quot;i = 0&quot;)
+        writeln("i = 0")
     else:
         if i &gt; 0 and i &lt; 10:
-            writeln(&quot;0 &lt; i &lt; 10&quot;)
+            writeln("0 &lt; i &lt; 10")
         else:
             # i must be greater or equal 10
-            writeln(&quot;i &gt;= 10&quot;)
+            writeln("i &gt;= 10")
         end
     end
 end</code></pre>
@@ -2339,15 +2343,15 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">if i &lt; 0:
-    writeln(&quot;i &lt; 0&quot;)
+<pre class="highlight"><code class="language-chi" data-lang="chi">if i &lt; 0:
+    writeln("i &lt; 0")
 elif i == 0:
-    writeln(&quot;i = 0&quot;)
+    writeln("i = 0")
 elif i &gt; 0 and i &lt; 10:
-    writeln(&quot;0 &lt; i &lt; 10&quot;)
+    writeln("0 &lt; i &lt; 10")
 else:
     # i must be greater or equal 10
-    writeln(&quot;i &gt;= 10&quot;)
+    writeln("i &gt;= 10")
 end</code></pre>
 </div>
 </div>
@@ -2380,7 +2384,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">int i = 10, sum;
+<pre class="highlight"><code class="language-chi" data-lang="chi">int i = 10, sum;
 
 while i &gt; 0:
     sum = sum + i; i = i - 1
@@ -2402,7 +2406,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">while true:
+<pre class="highlight"><code class="language-chi" data-lang="chi">while true:
     i = i + 1;
     ...
 end</code></pre>
@@ -2420,7 +2424,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">real x; int y; real z = 1;
+<pre class="highlight"><code class="language-chi" data-lang="chi">real x; int y; real z = 1;
 
 while y &gt; 0:
     while y mod 2 == 0:
@@ -2437,7 +2441,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">while j != k:
+<pre class="highlight"><code class="language-chi" data-lang="chi">while j != k:
     if j &gt; k:
         j = j - k
     else:
@@ -2463,7 +2467,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">int sum;
+<pre class="highlight"><code class="language-chi" data-lang="chi">int sum;
 
 for i in range(1, 11):
     sum = sum + i
@@ -2484,7 +2488,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">list int xs = [1, 2, 3, 5, 7, 11, 13];
+<pre class="highlight"><code class="language-chi" data-lang="chi">list int xs = [1, 2, 3, 5, 7, 11, 13];
 int sum;
 
 for x in xs:
@@ -2534,13 +2538,13 @@
 Make a suggestion for a shorter, more elegant version of:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">model M():
+<pre class="highlight"><code class="language-chi" data-lang="chi">model M():
     int i = 3;
 
     if (i &lt;  0) == true:
-        write(&quot;%d is a negative number\n&quot;, i);
+        write("%d is a negative number\n", i);
     elif (i &lt;= 0) == false:
-        write(&quot;%d is a positive number\n&quot;, i);
+        write("%d is a positive number\n", i);
     end
 end</code></pre>
 </div>
@@ -2597,7 +2601,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">func real mean(list int xs):
+<pre class="highlight"><code class="language-chi" data-lang="chi">func real mean(list int xs):
     int sum;
 
     for x in xs:
@@ -2637,7 +2641,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">m = mean([1, 3, 5, 7, 9])</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">m = mean([1, 3, 5, 7, 9])</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2661,7 +2665,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">func int sign(real r):
+<pre class="highlight"><code class="language-chi" data-lang="chi">func int sign(real r):
     if r &lt; 0:
         return -1
     elif r = 0:
@@ -2713,7 +2717,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">func bool decreasing(int x, y):
+<pre class="highlight"><code class="language-chi" data-lang="chi">func bool decreasing(int x, y):
     return x &gt;= y
 end</code></pre>
 </div>
@@ -2773,7 +2777,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">ys = sort([3, 8, 7], decreasing)</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">ys = sort([3, 8, 7], decreasing)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2789,7 +2793,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">type item = tuple(int number, real slack);</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">type item = tuple(int number, real slack);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2797,7 +2801,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">func bool spred(item x, y):
+<pre class="highlight"><code class="language-chi" data-lang="chi">func bool spred(item x, y):
     return x.slack &lt;= y.slack
 end</code></pre>
 </div>
@@ -2811,7 +2815,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">qs = sort(ps, spred)</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">qs = sort(ps, spred)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2836,7 +2840,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">xs = insert(xs, 7, increasing)</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">xs = insert(xs, 7, increasing)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2844,7 +2848,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">func bool increasing(int x, y):
+<pre class="highlight"><code class="language-chi" data-lang="chi">func bool increasing(int x, y):
     return x &lt;= y
 end</code></pre>
 </div>
@@ -2875,7 +2879,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">int i; string s;
+<pre class="highlight"><code class="language-chi" data-lang="chi">int i; string s;
 
 i = read(int);
 s = read(string);</code></pre>
@@ -2887,7 +2891,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">1 &quot;This is a string&quot;</code></pre>
+<pre class="highlight"><code class="language-console" data-lang="console">1 "This is a string"</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2907,13 +2911,13 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">type row = tuple(string name; list int numbers);
+<pre class="highlight"><code class="language-chi" data-lang="chi">type row = tuple(string name; list int numbers);
 
 file f;
 int i;
 list row rows;
 
-f = open(&quot;data_file.txt&quot;, &quot;r&quot;);
+f = open("data_file.txt", "r");
 i = read(f, int);
 rows = read(f, list row);
 close(f)</code></pre>
@@ -2938,9 +2942,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">21
-[(&quot;abc&quot;, [7,21]),
- (&quot;def&quot;, [8,31,47])]</code></pre>
+<pre class="highlight"><code class="language-console" data-lang="console">21
+[("abc", [7,21]),
+ ("def", [8,31,47])]</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2978,7 +2982,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">abc 7 21
+<pre class="highlight"><code class="language-console" data-lang="console">abc 7 21
 def 8 31 47</code></pre>
 </div>
 </div>
@@ -2990,12 +2994,12 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">file f;
+<pre class="highlight"><code class="language-chi" data-lang="chi">file f;
 list row rows;
 string name;
 list int xs;
 
-f = open(&quot;clean_data.txt&quot;, &quot;r&quot;);
+f = open("clean_data.txt", "r");
 while not eof(f):
     name = read(f, string);
     xs = &lt;int&gt;[];
@@ -3047,9 +3051,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">int i = 5;
+<pre class="highlight"><code class="language-chi" data-lang="chi">int i = 5;
 
-write(&quot;i equals %s&quot;, i)</code></pre>
+write("i equals %s", i)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3065,9 +3069,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">list dict(int:real) xs = [{1 : 5.3}];
+<pre class="highlight"><code class="language-chi" data-lang="chi">list dict(int:real) xs = [{1 : 5.3}];
 
-write(&quot;%s&quot;, xs)</code></pre>
+write("%s", xs)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3082,10 +3086,10 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">int i = 5;
+<pre class="highlight"><code class="language-chi" data-lang="chi">int i = 5;
 real r = 3.14;
 
-write(&quot;%4d/%8.2f&quot;, i, r)</code></pre>
+write("%4d/%8.2f", i, r)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3094,7 +3098,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">   5/    3.14</code></pre>
+<pre class="highlight"><code class="language-console" data-lang="console">   5/    3.14</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3206,9 +3210,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">int i = 5, j = 10;
+<pre class="highlight"><code class="language-chi" data-lang="chi">int i = 5, j = 10;
 real r = 3.14;
-write(&quot;%6d\t%d\n\t%.2f\n&quot;, i, j, r)</code></pre>
+write("%6d\t%d\n\t%.2f\n", i, j, r)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3216,7 +3220,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">     5  10
+<pre class="highlight"><code class="language-console" data-lang="console">     5  10
         3.14</code></pre>
 </div>
 </div>
@@ -3238,11 +3242,11 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">file f;
+<pre class="highlight"><code class="language-chi" data-lang="chi">file f;
 int i;
 
-f = open(&quot;output_file&quot;, &quot;w&quot;);
-write(f, &quot;%s&quot;, i); write(f, &quot;%8.2f&quot;, r);
+f = open("output_file", "w");
+write(f, "%s", i); write(f, "%8.2f", r);
 close(f)</code></pre>
 </div>
 </div>
@@ -3290,12 +3294,12 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">dist int dice = uniform(1,7);
+<pre class="highlight"><code class="language-chi" data-lang="chi">dist int dice = uniform(1,7);
 int x, y;
 
 x = sample dice;
 y = sample dice;
-writeln(&quot;x=%d, y=%d&quot;, x, y);</code></pre>
+writeln("x=%d, y=%d", x, y);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3373,7 +3377,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">dist int u = constant(7);</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">dist int u = constant(7);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3663,7 +3667,7 @@
 variance σ<sup>2</sup> of <em>n</em> samples can be calculated by a function like:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">func real variance(list real samples, real avg):
+<pre class="highlight"><code class="language-chi" data-lang="chi">func real variance(list real samples, real avg):
     real v;
 
     for x in samples:
@@ -3685,7 +3689,7 @@
 specification:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">model HoL():
+<pre class="highlight"><code class="language-chi" data-lang="chi">model HoL():
     dist int u = uniform(1, 15);
     int sc = 1;
     bool c = true;
@@ -3693,19 +3697,19 @@
     string s;
 
     new = sample u;
-    write(&quot;Your score is %d\n&quot;, sc);
-    write(&quot;The computer drew %d\n&quot;, new);
+    write("Your score is %d\n", sc);
+    write("The computer drew %d\n", new);
 
     while c:
-        writeln(&quot;(h)igher or (l)ower:\n&quot;);
+        writeln("(h)igher or (l)ower:\n");
         s = read(string);
         oldval = new;
         new = sample u;
-        write(&quot;The computer drew %d\n&quot;, new);
+        write("The computer drew %d\n", new);
         if new == oldval:
             c = false;
         else:
-            c = (new &gt; oldval) == (s == &quot;h&quot;);
+            c = (new &gt; oldval) == (s == "h");
         end;
 
         if c:
@@ -3714,9 +3718,9 @@
             sc = 0;
         end;
 
-        write(&quot;Your score is %d\n&quot;, sc)
+        write("Your score is %d\n", sc)
     end;
-    write(&quot;GAME OVER...\n&quot;)
+    write("GAME OVER...\n")
 end</code></pre>
 </div>
 </div>
@@ -3801,8 +3805,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc P():
-    write(&quot;Hello. I am a process.&quot;)
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc P():
+    write("Hello. I am a process.")
 end
 
 model M():
@@ -3822,7 +3826,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">Hello. I am a process.</code></pre>
+<pre class="highlight"><code class="language-console" data-lang="console">Hello. I am a process.</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3840,8 +3844,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc P(int i):
-    write(&quot;I am process. %d.\n&quot;, i)
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc P(int i):
+    write("I am process. %d.\n", i)
 end
 
 model M():
@@ -3860,7 +3864,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">I am process 1.
+<pre class="highlight"><code class="language-console" data-lang="console">I am process 1.
 I am process 2.</code></pre>
 </div>
 </div>
@@ -3869,7 +3873,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">I am process 2.
+<pre class="highlight"><code class="language-console" data-lang="console">I am process 2.
 I am process 1.</code></pre>
 </div>
 </div>
@@ -3893,9 +3897,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc P():
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc P():
     while true:
-        write(&quot;Hello. I am a process.\n&quot;)
+        write("Hello. I am a process.\n")
     end
 end
 
@@ -3929,7 +3933,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">model MRun():
+<pre class="highlight"><code class="language-chi" data-lang="chi">model MRun():
     run P(0), P(1), P(2), P(3), P(4),
         P(5), P(6), P(7), P(8), P(9)
 end</code></pre>
@@ -3941,7 +3945,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">model MP():
+<pre class="highlight"><code class="language-chi" data-lang="chi">model MP():
     run unwind j in range(10):
             P(j)
         end
@@ -3997,7 +4001,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc P(chan! int a):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc P(chan! int a):
     for i in range(5):
         a!i
     end
@@ -4008,7 +4012,7 @@
 
     while true:
         b?x;
-        write(&quot;%d\n&quot;,x)
+        write("%d\n",x)
     end
 end
 
@@ -4066,7 +4070,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc P(chan! void a):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc P(chan! void a):
     for i in range(5):
         a!    # No data is being sent
     end
@@ -4077,7 +4081,7 @@
 
     while true:
         b?;   # Nothing is being received
-        write(&quot;%d\n&quot;, i);
+        write("%d\n", i);
         i = i + 1
     end
 end
@@ -4122,7 +4126,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc G(chan! int a):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc G(chan! int a):
     for x in range(5):
         a!x
     end
@@ -4141,7 +4145,7 @@
 
     while true:
         a?x;
-        write(&quot;E %d\n&quot;, x)
+        write("E %d\n", x)
     end
 end
 
@@ -4168,7 +4172,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">E   0
+<pre class="highlight"><code class="language-console" data-lang="console">E   0
 E   2
 E   4
 E   6
@@ -4299,13 +4303,13 @@
 <p>Given is the specification of process <code>P</code> and model <code>PP</code>:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc P(chan int a, b):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc P(chan int a, b):
     int x;
 
     while true:
         a?x;
         x = x + 1;
-        write(&quot;%d\n&quot;, x);
+        write("%d\n", x);
         b!x
     end
 end
@@ -4356,7 +4360,7 @@
 numbers 0 till 9 one by one:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc R(...):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc R(...):
     int i;
 
     while i &lt; 10:
@@ -4486,7 +4490,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc B1(chan? item a; chan! item b):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc B1(chan? item a; chan! item b):
     item x;
 
     while true:
@@ -4519,7 +4523,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc B2(chan? item a; chan! item b):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc B2(chan? item a; chan! item b):
     chan item c;
 
     run B1(a, c), B1(c, b)
@@ -4577,7 +4581,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">xs = xs + [x]</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">xs = xs + [x]</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4585,7 +4589,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">xs = xs[1:]</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">xs = xs[1:]</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4599,7 +4603,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">select
+<pre class="highlight"><code class="language-chi" data-lang="chi">select
     boolean_expression_1, communication statement_1:
         statement_list_1
 alt
@@ -4632,7 +4636,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">select
+<pre class="highlight"><code class="language-chi" data-lang="chi">select
     size(xs) &lt; N, a?x:
         xs = xs + [x]
 alt
@@ -4656,7 +4660,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc B(chan? item a; chan! item b):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc B(chan? item a; chan! item b):
     list item xs; item x;
 
     while true:
@@ -4686,7 +4690,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc B(chan? item a; chan! item b):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc B(chan? item a; chan! item b):
     list item xs; item x;
 
     while true:
@@ -4708,7 +4712,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc B(chan? item a; chan! item b):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc B(chan? item a; chan! item b):
     list item xs; item x;
 
     while true:
@@ -4747,7 +4751,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc B(chan? void a; chan! void b):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc B(chan? void a; chan! void b):
     int w;
 
     while true:
@@ -4780,7 +4784,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">type item = tuple(...; int prio);</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">type item = tuple(...; int prio);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4790,7 +4794,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">list(2) list item xs;</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">list(2) list item xs;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4808,7 +4812,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc BPrio(chan? item a; chan! item b):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc BPrio(chan? item a; chan! item b):
     list(2) list item xs; item x;
 
     while true:
@@ -4863,7 +4867,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc G(chan! int a; chan? void sg):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc G(chan! int a; chan? void sg):
     for i in range(10):
         sg?;
         a!i;
@@ -4880,7 +4884,7 @@
     while true:
         se?;
         a?x;
-        write(&quot;E received %d\n&quot;, x);
+        write("E received %d\n", x);
     end
 end
 
@@ -4994,7 +4998,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">t = time</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">t = time</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5015,9 +5019,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc P():
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc P():
     for i in range(3):
-        write(&quot;i = %d, time = %f\n&quot;, i, time);
+        write("i = %d, time = %f\n", i, time);
         delay 0.75
     end
 end
@@ -5037,7 +5041,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">i = 0, time = 0.000000
+<pre class="highlight"><code class="language-console" data-lang="console">i = 0, time = 0.000000
 i = 1, time = 0.750000
 i = 2, time = 1.500000
 All processes finished at time 2.25</code></pre>
@@ -5117,7 +5121,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">type item = real;
+<pre class="highlight"><code class="language-chi" data-lang="chi">type item = real;
 
 model M(real ta, ts; int N):
     chan item a, b;
@@ -5141,7 +5145,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc G(chan! item a; real ta):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc G(chan! item a; real ta):
     while true:
         a!time; delay ta
     end
@@ -5158,7 +5162,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc S(chan? item a; chan! item b; real ts):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc S(chan? item a; chan! item b; real ts):
     item x;
 
     while true:
@@ -5177,11 +5181,11 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc E(chan item a; int N):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc E(chan item a; int N):
     item x;
 
     for i in range(N):
-        a?x; write(&quot;%f, %f\n&quot;, time, time - x)
+        a?x; write("%f, %f\n", time, time - x)
     end
 end</code></pre>
 </div>
@@ -5214,7 +5218,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">model M(real ta, ts; int N):
+<pre class="highlight"><code class="language-chi" data-lang="chi">model M(real ta, ts; int N):
     chan item a, b, c;
 
     run G(a, ta),
@@ -5232,7 +5236,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc G(chan item a; real ta):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc G(chan item a; real ta):
     dist real u = exponential(ta);
 
     while true:
@@ -5251,7 +5255,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc S(chan item a, b; real ts):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc S(chan item a, b; real ts):
     dist real u = exponential(ts);
     item x;
 
@@ -5308,7 +5312,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">model M(real ta, ts; int N):
+<pre class="highlight"><code class="language-chi" data-lang="chi">model M(real ta, ts; int N):
     chan item a, b, c, d, e;
 
     run G(a, ta),
@@ -5357,7 +5361,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">model M(real ta, ts; int N):
+<pre class="highlight"><code class="language-chi" data-lang="chi">model M(real ta, ts; int N):
     chan item a, b, c;
 
     run G(a, ta),
@@ -5389,7 +5393,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">model M(real ta, ts; int N):
+<pre class="highlight"><code class="language-chi" data-lang="chi">model M(real ta, ts; int N):
     chan item a; list(2) chan item b; chan item c;
     chan int r;
 
@@ -5416,7 +5420,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc B(chan? item a; list chan! item b; chan? int r):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc B(chan? item a; list chan! item b; chan? int r):
     list item xs; item x;
     list int ys; int y;
 
@@ -5450,7 +5454,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc S(chan? item b; chan! item c; chan! int r; real ts; int k):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc S(chan? item b; chan! item c; chan! int r; real ts; int k):
     dist real u = exponential(ts);
     item x;
 
@@ -5493,7 +5497,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc S(list chan? item c, chan! list item b):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc S(list chan? item c, chan! list item b):
     list(2) item v;
 
     while true:
@@ -5542,7 +5546,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc W(list chan? item a; chan! list item b):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc W(list chan? item a; chan! list item b):
     list(size(a)) chan item c;
 
     run unwind i in range(size(a)):
@@ -5565,7 +5569,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc S(list chan? item c, chan! list item b):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc S(list chan? item c, chan! list item b):
     list(size(c)) item v;
     list int rec;
 
@@ -5595,7 +5599,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">select
+<pre class="highlight"><code class="language-chi" data-lang="chi">select
     c[0]?v[0]: rec = rec - [0]
 alt
     c[1]?v[1]: rec = rec - [1]
@@ -5701,13 +5705,13 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc P():
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc P():
     timer t;
 
     delay 10.0;
     t = timer(5.0); # Get a time-out at time = 15.0
     for i in range(7):
-        write(&quot;%f %f %b\n, time, real(t), ready(t));
+        write("%f %f %b\n, time, real(t), ready(t));
         delay 1.0
     end
 end
@@ -5727,7 +5731,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">10.0   5.0    false
+<pre class="highlight"><code class="language-console" data-lang="console">10.0   5.0    false
 11.0   4.0    false
 12.0   3.0    false
 13.0   2.0    false
@@ -5769,7 +5773,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">type conv_item = tuple(item x; timer t);
+<pre class="highlight"><code class="language-chi" data-lang="chi">type conv_item = tuple(item x; timer t);
 
 proc T(chan? item a; chan! item b; real convey_time):
     list conv_item xst; item x;
@@ -5812,7 +5816,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">type item      = tuple(...; real tt; ...),
+<pre class="highlight"><code class="language-chi" data-lang="chi">type item      = tuple(...; real tt; ...),
      conv_item = tuple(item x; timer t);</code></pre>
 </div>
 </div>
@@ -5821,7 +5825,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">func bool pred(conv_item x, y):
+<pre class="highlight"><code class="language-chi" data-lang="chi">func bool pred(conv_item x, y):
     return real(x.t) &lt;= real(y.t)
 end</code></pre>
 </div>
@@ -5831,7 +5835,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc T(chan? item a; chan! item b):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc T(chan? item a; chan! item b):
     list conv_item xst; item x;
 
     while true:
@@ -5913,7 +5917,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc G(chan! real a):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc G(chan! real a):
     a!time
 end
 
@@ -5927,7 +5931,7 @@
     real x;
 
     a?x;
-    writeln(&quot;Flow time: %.2f&quot;, time - x);
+    writeln("Flow time: %.2f", time - x);
 end
 
 model M():
@@ -5963,7 +5967,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc real E(chan? real a, int N):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc real E(chan? real a, int N):
     real total, x;
 
     for n in range(N):
@@ -6011,13 +6015,13 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">xper X():
+<pre class="highlight"><code class="language-chi" data-lang="chi">xper X():
     real v;
     int n;
 
     for n in range(5, 10):
         v = M(n);
-        write(&quot;%2d: %.2f\n&quot;, n, v)
+        write("%2d: %.2f\n", n, v)
     end
 end</code></pre>
 </div>
@@ -6108,7 +6112,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc G(chan! real to; real ptime):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc G(chan! real to; real ptime):
     int n = 0;
 
     while n &lt; 100:
@@ -6184,10 +6188,10 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc B(int num; chan? real from; chan! real to; int cap):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc B(int num; chan? real from; chan! real to; int cap):
     list real xs;
     real x;
-    file f = open(&quot;SVG:gbse.svg&quot;, &quot;w&quot;);
+    file f = open("SVG:gbse.svg", "w");
 
     while true:
         select size(xs) &gt; 0, to!xs[0]:
@@ -6195,7 +6199,7 @@
         alt size(xs) &lt; cap, from?x:
             xs = xs + [x]
         end
-        writeln(f, &quot;attr buf%d.height = %d&quot;, num, size(xs) * 50);
+        writeln(f, "attr buf%d.height = %d", num, size(xs) * 50);
     end
     close(f);
 end</code></pre>
@@ -6262,28 +6266,28 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc S(int num; chan? real from; chan! real to; real ptime; dist real up, down):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc S(int num; chan? real from; chan! real to; real ptime; dist real up, down):
     real event, x;
-    file f = open(&quot;SVG:gbse.svg&quot;, &quot;w&quot;);
+    file f = open("SVG:gbse.svg", "w");
 
-    writeln(f, &quot;copy server, , _x%d&quot;, num);
-    writeln(f, &quot;absmove s_x%d (%d, 325)&quot;, num, num*420+150);
+    writeln(f, "copy server, , _x%d", num);
+    writeln(f, "absmove s_x%d (%d, 325)", num, num*420+150);
 
     while true:
         event = time + sample up;
 
         # Up; process items.
         while event &gt; time:
-            writeln(f, &quot;attr s_x%d.fill=yellow&quot;, num);
+            writeln(f, "attr s_x%d.fill=yellow", num);
             from?x;
-            writeln(f, &quot;attr s_x%d.fill=green&quot;, num);
+            writeln(f, "attr s_x%d.fill=green", num);
             delay ptime;
-            writeln(f, &quot;attr s_x%d.fill=magenta&quot;, num);
+            writeln(f, "attr s_x%d.fill=magenta", num);
             to!x;
         end
 
         # Down; repair machine.
-        writeln(f, &quot;attr s_x%d.fill=red&quot;, num);
+        writeln(f, "attr s_x%d.fill=red", num);
         delay sample down;
     end
     close(f);
@@ -6496,7 +6500,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">enum FlagColours  = {red, white, blue},
+<pre class="highlight"><code class="language-chi" data-lang="chi">enum FlagColours  = {red, white, blue},
      MachineState = {idle, heating, processing};</code></pre>
 </div>
 </div>
@@ -6509,7 +6513,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">MachineState state = idle;
+<pre class="highlight"><code class="language-chi" data-lang="chi">MachineState state = idle;
 ...
 while state != processing:
     ...
@@ -6547,7 +6551,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">type lot   = real,
+<pre class="highlight"><code class="language-chi" data-lang="chi">type lot   = real,
      batch = list lot;</code></pre>
 </div>
 </div>
@@ -6561,7 +6565,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">batch xs;
+<pre class="highlight"><code class="language-chi" data-lang="chi">batch xs;
 lot x;</code></pre>
 </div>
 </div>
@@ -6597,9 +6601,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">const real speed = 4.8,
-      dict(string : list int) recipes = { &quot;short&quot; : [1,4,8],
-                                          &quot;long&quot;  : [1,1,2,3,4,5] };</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">const real speed = 4.8,
+      dict(string : list int) recipes = { "short" : [1,4,8],
+                                          "long"  : [1,1,2,3,4,5] };</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -6643,10 +6647,10 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc P():
-  writeln(&quot;Hello&quot;);
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc P():
+  writeln("Hello");
   delay 15;
-  writeln(&quot;Finished&quot;)
+  writeln("Finished")
 end</code></pre>
 </div>
 </div>
@@ -6823,7 +6827,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">xper X():
+<pre class="highlight"><code class="language-chi" data-lang="chi">xper X():
     real total;
     int n;
 
@@ -6832,7 +6836,7 @@
         n = n + 1
     end
 
-    writeln(&quot;Average is %.2f&quot;, total / 10);
+    writeln("Average is %.2f", total / 10);
 end
 
 model real M():
@@ -6887,13 +6891,13 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc P(int x, y; string rel):
-    writeln(&quot;%d %s %d&quot;, x, rel, x-y)
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc P(int x, y; string rel):
+    writeln("%d %s %d", x, rel, x-y)
 end
 
 ...
 
-run P(2, -1, &quot;is less than&quot;);</code></pre>
+run P(2, -1, "is less than");</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -7073,7 +7077,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">int x, y;
+<pre class="highlight"><code class="language-chi" data-lang="chi">int x, y;
 real r;
 list(10) int xs;
 tuple(real v; int w) t;
@@ -7097,7 +7101,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">x = 3;
+<pre class="highlight"><code class="language-chi" data-lang="chi">x = 3;
 t = f(y);
 x, y = 4, 5;
 xs[0], t.v = x+x, r;</code></pre>
@@ -7115,7 +7119,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">t = r, y;
+<pre class="highlight"><code class="language-chi" data-lang="chi">t = r, y;
 r, x = t;
 r, x = f(y);</code></pre>
 </div>
@@ -7139,7 +7143,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">x, xs[x-1] = 7, x+2;</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">x, xs[x-1] = 7, x+2;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -7148,7 +7152,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">x, xs[x-1] = (7, 5);</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">x, xs[x-1] = (7, 5);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -7156,7 +7160,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">x, xs[2] = (7, 5);</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">x, xs[2] = (7, 5);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -7174,7 +7178,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">x, x = 3, 3         # Error, assigned 'x' twice.
+<pre class="highlight"><code class="language-chi" data-lang="chi">x, x = 3, 3         # Error, assigned 'x' twice.
 xs[0], xs[1] = 0, 1 # Allowed, different selected elements.
 xs[0], xs[x] = 0, 1 # Allowed if x != 0 .</code></pre>
 </div>
@@ -7234,7 +7238,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">int s, i;
+<pre class="highlight"><code class="language-chi" data-lang="chi">int s, i;
 
 while i &lt; 10:
     s = s + i
@@ -7269,7 +7273,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">list int xs;
+<pre class="highlight"><code class="language-chi" data-lang="chi">list int xs;
 int x;
 int i;
 
@@ -7287,7 +7291,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">list int xs;
+<pre class="highlight"><code class="language-chi" data-lang="chi">list int xs;
 
 for x in xs:
     ...
@@ -7339,10 +7343,10 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">dict(int:int) d = {1:10, 2:20};
+<pre class="highlight"><code class="language-chi" data-lang="chi">dict(int:int) d = {1:10, 2:20};
 
 for k, v in d:
-    writeln(&quot;%s: %s&quot;, k, v);
+    writeln("%s: %s", k, v);
 end</code></pre>
 </div>
 </div>
@@ -7371,7 +7375,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi"># Get a slice of the xs list, up-to the position of value x in the list
+<pre class="highlight"><code class="language-chi" data-lang="chi"># Get a slice of the xs list, up-to the position of value x in the list
 func get_until(list int xs, int x):
     int index;
 
@@ -7414,7 +7418,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">int s;
+<pre class="highlight"><code class="language-chi" data-lang="chi">int s;
 
 for x in xs:
     if x mod 5 == 0:
@@ -7482,7 +7486,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">if x == 1:
+<pre class="highlight"><code class="language-chi" data-lang="chi">if x == 1:
     x = 2
 end</code></pre>
 </div>
@@ -7496,7 +7500,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">if x == 1:
+<pre class="highlight"><code class="language-chi" data-lang="chi">if x == 1:
      y = 5
 elif x == 2:
     y = 6; x = 6
@@ -7611,7 +7615,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">chan c;
+<pre class="highlight"><code class="language-chi" data-lang="chi">chan c;
 inst p, q;
 
 run P(18, c), Q(19, c);
@@ -7644,7 +7648,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">list int xs = [1, 2]
+<pre class="highlight"><code class="language-chi" data-lang="chi">list int xs = [1, 2]
 
 run
     unwind i in range(5),
@@ -7695,7 +7699,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">chan bool c;
+<pre class="highlight"><code class="language-chi" data-lang="chi">chan bool c;
 inst p, q;
 
 start p = P(18, c), q = Q(19, c);
@@ -7745,7 +7749,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">chan void sync;   # Synchronization channel
+<pre class="highlight"><code class="language-chi" data-lang="chi">chan void sync;   # Synchronization channel
 chan int  dch;    # Channel with integer number messages
 
 run P(sync, dch), Q(sync, dch);</code></pre>
@@ -7798,7 +7802,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc P(chan void a, chan! int b):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc P(chan void a, chan! int b):
     a!;
     b!21;
 end</code></pre>
@@ -7838,12 +7842,12 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc Q(chan void a, chan int b):
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc Q(chan void a, chan int b):
     int x;
 
     a?;
     b?x;
-    writeln(&quot;%s&quot;, x);
+    writeln("%s", x);
 end</code></pre>
 </div>
 </div>
@@ -7934,16 +7938,16 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">timer t = timer(5.2);
+<pre class="highlight"><code class="language-chi" data-lang="chi">timer t = timer(5.2);
 
 select
     a?
 alt
     b!7:
-        writeln(&quot;7 sent&quot;)
+        writeln("7 sent")
 alt
     ready(t):
-        writeln(&quot;done&quot;)
+        writeln("done")
 end</code></pre>
 </div>
 </div>
@@ -7961,7 +7965,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">list int xs;
+<pre class="highlight"><code class="language-chi" data-lang="chi">list int xs;
 int x;
 
 select
@@ -7991,13 +7995,13 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">list(5) chan int cs;
+<pre class="highlight"><code class="language-chi" data-lang="chi">list(5) chan int cs;
 int x;
 
 select
     unwind i, c in enumerate(cs):
         c?x:
-            writeln(&quot;Received %s from channel number %d&quot;, x, i)
+            writeln("Received %s from channel number %d", x, i)
     end
 end</code></pre>
 </div>
@@ -8016,18 +8020,18 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">select
+<pre class="highlight"><code class="language-chi" data-lang="chi">select
     cs[0]?x:
-        writeln(&quot;Received %s from channel number %d&quot;, x, 0)
+        writeln("Received %s from channel number %d", x, 0)
 alt
     cs[1]?x:
-        writeln(&quot;Received %s from channel number %d&quot;, x, 1)
+        writeln("Received %s from channel number %d", x, 1)
 
 ...
 
 alt
     cs[4]?x:
-        writeln(&quot;Received %s from channel number %d&quot;, x, 4)</code></pre>
+        writeln("Received %s from channel number %d", x, 4)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -8085,7 +8089,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">delay 1.5   # Delay for 1.5 time units.</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">delay 1.5   # Delay for 1.5 time units.</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -8293,7 +8297,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">return 4          # Return integer value 4 to the caller.
+<pre class="highlight"><code class="language-chi" data-lang="chi">return 4          # Return integer value 4 to the caller.
 
 return true, 3.7  # Return value of type tuple(bool b; real r).</code></pre>
 </div>
@@ -8352,7 +8356,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">if x == 3:
+<pre class="highlight"><code class="language-chi" data-lang="chi">if x == 3:
     pass
 else:
     x = x + 1
@@ -8564,7 +8568,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">enum FlagColours  = {red, white, blue};
+<pre class="highlight"><code class="language-chi" data-lang="chi">enum FlagColours  = {red, white, blue};
 
 ...
 
@@ -8987,7 +8991,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">3.14
+<pre class="highlight"><code class="language-chi" data-lang="chi">3.14
 0.314e1
 314E-2</code></pre>
 </div>
@@ -9303,15 +9307,15 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">string s = &quot;abcdef&quot;;
+<pre class="highlight"><code class="language-chi" data-lang="chi">string s = "abcdef";
 
-s[4]        # results in &quot;e&quot;
-s[2:4]      # results in &quot;cd&quot;
-s[1::2]     # results in &quot;bdf&quot;
-s[-1:0:-2]  # results in &quot;fdb&quot;
-s[-1:-7:-1] # results in &quot;fedcba&quot;
-s[:4]       # results in &quot;abcd&quot;
-s[-1:]      # results in &quot;f&quot; (from the last character to the end)</code></pre>
+s[4]        # results in "e"
+s[2:4]      # results in "cd"
+s[1::2]     # results in "bdf"
+s[-1:0:-2]  # results in "fdb"
+s[-1:-7:-1] # results in "fedcba"
+s[:4]       # results in "abcd"
+s[-1:]      # results in "f" (from the last character to the end)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -9327,8 +9331,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">size(&quot;a&quot;)  # results in 1, string is 1 character long (namely 'a').
-size(&quot;\n&quot;) # results in 1, string contains one NL character.</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">size("a")  # results in 1, string is 1 character long (namely 'a').
+size("\n") # results in 1, string contains one NL character.</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -9367,7 +9371,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">list int xs;
+<pre class="highlight"><code class="language-chi" data-lang="chi">list int xs;
 list int ys = &lt;int&gt;[];
 list int zs = [1, 4, 28];</code></pre>
 </div>
@@ -9471,7 +9475,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">list int xs = [4, 7, 18];
+<pre class="highlight"><code class="language-chi" data-lang="chi">list int xs = [4, 7, 18];
 int x;
 
 x = xs[0];  # assigns 4
@@ -9494,7 +9498,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">list int xs = [4, 7, 18];
+<pre class="highlight"><code class="language-chi" data-lang="chi">list int xs = [4, 7, 18];
 list int ys;
 
 ys = xs[0:2];  # assigns [4, 7]
@@ -9532,7 +9536,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">list int xs = [4, 7, 18];
+<pre class="highlight"><code class="language-chi" data-lang="chi">list int xs = [4, 7, 18];
 list int ys;
 
 ys = xs[::2];  # == xs[0:3:2], assigns [4, 18]
@@ -9550,7 +9554,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">[1, 2] + [3, 4] == [1, 2, 3, 4]
+<pre class="highlight"><code class="language-chi" data-lang="chi">[1, 2] + [3, 4] == [1, 2, 3, 4]
 &lt;int&gt;[] + [1]   == [1]
 [5] + &lt;int&gt;[]   == [5]</code></pre>
 </div>
@@ -9564,7 +9568,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">[1, 2, 4, 2] - [4]        # results in [1, 2, 2], 4 is removed.
+<pre class="highlight"><code class="language-chi" data-lang="chi">[1, 2, 4, 2] - [4]        # results in [1, 2, 2], 4 is removed.
 [1, 2, 4, 2] - [6]        # results in [1, 2, 4 2], 6 does not exist.
 [1, 2, 4, 2] - [1, 4]     # results in [2, 2], 1 and 4 are removed.
 [1, 2, 4, 2] - [2]        # results in [1, 4, 2], first 2 is removed.
@@ -9580,7 +9584,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">1 in [1, 2, 3]          == true
+<pre class="highlight"><code class="language-chi" data-lang="chi">1 in [1, 2, 3]          == true
 4 in [1, 2, 3]          == false  # there is no 4 in [1, 2, 3]
 [1] in [[2], [1]]       == true
 [2, 1] in [[1, 2]]      == false  # [2, 1] != [1, 2]
@@ -9620,7 +9624,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">set real xr = {1.0, 2.5, -31.28, 1.0}</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">set real xr = {1.0, 2.5, -31.28, 1.0}</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -9717,7 +9721,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">set int xr = {1, 3, 7};
+<pre class="highlight"><code class="language-chi" data-lang="chi">set int xr = {1, 3, 7};
 set int yr;
 
 yr = xr + {1, 2};  # assigns {1, 2, 3, 7}
@@ -9734,7 +9738,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">1 in {1, 3, 7}  == true
+<pre class="highlight"><code class="language-chi" data-lang="chi">1 in {1, 3, 7}  == true
 9 in {1, 3, 7}  == false
 
 {1} sub {1, 3, 7}       == true
@@ -9770,9 +9774,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">dict(string, int) d;  # Initialized with the empty dictionary.
+<pre class="highlight"><code class="language-chi" data-lang="chi">dict(string, int) d;  # Initialized with the empty dictionary.
 
-d = {&quot;one&quot;: 1, &quot;twenty-three&quot;: 23};</code></pre>
+d = {"one": 1, "twenty-three": 23};</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -9874,7 +9878,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">dict(int:bool) d = {1:true, 2:false};
+<pre class="highlight"><code class="language-chi" data-lang="chi">dict(int:bool) d = {1:true, 2:false};
 bool b;
 
 b = d[1];     # assigns 'true' (the value of key 1).
@@ -9890,7 +9894,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">dict(int:bool) d = {1:true, 2:false};
+<pre class="highlight"><code class="language-chi" data-lang="chi">dict(int:bool) d = {1:true, 2:false};
 
 d + {1:false}   # result is {1:false, 2:false}
 d + {3:false}   # result is {1:true, 2:false, 3:false}</code></pre>
@@ -9904,7 +9908,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">dict(int:bool) d = {1:true, 2:false};
+<pre class="highlight"><code class="language-chi" data-lang="chi">dict(int:bool) d = {1:true, 2:false};
 
 d - {1:false}   # results in {2:false}, value of '1' is not relevant
 d - [1]         # results in {2:false}
@@ -9922,7 +9926,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">dict(int:bool) d = {1:true, 2:false};
+<pre class="highlight"><code class="language-chi" data-lang="chi">dict(int:bool) d = {1:true, 2:false};
 bool b;
 
 b = 2 in d;  # assigns 'true', 2 is a key in d.
@@ -9959,7 +9963,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">type tup = tuple(bool b; real r);
+<pre class="highlight"><code class="language-chi" data-lang="chi">type tup = tuple(bool b; real r);
 
 tup t = (true, 3.48);</code></pre>
 </div>
@@ -9978,7 +9982,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">bool c;
+<pre class="highlight"><code class="language-chi" data-lang="chi">bool c;
 
 c = t.b;     # Read the 'b' field.
 t.b = false; # Assign a new value to the 'b' field.</code></pre>
@@ -9994,7 +9998,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">real q;
+<pre class="highlight"><code class="language-chi" data-lang="chi">real q;
 
 t = false, 3.8; # Packing of values into a tuple.
 
@@ -10017,7 +10021,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">a, b = 3, 4;   # Assign 3 to 'a', and 4 to 'b'.
+<pre class="highlight"><code class="language-chi" data-lang="chi">a, b = 3, 4;   # Assign 3 to 'a', and 4 to 'b'.
 
 a, b = b, a;   # Swap values of 'a' and 'b'.</code></pre>
 </div>
@@ -10158,7 +10162,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">chan void s;
+<pre class="highlight"><code class="language-chi" data-lang="chi">chan void s;
 chan int c, d;</code></pre>
 </div>
 </div>
@@ -10284,12 +10288,12 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">model Dice():
+<pre class="highlight"><code class="language-chi" data-lang="chi">model Dice():
     dist int d = uniform(1, 7);
 
     # Roll the dice 5 times
     for i in range(5):
-        writeln(&quot;Rolled %d&quot;, sample d);
+        writeln("Rolled %d", sample d);
     end
 end</code></pre>
 </div>
@@ -10310,12 +10314,12 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc A(int x):
-    writeln(&quot;A(%d)&quot;, x);
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc A(int x):
+    writeln("A(%d)", x);
 end
 
 proc B(int x):
-    writeln(&quot;B(%d)&quot;, x);
+    writeln("B(%d)", x);
 end
 
 proc P(proc (int) ab):
@@ -10354,7 +10358,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">proc Wait():
+<pre class="highlight"><code class="language-chi" data-lang="chi">proc Wait():
     delay 4.52;
 end
 
@@ -10364,7 +10368,7 @@
     start w = Wait();
 
     delay 1.2;
-    writeln(&quot;is Wait finished? %b&quot;, finished(w));
+    writeln("is Wait finished? %b", finished(w));
 
     # Wait until the process has finished.
     finish w;
@@ -10407,7 +10411,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">matrix(2, 3) m = [1.0, 2.0, 3.0;
+<pre class="highlight"><code class="language-chi" data-lang="chi">matrix(2, 3) m = [1.0, 2.0, 3.0;
                   4.0, 5.0, 6.0]</code></pre>
 </div>
 </div>
@@ -10441,7 +10445,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">real v = 3.81;
+<pre class="highlight"><code class="language-chi" data-lang="chi">real v = 3.81;
 timer t;
 
 t = timer(v);  # Convert from real to timer (third entry in the table)</code></pre>
@@ -10454,9 +10458,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">list real xs = [1, 2, 3];
+<pre class="highlight"><code class="language-chi" data-lang="chi">list real xs = [1, 2, 3];
 
-writeln(&quot;matrix with one row and three columns: %s&quot;, matrix(1, 3, xs));</code></pre>
+writeln("matrix with one row and three columns: %s", matrix(1, 3, xs));</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -11373,15 +11377,15 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">int i;
-file f = open(&quot;data.txt&quot;, &quot;r&quot;);
+<pre class="highlight"><code class="language-chi" data-lang="chi">int i;
+file f = open("data.txt", "r");
 
 i = read(f, int);
-writeln(&quot;read %d, eol count is %d&quot;, i, newlines(f));
+writeln("read %d, eol count is %d", i, newlines(f));
 i = read(f, int);
-writeln(&quot;read %d, eol count is %d&quot;, i, newlines(f));
+writeln("read %d, eol count is %d", i, newlines(f));
 i = read(f, int);
-writeln(&quot;read %d, eol count is %d&quot;, i, newlines(f));
+writeln("read %d, eol count is %d", i, newlines(f));
 close(f);</code></pre>
 </div>
 </div>
@@ -11390,7 +11394,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">123 345
+<pre class="highlight"><code class="language-console" data-lang="console">123 345
 789</code></pre>
 </div>
 </div>
@@ -11399,7 +11403,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">read 123, eol count is 0
+<pre class="highlight"><code class="language-console" data-lang="console">read 123, eol count is 0
 read 345, eol count is 1
 read 789, eol count is -1</code></pre>
 </div>
@@ -12376,7 +12380,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">type lot = real;
+<pre class="highlight"><code class="language-chi" data-lang="chi">type lot = real;
 
 model M():
     lot x;
@@ -12396,7 +12400,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">enum FlagColours = {red, white, blue};
+<pre class="highlight"><code class="language-chi" data-lang="chi">enum FlagColours = {red, white, blue};
 
 model M():
     FlagColours x = white;
@@ -12619,7 +12623,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">list bool    # A list of boolean values, initial value is &lt;bool&gt;[]
+<pre class="highlight"><code class="language-chi" data-lang="chi">list bool    # A list of boolean values, initial value is &lt;bool&gt;[]
 list (2) int # A list of integer values, initial value is [0, 0]</code></pre>
 </div>
 </div>
@@ -12653,7 +12657,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">set real  # A set of real numbers, initial value &lt;real&gt;{}.</code></pre>
+<pre class="highlight"><code class="language-chi" data-lang="chi">set real  # A set of real numbers, initial value &lt;real&gt;{}.</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -12687,7 +12691,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">dict (bool : int)  # A dictionary with boolean keys, and integer values.
+<pre class="highlight"><code class="language-chi" data-lang="chi">dict (bool : int)  # A dictionary with boolean keys, and integer values.
                    # Initial value &lt;bool:int&gt;{}.</code></pre>
 </div>
 </div>
@@ -12724,7 +12728,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="chi">tuple(int a, b)      # A tuple containing fields 'a' and 'b', both of type int
+<pre class="highlight"><code class="language-chi" data-lang="chi">tuple(int a, b)      # A tuple containing fields 'a' and 'b', both of type int
 tuple(int a; int b)  # A tuple containing fields 'a' and 'b', both of type int
 
 tuple(lot x; real start) # A tuple with a 'lot' and a 'real' type.</code></pre>
@@ -13388,10 +13392,27 @@
 part of the Eclipse ESCET project, are listed below in reverse chronological
 order.</p>
 </div>
-<div class="sect2">
-<h3 id="version-0-1-unreleased">Version 0.1 (unreleased)</h3>
 <div class="paragraph">
-<p>The first release of Chi as part of the Eclipse ESCET project.</p>
+<p>See also the Eclipse ESCET
+<a href="https://www.eclipse.org/escet/escet/#release-notes-chapter-index">toolkit release notes</a>
+covering those aspects that are common to the various Eclipse ESCET tools.</p>
+</div>
+<div class="sect2">
+<h3 id="version-0-1">Version 0.1</h3>
+<div class="paragraph">
+<p>The first release of Chi as part of the Eclipse ESCET project.
+This release is based on the initial contribution by the Eindhoven University
+of Technology (TU/e).</p>
+</div>
+<div class="paragraph">
+<p>Most notable changes compared to the last TU/e release:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>The Chi simulator no longer crashes on code generation.</p>
+</li>
+</ul>
 </div>
 <div class="paragraph">
 <p></p>
@@ -13404,7 +13425,7 @@
 <div class="sectionbody">
 <div class="paragraph">
 <p>The material in this documentation is
-Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation.</p>
+Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation.</p>
 </div>
 <div class="paragraph">
 <p>Eclipse ESCET and ESCET are trademarks of the Eclipse Foundation.
@@ -13435,95 +13456,6 @@
 </div>
 </div>
 </div>
-<style>
-/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
-pre.CodeRay{background:#f7f7f8}
-.CodeRay .line-numbers{border-right:1px solid currentColor;opacity:.35;padding:0 .5em 0 0}
-.CodeRay span.line-numbers{display:inline-block;margin-right:.75em}
-.CodeRay .line-numbers strong{color:#000}
-table.CodeRay{border-collapse:separate;border:0;margin-bottom:0;background:none}
-table.CodeRay td{vertical-align:top;line-height:inherit}
-table.CodeRay td.line-numbers{text-align:right}
-table.CodeRay td.code{padding:0 0 0 .75em}
-.CodeRay .debug{color:#fff !important;background:#000080 !important}
-.CodeRay .annotation{color:#007}
-.CodeRay .attribute-name{color:#000080}
-.CodeRay .attribute-value{color:#700}
-.CodeRay .binary{color:#509}
-.CodeRay .comment{color:#998;font-style:italic}
-.CodeRay .char{color:#04d}
-.CodeRay .char .content{color:#04d}
-.CodeRay .char .delimiter{color:#039}
-.CodeRay .class{color:#458;font-weight:bold}
-.CodeRay .complex{color:#a08}
-.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
-.CodeRay .color{color:#099}
-.CodeRay .class-variable{color:#369}
-.CodeRay .decorator{color:#b0b}
-.CodeRay .definition{color:#099}
-.CodeRay .delimiter{color:#000}
-.CodeRay .doc{color:#970}
-.CodeRay .doctype{color:#34b}
-.CodeRay .doc-string{color:#d42}
-.CodeRay .escape{color:#666}
-.CodeRay .entity{color:#800}
-.CodeRay .error{color:#808}
-.CodeRay .exception{color:inherit}
-.CodeRay .filename{color:#099}
-.CodeRay .function{color:#900;font-weight:bold}
-.CodeRay .global-variable{color:#008080}
-.CodeRay .hex{color:#058}
-.CodeRay .integer,.CodeRay .float{color:#099}
-.CodeRay .include{color:#555}
-.CodeRay .inline{color:#000}
-.CodeRay .inline .inline{background:#ccc}
-.CodeRay .inline .inline .inline{background:#bbb}
-.CodeRay .inline .inline-delimiter{color:#d14}
-.CodeRay .inline-delimiter{color:#d14}
-.CodeRay .important{color:#555;font-weight:bold}
-.CodeRay .interpreted{color:#b2b}
-.CodeRay .instance-variable{color:#008080}
-.CodeRay .label{color:#970}
-.CodeRay .local-variable{color:#963}
-.CodeRay .octal{color:#40e}
-.CodeRay .predefined{color:#369}
-.CodeRay .preprocessor{color:#579}
-.CodeRay .pseudo-class{color:#555}
-.CodeRay .directive{font-weight:bold}
-.CodeRay .type{font-weight:bold}
-.CodeRay .predefined-type{color:inherit}
-.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
-.CodeRay .key{color:#808}
-.CodeRay .key .delimiter{color:#606}
-.CodeRay .key .char{color:#80f}
-.CodeRay .value{color:#088}
-.CodeRay .regexp .delimiter{color:#808}
-.CodeRay .regexp .content{color:#808}
-.CodeRay .regexp .modifier{color:#808}
-.CodeRay .regexp .char{color:#d14}
-.CodeRay .regexp .function{color:#404;font-weight:bold}
-.CodeRay .string{color:#d20}
-.CodeRay .string .string .string{background:#ffd0d0}
-.CodeRay .string .content{color:#d14}
-.CodeRay .string .char{color:#d14}
-.CodeRay .string .delimiter{color:#d14}
-.CodeRay .shell{color:#d14}
-.CodeRay .shell .delimiter{color:#d14}
-.CodeRay .symbol{color:#990073}
-.CodeRay .symbol .content{color:#a60}
-.CodeRay .symbol .delimiter{color:#630}
-.CodeRay .tag{color:#008080}
-.CodeRay .tag-special{color:#d70}
-.CodeRay .variable{color:#036}
-.CodeRay .insert{background:#afa}
-.CodeRay .delete{background:#faa}
-.CodeRay .change{color:#aaf;background:#007}
-.CodeRay .head{color:#f8f;background:#505}
-.CodeRay .insert .insert{color:#080}
-.CodeRay .delete .delete{color:#800}
-.CodeRay .change .change{color:#66f}
-.CodeRay .head .head{color:#f4f}
-</style>
 <script type="text/x-mathjax-config">
 MathJax.Hub.Config({
   messageStyle: "none",
@@ -13540,16 +13472,16 @@
 })
 MathJax.Hub.Register.StartupHook("AsciiMath Jax Ready", function () {
   MathJax.InputJax.AsciiMath.postfilterHooks.Add(function (data, node) {
-    if ((node = data.script.parentNode) && (node = node.parentNode) && node.classList.contains('stemblock')) {
+    if ((node = data.script.parentNode) && (node = node.parentNode) && node.classList.contains("stemblock")) {
       data.math.root.display = "block"
     }
     return data
   })
 })
 </script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_HTMLorMML"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.9/MathJax.js?config=TeX-MML-AM_HTMLorMML"></script>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/Makefile b/chi/reference-manual/distribution_plots/Makefile
index 5a4504c..7d9adf7 100644
--- a/chi/reference-manual/distribution_plots/Makefile
+++ b/chi/reference-manual/distribution_plots/Makefile
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/bernoulli.dat b/chi/reference-manual/distribution_plots/bernoulli.dat
index d1707aa..412ce86 100644
--- a/chi/reference-manual/distribution_plots/bernoulli.dat
+++ b/chi/reference-manual/distribution_plots/bernoulli.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/bernoulli.plt b/chi/reference-manual/distribution_plots/bernoulli.plt
index ee7607e..cf3ffa2 100644
--- a/chi/reference-manual/distribution_plots/bernoulli.plt
+++ b/chi/reference-manual/distribution_plots/bernoulli.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/bernoulli.svg b/chi/reference-manual/distribution_plots/bernoulli.svg
index 9f6ac3b..34feae3 100644
--- a/chi/reference-manual/distribution_plots/bernoulli.svg
+++ b/chi/reference-manual/distribution_plots/bernoulli.svg
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/beta.plt b/chi/reference-manual/distribution_plots/beta.plt
index cb4d2ed..8460f15 100644
--- a/chi/reference-manual/distribution_plots/beta.plt
+++ b/chi/reference-manual/distribution_plots/beta.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/beta.svg b/chi/reference-manual/distribution_plots/beta.svg
index b17b93b..1226c99 100644
--- a/chi/reference-manual/distribution_plots/beta.svg
+++ b/chi/reference-manual/distribution_plots/beta.svg
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/beta_0.8_0.5.dat b/chi/reference-manual/distribution_plots/beta_0.8_0.5.dat
index 456f9ab..8c993e2 100644
--- a/chi/reference-manual/distribution_plots/beta_0.8_0.5.dat
+++ b/chi/reference-manual/distribution_plots/beta_0.8_0.5.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/beta_1.5_3.0.dat b/chi/reference-manual/distribution_plots/beta_1.5_3.0.dat
index 16e367e..a2e2f26 100644
--- a/chi/reference-manual/distribution_plots/beta_1.5_3.0.dat
+++ b/chi/reference-manual/distribution_plots/beta_1.5_3.0.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/beta_2.0_2.0.dat b/chi/reference-manual/distribution_plots/beta_2.0_2.0.dat
index c741a22..bcf4402 100644
--- a/chi/reference-manual/distribution_plots/beta_2.0_2.0.dat
+++ b/chi/reference-manual/distribution_plots/beta_2.0_2.0.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/beta_5.0_1.5.dat b/chi/reference-manual/distribution_plots/beta_5.0_1.5.dat
index 4ee7a92..2a6dbf9 100644
--- a/chi/reference-manual/distribution_plots/beta_5.0_1.5.dat
+++ b/chi/reference-manual/distribution_plots/beta_5.0_1.5.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/binomial.plt b/chi/reference-manual/distribution_plots/binomial.plt
index 89159e2..b3875d8 100644
--- a/chi/reference-manual/distribution_plots/binomial.plt
+++ b/chi/reference-manual/distribution_plots/binomial.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/binomial.svg b/chi/reference-manual/distribution_plots/binomial.svg
index 9812442..b2115be 100644
--- a/chi/reference-manual/distribution_plots/binomial.svg
+++ b/chi/reference-manual/distribution_plots/binomial.svg
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/binomial_20_0.5.dat b/chi/reference-manual/distribution_plots/binomial_20_0.5.dat
index 9ef2dbe..a690789 100644
--- a/chi/reference-manual/distribution_plots/binomial_20_0.5.dat
+++ b/chi/reference-manual/distribution_plots/binomial_20_0.5.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/binomial_20_0.7.dat b/chi/reference-manual/distribution_plots/binomial_20_0.7.dat
index 9afac8f..c253e45 100644
--- a/chi/reference-manual/distribution_plots/binomial_20_0.7.dat
+++ b/chi/reference-manual/distribution_plots/binomial_20_0.7.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/binomial_40_0.5.dat b/chi/reference-manual/distribution_plots/binomial_40_0.5.dat
index ce85960..49fae36 100644
--- a/chi/reference-manual/distribution_plots/binomial_40_0.5.dat
+++ b/chi/reference-manual/distribution_plots/binomial_40_0.5.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/cont_uni.plt b/chi/reference-manual/distribution_plots/cont_uni.plt
index a3503e9..fa20446 100644
--- a/chi/reference-manual/distribution_plots/cont_uni.plt
+++ b/chi/reference-manual/distribution_plots/cont_uni.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/cont_uni.svg b/chi/reference-manual/distribution_plots/cont_uni.svg
index 5dfe954..90dfa5a 100644
--- a/chi/reference-manual/distribution_plots/cont_uni.svg
+++ b/chi/reference-manual/distribution_plots/cont_uni.svg
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/cont_uni1.dat b/chi/reference-manual/distribution_plots/cont_uni1.dat
index f83d940..0d46570 100644
--- a/chi/reference-manual/distribution_plots/cont_uni1.dat
+++ b/chi/reference-manual/distribution_plots/cont_uni1.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/cont_uni2.dat b/chi/reference-manual/distribution_plots/cont_uni2.dat
index 1d928d6..2f9aca7 100644
--- a/chi/reference-manual/distribution_plots/cont_uni2.dat
+++ b/chi/reference-manual/distribution_plots/cont_uni2.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/disc_uni.plt b/chi/reference-manual/distribution_plots/disc_uni.plt
index 015caec..c0f4ae1 100644
--- a/chi/reference-manual/distribution_plots/disc_uni.plt
+++ b/chi/reference-manual/distribution_plots/disc_uni.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/disc_uni.svg b/chi/reference-manual/distribution_plots/disc_uni.svg
index c81e1b7..3f284af 100644
--- a/chi/reference-manual/distribution_plots/disc_uni.svg
+++ b/chi/reference-manual/distribution_plots/disc_uni.svg
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/disc_uni1.dat b/chi/reference-manual/distribution_plots/disc_uni1.dat
index 793ea65..fc845f5 100644
--- a/chi/reference-manual/distribution_plots/disc_uni1.dat
+++ b/chi/reference-manual/distribution_plots/disc_uni1.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/disc_uni2.dat b/chi/reference-manual/distribution_plots/disc_uni2.dat
index 8bf4747..0572a6a 100644
--- a/chi/reference-manual/distribution_plots/disc_uni2.dat
+++ b/chi/reference-manual/distribution_plots/disc_uni2.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/exponential.plt b/chi/reference-manual/distribution_plots/exponential.plt
index 8ae60eb..02c68f1 100644
--- a/chi/reference-manual/distribution_plots/exponential.plt
+++ b/chi/reference-manual/distribution_plots/exponential.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/exponential.svg b/chi/reference-manual/distribution_plots/exponential.svg
index 75369b4..d5b8da8 100644
--- a/chi/reference-manual/distribution_plots/exponential.svg
+++ b/chi/reference-manual/distribution_plots/exponential.svg
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/exponential_0.5.dat b/chi/reference-manual/distribution_plots/exponential_0.5.dat
index 690c684..f1eb0ea 100644
--- a/chi/reference-manual/distribution_plots/exponential_0.5.dat
+++ b/chi/reference-manual/distribution_plots/exponential_0.5.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/exponential_1.0.dat b/chi/reference-manual/distribution_plots/exponential_1.0.dat
index 0535326..940a2d4 100644
--- a/chi/reference-manual/distribution_plots/exponential_1.0.dat
+++ b/chi/reference-manual/distribution_plots/exponential_1.0.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/exponential_1.5.dat b/chi/reference-manual/distribution_plots/exponential_1.5.dat
index e543b77..00634fd 100644
--- a/chi/reference-manual/distribution_plots/exponential_1.5.dat
+++ b/chi/reference-manual/distribution_plots/exponential_1.5.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/gamma.plt b/chi/reference-manual/distribution_plots/gamma.plt
index c800a07..f91c8da 100644
--- a/chi/reference-manual/distribution_plots/gamma.plt
+++ b/chi/reference-manual/distribution_plots/gamma.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/gamma.svg b/chi/reference-manual/distribution_plots/gamma.svg
index 63f740e..47513a5 100644
--- a/chi/reference-manual/distribution_plots/gamma.svg
+++ b/chi/reference-manual/distribution_plots/gamma.svg
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/gamma_1.0_2.0.dat b/chi/reference-manual/distribution_plots/gamma_1.0_2.0.dat
index db3087f..bd11a13 100644
--- a/chi/reference-manual/distribution_plots/gamma_1.0_2.0.dat
+++ b/chi/reference-manual/distribution_plots/gamma_1.0_2.0.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/gamma_3.0_2.0.dat b/chi/reference-manual/distribution_plots/gamma_3.0_2.0.dat
index 4ec5ba7..ba2c5db 100644
--- a/chi/reference-manual/distribution_plots/gamma_3.0_2.0.dat
+++ b/chi/reference-manual/distribution_plots/gamma_3.0_2.0.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/gamma_6.0_0.5.dat b/chi/reference-manual/distribution_plots/gamma_6.0_0.5.dat
index aadb4d9..d689fbc 100644
--- a/chi/reference-manual/distribution_plots/gamma_6.0_0.5.dat
+++ b/chi/reference-manual/distribution_plots/gamma_6.0_0.5.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/gamma_6.0_2.0.dat b/chi/reference-manual/distribution_plots/gamma_6.0_2.0.dat
index 58066e9..1f4efb8 100644
--- a/chi/reference-manual/distribution_plots/gamma_6.0_2.0.dat
+++ b/chi/reference-manual/distribution_plots/gamma_6.0_2.0.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/lognormal.plt b/chi/reference-manual/distribution_plots/lognormal.plt
index 055cc91..f8927ae 100644
--- a/chi/reference-manual/distribution_plots/lognormal.plt
+++ b/chi/reference-manual/distribution_plots/lognormal.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/lognormal.svg b/chi/reference-manual/distribution_plots/lognormal.svg
index ec0c303..fee2dc5 100644
--- a/chi/reference-manual/distribution_plots/lognormal.svg
+++ b/chi/reference-manual/distribution_plots/lognormal.svg
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/lognormal_0.0_0.25.dat b/chi/reference-manual/distribution_plots/lognormal_0.0_0.25.dat
index a688111..63c6ad3 100644
--- a/chi/reference-manual/distribution_plots/lognormal_0.0_0.25.dat
+++ b/chi/reference-manual/distribution_plots/lognormal_0.0_0.25.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/lognormal_0.0_0.5.dat b/chi/reference-manual/distribution_plots/lognormal_0.0_0.5.dat
index 25387a4..c46f845 100644
--- a/chi/reference-manual/distribution_plots/lognormal_0.0_0.5.dat
+++ b/chi/reference-manual/distribution_plots/lognormal_0.0_0.5.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/lognormal_0.0_1.0.dat b/chi/reference-manual/distribution_plots/lognormal_0.0_1.0.dat
index b43e074..0bb81cd 100644
--- a/chi/reference-manual/distribution_plots/lognormal_0.0_1.0.dat
+++ b/chi/reference-manual/distribution_plots/lognormal_0.0_1.0.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/normal.plt b/chi/reference-manual/distribution_plots/normal.plt
index 84524ad..be03709 100644
--- a/chi/reference-manual/distribution_plots/normal.plt
+++ b/chi/reference-manual/distribution_plots/normal.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/normal.svg b/chi/reference-manual/distribution_plots/normal.svg
index e494812..cbca5c8 100644
--- a/chi/reference-manual/distribution_plots/normal.svg
+++ b/chi/reference-manual/distribution_plots/normal.svg
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/normal_3_1.dat b/chi/reference-manual/distribution_plots/normal_3_1.dat
index f5ac621..6cfe806 100644
--- a/chi/reference-manual/distribution_plots/normal_3_1.dat
+++ b/chi/reference-manual/distribution_plots/normal_3_1.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/normal_5_2.dat b/chi/reference-manual/distribution_plots/normal_5_2.dat
index 7052d9e..ef5247c 100644
--- a/chi/reference-manual/distribution_plots/normal_5_2.dat
+++ b/chi/reference-manual/distribution_plots/normal_5_2.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/poisson.plt b/chi/reference-manual/distribution_plots/poisson.plt
index beea162..79ec045 100644
--- a/chi/reference-manual/distribution_plots/poisson.plt
+++ b/chi/reference-manual/distribution_plots/poisson.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/poisson.svg b/chi/reference-manual/distribution_plots/poisson.svg
index aaebf95..0f35eee 100644
--- a/chi/reference-manual/distribution_plots/poisson.svg
+++ b/chi/reference-manual/distribution_plots/poisson.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"  standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/poisson_10.0.dat b/chi/reference-manual/distribution_plots/poisson_10.0.dat
index a308422..2a9fb78 100644
--- a/chi/reference-manual/distribution_plots/poisson_10.0.dat
+++ b/chi/reference-manual/distribution_plots/poisson_10.0.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/poisson_4.0.dat b/chi/reference-manual/distribution_plots/poisson_4.0.dat
index 8ef210d..4e7f40c 100644
--- a/chi/reference-manual/distribution_plots/poisson_4.0.dat
+++ b/chi/reference-manual/distribution_plots/poisson_4.0.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/triangle.plt b/chi/reference-manual/distribution_plots/triangle.plt
index 69a12f2..fa6cf20 100644
--- a/chi/reference-manual/distribution_plots/triangle.plt
+++ b/chi/reference-manual/distribution_plots/triangle.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/triangle.svg b/chi/reference-manual/distribution_plots/triangle.svg
index 3437a62..dcfc83d 100644
--- a/chi/reference-manual/distribution_plots/triangle.svg
+++ b/chi/reference-manual/distribution_plots/triangle.svg
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/triangle_1_2_4.dat b/chi/reference-manual/distribution_plots/triangle_1_2_4.dat
index c569178..aff020e 100644
--- a/chi/reference-manual/distribution_plots/triangle_1_2_4.dat
+++ b/chi/reference-manual/distribution_plots/triangle_1_2_4.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/weibull.plt b/chi/reference-manual/distribution_plots/weibull.plt
index 7569a7a..4a32f34 100644
--- a/chi/reference-manual/distribution_plots/weibull.plt
+++ b/chi/reference-manual/distribution_plots/weibull.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/weibull.svg b/chi/reference-manual/distribution_plots/weibull.svg
index a74b297..e24734c 100644
--- a/chi/reference-manual/distribution_plots/weibull.svg
+++ b/chi/reference-manual/distribution_plots/weibull.svg
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/weibull_0.5_1.0.dat b/chi/reference-manual/distribution_plots/weibull_0.5_1.0.dat
index b09019e..b909d71 100644
--- a/chi/reference-manual/distribution_plots/weibull_0.5_1.0.dat
+++ b/chi/reference-manual/distribution_plots/weibull_0.5_1.0.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/weibull_1.0_1.0.dat b/chi/reference-manual/distribution_plots/weibull_1.0_1.0.dat
index e48d62d..3bf13dc 100644
--- a/chi/reference-manual/distribution_plots/weibull_1.0_1.0.dat
+++ b/chi/reference-manual/distribution_plots/weibull_1.0_1.0.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/weibull_1.5_1.0.dat b/chi/reference-manual/distribution_plots/weibull_1.5_1.0.dat
index 98b2cb7..762a666 100644
--- a/chi/reference-manual/distribution_plots/weibull_1.5_1.0.dat
+++ b/chi/reference-manual/distribution_plots/weibull_1.5_1.0.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/distribution_plots/weibull_5.0_1.0.dat b/chi/reference-manual/distribution_plots/weibull_5.0_1.0.dat
index d8b3d17..5aa874d 100644
--- a/chi/reference-manual/distribution_plots/weibull_5.0_1.0.dat
+++ b/chi/reference-manual/distribution_plots/weibull_5.0_1.0.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/Makefile b/chi/reference-manual/rail_diagrams/Makefile
index 4bd7a6b..d7a39c3 100644
--- a/chi/reference-manual/rail_diagrams/Makefile
+++ b/chi/reference-manual/rail_diagrams/Makefile
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/addressable.tex b/chi/reference-manual/rail_diagrams/addressable.tex
index e5492c0..be3f67c 100644
--- a/chi/reference-manual/rail_diagrams/addressable.tex
+++ b/chi/reference-manual/rail_diagrams/addressable.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/assignment_statement.tex b/chi/reference-manual/rail_diagrams/assignment_statement.tex
index 188b32a..99b2502 100644
--- a/chi/reference-manual/rail_diagrams/assignment_statement.tex
+++ b/chi/reference-manual/rail_diagrams/assignment_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/body.tex b/chi/reference-manual/rail_diagrams/body.tex
index d259468..1845a4c 100644
--- a/chi/reference-manual/rail_diagrams/body.tex
+++ b/chi/reference-manual/rail_diagrams/body.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/bool_expression.tex b/chi/reference-manual/rail_diagrams/bool_expression.tex
index fef32d9..fbc3945 100644
--- a/chi/reference-manual/rail_diagrams/bool_expression.tex
+++ b/chi/reference-manual/rail_diagrams/bool_expression.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/break_statement.tex b/chi/reference-manual/rail_diagrams/break_statement.tex
index 501b619..3e47108 100644
--- a/chi/reference-manual/rail_diagrams/break_statement.tex
+++ b/chi/reference-manual/rail_diagrams/break_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/cast_expression.tex b/chi/reference-manual/rail_diagrams/cast_expression.tex
index d9b1288..03ef741 100644
--- a/chi/reference-manual/rail_diagrams/cast_expression.tex
+++ b/chi/reference-manual/rail_diagrams/cast_expression.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/channel_type.tex b/chi/reference-manual/rail_diagrams/channel_type.tex
index 688d78c..438b058 100644
--- a/chi/reference-manual/rail_diagrams/channel_type.tex
+++ b/chi/reference-manual/rail_diagrams/channel_type.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/choice_statement.tex b/chi/reference-manual/rail_diagrams/choice_statement.tex
index 2737e3c..4bbf001 100644
--- a/chi/reference-manual/rail_diagrams/choice_statement.tex
+++ b/chi/reference-manual/rail_diagrams/choice_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/close_statement.tex b/chi/reference-manual/rail_diagrams/close_statement.tex
index 38e2a2d..697f9f1 100644
--- a/chi/reference-manual/rail_diagrams/close_statement.tex
+++ b/chi/reference-manual/rail_diagrams/close_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/communication_statement.tex b/chi/reference-manual/rail_diagrams/communication_statement.tex
index 6ab66c3..57a97d9 100644
--- a/chi/reference-manual/rail_diagrams/communication_statement.tex
+++ b/chi/reference-manual/rail_diagrams/communication_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/compare_expression.tex b/chi/reference-manual/rail_diagrams/compare_expression.tex
index 43b6673..3dae0d8 100644
--- a/chi/reference-manual/rail_diagrams/compare_expression.tex
+++ b/chi/reference-manual/rail_diagrams/compare_expression.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/constantdef.tex b/chi/reference-manual/rail_diagrams/constantdef.tex
index ba0b73a..d1dd6be 100644
--- a/chi/reference-manual/rail_diagrams/constantdef.tex
+++ b/chi/reference-manual/rail_diagrams/constantdef.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/container_type.tex b/chi/reference-manual/rail_diagrams/container_type.tex
index 12ee344..45c37fe 100644
--- a/chi/reference-manual/rail_diagrams/container_type.tex
+++ b/chi/reference-manual/rail_diagrams/container_type.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/continue_statement.tex b/chi/reference-manual/rail_diagrams/continue_statement.tex
index 7e20e6b..0c87781 100644
--- a/chi/reference-manual/rail_diagrams/continue_statement.tex
+++ b/chi/reference-manual/rail_diagrams/continue_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/delay_statement.tex b/chi/reference-manual/rail_diagrams/delay_statement.tex
index 9d6535f..f55e37d 100644
--- a/chi/reference-manual/rail_diagrams/delay_statement.tex
+++ b/chi/reference-manual/rail_diagrams/delay_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/dictionary_type.tex b/chi/reference-manual/rail_diagrams/dictionary_type.tex
index 5a645f2..957633a 100644
--- a/chi/reference-manual/rail_diagrams/dictionary_type.tex
+++ b/chi/reference-manual/rail_diagrams/dictionary_type.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/distribution_type.tex b/chi/reference-manual/rail_diagrams/distribution_type.tex
index 2a43e4c..d12a478 100644
--- a/chi/reference-manual/rail_diagrams/distribution_type.tex
+++ b/chi/reference-manual/rail_diagrams/distribution_type.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/elementary_type.tex b/chi/reference-manual/rail_diagrams/elementary_type.tex
index 9b79ffb..022c38f 100644
--- a/chi/reference-manual/rail_diagrams/elementary_type.tex
+++ b/chi/reference-manual/rail_diagrams/elementary_type.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/enum_value.tex b/chi/reference-manual/rail_diagrams/enum_value.tex
index 454f3af..20dcce4 100644
--- a/chi/reference-manual/rail_diagrams/enum_value.tex
+++ b/chi/reference-manual/rail_diagrams/enum_value.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/enumdef.tex b/chi/reference-manual/rail_diagrams/enumdef.tex
index da51d06..7febf1f 100644
--- a/chi/reference-manual/rail_diagrams/enumdef.tex
+++ b/chi/reference-manual/rail_diagrams/enumdef.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/exit_statement.tex b/chi/reference-manual/rail_diagrams/exit_statement.tex
index c2be7d9..a0184ba 100644
--- a/chi/reference-manual/rail_diagrams/exit_statement.tex
+++ b/chi/reference-manual/rail_diagrams/exit_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/finish_statement.tex b/chi/reference-manual/rail_diagrams/finish_statement.tex
index 8673be9..2907570 100644
--- a/chi/reference-manual/rail_diagrams/finish_statement.tex
+++ b/chi/reference-manual/rail_diagrams/finish_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/for_statement.tex b/chi/reference-manual/rail_diagrams/for_statement.tex
index afe50a3..7c774b0 100644
--- a/chi/reference-manual/rail_diagrams/for_statement.tex
+++ b/chi/reference-manual/rail_diagrams/for_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/formalparms.tex b/chi/reference-manual/rail_diagrams/formalparms.tex
index 69e66da..90bdb98 100644
--- a/chi/reference-manual/rail_diagrams/formalparms.tex
+++ b/chi/reference-manual/rail_diagrams/formalparms.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/func_call_expression.tex b/chi/reference-manual/rail_diagrams/func_call_expression.tex
index 68bcec3..c8cbd4e 100644
--- a/chi/reference-manual/rail_diagrams/func_call_expression.tex
+++ b/chi/reference-manual/rail_diagrams/func_call_expression.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/funcdef.tex b/chi/reference-manual/rail_diagrams/funcdef.tex
index 957d713..9ab0ca4 100644
--- a/chi/reference-manual/rail_diagrams/funcdef.tex
+++ b/chi/reference-manual/rail_diagrams/funcdef.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/function_type.tex b/chi/reference-manual/rail_diagrams/function_type.tex
index dcbcb8f..013b077 100644
--- a/chi/reference-manual/rail_diagrams/function_type.tex
+++ b/chi/reference-manual/rail_diagrams/function_type.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/generic_expression.tex b/chi/reference-manual/rail_diagrams/generic_expression.tex
index 16e994f..9a6015d 100644
--- a/chi/reference-manual/rail_diagrams/generic_expression.tex
+++ b/chi/reference-manual/rail_diagrams/generic_expression.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/iterative_statement.tex b/chi/reference-manual/rail_diagrams/iterative_statement.tex
index 52d954d..1f65bbe 100644
--- a/chi/reference-manual/rail_diagrams/iterative_statement.tex
+++ b/chi/reference-manual/rail_diagrams/iterative_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/lexical_real_number.tex b/chi/reference-manual/rail_diagrams/lexical_real_number.tex
index e327d0a..54bcd88 100644
--- a/chi/reference-manual/rail_diagrams/lexical_real_number.tex
+++ b/chi/reference-manual/rail_diagrams/lexical_real_number.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/lexical_string_literal.tex b/chi/reference-manual/rail_diagrams/lexical_string_literal.tex
index 851ddd6..d9e5c09 100644
--- a/chi/reference-manual/rail_diagrams/lexical_string_literal.tex
+++ b/chi/reference-manual/rail_diagrams/lexical_string_literal.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/list_type.tex b/chi/reference-manual/rail_diagrams/list_type.tex
index a4f3a28..cd4a83c 100644
--- a/chi/reference-manual/rail_diagrams/list_type.tex
+++ b/chi/reference-manual/rail_diagrams/list_type.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/literal_dictionary.tex b/chi/reference-manual/rail_diagrams/literal_dictionary.tex
index b0a18ee..cc2d4d2 100644
--- a/chi/reference-manual/rail_diagrams/literal_dictionary.tex
+++ b/chi/reference-manual/rail_diagrams/literal_dictionary.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/literal_integer_number.tex b/chi/reference-manual/rail_diagrams/literal_integer_number.tex
index c548349..d29be4d 100644
--- a/chi/reference-manual/rail_diagrams/literal_integer_number.tex
+++ b/chi/reference-manual/rail_diagrams/literal_integer_number.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/literal_list.tex b/chi/reference-manual/rail_diagrams/literal_list.tex
index fe41036..e5a3cc6 100644
--- a/chi/reference-manual/rail_diagrams/literal_list.tex
+++ b/chi/reference-manual/rail_diagrams/literal_list.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/literal_matrix.tex b/chi/reference-manual/rail_diagrams/literal_matrix.tex
index 4b91145..076ebee 100644
--- a/chi/reference-manual/rail_diagrams/literal_matrix.tex
+++ b/chi/reference-manual/rail_diagrams/literal_matrix.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/literal_set.tex b/chi/reference-manual/rail_diagrams/literal_set.tex
index bb88a36..0d1d8d5 100644
--- a/chi/reference-manual/rail_diagrams/literal_set.tex
+++ b/chi/reference-manual/rail_diagrams/literal_set.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/literal_tuple.tex b/chi/reference-manual/rail_diagrams/literal_tuple.tex
index 0f7d2a1..bca4a0f 100644
--- a/chi/reference-manual/rail_diagrams/literal_tuple.tex
+++ b/chi/reference-manual/rail_diagrams/literal_tuple.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/modeldef.tex b/chi/reference-manual/rail_diagrams/modeldef.tex
index 62cfa3b..2cd650d 100644
--- a/chi/reference-manual/rail_diagrams/modeldef.tex
+++ b/chi/reference-manual/rail_diagrams/modeldef.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/other_statements.tex b/chi/reference-manual/rail_diagrams/other_statements.tex
index 50c5a0b..38af97d 100644
--- a/chi/reference-manual/rail_diagrams/other_statements.tex
+++ b/chi/reference-manual/rail_diagrams/other_statements.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/pass_statement.tex b/chi/reference-manual/rail_diagrams/pass_statement.tex
index 7def7c5..894cc9f 100644
--- a/chi/reference-manual/rail_diagrams/pass_statement.tex
+++ b/chi/reference-manual/rail_diagrams/pass_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/postamble.tex b/chi/reference-manual/rail_diagrams/postamble.tex
index f29fa8b..42f325a 100644
--- a/chi/reference-manual/rail_diagrams/postamble.tex
+++ b/chi/reference-manual/rail_diagrams/postamble.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/preamble.tex b/chi/reference-manual/rail_diagrams/preamble.tex
index 3aaff9b..86a175c 100644
--- a/chi/reference-manual/rail_diagrams/preamble.tex
+++ b/chi/reference-manual/rail_diagrams/preamble.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/procdef.tex b/chi/reference-manual/rail_diagrams/procdef.tex
index ea4a5e4..1fb36e9 100644
--- a/chi/reference-manual/rail_diagrams/procdef.tex
+++ b/chi/reference-manual/rail_diagrams/procdef.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/process_instance.tex b/chi/reference-manual/rail_diagrams/process_instance.tex
index 75f4f96..dc118b7 100644
--- a/chi/reference-manual/rail_diagrams/process_instance.tex
+++ b/chi/reference-manual/rail_diagrams/process_instance.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/process_type.tex b/chi/reference-manual/rail_diagrams/process_type.tex
index 5db4242..fb37c1c 100644
--- a/chi/reference-manual/rail_diagrams/process_type.tex
+++ b/chi/reference-manual/rail_diagrams/process_type.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/program.tex b/chi/reference-manual/rail_diagrams/program.tex
index bac72b4..4d52f55 100644
--- a/chi/reference-manual/rail_diagrams/program.tex
+++ b/chi/reference-manual/rail_diagrams/program.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/real_number_values.tex b/chi/reference-manual/rail_diagrams/real_number_values.tex
index 7a8d844..beb4845 100644
--- a/chi/reference-manual/rail_diagrams/real_number_values.tex
+++ b/chi/reference-manual/rail_diagrams/real_number_values.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/receive_statement.tex b/chi/reference-manual/rail_diagrams/receive_statement.tex
index a8df180..6defccd 100644
--- a/chi/reference-manual/rail_diagrams/receive_statement.tex
+++ b/chi/reference-manual/rail_diagrams/receive_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/return_statement.tex b/chi/reference-manual/rail_diagrams/return_statement.tex
index bf3adb6..10fdb57 100644
--- a/chi/reference-manual/rail_diagrams/return_statement.tex
+++ b/chi/reference-manual/rail_diagrams/return_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/run_start.tex b/chi/reference-manual/rail_diagrams/run_start.tex
index e5d39d0..8e737fc 100644
--- a/chi/reference-manual/rail_diagrams/run_start.tex
+++ b/chi/reference-manual/rail_diagrams/run_start.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/select_alternative.tex b/chi/reference-manual/rail_diagrams/select_alternative.tex
index 7023efc..9d2d2a3 100644
--- a/chi/reference-manual/rail_diagrams/select_alternative.tex
+++ b/chi/reference-manual/rail_diagrams/select_alternative.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/select_condition.tex b/chi/reference-manual/rail_diagrams/select_condition.tex
index 8519692..1f9a728 100644
--- a/chi/reference-manual/rail_diagrams/select_condition.tex
+++ b/chi/reference-manual/rail_diagrams/select_condition.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/select_statement.tex b/chi/reference-manual/rail_diagrams/select_statement.tex
index b110cb1..addacec 100644
--- a/chi/reference-manual/rail_diagrams/select_statement.tex
+++ b/chi/reference-manual/rail_diagrams/select_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/send_statement.tex b/chi/reference-manual/rail_diagrams/send_statement.tex
index 4c5c0a1..23aa7c9 100644
--- a/chi/reference-manual/rail_diagrams/send_statement.tex
+++ b/chi/reference-manual/rail_diagrams/send_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/set_type.tex b/chi/reference-manual/rail_diagrams/set_type.tex
index 6ea11ac..8011089 100644
--- a/chi/reference-manual/rail_diagrams/set_type.tex
+++ b/chi/reference-manual/rail_diagrams/set_type.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/statement.tex b/chi/reference-manual/rail_diagrams/statement.tex
index 69b750c..708e529 100644
--- a/chi/reference-manual/rail_diagrams/statement.tex
+++ b/chi/reference-manual/rail_diagrams/statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/subprocess_statement.tex b/chi/reference-manual/rail_diagrams/subprocess_statement.tex
index dfaf101..73bcf71 100644
--- a/chi/reference-manual/rail_diagrams/subprocess_statement.tex
+++ b/chi/reference-manual/rail_diagrams/subprocess_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/tuple_type.tex b/chi/reference-manual/rail_diagrams/tuple_type.tex
index 4af745d..6d860a2 100644
--- a/chi/reference-manual/rail_diagrams/tuple_type.tex
+++ b/chi/reference-manual/rail_diagrams/tuple_type.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/type.tex b/chi/reference-manual/rail_diagrams/type.tex
index bfd4cd6..26d06bc 100644
--- a/chi/reference-manual/rail_diagrams/type.tex
+++ b/chi/reference-manual/rail_diagrams/type.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/typed_expression.tex b/chi/reference-manual/rail_diagrams/typed_expression.tex
index 30b93d0..160215d 100644
--- a/chi/reference-manual/rail_diagrams/typed_expression.tex
+++ b/chi/reference-manual/rail_diagrams/typed_expression.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/typedef.tex b/chi/reference-manual/rail_diagrams/typedef.tex
index b9e8ef2..e468c8d 100644
--- a/chi/reference-manual/rail_diagrams/typedef.tex
+++ b/chi/reference-manual/rail_diagrams/typedef.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/vardef.tex b/chi/reference-manual/rail_diagrams/vardef.tex
index 580ca2b..31e15db 100644
--- a/chi/reference-manual/rail_diagrams/vardef.tex
+++ b/chi/reference-manual/rail_diagrams/vardef.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/while_statement.tex b/chi/reference-manual/rail_diagrams/while_statement.tex
index eb1fe35..248f645 100644
--- a/chi/reference-manual/rail_diagrams/while_statement.tex
+++ b/chi/reference-manual/rail_diagrams/while_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/write_statement.tex b/chi/reference-manual/rail_diagrams/write_statement.tex
index 772e815..b9edc49 100644
--- a/chi/reference-manual/rail_diagrams/write_statement.tex
+++ b/chi/reference-manual/rail_diagrams/write_statement.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/reference-manual/rail_diagrams/xperdef.tex b/chi/reference-manual/rail_diagrams/xperdef.tex
index 3e32f67..9b547c2 100644
--- a/chi/reference-manual/rail_diagrams/xperdef.tex
+++ b/chi/reference-manual/rail_diagrams/xperdef.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/gbse.svg b/chi/tutorial/gbse.svg
index 12bde24..9edfa40 100644
--- a/chi/tutorial/gbse.svg
+++ b/chi/tutorial/gbse.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/Makefile b/chi/tutorial/pictures/Makefile
index 1a2fdf9..4b5f7e8 100644
--- a/chi/tutorial/pictures/Makefile
+++ b/chi/tutorial/pictures/Makefile
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/assembly_n_components.tex b/chi/tutorial/pictures/assembly_n_components.tex
index db4a9ad..79ad177 100644
--- a/chi/tutorial/pictures/assembly_n_components.tex
+++ b/chi/tutorial/pictures/assembly_n_components.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/assembly_two_components.tex b/chi/tutorial/pictures/assembly_two_components.tex
index 622e108..4a0e077 100644
--- a/chi/tutorial/pictures/assembly_two_components.tex
+++ b/chi/tutorial/pictures/assembly_two_components.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/buffered_producer_consumer.tex b/chi/tutorial/pictures/buffered_producer_consumer.tex
index e8e05f4..d74c54e 100644
--- a/chi/tutorial/pictures/buffered_producer_consumer.tex
+++ b/chi/tutorial/pictures/buffered_producer_consumer.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/controlled_factory.tex b/chi/tutorial/pictures/controlled_factory.tex
index 286f503..a846c21 100644
--- a/chi/tutorial/pictures/controlled_factory.tex
+++ b/chi/tutorial/pictures/controlled_factory.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/conveyor_3items.tex b/chi/tutorial/pictures/conveyor_3items.tex
index 4ca37cc..444c485 100644
--- a/chi/tutorial/pictures/conveyor_3items.tex
+++ b/chi/tutorial/pictures/conveyor_3items.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/conveyor_system.tex b/chi/tutorial/pictures/conveyor_system.tex
index fe0228e..147721b 100644
--- a/chi/tutorial/pictures/conveyor_system.tex
+++ b/chi/tutorial/pictures/conveyor_system.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/generator_2buffers_2servers_exit.tex b/chi/tutorial/pictures/generator_2buffers_2servers_exit.tex
index 0848cae..5886e0d 100644
--- a/chi/tutorial/pictures/generator_2buffers_2servers_exit.tex
+++ b/chi/tutorial/pictures/generator_2buffers_2servers_exit.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/generator_2servers_exit.tex b/chi/tutorial/pictures/generator_2servers_exit.tex
index 2dee8e2..72e93b4 100644
--- a/chi/tutorial/pictures/generator_2servers_exit.tex
+++ b/chi/tutorial/pictures/generator_2servers_exit.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/generator_buffer_server_exit.tex b/chi/tutorial/pictures/generator_buffer_server_exit.tex
index 935bcc0..035da78 100644
--- a/chi/tutorial/pictures/generator_buffer_server_exit.tex
+++ b/chi/tutorial/pictures/generator_buffer_server_exit.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/generator_server_exit.tex b/chi/tutorial/pictures/generator_server_exit.tex
index 737e0d7..aa4ae65 100644
--- a/chi/tutorial/pictures/generator_server_exit.tex
+++ b/chi/tutorial/pictures/generator_server_exit.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/list_with_indices.tex b/chi/tutorial/pictures/list_with_indices.tex
index cbdf7bf..b4d3b85 100644
--- a/chi/tutorial/pictures/list_with_indices.tex
+++ b/chi/tutorial/pictures/list_with_indices.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/list_with_slices.tex b/chi/tutorial/pictures/list_with_slices.tex
index 6f57a82..3da5dac 100644
--- a/chi/tutorial/pictures/list_with_slices.tex
+++ b/chi/tutorial/pictures/list_with_slices.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/one_place_buffer.tex b/chi/tutorial/pictures/one_place_buffer.tex
index 086206b..2531c02 100644
--- a/chi/tutorial/pictures/one_place_buffer.tex
+++ b/chi/tutorial/pictures/one_place_buffer.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/postamble.tex b/chi/tutorial/pictures/postamble.tex
index 448e6df..03eaff3 100644
--- a/chi/tutorial/pictures/postamble.tex
+++ b/chi/tutorial/pictures/postamble.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/preamble.tex b/chi/tutorial/pictures/preamble.tex
index fc69186..dc35ec7 100644
--- a/chi/tutorial/pictures/preamble.tex
+++ b/chi/tutorial/pictures/preamble.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/producer_consumer.tex b/chi/tutorial/pictures/producer_consumer.tex
index 3eca9dd..647dcc7 100644
--- a/chi/tutorial/pictures/producer_consumer.tex
+++ b/chi/tutorial/pictures/producer_consumer.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/sixchilds.fig b/chi/tutorial/pictures/sixchilds.fig
index ff55db4..d6ecafa 100644
--- a/chi/tutorial/pictures/sixchilds.fig
+++ b/chi/tutorial/pictures/sixchilds.fig
@@ -1,6 +1,6 @@
 #FIG 3.2

 ################################################################################

-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation

+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation

 #

 # See the NOTICE file(s) distributed with this work for additional

 # information regarding copyright ownership.

diff --git a/chi/tutorial/pictures/three_parallel_servers.tex b/chi/tutorial/pictures/three_parallel_servers.tex
index 4950774..77e6ed9 100644
--- a/chi/tutorial/pictures/three_parallel_servers.tex
+++ b/chi/tutorial/pictures/three_parallel_servers.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/two_parallel_requesting_servers.tex b/chi/tutorial/pictures/two_parallel_requesting_servers.tex
index 10e5b99..7e39749 100644
--- a/chi/tutorial/pictures/two_parallel_requesting_servers.tex
+++ b/chi/tutorial/pictures/two_parallel_requesting_servers.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/two_parallel_servers.tex b/chi/tutorial/pictures/two_parallel_servers.tex
index fbcfe2d..6d82439 100644
--- a/chi/tutorial/pictures/two_parallel_servers.tex
+++ b/chi/tutorial/pictures/two_parallel_servers.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/chi/tutorial/pictures/two_place_buffer.tex b/chi/tutorial/pictures/two_place_buffer.tex
index 7adb450..ceadef6 100644
--- a/chi/tutorial/pictures/two_place_buffer.tex
+++ b/chi/tutorial/pictures/two_place_buffer.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/build-imgs.bash b/cif/build-imgs.bash
index 76930d1..e5026eb 100644
--- a/cif/build-imgs.bash
+++ b/cif/build-imgs.bash
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/eclipse-escet-incubation-cif-manual.pdf b/cif/eclipse-escet-incubation-cif-manual.pdf
index 21aa3c4..fa5a6ac 100644
--- a/cif/eclipse-escet-incubation-cif-manual.pdf
+++ b/cif/eclipse-escet-incubation-cif-manual.pdf
Binary files differ
diff --git a/cif/index.html b/cif/index.html
index 3f9072d..5c6c5bb 100644
--- a/cif/index.html
+++ b/cif/index.html
@@ -4,8 +4,8 @@
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="generator" content="Asciidoctor 2.0.10">
-<meta name="author" content="Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation">
+<meta name="generator" content="Asciidoctor 2.0.12">
+<meta name="author" content="Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation">
 <link rel="icon" type="image/png" href="favicon.png">
 <title>CIF documentation (Incubation)</title>
 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
@@ -49,7 +49,7 @@
 table{border-collapse:collapse;border-spacing:0}
 *,*::before,*::after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
 html,body{font-size:100%}
-body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
+body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;word-wrap:anywhere;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
 a:hover{cursor:pointer}
 img,object,embed{max-width:100%;height:auto}
 object,embed{height:100%}
@@ -64,10 +64,8 @@
 img,object,svg{display:inline-block;vertical-align:middle}
 textarea{height:auto;min-height:50px}
 select{width:100%}
-.center{margin-left:auto;margin-right:auto}
-.stretch{width:100%}
 .subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em}
-div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0;direction:ltr}
+div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0}
 a{color:#2156a5;text-decoration:underline;line-height:inherit}
 a:hover,a:focus{color:#1d4b8f}
 a img{border:0}
@@ -107,19 +105,22 @@
 h2{font-size:2.3125em}
 h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
 h4{font-size:1.4375em}}
-table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede}
+table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede;word-wrap:normal}
 table thead,table tfoot{background:#f7f8f7}
 table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left}
 table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
 table tr.even,table tr.alt{background:#f8f8f7}
-table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{display:table-cell;line-height:1.6}
+table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6}
 h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
 h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
+.center{margin-left:auto;margin-right:auto}
+.stretch{width:100%}
 .clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table}
 .clearfix::after,.float-group::after{clear:both}
-:not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed;word-wrap:break-word}
-:not(pre)>code.nobreak{word-wrap:normal}
-:not(pre)>code.nowrap{white-space:nowrap}
+:not(pre).nobreak{word-wrap:normal}
+:not(pre).nowrap{white-space:nowrap}
+:not(pre).pre-wrap{white-space:pre-wrap}
+:not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed}
 pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
 pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
 pre>code{display:block}
@@ -184,7 +185,7 @@
 #content #toc{border-style:solid;border-width:1px;border-color:#e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;-webkit-border-radius:4px;border-radius:4px}
 #content #toc>:first-child{margin-top:0}
 #content #toc>:last-child{margin-bottom:0}
-#footer{max-width:100%;background:rgba(0,0,0,.8);padding:1.25em}
+#footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em}
 #footer-text{color:rgba(255,255,255,.8);line-height:1.44}
 #content{margin-bottom:.625em}
 .sect1{padding-bottom:.625em}
@@ -207,7 +208,7 @@
 .admonitionblock>table td.icon{text-align:center;width:80px}
 .admonitionblock>table td.icon img{max-width:none}
 .admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
-.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6)}
+.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6);word-wrap:anywhere}
 .admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
 .exampleblock>.content{border-style:solid;border-width:1px;border-color:#e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;-webkit-border-radius:4px;border-radius:4px}
 .exampleblock>.content>:first-child{margin-top:0}
@@ -217,7 +218,7 @@
 .sidebarblock>:last-child{margin-bottom:0}
 .sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
 .exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
-.literalblock pre,.listingblock>.content>pre{-webkit-border-radius:4px;border-radius:4px;word-wrap:break-word;overflow-x:auto;padding:1em;font-size:.8125em}
+.literalblock pre,.listingblock>.content>pre{-webkit-border-radius:4px;border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em}
 @media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}}
 @media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}}
 .literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class="highlight"],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
@@ -263,21 +264,20 @@
 .quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0}
 .quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem}
 .quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;text-align:left;margin-right:0}
-table.tableblock{max-width:100%;border-collapse:separate}
 p.tableblock:last-child{margin-bottom:0}
+td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere}
 td.tableblock>.content>:last-child{margin-bottom:-1.25em}
-td.tableblock>.content>:last-child.sidebarblock{margin-bottom:0}
 table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
-table.grid-all>thead>tr>.tableblock,table.grid-all>tbody>tr>.tableblock{border-width:0 1px 1px 0}
-table.grid-all>tfoot>tr>.tableblock{border-width:1px 1px 0 0}
-table.grid-cols>*>tr>.tableblock{border-width:0 1px 0 0}
-table.grid-rows>thead>tr>.tableblock,table.grid-rows>tbody>tr>.tableblock{border-width:0 0 1px}
-table.grid-rows>tfoot>tr>.tableblock{border-width:1px 0 0}
-table.grid-all>*>tr>.tableblock:last-child,table.grid-cols>*>tr>.tableblock:last-child{border-right-width:0}
-table.grid-all>tbody>tr:last-child>.tableblock,table.grid-all>thead:last-child>tr>.tableblock,table.grid-rows>tbody>tr:last-child>.tableblock,table.grid-rows>thead:last-child>tr>.tableblock{border-bottom-width:0}
+table.grid-all>*>tr>*{border-width:1px}
+table.grid-cols>*>tr>*{border-width:0 1px}
+table.grid-rows>*>tr>*{border-width:1px 0}
 table.frame-all{border-width:1px}
+table.frame-ends{border-width:1px 0}
 table.frame-sides{border-width:0 1px}
-table.frame-topbot,table.frame-ends{border-width:1px 0}
+table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0}
+table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0}
+table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0}
+table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0}
 table.stripes-all tr,table.stripes-odd tr:nth-of-type(odd),table.stripes-even tr:nth-of-type(even),table.stripes-hover tr:hover{background:#f8f8f7}
 th.halign-left,td.halign-left{text-align:left}
 th.halign-right,td.halign-right{text-align:right}
@@ -286,7 +286,7 @@
 th.valign-bottom,td.valign-bottom{vertical-align:bottom}
 th.valign-middle,td.valign-middle{vertical-align:middle}
 table thead th,table tfoot th{font-weight:bold}
-tbody tr th{display:table-cell;line-height:1.6;background:#f7f8f7}
+tbody tr th{background:#f7f8f7}
 tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
 p.tableblock>code:only-child{background:none;padding:0}
 p.tableblock{font-size:1em}
@@ -315,6 +315,7 @@
 .hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
 td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
 td.hdlist1{font-weight:bold;padding-bottom:1.25em}
+td.hdlist2{word-wrap:anywhere}
 .literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
 .colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
 .colist td:not([class]):first-child img{max-width:none}
@@ -387,7 +388,7 @@
 .admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
 .admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
 .admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
-.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);-webkit-border-radius:100px;border-radius:100px;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
+.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);-webkit-border-radius:50%;border-radius:50%;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
 .conum[data-value] *{color:#fff!important}
 .conum[data-value]+b{display:none}
 .conum[data-value]::after{content:attr(data-value)}
@@ -414,6 +415,7 @@
 svg{max-width:100%}
 p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
 h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
+#header,#content,#footnotes,#footer{max-width:none}
 #toc,.sidebarblock,.exampleblock>.content{background:none!important}
 #toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important}
 body.book #header{text-align:center}
@@ -439,7 +441,7 @@
 </style>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
@@ -483,8 +485,8 @@
 <div id="header">
 <h1>CIF documentation (Incubation)</h1>
 <div class="details">
-<span id="author" class="author">Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation</span><br>
-<span id="revnumber">version 0.1.0.20210126-175926</span>
+<span id="author" class="author">Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation</span><br>
+<span id="revnumber">version 0.1.0.20210318-080652</span>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
@@ -670,7 +672,7 @@
 <li><a href="#examples-chapter-index">CIF examples</a></li>
 <li><a href="#release-notes-chapter-index">CIF release notes</a>
 <ul class="sectlevel2">
-<li><a href="#version-0-1-unreleased">Version 0.1 (unreleased)</a></li>
+<li><a href="#version-0-1">Version 0.1</a></li>
 </ul>
 </li>
 <li><a href="#dev-chapter-index">Developers</a>
@@ -694,8 +696,10 @@
 testing, and code generation.</p>
 </div>
 <div class="paragraph">
-<p>CIF is one of the tools of the
-<a href="https://eclipse.org/escet">Eclipse ESCET&#8482; project</a>.</p>
+<p>CIF is one of the tools of the Eclipse ESCET&#8482; project. Visit the
+<a href="https://eclipse.org/escet">project website</a> for downloads,
+installation instructions, source code, general tool usage information,
+information on how to contribute, and more.</p>
 </div>
 <div class="admonitionblock warning">
 <table>
@@ -1310,7 +1314,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton lamp:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton lamp:
   event turn_on, turn_off;
 
   location on:
@@ -1400,7 +1404,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton producer:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton producer:
   event produce, provide;
 
   location producing:
@@ -1424,7 +1428,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton consumer:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton consumer:
   event consume;
 
   location idle:
@@ -1665,7 +1669,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton coin:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton coin:
   event toss, land, pick_up;
 
   location hand:
@@ -1761,7 +1765,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton producer:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton producer:
   event produce, provide;
 
   location producing:
@@ -1801,7 +1805,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event provide;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event provide;
 
 automaton producer:
   event produce;
@@ -1836,7 +1840,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">alphabet; // Empty alphabet. Automaton doesn't synchronize over any events.</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">alphabet; // Empty alphabet. Automaton doesn't synchronize over any events.</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1884,7 +1888,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton producer:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton producer:
   event produce, provide;
 
   location producing:
@@ -1912,7 +1916,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton producer:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton producer:
   event produce, provide, consume; // Declaration of event 'consume' moved.
 
   location producing:
@@ -1959,7 +1963,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event provide; // Event 'provide' now declared outside the automata.
+<pre class="highlight"><code class="language-cif" data-lang="cif">event provide; // Event 'provide' now declared outside the automata.
 
 automaton producer:
   event produce;
@@ -2030,7 +2034,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton a:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton a:
   event e;
 
   location x:
@@ -2049,7 +2053,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton a:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton a:
   event e;
 
   location x:
@@ -2075,7 +2079,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event a, b, c; // Single declaration declares multiple events.</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">event a, b, c; // Single declaration declares multiple events.</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2084,7 +2088,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event a; // Multiple declarations each declare a single event.
+<pre class="highlight"><code class="language-cif" data-lang="cif">event a; // Multiple declarations each declare a single event.
 event b;
 event c;</code></pre>
 </div>
@@ -2105,7 +2109,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton a:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton a:
   event e, f;
 
   location loc:
@@ -2119,7 +2123,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton a:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton a:
   event e, f;
 
   location loc:
@@ -2145,7 +2149,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton a:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton a:
   event e;
 
   location:
@@ -2171,7 +2175,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton counter:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton counter:
   event increment, decrement;
 
   disc int count = 3;
@@ -2246,7 +2250,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton lamp:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton lamp:
   event turn_on, turn_off;
 
   disc int count = 0;
@@ -2295,7 +2299,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton counter:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton counter:
   event increment, decrement;
 
   disc int count = 3;
@@ -2311,7 +2315,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton counter:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton counter:
   event increment, decrement;
 
   location zero:
@@ -2359,7 +2363,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton lamp:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton lamp:
   event turn_on, turn_off;
 
   location on:
@@ -2377,7 +2381,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton lamp:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton lamp:
   event turn_on, turn_off;
 
   disc bool on = true;
@@ -2410,7 +2414,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton lamp:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton lamp:
   event turn_on, turn_off;
 
   disc bool on2 = true;
@@ -2451,7 +2455,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton customer:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton customer:
   location:
     initial;
     edge queue1.enter when queue1.count &lt;= queue2.count;
@@ -2559,7 +2563,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton producer:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton producer:
   event produce, provide_a, provide_b;
 
   location producing:
@@ -2642,7 +2646,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton detect_changeover:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton detect_changeover:
   disc int count = 0;
 
   location start:
@@ -2699,7 +2703,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton detect_changeover:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton detect_changeover:
   monitor producer.provide_a, producer.provide_b; // Monitor instead of the self loops.
 
   disc int count = 0;
@@ -2730,7 +2734,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">monitor; // Monitor all events in the alphabet of the automaton.</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">monitor; // Monitor all events in the alphabet of the automaton.</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2760,7 +2764,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton counter:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton counter:
   event increment;
 
   disc int count = 0;
@@ -2813,7 +2817,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton swapper:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton swapper:
   event swap;
   disc int x = 0, y = 0;
 
@@ -2879,7 +2883,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">edge swap do y := x + 1, x := y;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">edge swap do y := x + 1, x := y;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2898,7 +2902,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">edge ... do x := y, y := x + 1;     // Multiple (two) assignments.
+<pre class="highlight"><code class="language-cif" data-lang="cif">edge ... do x := y, y := x + 1;     // Multiple (two) assignments.
 edge ... do (x, y) := (y, x + 1);   // Single multi-assignment.</code></pre>
 </div>
 </div>
@@ -2933,7 +2937,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event move;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event move;
 
 automaton conveyor1:
   monitor move;
@@ -3033,7 +3037,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton machine1:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton machine1:
   event process, provide;
   disc int id = 0;
 
@@ -3078,7 +3082,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton machine1:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton machine1:
   event provide;                         // No more 'process' event.
   disc int id = 0;
 
@@ -3132,7 +3136,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">edge tau goto ...;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">edge tau goto ...;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3141,7 +3145,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">edge provide, tau goto ...;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">edge provide, tau goto ...;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3161,7 +3165,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc int x = 1;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc int x = 1;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3172,7 +3176,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc int x;
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc int x;
 disc bool y;</code></pre>
 </div>
 </div>
@@ -3190,7 +3194,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc int x in {1, 2, 4};</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc int x in {1, 2, 4};</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3212,7 +3216,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc int x in any;
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc int x in any;
 disc bool y in any;</code></pre>
 </div>
 </div>
@@ -3239,7 +3243,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc int x = 1;     // Initial value: 1
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc int x = 1;     // Initial value: 1
 disc int y = x * 2; // Initial value: 2
 disc int z = x + y; // Initial value: 3</code></pre>
 </div>
@@ -3260,7 +3264,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc int y = x * 2; // Uses variable x, which is declared later.
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc int y = x * 2; // Uses variable x, which is declared later.
 disc int x = 1;</code></pre>
 </div>
 </div>
@@ -3272,7 +3276,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc int x = y; // Invalid initial value due to cyclic dependency.
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc int x = y; // Invalid initial value due to cyclic dependency.
 disc int y = z;
 disc int z = x;</code></pre>
 </div>
@@ -3287,7 +3291,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc int x in any; // Explicit 'any' breaks the cyclic dependency.
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc int x in any; // Explicit 'any' breaks the cyclic dependency.
 disc int y = z;
 disc int z = x;</code></pre>
 </div>
@@ -3317,7 +3321,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton a:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton a:
   location loc1:
     initial;
 
@@ -3368,7 +3372,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton odd_even:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton odd_even:
   event inc, dec;
   disc int n = 5;
 
@@ -3396,7 +3400,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton odd_even:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton odd_even:
   event inc, dec;
   disc int n = 5;
 
@@ -3435,7 +3439,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton a:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton a:
   disc int x in any;
 
   initial x mod 2 = 1;
@@ -3457,7 +3461,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton a:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton a:
   disc int x in any;
 
   location ...
@@ -3494,7 +3498,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton machine1:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton machine1:
   event start1, done1, reset1;
   disc bool claimed = false;
 
@@ -3555,7 +3559,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton machine1:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton machine1:
   event start1, done1, reset1;
 
   location idle:
@@ -3612,7 +3616,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton counter:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton counter:
   event increment, decrement;
 
   disc int count = 3;
@@ -3636,7 +3640,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton counter:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton counter:
   event increment, decrement;
 
   disc int count = 3;
@@ -3678,7 +3682,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Multiple invariants, each with a single predicate.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Multiple invariants, each with a single predicate.
 invariant count &gt;= 0;
 invariant count &lt;= 5;
 
@@ -3722,7 +3726,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Using invariants.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Using invariants.
 automaton a:
   disc int x;
 
@@ -3787,7 +3791,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton motor:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton motor:
   event turn_on, turn_off;
 
   location off:
@@ -3836,7 +3840,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton controller:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton controller:
   location:
     initial;
     edge motor.turn_on when door.closed and emergency_button.released;
@@ -3867,7 +3871,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">invariant motor.turn_on needs door.closed and emergency_button.released;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">invariant motor.turn_on needs door.closed and emergency_button.released;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3885,7 +3889,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Single state/event exclusion invariant.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Single state/event exclusion invariant.
 invariant motor.turn_on needs door.closed and emergency_button.released;
 
 // Multiple state/event exclusion invariants.
@@ -3911,7 +3915,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// State/event exclusion invariant to specify when event is allowed/enabled.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// State/event exclusion invariant to specify when event is allowed/enabled.
 invariant motor.turn_on needs door.closed;
 
 // State/event exclusion invariant to specify when event is disallowed/disabled.
@@ -3931,26 +3935,26 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Single state/event exclusion invariant for enabling the event.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Single state/event exclusion invariant for enabling the event.
 invariant motor.turn_on needs door.closed and emergency_button.released;</code></pre>
 </div>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Multiple state/event exclusion invariants for enabling the event.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Multiple state/event exclusion invariants for enabling the event.
 invariant motor.turn_on needs door.closed;
 invariant motor.turn_on needs emergency_button.released;</code></pre>
 </div>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Single state/event exclusion invariant for disabling the event.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Single state/event exclusion invariant for disabling the event.
 invariant door.opened or emergency_button.pushed disables motor.turn_on;</code></pre>
 </div>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Multiple state/event exclusion invariants for disabling the event.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Multiple state/event exclusion invariants for disabling the event.
 invariant door.opened             disables motor.turn_on;
 invariant emergency_button.pushed disables motor.turn_on;</code></pre>
 </div>
@@ -3981,7 +3985,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Two separate invariants with same condition, for different events.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Two separate invariants with same condition, for different events.
 invariant motor.turn_on needs emergency_button.released;
 invariant door.close    needs emergency_button.released;
 
@@ -4012,7 +4016,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc int x = 1;
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc int x = 1;
 disc int y = 2 * x;</code></pre>
 </div>
 </div>
@@ -4167,7 +4171,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">+9          // 9
+<pre class="highlight"><code class="language-cif" data-lang="cif">+9          // 9
 --9         // 9
 
 9 + 4       // 13
@@ -4189,7 +4193,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">x &lt; y       // less than
+<pre class="highlight"><code class="language-cif" data-lang="cif">x &lt; y       // less than
 x &lt;= y      // less than or equal to
 x = y       // equal to
 x != y      // not equal to
@@ -4210,7 +4214,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">ERROR: Integer overflow: 9999999 * 9999999.</code></pre>
+<pre class="highlight"><code class="language-console" data-lang="console">ERROR: Integer overflow: 9999999 * 9999999.</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4219,7 +4223,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc int[3..7] x;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc int[3..7] x;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4249,7 +4253,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">+1.23           // 1.23
+<pre class="highlight"><code class="language-cif" data-lang="cif">+1.23           // 1.23
 --1.2           // 1.2
 
 1.5 + 0.5       // 2.0
@@ -4278,7 +4282,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">x &lt; y       // less than
+<pre class="highlight"><code class="language-cif" data-lang="cif">x &lt; y       // less than
 x &lt;= y      // less than or equal to
 x = y       // equal to
 x != y      // not equal to
@@ -4294,7 +4298,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">sqrt(16)    // 4.0 (16 interpreted as 16.0)
+<pre class="highlight"><code class="language-cif" data-lang="cif">sqrt(16)    // 4.0 (16 interpreted as 16.0)
 1 + 0.5     // 1.5 (addition of an integer number and a real number)
 max(0.5, 1) // 1.0 (maximum of an integer number and a real number)
 
@@ -4324,7 +4328,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">not x       // inverse
+<pre class="highlight"><code class="language-cif" data-lang="cif">not x       // inverse
 
 x and y     // conjunction (both x and y must hold)
 x or y      // disjunction (either x, y, or both must hold)
@@ -4390,7 +4394,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">enum TrafficColor = RED, ORANGE, GREEN;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">enum TrafficColor = RED, ORANGE, GREEN;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4405,7 +4409,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc TrafficColor light = RED;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc TrafficColor light = RED;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4417,7 +4421,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">edge change_color when light = RED do light := GREEN;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">edge change_color when light = RED do light := GREEN;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4444,7 +4448,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc tuple(int nr; real weight) box;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc tuple(int nr; real weight) box;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4460,7 +4464,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc tuple(int a; int b; real c; int d) x1;
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc tuple(int a; int b; real c; int d) x1;
 disc tuple(int a, b;     real c; int d) x2;</code></pre>
 </div>
 </div>
@@ -4472,7 +4476,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc tuple(int nr; real weight) box = (5, 2.7);
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc tuple(int nr; real weight) box = (5, 2.7);
 
 edge ... do box := (6, 3.4);</code></pre>
 </div>
@@ -4490,7 +4494,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc tuple(int nr; real weight) box = (5, 2.7);
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc tuple(int nr; real weight) box = (5, 2.7);
 disc int i;
 disc real r;
 
@@ -4514,7 +4518,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc tuple(int nr; real weight) box = (5, 2.7);
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc tuple(int nr; real weight) box = (5, 2.7);
 disc int i;
 disc real r;
 
@@ -4536,7 +4540,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc tuple(int nr; real weight) box;
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc tuple(int nr; real weight) box;
 disc int i;
 disc real r;
 
@@ -4559,7 +4563,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc tuple(int nr; real weight) box = (5, 2.7);
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc tuple(int nr; real weight) box = (5, 2.7);
 disc int i;
 disc real r;
 
@@ -4594,7 +4598,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc list int x = [7, 8, 3];</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc list int x = [7, 8, 3];</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4610,7 +4614,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc list int x1;                       // Implicitly empty list.
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc list int x1;                       // Implicitly empty list.
 disc list int x2 = [];                  // Explicitly empty list.
 disc list int x3 = [1, 2, 1, 2, 2];     // Duplicate elements in a list.</code></pre>
 </div>
@@ -4624,7 +4628,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc list int x = [7, 8, 3];
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc list int x = [7, 8, 3];
 disc int i;
 
 edge ... do i := x[0];   // 'i' becomes '7'
@@ -4647,7 +4651,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc list int x = [7, 8, 3];
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc list int x = [7, 8, 3];
 disc int i;
 
 edge ... do i := x[-1];  // 'i' becomes '3'
@@ -4690,7 +4694,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc list int x = [7, 8, 3, 5, 9];
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc list int x = [7, 8, 3, 5, 9];
 
 x[2:4]  //       [3, 5]    Slice that includes third and fourth elements.
 x[2:7]  //       [3, 5, 9] Slice that excludes the first two elements.
@@ -4728,7 +4732,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">[7, 8, 3] + [5, 9]   // [7, 8, 3, 5, 9]
+<pre class="highlight"><code class="language-cif" data-lang="cif">[7, 8, 3] + [5, 9]   // [7, 8, 3, 5, 9]
 [5] + [7, 8, 3]      // [5, 7, 8, 3]
 [7, 8, 3] + [5]      // [7, 8, 3, 5]</code></pre>
 </div>
@@ -4739,7 +4743,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">[1, 4, 2, 4, 5] - [2]           // [1, 4, 4, 5] (removal of elements)
+<pre class="highlight"><code class="language-cif" data-lang="cif">[1, 4, 2, 4, 5] - [2]           // [1, 4, 4, 5] (removal of elements)
 [1, 4, 2, 4, 5] - [4]           // [1, 2, 4, 5]
 [1, 4, 2, 4, 5] - [8]           // [1, 4, 2, 4, 5]
 [1, 2, 3, 4, 5] - [6, 4, 2, 3]  // [1, 5]
@@ -4769,7 +4773,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton a:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton a:
   disc list int x;
 
   location:
@@ -4789,7 +4793,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc list[3..7] int y;      // List with at least 3 and at most 7 elements.</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc list[3..7] int y;      // List with at least 3 and at most 7 elements.</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4810,7 +4814,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc list[5..5] int a;      // List with at least 5 and at most 5 elements.
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc list[5..5] int a;      // List with at least 5 and at most 5 elements.
 disc list[5]    int b;      // Shorter but equivalent array notation.</code></pre>
 </div>
 </div>
@@ -4841,7 +4845,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc set int x1 = {3, 7, 8};
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc set int x1 = {3, 7, 8};
 disc set int x2 = {8, 3, 7};        // Order irrelevant (same as 'x1').
 disc set int x3 = {8, 3, 7, 3};     // Duplicates ignored (same as 'x2').
 disc set int x4 = {};               // Empty set.</code></pre>
@@ -4869,7 +4873,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">{1, 2, 3} or {2, 3, 4}          // {1, 2, 3, 4}
+<pre class="highlight"><code class="language-cif" data-lang="cif">{1, 2, 3} or {2, 3, 4}          // {1, 2, 3, 4}
 {1, 2, 3} or {2, 3, 4}          // {1, 2, 4, 3}</code></pre>
 </div>
 </div>
@@ -4888,7 +4892,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">{1, 2, 3} and {2, 3, 4}         // {2, 3}
+<pre class="highlight"><code class="language-cif" data-lang="cif">{1, 2, 3} and {2, 3, 4}         // {2, 3}
 {1, 2} and {3, 4}               // {} (no elements in common)</code></pre>
 </div>
 </div>
@@ -4901,7 +4905,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">{1, 2, 3} - {2, 3, 4}           // {1}
+<pre class="highlight"><code class="language-cif" data-lang="cif">{1, 2, 3} - {2, 3, 4}           // {1}
 {1, 2, 3} - {4, 5}              // {1, 2, 3}
 {1, 2, 3} - {1, 2, 3, 4}        // {}</code></pre>
 </div>
@@ -4912,7 +4916,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">{1, 8, 3} = {1, 3, 8}       // true (equality, ignores order of elements)
+<pre class="highlight"><code class="language-cif" data-lang="cif">{1, 8, 3} = {1, 3, 8}       // true (equality, ignores order of elements)
 
 6 in {1, 8, 3}              // false (element test)
 1 in {1, 8, 3}              // true
@@ -4942,7 +4946,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc dict(string:int) age = {&quot;eve&quot;: 32, &quot;john&quot;: 34, &quot;adam&quot;: 25};</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc dict(string:int) age = {"eve": 32, "john": 34, "adam": 25};</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4969,9 +4973,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc dict(string:int) age = {&quot;eve&quot;:  32,
-                             &quot;john&quot;: 34,
-                             &quot;adam&quot;: 25};</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc dict(string:int) age = {"eve":  32,
+                             "john": 34,
+                             "adam": 25};</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4980,7 +4984,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc dict(string:int) x1 = {};  // Explicitly initialized as empty.
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc dict(string:int) x1 = {};  // Explicitly initialized as empty.
 disc dict(string:int) x2;       // Implicitly initialized as empty.</code></pre>
 </div>
 </div>
@@ -4993,7 +4997,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc dict(int:int) x1 = {1: 2, 1: 2};  // Invalid due to duplicate key '1'.
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc dict(int:int) x1 = {1: 2, 1: 2};  // Invalid due to duplicate key '1'.
 disc dict(int:int) x2 = {1: 2, 1: 3};  // Invalid due to duplicate key '1'.</code></pre>
 </div>
 </div>
@@ -5003,12 +5007,12 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc dict(string:int) age = {&quot;adam&quot;: 25, &quot;eve&quot;: 32, &quot;john&quot;: 34};
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc dict(string:int) age = {"adam": 25, "eve": 32, "john": 34};
 disc int i;
 
-edge ... do i := age[&quot;adam&quot;];   // 'i' becomes '25'
-edge ... do i := age[&quot;eve&quot;];    // 'i' becomes '32'
-edge ... do i := age[&quot;carl&quot;];   // error (there is no &quot;carl&quot; key)</code></pre>
+edge ... do i := age["adam"];   // 'i' becomes '25'
+edge ... do i := age["eve"];    // 'i' becomes '32'
+edge ... do i := age["carl"];   // error (there is no "carl" key)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5021,10 +5025,10 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc dict(string:int) age = {&quot;adam&quot;: 25, &quot;eve&quot;: 32, &quot;john&quot;: 34};
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc dict(string:int) age = {"adam": 25, "eve": 32, "john": 34};
 
-edge ... do age[&quot;eve&quot;] := 33;  // Changes eve's age.
-edge ... do age[&quot;bob&quot;] := 47;  // Adds a new key/value pair.</code></pre>
+edge ... do age["eve"] := 33;  // Changes eve's age.
+edge ... do age["bob"] := 47;  // Adds a new key/value pair.</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5040,20 +5044,20 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">{&quot;a&quot;: 1, &quot;b&quot;: 2} = {&quot;b&quot;: 2, &quot;a&quot;: 1}     // true (equality check)
-{&quot;a&quot;: 1, &quot;b&quot;: 2} = {&quot;a&quot;: 1, &quot;b&quot;: 3}     // false
+<pre class="highlight"><code class="language-cif" data-lang="cif">{"a": 1, "b": 2} = {"b": 2, "a": 1}     // true (equality check)
+{"a": 1, "b": 2} = {"a": 1, "b": 3}     // false
 
-&quot;a&quot; in {&quot;a&quot;: 1, &quot;b&quot;: 2}                 // true (key existence check)
-&quot;c&quot; in {&quot;a&quot;: 1, &quot;b&quot;: 2}                 // false
+"a" in {"a": 1, "b": 2}                 // true (key existence check)
+"c" in {"a": 1, "b": 2}                 // false
 
-{&quot;a&quot;: 1, &quot;b&quot;: 2} + {&quot;b&quot;: 3, &quot;c&quot;: 4}     // {&quot;a&quot;: 1, &quot;b&quot;: 3, &quot;c&quot;: 4} (add/overwrite pairs)
+{"a": 1, "b": 2} + {"b": 3, "c": 4}     // {"a": 1, "b": 3, "c": 4} (add/overwrite pairs)
 
-{&quot;a&quot;: 1, &quot;b&quot;: 2} - {&quot;b&quot;: 3, &quot;c&quot;: 4}     // {&quot;a&quot;: 1} (removal based on keys)
-{&quot;a&quot;: 1, &quot;b&quot;: 2} - {&quot;b&quot;, &quot;c&quot;}           // {&quot;a&quot;: 1}
-{&quot;a&quot;: 1, &quot;b&quot;: 2} - [&quot;b&quot;, &quot;c&quot;]           // {&quot;a&quot;: 1}
+{"a": 1, "b": 2} - {"b": 3, "c": 4}     // {"a": 1} (removal based on keys)
+{"a": 1, "b": 2} - {"b", "c"}           // {"a": 1}
+{"a": 1, "b": 2} - ["b", "c"]           // {"a": 1}
 
-empty({&quot;a&quot;: 1, &quot;b&quot;: 2})                 // false (empty check)
-size({&quot;a&quot;: 1, &quot;b&quot;: 2})                  // 2 (count pairs)</code></pre>
+empty({"a": 1, "b": 2})                 // false (empty check)
+size({"a": 1, "b": 2})                  // 2 (count pairs)</code></pre>
 </div>
 </div>
 </div>
@@ -5065,7 +5069,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">disc dict(int;tuple(real pos, weight)) boxes = {1: (0.0, 2.5),
+<pre class="highlight"><code class="language-cif" data-lang="cif">disc dict(int;tuple(real pos, weight)) boxes = {1: (0.0, 2.5),
                                                 2: (3.0, 1.7),
                                                 3: (4.0, 3.9};</code></pre>
 </div>
@@ -5081,7 +5085,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">edge ... do boxes[1][weight] := 3.5;
+<pre class="highlight"><code class="language-cif" data-lang="cif">edge ... do boxes[1][weight] := 3.5;
 edge ... do boxes[2][pos] := boxes[2][pos] + 1;
 edge ... do boxes[4] := (1.0, 0.8);</code></pre>
 </div>
@@ -5110,7 +5114,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">const int STEP = 2;
+<pre class="highlight"><code class="language-cif" data-lang="cif">const int STEP = 2;
 const int TARGET = 100;
 
 automaton movement:
@@ -5144,7 +5148,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">const int STEP = 2;
+<pre class="highlight"><code class="language-cif" data-lang="cif">const int STEP = 2;
 const int TARGET = 100;
 
 automaton movement:
@@ -5172,7 +5176,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">enum ProductType = A, B, C;
+<pre class="highlight"><code class="language-cif" data-lang="cif">enum ProductType = A, B, C;
 const dict(ProductType:real) DURATION = {A: 3.5, B: 5.7, C: 0.8};</code></pre>
 </div>
 </div>
@@ -5208,7 +5212,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton conveyor:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton conveyor:
   disc real position = 0.0;
   event move;
 
@@ -5270,7 +5274,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton light:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton light:
   event turn_on, turn_off;
 
   location off:
@@ -5307,7 +5311,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton car:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton car:
   event start, stop, breakdown, start_repair, repaired;
 
   alg bool can_drive = idle or moving;
@@ -5350,7 +5354,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton car:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton car:
   event start, stop, breakdown, start_repair, repaired;
 
   alg bool can_drive;
@@ -5375,7 +5379,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton car:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton car:
   event start, stop, breakdown, start_repair, repaired;
 
   alg bool can_drive;
@@ -5433,7 +5437,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">enum ProductType = A, B, C;
+<pre class="highlight"><code class="language-cif" data-lang="cif">enum ProductType = A, B, C;
 
 const dict(ProductType:real) M1_DURATION = {A: 3.5, B: 5.7, C: 0.8};
 const dict(ProductType:real) M2_DURATION = {A: 1.8, B: 4.2, C: 3.9};</code></pre>
@@ -5453,7 +5457,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">enum ProductType = A, B, C;
+<pre class="highlight"><code class="language-cif" data-lang="cif">enum ProductType = A, B, C;
 type Durations = dict(ProductType:real)
 
 const Durations M1_DURATION = {A: 3.5, B: 5.7, C: 0.8};
@@ -5527,7 +5531,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event push, release;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event push, release;
 
 automaton user:
   location start1:
@@ -5637,7 +5641,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton machine:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton machine:
   event start, finished;
   cont t = 0 der 1;
 
@@ -5692,7 +5696,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">cont t der 1; // Initial value is 0.0.</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">cont t der 1; // Initial value is 0.0.</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5719,7 +5723,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton person:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton person:
   event turn;
   cont t = 0 der 1;
 
@@ -5742,7 +5746,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton person:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton person:
   event turn;
   cont t = 0;         // Declaration specifies only the initial value.
 
@@ -5768,7 +5772,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton person:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton person:
   event turn;
   cont t = 0 der 1;
 
@@ -5788,7 +5792,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton person:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton person:
   event turn;
   cont pos = 0;
 
@@ -5850,7 +5854,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">cont V = 5 der Qi - Qo;
+<pre class="highlight"><code class="language-cif" data-lang="cif">cont V = 5 der Qi - Qo;
 alg real Qi = 1;
 alg real Qo = sqrt(V);</code></pre>
 </div>
@@ -5866,7 +5870,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">cont V = 5;
+<pre class="highlight"><code class="language-cif" data-lang="cif">cont V = 5;
 alg real Qi;
 alg real Qo;
 
@@ -5987,7 +5991,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton use_case:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton use_case:
   location first:
     initial;
     edge tau goto second;
@@ -6017,7 +6021,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton use_case:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton use_case:
   location first:
     initial;
     edge tau goto second;
@@ -6058,7 +6062,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton use_case:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton use_case:
   location wait3:
     initial;
     urgent;
@@ -6087,7 +6091,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton car:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton car:
   event increase, decrease, arrived;
   disc real speed = 0;
   cont pos der speed;
@@ -6141,7 +6145,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event provide1, provide2;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event provide1, provide2;
 
 automaton producer:
   disc int nr = 0;
@@ -6240,7 +6244,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event int provide;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event int provide;
 
 automaton producer:
   disc int nr = 0;
@@ -6309,7 +6313,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event int provide;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event int provide;
 
 automaton producer1:
   disc int nr = 0;
@@ -6384,7 +6388,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event void provide;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event void provide;
 
 automaton producer:
   location:
@@ -6419,7 +6423,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event int provide;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event int provide;
 
 automaton producer1:
   disc int nr = 0;
@@ -6461,7 +6465,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton producer1:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton producer1:
   disc int nr = 0;
 
   location:
@@ -6490,7 +6494,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton controller:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton controller:
   disc int cnt = 0;
 
   location:
@@ -6583,7 +6587,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">func real mean(list real vs):
+<pre class="highlight"><code class="language-cif" data-lang="cif">func real mean(list real vs):
   int length = size(vs);
   int index = 0;
   real sum = 0;
@@ -6643,7 +6647,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">alg real m = mean([1.5, 3.2, 7.9, 15.8]);
+<pre class="highlight"><code class="language-cif" data-lang="cif">alg real m = mean([1.5, 3.2, 7.9, 15.8]);
 
 automaton a:
   disc real x;
@@ -6724,7 +6728,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">x := x + 1;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">x := x + 1;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -6737,7 +6741,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Multi-assignment on an edge.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Multi-assignment on an edge.
 edge do (x, y) := (1, 2);
 
 // Multi-assignment in a function.
@@ -6756,7 +6760,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">func int signum(real x):
+<pre class="highlight"><code class="language-cif" data-lang="cif">func int signum(real x):
   if x &gt; 0:
     return 1;
   elif x &lt; 0:
@@ -6788,7 +6792,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">return sum / length;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">return sum / length;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -6810,7 +6814,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">func real mean(list real vs):
+<pre class="highlight"><code class="language-cif" data-lang="cif">func real mean(list real vs):
   int length = size(vs);
   int index = 0;
   real sum = 0;
@@ -6847,7 +6851,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Get the first 'n' values from 'xs' that are not 'bad'.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Get the first 'n' values from 'xs' that are not 'bad'.
 func list int first_n(list int xs; int n; int bad):
   int index = 0;
   int x;
@@ -6897,7 +6901,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Get the values from 'xs' that are greater than 5.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Get the values from 'xs' that are greater than 5.
 func list int filter_gt5(list int xs):
   int index = 0;
   int x;
@@ -6946,7 +6950,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">alg list real nrs = [0.5, 1.3, 0.1, 2.7, 1.4];</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">alg list real nrs = [0.5, 1.3, 0.1, 2.7, 1.4];</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -6955,7 +6959,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">alg list real inc = sort(nrs, cmp_inc); // [0.1, 0.5, 1.3, 1.4, 2.7]
+<pre class="highlight"><code class="language-cif" data-lang="cif">alg list real inc = sort(nrs, cmp_inc); // [0.1, 0.5, 1.3, 1.4, 2.7]
 alg list real dec = sort(nrs, cmp_dec); // [2.7, 1.4, 1.3, 0.5, 0.1]</code></pre>
 </div>
 </div>
@@ -6966,7 +6970,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">func bool cmp_inc(real a, b):
+<pre class="highlight"><code class="language-cif" data-lang="cif">func bool cmp_inc(real a, b):
   return a &lt;= b;
 end
 
@@ -6984,7 +6988,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">func list real sort(list real xs; func bool (real, real) cmp):
+<pre class="highlight"><code class="language-cif" data-lang="cif">func list real sort(list real xs; func bool (real, real) cmp):
   int i = 1, j;
   real x;
 
@@ -7048,7 +7052,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event int provide;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event int provide;
 
 automaton producer:
   disc int nr = 0;
@@ -7085,7 +7089,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event int provide;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event int provide;
 
 automaton producer:
   disc int nr = 0;
@@ -7156,7 +7160,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton consumer1:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton consumer1:
   disc list int buffer = [];
 
   location:
@@ -7184,7 +7188,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton def Consumer(alg int capacity):
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton def Consumer(alg int capacity):
   disc list int buffer = [];
 
   location:
@@ -7254,7 +7258,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event int accept, provide;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event int accept, provide;
 
 automaton def Buffer(alg int capacity):
   disc list int buf = [];
@@ -7285,7 +7289,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event int accept, provide;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event int accept, provide;
 
 automaton buffer1:
   disc list int buf = [];
@@ -7311,7 +7315,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event int generate, pass_along, exit;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event int generate, pass_along, exit;
 
 automaton def Buffer(event int accept, provide):
   disc int buffer;
@@ -7350,7 +7354,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event int generate, pass_along, exit;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event int generate, pass_along, exit;
 
 automaton buffer1:
   disc int buffer;
@@ -7422,7 +7426,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton def Buffer(event int accept, provide):</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton def Buffer(event int accept, provide):</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -7430,7 +7434,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton def Buffer(event int accept?, provide!):</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton def Buffer(event int accept?, provide!):</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -7453,7 +7457,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton def Machine(location other_processing):
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton def Machine(location other_processing):
   location heat_up:
     initial;
     edge when not other_processing goto processing;
@@ -7495,7 +7499,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton machine1:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton machine1:
   location heat_up:
     initial;
     edge when not machine2.processing goto processing;
@@ -7536,7 +7540,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton def Sensor():
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton def Sensor():
   event go_on, go_off;
 
   location off:
@@ -7581,7 +7585,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton sensor1:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton sensor1:
   event go_on, go_off;
 
   location off:
@@ -7627,7 +7631,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton def X(event a, b; alg real c; event d):
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton def X(event a, b; alg real c; event d):
   ...
 end
 
@@ -7662,7 +7666,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">group factory:
+<pre class="highlight"><code class="language-cif" data-lang="cif">group factory:
   group hall1:
     automaton machine1:
       ...
@@ -7700,7 +7704,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">group configuration:
+<pre class="highlight"><code class="language-cif" data-lang="cif">group configuration:
   const int  MAX_PRODUCTS        = 1500;
   const real MAX_PRODUCTION_TIME = 3.7;
   const real ARRIVAL_RATE        = 28.6;
@@ -7720,7 +7724,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">group tank:
+<pre class="highlight"><code class="language-cif" data-lang="cif">group tank:
   cont V = 5;
   alg real Qi;
   alg real Qo;
@@ -7749,7 +7753,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton def Machine():
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton def Machine():
   location:
     initial;
   ...
@@ -7784,7 +7788,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">group factory1:
+<pre class="highlight"><code class="language-cif" data-lang="cif">group factory1:
   group hall1:
     automaton machine1:
       location:
@@ -7832,7 +7836,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// producer.cif
+<pre class="highlight"><code class="language-cif" data-lang="cif">// producer.cif
 
 event provide;
 
@@ -7845,9 +7849,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// consumer.cif
+<pre class="highlight"><code class="language-cif" data-lang="cif">// consumer.cif
 
-import &quot;producer.cif&quot;;
+import "producer.cif";
 
 automaton consumer:
   location:
@@ -7875,7 +7879,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event provide;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event provide;
 
 automaton producer:
   location:
@@ -7916,7 +7920,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// math.cif
+<pre class="highlight"><code class="language-cif" data-lang="cif">// math.cif
 
 func int inc(int x):
   return x + 1;
@@ -7930,9 +7934,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// counter.cif
+<pre class="highlight"><code class="language-cif" data-lang="cif">// counter.cif
 
-import &quot;math.cif&quot;;
+import "math.cif";
 
 automaton counter:
   disc int count = 0;
@@ -7976,9 +7980,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// counter.cif
+<pre class="highlight"><code class="language-cif" data-lang="cif">// counter.cif
 
-import &quot;libraries/math.cif&quot;;
+import "libraries/math.cif";
 
 automaton counter:
   disc int count = 0;
@@ -8005,7 +8009,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// p1.cif
+<pre class="highlight"><code class="language-cif" data-lang="cif">// p1.cif
 
 group machine1:
   automaton part1:
@@ -8021,7 +8025,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// p2.cif
+<pre class="highlight"><code class="language-cif" data-lang="cif">// p2.cif
 
 group machine1:
   automaton part2:
@@ -8037,7 +8041,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// p3.cif
+<pre class="highlight"><code class="language-cif" data-lang="cif">// p3.cif
 
 group machine2:
   automaton part1:
@@ -8053,7 +8057,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// p4.cif
+<pre class="highlight"><code class="language-cif" data-lang="cif">// p4.cif
 
 group machine2:
   automaton part2:
@@ -8069,12 +8073,12 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// factory.cif
+<pre class="highlight"><code class="language-cif" data-lang="cif">// factory.cif
 
-import &quot;p1.cif&quot;;
-import &quot;p2.cif&quot;;
-import &quot;p3.cif&quot;;
-import &quot;p4.cif&quot;;</code></pre>
+import "p1.cif";
+import "p2.cif";
+import "p3.cif";
+import "p4.cif";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -8086,7 +8090,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">group machine1:
+<pre class="highlight"><code class="language-cif" data-lang="cif">group machine1:
   automaton part1:
     location idle:
       initial;
@@ -8156,7 +8160,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">group factory:
+<pre class="highlight"><code class="language-cif" data-lang="cif">group factory:
   group machine1:
     group part1:
       automaton sensor1:
@@ -8179,7 +8183,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">namespace factory.machine1.part1;
+<pre class="highlight"><code class="language-cif" data-lang="cif">namespace factory.machine1.part1;
 
 automaton sensor1:
   ...
@@ -8218,7 +8222,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">input bool sensor;
+<pre class="highlight"><code class="language-cif" data-lang="cif">input bool sensor;
 
 automaton controller:
   cont t der 1;
@@ -8280,7 +8284,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">input real level;
+<pre class="highlight"><code class="language-cif" data-lang="cif">input real level;
 
 automaton valve:
   disc bool open = true;
@@ -8325,7 +8329,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">cont level der if valve.open: 1 else -1 end;
+<pre class="highlight"><code class="language-cif" data-lang="cif">cont level der if valve.open: 1 else -1 end;
 
 group valve:
   input bool open;
@@ -8353,7 +8357,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">cont level = 0.0 der if valve.open: 1 else -1 end;
+<pre class="highlight"><code class="language-cif" data-lang="cif">cont level = 0.0 der if valve.open: 1 else -1 end;
 
 automaton valve:
   disc bool open = true;
@@ -8423,7 +8427,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton coin_toss:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton coin_toss:
   disc dist bool d = bernoulli(0.5);
   disc bool outcome;
 
@@ -8523,7 +8527,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton dice:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton dice:
   disc dist int d = uniform(1, 7);
   disc int result;
   disc list int results = [];
@@ -8566,7 +8570,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton pennies:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton pennies:
   disc dist int d = normal(2.46, 0.0004);
 
   location:
@@ -8624,7 +8628,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton dice:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton dice:
   disc dist int d = constant(3); // Constant distribution.
   disc int result;
   disc list int results = [];
@@ -8707,7 +8711,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton coin_toss:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton coin_toss:
   disc dist bool d = bernoulli(0.5);
   disc bool outcome;
 
@@ -8825,7 +8829,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Plant automaton, long form.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Plant automaton, long form.
 plant automaton lamp:
   event turn_on, turn_off;
 
@@ -8873,7 +8877,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">invariant lamp.on or lamp.off;      // Regular/kindless invariant.
+<pre class="highlight"><code class="language-cif" data-lang="cif">invariant lamp.on or lamp.off;      // Regular/kindless invariant.
 
 plant lamp:
   event turn_on, turn_off;
@@ -8912,7 +8916,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">plant lamp:
+<pre class="highlight"><code class="language-cif" data-lang="cif">plant lamp:
   event turn_on, turn_off;
 
   invariant on or off;          // Inherits 'plant' kind from automaton.
@@ -8948,7 +8952,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">plant counter:
+<pre class="highlight"><code class="language-cif" data-lang="cif">plant counter:
   controllable increment, decrement;
   disc int x = 0;
 
@@ -9032,7 +9036,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">controllable c_on, c_off;
+<pre class="highlight"><code class="language-cif" data-lang="cif">controllable c_on, c_off;
 uncontrollable u_pushed, u_released;</code></pre>
 </div>
 </div>
@@ -9060,7 +9064,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">plant lamp:
+<pre class="highlight"><code class="language-cif" data-lang="cif">plant lamp:
   controllable c_turn_on, c_turn_off;
 
   location off:
@@ -9091,7 +9095,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">plant counter:
+<pre class="highlight"><code class="language-cif" data-lang="cif">plant counter:
   controllable c_increment, c_decrement;
   disc int[0..10] count = 0;
 
@@ -9166,7 +9170,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">alg            disc       group       post          switch
+<pre class="highlight"><code class="language-cif" data-lang="cif">alg            disc       group       post          switch
 alphabet       dist       id          pre           tau
 any            do         if          print         text
 attr           edge       import      printfile     time
@@ -9189,7 +9193,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">acosh   asin    cosh   sin
+<pre class="highlight"><code class="language-cif" data-lang="cif">acosh   asin    cosh   sin
 acos    atanh   cos    tanh
 asinh   atan    sinh   tan</code></pre>
 </div>
@@ -9199,7 +9203,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">abs    empty   ln    pop     sign
+<pre class="highlight"><code class="language-cif" data-lang="cif">abs    empty   ln    pop     sign
 cbrt   exp     log   pow     size
 ceil   floor   max   round   sqrt
 del    fmt     min   scale</code></pre>
@@ -9210,7 +9214,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">bernoulli   erlang        lognormal   triangle
+<pre class="highlight"><code class="language-cif" data-lang="cif">bernoulli   erlang        lognormal   triangle
 beta        exponential   normal      uniform
 binomial    gamma         poisson     weibull
 constant    geometric     random</code></pre>
@@ -9221,7 +9225,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">and   mod   sample
+<pre class="highlight"><code class="language-cif" data-lang="cif">and   mod   sample
 div   not   sub
 in    or</code></pre>
 </div>
@@ -9259,7 +9263,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">apple       // identifier
+<pre class="highlight"><code class="language-cif" data-lang="cif">apple       // identifier
 bear        // identifier
 int         // keyword
 $int        // identifier 'int' (override keyword priority with $)</code></pre>
@@ -9289,7 +9293,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">some_automaton.some_location</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">some_automaton.some_location</code></pre>
 </div>
 </div>
 </dd>
@@ -9317,7 +9321,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">.some_event
+<pre class="highlight"><code class="language-cif" data-lang="cif">.some_event
 .some_group.some_event</code></pre>
 </div>
 </div>
@@ -9346,7 +9350,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">^some_group.some_event</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">^some_group.some_event</code></pre>
 </div>
 </div>
 </dd>
@@ -9369,7 +9373,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">0
+<pre class="highlight"><code class="language-cif" data-lang="cif">0
 1
 123</code></pre>
 </div>
@@ -9397,7 +9401,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">0.0
+<pre class="highlight"><code class="language-cif" data-lang="cif">0.0
 1e5
 1E+03
 1.05e-78</code></pre>
@@ -9427,8 +9431,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">&quot;hello world&quot;
-&quot;first line\nsecond line&quot;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">"hello world"
+"first line\nsecond line"</code></pre>
 </div>
 </div>
 </dd>
@@ -9454,7 +9458,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Normal layout.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Normal layout.
 int x = 5;
 
 // Alternative layout.
@@ -9483,7 +9487,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">int x = 5; // Single line comment.
+<pre class="highlight"><code class="language-cif" data-lang="cif">int x = 5; // Single line comment.
 
 int /* some comment */ x = /* some
   more comments
@@ -9512,7 +9516,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="bnf">Specification : GroupBody
+<pre class="highlight"><code class="language-bnf" data-lang="bnf">Specification : GroupBody
               ;
 
 GroupBody : OptGroupDecls
@@ -9526,17 +9530,17 @@
               ;
 
 GroupDecl : Decl
-          | &quot;import&quot; Imports &quot;;&quot;
-          | &quot;namespace&quot; IDENTIFIERTK &quot;;&quot;
-          | &quot;namespace&quot; RELATIVENAMETK &quot;;&quot;
-          | &quot;func&quot; Types Identifier FuncParams &quot;:&quot; FuncBody
-          | Identifier &quot;:&quot; Name ActualParms &quot;;&quot;
-          | &quot;group&quot;                &quot;def&quot; Identifier FormalParms &quot;:&quot; GroupBody     &quot;end&quot;
-          | OptSupKind &quot;automaton&quot; &quot;def&quot; Identifier FormalParms &quot;:&quot; AutomatonBody &quot;end&quot;
-          |    SupKind             &quot;def&quot; Identifier FormalParms &quot;:&quot; AutomatonBody &quot;end&quot;
-          | &quot;group&quot;                      Identifier             &quot;:&quot; GroupBody     &quot;end&quot;
-          | OptSupKind &quot;automaton&quot;       Identifier             &quot;:&quot; AutomatonBody &quot;end&quot;
-          |    SupKind                   Identifier             &quot;:&quot; AutomatonBody &quot;end&quot;
+          | "import" Imports ";"
+          | "namespace" IDENTIFIERTK ";"
+          | "namespace" RELATIVENAMETK ";"
+          | "func" Types Identifier FuncParams ":" FuncBody
+          | Identifier ":" Name ActualParms ";"
+          | "group"                "def" Identifier FormalParms ":" GroupBody     "end"
+          | OptSupKind "automaton" "def" Identifier FormalParms ":" AutomatonBody "end"
+          |    SupKind             "def" Identifier FormalParms ":" AutomatonBody "end"
+          | "group"                      Identifier             ":" GroupBody     "end"
+          | OptSupKind "automaton"       Identifier             ":" AutomatonBody "end"
+          |    SupKind                   Identifier             ":" AutomatonBody "end"
           ;
 
 OptAutDecls : /* empty */
@@ -9544,28 +9548,28 @@
             ;
 
 AutDecl : Decl
-        | &quot;alphabet&quot; Events &quot;;&quot;
-        | &quot;alphabet&quot; &quot;;&quot;
-        | &quot;monitor&quot; Events &quot;;&quot;
-        | &quot;monitor&quot; &quot;;&quot;
-        | &quot;disc&quot; Type DiscDecls &quot;;&quot;
+        | "alphabet" Events ";"
+        | "alphabet" ";"
+        | "monitor" Events ";"
+        | "monitor" ";"
+        | "disc" Type DiscDecls ";"
         ;
 
-Decl : &quot;type&quot; TypeDefs &quot;;&quot;
-     | &quot;enum&quot; Identifier &quot;=&quot; &quot;{&quot; Identifiers &quot;}&quot; &quot;;&quot;
-     | &quot;enum&quot; Identifier &quot;=&quot; Identifiers &quot;;&quot;
-     | OptControllability &quot;event&quot;           Identifiers &quot;;&quot;
-     | OptControllability &quot;event&quot; EventType Identifiers &quot;;&quot;
-     |    Controllability                   Identifiers &quot;;&quot;
-     |    Controllability         EventType Identifiers &quot;;&quot;
-     | &quot;const&quot; Type ConstantDefs &quot;;&quot;
-     | &quot;alg&quot; Type AlgVarsDefs &quot;;&quot;
-     | &quot;input&quot; Type Identifiers &quot;;&quot;
-     | &quot;cont&quot; ContDecls &quot;;&quot;
-     | &quot;equation&quot; Equations &quot;;&quot;
-     | &quot;initial&quot; Expressions &quot;;&quot;
+Decl : "type" TypeDefs ";"
+     | "enum" Identifier "=" "{" Identifiers "}" ";"
+     | "enum" Identifier "=" Identifiers ";"
+     | OptControllability "event"           Identifiers ";"
+     | OptControllability "event" EventType Identifiers ";"
+     |    Controllability                   Identifiers ";"
+     |    Controllability         EventType Identifiers ";"
+     | "const" Type ConstantDefs ";"
+     | "alg" Type AlgVarsDefs ";"
+     | "input" Type Identifiers ";"
+     | "cont" ContDecls ";"
+     | "equation" Equations ";"
+     | "initial" Expressions ";"
      | InvariantDecls
-     | &quot;marked&quot; Expressions &quot;;&quot;
+     | "marked" Expressions ";"
      | IoDecl
      ;
 
@@ -9573,150 +9577,150 @@
            ;
 
 Imports : StringToken
-        | Imports &quot;,&quot; StringToken
+        | Imports "," StringToken
         ;
 
 StringToken : STRINGTK
             ;
 
-TypeDefs : Identifier &quot;=&quot; Type
-         | TypeDefs &quot;,&quot; Identifier &quot;=&quot; Type
+TypeDefs : Identifier "=" Type
+         | TypeDefs "," Identifier "=" Type
          ;
 
-ConstantDefs : Identifier &quot;=&quot; Expression
-             | ConstantDefs &quot;,&quot; Identifier &quot;=&quot; Expression
+ConstantDefs : Identifier "=" Expression
+             | ConstantDefs "," Identifier "=" Expression
              ;
 
 AlgVarsDefs : Identifier
-            | Identifier &quot;=&quot; Expression
-            | AlgVarsDefs &quot;,&quot; Identifier
-            | AlgVarsDefs &quot;,&quot; Identifier &quot;=&quot; Expression
+            | Identifier "=" Expression
+            | AlgVarsDefs "," Identifier
+            | AlgVarsDefs "," Identifier "=" Expression
             ;
 
-FuncParams : &quot;(&quot; &quot;)&quot;
-           | &quot;(&quot; FuncParamDecls &quot;)&quot;
+FuncParams : "(" ")"
+           | "(" FuncParamDecls ")"
            ;
 
 FuncParamDecls : Type Identifiers
-               | FuncParamDecls &quot;;&quot; Type Identifiers
+               | FuncParamDecls ";" Type Identifiers
                ;
 
-FuncBody : FuncVarDecls FuncStatements &quot;end&quot;
-         | StringToken &quot;;&quot;
+FuncBody : FuncVarDecls FuncStatements "end"
+         | StringToken ";"
          ;
 
 FuncVarDecls : /* empty */
-             | FuncVarDecls Type FuncVarDecl &quot;;&quot;
+             | FuncVarDecls Type FuncVarDecl ";"
              ;
 
 FuncVarDecl : Identifier
-            | Identifier &quot;=&quot; Expression
-            | FuncVarDecl &quot;,&quot; Identifier
-            | FuncVarDecl &quot;,&quot; Identifier &quot;=&quot; Expression
+            | Identifier "=" Expression
+            | FuncVarDecl "," Identifier
+            | FuncVarDecl "," Identifier "=" Expression
             ;
 
 FuncStatements : FuncStatement
                | FuncStatements FuncStatement
                ;
 
-FuncStatement : Addressables &quot;:=&quot; Expressions &quot;;&quot;
-              | &quot;if&quot; Expressions &quot;:&quot; FuncStatements
-                OptElifFuncStats OptElseFuncStat &quot;end&quot;
-              | &quot;while&quot; Expressions &quot;:&quot; FuncStatements &quot;end&quot;
-              | &quot;break&quot; &quot;;&quot;
-              | &quot;continue&quot; &quot;;&quot;
-              | &quot;return&quot; Expressions &quot;;&quot;
+FuncStatement : Addressables ":=" Expressions ";"
+              | "if" Expressions ":" FuncStatements
+                OptElifFuncStats OptElseFuncStat "end"
+              | "while" Expressions ":" FuncStatements "end"
+              | "break" ";"
+              | "continue" ";"
+              | "return" Expressions ";"
               ;
 
 OptElifFuncStats : /* empty */
-                 | OptElifFuncStats &quot;elif&quot; Expressions &quot;:&quot; FuncStatements
+                 | OptElifFuncStats "elif" Expressions ":" FuncStatements
                  ;
 
 OptElseFuncStat : /* empty */
-                | &quot;else&quot; FuncStatements
+                | "else" FuncStatements
                 ;
 
 Events : Name
-       | Events &quot;,&quot; Name
+       | Events "," Name
        ;
 
 CoreEdge : EdgeEvents         OptEdgeGuard OptEdgeUrgent OptEdgeUpdate
-         | &quot;when&quot; Expressions              OptEdgeUrgent OptEdgeUpdate
-         | &quot;now&quot;                                         OptEdgeUpdate
-         | &quot;do&quot; Updates
+         | "when" Expressions              OptEdgeUrgent OptEdgeUpdate
+         | "now"                                         OptEdgeUpdate
+         | "do" Updates
          ;
 
 OptEdgeGuard : /* empty */
-             | &quot;when&quot; Expressions
+             | "when" Expressions
              ;
 
 OptEdgeUrgent : /* empty */
-              | &quot;now&quot;
+              | "now"
               ;
 
 OptEdgeUpdate : /* empty */
-              | &quot;do&quot; Updates
+              | "do" Updates
               ;
 
 EdgeEvents : EdgeEvent
-           | EdgeEvents &quot;,&quot; EdgeEvent
+           | EdgeEvents "," EdgeEvent
            ;
 
-EdgeEvent : &quot;tau&quot;
+EdgeEvent : "tau"
           | Name
-          | Name &quot;!&quot;
-          | Name &quot;!&quot; Expression
-          | Name &quot;?&quot;
+          | Name "!"
+          | Name "!" Expression
+          | Name "?"
           ;
 
 Locations : Location
           | Locations Location
           ;
 
-Location : &quot;location&quot; &quot;;&quot;
-         | &quot;location&quot; Identifier &quot;;&quot;
-         | &quot;location&quot; &quot;:&quot; LocationElements
-         | &quot;location&quot; Identifier &quot;:&quot; LocationElements
+Location : "location" ";"
+         | "location" Identifier ";"
+         | "location" ":" LocationElements
+         | "location" Identifier ":" LocationElements
          ;
 
 LocationElements : LocationElement
                  | LocationElements LocationElement
                  ;
 
-LocationElement : &quot;initial&quot; &quot;;&quot;
-                | &quot;initial&quot; Expressions &quot;;&quot;
+LocationElement : "initial" ";"
+                | "initial" Expressions ";"
                 | InvariantDecls
-                | &quot;equation&quot; Equations &quot;;&quot;
-                | &quot;marked&quot; &quot;;&quot;
-                | &quot;marked&quot; Expressions &quot;;&quot;
-                | &quot;urgent&quot; &quot;;&quot;
-                | &quot;edge&quot; CoreEdge &quot;;&quot;
-                | &quot;edge&quot; CoreEdge &quot;goto&quot; Identifier &quot;;&quot;
+                | "equation" Equations ";"
+                | "marked" ";"
+                | "marked" Expressions ";"
+                | "urgent" ";"
+                | "edge" CoreEdge ";"
+                | "edge" CoreEdge "goto" Identifier ";"
                 ;
 
-ActualParms : &quot;(&quot; &quot;)&quot;
-            | &quot;(&quot; Expressions &quot;)&quot;
+ActualParms : "(" ")"
+            | "(" Expressions ")"
             ;
 
-FormalParms : &quot;(&quot; &quot;)&quot;
-            | &quot;(&quot; FormalDecls &quot;)&quot;
+FormalParms : "(" ")"
+            | "(" FormalDecls ")"
             ;
 
 FormalDecls : FormalDeclaration
-            | FormalDecls &quot;;&quot; FormalDeclaration
+            | FormalDecls ";" FormalDeclaration
             ;
 
-FormalDeclaration : OptControllability &quot;event&quot;           EventParamIds
-                  | OptControllability &quot;event&quot; EventType EventParamIds
+FormalDeclaration : OptControllability "event"           EventParamIds
+                  | OptControllability "event" EventType EventParamIds
                   |    Controllability                   EventParamIds
                   |    Controllability         EventType EventParamIds
                   | Name Identifiers
-                  | &quot;location&quot; Identifiers
-                  | &quot;alg&quot; Type Identifiers
+                  | "location" Identifiers
+                  | "alg" Type Identifiers
                   ;
 
 EventParamIds : EventParamId
-              | EventParamIds &quot;,&quot; EventParamId
+              | EventParamIds "," EventParamId
               ;
 
 EventParamId : Identifier OptEventParamFlags
@@ -9726,98 +9730,98 @@
                    | OptEventParamFlags EventParamFlag
                    ;
 
-EventParamFlag : &quot;!&quot;
-               | &quot;?&quot;
-               | &quot;~&quot;
+EventParamFlag : "!"
+               | "?"
+               | "~"
                ;
 
 DiscDecls : DiscDecl
-          | DiscDecls &quot;,&quot; DiscDecl
+          | DiscDecls "," DiscDecl
           ;
 
 DiscDecl : Identifier
-         | Identifier &quot;in&quot; &quot;any&quot;
-         | Identifier &quot;=&quot; Expression
-         | Identifier &quot;in&quot; &quot;{&quot; Expressions &quot;}&quot;
+         | Identifier "in" "any"
+         | Identifier "=" Expression
+         | Identifier "in" "{" Expressions "}"
          ;
 
 ContDecls : ContDecl
-          | ContDecls &quot;,&quot; ContDecl
+          | ContDecls "," ContDecl
           ;
 
 ContDecl : Identifier OptDerivative
-         | Identifier &quot;=&quot; Expression OptDerivative
+         | Identifier "=" Expression OptDerivative
          ;
 
 OptDerivative : /* empty */
-              | &quot;der&quot; Expression
+              | "der" Expression
               ;
 
 Equations : Equation
-          | Equations &quot;,&quot; Equation
+          | Equations "," Equation
           ;
 
-Equation : Identifier &quot;'&quot; &quot;=&quot; Expression
-         | Identifier &quot;=&quot; Expression
+Equation : Identifier "'" "=" Expression
+         | Identifier "=" Expression
          ;
 
-InvariantDecls : OptSupKind &quot;invariant&quot; Invariants &quot;;&quot;
-               |    SupKind             Invariants &quot;;&quot;
+InvariantDecls : OptSupKind "invariant" Invariants ";"
+               |    SupKind             Invariants ";"
                ;
 
 Invariants : Invariant
-           | Invariants &quot;,&quot; Invariant
+           | Invariants "," Invariant
            ;
 
 Invariant : Expression
-          | Name                  &quot;needs&quot;    Expression
-          | NonEmptySetExpression &quot;needs&quot;    Expression
-          | Expression            &quot;disables&quot; Name
-          | Expression            &quot;disables&quot; NamesSet
+          | Name                  "needs"    Expression
+          | NonEmptySetExpression "needs"    Expression
+          | Expression            "disables" Name
+          | Expression            "disables" NamesSet
           ;
 
-NamesSet : &quot;{&quot; Names &quot;}&quot;
+NamesSet : "{" Names "}"
          ;
 
 Names : Name
-      | Names &quot;,&quot; Name
+      | Names "," Name
       ;
 
 Updates : Update
-        | Updates &quot;,&quot; Update
+        | Updates "," Update
         ;
 
-Update : Addressable &quot;:=&quot; Expression
-       | &quot;if&quot; Expressions &quot;:&quot; Updates
-         OptElifUpdates OptElseUpdate &quot;end&quot;
+Update : Addressable ":=" Expression
+       | "if" Expressions ":" Updates
+         OptElifUpdates OptElseUpdate "end"
        ;
 
 Addressables : Addressable
-             | Addressables &quot;,&quot; Addressable
+             | Addressables "," Addressable
              ;
 
 Addressable : Identifier
             | Identifier Projections
-            | &quot;(&quot; Addressable &quot;,&quot; Addressables &quot;)&quot;
+            | "(" Addressable "," Addressables ")"
             ;
 
 Projections : Projection
             | Projections Projection
             ;
 
-Projection : &quot;[&quot; Expression &quot;]&quot;
+Projection : "[" Expression "]"
            ;
 
 OptElifUpdates : /* empty */
-               | OptElifUpdates &quot;elif&quot; Expressions &quot;:&quot; Updates
+               | OptElifUpdates "elif" Expressions ":" Updates
                ;
 
 OptElseUpdate : /* empty */
-              | &quot;else&quot; Updates
+              | "else" Updates
               ;
 
 Identifiers : Identifier
-            | Identifiers &quot;,&quot; Identifier
+            | Identifiers "," Identifier
             ;
 
 OptSupKind : /* empty */
@@ -9828,8 +9832,8 @@
                    | Controllability
                    ;
 
-Controllability : &quot;controllable&quot;
-                | &quot;uncontrollable&quot;
+Controllability : "controllable"
+                | "uncontrollable"
                 ;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -9847,119 +9851,119 @@
        | Print
        ;
 
-SvgFile : &quot;svgfile&quot; StringToken &quot;;&quot;
+SvgFile : "svgfile" StringToken ";"
         ;
 
 OptSvgFile : /* empty */
-           | &quot;file&quot; StringToken
+           | "file" StringToken
            ;
 
-SvgCopy : &quot;svgcopy&quot; &quot;id&quot; Expression OptSvgCopyPre OptSvgCopyPost OptSvgFile &quot;;&quot;
+SvgCopy : "svgcopy" "id" Expression OptSvgCopyPre OptSvgCopyPost OptSvgFile ";"
         ;
 
 OptSvgCopyPre : /* empty */
-              | &quot;pre&quot; Expression
+              | "pre" Expression
               ;
 
 OptSvgCopyPost : /* empty */
-               | &quot;post&quot; Expression
+               | "post" Expression
                ;
 
-SvgMove : &quot;svgmove&quot; &quot;id&quot; Expression &quot;to&quot; Expression &quot;,&quot; Expression
-          OptSvgFile &quot;;&quot;
+SvgMove : "svgmove" "id" Expression "to" Expression "," Expression
+          OptSvgFile ";"
         ;
 
-SvgOut : &quot;svgout&quot; &quot;id&quot; Expression SvgAttr &quot;value&quot; Expression OptSvgFile
-         &quot;;&quot;
+SvgOut : "svgout" "id" Expression SvgAttr "value" Expression OptSvgFile
+         ";"
        ;
 
-SvgAttr : &quot;attr&quot; StringToken
-        | &quot;text&quot;
+SvgAttr : "attr" StringToken
+        | "text"
         ;
 
-SvgIn : &quot;svgin&quot; &quot;id&quot; Expression &quot;event&quot; SvgInEvent OptSvgFile &quot;;&quot;
+SvgIn : "svgin" "id" Expression "event" SvgInEvent OptSvgFile ";"
       ;
 
 SvgInEvent : Name
-           | &quot;if&quot; Expression &quot;:&quot; Name OptSvgInEventElifs &quot;else&quot; Name &quot;end&quot;
-           | &quot;if&quot; Expression &quot;:&quot; Name SvgInEventElifs &quot;end&quot;
+           | "if" Expression ":" Name OptSvgInEventElifs "else" Name "end"
+           | "if" Expression ":" Name SvgInEventElifs "end"
            ;
 
 OptSvgInEventElifs : /* empty */
                    | SvgInEventElifs
                    ;
 
-SvgInEventElifs : &quot;elif&quot; Expression &quot;:&quot; Name
-                | SvgInEventElifs &quot;elif&quot; Expression &quot;:&quot; Name
+SvgInEventElifs : "elif" Expression ":" Name
+                | SvgInEventElifs "elif" Expression ":" Name
                 ;
 
-PrintFile : &quot;printfile&quot; StringToken &quot;;&quot;
+PrintFile : "printfile" StringToken ";"
           ;
 
-Print : &quot;print&quot; PrintTxt OptPrintFors OptPrintWhen OptPrintFile &quot;;&quot;
+Print : "print" PrintTxt OptPrintFors OptPrintWhen OptPrintFile ";"
       ;
 
 PrintTxt : Expression
-         | &quot;pre&quot; Expression
-         | &quot;post&quot; Expression
-         | &quot;pre&quot; Expression &quot;post&quot; Expression
+         | "pre" Expression
+         | "post" Expression
+         | "pre" Expression "post" Expression
          ;
 
 OptPrintFors : /* empty */
-             | &quot;for&quot; PrintFors
+             | "for" PrintFors
              ;
 
 PrintFors : PrintFor
-          | PrintFors &quot;,&quot; PrintFor
+          | PrintFors "," PrintFor
           ;
 
-PrintFor : &quot;event&quot;
-         | &quot;time&quot;
+PrintFor : "event"
+         | "time"
          | Name
-         | &quot;initial&quot;
-         | &quot;final&quot;
+         | "initial"
+         | "final"
          ;
 
 OptPrintWhen : /* empty */
-             | &quot;when&quot; Expression
-             | &quot;when&quot; &quot;pre&quot; Expression
-             | &quot;when&quot; &quot;post&quot; Expression
-             | &quot;when&quot; &quot;pre&quot; Expression &quot;post&quot; Expression
+             | "when" Expression
+             | "when" "pre" Expression
+             | "when" "post" Expression
+             | "when" "pre" Expression "post" Expression
              ;
 
 OptPrintFile : /* empty */
-             | &quot;file&quot; StringToken
+             | "file" StringToken
              ;
 
 ///////////////////////////////////////////////////////////////////////////////
 
 Types : Type
-      | Types &quot;,&quot; Type
+      | Types "," Type
       ;
 
-EventType : &quot;void&quot;
+EventType : "void"
           | Type
           ;
 
-Type : &quot;bool&quot;
-     | &quot;int&quot;
-     | &quot;int&quot; &quot;[&quot; Expression &quot;..&quot; Expression &quot;]&quot;
-     | &quot;real&quot;
-     | &quot;string&quot;
-     | &quot;list&quot; Type
-     | &quot;list&quot; &quot;[&quot; Expression &quot;]&quot; Type
-     | &quot;list&quot; &quot;[&quot; Expression &quot;..&quot; Expression &quot;]&quot; Type
-     | &quot;set&quot; Type
-     | &quot;dict&quot; &quot;(&quot; Type &quot;:&quot; Type &quot;)&quot;
-     | &quot;tuple&quot; &quot;(&quot; Fields &quot;)&quot;
-     | &quot;func&quot; Type &quot;(&quot; &quot;)&quot;
-     | &quot;func&quot; Type &quot;(&quot; Types &quot;)&quot;
-     | &quot;dist&quot; Type
+Type : "bool"
+     | "int"
+     | "int" "[" Expression ".." Expression "]"
+     | "real"
+     | "string"
+     | "list" Type
+     | "list" "[" Expression "]" Type
+     | "list" "[" Expression ".." Expression "]" Type
+     | "set" Type
+     | "dict" "(" Type ":" Type ")"
+     | "tuple" "(" Fields ")"
+     | "func" Type "(" ")"
+     | "func" Type "(" Types ")"
+     | "dist" Type
      | Name
      ;
 
 Fields : Field
-       | Fields &quot;;&quot; Field
+       | Fields ";" Field
        ;
 
 Field : Type Identifiers
@@ -9968,7 +9972,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 Expressions : Expression
-            | Expressions &quot;,&quot; Expression
+            | Expressions "," Expression
             ;
 
 OptExpression : /* empty */
@@ -9976,99 +9980,99 @@
               ;
 
 Expression : OrExpression
-           | OrExpression &quot;=&gt;&quot; OrExpression
-           | OrExpression &quot;&lt;=&gt;&quot; OrExpression
+           | OrExpression "=&gt;" OrExpression
+           | OrExpression "&lt;=&gt;" OrExpression
            ;
 
 OrExpression : AndExpression
-             | OrExpression &quot;or&quot; AndExpression
+             | OrExpression "or" AndExpression
              ;
 
 AndExpression : CompareExpression
-              | AndExpression &quot;and&quot; CompareExpression
+              | AndExpression "and" CompareExpression
               ;
 
 CompareExpression : AddExpression
-                  | CompareExpression &quot;&lt;&quot;  AddExpression
-                  | CompareExpression &quot;&lt;=&quot; AddExpression
-                  | CompareExpression &quot;=&quot;  AddExpression
-                  | CompareExpression &quot;!=&quot; AddExpression
-                  | CompareExpression &quot;&gt;=&quot; AddExpression
-                  | CompareExpression &quot;&gt;&quot;  AddExpression
-                  | CompareExpression &quot;in&quot; AddExpression
-                  | CompareExpression &quot;sub&quot; AddExpression
+                  | CompareExpression "&lt;"  AddExpression
+                  | CompareExpression "&lt;=" AddExpression
+                  | CompareExpression "="  AddExpression
+                  | CompareExpression "!=" AddExpression
+                  | CompareExpression "&gt;=" AddExpression
+                  | CompareExpression "&gt;"  AddExpression
+                  | CompareExpression "in" AddExpression
+                  | CompareExpression "sub" AddExpression
                   ;
 
 AddExpression : MulExpression
-              | AddExpression &quot;+&quot; MulExpression
-              | AddExpression &quot;-&quot; MulExpression
+              | AddExpression "+" MulExpression
+              | AddExpression "-" MulExpression
               ;
 
 MulExpression : UnaryExpression
-              | MulExpression &quot;*&quot; UnaryExpression
-              | MulExpression &quot;/&quot; UnaryExpression
-              | MulExpression &quot;div&quot; UnaryExpression
-              | MulExpression &quot;mod&quot; UnaryExpression
+              | MulExpression "*" UnaryExpression
+              | MulExpression "/" UnaryExpression
+              | MulExpression "div" UnaryExpression
+              | MulExpression "mod" UnaryExpression
               ;
 
 UnaryExpression : FuncExpression
-                | &quot;-&quot; UnaryExpression
-                | &quot;+&quot; UnaryExpression
-                | &quot;not&quot; UnaryExpression
-                | &quot;sample&quot; FuncExpression
+                | "-" UnaryExpression
+                | "+" UnaryExpression
+                | "not" UnaryExpression
+                | "sample" FuncExpression
                 ;
 
 FuncExpression : ExpressionFactor
-               | FuncExpression &quot;[&quot; Expression &quot;]&quot;
+               | FuncExpression "[" Expression "]"
                | FuncExpression
-                 &quot;[&quot; OptExpression &quot;:&quot; OptExpression &quot;]&quot;
-               | FuncExpression &quot;(&quot; &quot;)&quot;
-               | FuncExpression &quot;(&quot; Expressions &quot;)&quot;
-               | StdLibFunction &quot;(&quot; &quot;)&quot;
-               | StdLibFunction &quot;(&quot; Expressions &quot;)&quot;
+                 "[" OptExpression ":" OptExpression "]"
+               | FuncExpression "(" ")"
+               | FuncExpression "(" Expressions ")"
+               | StdLibFunction "(" ")"
+               | StdLibFunction "(" Expressions ")"
                ;
 
-ExpressionFactor : &quot;true&quot;
-                 | &quot;false&quot;
+ExpressionFactor : "true"
+                 | "false"
                  | NUMBERTK
                  | REALTK
                  | StringToken
-                 | &quot;time&quot;
-                 | &quot;[&quot; &quot;]&quot;
-                 | &quot;[&quot; Expressions &quot;]&quot;
-                 | &quot;{&quot; &quot;}&quot;
+                 | "time"
+                 | "[" "]"
+                 | "[" Expressions "]"
+                 | "{" "}"
                  | NonEmptySetExpression
-                 | &quot;{&quot; DictPairs &quot;}&quot;
-                 | &quot;(&quot; Expression &quot;,&quot; Expressions &quot;)&quot;
-                 | &quot;&lt;&quot; Type &quot;&gt;&quot; ExpressionFactor
-                 | &quot;if&quot; Expressions &quot;:&quot; Expression
-                   OptElifExprs &quot;else&quot; Expression &quot;end&quot;
-                 | &quot;switch&quot; Expression &quot;:&quot; SwitchBody &quot;end&quot;
-                 | &quot;(&quot; Expression &quot;)&quot;
+                 | "{" DictPairs "}"
+                 | "(" Expression "," Expressions ")"
+                 | "&lt;" Type "&gt;" ExpressionFactor
+                 | "if" Expressions ":" Expression
+                   OptElifExprs "else" Expression "end"
+                 | "switch" Expression ":" SwitchBody "end"
+                 | "(" Expression ")"
                  | Name
-                 | Name &quot;'&quot;
-                 | &quot;?&quot;
-                 | &quot;self&quot;
+                 | Name "'"
+                 | "?"
+                 | "self"
                  ;
 
-NonEmptySetExpression : &quot;{&quot; Expressions &quot;}&quot;
+NonEmptySetExpression : "{" Expressions "}"
                       ;
 
-DictPairs : Expression &quot;:&quot; Expression
-          | DictPairs &quot;,&quot; Expression &quot;:&quot; Expression
+DictPairs : Expression ":" Expression
+          | DictPairs "," Expression ":" Expression
           ;
 
 OptElifExprs : /* empty */
-             | OptElifExprs &quot;elif&quot; Expressions &quot;:&quot; Expression
+             | OptElifExprs "elif" Expressions ":" Expression
              ;
 
 SwitchBody : SwitchCases
-           | SwitchCases &quot;else&quot; Expression
-           |             &quot;else&quot; Expression
+           | SwitchCases "else" Expression
+           |             "else" Expression
            ;
 
-SwitchCases : &quot;case&quot; Expression &quot;:&quot; Expression
-            | SwitchCases &quot;case&quot; Expression &quot;:&quot; Expression
+SwitchCases : "case" Expression ":" Expression
+            | SwitchCases "case" Expression ":" Expression
             ;
 
 Name : Identifier
@@ -10077,57 +10081,57 @@
      | ROOTNAMETK
      ;
 
-SupKind : &quot;plant&quot;
-        | &quot;requirement&quot;
-        | &quot;supervisor&quot;
+SupKind : "plant"
+        | "requirement"
+        | "supervisor"
         ;
 
-StdLibFunction : &quot;acosh&quot;
-               | &quot;acos&quot;
-               | &quot;asinh&quot;
-               | &quot;asin&quot;
-               | &quot;atanh&quot;
-               | &quot;atan&quot;
-               | &quot;cosh&quot;
-               | &quot;cos&quot;
-               | &quot;sinh&quot;
-               | &quot;sin&quot;
-               | &quot;tanh&quot;
-               | &quot;tan&quot;
-               | &quot;abs&quot;
-               | &quot;cbrt&quot;
-               | &quot;ceil&quot;
-               | &quot;del&quot;
-               | &quot;empty&quot;
-               | &quot;exp&quot;
-               | &quot;floor&quot;
-               | &quot;fmt&quot;
-               | &quot;ln&quot;
-               | &quot;log&quot;
-               | &quot;max&quot;
-               | &quot;min&quot;
-               | &quot;pop&quot;
-               | &quot;pow&quot;
-               | &quot;round&quot;
-               | &quot;scale&quot;
-               | &quot;sign&quot;
-               | &quot;size&quot;
-               | &quot;sqrt&quot;
-               | &quot;bernoulli&quot;
-               | &quot;beta&quot;
-               | &quot;binomial&quot;
-               | &quot;constant&quot;
-               | &quot;erlang&quot;
-               | &quot;exponential&quot;
-               | &quot;gamma&quot;
-               | &quot;geometric&quot;
-               | &quot;lognormal&quot;
-               | &quot;normal&quot;
-               | &quot;poisson&quot;
-               | &quot;random&quot;
-               | &quot;triangle&quot;
-               | &quot;uniform&quot;
-               | &quot;weibull&quot;
+StdLibFunction : "acosh"
+               | "acos"
+               | "asinh"
+               | "asin"
+               | "atanh"
+               | "atan"
+               | "cosh"
+               | "cos"
+               | "sinh"
+               | "sin"
+               | "tanh"
+               | "tan"
+               | "abs"
+               | "cbrt"
+               | "ceil"
+               | "del"
+               | "empty"
+               | "exp"
+               | "floor"
+               | "fmt"
+               | "ln"
+               | "log"
+               | "max"
+               | "min"
+               | "pop"
+               | "pow"
+               | "round"
+               | "scale"
+               | "sign"
+               | "size"
+               | "sqrt"
+               | "bernoulli"
+               | "beta"
+               | "binomial"
+               | "constant"
+               | "erlang"
+               | "exponential"
+               | "gamma"
+               | "geometric"
+               | "lognormal"
+               | "normal"
+               | "poisson"
+               | "random"
+               | "triangle"
+               | "uniform"
+               | "weibull"
                ;</code></pre>
 </div>
 </div>
@@ -10334,7 +10338,7 @@
 is an
 application that can be used to view, create, edit, arrange, import and export
 various kinds of diagrams. It is freely available and runs on Windows, Linux,
-and Mac OS X.</p>
+and macOS.</p>
 </div>
 <div class="paragraph">
 <p>The yEd diagrams are generated as
@@ -11600,7 +11604,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">requirement invariant x != 0 and not p.b;
+<pre class="highlight"><code class="language-cif" data-lang="cif">requirement invariant x != 0 and not p.b;
 requirement invariant x &gt; 5;
 requirement invariant not(x = 1 and y = 1) or q.x = a;
 
@@ -11616,7 +11620,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">requirement invariant buffer.c_add    needs buffer.count &lt; 5;
+<pre class="highlight"><code class="language-cif" data-lang="cif">requirement invariant buffer.c_add    needs buffer.count &lt; 5;
 requirement invariant buffer.c_remove needs buffer.count &gt; 0;
 requirement invariant button.on = 1 disables lamp.c_turn_on;
 
@@ -11633,7 +11637,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">requirement automaton counter:
+<pre class="highlight"><code class="language-cif" data-lang="cif">requirement automaton counter:
   disc int[0..5] count = 0;
 
   requirement invariant count &lt;= 3;
@@ -11654,7 +11658,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">requirement automaton order:
+<pre class="highlight"><code class="language-cif" data-lang="cif">requirement automaton order:
   location on1:
     initial;
     marked;
@@ -14673,7 +14677,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">plant automaton p:
+<pre class="highlight"><code class="language-cif" data-lang="cif">plant automaton p:
   controllable c_event;
   disc int[0..3] v = 0;
 
@@ -14702,7 +14706,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">plant automaton p:
+<pre class="highlight"><code class="language-cif" data-lang="cif">plant automaton p:
   controllable c_event;
   disc int[0..3] v = 0;
 
@@ -15193,7 +15197,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton button:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton button:
   event pushed, released;
 
   location Released:
@@ -15512,7 +15516,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event enter;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event enter;
 event processed;
 event exit;
 
@@ -15557,27 +15561,27 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">from &quot;lib:cif&quot; import *;
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">from "lib:cif" import *;
 
-cifsim(&quot;machine.cif --compile-only=on&quot;);
+cifsim("machine.cif --compile-only=on");
 
-rmfile(&quot;out.txt&quot;, force=true);
+rmfile("out.txt", force=true);
 
 for x in range(1000):
-    string args = &quot;machine.cifcode -i auto -a first -t 100 -o print&quot;;
-    cifsim(args, stdout=&quot;out.txt&quot;, appendOut=true);
+    string args = "machine.cifcode -i auto -a first -t 100 -o print";
+    cifsim(args, stdout="out.txt", appendOut=true);
 end
 
 double minimum = 9999;
 double maximum = -9999;
-for line in readlines(&quot;out.txt&quot;):
+for line in readlines("out.txt"):
     double value = &lt;double&gt;line;
     minimum = min(minimum, value);
     maximum = max(maximum, value);
 end
 
-outln(&quot;Minimum: %.2f&quot;, minimum);
-outln(&quot;Maximum: %.2f&quot;, maximum);</code></pre>
+outln("Minimum: %.2f", minimum);
+outln("Maximum: %.2f", maximum);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -15619,7 +15623,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">Minimum: 7.00
+<pre class="highlight"><code class="language-console" data-lang="console">Minimum: 7.00
 Maximum: 12.00</code></pre>
 </div>
 </div>
@@ -15724,7 +15728,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">Possible transitions:
+<pre class="highlight"><code class="language-console" data-lang="console">Possible transitions:
   #1: event machine1.c_start
   #2: event machine2.c_start
   #3: delay for (0 .. 100.0]
@@ -15800,7 +15804,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">Select a duration from (0 .. 100.0]. Empty choice equals maximum delay. Enter q to quit. Confirm with &lt;ENTER&gt;:</code></pre>
+<pre class="highlight"><code class="language-console" data-lang="console">Select a duration from (0 .. 100.0]. Empty choice equals maximum delay. Enter q to quit. Confirm with &lt;ENTER&gt;:</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -15838,7 +15842,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">Simulation resulted in deadlock. Enter q to quit. Enter h for help and additional commands. Confirm with &lt;ENTER&gt;:</code></pre>
+<pre class="highlight"><code class="language-console" data-lang="console">Simulation resulted in deadlock. Enter q to quit. Enter h for help and additional commands. Confirm with &lt;ENTER&gt;:</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -16318,7 +16322,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton auto_time_trans_duration:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton auto_time_trans_duration:
   const real UPPER = ...;
   disc dist real d = uniform(0.0, UPPER);
   disc real timeToWait;
@@ -16649,7 +16653,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgin id &quot;button&quot; event machine.button.toggle;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgin id "button" event machine.button.toggle;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -16678,7 +16682,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton button:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton button:
   event u_pushed, u_released;
 
   location Released:
@@ -16700,7 +16704,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgin id &quot;button&quot; event
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgin id "button" event
   if   button.Released: button.u_pushed
   elif button.Pushed:   button.u_released
   end;</code></pre>
@@ -17516,7 +17520,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">plant automaton Button:
+<pre class="highlight"><code class="language-cif" data-lang="cif">plant automaton Button:
   uncontrollable u_pushed, u_released;
 
   location Released:
@@ -17566,7 +17570,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">plant automaton User:
+<pre class="highlight"><code class="language-cif" data-lang="cif">plant automaton User:
   cont t der 1.0;
 
   location:
@@ -18119,7 +18123,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">printfile &quot;out.txt&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">printfile "out.txt";
 
 print x for e;</code></pre>
 </div>
@@ -18233,7 +18237,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton buffer:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton buffer:
   event add, remove;
   disc int cnt = 5;
 
@@ -18275,7 +18279,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print cnt;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print cnt;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18284,7 +18288,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">5
+<pre class="highlight"><code class="language-console" data-lang="console">5
 6
 7
 6</code></pre>
@@ -18305,8 +18309,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print cnt     file &quot;a.txt&quot;;
-print cnt * 2 file &quot;b.txt&quot;;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print cnt     file "a.txt";
+print cnt * 2 file "b.txt";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18319,7 +18323,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">printfile &quot;ab.txt&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">printfile "ab.txt";
 print cnt;
 print cnt * 2;</code></pre>
 </div>
@@ -18341,7 +18345,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print if cnt mod 2 = 0: &quot;even&quot; else &quot;odd&quot; end;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print if cnt mod 2 = 0: "even" else "odd" end;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18350,7 +18354,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">odd
+<pre class="highlight"><code class="language-console" data-lang="console">odd
 even
 odd
 even</code></pre>
@@ -18366,7 +18370,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print cnt when cnt mod 2 = 1;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print cnt when cnt mod 2 = 1;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18375,7 +18379,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">5
+<pre class="highlight"><code class="language-console" data-lang="console">5
 7</code></pre>
 </div>
 </div>
@@ -18389,7 +18393,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print cnt for add;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print cnt for add;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18398,7 +18402,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">6
+<pre class="highlight"><code class="language-console" data-lang="console">6
 7</code></pre>
 </div>
 </div>
@@ -18415,7 +18419,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print cnt for add, remove;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print cnt for add, remove;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18424,7 +18428,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">6
+<pre class="highlight"><code class="language-console" data-lang="console">6
 7
 6</code></pre>
 </div>
@@ -18440,7 +18444,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print cnt for event;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print cnt for event;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18456,7 +18460,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print pre cnt post cnt for remove;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print pre cnt post cnt for remove;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18465,7 +18469,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">7
+<pre class="highlight"><code class="language-console" data-lang="console">7
 6</code></pre>
 </div>
 </div>
@@ -18487,7 +18491,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print cnt;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print cnt;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18497,8 +18501,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print &quot;header&quot; for initial;
-print &quot;footer&quot; for final;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print "header" for initial;
+print "footer" for final;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18507,7 +18511,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">header
+<pre class="highlight"><code class="language-console" data-lang="console">header
 5
 6
 7
@@ -18526,7 +18530,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print time for time;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print time for time;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18538,7 +18542,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">0.005
+<pre class="highlight"><code class="language-console" data-lang="console">0.005
 0.75
 3.1
 7.9</code></pre>
@@ -18557,7 +18561,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print time for initial, time;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print time for initial, time;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18567,7 +18571,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">0.0
+<pre class="highlight"><code class="language-console" data-lang="console">0.0
 0.005
 0.75
 3.1
@@ -18586,7 +18590,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print x for event when aut.loc;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print x for event when aut.loc;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18599,7 +18603,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print x for event when pre not aut.loc post aut.loc;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print x for event when pre not aut.loc post aut.loc;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18615,7 +18619,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print pre y for event when pre aut.loc post not aut.loc;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print pre y for event when pre aut.loc post not aut.loc;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18651,7 +18655,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print &quot;Time=&quot; + &lt;string&gt;time;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print "Time=" + &lt;string&gt;time;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18659,7 +18663,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>Time=0.0
+<pre class="highlight"><code>Time=0.0
 Time=3.333333333333336
 Time=5.000000000000001
 Time=10.0</code></pre>
@@ -18678,7 +18682,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print fmt(&quot;Time=%s&quot;, time);</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print fmt("Time=%s", time);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18719,7 +18723,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print fmt(&quot;Time=%.2f&quot;, time);</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print fmt("Time=%.2f", time);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18732,7 +18736,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>Time=0.00
+<pre class="highlight"><code>Time=0.00
 Time=3.33
 Time=5.00
 Time=10.00</code></pre>
@@ -18750,7 +18754,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print fmt(&quot;%.2f %.2f %.2f&quot;, x, y, z);</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print fmt("%.2f %.2f %.2f", x, y, z);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18764,7 +18768,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>1.50 0.00 -3.57
+<pre class="highlight"><code>1.50 0.00 -3.57
 2.34 3.75 5.78
 4.71 12345.34 -3.12
 -3.25 1.25 99.20</code></pre>
@@ -18777,7 +18781,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print fmt(&quot;%10.2f %10.2f %10.2f&quot;, x, y, z);</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print fmt("%10.2f %10.2f %10.2f", x, y, z);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18786,7 +18790,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>---------- ---------- ----------
+<pre class="highlight"><code>---------- ---------- ----------
       1.50       0.00      -3.57
       2.34       3.75       5.78
       4.71   12345.34      -3.12
@@ -18809,7 +18813,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print fmt(&quot;%.2f&quot;, time);</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print fmt("%.2f", time);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18817,7 +18821,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>0.00
+<pre class="highlight"><code>0.00
 1.34
 5000.23
 2147185402.17</code></pre>
@@ -18831,7 +18835,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print fmt(&quot;%,.2f&quot;, time);</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print fmt("%,.2f", time);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18840,7 +18844,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>0.00
+<pre class="highlight"><code>0.00
 1.34
 5,000.23
 2,147,185,402.17</code></pre>
@@ -18864,7 +18868,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print fmt(&quot;%-10.2d %-10.2d %-10.2d&quot;, g, h, i);</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print fmt("%-10.2d %-10.2d %-10.2d", g, h, i);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18876,7 +18880,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>---------- ---------- ----------
+<pre class="highlight"><code>---------- ---------- ----------
 184        3675       2
 19350      29         -2956
 -17        -964563    235
@@ -18893,7 +18897,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print fmt(&quot;%-+10.2d %-+10.2d %-+10.2d&quot;, x, y, z);</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print fmt("%-+10.2d %-+10.2d %-+10.2d", x, y, z);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18902,7 +18906,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>---------- ---------- ----------
+<pre class="highlight"><code>---------- ---------- ----------
 +184       +3675      +2
 +19350     +29        -2956
 -17        -964563    +235
@@ -18915,7 +18919,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print fmt(&quot;%- 10.2d %- 10.2d %- 10.2d&quot;, x, y, z);</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print fmt("%- 10.2d %- 10.2d %- 10.2d", x, y, z);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -18923,7 +18927,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>---------- ---------- ----------
+<pre class="highlight"><code>---------- ---------- ----------
  184        3675       2
  19350      29        -2956
 -17        -964563     235
@@ -19004,7 +19008,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton buffer:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton buffer:
   event add, remove;
   disc int cnt = 5;
 
@@ -19088,7 +19092,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print EXPR;
+<pre class="highlight"><code class="language-cif" data-lang="cif">print EXPR;
 print pre EXPR;
 print post EXPR;
 print pre EXPR post EXPR;</code></pre>
@@ -19109,7 +19113,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print &quot;a&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">print "a";
 print pre x post x;</code></pre>
 </div>
 </div>
@@ -19136,8 +19140,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print [&quot;a\&quot;b&quot;];
-print &quot;a\&quot;b&quot;;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print ["a\"b"];
+print "a\"b";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -19147,8 +19151,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">[&quot;a\&quot;b&quot;]
-a&quot;b</code></pre>
+<pre class="highlight"><code class="language-console" data-lang="console">["a\"b"]
+a"b</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -19226,7 +19230,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print EXPR for e;
+<pre class="highlight"><code class="language-cif" data-lang="cif">print EXPR for e;
 print EXPR for time, event;
 print EXPR for initial, final;
 print EXPR for machine1.start, machine2.start;
@@ -19260,7 +19264,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print EXPR when PRED;
+<pre class="highlight"><code class="language-cif" data-lang="cif">print EXPR when PRED;
 print EXPR when pre PRED;
 print EXPR when post PRED;
 print EXPR when pre PRED post PRED;</code></pre>
@@ -19292,10 +19296,10 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print &quot;a&quot;;
-print &quot;b&quot; when aut.loc;
-print &quot;c&quot; when pre aut.loc;
-print &quot;d&quot; when pre x mod 2 = 0 post x mod 2 = 1;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print "a";
+print "b" when aut.loc;
+print "c" when pre aut.loc;
+print "d" when pre x mod 2 = 0 post x mod 2 = 1;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -19325,7 +19329,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print time for time when time &gt; 3;
+<pre class="highlight"><code class="language-cif" data-lang="cif">print time for time when time &gt; 3;
 print x for e when pre x &lt; 3 post x &gt; 5;
 print pre y post y when pre y = 5;</code></pre>
 </div>
@@ -19362,8 +19366,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print ... file &quot;txt_files/some_file.txt&quot;;
-print ... file &quot;../files/some_file.txt&quot;;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print ... file "txt_files/some_file.txt";
+print ... file "../files/some_file.txt";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -19435,7 +19439,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">printfile &quot;some_file.txt&quot;;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">printfile "some_file.txt";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -19448,8 +19452,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">printfile &quot;txt_files/some_file.txt&quot;;
-printfile &quot;../files/some_file.txt&quot;;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">printfile "txt_files/some_file.txt";
+printfile "../files/some_file.txt";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -19512,20 +19516,20 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">printfile &quot;file1.txt&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">printfile "file1.txt";
 
 print 5;
-print 6 file &quot;file2.txt&quot;;
+print 6 file "file2.txt";
 
 group g:
-  printfile &quot;file3.txt&quot;;
+  printfile "file3.txt";
 
   print 7;
   print 8;
-  print 9 file &quot;file4.txt&quot;;
+  print 9 file "file4.txt";
 
   group h:
-    printfile &quot;file5.txt&quot;;
+    printfile "file5.txt";
   end
 
   group i:
@@ -19596,8 +19600,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print 5 file &quot;some_file.txt&quot;;
-print 6 file &quot;some_file.txt&quot;;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">print 5 file "some_file.txt";
+print 6 file "some_file.txt";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -19736,7 +19740,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">fmt(&quot;%s %s&quot;, x, y)</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">fmt("%s %s", x, y)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -19764,7 +19768,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">fmt(&quot;%s %.2e&quot;, x, y)</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">fmt("%s %.2e", x, y)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -19887,7 +19891,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>%[value_index$][flags][width][.precision]conversion</code></pre>
+<pre class="highlight"><code>%[value_index$][flags][width][.precision]conversion</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -19937,7 +19941,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">fmt(&quot;%s %1$s %3$f %d %f %1$s&quot;, 1, 2, 3.0);</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">fmt("%s %1$s %3$f %d %f %1$s", 1, 2, 3.0);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -19954,7 +19958,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>1 1 3.000000 2 3.000000 1</code></pre>
+<pre class="highlight"><code>1 1 3.000000 2 3.000000 1</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -20171,10 +20175,10 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">fmt(&quot;%b&quot;, b);       // true
-fmt(&quot;%B&quot;, b);       // TRUE
-fmt(&quot;_%10b_&quot;, b);   // _      true_
-fmt(&quot;_%-10b_&quot;, b);  // _true      _</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">fmt("%b", b);       // true
+fmt("%B", b);       // TRUE
+fmt("_%10b_", b);   // _      true_
+fmt("_%-10b_", b);  // _true      _</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -20238,16 +20242,16 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">fmt(&quot;%d&quot;, x);           // 12345
-fmt(&quot;%,d&quot;, x);          // 12,345
-fmt(&quot;_%10d_&quot;, x);       // _     12345_
-fmt(&quot;_%-10d_&quot;, x);      // _12345     _
-fmt(&quot;_%0,10d_&quot;, x);     // _000012,345_
-fmt(&quot;_%- 10d_&quot;, x);     // _ 12345    _
-fmt(&quot;_%- 10d_&quot;, y);     // _-2345     _
-fmt(&quot;_%-+10d_&quot;, x);     // _+12345    _
-fmt(&quot;_%-+10d_&quot;, y);     // _-2345     _
-fmt(&quot;_%3d_&quot;, x);        // _12345_</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">fmt("%d", x);           // 12345
+fmt("%,d", x);          // 12,345
+fmt("_%10d_", x);       // _     12345_
+fmt("_%-10d_", x);      // _12345     _
+fmt("_%0,10d_", x);     // _000012,345_
+fmt("_%- 10d_", x);     // _ 12345    _
+fmt("_%- 10d_", y);     // _-2345     _
+fmt("_%-+10d_", x);     // _+12345    _
+fmt("_%-+10d_", y);     // _-2345     _
+fmt("_%3d_", x);        // _12345_</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -20306,13 +20310,13 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">fmt(&quot;%x&quot;, a);           // 15a7
-fmt(&quot;0x%x&quot;, a);         // 0x15a7
-fmt(&quot;0x%X&quot;, a);         // 0x15A7
-fmt(&quot;0x%X&quot;, b);         // 0xFFFFFFFF
-fmt(&quot;_%10x_&quot;, a);       // _      15a7_
-fmt(&quot;_%-10x_&quot;, a);      // _15a7      _
-fmt(&quot;_%3x_&quot;, a);        // _15a7_</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">fmt("%x", a);           // 15a7
+fmt("0x%x", a);         // 0x15a7
+fmt("0x%X", a);         // 0x15A7
+fmt("0x%X", b);         // 0xFFFFFFFF
+fmt("_%10x_", a);       // _      15a7_
+fmt("_%-10x_", a);      // _15a7      _
+fmt("_%3x_", a);        // _15a7_</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -20416,18 +20420,18 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">fmt(&quot;%e&quot;, a);           // 1.234568e+04
-fmt(&quot;%E&quot;, a);           // 1.234568E+04
-fmt(&quot;%.3e&quot;, a);         // 1.235e+04
-fmt(&quot;%.3e&quot;, b);         // -2.346e-05
-fmt(&quot;_%20e_&quot;, a);       // _        1.234568e+04_
-fmt(&quot;_%-20e_&quot;, a);      // _1.234568e+04        _
-fmt(&quot;_%5e_&quot;, a);        // _1.234568e+04_
-fmt(&quot;_%020e_&quot;, a);      // _000000001.234568e+04_
-fmt(&quot;_%-+20e_&quot;, a);     // _+1.234568e+04       _
-fmt(&quot;_%-+20e_&quot;, b);     // _-2.345678e-05       _
-fmt(&quot;_%- 20e_&quot;, a);     // _ 1.234568e+04       _
-fmt(&quot;_%- 20e_&quot;, b);     // _-2.345678e-05       _</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">fmt("%e", a);           // 1.234568e+04
+fmt("%E", a);           // 1.234568E+04
+fmt("%.3e", a);         // 1.235e+04
+fmt("%.3e", b);         // -2.346e-05
+fmt("_%20e_", a);       // _        1.234568e+04_
+fmt("_%-20e_", a);      // _1.234568e+04        _
+fmt("_%5e_", a);        // _1.234568e+04_
+fmt("_%020e_", a);      // _000000001.234568e+04_
+fmt("_%-+20e_", a);     // _+1.234568e+04       _
+fmt("_%-+20e_", b);     // _-2.345678e-05       _
+fmt("_%- 20e_", a);     // _ 1.234568e+04       _
+fmt("_%- 20e_", b);     // _-2.345678e-05       _</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -20509,18 +20513,18 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">fmt(&quot;%f&quot;, a);           // 12345.678900
-fmt(&quot;%f&quot;, b);           // -0.000023
-fmt(&quot;%.3f&quot;, a);         // 12345.679
-fmt(&quot;_%20f_&quot;, a);       // _        12345.678900_
-fmt(&quot;_%-20f_&quot;, a);      // _12345.678900        _
-fmt(&quot;_%-,20f_&quot;, a);     // _12,345.678900       _
-fmt(&quot;_%5f_&quot;, a);        // _12345.678900_
-fmt(&quot;_%020f_&quot;, a);      // _0000000012345.678900_
-fmt(&quot;_%-+20f_&quot;, a);     // _+12345.678900       _
-fmt(&quot;_%-+20f_&quot;, b);     // _-0.000023           _
-fmt(&quot;_%- 20f_&quot;, a);     // _ 12345.678900       _
-fmt(&quot;_%- 20f_&quot;, b);     // _-0.000023           _</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">fmt("%f", a);           // 12345.678900
+fmt("%f", b);           // -0.000023
+fmt("%.3f", a);         // 12345.679
+fmt("_%20f_", a);       // _        12345.678900_
+fmt("_%-20f_", a);      // _12345.678900        _
+fmt("_%-,20f_", a);     // _12,345.678900       _
+fmt("_%5f_", a);        // _12345.678900_
+fmt("_%020f_", a);      // _0000000012345.678900_
+fmt("_%-+20f_", a);     // _+12345.678900       _
+fmt("_%-+20f_", b);     // _-0.000023           _
+fmt("_%- 20f_", a);     // _ 12345.678900       _
+fmt("_%- 20f_", b);     // _-0.000023           _</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -20558,19 +20562,19 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">fmt(&quot;%g&quot;, a);           // 12345.7
-fmt(&quot;%g&quot;, b);           // -2.34568e-05
-fmt(&quot;%G&quot;, b);           // -2.34568E-05
-fmt(&quot;%.3g&quot;, a);         // 1.23e+04
-fmt(&quot;_%20g_&quot;, a);       // _             12345.7_
-fmt(&quot;_%-20g_&quot;, a);      // _12345.7             _
-fmt(&quot;_%-,20g_&quot;, a);     // _12,345.7            _
-fmt(&quot;_%5g_&quot;, a);        // _12345.7_
-fmt(&quot;_%020g_&quot;, a);      // _000000000000012345.7_
-fmt(&quot;_%-+20g_&quot;, a);     // _+12345.7            _
-fmt(&quot;_%-+20g_&quot;, b);     // _-2.34568e-05        _
-fmt(&quot;_%- 20g_&quot;, a);     // _ 12345.7            _
-fmt(&quot;_%- 20g_&quot;, b);     // _-2.34568e-05        _</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">fmt("%g", a);           // 12345.7
+fmt("%g", b);           // -2.34568e-05
+fmt("%G", b);           // -2.34568E-05
+fmt("%.3g", a);         // 1.23e+04
+fmt("_%20g_", a);       // _             12345.7_
+fmt("_%-20g_", a);      // _12345.7             _
+fmt("_%-,20g_", a);     // _12,345.7            _
+fmt("_%5g_", a);        // _12345.7_
+fmt("_%020g_", a);      // _000000000000012345.7_
+fmt("_%-+20g_", a);     // _+12345.7            _
+fmt("_%-+20g_", b);     // _-2.34568e-05        _
+fmt("_%- 20g_", a);     // _ 12345.7            _
+fmt("_%- 20g_", b);     // _-2.34568e-05        _</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -20614,10 +20618,10 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">fmt(&quot;%s&quot;, x);       // aBcD
-fmt(&quot;%S&quot;, x);       // ABCD
-fmt(&quot;_%10s_&quot;, x);   // _      aBcD_
-fmt(&quot;_%-10s_&quot;, x);  // _aBcD      _</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">fmt("%s", x);       // aBcD
+fmt("%S", x);       // ABCD
+fmt("_%10s_", x);   // _      aBcD_
+fmt("_%-10s_", x);  // _aBcD      _</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -20626,8 +20630,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">fmt(&quot;a %s b&quot;, (&quot;some \\ text&quot;, 6));     // a (&quot;some \\ text&quot;, 6) b
-fmt(&quot;a %s b&quot;, &quot;some \\ text&quot;);          // c some \ text d</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">fmt("a %s b", ("some \\ text", 6));     // a ("some \\ text", 6) b
+fmt("a %s b", "some \\ text");          // c some \ text d</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -20653,8 +20657,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">fmt(&quot;a %s b&quot;, 1 / 3);       // a 0.3333333333333333 b
-fmt(&quot;c %s d&quot;, 1 / 2);       // c 0.5 d</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">fmt("a %s b", 1 / 3);       // a 0.3333333333333333 b
+fmt("c %s d", 1 / 2);       // c 0.5 d</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -20696,7 +20700,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>a&quot;b
+<pre class="highlight"><code>a"b
 c       d\e%f</code></pre>
 </div>
 </div>
@@ -20848,7 +20852,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgfile &quot;lamp.svg&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgfile "lamp.svg";
 
 automaton lamp:
   cont t der 1.0;
@@ -20860,7 +20864,7 @@
   location On:
     edge when t &gt;= 2.0 do t := 0.0 goto Off;
 
-  svgout id &quot;lamp&quot; attr &quot;fill&quot; value if Off: &quot;gray&quot; else &quot;yellow&quot; end;
+  svgout id "lamp" attr "fill" value if Off: "gray" else "yellow" end;
 end</code></pre>
 </div>
 </div>
@@ -20997,13 +21001,13 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">from &quot;lib:cif&quot; import *;
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">from "lib:cif" import *;
 
 cifsim(
-    &quot;lamp.cif&quot;,
-    &quot;-t 10&quot;,
-    &quot;-i auto&quot;,
-    &quot;--frame-rate=20&quot;,
+    "lamp.cif",
+    "-t 10",
+    "-i auto",
+    "--frame-rate=20",
 );</code></pre>
 </div>
 </div>
@@ -21099,7 +21103,7 @@
 <a href="http://inkscape.org/">Inkscape</a>,
 a free and
 open source vector graphics editor that uses SVG as its native file format, and
-is available for many platforms, including Microsoft Windows, Mac OS X, and
+is available for many platforms, including Microsoft Windows, macOS, and
 Linux. In this documentation, we&#8217;ll use Inkscape to create and edit SVG images.</p>
 </div>
 <div class="paragraph">
@@ -21319,7 +21323,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">ERROR: SVG image file &quot;some_image.svg&quot; is not an SVG file, is an invalid SVG file, or contains unsupported SVG features.
+<pre class="highlight"><code class="language-console" data-lang="console">ERROR: SVG image file "some_image.svg" is not an SVG file, is an invalid SVG file, or contains unsupported SVG features.
 CAUSE: invalid.element</code></pre>
 </div>
 </div>
@@ -21387,7 +21391,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgfile &quot;some_file.svg&quot;;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgfile "some_file.svg";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -21407,8 +21411,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgfile &quot;svg_files/some_file.svg&quot;;
-svgfile &quot;../images/some_file.svg&quot;;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgfile "svg_files/some_file.svg";
+svgfile "../images/some_file.svg";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -21448,27 +21452,27 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgfile &quot;file1.svg&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgfile "file1.svg";
 
-svgout id &quot;a&quot; attr &quot;b&quot; value 5;
+svgout id "a" attr "b" value 5;
 
-svgout id &quot;c&quot; attr &quot;d&quot; value 6 file &quot;file2.svg&quot;;
+svgout id "c" attr "d" value 6 file "file2.svg";
 
 group g:
-  svgfile &quot;file3.svg&quot;;
+  svgfile "file3.svg";
 
-  svgout id &quot;e&quot; attr &quot;f&quot; value 7;
+  svgout id "e" attr "f" value 7;
 
-  svgout id &quot;g&quot; attr &quot;h&quot; value 8;
+  svgout id "g" attr "h" value 8;
 
-  svgout id &quot;i&quot; attr &quot;j&quot; value 9 file &quot;file4.svg&quot;;
+  svgout id "i" attr "j" value 9 file "file4.svg";
 
   group h:
-    svgfile &quot;file5.svg&quot;;
+    svgfile "file5.svg";
   end
 
   group i:
-    svgout id &quot;k&quot; attr &quot;l&quot; value 10;
+    svgout id "k" attr "l" value 10;
   end
 end</code></pre>
 </div>
@@ -21539,9 +21543,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgout id &quot;...&quot; attr &quot;...&quot; value 5 file &quot;some_file.svg&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgout id "..." attr "..." value 5 file "some_file.svg";
 
-svgout id &quot;...&quot; attr &quot;...&quot; value 6 file &quot;some_file.svg&quot;;</code></pre>
+svgout id "..." attr "..." value 6 file "some_file.svg";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -21574,7 +21578,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">cont pos der 1.0;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">cont pos der 1.0;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -21583,7 +21587,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgout id &quot;box&quot; attr &quot;x&quot; value pos;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgout id "box" attr "x" value pos;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -21602,7 +21606,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgout id &lt;id&gt; attr &lt;attr&gt; value &lt;value&gt;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgout id &lt;id&gt; attr &lt;attr&gt; value &lt;value&gt;;
 svgout id &lt;id&gt; attr &lt;attr&gt; value &lt;value&gt; file &lt;file&gt;;
 svgout id &lt;id&gt; text        value &lt;value&gt;;
 svgout id &lt;id&gt; text        value &lt;value&gt; file &lt;file&gt;;</code></pre>
@@ -21662,12 +21666,12 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Hard coded SVG element id.
-svgout id &quot;box&quot; attr &quot;width&quot; value ...;
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Hard coded SVG element id.
+svgout id "box" attr "width" value ...;
 
 // Computed SVG element id.
-const string c = &quot;bo&quot;;
-svgout id c + &quot;x&quot; attr &quot;width&quot; value ...;</code></pre>
+const string c = "bo";
+svgout id c + "x" attr "width" value ...;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -21741,8 +21745,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="svg">&lt;rect fill=&quot;red&quot;        id=&quot;rect1&quot; width=&quot;25&quot; height=&quot;25&quot; x=&quot;65&quot; y=&quot;5&quot;/&gt;
-&lt;rect style=&quot;fill:red;&quot; id=&quot;rect2&quot; width=&quot;25&quot; height=&quot;25&quot; x=&quot;15&quot; y=&quot;5&quot;/&gt;</code></pre>
+<pre class="highlight"><code class="language-svg" data-lang="svg">&lt;rect fill="red"        id="rect1" width="25" height="25" x="65" y="5"/&gt;
+&lt;rect style="fill:red;" id="rect2" width="25" height="25" x="15" y="5"/&gt;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -21796,8 +21800,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="svg">&lt;text x=&quot;5&quot; y=&quot;5&quot; id=&quot;text1&quot; style=&quot;font-size:16px;&quot;&gt;
-  &lt;tspan x=&quot;5&quot; y=&quot;5&quot; id=&quot;tspan2&quot;&gt;
+<pre class="highlight"><code class="language-svg" data-lang="svg">&lt;text x="5" y="5" id="text1" style="font-size:16px;"&gt;
+  &lt;tspan x="5" y="5" id="tspan2"&gt;
     The actual text.
   &lt;/tspan&gt;
 &lt;/text&gt;</code></pre>
@@ -21810,9 +21814,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgout id &quot;text1&quot; text value ...;
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgout id "text1" text value ...;
 
-svgout id &quot;tspan2&quot; text value ...;</code></pre>
+svgout id "tspan2" text value ...;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -21895,8 +21899,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgout id &quot;...&quot; attr &quot;...&quot; value [&quot;a\&quot;b&quot;];
-svgout id &quot;...&quot; attr &quot;...&quot; value &quot;a\&quot;b&quot;;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgout id "..." attr "..." value ["a\"b"];
+svgout id "..." attr "..." value "a\"b";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -21906,8 +21910,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">[&quot;a\&quot;b&quot;]
-a&quot;b</code></pre>
+<pre class="highlight"><code class="language-console" data-lang="console">["a\"b"]
+a"b</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -22014,15 +22018,15 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="svg">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;
-&lt;svg xmlns=&quot;http://www.w3.org/2000/svg&quot;
-     xmlns:svg=&quot;http://www.w3.org/2000/svg&quot;
-     width=&quot;250&quot; height=&quot;250&quot; id=&quot;root&quot; version=&quot;1.1&quot;&gt;
-  &lt;rect style=&quot;fill:red;&quot;   id=&quot;rect&quot;  width=&quot;100&quot; height=&quot;100&quot; x=&quot;20&quot; y=&quot;20&quot;/&gt;
-  &lt;g id=&quot;grp&quot;&gt;
-    &lt;rect style=&quot;fill:green;&quot; id=&quot;rect2&quot; width=&quot;100&quot; height=&quot;100&quot; x=&quot;50&quot; y=&quot;50&quot;/&gt;
+<pre class="highlight"><code class="language-svg" data-lang="svg">&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;
+&lt;svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:svg="http://www.w3.org/2000/svg"
+     width="250" height="250" id="root" version="1.1"&gt;
+  &lt;rect style="fill:red;"   id="rect"  width="100" height="100" x="20" y="20"/&gt;
+  &lt;g id="grp"&gt;
+    &lt;rect style="fill:green;" id="rect2" width="100" height="100" x="50" y="50"/&gt;
   &lt;/g&gt;
-  &lt;rect style=&quot;fill:blue;&quot;  id=&quot;rect3&quot; width=&quot;100&quot; height=&quot;100&quot; x=&quot;80&quot; y=&quot;80&quot;/&gt;
+  &lt;rect style="fill:blue;"  id="rect3" width="100" height="100" x="80" y="80"/&gt;
 &lt;/svg&gt;</code></pre>
 </div>
 </div>
@@ -22034,11 +22038,11 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgfile &quot;svgcopy.svg&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgfile "svgcopy.svg";
 
-svgcopy id &quot;rect&quot; pre &quot;a&quot;;
-svgcopy id &quot;grp&quot; post &quot;b&quot;;
-svgcopy id &quot;rect3&quot; pre &quot;_&quot; post &quot;x&quot;;</code></pre>
+svgcopy id "rect" pre "a";
+svgcopy id "grp" post "b";
+svgcopy id "rect3" pre "_" post "x";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -22046,20 +22050,20 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="svg">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;
-&lt;svg xmlns=&quot;http://www.w3.org/2000/svg&quot;
-     xmlns:svg=&quot;http://www.w3.org/2000/svg&quot;
-     width=&quot;250&quot; height=&quot;250&quot; id=&quot;root&quot; version=&quot;1.1&quot;&gt;
-  &lt;rect style=&quot;fill:red;&quot;   id=&quot;arect&quot;   width=&quot;100&quot; height=&quot;100&quot; x=&quot;20&quot; y=&quot;20&quot;/&gt;
-  &lt;rect style=&quot;fill:red;&quot;   id=&quot;rect&quot;    width=&quot;100&quot; height=&quot;100&quot; x=&quot;20&quot; y=&quot;20&quot;/&gt;
-  &lt;g id=&quot;grpb&quot;&gt;
-    &lt;rect style=&quot;fill:green;&quot; id=&quot;rect2b&quot; width=&quot;100&quot; height=&quot;100&quot; x=&quot;50&quot; y=&quot;50&quot;/&gt;
+<pre class="highlight"><code class="language-svg" data-lang="svg">&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;
+&lt;svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:svg="http://www.w3.org/2000/svg"
+     width="250" height="250" id="root" version="1.1"&gt;
+  &lt;rect style="fill:red;"   id="arect"   width="100" height="100" x="20" y="20"/&gt;
+  &lt;rect style="fill:red;"   id="rect"    width="100" height="100" x="20" y="20"/&gt;
+  &lt;g id="grpb"&gt;
+    &lt;rect style="fill:green;" id="rect2b" width="100" height="100" x="50" y="50"/&gt;
   &lt;/g&gt;
-  &lt;g id=&quot;grp&quot;&gt;
-    &lt;rect style=&quot;fill:green;&quot; id=&quot;rect2&quot; width=&quot;100&quot; height=&quot;100&quot; x=&quot;50&quot; y=&quot;50&quot;/&gt;
+  &lt;g id="grp"&gt;
+    &lt;rect style="fill:green;" id="rect2" width="100" height="100" x="50" y="50"/&gt;
   &lt;/g&gt;
-  &lt;rect style=&quot;fill:blue;&quot;  id=&quot;_rect3x&quot; width=&quot;100&quot; height=&quot;100&quot; x=&quot;80&quot; y=&quot;80&quot;/&gt;
-  &lt;rect style=&quot;fill:blue;&quot;  id=&quot;rect3&quot;   width=&quot;100&quot; height=&quot;100&quot; x=&quot;80&quot; y=&quot;80&quot;/&gt;
+  &lt;rect style="fill:blue;"  id="_rect3x" width="100" height="100" x="80" y="80"/&gt;
+  &lt;rect style="fill:blue;"  id="rect3"   width="100" height="100" x="80" y="80"/&gt;
 &lt;/svg&gt;</code></pre>
 </div>
 </div>
@@ -22080,13 +22084,13 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgcopy id &lt;orig-elem-id&gt; pre &lt;prefix&gt;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgcopy id &lt;orig-elem-id&gt; pre &lt;prefix&gt;;
 
 svgcopy id &lt;orig-elem-id&gt; post &lt;postfix&gt;;
 
 svgcopy id &lt;orig-elem-id&gt; pre &lt;prefix&gt; post &lt;postfix&gt;;
 
-svgcopy id &lt;orig-elem-id&gt; pre &lt;prefix&gt; file &quot;...&quot;;</code></pre>
+svgcopy id &lt;orig-elem-id&gt; pre &lt;prefix&gt; file "...";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -22184,15 +22188,15 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="svg">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;
-&lt;svg xmlns=&quot;http://www.w3.org/2000/svg&quot;
-     xmlns:svg=&quot;http://www.w3.org/2000/svg&quot;
-     width=&quot;250&quot; height=&quot;250&quot; id=&quot;root&quot; version=&quot;1.1&quot;&gt;
-  &lt;rect style=&quot;fill:red;&quot;   id=&quot;rect&quot;  width=&quot;100&quot; height=&quot;100&quot; x=&quot;20&quot; y=&quot;20&quot;/&gt;
-  &lt;g id=&quot;grp&quot;&gt;
-    &lt;rect style=&quot;fill:green;&quot; id=&quot;rect2&quot; width=&quot;100&quot; height=&quot;100&quot; x=&quot;50&quot; y=&quot;50&quot;/&gt;
+<pre class="highlight"><code class="language-svg" data-lang="svg">&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;
+&lt;svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:svg="http://www.w3.org/2000/svg"
+     width="250" height="250" id="root" version="1.1"&gt;
+  &lt;rect style="fill:red;"   id="rect"  width="100" height="100" x="20" y="20"/&gt;
+  &lt;g id="grp"&gt;
+    &lt;rect style="fill:green;" id="rect2" width="100" height="100" x="50" y="50"/&gt;
   &lt;/g&gt;
-  &lt;rect style=&quot;fill:blue;&quot;  id=&quot;rect3&quot; width=&quot;100&quot; height=&quot;100&quot; x=&quot;80&quot; y=&quot;80&quot;/&gt;
+  &lt;rect style="fill:blue;"  id="rect3" width="100" height="100" x="80" y="80"/&gt;
 &lt;/svg&gt;</code></pre>
 </div>
 </div>
@@ -22201,7 +22205,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgcopy id &quot;rect&quot; post &quot;2&quot;;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgcopy id "rect" post "2";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -22224,12 +22228,12 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;
-&lt;svg xmlns=&quot;http://www.w3.org/2000/svg&quot;
-     xmlns:svg=&quot;http://www.w3.org/2000/svg&quot;
-     width=&quot;250&quot; height=&quot;250&quot; id=&quot;root&quot; version=&quot;1.1&quot;&gt;
-  &lt;g id=&quot;g&quot;&gt;
-    &lt;rect style=&quot;fill:green;&quot; id=&quot;r&quot; width=&quot;100&quot; height=&quot;100&quot; x=&quot;50&quot; y=&quot;50&quot;/&gt;
+<pre class="highlight"><code class="language-cif" data-lang="cif">&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;
+&lt;svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:svg="http://www.w3.org/2000/svg"
+     width="250" height="250" id="root" version="1.1"&gt;
+  &lt;g id="g"&gt;
+    &lt;rect style="fill:green;" id="r" width="100" height="100" x="50" y="50"/&gt;
   &lt;/g&gt;
 &lt;/svg&gt;</code></pre>
 </div>
@@ -22239,8 +22243,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgcopy id &quot;g&quot; post &quot;a&quot;;
-svgcopy id &quot;r&quot; post &quot;b&quot;;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgcopy id "g" post "a";
+svgcopy id "r" post "b";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -22251,16 +22255,16 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;
-&lt;svg xmlns=&quot;http://www.w3.org/2000/svg&quot;
-     xmlns:svg=&quot;http://www.w3.org/2000/svg&quot;
-     width=&quot;250&quot; height=&quot;250&quot; id=&quot;root&quot; version=&quot;1.1&quot;&gt;
-  &lt;g id=&quot;ga&quot;&gt;
-    &lt;rect style=&quot;fill:green;&quot; id=&quot;ra&quot; width=&quot;100&quot; height=&quot;100&quot; x=&quot;50&quot; y=&quot;50&quot;/&gt;
+<pre class="highlight"><code class="language-cif" data-lang="cif">&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;
+&lt;svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:svg="http://www.w3.org/2000/svg"
+     width="250" height="250" id="root" version="1.1"&gt;
+  &lt;g id="ga"&gt;
+    &lt;rect style="fill:green;" id="ra" width="100" height="100" x="50" y="50"/&gt;
   &lt;/g&gt;
-  &lt;g id=&quot;g&quot;&gt;
-    &lt;rect style=&quot;fill:green;&quot; id=&quot;rb&quot; width=&quot;100&quot; height=&quot;100&quot; x=&quot;50&quot; y=&quot;50&quot;/&gt;
-    &lt;rect style=&quot;fill:green;&quot; id=&quot;r&quot; width=&quot;100&quot; height=&quot;100&quot; x=&quot;50&quot; y=&quot;50&quot;/&gt;
+  &lt;g id="g"&gt;
+    &lt;rect style="fill:green;" id="rb" width="100" height="100" x="50" y="50"/&gt;
+    &lt;rect style="fill:green;" id="r" width="100" height="100" x="50" y="50"/&gt;
   &lt;/g&gt;
 &lt;/svg&gt;</code></pre>
 </div>
@@ -22270,17 +22274,17 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;
-&lt;svg xmlns=&quot;http://www.w3.org/2000/svg&quot;
-     xmlns:svg=&quot;http://www.w3.org/2000/svg&quot;
-     width=&quot;250&quot; height=&quot;250&quot; id=&quot;root&quot; version=&quot;1.1&quot;&gt;
-  &lt;g id=&quot;ga&quot;&gt;
-    &lt;rect style=&quot;fill:green;&quot; id=&quot;rba&quot; width=&quot;100&quot; height=&quot;100&quot; x=&quot;50&quot; y=&quot;50&quot;/&gt;
-    &lt;rect style=&quot;fill:green;&quot; id=&quot;ra&quot; width=&quot;100&quot; height=&quot;100&quot; x=&quot;50&quot; y=&quot;50&quot;/&gt;
+<pre class="highlight"><code class="language-cif" data-lang="cif">&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;
+&lt;svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:svg="http://www.w3.org/2000/svg"
+     width="250" height="250" id="root" version="1.1"&gt;
+  &lt;g id="ga"&gt;
+    &lt;rect style="fill:green;" id="rba" width="100" height="100" x="50" y="50"/&gt;
+    &lt;rect style="fill:green;" id="ra" width="100" height="100" x="50" y="50"/&gt;
   &lt;/g&gt;
-  &lt;g id=&quot;g&quot;&gt;
-    &lt;rect style=&quot;fill:green;&quot; id=&quot;rb&quot; width=&quot;100&quot; height=&quot;100&quot; x=&quot;50&quot; y=&quot;50&quot;/&gt;
-    &lt;rect style=&quot;fill:green;&quot; id=&quot;r&quot; width=&quot;100&quot; height=&quot;100&quot; x=&quot;50&quot; y=&quot;50&quot;/&gt;
+  &lt;g id="g"&gt;
+    &lt;rect style="fill:green;" id="rb" width="100" height="100" x="50" y="50"/&gt;
+    &lt;rect style="fill:green;" id="r" width="100" height="100" x="50" y="50"/&gt;
   &lt;/g&gt;
 &lt;/svg&gt;</code></pre>
 </div>
@@ -22295,8 +22299,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgcopy id &quot;g&quot; post &quot;a&quot;;
-svgcopy id &quot;ra&quot; post &quot;b&quot;;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgcopy id "g" post "a";
+svgcopy id "ra" post "b";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -22304,16 +22308,16 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;
-&lt;svg xmlns=&quot;http://www.w3.org/2000/svg&quot;
-     xmlns:svg=&quot;http://www.w3.org/2000/svg&quot;
-     width=&quot;250&quot; height=&quot;250&quot; id=&quot;root&quot; version=&quot;1.1&quot;&gt;
-  &lt;g id=&quot;ga&quot;&gt;
-    &lt;rect style=&quot;fill:green;&quot; id=&quot;rab&quot; width=&quot;100&quot; height=&quot;100&quot; x=&quot;50&quot; y=&quot;50&quot;/&gt;
-    &lt;rect style=&quot;fill:green;&quot; id=&quot;ra&quot; width=&quot;100&quot; height=&quot;100&quot; x=&quot;50&quot; y=&quot;50&quot;/&gt;
+<pre class="highlight"><code class="language-cif" data-lang="cif">&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;
+&lt;svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:svg="http://www.w3.org/2000/svg"
+     width="250" height="250" id="root" version="1.1"&gt;
+  &lt;g id="ga"&gt;
+    &lt;rect style="fill:green;" id="rab" width="100" height="100" x="50" y="50"/&gt;
+    &lt;rect style="fill:green;" id="ra" width="100" height="100" x="50" y="50"/&gt;
   &lt;/g&gt;
-  &lt;g id=&quot;g&quot;&gt;
-    &lt;rect style=&quot;fill:green;&quot; id=&quot;r&quot; width=&quot;100&quot; height=&quot;100&quot; x=&quot;50&quot; y=&quot;50&quot;/&gt;
+  &lt;g id="g"&gt;
+    &lt;rect style="fill:green;" id="r" width="100" height="100" x="50" y="50"/&gt;
   &lt;/g&gt;
 &lt;/svg&gt;</code></pre>
 </div>
@@ -22366,17 +22370,17 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="svg">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;
-&lt;svg xmlns=&quot;http://www.w3.org/2000/svg&quot;
-     xmlns:svg=&quot;http://www.w3.org/2000/svg&quot;
-     width=&quot;400&quot; height=&quot;400&quot; id=&quot;root&quot; version=&quot;1.1&quot;&gt;
-  &lt;g id=&quot;grp1&quot;&gt;
-    &lt;rect style=&quot;fill:green;&quot; id=&quot;rect1&quot; width=&quot;20&quot; height=&quot;20&quot; x=&quot;5&quot; y=&quot;10&quot;
-          transform=&quot;translate(15, 20)&quot;/&gt;
+<pre class="highlight"><code class="language-svg" data-lang="svg">&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;
+&lt;svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:svg="http://www.w3.org/2000/svg"
+     width="400" height="400" id="root" version="1.1"&gt;
+  &lt;g id="grp1"&gt;
+    &lt;rect style="fill:green;" id="rect1" width="20" height="20" x="5" y="10"
+          transform="translate(15, 20)"/&gt;
   &lt;/g&gt;
-  &lt;g id=&quot;grp2&quot; transform=&quot;scale(5, 2)&quot;&gt;
-    &lt;rect style=&quot;fill:blue;&quot; id=&quot;rect2&quot; width=&quot;20&quot; height=&quot;20&quot; x=&quot;5&quot; y=&quot;10&quot;
-          transform=&quot;translate(15, 20)&quot;/&gt;
+  &lt;g id="grp2" transform="scale(5, 2)"&gt;
+    &lt;rect style="fill:blue;" id="rect2" width="20" height="20" x="5" y="10"
+          transform="translate(15, 20)"/&gt;
   &lt;/g&gt;
 &lt;/svg&gt;</code></pre>
 </div>
@@ -22405,10 +22409,10 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgfile &quot;svgmove.svg&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgfile "svgmove.svg";
 
-svgmove id &quot;rect1&quot; to 10, 10;
-svgmove id &quot;rect2&quot; to 10, 50;</code></pre>
+svgmove id "rect1" to 10, 10;
+svgmove id "rect2" to 10, 50;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -22420,17 +22424,17 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="svg">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;
-&lt;svg xmlns=&quot;http://www.w3.org/2000/svg&quot;
-     xmlns:svg=&quot;http://www.w3.org/2000/svg&quot;
-     width=&quot;400&quot; height=&quot;400&quot; id=&quot;root&quot; version=&quot;1.1&quot;&gt;
-  &lt;g id=&quot;grp1&quot;&gt;
-    &lt;rect style=&quot;fill:green;&quot; id=&quot;rect1&quot; width=&quot;20&quot; height=&quot;20&quot; x=&quot;5&quot; y=&quot;10&quot;
-          transform=&quot;translate(15, 20) translate(-10.000000,-20.000000)&quot;/&gt;
+<pre class="highlight"><code class="language-svg" data-lang="svg">&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;
+&lt;svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:svg="http://www.w3.org/2000/svg"
+     width="400" height="400" id="root" version="1.1"&gt;
+  &lt;g id="grp1"&gt;
+    &lt;rect style="fill:green;" id="rect1" width="20" height="20" x="5" y="10"
+          transform="translate(15, 20) translate(-10.000000,-20.000000)"/&gt;
   &lt;/g&gt;
-  &lt;g id=&quot;grp2&quot; transform=&quot;scale(5, 2)&quot;&gt;
-    &lt;rect style=&quot;fill:blue;&quot; id=&quot;rect2&quot; width=&quot;20&quot; height=&quot;20&quot; x=&quot;5&quot; y=&quot;10&quot;
-          transform=&quot;translate(15, 20) translate(-18.000000,-5.000000)&quot;/&gt;
+  &lt;g id="grp2" transform="scale(5, 2)"&gt;
+    &lt;rect style="fill:blue;" id="rect2" width="20" height="20" x="5" y="10"
+          transform="translate(15, 20) translate(-18.000000,-5.000000)"/&gt;
   &lt;/g&gt;
 &lt;/svg&gt;</code></pre>
 </div>
@@ -22482,9 +22486,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgmove id &lt;id&gt; to &lt;x&gt;, &lt;y&gt;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgmove id &lt;id&gt; to &lt;x&gt;, &lt;y&gt;;
 
-svgmove id &lt;id&gt; to &lt;x&gt;, &lt;y&gt; file &quot;...&quot;;</code></pre>
+svgmove id &lt;id&gt; to &lt;x&gt;, &lt;y&gt; file "...";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -22755,12 +22759,12 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">SVG output (&quot;some_file.svg&quot;) id &quot;a&quot; text: &quot;10.00&quot;
-SVG output (&quot;some_file.svg&quot;) id &quot;b&quot; text: &quot;0.0&quot;
-SVG output (&quot;some_file.svg&quot;) id &quot;c&quot; text: &quot;3.16&quot;
-SVG output (&quot;some_file.svg&quot;) id &quot;n&quot; attr &quot;fill&quot; (CSS attr): &quot;#ff0000&quot;
-SVG output (&quot;some_file.svg&quot;) id &quot;water&quot; attr &quot;height&quot; (SVG attr): &quot;75.0&quot;
-SVG output (&quot;some_file.svg&quot;) id &quot;water&quot; attr &quot;y&quot; (SVG attr): &quot;104.5&quot;</code></pre>
+<pre class="highlight"><code class="language-console" data-lang="console">SVG output ("some_file.svg") id "a" text: "10.00"
+SVG output ("some_file.svg") id "b" text: "0.0"
+SVG output ("some_file.svg") id "c" text: "3.16"
+SVG output ("some_file.svg") id "n" attr "fill" (CSS attr): "#ff0000"
+SVG output ("some_file.svg") id "water" attr "height" (SVG attr): "75.0"
+SVG output ("some_file.svg") id "water" attr "y" (SVG attr): "104.5"</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -22791,7 +22795,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">SVG input (&quot;some_file.svg&quot;) id &quot;button&quot;: event &quot;button.u_pushed&quot;
+<pre class="highlight"><code class="language-console" data-lang="console">SVG input ("some_file.svg") id "button": event "button.u_pushed"
 Transition: event button.u_pushed</code></pre>
 </div>
 </div>
@@ -22805,11 +22809,11 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">SVG copy (&quot;some_file.svg&quot;) id &quot;button&quot; post &quot;1&quot;.
-SVG copy (&quot;some_file.svg&quot;) id &quot;button&quot; post &quot;2&quot;.
+<pre class="highlight"><code class="language-console" data-lang="console">SVG copy ("some_file.svg") id "button" post "1".
+SVG copy ("some_file.svg") id "button" post "2".
 
-SVG move (&quot;some_file.svg&quot;) id &quot;button1&quot; to 10.0, 10.0.
-SVG move (&quot;some_file.svg&quot;) id &quot;button2&quot; to 30.0, 10.0.</code></pre>
+SVG move ("some_file.svg") id "button1" to 10.0, 10.0.
+SVG move ("some_file.svg") id "button2" to 30.0, 10.0.</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -22842,9 +22846,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">ERROR: Simulation resulted in a runtime error.
-CAUSE: Evaluation of the SVG output mapping (&quot;some_file.svg&quot;) for the text of the SVG element with id &quot;txt1&quot; failed for state: time=0.0, x=-1.5265566588595902e-16.
-CAUSE: Evaluation of SVG output mapping value &quot;sqrt(x)&quot; failed.
+<pre class="highlight"><code class="language-console" data-lang="console">ERROR: Simulation resulted in a runtime error.
+CAUSE: Evaluation of the SVG output mapping ("some_file.svg") for the text of the SVG element with id "txt1" failed for state: time=0.0, x=-1.5265566588595902e-16.
+CAUSE: Evaluation of SVG output mapping value "sqrt(x)" failed.
 CAUSE: Invalid operation: sqrt(-1.5265566588595902e-16).</code></pre>
 </div>
 </div>
@@ -23019,7 +23023,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgfile &quot;sun_moon.svg&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgfile "sun_moon.svg";
 
 automaton sun_moon:
   cont t der 1.0;
@@ -23031,13 +23035,13 @@
   location Night:
     edge when t &gt;= 12.0 do t := 0.0 goto Day;
 
-  svgout id &quot;sun&quot; attr &quot;visibility&quot;
-    value if Day: &quot;visible&quot; else &quot;hidden&quot; end;
+  svgout id "sun" attr "visibility"
+    value if Day: "visible" else "hidden" end;
 
-  svgout id &quot;moon&quot; attr &quot;visibility&quot;
+  svgout id "moon" attr "visibility"
     value switch self:
-      case Day:   &quot;hidden&quot;
-      case Night: &quot;visible&quot;
+      case Day:   "hidden"
+      case Night: "visible"
     end;
 end</code></pre>
 </div>
@@ -23171,7 +23175,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Behavior.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Behavior.
 automaton person:
   cont pos = 0.0;
 
@@ -23186,15 +23190,15 @@
 end
 
 // Visualization.
-svgfile &quot;walk_floor.svg&quot;;
+svgfile "walk_floor.svg";
 
 // width of the floor - width of the person = movement
 // 180px              - 19px                = 161px
-svgout id &quot;person&quot; attr &quot;transform&quot;
-  value fmt(&quot;translate(%s,0)&quot;, scale(person.pos, 0, 5, 0, 161));
+svgout id "person" attr "transform"
+  value fmt("translate(%s,0)", scale(person.pos, 0, 5, 0, 161));
 
-svgout id &quot;pos_txt&quot; text
-  value fmt(&quot;%.1f%%&quot;, scale(person.pos, 0, 5, 0, 100));</code></pre>
+svgout id "pos_txt" text
+  value fmt("%.1f%%", scale(person.pos, 0, 5, 0, 100));</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -23255,7 +23259,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Behavior.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Behavior.
 automaton person:
   cont x = 0.0;
   cont y = 0.0;
@@ -23283,15 +23287,15 @@
 end
 
 // Visualization.
-svgfile &quot;walk_room.svg&quot;;
+svgfile "walk_room.svg";
 
 // width of the room - width of the person = horizontal movement
 // 180px             - 19px                = 161px
 //
 // height of the room - height of the person = vertical movement
 // 180px              - 40x                  = 140px
-svgout id &quot;person&quot; attr &quot;transform&quot;
-  value fmt(&quot;translate(%s,%s)&quot;, scale(person.x, 0, 5, 0, 161),
+svgout id "person" attr "transform"
+  value fmt("translate(%s,%s)", scale(person.x, 0, 5, 0, 161),
                                 scale(person.y, 0, 5, 0, 140));</code></pre>
 </div>
 </div>
@@ -23372,7 +23376,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Behavior.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Behavior.
 const real MARGIN = 0.01;
 
 automaton machine:
@@ -23389,12 +23393,12 @@
 end
 
 // Visualization.
-svgfile &quot;rate.svg&quot;;
+svgfile "rate.svg";
 
-svgout id &quot;circle_bg_rect&quot; attr &quot;height&quot;
+svgout id "circle_bg_rect" attr "height"
   value scale(machine.rate, 0, 1, 58, 0);
 
-svgout id &quot;circle_bg_rect&quot; attr &quot;fill&quot; value &quot;white&quot;;</code></pre>
+svgout id "circle_bg_rect" attr "fill" value "white";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -23486,7 +23490,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgfile &quot;workstation.svg&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgfile "workstation.svg";
 
 event generate, transfer, exit;
 
@@ -23506,11 +23510,11 @@
   location completed:
     edge done goto idle;
 
-  svgout id &quot;m&quot; + &lt;string&gt;nr + &quot;_bar_front&quot; attr &quot;width&quot;
+  svgout id "m" + &lt;string&gt;nr + "_bar_front" attr "width"
     value scale(if processing: t else ptime end, 0, ptime, 0, 130);
 
-  svgout id &quot;m&quot; + &lt;string&gt;nr + &quot;_bar_front&quot; attr &quot;fill&quot;
-    value if idle : &quot;gray&quot; else &quot;dodgerblue&quot; end;
+  svgout id "m" + &lt;string&gt;nr + "_bar_front" attr "fill"
+    value if idle : "gray" else "dodgerblue" end;
 end</code></pre>
 </div>
 </div>
@@ -23688,7 +23692,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Behavior.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Behavior.
 const real CAPACITY   = 10.0;
 const real MAX_LEVEL  =  8.0;
 const real INIT_LEVEL =  5.0;
@@ -23708,9 +23712,9 @@
 end
 
 // Visualization.
-svgfile &quot;tank.svg&quot;;
+svgfile "tank.svg";
 
-svgout id &quot;water&quot; attr &quot;height&quot; value scale(tank.level, 0, CAPACITY, 0, 80);</code></pre>
+svgout id "water" attr "height" value scale(tank.level, 0, CAPACITY, 0, 80);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -23817,7 +23821,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">// Behavior.
+<pre class="highlight"><code class="language-cif" data-lang="cif">// Behavior.
 automaton def Lamp():
   event toggle;
   disc bool on = false;
@@ -23831,13 +23835,13 @@
 lamp2: Lamp();
 
 // Visualization.
-svgfile &quot;lamps2.svg&quot;;
+svgfile "lamps2.svg";
 
-svgout id &quot;lamp1&quot; attr &quot;fill&quot; value if lamp1.on: &quot;yellow&quot; else &quot;silver&quot; end;
-svgout id &quot;lamp2&quot; attr &quot;fill&quot; value if lamp2.on: &quot;yellow&quot; else &quot;silver&quot; end;
+svgout id "lamp1" attr "fill" value if lamp1.on: "yellow" else "silver" end;
+svgout id "lamp2" attr "fill" value if lamp2.on: "yellow" else "silver" end;
 
-svgout id &quot;lamp1&quot; attr &quot;stroke-width&quot; value if lamp1.on: 5 else 2 end;
-svgout id &quot;lamp2&quot; attr &quot;stroke-width&quot; value if lamp2.on: 5 else 2 end;</code></pre>
+svgout id "lamp1" attr "stroke-width" value if lamp1.on: 5 else 2 end;
+svgout id "lamp2" attr "stroke-width" value if lamp2.on: 5 else 2 end;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -23870,7 +23874,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">lamp3: Lamp();</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">lamp3: Lamp();</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -23918,7 +23922,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgfile &quot;lamps3.svg&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgfile "lamps3.svg";
 
 automaton def Lamp(alg int nr):
   // Behavior.
@@ -23930,14 +23934,14 @@
     edge toggle do on := not on;
 
   // Visualization.
-  svgcopy id &quot;lamp&quot; post &lt;string&gt;nr;
+  svgcopy id "lamp" post &lt;string&gt;nr;
 
-  svgmove id &quot;lamp&quot; + &lt;string&gt;nr to 20 + (nr - 1) * 100, 20;
+  svgmove id "lamp" + &lt;string&gt;nr to 20 + (nr - 1) * 100, 20;
 
-  svgout id &quot;lamp&quot; + &lt;string&gt;nr attr &quot;fill&quot;
-    value if on: &quot;yellow&quot; else &quot;silver&quot; end;
+  svgout id "lamp" + &lt;string&gt;nr attr "fill"
+    value if on: "yellow" else "silver" end;
 
-  svgout id &quot;lamp&quot; + &lt;string&gt;nr attr &quot;stroke-width&quot;
+  svgout id "lamp" + &lt;string&gt;nr attr "stroke-width"
     value if on: 5 else 2 end;
 end
 
@@ -24014,13 +24018,13 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton lamp1:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton lamp1:
   event toggle;
   disc bool on = false;
-  svgcopy id &quot;lamp&quot; post &quot;1&quot;;
-  svgmove id &quot;lamp1&quot; to 20, 20;
-  svgout id &quot;lamp1&quot; attr &quot;fill&quot; value if on: &quot;yellow&quot; else &quot;silver&quot; end;
-  svgout id &quot;lamp1&quot; attr &quot;stroke-width&quot; value if on: 5 else 2 end;
+  svgcopy id "lamp" post "1";
+  svgmove id "lamp1" to 20, 20;
+  svgout id "lamp1" attr "fill" value if on: "yellow" else "silver" end;
+  svgout id "lamp1" attr "stroke-width" value if on: 5 else 2 end;
   location:
     initial;
     edge toggle do on := not on;
@@ -24028,10 +24032,10 @@
 automaton lamp2:
   event toggle;
   disc bool on = false;
-  svgcopy id &quot;lamp&quot; post &quot;2&quot;;
-  svgmove id &quot;lamp2&quot; to 120, 20;
-  svgout id &quot;lamp2&quot; attr &quot;fill&quot; value if on: &quot;yellow&quot; else &quot;silver&quot; end;
-  svgout id &quot;lamp2&quot; attr &quot;stroke-width&quot; value if on: 5 else 2 end;
+  svgcopy id "lamp" post "2";
+  svgmove id "lamp2" to 120, 20;
+  svgout id "lamp2" attr "fill" value if on: "yellow" else "silver" end;
+  svgout id "lamp2" attr "stroke-width" value if on: 5 else 2 end;
   location:
     initial;
     edge toggle do on := not on;
@@ -24039,15 +24043,15 @@
 automaton lamp3:
   event toggle;
   disc bool on = false;
-  svgcopy id &quot;lamp&quot; post &quot;3&quot;;
-  svgmove id &quot;lamp3&quot; to 220, 20;
-  svgout id &quot;lamp3&quot; attr &quot;fill&quot; value if on: &quot;yellow&quot; else &quot;silver&quot; end;
-  svgout id &quot;lamp3&quot; attr &quot;stroke-width&quot; value if on: 5 else 2 end;
+  svgcopy id "lamp" post "3";
+  svgmove id "lamp3" to 220, 20;
+  svgout id "lamp3" attr "fill" value if on: "yellow" else "silver" end;
+  svgout id "lamp3" attr "stroke-width" value if on: 5 else 2 end;
   location:
     initial;
     edge toggle do on := not on;
 end
-svgfile &quot;lamps3.svg&quot;;</code></pre>
+svgfile "lamps3.svg";</code></pre>
 </div>
 </div>
 </div>
@@ -24094,13 +24098,13 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="svg">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;
-&lt;svg xmlns=&quot;http://www.w3.org/2000/svg&quot;
-     xmlns:svg=&quot;http://www.w3.org/2000/svg&quot;
-     width=&quot;220&quot; height=&quot;70&quot; id=&quot;root&quot; version=&quot;1.1&quot;&gt;
-  &lt;g id=&quot;buffer&quot;&gt;
-    &lt;rect width=&quot;100&quot; height=&quot;50&quot; x=&quot;-120&quot; y=&quot;10&quot; id=&quot;background&quot; style=&quot;fill:#ff0000&quot;/&gt;
-    &lt;rect width=&quot;10&quot;  height=&quot;30&quot; x=&quot;-110&quot; y=&quot;20&quot; id=&quot;product&quot;    style=&quot;fill:#8b0000;visibility:hidden;&quot;/&gt;
+<pre class="highlight"><code class="language-svg" data-lang="svg">&lt;?xml version="1.0" encoding="UTF-8" standalone="no"?&gt;
+&lt;svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:svg="http://www.w3.org/2000/svg"
+     width="220" height="70" id="root" version="1.1"&gt;
+  &lt;g id="buffer"&gt;
+    &lt;rect width="100" height="50" x="-120" y="10" id="background" style="fill:#ff0000"/&gt;
+    &lt;rect width="10"  height="30" x="-110" y="20" id="product"    style="fill:#8b0000;visibility:hidden;"/&gt;
   &lt;/g&gt;
 &lt;/svg&gt;</code></pre>
 </div>
@@ -24119,15 +24123,15 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgfile &quot;buffers_products.svg&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgfile "buffers_products.svg";
 
 buffer0: Buffer(0);
 buffer1: Buffer(1);
 
 group def Buffer(alg int nr):
-  svgcopy id &quot;buffer&quot; post &lt;string&gt;nr;
+  svgcopy id "buffer" post &lt;string&gt;nr;
 
-  svgmove id &quot;buffer&quot; + &lt;string&gt;nr to 10 + nr * 110, 10;
+  svgmove id "buffer" + &lt;string&gt;nr to 10 + nr * 110, 10;
 
   product0: Product(nr, 0);
   product1: Product(nr, 1);
@@ -24135,15 +24139,15 @@
 end
 
 group def Product(alg int bufferNr, productNr):
-  svgcopy id &quot;product&quot; + &lt;string&gt;bufferNr post &quot;_&quot; + &lt;string&gt;productNr;
+  svgcopy id "product" + &lt;string&gt;bufferNr post "_" + &lt;string&gt;productNr;
 
-  svgout id fmt(&quot;product%d_%d&quot;, bufferNr, productNr)
-         attr &quot;transform&quot;
-         value fmt(&quot;translate(%d,0)&quot;, productNr * 20);
+  svgout id fmt("product%d_%d", bufferNr, productNr)
+         attr "transform"
+         value fmt("translate(%d,0)", productNr * 20);
 
-  svgout id fmt(&quot;product%d_%d&quot;, bufferNr, productNr)
-         attr &quot;visibility&quot;
-         value &quot;visible&quot;;
+  svgout id fmt("product%d_%d", bufferNr, productNr)
+         attr "visibility"
+         value "visible";
 end</code></pre>
 </div>
 </div>
@@ -24339,7 +24343,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code># time controller.n tank.V tank.V' tank.Qi tank.Qo
+<pre class="highlight"><code># time controller.n tank.V tank.V' tank.Qi tank.Qo
 0.0 0 10.0 -3.1622776601683795 0.0 3.1622776601683795
 0.08763429266802605 0 9.7247959763441 -3.1184605138343664 0.0 3.1184605138343664
 0.587634292668026 0 8.228065719426915 -2.868460513834366 0.0 2.868460513834366
@@ -24366,7 +24370,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code># time                controller.n   tank.V               tank.V'               tank.Qi   tank.Qo
+<pre class="highlight"><code># time                controller.n   tank.V               tank.V'               tank.Qi   tank.Qo
 0.0                   0              10.0                 -3.1622776601683795   0.0       3.1622776601683795
 0.08763429266802605   0              9.7247959763441      -3.1184605138343664   0.0       3.1184605138343664
 0.587634292668026     0              8.228065719426915    -2.868460513834366    0.0       2.868460513834366
@@ -25707,7 +25711,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">cont x = 0.0;
+<pre class="highlight"><code class="language-cif" data-lang="cif">cont x = 0.0;
 equation x' = 1.0;</code></pre>
 </div>
 </div>
@@ -25751,7 +25755,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code># time                 x                       x'
+<pre class="highlight"><code># time                 x                       x'
 0.0                    0.0                     1.0
 9.999999999999999e-5   1.0000000000000003e-4   1.0
 0.0011                 0.0011000000000000005   1.0
@@ -25780,7 +25784,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">cont x = 0.0;
+<pre class="highlight"><code class="language-cif" data-lang="cif">cont x = 0.0;
 equation x' = (x * x) - x - 2;</code></pre>
 </div>
 </div>
@@ -25809,7 +25813,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">cont x = 1.0;
+<pre class="highlight"><code class="language-cif" data-lang="cif">cont x = 1.0;
 equation x' = if x &lt; 2: 1.0
               else      3.0
               end;</code></pre>
@@ -25845,7 +25849,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton p:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton p:
   cont x = 0.0;
   equation x' = 0.5;
 
@@ -25952,7 +25956,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton p:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton p:
   cont x = 0.0;
   equation x' = 1.0;
 
@@ -26042,7 +26046,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton p:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton p:
   cont x = 0.0;
   equation x' = 1.0;
 
@@ -26085,7 +26089,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton p:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton p:
   cont x der 1.0;
   location:
     initial;
@@ -26669,9 +26673,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">func real f1(real x): &quot;java:java.lang.Math.expm1&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">func real f1(real x): "java:java.lang.Math.expm1";
 
-func int f2(bool x): &quot;java:pkg.Cls.method|../some.jar;bin&quot;;</code></pre>
+func int f2(bool x): "java:pkg.Cls.method|../some.jar;bin";</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -26942,7 +26946,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">750431.42 transitions/second
+<pre class="highlight"><code class="language-console" data-lang="console">750431.42 transitions/second
 640589.87 transitions/second
 890939.01 transitions/second
 887228.57 transitions/second
@@ -27056,8 +27060,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">ERROR: Simulation resulted in a runtime error, for state: time=0.0, x=1.0.
-CAUSE: Requested time point &quot;1.6000000000000005&quot; is &quot;2.0&quot; ulps (1 ulp = 2.220446049250313e-16) away from the closest time point in the trajectories &quot;1.6&quot;, which is farther away than the maximum tolerance of &quot;1&quot; ulps. You can try increasing the value of the maximum time point tolerance option. Please also contact the development team.</code></pre>
+<pre class="highlight"><code class="language-console" data-lang="console">ERROR: Simulation resulted in a runtime error, for state: time=0.0, x=1.0.
+CAUSE: Requested time point "1.6000000000000005" is "2.0" ulps (1 ulp = 2.220446049250313e-16) away from the closest time point in the trajectories "1.6", which is farther away than the maximum tolerance of "1" ulps. You can try increasing the value of the maximum time point tolerance option. Please also contact the development team.</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -27558,7 +27562,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>A.p12 A.q2 A.z B.x B.y1 B.y2 B.z C.q</code></pre>
+<pre class="highlight"><code>A.p12 A.q2 A.z B.x B.y1 B.y2 B.z C.q</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -27656,7 +27660,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>( ( A B C ) A.x ) B.y</code></pre>
+<pre class="highlight"><code>( ( A B C ) A.x ) B.y</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -27666,7 +27670,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>( ( ( A B ) C ) B.y ) A.x</code></pre>
+<pre class="highlight"><code>( ( ( A B ) C ) B.y ) A.x</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -27688,7 +27692,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event a, b, c;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event a, b, c;
 
 automaton P:
   disc int[0..10] x = 0;
@@ -27734,7 +27738,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>===============================================================
+<pre class="highlight"><code>===============================================================
 Node 1.1.1.1
 
 Variable use by behavior processes ordered by event:
@@ -27756,7 +27760,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>===============================================================
+<pre class="highlight"><code>===============================================================
 Node 1.1.1.2
 
 Variable use by behavior processes ordered by event:
@@ -27778,7 +27782,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>===============================================================
+<pre class="highlight"><code>===============================================================
 Node 1.1.1
 
 Variable use by behavior processes ordered by event:
@@ -27806,7 +27810,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>===============================================================
+<pre class="highlight"><code>===============================================================
 Node 1.1.2
 
 Available variable processes:
@@ -27822,7 +27826,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>===============================================================
+<pre class="highlight"><code>===============================================================
 Node 1.1
 
 Available variable processes:
@@ -27863,7 +27867,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>===============================================================
+<pre class="highlight"><code>===============================================================
 Node 1
 
 Available variable processes:
@@ -27903,7 +27907,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>act value_x, vread_x, vwrite_x, sync_x, aread_x, awrite_x : Int;
+<pre class="highlight"><code>act value_x, vread_x, vwrite_x, sync_x, aread_x, awrite_x : Int;
 
 proc VarProc_x(v:Int) =
   value_x(v) . VarProc_x(v) +
@@ -27926,7 +27930,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>sort LocSort_P = struct loc_P_p1 | loc_P_p2;
+<pre class="highlight"><code>sort LocSort_P = struct loc_P_p1 | loc_P_p2;
 
 proc BehProc_P(Locvar_P : LocSort_P) =
   sum x : Int . ((x &gt;= 0) &amp;&amp; (x &lt;= 10) &amp;&amp; (Locvar_P == loc_P_p1)) -&gt; a | aread_x(x) | awrite_x((x + 1)) . BehProc_P(loc_P_p2) +
@@ -27946,7 +27950,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>act a, renamed_a, c, renamed_c, b, renamed_b;
+<pre class="highlight"><code>act a, renamed_a, c, renamed_c, b, renamed_b;
 
 init block({aread_y, awrite_y, vread_y, vwrite_y},
      hide({sync_y},
@@ -28856,7 +28860,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="shell">gcc -Wall -std=c89 -DPRINT_OUTPUT=1 -DCHECK_RANGES=1 \
+<pre class="highlight"><code class="language-shell" data-lang="shell">gcc -Wall -std=c89 -DPRINT_OUTPUT=1 -DCHECK_RANGES=1 \
     &lt;prefix&gt;_engine.c &lt;prefix&gt;_library.c &lt;prefix&gt;_test_code.c -lm</code></pre>
 </div>
 </div>
@@ -28943,7 +28947,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="c">&lt;prefix&gt;_EngineFirstStep(<span class="directive">void</span>)</code></pre>
+<pre class="highlight"><code class="language-c" data-lang="c">&lt;prefix&gt;_EngineFirstStep(void)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -28958,7 +28962,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="c">&lt;prefix&gt;_EngineTimeStep(<span class="predefined-type">double</span> delta)</code></pre>
+<pre class="highlight"><code class="language-c" data-lang="c">&lt;prefix&gt;_EngineTimeStep(double delta)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -28988,7 +28992,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="c">&lt;prefix&gt;_AssignInputVariables(<span class="directive">void</span>)</code></pre>
+<pre class="highlight"><code class="language-c" data-lang="c">&lt;prefix&gt;_AssignInputVariables(void)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -29003,7 +29007,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="c">&lt;prefix&gt;_InfoEvent(&lt;prefix&gt;_Event_ event, BoolType pre)</code></pre>
+<pre class="highlight"><code class="language-c" data-lang="c">&lt;prefix&gt;_InfoEvent(&lt;prefix&gt;_Event_ event, BoolType pre)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -29024,7 +29028,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="c">&lt;prefix&gt;_PrintOutput(<span class="directive">const</span> <span class="predefined-type">char</span> *line, <span class="directive">const</span> <span class="predefined-type">char</span> *fname)</code></pre>
+<pre class="highlight"><code class="language-c" data-lang="c">&lt;prefix&gt;_PrintOutput(const char *line, const char *fname)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -29350,7 +29354,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="shell">gcc -Wall -std=c99 -DPRINT_OUTPUT=1 -DCHECK_RANGES=1 \
+<pre class="highlight"><code class="language-shell" data-lang="shell">gcc -Wall -std=c99 -DPRINT_OUTPUT=1 -DCHECK_RANGES=1 \
     &lt;prefix&gt;_engine.c &lt;prefix&gt;_library.c &lt;prefix&gt;_test_code.c -lm</code></pre>
 </div>
 </div>
@@ -29437,7 +29441,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="c">&lt;prefix&gt;_EngineFirstStep(<span class="directive">void</span>)</code></pre>
+<pre class="highlight"><code class="language-c" data-lang="c">&lt;prefix&gt;_EngineFirstStep(void)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -29452,7 +29456,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="c">&lt;prefix&gt;_EngineTimeStep(<span class="predefined-type">double</span> delta)</code></pre>
+<pre class="highlight"><code class="language-c" data-lang="c">&lt;prefix&gt;_EngineTimeStep(double delta)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -29482,7 +29486,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="c">&lt;prefix&gt;_AssignInputVariables(<span class="directive">void</span>)</code></pre>
+<pre class="highlight"><code class="language-c" data-lang="c">&lt;prefix&gt;_AssignInputVariables(void)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -29497,7 +29501,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="c">&lt;prefix&gt;_InfoEvent(&lt;prefix&gt;_Event_ event, BoolType pre)</code></pre>
+<pre class="highlight"><code class="language-c" data-lang="c">&lt;prefix&gt;_InfoEvent(&lt;prefix&gt;_Event_ event, BoolType pre)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -29518,7 +29522,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="c">&lt;prefix&gt;_PrintOutput(<span class="directive">const</span> <span class="predefined-type">char</span> *line, <span class="directive">const</span> <span class="predefined-type">char</span> *fname)</code></pre>
+<pre class="highlight"><code class="language-c" data-lang="c">&lt;prefix&gt;_PrintOutput(const char *line, const char *fname)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -29806,7 +29810,7 @@
 <p><code>execOnce</code> method</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">void</span> execOnce(<span class="type">double</span> newTime)</code></pre>
+<pre class="highlight"><code class="language-java" data-lang="java">public void execOnce(double newTime)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -29827,7 +29831,7 @@
 <p><code>exec</code> method</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">void</span> exec(<span class="type">long</span> frequency)</code></pre>
+<pre class="highlight"><code class="language-java" data-lang="java">public void exec(long frequency)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -29867,7 +29871,7 @@
 <p><code>updateInputs</code> method</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">protected</span> <span class="type">void</span> updateInputs()</code></pre>
+<pre class="highlight"><code class="language-java" data-lang="java">protected void updateInputs()</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -29891,7 +29895,7 @@
 <p><code>preExec</code> method</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">protected</span> <span class="type">void</span> preExec()</code></pre>
+<pre class="highlight"><code class="language-java" data-lang="java">protected void preExec()</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -29908,7 +29912,7 @@
 <p><code>postExec</code> method</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">protected</span> <span class="type">void</span> postExec()</code></pre>
+<pre class="highlight"><code class="language-java" data-lang="java">protected void postExec()</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -29932,7 +29936,7 @@
 <p><code>infoExec</code> method</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">protected</span> <span class="type">void</span> infoExec(<span class="type">long</span> duration, <span class="type">long</span> cycleTime)</code></pre>
+<pre class="highlight"><code class="language-java" data-lang="java">protected void infoExec(long duration, long cycleTime)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -29958,7 +29962,7 @@
 <p><code>infoEvent</code> method</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">protected</span> <span class="type">void</span> infoEvent(<span class="type">int</span> idx, <span class="type">boolean</span> pre)</code></pre>
+<pre class="highlight"><code class="language-java" data-lang="java">protected void infoEvent(int idx, boolean pre)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -29982,7 +29986,7 @@
 <p><code>infoPrintOutput</code> method</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">protected</span> <span class="type">void</span> infoPrintOutput(<span class="predefined-type">String</span> text, <span class="predefined-type">String</span> target)</code></pre>
+<pre class="highlight"><code class="language-java" data-lang="java">protected void infoPrintOutput(String text, String target)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -30460,7 +30464,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">Qi = n * 5
+<pre class="highlight"><code class="language-cif" data-lang="cif">Qi = n * 5
 Qo = sqrt(V)
 V' = Qi - Qo</code></pre>
 </div>
@@ -30479,7 +30483,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event open_valve;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event open_valve;
 
 automaton controller:
     disc int n = 0;
@@ -30535,7 +30539,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>Input/output report of the tank_ctrl.cif SFunction.
+<pre class="highlight"><code>Input/output report of the tank_ctrl.cif SFunction.
 
 During code generation, CIF variables are made available in the Simulink vectors.
 This report lists the variables in each vector, along with their index number.
@@ -30588,7 +30592,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="shell">mex tank_ctrl.c</code></pre>
+<pre class="highlight"><code class="language-shell" data-lang="shell">mex tank_ctrl.c</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -31083,7 +31087,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="console">WARNING: PLC variable &quot;elit_WaitForTimeout&quot; is renamed to &quot;elit_WaitForTimeout2&quot;.</code></pre>
+<pre class="highlight"><code class="language-console" data-lang="console">WARNING: PLC variable "elit_WaitForTimeout" is renamed to "elit_WaitForTimeout2".</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -32499,7 +32503,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton x:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton x:
   disc int x, y = 5;
   disc func bool (int) f;
   location;
@@ -32511,7 +32515,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">func bool _f(int p0):
+<pre class="highlight"><code class="language-cif" data-lang="cif">func bool _f(int p0):
   return false;
 end
 
@@ -32592,7 +32596,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">alg int y = ...
+<pre class="highlight"><code class="language-cif" data-lang="cif">alg int y = ...
 alg real x = switch y:
                case 1: 1.0
                case 2: 4.0
@@ -32605,8 +32609,8 @@
 
 automaton a:
   alg string v = switch self:
-                   case l1: &quot;first&quot;
-                   case l2: &quot;second&quot;
+                   case l1: "first"
+                   case l2: "second"
                  end;
 
   location l1:
@@ -32622,7 +32626,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">alg int y = ...
+<pre class="highlight"><code class="language-cif" data-lang="cif">alg int y = ...
 alg real x = if   y = 1: 1.0
              elif y = 2: 4.0
              elif y = 3: 9.0
@@ -32631,8 +32635,8 @@
 alg real z = 1.0;
 
 automaton a:
-  alg string v = if l1: &quot;first&quot;
-                 else   &quot;second&quot;
+  alg string v = if l1: "first"
+                 else   "second"
                  end;
 
   location l1:
@@ -32766,7 +32770,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">alg bool b1 = true;
+<pre class="highlight"><code class="language-cif" data-lang="cif">alg bool b1 = true;
 alg bool b2;
 equation b2 = false;
 
@@ -32786,7 +32790,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton aut:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton aut:
   location l1;
   location l2;
 end
@@ -32897,7 +32901,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton a:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton a:
   alg string x = &lt;string&gt;self;
 
   location:
@@ -32918,17 +32922,17 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton a:
-  alg string x = &quot;*&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton a:
+  alg string x = "*";
 
   location:
     initial;
 end
 
 automaton b:
-  alg string x = if   l1: &quot;l1&quot;
-                 elif l2: &quot;l2&quot;
-                 else     &quot;l3&quot;
+  alg string x = if   l1: "l1"
+                 elif l2: "l2"
+                 else     "l3"
                  end;
 
   location l1:
@@ -33023,7 +33027,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">group def P(alg int x):
+<pre class="highlight"><code class="language-cif" data-lang="cif">group def P(alg int x):
   invariant x &gt; 0;
 end
 
@@ -33038,7 +33042,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">group p1:
+<pre class="highlight"><code class="language-cif" data-lang="cif">group p1:
   alg int x = 1;
   invariant x &gt; 0;
 end
@@ -33056,7 +33060,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">const int x = 5;
+<pre class="highlight"><code class="language-cif" data-lang="cif">const int x = 5;
 
 group def X():
   invariant x = 5;
@@ -33072,7 +33076,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">const int x = 5;
+<pre class="highlight"><code class="language-cif" data-lang="cif">const int x = 5;
 
 group a:
   group x:
@@ -33166,7 +33170,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">const int x = 1;
+<pre class="highlight"><code class="language-cif" data-lang="cif">const int x = 1;
 const int z = y;
 const int y = x + 1;
 invariant x + y + z &gt; 0;</code></pre>
@@ -33177,7 +33181,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">invariant 1 + 2 + 2 &gt; 0;</code></pre>
+<pre class="highlight"><code class="language-cif" data-lang="cif">invariant 1 + 2 + 2 &gt; 0;</code></pre>
 </div>
 </div>
 </div>
@@ -33282,7 +33286,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">group x:
+<pre class="highlight"><code class="language-cif" data-lang="cif">group x:
   enum EX = A, B;
 
   const EX x = A;
@@ -33300,7 +33304,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">group x:
+<pre class="highlight"><code class="language-cif" data-lang="cif">group x:
   const int[0..1] x = 0;
 end
 
@@ -33430,7 +33434,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">alg bool b1 = true;
+<pre class="highlight"><code class="language-cif" data-lang="cif">alg bool b1 = true;
 cont x;
 equation x' = 1.0;
 
@@ -33448,7 +33452,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">alg bool b1 = true;
+<pre class="highlight"><code class="language-cif" data-lang="cif">alg bool b1 = true;
 cont x der 1.0;
 
 automaton p:
@@ -33585,7 +33589,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">group a:
+<pre class="highlight"><code class="language-cif" data-lang="cif">group a:
   const int x = 5;
   invariant x &gt; 4;
 end
@@ -33603,7 +33607,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">const int a_x = 5;
+<pre class="highlight"><code class="language-cif" data-lang="cif">const int a_x = 5;
 invariant a_x &gt; 4;
 
 automaton p_q:
@@ -33640,7 +33644,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">group x:
+<pre class="highlight"><code class="language-cif" data-lang="cif">group x:
   enum E = A, B;
 end
 
@@ -33664,7 +33668,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">enum x_E = x_A, x_B;
+<pre class="highlight"><code class="language-cif" data-lang="cif">enum x_E = x_A, x_B;
 
 automaton y:
   enum E = A, B;
@@ -33683,7 +33687,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">enum x_E = A, B;
+<pre class="highlight"><code class="language-cif" data-lang="cif">enum x_E = A, B;
 
 automaton y:
   enum E = A, B;
@@ -33703,7 +33707,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">group x:
+<pre class="highlight"><code class="language-cif" data-lang="cif">group x:
   enum E = A, B;
 end
 
@@ -33722,7 +33726,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">enum x_E = A, B;
+<pre class="highlight"><code class="language-cif" data-lang="cif">enum x_E = A, B;
 enum y_E = A2, B2;
 
 invariant A = A2;</code></pre>
@@ -33803,7 +33807,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">if g:
+<pre class="highlight"><code class="language-cif" data-lang="cif">if g:
   if g2:
     x := 5
   else
@@ -33818,7 +33822,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">x := if g:
+<pre class="highlight"><code class="language-cif" data-lang="cif">x := if g:
        if g2:
          5
        else
@@ -33959,7 +33963,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton x:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton x:
   event e;
   alg bool a = l1;
 
@@ -33977,7 +33981,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton x:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton x:
   event e;
   alg bool a = LP_x = LOC_l1;
   disc LOCS_x LP_x = LOC_l1;
@@ -34110,7 +34114,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">location l1:
+<pre class="highlight"><code class="language-cif" data-lang="cif">location l1:
   edge e goto l2;
   edge f when x = 2 goto l3;
 
@@ -34126,7 +34130,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">location l1:
+<pre class="highlight"><code class="language-cif" data-lang="cif">location l1:
   edge e goto l2;
   edge f when x = 2 goto l3;
 
@@ -34239,7 +34243,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton a:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton a:
   alg string x = &lt;string&gt;self;
 
   location:
@@ -34252,7 +34256,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton a:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton a:
   alg string x = &lt;string&gt;a;
 
   location:
@@ -34395,7 +34399,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">plant automaton aut:
+<pre class="highlight"><code class="language-cif" data-lang="cif">plant automaton aut:
   controllable e1, e2, e3;
   disc int[0..10] x;
 
@@ -34418,7 +34422,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">plant automaton aut:
+<pre class="highlight"><code class="language-cif" data-lang="cif">plant automaton aut:
   controllable e1, e2, e3;
   disc int[0..10] x;
 
@@ -34528,7 +34532,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton p:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton p:
   event e;
 
   location l1:
@@ -34545,7 +34549,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton p:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton p:
   event e;
   event tau_;
 
@@ -34623,7 +34627,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">const tuple(int a; real b) t = (1, 2.0);
+<pre class="highlight"><code class="language-cif" data-lang="cif">const tuple(int a; real b) t = (1, 2.0);
 const int x = t[a];
 const int y = t[0];</code></pre>
 </div>
@@ -34639,7 +34643,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">const tuple(int a; real b) t = (1, 2.0);
+<pre class="highlight"><code class="language-cif" data-lang="cif">const tuple(int a; real b) t = (1, 2.0);
 const int x = t[0];
 const int y = t[0];</code></pre>
 </div>
@@ -34725,7 +34729,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">type t = int;
+<pre class="highlight"><code class="language-cif" data-lang="cif">type t = int;
 type u = v;
 type v = tuple(t a, b);
 
@@ -34739,7 +34743,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">const int x = 1;
+<pre class="highlight"><code class="language-cif" data-lang="cif">const int x = 1;
 const tuple(int a, b) y = (2, 3);
 const tuple(int a, b) z = (4, 5);</code></pre>
 </div>
@@ -34841,7 +34845,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event e;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event e;
 
 automaton a:
   event e;
@@ -34861,7 +34865,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event e;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event e;
 event a_e;
 event b_c_e;
 
@@ -35035,7 +35039,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event e;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event e;
 
 plant automaton p:
   disc int x = 1;
@@ -35063,7 +35067,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event e;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event e;
 enum E = l1, l2;
 
 plant automaton M:
@@ -35128,7 +35132,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton p:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton p:
   event e;
   disc int x = 0;
 
@@ -35143,7 +35147,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">enum E = X;
+<pre class="highlight"><code class="language-cif" data-lang="cif">enum E = X;
 
 automaton M:
   alphabet p_e;
@@ -35180,7 +35184,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton p:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton p:
   event e;
   disc int x = 0;
   location:
@@ -35194,7 +35198,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">enum E = X;
+<pre class="highlight"><code class="language-cif" data-lang="cif">enum E = X;
 
 automaton M:
   alphabet p_e;
@@ -35271,7 +35275,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton p:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton p:
   event e;
 
   location l1:
@@ -35289,7 +35293,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">enum E = l1, l2;
+<pre class="highlight"><code class="language-cif" data-lang="cif">enum E = l1, l2;
 
 automaton M:
   alphabet p_e;
@@ -35342,7 +35346,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event tuple(int a, b) e;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event tuple(int a, b) e;
 
 automaton s:
   location:
@@ -35361,7 +35365,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event e;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event e;
 enum E = X;
 
 automaton M:
@@ -35638,7 +35642,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event e;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event e;
 
 plant automaton p:
   disc int x = 1;
@@ -35666,7 +35670,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event e;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event e;
 enum E = l1, l2;
 
 plant automaton M:
@@ -35731,7 +35735,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event e;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event e;
 
 automaton p:
   disc int x = 0;
@@ -35756,7 +35760,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event e;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event e;
 
 enum E = X;
 
@@ -35842,7 +35846,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">automaton p:
+<pre class="highlight"><code class="language-cif" data-lang="cif">automaton p:
   event e;
 
   location l1:
@@ -35860,7 +35864,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">enum E = l1, l2;
+<pre class="highlight"><code class="language-cif" data-lang="cif">enum E = l1, l2;
 
 automaton M:
   alphabet p_e;
@@ -35911,7 +35915,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event tuple(int a, b) e;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event tuple(int a, b) e;
 
 automaton s:
   location:
@@ -35930,7 +35934,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">event e;
+<pre class="highlight"><code class="language-cif" data-lang="cif">event e;
 enum E = X;
 
 automaton M:
@@ -36139,7 +36143,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">enum A = B, C;
+<pre class="highlight"><code class="language-cif" data-lang="cif">enum A = B, C;
 
 automaton p:
   enum A = C, B;
@@ -36156,7 +36160,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">enum E = B, C, D;
+<pre class="highlight"><code class="language-cif" data-lang="cif">enum E = B, C, D;
 
 automaton p:
   disc E a = C;
@@ -36197,7 +36201,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">group g1:
+<pre class="highlight"><code class="language-cif" data-lang="cif">group g1:
   enum e1 = A, B;
 end
 
@@ -36219,7 +36223,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">enum E = A, B;
+<pre class="highlight"><code class="language-cif" data-lang="cif">enum E = A, B;
 
 group g1:
 end
@@ -36336,20 +36340,20 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">printfile &quot;out1.txt&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">printfile "out1.txt";
 
 print 5;
-print 6 file &quot;out2.txt&quot;;
+print 6 file "out2.txt";
 
 group g:
-  printfile &quot;out3.txt&quot;;
+  printfile "out3.txt";
 
   print 7;
   print 8;
-  print 9 file &quot;out4.txt&quot;;
+  print 9 file "out4.txt";
 
   group h:
-    printfile &quot;out5.txt&quot;;
+    printfile "out5.txt";
   end
 
   group i:
@@ -36363,19 +36367,19 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">print 5 file &quot;out1.txt&quot;;
-print 6 file &quot;out2.txt&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">print 5 file "out1.txt";
+print 6 file "out2.txt";
 
 group g:
-  print 7 file &quot;out3.txt&quot;;
-  print 8 file &quot;out3.txt&quot;;
-  print 9 file &quot;out4.txt&quot;;
+  print 7 file "out3.txt";
+  print 8 file "out3.txt";
+  print 9 file "out4.txt";
 
   group h:
   end
 
   group i:
-    print 10 file &quot;out3.txt&quot;;
+    print 10 file "out3.txt";
   end
 end</code></pre>
 </div>
@@ -36496,27 +36500,27 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgfile &quot;file1.svg&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgfile "file1.svg";
 
-svgout id &quot;a&quot; attr &quot;b&quot; value 5;
+svgout id "a" attr "b" value 5;
 
-svgout id &quot;c&quot; attr &quot;d&quot; value 6 file &quot;file2.svg&quot;;
+svgout id "c" attr "d" value 6 file "file2.svg";
 
 group g:
-  svgfile &quot;file3.svg&quot;;
+  svgfile "file3.svg";
 
-  svgout id &quot;e&quot; attr &quot;f&quot; value 7;
+  svgout id "e" attr "f" value 7;
 
-  svgout id &quot;g&quot; attr &quot;h&quot; value 8;
+  svgout id "g" attr "h" value 8;
 
-  svgout id &quot;i&quot; attr &quot;j&quot; value 9 file &quot;file4.svg&quot;;
+  svgout id "i" attr "j" value 9 file "file4.svg";
 
   group h:
-    svgfile &quot;file5.svg&quot;;
+    svgfile "file5.svg";
   end
 
   group i:
-    svgout id &quot;k&quot; attr &quot;l&quot; value 10;
+    svgout id "k" attr "l" value 10;
   end
 end</code></pre>
 </div>
@@ -36526,22 +36530,22 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">svgout id &quot;a&quot; attr &quot;b&quot; value 5 file &quot;file1.svg&quot;;
+<pre class="highlight"><code class="language-cif" data-lang="cif">svgout id "a" attr "b" value 5 file "file1.svg";
 
-svgout id &quot;c&quot; attr &quot;d&quot; value 6 file &quot;file2.svg&quot;;
+svgout id "c" attr "d" value 6 file "file2.svg";
 
 group g:
-  svgout id &quot;e&quot; attr &quot;f&quot; value 7 file &quot;file3.svg&quot;;
+  svgout id "e" attr "f" value 7 file "file3.svg";
 
-  svgout id &quot;g&quot; attr &quot;h&quot; value 8 file &quot;file3.svg&quot;;
+  svgout id "g" attr "h" value 8 file "file3.svg";
 
-  svgout id &quot;i&quot; attr &quot;j&quot; value 9 file &quot;file4.svg&quot;;
+  svgout id "i" attr "j" value 9 file "file4.svg";
 
   group h:
   end
 
   group i:
-    svgout id &quot;k&quot; attr &quot;l&quot; value 10 file &quot;file3.svg&quot;;
+    svgout id "k" attr "l" value 10 file "file3.svg";
   end
 end</code></pre>
 </div>
@@ -36922,7 +36926,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">alg int x = switch req: case l1: 1 else 2 end;
+<pre class="highlight"><code class="language-cif" data-lang="cif">alg int x = switch req: case l1: 1 else 2 end;
 
 requirement automaton req:
   location l1:
@@ -36966,7 +36970,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">controllable add;
+<pre class="highlight"><code class="language-cif" data-lang="cif">controllable add;
 
 plant automaton buffer:
   disc int x;
@@ -36993,7 +36997,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">controllable add;
+<pre class="highlight"><code class="language-cif" data-lang="cif">controllable add;
 
 plant automaton buffer:
   disc int x;
@@ -37581,7 +37585,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">const int x = 3;
+<pre class="highlight"><code class="language-cif" data-lang="cif">const int x = 3;
 invariant x - 5 + 1 &gt; 0;</code></pre>
 </div>
 </div>
@@ -37590,7 +37594,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">const int x = 3;
+<pre class="highlight"><code class="language-cif" data-lang="cif">const int x = 3;
 invariant false;</code></pre>
 </div>
 </div>
@@ -37602,7 +37606,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">const int x = 3;
+<pre class="highlight"><code class="language-cif" data-lang="cif">const int x = 3;
 invariant x - 4 &gt; 0;</code></pre>
 </div>
 </div>
@@ -37937,7 +37941,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">group button:
+<pre class="highlight"><code class="language-cif" data-lang="cif">group button:
   uncontrollable u_pushed, u_released;
 end
 
@@ -37979,7 +37983,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">plant automaton button:
+<pre class="highlight"><code class="language-cif" data-lang="cif">plant automaton button:
   uncontrollable u_pushed, u_released;
 
   location released:
@@ -38021,7 +38025,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">plant automaton button:
+<pre class="highlight"><code class="language-cif" data-lang="cif">plant automaton button:
   uncontrollable u_pushed;
   uncontrollable u_released;
   location released:
@@ -38442,7 +38446,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">group x:
+<pre class="highlight"><code class="language-cif" data-lang="cif">group x:
   input int y;
   invariant y = 1;
 end</code></pre>
@@ -38450,7 +38454,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">plant automaton x:
+<pre class="highlight"><code class="language-cif" data-lang="cif">plant automaton x:
   disc int y;
 end</code></pre>
 </div>
@@ -38460,7 +38464,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">plant automaton x:
+<pre class="highlight"><code class="language-cif" data-lang="cif">plant automaton x:
   disc int y;
   invariant y = 1;
 end</code></pre>
@@ -38500,13 +38504,13 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">input int x;
+<pre class="highlight"><code class="language-cif" data-lang="cif">input int x;
 alg int y = x;</code></pre>
 </div>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">alg int x = y;
+<pre class="highlight"><code class="language-cif" data-lang="cif">alg int x = y;
 input int y;</code></pre>
 </div>
 </div>
@@ -38515,7 +38519,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="cif">alg int x = y;
+<pre class="highlight"><code class="language-cif" data-lang="cif">alg int x = y;
 alg int y = x;</code></pre>
 </div>
 </div>
@@ -39072,7 +39076,8 @@
 cross-platform and machine-independent scripting language that supports command
 line execution, but is also available as plug-in for
 <a href="https://eclipse.org">Eclipse</a>, providing an integrated development
-experience.</p>
+experience. See the <a href="https://eclipse.org/escet/tooldef">ToolDef website</a> for
+more information on ToolDef.</p>
 </div>
 <div class="sect4">
 <h5 id="tools-scenarios">Scenarios</h5>
@@ -39120,7 +39125,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">from &quot;lib:cif&quot; import *;</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">from "lib:cif" import *;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -39137,9 +39142,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">from &quot;lib:cif&quot; import *;
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">from "lib:cif" import *;
 
-cifsim(&quot;some_model.cif -i auto -t 10&quot;);</code></pre>
+cifsim("some_model.cif -i auto -t 10");</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -39176,9 +39181,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">from &quot;lib:cif&quot; import *;
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">from "lib:cif" import *;
 
-cifsim(&quot;-h&quot;);</code></pre>
+cifsim("-h");</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -39220,9 +39225,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">cifsim(&quot;some_model.cif -i auto -t 10&quot;);       // Single string, all arguments.
-cifsim(&quot;some_model.cif&quot;, &quot;-i auto&quot;, &quot;-t 10&quot;); // Multiple strings, multiple arguments each.
-cifsim(&quot;some_model.cif&quot;, &quot;-i&quot;, &quot;auto&quot;, &quot;-t&quot;, &quot;10&quot;); // Multiple strings, one argument each.</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">cifsim("some_model.cif -i auto -t 10");       // Single string, all arguments.
+cifsim("some_model.cif", "-i auto", "-t 10"); // Multiple strings, multiple arguments each.
+cifsim("some_model.cif", "-i", "auto", "-t", "10"); // Multiple strings, one argument each.</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -39233,12 +39238,12 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">from &quot;lib:cif&quot; import *;
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">from "lib:cif" import *;
 
 cifsim(
-    &quot;some_model.cif&quot;,
-    &quot;-i auto&quot;,
-    &quot;-t 10&quot;,
+    "some_model.cif",
+    "-i auto",
+    "-t 10",
 );</code></pre>
 </div>
 </div>
@@ -39249,12 +39254,12 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">from &quot;lib:cif&quot; import *;
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">from "lib:cif" import *;
 
 cifsim(
-    &quot;some_model.cif&quot;,
-    &quot;-i auto&quot;,
-    // &quot;-t 10&quot;,
+    "some_model.cif",
+    "-i auto",
+    // "-t 10",
 );</code></pre>
 </div>
 </div>
@@ -39276,9 +39281,9 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">from &quot;lib:cif&quot; import *;
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">from "lib:cif" import *;
 
-cifsim(&quot;some_model.cif -i auto -t 10&quot;, stdout=&quot;output.txt&quot;);</code></pre>
+cifsim("some_model.cif -i auto -t 10", stdout="output.txt");</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -39427,11 +39432,11 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool int toolname(
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool int toolname(
             string... args,
-            string stdin = &quot;-&quot;,
-            string stdout = &quot;-&quot;,
-            string stderr = &quot;-&quot;,
+            string stdin = "-",
+            string stdout = "-",
+            string stderr = "-",
             bool appendOut = false,
             bool appendErr = false,
             bool errToOut = false,
@@ -39440,9 +39445,9 @@
 
 tool int toolname(
             list string args = [],
-            string stdin = &quot;-&quot;,
-            string stdout = &quot;-&quot;,
-            string stderr = &quot;-&quot;,
+            string stdin = "-",
+            string stdout = "-",
+            string stderr = "-",
             bool appendOut = false,
             bool appendErr = false,
             bool errToOut = false,
@@ -39603,10 +39608,36 @@
 part of the Eclipse ESCET project, are listed below in reverse chronological
 order.</p>
 </div>
-<div class="sect2">
-<h3 id="version-0-1-unreleased">Version 0.1 (unreleased)</h3>
 <div class="paragraph">
-<p>The first release of CIF as part of the Eclipse ESCET project.</p>
+<p>See also the Eclipse ESCET
+<a href="https://www.eclipse.org/escet/escet/#release-notes-chapter-index">toolkit release notes</a>
+covering those aspects that are common to the various Eclipse ESCET tools.</p>
+</div>
+<div class="sect2">
+<h3 id="version-0-1">Version 0.1</h3>
+<div class="paragraph">
+<p>The first release of CIF as part of the Eclipse ESCET project.
+This release is based on the initial contribution by the Eindhoven University
+of Technology (TU/e).</p>
+</div>
+<div class="paragraph">
+<p>Most notable changes compared to the last TU/e release:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>The names of the CIF command line tools and tools available in ToolDef
+scripts have changed. For more information, check the list of
+<a href="#tools-scripting-chapter-tools">currently available tools</a>.</p>
+</li>
+<li>
+<p>The CIF simulator no longer crashes on code generation.</p>
+</li>
+<li>
+<p>The CIF simulator plot visualizer has been re-implemented using different
+third party libraries.</p>
+</li>
+</ul>
 </div>
 </div>
 </div>
@@ -39704,7 +39735,7 @@
 <div class="sectionbody">
 <div class="paragraph">
 <p>The material in this documentation is
-Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation.</p>
+Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation.</p>
 </div>
 <div class="paragraph">
 <p>Eclipse ESCET and ESCET are trademarks of the Eclipse Foundation.
@@ -39735,95 +39766,6 @@
 </div>
 </div>
 </div>
-<style>
-/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
-pre.CodeRay{background:#f7f7f8}
-.CodeRay .line-numbers{border-right:1px solid currentColor;opacity:.35;padding:0 .5em 0 0}
-.CodeRay span.line-numbers{display:inline-block;margin-right:.75em}
-.CodeRay .line-numbers strong{color:#000}
-table.CodeRay{border-collapse:separate;border:0;margin-bottom:0;background:none}
-table.CodeRay td{vertical-align:top;line-height:inherit}
-table.CodeRay td.line-numbers{text-align:right}
-table.CodeRay td.code{padding:0 0 0 .75em}
-.CodeRay .debug{color:#fff !important;background:#000080 !important}
-.CodeRay .annotation{color:#007}
-.CodeRay .attribute-name{color:#000080}
-.CodeRay .attribute-value{color:#700}
-.CodeRay .binary{color:#509}
-.CodeRay .comment{color:#998;font-style:italic}
-.CodeRay .char{color:#04d}
-.CodeRay .char .content{color:#04d}
-.CodeRay .char .delimiter{color:#039}
-.CodeRay .class{color:#458;font-weight:bold}
-.CodeRay .complex{color:#a08}
-.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
-.CodeRay .color{color:#099}
-.CodeRay .class-variable{color:#369}
-.CodeRay .decorator{color:#b0b}
-.CodeRay .definition{color:#099}
-.CodeRay .delimiter{color:#000}
-.CodeRay .doc{color:#970}
-.CodeRay .doctype{color:#34b}
-.CodeRay .doc-string{color:#d42}
-.CodeRay .escape{color:#666}
-.CodeRay .entity{color:#800}
-.CodeRay .error{color:#808}
-.CodeRay .exception{color:inherit}
-.CodeRay .filename{color:#099}
-.CodeRay .function{color:#900;font-weight:bold}
-.CodeRay .global-variable{color:#008080}
-.CodeRay .hex{color:#058}
-.CodeRay .integer,.CodeRay .float{color:#099}
-.CodeRay .include{color:#555}
-.CodeRay .inline{color:#000}
-.CodeRay .inline .inline{background:#ccc}
-.CodeRay .inline .inline .inline{background:#bbb}
-.CodeRay .inline .inline-delimiter{color:#d14}
-.CodeRay .inline-delimiter{color:#d14}
-.CodeRay .important{color:#555;font-weight:bold}
-.CodeRay .interpreted{color:#b2b}
-.CodeRay .instance-variable{color:#008080}
-.CodeRay .label{color:#970}
-.CodeRay .local-variable{color:#963}
-.CodeRay .octal{color:#40e}
-.CodeRay .predefined{color:#369}
-.CodeRay .preprocessor{color:#579}
-.CodeRay .pseudo-class{color:#555}
-.CodeRay .directive{font-weight:bold}
-.CodeRay .type{font-weight:bold}
-.CodeRay .predefined-type{color:inherit}
-.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
-.CodeRay .key{color:#808}
-.CodeRay .key .delimiter{color:#606}
-.CodeRay .key .char{color:#80f}
-.CodeRay .value{color:#088}
-.CodeRay .regexp .delimiter{color:#808}
-.CodeRay .regexp .content{color:#808}
-.CodeRay .regexp .modifier{color:#808}
-.CodeRay .regexp .char{color:#d14}
-.CodeRay .regexp .function{color:#404;font-weight:bold}
-.CodeRay .string{color:#d20}
-.CodeRay .string .string .string{background:#ffd0d0}
-.CodeRay .string .content{color:#d14}
-.CodeRay .string .char{color:#d14}
-.CodeRay .string .delimiter{color:#d14}
-.CodeRay .shell{color:#d14}
-.CodeRay .shell .delimiter{color:#d14}
-.CodeRay .symbol{color:#990073}
-.CodeRay .symbol .content{color:#a60}
-.CodeRay .symbol .delimiter{color:#630}
-.CodeRay .tag{color:#008080}
-.CodeRay .tag-special{color:#d70}
-.CodeRay .variable{color:#036}
-.CodeRay .insert{background:#afa}
-.CodeRay .delete{background:#faa}
-.CodeRay .change{color:#aaf;background:#007}
-.CodeRay .head{color:#f8f;background:#505}
-.CodeRay .insert .insert{color:#080}
-.CodeRay .delete .delete{color:#800}
-.CodeRay .change .change{color:#66f}
-.CodeRay .head .head{color:#f4f}
-</style>
 <script type="text/x-mathjax-config">
 MathJax.Hub.Config({
   messageStyle: "none",
@@ -39840,16 +39782,16 @@
 })
 MathJax.Hub.Register.StartupHook("AsciiMath Jax Ready", function () {
   MathJax.InputJax.AsciiMath.postfilterHooks.Add(function (data, node) {
-    if ((node = data.script.parentNode) && (node = node.parentNode) && node.classList.contains('stemblock')) {
+    if ((node = data.script.parentNode) && (node = node.parentNode) && node.classList.contains("stemblock")) {
       data.math.root.display = "block"
     }
     return data
   })
 })
 </script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_HTMLorMML"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.9/MathJax.js?config=TeX-MML-AM_HTMLorMML"></script>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cif2yed/machine_buffer.events.layouted.graphml b/cif/tools/cif2yed/machine_buffer.events.layouted.graphml
index 5929d3d..2071cb7 100644
--- a/cif/tools/cif2yed/machine_buffer.events.layouted.graphml
+++ b/cif/tools/cif2yed/machine_buffer.events.layouted.graphml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cif2yed/machine_buffer.events.orig.graphml b/cif/tools/cif2yed/machine_buffer.events.orig.graphml
index 1867205..a4074ce 100644
--- a/cif/tools/cif2yed/machine_buffer.events.orig.graphml
+++ b/cif/tools/cif2yed/machine_buffer.events.orig.graphml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cif2yed/tank.model.layouted.graphml b/cif/tools/cif2yed/tank.model.layouted.graphml
index 926ecaa..7f91dc1 100644
--- a/cif/tools/cif2yed/tank.model.layouted.graphml
+++ b/cif/tools/cif2yed/tank.model.layouted.graphml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cif2yed/tank.model.orig.graphml b/cif/tools/cif2yed/tank.model.orig.graphml
index b9ba7fe..baa138d 100644
--- a/cif/tools/cif2yed/tank.model.orig.graphml
+++ b/cif/tools/cif2yed/tank.model.orig.graphml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/input/history_0.png.svg b/cif/tools/cifsim/input/history_0.png.svg
index 1c5872e..947aca0 100644
--- a/cif/tools/cifsim/input/history_0.png.svg
+++ b/cif/tools/cifsim/input/history_0.png.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/input/history_01.png.svg b/cif/tools/cifsim/input/history_01.png.svg
index cea46fa..4f7a0ed 100644
--- a/cif/tools/cifsim/input/history_01.png.svg
+++ b/cif/tools/cifsim/input/history_01.png.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/input/history_012.png.svg b/cif/tools/cifsim/input/history_012.png.svg
index f160cc3..035dca7 100644
--- a/cif/tools/cifsim/input/history_012.png.svg
+++ b/cif/tools/cifsim/input/history_012.png.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/input/history_0123.png.svg b/cif/tools/cifsim/input/history_0123.png.svg
index ae839fb..493d5bf 100644
--- a/cif/tools/cifsim/input/history_0123.png.svg
+++ b/cif/tools/cifsim/input/history_0123.png.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/input/history_0234.png.svg b/cif/tools/cifsim/input/history_0234.png.svg
index b8cc5df..8e9fde1 100644
--- a/cif/tools/cifsim/input/history_0234.png.svg
+++ b/cif/tools/cifsim/input/history_0234.png.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/print/trace_extended.png.svg b/cif/tools/cifsim/output/print/trace_extended.png.svg
index 583e842..6b6538d 100644
--- a/cif/tools/cifsim/output/print/trace_extended.png.svg
+++ b/cif/tools/cifsim/output/print/trace_extended.png.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/print/trace_normal.png.svg b/cif/tools/cifsim/output/print/trace_normal.png.svg
index fbdf416..b72867c 100644
--- a/cif/tools/cifsim/output/print/trace_normal.png.svg
+++ b/cif/tools/cifsim/output/print/trace_normal.png.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/print/transition.png.svg b/cif/tools/cifsim/output/print/transition.png.svg
index 808a6a4..c61403b 100644
--- a/cif/tools/cifsim/output/print/transition.png.svg
+++ b/cif/tools/cifsim/output/print/transition.png.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/lamp/lamp.svg b/cif/tools/cifsim/output/svgviz/lamp/lamp.svg
index 6f9484b..e99e4e0 100644
--- a/cif/tools/cifsim/output/svgviz/lamp/lamp.svg
+++ b/cif/tools/cifsim/output/svgviz/lamp/lamp.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/lamps/lamps2.svg b/cif/tools/cifsim/output/svgviz/lamps/lamps2.svg
index c1e67a1..f8319ab 100644
--- a/cif/tools/cifsim/output/svgviz/lamps/lamps2.svg
+++ b/cif/tools/cifsim/output/svgviz/lamps/lamps2.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/lamps/lamps2.tooldef b/cif/tools/cifsim/output/svgviz/lamps/lamps2.tooldef
index d1032f6..f26a3cd 100644
--- a/cif/tools/cifsim/output/svgviz/lamps/lamps2.tooldef
+++ b/cif/tools/cifsim/output/svgviz/lamps/lamps2.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/lamps/lamps3.svg b/cif/tools/cifsim/output/svgviz/lamps/lamps3.svg
index bd9e830..5ecaf59 100644
--- a/cif/tools/cifsim/output/svgviz/lamps/lamps3.svg
+++ b/cif/tools/cifsim/output/svgviz/lamps/lamps3.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/lamps/lamps3.tooldef b/cif/tools/cifsim/output/svgviz/lamps/lamps3.tooldef
index a13fa7e..7af93f1 100644
--- a/cif/tools/cifsim/output/svgviz/lamps/lamps3.tooldef
+++ b/cif/tools/cifsim/output/svgviz/lamps/lamps3.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/rate/rate.svg b/cif/tools/cifsim/output/svgviz/rate/rate.svg
index 98efdff..f6254e8 100644
--- a/cif/tools/cifsim/output/svgviz/rate/rate.svg
+++ b/cif/tools/cifsim/output/svgviz/rate/rate.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/rate/rate.tooldef b/cif/tools/cifsim/output/svgviz/rate/rate.tooldef
index 36bb456..1c6ecf9 100644
--- a/cif/tools/cifsim/output/svgviz/rate/rate.tooldef
+++ b/cif/tools/cifsim/output/svgviz/rate/rate.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/sun_moon/sun_moon.svg b/cif/tools/cifsim/output/svgviz/sun_moon/sun_moon.svg
index 12d52e8..466caa3 100644
--- a/cif/tools/cifsim/output/svgviz/sun_moon/sun_moon.svg
+++ b/cif/tools/cifsim/output/svgviz/sun_moon/sun_moon.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/sun_moon/sun_moon.tooldef b/cif/tools/cifsim/output/svgviz/sun_moon/sun_moon.tooldef
index 06b9a26..fd809e0 100644
--- a/cif/tools/cifsim/output/svgviz/sun_moon/sun_moon.tooldef
+++ b/cif/tools/cifsim/output/svgviz/sun_moon/sun_moon.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/svgcopy/svgcopy.tooldef b/cif/tools/cifsim/output/svgviz/svgcopy/svgcopy.tooldef
index 04c480b..9018b63 100644
--- a/cif/tools/cifsim/output/svgviz/svgcopy/svgcopy.tooldef
+++ b/cif/tools/cifsim/output/svgviz/svgcopy/svgcopy.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/svgmove/svgmove.tooldef b/cif/tools/cifsim/output/svgviz/svgmove/svgmove.tooldef
index 63abeda..d987b32 100644
--- a/cif/tools/cifsim/output/svgviz/svgmove/svgmove.tooldef
+++ b/cif/tools/cifsim/output/svgviz/svgmove/svgmove.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/tank/tank.svg b/cif/tools/cifsim/output/svgviz/tank/tank.svg
index 004cae8..4f53a0b 100644
--- a/cif/tools/cifsim/output/svgviz/tank/tank.svg
+++ b/cif/tools/cifsim/output/svgviz/tank/tank.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/tank/tank.tooldef b/cif/tools/cifsim/output/svgviz/tank/tank.tooldef
index c1b67ce..07ac0d6 100644
--- a/cif/tools/cifsim/output/svgviz/tank/tank.tooldef
+++ b/cif/tools/cifsim/output/svgviz/tank/tank.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/tank/tank2.cif b/cif/tools/cifsim/output/svgviz/tank/tank2.cif
index 6da7201..98885ee 100644
--- a/cif/tools/cifsim/output/svgviz/tank/tank2.cif
+++ b/cif/tools/cifsim/output/svgviz/tank/tank2.cif
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/tank/tank2.svg b/cif/tools/cifsim/output/svgviz/tank/tank2.svg
index 58447bf..8511305 100644
--- a/cif/tools/cifsim/output/svgviz/tank/tank2.svg
+++ b/cif/tools/cifsim/output/svgviz/tank/tank2.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/tank/tank2.tooldef b/cif/tools/cifsim/output/svgviz/tank/tank2.tooldef
index c657f42..bfb1fa3 100644
--- a/cif/tools/cifsim/output/svgviz/tank/tank2.tooldef
+++ b/cif/tools/cifsim/output/svgviz/tank/tank2.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/walk_floor/walk_floor.svg b/cif/tools/cifsim/output/svgviz/walk_floor/walk_floor.svg
index b3a176b..b14f9c7 100644
--- a/cif/tools/cifsim/output/svgviz/walk_floor/walk_floor.svg
+++ b/cif/tools/cifsim/output/svgviz/walk_floor/walk_floor.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/walk_floor/walk_floor.tooldef b/cif/tools/cifsim/output/svgviz/walk_floor/walk_floor.tooldef
index 4e84cf0..f949557 100644
--- a/cif/tools/cifsim/output/svgviz/walk_floor/walk_floor.tooldef
+++ b/cif/tools/cifsim/output/svgviz/walk_floor/walk_floor.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/walk_floor/walk_floor_orig.svg b/cif/tools/cifsim/output/svgviz/walk_floor/walk_floor_orig.svg
index b257ac1..bf9bc8a 100644
--- a/cif/tools/cifsim/output/svgviz/walk_floor/walk_floor_orig.svg
+++ b/cif/tools/cifsim/output/svgviz/walk_floor/walk_floor_orig.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/walk_room/walk_room.svg b/cif/tools/cifsim/output/svgviz/walk_room/walk_room.svg
index d889c3e..1dbdd2e 100644
--- a/cif/tools/cifsim/output/svgviz/walk_room/walk_room.svg
+++ b/cif/tools/cifsim/output/svgviz/walk_room/walk_room.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/walk_room/walk_room.tooldef b/cif/tools/cifsim/output/svgviz/walk_room/walk_room.tooldef
index e050a8c..9545f15 100644
--- a/cif/tools/cifsim/output/svgviz/walk_room/walk_room.tooldef
+++ b/cif/tools/cifsim/output/svgviz/walk_room/walk_room.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/workstation/workstation.svg b/cif/tools/cifsim/output/svgviz/workstation/workstation.svg
index f6a4b23..76ab6fd 100644
--- a/cif/tools/cifsim/output/svgviz/workstation/workstation.svg
+++ b/cif/tools/cifsim/output/svgviz/workstation/workstation.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/cifsim/output/svgviz/workstation/workstation.tooldef b/cif/tools/cifsim/output/svgviz/workstation/workstation.tooldef
index 17b282e..6a7393f 100644
--- a/cif/tools/cifsim/output/svgviz/workstation/workstation.tooldef
+++ b/cif/tools/cifsim/output/svgviz/workstation/workstation.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/integr_discont.png.dat b/cif/tools/cifsim/solver/integr_discont.png.dat
index 4a10f68..bcabd91 100644
--- a/cif/tools/cifsim/solver/integr_discont.png.dat
+++ b/cif/tools/cifsim/solver/integr_discont.png.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/integr_discont.png.plt b/cif/tools/cifsim/solver/integr_discont.png.plt
index da6a41f..b68ea3f 100644
--- a/cif/tools/cifsim/solver/integr_discont.png.plt
+++ b/cif/tools/cifsim/solver/integr_discont.png.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/integr_discont.tooldef b/cif/tools/cifsim/solver/integr_discont.tooldef
index 812bf2f..f399528 100644
--- a/cif/tools/cifsim/solver/integr_discont.tooldef
+++ b/cif/tools/cifsim/solver/integr_discont.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/integr_linear.png.plt b/cif/tools/cifsim/solver/integr_linear.png.plt
index ce17ddd..911dddc 100644
--- a/cif/tools/cifsim/solver/integr_linear.png.plt
+++ b/cif/tools/cifsim/solver/integr_linear.png.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/integr_linear.tooldef b/cif/tools/cifsim/solver/integr_linear.tooldef
index bf6e652..962e255 100644
--- a/cif/tools/cifsim/solver/integr_linear.tooldef
+++ b/cif/tools/cifsim/solver/integr_linear.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/integr_nonlinear.png.dat b/cif/tools/cifsim/solver/integr_nonlinear.png.dat
index 660d3b2..ff04e4c 100644
--- a/cif/tools/cifsim/solver/integr_nonlinear.png.dat
+++ b/cif/tools/cifsim/solver/integr_nonlinear.png.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/integr_nonlinear.png.plt b/cif/tools/cifsim/solver/integr_nonlinear.png.plt
index 7ecf345..8c5588e 100644
--- a/cif/tools/cifsim/solver/integr_nonlinear.png.plt
+++ b/cif/tools/cifsim/solver/integr_nonlinear.png.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/integr_nonlinear.tooldef b/cif/tools/cifsim/solver/integr_nonlinear.tooldef
index 85be756..e1942f8 100644
--- a/cif/tools/cifsim/solver/integr_nonlinear.tooldef
+++ b/cif/tools/cifsim/solver/integr_nonlinear.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/root_problem.png.dat b/cif/tools/cifsim/solver/root_problem.png.dat
index 59a9fe4..a3b0b46 100644
--- a/cif/tools/cifsim/solver/root_problem.png.dat
+++ b/cif/tools/cifsim/solver/root_problem.png.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/root_problem.png.plt b/cif/tools/cifsim/solver/root_problem.png.plt
index 5b14d6c..6c330ab 100644
--- a/cif/tools/cifsim/solver/root_problem.png.plt
+++ b/cif/tools/cifsim/solver/root_problem.png.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/root_problem.tooldef b/cif/tools/cifsim/solver/root_problem.tooldef
index 2cefeee..b32c0cf 100644
--- a/cif/tools/cifsim/solver/root_problem.tooldef
+++ b/cif/tools/cifsim/solver/root_problem.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/root_problem2.png.dat b/cif/tools/cifsim/solver/root_problem2.png.dat
index f21c198..e473560 100644
--- a/cif/tools/cifsim/solver/root_problem2.png.dat
+++ b/cif/tools/cifsim/solver/root_problem2.png.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/root_problem2.png.plt b/cif/tools/cifsim/solver/root_problem2.png.plt
index 830eec8..0cc6743 100644
--- a/cif/tools/cifsim/solver/root_problem2.png.plt
+++ b/cif/tools/cifsim/solver/root_problem2.png.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/root_problem2.tooldef b/cif/tools/cifsim/solver/root_problem2.tooldef
index cf5aec5..923d738 100644
--- a/cif/tools/cifsim/solver/root_problem2.tooldef
+++ b/cif/tools/cifsim/solver/root_problem2.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/root_root.png.dat b/cif/tools/cifsim/solver/root_root.png.dat
index c220444..f72c007 100644
--- a/cif/tools/cifsim/solver/root_root.png.dat
+++ b/cif/tools/cifsim/solver/root_root.png.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/root_root.png.plt b/cif/tools/cifsim/solver/root_root.png.plt
index 43cce35..73150ce 100644
--- a/cif/tools/cifsim/solver/root_root.png.plt
+++ b/cif/tools/cifsim/solver/root_root.png.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/root_simple.png.dat b/cif/tools/cifsim/solver/root_simple.png.dat
index ce02345..5b3e07d 100644
--- a/cif/tools/cifsim/solver/root_simple.png.dat
+++ b/cif/tools/cifsim/solver/root_simple.png.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/root_simple.png.plt b/cif/tools/cifsim/solver/root_simple.png.plt
index 5a88611..d409c6d 100644
--- a/cif/tools/cifsim/solver/root_simple.png.plt
+++ b/cif/tools/cifsim/solver/root_simple.png.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/root_simple.tooldef b/cif/tools/cifsim/solver/root_simple.tooldef
index b2336c7..fd5c2b3 100644
--- a/cif/tools/cifsim/solver/root_simple.tooldef
+++ b/cif/tools/cifsim/solver/root_simple.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/root_simple2.cif b/cif/tools/cifsim/solver/root_simple2.cif
index 953cf33..e680667 100644
--- a/cif/tools/cifsim/solver/root_simple2.cif
+++ b/cif/tools/cifsim/solver/root_simple2.cif
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/root_simple2.png.dat b/cif/tools/cifsim/solver/root_simple2.png.dat
index 5d14429..3d7fa52 100644
--- a/cif/tools/cifsim/solver/root_simple2.png.dat
+++ b/cif/tools/cifsim/solver/root_simple2.png.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/root_simple2.png.plt b/cif/tools/cifsim/solver/root_simple2.png.plt
index cc82760..0d6f9fa 100644
--- a/cif/tools/cifsim/solver/root_simple2.png.plt
+++ b/cif/tools/cifsim/solver/root_simple2.png.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/root_simple2.tooldef b/cif/tools/cifsim/solver/root_simple2.tooldef
index d93a814..5f617ea 100644
--- a/cif/tools/cifsim/solver/root_simple2.tooldef
+++ b/cif/tools/cifsim/solver/root_simple2.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/root_simple_guard.png.dat b/cif/tools/cifsim/solver/root_simple_guard.png.dat
index 81fbd4d..b011b5a 100644
--- a/cif/tools/cifsim/solver/root_simple_guard.png.dat
+++ b/cif/tools/cifsim/solver/root_simple_guard.png.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tools/cifsim/solver/root_simple_guard.png.plt b/cif/tools/cifsim/solver/root_simple_guard.png.plt
index b36408c..e558333 100644
--- a/cif/tools/cifsim/solver/root_simple_guard.png.plt
+++ b/cif/tools/cifsim/solver/root_simple_guard.png.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tools/cifsim/state_space.png.tex b/cif/tools/cifsim/state_space.png.tex
index 73f62dc..813f514 100644
--- a/cif/tools/cifsim/state_space.png.tex
+++ b/cif/tools/cifsim/state_space.png.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/tools/codegen/simulink-example/tank.svg b/cif/tools/codegen/simulink-example/tank.svg
index 51be41a..6f49fa9 100644
--- a/cif/tools/codegen/simulink-example/tank.svg
+++ b/cif/tools/codegen/simulink-example/tank.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tools/mergecif/merge.tooldef b/cif/tools/mergecif/merge.tooldef
index 46391f4..6515d73 100644
--- a/cif/tools/mergecif/merge.tooldef
+++ b/cif/tools/mergecif/merge.tooldef
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
diff --git a/cif/tutorial/basics/coin_toss_state_space.png.tex b/cif/tutorial/basics/coin_toss_state_space.png.tex
index 463d20f..a26ff84 100644
--- a/cif/tutorial/basics/coin_toss_state_space.png.tex
+++ b/cif/tutorial/basics/coin_toss_state_space.png.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/tutorial/basics/producer_consumer_state_space_finite.png.tex b/cif/tutorial/basics/producer_consumer_state_space_finite.png.tex
index 936f17f..96e1089 100644
--- a/cif/tutorial/basics/producer_consumer_state_space_finite.png.tex
+++ b/cif/tutorial/basics/producer_consumer_state_space_finite.png.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/tutorial/basics/producer_consumer_state_space_infinite.png.tex b/cif/tutorial/basics/producer_consumer_state_space_infinite.png.tex
index f5e092a..b4ef063 100644
--- a/cif/tutorial/basics/producer_consumer_state_space_infinite.png.tex
+++ b/cif/tutorial/basics/producer_consumer_state_space_infinite.png.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/tutorial/channels/producer_consumer.png.svg b/cif/tutorial/channels/producer_consumer.png.svg
index e97cd60..f73c1d4 100644
--- a/cif/tutorial/channels/producer_consumer.png.svg
+++ b/cif/tutorial/channels/producer_consumer.png.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tutorial/data/conveyor.png.svg b/cif/tutorial/data/conveyor.png.svg
index 7093bd3..dde5f12 100644
--- a/cif/tutorial/data/conveyor.png.svg
+++ b/cif/tutorial/data/conveyor.png.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tutorial/data/conveyor_state_space.png.tex b/cif/tutorial/data/conveyor_state_space.png.tex
index 3f5a413..da18fd4 100644
--- a/cif/tutorial/data/conveyor_state_space.png.tex
+++ b/cif/tutorial/data/conveyor_state_space.png.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/tutorial/data/counter_state_space.png.tex b/cif/tutorial/data/counter_state_space.png.tex
index 9d87ec5..15c23af 100644
--- a/cif/tutorial/data/counter_state_space.png.tex
+++ b/cif/tutorial/data/counter_state_space.png.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/tutorial/data/discvar_change_state_space.png.tex b/cif/tutorial/data/discvar_change_state_space.png.tex
index 5de0ee2..885278d 100644
--- a/cif/tutorial/data/discvar_change_state_space.png.tex
+++ b/cif/tutorial/data/discvar_change_state_space.png.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/tutorial/data/monitoring_fixed_state_space.png.tex b/cif/tutorial/data/monitoring_fixed_state_space.png.tex
index d2325ad..b125e8f 100644
--- a/cif/tutorial/data/monitoring_fixed_state_space.png.tex
+++ b/cif/tutorial/data/monitoring_fixed_state_space.png.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/tutorial/data/monitoring_problem_state_space.png.tex b/cif/tutorial/data/monitoring_problem_state_space.png.tex
index cde5b82..27b576c 100644
--- a/cif/tutorial/data/monitoring_problem_state_space.png.tex
+++ b/cif/tutorial/data/monitoring_problem_state_space.png.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/tutorial/data/mutex_state_space.png.tex b/cif/tutorial/data/mutex_state_space.png.tex
index b8413bf..d28ed26 100644
--- a/cif/tutorial/data/mutex_state_space.png.tex
+++ b/cif/tutorial/data/mutex_state_space.png.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/tutorial/data/supermarket_state_space.png.tex b/cif/tutorial/data/supermarket_state_space.png.tex
index efd2dc4..046ebdc 100644
--- a/cif/tutorial/data/supermarket_state_space.png.tex
+++ b/cif/tutorial/data/supermarket_state_space.png.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/tutorial/data/swapper_state_space.png.tex b/cif/tutorial/data/swapper_state_space.png.tex
index f70ab6a..07a0a0c 100644
--- a/cif/tutorial/data/swapper_state_space.png.tex
+++ b/cif/tutorial/data/swapper_state_space.png.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/tutorial/data/tau_event_state_space1.png.tex b/cif/tutorial/data/tau_event_state_space1.png.tex
index 93e444a..f7146ca 100644
--- a/cif/tutorial/data/tau_event_state_space1.png.tex
+++ b/cif/tutorial/data/tau_event_state_space1.png.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/tutorial/data/tau_event_state_space2.png.tex b/cif/tutorial/data/tau_event_state_space2.png.tex
index 687c201..e61b73b 100644
--- a/cif/tutorial/data/tau_event_state_space2.png.tex
+++ b/cif/tutorial/data/tau_event_state_space2.png.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/tutorial/reuse1/conveyor.png.svg b/cif/tutorial/reuse1/conveyor.png.svg
index 8511020..d5c85d9 100644
--- a/cif/tutorial/reuse1/conveyor.png.svg
+++ b/cif/tutorial/reuse1/conveyor.png.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tutorial/stochastics/pennies.png.dat b/cif/tutorial/stochastics/pennies.png.dat
index 65eeb17..154c4c1 100644
--- a/cif/tutorial/stochastics/pennies.png.dat
+++ b/cif/tutorial/stochastics/pennies.png.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tutorial/stochastics/pennies.png.plt b/cif/tutorial/stochastics/pennies.png.plt
index d0a7462..01901dd 100644
--- a/cif/tutorial/stochastics/pennies.png.plt
+++ b/cif/tutorial/stochastics/pennies.png.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tutorial/time/machine_plot.png.dat b/cif/tutorial/time/machine_plot.png.dat
index d015f5a..ad04e57 100644
--- a/cif/tutorial/time/machine_plot.png.dat
+++ b/cif/tutorial/time/machine_plot.png.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tutorial/time/machine_plot.png.plt b/cif/tutorial/time/machine_plot.png.plt
index dd93906..e73fbea 100644
--- a/cif/tutorial/time/machine_plot.png.plt
+++ b/cif/tutorial/time/machine_plot.png.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tutorial/time/machine_state_space.png.tex b/cif/tutorial/time/machine_state_space.png.tex
index 2deeecd..13124af 100644
--- a/cif/tutorial/time/machine_state_space.png.tex
+++ b/cif/tutorial/time/machine_state_space.png.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/tutorial/time/person_plot.png.dat b/cif/tutorial/time/person_plot.png.dat
index b09b1d5..766ebf8 100644
--- a/cif/tutorial/time/person_plot.png.dat
+++ b/cif/tutorial/time/person_plot.png.dat
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tutorial/time/person_plot.png.plt b/cif/tutorial/time/person_plot.png.plt
index 4d33350..4ae0a39 100644
--- a/cif/tutorial/time/person_plot.png.plt
+++ b/cif/tutorial/time/person_plot.png.plt
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/cif/tutorial/time/tank.png.svg b/cif/tutorial/time/tank.png.svg
index a0df95d..70899aa 100644
--- a/cif/tutorial/time/tank.png.svg
+++ b/cif/tutorial/time/tank.png.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tutorial/time/usecase_nonurg_state_space.png.tex b/cif/tutorial/time/usecase_nonurg_state_space.png.tex
index 45dbb59..fa758fc 100644
--- a/cif/tutorial/time/usecase_nonurg_state_space.png.tex
+++ b/cif/tutorial/time/usecase_nonurg_state_space.png.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/tutorial/time/usecase_urgloc_state_space.png.tex b/cif/tutorial/time/usecase_urgloc_state_space.png.tex
index e274219..90831c6 100644
--- a/cif/tutorial/time/usecase_urgloc_state_space.png.tex
+++ b/cif/tutorial/time/usecase_urgloc_state_space.png.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/tutorial/time/user_state_space.png.tex b/cif/tutorial/time/user_state_space.png.tex
index c19b977..9b36f70 100644
--- a/cif/tutorial/time/user_state_space.png.tex
+++ b/cif/tutorial/time/user_state_space.png.tex
@@ -1,5 +1,5 @@
 % ------------------------------------------------------------------------------
-% Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+% Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 %
 % See the NOTICE file(s) distributed with this work for additional
 % information regarding copyright ownership.
diff --git a/cif/tutorial/values/list_indices.png.svg b/cif/tutorial/values/list_indices.png.svg
index 15abbad..ef2f650 100644
--- a/cif/tutorial/values/list_indices.png.svg
+++ b/cif/tutorial/values/list_indices.png.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/cif/tutorial/values/list_slicing.png.svg b/cif/tutorial/values/list_slicing.png.svg
index d9b90d4..f27908b 100644
--- a/cif/tutorial/values/list_slicing.png.svg
+++ b/cif/tutorial/values/list_slicing.png.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/eclipse-incubation.png b/eclipse-incubation.png
new file mode 100644
index 0000000..5fccef5
--- /dev/null
+++ b/eclipse-incubation.png
Binary files differ
diff --git a/escet/eclipse-escet-incubation-manual.pdf b/escet/eclipse-escet-incubation-manual.pdf
index 55b055f..e26a7ca 100644
--- a/escet/eclipse-escet-incubation-manual.pdf
+++ b/escet/eclipse-escet-incubation-manual.pdf
Binary files differ
diff --git a/escet/index.html b/escet/index.html
index 0808663..e7f2cd2 100644
--- a/escet/index.html
+++ b/escet/index.html
@@ -4,8 +4,8 @@
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="generator" content="Asciidoctor 2.0.10">
-<meta name="author" content="Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation">
+<meta name="generator" content="Asciidoctor 2.0.12">
+<meta name="author" content="Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation">
 <title>Eclipse ESCET&#8482; documentation (Incubation)</title>
 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
 <style>
@@ -48,7 +48,7 @@
 table{border-collapse:collapse;border-spacing:0}
 *,*::before,*::after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
 html,body{font-size:100%}
-body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
+body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;word-wrap:anywhere;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
 a:hover{cursor:pointer}
 img,object,embed{max-width:100%;height:auto}
 object,embed{height:100%}
@@ -63,10 +63,8 @@
 img,object,svg{display:inline-block;vertical-align:middle}
 textarea{height:auto;min-height:50px}
 select{width:100%}
-.center{margin-left:auto;margin-right:auto}
-.stretch{width:100%}
 .subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em}
-div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0;direction:ltr}
+div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0}
 a{color:#2156a5;text-decoration:underline;line-height:inherit}
 a:hover,a:focus{color:#1d4b8f}
 a img{border:0}
@@ -106,19 +104,22 @@
 h2{font-size:2.3125em}
 h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
 h4{font-size:1.4375em}}
-table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede}
+table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede;word-wrap:normal}
 table thead,table tfoot{background:#f7f8f7}
 table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left}
 table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
 table tr.even,table tr.alt{background:#f8f8f7}
-table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{display:table-cell;line-height:1.6}
+table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6}
 h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
 h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
+.center{margin-left:auto;margin-right:auto}
+.stretch{width:100%}
 .clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table}
 .clearfix::after,.float-group::after{clear:both}
-:not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed;word-wrap:break-word}
-:not(pre)>code.nobreak{word-wrap:normal}
-:not(pre)>code.nowrap{white-space:nowrap}
+:not(pre).nobreak{word-wrap:normal}
+:not(pre).nowrap{white-space:nowrap}
+:not(pre).pre-wrap{white-space:pre-wrap}
+:not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed}
 pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
 pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
 pre>code{display:block}
@@ -183,7 +184,7 @@
 #content #toc{border-style:solid;border-width:1px;border-color:#e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;-webkit-border-radius:4px;border-radius:4px}
 #content #toc>:first-child{margin-top:0}
 #content #toc>:last-child{margin-bottom:0}
-#footer{max-width:100%;background:rgba(0,0,0,.8);padding:1.25em}
+#footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em}
 #footer-text{color:rgba(255,255,255,.8);line-height:1.44}
 #content{margin-bottom:.625em}
 .sect1{padding-bottom:.625em}
@@ -206,7 +207,7 @@
 .admonitionblock>table td.icon{text-align:center;width:80px}
 .admonitionblock>table td.icon img{max-width:none}
 .admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
-.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6)}
+.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6);word-wrap:anywhere}
 .admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
 .exampleblock>.content{border-style:solid;border-width:1px;border-color:#e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;-webkit-border-radius:4px;border-radius:4px}
 .exampleblock>.content>:first-child{margin-top:0}
@@ -216,7 +217,7 @@
 .sidebarblock>:last-child{margin-bottom:0}
 .sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
 .exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
-.literalblock pre,.listingblock>.content>pre{-webkit-border-radius:4px;border-radius:4px;word-wrap:break-word;overflow-x:auto;padding:1em;font-size:.8125em}
+.literalblock pre,.listingblock>.content>pre{-webkit-border-radius:4px;border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em}
 @media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}}
 @media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}}
 .literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class="highlight"],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
@@ -262,21 +263,20 @@
 .quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0}
 .quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem}
 .quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;text-align:left;margin-right:0}
-table.tableblock{max-width:100%;border-collapse:separate}
 p.tableblock:last-child{margin-bottom:0}
+td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere}
 td.tableblock>.content>:last-child{margin-bottom:-1.25em}
-td.tableblock>.content>:last-child.sidebarblock{margin-bottom:0}
 table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
-table.grid-all>thead>tr>.tableblock,table.grid-all>tbody>tr>.tableblock{border-width:0 1px 1px 0}
-table.grid-all>tfoot>tr>.tableblock{border-width:1px 1px 0 0}
-table.grid-cols>*>tr>.tableblock{border-width:0 1px 0 0}
-table.grid-rows>thead>tr>.tableblock,table.grid-rows>tbody>tr>.tableblock{border-width:0 0 1px}
-table.grid-rows>tfoot>tr>.tableblock{border-width:1px 0 0}
-table.grid-all>*>tr>.tableblock:last-child,table.grid-cols>*>tr>.tableblock:last-child{border-right-width:0}
-table.grid-all>tbody>tr:last-child>.tableblock,table.grid-all>thead:last-child>tr>.tableblock,table.grid-rows>tbody>tr:last-child>.tableblock,table.grid-rows>thead:last-child>tr>.tableblock{border-bottom-width:0}
+table.grid-all>*>tr>*{border-width:1px}
+table.grid-cols>*>tr>*{border-width:0 1px}
+table.grid-rows>*>tr>*{border-width:1px 0}
 table.frame-all{border-width:1px}
+table.frame-ends{border-width:1px 0}
 table.frame-sides{border-width:0 1px}
-table.frame-topbot,table.frame-ends{border-width:1px 0}
+table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0}
+table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0}
+table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0}
+table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0}
 table.stripes-all tr,table.stripes-odd tr:nth-of-type(odd),table.stripes-even tr:nth-of-type(even),table.stripes-hover tr:hover{background:#f8f8f7}
 th.halign-left,td.halign-left{text-align:left}
 th.halign-right,td.halign-right{text-align:right}
@@ -285,7 +285,7 @@
 th.valign-bottom,td.valign-bottom{vertical-align:bottom}
 th.valign-middle,td.valign-middle{vertical-align:middle}
 table thead th,table tfoot th{font-weight:bold}
-tbody tr th{display:table-cell;line-height:1.6;background:#f7f8f7}
+tbody tr th{background:#f7f8f7}
 tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
 p.tableblock>code:only-child{background:none;padding:0}
 p.tableblock{font-size:1em}
@@ -314,6 +314,7 @@
 .hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
 td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
 td.hdlist1{font-weight:bold;padding-bottom:1.25em}
+td.hdlist2{word-wrap:anywhere}
 .literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
 .colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
 .colist td:not([class]):first-child img{max-width:none}
@@ -386,7 +387,7 @@
 .admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
 .admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
 .admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
-.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);-webkit-border-radius:100px;border-radius:100px;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
+.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);-webkit-border-radius:50%;border-radius:50%;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
 .conum[data-value] *{color:#fff!important}
 .conum[data-value]+b{display:none}
 .conum[data-value]::after{content:attr(data-value)}
@@ -413,6 +414,7 @@
 svg{max-width:100%}
 p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
 h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
+#header,#content,#footnotes,#footer{max-width:none}
 #toc,.sidebarblock,.exampleblock>.content{background:none!important}
 #toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important}
 body.book #header{text-align:center}
@@ -438,7 +440,7 @@
 </style>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
@@ -482,8 +484,8 @@
 <div id="header">
 <h1>Eclipse ESCET&#8482; documentation (Incubation)</h1>
 <div class="details">
-<span id="author" class="author">Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation</span><br>
-<span id="revnumber">version 0.1.0.20210211-193517</span>
+<span id="author" class="author">Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation</span><br>
+<span id="revnumber">version 0.1.0.20210318-143659</span>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
@@ -553,7 +555,7 @@
 </li>
 <li><a href="#release-notes-chapter-index">Eclipse ESCET release notes</a>
 <ul class="sectlevel2">
-<li><a href="#version-0-1-unreleased">Version 0.1 (unreleased)</a></li>
+<li><a href="#version-0-1">Version 0.1</a></li>
 </ul>
 </li>
 <li><a href="#contact-chapter-index">Contact information</a></li>
@@ -566,11 +568,11 @@
 <div class="sectionbody">
 <div class="paragraph">
 <p>The Eclipse Supervisory Control Engineering Toolkit (Eclipse ESCET&#8482;)
-project is an <a href="https://eclipse.org">Eclipse</a> project that provides a
-toolkit for the development of supervisory controllers in the Model-Based
-Systems Engineering (MBSE) paradigm. The toolkit has a strong focus on
-model-based design, supervisory controller synthesis, and industrial
-applicability, for example to cyber physical systems. The toolkit supports
+project is an <a href="https://eclipse.org">Eclipse Foundation</a> open-source project
+that provides a toolkit for the development of supervisory controllers in the
+Model-Based Systems Engineering (MBSE) paradigm. The toolkit has a strong
+focus on model-based design, supervisory controller synthesis, and industrial
+applicability, for example to cyber-physical systems. The toolkit supports
 the entire development process of (supervisory) controllers, from modeling,
 supervisory controller synthesis, simulation-based validation and
 visualization, and formal verification, to real-time testing and
@@ -690,15 +692,15 @@
 <p></p>
 </div>
 <div class="paragraph">
-<p>The Eclipse Supervisory Control Engineering Toolkit (Eclipse ESCET) project is
-an <a href="https://eclipse.org">Eclipse</a> project that provides a toolkit for the
-development of supervisory controllers in the MBSE paradigm. The toolkit has
-a strong focus on model-based design, supervisory controller synthesis, and
-industrial applicability, for example to cyber physical systems. The toolkit
-supports the entire development process of (supervisory) controllers, from
-modeling, supervisory controller synthesis, simulation-based validation and
-visualization, and formal verification, to real-time testing and
-implementation.</p>
+<p>The Eclipse Supervisory Control Engineering Toolkit (Eclipse ESCET&#8482;)
+project is an <a href="https://eclipse.org">Eclipse Foundation</a> open-source project
+that provides a toolkit for the development of supervisory controllers in the
+MBSE paradigm. The toolkit has a strong focus on model-based design,
+supervisory controller synthesis, and industrial applicability, for example to
+cyber-physical systems. The toolkit supports the entire development process of
+(supervisory) controllers, from modeling, supervisory controller synthesis,
+simulation-based validation and visualization, and formal verification, to
+real-time testing and implementation.</p>
 </div>
 <div class="paragraph">
 <p></p>
@@ -786,8 +788,8 @@
 <p>The Chi toolset allows verification of properties of the actual system by
 means of simulation, e.g. to optimize the supervisory (logic) control of
 the system. The Chi language has features that allow for easy
-specification of . Chi aims to make the process of verifying properties for large
-systems effortless.</p>
+specification. Chi aims to make the process of verifying properties for
+large systems effortless.</p>
 </div>
 <div class="paragraph">
 <p>Tutorials and manuals demonstrate the use of the language for effective
@@ -796,7 +798,8 @@
 has no inherent limits.</p>
 </div>
 <div class="paragraph">
-<p>See the separate Chi documentation for more information.</p>
+<p>See the separate <a href="https://eclipse.org/escet/chi">Chi documentation</a> for more
+information.</p>
 </div>
 <div class="paragraph">
 <p></p>
@@ -861,7 +864,8 @@
 </ul>
 </div>
 <div class="paragraph">
-<p>See the separate CIF documentation for more information.</p>
+<p>See the separate <a href="https://eclipse.org/escet/cif">CIF documentation</a> for
+more information.</p>
 </div>
 <div class="paragraph">
 <p></p>
@@ -880,7 +884,8 @@
 also be used for the development of scanners and parsers for other languages.</p>
 </div>
 <div class="paragraph">
-<p>See the separate SeText documentation for more information.</p>
+<p>See the separate <a href="https://eclipse.org/escet/setext">SeText documentation</a> for more
+information.</p>
 </div>
 <div class="paragraph">
 <p></p>
@@ -907,7 +912,8 @@
 within ToolDef scripts by defining ToolDef libraries for them.</p>
 </div>
 <div class="paragraph">
-<p>See the separate ToolDef documentation for more information.</p>
+<p>See the separate <a href="https://eclipse.org/escet/tooldef">ToolDef documentation</a> for
+more information.</p>
 </div>
 <div class="paragraph">
 <p>
@@ -976,7 +982,8 @@
 <li>
 <p>As command line execution scripts (<code>bin</code> directory of the archives),
 allowing execution in a command line terminal or console,
-particularly useful for execution of the tools on headless clusters.</p>
+particularly useful for execution of the tools on headless clusters. The
+command line scripts are only available for Windows and Linux, not for macOS.</p>
 </li>
 </ul>
 </div>
@@ -1018,7 +1025,11 @@
 </ul>
 </div>
 <div class="paragraph">
-<p>The following documentation is available for download:</p>
+<p>The tools are also available as plug-ins for the Eclipse IDE, by means of an
+Eclipse P2 update site.</p>
+</div>
+<div class="paragraph">
+<p>Furthermore, the following documentation is available for download:</p>
 </div>
 <div class="ulist">
 <ul>
@@ -1026,16 +1037,16 @@
 <p>Eclipse ESCET documentation (this documentation)</p>
 </li>
 <li>
-<p>Chi documentation</p>
+<p><a href="#intro-chapter-chi">Chi</a> documentation</p>
 </li>
 <li>
-<p>CIF documentation</p>
+<p><a href="#intro-chapter-cif">CIF</a> documentation</p>
 </li>
 <li>
-<p>SeText documentation</p>
+<p><a href="#intro-chapter-setext">SeText</a> documentation</p>
 </li>
 <li>
-<p>ToolDef documentation</p>
+<p><a href="#intro-chapter-tooldef">ToolDef</a> documentation</p>
 </li>
 </ul>
 </div>
@@ -1088,7 +1099,7 @@
 </div>
 <div class="paragraph">
 <p>You can download a JDK from Oracle&#8217;s
-<a href="https://www.oracle.com/java/technologies/javase-downloads.html">Java SE Downloads</a>
+<a href="https://www.oracle.com/java/technologies/javase/javase-jdk8-downloads.html">Java SE Development Kit 8 Downloads</a>
 page. For more information, see:</p>
 </div>
 <div class="ulist">
@@ -1143,15 +1154,68 @@
 extracted files.</p>
 </li>
 <li>
-<p>For macOS, the archive contains a directory named <code>Eclipse.app</code>, which
-contains all the files of the release. The operating system recognizes this
-directory as a macOS application and displays it as <em>Eclipse</em> with a custom
-icon.  You can now execute the application by double clicking the <em>Eclipse</em>
-application icon. A dialog may be shown with the following text:
-<em>"Eclipse" is an application downloaded from the Internet. Are you sure you
-want to open it?</em> Click the <b class="button">Open</b> button to confirm. You may move/drag
-the <em>Eclipse</em> application icon to the macOS <em>Applications</em> folder, to
-make the Eclipse icon appear among the other macOS applications.</p>
+<p>For macOS, installation is more complex and may also depend on the version of
+macOS. The following instructions have been tested on Big Sur. The downloaded
+archive contains the Eclipse app in the form of a directory named <code>Eclipse.app</code>,
+which contains all the files of the release. The operating system recognizes
+this directory as a macOS application and displays it as <em>Eclipse</em> with a custom
+icon. Move/drag the <em>Eclipse</em> application icon to the macOS <em>Applications</em>
+folder, to make the Eclipse icon appear among the other macOS applications.
+Execute the Eclipse application by double clicking it.</p>
+<div class="paragraph">
+<p>On macOS Big Sur, you will get an error message saying either <em>"Eclipse.app"
+cannot be opened because it was not downloaded from the App store</em> or
+<em>"Eclipse.app" cannot be opened because Apple cannot check it for malicious
+software</em>. Dismiss the popup by clicking <b class="button">OK</b>. Go to <span class="menuseq"><b class="menu">Apple menu</b>&#160;<i class="fa fa-angle-right caret"></i> <b class="menuitem">System
+Preferences</b></span>, click <em>Security &amp; Privacy</em>, then click tab <em>General</em>. Under <em>Allow
+apps downloaded from:</em> you should see two tick boxes: one for <em>App Store</em> and
+one for <em>App Store and identified developers</em>. Below that, you should see an
+additional line: <em>"Eclipse.app"</em> was blocked from use because it is not from an
+identified developer, and after that, a button <b class="button">Open Anyway</b>. Clicking that
+button will allow the Eclipse app to be executed.</p>
+</div>
+<div class="paragraph">
+<p>If executing the Eclipse app now gives an <em>Alert</em> message saying <em>Failed to
+create the Java virtual machine</em>, you need to add a setting in Eclipse that
+points to the Java JDK as follows:</p>
+</div>
+<div class="paragraph">
+<p>In the Finder, right click the Eclipse app icon and execute <em>Show Package
+Contents</em>. In the folder <code>Contents</code>, edit the file <code>Info.plist</code>. You can do this by right
+clicking the file and execute <span class="menuseq"><b class="menu">Open With</b>&#160;<i class="fa fa-angle-right caret"></i> <b class="menuitem">TextEdit</b></span>. Near the end of this file, look for the following lines:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>&lt;key&gt;Eclipse&lt;/key&gt;
+        &lt;array&gt;
+                &lt;!-- to use a specific ...
+                        ...
+                        ...
+                        ...
+                --&gt;</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Immediately after these lines, insert the following line:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>&lt;string&gt;-vm&lt;/string&gt;&lt;string&gt;/Library/Java/JavaVirtualMachines/jdk1.8.0_281.jdk/Contents/Home/bin/java&lt;/string&gt;</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>where you should change the version number <code>0_281</code> to the version number of the
+JDK that you have installed on your Mac. You can find this version number in the
+name of the folder that is present in <code>/Library/Java/JavaVirtualMachines/</code>. You
+can go to this folder via the Finder menu <span class="menuseq"><b class="menu">Go</b>&#160;<i class="fa fa-angle-right caret"></i> <b class="menuitem">Go to Folder&#8230;&#8203;</b></span>. After
+saving the file, try to execute the Eclipse app.</p>
+</div>
+<div class="paragraph">
+<p>In case you now  get an <em>Alert</em> error message saying <em>The JVM shared
+library "/Library/Java/JavaVirtualMachines/jdk&#8230;&#8203;" does not contain the
+JNI_CreateJavaVM symbol</em>, click <b class="button">OK</b> and restart your Mac. After restarting, the
+Eclipse app should work.</p>
+</div>
 </li>
 </ul>
 </div>
@@ -1161,8 +1225,8 @@
 </div>
 <div class="paragraph">
 <p>You can now also use the command line scripts located in the <code>bin</code>
-directory (<code>Eclipse.app/Contents/Eclipse/bin</code> on macOS). To see which
-tools are available, simply look in the <code>bin</code> directory. Each of these
+directory. These are only available for Windows and Linux, not for macOS. To see which
+tools are available, simply look in this directory. Each of these
 tools can be started with the <code>-h</code> or <code>--help</code> option to get further
 information. You may want to add the <code>bin</code> directory to your <code>PATH</code>
 environment variable. See e.g.
@@ -1170,19 +1234,14 @@
 for how to achieve this.</p>
 </div>
 <div class="paragraph">
-<p>If the Eclipse ESCET IDE or one of the command line scripts can&#8217;t be started,
-you can try the following:</p>
+<p>If the Eclipse ESCET IDE or one of the command line scripts cannot be started,
+the ESCET tools may not be able to correctly detect the JDK you installed. In
+such a case, edit the <code>eclipse.ini</code> file from the directory that contains the
+extracted files and add in the following lines at the beginning of the file:</p>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p>The Eclipse ESCET tools may not be able to correctly detect the JDK you
-installed. In such a case, edit the <code>eclipse.ini</code> file from the directory
-that contains the extracted files and add in the following lines at the
-beginning of the file:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>-vm
+<pre class="highlight"><code>-vm
 C:/Program Files/Java/jdk1.8.0_211/bin</code></pre>
 </div>
 </div>
@@ -1192,14 +1251,8 @@
 Make sure to save the file and retry starting the Eclipse ESCET IDE
 or one of the command line scripts.</p>
 </div>
-</li>
-<li>
-<p>For macOS, open the <em>System Preferences</em> of the operation system. Click
-on <em>Security &amp; Privacy</em>. Click on the lock icon to allow changing the security
-settings. For <em>Allow apps downloaded from</em>, choose <em>Anywhere</em>. Close the
-<em>Security &amp; Privacy</em> settings window.</p>
-</li>
-</ul>
+<div class="paragraph">
+<p>Adding the <code>-vm</code> option to the <code>eclipse.ini</code> file on macOS is of no use.</p>
 </div>
 </div>
 <div class="sect2">
@@ -1299,7 +1352,7 @@
 to the <code>eclipse.ini</code> file:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>-Djava.net.preferIPv4Stack=true</code></pre>
+<pre class="highlight"><code>-Djava.net.preferIPv4Stack=true</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2684,7 +2737,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code>-Xmx8g</code></pre>
+<pre class="highlight"><code>-Xmx8g</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3662,17 +3715,18 @@
 <div class="sect3">
 <h4 id="developer-releases-and-milestones">Releases and milestones</h4>
 <div class="paragraph">
-<p>For every release a GitLab milestone is created, to track the scope and
-progress of the release. Milestones are created for public releases as well
-as for e.g. release candidates.</p>
-</div>
-<div class="paragraph">
-<p>For every release, first the scope is discussed and agreed upon. Then, a
+<p>For every software version a GitLab milestone is created, to track its scope and
+progress. First the scope is discussed and agreed upon. Then, a
 GitLab milestone is created, the relevant issues are created if not yet
 present, and the issues are associated with the milestone. The issues can
 then be picked up to be addressed.</p>
 </div>
 <div class="paragraph">
+<p>A single GitLab milestone is used per software version. Each software version
+has one or more milestone releases, followed by one or more release candidates,
+and is completed by a final release.</p>
+</div>
+<div class="paragraph">
 <p>See also:</p>
 </div>
 <div class="ulist">
@@ -3753,6 +3807,19 @@
 convenient as it indicates what the branch is about, without having to look
 up the issue.</p>
 </li>
+<li>
+<p>There are many ways to create a branch. One way is to create it from the
+GitLab issue. On the web page for a GitLab issue, there is a
+<em>Create merge request</em> button. Select the arrow to the right of it to
+show more options. Select <em>Create branch</em>. Adapt the <em>Branch name</em> and
+<em>Source</em> as needed. Typically the defaults suffice. Click the
+<em>Create branch</em> button to create the branch.</p>
+</li>
+<li>
+<p>We prefer not to create a draft merge request with the creation of the
+branch, as then commits in the branch lead to commits on the merge requests,
+which lead to notification emails.</p>
+</li>
 </ul>
 </div>
 <div class="paragraph">
@@ -3769,7 +3836,7 @@
 <p>For the Eclipse ESCET project, this line must start with the issue number,
 to allow GitLab to link commits to issues. For instance: <code>#1 commit summary</code>.
 In case a commit relates to multiple issues, list each of them, e.g.
-<code>#1 #2 commit summary</code>.</p>
+<code>#1 #2 commit summary</code>. Merge commits are exempt from this rule.</p>
 </div>
 <div class="paragraph">
 <p>Furthermore, all commits must adhere to the requirements as defined by the
@@ -3787,7 +3854,7 @@
 <p>If you are not an Eclipse ESCET project committer, with write access to our
 Git repository, see the information on
 <a href="#developer-contributing-chapter-index">contributing</a> to the Eclipse ESCET
-project.</p>
+project. Don&#8217;t forget to sign-off your Git commits.</p>
 </div>
 <div class="paragraph">
 <p></p>
@@ -3803,8 +3870,29 @@
 <div class="ulist">
 <ul>
 <li>
-<p>Create a merge request for merging the branch. Typically a branch is created
-from and merged back to the <code>develop</code> branch.</p>
+<p>Create a merge request for merging the branch.
+You can create a merge request from the Eclipse ESCET Gitlab
+<a href="https://gitlab.eclipse.org/eclipse/escet/escet/-/branches">Branches page</a>.
+Select the <em>Merge request</em> button next to the branch to be merged.</p>
+<div class="ulist">
+<ul>
+<li>
+<p>Typically a branch is created from and merged back to the <code>develop</code> branch,
+but this can be changed if needed.</p>
+</li>
+<li>
+<p>If you include <code>Closes #nnn</code> in the description of the merge request,
+with <code>nnn</code> an issue number, that issue will automatically be closed once the
+merge request is merged. Use <code>Addresses #nnn</code> instead, if the merge request
+addresses part of the issue, but work remains, to prevent the issue from
+being closed. Always include either of them to ensure the merge request is
+properly linked to the issues it addresses.</p>
+</li>
+<li>
+<p>It is not mandatory to select <em>assignees</em>, <em>reviewers</em>, etc.</p>
+</li>
+</ul>
+</div>
 </li>
 <li>
 <p>The merge request is reviewed by the Eclipse ESCET project committers.</p>
@@ -4019,7 +4107,7 @@
 <div class="ulist">
 <ul>
 <li>
-<p>Start Eclipse Installer x64 that you downloaded.</p>
+<p>Start the Eclipse Installer that you downloaded.</p>
 </li>
 <li>
 <p>Use the hamburger menu at the top right to switch to advanced mode.</p>
@@ -4065,13 +4153,13 @@
 <div class="ulist">
 <ul>
 <li>
-<p>Select 'Eclipse Platform' from the big list at the top.</p>
+<p>Select <em>Eclipse Platform</em> from the big list at the top.</p>
 </li>
 <li>
-<p>Select '2020-06' for 'Product Version'.</p>
+<p>Select <em>2020-06</em> for <em>Product Version</em>.</p>
 </li>
 <li>
-<p>Select a Java 8 JDK for 'Java 1.8+ VM'.</p>
+<p>Select a Java 8 JDK for <em>Java 1.8+ VM</em>.</p>
 </li>
 <li>
 <p>Choose whether you want a P2 bundle pool (recommended).</p>
@@ -4091,11 +4179,12 @@
 <div class="ulist">
 <ul>
 <li>
-<p>For 'Catalog', choose 'Eclipse Projects'.</p>
+<p>For <em>Catalog</em>, choose <em>Eclipse Projects</em>.</p>
 </li>
 <li>
-<p>For 'Resource URIs', enter
-<code><a href="https://gitlab.eclipse.org/eclipse/escet/escet/-/raw/develop/org.eclipse.escet.setup" class="bare">https://gitlab.eclipse.org/eclipse/escet/escet/-/raw/develop/org.eclipse.escet.setup</a></code>.</p>
+<p>For <em>Resource URIs</em>, enter
+<code>https://gitlab.eclipse.org/eclipse/escet/escet/-/raw/develop/org.eclipse.escet.setup</code>
+and make sure there are no spaces before or after the URL.</p>
 </li>
 <li>
 <p>Click <b class="button">OK</b>.</p>
@@ -4104,11 +4193,11 @@
 </div>
 </li>
 <li>
-<p>Check the checkbox for 'Eclipse ESCET', from the big list. It is under 'Eclipse
-Projects' / '&lt;User&gt;'.</p>
+<p>Check the checkbox for <em>Eclipse ESCET</em>, from the big list. It is under <em>Eclipse
+Projects</em> / <em>&lt;User&gt;</em>.</p>
 </li>
 <li>
-<p>At the bottom right, select the 'develop' stream.</p>
+<p>At the bottom right, select the <em>develop</em> stream.</p>
 </li>
 <li>
 <p>Click <b class="button">Next</b>.</p>
@@ -4121,11 +4210,16 @@
 <div class="ulist">
 <ul>
 <li>
-<p>Choose a 'Root install folder' and 'Installation folder name'.</p>
+<p>Enable the <em>Show all variables</em> option to show all options.</p>
 </li>
 <li>
-<p>The development environment will be put at
-'&lt;root_installation_folder&gt;/&lt;installation_folder_name&gt;'.</p>
+<p>Choose a <em>Root install folder</em> and <em>Installation folder name</em>.
+The new development environment will be put at
+<code>&lt;root_installation_folder&gt;/&lt;installation_folder_name&gt;</code>.</p>
+</li>
+<li>
+<p>For <em>JRE 1.8 location</em> make sure to select the same Java 8 JDK that you
+selected in the first wizard window.</p>
 </li>
 <li>
 <p>Click <b class="button">Next</b>.</p>
@@ -4159,7 +4253,7 @@
 </li>
 <li>
 <p>Click the rotating arrows icon in the status bar (bottom right) of the
-development environment.</p>
+new development environment.</p>
 </li>
 <li>
 <p>Observe Oomph executing the startup tasks (such as Git clone, importing
@@ -4175,6 +4269,33 @@
 </ul>
 </div>
 <div class="paragraph">
+<p>If you have any issues during setting up the development environment, consider
+the following:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Make sure to use a recent version of the Eclipse Installer. These versions
+include a recent JRE, which includes up-to-date certificates, preventing issues
+when accessing https URLs.</p>
+</li>
+<li>
+<p>You can set the following environment variables to force the use of IPv4, in
+case of any issues accessing/downloading remote files:</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>_JAVA_OPTIONS=-Djava.net.preferIPv4Stack=true
+_JPI_VM_OPTIONS=-Djava.net.preferIPv4Stack=true</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>After setting them, make sure to fully close the Eclipse Installer and then
+start it again, for the changes to be picked up.</p>
+</div>
+</li>
+</ul>
+</div>
+<div class="paragraph">
 <p>In your new development environment, consider changing the following settings:</p>
 </div>
 <div class="ulist">
@@ -4613,10 +4734,25 @@
 tags with a specific syntax will be picked up by Jenkins to be released.
 For instance, use <code>v0.1</code>, <code>v0.1.1</code>, <code>v2.0</code>, etc for releases, <code>v0.1-M1</code>
 for a milestone build, or <code>v0.1-RC1</code> for a release candidate.</p>
+<div class="paragraph">
+<p>Add the tag via GitLab, at
+<a href="https://gitlab.eclipse.org/eclipse/escet/escet/-/tags/new" class="bare">https://gitlab.eclipse.org/eclipse/escet/escet/-/tags/new</a>. Use the
+<em>Tag name</em> also as <em>Message</em>. Make sure to select <code>master</code> as branch from
+which to create the tag. For the <em>Release notes</em>, use a short text inspired
+by the release plan.</p>
+</div>
+<div class="paragraph">
+<p>As an example, consider milestone 1 of release v0.1: see
+<a href="https://projects.eclipse.org/projects/technology.escet/releases/0.1" class="bare">https://projects.eclipse.org/projects/technology.escet/releases/0.1</a> for the
+release plan, <a href="https://gitlab.eclipse.org/eclipse/escet/escet/-/tags/v0.1-M1" class="bare">https://gitlab.eclipse.org/eclipse/escet/escet/-/tags/v0.1-M1</a>
+for the tag and
+<a href="https://gitlab.eclipse.org/eclipse/escet/escet/-/releases/v0.1-M1" class="bare">https://gitlab.eclipse.org/eclipse/escet/escet/-/releases/v0.1-M1</a> for the
+GitLab release record.</p>
+</div>
 </li>
 <li>
-<p>Push the tag to the Eclipse ESCET GitLab. E.g. use
-<code>git push origin &lt;tagname&gt;</code> with <code>&lt;tagname&gt;</code> the name of the tag to push.</p>
+<p>Edit the GitLab release record, adding the GitLab milestone to the
+release record. Save the changes.</p>
 </li>
 <li>
 <p>Jenkins will automatically pick up the new tag. Log in to Jenkins and
@@ -4721,27 +4857,42 @@
 </ul>
 </div>
 </li>
-</ul>
-</div>
-<div class="paragraph">
-<p>Regularly, consider the following:</p>
-</div>
+<li>
+<p>Remove/archive old releases:</p>
 <div class="ulist">
 <ul>
 <li>
-<p>Remove old non-release websites.</p>
-</li>
-<li>
-<p>Remove old non-release downloads. Consider whether removing P2 update
-sites will lead to issues for users.</p>
-</li>
-<li>
-<p>Move old release downloads from <code>downloads.eclipse.org</code> to
-<code>archive.eclipse.org</code>. Consider whether moving P2 update
-sites will lead to issues for users. See for more information the
-Eclipse Foundation Wiki page
+<p>For every release (not a milestone or release candidate), remove
+all milestones and release candidates of the previous version and older.
+E.g. for <code>v0.2</code>, remove <code>v0.1-M1</code>, <code>v0.1-M2</code>, <code>v0.1-RC1</code>, etc. Also archive
+all releases older than the current and previous release. E.g. for <code>v0.3</code>
+archive <code>v0.1</code> and older, but keep <code>v0.2</code>.</p>
+<div class="paragraph">
+<p>Consider whether archiving or removing P2 update sites will lead to issues
+for users. See for more information the Eclipse Foundation Wiki page
 <a href="https://wiki.eclipse.org/Equinox/p2/p2.mirrorsURL#Moving_a_repo_to_archive.eclipse.org">Moving
 a repo to archive.eclipse.org</a>.</p>
+</div>
+</li>
+<li>
+<p>Old websites can be removed in a similar way to the above instructions to
+change the default website. Only remove the directory for the milestone
+or release candidate.</p>
+</li>
+<li>
+<p>Older downloads can be archived. Go to <a href="https://download.eclipse.org/escet/" class="bare">https://download.eclipse.org/escet/</a>.
+Make sure you&#8217;re logged in. This should make check-boxes appear. Select the
+folders to archive and click the <em>Archive</em> button. It may take a few minutes
+for archiving to complete.</p>
+</li>
+<li>
+<p>Archived downloads can be removed. Go to <a href="https://archive.eclipse.org/escet/" class="bare">https://archive.eclipse.org/escet/</a>.
+Make sure you&#8217;re logged in. This should make check-boxes appear. Select the
+folders to delete and click the <em>Delete</em> button. It may take a few minutes
+for deleting to complete.</p>
+</li>
+</ul>
+</div>
 </li>
 </ul>
 </div>
@@ -5092,7 +5243,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="directive">static</span> <span class="type">int</span> count = <span class="integer">0</span>;</code></pre>
+<pre class="highlight"><code class="language-java" data-lang="java">public static int count = 0;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5675,7 +5826,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java">Options.getInstance(MyOption.class)</code></pre>
+<pre class="highlight"><code class="language-java" data-lang="java">Options.getInstance(MyOption.class)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5700,7 +5851,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java">Options.set(MyOption.class, &lt;value&gt;);</code></pre>
+<pre class="highlight"><code class="language-java" data-lang="java">Options.set(MyOption.class, &lt;value&gt;);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5850,13 +6001,13 @@
 <p>Add a <code>main</code> method to your application class. For instance:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="comment">/**
+<pre class="highlight"><code class="language-java" data-lang="java">/**
  * Application main method.
  *
  * @param args The command line arguments supplied to the application.
- */</span>
-<span class="directive">public</span> <span class="directive">static</span> <span class="type">void</span> main(<span class="predefined-type">String</span><span class="type">[]</span> args) {
-    MyApp app = <span class="keyword">new</span> MyApp();
+ */
+public static void main(String[] args) {
+    MyApp app = new MyApp();
     app.run(args);
 }</code></pre>
 </div>
@@ -5871,9 +6022,9 @@
 support standalone execution, the following constructor is required:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="comment">/** Constructor for the {@link MyApp} class. */</span>
-<span class="directive">public</span> MyApp() {
-    <span class="comment">// Nothing to do here.</span>
+<pre class="highlight"><code class="language-java" data-lang="java">/** Constructor for the {@link MyApp} class. */
+public MyApp() {
+    // Nothing to do here.
 }</code></pre>
 </div>
 </div>
@@ -5884,13 +6035,13 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="comment">/**
+<pre class="highlight"><code class="language-java" data-lang="java">/**
  * Constructor for the {@link MyApp} class.
  *
  * @param streams The streams to use for input, output, and error streams.
- */</span>
-<span class="directive">public</span> MyApp(AppStreams streams) {
-    <span class="local-variable">super</span>(streams);
+ */
+public MyApp(AppStreams streams) {
+    super(streams);
 }</code></pre>
 </div>
 </div>
@@ -5908,7 +6059,7 @@
 then you can implement it as follows:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="keyword">return</span> <span class="keyword">new</span> OutputProvider&lt;&gt;();</code></pre>
+<pre class="highlight"><code class="language-java" data-lang="java">return new OutputProvider&lt;&gt;();</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5933,21 +6084,21 @@
 your application. An example of an implementation of this method:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="annotation">@Override</span>
-<span class="annotation">@SuppressWarnings</span>(<span class="string"><span class="delimiter">&quot;</span><span class="content">rawtypes</span><span class="delimiter">&quot;</span></span>)
-<span class="directive">protected</span> OptionCategory getAllOptions() {
+<pre class="highlight"><code class="language-java" data-lang="java">@Override
+@SuppressWarnings("rawtypes")
+protected OptionCategory getAllOptions() {
     OptionCategory generalOpts = getGeneralOptionCategory();
 
     OptionCategory debugOpts =
-        <span class="keyword">new</span> OptionCategory(<span class="string"><span class="delimiter">&quot;</span><span class="content">Debug</span><span class="delimiter">&quot;</span></span>, <span class="string"><span class="delimiter">&quot;</span><span class="content">Debugging options.</span><span class="delimiter">&quot;</span></span>, list(),
+        new OptionCategory("Debug", "Debugging options.", list(),
                            list(Options.getInstance(DebugOption.class)));
 
     OptionCategory options =
-        <span class="keyword">new</span> OptionCategory(<span class="string"><span class="delimiter">&quot;</span><span class="content">My Application Options</span><span class="delimiter">&quot;</span></span>,
-                           <span class="string"><span class="delimiter">&quot;</span><span class="content">All options for My Application.</span><span class="delimiter">&quot;</span></span>,
+        new OptionCategory("My Application Options",
+                           "All options for My Application.",
                            list(generalOpts, debugOpts), list());
 
-    <span class="keyword">return</span> options;
+    return options;
 }</code></pre>
 </div>
 </div>
@@ -5979,8 +6130,8 @@
 parsers, constraints, etc. For instance:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="keyword">if</span> (!Platform.isRunning()) {
-    <span class="comment">// Register languages and parsers for stand-alone execution.</span>
+<pre class="highlight"><code class="language-java" data-lang="java">if (!Platform.isRunning()) {
+    // Register languages and parsers for stand-alone execution.
     LanguageRegistry.register...(...)
 }</code></pre>
 </div>
@@ -6055,13 +6206,13 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="comment">/***/</span> <span class="annotation">@BeforeClass</span>
-<span class="directive">public</span> <span class="directive">static</span> <span class="type">void</span> oneTimeSetUp() {
+<pre class="highlight"><code class="language-java" data-lang="java">/***/ @BeforeClass
+public static void oneTimeSetUp() {
     AppEnv.registerSimple();
 }
 
-<span class="comment">/***/</span> <span class="annotation">@AfterClass</span>
-<span class="directive">public</span> <span class="directive">static</span> <span class="type">void</span> oneTimeTearDown() {
+/***/ @AfterClass
+public static void oneTimeTearDown() {
     AppEnv.unregisterApplication();
 }</code></pre>
 </div>
@@ -6073,7 +6224,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java">Options.set(SomeOption.class, &lt;value&gt;);</code></pre>
+<pre class="highlight"><code class="language-java" data-lang="java">Options.set(SomeOption.class, &lt;value&gt;);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -6213,10 +6364,45 @@
 as part of the Eclipse ESCET project, are listed below in reverse
 chronological order.</p>
 </div>
-<div class="sect2">
-<h3 id="version-0-1-unreleased">Version 0.1 (unreleased)</h3>
 <div class="paragraph">
-<p>The first release of the Eclipse ESCET project and toolkit.</p>
+<p>See also the release notes for the specific tools for more information:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://www.eclipse.org/escet/cif/#release-notes-chapter-index">CIF release notes</a></p>
+</li>
+<li>
+<p><a href="https://www.eclipse.org/escet/chi/#release-notes-chapter-index">Chi release notes</a></p>
+</li>
+<li>
+<p><a href="https://www.eclipse.org/escet/tooldef/#release-notes-chapter-index">ToolDef release notes</a></p>
+</li>
+<li>
+<p><a href="https://www.eclipse.org/escet/setext/#setext-readme-release-notes">SeText release notes</a></p>
+</li>
+</ul>
+</div>
+<div class="sect2">
+<h3 id="version-0-1">Version 0.1</h3>
+<div class="paragraph">
+<p>The first release of the Eclipse ESCET project and toolkit.
+This release is based on the initial contribution by the Eindhoven University
+of Technology (TU/e).</p>
+</div>
+<div class="paragraph">
+<p>Most notable changes compared to the last TU/e release:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>A JDK is no longer bundled with the downloads. A JDK must be installed
+separately and manually. Future releases will again include a JDK.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>This release is based on the Eclipse IDE version 2020-06 and supports Java 8.</p>
 </div>
 <div class="paragraph">
 <p></p>
@@ -6266,7 +6452,7 @@
 <div class="sectionbody">
 <div class="paragraph">
 <p>The material in this documentation is
-Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation.</p>
+Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation.</p>
 </div>
 <div class="paragraph">
 <p>Eclipse ESCET and ESCET are trademarks of the Eclipse Foundation.
@@ -6297,95 +6483,6 @@
 </div>
 </div>
 </div>
-<style>
-/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
-pre.CodeRay{background:#f7f7f8}
-.CodeRay .line-numbers{border-right:1px solid currentColor;opacity:.35;padding:0 .5em 0 0}
-.CodeRay span.line-numbers{display:inline-block;margin-right:.75em}
-.CodeRay .line-numbers strong{color:#000}
-table.CodeRay{border-collapse:separate;border:0;margin-bottom:0;background:none}
-table.CodeRay td{vertical-align:top;line-height:inherit}
-table.CodeRay td.line-numbers{text-align:right}
-table.CodeRay td.code{padding:0 0 0 .75em}
-.CodeRay .debug{color:#fff !important;background:#000080 !important}
-.CodeRay .annotation{color:#007}
-.CodeRay .attribute-name{color:#000080}
-.CodeRay .attribute-value{color:#700}
-.CodeRay .binary{color:#509}
-.CodeRay .comment{color:#998;font-style:italic}
-.CodeRay .char{color:#04d}
-.CodeRay .char .content{color:#04d}
-.CodeRay .char .delimiter{color:#039}
-.CodeRay .class{color:#458;font-weight:bold}
-.CodeRay .complex{color:#a08}
-.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
-.CodeRay .color{color:#099}
-.CodeRay .class-variable{color:#369}
-.CodeRay .decorator{color:#b0b}
-.CodeRay .definition{color:#099}
-.CodeRay .delimiter{color:#000}
-.CodeRay .doc{color:#970}
-.CodeRay .doctype{color:#34b}
-.CodeRay .doc-string{color:#d42}
-.CodeRay .escape{color:#666}
-.CodeRay .entity{color:#800}
-.CodeRay .error{color:#808}
-.CodeRay .exception{color:inherit}
-.CodeRay .filename{color:#099}
-.CodeRay .function{color:#900;font-weight:bold}
-.CodeRay .global-variable{color:#008080}
-.CodeRay .hex{color:#058}
-.CodeRay .integer,.CodeRay .float{color:#099}
-.CodeRay .include{color:#555}
-.CodeRay .inline{color:#000}
-.CodeRay .inline .inline{background:#ccc}
-.CodeRay .inline .inline .inline{background:#bbb}
-.CodeRay .inline .inline-delimiter{color:#d14}
-.CodeRay .inline-delimiter{color:#d14}
-.CodeRay .important{color:#555;font-weight:bold}
-.CodeRay .interpreted{color:#b2b}
-.CodeRay .instance-variable{color:#008080}
-.CodeRay .label{color:#970}
-.CodeRay .local-variable{color:#963}
-.CodeRay .octal{color:#40e}
-.CodeRay .predefined{color:#369}
-.CodeRay .preprocessor{color:#579}
-.CodeRay .pseudo-class{color:#555}
-.CodeRay .directive{font-weight:bold}
-.CodeRay .type{font-weight:bold}
-.CodeRay .predefined-type{color:inherit}
-.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
-.CodeRay .key{color:#808}
-.CodeRay .key .delimiter{color:#606}
-.CodeRay .key .char{color:#80f}
-.CodeRay .value{color:#088}
-.CodeRay .regexp .delimiter{color:#808}
-.CodeRay .regexp .content{color:#808}
-.CodeRay .regexp .modifier{color:#808}
-.CodeRay .regexp .char{color:#d14}
-.CodeRay .regexp .function{color:#404;font-weight:bold}
-.CodeRay .string{color:#d20}
-.CodeRay .string .string .string{background:#ffd0d0}
-.CodeRay .string .content{color:#d14}
-.CodeRay .string .char{color:#d14}
-.CodeRay .string .delimiter{color:#d14}
-.CodeRay .shell{color:#d14}
-.CodeRay .shell .delimiter{color:#d14}
-.CodeRay .symbol{color:#990073}
-.CodeRay .symbol .content{color:#a60}
-.CodeRay .symbol .delimiter{color:#630}
-.CodeRay .tag{color:#008080}
-.CodeRay .tag-special{color:#d70}
-.CodeRay .variable{color:#036}
-.CodeRay .insert{background:#afa}
-.CodeRay .delete{background:#faa}
-.CodeRay .change{color:#aaf;background:#007}
-.CodeRay .head{color:#f8f;background:#505}
-.CodeRay .insert .insert{color:#080}
-.CodeRay .delete .delete{color:#800}
-.CodeRay .change .change{color:#66f}
-.CodeRay .head .head{color:#f4f}
-</style>
 <script type="text/x-mathjax-config">
 MathJax.Hub.Config({
   messageStyle: "none",
@@ -6402,16 +6499,16 @@
 })
 MathJax.Hub.Register.StartupHook("AsciiMath Jax Ready", function () {
   MathJax.InputJax.AsciiMath.postfilterHooks.Add(function (data, node) {
-    if ((node = data.script.parentNode) && (node = node.parentNode) && node.classList.contains('stemblock')) {
+    if ((node = data.script.parentNode) && (node = node.parentNode) && node.classList.contains("stemblock")) {
       data.math.root.display = "block"
     }
     return data
   })
 })
 </script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_HTMLorMML"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.9/MathJax.js?config=TeX-MML-AM_HTMLorMML"></script>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/escet/performance/java_memory.png.svg b/escet/performance/java_memory.png.svg
index 264d5a9..82b43e6 100644
--- a/escet/performance/java_memory.png.svg
+++ b/escet/performance/java_memory.png.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/index.html b/index.html
index 4c3d33e..d29d86f 100644
--- a/index.html
+++ b/index.html
@@ -1,4 +1,15 @@
 <!DOCTYPE html>
+<!--
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
+
+  See the NOTICE file(s) distributed with this work for additional
+  information regarding copyright ownership.
+
+  This program and the accompanying materials are made available under the terms
+  of the MIT License which is available at https://opensource.org/licenses/MIT
+
+  SPDX-License-Identifier: MIT
+-->
 <html lang="en">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -17,7 +28,10 @@
 
 <p><strong>Eclipse Supervisory Control Engineering Toolkit (Eclipse ESCET™)</strong></p>
 
-<p>Version: v0.1-M2</p>
+<p>Version: v0.1-RC1</p>
+
+<p>The Eclipse ESCET project provides a toolkit for the development of
+supervisory controllers in the Model-Based Systems Engineering paradigm.</p>
 
 <p>
 <table>
@@ -40,5 +54,19 @@
 </table>
 </p>
 
+<p><img src="eclipse-incubation.png" width="250px"></p>
+
+<p>
+<a href="https://www.eclipse.org">Eclipse Home</a>
+|
+<a href="https://www.eclipse.org/legal/privacy.php">Privacy Policy</a>
+|
+<a href="https://www.eclipse.org/legal/termsofuse.php">Terms of Use</a>
+|
+<a href="https://www.eclipse.org/legal/copyright.php">Copyright Agent</a>
+|
+<a href="https://www.eclipse.org/legal">Eclipse Legal</a>
+</p>
+
 </body>
 </html>
diff --git a/setext/.git_keep_empty_dir b/setext/.git_keep_empty_dir
index 4e99800..a251d16 100644
--- a/setext/.git_keep_empty_dir
+++ b/setext/.git_keep_empty_dir
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
diff --git a/setext/eclipse-escet-incubation-setext-manual.pdf b/setext/eclipse-escet-incubation-setext-manual.pdf
index 1591da4..cdf0faf 100644
--- a/setext/eclipse-escet-incubation-setext-manual.pdf
+++ b/setext/eclipse-escet-incubation-setext-manual.pdf
Binary files differ
diff --git a/setext/index.html b/setext/index.html
index 4c70eae..598597c 100644
--- a/setext/index.html
+++ b/setext/index.html
@@ -4,8 +4,8 @@
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="generator" content="Asciidoctor 2.0.10">
-<meta name="author" content="Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation">
+<meta name="generator" content="Asciidoctor 2.0.12">
+<meta name="author" content="Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation">
 <title>SeText documentation (Incubation)</title>
 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
 <style>
@@ -48,7 +48,7 @@
 table{border-collapse:collapse;border-spacing:0}
 *,*::before,*::after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
 html,body{font-size:100%}
-body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
+body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;word-wrap:anywhere;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
 a:hover{cursor:pointer}
 img,object,embed{max-width:100%;height:auto}
 object,embed{height:100%}
@@ -63,10 +63,8 @@
 img,object,svg{display:inline-block;vertical-align:middle}
 textarea{height:auto;min-height:50px}
 select{width:100%}
-.center{margin-left:auto;margin-right:auto}
-.stretch{width:100%}
 .subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em}
-div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0;direction:ltr}
+div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0}
 a{color:#2156a5;text-decoration:underline;line-height:inherit}
 a:hover,a:focus{color:#1d4b8f}
 a img{border:0}
@@ -106,19 +104,22 @@
 h2{font-size:2.3125em}
 h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
 h4{font-size:1.4375em}}
-table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede}
+table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede;word-wrap:normal}
 table thead,table tfoot{background:#f7f8f7}
 table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left}
 table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
 table tr.even,table tr.alt{background:#f8f8f7}
-table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{display:table-cell;line-height:1.6}
+table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6}
 h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
 h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
+.center{margin-left:auto;margin-right:auto}
+.stretch{width:100%}
 .clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table}
 .clearfix::after,.float-group::after{clear:both}
-:not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed;word-wrap:break-word}
-:not(pre)>code.nobreak{word-wrap:normal}
-:not(pre)>code.nowrap{white-space:nowrap}
+:not(pre).nobreak{word-wrap:normal}
+:not(pre).nowrap{white-space:nowrap}
+:not(pre).pre-wrap{white-space:pre-wrap}
+:not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed}
 pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
 pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
 pre>code{display:block}
@@ -183,7 +184,7 @@
 #content #toc{border-style:solid;border-width:1px;border-color:#e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;-webkit-border-radius:4px;border-radius:4px}
 #content #toc>:first-child{margin-top:0}
 #content #toc>:last-child{margin-bottom:0}
-#footer{max-width:100%;background:rgba(0,0,0,.8);padding:1.25em}
+#footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em}
 #footer-text{color:rgba(255,255,255,.8);line-height:1.44}
 #content{margin-bottom:.625em}
 .sect1{padding-bottom:.625em}
@@ -206,7 +207,7 @@
 .admonitionblock>table td.icon{text-align:center;width:80px}
 .admonitionblock>table td.icon img{max-width:none}
 .admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
-.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6)}
+.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6);word-wrap:anywhere}
 .admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
 .exampleblock>.content{border-style:solid;border-width:1px;border-color:#e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;-webkit-border-radius:4px;border-radius:4px}
 .exampleblock>.content>:first-child{margin-top:0}
@@ -216,7 +217,7 @@
 .sidebarblock>:last-child{margin-bottom:0}
 .sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
 .exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
-.literalblock pre,.listingblock>.content>pre{-webkit-border-radius:4px;border-radius:4px;word-wrap:break-word;overflow-x:auto;padding:1em;font-size:.8125em}
+.literalblock pre,.listingblock>.content>pre{-webkit-border-radius:4px;border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em}
 @media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}}
 @media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}}
 .literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class="highlight"],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
@@ -262,21 +263,20 @@
 .quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0}
 .quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem}
 .quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;text-align:left;margin-right:0}
-table.tableblock{max-width:100%;border-collapse:separate}
 p.tableblock:last-child{margin-bottom:0}
+td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere}
 td.tableblock>.content>:last-child{margin-bottom:-1.25em}
-td.tableblock>.content>:last-child.sidebarblock{margin-bottom:0}
 table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
-table.grid-all>thead>tr>.tableblock,table.grid-all>tbody>tr>.tableblock{border-width:0 1px 1px 0}
-table.grid-all>tfoot>tr>.tableblock{border-width:1px 1px 0 0}
-table.grid-cols>*>tr>.tableblock{border-width:0 1px 0 0}
-table.grid-rows>thead>tr>.tableblock,table.grid-rows>tbody>tr>.tableblock{border-width:0 0 1px}
-table.grid-rows>tfoot>tr>.tableblock{border-width:1px 0 0}
-table.grid-all>*>tr>.tableblock:last-child,table.grid-cols>*>tr>.tableblock:last-child{border-right-width:0}
-table.grid-all>tbody>tr:last-child>.tableblock,table.grid-all>thead:last-child>tr>.tableblock,table.grid-rows>tbody>tr:last-child>.tableblock,table.grid-rows>thead:last-child>tr>.tableblock{border-bottom-width:0}
+table.grid-all>*>tr>*{border-width:1px}
+table.grid-cols>*>tr>*{border-width:0 1px}
+table.grid-rows>*>tr>*{border-width:1px 0}
 table.frame-all{border-width:1px}
+table.frame-ends{border-width:1px 0}
 table.frame-sides{border-width:0 1px}
-table.frame-topbot,table.frame-ends{border-width:1px 0}
+table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0}
+table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0}
+table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0}
+table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0}
 table.stripes-all tr,table.stripes-odd tr:nth-of-type(odd),table.stripes-even tr:nth-of-type(even),table.stripes-hover tr:hover{background:#f8f8f7}
 th.halign-left,td.halign-left{text-align:left}
 th.halign-right,td.halign-right{text-align:right}
@@ -285,7 +285,7 @@
 th.valign-bottom,td.valign-bottom{vertical-align:bottom}
 th.valign-middle,td.valign-middle{vertical-align:middle}
 table thead th,table tfoot th{font-weight:bold}
-tbody tr th{display:table-cell;line-height:1.6;background:#f7f8f7}
+tbody tr th{background:#f7f8f7}
 tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
 p.tableblock>code:only-child{background:none;padding:0}
 p.tableblock{font-size:1em}
@@ -314,6 +314,7 @@
 .hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
 td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
 td.hdlist1{font-weight:bold;padding-bottom:1.25em}
+td.hdlist2{word-wrap:anywhere}
 .literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
 .colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
 .colist td:not([class]):first-child img{max-width:none}
@@ -386,7 +387,7 @@
 .admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
 .admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
 .admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
-.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);-webkit-border-radius:100px;border-radius:100px;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
+.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);-webkit-border-radius:50%;border-radius:50%;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
 .conum[data-value] *{color:#fff!important}
 .conum[data-value]+b{display:none}
 .conum[data-value]::after{content:attr(data-value)}
@@ -413,6 +414,7 @@
 svg{max-width:100%}
 p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
 h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
+#header,#content,#footnotes,#footer{max-width:none}
 #toc,.sidebarblock,.exampleblock>.content{background:none!important}
 #toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important}
 body.book #header{text-align:center}
@@ -438,7 +440,7 @@
 </style>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
@@ -482,8 +484,8 @@
 <div id="header">
 <h1>SeText documentation (Incubation)</h1>
 <div class="details">
-<span id="author" class="author">Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation</span><br>
-<span id="revnumber">version 0.1.0.20210126-175926</span>
+<span id="author" class="author">Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation</span><br>
+<span id="revnumber">version 0.1.0.20210305-171633</span>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
@@ -502,7 +504,7 @@
 <li><a href="#setext-readme-limitations-issues">Limitations and issues</a></li>
 <li><a href="#setext-readme-release-notes">Release notes</a>
 <ul class="sectlevel2">
-<li><a href="#version-0-1-unreleased">Version 0.1 (unreleased)</a></li>
+<li><a href="#version-0-1">Version 0.1</a></li>
 </ul>
 </li>
 <li><a href="#setext-readme-legal">Legal</a></li>
@@ -518,8 +520,10 @@
 generate a scanner and LALR(1) parser(s).</p>
 </div>
 <div class="paragraph">
-<p>SeText is one of the tools of the
-<a href="https://eclipse.org/escet">Eclipse ESCET&#8482; project</a>.</p>
+<p>SeText is one of the tools of the Eclipse ESCET&#8482; project. Visit the
+<a href="https://eclipse.org/escet">project website</a> for downloads,
+installation instructions, source code, general tool usage information,
+information on how to contribute, and more.</p>
 </div>
 <div class="admonitionblock warning">
 <table>
@@ -643,13 +647,13 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="setext">@terminals:
+<pre class="highlight"><code class="language-setext" data-lang="setext">@terminals:
   @keywords Operators = and or;
   @keywords Functions = log sin cos tan;
 end
 
 @terminals:
-  IDTK = &quot;$?[a-zA-Z_][a-zA-Z0-9_]*&quot; {scanID};
+  IDTK = "$?[a-zA-Z_][a-zA-Z0-9_]*" {scanID};
 end</code></pre>
 </div>
 </div>
@@ -684,16 +688,16 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="setext">@terminals:
-  &quot;//.*&quot;;
-  &quot;/\*&quot; -&gt; BLOCK_COMMENT;
+<pre class="highlight"><code class="language-setext" data-lang="setext">@terminals:
+  "//.*";
+  "/\*" -&gt; BLOCK_COMMENT;
   @eof;
 end
 
 @terminals BLOCK_COMMENT:
-  &quot;\*/&quot; -&gt;;
-  &quot;.&quot;;
-  &quot;\n&quot;;
+  "\*/" -&gt;;
+  ".";
+  "\n";
 end</code></pre>
 </div>
 </div>
@@ -725,7 +729,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="setext">@scanner some.package.SomeScanner;</code></pre>
+<pre class="highlight"><code class="language-setext" data-lang="setext">@scanner some.package.SomeScanner;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -737,11 +741,11 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="setext">@shortcut identifier = &quot;$?[a-zA-Z_][a-zA-Z0-9_]*&quot;;
+<pre class="highlight"><code class="language-setext" data-lang="setext">@shortcut identifier = "$?[a-zA-Z_][a-zA-Z0-9_]*";
 
 @terminals:
-  ID2TK = &quot;{identifier}.{identifier}&quot;;
-  ID3TK = &quot;{identifier}.{identifier}.{identifier}&quot;;
+  ID2TK = "{identifier}.{identifier}";
+  ID3TK = "{identifier}.{identifier}.{identifier}";
 end</code></pre>
 </div>
 </div>
@@ -843,15 +847,15 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="setext">@terminals:
-  @keywords Operators = and            // &quot;and&quot;
-                        or;            // &quot;or&quot;
-  IDTK   = &quot;[a-z]+&quot; [an identifier];   // an identifier
-  ID2TK  = &quot;[A-Z]+&quot; [ an identifier ]; // an identifier
-  ASNGTK = &quot;:=&quot;;                       // &quot;:=&quot;
+<pre class="highlight"><code class="language-setext" data-lang="setext">@terminals:
+  @keywords Operators = and            // "and"
+                        or;            // "or"
+  IDTK   = "[a-z]+" [an identifier];   // an identifier
+  ID2TK  = "[A-Z]+" [ an identifier ]; // an identifier
+  ASNGTK = ":=";                       // ":="
   @eof;                                // end-of-file
-  X = &quot;[abc]&quot;;                         // X
-  &quot;[def]&quot;;                             // no description</code></pre>
+  X = "[abc]";                         // X
+  "[def]";                             // no description</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -884,7 +888,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="setext">java.util.String
+<pre class="highlight"><code class="language-setext" data-lang="setext">java.util.String
 java.util.List
 java.util.List&lt;java.util.String&gt;</code></pre>
 </div>
@@ -894,7 +898,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="setext">@import java.util.String;
+<pre class="highlight"><code class="language-setext" data-lang="setext">@import java.util.String;
 @import java.util.String as string;
 @import java.util;
 @import java.util as u;</code></pre>
@@ -909,7 +913,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="setext">java.util.String
+<pre class="highlight"><code class="language-setext" data-lang="setext">java.util.String
 util.String
 u.String
 String
@@ -922,7 +926,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="setext">@import java.util.List&lt;java.util.String&gt; as stringList</code></pre>
+<pre class="highlight"><code class="language-setext" data-lang="setext">@import java.util.List&lt;java.util.String&gt; as stringList</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -949,8 +953,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="setext">@terminals:
-  IDTK = &quot;$?[a-zA-Z_][a-zA-Z0-9_]*&quot; {scanID};
+<pre class="highlight"><code class="language-setext" data-lang="setext">@terminals:
+  IDTK = "$?[a-zA-Z_][a-zA-Z0-9_]*" {scanID};
 end</code></pre>
 </div>
 </div>
@@ -961,7 +965,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="setext">@hooks some.package.SomeHooks;</code></pre>
+<pre class="highlight"><code class="language-setext" data-lang="setext">@hooks some.package.SomeHooks;</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -971,7 +975,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">void</span> scanID(Token token);</code></pre>
+<pre class="highlight"><code class="language-java" data-lang="java">public void scanID(Token token);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -999,7 +1003,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="setext">@main  Program    : some.package.ProgramParser;
+<pre class="highlight"><code class="language-setext" data-lang="setext">@main  Program    : some.package.ProgramParser;
 @start Expression : some.package.ExpressionParser;</code></pre>
 </div>
 </div>
@@ -1034,7 +1038,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="setext">{java.util.List&lt;some.package.SomeClass&gt;}
+<pre class="highlight"><code class="language-setext" data-lang="setext">{java.util.List&lt;some.package.SomeClass&gt;}
 NonTerm : /* empty */
         | NonTerm2
         | NonTerm NonTerm2
@@ -1071,7 +1075,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="setext">@hooks some.package.SomeHooks;
+<pre class="highlight"><code class="language-setext" data-lang="setext">@hooks some.package.SomeHooks;
 
 @import some.package.ast;
 
@@ -1095,15 +1099,15 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="predefined-type">Expression</span> parseExpression1();
+<pre class="highlight"><code class="language-java" data-lang="java">public Expression parseExpression1();
 
-<span class="directive">public</span> <span class="predefined-type">Expression</span> parseExpression2(<span class="predefined-type">Expression</span> e1, Token t2, Literal l3);
+public Expression parseExpression2(Expression e1, Token t2, Literal l3);
 
-<span class="directive">public</span> <span class="predefined-type">Expression</span> parseExpression3(<span class="predefined-type">Expression</span> e1, Literal l3);
+public Expression parseExpression3(Expression e1, Literal l3);
 
-<span class="directive">public</span> Literal parseLiteral1(Token t1);
+public Literal parseLiteral1(Token t1);
 
-<span class="directive">public</span> Literal parseLiteral2();</code></pre>
+public Literal parseLiteral2();</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1127,7 +1131,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="directive">public</span> <span class="type">void</span> setParser&lt;<span class="predefined-type">Parser</span>&lt;?&gt; parser);</code></pre>
+<pre class="highlight"><code class="language-java" data-lang="java">public void setParser&lt;Parser&lt;?&gt; parser);</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1141,42 +1145,42 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="java"><span class="keyword">package</span> <span class="namespace">some.package</span>;
+<pre class="highlight"><code class="language-java" data-lang="java">package some.package;
 
-<span class="keyword">import</span> <span class="include">org.eclipse.escet.setext.runtime.Parser</span>;
-<span class="keyword">import</span> <span class="include">org.eclipse.escet.setext.runtime.Token</span>;
-<span class="keyword">import</span> <span class="include">some.package.ast.Expression</span>;
-<span class="keyword">import</span> <span class="include">some.package.ast.Literal</span>;
+import org.eclipse.escet.setext.runtime.Parser;
+import org.eclipse.escet.setext.runtime.Token;
+import some.package.ast.Expression;
+import some.package.ast.Literal;
 
-<span class="directive">public</span> <span class="type">class</span> <span class="class">SomeHooks</span> <span class="directive">implements</span> ExpressionParser.Hooks {
-    <span class="annotation">@Override</span>
-    <span class="directive">public</span> <span class="type">void</span> setParser(<span class="predefined-type">Parser</span>&lt;?&gt; parser) {
-        <span class="comment">// No need to store this...</span>
+public class SomeHooks implements ExpressionParser.Hooks {
+    @Override
+    public void setParser(Parser&lt;?&gt; parser) {
+        // No need to store this...
     }
 
-    <span class="annotation">@Override</span>
-    <span class="directive">public</span> <span class="predefined-type">Expression</span> parseExpression1() {
-        <span class="keyword">return</span> <span class="predefined-constant">null</span>; <span class="comment">// Do something more useful here...</span>
+    @Override
+    public Expression parseExpression1() {
+        return null; // Do something more useful here...
     }
 
-    <span class="annotation">@Override</span>
-    <span class="directive">public</span> <span class="predefined-type">Expression</span> parseExpression2(<span class="predefined-type">Expression</span> e1, Token t2, Literal l3) {
-        <span class="keyword">return</span> <span class="predefined-constant">null</span>; <span class="comment">// Do something more useful here...</span>
+    @Override
+    public Expression parseExpression2(Expression e1, Token t2, Literal l3) {
+        return null; // Do something more useful here...
     }
 
-    <span class="annotation">@Override</span>
-    <span class="directive">public</span> <span class="predefined-type">Expression</span> parseExpression3(<span class="predefined-type">Expression</span> e1, Literal l3) {
-        <span class="keyword">return</span> <span class="predefined-constant">null</span>; <span class="comment">// Do something more useful here...</span>
+    @Override
+    public Expression parseExpression3(Expression e1, Literal l3) {
+        return null; // Do something more useful here...
     }
 
-    <span class="annotation">@Override</span>
-    <span class="directive">public</span> Literal parseLiteral1(Token t1) {
-        <span class="keyword">return</span> <span class="predefined-constant">null</span>; <span class="comment">// Do something more useful here...</span>
+    @Override
+    public Literal parseLiteral1(Token t1) {
+        return null; // Do something more useful here...
     }
 
-    <span class="annotation">@Override</span>
-    <span class="directive">public</span> Literal parseLiteral2() {
-        <span class="keyword">return</span> <span class="predefined-constant">null</span>; <span class="comment">// Do something more useful here...</span>
+    @Override
+    public Literal parseLiteral2() {
+        return null; // Do something more useful here...
     }
 }</code></pre>
 </div>
@@ -1348,10 +1352,17 @@
 part of the Eclipse ESCET project, are listed below in reverse chronological
 order.</p>
 </div>
-<div class="sect2">
-<h3 id="version-0-1-unreleased">Version 0.1 (unreleased)</h3>
 <div class="paragraph">
-<p>The first release of SeText as part of the Eclipse ESCET project.</p>
+<p>See also the Eclipse ESCET
+<a href="https://www.eclipse.org/escet/escet/#release-notes-chapter-index">toolkit release notes</a>
+covering those aspects that are common to the various Eclipse ESCET tools.</p>
+</div>
+<div class="sect2">
+<h3 id="version-0-1">Version 0.1</h3>
+<div class="paragraph">
+<p>The first release of SeText as part of the Eclipse ESCET project.
+This release is based on the initial contribution by the Eindhoven University
+of Technology (TU/e).</p>
 </div>
 </div>
 </div>
@@ -1361,7 +1372,7 @@
 <div class="sectionbody">
 <div class="paragraph">
 <p>The material in this documentation is
-Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation.</p>
+Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation.</p>
 </div>
 <div class="paragraph">
 <p>Eclipse ESCET and ESCET are trademarks of the Eclipse Foundation.
@@ -1392,95 +1403,6 @@
 </div>
 </div>
 </div>
-<style>
-/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
-pre.CodeRay{background:#f7f7f8}
-.CodeRay .line-numbers{border-right:1px solid currentColor;opacity:.35;padding:0 .5em 0 0}
-.CodeRay span.line-numbers{display:inline-block;margin-right:.75em}
-.CodeRay .line-numbers strong{color:#000}
-table.CodeRay{border-collapse:separate;border:0;margin-bottom:0;background:none}
-table.CodeRay td{vertical-align:top;line-height:inherit}
-table.CodeRay td.line-numbers{text-align:right}
-table.CodeRay td.code{padding:0 0 0 .75em}
-.CodeRay .debug{color:#fff !important;background:#000080 !important}
-.CodeRay .annotation{color:#007}
-.CodeRay .attribute-name{color:#000080}
-.CodeRay .attribute-value{color:#700}
-.CodeRay .binary{color:#509}
-.CodeRay .comment{color:#998;font-style:italic}
-.CodeRay .char{color:#04d}
-.CodeRay .char .content{color:#04d}
-.CodeRay .char .delimiter{color:#039}
-.CodeRay .class{color:#458;font-weight:bold}
-.CodeRay .complex{color:#a08}
-.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
-.CodeRay .color{color:#099}
-.CodeRay .class-variable{color:#369}
-.CodeRay .decorator{color:#b0b}
-.CodeRay .definition{color:#099}
-.CodeRay .delimiter{color:#000}
-.CodeRay .doc{color:#970}
-.CodeRay .doctype{color:#34b}
-.CodeRay .doc-string{color:#d42}
-.CodeRay .escape{color:#666}
-.CodeRay .entity{color:#800}
-.CodeRay .error{color:#808}
-.CodeRay .exception{color:inherit}
-.CodeRay .filename{color:#099}
-.CodeRay .function{color:#900;font-weight:bold}
-.CodeRay .global-variable{color:#008080}
-.CodeRay .hex{color:#058}
-.CodeRay .integer,.CodeRay .float{color:#099}
-.CodeRay .include{color:#555}
-.CodeRay .inline{color:#000}
-.CodeRay .inline .inline{background:#ccc}
-.CodeRay .inline .inline .inline{background:#bbb}
-.CodeRay .inline .inline-delimiter{color:#d14}
-.CodeRay .inline-delimiter{color:#d14}
-.CodeRay .important{color:#555;font-weight:bold}
-.CodeRay .interpreted{color:#b2b}
-.CodeRay .instance-variable{color:#008080}
-.CodeRay .label{color:#970}
-.CodeRay .local-variable{color:#963}
-.CodeRay .octal{color:#40e}
-.CodeRay .predefined{color:#369}
-.CodeRay .preprocessor{color:#579}
-.CodeRay .pseudo-class{color:#555}
-.CodeRay .directive{font-weight:bold}
-.CodeRay .type{font-weight:bold}
-.CodeRay .predefined-type{color:inherit}
-.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
-.CodeRay .key{color:#808}
-.CodeRay .key .delimiter{color:#606}
-.CodeRay .key .char{color:#80f}
-.CodeRay .value{color:#088}
-.CodeRay .regexp .delimiter{color:#808}
-.CodeRay .regexp .content{color:#808}
-.CodeRay .regexp .modifier{color:#808}
-.CodeRay .regexp .char{color:#d14}
-.CodeRay .regexp .function{color:#404;font-weight:bold}
-.CodeRay .string{color:#d20}
-.CodeRay .string .string .string{background:#ffd0d0}
-.CodeRay .string .content{color:#d14}
-.CodeRay .string .char{color:#d14}
-.CodeRay .string .delimiter{color:#d14}
-.CodeRay .shell{color:#d14}
-.CodeRay .shell .delimiter{color:#d14}
-.CodeRay .symbol{color:#990073}
-.CodeRay .symbol .content{color:#a60}
-.CodeRay .symbol .delimiter{color:#630}
-.CodeRay .tag{color:#008080}
-.CodeRay .tag-special{color:#d70}
-.CodeRay .variable{color:#036}
-.CodeRay .insert{background:#afa}
-.CodeRay .delete{background:#faa}
-.CodeRay .change{color:#aaf;background:#007}
-.CodeRay .head{color:#f8f;background:#505}
-.CodeRay .insert .insert{color:#080}
-.CodeRay .delete .delete{color:#800}
-.CodeRay .change .change{color:#66f}
-.CodeRay .head .head{color:#f4f}
-</style>
 <script type="text/x-mathjax-config">
 MathJax.Hub.Config({
   messageStyle: "none",
@@ -1497,16 +1419,16 @@
 })
 MathJax.Hub.Register.StartupHook("AsciiMath Jax Ready", function () {
   MathJax.InputJax.AsciiMath.postfilterHooks.Add(function (data, node) {
-    if ((node = data.script.parentNode) && (node = node.parentNode) && node.classList.contains('stemblock')) {
+    if ((node = data.script.parentNode) && (node = node.parentNode) && node.classList.contains("stemblock")) {
       data.math.root.display = "block"
     }
     return data
   })
 })
 </script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_HTMLorMML"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.9/MathJax.js?config=TeX-MML-AM_HTMLorMML"></script>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
diff --git a/tooldef/eclipse-escet-incubation-tooldef-manual.pdf b/tooldef/eclipse-escet-incubation-tooldef-manual.pdf
index af73880..e0cf645 100644
--- a/tooldef/eclipse-escet-incubation-tooldef-manual.pdf
+++ b/tooldef/eclipse-escet-incubation-tooldef-manual.pdf
Binary files differ
diff --git a/tooldef/index.html b/tooldef/index.html
index 1646574..8d51937 100644
--- a/tooldef/index.html
+++ b/tooldef/index.html
@@ -4,8 +4,8 @@
 <meta charset="UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="generator" content="Asciidoctor 2.0.10">
-<meta name="author" content="Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation">
+<meta name="generator" content="Asciidoctor 2.0.12">
+<meta name="author" content="Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation">
 <link rel="icon" type="image/png" href="favicon.png">
 <title>ToolDef documentation (Incubation)</title>
 <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
@@ -49,7 +49,7 @@
 table{border-collapse:collapse;border-spacing:0}
 *,*::before,*::after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
 html,body{font-size:100%}
-body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
+body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;word-wrap:anywhere;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
 a:hover{cursor:pointer}
 img,object,embed{max-width:100%;height:auto}
 object,embed{height:100%}
@@ -64,10 +64,8 @@
 img,object,svg{display:inline-block;vertical-align:middle}
 textarea{height:auto;min-height:50px}
 select{width:100%}
-.center{margin-left:auto;margin-right:auto}
-.stretch{width:100%}
 .subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em}
-div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0;direction:ltr}
+div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0}
 a{color:#2156a5;text-decoration:underline;line-height:inherit}
 a:hover,a:focus{color:#1d4b8f}
 a img{border:0}
@@ -107,19 +105,22 @@
 h2{font-size:2.3125em}
 h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
 h4{font-size:1.4375em}}
-table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede}
+table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede;word-wrap:normal}
 table thead,table tfoot{background:#f7f8f7}
 table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left}
 table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
 table tr.even,table tr.alt{background:#f8f8f7}
-table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{display:table-cell;line-height:1.6}
+table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6}
 h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
 h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
+.center{margin-left:auto;margin-right:auto}
+.stretch{width:100%}
 .clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table}
 .clearfix::after,.float-group::after{clear:both}
-:not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed;word-wrap:break-word}
-:not(pre)>code.nobreak{word-wrap:normal}
-:not(pre)>code.nowrap{white-space:nowrap}
+:not(pre).nobreak{word-wrap:normal}
+:not(pre).nowrap{white-space:nowrap}
+:not(pre).pre-wrap{white-space:pre-wrap}
+:not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed}
 pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
 pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
 pre>code{display:block}
@@ -184,7 +185,7 @@
 #content #toc{border-style:solid;border-width:1px;border-color:#e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;-webkit-border-radius:4px;border-radius:4px}
 #content #toc>:first-child{margin-top:0}
 #content #toc>:last-child{margin-bottom:0}
-#footer{max-width:100%;background:rgba(0,0,0,.8);padding:1.25em}
+#footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em}
 #footer-text{color:rgba(255,255,255,.8);line-height:1.44}
 #content{margin-bottom:.625em}
 .sect1{padding-bottom:.625em}
@@ -207,7 +208,7 @@
 .admonitionblock>table td.icon{text-align:center;width:80px}
 .admonitionblock>table td.icon img{max-width:none}
 .admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
-.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6)}
+.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6);word-wrap:anywhere}
 .admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
 .exampleblock>.content{border-style:solid;border-width:1px;border-color:#e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;-webkit-border-radius:4px;border-radius:4px}
 .exampleblock>.content>:first-child{margin-top:0}
@@ -217,7 +218,7 @@
 .sidebarblock>:last-child{margin-bottom:0}
 .sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
 .exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
-.literalblock pre,.listingblock>.content>pre{-webkit-border-radius:4px;border-radius:4px;word-wrap:break-word;overflow-x:auto;padding:1em;font-size:.8125em}
+.literalblock pre,.listingblock>.content>pre{-webkit-border-radius:4px;border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em}
 @media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}}
 @media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}}
 .literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class="highlight"],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
@@ -263,21 +264,20 @@
 .quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0}
 .quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem}
 .quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;text-align:left;margin-right:0}
-table.tableblock{max-width:100%;border-collapse:separate}
 p.tableblock:last-child{margin-bottom:0}
+td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere}
 td.tableblock>.content>:last-child{margin-bottom:-1.25em}
-td.tableblock>.content>:last-child.sidebarblock{margin-bottom:0}
 table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
-table.grid-all>thead>tr>.tableblock,table.grid-all>tbody>tr>.tableblock{border-width:0 1px 1px 0}
-table.grid-all>tfoot>tr>.tableblock{border-width:1px 1px 0 0}
-table.grid-cols>*>tr>.tableblock{border-width:0 1px 0 0}
-table.grid-rows>thead>tr>.tableblock,table.grid-rows>tbody>tr>.tableblock{border-width:0 0 1px}
-table.grid-rows>tfoot>tr>.tableblock{border-width:1px 0 0}
-table.grid-all>*>tr>.tableblock:last-child,table.grid-cols>*>tr>.tableblock:last-child{border-right-width:0}
-table.grid-all>tbody>tr:last-child>.tableblock,table.grid-all>thead:last-child>tr>.tableblock,table.grid-rows>tbody>tr:last-child>.tableblock,table.grid-rows>thead:last-child>tr>.tableblock{border-bottom-width:0}
+table.grid-all>*>tr>*{border-width:1px}
+table.grid-cols>*>tr>*{border-width:0 1px}
+table.grid-rows>*>tr>*{border-width:1px 0}
 table.frame-all{border-width:1px}
+table.frame-ends{border-width:1px 0}
 table.frame-sides{border-width:0 1px}
-table.frame-topbot,table.frame-ends{border-width:1px 0}
+table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0}
+table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0}
+table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0}
+table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0}
 table.stripes-all tr,table.stripes-odd tr:nth-of-type(odd),table.stripes-even tr:nth-of-type(even),table.stripes-hover tr:hover{background:#f8f8f7}
 th.halign-left,td.halign-left{text-align:left}
 th.halign-right,td.halign-right{text-align:right}
@@ -286,7 +286,7 @@
 th.valign-bottom,td.valign-bottom{vertical-align:bottom}
 th.valign-middle,td.valign-middle{vertical-align:middle}
 table thead th,table tfoot th{font-weight:bold}
-tbody tr th{display:table-cell;line-height:1.6;background:#f7f8f7}
+tbody tr th{background:#f7f8f7}
 tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
 p.tableblock>code:only-child{background:none;padding:0}
 p.tableblock{font-size:1em}
@@ -315,6 +315,7 @@
 .hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
 td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
 td.hdlist1{font-weight:bold;padding-bottom:1.25em}
+td.hdlist2{word-wrap:anywhere}
 .literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
 .colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
 .colist td:not([class]):first-child img{max-width:none}
@@ -387,7 +388,7 @@
 .admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
 .admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
 .admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
-.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);-webkit-border-radius:100px;border-radius:100px;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
+.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);-webkit-border-radius:50%;border-radius:50%;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
 .conum[data-value] *{color:#fff!important}
 .conum[data-value]+b{display:none}
 .conum[data-value]::after{content:attr(data-value)}
@@ -414,6 +415,7 @@
 svg{max-width:100%}
 p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
 h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
+#header,#content,#footnotes,#footer{max-width:none}
 #toc,.sidebarblock,.exampleblock>.content{background:none!important}
 #toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important}
 body.book #header{text-align:center}
@@ -439,7 +441,7 @@
 </style>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.
@@ -483,8 +485,8 @@
 <div id="header">
 <h1>ToolDef documentation (Incubation)</h1>
 <div class="details">
-<span id="author" class="author">Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation</span><br>
-<span id="revnumber">version 0.1.0.20210126-175926</span>
+<span id="author" class="author">Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation</span><br>
+<span id="revnumber">version 0.1.0.20210305-171633</span>
 </div>
 <div id="toc" class="toc2">
 <div id="toctitle">Table of Contents</div>
@@ -518,7 +520,7 @@
 </li>
 <li><a href="#release-notes-chapter-index">ToolDef release notes</a>
 <ul class="sectlevel2">
-<li><a href="#version-0-1-unreleased">Version 0.1 (unreleased)</a></li>
+<li><a href="#version-0-1">Version 0.1</a></li>
 </ul>
 </li>
 <li><a href="#legal-chapter-index">Legal</a></li>
@@ -535,8 +537,10 @@
 experience.</p>
 </div>
 <div class="paragraph">
-<p>ToolDef is one of the tools of the
-<a href="https://eclipse.org/escet">Eclipse ESCET&#8482; project</a>.</p>
+<p>ToolDef is one of the tools of the Eclipse ESCET&#8482; project. Visit the
+<a href="https://eclipse.org/escet">project website</a> for downloads,
+installation instructions, source code, general tool usage information,
+information on how to contribute, and more.</p>
 </div>
 <div class="admonitionblock warning">
 <table>
@@ -805,7 +809,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">as          else        if          map         tool
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">as          else        if          map         tool
 bool        end         import      null        true
 break       exit        in          object      tuple
 continue    false       int         return      type
@@ -818,7 +822,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">and         div         mod         not         or</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">and         div         mod         not         or</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -826,7 +830,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">abs         enumerate      log         reverse       str
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">abs         enumerate      log         reverse       str
 ceil        floor          lower       round         strdup
 contains    fmt            ltrim       rtrim         subset
 del         indexof        max         size          trim
@@ -841,7 +845,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">err         errln       out         outln</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">err         errln       out         outln</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -849,7 +853,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">app         exec        tooldef</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">app         exec        tooldef</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -857,7 +861,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">abspath     dirname
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">abspath     dirname
 basename    fileext
 chdir       hasfileext
 chfileext   pathjoin
@@ -869,7 +873,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">cpdir       filenewer   isfile      readlines
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">cpdir       filenewer   isfile      readlines
 cpfile      filesize    mkdir       rmdir
 diff        find        mvdir       rmfile
 exists      isdir       mvfile      writefile</code></pre>
@@ -908,7 +912,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">apple       // identifier
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">apple       // identifier
 bear        // identifier
 int         // keyword
 $int        // identifier 'int' (override keyword priority with $)</code></pre>
@@ -934,7 +938,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">some_library.some_tool</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">some_library.some_tool</code></pre>
 </div>
 </div>
 </dd>
@@ -958,7 +962,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">0
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">0
 1
 123</code></pre>
 </div>
@@ -986,7 +990,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">0.0
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">0.0
 1e5
 1E+03
 1.05e-78</code></pre>
@@ -1016,8 +1020,8 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">&quot;hello world&quot;
-&quot;first line\nsecond line&quot;</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">"hello world"
+"first line\nsecond line"</code></pre>
 </div>
 </div>
 </dd>
@@ -1043,7 +1047,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">// Normal layout.
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">// Normal layout.
 int x = 5;
 
 // Alternative layout.
@@ -1072,7 +1076,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">int x = 5; // Single line comment.
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">int x = 5; // Single line comment.
 
 int /* some comment */ x = /* some
   more comments
@@ -1101,7 +1105,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="bnf">Script : /* empty */
+<pre class="highlight"><code class="language-bnf" data-lang="bnf">Script : /* empty */
        | Decls
        ;
 
@@ -1110,144 +1114,144 @@
       ;
 
 Decl : Import
-     | &quot;type&quot; TypeDecls &quot;;&quot;
-     | &quot;tool&quot; IDENTIFIERTK OptTypeParams ToolParameters &quot;:&quot; OptStatements &quot;end&quot;
-     | &quot;tool&quot; Types IDENTIFIERTK OptTypeParams ToolParameters &quot;:&quot; OptStatements &quot;end&quot;
+     | "type" TypeDecls ";"
+     | "tool" IDENTIFIERTK OptTypeParams ToolParameters ":" OptStatements "end"
+     | "tool" Types IDENTIFIERTK OptTypeParams ToolParameters ":" OptStatements "end"
      | Statement
      ;
 
-Import : &quot;import&quot; STRINGTK &quot;;&quot;
-       | &quot;import&quot; STRINGTK &quot;as&quot; IDENTIFIERTK &quot;;&quot;
-       | &quot;import&quot; Name &quot;;&quot;
-       | &quot;import&quot; Name &quot;as&quot; IDENTIFIERTK &quot;;&quot;
-       | &quot;import&quot; Name &quot;:&quot; Name &quot;;&quot;
-       | &quot;import&quot; Name &quot;:&quot; Name &quot;as&quot; IDENTIFIERTK &quot;;&quot;
-       | &quot;from&quot; STRINGTK &quot;import&quot; ImportParts &quot;;&quot;
+Import : "import" STRINGTK ";"
+       | "import" STRINGTK "as" IDENTIFIERTK ";"
+       | "import" Name ";"
+       | "import" Name "as" IDENTIFIERTK ";"
+       | "import" Name ":" Name ";"
+       | "import" Name ":" Name "as" IDENTIFIERTK ";"
+       | "from" STRINGTK "import" ImportParts ";"
        ;
 
-ImportParts : &quot;*&quot;
+ImportParts : "*"
             | IDENTIFIERTK
-            | IDENTIFIERTK &quot;as&quot; IDENTIFIERTK
-            | ImportParts &quot;,&quot; &quot;*&quot;
-            | ImportParts &quot;,&quot; IDENTIFIERTK
-            | ImportParts &quot;,&quot; IDENTIFIERTK &quot;as&quot; IDENTIFIERTK
+            | IDENTIFIERTK "as" IDENTIFIERTK
+            | ImportParts "," "*"
+            | ImportParts "," IDENTIFIERTK
+            | ImportParts "," IDENTIFIERTK "as" IDENTIFIERTK
             ;
 
 TypeDecls : TypeDecl
-          | TypeDecls &quot;,&quot; TypeDecl
+          | TypeDecls "," TypeDecl
           ;
 
-TypeDecl : IDENTIFIERTK &quot;=&quot; Type
+TypeDecl : IDENTIFIERTK "=" Type
          ;
 
 OptTypeParams : /* empty */
-              | &quot;&lt;&quot; Names &quot;&gt;&quot;
+              | "&lt;" Names "&gt;"
               ;
 
-ToolParameters : &quot;(&quot; &quot;)&quot;
-               | &quot;(&quot; ToolParams &quot;)&quot;
+ToolParameters : "(" ")"
+               | "(" ToolParams ")"
                ;
 
 ToolParams : Type ToolParam
-           | Type &quot;...&quot; ToolParam
-           | ToolParams &quot;,&quot; Type ToolParam
-           | ToolParams &quot;,&quot; Type &quot;...&quot; ToolParam
+           | Type "..." ToolParam
+           | ToolParams "," Type ToolParam
+           | ToolParams "," Type "..." ToolParam
            ;
 
 ToolParam : IDENTIFIERTK
-          | IDENTIFIERTK &quot;=&quot; Expression
+          | IDENTIFIERTK "=" Expression
           ;
 
 OptStatements : /* empty */
               | OptStatements Statement
               ;
 
-Statement : Type VarDecls &quot;;&quot;
-          | &quot;while&quot; Expression &quot;:&quot; OptStatements &quot;end&quot;
-          | &quot;while&quot; Expression &quot;::&quot; Statement
-          | &quot;for&quot; AddressableDecls &quot;in&quot; Expression &quot;:&quot; OptStatements &quot;end&quot;
-          | &quot;for&quot; AddressableDecls &quot;in&quot; Expression &quot;::&quot; Statement
-          | &quot;if&quot; Expression &quot;:&quot; OptStatements OptElifStatements OptElseStatement &quot;end&quot;
-          | &quot;if&quot; Expression &quot;::&quot; Statement
-          | &quot;break&quot; &quot;;&quot;
-          | &quot;continue&quot; &quot;;&quot;
-          | Addressables &quot;=&quot; Expressions &quot;;&quot;
-          | &quot;return&quot; &quot;;&quot;
-          | &quot;return&quot; Expressions &quot;;&quot;
-          | ToolInvokeExpression &quot;;&quot;
-          | &quot;exit&quot; &quot;;&quot;
-          | &quot;exit&quot; Expression &quot;;&quot;
+Statement : Type VarDecls ";"
+          | "while" Expression ":" OptStatements "end"
+          | "while" Expression "::" Statement
+          | "for" AddressableDecls "in" Expression ":" OptStatements "end"
+          | "for" AddressableDecls "in" Expression "::" Statement
+          | "if" Expression ":" OptStatements OptElifStatements OptElseStatement "end"
+          | "if" Expression "::" Statement
+          | "break" ";"
+          | "continue" ";"
+          | Addressables "=" Expressions ";"
+          | "return" ";"
+          | "return" Expressions ";"
+          | ToolInvokeExpression ";"
+          | "exit" ";"
+          | "exit" Expression ";"
           ;
 
 VarDecls : VarDecl
-         | VarDecls &quot;,&quot; VarDecl
+         | VarDecls "," VarDecl
          ;
 
 VarDecl : IDENTIFIERTK
-        | IDENTIFIERTK &quot;=&quot; Expression
+        | IDENTIFIERTK "=" Expression
         ;
 
 OptElifStatements : /* empty */
-                  | OptElifStatements &quot;elif&quot; Expression &quot;:&quot; OptStatements
+                  | OptElifStatements "elif" Expression ":" OptStatements
                   ;
 
 OptElseStatement : /* empty */
-                 | &quot;else&quot; OptStatements
+                 | "else" OptStatements
                  ;
 
 AddressableDecls : AddressableDecl
-                 | AddressableDecls &quot;,&quot; AddressableDecl
+                 | AddressableDecls "," AddressableDecl
                  ;
 
 AddressableDecl : IDENTIFIERTK
-                | &quot;(&quot; AddressableDecl &quot;,&quot; AddressableDecls &quot;)&quot;
+                | "(" AddressableDecl "," AddressableDecls ")"
                 ;
 
 Addressables : Addressable
-             | Addressables &quot;,&quot; Addressable
+             | Addressables "," Addressable
              ;
 
 Addressable : IDENTIFIERTK
             | IDENTIFIERTK Projections
-            | &quot;(&quot; Addressable &quot;,&quot; Addressables &quot;)&quot;
+            | "(" Addressable "," Addressables ")"
             ;
 
 Projections : Projection
             | Projections Projection
             ;
 
-Projection : &quot;[&quot; Expression &quot;]&quot;
+Projection : "[" Expression "]"
            ;
 
 Types : Type
-      | Types &quot;,&quot; Type
+      | Types "," Type
       ;
 
-Type : &quot;bool&quot;
-     | &quot;bool&quot; &quot;?&quot;
-     | &quot;int&quot;
-     | &quot;int&quot; &quot;?&quot;
-     | &quot;long&quot;
-     | &quot;long&quot; &quot;?&quot;
-     | &quot;double&quot;
-     | &quot;double&quot; &quot;?&quot;
-     | &quot;string&quot;
-     | &quot;string&quot; &quot;?&quot;
-     | &quot;list&quot; Type
-     | &quot;list&quot; &quot;?&quot; Type
-     | &quot;set&quot; Type
-     | &quot;set&quot; &quot;?&quot; Type
-     | &quot;map&quot; &quot;(&quot; Type &quot;:&quot; Type &quot;)&quot;
-     | &quot;map&quot; &quot;?&quot; &quot;(&quot; Type &quot;:&quot; Type &quot;)&quot;
-     | &quot;tuple&quot; &quot;(&quot; Type &quot;,&quot; Types &quot;)&quot;
-     | &quot;tuple&quot; &quot;?&quot; &quot;(&quot; Type &quot;,&quot; Types &quot;)&quot;
-     | &quot;object&quot;
-     | &quot;object&quot; &quot;?&quot;
+Type : "bool"
+     | "bool" "?"
+     | "int"
+     | "int" "?"
+     | "long"
+     | "long" "?"
+     | "double"
+     | "double" "?"
+     | "string"
+     | "string" "?"
+     | "list" Type
+     | "list" "?" Type
+     | "set" Type
+     | "set" "?" Type
+     | "map" "(" Type ":" Type ")"
+     | "map" "?" "(" Type ":" Type ")"
+     | "tuple" "(" Type "," Types ")"
+     | "tuple" "?" "(" Type "," Types ")"
+     | "object"
+     | "object" "?"
      | Name
      ;
 
 Expressions : Expression
-            | Expressions &quot;,&quot; Expression
+            | Expressions "," Expression
             ;
 
 OptExpression : /* empty */
@@ -1255,69 +1259,69 @@
               ;
 
 Expression : AndExpression
-           | Expression &quot;or&quot; AndExpression
+           | Expression "or" AndExpression
            ;
 
 AndExpression : CompareExpression
-              | AndExpression &quot;and&quot; CompareExpression
+              | AndExpression "and" CompareExpression
               ;
 
 CompareExpression : AddExpression
-                  | CompareExpression &quot;&lt;&quot; AddExpression
-                  | CompareExpression &quot;&lt;=&quot; AddExpression
-                  | CompareExpression &quot;==&quot; AddExpression
-                  | CompareExpression &quot;!=&quot; AddExpression
-                  | CompareExpression &quot;&gt;=&quot; AddExpression
-                  | CompareExpression &quot;&gt;&quot; AddExpression
+                  | CompareExpression "&lt;" AddExpression
+                  | CompareExpression "&lt;=" AddExpression
+                  | CompareExpression "==" AddExpression
+                  | CompareExpression "!=" AddExpression
+                  | CompareExpression "&gt;=" AddExpression
+                  | CompareExpression "&gt;" AddExpression
                   ;
 
 AddExpression : MulExpression
-              | AddExpression &quot;-&quot; MulExpression
-              | AddExpression &quot;+&quot; MulExpression
+              | AddExpression "-" MulExpression
+              | AddExpression "+" MulExpression
               ;
 
 MulExpression : UnaryExpression
-              | MulExpression &quot;*&quot; UnaryExpression
-              | MulExpression &quot;/&quot; UnaryExpression
-              | MulExpression &quot;div&quot; UnaryExpression
-              | MulExpression &quot;mod&quot; UnaryExpression
+              | MulExpression "*" UnaryExpression
+              | MulExpression "/" UnaryExpression
+              | MulExpression "div" UnaryExpression
+              | MulExpression "mod" UnaryExpression
               ;
 
 UnaryExpression : ProjExpression
-                | &quot;-&quot; UnaryExpression
-                | &quot;+&quot; UnaryExpression
-                | &quot;not&quot; UnaryExpression
+                | "-" UnaryExpression
+                | "+" UnaryExpression
+                | "not" UnaryExpression
                 ;
 
 ProjExpression : ExpressionFactor
-               | ProjExpression &quot;[&quot; Expression &quot;]&quot;
-               | ProjExpression &quot;[&quot; OptExpression &quot;:&quot; OptExpression &quot;]&quot;
+               | ProjExpression "[" Expression "]"
+               | ProjExpression "[" OptExpression ":" OptExpression "]"
                ;
 
-ExpressionFactor : &quot;true&quot;
-                 | &quot;false&quot;
+ExpressionFactor : "true"
+                 | "false"
                  | NUMBERTK
                  | DOUBLETK
-                 | &quot;null&quot;
+                 | "null"
                  | STRINGTK
-                 | &quot;&lt;&quot; Type &quot;&gt;&quot; ExpressionFactor
-                 | &quot;[&quot; &quot;]&quot;
-                 | &quot;[&quot; Expressions OptComma &quot;]&quot;
-                 | &quot;{&quot; &quot;}&quot;
-                 | &quot;{&quot; Expressions OptComma &quot;}&quot;
-                 | &quot;{&quot; MapEntries OptComma &quot;}&quot;
-                 | &quot;(&quot; Expression &quot;,&quot; Expressions OptComma &quot;)&quot;
-                 | &quot;(&quot; Expression &quot;)&quot;
+                 | "&lt;" Type "&gt;" ExpressionFactor
+                 | "[" "]"
+                 | "[" Expressions OptComma "]"
+                 | "{" "}"
+                 | "{" Expressions OptComma "}"
+                 | "{" MapEntries OptComma "}"
+                 | "(" Expression "," Expressions OptComma ")"
+                 | "(" Expression ")"
                  | ToolInvokeExpression
                  | Name
                  ;
 
-MapEntries : Expression &quot;:&quot; Expression
-           | MapEntries &quot;,&quot; Expression &quot;:&quot; Expression
+MapEntries : Expression ":" Expression
+           | MapEntries "," Expression ":" Expression
            ;
 
-ToolInvokeExpression : ToolRef &quot;(&quot; ToolArgs OptComma &quot;)&quot;
-                     | ToolRef &quot;(&quot; &quot;)&quot;
+ToolInvokeExpression : ToolRef "(" ToolArgs OptComma ")"
+                     | ToolRef "(" ")"
                      ;
 
 ToolRef : BuiltInTool
@@ -1332,13 +1336,13 @@
             ;
 
 ToolArgs : Expression
-         | IDENTIFIERTK &quot;=&quot; Expression
-         | ToolArgs &quot;,&quot; Expression
-         | ToolArgs &quot;,&quot; IDENTIFIERTK &quot;=&quot; Expression
+         | IDENTIFIERTK "=" Expression
+         | ToolArgs "," Expression
+         | ToolArgs "," IDENTIFIERTK "=" Expression
          ;
 
 Names : Name
-      | Names &quot;,&quot; Name
+      | Names "," Name
       ;
 
 Name : IDENTIFIERTK
@@ -1346,88 +1350,88 @@
      ;
 
 OptComma : /* empty */
-         | &quot;,&quot;
+         | ","
          ;
 
-BuiltInIoTool : &quot;err&quot;
-              | &quot;errln&quot;
-              | &quot;out&quot;
-              | &quot;outln&quot;
+BuiltInIoTool : "err"
+              | "errln"
+              | "out"
+              | "outln"
               ;
 
-BuiltInGenericTool : &quot;app&quot;
-                   | &quot;exec&quot;
-                   | &quot;tooldef&quot;
+BuiltInGenericTool : "app"
+                   | "exec"
+                   | "tooldef"
                    ;
 
-BuiltInPathTool : &quot;abspath&quot;
-                | &quot;basename&quot;
-                | &quot;chdir&quot;
-                | &quot;chfileext&quot;
-                | &quot;curdir&quot;
-                | &quot;dirname&quot;
-                | &quot;fileext&quot;
-                | &quot;hasfileext&quot;
-                | &quot;pathjoin&quot;
-                | &quot;scriptpath&quot;
+BuiltInPathTool : "abspath"
+                | "basename"
+                | "chdir"
+                | "chfileext"
+                | "curdir"
+                | "dirname"
+                | "fileext"
+                | "hasfileext"
+                | "pathjoin"
+                | "scriptpath"
                 ;
 
-BuiltInFileTool : &quot;cpdir&quot;
-                | &quot;cpfile&quot;
-                | &quot;diff&quot;
-                | &quot;exists&quot;
-                | &quot;filenewer&quot;
-                | &quot;filesize&quot;
-                | &quot;find&quot;
-                | &quot;isdir&quot;
-                | &quot;isfile&quot;
-                | &quot;mkdir&quot;
-                | &quot;mvdir&quot;
-                | &quot;mvfile&quot;
-                | &quot;readlines&quot;
-                | &quot;rmdir&quot;
-                | &quot;rmfile&quot;
-                | &quot;writefile&quot;
+BuiltInFileTool : "cpdir"
+                | "cpfile"
+                | "diff"
+                | "exists"
+                | "filenewer"
+                | "filesize"
+                | "find"
+                | "isdir"
+                | "isfile"
+                | "mkdir"
+                | "mvdir"
+                | "mvfile"
+                | "readlines"
+                | "rmdir"
+                | "rmfile"
+                | "writefile"
                 ;
 
-BuiltInDataTool : &quot;abs&quot;
-                | &quot;ceil&quot;
-                | &quot;contains&quot;
-                | &quot;del&quot;
-                | &quot;delidx&quot;
-                | &quot;empty&quot;
-                | &quot;endswith&quot;
-                | &quot;entries&quot;
-                | &quot;enumerate&quot;
-                | &quot;floor&quot;
-                | &quot;fmt&quot;
-                | &quot;indexof&quot;
-                | &quot;join&quot;
-                | &quot;keys&quot;
-                | &quot;lastindexof&quot;
-                | &quot;ln&quot;
-                | &quot;log&quot;
-                | &quot;lower&quot;
-                | &quot;ltrim&quot;
-                | &quot;max&quot;
-                | &quot;min&quot;
-                | &quot;pow&quot;
-                | &quot;range&quot;
-                | &quot;replace&quot;
-                | &quot;reverse&quot;
-                | &quot;round&quot;
-                | &quot;rtrim&quot;
-                | &quot;size&quot;
-                | &quot;sorted&quot;
-                | &quot;split&quot;
-                | &quot;sqrt&quot;
-                | &quot;startswith&quot;
-                | &quot;str&quot;
-                | &quot;strdup&quot;
-                | &quot;subset&quot;
-                | &quot;trim&quot;
-                | &quot;upper&quot;
-                | &quot;values&quot;
+BuiltInDataTool : "abs"
+                | "ceil"
+                | "contains"
+                | "del"
+                | "delidx"
+                | "empty"
+                | "endswith"
+                | "entries"
+                | "enumerate"
+                | "floor"
+                | "fmt"
+                | "indexof"
+                | "join"
+                | "keys"
+                | "lastindexof"
+                | "ln"
+                | "log"
+                | "lower"
+                | "ltrim"
+                | "max"
+                | "min"
+                | "pow"
+                | "range"
+                | "replace"
+                | "reverse"
+                | "round"
+                | "rtrim"
+                | "size"
+                | "sorted"
+                | "split"
+                | "sqrt"
+                | "startswith"
+                | "str"
+                | "strdup"
+                | "subset"
+                | "trim"
+                | "upper"
+                | "values"
                 ;</code></pre>
 </div>
 </div>
@@ -1510,7 +1514,7 @@
 <h5 id="lang-ref-builtins-operators-not">not operator</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool not(bool arg)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool not(bool arg)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1541,7 +1545,7 @@
 <h5 id="lang-ref-builtins-operators-and">and operator</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool  and(bool left, bool right)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool  and(bool left, bool right)
 tool set T and&lt;T&gt;(set T left, set T right)</code></pre>
 </div>
 </div>
@@ -1591,7 +1595,7 @@
 <h5 id="lang-ref-builtins-operators-or">or operator</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool  or(bool left, bool right)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool  or(bool left, bool right)
 tool set T or&lt;T&gt;(set T left, set T right)</code></pre>
 </div>
 </div>
@@ -1641,7 +1645,7 @@
 <h5 id="lang-ref-builtins-operators-plus-unary">+ operator (unary)</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool int    +(int arg)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool int    +(int arg)
 tool long   +(long arg)
 tool double +(double arg)</code></pre>
 </div>
@@ -1676,7 +1680,7 @@
 <h5 id="lang-ref-builtins-operators-plus-binary">+ operator (binary)</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool int      +(int left, int right)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool int      +(int left, int right)
 tool long     +(long left, long right)
 tool double   +(double left, double right)
 tool string   +(string left, string right)
@@ -1750,7 +1754,7 @@
 <h5 id="lang-ref-builtins-operators-dash-unary">- operator (unary)</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool int    -(int arg)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool int    -(int arg)
 tool long   -(long arg)
 tool double -(double arg)</code></pre>
 </div>
@@ -1793,7 +1797,7 @@
 <h5 id="lang-ref-builtins-operators-dash-binary">- operator (binary)</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool int      -(int left, int right)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool int      -(int left, int right)
 tool long     -(long left, long right)
 tool double   -(double left, double right)
 tool set T    -&lt;T&gt;(set T left, set T right)
@@ -1868,7 +1872,7 @@
 <h5 id="lang-ref-builtins-operators-star">* operator</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool int    *(int left, int right)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool int    *(int left, int right)
 tool long   *(long left, long right)
 tool double *(double left, double right)</code></pre>
 </div>
@@ -1915,7 +1919,7 @@
 <h5 id="lang-ref-builtins-operators-slash">/ operator</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool double /(double left, double right)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool double /(double left, double right)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1960,7 +1964,7 @@
 <h5 id="lang-ref-builtins-operators-div">div operator</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool int  div(int left, int right)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool int  div(int left, int right)
 tool long div(long left, long right)</code></pre>
 </div>
 </div>
@@ -2006,7 +2010,7 @@
 <h5 id="lang-ref-builtins-operators-mod">mod operator</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool int  mod(int left, int right)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool int  mod(int left, int right)
 tool long mod(long left, long right)</code></pre>
 </div>
 </div>
@@ -2052,7 +2056,7 @@
 <h5 id="lang-ref-builtins-operators-lt">&lt; operator</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool &lt;(int left, int right)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool &lt;(int left, int right)
 tool bool &lt;(long left, long right)
 tool bool &lt;(double left, double right)</code></pre>
 </div>
@@ -2091,7 +2095,7 @@
 <h5 id="lang-ref-builtins-operators-le">&lt;= operator</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool &lt;=(int left, int right)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool &lt;=(int left, int right)
 tool bool &lt;=(long left, long right)
 tool bool &lt;=(double left, double right)</code></pre>
 </div>
@@ -2130,7 +2134,7 @@
 <h5 id="lang-ref-builtins-operators-gt">> operator</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool &gt;(int left, int right)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool &gt;(int left, int right)
 tool bool &gt;(long left, long right)
 tool bool &gt;(double left, double right)</code></pre>
 </div>
@@ -2169,7 +2173,7 @@
 <h5 id="lang-ref-builtins-operators-ge">>= operator</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool &gt;=(int left, int right)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool &gt;=(int left, int right)
 tool bool &gt;=(long left, long right)
 tool bool &gt;=(double left, double right)</code></pre>
 </div>
@@ -2208,7 +2212,7 @@
 <h5 id="lang-ref-builtins-operators-eq">== operator</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool ==&lt;T&gt;(T left, T right)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool ==&lt;T&gt;(T left, T right)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2254,7 +2258,7 @@
 <h5 id="lang-ref-builtins-operators-ne">!= operator</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool !=&lt;T&gt;(T left, T right)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool !=&lt;T&gt;(T left, T right)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2425,7 +2429,7 @@
 <h5 id="lang-ref-builtins-data-abs">abs tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool int    abs(int x)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool int    abs(int x)
 tool long   abs(long x)
 tool double abs(double x)</code></pre>
 </div>
@@ -2468,7 +2472,7 @@
 <h5 id="lang-ref-builtins-data-ceil">ceil tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool long ceil(double x)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool long ceil(double x)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2510,7 +2514,7 @@
 <h5 id="lang-ref-builtins-data-contains">contains tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool contains(string whole, string part)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool contains(string whole, string part)
 tool bool contains&lt;T&gt;(list T $list, T elem)
 tool bool contains&lt;T&gt;(set T $set, T elem)
 tool bool contains&lt;K,V&gt;(map(K:V) $map, K key)</code></pre>
@@ -2572,7 +2576,7 @@
 <h5 id="lang-ref-builtins-data-del">del tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool list T   del&lt;T&gt;(list T $list, T elem)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool list T   del&lt;T&gt;(list T $list, T elem)
 tool set T    del&lt;T&gt;(set T $set, T elem)
 tool map(K:V) del&lt;K,V&gt;(map(K:V) $map, K key)</code></pre>
 </div>
@@ -2633,7 +2637,7 @@
 <h5 id="lang-ref-builtins-data-delidx">delidx tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool list T delidx&lt;T&gt;(list T $list, int index)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool list T delidx&lt;T&gt;(list T $list, int index)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2690,7 +2694,7 @@
 <h5 id="lang-ref-builtins-data-empty">empty tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool empty(string x)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool empty(string x)
 tool bool empty&lt;T&gt;(list T x)
 tool bool empty&lt;T&gt;(set T x)
 tool bool empty&lt;K,V&gt;(map(K:V) x)</code></pre>
@@ -2744,7 +2748,7 @@
 <h5 id="lang-ref-builtins-data-endswith">endswith tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool endswith(string whole, string suffix)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool endswith(string whole, string suffix)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2781,7 +2785,7 @@
 <h5 id="lang-ref-builtins-data-entries">entries tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool list tuple(K, V) entries&lt;K,V&gt;(map(K:V) $map)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool list tuple(K, V) entries&lt;K,V&gt;(map(K:V) $map)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2828,7 +2832,7 @@
 <h5 id="lang-ref-builtins-data-enumerate">enumerate tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool list tuple(int, T) enumerate&lt;T&gt;(list T $list)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool list tuple(int, T) enumerate&lt;T&gt;(list T $list)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2872,7 +2876,7 @@
 <h5 id="lang-ref-builtins-data-floor">floor tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool long floor(double x)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool long floor(double x)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2914,7 +2918,7 @@
 <h5 id="lang-ref-builtins-data-fmt">fmt tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string fmt(string pattern, object?... args)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string fmt(string pattern, object?... args)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -2966,7 +2970,7 @@
 <h5 id="lang-ref-builtins-data-indexof">indexof tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool int indexof(string whole, string part)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool int indexof(string whole, string part)
 tool int indexof(string whole, string part, int offset)
 tool int indexof&lt;T&gt;(list T $list, T elem)
 tool int indexof&lt;T&gt;(list T $list, T elem, int offset)</code></pre>
@@ -3033,7 +3037,7 @@
 <h5 id="lang-ref-builtins-data-join">join tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string join(string... texts)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string join(string... texts)
 tool string join(list string texts)
 tool string join(list string texts, string separator)</code></pre>
 </div>
@@ -3071,7 +3075,7 @@
 <h5 id="lang-ref-builtins-data-keys">keys tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool set K keys&lt;K,V&gt;(map(K:V) $map)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool set K keys&lt;K,V&gt;(map(K:V) $map)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3117,7 +3121,7 @@
 <h5 id="lang-ref-builtins-data-lastindexof">lastindexof tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool int lastindexof(string whole, string part)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool int lastindexof(string whole, string part)
 tool int lastindexof(string whole, string part, int offset)
 tool int lastindexof&lt;T&gt;(list T $list, T elem)
 tool int lastindexof&lt;T&gt;(list T $list, T elem, int offset)</code></pre>
@@ -3184,7 +3188,7 @@
 <h5 id="lang-ref-builtins-data-ln">ln tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool double ln(double x)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool double ln(double x)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3225,7 +3229,7 @@
 <h5 id="lang-ref-builtins-data-log">log tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool double log(double x)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool double log(double x)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3266,7 +3270,7 @@
 <h5 id="lang-ref-builtins-data-lower">lower tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string lower(string text)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string lower(string text)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3297,7 +3301,7 @@
 <h5 id="lang-ref-builtins-data-ltrim">ltrim tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string ltrim(string text)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string ltrim(string text)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3328,7 +3332,7 @@
 <h5 id="lang-ref-builtins-data-max">max tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool int    max(int... x)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool int    max(int... x)
 tool long   max(long... x)
 tool double max(double... x)
 tool int    max(list int x)
@@ -3366,7 +3370,7 @@
 <h5 id="lang-ref-builtins-data-min">min tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool int    min(int... x)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool int    min(int... x)
 tool long   min(long... x)
 tool double min(double... x)
 tool int    min(list int x)
@@ -3404,7 +3408,7 @@
 <h5 id="lang-ref-builtins-data-pow">pow tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool double pow(double base, double exponent)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool double pow(double base, double exponent)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3449,7 +3453,7 @@
 <h5 id="lang-ref-builtins-data-range">range tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool list int range(int count)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool list int range(int count)
 tool list int range(int begin, int $end)
 tool list int range&lt;T&gt;(list T $list)</code></pre>
 </div>
@@ -3510,7 +3514,7 @@
 <h5 id="lang-ref-builtins-data-replace">replace tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string replace(string text, string oldtext, string newtext)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string replace(string text, string oldtext, string newtext)
 tool list T replace&lt;T&gt;(list T $list, T oldelem, T newelem)</code></pre>
 </div>
 </div>
@@ -3566,7 +3570,7 @@
 <h5 id="lang-ref-builtins-data-reverse">reverse tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string reverse(string text)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string reverse(string text)
 tool list T reverse&lt;T&gt;(list T $list)</code></pre>
 </div>
 </div>
@@ -3609,7 +3613,7 @@
 <h5 id="lang-ref-builtins-data-round">round tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool long round(double x)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool long round(double x)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3651,7 +3655,7 @@
 <h5 id="lang-ref-builtins-data-rtrim">rtrim tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string rtrim(string text)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string rtrim(string text)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3682,7 +3686,7 @@
 <h5 id="lang-ref-builtins-data-size">size tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool int size(string x)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool int size(string x)
 tool int size&lt;T&gt;(list T x)
 tool int size&lt;T&gt;(set T x)
 tool int size&lt;K,V&gt;(map(K:V) x)</code></pre>
@@ -3736,7 +3740,7 @@
 <h5 id="lang-ref-builtins-data-sorted">sorted tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool list T sorted&lt;T&gt;(list T $list)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool list T sorted&lt;T&gt;(list T $list)
 tool list T sorted&lt;T&gt;(set T $set)</code></pre>
 </div>
 </div>
@@ -3784,7 +3788,7 @@
 <h5 id="lang-ref-builtins-data-split">split tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool list string split(string text, string? separator = null, bool removeEmpty = true)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool list string split(string text, string? separator = null, bool removeEmpty = true)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3826,7 +3830,7 @@
 <h5 id="lang-ref-builtins-data-sqrt">sqrt tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool double sqrt(double x)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool double sqrt(double x)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3867,7 +3871,7 @@
 <h5 id="lang-ref-builtins-data-startswith">startswith tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool startswith(string whole, string prefix)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool startswith(string whole, string prefix)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3904,7 +3908,7 @@
 <h5 id="lang-ref-builtins-data-str">str tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string str(object? value)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string str(object? value)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3945,7 +3949,7 @@
 <h5 id="lang-ref-builtins-data-strdup">strdup tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string strdup(string text, int count)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string strdup(string text, int count)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3990,7 +3994,7 @@
 <h5 id="lang-ref-builtins-data-subset">subset tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool subset&lt;T&gt;(set T part, set T whole)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool subset&lt;T&gt;(set T part, set T whole)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4038,7 +4042,7 @@
 <h5 id="lang-ref-builtins-data-trim">trim tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string trim(string text)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string trim(string text)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4070,7 +4074,7 @@
 <h5 id="lang-ref-builtins-data-upper">upper tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string upper(string text)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string upper(string text)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4101,7 +4105,7 @@
 <h5 id="lang-ref-builtins-data-values">values tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool set V values&lt;K,V&gt;(map(K:V) $map)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool set V values&lt;K,V&gt;(map(K:V) $map)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4169,7 +4173,7 @@
 <h5 id="lang-ref-builtins-io-out">out tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool out(string pattern, object?... args)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool out(string pattern, object?... args)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4212,7 +4216,7 @@
 <h5 id="lang-ref-builtins-io-err">err tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool err(string pattern, object?... args)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool err(string pattern, object?... args)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4255,7 +4259,7 @@
 <h5 id="lang-ref-builtins-io-outln">outln tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool outln(string pattern = &quot;&quot;, object?... args)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool outln(string pattern = "", object?... args)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4299,7 +4303,7 @@
 <h5 id="lang-ref-builtins-io-errln">errln tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool errln(string pattern = &quot;&quot;, object?... args)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool errln(string pattern = "", object?... args)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4362,8 +4366,8 @@
 <h5 id="lang-ref-builtins-generic-app">app tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool int app(string? plugin, string classname, string... args,        string stdin = &quot;-&quot;, string stdout = &quot;-&quot;, string stderr = &quot;-&quot;, bool appendOut = false, bool appendErr = false, bool errToOut = false, bool ignoreNonZeroExitCode = false)
-tool int app(string? plugin, string classname, list string args = [], string stdin = &quot;-&quot;, string stdout = &quot;-&quot;, string stderr = &quot;-&quot;, bool appendOut = false, bool appendErr = false, bool errToOut = false, bool ignoreNonZeroExitCode = false)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool int app(string? plugin, string classname, string... args,        string stdin = "-", string stdout = "-", string stderr = "-", bool appendOut = false, bool appendErr = false, bool errToOut = false, bool ignoreNonZeroExitCode = false)
+tool int app(string? plugin, string classname, list string args = [], string stdin = "-", string stdout = "-", string stderr = "-", bool appendOut = false, bool appendErr = false, bool errToOut = false, bool ignoreNonZeroExitCode = false)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4514,8 +4518,8 @@
 <h5 id="lang-ref-builtins-generic-exec">exec tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool int exec(string cmd, string... args,        string stdin = &quot;&quot;, string stdout = &quot;-&quot;, string stderr = &quot;-&quot;, bool appendOut = false, bool appendErr = false, bool errToOut = false, bool ignoreNonZeroExitCode = false)
-tool int exec(string cmd, list string args = [], string stdin = &quot;&quot;, string stdout = &quot;-&quot;, string stderr = &quot;-&quot;, bool appendOut = false, bool appendErr = false, bool errToOut = false, bool ignoreNonZeroExitCode = false)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool int exec(string cmd, string... args,        string stdin = "", string stdout = "-", string stderr = "-", bool appendOut = false, bool appendErr = false, bool errToOut = false, bool ignoreNonZeroExitCode = false)
+tool int exec(string cmd, list string args = [], string stdin = "", string stdout = "-", string stderr = "-", bool appendOut = false, bool appendErr = false, bool errToOut = false, bool ignoreNonZeroExitCode = false)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4636,8 +4640,8 @@
 <h5 id="lang-ref-builtins-generic-tooldef">tooldef tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool int tooldef(string... args,        string stdin = &quot;-&quot;, string stdout = &quot;-&quot;, string stderr = &quot;-&quot;, bool appendOut = false, bool appendErr = false, bool errToOut = false, bool ignoreNonZeroExitCode = false)
-tool int tooldef(list string args = [], string stdin = &quot;-&quot;, string stdout = &quot;-&quot;, string stderr = &quot;-&quot;, bool appendOut = false, bool appendErr = false, bool errToOut = false, bool ignoreNonZeroExitCode = false)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool int tooldef(string... args,        string stdin = "-", string stdout = "-", string stderr = "-", bool appendOut = false, bool appendErr = false, bool errToOut = false, bool ignoreNonZeroExitCode = false)
+tool int tooldef(list string args = [], string stdin = "-", string stdout = "-", string stderr = "-", bool appendOut = false, bool appendErr = false, bool errToOut = false, bool ignoreNonZeroExitCode = false)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4790,7 +4794,7 @@
 <h5 id="lang-ref-builtins-path-abspath">abspath tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string abspath(string path)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string abspath(string path)
 tool string abspath(string path, string workdir)</code></pre>
 </div>
 </div>
@@ -4832,7 +4836,7 @@
 <h5 id="lang-ref-builtins-path-basename">basename tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string basename(string path)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string basename(string path)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4877,7 +4881,7 @@
 <h5 id="lang-ref-builtins-path-chdir">chdir tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool chdir(string path)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool chdir(string path)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4923,7 +4927,7 @@
 <h5 id="lang-ref-builtins-path-chfileext">chfileext tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string chfileext(string path, string? oldext = null, string? newext = null)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string chfileext(string path, string? oldext = null, string? newext = null)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4966,7 +4970,7 @@
 <h5 id="lang-ref-builtins-path-curdir">curdir tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string curdir()</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string curdir()</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4987,7 +4991,7 @@
 <h5 id="lang-ref-builtins-path-dirname">dirname tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string dirname(string path)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string dirname(string path)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5034,7 +5038,7 @@
 <h5 id="lang-ref-builtins-path-fileext">fileext tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string fileext(string path)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string fileext(string path)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5067,7 +5071,7 @@
 <h5 id="lang-ref-builtins-path-hasfileext">hasfileext tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool hasfileext(string path, string ext)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool hasfileext(string path, string ext)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5103,7 +5107,7 @@
 <h5 id="lang-ref-builtins-path-pathjoin">pathjoin tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string pathjoin(string... paths)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string pathjoin(string... paths)
 tool string pathjoin(list string paths)</code></pre>
 </div>
 </div>
@@ -5138,7 +5142,7 @@
 <h5 id="lang-ref-builtins-path-scriptpath">scriptpath tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool string scriptpath()</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool string scriptpath()</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5217,7 +5221,7 @@
 <h5 id="lang-ref-builtins-file-cpfile">cpfile tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool cpfile(string source, string target, bool overwrite = false)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool cpfile(string source, string target, bool overwrite = false)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5283,7 +5287,7 @@
 <h5 id="lang-ref-builtins-file-cpdir">cpdir tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool cpdir(string source, string target)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool cpdir(string source, string target)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5356,7 +5360,7 @@
 <h5 id="lang-ref-builtins-file-diff">diff tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool diff(string file1, string file2, string output = &quot;-&quot;, bool missingAsEmpty = false, bool warnOnDiff = false, bool failOnDiff = false)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool diff(string file1, string file2, string output = "-", bool missingAsEmpty = false, bool warnOnDiff = false, bool failOnDiff = false)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5457,7 +5461,7 @@
 <h5 id="lang-ref-builtins-file-exists">exists tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool exists(string path)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool exists(string path)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5489,7 +5493,7 @@
 <h5 id="lang-ref-builtins-file-filenewer">filenewer tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool filenewer(string path, string refpath,       bool allowNonExisting = false, bool sameAsNewer = true)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool filenewer(string path, string refpath,       bool allowNonExisting = false, bool sameAsNewer = true)
 tool bool filenewer(string path, string... refpaths,   bool allowNonExisting = false, bool sameAsNewer = true)
 tool bool filenewer(string path, list string refpaths, bool allowNonExisting = false, bool sameAsNewer = true)</code></pre>
 </div>
@@ -5570,7 +5574,7 @@
 <h5 id="lang-ref-builtins-file-filesize">filesize tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool long filesize(string path, bool missingAsZero = false)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool long filesize(string path, bool missingAsZero = false)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5627,7 +5631,7 @@
 <h5 id="lang-ref-builtins-file-find">find tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool list string find(string path, string pattern = &quot;*&quot;, bool recursive = true, bool files = true, bool dirs = true)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool list string find(string path, string pattern = "*", bool recursive = true, bool files = true, bool dirs = true)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5710,7 +5714,7 @@
 <h5 id="lang-ref-builtins-file-isdir">isdir tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool isdir(string path)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool isdir(string path)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5743,7 +5747,7 @@
 <h5 id="lang-ref-builtins-file-isfile">isfile tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool isfile(string path)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool isfile(string path)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5775,7 +5779,7 @@
 <h5 id="lang-ref-builtins-file-mkdir">mkdir tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool mkdir(string path, bool force = false, bool parents = true)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool mkdir(string path, bool force = false, bool parents = true)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5824,7 +5828,7 @@
 <h5 id="lang-ref-builtins-file-mvfile">mvfile tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool mvfile(string source, string target, bool overwrite = false)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool mvfile(string source, string target, bool overwrite = false)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5891,7 +5895,7 @@
 <h5 id="lang-ref-builtins-file-mvdir">mvdir tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool mvdir(string source, string target)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool mvdir(string source, string target)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -5965,7 +5969,7 @@
 <h5 id="lang-ref-builtins-file-readlines">readlines tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool list string readlines(string path)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool list string readlines(string path)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -6022,7 +6026,7 @@
 <h5 id="lang-ref-builtins-file-rmfile">rmfile tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool rmfile(string path, bool force = false)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool rmfile(string path, bool force = false)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -6082,7 +6086,7 @@
 <h5 id="lang-ref-builtins-file-rmdir">rmdir tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool bool rmdir(string path, bool force = false)</code></pre>
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool bool rmdir(string path, bool force = false)</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -6150,7 +6154,7 @@
 <h5 id="lang-ref-builtins-file-writefile">writefile tool</h5>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="tooldef">tool writefile(string path, string text,       bool append = false)
+<pre class="highlight"><code class="language-tooldef" data-lang="tooldef">tool writefile(string path, string text,       bool append = false)
 tool writefile(string path, list string lines, bool append = false)</code></pre>
 </div>
 </div>
@@ -6233,7 +6237,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="shell">tooldef some_script.tooldef</code></pre>
+<pre class="highlight"><code class="language-shell" data-lang="shell">tooldef some_script.tooldef</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -6245,7 +6249,7 @@
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="shell">tooldef --help</code></pre>
+<pre class="highlight"><code class="language-shell" data-lang="shell">tooldef --help</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -6288,10 +6292,28 @@
 part of the Eclipse ESCET project, are listed below in reverse chronological
 order.</p>
 </div>
-<div class="sect2">
-<h3 id="version-0-1-unreleased">Version 0.1 (unreleased)</h3>
 <div class="paragraph">
-<p>The first release of ToolDef as part of the Eclipse ESCET project.</p>
+<p>See also the Eclipse ESCET
+<a href="https://www.eclipse.org/escet/escet/#release-notes-chapter-index">toolkit release notes</a>
+covering those aspects that are common to the various Eclipse ESCET tools.</p>
+</div>
+<div class="sect2">
+<h3 id="version-0-1">Version 0.1</h3>
+<div class="paragraph">
+<p>The first release of ToolDef as part of the Eclipse ESCET project.
+This release is based on the initial contribution by the Eindhoven University
+of Technology (TU/e).</p>
+</div>
+<div class="paragraph">
+<p>Most notable changes compared to the last TU/e release:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>We no longer use separate language and tool versions. The <code>.tooldef2</code> file
+extension has been changed to <code>.tooldef</code> as part of this change.</p>
+</li>
+</ul>
 </div>
 <div class="paragraph">
 <p></p>
@@ -6304,7 +6326,7 @@
 <div class="sectionbody">
 <div class="paragraph">
 <p>The material in this documentation is
-Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation.</p>
+Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation.</p>
 </div>
 <div class="paragraph">
 <p>Eclipse ESCET and ESCET are trademarks of the Eclipse Foundation.
@@ -6335,95 +6357,6 @@
 </div>
 </div>
 </div>
-<style>
-/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
-pre.CodeRay{background:#f7f7f8}
-.CodeRay .line-numbers{border-right:1px solid currentColor;opacity:.35;padding:0 .5em 0 0}
-.CodeRay span.line-numbers{display:inline-block;margin-right:.75em}
-.CodeRay .line-numbers strong{color:#000}
-table.CodeRay{border-collapse:separate;border:0;margin-bottom:0;background:none}
-table.CodeRay td{vertical-align:top;line-height:inherit}
-table.CodeRay td.line-numbers{text-align:right}
-table.CodeRay td.code{padding:0 0 0 .75em}
-.CodeRay .debug{color:#fff !important;background:#000080 !important}
-.CodeRay .annotation{color:#007}
-.CodeRay .attribute-name{color:#000080}
-.CodeRay .attribute-value{color:#700}
-.CodeRay .binary{color:#509}
-.CodeRay .comment{color:#998;font-style:italic}
-.CodeRay .char{color:#04d}
-.CodeRay .char .content{color:#04d}
-.CodeRay .char .delimiter{color:#039}
-.CodeRay .class{color:#458;font-weight:bold}
-.CodeRay .complex{color:#a08}
-.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
-.CodeRay .color{color:#099}
-.CodeRay .class-variable{color:#369}
-.CodeRay .decorator{color:#b0b}
-.CodeRay .definition{color:#099}
-.CodeRay .delimiter{color:#000}
-.CodeRay .doc{color:#970}
-.CodeRay .doctype{color:#34b}
-.CodeRay .doc-string{color:#d42}
-.CodeRay .escape{color:#666}
-.CodeRay .entity{color:#800}
-.CodeRay .error{color:#808}
-.CodeRay .exception{color:inherit}
-.CodeRay .filename{color:#099}
-.CodeRay .function{color:#900;font-weight:bold}
-.CodeRay .global-variable{color:#008080}
-.CodeRay .hex{color:#058}
-.CodeRay .integer,.CodeRay .float{color:#099}
-.CodeRay .include{color:#555}
-.CodeRay .inline{color:#000}
-.CodeRay .inline .inline{background:#ccc}
-.CodeRay .inline .inline .inline{background:#bbb}
-.CodeRay .inline .inline-delimiter{color:#d14}
-.CodeRay .inline-delimiter{color:#d14}
-.CodeRay .important{color:#555;font-weight:bold}
-.CodeRay .interpreted{color:#b2b}
-.CodeRay .instance-variable{color:#008080}
-.CodeRay .label{color:#970}
-.CodeRay .local-variable{color:#963}
-.CodeRay .octal{color:#40e}
-.CodeRay .predefined{color:#369}
-.CodeRay .preprocessor{color:#579}
-.CodeRay .pseudo-class{color:#555}
-.CodeRay .directive{font-weight:bold}
-.CodeRay .type{font-weight:bold}
-.CodeRay .predefined-type{color:inherit}
-.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
-.CodeRay .key{color:#808}
-.CodeRay .key .delimiter{color:#606}
-.CodeRay .key .char{color:#80f}
-.CodeRay .value{color:#088}
-.CodeRay .regexp .delimiter{color:#808}
-.CodeRay .regexp .content{color:#808}
-.CodeRay .regexp .modifier{color:#808}
-.CodeRay .regexp .char{color:#d14}
-.CodeRay .regexp .function{color:#404;font-weight:bold}
-.CodeRay .string{color:#d20}
-.CodeRay .string .string .string{background:#ffd0d0}
-.CodeRay .string .content{color:#d14}
-.CodeRay .string .char{color:#d14}
-.CodeRay .string .delimiter{color:#d14}
-.CodeRay .shell{color:#d14}
-.CodeRay .shell .delimiter{color:#d14}
-.CodeRay .symbol{color:#990073}
-.CodeRay .symbol .content{color:#a60}
-.CodeRay .symbol .delimiter{color:#630}
-.CodeRay .tag{color:#008080}
-.CodeRay .tag-special{color:#d70}
-.CodeRay .variable{color:#036}
-.CodeRay .insert{background:#afa}
-.CodeRay .delete{background:#faa}
-.CodeRay .change{color:#aaf;background:#007}
-.CodeRay .head{color:#f8f;background:#505}
-.CodeRay .insert .insert{color:#080}
-.CodeRay .delete .delete{color:#800}
-.CodeRay .change .change{color:#66f}
-.CodeRay .head .head{color:#f4f}
-</style>
 <script type="text/x-mathjax-config">
 MathJax.Hub.Config({
   messageStyle: "none",
@@ -6440,16 +6373,16 @@
 })
 MathJax.Hub.Register.StartupHook("AsciiMath Jax Ready", function () {
   MathJax.InputJax.AsciiMath.postfilterHooks.Add(function (data, node) {
-    if ((node = data.script.parentNode) && (node = node.parentNode) && node.classList.contains('stemblock')) {
+    if ((node = data.script.parentNode) && (node = node.parentNode) && node.classList.contains("stemblock")) {
       data.math.root.display = "block"
     }
     return data
   })
 })
 </script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_HTMLorMML"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.9/MathJax.js?config=TeX-MML-AM_HTMLorMML"></script>
 <!--
-  Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation
+  Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
 
   See the NOTICE file(s) distributed with this work for additional
   information regarding copyright ownership.