Skip to content

Import explicit MusicXML sound jump attributes regardless of inferTextType #33802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonashogstrom wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Import explicit MusicXML sound jump attributes regardless of inferTextType #33802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/importexport/musicxml/internal/import/importmusicxmlpass2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4644,26 +4644,27 @@ static String countSegno(const String& plainWords)
void MusicXmlParserDirection::handleRepeats(Measure* measure, const Fraction tick, bool& measureHasCoda,
SegnoStack& segnos, DelayedDirectionsList& delayedDirections)
{
if (!configuration()->inferTextType()) {
return;
}
// Try to recognize the various repeats
// The explicit repeat attributes of the <sound> element are always honoured;
// only the purely text-based fallback depends on the inferTextType preference
String repeat;
const String plainWords = MScoreTextToMusicXml::toPlainText(m_wordsText.toLower().simplified());
const String wordsRepeat = matchRepeat(plainWords);
if (!m_sndCoda.empty()) {
repeat = u"coda";
} else if (!m_sndDacapo.empty()) {
repeat = u"daCapo";
// the accompanying words may refine the jump type (e.g. "D.C. al Fine")
repeat = wordsRepeat.startsWith(u"daCapo") ? wordsRepeat : u"daCapo";
} else if (!m_sndDalsegno.empty()) {
repeat = u"dalSegno";
repeat = wordsRepeat.startsWith(u"dalSegno") ? wordsRepeat : u"dalSegno";
} else if (!m_sndFine.empty()) {
repeat = u"fine";
} else if (!m_sndSegno.empty()) {
repeat = u"segno";
} else if (!m_sndToCoda.empty()) {
repeat = u"toCoda";
} else {
repeat = matchRepeat(plainWords);
} else if (configuration()->inferTextType()) {
repeat = wordsRepeat;
}
// Check if repeat number has become detached
if (repeat == u"coda" || repeat == u"segno") {
Expand Down
145 changes: 145 additions & 0 deletions src/importexport/musicxml/tests/data/testDCalCoda_ref.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 4.0 Partwise//EN" "http://www.musicxml.org/dtds/partwise.dtd">
<score-partwise version="4.0">
<work>
<work-number>MuseScore testfile</work-number>
<work-title>D.C. al Coda</work-title>
</work>
<identification>
<creator type="composer">Leon Vinken</creator>
<encoding>
<software>MuseScore 0.7.0</software>
<encoding-date>2007-09-10</encoding-date>
<supports element="accidental" type="yes"/>
<supports element="beam" type="yes"/>
<supports element="print" attribute="new-page" type="no"/>
<supports element="print" attribute="new-system" type="no"/>
<supports element="stem" type="yes"/>
</encoding>
</identification>
<part-list>
<score-part id="P1">
<part-name>Guitar</part-name>
<score-instrument id="P1-I1">
<instrument-name>Guitar</instrument-name>
</score-instrument>
<midi-device id="P1-I1" port="1"></midi-device>
<midi-instrument id="P1-I1">
<midi-channel>1</midi-channel>
<midi-program>1</midi-program>
<volume>78.7402</volume>
<pan>0</pan>
</midi-instrument>
</score-part>
</part-list>
<part id="P1">
<measure number="1">
<attributes>
<divisions>1</divisions>
<key>
<fifths>0</fifths>
</key>
<time>
<beats>4</beats>
<beat-type>4</beat-type>
</time>
<clef>
<sign>G</sign>
<line>2</line>
<clef-octave-change>-1</clef-octave-change>
</clef>
</attributes>
<note>
<pitch>
<step>G</step>
<octave>3</octave>
</pitch>
<duration>4</duration>
<voice>1</voice>
<type>whole</type>
</note>
</measure>
<measure number="2">
<note>
<pitch>
<step>A</step>
<octave>3</octave>
</pitch>
<duration>4</duration>
<voice>1</voice>
<type>whole</type>
</note>
<direction placement="above">
<direction-type>
<words>To Coda</words>
<symbol>coda</symbol>
</direction-type>
<sound tocoda="codab"/>
</direction>
</measure>
<measure number="3">
<note>
<pitch>
<step>B</step>
<octave>3</octave>
</pitch>
<duration>4</duration>
<voice>1</voice>
<type>whole</type>
</note>
</measure>
<measure number="4">
<note>
<pitch>
<step>C</step>
<octave>4</octave>
</pitch>
<duration>4</duration>
<voice>1</voice>
<type>whole</type>
</note>
</measure>
<measure number="5">
<print>
<measure-layout>
<measure-distance>100</measure-distance>
</measure-layout>
</print>
<direction placement="above">
<direction-type>
<coda/>
</direction-type>
<sound coda="codab"/>
</direction>
<note>
<pitch>
<step>D</step>
<octave>4</octave>
</pitch>
<duration>4</duration>
<voice>1</voice>
<type>whole</type>
</note>
</measure>
<measure number="6">
<note>
<pitch>
<step>E</step>
<octave>4</octave>
</pitch>
<duration>4</duration>
<voice>1</voice>
<type>whole</type>
</note>
<direction placement="above">
<direction-type>
<words>D.C. al Coda</words>
</direction-type>
<sound dacapo="yes"/>
</direction>
<barline location="right">
<bar-style>light-heavy</bar-style>
</barline>
</measure>
</part>
</score-partwise>
4 changes: 2 additions & 2 deletions src/importexport/musicxml/tests/data/testDSalCodaMisplaced_ref.mscx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,8 @@
<style>repeat_right</style>
<text>D.S. al Coda</text>
<jumpTo>segno</jumpTo>
<playUntil>end</playUntil>
<continueAt></continueAt>
<playUntil>coda</playUntil>
<continueAt>codab</continueAt>
</Jump>
<voice>
<Chord>
Expand Down
4 changes: 2 additions & 2 deletions src/importexport/musicxml/tests/data/testDSalCoda_ref.mscx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,8 @@
<style>repeat_right</style>
<text>D.S. al Coda</text>
<jumpTo>segno</jumpTo>
<playUntil>end</playUntil>
<continueAt></continueAt>
<playUntil>coda</playUntil>
<continueAt>codab</continueAt>
</Jump>
<voice>
<Chord>
Expand Down
35 changes: 34 additions & 1 deletion src/importexport/musicxml/tests/musicxml_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include <gtest/gtest.h>

#include "engraving/engravingerrors.h"
#include "engraving/dom/jump.h"
#include "engraving/dom/marker.h"
#include "engraving/dom/masterscore.h"

#include "settings.h"
Expand Down Expand Up @@ -520,11 +522,42 @@ TEST_F(MusicXml_Tests, dalSegno) {
musicXmlIoTest("testDalSegno");
}
TEST_F(MusicXml_Tests, dcalCoda) {
musicXmlIoTest("testDCalCoda");
// "D.C. al Coda" with <sound dacapo="yes"/> imports as a D.C. al Coda jump,
// so the exported <sound tocoda> attribute becomes linked to the coda marker
musicXmlIoTestRef("testDCalCoda");
}
TEST_F(MusicXml_Tests, dcalFine) {
musicXmlIoTest("testDCalFine");
}
TEST_F(MusicXml_Tests, dcalFineNoInferTextType) {
// Explicit <sound dacapo="yes"/> and <sound fine="yes"/> attributes must be
// imported as Jump/Marker elements even when text type inference is disabled
MScore::debugMode = true;

setValue(PREF_IMPORT_MUSICXML_INFERTEXT, Val(false));

MasterScore* score = readScore(XML_IO_DATA_DIR + u"testDCalFine.xml");
ASSERT_TRUE(score);

const Jump* jump = nullptr;
const Marker* marker = nullptr;
for (const MeasureBase* mb = score->first(); mb; mb = mb->next()) {
for (const EngravingItem* el : mb->el()) {
if (el->isJump()) {
jump = toJump(el);
} else if (el->isMarker()) {
marker = toMarker(el);
}
}
}

ASSERT_TRUE(jump);
EXPECT_EQ(jump->jumpType(), JumpType::DC_AL_FINE);
ASSERT_TRUE(marker);
EXPECT_EQ(marker->markerType(), MarkerType::FINE);

delete score;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
TEST_F(MusicXml_Tests, directions1) {
musicXmlIoTestRef("testDirections1");
}
Expand Down
Loading