Merge branch 'develop' into develop-humdrum

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## [unreleased]
+## [4.0.1] - 2023-09-05
+* Fix MEI version in output
+
+## [4.0.0] - 2023-09-05
+* Update schemas to MEI 5.0 and corresponding adjustments
 * Support for `space` within `beam`
 
 ## [3.16.0] - 2023-07-03

Verovio.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name           = 'Verovio'
-  s.version        = '3.17.0-dev'
+  s.version        = '4.1.0-dev'
   s.license        = { :type => 'LGPL' }
   s.homepage       = 'https://www.verovio.org/index.xhtml'
   s.authors        = { 'Contributors List' => 'https://github.com/rism-digital/verovio/graphs/contributors' }

bindings/java/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>org.rism.verovio</groupId>
   <artifactId>VerovioToolkit</artifactId>
-  <version>3.17.0-dev</version>
+  <version>4.1.0-dev</version>
   <packaging>jar</packaging>
 
   <name>VerovioToolkit</name>

bindings/python/.pypi-version

@@ -1,3 +1,3 @@
 # dummy file used by setup.py for counting revisions when publishing to test.pypi
 # counting can be reset by making a change to this file
-3.17.0
+4.1.0

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.17.0-dev",
-  "datePublished": "2023-07-03",
+  "softwareVersion": "4.1.0-dev",
+  "datePublished": "2023-09-05",
   "license": "https://www.gnu.org/licenses/lgpl-3.0",
   "programmingLanguage": [{
     "@type": "ComputerLanguage",

emscripten/npm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "verovio",
-  "version": "3.17.0-alpha",
+  "version": "4.1.0-alpha",
   "description": "This is the stable version of the verovio package",
   "main": "dist/verovio-toolkit-wasm.js",
   "exports": {

include/vrv/iomei.h

@@ -889,20 +889,20 @@ class MEIInput : public Input {
      */
     ///@{
     // to MEI 5.0.0
-    void UpgradeKeySigTo_5_0_0(pugi::xml_node keySig);
-    void UpgradePageTo_5_0_0(Page *page);
-    void UpgradePgHeadFootTo_5_0_0(pugi::xml_node element);
-    void UpgradeMeasureTo_5_0_0(pugi::xml_node measure);
-    void UpgradeMeterSigTo_5_0_0(pugi::xml_node meterSig, MeterSig *vrvMeterSig);
-    void UpgradeScoreDefElementTo_5_0_0(pugi::xml_node scoreDefElement);
-    void UpgradeStaffTo_5_0_0(pugi::xml_node staff);
-    void UpgradeLayerElementTo_5_0_0(pugi::xml_node element);
-    void UpgradeRendTo_5_0_0(pugi::xml_node element);
+    void UpgradeKeySigTo_5_0(pugi::xml_node keySig);
+    void UpgradePageTo_5_0(Page *page);
+    void UpgradePgHeadFootTo_5_0(pugi::xml_node element);
+    void UpgradeMeasureTo_5_0(pugi::xml_node measure);
+    void UpgradeMeterSigTo_5_0(pugi::xml_node meterSig, MeterSig *vrvMeterSig);
+    void UpgradeScoreDefElementTo_5_0(pugi::xml_node scoreDefElement);
+    void UpgradeStaffTo_5_0(pugi::xml_node staff);
+    void UpgradeLayerElementTo_5_0(pugi::xml_node element);
+    void UpgradeRendTo_5_0(pugi::xml_node element);
     // to MEI 4.0.0
     void UpgradeBeatRptTo_4_0_0(pugi::xml_node beatRpt, BeatRpt *vrvBeatRpt);
     void UpgradeDurGesTo_4_0_0(pugi::xml_node element, DurationInterface *interface);
     void UpgradeFTremTo_4_0_0(pugi::xml_node fTrem, FTrem *vrvFTrem);
-    void UpgradeMensurTo_5_0_0(pugi::xml_node mensur, Mensur *vrvMensur);
+    void UpgradeMensurTo_5_0(pugi::xml_node mensur, Mensur *vrvMensur);
     void UpgradeMordentTo_4_0_0(pugi::xml_node mordent, Mordent *vrvMordent);
     void UpgradeScoreDefElementTo_4_0_0(pugi::xml_node scoreDefElement, ScoreDefElement *vrvScoreDefElement);
     void UpgradeStaffDefTo_4_0_0(pugi::xml_node staffDef, StaffDef *vrvStaffDef);

include/vrv/ornam.h

@@ -29,8 +29,6 @@ class Ornam : public ControlElement,
               public TextDirInterface,
               public TimePointInterface,
               public AttColor,
-              public AttExtSymAuth,
-              public AttExtSymNames,
               public AttOrnamentAccid {
 public:
     /**
@@ -64,11 +62,6 @@ class Ornam : public ControlElement,
      */
     bool IsSupportedChild(Object *object) override;
 
-    /**
-     * Get the SMuFL glyph for the ornam based glyph.num
-     */
-    char32_t GetOrnamGlyph() const;
-
     //----------//
     // Functors //
     //----------//

include/vrv/toolkit.h

@@ -500,9 +500,10 @@ class Toolkit {
     /**
      * Get the MEI as a string.
      *
-     * @param jsonOptions A stringified JSON object with the output options
+     * @param jsonOptions A stringified JSON object with the output options;
      * pageNo: integer; (1-based), all pages if none (or 0) specified;
      * scoreBased: true or false; true by default;
+     * basic: true or false; false by default;
      * removeIds: true or false; false by default - remove all \@xml:id not used in the data;
      */
     std::string GetMEI(const std::string &jsonOptions = "");

include/vrv/vrvdef.h

@@ -38,8 +38,8 @@ namespace vrv {
 // Version
 //----------------------------------------------------------------------------
 
-#define VERSION_MAJOR 3
-#define VERSION_MINOR 17
+#define VERSION_MAJOR 4
+#define VERSION_MINOR 1
 #define VERSION_REVISION 0
 // Adds "-dev" in the version number - should be set to false for releases
 #define VERSION_DEV true

libmei/config.yml

@@ -5,4 +5,4 @@ addons_dir: "./addons"
 elements: false
 namespace: "vrv"
 datatypes: "./datatypes.yml"
-basic_odd: "./mei/develop/mei-basic_compiled.odd"
+basic_odd: "./mei/mei-basic_compiled.odd"

libmei/dist/attconverter.cpp

@@ -4703,8 +4703,11 @@ std::string AttConverterBase::MeiVersionMeiversionToStr(meiVersion_MEIVERSION da
         case meiVersion_MEIVERSION_3_0_0: value = "3.0.0"; break;
         case meiVersion_MEIVERSION_4_0_0: value = "4.0.0"; break;
         case meiVersion_MEIVERSION_4_0_1: value = "4.0.1"; break;
-        case meiVersion_MEIVERSION_5_0_0_devplusbasic: value = "5.0.0-dev+basic"; break;
-        case meiVersion_MEIVERSION_5_0_0_dev: value = "5.0.0-dev"; break;
+        case meiVersion_MEIVERSION_5_0: value = "5.0"; break;
+        case meiVersion_MEIVERSION_5_0plusbasic: value = "5.0+basic"; break;
+        case meiVersion_MEIVERSION_5_0plusCMN: value = "5.0+CMN"; break;
+        case meiVersion_MEIVERSION_5_0plusMensural: value = "5.0+Mensural"; break;
+        case meiVersion_MEIVERSION_5_0plusNeumes: value = "5.0+Neumes"; break;
         default:
             LogWarning("Unknown value '%d' for att.meiVersion@meiversion", data);
             value = "";
@@ -4719,8 +4722,11 @@ meiVersion_MEIVERSION AttConverterBase::StrToMeiVersionMeiversion(const std::str
     if (value == "3.0.0") return meiVersion_MEIVERSION_3_0_0;
     if (value == "4.0.0") return meiVersion_MEIVERSION_4_0_0;
     if (value == "4.0.1") return meiVersion_MEIVERSION_4_0_1;
-    if (value == "5.0.0-dev+basic") return meiVersion_MEIVERSION_5_0_0_devplusbasic;
-    if (value == "5.0.0-dev") return meiVersion_MEIVERSION_5_0_0_dev;
+    if (value == "5.0") return meiVersion_MEIVERSION_5_0;
+    if (value == "5.0+basic") return meiVersion_MEIVERSION_5_0plusbasic;
+    if (value == "5.0+CMN") return meiVersion_MEIVERSION_5_0plusCMN;
+    if (value == "5.0+Mensural") return meiVersion_MEIVERSION_5_0plusMensural;
+    if (value == "5.0+Neumes") return meiVersion_MEIVERSION_5_0plusNeumes;
     if (logWarning && !value.empty())
         LogWarning("Unsupported value '%s' for att.meiVersion@meiversion", value.c_str());
     return meiVersion_MEIVERSION_NONE;

libmei/dist/atttypes.h

@@ -2185,8 +2185,11 @@ enum meiVersion_MEIVERSION : int8_t {
     meiVersion_MEIVERSION_3_0_0,
     meiVersion_MEIVERSION_4_0_0,
     meiVersion_MEIVERSION_4_0_1,
-    meiVersion_MEIVERSION_5_0_0_devplusbasic,
-    meiVersion_MEIVERSION_5_0_0_dev,
+    meiVersion_MEIVERSION_5_0,
+    meiVersion_MEIVERSION_5_0plusbasic,
+    meiVersion_MEIVERSION_5_0plusCMN,
+    meiVersion_MEIVERSION_5_0plusMensural,
+    meiVersion_MEIVERSION_5_0plusNeumes,
     meiVersion_MEIVERSION_MAX
 };