forked from musescore/MuseScore
-
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ENG-20: Add support for "wavy" type brackets
Previously, brackets with line-type "wavy" were unsupported. This commit adds handling for them by creating a Trill line of type PRALLPRALL_LINE, which best visually matches the examples in the MusicXML spec. This required some fairly involved changes to the structure of MusicXMLParserPass2::bracket(). Duplicate of musescore#8480
- Loading branch information
1 parent
f271408
commit e21d7c3
Showing
5 changed files
with
503 additions
and
26 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
Binary file not shown.
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,186 @@ | ||
<?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-title>Bracket Types</work-title> | ||
</work> | ||
<identification> | ||
<creator type="composer">Henry Ives</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> | ||
<defaults> | ||
<scaling> | ||
<millimeters>7</millimeters> | ||
<tenths>40</tenths> | ||
</scaling> | ||
<page-layout> | ||
<page-height>1697.14</page-height> | ||
<page-width>1200</page-width> | ||
<page-margins type="even"> | ||
<left-margin>85.7143</left-margin> | ||
<right-margin>85.7143</right-margin> | ||
<top-margin>85.7143</top-margin> | ||
<bottom-margin>85.7143</bottom-margin> | ||
</page-margins> | ||
<page-margins type="odd"> | ||
<left-margin>85.7143</left-margin> | ||
<right-margin>85.7143</right-margin> | ||
<top-margin>85.7143</top-margin> | ||
<bottom-margin>85.7143</bottom-margin> | ||
</page-margins> | ||
</page-layout> | ||
<word-font font-family="Edwin" font-size="10"/> | ||
<lyric-font font-family="Edwin" font-size="10"/> | ||
</defaults> | ||
<credit page="1"> | ||
<credit-type>title</credit-type> | ||
<credit-words default-x="600" default-y="1611.43" justify="center" valign="top" font-size="22">Bracket Types</credit-words> | ||
</credit> | ||
<credit page="1"> | ||
<credit-type>subtitle</credit-type> | ||
<credit-words default-x="600" default-y="1554.29" justify="center" valign="top" font-size="16">MuseScore Testcase</credit-words> | ||
</credit> | ||
<credit page="1"> | ||
<credit-type>composer</credit-type> | ||
<credit-words default-x="1114.29" default-y="1511.43" justify="right" valign="bottom">Henry Ives</credit-words> | ||
</credit> | ||
<part-list> | ||
<part-group type="start" number="1"> | ||
<group-symbol>brace</group-symbol> | ||
</part-group> | ||
<score-part id="P1"> | ||
<part-name>Piano</part-name> | ||
<part-abbreviation>Pno.</part-abbreviation> | ||
<score-instrument id="P1-I1"> | ||
<instrument-name>Piano</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" width="290.24"> | ||
<print> | ||
<system-layout> | ||
<system-margins> | ||
<left-margin>50.00</left-margin> | ||
<right-margin>0.00</right-margin> | ||
</system-margins> | ||
<top-system-distance>170.00</top-system-distance> | ||
</system-layout> | ||
</print> | ||
<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> | ||
</attributes> | ||
<direction placement="above"> | ||
<direction-type> | ||
<bracket type="start" number="1" line-end="none" line-type="solid" default-y="10.00"/> | ||
</direction-type> | ||
</direction> | ||
<note default-x="80.72" default-y="-5.00"> | ||
<pitch> | ||
<step>E</step> | ||
<octave>5</octave> | ||
</pitch> | ||
<duration>4</duration> | ||
<voice>1</voice> | ||
<type>whole</type> | ||
</note> | ||
<direction placement="above"> | ||
<direction-type> | ||
<bracket type="stop" number="1" line-end="none"/> | ||
</direction-type> | ||
</direction> | ||
</measure> | ||
<measure number="2" width="227.80"> | ||
<direction placement="above"> | ||
<direction-type> | ||
<bracket type="start" number="1" line-end="none" line-type="dashed" default-y="10.00"/> | ||
</direction-type> | ||
</direction> | ||
<note default-x="13.96" default-y="-15.00"> | ||
<pitch> | ||
<step>C</step> | ||
<octave>5</octave> | ||
</pitch> | ||
<duration>4</duration> | ||
<voice>1</voice> | ||
<type>whole</type> | ||
</note> | ||
<direction placement="above"> | ||
<direction-type> | ||
<bracket type="stop" number="1" line-end="none"/> | ||
</direction-type> | ||
</direction> | ||
</measure> | ||
<measure number="3" width="228.00"> | ||
<direction placement="above"> | ||
<direction-type> | ||
<bracket type="start" number="1" line-end="none" line-type="dotted" default-y="10.00"/> | ||
</direction-type> | ||
</direction> | ||
<note default-x="13.00" default-y="-25.00"> | ||
<pitch> | ||
<step>A</step> | ||
<octave>4</octave> | ||
</pitch> | ||
<duration>4</duration> | ||
<voice>1</voice> | ||
<type>whole</type> | ||
</note> | ||
<direction placement="above"> | ||
<direction-type> | ||
<bracket type="stop" number="1" line-end="none"/> | ||
</direction-type> | ||
</direction> | ||
</measure> | ||
<measure number="4" width="232.53"> | ||
<direction placement="above"> | ||
<direction-type> | ||
<bracket type="start" number="1" line-end="none" line-type="wavy" default-y="10.00"/> | ||
</direction-type> | ||
</direction> | ||
<note default-x="13.00" default-y="-35.00"> | ||
<pitch> | ||
<step>F</step> | ||
<octave>4</octave> | ||
</pitch> | ||
<duration>4</duration> | ||
<voice>1</voice> | ||
<type>whole</type> | ||
</note> | ||
<direction placement="above"> | ||
<direction-type> | ||
<bracket type="stop" number="1" line-end="none"/> | ||
</direction-type> | ||
</direction> | ||
<barline location="right"> | ||
<bar-style>light-heavy</bar-style> | ||
</barline> | ||
</measure> | ||
</part> | ||
</score-partwise> |
Oops, something went wrong.