Fix marker type not saving

Author: XiaoMigros

src/engraving/dom/marker.cpp

@@ -44,6 +44,23 @@ static const ElementStyle markerStyle {
     { Sid::repeatMinDistance,   Pid::MIN_DISTANCE },
 };
 
+//---------------------------------------------------------
+//   MarkerTypeTable
+//---------------------------------------------------------
+
+const std::vector<MarkerTypeTableItem> markerTypeTable {
+    { MarkerType::SEGNO,      "<sym>segno</sym>",               "segno", false },
+    { MarkerType::VARSEGNO,   "<sym>segnoSerpent1</sym>",       "varsegno", false },
+    { MarkerType::CODA,       "<sym>coda</sym>",                "codab", false },
+    { MarkerType::VARCODA,    "<sym>codaSquare</sym>",          "varcoda", false },
+    { MarkerType::CODETTA,    "<sym>coda</sym><sym>coda</sym>", "codetta", false },
+    { MarkerType::FINE,       "Fine",                           "fine", true },
+    { MarkerType::TOCODA,     "To Coda",                        "coda", true },
+    { MarkerType::TOCODASYM,  "To <sym>coda</sym>",             "coda", true },
+    { MarkerType::DA_CODA,    "Da Coda",                        "coda", true },
+    { MarkerType::DA_DBLCODA, "Da Doppia Coda",                 "coda", true },
+};
+
 //---------------------------------------------------------
 //   Marker
 //---------------------------------------------------------
@@ -68,73 +85,17 @@ Marker::Marker(EngravingItem* parent, TextStyleType tid)
 
 void Marker::setMarkerType(MarkerType t)
 {
+    bool changeLabel = getProperty(Pid::LABEL) == propertyDefault(Pid::LABEL);
     m_markerType = t;
-    const char* txt = 0;
-    switch (t) {
-    case MarkerType::SEGNO:
-        txt = "<sym>segno</sym>";
-        setLabel(u"segno");
-        break;
-
-    case MarkerType::VARSEGNO:
-        txt = "<sym>segnoSerpent1</sym>";
-        setLabel(u"varsegno");
-        break;
-
-    case MarkerType::CODA:
-        txt = "<sym>coda</sym>";
-        setLabel(u"codab");
-        break;
-
-    case MarkerType::VARCODA:
-        txt = "<sym>codaSquare</sym>";
-        setLabel(u"varcoda");
-        break;
-
-    case MarkerType::CODETTA:
-        txt = "<sym>coda</sym><sym>coda</sym>";
-        setLabel(u"codetta");
-        break;
-
-    case MarkerType::FINE:
-        txt = "Fine";
-        initTextStyleType(TextStyleType::REPEAT_RIGHT, true);
-        setLabel(u"fine");
-        break;
-
-    case MarkerType::TOCODA:
-        txt = "To Coda";
-        initTextStyleType(TextStyleType::REPEAT_RIGHT, true);
-        setLabel(u"coda");
-        break;
-
-    case MarkerType::TOCODASYM:
-        txt = "To <font size=\"20\"/><sym>coda</sym>";
-        initTextStyleType(TextStyleType::REPEAT_RIGHT, true);
-        setLabel(u"coda");
-        break;
-
-    case MarkerType::DA_CODA:
-        txt = "Da Coda";
-        initTextStyleType(TextStyleType::REPEAT_RIGHT, true);
-        setLabel(u"coda");
-        break;
-
-    case MarkerType::DA_DBLCODA:
-        txt = "Da Doppia Coda";
-        initTextStyleType(TextStyleType::REPEAT_RIGHT, true);
-        setLabel(u"coda");
-        break;
-
-    case MarkerType::USER:
-        break;
-
-    default:
-        LOGD("unknown marker type %d", int(t));
-        break;
-    }
-    if (empty() && txt) {
-        setXmlText(String::fromAscii(txt));
+    for (const MarkerTypeTableItem& p : markerTypeTable) {
+        if (p.type == t) {
+            setXmlText(String::fromAscii(p.text.ascii()));
+            if (changeLabel) {
+                setLabel(String::fromAscii(p.label.ascii()));
+            }
+            initTextStyleType(p.rightAligned ? TextStyleType::REPEAT_RIGHT : TextStyleType::REPEAT_LEFT);
+            break;
+        }
     }
 }
 
@@ -200,6 +161,11 @@ PropertyValue Marker::propertyDefault(Pid propertyId) const
 {
     switch (propertyId) {
     case Pid::LABEL:
+        for (const MarkerTypeTableItem& p : markerTypeTable) {
+            if (m_markerType == p.type) {
+                return String::fromAscii(p.label.ascii());
+            }
+        }
         return String();
     case Pid::MARKER_TYPE:
         return MarkerType::FINE;

src/engraving/dom/marker.h

@@ -98,4 +98,13 @@ class Marker final : public TextBase
 
     bool m_centerOnSymbol = true;
 };
+
+struct MarkerTypeTableItem {
+    MarkerType type;
+    AsciiStringView text;
+    AsciiStringView label;
+    bool rightAligned;
+};
+
+extern const std::vector<MarkerTypeTableItem> markerTypeTable;
 } // namespace mu::engraving