Merge pull request #20224 from rettinghaus/fix/pedal

fix pedal import/export for MusicXML
musescore · Dec 4, 2023 · 7d2cae5 · 7d2cae5
2 parents a5eb785 + 132491e
commit 7d2cae5
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 596 deletions.
diff --git a/src/importexport/musicxml/internal/musicxml/exportxml.cpp b/src/importexport/musicxml/internal/musicxml/exportxml.cpp
@@ -5155,12 +5155,12 @@ void ExportMusicXml::pedal(Pedal const* const pd, staff_idx_t staff, const Fract
  pedalType = "change";
  break;
  case HookType::NONE:
- pedalType = "resume";
+ pedalType = pd->lineVisible() ? "resume" : "start";
  break;
  default:
  pedalType = "start";
  }
- signText = pd->beginText() == "" ? " sign=\"no\"" : " sign=\"yes\"";
+ signText = pd->beginText().isEmpty() ? " sign=\"no\"" : " sign=\"yes\"";
  } else {
  if (!pd->endText().isEmpty() || pd->endHookType() == HookType::HOOK_90) {
  pedalType = "stop";
@@ -5169,7 +5169,7 @@ void ExportMusicXml::pedal(Pedal const* const pd, staff_idx_t staff, const Fract
  }
  // "change" type is handled only on the beginning of pedal lines
 
- signText = pd->endText() == "" ? " sign=\"no\"" : " sign=\"yes\"";
+ signText = pd->endText().isEmpty() ? " sign=\"no\"" : " sign=\"yes\"";
  }
  pedalXml = QString("pedal type=\"%1\"").arg(pedalType);
  pedalXml += lineText;

diff --git a/src/importexport/musicxml/internal/musicxml/importmxmlpass2.cpp b/src/importexport/musicxml/internal/musicxml/importmxmlpass2.cpp
@@ -3552,6 +3552,8 @@ void MusicXMLParserDirection::pedal(const QString& type, const int /* number */,
  p->setBeginText(u"<sym>keyboardPedalPed</sym>");
  p->setContinueText(u"(<sym>keyboardPedalPed</sym>)");
  } else {
+ p->setBeginText(u"");
+ p->setContinueText(u"");
  p->setBeginHookType(type == "resume" ? HookType::NONE : HookType::HOOK_90);
  }
  p->setEndHookType(HookType::NONE);
@@ -3596,6 +3598,10 @@ void MusicXMLParserDirection::pedal(const QString& type, const int /* number */,
  } else {
  p->setLineVisible(false);
  }
+ if (sign == "no") {
+ p->setBeginText(u"");
+ p->setContinueText(u"");
+ }
  if (color.isValid()) {
  p->setColor(color);
  }

diff --git a/src/importexport/musicxml/tests/data/testDirections1.xml b/src/importexport/musicxml/tests/data/testDirections1.xml
@@ -102,7 +102,7 @@
  <measure number="2">
  <direction placement="above">
  <direction-type>
- <pedal type="resume" line="no" sign="yes"/>
+ <pedal type="start" line="no" sign="yes"/>
  </direction-type>
  </direction>
  <note>
@@ -132,7 +132,7 @@
  </note>
  <direction placement="below">
  <direction-type>
- <pedal type="resume" line="no" sign="yes"/>
+ <pedal type="start" line="no" sign="yes"/>
  </direction-type>
  </direction>
  <note>

diff --git a/src/importexport/musicxml/tests/data/testDirections1_ref.xml b/src/importexport/musicxml/tests/data/testDirections1_ref.xml
@@ -102,7 +102,7 @@
  <measure number="2">
  <direction placement="above">
  <direction-type>
- <pedal type="resume" line="no" sign="yes"/>
+ <pedal type="start" line="no" sign="yes"/>
  </direction-type>
  </direction>
  <note>
@@ -132,7 +132,7 @@
  </note>
  <direction placement="below">
  <direction-type>
- <pedal type="resume" line="no" sign="yes"/>
+ <pedal type="start" line="no" sign="yes"/>
  </direction-type>
  </direction>
  <note>