-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3515 from jeetee/269603_unwind_RepeatList_followup
fix #269603, fix #148276 unwind followup especially with regards to DS having playRepeats enabled
- Loading branch information
Showing
11 changed files
with
1,041 additions
and
130 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
Large diffs are not rendered by default.
Oops, something went wrong.
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
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,224 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <museScore version="3.00"> | ||
| <Score> | ||
| <LayerTag id="0" tag="default"></LayerTag> | ||
| <currentLayer>0</currentLayer> | ||
| <Division>480</Division> | ||
| <Style> | ||
| <Spatium>1.76389</Spatium> | ||
| </Style> | ||
| <showInvisible>1</showInvisible> | ||
| <showUnprintable>1</showUnprintable> | ||
| <showFrames>1</showFrames> | ||
| <showMargins>0</showMargins> | ||
| <metaTag name="arranger"></metaTag> | ||
| <metaTag name="composer"></metaTag> | ||
| <metaTag name="copyright"></metaTag> | ||
| <metaTag name="lyricist"></metaTag> | ||
| <metaTag name="movementNumber"></metaTag> | ||
| <metaTag name="movementTitle"></metaTag> | ||
| <metaTag name="poet"></metaTag> | ||
| <metaTag name="source"></metaTag> | ||
| <metaTag name="translator"></metaTag> | ||
| <metaTag name="workNumber"></metaTag> | ||
| <metaTag name="workTitle">Repeat Test</metaTag> | ||
| <Part> | ||
| <Staff id="1"> | ||
| <StaffType group="pitched"> | ||
| <name>stdNormal</name> | ||
| </StaffType> | ||
| </Staff> | ||
| <trackName>Piano</trackName> | ||
| <Instrument> | ||
| <longName>Piano</longName> | ||
| <shortName>Pno.</shortName> | ||
| <trackName>Piano</trackName> | ||
| <minPitchP>21</minPitchP> | ||
| <maxPitchP>108</maxPitchP> | ||
| <minPitchA>21</minPitchA> | ||
| <maxPitchA>108</maxPitchA> | ||
| <instrumentId>keyboard.piano</instrumentId> | ||
| <clef staff="2">F</clef> | ||
| <Articulation> | ||
| <velocity>100</velocity> | ||
| <gateTime>95</gateTime> | ||
| </Articulation> | ||
| <Articulation name="staccatissimo"> | ||
| <velocity>100</velocity> | ||
| <gateTime>33</gateTime> | ||
| </Articulation> | ||
| <Articulation name="staccato"> | ||
| <velocity>100</velocity> | ||
| <gateTime>50</gateTime> | ||
| </Articulation> | ||
| <Articulation name="portato"> | ||
| <velocity>100</velocity> | ||
| <gateTime>67</gateTime> | ||
| </Articulation> | ||
| <Articulation name="tenuto"> | ||
| <velocity>100</velocity> | ||
| <gateTime>100</gateTime> | ||
| </Articulation> | ||
| <Articulation name="marcato"> | ||
| <velocity>120</velocity> | ||
| <gateTime>67</gateTime> | ||
| </Articulation> | ||
| <Articulation name="sforzato"> | ||
| <velocity>120</velocity> | ||
| <gateTime>100</gateTime> | ||
| </Articulation> | ||
| <Channel> | ||
| <program value="0"/> | ||
| </Channel> | ||
| </Instrument> | ||
| </Part> | ||
| <Staff id="1"> | ||
| <VBox> | ||
| <height>10</height> | ||
| <bottomGap>1</bottomGap> | ||
| <Text> | ||
| <style>Title</style> | ||
| <text>Repeat Test</text> | ||
| </Text> | ||
| <Text> | ||
| <style>Subtitle</style> | ||
| <text>Jump into first Volta</text> | ||
| </Text> | ||
| </VBox> | ||
| <TBox> | ||
| <height>1</height> | ||
| <topGap>0</topGap> | ||
| <leftMargin>1</leftMargin> | ||
| <rightMargin>1</rightMargin> | ||
| <topMargin>1</topMargin> | ||
| <bottomMargin>1</bottomMargin> | ||
| <Text> | ||
| <style>Frame</style> | ||
| <text>Assume the composer is 'right' and rewind that far for 'final' playthrough: | ||
| 1,2,3,4,1,5,6,7,3,4,1,5,8</text> | ||
| </Text> | ||
| </TBox> | ||
| <Measure number="1"> | ||
| <TimeSig> | ||
| <sigN>4</sigN> | ||
| <sigD>4</sigD> | ||
| </TimeSig> | ||
| <Tempo> | ||
| <tempo>5</tempo> | ||
| <followText>1</followText> | ||
| <text><sym>metNoteQuarterUp</sym> = 300</text> | ||
| </Tempo> | ||
| <Chord> | ||
| <durationType>whole</durationType> | ||
| <Note> | ||
| <pitch>60</pitch> | ||
| <tpc>14</tpc> | ||
| </Note> | ||
| </Chord> | ||
| </Measure> | ||
| <Measure number="2"> | ||
| <Volta id="2"> | ||
| <endHookType>1</endHookType> | ||
| <beginText>1.</beginText> | ||
| <endings>1</endings> | ||
| </Volta> | ||
| <Chord> | ||
| <durationType>whole</durationType> | ||
| <Note> | ||
| <pitch>62</pitch> | ||
| <tpc>16</tpc> | ||
| </Note> | ||
| </Chord> | ||
| </Measure> | ||
| <Measure number="3"> | ||
| <Marker> | ||
| <style>Repeat Text Left</style> | ||
| <text><sym>segno</sym></text> | ||
| <label>segno</label> | ||
| </Marker> | ||
| <Chord> | ||
| <durationType>whole</durationType> | ||
| <Note> | ||
| <pitch>64</pitch> | ||
| <tpc>18</tpc> | ||
| </Note> | ||
| </Chord> | ||
| </Measure> | ||
| <Measure number="4"> | ||
| <endRepeat>2</endRepeat> | ||
| <Chord> | ||
| <durationType>whole</durationType> | ||
| <Note> | ||
| <pitch>65</pitch> | ||
| <tpc>13</tpc> | ||
| </Note> | ||
| </Chord> | ||
| </Measure> | ||
| <Measure number="5"> | ||
| <Marker> | ||
| <style>Repeat Text Right</style> | ||
| <text>To Coda</text> | ||
| <label>coda</label> | ||
| </Marker> | ||
| <endSpanner id="2"/> | ||
| <Volta id="3"> | ||
| <beginText>2.</beginText> | ||
| <endings>2</endings> | ||
| </Volta> | ||
| <Chord> | ||
| <durationType>whole</durationType> | ||
| <Note> | ||
| <pitch>67</pitch> | ||
| <tpc>15</tpc> | ||
| </Note> | ||
| </Chord> | ||
| </Measure> | ||
| <Measure number="6"> | ||
| <endSpanner id="3"/> | ||
| <Chord> | ||
| <durationType>whole</durationType> | ||
| <Note> | ||
| <pitch>69</pitch> | ||
| <tpc>17</tpc> | ||
| </Note> | ||
| </Chord> | ||
| </Measure> | ||
| <Measure number="7"> | ||
| <Jump> | ||
| <style>Repeat Text Right</style> | ||
| <text>D.S. al Coda</text> | ||
| <jumpTo>segno</jumpTo> | ||
| <playUntil>coda</playUntil> | ||
| <continueAt>codab</continueAt> | ||
| </Jump> | ||
| <Chord> | ||
| <durationType>whole</durationType> | ||
| <Note> | ||
| <pitch>71</pitch> | ||
| <tpc>19</tpc> | ||
| </Note> | ||
| </Chord> | ||
| <BarLine> | ||
| <subtype>double</subtype> | ||
| </BarLine> | ||
| </Measure> | ||
| <HBox> | ||
| <width>5</width> | ||
| </HBox> | ||
| <Measure number="8"> | ||
| <Marker> | ||
| <style>Repeat Text Left</style> | ||
| <text><sym>coda</sym></text> | ||
| <label>codab</label> | ||
| </Marker> | ||
| <Chord> | ||
| <durationType>whole</durationType> | ||
| <Note> | ||
| <pitch>72</pitch> | ||
| <tpc>14</tpc> | ||
| </Note> | ||
| </Chord> | ||
| </Measure> | ||
| </Staff> | ||
| </Score> | ||
| </museScore> |
Oops, something went wrong.