Code review fixes

musescore · Nov 13, 2024 · f241f95 · f241f95
1 parent 2d54b34
commit f241f95
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/engraving/dom/dynamic.cpp b/src/engraving/dom/dynamic.cpp
@@ -428,23 +428,27 @@ void Dynamic::setDynamicType(const String& tag)
 
     if (dt == DynamicType::OTHER) {
         LOGD("setDynamicType: other <%s>", muPrintable(tag));
+    } else {
+        std::string utf8Tag = tag.toStdString();
+        const std::regex asciiDynamic(R"((?:\b))" + std::string(TConv::toXml(dt).ascii()) + R"((?:\b(?=[^>]|$)))");
+        utf8Tag = std::regex_replace(utf8Tag, asciiDynamic, DYN_LIST[int(dt)].text);
+        setXmlText(String::fromStdString(utf8Tag));
     }
 
     setDynamicType(dt);
 }
 
-DynamicType Dynamic::parseDynamicText(const String& tag)
+DynamicType Dynamic::parseDynamicText(const String& tag) const
 {
     std::string utf8Tag = tag.toStdString();
-    std::regex dynamicRegex(R"((?:<sym>.*?</sym>)+|(?:\b)[fmnprsz]+(?:\b(?=[^>]|$)))");
-    for (std::sregex_iterator it(utf8Tag.begin(), utf8Tag.end(), dynamicRegex), end; it != end; ++it) {
-        std::smatch match = *it;
-        std::string matchStr = match.str();
+    const std::regex dynamicRegex(R"((?:<sym>.*?</sym>)+|(?:\b)[fmnprsz]+(?:\b(?=[^>]|$)))");
+    auto begin = std::sregex_iterator(utf8Tag.begin(), utf8Tag.end(), dynamicRegex);
+    for (auto it = begin; it != std::sregex_iterator(); ++it) {
+        const std::smatch match = *it;
+        const std::string matchStr = match.str();
         size_t n = DYN_LIST.size();
         for (size_t i = 0; i < n; ++i) {
             if (TConv::toXml(DynamicType(i)).ascii() == matchStr || DYN_LIST[i].text == matchStr) {
-                utf8Tag.replace(match.position(0), match.length(0), DYN_LIST[i].text);
-                setXmlText(String::fromStdString(utf8Tag));
                 return DynamicType(i);
             }
         }

diff --git a/src/engraving/dom/dynamic.h b/src/engraving/dom/dynamic.h
@@ -64,7 +64,7 @@ class Dynamic final : public TextBase
     void setDynamicType(DynamicType val) { m_dynamicType = val; }
     void setDynamicType(const String&);
 
-    DynamicType parseDynamicText(const String&);
+    DynamicType parseDynamicText(const String&) const;
 
     DynamicType dynamicType() const { return m_dynamicType; }
     int subtype() const override { return static_cast<int>(m_dynamicType); }

diff --git a/src/engraving/dom/textedit.cpp b/src/engraving/dom/textedit.cpp
@@ -147,6 +147,7 @@ void TextBase::endEdit(EditData& ed)
         Dynamic* d = toDynamic(this);
         const DynamicType dt = d->parseDynamicText(xmlText());
         undoChangeProperty(Pid::DYNAMIC_TYPE, dt);
+        d->setDynamicType(xmlText());
     }
 
     UndoStack* undo = score()->undoStack();