Merge branch 'pr/3510' into develop

# Conflicts: # libmei/dist/meibasic.h # libmei/mei/mei-basic_compiled.odd # src/iomei.cpp
rism-digital · Sep 5, 2023 · adad8cb · adad8cb
2 parents 0a654d9 + 99dad44
commit adad8cb
Show file tree

Hide file tree

Showing 10 changed files with 7,076 additions and 7,079 deletions.
diff --git a/include/vrv/iomei.h b/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);

diff --git a/libmei/config.yml b/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"
diff --git a/libmei/dist/attconverter.cpp b/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;

diff --git a/libmei/dist/atttypes.h b/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
 };
 

diff --git a/libmei/dist/meibasic.h b/libmei/dist/meibasic.h
diff --git a/libmei/mei/develop/mei-all_compiled.odd → libmei/mei/mei-all_compiled.odd b/libmei/mei/develop/mei-all_compiled.odd → libmei/mei/mei-all_compiled.odd