Skip to content
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

[MusicXML] Add full support for holes element #25932

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
+210 −2
Open

[MusicXML] Add full support for holes element #25932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
695fc7a
import wind techniques' hole
rettinghaus Dec 21, 2024
4bac758
export wind techniques' hole
rettinghaus Dec 27, 2024
ee8263c
add test
rettinghaus Dec 27, 2024
c1d5fe1
switch glyph for toe import
rettinghaus Dec 27, 2024
1422b3e
import other technical smufl glyphs
rettinghaus Dec 27, 2024
b684f02
import other articulation smufl glyphs
rettinghaus Dec 27, 2024
beb9bcf
formatting
rettinghaus Dec 28, 2024
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
24 changes: 24 additions & 0 deletions src/importexport/musicxml/internal/musicxml/export/exportmusicxml.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3343,6 +3343,12 @@ static String symIdToTechn(const SymId sid)
case SymId::brassHarmonMuteStemOpen:
return u"harmon-mute";
break;
case SymId::windClosedHole:
case SymId::windHalfClosedHole1:
case SymId::windHalfClosedHole2:
case SymId::windHalfClosedHole3:
case SymId::windOpenHole:
return u"hole";
case SymId::guitarGolpe:
return u"golpe";
break;
Expand Down Expand Up @@ -3605,6 +3611,24 @@ void ExportMusicXml::chordAttributes(Chord* chord, Notations& notations, Technic
}
m_xml.tag("harmon-closed", location, harmonClosedValue);
m_xml.endElement();
} else if (mxmlTechn.startsWith(u"hole")) {
m_xml.startElementRaw(mxmlTechn);
XmlWriter::Attributes location = {};
String holeClosedValue;
switch (sid) {
case SymId::windClosedHole:
holeClosedValue = u"yes";
break;
case SymId::windOpenHole:
holeClosedValue = u"no";
break;
default:
holeClosedValue = u"half";
location = { { "location", (sid == SymId::windHalfClosedHole1) ? "right" : "bottom" } };
break;
}
m_xml.tag("hole-closed", location, holeClosedValue);
m_xml.endElement();
} else {
m_xml.tagRaw(mxmlTechn);
}
Expand Down
64 changes: 62 additions & 2 deletions src/importexport/musicxml/internal/musicxml/import/importmusicxmlpass2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1356,7 +1356,7 @@ static bool convertArticulationToSymId(const String& mxmlName, SymId& id)
{ u"stopped", SymId::brassMuteClosed },
{ u"snap-pizzicato", SymId::pluckedSnapPizzicatoAbove },
{ u"heel", SymId::keyboardPedalHeel1 },
{ u"toe", SymId::keyboardPedalToe1 },
{ u"toe", SymId::keyboardPedalToe2 },
{ u"fingernails", SymId::pluckedWithFingernails },
{ u"brass-bend", SymId::brassBend },
{ u"flip", SymId::brassFlip },
Expand Down Expand Up @@ -8053,6 +8053,16 @@ void MusicXmlParserNotations::articulations()
artic.setSubType(String::fromAscii(m_e.name().ascii()));
m_notations.push_back(artic);
m_e.skipCurrentElement(); // skip but don't log
} else if (m_e.name() == "other-articulation") {
const String smufl = m_e.attribute("smufl");

if (!smufl.empty()) {
SymId id = SymNames::symIdByName(smufl, SymId::noSym);
Notation artic = Notation::notationWithAttributes(String::fromAscii(m_e.name().ascii()),
m_e.attributes(), u"articulations", id);
m_notations.push_back(artic);
}
m_e.skipCurrentElement(); // skip but don't log
} else {
skipLogCurrElem();
}
Expand Down Expand Up @@ -8151,6 +8161,8 @@ void MusicXmlParserNotations::technical()
harmonic();
} else if (m_e.name() == "harmon-mute") {
harmonMute();
} else if (m_e.name() == "hole") {
hole();
} else if (m_e.name() == "other-technical") {
otherTechnical();
} else {
Expand All @@ -8161,7 +8173,18 @@ void MusicXmlParserNotations::technical()

void MusicXmlParserNotations::otherTechnical()
{
String text = m_e.readText();
const String smufl = m_e.attribute("smufl");

if (!smufl.empty()) {
SymId id = SymNames::symIdByName(smufl, SymId::noSym);
Notation notation = Notation::notationWithAttributes(String::fromAscii(m_e.name().ascii()),
m_e.attributes(), u"technical", id);
m_notations.push_back(notation);
m_e.skipCurrentElement();
return;
}

const String text = m_e.readText();

if (text == u"z") {
// Buzz roll
Expand Down Expand Up @@ -8238,6 +8261,43 @@ void MusicXmlParserNotations::harmonMute()
m_notations.push_back(Notation::notationWithAttributes(u"harmon-closed", attributes, u"technical", mute));
}

//---------------------------------------------------------
// hole
//---------------------------------------------------------

/**
Parse the /score-partwise/part/measure/note/notations/technical/hole node.
*/

void MusicXmlParserNotations::hole()
{
engraving::SymId hole = SymId::noSym;
const std::vector<XmlStreamReader::Attribute> attributes = m_e.attributes();
while (m_e.readNextStartElement()) {
if (m_e.name() == "hole-closed") {
const String location = m_e.attribute("location");
const String value = m_e.readText();
if (value == "yes") {
hole = SymId::windClosedHole;
} else if (value == "no") {
hole = SymId::windOpenHole;
} else if (value == "half") {
if (location == "bottom") {
hole = SymId::windHalfClosedHole2;
} else if (location == "right") {
hole = SymId::windHalfClosedHole1;
} else {
m_logger->logError(String(u"unsupported hole-closed location '%1'").arg(location), &m_e);
hole = SymId::windHalfClosedHole3;
}
}
} else {
m_e.skipCurrentElement();
}
}
m_notations.push_back(Notation::notationWithAttributes(u"hole-closed", attributes, u"technical", hole));
}

//---------------------------------------------------------
// addTechnical
//---------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions src/importexport/musicxml/internal/musicxml/import/importmusicxmlpass2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,7 @@ class MusicXmlParserNotations
void arpeggio();
void harmonic();
void harmonMute();
void hole();
void articulations();
void dynamics();
void fermata();
Expand Down
120 changes: 120 additions & 0 deletions src/importexport/musicxml/tests/data/testHoles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?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-title>Holes test</work-title>
</work>
<identification>
<creator type="composer">Klaus Rettinghaus</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>Flute</part-name>
<part-abbreviation>Fl.</part-abbreviation>
<score-instrument id="P1-I1">
<instrument-name>Flute</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>58</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>
<clef>
<sign>G</sign>
<line>2</line>
</clef>
</attributes>
<note>
<pitch>
<step>C</step>
<octave>5</octave>
</pitch>
<duration>1</duration>
<voice>1</voice>
<type>quarter</type>
<stem>down</stem>
<notations>
<technical>
<hole>
<hole-closed>no</hole-closed>
</hole>
</technical>
</notations>
</note>
<note>
<pitch>
<step>C</step>
<octave>5</octave>
</pitch>
<duration>1</duration>
<voice>1</voice>
<type>quarter</type>
<stem>down</stem>
<notations>
<technical>
<hole>
<hole-closed>yes</hole-closed>
</hole>
</technical>
</notations>
</note>
<note>
<pitch>
<step>C</step>
<octave>5</octave>
</pitch>
<duration>1</duration>
<voice>1</voice>
<type>quarter</type>
<stem>down</stem>
<notations>
<technical>
<hole>
<hole-closed location="bottom">half</hole-closed>
</hole>
</technical>
</notations>
</note>
<note>
<pitch>
<step>C</step>
<octave>5</octave>
</pitch>
<duration>1</duration>
<voice>1</voice>
<type>quarter</type>
<stem>down</stem>
<notations>
<technical>
<hole>
<hole-closed location="right">half</hole-closed>
</hole>
</technical>
</notations>
</note>
<barline location="right">
<bar-style>light-heavy</bar-style>
</barline>
</measure>
</part>
</score-partwise>
3 changes: 3 additions & 0 deletions src/importexport/musicxml/tests/musicxml_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,9 @@ TEST_F(MusicXml_Tests, helloReadCompr) {
TEST_F(MusicXml_Tests, helloReadWriteCompr) {
musicXmlReadWriteTestCompr("testHello");
}
TEST_F(MusicXml_Tests, holes) {
musicXmlIoTest("testHoles");
}
TEST_F(MusicXml_Tests, implicitMeasure1) {
musicXmlIoTest("testImplicitMeasure1");
}
Expand Down