Skip to content

Commit

Permalink
Merge pull request #5818 from emfomy/patch-1
Browse files Browse the repository at this point in the history 
Fix #302281: Wrong default beaming of 32nd notes in 9/8 and 12/8
  • Loading branch information
@anatoly-os
anatoly-os committed Apr 7, 2020
2 parents 4e123c3 + 56ee821 commit 7710ce7
Showing 1 changed file with 26 additions and 20 deletions.
46 changes: 26 additions & 20 deletions libmscore/groups.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,40 +25,46 @@ namespace Ms {

static std::vector<NoteGroup> noteGroups {
{ Fraction(2,2),
Groups( { { 4, 512}, { 8, 272}, {12, 512}, {16, 273}, {20, 512}, {24, 272}, {28, 512} })
Groups( { {4, 0x200}, {8, 0x110}, {12, 0x200}, {16, 0x111}, {20, 0x200}, {24, 0x110}, {28, 0x200} })
},
{ Fraction(4,4),
Groups( { { 4, 0x200}, { 8, 0x110}, {12, 0x200}, {16, 0x111}, {20, 0x200}, {24, 0x110}, {28, 0x200} })
{ Fraction(3,2),
Groups( { {4, 0x200}, {8, 0x110}, {12, 0x200}, {16, 0x111}, {20, 0x200}, {24, 0x110}, {28, 0x200}, {32, 0x111}, {36, 0x200}, {40, 0x110}, {44, 0x200} })
},
{ Fraction(3,4),
Groups( { { 4, 512}, { 8, 273}, { 12, 512}, {16, 273}, { 20, 512} })
{ Fraction(4,2),
Groups( { {4, 0x200}, {8, 0x110}, {12, 0x200}, {16, 0x111}, {20, 0x200}, {24, 0x110}, {28, 0x200}, {32, 0x111}, {36, 0x200}, {40, 0x110}, {44, 0x200}, {48, 0x111}, {52, 0x200}, {56, 0x110}, {60, 0x200} })
},
{ Fraction(2,4),
Groups( { { 4, 512}, { 8, 273}, { 12, 512}, {0, 0} })
Groups( { {4, 0x200}, {8, 0x111}, {12, 0x200} })
},
{ Fraction(6,8),
Groups( { { 4, 512}, { 8, 512}, { 12, 273}, { 16, 512}, { 20, 512}, {0, 0} })
{ Fraction(3,4),
Groups( { {4, 0x200}, {8, 0x111}, {12, 0x200}, {16, 0x111}, {20, 0x200} })
},
{ Fraction(9,8),
Groups( { { 4, 512}, { 8, 512}, { 12, 273}, { 16, 512}, { 20, 512}, {24, 273}, { 18, 512}, { 32, 512} })
{ Fraction(4,4),
Groups( { {4, 0x200}, {8, 0x110}, {12, 0x200}, {16, 0x111}, {20, 0x200}, {24, 0x110}, {28, 0x200} })
},
{ Fraction(12,8),
Groups( { { 4, 512}, { 8, 512}, { 12, 273}, { 16, 512}, { 20, 512}, {24, 273}, { 18, 512}, { 32, 512}, {36, 273}, { 40, 512}, { 44, 512} })
{ Fraction(5,4),
Groups( { {4, 0x200}, {8, 0x110}, {12, 0x200}, {16, 0x110}, {20, 0x200}, {24, 0x111}, {28, 0x200}, {32, 0x110}, {36, 0x200} })
},
{ Fraction(6,4),
Groups( { { 4, 512}, { 8, 512}, { 12, 512}, { 16, 512}, { 20, 512}, { 24, 273}, { 28, 512}, { 32, 512}, { 36, 512}, { 40, 512}, { 44, 512} })
Groups( { {4, 0x200}, {8, 0x110}, {12, 0x200}, {16, 0x110}, {20, 0x200}, {24, 0x111}, {28, 0x200}, {32, 0x110}, {36, 0x200}, {40, 0x110}, {44, 0x200} })
},
{ Fraction(3,2),
Groups( { { 4, 512}, { 8, 272}, { 12, 512}, { 16, 273}, { 20, 512}, { 24, 272}, { 28, 512}, { 32, 273}, { 36, 512}, { 40, 272}, { 44, 512} })
{ Fraction(3,8),
Groups( { {4, 0x200}, {8, 0x200} })
},
{ Fraction(5,4),
Groups( { { 4, 512}, { 8, 512}, { 12, 512}, { 16, 512}, { 20, 512}, { 24, 273}, { 28, 512}, { 32, 512}, { 36, 512} })
{ Fraction(5,8),
Groups( { {4, 0x200}, {8, 0x200}, {12, 0x111}, {16, 0x200} })
},
{ Fraction(6,8),
Groups( { {4, 0x200}, {8, 0x200}, {12, 0x111}, {16, 0x200}, {20, 0x200} })
},
{ Fraction(7,8),
Groups( { { 4, 512}, { 8, 512}, { 12, 273}, { 16, 512}, { 20, 273}, { 24, 512} })
Groups( { {4, 0x200}, {8, 0x200}, {12, 0x111}, {16, 0x200}, {20, 0x111}, {24, 0x200} })
},
{ Fraction(5,8),
Groups( { { 4, 512}, { 8, 512}, { 12, 273}, { 16, 512} })
{ Fraction(9,8),
Groups( { {4, 0x200}, {8, 0x200}, {12, 0x111}, {16, 0x200}, {20, 0x200}, {24, 0x111}, {28, 0x200}, {32, 0x200} })
},
{ Fraction(12,8),
Groups( { {4, 0x200}, {8, 0x200}, {12, 0x111}, {16, 0x200}, {20, 0x200}, {24, 0x111}, {28, 0x200}, {32, 0x200}, {36, 0x111}, {40, 0x200}, {44, 0x200} })
},
};

Expand Down

0 comments on commit 7710ce7

Please sign in to comment.