-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix #329608: [MusicXML export] custom ending text not exported
Export the volta text to the MusicXML ending element, allowing custom text such as "1-3". Backport of #10623, plus 2 more mtest fixes
- Loading branch information
1 parent
8000c6a
commit a24083a
Showing
6 changed files
with
121 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,108 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 3.1 Partwise//EN" "http://www.musicxml.org/dtds/partwise.dtd"> | ||
<score-partwise version="3.1"> | ||
<work> | ||
<work-number>MuseScore testfile</work-number> | ||
<work-title>Volta 2</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> | ||
<clef> | ||
<sign>G</sign> | ||
<line>2</line> | ||
</clef> | ||
</attributes> | ||
<note> | ||
<pitch> | ||
<step>G</step> | ||
<octave>4</octave> | ||
</pitch> | ||
<duration>4</duration> | ||
<voice>1</voice> | ||
<type>whole</type> | ||
</note> | ||
</measure> | ||
<measure number="2"> | ||
<barline location="left"> | ||
<ending number="1, 2, 3" type="start">1-3</ending> | ||
</barline> | ||
<note> | ||
<pitch> | ||
<step>A</step> | ||
<octave>4</octave> | ||
</pitch> | ||
<duration>4</duration> | ||
<voice>1</voice> | ||
<type>whole</type> | ||
</note> | ||
<barline location="right"> | ||
<bar-style>light-heavy</bar-style> | ||
<ending number="1, 2, 3" type="stop"/> | ||
<repeat direction="backward"/> | ||
</barline> | ||
</measure> | ||
<measure number="3"> | ||
<barline location="left"> | ||
<ending number="4" type="start">4</ending> | ||
</barline> | ||
<note> | ||
<pitch> | ||
<step>B</step> | ||
<octave>4</octave> | ||
</pitch> | ||
<duration>4</duration> | ||
<voice>1</voice> | ||
<type>whole</type> | ||
</note> | ||
<barline location="right"> | ||
<ending number="4" type="discontinue"/> | ||
</barline> | ||
</measure> | ||
<measure number="4"> | ||
<note> | ||
<pitch> | ||
<step>C</step> | ||
<octave>5</octave> | ||
</pitch> | ||
<duration>4</duration> | ||
<voice>1</voice> | ||
<type>whole</type> | ||
</note> | ||
<barline location="right"> | ||
<bar-style>light-heavy</bar-style> | ||
</barline> | ||
</measure> | ||
</part> | ||
</score-partwise> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
a24083a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
testVoltaHiding is not something I recognise, don't know why it is in your test/musicxml/io but not in 3.x in test/musicxml/io or in master in src/importexport/musicxml/tests/data. Perhaps part of some unmerged PR ?
a24083a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well possible that is from those backend fixes. It is in PR #9000, but no worries, just look at the other one.
Edit: Indeed, it stems from #8622
a24083a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The "other one" (testTextLines) was introduced in 3.x by commit a2f4f1b, which solves issue 303027. Pull request #5965.
The code change is present in master, as is the testfile. The test does work correctly in master.
a24083a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sync to master in commit 93bfbf3
a24083a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I know it is disabled, and doesn't work, that's why I left it disabled in e414499
a24083a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
testTextLines must be called using mxmlMscxExportTestRef
a24083a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, I've enabled it in #10586 now.