Release 3.0.1

rism-digital · Oct 22, 2020 · 9be368d · 9be368d
1 parent 5cac064
commit 9be368d
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## [3.0.1] - 2020-10-22
+* Fix bug with mensural notation notes
+
 ## [3.0.0] - 2020-10-05
 * Support for buzz roll tremolos (@rettinghaus)
 * Support for `Sprechgesang` stems (@rettinghaus)

diff --git a/Verovio.podspec b/Verovio.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name           = 'Verovio'
-  s.version        = '3.0.0'
+  s.version        = '3.0.1'
   s.license        = { :type => 'LGPL' }
   s.homepage       = 'https://www.verovio.org/index.xhtml'
   s.authors        = { 'Contributors List' => 'https://github.com/rism-ch/verovio/graphs/contributors' }

diff --git a/bindings/java/pom.xml b/bindings/java/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.rism.verovio</groupId>
   <artifactId>VerovioToolkit</artifactId>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <packaging>jar</packaging>
 
   <name>VerovioToolkit</name>

diff --git a/bindings/python/setup.py b/bindings/python/setup.py
@@ -61,7 +61,7 @@
                            )
 
 setup(name='verovio',
-      version='3.0.0',
+      version='3.0.1',
       url="www.verovio.org",
       description="""A library and toolkit for engraving MEI music notation into SVG""",
       ext_modules=[verovio_module],

diff --git a/codemeta.json b/codemeta.json
@@ -4,8 +4,8 @@
   "identifier": "Verovio",
   "name": "Verovio",
   "description": "Verovio is a fast, portable and lightweight open-source library for engraving Music Encoding Initiative (MEI) music scores into SVG.",
-  "softwareVersion": "3.0.0",
-  "datePublished": "2020-10-05",
+  "softwareVersion": "3.0.1",
+  "datePublished": "2020-10-22",
   "license": "https://www.gnu.org/licenses/lgpl-3.0",
   "programmingLanguage": [{
     "@type": "ComputerLanguage",

diff --git a/emscripten/npm/package.json b/emscripten/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "verovio",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "This is the stable version of the verovio package",
   "main": "index.js",
   "keywords": [

diff --git a/include/vrv/vrvdef.h b/include/vrv/vrvdef.h
@@ -35,7 +35,7 @@ namespace vrv {
 
 #define VERSION_MAJOR 3
 #define VERSION_MINOR 0
-#define VERSION_REVISION 0
+#define VERSION_REVISION 1
 // Adds "-dev" in the version number - should be set to false for releases
 #define VERSION_DEV false
 

diff --git a/src/layerelement.cpp b/src/layerelement.cpp
@@ -464,11 +464,11 @@ int LayerElement::GetDrawingRadius(Doc *doc, bool isInLigature)
         assert(note);
         dur = note->GetDrawingDur();
         if (note->IsMensuralDur() && !isInLigature) {
-            return doc->GetGlyphWidth(
-                       note->GetMensuralSmuflNoteHead(), staff->m_drawingStaffSize, this->GetDrawingCueSize())
-                / 2;
+            code = note->GetMensuralSmuflNoteHead();
+        }
+        else {
+            code = note->GetNoteheadGlyph(dur);
         }
-        code = note->GetNoteheadGlyph(dur);
     }
     else if (this->Is(CHORD)) {
         Chord *chord = vrv_cast<Chord *>(this);
@@ -496,6 +496,10 @@ int LayerElement::GetDrawingRadius(Doc *doc, bool isInLigature)
         }
     }
 
+    // The code should not be null at this stage. It can above but only with mensural notation.
+    // Maybe this can be refactored with a distinct method for radius in mensural notation.
+    assert(code);
+
     return doc->GetGlyphWidth(code, staff->m_drawingStaffSize, this->GetDrawingCueSize()) / 2;
 }