Skip to content

Commit 2bc0807

Browse files
authored
Merge pull request #28333 from rettinghaus/xml/encoder
[MusicXML] add support for encoder
2 parents e3e19a7 + 7efc232 commit 2bc0807

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

src/importexport/musicxml/internal/musicxml/export/exportmusicxml.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7068,6 +7068,11 @@ void ExportMusicXml::identification(XmlWriter& xml, Score const* const score)
70687068

70697069
xml.startElement("encoding");
70707070

7071+
String encoder = score->metaTag(u"encoder");
7072+
if (!encoder.empty()) {
7073+
xml.tag("encoder", encoder);
7074+
}
7075+
70717076
if (MScore::debugMode) {
70727077
xml.tag("software", String(u"MuseScore 0.7.0"));
70737078
xml.tag("encoding-date", String(u"2007-09-10"));

src/importexport/musicxml/internal/musicxml/import/importmusicxmlpass1.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1489,7 +1489,9 @@ void MusicXmlParserPass1::identification()
14891489
} else if (m_e.name() == "encoding") {
14901490
// TODO
14911491
while (m_e.readNextStartElement()) {
1492-
if (m_e.name() == "software") {
1492+
if (m_e.name() == "encoder") {
1493+
m_score->setMetaTag(u"encoder", m_e.readText());
1494+
} else if (m_e.name() == "software") {
14931495
String exporterString = m_e.readText().toLower();
14941496
setExporterSoftware(exporterString);
14951497
} else if (m_e.name() == "supports" && m_e.asciiAttribute("element") == "beam" && m_e.asciiAttribute("type") == "yes") {

src/importexport/musicxml/tests/data/testOrnaments.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<work-title>Ornaments import test</work-title>
66
</work>
77
<identification>
8-
<creator type="composer">Klaus Rettinghaus</creator>
98
<encoding>
9+
<encoder>Klaus Rettinghaus</encoder>
1010
<software>MuseScore 0.7.0</software>
1111
<encoding-date>2007-09-10</encoding-date>
1212
<supports element="accidental" type="yes"/>

src/importexport/musicxml/tests/data/testSibOttavas_ref.mscx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
<metaTag name="arranger"></metaTag>
148148
<metaTag name="composer"></metaTag>
149149
<metaTag name="copyright"></metaTag>
150+
<metaTag name="encoder">James Mizen</metaTag>
150151
<metaTag name="lyricist"></metaTag>
151152
<metaTag name="movementNumber"></metaTag>
152153
<metaTag name="movementTitle"></metaTag>

0 commit comments

Comments
 (0)