Release 3.0.0

rism-digital · Oct 5, 2020 · 5cac064 · 5cac064
1 parent a499e7d
commit 5cac064
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [unreleased]
+## [3.0.0] - 2020-10-05
 * Support for buzz roll tremolos (@rettinghaus)
 * Support for `Sprechgesang` stems (@rettinghaus)
 * Support for `<phrase>`
@@ -14,9 +14,6 @@
 ## [2.7.2] - 2020-07-23
 * Fix bug with memory in beams (@valeriyvan)
 
-## [2.7.2] - 2020-07-23
-* Fix bug with memory in beams (@valeriyvan)
-
 ## [2.7.1] - 2020-05-22
 * Fix bug with mensural clefs not displaying
 

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-dev'
+  s.version        = '3.0.0'
   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>2.7.2</version>
+  <version>3.0.0</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='2.7.2',
+      version='3.0.0',
       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": "2.7.2",
-  "datePublished": "2020-07-23",
+  "softwareVersion": "3.0.0",
+  "datePublished": "2020-10-05",
   "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": "2.7.2",
+  "version": "3.0.0",
   "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
@@ -33,13 +33,25 @@ namespace vrv {
 // Version
 //----------------------------------------------------------------------------
 
-#define VERSION_MAJOR 2
-#define VERSION_MINOR 7
-#define VERSION_REVISION 2
+#define VERSION_MAJOR 3
+#define VERSION_MINOR 0
+#define VERSION_REVISION 0
 // Adds "-dev" in the version number - should be set to false for releases
 #define VERSION_DEV false
 
-enum MEIVersion { MEI_UNDEFINED = 0, MEI_2013, MEI_3_0_0, MEI_4_0_0, MEI_4_0_1 };
+enum MEIVersion { MEI_UNDEFINED = 0, MEI_2013, MEI_3_0_0, MEI_4_0_0, MEI_4_0_1, MEI_5_0_0_dev };
+
+//----------------------------------------------------------------------------
+// Cast redefinition
+//----------------------------------------------------------------------------
+
+// Can be changed between static and dynamic for debug purposes
+
+// To be used for all cases where type is cheched through Object::m_type
+#define vrv_cast static_cast
+
+// To be used for all FunctorParams casts withi Functors
+#define vrv_params_cast static_cast
 
 //----------------------------------------------------------------------------
 // Default midi values
@@ -144,13 +156,15 @@ enum ClassId {
     DIR,
     DYNAM,
     FERMATA,
+    FING,
     GLISS,
     HAIRPIN,
     HARM,
     MORDENT,
     MNUM,
     OCTAVE,
     PEDAL,
+    PHRASE,
     REH,
     SLUR,
     TEMPO,
@@ -277,6 +291,8 @@ class TimeSpanningInterface;
 
 typedef std::vector<Object *> ArrayOfObjects;
 
+typedef std::list<Object *> ListOfObjects;
+
 typedef std::vector<Comparison *> ArrayOfComparisons;
 
 typedef std::vector<Note *> ChordCluster;
@@ -289,7 +305,7 @@ typedef std::vector<BeamElementCoord *> ArrayOfBeamElementCoords;
 
 typedef std::vector<std::pair<int, int> > ArrayOfIntPairs;
 
-typedef std::multimap<std::string, LinkingInterface *> ArrayOfLinkingInterfaceUuidPairs;
+typedef std::multimap<std::string, LinkingInterface *> MapOfLinkingInterfaceUuidPairs;
 
 typedef std::vector<std::pair<PlistInterface *, std::string> > ArrayOfPlistInterfaceUuidPairs;
 
@@ -526,6 +542,12 @@ enum {
     LIGATURE_STACKED = 32
 };
 
+//----------------------------------------------------------------------------
+// Analytical markup bitfields
+//----------------------------------------------------------------------------
+
+enum { MARKUP_DEFAULT = 0, MARKUP_ANALYTICAL_TIE = 1, MARKUP_ANALYTICAL_FERMATA = 2, MARKUP_GRACE_ATTRIBUTE = 4 };
+
 //----------------------------------------------------------------------------
 // Bounding box access
 //----------------------------------------------------------------------------