Merge pull request #3446 from paxbun/fix/musicxml-wedge-spread

Fix MusicXML diminuendo <wedge> spread handling [skip-ci]
rism-digital · Jun 8, 2023 · 4f1a85b · 4f1a85b
2 parents 4c2e338 + 9547d8d
commit 4f1a85b
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/iomusxml.cpp b/src/iomusxml.cpp
@@ -2229,10 +2229,12 @@ void MusicXmlInput::ReadMusicXmlDirection(
                     if (wedge->node().attribute("niente")) {
                         iter->first->SetNiente(ConvertWordToBool(wedge->node().attribute("niente").as_string()));
                     }
-                    if (wedge->node().attribute("spread")) {
-                        data_MEASUREMENTSIGNED opening;
-                        opening.SetVu(wedge->node().attribute("spread").as_double() / 5);
-                        iter->first->SetOpening(opening);
+                    if (iter->first->GetForm() == hairpinLog_FORM_cres) {
+                        if (wedge->node().attribute("spread")) {
+                            data_MEASUREMENTSIGNED opening;
+                            opening.SetVu(wedge->node().attribute("spread").as_double() / 5);
+                            iter->first->SetOpening(opening);
+                        }
                     }
                     matchedWedge = true;
                     m_hairpinStack.erase(iter);
@@ -2252,6 +2254,11 @@ void MusicXmlInput::ReadMusicXmlDirection(
             }
             else if (HasAttributeWithValue(wedge->node(), "type", "diminuendo")) {
                 hairpin->SetForm(hairpinLog_FORM_dim);
+                if (wedge->node().attribute("spread")) {
+                    data_MEASUREMENTSIGNED opening;
+                    opening.SetVu(wedge->node().attribute("spread").as_double() / 5);
+                    hairpin->SetOpening(opening);
+                }
             }
             else {
                 delete hairpin;