Update web page and changelog with meld paper details.

Author: Kasper Peeters

cmake/version.cmake

@@ -1,7 +1,7 @@
 set(CADABRA_VERSION_MAJOR 2)
-set(CADABRA_VERSION_MINOR 3)
-set(CADABRA_VERSION_PATCH 9)
-set(CADABRA_VERSION_TWEAK 6)
+set(CADABRA_VERSION_MINOR 4)
+set(CADABRA_VERSION_PATCH 0)
+set(CADABRA_VERSION_TWEAK 0)
 set(COPYRIGHT_YEARS "2001-2022")
 math(EXPR SYSTEM_BITS "${CMAKE_SIZEOF_VOID_P} * 8")
 find_program(GIT git PATHS ${GIT_DIR})

config/install_script.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Cadabra2"
-#define MyAppVersion "2.3.9"
+#define MyAppVersion "2.4.0"
 #define MyAppPublisher "Kasper Peeters"
 #define MyAppURL "https://www.cadabra.science/"
 #define MyAppExeName "cadabra2-gtk.exe"

web2/cadabra2/source/changelog.html

@@ -16,8 +16,15 @@ <h1>Change log</h1>
   development, even numbered ones are released in packaged form.
 </p>
 <a name="master"></a>
-<h3>github master (2.3.9)</h3>
+<h3>github master (2.4.1)</h3>
 <ul>
+</ul>
+
+<h3>2.4.0 (released 25-Aug-2022)</h3>
+<ul>
+  <li>Version to accompany the publication of
+  the <a href="http://arxiv.org/abs/2208.11946">paper about the meld
+  algorithm</a>.</li>
   <li>Several fixes to <tt>meld</tt> (Dominic).</li>
   <li>Make typesetting run in a separate thread to prevent the UI from
 	 feeling sluggish.</li>

web2/cadabra2/source/download.html

@@ -41,6 +41,10 @@ <h2>Binary packages</h2>
 	 <div class="distronum"><a href="https://cadabra.science/packages/ubuntu2004">Ubuntu Focal Fossa 20.04</a></div>
 	 <div class="distronum"><a href="https://cadabra.science/packages/ubuntu2204">Ubuntu Jammy Jellyfish 22.04</a></div>
 	 <div class="distrotxt">
+	   Cadabra is now available in Ubuntu 22.04 from the official
+	   repositories, by installing the <tt>cadabra2</tt> package
+	   (though this may not always be the most recent
+	   version). Thanks to Alex Myczko for making this happen.
 	 </div>
   </div>
 
@@ -92,11 +96,13 @@ <h2>Binary packages</h2>
   <div class="distrotype">
 	 <img src="static/images/debian-logo.jpg"/>
 	 <div class="distronum"><a href="https://cadabra.science/packages/debian9/">Debian Stretch 9</a></div>
-	 <div class="distronum"><a href="https://cadabra.science/packages/debian10/">Debian
-	     Buster 10</a></div>
-    <div class="distrotxt">
-      Cadabra is now also available in Debian Unstable (`Sid') as <code>cadabra2</code>.
-    </div>
+	 <div class="distronum"><a href="https://cadabra.science/packages/debian10/">Debian Buster 10</a></div>
+	 <div class="distrotxt">
+	   Cadabra is now available in Debian 11 (Bullseye) from the
+	   official repositories, by installing the <tt>cadabra2</tt>
+	   package (though this may not always be the most recent
+	   version). Thanks to Alex Myczko for making this happen.
+	 </div>
   </div>
 
   <div class="distrotype">

web2/cadabra2/source/index.html

@@ -22,6 +22,13 @@ <h1>News</h1>
   what you want to use it for).
 </p>
 <dl>
+  <dt>25 Aug 2021</dt>
+  <dd>Release of 2.4.0 (<a href="changelog.html#2.4.0">changes</a>).
+    Update to accompany the release of
+    the <a href="http://arxiv.org/abs/2208.11946">paper about the meld
+    algorithm</a>.  Many bug fixes and various functionality
+    improvements and UI enhancements.</dd>
+    
   <dt>21 Nov 2021</dt>
   <dd>Release of 2.3.8 (<a href="changelog.html#2.3.8">changes</a>).
 	 Update to make Cadabra build on Apple silicon, and many bugfixes
@@ -31,7 +38,7 @@ <h1>News</h1>
   <dd>Release of 2.3.6 (<a href="changelog.html#2.3.6">changes</a>).
 	 Various bug fixes.
 
-  <dt>08 Dec 2020</dt>
+<!--  <dt>08 Dec 2020</dt>
   <dd>New Windows installer, for version 2.3.5, now available from the
     <a href="download.html#windows">download page</a>. Please provide feedback if you want the Windows
     version to receive regular updates.
@@ -57,18 +64,18 @@ <h1>News</h1>
     Now also available through conda-forge, from which you can also
 	 install the <a href="jupyter.html">Cadabra Jupyter kernel</a>.
   </dd>
-<!--  
+
   <dt>01 April 2020</dt>
   <dd>No, this is not an April fools joke. There is now
     an <a href="jupyter.html">Anaconda package for the Cadabra
     Jupyter kernel</a>. Only for Linux for now.
-  </dd> -->
+  </dd> 
   <dt>10 December 2019</dt>
   <dd>Release of 2.2.8 (<a href="changelog.html#2.2.8">changes</a>).
 	 Various new features, long overdue release. Available on Linux,
 	 macOS and Windows. 
   </dd>
-<!--  <dt>11 November 2019</dt>
+  <dt>11 November 2019</dt>
   <dd>New Windows installer. Thanks to feedback from many users, there
   is now a new Windows installer which hopefully takes care of many of
   the installation problems encountered with earlier versions.