Update importmxmlpass2.cpp

Jojo-Schmitz · Aug 17, 2024 · 67c12d3 · 67c12d3
1 parent a766b0a
commit 67c12d3
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/importexport/musicxml/importmxmlpass2.cpp b/importexport/musicxml/importmxmlpass2.cpp
@@ -3879,12 +3879,20 @@ void MusicXMLParserDirection::textToDynamic(QString& text) const
                         }
                   }
             }
-      for (auto dyn : dynList) {
-            if (dyn.tag == simplifiedText) {
-                  text = text.replace(simplifiedText, dyn.text);
-                  break;
+#if 0
+      // We don't want to count a single 'm', 'r', 's' or 'z' as a whole dynamic
+      static const QRegularExpression singleCharDynamic("^[mrsz]$");
+      // try to find a dynamic - xml representation or
+      // if found add to dynamics list and set text to blank string
+      if (!simplifiedText.contains(singleCharDynamic) && TConv::dynamicValid(simplifiedText.toStdString())) {
+            Dynamic::Type dt = TConv::fromXml(simplifiedText.toStdString(), Dynamic::Type::OTHER);
+            if (dt != Dynamic::Type::OTHER) {
+                  _dynaVelocity = QString::number(round(Dynamic::dynamicVelocity(dt) / 0.9));
+                  _dynamicsList.push_back(Dynamic::dynamicTypeName(dt));
+                  text.clear();
                   }
             }
+#endif
       }
 
 //---------------------------------------------------------