Skip to content

Commit

Permalink
Merge pull request musescore#4191 from Jojo-Schmitz/mm-rest
Browse files Browse the repository at this point in the history 
fix #275809: MM rests should not include irregular measures
  • Loading branch information
@anatoly-os
anatoly-os authored Nov 24, 2018
2 parents c4e4d87 + ef59d24 commit 6337218
Show file tree
Hide file tree
Showing 5 changed files with 278 additions and 2 deletions.
2 changes: 2 additions & 0 deletions libmscore/layout.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2009,6 +2009,8 @@ static bool breakMultiMeasureRest(Measure* m)

if (m->repeatStart()
|| (m->prevMeasure() && m->prevMeasure()->repeatEnd())
|| (m->isIrregular())
|| (m->prevMeasure() && m->prevMeasure()->isIrregular())
|| (m->prevMeasure() && (m->prevMeasure()->sectionBreak())))
return true;

Expand Down
2 changes: 1 addition & 1 deletion vtest/gen
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if test -n "$1"; then
SRC=$1
else
SRC="mmrest-1 bravura-mmrest gonville-mmrest mmrest-2 mmrest-4 mmrest-5 mmrest-6 mmrest-7 mmrest-8 mmrest-9\
mmrest-10 fmrest-1 fmrest-2 fmrest-3 fmrest-4 fmrest-5 fmrest-6 measure-repeat-1\
mmrest-10 mmrest-11 fmrest-1 fmrest-2 fmrest-3 fmrest-4 fmrest-5 fmrest-6 measure-repeat-1\
noteheadposition-1 valign-1 valign-2 valign-3\
emmentaler-1 bravura-1 gonville-1 musejazz-1\
emmentaler-2 bravura-2 gonville-2 musejazz-2\
Expand Down
2 changes: 1 addition & 1 deletion vtest/gen.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
rem "magick compare" - image magick compare program

set SRC=mmrest-1,bravura-mmrest,gonville-mmrest,mmrest-2,mmrest-4,mmrest-5,mmrest-6,mmrest-7,mmrest-8,mmrest-9, ^
mmrest-10,fmrest-1,fmrest-2,fmrest-3,fmrest-4,fmrest-5,fmrest-6,measure-repeat-1, ^
mmrest-10,mmrest-11,fmrest-1,fmrest-2,fmrest-3,fmrest-4,fmrest-5,fmrest-6,measure-repeat-1, ^
noteheadposition-1,valign-1,valign-2,valign-3, ^
emmentaler-1,bravura-1,gonville-1, musejazz-1, ^
emmentaler-2,bravura-2,gonville-2, musejazz-2, ^
Expand Down
Binary file added vtest/mmrest-11-ref.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
274 changes: 274 additions & 0 deletions vtest/mmrest-11.mscx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,274 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.01">
<programVersion>3.0.0</programVersion>
<programRevision>751bd8a</programRevision>
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Synthesizer>
</Synthesizer>
<Division>480</Division>
<Style>
<pageWidth>5.82992</pageWidth>
<pageHeight>4.12992</pageHeight>
<pagePrintableWidth>5.04252</pagePrintableWidth>
<createMultiMeasureRests>1</createMultiMeasureRests>
<Spatium>1.764</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="creationDate">2018-11-24</metaTag>
<metaTag name="lyricist"></metaTag>
<metaTag name="movementNumber"></metaTag>
<metaTag name="movementTitle"></metaTag>
<metaTag name="platform">Microsoft Windows</metaTag>
<metaTag name="poet"></metaTag>
<metaTag name="source"></metaTag>
<metaTag name="translator"></metaTag>
<metaTag name="workNumber"></metaTag>
<metaTag name="workTitle"></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>
<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"/>
<synti>Fluid</synti>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<VBox>
<height>10</height>
<Text>
<style>Title</style>
<text>MM-Rest test with irregular measures</text>
</Text>
</VBox>
<Measure len="1/4">
<irregular>1</irregular>
<voice>
<TimeSig>
<sigN>4</sigN>
<sigD>4</sigD>
</TimeSig>
<Rest>
<durationType>quarter</durationType>
</Rest>
</voice>
</Measure>
<Measure>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
</voice>
</Measure>
<Measure len="8/4">
<multiMeasureRest>2</multiMeasureRest>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>8/4</duration>
</Rest>
</voice>
</Measure>
<Measure>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
</voice>
</Measure>
<Measure len="3/4">
<voice>
<Rest>
<durationType>half</durationType>
</Rest>
<Rest>
<durationType>quarter</durationType>
</Rest>
</voice>
</Measure>
<Measure len="1/4">
<startRepeat/>
<irregular>1</irregular>
<voice>
<Rest>
<durationType>quarter</durationType>
</Rest>
</voice>
</Measure>
<Measure>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
</voice>
</Measure>
<Measure len="8/4">
<multiMeasureRest>2</multiMeasureRest>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>8/4</duration>
</Rest>
</voice>
</Measure>
<Measure>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
</voice>
</Measure>
<Measure len="3/4">
<LayoutBreak>
<subtype>section</subtype>
</LayoutBreak>
<voice>
<Rest>
<durationType>half</durationType>
</Rest>
<Rest>
<durationType>quarter</durationType>
</Rest>
<BarLine>
<subtype>end</subtype>
</BarLine>
</voice>
</Measure>
<Measure len="1/4">
<voice>
<Rest>
<durationType>quarter</durationType>
</Rest>
</voice>
</Measure>
<Measure>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
</voice>
</Measure>
<Measure len="8/4">
<multiMeasureRest>2</multiMeasureRest>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>8/4</duration>
</Rest>
</voice>
</Measure>
<Measure>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
</voice>
</Measure>
<Measure len="3/4">
<voice>
<Rest>
<durationType>measure</durationType>
<duration>3/4</duration>
</Rest>
</voice>
</Measure>
<Measure len="1/4">
<startRepeat/>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>1/4</duration>
</Rest>
</voice>
</Measure>
<Measure>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
</voice>
</Measure>
<Measure len="8/4">
<multiMeasureRest>2</multiMeasureRest>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>8/4</duration>
</Rest>
</voice>
</Measure>
<Measure>
<voice>
<Rest>
<durationType>measure</durationType>
<duration>4/4</duration>
</Rest>
</voice>
</Measure>
<Measure len="3/4">
<voice>
<Rest>
<durationType>measure</durationType>
<duration>3/4</duration>
</Rest>
</voice>
</Measure>
</Staff>
</Score>
</museScore>

0 comments on commit 6337218

Please sign in to comment.