From 5cac06484546ff4a8629801738c36df69bbef415 Mon Sep 17 00:00:00 2001 From: Laurent Pugin Date: Mon, 5 Oct 2020 15:04:54 +0200 Subject: [PATCH] Release 3.0.0 --- CHANGELOG.md | 5 +---- Verovio.podspec | 2 +- bindings/java/pom.xml | 2 +- bindings/python/setup.py | 2 +- codemeta.json | 4 ++-- emscripten/npm/package.json | 2 +- include/vrv/vrvdef.h | 32 +++++++++++++++++++++++++++----- 7 files changed, 34 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2eff2bb8535..bba427bc1d5 100644 --- 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 `` @@ -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 index ae3f5b4a9b6..4f33897d9ed 100644 --- 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 index 7cda1e183d4..f6ae86f9d93 100644 --- a/bindings/java/pom.xml +++ b/bindings/java/pom.xml @@ -4,7 +4,7 @@ org.rism.verovio VerovioToolkit - 2.7.2 + 3.0.0 jar VerovioToolkit diff --git a/bindings/python/setup.py b/bindings/python/setup.py index 5c253cd3384..d47b8818a57 100755 --- 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 index a7ed74bdbb1..231a194fb53 100644 --- 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 index 1f3e65bf49a..de3ab7d7372 100644 --- 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 index 83da9732a2b..cc8036cf379 100644 --- 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,6 +156,7 @@ enum ClassId { DIR, DYNAM, FERMATA, + FING, GLISS, HAIRPIN, HARM, @@ -151,6 +164,7 @@ enum ClassId { MNUM, OCTAVE, PEDAL, + PHRASE, REH, SLUR, TEMPO, @@ -277,6 +291,8 @@ class TimeSpanningInterface; typedef std::vector ArrayOfObjects; +typedef std::list ListOfObjects; + typedef std::vector ArrayOfComparisons; typedef std::vector ChordCluster; @@ -289,7 +305,7 @@ typedef std::vector ArrayOfBeamElementCoords; typedef std::vector > ArrayOfIntPairs; -typedef std::multimap ArrayOfLinkingInterfaceUuidPairs; +typedef std::multimap MapOfLinkingInterfaceUuidPairs; typedef std::vector > 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 //----------------------------------------------------------------------------