From 00f0529b2e0464fc20d8377f835dc7470b71b5bd Mon Sep 17 00:00:00 2001 From: infojunkie Date: Tue, 24 Sep 2024 21:24:25 -0700 Subject: [PATCH] Fix couple more tuplet cases --- src/js/musicxml-grooves.js | 18 +- test/data/grooves/04JAZZ01.musicxml | 212 +- test/data/grooves/04JAZZ02.musicxml | 4 +- test/data/grooves/04JAZZ03.musicxml | 4 +- test/data/grooves/04JAZZ04.musicxml | 362 +- test/data/grooves/08Beat01.musicxml | 4 +- test/data/grooves/08Beat02.musicxml | 4 +- test/data/grooves/08Beat03.musicxml | 4 +- test/data/grooves/08Beat04.musicxml | 4 +- test/data/grooves/08Beat05.musicxml | 4 +- test/data/grooves/08Beat06.musicxml | 4 +- test/data/grooves/08Beat07.musicxml | 4 +- test/data/grooves/08Beat08.musicxml | 56 +- test/data/grooves/08Beat09.musicxml | 421 +- test/data/grooves/08Beat10.musicxml | 30 +- test/data/grooves/08Beat11.musicxml | 30 +- test/data/grooves/08Beat12.musicxml | 30 +- test/data/grooves/16Beat01.musicxml | 4 +- test/data/grooves/16Beat02.musicxml | 4 +- test/data/grooves/16Beat03.musicxml | 4 +- test/data/grooves/16Beat04.musicxml | 4 +- test/data/grooves/16Beat05.musicxml | 4 +- test/data/grooves/16Beat06.musicxml | 4 +- test/data/grooves/16Beat07.musicxml | 4 +- test/data/grooves/16Beat08.musicxml | 4 +- test/data/grooves/16Beat09.musicxml | 54 +- test/data/grooves/16Beat1.musicxml | 4 +- test/data/grooves/16Beat10.musicxml | 4 +- test/data/grooves/16Beat11.musicxml | 4 +- test/data/grooves/16Beat12.musicxml | 4 +- test/data/grooves/16Beat2.musicxml | 607 +-- test/data/grooves/16Beat2End.musicxml | 14 +- test/data/grooves/16Beat2Intro.musicxml | 355 +- test/data/grooves/16Beat3.musicxml | 626 +-- test/data/grooves/16Beat3End.musicxml | 132 +- test/data/grooves/16Beat3Intro.musicxml | 260 +- test/data/grooves/16BeatBallad1.musicxml | 123 +- test/data/grooves/16BeatBallad1End.musicxml | 956 ++--- test/data/grooves/16BeatBallad1Intro.musicxml | 242 +- test/data/grooves/16BeatBallad2.musicxml | 19 +- test/data/grooves/16BeatBallad2End.musicxml | 531 +-- test/data/grooves/16BeatBallad2Intro.musicxml | 488 +-- test/data/grooves/16BeatBallad3.musicxml | 262 +- test/data/grooves/16BeatBallad3End.musicxml | 600 +-- test/data/grooves/16BeatBallad3Intro.musicxml | 728 +--- test/data/grooves/16FUS01.musicxml | 4 +- test/data/grooves/16FUS02.musicxml | 4 +- test/data/grooves/16FUS03.musicxml | 4 +- test/data/grooves/16FUS04.musicxml | 4 +- test/data/grooves/16Shuffle1.musicxml | 1065 ++--- test/data/grooves/16Shuffle1End.musicxml | 10 +- test/data/grooves/16Shuffle1Intro.musicxml | 297 +- test/data/grooves/16Shuffle2.musicxml | 4 +- test/data/grooves/16Shuffle2End.musicxml | 10 +- test/data/grooves/16Shuffle2Intro.musicxml | 4 +- test/data/grooves/16beat1A.musicxml | 4 +- test/data/grooves/16beat1B.musicxml | 4 +- test/data/grooves/16beat1E.musicxml | 4 +- test/data/grooves/16beat1End.musicxml | 4 +- test/data/grooves/16beat1FA.musicxml | 4 +- test/data/grooves/16beat1FB.musicxml | 4 +- test/data/grooves/16beat1Intro.musicxml | 4 +- test/data/grooves/16beat2A.musicxml | 4 +- test/data/grooves/16beat2B.musicxml | 4 +- test/data/grooves/16beat2E.musicxml | 4 +- test/data/grooves/16beat2FA.musicxml | 4 +- test/data/grooves/16beat2FB.musicxml | 4 +- test/data/grooves/50sRock.musicxml | 54 +- test/data/grooves/50sRock1.musicxml | 4 +- test/data/grooves/50sRock1Plus.musicxml | 4 +- test/data/grooves/50sRock1Sus.musicxml | 4 +- test/data/grooves/50sRock1SusPlus.musicxml | 4 +- test/data/grooves/50sRockEnd.musicxml | 4 +- test/data/grooves/50sRockIntro.musicxml | 4 +- test/data/grooves/50sRockIntro1.musicxml | 4 +- test/data/grooves/50sRockPlus.musicxml | 104 +- test/data/grooves/50sRockSus.musicxml | 54 +- test/data/grooves/50sRockSusPlus.musicxml | 104 +- test/data/grooves/50s_RockA.musicxml | 19 +- test/data/grooves/50s_RockB.musicxml | 19 +- test/data/grooves/50s_RockC.musicxml | 19 +- test/data/grooves/50s_RockD.musicxml | 19 +- test/data/grooves/50s_RockEndingA.musicxml | 54 +- test/data/grooves/50s_RockEndingB.musicxml | 54 +- test/data/grooves/50s_RockEndingC.musicxml | 63 +- test/data/grooves/50s_RockFillAA.musicxml | 4 +- test/data/grooves/50s_RockFillBA.musicxml | 4 +- test/data/grooves/50s_RockFillBB.musicxml | 19 +- test/data/grooves/50s_RockFillCC.musicxml | 4 +- test/data/grooves/50s_RockFillDD.musicxml | 4 +- test/data/grooves/50s_RockIntroA.musicxml | 4 +- test/data/grooves/50s_RockIntroB.musicxml | 19 +- test/data/grooves/50s_RockIntroC.musicxml | 4 +- test/data/grooves/60sPop.musicxml | 448 +-- test/data/grooves/60sPopEnd.musicxml | 4 +- test/data/grooves/60sPopIntro.musicxml | 226 +- test/data/grooves/60sRock.musicxml | 4 +- test/data/grooves/60sRock1.musicxml | 4 +- test/data/grooves/60sRock1Plus.musicxml | 4 +- test/data/grooves/60sRock1Sus.musicxml | 4 +- test/data/grooves/60sRock1SusPlus.musicxml | 4 +- test/data/grooves/60sRockEnd.musicxml | 610 +-- test/data/grooves/60sRockIntro.musicxml | 18 +- test/data/grooves/60sRockPlus.musicxml | 4 +- test/data/grooves/60sRockSus.musicxml | 4 +- test/data/grooves/60sRockSusPlus.musicxml | 4 +- test/data/grooves/60sSoul.musicxml | 4 +- test/data/grooves/60sSoulEnd.musicxml | 4 +- test/data/grooves/60sSoulIntro.musicxml | 4 +- test/data/grooves/68BLUS.musicxml | 4 +- test/data/grooves/68Ballad.musicxml | 427 +- test/data/grooves/68BalladEnd.musicxml | 462 +-- test/data/grooves/68BalladIntro.musicxml | 1081 +---- test/data/grooves/68March.musicxml | 4 +- test/data/grooves/68MarchEnd.musicxml | 4 +- test/data/grooves/68MarchFill.musicxml | 4 +- test/data/grooves/68MarchFill2.musicxml | 4 +- test/data/grooves/68MarchIntro.musicxml | 4 +- test/data/grooves/68MarchMetronome.musicxml | 4 +- test/data/grooves/68MarchPlus.musicxml | 4 +- test/data/grooves/68MarchSus.musicxml | 4 +- test/data/grooves/68MarchSusPlus.musicxml | 4 +- test/data/grooves/68Swing.musicxml | 4 +- test/data/grooves/68Swing1.musicxml | 4 +- test/data/grooves/68Swing1Plus.musicxml | 4 +- test/data/grooves/68Swing1Sus.musicxml | 4 +- test/data/grooves/68Swing1SusPlus.musicxml | 4 +- test/data/grooves/68Swing2.musicxml | 4 +- test/data/grooves/68Swing2Plus.musicxml | 4 +- test/data/grooves/68Swing2Sus.musicxml | 4 +- test/data/grooves/68Swing2SusPlus.musicxml | 4 +- test/data/grooves/68SwingEnd.musicxml | 4 +- test/data/grooves/68SwingIntro.musicxml | 4 +- test/data/grooves/68SwingPlus.musicxml | 4 +- test/data/grooves/68SwingSus.musicxml | 4 +- test/data/grooves/68SwingSusPlus.musicxml | 4 +- test/data/grooves/80sPop.musicxml | 4 +- test/data/grooves/80sPopEnd.musicxml | 600 +-- test/data/grooves/80sPopIntro.musicxml | 478 +-- test/data/grooves/8Beat.musicxml | 1006 +---- test/data/grooves/8Beat1.musicxml | 4 +- test/data/grooves/8Beat1End.musicxml | 4 +- test/data/grooves/8Beat1Intro.musicxml | 4 +- test/data/grooves/8Beat1Plus.musicxml | 1006 +---- test/data/grooves/8Beat1Sus.musicxml | 1006 +---- test/data/grooves/8Beat1SusPlus.musicxml | 1006 +---- test/data/grooves/8Beat2.musicxml | 4 +- test/data/grooves/8Beat2End.musicxml | 4 +- test/data/grooves/8Beat2Intro.musicxml | 4 +- test/data/grooves/8Beat3.musicxml | 4 +- test/data/grooves/8Beat3End.musicxml | 15 +- test/data/grooves/8Beat3Intro.musicxml | 28 +- test/data/grooves/8BeatBallad1.musicxml | 4 +- test/data/grooves/8BeatBallad1Intro.musicxml | 4 +- test/data/grooves/8BeatBallad2.musicxml | 4 +- test/data/grooves/8BeatBallad2End.musicxml | 4 +- test/data/grooves/8BeatBallad2Intro.musicxml | 4 +- test/data/grooves/8BeatBallad3.musicxml | 4 +- test/data/grooves/8BeatBallad3End.musicxml | 4 +- test/data/grooves/8BeatBallad3Intro.musicxml | 4 +- test/data/grooves/8BeatDance.musicxml | 4 +- test/data/grooves/8BeatDanceEnd.musicxml | 4 +- test/data/grooves/8BeatDanceIntro.musicxml | 4 +- test/data/grooves/8BeatEnd.musicxml | 46 +- test/data/grooves/8BeatFill.musicxml | 36 +- test/data/grooves/8BeatIntro.musicxml | 710 +--- test/data/grooves/8BeatPlus.musicxml | 1006 +---- test/data/grooves/8BeatPop1.musicxml | 4 +- test/data/grooves/8BeatPop1End.musicxml | 4 +- test/data/grooves/8BeatPop1Intro.musicxml | 4 +- test/data/grooves/8BeatPop2.musicxml | 4 +- test/data/grooves/8BeatPop2End.musicxml | 4 +- test/data/grooves/8BeatPop2Intro.musicxml | 4 +- test/data/grooves/8BeatPop3.musicxml | 4 +- test/data/grooves/8BeatPop3End.musicxml | 438 +- test/data/grooves/8BeatPop3Intro.musicxml | 438 +- test/data/grooves/8BeatSus.musicxml | 1006 +---- test/data/grooves/8BeatSusPlus.musicxml | 1006 +---- test/data/grooves/8BeatWalk.musicxml | 1006 +---- test/data/grooves/8BeatWalkPlus.musicxml | 1006 +---- test/data/grooves/8BeatWalkSus.musicxml | 1006 +---- test/data/grooves/8BeatWalkSusPlus.musicxml | 1006 +---- test/data/grooves/8beat1A.musicxml | 4 +- test/data/grooves/8beat1B.musicxml | 4 +- test/data/grooves/8beat1E.musicxml | 4 +- test/data/grooves/8beat1FA.musicxml | 4 +- test/data/grooves/8beat1FB.musicxml | 4 +- test/data/grooves/8beat2A.musicxml | 4 +- test/data/grooves/8beat2B.musicxml | 4 +- test/data/grooves/8beat2E.musicxml | 4 +- test/data/grooves/8beat2FA.musicxml | 4 +- test/data/grooves/8beat2FB.musicxml | 4 +- test/data/grooves/8beatmotownA.musicxml | 4 +- test/data/grooves/8beatmotownB.musicxml | 225 +- test/data/grooves/8beatmotownC.musicxml | 44 +- test/data/grooves/8beatmotownD.musicxml | 225 +- test/data/grooves/8beatmotownEndingA.musicxml | 90 +- test/data/grooves/8beatmotownEndingB.musicxml | 90 +- test/data/grooves/8beatmotownEndingC.musicxml | 202 +- test/data/grooves/8beatmotownFillA.musicxml | 117 +- test/data/grooves/8beatmotownFillB.musicxml | 4 +- test/data/grooves/8beatmotownFillBA.musicxml | 4 +- test/data/grooves/8beatmotownFillC.musicxml | 117 +- test/data/grooves/8beatmotownFillD.musicxml | 4 +- test/data/grooves/8beatmotownIntroA.musicxml | 112 +- test/data/grooves/8beatmotownIntroB.musicxml | 112 +- test/data/grooves/8beatmotownIntroC.musicxml | 112 +- test/data/grooves/AFRO01.musicxml | 23 +- test/data/grooves/AFRO02.musicxml | 716 ++-- test/data/grooves/AFRO03.musicxml | 4 +- test/data/grooves/AFRO04.musicxml | 104 +- test/data/grooves/AFRO05.musicxml | 17 +- test/data/grooves/AFRO06.musicxml | 828 +--- test/data/grooves/AFRO07.musicxml | 56 +- test/data/grooves/AFRO08.musicxml | 4 +- test/data/grooves/AMB01.musicxml | 117 +- test/data/grooves/AMB02.musicxml | 54 +- test/data/grooves/AMB03.musicxml | 137 +- test/data/grooves/AMB04.musicxml | 4 +- test/data/grooves/Afro-Cuban.musicxml | 4 +- test/data/grooves/Afro-CubanEnd.musicxml | 4 +- test/data/grooves/Afro-CubanFill.musicxml | 4 +- test/data/grooves/Afro-CubanIntro.musicxml | 4 +- test/data/grooves/Afro-CubanPlus.musicxml | 4 +- test/data/grooves/Afro-CubanSus.musicxml | 4 +- test/data/grooves/Afro-CubanSusPlus.musicxml | 4 +- test/data/grooves/Ambient1.musicxml | 796 ++-- test/data/grooves/Ambient1End.musicxml | 600 +-- test/data/grooves/Ambient1Intro.musicxml | 1103 ++---- test/data/grooves/Ambient2.musicxml | 4 +- test/data/grooves/Ambient2End.musicxml | 4 +- test/data/grooves/Ambient2Intro.musicxml | 4 +- test/data/grooves/Arrastape-Miranda.musicxml | 4 +- test/data/grooves/Ayyub.musicxml | 4 +- test/data/grooves/BALD01.musicxml | 4 +- test/data/grooves/BALD02.musicxml | 17 +- test/data/grooves/BALD03.musicxml | 4 +- test/data/grooves/BALD04.musicxml | 4 +- test/data/grooves/BALD05.musicxml | 4 +- test/data/grooves/BALD06.musicxml | 4 +- test/data/grooves/BALD07.musicxml | 4 +- test/data/grooves/BALD08.musicxml | 4 +- test/data/grooves/BALD09.musicxml | 4 +- test/data/grooves/BALD10.musicxml | 56 +- test/data/grooves/BALD11.musicxml | 133 +- test/data/grooves/BLUS01.musicxml | 4 +- test/data/grooves/BLUS02.musicxml | 700 +--- test/data/grooves/BLUS03.musicxml | 4 +- test/data/grooves/BLUS04.musicxml | 4 +- test/data/grooves/BLUS05.musicxml | 130 +- test/data/grooves/BLUS06.musicxml | 4 +- test/data/grooves/BOSSA01.musicxml | 4 +- test/data/grooves/BOSSA02.musicxml | 4 +- test/data/grooves/BVFunk.musicxml | 4 +- test/data/grooves/BVFunkEnd.musicxml | 4 +- test/data/grooves/BVFunkHorns.musicxml | 4 +- test/data/grooves/BVFunkIntro.musicxml | 4 +- test/data/grooves/BVFunkIntro8.musicxml | 4 +- test/data/grooves/BVFunkSus.musicxml | 4 +- test/data/grooves/BWMarch.musicxml | 4 +- test/data/grooves/BWMarchEnd.musicxml | 24 +- test/data/grooves/BWMarchFill.musicxml | 4 +- test/data/grooves/BWMarchIntro.musicxml | 4 +- test/data/grooves/BWMarchIntro8.musicxml | 4 +- test/data/grooves/BWMarchPlus.musicxml | 4 +- test/data/grooves/BWMarchPlus2.musicxml | 4 +- test/data/grooves/BWMarchSus.musicxml | 4 +- test/data/grooves/BWMarchSusPlus.musicxml | 4 +- test/data/grooves/BWMarchSusPlus2.musicxml | 4 +- test/data/grooves/Baiao-Gimenez.musicxml | 4 +- test/data/grooves/Baiao-Miranda.musicxml | 4 +- test/data/grooves/Ballad.musicxml | 436 +- test/data/grooves/Ballad1.musicxml | 436 +- test/data/grooves/Ballad128.musicxml | 4 +- test/data/grooves/Ballad128End.musicxml | 4 +- test/data/grooves/Ballad128Intro1.musicxml | 4 +- test/data/grooves/Ballad128Plus.musicxml | 4 +- test/data/grooves/Ballad128Sus.musicxml | 4 +- test/data/grooves/Ballad128SusPlus.musicxml | 4 +- test/data/grooves/Ballad1End.musicxml | 84 +- test/data/grooves/Ballad1Plus.musicxml | 436 +- test/data/grooves/Ballad1Sus.musicxml | 436 +- test/data/grooves/Ballad1SusPlus.musicxml | 436 +- test/data/grooves/Ballad68-44.musicxml | 4 +- test/data/grooves/Ballad68.musicxml | 1014 ++--- test/data/grooves/Ballad68End.musicxml | 238 +- test/data/grooves/Ballad68Intro.musicxml | 706 +--- test/data/grooves/Ballad68Plus.musicxml | 1014 ++--- test/data/grooves/Ballad68Sus.musicxml | 1014 ++--- test/data/grooves/Ballad68SusPlus.musicxml | 1014 ++--- test/data/grooves/BalladEnd.musicxml | 84 +- test/data/grooves/BalladFill.musicxml | 22 +- test/data/grooves/BalladIntro.musicxml | 116 +- test/data/grooves/BalladIntro1.musicxml | 116 +- test/data/grooves/BalladIntro2.musicxml | 116 +- test/data/grooves/BalladPlus.musicxml | 436 +- test/data/grooves/BalladSus.musicxml | 436 +- test/data/grooves/BalladSusPlus.musicxml | 436 +- test/data/grooves/BasicRock.musicxml | 4 +- test/data/grooves/BasicRock4.musicxml | 4 +- test/data/grooves/BasicRock4Intro.musicxml | 4 +- test/data/grooves/BasicRock4Sus.musicxml | 4 +- test/data/grooves/BasicRockEnd.musicxml | 20 +- test/data/grooves/BasicRockIntro.musicxml | 4 +- test/data/grooves/BasicRockSus.musicxml | 4 +- test/data/grooves/Bebop.musicxml | 4 +- test/data/grooves/BebopEnd.musicxml | 10 +- test/data/grooves/BebopIntro.musicxml | 94 +- test/data/grooves/BebopPlus.musicxml | 4 +- test/data/grooves/BebopSus.musicxml | 4 +- test/data/grooves/BebopSusPlus.musicxml | 4 +- test/data/grooves/Beguine.musicxml | 14 +- test/data/grooves/Beguine1.musicxml | 14 +- test/data/grooves/Beguine1Sus.musicxml | 14 +- test/data/grooves/Beguine2End.musicxml | 26 +- test/data/grooves/BeguineEnd.musicxml | 14 +- test/data/grooves/BeguineFill.musicxml | 4 +- test/data/grooves/BeguineIntro.musicxml | 14 +- test/data/grooves/BeguineIntro8.musicxml | 24 +- test/data/grooves/BeguineSus.musicxml | 14 +- test/data/grooves/BeguineSusIntro.musicxml | 14 +- test/data/grooves/BigBand.musicxml | 52 +- test/data/grooves/BigBand1.musicxml | 52 +- test/data/grooves/BigBand1End.musicxml | 4 +- test/data/grooves/BigBand1Fill.musicxml | 4 +- test/data/grooves/BigBand1Plus.musicxml | 52 +- test/data/grooves/BigBand1Sus.musicxml | 52 +- test/data/grooves/BigBand1SusPlus.musicxml | 52 +- test/data/grooves/BigBand2End.musicxml | 52 +- test/data/grooves/BigBand4End.musicxml | 52 +- test/data/grooves/BigBand8.musicxml | 100 +- test/data/grooves/BigBand8Sus.musicxml | 100 +- test/data/grooves/BigBandEnd.musicxml | 4 +- test/data/grooves/BigBandFill.musicxml | 4 +- test/data/grooves/BigBandIntro.musicxml | 52 +- test/data/grooves/BigBandIntro2.musicxml | 52 +- test/data/grooves/BigBandIntro8.musicxml | 100 +- test/data/grooves/BigBandPlus.musicxml | 52 +- test/data/grooves/BigBandSus.musicxml | 52 +- test/data/grooves/BigBandSusPlus.musicxml | 52 +- test/data/grooves/BlueFolk.musicxml | 4 +- test/data/grooves/BlueFolk2.musicxml | 4 +- test/data/grooves/BlueFolk2Plus.musicxml | 4 +- test/data/grooves/BlueFolk2Sus.musicxml | 4 +- test/data/grooves/BlueFolk2SusPlus.musicxml | 4 +- test/data/grooves/BlueFolkEnd.musicxml | 4 +- test/data/grooves/BlueFolkIntro.musicxml | 4 +- test/data/grooves/BlueFolkPlus.musicxml | 4 +- test/data/grooves/BlueFolkSus.musicxml | 4 +- test/data/grooves/BlueFolkSusPlus.musicxml | 4 +- test/data/grooves/BlueGrass.musicxml | 4 +- test/data/grooves/BlueGrassBottle.musicxml | 4 +- .../data/grooves/BlueGrassBottleClap.musicxml | 4 +- test/data/grooves/BlueGrassClap.musicxml | 4 +- test/data/grooves/BlueGrassEnd.musicxml | 4 +- test/data/grooves/BlueGrassIntro.musicxml | 4 +- test/data/grooves/BlueGrassSus.musicxml | 4 +- test/data/grooves/BlueGrassSusClap.musicxml | 4 +- test/data/grooves/Blues.musicxml | 4 +- test/data/grooves/Blues1.musicxml | 4 +- test/data/grooves/Blues128.musicxml | 4 +- test/data/grooves/Blues128End.musicxml | 4 +- test/data/grooves/Blues128Plus.musicxml | 4 +- test/data/grooves/Blues128Sus.musicxml | 4 +- test/data/grooves/Blues128SusPlus.musicxml | 4 +- test/data/grooves/Blues1Sus.musicxml | 4 +- test/data/grooves/Blues68.musicxml | 4 +- test/data/grooves/Blues68End.musicxml | 4 +- test/data/grooves/Blues68Intro.musicxml | 4 +- test/data/grooves/Blues68Plus.musicxml | 4 +- test/data/grooves/Blues68Walk.musicxml | 4 +- test/data/grooves/Blues68WalkPlus.musicxml | 4 +- test/data/grooves/BluesEnd.musicxml | 4 +- test/data/grooves/BluesIntro.musicxml | 30 +- test/data/grooves/BluesSus.musicxml | 4 +- test/data/grooves/BluesTriple.musicxml | 4 +- test/data/grooves/BluesTripleL.musicxml | 4 +- test/data/grooves/BluesTripleLSus.musicxml | 4 +- test/data/grooves/BluesTripleR.musicxml | 4 +- test/data/grooves/BluesTripleRSus.musicxml | 4 +- test/data/grooves/BluesTripleSus.musicxml | 4 +- test/data/grooves/Bolero.musicxml | 400 +- test/data/grooves/Bolero1.musicxml | 4 +- test/data/grooves/Bolero1End.musicxml | 197 +- test/data/grooves/Bolero1Fill.musicxml | 4 +- test/data/grooves/Bolero1Intro.musicxml | 10 +- test/data/grooves/Bolero1Sus.musicxml | 4 +- test/data/grooves/Bolero1SusFill.musicxml | 4 +- test/data/grooves/BoleroAlt.musicxml | 400 +- test/data/grooves/BoleroAltFill.musicxml | 400 +- test/data/grooves/BoleroAltSus.musicxml | 400 +- test/data/grooves/BoleroAltSusFill.musicxml | 400 +- test/data/grooves/BoleroEnd.musicxml | 400 +- test/data/grooves/BoleroFill.musicxml | 400 +- test/data/grooves/BoleroIntro.musicxml | 307 +- test/data/grooves/BoleroSus.musicxml | 400 +- test/data/grooves/BoleroSusFill.musicxml | 400 +- test/data/grooves/BoneyM.musicxml | 964 +---- test/data/grooves/BoneyMEnd.musicxml | 124 +- test/data/grooves/BoneyMFill.musicxml | 175 +- test/data/grooves/BoneyMIntro.musicxml | 319 +- test/data/grooves/BoneyMIntro8.musicxml | 945 +---- test/data/grooves/BoneyMPlus.musicxml | 964 +---- test/data/grooves/BoneyMSus.musicxml | 964 +---- test/data/grooves/BoneyMSusPlus.musicxml | 964 +---- test/data/grooves/BossaNova.musicxml | 4 +- test/data/grooves/BossaNova1End.musicxml | 4 +- test/data/grooves/BossaNova1Sus.musicxml | 4 +- test/data/grooves/BossaNova1SusPlus.musicxml | 4 +- test/data/grooves/BossaNova2End.musicxml | 4 +- test/data/grooves/BossaNova2Sus.musicxml | 4 +- test/data/grooves/BossaNova2SusPlus.musicxml | 4 +- test/data/grooves/BossaNova3Sus.musicxml | 4 +- test/data/grooves/BossaNova3SusPlus.musicxml | 4 +- test/data/grooves/BossaNovaEnd.musicxml | 4 +- test/data/grooves/BossaNovaFill.musicxml | 56 +- test/data/grooves/BossaNovaIntro.musicxml | 4 +- test/data/grooves/BossaNovaIntro1.musicxml | 4 +- test/data/grooves/BossaNovaIntro8.musicxml | 4 +- test/data/grooves/BossaNovaPlus.musicxml | 4 +- test/data/grooves/BossaNovaSus.musicxml | 4 +- test/data/grooves/BossaNovaSusPlus.musicxml | 4 +- test/data/grooves/Broadway.musicxml | 4 +- test/data/grooves/Broadway1.musicxml | 4 +- test/data/grooves/Broadway1Sus.musicxml | 4 +- test/data/grooves/Broadway2.musicxml | 4 +- test/data/grooves/Broadway2Sus.musicxml | 4 +- test/data/grooves/BroadwayEnd.musicxml | 24 +- test/data/grooves/BroadwayFill.musicxml | 4 +- test/data/grooves/BroadwayIntro.musicxml | 4 +- test/data/grooves/BroadwayIntro8.musicxml | 4 +- test/data/grooves/BroadwaySus.musicxml | 4 +- test/data/grooves/BroadwayWaltz.musicxml | 4 +- test/data/grooves/BroadwayWaltz1.musicxml | 4 +- test/data/grooves/BroadwayWaltz1Sus.musicxml | 4 +- test/data/grooves/BroadwayWaltz2.musicxml | 4 +- test/data/grooves/BroadwayWaltz2Sus.musicxml | 4 +- test/data/grooves/BroadwayWaltzEnd.musicxml | 4 +- test/data/grooves/BroadwayWaltzIntro.musicxml | 4 +- .../data/grooves/BroadwayWaltzIntro8.musicxml | 4 +- test/data/grooves/BroadwayWaltzSus.musicxml | 4 +- test/data/grooves/BubbleRock.musicxml | 68 +- test/data/grooves/BubbleRockEnd.musicxml | 26 +- test/data/grooves/BubbleRockFill.musicxml | 20 +- test/data/grooves/BubbleRockIntro.musicxml | 58 +- test/data/grooves/BubbleRockPlus.musicxml | 68 +- test/data/grooves/BubbleRockSus.musicxml | 68 +- test/data/grooves/BubbleRockSusPlus.musicxml | 68 +- test/data/grooves/CNTR01.musicxml | 4 +- test/data/grooves/CNTR02.musicxml | 4 +- test/data/grooves/CNTR03.musicxml | 213 +- test/data/grooves/CNTR04.musicxml | 133 +- test/data/grooves/CNTRY.musicxml | 4 +- test/data/grooves/COUNT.musicxml | 4 +- test/data/grooves/Calypso.musicxml | 4 +- test/data/grooves/Calypso1.musicxml | 4 +- test/data/grooves/Calypso1Plus.musicxml | 4 +- test/data/grooves/Calypso1Sus.musicxml | 4 +- test/data/grooves/Calypso1SusPlus.musicxml | 4 +- test/data/grooves/Calypso8Intro.musicxml | 4 +- test/data/grooves/CalypsoEnd.musicxml | 4 +- test/data/grooves/CalypsoIntro.musicxml | 4 +- test/data/grooves/CalypsoPlus.musicxml | 4 +- test/data/grooves/CalypsoSus.musicxml | 4 +- test/data/grooves/CalypsoSusPlus.musicxml | 4 +- test/data/grooves/ChaCha.musicxml | 4 +- test/data/grooves/ChaCha1.musicxml | 4 +- test/data/grooves/ChaCha1Fill.musicxml | 4 +- test/data/grooves/ChaCha1Sus.musicxml | 4 +- test/data/grooves/ChaChaEnd.musicxml | 4 +- test/data/grooves/ChaChaFill.musicxml | 4 +- test/data/grooves/ChaChaIntro.musicxml | 4 +- test/data/grooves/ChaChaIntro8.musicxml | 4 +- test/data/grooves/ChaChaSus.musicxml | 4 +- test/data/grooves/Charleston.musicxml | 4 +- test/data/grooves/Charleston1.musicxml | 4 +- test/data/grooves/Charleston1Plus.musicxml | 4 +- test/data/grooves/Charleston1Sus.musicxml | 4 +- test/data/grooves/Charleston1SusPlus.musicxml | 4 +- test/data/grooves/Charleston1Walk.musicxml | 4 +- .../data/grooves/Charleston1WalkPlus.musicxml | 4 +- test/data/grooves/Charleston1WalkSus.musicxml | 4 +- .../grooves/Charleston1WalkSusPlus.musicxml | 4 +- test/data/grooves/Charleston2.musicxml | 4 +- test/data/grooves/Charleston2Plus.musicxml | 4 +- test/data/grooves/Charleston2Sus.musicxml | 4 +- test/data/grooves/Charleston2SusPlus.musicxml | 4 +- test/data/grooves/Charleston2Walk.musicxml | 4 +- .../data/grooves/Charleston2WalkPlus.musicxml | 4 +- test/data/grooves/Charleston2WalkSus.musicxml | 4 +- .../grooves/Charleston2WalkSusPlus.musicxml | 4 +- test/data/grooves/CharlestonEnd.musicxml | 4 +- test/data/grooves/CharlestonIntro.musicxml | 4 +- test/data/grooves/CharlestonIntro8.musicxml | 4 +- test/data/grooves/CharlestonPlus.musicxml | 4 +- test/data/grooves/CharlestonSus.musicxml | 4 +- test/data/grooves/CharlestonSusPlus.musicxml | 4 +- test/data/grooves/CharlestonWalk.musicxml | 4 +- test/data/grooves/CharlestonWalkPlus.musicxml | 4 +- test/data/grooves/CharlestonWalkSus.musicxml | 4 +- .../grooves/CharlestonWalkSusPlus.musicxml | 4 +- test/data/grooves/Click.musicxml | 4 +- test/data/grooves/CountryBlues.musicxml | 4 +- test/data/grooves/CountryBlues1.musicxml | 4 +- test/data/grooves/CountryBlues1Fill.musicxml | 4 +- test/data/grooves/CountryBlues1Sus.musicxml | 4 +- test/data/grooves/CountryBlues1Walk.musicxml | 4 +- .../grooves/CountryBlues1WalkFill.musicxml | 4 +- .../grooves/CountryBlues1WalkSus.musicxml | 4 +- test/data/grooves/CountryBluesEnd.musicxml | 4 +- test/data/grooves/CountryBluesFill.musicxml | 4 +- test/data/grooves/CountryBluesIntro.musicxml | 4 +- test/data/grooves/CountryBluesSus.musicxml | 4 +- test/data/grooves/CountryBluesWalk.musicxml | 4 +- .../grooves/CountryBluesWalkFill.musicxml | 4 +- .../data/grooves/CountryBluesWalkSus.musicxml | 4 +- test/data/grooves/CountrySwing.musicxml | 4 +- test/data/grooves/CountrySwing1.musicxml | 4 +- test/data/grooves/CountrySwing1Sus.musicxml | 4 +- test/data/grooves/CountrySwing2.musicxml | 4 +- test/data/grooves/CountrySwing2Sus.musicxml | 4 +- test/data/grooves/CountrySwingEnd.musicxml | 4 +- test/data/grooves/CountrySwingIntro.musicxml | 4 +- test/data/grooves/CountrySwingSus.musicxml | 4 +- test/data/grooves/CountryWaltz.musicxml | 4 +- test/data/grooves/CountryWaltz1.musicxml | 4 +- test/data/grooves/CountryWaltz1Sus.musicxml | 4 +- .../grooves/CountryWaltz1SusWalk.musicxml | 4 +- test/data/grooves/CountryWaltz1Walk.musicxml | 4 +- test/data/grooves/CountryWaltz2.musicxml | 4 +- test/data/grooves/CountryWaltz2Sus.musicxml | 4 +- .../grooves/CountryWaltz2SusWalk.musicxml | 4 +- test/data/grooves/CountryWaltzEnd.musicxml | 4 +- test/data/grooves/CountryWaltzIntro.musicxml | 4 +- test/data/grooves/CountryWaltzIntro8.musicxml | 4 +- test/data/grooves/CountryWaltzSus.musicxml | 4 +- test/data/grooves/CountryWaltzWalk.musicxml | 4 +- .../data/grooves/CountryWaltzWalkSus.musicxml | 4 +- test/data/grooves/Countrywaltz2Walk.musicxml | 4 +- test/data/grooves/DANC01.musicxml | 4 +- test/data/grooves/DANC02.musicxml | 4 +- test/data/grooves/DANC03.musicxml | 4 +- test/data/grooves/DANC04.musicxml | 4 +- test/data/grooves/DANC05.musicxml | 202 +- test/data/grooves/DANC06.musicxml | 4 +- test/data/grooves/DANCE.musicxml | 4 +- test/data/grooves/DSoul.musicxml | 4 +- test/data/grooves/DSoulEnd.musicxml | 36 +- test/data/grooves/DSoulFill.musicxml | 36 +- test/data/grooves/DSoulIntro.musicxml | 36 +- test/data/grooves/DSoulPlus.musicxml | 4 +- test/data/grooves/DSoulSus.musicxml | 4 +- test/data/grooves/DSoulSusPlus.musicxml | 4 +- test/data/grooves/Dance1.musicxml | 4 +- test/data/grooves/Dance1End.musicxml | 10 +- test/data/grooves/Dance1Intro.musicxml | 4 +- test/data/grooves/Dance2.musicxml | 4 +- test/data/grooves/Dance2End.musicxml | 10 +- test/data/grooves/Dance2Intro.musicxml | 166 +- test/data/grooves/DancePop1.musicxml | 4 +- test/data/grooves/DancePop1End.musicxml | 600 +-- test/data/grooves/DancePop1Intro.musicxml | 600 +-- test/data/grooves/DancePop2.musicxml | 4 +- test/data/grooves/DancePop2End.musicxml | 103 +- test/data/grooves/DancePop2Intro.musicxml | 103 +- test/data/grooves/DancePop3.musicxml | 216 +- test/data/grooves/DancePop3End.musicxml | 10 +- test/data/grooves/DancePop3Intro.musicxml | 20 +- test/data/grooves/DescendingJazz.musicxml | 4 +- test/data/grooves/DescendingJazzEnd.musicxml | 4 +- .../data/grooves/DescendingJazzIntro.musicxml | 4 +- .../grooves/DescendingJazzIntro8.musicxml | 4 +- test/data/grooves/DescendingJazzPlus.musicxml | 4 +- .../grooves/DescendingJazzPlusIntro.musicxml | 4 +- .../grooves/DescendingJazzPlusIntro8.musicxml | 4 +- test/data/grooves/DescendingJazzSus.musicxml | 4 +- .../grooves/DescendingJazzSusPlus.musicxml | 4 +- test/data/grooves/Desert.musicxml | 4 +- test/data/grooves/DesertEnd.musicxml | 4 +- test/data/grooves/DesertFill.musicxml | 483 +-- test/data/grooves/DesertSus.musicxml | 4 +- test/data/grooves/DigitalRock.musicxml | 166 +- test/data/grooves/DigitalRockEnd.musicxml | 397 +- test/data/grooves/DigitalRockIntro.musicxml | 180 +- test/data/grooves/DiscoSoul.musicxml | 4 +- test/data/grooves/DiscoSoulEnd.musicxml | 36 +- test/data/grooves/DiscoSoulIntro.musicxml | 36 +- test/data/grooves/Dixie.musicxml | 4 +- test/data/grooves/Dixie1.musicxml | 4 +- test/data/grooves/Dixie1Sus.musicxml | 4 +- test/data/grooves/Dixie2.musicxml | 4 +- test/data/grooves/Dixie2Sus.musicxml | 4 +- test/data/grooves/Dixie3.musicxml | 4 +- test/data/grooves/Dixie3Sus.musicxml | 4 +- test/data/grooves/Dixie4.musicxml | 4 +- test/data/grooves/Dixie4Strum.musicxml | 4 +- test/data/grooves/Dixie4Sus.musicxml | 4 +- test/data/grooves/DixieEnd.musicxml | 4 +- test/data/grooves/DixieIntro.musicxml | 4 +- test/data/grooves/DixieIntro8.musicxml | 4 +- test/data/grooves/DixieMarch.musicxml | 4 +- test/data/grooves/DixieMarchEnd.musicxml | 4 +- test/data/grooves/DixieMarchIntro.musicxml | 4 +- test/data/grooves/DixieMarchPlus.musicxml | 4 +- test/data/grooves/DixieMarchSus.musicxml | 4 +- test/data/grooves/DixieMarchSusPlus.musicxml | 4 +- test/data/grooves/DixieStrum.musicxml | 4 +- test/data/grooves/DixieStrumSus.musicxml | 4 +- test/data/grooves/DixieSus.musicxml | 4 +- test/data/grooves/DnB01.musicxml | 133 +- test/data/grooves/DnB02.musicxml | 4 +- test/data/grooves/DnB03.musicxml | 4 +- test/data/grooves/DnB04.musicxml | 4 +- test/data/grooves/DnB05.musicxml | 112 +- test/data/grooves/DnB06.musicxml | 54 +- test/data/grooves/DooWop.musicxml | 4 +- test/data/grooves/DooWopEnd.musicxml | 4 +- test/data/grooves/DooWopFill.musicxml | 4 +- test/data/grooves/DooWopIntro.musicxml | 4 +- test/data/grooves/DooWopIntroSus.musicxml | 4 +- test/data/grooves/DooWopPlus.musicxml | 4 +- test/data/grooves/DooWopSus.musicxml | 4 +- test/data/grooves/DooWopSusPlus.musicxml | 4 +- test/data/grooves/ENDING01.musicxml | 4 +- test/data/grooves/ENDING02.musicxml | 4 +- test/data/grooves/ENDING03.musicxml | 113 +- test/data/grooves/ENDING04.musicxml | 4 +- test/data/grooves/ENDING05.musicxml | 4 +- test/data/grooves/ENDING06.musicxml | 114 +- test/data/grooves/ENDING07.musicxml | 4 +- test/data/grooves/EasySwing.musicxml | 4 +- test/data/grooves/EasySwing1.musicxml | 4 +- test/data/grooves/EasySwing1Fill.musicxml | 4 +- test/data/grooves/EasySwing1Sus.musicxml | 4 +- test/data/grooves/EasySwing2.musicxml | 4 +- test/data/grooves/EasySwing2Fill.musicxml | 4 +- test/data/grooves/EasySwing2Sus.musicxml | 4 +- test/data/grooves/EasySwing42.musicxml | 4 +- test/data/grooves/EasySwing42Fill.musicxml | 4 +- test/data/grooves/EasySwing42Sus.musicxml | 4 +- test/data/grooves/EasySwing42Walk.musicxml | 4 +- .../data/grooves/EasySwing42WalkFill.musicxml | 4 +- test/data/grooves/EasySwing42WalkSus.musicxml | 4 +- test/data/grooves/EasySwingEnd.musicxml | 4 +- test/data/grooves/EasySwingFill.musicxml | 4 +- test/data/grooves/EasySwingIntro.musicxml | 4 +- test/data/grooves/EasySwingIntro1.musicxml | 4 +- test/data/grooves/EasySwingIntro2.musicxml | 4 +- test/data/grooves/EasySwingIntro3.musicxml | 4 +- test/data/grooves/EasySwingSus.musicxml | 4 +- test/data/grooves/EasySwingSusFill.musicxml | 4 +- test/data/grooves/EasySwingWalk.musicxml | 4 +- test/data/grooves/EasySwingWalkFill.musicxml | 4 +- test/data/grooves/EasySwingWalkSus.musicxml | 4 +- test/data/grooves/ElectricPop.musicxml | 4 +- test/data/grooves/ElectricPopEnd.musicxml | 16 +- test/data/grooves/ElectricPopIntro.musicxml | 20 +- test/data/grooves/Evansish.musicxml | 4 +- test/data/grooves/Evansish1.musicxml | 4 +- test/data/grooves/Evansish1Plus.musicxml | 4 +- test/data/grooves/Evansish1Sus.musicxml | 4 +- test/data/grooves/Evansish1SusPlus.musicxml | 4 +- test/data/grooves/EvansishEnd.musicxml | 4 +- test/data/grooves/EvansishFill.musicxml | 4 +- test/data/grooves/EvansishIntro.musicxml | 4 +- test/data/grooves/EvansishPlus.musicxml | 4 +- test/data/grooves/EvansishSus.musicxml | 4 +- test/data/grooves/EvansishSusPlus.musicxml | 4 +- test/data/grooves/FUNK01.musicxml | 4 +- test/data/grooves/FUNK02.musicxml | 4 +- test/data/grooves/FUNK03.musicxml | 4 +- test/data/grooves/FUNK04.musicxml | 4 +- test/data/grooves/FUNK05.musicxml | 4 +- test/data/grooves/FUNK06.musicxml | 251 +- test/data/grooves/FUNK07.musicxml | 485 +-- test/data/grooves/FUNK08.musicxml | 4 +- test/data/grooves/FUNK09.musicxml | 4 +- test/data/grooves/FUNK10.musicxml | 4 +- test/data/grooves/FUNK11.musicxml | 4 +- test/data/grooves/FUNK12.musicxml | 4 +- test/data/grooves/FUS01.musicxml | 123 +- test/data/grooves/FUS02.musicxml | 4 +- test/data/grooves/FUS03.musicxml | 4 +- test/data/grooves/FUS04.musicxml | 4 +- test/data/grooves/FUS05.musicxml | 4 +- test/data/grooves/FUS06.musicxml | 4 +- test/data/grooves/FUS07.musicxml | 104 +- test/data/grooves/FUS08.musicxml | 4 +- test/data/grooves/FastBigBand.musicxml | 54 +- test/data/grooves/FastBigBandEnd.musicxml | 4 +- test/data/grooves/FastBigBandIntro.musicxml | 54 +- test/data/grooves/FastBlues.musicxml | 4 +- test/data/grooves/FastBlues1.musicxml | 4 +- test/data/grooves/FastBlues1Sus.musicxml | 4 +- test/data/grooves/FastBluesEnd.musicxml | 304 +- test/data/grooves/FastBluesSus.musicxml | 4 +- test/data/grooves/FastBluesWalk.musicxml | 4 +- test/data/grooves/FastBluesWalkSus.musicxml | 4 +- test/data/grooves/FastJazzWaltz.musicxml | 4 +- test/data/grooves/FastJazzWaltz1.musicxml | 4 +- test/data/grooves/FastJazzWaltz1End.musicxml | 4 +- test/data/grooves/FastJazzWaltz1Sus.musicxml | 4 +- test/data/grooves/FastJazzWaltz2.musicxml | 4 +- test/data/grooves/FastJazzWaltz2Sus.musicxml | 4 +- test/data/grooves/FastJazzWaltzEnd.musicxml | 4 +- test/data/grooves/FastJazzWaltzFill.musicxml | 4 +- test/data/grooves/FastJazzWaltzIntro.musicxml | 353 +- .../data/grooves/FastJazzWaltzIntro8.musicxml | 353 +- test/data/grooves/FastJazzWaltzSus.musicxml | 4 +- test/data/grooves/FastSwing.musicxml | 480 +-- test/data/grooves/FastSwingEnd.musicxml | 4 +- test/data/grooves/FastSwingIntro.musicxml | 242 +- test/data/grooves/FastSwingIntro8.musicxml | 706 +--- test/data/grooves/FastSwingSus.musicxml | 480 +-- test/data/grooves/FastSwingWalk.musicxml | 480 +-- test/data/grooves/FastSwingWalkSus.musicxml | 480 +-- test/data/grooves/FastWaltz.musicxml | 4 +- test/data/grooves/FastWaltzEnd.musicxml | 4 +- test/data/grooves/FastWaltzIntro.musicxml | 4 +- test/data/grooves/FastWaltzIntro8.musicxml | 4 +- test/data/grooves/FastWaltzPlus.musicxml | 4 +- test/data/grooves/FastWaltzSus.musicxml | 4 +- test/data/grooves/FastWaltzSusPlus.musicxml | 4 +- test/data/grooves/FastWaltzWalk.musicxml | 4 +- test/data/grooves/FastWaltzWalkPlus.musicxml | 4 +- test/data/grooves/FastWaltzWalkSus.musicxml | 4 +- .../grooves/FastWaltzWalkSusPlus.musicxml | 4 +- test/data/grooves/Folk.musicxml | 4 +- test/data/grooves/FolkArticulated.musicxml | 4 +- test/data/grooves/FolkArticulatedSus.musicxml | 4 +- test/data/grooves/FolkEnd.musicxml | 4 +- test/data/grooves/FolkIntro.musicxml | 4 +- test/data/grooves/FolkRock.musicxml | 4 +- test/data/grooves/FolkRockEnd.musicxml | 4 +- test/data/grooves/FolkRockFill.musicxml | 4 +- test/data/grooves/FolkRockIntro.musicxml | 4 +- test/data/grooves/FolkRockPlus.musicxml | 4 +- test/data/grooves/FolkRockSus.musicxml | 4 +- test/data/grooves/FolkRockSusPlus.musicxml | 4 +- test/data/grooves/FolkSus.musicxml | 4 +- test/data/grooves/FolkWalk.musicxml | 4 +- test/data/grooves/FolkyJazzGuitar.musicxml | 4 +- test/data/grooves/FolkyJazzGuitarEnd.musicxml | 4 +- .../grooves/FolkyJazzGuitarIntro.musicxml | 4 +- .../data/grooves/FolkyJazzGuitarPlus.musicxml | 4 +- test/data/grooves/FolkyJazzGuitarSus.musicxml | 4 +- .../grooves/FolkyJazzGuitarSusPlus.musicxml | 4 +- test/data/grooves/FolkyJazzPiano.musicxml | 4 +- test/data/grooves/FolkyJazzPianoEnd.musicxml | 4 +- .../data/grooves/FolkyJazzPianoIntro.musicxml | 4 +- test/data/grooves/FolkyJazzPianoPlus.musicxml | 4 +- test/data/grooves/FolkyJazzPianoSus.musicxml | 4 +- .../grooves/FolkyJazzPianoSusPlus.musicxml | 4 +- test/data/grooves/Forro-Miranda.musicxml | 4 +- test/data/grooves/FoxTrot1End.musicxml | 4 +- test/data/grooves/FoxTrot1Intro.musicxml | 4 +- test/data/grooves/FoxTrot1Plus.musicxml | 4 +- test/data/grooves/FoxTrot1Sus.musicxml | 4 +- test/data/grooves/FoxTrot1SusPlus.musicxml | 4 +- test/data/grooves/FoxTrotEnd.musicxml | 4 +- test/data/grooves/FoxTrotIntro.musicxml | 4 +- test/data/grooves/FoxTrotPlus.musicxml | 4 +- test/data/grooves/FoxTrotSusPlus.musicxml | 4 +- test/data/grooves/Foxtrot.musicxml | 229 +- test/data/grooves/Foxtrot1.musicxml | 4 +- test/data/grooves/FoxtrotFill.musicxml | 4 +- test/data/grooves/FoxtrotIntro.musicxml | 52 +- test/data/grooves/FoxtrotSus.musicxml | 4 +- test/data/grooves/FrenchWaltz.musicxml | 4 +- test/data/grooves/FrenchWaltz1.musicxml | 4 +- test/data/grooves/FrenchWaltz1End.musicxml | 4 +- test/data/grooves/FrenchWaltz1Fill.musicxml | 4 +- .../data/grooves/FrenchWaltz1FillSus.musicxml | 4 +- test/data/grooves/FrenchWaltz1Sus.musicxml | 4 +- test/data/grooves/FrenchWaltz2.musicxml | 4 +- test/data/grooves/FrenchWaltz2Fill.musicxml | 4 +- .../data/grooves/FrenchWaltz2FillSus.musicxml | 4 +- test/data/grooves/FrenchWaltz2Sus.musicxml | 4 +- test/data/grooves/FrenchWaltz3.musicxml | 4 +- test/data/grooves/FrenchWaltz3Fill.musicxml | 4 +- .../data/grooves/FrenchWaltz3FillSus.musicxml | 4 +- test/data/grooves/FrenchWaltz3Sus.musicxml | 4 +- test/data/grooves/FrenchWaltzEnd.musicxml | 4 +- test/data/grooves/FrenchWaltzIntro.musicxml | 4 +- test/data/grooves/FrenchWaltzSus.musicxml | 4 +- test/data/grooves/Funk1.musicxml | 85 +- test/data/grooves/Funk1End.musicxml | 359 +- test/data/grooves/Funk1Intro.musicxml | 91 +- test/data/grooves/Funk2.musicxml | 1123 ++---- test/data/grooves/Funk2End.musicxml | 4 +- test/data/grooves/Funk2Intro.musicxml | 1417 ++----- test/data/grooves/Fusion.musicxml | 866 +--- test/data/grooves/FusionEnd.musicxml | 144 +- test/data/grooves/FusionIntro.musicxml | 647 +-- test/data/grooves/GuitarBallad.musicxml | 4 +- test/data/grooves/GuitarBallad1.musicxml | 4 +- test/data/grooves/GuitarBallad1Sus.musicxml | 4 +- test/data/grooves/GuitarBalladEnd.musicxml | 4 +- test/data/grooves/GuitarBalladIntro.musicxml | 4 +- test/data/grooves/GuitarBalladSus.musicxml | 4 +- .../grooves/GuitarBalladSusIntro.musicxml | 4 +- test/data/grooves/HIP01.musicxml | 130 +- test/data/grooves/HIP02.musicxml | 4 +- test/data/grooves/HIP03.musicxml | 332 +- test/data/grooves/HIP04.musicxml | 1236 ++---- test/data/grooves/HIP05.musicxml | 4 +- test/data/grooves/HIP06.musicxml | 4 +- test/data/grooves/HIP07.musicxml | 4 +- test/data/grooves/HIP08.musicxml | 258 +- test/data/grooves/HIP09.musicxml | 4 +- test/data/grooves/HIP10.musicxml | 220 +- test/data/grooves/HIP11.musicxml | 4 +- test/data/grooves/HIP12.musicxml | 543 +-- test/data/grooves/HIP13.musicxml | 143 +- test/data/grooves/HIP14.musicxml | 123 +- test/data/grooves/HIP15.musicxml | 112 +- test/data/grooves/HIP16.musicxml | 4 +- test/data/grooves/HIP17.musicxml | 4 +- test/data/grooves/HIP18.musicxml | 4 +- test/data/grooves/HIP19.musicxml | 4 +- test/data/grooves/HIP20.musicxml | 4 +- test/data/grooves/HIP21.musicxml | 4 +- test/data/grooves/HIP22.musicxml | 4 +- test/data/grooves/HIP23.musicxml | 27 +- test/data/grooves/HOUS01.musicxml | 508 +-- test/data/grooves/HOUS02.musicxml | 4 +- test/data/grooves/HOUS03.musicxml | 4 +- test/data/grooves/HOUS04.musicxml | 4 +- test/data/grooves/HRK01.musicxml | 4 +- test/data/grooves/HRK02.musicxml | 4 +- test/data/grooves/HRK03.musicxml | 234 +- test/data/grooves/HRK04.musicxml | 4 +- test/data/grooves/HRK05.musicxml | 4 +- test/data/grooves/HRK06.musicxml | 148 +- test/data/grooves/HRK07.musicxml | 4 +- test/data/grooves/HappyshuffleA.musicxml | 1452 ++----- test/data/grooves/HappyshuffleB.musicxml | 1452 ++----- test/data/grooves/HappyshuffleC.musicxml | 650 +-- test/data/grooves/HappyshuffleD.musicxml | 650 +-- .../data/grooves/HappyshuffleEndingA.musicxml | 4 +- .../data/grooves/HappyshuffleEndingB.musicxml | 241 +- .../data/grooves/HappyshuffleEndingC.musicxml | 692 +--- test/data/grooves/HappyshuffleFillA.musicxml | 240 +- test/data/grooves/HappyshuffleFillB.musicxml | 139 +- test/data/grooves/HappyshuffleFillC.musicxml | 202 +- test/data/grooves/HappyshuffleFillD.musicxml | 148 +- test/data/grooves/HappyshuffleIntroA.musicxml | 112 +- test/data/grooves/HappyshuffleIntroB.musicxml | 602 +-- test/data/grooves/HappyshuffleIntroC.musicxml | 752 +--- test/data/grooves/HeavyMetal.musicxml | 112 +- test/data/grooves/HeavyMetalEnd.musicxml | 776 ++-- test/data/grooves/HeavyMetalIntro.musicxml | 923 +---- test/data/grooves/HillCountry.musicxml | 4 +- test/data/grooves/HillCountryEnd.musicxml | 4 +- test/data/grooves/HillCountryFill.musicxml | 4 +- test/data/grooves/HillCountryIntro.musicxml | 4 +- test/data/grooves/HillCountryPlus.musicxml | 4 +- test/data/grooves/HillCountrySus.musicxml | 4 +- test/data/grooves/HillCountrySusPlus.musicxml | 4 +- test/data/grooves/Hip-Hop.musicxml | 4 +- test/data/grooves/Hip-HopEnd.musicxml | 4 +- test/data/grooves/Hip-HopIntro.musicxml | 4 +- test/data/grooves/HipHop.musicxml | 4 +- test/data/grooves/HipHopEnd.musicxml | 4 +- test/data/grooves/HipHopIntro.musicxml | 4 +- test/data/grooves/HipHopPlus1.musicxml | 4 +- test/data/grooves/HipHopPlus2.musicxml | 4 +- test/data/grooves/HipHopPlusPlus.musicxml | 4 +- test/data/grooves/HipHopSus.musicxml | 4 +- test/data/grooves/HipHopSusPlus1.musicxml | 4 +- test/data/grooves/HipHopSusPlus2.musicxml | 4 +- test/data/grooves/HipHopSusPlusPlus.musicxml | 4 +- test/data/grooves/House.musicxml | 4 +- test/data/grooves/HouseEnd.musicxml | 10 +- test/data/grooves/HouseIntro.musicxml | 112 +- test/data/grooves/INTRO01.musicxml | 145 +- test/data/grooves/INTRO02.musicxml | 4 +- test/data/grooves/INTRO03.musicxml | 4 +- test/data/grooves/INTRO04.musicxml | 114 +- test/data/grooves/INTRO05.musicxml | 61 +- test/data/grooves/INTRO06.musicxml | 4 +- test/data/grooves/INTRO07.musicxml | 4 +- test/data/grooves/INTRO08.musicxml | 4 +- test/data/grooves/INTRO09.musicxml | 165 +- test/data/grooves/INTRO10.musicxml | 4 +- test/data/grooves/INTRO11.musicxml | 4 +- test/data/grooves/INTRO12.musicxml | 112 +- test/data/grooves/INTRO13.musicxml | 4 +- test/data/grooves/INTRO14.musicxml | 23 +- test/data/grooves/INTRO15.musicxml | 4 +- test/data/grooves/JAZZ01.musicxml | 247 +- test/data/grooves/JAZZ02.musicxml | 133 +- test/data/grooves/JAZZ03.musicxml | 222 +- test/data/grooves/JAZZ04.musicxml | 43 +- test/data/grooves/JAZZ05.musicxml | 463 +-- test/data/grooves/JAZZ06.musicxml | 262 +- test/data/grooves/JAZZ07.musicxml | 757 ++-- test/data/grooves/Jazz54.musicxml | 4 +- test/data/grooves/Jazz54DrumIntro.musicxml | 4 +- test/data/grooves/Jazz54Sus.musicxml | 4 +- test/data/grooves/Jazz54Walk.musicxml | 4 +- test/data/grooves/Jazz54WalkSus.musicxml | 4 +- test/data/grooves/JazzBasieA.musicxml | 4 +- test/data/grooves/JazzBasieB.musicxml | 119 +- test/data/grooves/JazzBasieEndingA.musicxml | 65 +- test/data/grooves/JazzBasieEndingB.musicxml | 193 +- test/data/grooves/JazzBasieEndingC.musicxml | 65 +- test/data/grooves/JazzBasieFillAA.musicxml | 4 +- test/data/grooves/JazzBasieFillBA.musicxml | 4 +- test/data/grooves/JazzBasieFillBB.musicxml | 17 +- test/data/grooves/JazzBasieFillCC.musicxml | 17 +- test/data/grooves/JazzBasieFillDD.musicxml | 30 +- test/data/grooves/JazzBasieIntroA.musicxml | 17 +- test/data/grooves/JazzBasieIntroB.musicxml | 4 +- test/data/grooves/JazzBasieIntroC.musicxml | 119 +- test/data/grooves/JazzBasieMainC.musicxml | 4 +- test/data/grooves/JazzBasieMainD.musicxml | 117 +- test/data/grooves/JazzBossaA.musicxml | 4 +- test/data/grooves/JazzBossaB.musicxml | 4 +- test/data/grooves/JazzBossaEndingA.musicxml | 4 +- test/data/grooves/JazzBossaFillAA.musicxml | 4 +- test/data/grooves/JazzBossaFillBB.musicxml | 4 +- test/data/grooves/JazzBossaIntroA.musicxml | 4 +- test/data/grooves/JazzBouncyEndingA.musicxml | 43 +- test/data/grooves/JazzBouncyFillAA.musicxml | 278 +- test/data/grooves/JazzBouncyFillBB.musicxml | 139 +- test/data/grooves/JazzBouncyIntroA.musicxml | 4 +- test/data/grooves/JazzBouncyMainA.musicxml | 121 +- test/data/grooves/JazzBouncyMainB.musicxml | 186 +- test/data/grooves/JazzCombo.musicxml | 251 +- test/data/grooves/JazzCombo1.musicxml | 30 +- test/data/grooves/JazzCombo1Plus.musicxml | 30 +- test/data/grooves/JazzCombo1Sus.musicxml | 30 +- test/data/grooves/JazzCombo1SusPlus.musicxml | 30 +- test/data/grooves/JazzCombo2.musicxml | 42 +- test/data/grooves/JazzCombo2Plus.musicxml | 42 +- test/data/grooves/JazzCombo2Sus.musicxml | 42 +- test/data/grooves/JazzCombo2SusPlus.musicxml | 42 +- test/data/grooves/JazzComboEnd.musicxml | 4 +- test/data/grooves/JazzComboIntro.musicxml | 238 +- test/data/grooves/JazzComboIntro2.musicxml | 4 +- test/data/grooves/JazzComboPlus.musicxml | 30 +- test/data/grooves/JazzComboSus.musicxml | 30 +- test/data/grooves/JazzComboSusPlus.musicxml | 30 +- test/data/grooves/JazzCountryEndingA.musicxml | 134 +- test/data/grooves/JazzCountryFillAA.musicxml | 4 +- test/data/grooves/JazzCountryFillBB.musicxml | 4 +- test/data/grooves/JazzCountryIntroA.musicxml | 4 +- test/data/grooves/JazzCountryMainA.musicxml | 4 +- test/data/grooves/JazzCountryMainB.musicxml | 4 +- test/data/grooves/JazzGrTrioEndingA.musicxml | 4 +- test/data/grooves/JazzGrTrioEndingB.musicxml | 36 +- test/data/grooves/JazzGrTrioFillAA.musicxml | 17 +- test/data/grooves/JazzGrTrioFillAB.musicxml | 178 +- test/data/grooves/JazzGrTrioFillBA.musicxml | 43 +- test/data/grooves/JazzGrTrioFillBB.musicxml | 178 +- test/data/grooves/JazzGrTrioIntroA.musicxml | 30 +- test/data/grooves/JazzGrTrioIntroB.musicxml | 269 +- test/data/grooves/JazzGrTrioMainA.musicxml | 4 +- test/data/grooves/JazzGrTrioMainB.musicxml | 264 +- test/data/grooves/JazzRhumba.musicxml | 4 +- test/data/grooves/JazzRhumbaEnd.musicxml | 4 +- test/data/grooves/JazzRhumbaFill.musicxml | 68 +- test/data/grooves/JazzRhumbaIntro.musicxml | 4 +- test/data/grooves/JazzRhumbaPlus.musicxml | 4 +- test/data/grooves/JazzRhumbaSus.musicxml | 4 +- test/data/grooves/JazzRhumbaSusPlus.musicxml | 4 +- test/data/grooves/JazzRock.musicxml | 4 +- test/data/grooves/JazzRockEnd.musicxml | 4 +- test/data/grooves/JazzRockFill.musicxml | 472 +-- test/data/grooves/JazzRockIntro.musicxml | 4 +- test/data/grooves/JazzRockIntro8.musicxml | 4 +- test/data/grooves/JazzRockPlus.musicxml | 4 +- test/data/grooves/JazzRockSus.musicxml | 4 +- test/data/grooves/JazzRockSusPlus.musicxml | 4 +- test/data/grooves/JazzRockWalk.musicxml | 4 +- test/data/grooves/JazzRockWalkPlus.musicxml | 4 +- test/data/grooves/JazzRockWalkSus.musicxml | 4 +- .../data/grooves/JazzRockWalkSusPlus.musicxml | 4 +- test/data/grooves/JazzSwingEndingA.musicxml | 17 +- test/data/grooves/JazzSwingFillAA.musicxml | 30 +- test/data/grooves/JazzSwingFillBB.musicxml | 30 +- test/data/grooves/JazzSwingIntroA.musicxml | 4 +- test/data/grooves/JazzSwingMainA.musicxml | 4 +- test/data/grooves/JazzSwingMainB.musicxml | 82 +- test/data/grooves/JazzTrioEndingA.musicxml | 4 +- test/data/grooves/JazzTrioFillAA.musicxml | 33 +- test/data/grooves/JazzTrioFillBB.musicxml | 33 +- test/data/grooves/JazzTrioIntroA.musicxml | 4 +- test/data/grooves/JazzTrioMainA.musicxml | 64 +- test/data/grooves/JazzTrioMainB.musicxml | 628 +-- test/data/grooves/JazzWaltz.musicxml | 354 +- test/data/grooves/JazzWaltz1.musicxml | 4 +- test/data/grooves/JazzWaltz1End.musicxml | 4 +- test/data/grooves/JazzWaltz1Sus.musicxml | 4 +- test/data/grooves/JazzWaltz2.musicxml | 4 +- test/data/grooves/JazzWaltz2Sus.musicxml | 4 +- test/data/grooves/JazzWaltzEnd.musicxml | 54 +- test/data/grooves/JazzWaltzEndingA.musicxml | 4 +- test/data/grooves/JazzWaltzFill.musicxml | 4 +- test/data/grooves/JazzWaltzFillAA.musicxml | 4 +- test/data/grooves/JazzWaltzFillBB.musicxml | 4 +- test/data/grooves/JazzWaltzIntro.musicxml | 204 +- test/data/grooves/JazzWaltzIntro8.musicxml | 353 +- test/data/grooves/JazzWaltzIntroA.musicxml | 4 +- test/data/grooves/JazzWaltzMainA.musicxml | 17 +- test/data/grooves/JazzWaltzMainB.musicxml | 4 +- test/data/grooves/JazzWaltzSus.musicxml | 4 +- test/data/grooves/Jive.musicxml | 4 +- test/data/grooves/Jive1.musicxml | 4 +- test/data/grooves/Jive1Clap.musicxml | 4 +- test/data/grooves/Jive1ClapSus.musicxml | 4 +- test/data/grooves/Jive1Plus.musicxml | 4 +- test/data/grooves/Jive1Sus.musicxml | 4 +- test/data/grooves/Jive1SusPlus.musicxml | 4 +- test/data/grooves/JiveClap.musicxml | 4 +- test/data/grooves/JiveClapSus.musicxml | 4 +- test/data/grooves/JiveEnd.musicxml | 4 +- test/data/grooves/JiveIntro.musicxml | 70 +- test/data/grooves/JiveIntro2.musicxml | 70 +- test/data/grooves/JiveIntro8.musicxml | 150 +- test/data/grooves/JivePlus.musicxml | 4 +- test/data/grooves/JiveSus.musicxml | 4 +- test/data/grooves/JiveSusPlus.musicxml | 4 +- test/data/grooves/Kfunk1A.musicxml | 104 +- test/data/grooves/Kfunk1B.musicxml | 4 +- test/data/grooves/Kfunk1EndingA.musicxml | 104 +- test/data/grooves/Kfunk1FillAA.musicxml | 4 +- test/data/grooves/Kfunk1FillAB.musicxml | 4 +- test/data/grooves/Kfunk1FillBA.musicxml | 13 +- test/data/grooves/Kfunk1FillBB.musicxml | 4 +- test/data/grooves/Kfunk1IntroA.musicxml | 199 +- test/data/grooves/LATN01.musicxml | 926 ++--- test/data/grooves/LATN02.musicxml | 4 +- test/data/grooves/LATN03.musicxml | 4 +- test/data/grooves/LATN04.musicxml | 4 +- test/data/grooves/LATN05.musicxml | 262 +- test/data/grooves/LATN06.musicxml | 4 +- test/data/grooves/LATN07.musicxml | 4 +- test/data/grooves/LATN08.musicxml | 362 +- test/data/grooves/LATN09.musicxml | 4 +- test/data/grooves/LATN10.musicxml | 104 +- test/data/grooves/LATN11.musicxml | 4 +- test/data/grooves/LATN12.musicxml | 4 +- test/data/grooves/LFusion.musicxml | 4 +- test/data/grooves/LFusion1.musicxml | 4 +- test/data/grooves/LFusion1Sus.musicxml | 4 +- test/data/grooves/LFusionEnd.musicxml | 28 +- test/data/grooves/LFusionIntro.musicxml | 28 +- test/data/grooves/LFusionIntroSus.musicxml | 28 +- test/data/grooves/LFusionSus.musicxml | 4 +- test/data/grooves/LatinFusion.musicxml | 108 +- test/data/grooves/LatinFusionIntro.musicxml | 56 +- test/data/grooves/LatinHouse.musicxml | 4 +- test/data/grooves/LatinHouseEnd.musicxml | 10 +- test/data/grooves/LatinHouseIntro.musicxml | 328 +- test/data/grooves/LatinWaltz.musicxml | 4 +- test/data/grooves/LatinWaltzEnd.musicxml | 4 +- test/data/grooves/LatinWaltzFill.musicxml | 4 +- test/data/grooves/LatinWaltzIntro.musicxml | 4 +- test/data/grooves/LatinWaltzIntro8.musicxml | 4 +- test/data/grooves/LatinWaltzPlus.musicxml | 4 +- test/data/grooves/LatinWaltzSus.musicxml | 4 +- test/data/grooves/LatinWaltzSusPlus.musicxml | 4 +- test/data/grooves/Lfusion1End.musicxml | 28 +- test/data/grooves/LightTango.musicxml | 4 +- test/data/grooves/LightTango1.musicxml | 4 +- test/data/grooves/LightTango1Sus.musicxml | 4 +- test/data/grooves/LightTango4End.musicxml | 4 +- test/data/grooves/LightTangoEnd.musicxml | 4 +- test/data/grooves/LightTangoFill.musicxml | 4 +- test/data/grooves/LightTangoIntro.musicxml | 4 +- test/data/grooves/LightTangoIntro1.musicxml | 4 +- test/data/grooves/LightTangoSus.musicxml | 4 +- test/data/grooves/MTL01.musicxml | 240 +- test/data/grooves/MTL02.musicxml | 4 +- test/data/grooves/MTL03.musicxml | 4 +- test/data/grooves/MTL04.musicxml | 23 +- test/data/grooves/Mambo.musicxml | 4 +- test/data/grooves/Mambo1.musicxml | 4 +- test/data/grooves/Mambo1Sus.musicxml | 4 +- test/data/grooves/Mambo2.musicxml | 4 +- test/data/grooves/Mambo2Sus.musicxml | 4 +- test/data/grooves/Mambo3.musicxml | 4 +- test/data/grooves/Mambo3Sus.musicxml | 4 +- test/data/grooves/MamboBreakAA.musicxml | 98 +- test/data/grooves/MamboBreakBB.musicxml | 198 +- test/data/grooves/MamboEnd.musicxml | 4 +- test/data/grooves/MamboEndingA.musicxml | 4 +- test/data/grooves/MamboEndingB.musicxml | 54 +- test/data/grooves/MamboFillAA.musicxml | 54 +- test/data/grooves/MamboFillAB.musicxml | 4 +- test/data/grooves/MamboFillBA.musicxml | 4 +- test/data/grooves/MamboFillBB.musicxml | 54 +- test/data/grooves/MamboIntro.musicxml | 4 +- test/data/grooves/MamboIntroA.musicxml | 104 +- test/data/grooves/MamboIntroB.musicxml | 4 +- test/data/grooves/MamboMainA.musicxml | 204 +- test/data/grooves/MamboMainB.musicxml | 204 +- test/data/grooves/MamboSus.musicxml | 4 +- test/data/grooves/Maqsum.musicxml | 4 +- test/data/grooves/March.musicxml | 4 +- test/data/grooves/March1.musicxml | 4 +- test/data/grooves/March1End.musicxml | 4 +- test/data/grooves/March1Intro.musicxml | 4 +- test/data/grooves/March1Slow.musicxml | 4 +- test/data/grooves/March2.musicxml | 4 +- test/data/grooves/March3.musicxml | 4 +- test/data/grooves/March4.musicxml | 4 +- test/data/grooves/MarchEnd.musicxml | 4 +- test/data/grooves/MellowJazz.musicxml | 4 +- test/data/grooves/MellowJazzEnd.musicxml | 4 +- test/data/grooves/MellowJazzFill.musicxml | 4 +- test/data/grooves/MellowJazzIntro.musicxml | 4 +- test/data/grooves/MellowJazzPlus.musicxml | 4 +- test/data/grooves/MellowJazzSus.musicxml | 4 +- test/data/grooves/MellowJazzSusPlus.musicxml | 4 +- test/data/grooves/MellowRB.musicxml | 480 +-- test/data/grooves/MellowRBEnd.musicxml | 4 +- test/data/grooves/MellowRBIntro.musicxml | 123 +- test/data/grooves/Merengue.musicxml | 4 +- test/data/grooves/Merengue1.musicxml | 4 +- test/data/grooves/Merengue1Sus.musicxml | 4 +- test/data/grooves/Merengue2.musicxml | 4 +- test/data/grooves/Merengue2Sus.musicxml | 4 +- test/data/grooves/MerengueEnd.musicxml | 4 +- test/data/grooves/MerengueIntro.musicxml | 4 +- test/data/grooves/MerengueSus.musicxml | 4 +- test/data/grooves/Metronome2-4.musicxml | 4 +- test/data/grooves/Metronome2.musicxml | 4 +- test/data/grooves/Metronome3.musicxml | 4 +- test/data/grooves/Metronome4.musicxml | 4 +- test/data/grooves/Metronome6.musicxml | 238 +- test/data/grooves/Metronome68.musicxml | 20 +- test/data/grooves/MidE01.musicxml | 4 +- test/data/grooves/MidE02.musicxml | 386 +- test/data/grooves/MidE03.musicxml | 1577 ++------ test/data/grooves/MidE04.musicxml | 490 +-- test/data/grooves/MiddleBigBand.musicxml | 202 +- test/data/grooves/MiddleBigBandEnd.musicxml | 42 +- test/data/grooves/MiddleBigBandIntro.musicxml | 151 +- test/data/grooves/MilIntro2.musicxml | 600 +-- test/data/grooves/ModernJazz.musicxml | 54 +- test/data/grooves/ModernJazz1.musicxml | 54 +- test/data/grooves/ModernJazz1Sus.musicxml | 54 +- test/data/grooves/ModernJazz2.musicxml | 54 +- test/data/grooves/ModernJazz2Sus.musicxml | 54 +- test/data/grooves/ModernJazzEnd.musicxml | 4 +- test/data/grooves/ModernJazzFill.musicxml | 4 +- test/data/grooves/ModernJazzIntro.musicxml | 4 +- test/data/grooves/ModernJazzSus.musicxml | 54 +- test/data/grooves/ModernJazzWaltz.musicxml | 4 +- test/data/grooves/ModernJazzWaltz1.musicxml | 4 +- .../data/grooves/ModernJazzWaltz1Sus.musicxml | 4 +- test/data/grooves/ModernJazzWaltz2.musicxml | 4 +- .../data/grooves/ModernJazzWaltz2Sus.musicxml | 4 +- test/data/grooves/ModernJazzWaltzEnd.musicxml | 4 +- .../data/grooves/ModernJazzWaltzFill.musicxml | 4 +- .../grooves/ModernJazzWaltzIntro.musicxml | 54 +- test/data/grooves/ModernJazzWaltzSus.musicxml | 4 +- test/data/grooves/ModernR&B.musicxml | 4 +- test/data/grooves/ModernR&BEnd.musicxml | 4 +- test/data/grooves/ModernR&BIntro.musicxml | 4 +- test/data/grooves/NiteJazz.musicxml | 4 +- test/data/grooves/NiteJazzEnd.musicxml | 4 +- test/data/grooves/NiteJazzIntro.musicxml | 4 +- test/data/grooves/NiteJazzPlus.musicxml | 4 +- test/data/grooves/NiteJazzSus.musicxml | 4 +- test/data/grooves/NiteJazzSusPlus.musicxml | 4 +- test/data/grooves/OldieBallad.musicxml | 4 +- test/data/grooves/OldieBalladEnd.musicxml | 4 +- test/data/grooves/OldieBalladIntro.musicxml | 161 +- test/data/grooves/POP01.musicxml | 4 +- test/data/grooves/POP02.musicxml | 69 +- test/data/grooves/POP03.musicxml | 4 +- test/data/grooves/POP04.musicxml | 4 +- test/data/grooves/POP05.musicxml | 4 +- test/data/grooves/POP06.musicxml | 671 +--- test/data/grooves/POP07.musicxml | 4 +- test/data/grooves/POP08.musicxml | 1332 ++----- test/data/grooves/POP09.musicxml | 17 +- test/data/grooves/POP10.musicxml | 4 +- test/data/grooves/POP11.musicxml | 4 +- test/data/grooves/POP12.musicxml | 277 +- test/data/grooves/PUNK01.musicxml | 4 +- test/data/grooves/PUNK02.musicxml | 4 +- test/data/grooves/PianoBallad.musicxml | 4 +- test/data/grooves/PianoBallad1.musicxml | 4 +- test/data/grooves/PianoBallad1Sus.musicxml | 4 +- test/data/grooves/PianoBallad2.musicxml | 4 +- test/data/grooves/PianoBallad2Sus.musicxml | 4 +- test/data/grooves/PianoBalladEnd.musicxml | 4 +- test/data/grooves/PianoBalladFill.musicxml | 4 +- test/data/grooves/PianoBalladIntro.musicxml | 4 +- test/data/grooves/PianoBalladIntro2.musicxml | 4 +- test/data/grooves/PianoBalladSus.musicxml | 4 +- test/data/grooves/Polka.musicxml | 4 +- test/data/grooves/Polka1.musicxml | 4 +- test/data/grooves/Polka1Arp.musicxml | 4 +- test/data/grooves/Polka1Sus.musicxml | 4 +- test/data/grooves/Polka1SusArp.musicxml | 4 +- test/data/grooves/PolkaArp.musicxml | 4 +- test/data/grooves/PolkaEnd.musicxml | 4 +- test/data/grooves/PolkaFox.musicxml | 103 +- test/data/grooves/PolkaFoxEnd.musicxml | 4 +- test/data/grooves/PolkaFoxIntro.musicxml | 15 +- test/data/grooves/PolkaIntro.musicxml | 4 +- test/data/grooves/PolkaIntro8.musicxml | 4 +- test/data/grooves/PolkaSus.musicxml | 4 +- test/data/grooves/PolkaSusArp.musicxml | 4 +- test/data/grooves/Pop.musicxml | 1218 ++---- test/data/grooves/PopBallad.musicxml | 4 +- test/data/grooves/PopBallad1.musicxml | 14 +- test/data/grooves/PopBallad1Plus.musicxml | 14 +- test/data/grooves/PopBallad2.musicxml | 4 +- test/data/grooves/PopBallad2Plus.musicxml | 4 +- test/data/grooves/PopBallad2Sus.musicxml | 4 +- test/data/grooves/PopBallad2SusPlus.musicxml | 4 +- test/data/grooves/PopBalladEnd.musicxml | 4 +- test/data/grooves/PopBalladIntro.musicxml | 4 +- test/data/grooves/PopBalladPlus.musicxml | 4 +- test/data/grooves/PopBalladSus.musicxml | 4 +- test/data/grooves/PopBalladSusPlus.musicxml | 4 +- test/data/grooves/PopEnd.musicxml | 4 +- test/data/grooves/PopIntro.musicxml | 220 +- test/data/grooves/PopPolka.musicxml | 103 +- test/data/grooves/PopPolkaEnd.musicxml | 16 +- test/data/grooves/PopPolkaIntro.musicxml | 4 +- test/data/grooves/PopRock1.musicxml | 4 +- test/data/grooves/PopRock1End.musicxml | 4 +- test/data/grooves/PopRock1Intro.musicxml | 4 +- test/data/grooves/PopRock2.musicxml | 103 +- test/data/grooves/PopRock2End.musicxml | 16 +- test/data/grooves/PopRock2Intro.musicxml | 10 +- test/data/grooves/PopShuffle1.musicxml | 4 +- test/data/grooves/PopShuffle1End.musicxml | 4 +- test/data/grooves/PopShuffle1Intro.musicxml | 4 +- test/data/grooves/PopShuffle2.musicxml | 436 +- test/data/grooves/PopShuffle2End.musicxml | 4 +- test/data/grooves/PopShuffle2Intro.musicxml | 427 +- test/data/grooves/PopWaltzEnd.musicxml | 4 +- test/data/grooves/QuandoGSEndingA.musicxml | 4 +- test/data/grooves/QuandoGSEndingB.musicxml | 4 +- test/data/grooves/QuandoGSEndingC.musicxml | 4 +- test/data/grooves/QuandoGSFillAA.musicxml | 4 +- test/data/grooves/QuandoGSFillBA.musicxml | 4 +- test/data/grooves/QuandoGSFillBB.musicxml | 4 +- test/data/grooves/QuandoGSFillCC.musicxml | 4 +- test/data/grooves/QuandoGSFillDD.musicxml | 4 +- test/data/grooves/QuandoGSIntroA.musicxml | 4 +- test/data/grooves/QuandoGSIntroB.musicxml | 4 +- test/data/grooves/QuandoGSIntroC.musicxml | 4 +- test/data/grooves/QuandoGSMainA.musicxml | 4 +- test/data/grooves/QuandoGSMainB.musicxml | 4 +- test/data/grooves/QuandoGSMainC.musicxml | 4 +- test/data/grooves/QuandoGSMainD.musicxml | 4 +- test/data/grooves/QuickStep.musicxml | 4 +- test/data/grooves/QuickStepDuh.musicxml | 4 +- test/data/grooves/QuickStepDuhSus.musicxml | 4 +- .../data/grooves/QuickStepDuhSusWalk.musicxml | 4 +- test/data/grooves/QuickStepDuhWalk.musicxml | 4 +- test/data/grooves/QuickStepEnd.musicxml | 992 +---- test/data/grooves/QuickStepHit.musicxml | 4 +- test/data/grooves/QuickStepHitSus.musicxml | 4 +- .../data/grooves/QuickStepHitSusWalk.musicxml | 4 +- test/data/grooves/QuickStepHitWalk.musicxml | 4 +- test/data/grooves/QuickStepIntro.musicxml | 1442 +------ test/data/grooves/QuickStepIntro8.musicxml | 1442 +------ test/data/grooves/QuickStepSus.musicxml | 4 +- test/data/grooves/QuickStepSusWalk.musicxml | 4 +- test/data/grooves/QuickStepWalk.musicxml | 4 +- test/data/grooves/R&B-Ballad.musicxml | 4 +- test/data/grooves/R&B-BalladEnd.musicxml | 4 +- test/data/grooves/R&B-BalladFill.musicxml | 4 +- test/data/grooves/R&B-BalladIntro.musicxml | 4 +- test/data/grooves/R&B-BalladPlus.musicxml | 4 +- test/data/grooves/R&B-BalladSus.musicxml | 4 +- test/data/grooves/R&B-BalladSusPlus.musicxml | 4 +- test/data/grooves/R&B.musicxml | 4 +- test/data/grooves/R&BEnd.musicxml | 4 +- test/data/grooves/R&BFill.musicxml | 4 +- test/data/grooves/R&BIntro.musicxml | 4 +- test/data/grooves/R&BPlus.musicxml | 4 +- test/data/grooves/R&BSus.musicxml | 4 +- test/data/grooves/R&BSusPlus.musicxml | 4 +- test/data/grooves/REGG01.musicxml | 14 +- test/data/grooves/REGG02.musicxml | 127 +- test/data/grooves/REGG03.musicxml | 268 +- test/data/grooves/REGG04.musicxml | 4 +- test/data/grooves/ROCK01.musicxml | 4 +- test/data/grooves/ROCK02.musicxml | 30 +- test/data/grooves/ROCK03.musicxml | 4 +- test/data/grooves/ROCK04.musicxml | 4 +- test/data/grooves/ROCK05.musicxml | 4 +- test/data/grooves/ROCK06.musicxml | 4 +- test/data/grooves/ROCK07.musicxml | 52 +- test/data/grooves/ROCK08.musicxml | 4 +- test/data/grooves/ROCK09.musicxml | 4 +- test/data/grooves/ROCK10.musicxml | 68 +- test/data/grooves/ROCK11.musicxml | 4 +- test/data/grooves/ROCK12.musicxml | 4 +- test/data/grooves/ROCK13.musicxml | 4 +- test/data/grooves/ROCK14.musicxml | 4 +- test/data/grooves/ROCK15.musicxml | 4 +- test/data/grooves/ROCK16.musicxml | 4 +- test/data/grooves/ROCK17.musicxml | 14 +- test/data/grooves/ROCK18.musicxml | 4 +- test/data/grooves/ROCK19.musicxml | 4 +- test/data/grooves/ROCK20.musicxml | 4 +- test/data/grooves/ROCK21.musicxml | 4 +- test/data/grooves/ROCK22.musicxml | 4 +- test/data/grooves/ROCK23.musicxml | 4 +- test/data/grooves/ROCK24.musicxml | 4 +- test/data/grooves/ROCK25.musicxml | 4 +- test/data/grooves/ROCK26.musicxml | 4 +- test/data/grooves/ROCK27.musicxml | 10 +- test/data/grooves/ROCK28.musicxml | 4 +- test/data/grooves/Rave.musicxml | 2098 +++------- test/data/grooves/RaveEnd.musicxml | 614 +-- test/data/grooves/RaveIntro.musicxml | 2226 +++-------- test/data/grooves/Rhumba.musicxml | 103 +- test/data/grooves/Rhumba1.musicxml | 103 +- test/data/grooves/Rhumba1Sus.musicxml | 103 +- test/data/grooves/Rhumba2.musicxml | 103 +- test/data/grooves/Rhumba2Sus.musicxml | 103 +- test/data/grooves/Rhumba3.musicxml | 103 +- test/data/grooves/Rhumba3Sus.musicxml | 103 +- test/data/grooves/RhumbaEnd.musicxml | 103 +- test/data/grooves/RhumbaEnd1.musicxml | 4 +- test/data/grooves/RhumbaIntro.musicxml | 4 +- test/data/grooves/RhumbaSus.musicxml | 103 +- test/data/grooves/RhumbaTriple.musicxml | 4 +- test/data/grooves/RhumbaTriple12.musicxml | 4 +- test/data/grooves/RhumbaTriple12Sus.musicxml | 4 +- test/data/grooves/RhumbaTriple34.musicxml | 4 +- test/data/grooves/RhumbaTriple34Sus.musicxml | 4 +- test/data/grooves/RhumbaTripleSus.musicxml | 4 +- test/data/grooves/RnB01.musicxml | 4 +- test/data/grooves/RnB02.musicxml | 4 +- test/data/grooves/RnB03.musicxml | 4 +- test/data/grooves/RnB04.musicxml | 4 +- test/data/grooves/RnB05.musicxml | 286 +- test/data/grooves/RnB06.musicxml | 4 +- test/data/grooves/RnB07.musicxml | 4 +- test/data/grooves/RnB08.musicxml | 4 +- test/data/grooves/RnB09.musicxml | 4 +- test/data/grooves/RnB10.musicxml | 54 +- test/data/grooves/Rock128.musicxml | 4 +- test/data/grooves/Rock128End.musicxml | 4 +- test/data/grooves/Rock128Intro.musicxml | 4 +- test/data/grooves/Rock128IntroSus.musicxml | 4 +- test/data/grooves/Rock128Plain.musicxml | 4 +- test/data/grooves/Rock128PlainPlus.musicxml | 4 +- test/data/grooves/Rock128PlainSus.musicxml | 4 +- .../data/grooves/Rock128PlainSusPlus.musicxml | 4 +- test/data/grooves/Rock128Plus.musicxml | 4 +- test/data/grooves/Rock128Sus.musicxml | 4 +- test/data/grooves/Rock128SusPlus.musicxml | 4 +- test/data/grooves/Rock1End.musicxml | 4 +- test/data/grooves/Rock1Intro.musicxml | 4 +- test/data/grooves/Rock2.musicxml | 103 +- test/data/grooves/Rock2End.musicxml | 652 +-- test/data/grooves/Rock2Intro.musicxml | 652 +-- test/data/grooves/RockBallad.musicxml | 4 +- test/data/grooves/RockBallad1.musicxml | 4 +- test/data/grooves/RockBallad1Fill.musicxml | 4 +- test/data/grooves/RockBallad1Voice.musicxml | 4 +- test/data/grooves/RockBalladEnd.musicxml | 4 +- test/data/grooves/RockBalladEnd1.musicxml | 4 +- test/data/grooves/RockBalladFill.musicxml | 4 +- test/data/grooves/RockBalladIntro.musicxml | 4 +- test/data/grooves/RockBalladSusIntro.musicxml | 4 +- test/data/grooves/RockBalladVoice.musicxml | 4 +- test/data/grooves/RockWaltz.musicxml | 4 +- test/data/grooves/RockWaltz1.musicxml | 4 +- test/data/grooves/RockWaltz1Intro.musicxml | 4 +- test/data/grooves/RockWaltz1Sus.musicxml | 4 +- test/data/grooves/RockWaltz1Walk.musicxml | 4 +- test/data/grooves/RockWaltz1WalkSus.musicxml | 4 +- test/data/grooves/RockWaltz1intro8.musicxml | 4 +- test/data/grooves/RockWaltzEnd.musicxml | 4 +- test/data/grooves/RockWaltzIntro.musicxml | 4 +- test/data/grooves/RockWaltzIntro8.musicxml | 4 +- test/data/grooves/RockWaltzSus.musicxml | 4 +- test/data/grooves/RockWaltzWalk.musicxml | 4 +- test/data/grooves/RockWaltzWalkSus.musicxml | 4 +- test/data/grooves/SAMBA01.musicxml | 1188 ++---- test/data/grooves/SAMBA02.musicxml | 204 +- test/data/grooves/SHFL01.musicxml | 17 +- test/data/grooves/SHFL02.musicxml | 213 +- test/data/grooves/SHFL03.musicxml | 4 +- test/data/grooves/SHFL04.musicxml | 260 +- test/data/grooves/SHFL05.musicxml | 512 +-- test/data/grooves/SKA01.musicxml | 4 +- test/data/grooves/SKA02.musicxml | 4 +- test/data/grooves/SKA03.musicxml | 4 +- test/data/grooves/SKA04.musicxml | 22 +- test/data/grooves/Saidi.musicxml | 4 +- test/data/grooves/Salsa.musicxml | 4 +- test/data/grooves/Salsa1EndingA.musicxml | 54 +- test/data/grooves/Salsa1EndingB.musicxml | 54 +- test/data/grooves/Salsa1FillAA.musicxml | 4 +- test/data/grooves/Salsa1FillAB.musicxml | 4 +- test/data/grooves/Salsa1FillBA.musicxml | 4 +- test/data/grooves/Salsa1FillBB.musicxml | 4 +- test/data/grooves/Salsa1IntroA.musicxml | 4 +- test/data/grooves/Salsa1IntroB.musicxml | 4 +- test/data/grooves/Salsa1MainA.musicxml | 4 +- test/data/grooves/Salsa1MainB.musicxml | 4 +- test/data/grooves/Salsa2EndingA.musicxml | 238 +- test/data/grooves/Salsa2EndingB.musicxml | 238 +- test/data/grooves/Salsa2FillAA.musicxml | 104 +- test/data/grooves/Salsa2FillAB.musicxml | 4 +- test/data/grooves/Salsa2FillBA.musicxml | 4 +- test/data/grooves/Salsa2FillBB.musicxml | 104 +- test/data/grooves/Salsa2IntroA.musicxml | 460 ++- test/data/grooves/Salsa2IntroB.musicxml | 54 +- test/data/grooves/Salsa2MainA.musicxml | 501 +-- test/data/grooves/Salsa2MainB.musicxml | 404 +- test/data/grooves/SalsaEnd.musicxml | 10 +- test/data/grooves/SalsaFill.musicxml | 4 +- test/data/grooves/SalsaIntro.musicxml | 4 +- test/data/grooves/SalsaPlus.musicxml | 4 +- test/data/grooves/SalsaSus.musicxml | 4 +- test/data/grooves/SalsaSusPlus.musicxml | 4 +- test/data/grooves/Samai.musicxml | 4 +- test/data/grooves/Samba.musicxml | 4 +- test/data/grooves/SambaEnd.musicxml | 4 +- test/data/grooves/SambaFill.musicxml | 4 +- test/data/grooves/SambaIntro.musicxml | 4 +- test/data/grooves/SambaIntro1.musicxml | 4 +- test/data/grooves/SambaIntro8.musicxml | 4 +- test/data/grooves/SambaPlus.musicxml | 4 +- test/data/grooves/SambaSus.musicxml | 4 +- test/data/grooves/SambaSusFill.musicxml | 4 +- test/data/grooves/SambaSusPlus.musicxml | 4 +- test/data/grooves/Serenade.musicxml | 4 +- test/data/grooves/SerenadeEnd.musicxml | 4 +- test/data/grooves/SerenadeIntro.musicxml | 4 +- test/data/grooves/ShuffleBoggie.musicxml | 4 +- test/data/grooves/ShuffleBoggie1.musicxml | 4 +- test/data/grooves/ShuffleBoggieEnd.musicxml | 4 +- test/data/grooves/ShuffleBoggieFill.musicxml | 4 +- test/data/grooves/ShuffleBoggieIntro.musicxml | 4 +- .../data/grooves/ShuffleBoggieIntro4.musicxml | 4 +- test/data/grooves/ShuffleBoggieSus.musicxml | 4 +- test/data/grooves/ShuffleBoogie.musicxml | 30 +- test/data/grooves/ShuffleBoogieEnd.musicxml | 10 +- test/data/grooves/ShuffleBoogieIntro.musicxml | 49 +- test/data/grooves/ShuffleRock.musicxml | 4 +- test/data/grooves/ShuffleRockEnd.musicxml | 4 +- test/data/grooves/ShuffleRockIntro.musicxml | 4 +- test/data/grooves/Ska.musicxml | 204 +- test/data/grooves/Ska1.musicxml | 204 +- test/data/grooves/Ska1Sus.musicxml | 204 +- test/data/grooves/SkaClap.musicxml | 204 +- test/data/grooves/SkaEnd.musicxml | 204 +- test/data/grooves/SkaSus.musicxml | 204 +- test/data/grooves/Slow16Beat.musicxml | 4 +- test/data/grooves/Slow16BeatEnd.musicxml | 4 +- test/data/grooves/Slow16BeatIntro.musicxml | 4 +- test/data/grooves/SlowBigBand.musicxml | 428 +- test/data/grooves/SlowBigBandEnd.musicxml | 60 +- test/data/grooves/SlowBigBandIntro.musicxml | 260 +- test/data/grooves/SlowBlues.musicxml | 4 +- test/data/grooves/SlowBlues12Triple.musicxml | 4 +- test/data/grooves/SlowBlues34Triple.musicxml | 4 +- test/data/grooves/SlowBlues4Triple.musicxml | 4 +- test/data/grooves/SlowBluesEnd.musicxml | 4 +- test/data/grooves/SlowBluesFill.musicxml | 4 +- test/data/grooves/SlowBluesFill1.musicxml | 4 +- test/data/grooves/SlowBluesFill2.musicxml | 4 +- test/data/grooves/SlowBluesFill3.musicxml | 4 +- test/data/grooves/SlowBluesIntro.musicxml | 4 +- test/data/grooves/SlowBluesSus.musicxml | 4 +- test/data/grooves/SlowBluesWalk4.musicxml | 4 +- test/data/grooves/SlowBluesWalk4Sus.musicxml | 4 +- test/data/grooves/SlowBluesWalk8.musicxml | 4 +- test/data/grooves/SlowBluesWalk8Sus.musicxml | 4 +- test/data/grooves/SlowBolero.musicxml | 152 +- test/data/grooves/SlowBolero1.musicxml | 152 +- test/data/grooves/SlowBolero1Sus.musicxml | 152 +- test/data/grooves/SlowBoleroEnd.musicxml | 4 +- test/data/grooves/SlowBoleroIntro.musicxml | 78 +- test/data/grooves/SlowBoleroIntroSus.musicxml | 78 +- test/data/grooves/SlowBoleroPlus.musicxml | 152 +- test/data/grooves/SlowBoleroSus.musicxml | 152 +- test/data/grooves/SlowBoleroSusPlus.musicxml | 152 +- test/data/grooves/SlowBroadway.musicxml | 84 +- test/data/grooves/SlowBroadway1.musicxml | 84 +- test/data/grooves/SlowBroadway1Sus.musicxml | 84 +- test/data/grooves/SlowBroadwayEnd.musicxml | 24 +- test/data/grooves/SlowBroadwayIntro.musicxml | 84 +- test/data/grooves/SlowBroadwaySus.musicxml | 84 +- test/data/grooves/SlowCountry.musicxml | 4 +- test/data/grooves/SlowCountryEnd.musicxml | 4 +- test/data/grooves/SlowCountryFill.musicxml | 4 +- .../data/grooves/SlowCountryFillPlus.musicxml | 4 +- test/data/grooves/SlowCountryIntro.musicxml | 4 +- test/data/grooves/SlowCountryPlus.musicxml | 4 +- test/data/grooves/SlowCountrySus.musicxml | 4 +- test/data/grooves/SlowCountrySusPlus.musicxml | 4 +- test/data/grooves/SlowCountryWalk.musicxml | 4 +- .../data/grooves/SlowCountryWalkFill.musicxml | 4 +- .../grooves/SlowCountryWalkFillPlus.musicxml | 4 +- .../data/grooves/SlowCountryWalkPlus.musicxml | 4 +- test/data/grooves/SlowCountryWalkSus.musicxml | 4 +- .../grooves/SlowCountryWalkSusPlus.musicxml | 4 +- test/data/grooves/SlowDesert.musicxml | 4 +- test/data/grooves/SlowDesertEnd.musicxml | 4 +- test/data/grooves/SlowDesertFill.musicxml | 483 +-- test/data/grooves/SlowDesertFillSus.musicxml | 483 +-- test/data/grooves/SlowDesertPlus.musicxml | 4 +- test/data/grooves/SlowDesertSus.musicxml | 4 +- test/data/grooves/SlowDesertSusPlus.musicxml | 4 +- test/data/grooves/SlowJazz.musicxml | 4 +- test/data/grooves/SlowJazz1.musicxml | 4 +- test/data/grooves/SlowJazz1Intro.musicxml | 4 +- test/data/grooves/SlowJazz1Plus.musicxml | 4 +- test/data/grooves/SlowJazz1Sus.musicxml | 4 +- test/data/grooves/SlowJazz1SusPlus.musicxml | 4 +- test/data/grooves/SlowJazz1Walk.musicxml | 4 +- test/data/grooves/SlowJazz1WalkSus.musicxml | 4 +- test/data/grooves/SlowJazz2.musicxml | 4 +- test/data/grooves/SlowJazz2End.musicxml | 4 +- test/data/grooves/SlowJazz2Intro.musicxml | 4 +- test/data/grooves/SlowJazz2Sus.musicxml | 4 +- test/data/grooves/SlowJazzEnd.musicxml | 4 +- test/data/grooves/SlowJazzFill.musicxml | 4 +- test/data/grooves/SlowJazzIntro.musicxml | 4 +- test/data/grooves/SlowJazzPlus.musicxml | 4 +- test/data/grooves/SlowJazzSus.musicxml | 4 +- test/data/grooves/SlowJazzSusPlus.musicxml | 4 +- test/data/grooves/SlowJazzWalk.musicxml | 4 +- test/data/grooves/SlowJazzWalkSus.musicxml | 4 +- test/data/grooves/SlowRock.musicxml | 1464 ++----- test/data/grooves/SlowRockEnd.musicxml | 4 +- test/data/grooves/SlowRockIntro.musicxml | 1057 +---- test/data/grooves/SlowSwing.musicxml | 4 +- test/data/grooves/SlowSwingIntro.musicxml | 4 +- test/data/grooves/SoftRock.musicxml | 4 +- test/data/grooves/SoftRock1.musicxml | 4 +- test/data/grooves/SoftRock1Sus.musicxml | 4 +- test/data/grooves/SoftRock2.musicxml | 4 +- test/data/grooves/SoftRock2Sus.musicxml | 4 +- test/data/grooves/SoftRockEnd.musicxml | 4 +- test/data/grooves/SoftRockFill.musicxml | 4 +- test/data/grooves/SoftRockIntro.musicxml | 4 +- test/data/grooves/SoftRockSus.musicxml | 4 +- test/data/grooves/SoftRockSusIntro.musicxml | 4 +- test/data/grooves/SoftShoeEnd.musicxml | 4 +- test/data/grooves/SoftShoeIntro.musicxml | 4 +- test/data/grooves/SoftShoeIntro8.musicxml | 4 +- test/data/grooves/SoftShoePlus.musicxml | 4 +- test/data/grooves/SoftShoeSus.musicxml | 4 +- test/data/grooves/SoftShoeSusPlus.musicxml | 4 +- test/data/grooves/Softshoe.musicxml | 4 +- test/data/grooves/Son.musicxml | 4 +- test/data/grooves/SonEnd.musicxml | 10 +- test/data/grooves/SonFill.musicxml | 9 +- test/data/grooves/SonFill2.musicxml | 13 +- test/data/grooves/SonIntro.musicxml | 36 +- test/data/grooves/SonPlus.musicxml | 4 +- test/data/grooves/SonSus.musicxml | 4 +- test/data/grooves/SonSusPlus.musicxml | 4 +- test/data/grooves/Soul.musicxml | 815 +--- test/data/grooves/SoulEnd.musicxml | 420 +- test/data/grooves/SoulIntro.musicxml | 597 +-- test/data/grooves/SoulPop.musicxml | 3158 ++++----------- test/data/grooves/SoulPopEnd.musicxml | 10 +- test/data/grooves/SoulPopIntro.musicxml | 1768 ++------- test/data/grooves/Spiritual.musicxml | 4 +- test/data/grooves/SpiritualEnd.musicxml | 4 +- test/data/grooves/SpiritualIntro.musicxml | 4 +- test/data/grooves/SpiritualPlus.musicxml | 4 +- test/data/grooves/SpiritualSus.musicxml | 4 +- test/data/grooves/SpiritualSusIntro.musicxml | 4 +- test/data/grooves/SpiritualSusPlus.musicxml | 4 +- test/data/grooves/Strut.musicxml | 4 +- test/data/grooves/Strut2.musicxml | 4 +- test/data/grooves/Strut2Sus.musicxml | 4 +- test/data/grooves/StrutEnd.musicxml | 20 +- test/data/grooves/StrutIntro.musicxml | 4 +- test/data/grooves/StrutSus.musicxml | 4 +- test/data/grooves/StrutSusIntro.musicxml | 4 +- test/data/grooves/Swing.musicxml | 104 +- test/data/grooves/Swing1.musicxml | 4 +- test/data/grooves/Swing1End.musicxml | 4 +- test/data/grooves/Swing1Plus.musicxml | 4 +- test/data/grooves/Swing1PlusSus.musicxml | 4 +- test/data/grooves/Swing1Sus.musicxml | 4 +- test/data/grooves/Swing1Triple.musicxml | 472 +-- test/data/grooves/Swing1Walk.musicxml | 4 +- test/data/grooves/Swing1WalkPlus.musicxml | 4 +- test/data/grooves/Swing1WalkPlusSus.musicxml | 4 +- test/data/grooves/Swing1WalkSus.musicxml | 4 +- test/data/grooves/Swing2.musicxml | 4 +- test/data/grooves/Swing2End.musicxml | 1927 +++------ test/data/grooves/Swing2Plus.musicxml | 4 +- test/data/grooves/Swing2PlusSus.musicxml | 4 +- test/data/grooves/Swing2Sus.musicxml | 4 +- test/data/grooves/Swing2Triple.musicxml | 706 +--- test/data/grooves/SwingEnd.musicxml | 4 +- test/data/grooves/SwingFill.musicxml | 4 +- test/data/grooves/SwingIntro.musicxml | 4 +- test/data/grooves/SwingIntro2.musicxml | 4 +- test/data/grooves/SwingPlus.musicxml | 4 +- test/data/grooves/SwingPlusSus.musicxml | 4 +- test/data/grooves/SwingSus.musicxml | 4 +- test/data/grooves/SwingTriple.musicxml | 238 +- test/data/grooves/SwingWalk.musicxml | 4 +- test/data/grooves/SwingWalkPlus.musicxml | 4 +- test/data/grooves/SwingWalkPlusSus.musicxml | 4 +- test/data/grooves/SwingWalkSus.musicxml | 4 +- test/data/grooves/TECH01.musicxml | 202 +- test/data/grooves/TECH02.musicxml | 4 +- test/data/grooves/TECH03.musicxml | 419 +- test/data/grooves/TECH04.musicxml | 54 +- test/data/grooves/TECH05.musicxml | 342 +- test/data/grooves/TECH06.musicxml | 4 +- test/data/grooves/TECH07.musicxml | 4 +- test/data/grooves/TECH08.musicxml | 354 +- test/data/grooves/TECH09.musicxml | 4 +- test/data/grooves/TECH10.musicxml | 4 +- test/data/grooves/THRS01.musicxml | 4 +- test/data/grooves/THRS02.musicxml | 4 +- test/data/grooves/TRIP01.musicxml | 388 +- test/data/grooves/TRIP02.musicxml | 4 +- test/data/grooves/TRIP03.musicxml | 4 +- test/data/grooves/TRIP04.musicxml | 4 +- test/data/grooves/Tango.musicxml | 238 +- test/data/grooves/Tango1.musicxml | 238 +- test/data/grooves/TangoClean.musicxml | 238 +- test/data/grooves/TangoCleanPlus.musicxml | 238 +- test/data/grooves/TangoCleanSus.musicxml | 238 +- test/data/grooves/TangoEnd.musicxml | 121 +- test/data/grooves/TangoIntro.musicxml | 238 +- test/data/grooves/TeamTechno.musicxml | 4 +- test/data/grooves/TeamTechnoEnd.musicxml | 4 +- test/data/grooves/TeamTechnoIntro.musicxml | 4 +- .../data/grooves/TeamTechnoIntroPlus.musicxml | 4 +- test/data/grooves/TeamTechnoSus.musicxml | 4 +- test/data/grooves/Techno.musicxml | 4 +- test/data/grooves/TechnoEnd.musicxml | 4 +- test/data/grooves/TechnoIntro.musicxml | 4 +- test/data/grooves/Trance.musicxml | 4 +- test/data/grooves/Trance1.musicxml | 396 +- test/data/grooves/Trance1Bass1.musicxml | 4 +- test/data/grooves/Trance2.musicxml | 4 +- test/data/grooves/Trance2Bass1.musicxml | 4 +- test/data/grooves/TranceBass1.musicxml | 4 +- test/data/grooves/TranceEnd.musicxml | 4 +- test/data/grooves/TranceIntro.musicxml | 4 +- test/data/grooves/TripHop.musicxml | 184 +- test/data/grooves/TripHopEnd.musicxml | 60 +- test/data/grooves/TripHopIntro.musicxml | 190 +- test/data/grooves/TwiEndingB.musicxml | 9 +- test/data/grooves/TwiFillAA.musicxml | 4 +- test/data/grooves/TwiFillAB.musicxml | 211 +- test/data/grooves/TwiFillBA.musicxml | 51 +- test/data/grooves/TwiFillBB.musicxml | 121 +- test/data/grooves/TwiIntroB.musicxml | 103 +- test/data/grooves/TwiMainA.musicxml | 4 +- test/data/grooves/TwiMainB.musicxml | 103 +- test/data/grooves/Twist.musicxml | 40 +- test/data/grooves/Twist4.musicxml | 68 +- test/data/grooves/Twist4Sus.musicxml | 68 +- test/data/grooves/TwistEnd.musicxml | 13 +- test/data/grooves/TwistIntro.musicxml | 31 +- test/data/grooves/TwistSus.musicxml | 68 +- test/data/grooves/VieneseWaltz.musicxml | 4 +- test/data/grooves/VieneseWaltz1.musicxml | 4 +- test/data/grooves/VieneseWaltz1Sus.musicxml | 4 +- test/data/grooves/VieneseWaltz2.musicxml | 4 +- test/data/grooves/VieneseWaltz2Sus.musicxml | 4 +- test/data/grooves/VieneseWaltzEnd.musicxml | 4 +- test/data/grooves/VieneseWaltzIntro.musicxml | 4 +- test/data/grooves/VieneseWaltzSus.musicxml | 4 +- test/data/grooves/W-RockEndingA.musicxml | 4 +- test/data/grooves/W-RockEndingB.musicxml | 4 +- test/data/grooves/W-RockFillAA.musicxml | 4 +- test/data/grooves/W-RockFillAB.musicxml | 4 +- test/data/grooves/W-RockFillBA.musicxml | 4 +- test/data/grooves/W-RockIntroA.musicxml | 144 +- test/data/grooves/W-RockMainA.musicxml | 4 +- test/data/grooves/W-RockMainB.musicxml | 4 +- test/data/grooves/Waltz.musicxml | 4 +- test/data/grooves/Waltz1.musicxml | 4 +- test/data/grooves/Waltz1Intro.musicxml | 4 +- test/data/grooves/Waltz1Intro8.musicxml | 4 +- test/data/grooves/Waltz1Sus.musicxml | 4 +- test/data/grooves/Waltz1SusIntro.musicxml | 4 +- test/data/grooves/Waltz1SusIntro8.musicxml | 4 +- test/data/grooves/Waltz1Walk.musicxml | 4 +- test/data/grooves/Waltz1WalkSus.musicxml | 4 +- test/data/grooves/WaltzEnd.musicxml | 4 +- test/data/grooves/WaltzIntro.musicxml | 4 +- test/data/grooves/WaltzIntro8.musicxml | 4 +- test/data/grooves/WaltzSus.musicxml | 4 +- test/data/grooves/WaltzSusIntro.musicxml | 4 +- test/data/grooves/WaltzSusIntro8.musicxml | 4 +- test/data/grooves/WaltzWalk.musicxml | 4 +- test/data/grooves/WaltzWalkSus.musicxml | 4 +- test/data/grooves/WesternEndingA.musicxml | 14 +- test/data/grooves/WesternEndingB.musicxml | 14 +- test/data/grooves/WesternFillAA.musicxml | 4 +- test/data/grooves/WesternFillAB.musicxml | 4 +- test/data/grooves/WesternFillBA.musicxml | 4 +- test/data/grooves/WesternFillBB.musicxml | 4 +- test/data/grooves/WesternIntroA.musicxml | 4 +- test/data/grooves/WesternIntroB.musicxml | 52 +- test/data/grooves/WesternMainA.musicxml | 4 +- test/data/grooves/WesternMainB.musicxml | 4 +- test/data/grooves/WesternSwing.musicxml | 4 +- test/data/grooves/WesternSwingEnd.musicxml | 4 +- test/data/grooves/WesternSwingIntro.musicxml | 4 +- test/data/grooves/WesternSwingPlus.musicxml | 4 +- test/data/grooves/WesternSwingSus.musicxml | 4 +- .../data/grooves/WesternSwingSusPlus.musicxml | 4 +- test/data/grooves/WorldPop.musicxml | 1463 +++---- test/data/grooves/WorldPopEnd.musicxml | 490 +-- test/data/grooves/WorldPopIntro.musicxml | 640 +-- test/data/grooves/Xaxado-Miranda.musicxml | 4 +- test/data/grooves/Xote-Miranda.musicxml | 4 +- test/data/grooves/Zydeco.musicxml | 4 +- test/data/grooves/ZydecoEnd.musicxml | 4 +- test/data/grooves/ZydecoIntro.musicxml | 4 +- test/data/grooves/ZydecoPlus.musicxml | 4 +- test/data/grooves/ZydecoPlusEnd.musicxml | 4 +- test/data/grooves/ZydecoSus.musicxml | 4 +- test/data/grooves/ZydecoSusPlus.musicxml | 4 +- test/data/grooves/fasttwistA.musicxml | 4 +- test/data/grooves/fasttwistB.musicxml | 202 +- test/data/grooves/fasttwistEndingA.musicxml | 9 +- test/data/grooves/fasttwistEndingB.musicxml | 9 +- test/data/grooves/fasttwistFillA.musicxml | 211 +- test/data/grooves/fasttwistFillB.musicxml | 4 +- test/data/grooves/fasttwistIntroA.musicxml | 124 +- test/data/grooves/fasttwistIntroB.musicxml | 331 +- test/data/grooves/highfiveA.musicxml | 3444 ++++++---------- test/data/grooves/highfiveB.musicxml | 3514 ++++++----------- test/data/grooves/highfiveE.musicxml | 980 ++--- test/data/grooves/highfiveFA.musicxml | 396 +- test/data/grooves/highfiveFB.musicxml | 396 +- test/data/grooves/kbossaA.musicxml | 4 +- test/data/grooves/kbossaB.musicxml | 4 +- test/data/grooves/kbossaC.musicxml | 4 +- test/data/grooves/kbossaEndingA.musicxml | 4 +- test/data/grooves/kbossaEndingB.musicxml | 4 +- test/data/grooves/kbossaEndingC.musicxml | 4 +- test/data/grooves/kbossaEndingD.musicxml | 4 +- test/data/grooves/kbossaFillA.musicxml | 4 +- test/data/grooves/kbossaFillAB.musicxml | 4 +- test/data/grooves/kbossaFillB.musicxml | 4 +- test/data/grooves/kbossaFillC.musicxml | 4 +- test/data/grooves/kbossaIntroA.musicxml | 4 +- test/data/grooves/kbossaIntroB.musicxml | 4 +- test/data/grooves/kbossaIntroC.musicxml | 4 +- test/data/grooves/kwestballadA.musicxml | 4 +- test/data/grooves/kwestballadB.musicxml | 4 +- test/data/grooves/kwestballadC.musicxml | 24 +- test/data/grooves/kwestballadD.musicxml | 24 +- test/data/grooves/kwestballadEndingA.musicxml | 98 +- test/data/grooves/kwestballadEndingB.musicxml | 98 +- test/data/grooves/kwestballadEndingC.musicxml | 98 +- test/data/grooves/kwestballadEndingD.musicxml | 98 +- test/data/grooves/kwestballadFillA.musicxml | 4 +- test/data/grooves/kwestballadFillAB.musicxml | 4 +- test/data/grooves/kwestballadFillB.musicxml | 4 +- test/data/grooves/kwestballadFillC.musicxml | 4 +- test/data/grooves/kwestballadIntroA.musicxml | 24 +- test/data/grooves/kwestballadIntroB.musicxml | 24 +- test/data/grooves/metal1A.musicxml | 4 +- test/data/grooves/metal1B.musicxml | 4 +- test/data/grooves/metal1E.musicxml | 4 +- test/data/grooves/metal1FA.musicxml | 4 +- test/data/grooves/metal1FB.musicxml | 4 +- test/data/grooves/metal2A.musicxml | 1616 +++----- test/data/grooves/metal2B.musicxml | 1700 +++----- test/data/grooves/metal2E.musicxml | 4 +- test/data/grooves/metal2FA.musicxml | 4 +- test/data/grooves/metal2FB.musicxml | 436 +- test/data/grooves/rock1A.musicxml | 4 +- test/data/grooves/rock1B.musicxml | 4 +- test/data/grooves/rock1E.musicxml | 4 +- test/data/grooves/rock1FA.musicxml | 4 +- test/data/grooves/rock1FB.musicxml | 4 +- test/data/grooves/slowrockA.musicxml | 4 +- test/data/grooves/slowrockB.musicxml | 4 +- test/data/grooves/slowrockE.musicxml | 4 +- test/data/grooves/slowrockFA.musicxml | 4 +- test/data/grooves/slowrockFB.musicxml | 472 +-- 1792 files changed, 44482 insertions(+), 120769 deletions(-) diff --git a/src/js/musicxml-grooves.js b/src/js/musicxml-grooves.js index 2858bbab..f6415d73 100755 --- a/src/js/musicxml-grooves.js +++ b/src/js/musicxml-grooves.js @@ -31,6 +31,13 @@ import path from 'path' const require = createRequire(import.meta.url) const { version } = require('../../package.json') +// https://gomakethings.com/the-new-array.prototype.tospliced-method-in-vanilla-js/ +if (!Array.prototype.toSpliced) { + Array.prototype.toSpliced = function (...args) { + return Array.from(this).splice(...args); + }; +} + const options = { 'output': { type: 'string', @@ -773,7 +780,7 @@ function createNoteTiming(note, index, notes) { // - Each have a duration of a tuplet fraction of the enclosing note type // - Fall within the same enclosing note, instead of crossing note boundaries // TODO Handle tuplets where individual notes can be multiples of the tuplet division. - if (entry < note.quantized.duration && note.quantized.duration < entry * 2) { + if (entry / 2 < note.quantized.duration && note.quantized.duration < entry * 2) { for (const tupletCount of [3, 5]) { const target = entry * Math.pow(2, Math.ceil(Math.log2(tupletCount))) const tuplet = tuplets(note, index, notes, tupletCount) @@ -781,7 +788,7 @@ function createNoteTiming(note, index, notes) { if ( tuplet.length === tupletCount && Math.abs(tupletsDuration(tuplet) - target) <= Number.EPSILON && - tuplet.every(n => Math.min(n.quantized.duration % ratio, ratio - (n.quantized.duration % ratio)) <= Number.EPSILON) && + //tuplet.every(n => Math.min(n.quantized.duration % ratio, ratio - (n.quantized.duration % ratio)) <= Number.EPSILON) && tuplet.every(n => Math.floor(n.quantized.onset / target) === Math.floor(tuplet[0].quantized.onset / target)) ) { tuplet.forEach((n, i, t) => { @@ -873,6 +880,13 @@ function createNoteTiming(note, index, notes) { // Check that the gap is all filled. if (gap > Number.EPSILON) { + const isFirstNote = index === 0 || notes[index-1].voice !== note.voice + if (!isFirstNote && !('midi' in note)) { + console.warn(`[${note.track}:${note.measure+1}] Remaining gap of ${gap} left after rest at ${note.onset}. This indicates a missed tuplet. Attempting to fix.`) + notes[index-1].quantized.duration += note.quantized.duration + notes[index-1].duration += note.duration + return createNoteTiming(notes[index-1], index-1, notes.toSpliced(index, 1)) + } console.error(`[${note.track}:${note.measure+1}] Remaining gap of ${gap} left after note at ${note.onset}. This indicates a missed tuplet.`) } diff --git a/test/data/grooves/04JAZZ01.musicxml b/test/data/grooves/04JAZZ01.musicxml index fb21e004..2574218d 100644 --- a/test/data/grooves/04JAZZ01.musicxml +++ b/test/data/grooves/04JAZZ01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -373,98 +373,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - F - 5 - - 384 - - + 256 3 eighth - up - normal - - - - - - - F - 5 - - 96 - - - - 3 - 32nd - up - normal - - - - - - - - F - 5 - - 24 - - - - 3 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -472,15 +399,19 @@ F 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -528,10 +459,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -540,15 +471,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -683,10 +619,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -695,15 +631,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -738,10 +679,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -750,15 +691,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1438,10 +1384,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1450,15 +1396,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1589,10 +1540,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1601,15 +1552,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1740,10 +1696,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1752,15 +1708,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1891,10 +1852,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1903,15 +1864,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/04JAZZ02.musicxml b/test/data/grooves/04JAZZ02.musicxml index 555f2660..6d0bcb19 100644 --- a/test/data/grooves/04JAZZ02.musicxml +++ b/test/data/grooves/04JAZZ02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/04JAZZ03.musicxml b/test/data/grooves/04JAZZ03.musicxml index 422dd25f..5e91d103 100644 --- a/test/data/grooves/04JAZZ03.musicxml +++ b/test/data/grooves/04JAZZ03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/04JAZZ04.musicxml b/test/data/grooves/04JAZZ04.musicxml index 1e4512b1..013fcd21 100644 --- a/test/data/grooves/04JAZZ04.musicxml +++ b/test/data/grooves/04JAZZ04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1003,50 +1003,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - F @@ -1130,101 +1086,28 @@ F 5 - 192 - - - 1 - 16th - up - x - - - - - - - F - 5 - - 48 - - - - 1 - 64th - up - x - - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - - - 1 - 1024th - up - x - - - - - - - F - 5 - - 384 - + 256 1 eighth + + 3 + 2 + quarter + up x - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - + + + 3 + eighth + + + 2 + quarter + + @@ -1232,33 +1115,19 @@ F 5 - 24 - - + 512 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -1665,50 +1534,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - F @@ -1792,101 +1617,28 @@ F 5 - 192 - - - 1 - 16th - up - x - - - - - - - F - 5 - - 48 - - - - 1 - 64th - up - x - - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - - - 1 - 1024th - up - x - - - - - - - F - 5 - - 384 - + 256 1 eighth + + 3 + 2 + quarter + up x - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - + + + 3 + eighth + + + 2 + quarter + + @@ -1894,33 +1646,19 @@ F 5 - 24 - - + 512 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + up x - + diff --git a/test/data/grooves/08Beat01.musicxml b/test/data/grooves/08Beat01.musicxml index 302e70ec..52d1a0ea 100644 --- a/test/data/grooves/08Beat01.musicxml +++ b/test/data/grooves/08Beat01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/08Beat02.musicxml b/test/data/grooves/08Beat02.musicxml index 1238337e..43df5a2a 100644 --- a/test/data/grooves/08Beat02.musicxml +++ b/test/data/grooves/08Beat02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/08Beat03.musicxml b/test/data/grooves/08Beat03.musicxml index 2a60f483..07b3f449 100644 --- a/test/data/grooves/08Beat03.musicxml +++ b/test/data/grooves/08Beat03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/08Beat04.musicxml b/test/data/grooves/08Beat04.musicxml index 77b394a6..24f63c1d 100644 --- a/test/data/grooves/08Beat04.musicxml +++ b/test/data/grooves/08Beat04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/08Beat05.musicxml b/test/data/grooves/08Beat05.musicxml index 3f6d3b4b..979c441a 100644 --- a/test/data/grooves/08Beat05.musicxml +++ b/test/data/grooves/08Beat05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/08Beat06.musicxml b/test/data/grooves/08Beat06.musicxml index c20e0c22..03c0c954 100644 --- a/test/data/grooves/08Beat06.musicxml +++ b/test/data/grooves/08Beat06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/08Beat07.musicxml b/test/data/grooves/08Beat07.musicxml index 234eb021..b6bc5ee8 100644 --- a/test/data/grooves/08Beat07.musicxml +++ b/test/data/grooves/08Beat07.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/08Beat08.musicxml b/test/data/grooves/08Beat08.musicxml index 2ee1ed83..463c7623 100644 --- a/test/data/grooves/08Beat08.musicxml +++ b/test/data/grooves/08Beat08.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -446,10 +446,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -458,15 +458,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -527,10 +532,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -539,15 +544,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -608,10 +618,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -620,15 +630,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -689,10 +704,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -701,15 +716,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/08Beat09.musicxml b/test/data/grooves/08Beat09.musicxml index 582bfd05..09f2630f 100644 --- a/test/data/grooves/08Beat09.musicxml +++ b/test/data/grooves/08Beat09.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -261,98 +261,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - + 512 1 - 128th - up - normal + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + @@ -360,15 +287,18 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - @@ -376,13 +306,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -457,98 +393,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -556,67 +419,19 @@ E 4 - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 512 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - + @@ -624,67 +439,28 @@ E 4 - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 384 - + 256 1 eighth + + 3 + 2 + quarter + up normal - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - + + + 3 + eighth + + + 2 + quarter + + @@ -692,15 +468,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -1618,10 +1398,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1630,15 +1410,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1728,10 +1513,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1740,15 +1525,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1809,10 +1599,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1821,15 +1611,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/08Beat10.musicxml b/test/data/grooves/08Beat10.musicxml index df939cd9..a57c285f 100644 --- a/test/data/grooves/08Beat10.musicxml +++ b/test/data/grooves/08Beat10.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1357,10 +1357,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1369,15 +1369,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1542,10 +1547,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1554,15 +1559,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/08Beat11.musicxml b/test/data/grooves/08Beat11.musicxml index b44d74fe..0cb03882 100644 --- a/test/data/grooves/08Beat11.musicxml +++ b/test/data/grooves/08Beat11.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1433,10 +1433,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1445,15 +1445,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1624,10 +1629,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1636,15 +1641,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/08Beat12.musicxml b/test/data/grooves/08Beat12.musicxml index 9025457f..d68d8356 100644 --- a/test/data/grooves/08Beat12.musicxml +++ b/test/data/grooves/08Beat12.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1363,10 +1363,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1375,15 +1375,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1554,10 +1559,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1566,15 +1571,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/16Beat01.musicxml b/test/data/grooves/16Beat01.musicxml index 8b4c7265..fe78b271 100644 --- a/test/data/grooves/16Beat01.musicxml +++ b/test/data/grooves/16Beat01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16Beat02.musicxml b/test/data/grooves/16Beat02.musicxml index 6634ce7f..9f3d7256 100644 --- a/test/data/grooves/16Beat02.musicxml +++ b/test/data/grooves/16Beat02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16Beat03.musicxml b/test/data/grooves/16Beat03.musicxml index 12de4b13..11f7d289 100644 --- a/test/data/grooves/16Beat03.musicxml +++ b/test/data/grooves/16Beat03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16Beat04.musicxml b/test/data/grooves/16Beat04.musicxml index 897c05e4..296f967b 100644 --- a/test/data/grooves/16Beat04.musicxml +++ b/test/data/grooves/16Beat04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16Beat05.musicxml b/test/data/grooves/16Beat05.musicxml index d7c92778..343e224e 100644 --- a/test/data/grooves/16Beat05.musicxml +++ b/test/data/grooves/16Beat05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16Beat06.musicxml b/test/data/grooves/16Beat06.musicxml index 6f51a224..a03d3473 100644 --- a/test/data/grooves/16Beat06.musicxml +++ b/test/data/grooves/16Beat06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16Beat07.musicxml b/test/data/grooves/16Beat07.musicxml index 9794acda..34f8d981 100644 --- a/test/data/grooves/16Beat07.musicxml +++ b/test/data/grooves/16Beat07.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16Beat08.musicxml b/test/data/grooves/16Beat08.musicxml index 3691de24..99a3b7b0 100644 --- a/test/data/grooves/16Beat08.musicxml +++ b/test/data/grooves/16Beat08.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16Beat09.musicxml b/test/data/grooves/16Beat09.musicxml index 03e6bc8f..34d7cc65 100644 --- a/test/data/grooves/16Beat09.musicxml +++ b/test/data/grooves/16Beat09.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -267,22 +267,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -290,10 +293,15 @@ A 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -301,10 +309,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/16Beat1.musicxml b/test/data/grooves/16Beat1.musicxml index 4eb7839d..6e5e2294 100644 --- a/test/data/grooves/16Beat1.musicxml +++ b/test/data/grooves/16Beat1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16Beat10.musicxml b/test/data/grooves/16Beat10.musicxml index 6c740eea..2c6d84b8 100644 --- a/test/data/grooves/16Beat10.musicxml +++ b/test/data/grooves/16Beat10.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16Beat11.musicxml b/test/data/grooves/16Beat11.musicxml index 71085eb5..9ac9926e 100644 --- a/test/data/grooves/16Beat11.musicxml +++ b/test/data/grooves/16Beat11.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16Beat12.musicxml b/test/data/grooves/16Beat12.musicxml index e89e2bdc..54ac0aed 100644 --- a/test/data/grooves/16Beat12.musicxml +++ b/test/data/grooves/16Beat12.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16Beat2.musicxml b/test/data/grooves/16Beat2.musicxml index 5427c543..f406cd2b 100644 --- a/test/data/grooves/16Beat2.musicxml +++ b/test/data/grooves/16Beat2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -636,83 +636,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - + 256 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -720,33 +665,18 @@ G 5 - 24 - - + 256 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -754,13 +684,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -868,101 +804,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - + 256 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -970,15 +833,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -986,13 +852,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -1042,117 +914,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1204,101 +987,28 @@ G 5 - 192 - + 256 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -1306,15 +1016,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1322,13 +1035,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -1436,101 +1155,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 256 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -1538,15 +1184,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1554,13 +1203,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + diff --git a/test/data/grooves/16Beat2End.musicxml b/test/data/grooves/16Beat2End.musicxml index 9d7d3a62..d3d6576a 100644 --- a/test/data/grooves/16Beat2End.musicxml +++ b/test/data/grooves/16Beat2End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -319,25 +319,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/16Beat2Intro.musicxml b/test/data/grooves/16Beat2Intro.musicxml index b5a20047..e4500521 100644 --- a/test/data/grooves/16Beat2Intro.musicxml +++ b/test/data/grooves/16Beat2Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -554,101 +554,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -656,15 +583,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -672,13 +602,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -786,101 +722,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -888,15 +751,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -904,13 +770,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -960,117 +832,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - diff --git a/test/data/grooves/16Beat3.musicxml b/test/data/grooves/16Beat3.musicxml index 6af1a901..6af671d8 100644 --- a/test/data/grooves/16Beat3.musicxml +++ b/test/data/grooves/16Beat3.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -455,98 +455,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - + 512 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - - 1 - eighth - down - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - down - normal - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -554,23 +481,32 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -625,98 +561,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - + 512 1 - 1024th - - - - - - - E - 4 - - 384 - - - 1 - eighth - down - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - down - normal - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -724,23 +587,32 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -795,98 +667,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 512 1 - eighth - down - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - down - normal - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -894,23 +693,32 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -965,80 +773,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - down - normal - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1046,129 +799,42 @@ E 4 - 24 - - + 512 1 - 128th - down - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - down - normal - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1176,15 +842,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/16Beat3End.musicxml b/test/data/grooves/16Beat3End.musicxml index 70b1d5a6..7cc09a98 100644 --- a/test/data/grooves/16Beat3End.musicxml +++ b/test/data/grooves/16Beat3End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -342,98 +342,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 512 1 - eighth - down - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - down - normal - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -441,23 +368,32 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/16Beat3Intro.musicxml b/test/data/grooves/16Beat3Intro.musicxml index 9d75681a..6fa18097 100644 --- a/test/data/grooves/16Beat3Intro.musicxml +++ b/test/data/grooves/16Beat3Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -422,98 +422,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 512 1 - eighth - down - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - down - normal - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -521,23 +448,32 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -592,98 +528,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 512 1 - eighth - down - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - down - normal - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -691,23 +554,32 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/16BeatBallad1.musicxml b/test/data/grooves/16BeatBallad1.musicxml index 4c0aec7a..f31934bf 100644 --- a/test/data/grooves/16BeatBallad1.musicxml +++ b/test/data/grooves/16BeatBallad1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -764,62 +764,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -827,51 +790,19 @@ E 4 - 96 - - + 512 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/16BeatBallad1End.musicxml b/test/data/grooves/16BeatBallad1End.musicxml index e6b6bfcf..d7c07cb9 100644 --- a/test/data/grooves/16BeatBallad1End.musicxml +++ b/test/data/grooves/16BeatBallad1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -331,22 +331,52 @@ + + + G + 5 + + 192 + + 3 + 16th + up + x + + + + + + + G + 5 + + 192 + + 3 + 16th + up + circle-x + + + + G 5 48 - + 3 64th up - x + circle-x - + G 5 @@ -354,78 +384,78 @@ 12 - + 3 256th up - x + circle-x - + G 5 3 - + 3 1024th up - x + circle-x - + G 5 - 96 + 48 - + 3 - 32nd + 64th up - circle-x + x - + G 5 - 24 + 12 - + 3 - 128th + 256th up - circle-x + x - + G 5 - 6 + 3 - + 3 - 512th + 1024th up - circle-x + x @@ -480,23 +510,23 @@ - + G 5 96 - + 3 32nd up - x + circle-x - + G 5 @@ -504,64 +534,59 @@ 24 - + 3 128th up - x + circle-x - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - G 5 - 48 - + 6 + 3 - 64th + 512th up circle-x - + - + G 5 - 12 - - - + 128 + 3 - 256th + 16th + + 3 + 2 + 16th + up - circle-x + x - - + + + 3 + 16th + + + 2 + 16th + + @@ -569,15 +594,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up circle-x - @@ -585,13 +613,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up circle-x + @@ -599,33 +633,25 @@ G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x + G 5 - 186 + 192 3 - 32nd - - - - + 16th up circle-x @@ -646,37 +672,30 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x + G 5 - 186 + 192 3 - 32nd - - - - + 16th up circle-x @@ -737,11 +756,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -753,12 +772,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -771,11 +790,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -821,11 +840,11 @@ G 5 - 3 + 6 3 - 1024th + 512th up circle-x @@ -887,83 +906,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - + + + 3 + 16th + + + 2 + 16th + + @@ -971,15 +935,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up circle-x - @@ -987,13 +954,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up circle-x + @@ -1001,33 +974,25 @@ G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x + G 5 - 186 + 192 3 - 32nd - - - - + 16th up circle-x @@ -1048,37 +1013,30 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x + G 5 - 186 + 192 3 - 32nd - - - - + 16th up circle-x @@ -1139,11 +1097,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -1155,12 +1113,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -1173,11 +1131,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -1223,11 +1181,11 @@ G 5 - 3 + 6 3 - 1024th + 512th up circle-x @@ -1289,49 +1247,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 128 3 - 128th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1339,49 +1276,18 @@ G 5 - 48 - + 128 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th + 16th + + 3 + 2 + 16th + up circle-x - @@ -1389,13 +1295,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up circle-x + @@ -1403,33 +1315,25 @@ G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x + G 5 - 186 + 192 3 - 32nd - - - - + 16th up circle-x @@ -1450,37 +1354,30 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x + G 5 - 186 + 192 3 - 32nd - - - - + 16th up circle-x @@ -1541,11 +1438,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -1557,12 +1454,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -1575,11 +1472,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -1625,11 +1522,11 @@ G 5 - 3 + 6 3 - 1024th + 512th up circle-x @@ -1691,49 +1588,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1741,49 +1617,18 @@ G 5 - 48 - + 128 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th + 16th + + 3 + 2 + 16th + up circle-x - @@ -1791,13 +1636,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up circle-x + @@ -1805,41 +1656,17 @@ G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x - - G - 5 - - 186 - - 3 - 32nd - - - - - up - circle-x - - - - - - + G 5 @@ -1853,172 +1680,20 @@ - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - + + G 5 - 3 - + 768 3 - 1024th + quarter up x - @@ -2199,80 +1874,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -2280,33 +1900,19 @@ E 4 - 24 - - + 512 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/16BeatBallad1Intro.musicxml b/test/data/grooves/16BeatBallad1Intro.musicxml index a314f120..ef6e2bef 100644 --- a/test/data/grooves/16BeatBallad1Intro.musicxml +++ b/test/data/grooves/16BeatBallad1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1312,62 +1312,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1375,51 +1338,19 @@ E 4 - 96 - - + 512 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -1522,62 +1453,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1585,51 +1479,19 @@ E 4 - 96 - - + 512 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/16BeatBallad2.musicxml b/test/data/grooves/16BeatBallad2.musicxml index 8bbb834b..5283636d 100644 --- a/test/data/grooves/16BeatBallad2.musicxml +++ b/test/data/grooves/16BeatBallad2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -2872,6 +2872,21 @@ + + + + G + 5 + + 192 + + 3 + 16th + up + x + + + diff --git a/test/data/grooves/16BeatBallad2End.musicxml b/test/data/grooves/16BeatBallad2End.musicxml index fa0b7ddb..1fb5c43e 100644 --- a/test/data/grooves/16BeatBallad2End.musicxml +++ b/test/data/grooves/16BeatBallad2End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -496,53 +496,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -550,11 +515,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -566,12 +531,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -584,11 +549,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -650,15 +615,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -666,17 +644,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -684,15 +663,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -724,19 +707,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -847,65 +826,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -913,17 +855,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -931,15 +874,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -956,25 +903,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -990,19 +918,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -1113,65 +1037,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1179,17 +1066,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1197,15 +1085,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1222,25 +1114,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1256,19 +1129,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -1379,65 +1248,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1445,17 +1277,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1463,15 +1296,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1488,80 +1325,8 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 576 - - 3 - eighth - - up - x - - - - - - 768 - 3 - quarter - - - - - - 768 - 3 - quarter - - - - - - 768 - 3 - quarter - - - \ No newline at end of file diff --git a/test/data/grooves/16BeatBallad2Intro.musicxml b/test/data/grooves/16BeatBallad2Intro.musicxml index a233d11b..162eb0a1 100644 --- a/test/data/grooves/16BeatBallad2Intro.musicxml +++ b/test/data/grooves/16BeatBallad2Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -2333,53 +2333,33 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - + 192 3 - 256th + 16th up x - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -2387,11 +2367,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -2403,12 +2383,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -2421,11 +2401,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -2487,15 +2467,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2503,17 +2496,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -2521,15 +2515,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -2546,25 +2544,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -2580,19 +2559,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -2703,65 +2678,28 @@ G 5 - 96 - + 128 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2769,17 +2707,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -2787,15 +2726,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -2812,25 +2755,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -2846,19 +2770,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -2969,65 +2889,28 @@ G 5 - 96 - + 128 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -3035,17 +2918,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -3053,15 +2937,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -3078,25 +2966,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -3112,19 +2981,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -3235,65 +3100,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -3301,17 +3129,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -3319,15 +3148,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -3344,25 +3177,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - diff --git a/test/data/grooves/16BeatBallad3.musicxml b/test/data/grooves/16BeatBallad3.musicxml index 0c7fe443..c7e67d60 100644 --- a/test/data/grooves/16BeatBallad3.musicxml +++ b/test/data/grooves/16BeatBallad3.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1290,102 +1290,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 256 3 - 1024th - up - x - - - - - - - G - 5 - - 288 - - - 3 - 16th - - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -1393,15 +1319,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1409,13 +1338,19 @@ G 5 - 192 + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x + @@ -2449,102 +2384,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 256 3 - 1024th - up - x - - - - - - - G - 5 - - 288 - - - 3 - 16th - - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -2552,15 +2413,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -2568,13 +2432,19 @@ G 5 - 192 + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x + diff --git a/test/data/grooves/16BeatBallad3End.musicxml b/test/data/grooves/16BeatBallad3End.musicxml index 2847eba5..38d58dc7 100644 --- a/test/data/grooves/16BeatBallad3End.musicxml +++ b/test/data/grooves/16BeatBallad3End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -565,53 +565,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -619,11 +584,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -635,12 +600,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -653,11 +618,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -719,15 +684,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -735,17 +713,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -753,15 +732,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -793,19 +776,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -916,65 +895,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -982,17 +924,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1000,15 +943,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1025,25 +972,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1059,19 +987,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -1182,65 +1106,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1248,17 +1135,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1266,15 +1154,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1291,25 +1183,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1325,19 +1198,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -1448,65 +1317,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1514,17 +1346,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1532,15 +1365,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1557,25 +1394,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - @@ -1583,131 +1401,13 @@ G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 768 3 - 512th + quarter up x - diff --git a/test/data/grooves/16BeatBallad3Intro.musicxml b/test/data/grooves/16BeatBallad3Intro.musicxml index 14d44762..cbc9649e 100644 --- a/test/data/grooves/16BeatBallad3Intro.musicxml +++ b/test/data/grooves/16BeatBallad3Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1330,102 +1330,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 256 3 - 1024th - up - x - - - - - - - G - 5 - - 288 - - - 3 - 16th - - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -1433,15 +1359,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1449,13 +1378,19 @@ G 5 - 192 + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x + @@ -2489,84 +2424,28 @@ G 5 - 192 - + 256 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 288 - - - 3 - 16th - + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -2574,36 +2453,43 @@ G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - - + G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - + - + + + G 5 @@ -2617,9 +2503,8 @@ - - + G 5 @@ -2738,65 +2623,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 128 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2804,17 +2652,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -2822,15 +2671,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -2862,19 +2715,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -2985,49 +2834,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -3035,33 +2863,18 @@ G 5 - 48 - + 128 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -3069,15 +2882,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -3094,25 +2911,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -3128,19 +2926,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -3251,65 +3045,28 @@ G 5 - 96 - + 128 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -3317,17 +3074,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -3335,15 +3093,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -3360,25 +3122,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -3394,19 +3137,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -3517,65 +3256,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -3583,17 +3285,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -3601,15 +3304,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -3626,25 +3333,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - \ No newline at end of file diff --git a/test/data/grooves/16FUS01.musicxml b/test/data/grooves/16FUS01.musicxml index ee9de53a..7a2a0386 100644 --- a/test/data/grooves/16FUS01.musicxml +++ b/test/data/grooves/16FUS01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16FUS02.musicxml b/test/data/grooves/16FUS02.musicxml index 6150c907..aeef0d65 100644 --- a/test/data/grooves/16FUS02.musicxml +++ b/test/data/grooves/16FUS02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16FUS03.musicxml b/test/data/grooves/16FUS03.musicxml index e85b04f0..74d36c4d 100644 --- a/test/data/grooves/16FUS03.musicxml +++ b/test/data/grooves/16FUS03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16FUS04.musicxml b/test/data/grooves/16FUS04.musicxml index 110660a9..e3baf7fa 100644 --- a/test/data/grooves/16FUS04.musicxml +++ b/test/data/grooves/16FUS04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16Shuffle1.musicxml b/test/data/grooves/16Shuffle1.musicxml index d321ed4e..ce8576fe 100644 --- a/test/data/grooves/16Shuffle1.musicxml +++ b/test/data/grooves/16Shuffle1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1950,50 +1950,6 @@ - - - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - G @@ -2049,99 +2005,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -3012,6 +2897,21 @@ + + + + G + 5 + + 192 + + 3 + 16th + up + x + + + @@ -3082,101 +2982,161 @@ F 4 - 192 - + 256 1 - 16th + eighth + + 3 + 2 + quarter + down normal - + + + 3 + eighth + + + 2 + quarter + + - + F 4 - 48 - - + 512 1 - 64th + quarter + + 3 + 2 + quarter + down normal + + + + + + + 384 + + 1 + eighth + + + + + 192 + + 1 + 16th + - + F 4 - 12 - - + 192 1 - 256th + 16th down normal - - + + F 4 - 3 - + 768 1 - 1024th + quarter down normal + + + + + + 384 + + 1 + eighth + + + + + + + 192 + + 1 + 16th - + F 4 - 384 - + 192 1 - eighth + 16th down normal - - + F 4 - 96 - - + 512 1 - 32nd + quarter + + 3 + 2 + quarter + down normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -3184,33 +3144,48 @@ F 4 - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + down normal - - - + + + 512 + 1 + quarter + + 3 + 2 + quarter + + + + + + + + F 4 - 6 - + 768 1 - 512th + quarter down normal - @@ -3247,480 +3222,76 @@ - - F 4 - 768 + 256 1 - quarter + eighth + + 3 + 2 + quarter + down normal + + + 3 + eighth + + + 2 + quarter + + - - - 384 - - 1 - eighth - - - - - - - 192 - - 1 - 16th - - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - F - 4 - - 192 - - - 1 - 16th - down - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - down - normal - - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - down - normal - - - - - - - F - 4 - - 384 - - - 1 - eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - 768 - 1 - quarter - - - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - 384 - - 1 - eighth - - - - - - - 192 - - 1 - 16th - - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - F - 4 - - 192 - - - 1 - 16th - down - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - down - normal - - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - down - normal - - - - - - - F - 4 - - 384 - - - 1 - eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - - 1 - eighth - down - normal - - - - - + F 4 - 96 - - + 512 1 - 32nd + quarter + + 3 + 2 + quarter + down normal - - + - - - F - 4 - - 24 - - - + + + 256 1 - 128th - down - normal - - - + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -3728,15 +3299,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -3794,119 +3369,28 @@ F 4 - 192 - - - 1 - 16th - down - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - down - normal - - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - down - normal - - - - - - - F - 4 - - 384 - + 256 1 eighth + + 3 + 2 + quarter + down normal - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + + + 3 + eighth + + + 2 + quarter + + @@ -3914,111 +3398,42 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - + - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -4026,15 +3441,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/16Shuffle1End.musicxml b/test/data/grooves/16Shuffle1End.musicxml index 64e148cd..07a422c3 100644 --- a/test/data/grooves/16Shuffle1End.musicxml +++ b/test/data/grooves/16Shuffle1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1168,15 +1168,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/16Shuffle1Intro.musicxml b/test/data/grooves/16Shuffle1Intro.musicxml index f382c080..29918402 100644 --- a/test/data/grooves/16Shuffle1Intro.musicxml +++ b/test/data/grooves/16Shuffle1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1823,14 +1823,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1883,24 +1884,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -2111,101 +2113,28 @@ F 4 - 192 - - - 1 - 16th - down - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - down - normal - - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - down - normal - - - - - - - F - 4 - - 384 - + 256 1 eighth + + 3 + 2 + quarter + down normal - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - + + + 3 + eighth + + + 2 + quarter + + @@ -2213,33 +2142,19 @@ F 4 - 24 - - + 512 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -2331,119 +2246,28 @@ F 4 - 192 - - - 1 - 16th - down - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - down - normal - - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - + 512 1 - 1024th - down - normal - - - - - - - F - 4 - - 384 - - - 1 - eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th + quarter + + 3 + 2 + quarter + down normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -2451,23 +2275,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/16Shuffle2.musicxml b/test/data/grooves/16Shuffle2.musicxml index 8a17ec5e..fa15df96 100644 --- a/test/data/grooves/16Shuffle2.musicxml +++ b/test/data/grooves/16Shuffle2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16Shuffle2End.musicxml b/test/data/grooves/16Shuffle2End.musicxml index 17894716..adfeaa5a 100644 --- a/test/data/grooves/16Shuffle2End.musicxml +++ b/test/data/grooves/16Shuffle2End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -942,15 +942,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/16Shuffle2Intro.musicxml b/test/data/grooves/16Shuffle2Intro.musicxml index 09452621..6874527e 100644 --- a/test/data/grooves/16Shuffle2Intro.musicxml +++ b/test/data/grooves/16Shuffle2Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16beat1A.musicxml b/test/data/grooves/16beat1A.musicxml index 6a4b8b5e..0ffd355f 100644 --- a/test/data/grooves/16beat1A.musicxml +++ b/test/data/grooves/16beat1A.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16beat1B.musicxml b/test/data/grooves/16beat1B.musicxml index 1b2582da..288aeed2 100644 --- a/test/data/grooves/16beat1B.musicxml +++ b/test/data/grooves/16beat1B.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16beat1E.musicxml b/test/data/grooves/16beat1E.musicxml index 95e8f16e..9859509b 100644 --- a/test/data/grooves/16beat1E.musicxml +++ b/test/data/grooves/16beat1E.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16beat1End.musicxml b/test/data/grooves/16beat1End.musicxml index 9e3a72f0..39421e99 100644 --- a/test/data/grooves/16beat1End.musicxml +++ b/test/data/grooves/16beat1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16beat1FA.musicxml b/test/data/grooves/16beat1FA.musicxml index c5d8b99b..0533136c 100644 --- a/test/data/grooves/16beat1FA.musicxml +++ b/test/data/grooves/16beat1FA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16beat1FB.musicxml b/test/data/grooves/16beat1FB.musicxml index fc6dc7eb..2642de86 100644 --- a/test/data/grooves/16beat1FB.musicxml +++ b/test/data/grooves/16beat1FB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16beat1Intro.musicxml b/test/data/grooves/16beat1Intro.musicxml index 0bba81cd..4afe23ac 100644 --- a/test/data/grooves/16beat1Intro.musicxml +++ b/test/data/grooves/16beat1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16beat2A.musicxml b/test/data/grooves/16beat2A.musicxml index 18680ab3..14be9371 100644 --- a/test/data/grooves/16beat2A.musicxml +++ b/test/data/grooves/16beat2A.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16beat2B.musicxml b/test/data/grooves/16beat2B.musicxml index c4ccaab9..114478c4 100644 --- a/test/data/grooves/16beat2B.musicxml +++ b/test/data/grooves/16beat2B.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16beat2E.musicxml b/test/data/grooves/16beat2E.musicxml index 967a09dc..207c5235 100644 --- a/test/data/grooves/16beat2E.musicxml +++ b/test/data/grooves/16beat2E.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16beat2FA.musicxml b/test/data/grooves/16beat2FA.musicxml index be830ed0..dfce0836 100644 --- a/test/data/grooves/16beat2FA.musicxml +++ b/test/data/grooves/16beat2FA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/16beat2FB.musicxml b/test/data/grooves/16beat2FB.musicxml index 2abc1cec..863fa1a5 100644 --- a/test/data/grooves/16beat2FB.musicxml +++ b/test/data/grooves/16beat2FB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/50sRock.musicxml b/test/data/grooves/50sRock.musicxml index eee8ad8c..e3429bdf 100644 --- a/test/data/grooves/50sRock.musicxml +++ b/test/data/grooves/50sRock.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -273,22 +273,25 @@ - 384 - + 512 2 - eighth - - - - - - - 192 - - 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -296,10 +299,15 @@ E 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up square @@ -310,13 +318,19 @@ E 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up square + diff --git a/test/data/grooves/50sRock1.musicxml b/test/data/grooves/50sRock1.musicxml index dd9b1b67..2cb8134c 100644 --- a/test/data/grooves/50sRock1.musicxml +++ b/test/data/grooves/50sRock1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/50sRock1Plus.musicxml b/test/data/grooves/50sRock1Plus.musicxml index aae7ac93..2889d336 100644 --- a/test/data/grooves/50sRock1Plus.musicxml +++ b/test/data/grooves/50sRock1Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/50sRock1Sus.musicxml b/test/data/grooves/50sRock1Sus.musicxml index d6398c4e..748b5886 100644 --- a/test/data/grooves/50sRock1Sus.musicxml +++ b/test/data/grooves/50sRock1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/50sRock1SusPlus.musicxml b/test/data/grooves/50sRock1SusPlus.musicxml index fc3f64a3..427073b7 100644 --- a/test/data/grooves/50sRock1SusPlus.musicxml +++ b/test/data/grooves/50sRock1SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/50sRockEnd.musicxml b/test/data/grooves/50sRockEnd.musicxml index 170d5af2..f31c875c 100644 --- a/test/data/grooves/50sRockEnd.musicxml +++ b/test/data/grooves/50sRockEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/50sRockIntro.musicxml b/test/data/grooves/50sRockIntro.musicxml index cd3d9788..3167dd2d 100644 --- a/test/data/grooves/50sRockIntro.musicxml +++ b/test/data/grooves/50sRockIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/50sRockIntro1.musicxml b/test/data/grooves/50sRockIntro1.musicxml index 642cecf1..dad3c4b6 100644 --- a/test/data/grooves/50sRockIntro1.musicxml +++ b/test/data/grooves/50sRockIntro1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/50sRockPlus.musicxml b/test/data/grooves/50sRockPlus.musicxml index 80303510..68877867 100644 --- a/test/data/grooves/50sRockPlus.musicxml +++ b/test/data/grooves/50sRockPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -273,22 +273,25 @@ - 384 - + 512 2 - eighth - - - - - - - 192 - - 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -296,10 +299,15 @@ E 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up square @@ -310,13 +318,19 @@ E 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up square + @@ -391,22 +405,25 @@ - 384 - + 512 2 - eighth - - - - - - - 192 - - 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -414,10 +431,15 @@ E 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up square @@ -428,13 +450,19 @@ E 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up square + diff --git a/test/data/grooves/50sRockSus.musicxml b/test/data/grooves/50sRockSus.musicxml index 15bcc376..5cdeba30 100644 --- a/test/data/grooves/50sRockSus.musicxml +++ b/test/data/grooves/50sRockSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -273,22 +273,25 @@ - 384 - + 512 2 - eighth - - - - - - - 192 - - 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -296,10 +299,15 @@ E 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up square @@ -310,13 +318,19 @@ E 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up square + diff --git a/test/data/grooves/50sRockSusPlus.musicxml b/test/data/grooves/50sRockSusPlus.musicxml index 319e67be..7ef5a010 100644 --- a/test/data/grooves/50sRockSusPlus.musicxml +++ b/test/data/grooves/50sRockSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -273,22 +273,25 @@ - 384 - + 512 2 - eighth - - - - - - - 192 - - 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -296,10 +299,15 @@ E 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up square @@ -310,13 +318,19 @@ E 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up square + @@ -391,22 +405,25 @@ - 384 - + 512 2 - eighth - - - - - - - 192 - - 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -414,10 +431,15 @@ E 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up square @@ -428,13 +450,19 @@ E 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up square + diff --git a/test/data/grooves/50s_RockA.musicxml b/test/data/grooves/50s_RockA.musicxml index 4678a08d..9c464aa5 100644 --- a/test/data/grooves/50s_RockA.musicxml +++ b/test/data/grooves/50s_RockA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -444,6 +444,21 @@ + + + + E + 4 + + 192 + + 1 + 16th + up + normal + + + diff --git a/test/data/grooves/50s_RockB.musicxml b/test/data/grooves/50s_RockB.musicxml index f3f98cae..97cdbf4b 100644 --- a/test/data/grooves/50s_RockB.musicxml +++ b/test/data/grooves/50s_RockB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -444,6 +444,21 @@ + + + + E + 4 + + 192 + + 1 + 16th + up + normal + + + diff --git a/test/data/grooves/50s_RockC.musicxml b/test/data/grooves/50s_RockC.musicxml index 4b66135e..5e7d132f 100644 --- a/test/data/grooves/50s_RockC.musicxml +++ b/test/data/grooves/50s_RockC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -483,6 +483,21 @@ + + + + E + 4 + + 192 + + 1 + 16th + up + normal + + + diff --git a/test/data/grooves/50s_RockD.musicxml b/test/data/grooves/50s_RockD.musicxml index 26292c69..2e70c0a6 100644 --- a/test/data/grooves/50s_RockD.musicxml +++ b/test/data/grooves/50s_RockD.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -444,6 +444,21 @@ + + + + E + 4 + + 192 + + 1 + 16th + up + normal + + + diff --git a/test/data/grooves/50s_RockEndingA.musicxml b/test/data/grooves/50s_RockEndingA.musicxml index e4445550..e3f7bd0a 100644 --- a/test/data/grooves/50s_RockEndingA.musicxml +++ b/test/data/grooves/50s_RockEndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -578,22 +578,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -601,10 +604,15 @@ B 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -612,10 +620,16 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/50s_RockEndingB.musicxml b/test/data/grooves/50s_RockEndingB.musicxml index e7131d91..da24fb0a 100644 --- a/test/data/grooves/50s_RockEndingB.musicxml +++ b/test/data/grooves/50s_RockEndingB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -869,22 +869,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -892,10 +895,15 @@ B 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -903,10 +911,16 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/50s_RockEndingC.musicxml b/test/data/grooves/50s_RockEndingC.musicxml index a7c15681..1f5c2c56 100644 --- a/test/data/grooves/50s_RockEndingC.musicxml +++ b/test/data/grooves/50s_RockEndingC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -381,9 +381,8 @@ - - + E 4 @@ -397,15 +396,17 @@ + + E 4 - 192 + 384 1 - 16th + eighth up normal @@ -1379,22 +1380,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1402,10 +1406,15 @@ B 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1413,10 +1422,16 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/50s_RockFillAA.musicxml b/test/data/grooves/50s_RockFillAA.musicxml index 718e5f80..3726f557 100644 --- a/test/data/grooves/50s_RockFillAA.musicxml +++ b/test/data/grooves/50s_RockFillAA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/50s_RockFillBA.musicxml b/test/data/grooves/50s_RockFillBA.musicxml index 69879b8b..d31fd230 100644 --- a/test/data/grooves/50s_RockFillBA.musicxml +++ b/test/data/grooves/50s_RockFillBA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/50s_RockFillBB.musicxml b/test/data/grooves/50s_RockFillBB.musicxml index 78458bbb..305be6a0 100644 --- a/test/data/grooves/50s_RockFillBB.musicxml +++ b/test/data/grooves/50s_RockFillBB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -361,6 +361,21 @@ + + + + E + 4 + + 192 + + 1 + 16th + up + normal + + + diff --git a/test/data/grooves/50s_RockFillCC.musicxml b/test/data/grooves/50s_RockFillCC.musicxml index 4d4be359..2f65473f 100644 --- a/test/data/grooves/50s_RockFillCC.musicxml +++ b/test/data/grooves/50s_RockFillCC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/50s_RockFillDD.musicxml b/test/data/grooves/50s_RockFillDD.musicxml index 366862ff..2804af60 100644 --- a/test/data/grooves/50s_RockFillDD.musicxml +++ b/test/data/grooves/50s_RockFillDD.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/50s_RockIntroA.musicxml b/test/data/grooves/50s_RockIntroA.musicxml index 05353170..4bee9707 100644 --- a/test/data/grooves/50s_RockIntroA.musicxml +++ b/test/data/grooves/50s_RockIntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/50s_RockIntroB.musicxml b/test/data/grooves/50s_RockIntroB.musicxml index 575bfe79..f1b84dc9 100644 --- a/test/data/grooves/50s_RockIntroB.musicxml +++ b/test/data/grooves/50s_RockIntroB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -376,6 +376,21 @@ + + + + E + 4 + + 192 + + 1 + 16th + up + normal + + + diff --git a/test/data/grooves/50s_RockIntroC.musicxml b/test/data/grooves/50s_RockIntroC.musicxml index d9155bc5..7eb1ac48 100644 --- a/test/data/grooves/50s_RockIntroC.musicxml +++ b/test/data/grooves/50s_RockIntroC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/60sPop.musicxml b/test/data/grooves/60sPop.musicxml index 0a5b26d0..2a4896aa 100644 --- a/test/data/grooves/60sPop.musicxml +++ b/test/data/grooves/60sPop.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1120,81 +1120,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - + 256 1 - 1024th - - - - - - - F - 4 - - 288 - - - 1 - 16th - - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal + eighth + + 3 + 2 + eighth + - - + + + 3 + eighth + + + 2 + eighth + + @@ -1202,15 +1146,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -1218,13 +1165,19 @@ F 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + down normal + @@ -1316,81 +1269,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - + 256 1 - 1024th - - - - - - - F - 4 - - 288 - - - 1 - 16th - - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal + eighth + + 3 + 2 + eighth + - - + + + 3 + eighth + + + 2 + eighth + + @@ -1398,15 +1295,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -1414,13 +1314,19 @@ F 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + down normal + @@ -1512,81 +1418,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - + 256 1 - 1024th - - - - - - - F - 4 - - 288 - - - 1 - 16th - - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal + eighth + + 3 + 2 + eighth + - - + + + 3 + eighth + + + 2 + eighth + + @@ -1594,15 +1444,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -1610,13 +1463,19 @@ F 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + down normal + @@ -1708,81 +1567,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - + 256 1 - 1024th - - - - - - - F - 4 - - 288 - - - 1 - 16th - - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal + eighth + + 3 + 2 + eighth + - - + + + 3 + eighth + + + 2 + eighth + + @@ -1790,15 +1593,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -1806,13 +1612,19 @@ F 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + down normal + diff --git a/test/data/grooves/60sPopEnd.musicxml b/test/data/grooves/60sPopEnd.musicxml index 040d0a55..00fad624 100644 --- a/test/data/grooves/60sPopEnd.musicxml +++ b/test/data/grooves/60sPopEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/60sPopIntro.musicxml b/test/data/grooves/60sPopIntro.musicxml index ee416811..73f558e3 100644 --- a/test/data/grooves/60sPopIntro.musicxml +++ b/test/data/grooves/60sPopIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1002,81 +1002,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - + 256 1 - 1024th - - - - - - - F - 4 - - 288 - - - 1 - 16th - - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal + eighth + + 3 + 2 + eighth + - - + + + 3 + eighth + + + 2 + eighth + + @@ -1084,15 +1028,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -1100,13 +1047,19 @@ F 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + down normal + @@ -1198,81 +1151,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - + 256 1 - 1024th - - - - - - - F - 4 - - 288 - - - 1 - 16th - - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal + eighth + + 3 + 2 + eighth + - - + + + 3 + eighth + + + 2 + eighth + + @@ -1280,15 +1177,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -1296,13 +1196,19 @@ F 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + down normal + diff --git a/test/data/grooves/60sRock.musicxml b/test/data/grooves/60sRock.musicxml index 3fe1d528..2a94cbbf 100644 --- a/test/data/grooves/60sRock.musicxml +++ b/test/data/grooves/60sRock.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/60sRock1.musicxml b/test/data/grooves/60sRock1.musicxml index 2767fdd0..93fff145 100644 --- a/test/data/grooves/60sRock1.musicxml +++ b/test/data/grooves/60sRock1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/60sRock1Plus.musicxml b/test/data/grooves/60sRock1Plus.musicxml index 13c1d757..01dc03e6 100644 --- a/test/data/grooves/60sRock1Plus.musicxml +++ b/test/data/grooves/60sRock1Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/60sRock1Sus.musicxml b/test/data/grooves/60sRock1Sus.musicxml index eb720b72..02dd310a 100644 --- a/test/data/grooves/60sRock1Sus.musicxml +++ b/test/data/grooves/60sRock1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/60sRock1SusPlus.musicxml b/test/data/grooves/60sRock1SusPlus.musicxml index e554ef6c..080c57d2 100644 --- a/test/data/grooves/60sRock1SusPlus.musicxml +++ b/test/data/grooves/60sRock1SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/60sRockEnd.musicxml b/test/data/grooves/60sRockEnd.musicxml index 4108a8e3..9f8b65e0 100644 --- a/test/data/grooves/60sRockEnd.musicxml +++ b/test/data/grooves/60sRockEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -428,53 +428,33 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - + 192 3 - 256th + 16th up x - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -482,11 +462,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -498,12 +478,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -516,11 +496,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -582,15 +562,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -598,17 +591,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -616,15 +610,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -641,25 +639,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -675,19 +654,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -798,65 +773,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 128 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -864,17 +802,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -882,15 +821,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -907,25 +850,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -941,19 +865,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -1064,49 +984,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1114,15 +1013,18 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - @@ -1130,33 +1032,19 @@ G 5 - 12 - - + 128 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1173,25 +1061,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1207,19 +1076,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -1330,65 +1195,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1396,17 +1224,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1414,15 +1243,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1439,25 +1272,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - @@ -1465,131 +1279,13 @@ G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 768 3 - 512th + quarter up x - diff --git a/test/data/grooves/60sRockIntro.musicxml b/test/data/grooves/60sRockIntro.musicxml index 2d41cd51..0207a8a9 100644 --- a/test/data/grooves/60sRockIntro.musicxml +++ b/test/data/grooves/60sRockIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -768,14 +768,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -828,24 +829,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x diff --git a/test/data/grooves/60sRockPlus.musicxml b/test/data/grooves/60sRockPlus.musicxml index acc8c45a..27325678 100644 --- a/test/data/grooves/60sRockPlus.musicxml +++ b/test/data/grooves/60sRockPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/60sRockSus.musicxml b/test/data/grooves/60sRockSus.musicxml index fbe1c61e..73a270b9 100644 --- a/test/data/grooves/60sRockSus.musicxml +++ b/test/data/grooves/60sRockSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/60sRockSusPlus.musicxml b/test/data/grooves/60sRockSusPlus.musicxml index 6abf63c7..8b8412ee 100644 --- a/test/data/grooves/60sRockSusPlus.musicxml +++ b/test/data/grooves/60sRockSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/60sSoul.musicxml b/test/data/grooves/60sSoul.musicxml index a486401f..bb8ea584 100644 --- a/test/data/grooves/60sSoul.musicxml +++ b/test/data/grooves/60sSoul.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/60sSoulEnd.musicxml b/test/data/grooves/60sSoulEnd.musicxml index 5aadbfc3..4697cc02 100644 --- a/test/data/grooves/60sSoulEnd.musicxml +++ b/test/data/grooves/60sSoulEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/60sSoulIntro.musicxml b/test/data/grooves/60sSoulIntro.musicxml index 19f764ac..1692ad15 100644 --- a/test/data/grooves/60sSoulIntro.musicxml +++ b/test/data/grooves/60sSoulIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68BLUS.musicxml b/test/data/grooves/68BLUS.musicxml index 25d67c2c..d8b2d680 100644 --- a/test/data/grooves/68BLUS.musicxml +++ b/test/data/grooves/68BLUS.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68Ballad.musicxml b/test/data/grooves/68Ballad.musicxml index 89118cf4..dd6e2dae 100644 --- a/test/data/grooves/68Ballad.musicxml +++ b/test/data/grooves/68Ballad.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -2110,171 +2110,48 @@ + E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - + 192 1 - 128th + 16th up normal - - + E 4 - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - + 192 1 - 128th + 16th up normal - - + E 4 - 3 - + 768 1 - 1024th + quarter up normal - @@ -2366,171 +2243,48 @@ + E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - + 192 1 - 128th + 16th up normal - - + E 4 - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - + 192 1 - 128th + 16th up normal - - + E 4 - 3 - + 768 1 - 1024th + quarter up normal - @@ -2622,171 +2376,48 @@ + E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - + 192 1 - 128th + 16th up normal - - + E 4 - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - + 192 1 - 128th + 16th up normal - - + E 4 - 3 - + 768 1 - 1024th + quarter up normal - diff --git a/test/data/grooves/68BalladEnd.musicxml b/test/data/grooves/68BalladEnd.musicxml index 87e13891..6b1f0e1f 100644 --- a/test/data/grooves/68BalladEnd.musicxml +++ b/test/data/grooves/68BalladEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -930,369 +930,123 @@ + D 4 - 48 - - - 2 - 64th - down - x - - - - - - - D - 4 - - 12 - - - - 2 - 256th - down - x - - - - - - - - D - 4 - - 3 - - - 2 - 1024th - down - x - - - - - - - D - 4 - - 96 - - - 2 - 32nd - down - x - - - - - - - D - 4 - - 24 - - - - 2 - 128th - down - x - - - - - - - - D - 4 - - 6 - - - 2 - 512th - down - x - - - - - - - D - 4 - - 96 - - - 2 - 32nd - down - x - - - - - - - D - 4 - - 24 - - - - 2 - 128th - down - x - - - - - - - - D - 4 - - 3 - - - 2 - 1024th - down - x - - - - - - - D - 4 - - 96 - - - 2 - 32nd - down - x - - - - - - - D - 4 - - 24 - - - 2 - 128th - down - x - - - - - - - D - 4 - - 96 - - - 2 - 32nd - down - x - - - - - - - D - 4 - - 18 - - + 192 2 - 256th - + 16th down x - - + D 4 - 3 - + 192 2 - 1024th + 16th down x - + D 4 - 96 - + 192 2 - 32nd + 16th down x - + D 4 - 18 - + 192 2 - 256th - + 16th down x - + D 4 - 96 - + 192 2 - 32nd + 16th down x - + D 4 - 12 - - + 192 2 - 256th + 16th down x - - + D 4 - 3 - - - 2 - 1024th - down - x - - - - - - - D - 4 - - 384 - - - 2 - eighth - down - x - - - - - - - D - 4 - - 96 - - + 192 2 - 32nd + 16th down x - - + D 4 - 12 - + 768 2 - 256th + quarter down x - @@ -1528,203 +1282,63 @@ + E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - + 192 1 - 128th + 16th up normal - - + E 4 - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - + 192 1 - 128th + 16th up normal - - + E 4 - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - + 192 1 - 32nd + 16th up normal - - + E 4 - 24 - + 768 1 - 128th + quarter up normal - diff --git a/test/data/grooves/68BalladIntro.musicxml b/test/data/grooves/68BalladIntro.musicxml index f5948354..a09a7c5b 100644 --- a/test/data/grooves/68BalladIntro.musicxml +++ b/test/data/grooves/68BalladIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1699,121 +1699,33 @@ + F 4 - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - down - normal - - - - - - - F - 4 - - 384 - - - 1 - eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - + 192 1 - 128th + 16th down normal - - + F 4 - 6 - + 768 1 - 512th + quarter down normal - @@ -1878,399 +1790,170 @@ + D 4 - 48 - + 192 2 - 64th + 16th down x - + D 4 - 12 - - + 192 2 - 256th + 16th down x - - + D 4 - 3 - + 192 2 - 1024th + 16th down x - + D 4 - 96 - + 192 2 - 32nd + 16th down x - + D 4 - 24 - - + 192 2 - 128th + 16th down x - - + D 4 - 6 - + 192 2 - 512th + 16th down x - + D 4 - 96 - + 768 2 - 32nd + quarter down x - - - - D - 4 - - 24 - - - + + + 768 2 - 128th - down - x + quarter - - - - - D - 4 - - 3 - - + + + 768 2 - 1024th - down - x + quarter - - - - D - 4 - - 96 - - + + + 768 2 - 32nd - down - x + quarter - - - - D - 4 - - 24 - - - 2 - 128th - down - x + + + + + + 768 + + + percussion + + + 5 + + + + + 768 + 3 + quarter - - + - D - 4 + G + 5 - 96 - - - 2 - 32nd - down - x - - - - - - - D - 4 - - 18 - - - - 2 - 256th - - down - x - - - - - - - - D - 4 - - 3 - - - 2 - 1024th - down - x - - - - - - - D - 4 - - 96 - - - 2 - 32nd - down - x - - - - - - - D - 4 - - 18 - - - 2 - 256th - - down - x - - - - - - - D - 4 - - 384 - - - 2 - eighth - down - x - - - - - - - D - 4 - - 96 - - - - 2 - 32nd - down - x - - - - - - - - D - 4 - - 12 - - - - 2 - 256th - down - x - - - - - - - - D - 4 - - 3 - - - 2 - 1024th - down - x - - - - - - - 768 - 2 - quarter - - - - - - 768 - 2 - quarter - - - - - - 768 - 2 - quarter - - - - - - - - - 768 - - - percussion - - - 5 - - - - - 768 - 3 - quarter - - - - - - G - 5 - - 768 - - 3 - quarter - up - circle-x + 768 + + 3 + quarter + up + circle-x @@ -2497,360 +2180,7 @@ 768 1 - quarter - - - - - - 768 - 1 - quarter - - - - - - - - - 768 - - - percussion - - - 1 - - - - - 768 - 1 - quarter - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - 768 - 1 - quarter - - - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal + quarter @@ -2863,187 +2193,161 @@ - - - - E - 4 - - 192 - + + + + + 768 + + + percussion + + + 1 + + + + + 768 1 - 16th - up - normal + quarter - - - E - 4 - - 48 - - + + + 768 1 - 64th - up - normal + quarter - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - - + E 4 - 3 - + 192 1 - 1024th + 16th up normal - - + E 4 - 96 - + 192 1 - 32nd + 16th up normal - - + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - - - - E - 4 - - 6 - - + + + 768 1 - 512th - up - normal + quarter - - + + + E 4 - 384 - + 192 1 - eighth + 16th up normal - - + + E 4 - 96 - - + 192 1 - 32nd + 16th up normal - - - + + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - + E 4 - 3 - + 768 1 - 1024th + quarter up normal - @@ -3119,7 +2423,7 @@ - + E @@ -3135,203 +2439,196 @@ + E 4 - 48 - + 192 1 - 64th + 16th up normal - - + + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - - + + E 4 - 3 - + 768 1 - 1024th + quarter up normal - - + + + 768 + 1 + quarter + + + + E 4 - 96 - + 192 1 - 32nd + 16th up normal - - + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - - + E 4 - 6 - + 192 1 - 512th + 16th up normal - - + E 4 - 96 - + 192 1 - 32nd + 16th up normal - - + + + 768 + 1 + quarter + + + + + + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - - + + E 4 - 3 - + 192 1 - 1024th + 16th up normal - - + + E 4 - 384 - + 192 1 - eighth + 16th up normal - - + + E 4 - 96 - - + 192 1 - 32nd + 16th up normal - - + E 4 - 24 - + 768 1 - 128th + quarter up normal - diff --git a/test/data/grooves/68March.musicxml b/test/data/grooves/68March.musicxml index 513b9911..7248644a 100644 --- a/test/data/grooves/68March.musicxml +++ b/test/data/grooves/68March.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68MarchEnd.musicxml b/test/data/grooves/68MarchEnd.musicxml index cd0f25a7..ca080c2d 100644 --- a/test/data/grooves/68MarchEnd.musicxml +++ b/test/data/grooves/68MarchEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68MarchFill.musicxml b/test/data/grooves/68MarchFill.musicxml index f5facf67..ef3cb368 100644 --- a/test/data/grooves/68MarchFill.musicxml +++ b/test/data/grooves/68MarchFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68MarchFill2.musicxml b/test/data/grooves/68MarchFill2.musicxml index 30f09a84..a4e32612 100644 --- a/test/data/grooves/68MarchFill2.musicxml +++ b/test/data/grooves/68MarchFill2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68MarchIntro.musicxml b/test/data/grooves/68MarchIntro.musicxml index 8066eae5..06ee7aba 100644 --- a/test/data/grooves/68MarchIntro.musicxml +++ b/test/data/grooves/68MarchIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68MarchMetronome.musicxml b/test/data/grooves/68MarchMetronome.musicxml index 2938b56b..e1d974da 100644 --- a/test/data/grooves/68MarchMetronome.musicxml +++ b/test/data/grooves/68MarchMetronome.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68MarchPlus.musicxml b/test/data/grooves/68MarchPlus.musicxml index 990d232e..10569a3c 100644 --- a/test/data/grooves/68MarchPlus.musicxml +++ b/test/data/grooves/68MarchPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68MarchSus.musicxml b/test/data/grooves/68MarchSus.musicxml index d948742d..6dd477e3 100644 --- a/test/data/grooves/68MarchSus.musicxml +++ b/test/data/grooves/68MarchSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68MarchSusPlus.musicxml b/test/data/grooves/68MarchSusPlus.musicxml index 945c0b22..d80ef2cb 100644 --- a/test/data/grooves/68MarchSusPlus.musicxml +++ b/test/data/grooves/68MarchSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68Swing.musicxml b/test/data/grooves/68Swing.musicxml index 53ab6eec..bdb6d292 100644 --- a/test/data/grooves/68Swing.musicxml +++ b/test/data/grooves/68Swing.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68Swing1.musicxml b/test/data/grooves/68Swing1.musicxml index 882751b0..2087b8f8 100644 --- a/test/data/grooves/68Swing1.musicxml +++ b/test/data/grooves/68Swing1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68Swing1Plus.musicxml b/test/data/grooves/68Swing1Plus.musicxml index f1a862c1..7a7180ae 100644 --- a/test/data/grooves/68Swing1Plus.musicxml +++ b/test/data/grooves/68Swing1Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68Swing1Sus.musicxml b/test/data/grooves/68Swing1Sus.musicxml index ae175cac..82334b65 100644 --- a/test/data/grooves/68Swing1Sus.musicxml +++ b/test/data/grooves/68Swing1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68Swing1SusPlus.musicxml b/test/data/grooves/68Swing1SusPlus.musicxml index 2edafcd3..b6b0a3f2 100644 --- a/test/data/grooves/68Swing1SusPlus.musicxml +++ b/test/data/grooves/68Swing1SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68Swing2.musicxml b/test/data/grooves/68Swing2.musicxml index 84b6be6d..09b553f1 100644 --- a/test/data/grooves/68Swing2.musicxml +++ b/test/data/grooves/68Swing2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68Swing2Plus.musicxml b/test/data/grooves/68Swing2Plus.musicxml index 1e403db3..f5ce6229 100644 --- a/test/data/grooves/68Swing2Plus.musicxml +++ b/test/data/grooves/68Swing2Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68Swing2Sus.musicxml b/test/data/grooves/68Swing2Sus.musicxml index 82b70d68..78b64b20 100644 --- a/test/data/grooves/68Swing2Sus.musicxml +++ b/test/data/grooves/68Swing2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68Swing2SusPlus.musicxml b/test/data/grooves/68Swing2SusPlus.musicxml index 06a90f10..43003239 100644 --- a/test/data/grooves/68Swing2SusPlus.musicxml +++ b/test/data/grooves/68Swing2SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68SwingEnd.musicxml b/test/data/grooves/68SwingEnd.musicxml index 6555492f..f6df2d50 100644 --- a/test/data/grooves/68SwingEnd.musicxml +++ b/test/data/grooves/68SwingEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68SwingIntro.musicxml b/test/data/grooves/68SwingIntro.musicxml index d09be612..098def2a 100644 --- a/test/data/grooves/68SwingIntro.musicxml +++ b/test/data/grooves/68SwingIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68SwingPlus.musicxml b/test/data/grooves/68SwingPlus.musicxml index 7a4831d2..43fe7875 100644 --- a/test/data/grooves/68SwingPlus.musicxml +++ b/test/data/grooves/68SwingPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68SwingSus.musicxml b/test/data/grooves/68SwingSus.musicxml index feac06a5..bff38033 100644 --- a/test/data/grooves/68SwingSus.musicxml +++ b/test/data/grooves/68SwingSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/68SwingSusPlus.musicxml b/test/data/grooves/68SwingSusPlus.musicxml index c8851b9f..48cfc9a6 100644 --- a/test/data/grooves/68SwingSusPlus.musicxml +++ b/test/data/grooves/68SwingSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/80sPop.musicxml b/test/data/grooves/80sPop.musicxml index e8dd33e9..d2c2d02c 100644 --- a/test/data/grooves/80sPop.musicxml +++ b/test/data/grooves/80sPop.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/80sPopEnd.musicxml b/test/data/grooves/80sPopEnd.musicxml index 65302530..8f100800 100644 --- a/test/data/grooves/80sPopEnd.musicxml +++ b/test/data/grooves/80sPopEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -782,53 +782,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -836,11 +801,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -852,12 +817,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -870,11 +835,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -936,15 +901,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -952,17 +930,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -970,15 +949,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1010,19 +993,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -1133,65 +1112,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1199,17 +1141,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1217,15 +1160,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1242,25 +1189,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1276,19 +1204,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -1399,65 +1323,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1465,17 +1352,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1483,15 +1371,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1508,25 +1400,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1542,19 +1415,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -1665,65 +1534,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1731,17 +1563,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1749,15 +1582,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1774,25 +1611,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - @@ -1841,131 +1659,13 @@ G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 768 3 - 512th + quarter up x - diff --git a/test/data/grooves/80sPopIntro.musicxml b/test/data/grooves/80sPopIntro.musicxml index 1c7edc80..d261351f 100644 --- a/test/data/grooves/80sPopIntro.musicxml +++ b/test/data/grooves/80sPopIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1974,53 +1974,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -2028,11 +1993,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -2044,12 +2009,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -2062,11 +2027,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -2128,15 +2093,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2144,17 +2122,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -2162,15 +2141,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -2202,19 +2185,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -2325,65 +2304,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2391,17 +2333,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -2409,15 +2352,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -2434,25 +2381,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -2468,19 +2396,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -2591,65 +2515,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2657,17 +2544,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -2675,15 +2563,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -2700,25 +2592,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -2734,19 +2607,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -2857,65 +2726,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 128 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2923,17 +2755,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -2941,15 +2774,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -2966,25 +2803,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - diff --git a/test/data/grooves/8Beat.musicxml b/test/data/grooves/8Beat.musicxml index 989a2957..54cb7069 100644 --- a/test/data/grooves/8Beat.musicxml +++ b/test/data/grooves/8Beat.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -433,14 +433,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -451,33 +452,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -485,49 +481,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - @@ -535,33 +510,28 @@ G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -569,24 +539,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -597,33 +568,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -631,31 +582,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -663,51 +611,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -715,24 +656,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -744,25 +686,26 @@ 5 384 - + 3 eighth up - x + circle-x + G 5 - 192 - + 384 + 3 - 16th + eighth up - circle-x + x @@ -771,16 +714,17 @@ G 5 - 192 - + 384 + 3 - 16th + eighth up - x + circle-x + G 5 @@ -794,31 +738,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -829,33 +772,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -863,31 +786,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -895,51 +815,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -947,24 +860,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -975,33 +889,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1009,31 +918,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1041,35 +947,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1077,15 +976,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1093,24 +990,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1130,6 +1028,8 @@ + + G @@ -1145,20 +1045,7 @@ - - G - 5 - - 192 - - 3 - 16th - up - x - - - - + G 5 @@ -1172,31 +1059,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1207,33 +1093,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1241,31 +1122,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1273,35 +1151,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1309,15 +1180,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1325,559 +1194,22 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 + 384 3 eighth @@ -1886,34 +1218,6 @@ - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - G diff --git a/test/data/grooves/8Beat1.musicxml b/test/data/grooves/8Beat1.musicxml index 6aedd53e..204483f6 100644 --- a/test/data/grooves/8Beat1.musicxml +++ b/test/data/grooves/8Beat1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8Beat1End.musicxml b/test/data/grooves/8Beat1End.musicxml index 556f01b8..ba8afde9 100644 --- a/test/data/grooves/8Beat1End.musicxml +++ b/test/data/grooves/8Beat1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8Beat1Intro.musicxml b/test/data/grooves/8Beat1Intro.musicxml index 699e9dbd..a20345ad 100644 --- a/test/data/grooves/8Beat1Intro.musicxml +++ b/test/data/grooves/8Beat1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8Beat1Plus.musicxml b/test/data/grooves/8Beat1Plus.musicxml index b7ce17ef..a1a59a28 100644 --- a/test/data/grooves/8Beat1Plus.musicxml +++ b/test/data/grooves/8Beat1Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -433,14 +433,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -451,33 +452,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -485,49 +481,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - @@ -535,33 +510,28 @@ G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -569,24 +539,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -597,33 +568,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -631,31 +582,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -663,51 +611,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -715,24 +656,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -744,25 +686,26 @@ 5 384 - + 3 eighth up - x + circle-x + G 5 - 192 - + 384 + 3 - 16th + eighth up - circle-x + x @@ -771,16 +714,17 @@ G 5 - 192 - + 384 + 3 - 16th + eighth up - x + circle-x + G 5 @@ -794,31 +738,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -829,33 +772,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -863,31 +786,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -895,51 +815,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -947,24 +860,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -975,33 +889,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1009,31 +918,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1041,35 +947,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1077,15 +976,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1093,24 +990,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1130,6 +1028,8 @@ + + G @@ -1145,20 +1045,7 @@ - - G - 5 - - 192 - - 3 - 16th - up - x - - - - + G 5 @@ -1172,31 +1059,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1207,33 +1093,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1241,31 +1122,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1273,35 +1151,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1309,15 +1180,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1325,559 +1194,22 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 + 384 3 eighth @@ -1886,34 +1218,6 @@ - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - G diff --git a/test/data/grooves/8Beat1Sus.musicxml b/test/data/grooves/8Beat1Sus.musicxml index f38bc216..54c559e3 100644 --- a/test/data/grooves/8Beat1Sus.musicxml +++ b/test/data/grooves/8Beat1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -433,14 +433,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -451,33 +452,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -485,49 +481,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - @@ -535,33 +510,28 @@ G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -569,24 +539,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -597,33 +568,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -631,31 +582,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -663,51 +611,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -715,24 +656,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -744,25 +686,26 @@ 5 384 - + 3 eighth up - x + circle-x + G 5 - 192 - + 384 + 3 - 16th + eighth up - circle-x + x @@ -771,16 +714,17 @@ G 5 - 192 - + 384 + 3 - 16th + eighth up - x + circle-x + G 5 @@ -794,31 +738,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -829,33 +772,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -863,31 +786,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -895,51 +815,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -947,24 +860,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -975,33 +889,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1009,31 +918,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1041,35 +947,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1077,15 +976,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1093,24 +990,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1130,6 +1028,8 @@ + + G @@ -1145,20 +1045,7 @@ - - G - 5 - - 192 - - 3 - 16th - up - x - - - - + G 5 @@ -1172,31 +1059,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1207,33 +1093,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1241,31 +1122,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1273,35 +1151,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1309,15 +1180,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1325,559 +1194,22 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 + 384 3 eighth @@ -1886,34 +1218,6 @@ - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - G diff --git a/test/data/grooves/8Beat1SusPlus.musicxml b/test/data/grooves/8Beat1SusPlus.musicxml index e8dc6abd..b1109d4a 100644 --- a/test/data/grooves/8Beat1SusPlus.musicxml +++ b/test/data/grooves/8Beat1SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -433,14 +433,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -451,33 +452,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -485,49 +481,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - @@ -535,33 +510,28 @@ G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -569,24 +539,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -597,33 +568,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -631,31 +582,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -663,51 +611,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -715,24 +656,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -744,25 +686,26 @@ 5 384 - + 3 eighth up - x + circle-x + G 5 - 192 - + 384 + 3 - 16th + eighth up - circle-x + x @@ -771,16 +714,17 @@ G 5 - 192 - + 384 + 3 - 16th + eighth up - x + circle-x + G 5 @@ -794,31 +738,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -829,33 +772,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -863,31 +786,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -895,51 +815,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -947,24 +860,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -975,33 +889,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1009,31 +918,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1041,35 +947,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1077,15 +976,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1093,24 +990,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1130,6 +1028,8 @@ + + G @@ -1145,20 +1045,7 @@ - - G - 5 - - 192 - - 3 - 16th - up - x - - - - + G 5 @@ -1172,31 +1059,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1207,33 +1093,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1241,31 +1122,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1273,35 +1151,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1309,15 +1180,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1325,559 +1194,22 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 + 384 3 eighth @@ -1886,34 +1218,6 @@ - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - G diff --git a/test/data/grooves/8Beat2.musicxml b/test/data/grooves/8Beat2.musicxml index 68f92af9..e539b7ba 100644 --- a/test/data/grooves/8Beat2.musicxml +++ b/test/data/grooves/8Beat2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8Beat2End.musicxml b/test/data/grooves/8Beat2End.musicxml index 791f59a7..8fefc96b 100644 --- a/test/data/grooves/8Beat2End.musicxml +++ b/test/data/grooves/8Beat2End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8Beat2Intro.musicxml b/test/data/grooves/8Beat2Intro.musicxml index 46460822..9543c6be 100644 --- a/test/data/grooves/8Beat2Intro.musicxml +++ b/test/data/grooves/8Beat2Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8Beat3.musicxml b/test/data/grooves/8Beat3.musicxml index 6193624f..b2be664b 100644 --- a/test/data/grooves/8Beat3.musicxml +++ b/test/data/grooves/8Beat3.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8Beat3End.musicxml b/test/data/grooves/8Beat3End.musicxml index 0f6e4427..2e652692 100644 --- a/test/data/grooves/8Beat3End.musicxml +++ b/test/data/grooves/8Beat3End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -319,14 +319,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -447,15 +448,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/8Beat3Intro.musicxml b/test/data/grooves/8Beat3Intro.musicxml index b4599212..085ee5a3 100644 --- a/test/data/grooves/8Beat3Intro.musicxml +++ b/test/data/grooves/8Beat3Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -537,24 +537,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -770,24 +771,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -870,15 +872,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/8BeatBallad1.musicxml b/test/data/grooves/8BeatBallad1.musicxml index a5ca72e4..da58c9cc 100644 --- a/test/data/grooves/8BeatBallad1.musicxml +++ b/test/data/grooves/8BeatBallad1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8BeatBallad1Intro.musicxml b/test/data/grooves/8BeatBallad1Intro.musicxml index 34ddde93..bebfb855 100644 --- a/test/data/grooves/8BeatBallad1Intro.musicxml +++ b/test/data/grooves/8BeatBallad1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8BeatBallad2.musicxml b/test/data/grooves/8BeatBallad2.musicxml index 89f1acfa..b4c2c7e5 100644 --- a/test/data/grooves/8BeatBallad2.musicxml +++ b/test/data/grooves/8BeatBallad2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8BeatBallad2End.musicxml b/test/data/grooves/8BeatBallad2End.musicxml index dcb5c2fe..57471e16 100644 --- a/test/data/grooves/8BeatBallad2End.musicxml +++ b/test/data/grooves/8BeatBallad2End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8BeatBallad2Intro.musicxml b/test/data/grooves/8BeatBallad2Intro.musicxml index 6deddee4..1a29c8a6 100644 --- a/test/data/grooves/8BeatBallad2Intro.musicxml +++ b/test/data/grooves/8BeatBallad2Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8BeatBallad3.musicxml b/test/data/grooves/8BeatBallad3.musicxml index 0e80a33d..0b37192f 100644 --- a/test/data/grooves/8BeatBallad3.musicxml +++ b/test/data/grooves/8BeatBallad3.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8BeatBallad3End.musicxml b/test/data/grooves/8BeatBallad3End.musicxml index 0776f80b..cce8185e 100644 --- a/test/data/grooves/8BeatBallad3End.musicxml +++ b/test/data/grooves/8BeatBallad3End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8BeatBallad3Intro.musicxml b/test/data/grooves/8BeatBallad3Intro.musicxml index 178f1259..bf1366fa 100644 --- a/test/data/grooves/8BeatBallad3Intro.musicxml +++ b/test/data/grooves/8BeatBallad3Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8BeatDance.musicxml b/test/data/grooves/8BeatDance.musicxml index b4a88761..1515133c 100644 --- a/test/data/grooves/8BeatDance.musicxml +++ b/test/data/grooves/8BeatDance.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8BeatDanceEnd.musicxml b/test/data/grooves/8BeatDanceEnd.musicxml index 9fc9ba1d..a5f613cc 100644 --- a/test/data/grooves/8BeatDanceEnd.musicxml +++ b/test/data/grooves/8BeatDanceEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8BeatDanceIntro.musicxml b/test/data/grooves/8BeatDanceIntro.musicxml index 0644050d..f4e94935 100644 --- a/test/data/grooves/8BeatDanceIntro.musicxml +++ b/test/data/grooves/8BeatDanceIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8BeatEnd.musicxml b/test/data/grooves/8BeatEnd.musicxml index 2cb70161..ba9f1633 100644 --- a/test/data/grooves/8BeatEnd.musicxml +++ b/test/data/grooves/8BeatEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -337,15 +337,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -356,25 +356,25 @@ G 5 - 192 + 768 3 - 16th + quarter up circle-x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -385,25 +385,25 @@ G 5 - 192 + 768 3 - 16th + quarter up circle-x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -414,25 +414,25 @@ G 5 - 192 + 768 3 - 16th + quarter up circle-x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -455,15 +455,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/8BeatFill.musicxml b/test/data/grooves/8BeatFill.musicxml index 00b6df93..3816c475 100644 --- a/test/data/grooves/8BeatFill.musicxml +++ b/test/data/grooves/8BeatFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -335,14 +335,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -367,24 +368,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -409,24 +411,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -451,24 +454,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x diff --git a/test/data/grooves/8BeatIntro.musicxml b/test/data/grooves/8BeatIntro.musicxml index 96b76491..3aff7362 100644 --- a/test/data/grooves/8BeatIntro.musicxml +++ b/test/data/grooves/8BeatIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -405,14 +405,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -423,117 +424,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -541,24 +453,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -569,117 +482,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -687,24 +511,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -729,24 +554,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -783,14 +609,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -801,117 +628,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -919,24 +657,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -947,117 +686,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - + G 5 - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -1065,24 +715,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1107,24 +758,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1161,14 +813,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1179,117 +832,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -1297,24 +861,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1325,117 +890,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -1443,24 +919,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1485,24 +962,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1539,15 +1017,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -1572,25 +1050,25 @@ G 5 - 192 + 768 3 - 16th + quarter up circle-x + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/8BeatPlus.musicxml b/test/data/grooves/8BeatPlus.musicxml index 18540c6e..3c4954b9 100644 --- a/test/data/grooves/8BeatPlus.musicxml +++ b/test/data/grooves/8BeatPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -433,14 +433,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -451,33 +452,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -485,49 +481,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - @@ -535,33 +510,28 @@ G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -569,24 +539,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -597,33 +568,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -631,31 +582,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -663,51 +611,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -715,24 +656,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -744,25 +686,26 @@ 5 384 - + 3 eighth up - x + circle-x + G 5 - 192 - + 384 + 3 - 16th + eighth up - circle-x + x @@ -771,16 +714,17 @@ G 5 - 192 - + 384 + 3 - 16th + eighth up - x + circle-x + G 5 @@ -794,31 +738,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -829,33 +772,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -863,31 +786,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -895,51 +815,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -947,24 +860,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -975,33 +889,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1009,31 +918,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1041,35 +947,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1077,15 +976,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1093,24 +990,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1130,6 +1028,8 @@ + + G @@ -1145,20 +1045,7 @@ - - G - 5 - - 192 - - 3 - 16th - up - x - - - - + G 5 @@ -1172,31 +1059,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1207,33 +1093,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1241,31 +1122,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1273,35 +1151,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1309,15 +1180,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1325,559 +1194,22 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 + 384 3 eighth @@ -1886,34 +1218,6 @@ - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - G diff --git a/test/data/grooves/8BeatPop1.musicxml b/test/data/grooves/8BeatPop1.musicxml index 04dad453..b6b6b3a9 100644 --- a/test/data/grooves/8BeatPop1.musicxml +++ b/test/data/grooves/8BeatPop1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8BeatPop1End.musicxml b/test/data/grooves/8BeatPop1End.musicxml index 2fa80451..b4909a70 100644 --- a/test/data/grooves/8BeatPop1End.musicxml +++ b/test/data/grooves/8BeatPop1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8BeatPop1Intro.musicxml b/test/data/grooves/8BeatPop1Intro.musicxml index e4ef8046..825d7947 100644 --- a/test/data/grooves/8BeatPop1Intro.musicxml +++ b/test/data/grooves/8BeatPop1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8BeatPop2.musicxml b/test/data/grooves/8BeatPop2.musicxml index f67845d4..260f9f27 100644 --- a/test/data/grooves/8BeatPop2.musicxml +++ b/test/data/grooves/8BeatPop2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8BeatPop2End.musicxml b/test/data/grooves/8BeatPop2End.musicxml index 890001d3..9477c2e3 100644 --- a/test/data/grooves/8BeatPop2End.musicxml +++ b/test/data/grooves/8BeatPop2End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8BeatPop2Intro.musicxml b/test/data/grooves/8BeatPop2Intro.musicxml index a93b1c27..86916276 100644 --- a/test/data/grooves/8BeatPop2Intro.musicxml +++ b/test/data/grooves/8BeatPop2Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8BeatPop3.musicxml b/test/data/grooves/8BeatPop3.musicxml index b21d8fd7..981e60ae 100644 --- a/test/data/grooves/8BeatPop3.musicxml +++ b/test/data/grooves/8BeatPop3.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8BeatPop3End.musicxml b/test/data/grooves/8BeatPop3End.musicxml index 5ca572e6..10af9544 100644 --- a/test/data/grooves/8BeatPop3End.musicxml +++ b/test/data/grooves/8BeatPop3End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -313,14 +313,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -331,117 +332,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - + 384 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th + eighth up x - @@ -449,24 +361,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -477,117 +390,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - + 384 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th + eighth up x - @@ -595,24 +419,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -623,117 +448,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - + 384 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th + eighth up x - @@ -741,24 +477,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -769,117 +506,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - + 384 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th + eighth up x - @@ -899,15 +547,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/8BeatPop3Intro.musicxml b/test/data/grooves/8BeatPop3Intro.musicxml index a7b4b73b..7fbab587 100644 --- a/test/data/grooves/8BeatPop3Intro.musicxml +++ b/test/data/grooves/8BeatPop3Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -645,14 +645,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -663,117 +664,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - + G 5 - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -781,24 +693,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -809,117 +722,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - + G 5 - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -927,24 +751,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -955,117 +780,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - + G 5 - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -1073,24 +809,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1101,117 +838,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -1231,15 +879,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/8BeatSus.musicxml b/test/data/grooves/8BeatSus.musicxml index bce44057..e4fe7254 100644 --- a/test/data/grooves/8BeatSus.musicxml +++ b/test/data/grooves/8BeatSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -433,14 +433,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -451,33 +452,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -485,49 +481,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - @@ -535,33 +510,28 @@ G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -569,24 +539,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -597,33 +568,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -631,31 +582,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -663,51 +611,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -715,24 +656,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -744,25 +686,26 @@ 5 384 - + 3 eighth up - x + circle-x + G 5 - 192 - + 384 + 3 - 16th + eighth up - circle-x + x @@ -771,16 +714,17 @@ G 5 - 192 - + 384 + 3 - 16th + eighth up - x + circle-x + G 5 @@ -794,31 +738,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -829,33 +772,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -863,31 +786,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -895,51 +815,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -947,24 +860,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -975,33 +889,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1009,31 +918,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1041,35 +947,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1077,15 +976,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1093,24 +990,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1130,6 +1028,8 @@ + + G @@ -1145,20 +1045,7 @@ - - G - 5 - - 192 - - 3 - 16th - up - x - - - - + G 5 @@ -1172,31 +1059,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1207,33 +1093,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1241,31 +1122,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1273,35 +1151,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1309,15 +1180,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1325,559 +1194,22 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 + 384 3 eighth @@ -1886,34 +1218,6 @@ - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - G diff --git a/test/data/grooves/8BeatSusPlus.musicxml b/test/data/grooves/8BeatSusPlus.musicxml index ebd351e5..6f3afc33 100644 --- a/test/data/grooves/8BeatSusPlus.musicxml +++ b/test/data/grooves/8BeatSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -433,14 +433,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -451,33 +452,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -485,49 +481,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - @@ -535,33 +510,28 @@ G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -569,24 +539,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -597,33 +568,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -631,31 +582,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -663,51 +611,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -715,24 +656,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -744,25 +686,26 @@ 5 384 - + 3 eighth up - x + circle-x + G 5 - 192 - + 384 + 3 - 16th + eighth up - circle-x + x @@ -771,16 +714,17 @@ G 5 - 192 - + 384 + 3 - 16th + eighth up - x + circle-x + G 5 @@ -794,31 +738,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -829,33 +772,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -863,31 +786,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -895,51 +815,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -947,24 +860,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -975,33 +889,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1009,31 +918,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1041,35 +947,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1077,15 +976,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1093,24 +990,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1130,6 +1028,8 @@ + + G @@ -1145,20 +1045,7 @@ - - G - 5 - - 192 - - 3 - 16th - up - x - - - - + G 5 @@ -1172,31 +1059,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1207,33 +1093,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1241,31 +1122,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1273,35 +1151,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1309,15 +1180,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1325,559 +1194,22 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 + 384 3 eighth @@ -1886,34 +1218,6 @@ - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - G diff --git a/test/data/grooves/8BeatWalk.musicxml b/test/data/grooves/8BeatWalk.musicxml index 44300dcc..f46667d4 100644 --- a/test/data/grooves/8BeatWalk.musicxml +++ b/test/data/grooves/8BeatWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -433,14 +433,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -451,33 +452,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -485,49 +481,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - @@ -535,33 +510,28 @@ G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -569,24 +539,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -597,33 +568,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -631,31 +582,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -663,51 +611,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -715,24 +656,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -744,25 +686,26 @@ 5 384 - + 3 eighth up - x + circle-x + G 5 - 192 - + 384 + 3 - 16th + eighth up - circle-x + x @@ -771,16 +714,17 @@ G 5 - 192 - + 384 + 3 - 16th + eighth up - x + circle-x + G 5 @@ -794,31 +738,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -829,33 +772,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -863,31 +786,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -895,51 +815,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -947,24 +860,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -975,33 +889,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1009,31 +918,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1041,35 +947,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1077,15 +976,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1093,24 +990,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1130,6 +1028,8 @@ + + G @@ -1145,20 +1045,7 @@ - - G - 5 - - 192 - - 3 - 16th - up - x - - - - + G 5 @@ -1172,31 +1059,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1207,33 +1093,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1241,31 +1122,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1273,35 +1151,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1309,15 +1180,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1325,559 +1194,22 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 + 384 3 eighth @@ -1886,34 +1218,6 @@ - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - G diff --git a/test/data/grooves/8BeatWalkPlus.musicxml b/test/data/grooves/8BeatWalkPlus.musicxml index 5cf54696..361d9091 100644 --- a/test/data/grooves/8BeatWalkPlus.musicxml +++ b/test/data/grooves/8BeatWalkPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -433,14 +433,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -451,33 +452,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -485,49 +481,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - @@ -535,33 +510,28 @@ G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -569,24 +539,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -597,33 +568,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -631,31 +582,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -663,51 +611,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -715,24 +656,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -744,25 +686,26 @@ 5 384 - + 3 eighth up - x + circle-x + G 5 - 192 - + 384 + 3 - 16th + eighth up - circle-x + x @@ -771,16 +714,17 @@ G 5 - 192 - + 384 + 3 - 16th + eighth up - x + circle-x + G 5 @@ -794,31 +738,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -829,33 +772,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -863,31 +786,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -895,51 +815,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -947,24 +860,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -975,33 +889,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1009,31 +918,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1041,35 +947,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1077,15 +976,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1093,24 +990,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1130,6 +1028,8 @@ + + G @@ -1145,20 +1045,7 @@ - - G - 5 - - 192 - - 3 - 16th - up - x - - - - + G 5 @@ -1172,31 +1059,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1207,33 +1093,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1241,31 +1122,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1273,35 +1151,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1309,15 +1180,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1325,559 +1194,22 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 + 384 3 eighth @@ -1886,34 +1218,6 @@ - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - G diff --git a/test/data/grooves/8BeatWalkSus.musicxml b/test/data/grooves/8BeatWalkSus.musicxml index d986a14a..86bf9261 100644 --- a/test/data/grooves/8BeatWalkSus.musicxml +++ b/test/data/grooves/8BeatWalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -433,14 +433,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -451,33 +452,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -485,49 +481,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - @@ -535,33 +510,28 @@ G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -569,24 +539,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -597,33 +568,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -631,31 +582,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -663,51 +611,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -715,24 +656,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -744,25 +686,26 @@ 5 384 - + 3 eighth up - x + circle-x + G 5 - 192 - + 384 + 3 - 16th + eighth up - circle-x + x @@ -771,16 +714,17 @@ G 5 - 192 - + 384 + 3 - 16th + eighth up - x + circle-x + G 5 @@ -794,31 +738,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -829,33 +772,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -863,31 +786,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -895,51 +815,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -947,24 +860,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -975,33 +889,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1009,31 +918,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1041,35 +947,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1077,15 +976,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1093,24 +990,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1130,6 +1028,8 @@ + + G @@ -1145,20 +1045,7 @@ - - G - 5 - - 192 - - 3 - 16th - up - x - - - - + G 5 @@ -1172,31 +1059,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1207,33 +1093,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1241,31 +1122,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1273,35 +1151,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1309,15 +1180,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1325,559 +1194,22 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 + 384 3 eighth @@ -1886,34 +1218,6 @@ - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - G diff --git a/test/data/grooves/8BeatWalkSusPlus.musicxml b/test/data/grooves/8BeatWalkSusPlus.musicxml index 9bad42f7..2a50e095 100644 --- a/test/data/grooves/8BeatWalkSusPlus.musicxml +++ b/test/data/grooves/8BeatWalkSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -433,14 +433,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -451,33 +452,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -485,49 +481,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - @@ -535,33 +510,28 @@ G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -569,24 +539,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -597,33 +568,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -631,31 +582,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -663,51 +611,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -715,24 +656,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -744,25 +686,26 @@ 5 384 - + 3 eighth up - x + circle-x + G 5 - 192 - + 384 + 3 - 16th + eighth up - circle-x + x @@ -771,16 +714,17 @@ G 5 - 192 - + 384 + 3 - 16th + eighth up - x + circle-x + G 5 @@ -794,31 +738,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -829,33 +772,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -863,31 +786,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -895,51 +815,44 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -947,24 +860,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -975,33 +889,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1009,31 +918,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1041,35 +947,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1077,15 +976,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1093,24 +990,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1130,6 +1028,8 @@ + + G @@ -1145,20 +1045,7 @@ - - G - 5 - - 192 - - 3 - 16th - up - x - - - - + G 5 @@ -1172,31 +1059,30 @@ - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1207,33 +1093,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1241,31 +1122,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1273,35 +1151,28 @@ G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x + circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1309,15 +1180,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1325,559 +1194,22 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 + 384 3 eighth @@ -1886,34 +1218,6 @@ - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - G diff --git a/test/data/grooves/8beat1A.musicxml b/test/data/grooves/8beat1A.musicxml index 66367469..56bb9c5c 100644 --- a/test/data/grooves/8beat1A.musicxml +++ b/test/data/grooves/8beat1A.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8beat1B.musicxml b/test/data/grooves/8beat1B.musicxml index 9cfcea69..12e40b55 100644 --- a/test/data/grooves/8beat1B.musicxml +++ b/test/data/grooves/8beat1B.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8beat1E.musicxml b/test/data/grooves/8beat1E.musicxml index 9203f83e..309c787a 100644 --- a/test/data/grooves/8beat1E.musicxml +++ b/test/data/grooves/8beat1E.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8beat1FA.musicxml b/test/data/grooves/8beat1FA.musicxml index 85d41c0f..504787b9 100644 --- a/test/data/grooves/8beat1FA.musicxml +++ b/test/data/grooves/8beat1FA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8beat1FB.musicxml b/test/data/grooves/8beat1FB.musicxml index 68996e6b..28e3683b 100644 --- a/test/data/grooves/8beat1FB.musicxml +++ b/test/data/grooves/8beat1FB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8beat2A.musicxml b/test/data/grooves/8beat2A.musicxml index cef0b9fc..5204c144 100644 --- a/test/data/grooves/8beat2A.musicxml +++ b/test/data/grooves/8beat2A.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8beat2B.musicxml b/test/data/grooves/8beat2B.musicxml index cb222179..07e7b3f3 100644 --- a/test/data/grooves/8beat2B.musicxml +++ b/test/data/grooves/8beat2B.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8beat2E.musicxml b/test/data/grooves/8beat2E.musicxml index 66c93981..bc4b65c6 100644 --- a/test/data/grooves/8beat2E.musicxml +++ b/test/data/grooves/8beat2E.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8beat2FA.musicxml b/test/data/grooves/8beat2FA.musicxml index 5dd428c8..954b56f0 100644 --- a/test/data/grooves/8beat2FA.musicxml +++ b/test/data/grooves/8beat2FA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8beat2FB.musicxml b/test/data/grooves/8beat2FB.musicxml index c48ab278..7ee025c4 100644 --- a/test/data/grooves/8beat2FB.musicxml +++ b/test/data/grooves/8beat2FB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8beatmotownA.musicxml b/test/data/grooves/8beatmotownA.musicxml index 8e4f1c60..614398d2 100644 --- a/test/data/grooves/8beatmotownA.musicxml +++ b/test/data/grooves/8beatmotownA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8beatmotownB.musicxml b/test/data/grooves/8beatmotownB.musicxml index c01930b1..f5133ad0 100644 --- a/test/data/grooves/8beatmotownB.musicxml +++ b/test/data/grooves/8beatmotownB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -663,24 +663,25 @@ G 5 - 192 + 384 3 - 16th + eighth up x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -791,24 +792,25 @@ G 5 - 192 + 384 3 - 16th + eighth up x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -919,24 +921,25 @@ G 5 - 192 + 384 3 - 16th + eighth up x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1057,87 +1060,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - @@ -1145,15 +1079,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1187,14 +1119,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1275,24 +1208,25 @@ G 5 - 192 + 384 3 - 16th + eighth up x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1403,24 +1337,25 @@ G 5 - 192 + 384 3 - 16th + eighth up x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1531,24 +1466,25 @@ G 5 - 192 + 384 3 - 16th + eighth up x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1669,87 +1605,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - @@ -1757,15 +1624,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - diff --git a/test/data/grooves/8beatmotownC.musicxml b/test/data/grooves/8beatmotownC.musicxml index 3195883f..c7b22cc9 100644 --- a/test/data/grooves/8beatmotownC.musicxml +++ b/test/data/grooves/8beatmotownC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1384,14 +1384,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1526,14 +1527,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1654,14 +1656,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1796,14 +1799,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1924,14 +1928,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -2066,14 +2071,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -2194,14 +2200,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -2336,14 +2343,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x diff --git a/test/data/grooves/8beatmotownD.musicxml b/test/data/grooves/8beatmotownD.musicxml index 3fbde4a1..2cb935eb 100644 --- a/test/data/grooves/8beatmotownD.musicxml +++ b/test/data/grooves/8beatmotownD.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -663,24 +663,25 @@ G 5 - 192 + 384 3 - 16th + eighth up x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -791,24 +792,25 @@ G 5 - 192 + 384 3 - 16th + eighth up x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -919,24 +921,25 @@ G 5 - 192 + 384 3 - 16th + eighth up x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1057,87 +1060,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - @@ -1145,15 +1079,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1187,14 +1119,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1275,24 +1208,25 @@ G 5 - 192 + 384 3 - 16th + eighth up x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1403,24 +1337,25 @@ G 5 - 192 + 384 3 - 16th + eighth up x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1531,24 +1466,25 @@ G 5 - 192 + 384 3 - 16th + eighth up x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1669,87 +1605,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - @@ -1757,15 +1624,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - diff --git a/test/data/grooves/8beatmotownEndingA.musicxml b/test/data/grooves/8beatmotownEndingA.musicxml index cfa79401..24f0f908 100644 --- a/test/data/grooves/8beatmotownEndingA.musicxml +++ b/test/data/grooves/8beatmotownEndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -536,14 +536,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -578,14 +579,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -720,14 +722,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -861,14 +864,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -903,14 +907,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1288,22 +1293,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -1311,10 +1319,15 @@ D 5 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1325,13 +1338,19 @@ B 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + @@ -1381,10 +1400,10 @@ E 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -1393,15 +1412,20 @@ up normal - - 768 + 512 3 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/8beatmotownEndingB.musicxml b/test/data/grooves/8beatmotownEndingB.musicxml index 6be230c4..d102b58b 100644 --- a/test/data/grooves/8beatmotownEndingB.musicxml +++ b/test/data/grooves/8beatmotownEndingB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -536,14 +536,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -578,14 +579,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -720,14 +722,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -861,14 +864,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -903,14 +907,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1288,22 +1293,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -1311,10 +1319,15 @@ D 5 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1325,13 +1338,19 @@ B 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + @@ -1381,10 +1400,10 @@ E 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -1393,15 +1412,20 @@ up normal - - 768 + 512 3 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/8beatmotownEndingC.musicxml b/test/data/grooves/8beatmotownEndingC.musicxml index 2dedf84f..11acca91 100644 --- a/test/data/grooves/8beatmotownEndingC.musicxml +++ b/test/data/grooves/8beatmotownEndingC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -584,117 +584,28 @@ A 5 - 96 - - - 1 - 32nd - up - x - - - - - - - A - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - A - 5 - - 6 - - - 1 - 512th - up - x - - - - - - - A - 5 - - 192 - - - 1 - 16th - up - x - - - - - - - A - 5 - - 48 - - - - 1 - 64th - up - x - - - - - - - - A - 5 - - 12 - - + 384 1 - 256th + eighth up x - - + A 5 - 3 - + 384 1 - 1024th + eighth up x - @@ -710,117 +621,28 @@ F 5 - 96 - - - 1 - 32nd - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - + 384 1 - 512th - up - x - - - - - - - A - 5 - - 192 - - - 1 - 16th - up - x - - - - - - - A - 5 - - 48 - - - - 1 - 64th - up - x - - - - - - - - A - 5 - - 12 - - - - 1 - 256th + eighth up x - - + A 5 - 3 - + 384 1 - 1024th + eighth up x - diff --git a/test/data/grooves/8beatmotownFillA.musicxml b/test/data/grooves/8beatmotownFillA.musicxml index 1595b72f..0e8af8eb 100644 --- a/test/data/grooves/8beatmotownFillA.musicxml +++ b/test/data/grooves/8beatmotownFillA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -290,83 +290,28 @@ E 4 - 96 - + 128 2 - 32nd - up - square - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - - - 2 - 512th - up - square - - - - - - - E - 4 - - 48 - - - 2 - 64th - up - square - - - - - - - E - 4 - - 12 - - - - 2 - 256th + 16th + + 3 + 2 + 16th + up square - - + + + 3 + 16th + + + 2 + 16th + + @@ -374,15 +319,18 @@ E 4 - 3 - + 128 2 - 1024th + 16th + + 3 + 2 + 16th + up square - @@ -390,13 +338,19 @@ E 4 - 192 + 128 2 16th + + 3 + 2 + 16th + up square + @@ -701,14 +655,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x diff --git a/test/data/grooves/8beatmotownFillB.musicxml b/test/data/grooves/8beatmotownFillB.musicxml index f33ed995..d7e6febd 100644 --- a/test/data/grooves/8beatmotownFillB.musicxml +++ b/test/data/grooves/8beatmotownFillB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8beatmotownFillBA.musicxml b/test/data/grooves/8beatmotownFillBA.musicxml index 2f09a3cc..65d95c28 100644 --- a/test/data/grooves/8beatmotownFillBA.musicxml +++ b/test/data/grooves/8beatmotownFillBA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8beatmotownFillC.musicxml b/test/data/grooves/8beatmotownFillC.musicxml index 68d2d4ca..49d7184e 100644 --- a/test/data/grooves/8beatmotownFillC.musicxml +++ b/test/data/grooves/8beatmotownFillC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -290,83 +290,28 @@ E 4 - 96 - + 128 2 - 32nd - up - square - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - - - 2 - 512th - up - square - - - - - - - E - 4 - - 48 - - - 2 - 64th - up - square - - - - - - - E - 4 - - 12 - - - - 2 - 256th + 16th + + 3 + 2 + 16th + up square - - + + + 3 + 16th + + + 2 + 16th + + @@ -374,15 +319,18 @@ E 4 - 3 - + 128 2 - 1024th + 16th + + 3 + 2 + 16th + up square - @@ -390,13 +338,19 @@ E 4 - 192 + 128 2 16th + + 3 + 2 + 16th + up square + @@ -701,14 +655,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x diff --git a/test/data/grooves/8beatmotownFillD.musicxml b/test/data/grooves/8beatmotownFillD.musicxml index 6639edd4..bf6c9c00 100644 --- a/test/data/grooves/8beatmotownFillD.musicxml +++ b/test/data/grooves/8beatmotownFillD.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/8beatmotownIntroA.musicxml b/test/data/grooves/8beatmotownIntroA.musicxml index 2f10dee5..6f43b05e 100644 --- a/test/data/grooves/8beatmotownIntroA.musicxml +++ b/test/data/grooves/8beatmotownIntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -352,83 +352,28 @@ E 4 - 96 - + 128 2 - 32nd - up - square - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - - - 2 - 512th - up - square - - - - - - - E - 4 - - 48 - - - 2 - 64th - up - square - - - - - - - E - 4 - - 12 - - - - 2 - 256th + 16th + + 3 + 2 + 16th + up square - - + + + 3 + 16th + + + 2 + 16th + + @@ -436,15 +381,18 @@ E 4 - 3 - + 128 2 - 1024th + 16th + + 3 + 2 + 16th + up square - @@ -452,13 +400,19 @@ E 4 - 192 + 128 2 16th + + 3 + 2 + 16th + up square + diff --git a/test/data/grooves/8beatmotownIntroB.musicxml b/test/data/grooves/8beatmotownIntroB.musicxml index a13c04c4..08aab04b 100644 --- a/test/data/grooves/8beatmotownIntroB.musicxml +++ b/test/data/grooves/8beatmotownIntroB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -352,83 +352,28 @@ E 4 - 96 - + 128 2 - 32nd - up - square - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - - - 2 - 512th - up - square - - - - - - - E - 4 - - 48 - - - 2 - 64th - up - square - - - - - - - E - 4 - - 12 - - - - 2 - 256th + 16th + + 3 + 2 + 16th + up square - - + + + 3 + 16th + + + 2 + 16th + + @@ -436,15 +381,18 @@ E 4 - 3 - + 128 2 - 1024th + 16th + + 3 + 2 + 16th + up square - @@ -452,13 +400,19 @@ E 4 - 192 + 128 2 16th + + 3 + 2 + 16th + up square + diff --git a/test/data/grooves/8beatmotownIntroC.musicxml b/test/data/grooves/8beatmotownIntroC.musicxml index c8366e24..6c62a111 100644 --- a/test/data/grooves/8beatmotownIntroC.musicxml +++ b/test/data/grooves/8beatmotownIntroC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -272,83 +272,28 @@ E 4 - 96 - + 128 2 - 32nd - up - square - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - - - 2 - 512th - up - square - - - - - - - E - 4 - - 48 - - - 2 - 64th - up - square - - - - - - - E - 4 - - 12 - - - - 2 - 256th + 16th + + 3 + 2 + 16th + up square - - + + + 3 + 16th + + + 2 + 16th + + @@ -356,15 +301,18 @@ E 4 - 3 - + 128 2 - 1024th + 16th + + 3 + 2 + 16th + up square - @@ -372,13 +320,19 @@ E 4 - 192 + 128 2 16th + + 3 + 2 + 16th + up square + diff --git a/test/data/grooves/AFRO01.musicxml b/test/data/grooves/AFRO01.musicxml index 38c34709..f78b8111 100644 --- a/test/data/grooves/AFRO01.musicxml +++ b/test/data/grooves/AFRO01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -295,10 +295,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -307,15 +307,20 @@ up x - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -549,15 +554,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/AFRO02.musicxml b/test/data/grooves/AFRO02.musicxml index d7de7679..d5fd6a9a 100644 --- a/test/data/grooves/AFRO02.musicxml +++ b/test/data/grooves/AFRO02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -167,98 +167,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - A - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - A - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - A - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -266,15 +193,19 @@ A 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -293,98 +224,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - A - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - A - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - A - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -392,15 +250,19 @@ A 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -741,98 +603,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - A - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - A - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - A - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -840,15 +629,19 @@ A 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -865,100 +658,27 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - A - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - A - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - A - 4 - - 24 - - - + + + 256 1 - 128th - up - normal + eighth + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -966,15 +686,19 @@ A 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -1330,95 +1054,97 @@ - 384 - - 1 - eighth - - - - - - - 96 - - - 1 - 32nd - - - - - - - - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + - - - 6 - + + + F + 4 + + 256 + 1 - 512th + eighth + + 3 + 2 + quarter + + up + normal - + - + + F 4 - 48 + 192 - + 1 - 64th + 16th up - normal + x - + F 4 - 12 + 48 - + 1 - 256th + 64th up - normal + x - + F 4 - 3 + 12 + - + 1 - 1024th + 256th up - normal + x + @@ -1427,13 +1153,15 @@ F 4 - 192 + 3 + 1 - 16th + 1024th up x + @@ -1472,10 +1200,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1484,15 +1212,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1546,95 +1279,97 @@ - 384 - - 1 - eighth - - - - - - - 96 - - - 1 - 32nd - - - - - - - - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + - - - 6 - + + + F + 4 + + 256 + 1 - 512th + eighth + + 3 + 2 + quarter + + up + normal - + - + + F 4 - 48 + 192 - + 1 - 64th + 16th up - normal + x - + F 4 - 12 + 48 - + 1 - 256th + 64th up - normal + x - + F 4 - 3 + 12 + - + 1 - 1024th + 256th up - normal + x + @@ -1643,13 +1378,15 @@ F 4 - 192 + 3 + 1 - 16th + 1024th up x + @@ -1688,10 +1425,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1700,15 +1437,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/AFRO03.musicxml b/test/data/grooves/AFRO03.musicxml index 33dfad2b..c29c3748 100644 --- a/test/data/grooves/AFRO03.musicxml +++ b/test/data/grooves/AFRO03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/AFRO04.musicxml b/test/data/grooves/AFRO04.musicxml index 34e41456..9bf1f558 100644 --- a/test/data/grooves/AFRO04.musicxml +++ b/test/data/grooves/AFRO04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -185,22 +185,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -208,10 +211,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -219,10 +227,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -342,22 +356,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -365,10 +382,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -376,10 +398,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/AFRO05.musicxml b/test/data/grooves/AFRO05.musicxml index 04107f54..05a13a4c 100644 --- a/test/data/grooves/AFRO05.musicxml +++ b/test/data/grooves/AFRO05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -580,10 +580,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -592,15 +592,20 @@ up x - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/AFRO06.musicxml b/test/data/grooves/AFRO06.musicxml index 049674cc..88f2addc 100644 --- a/test/data/grooves/AFRO06.musicxml +++ b/test/data/grooves/AFRO06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -356,80 +356,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 96 - - + 307.2 1 - 32nd - up - x - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - x - - - + quarter + + 5 + 2 + quarter + + + + + 5 + quarter + + + 2 + quarter + + @@ -437,99 +382,31 @@ E 4 - 6 - + 307.2 1 - 512th + quarter + + 5 + 2 + quarter + up x - - - - - - 96 - - 1 - 32nd - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - + 307.2 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x + quarter + + 5 + 2 + quarter + - - @@ -537,101 +414,55 @@ E 4 - 3 - + 307.2 1 - 1024th + quarter + + 5 + 2 + quarter + up x - - 768 + 307.2 1 quarter + + 5 + 2 + quarter + + - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 96 - - + 307.2 1 - 32nd - up - x - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - x - - - + quarter + + 5 + 2 + quarter + + + + + 5 + quarter + + + 2 + quarter + + @@ -639,99 +470,31 @@ E 4 - 6 - + 307.2 1 - 512th + quarter + + 5 + 2 + quarter + up x - - - - - - 96 - - 1 - 32nd - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - + 307.2 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x + quarter + + 5 + 2 + quarter + - - @@ -739,103 +502,57 @@ E 4 - 3 - + 307.2 1 - 1024th + quarter + + 5 + 2 + quarter + up x - - 768 + 307.2 1 quarter + + 5 + 2 + quarter + + - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 96 - - + 307.2 1 - 32nd - up - x - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - x - - - + quarter + + 5 + 2 + quarter + + + + + 5 + quarter + + + 2 + quarter + + @@ -843,99 +560,31 @@ E 4 - 6 - + 307.2 1 - 512th + quarter + + 5 + 2 + quarter + up x - - - - - - 96 - - 1 - 32nd - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - + 307.2 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x + quarter + + 5 + 2 + quarter + - - @@ -943,101 +592,55 @@ E 4 - 3 - + 307.2 1 - 1024th + quarter + + 5 + 2 + quarter + up x - - 768 + 307.2 1 quarter + + 5 + 2 + quarter + + - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 96 - - + 307.2 1 - 32nd - up - x - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - x - - - + quarter + + 5 + 2 + quarter + + + + + 5 + quarter + + + 2 + quarter + + @@ -1045,99 +648,31 @@ E 4 - 6 - + 307.2 1 - 512th + quarter + + 5 + 2 + quarter + up x - - - - - - 96 - - 1 - 32nd - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - + 307.2 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x + quarter + + 5 + 2 + quarter + - - @@ -1145,23 +680,32 @@ E 4 - 3 - + 307.2 1 - 1024th + quarter + + 5 + 2 + quarter + up x - - 768 + 307.2 1 quarter + + 5 + 2 + quarter + + diff --git a/test/data/grooves/AFRO07.musicxml b/test/data/grooves/AFRO07.musicxml index bc929e0e..ce2aa579 100644 --- a/test/data/grooves/AFRO07.musicxml +++ b/test/data/grooves/AFRO07.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -310,19 +310,28 @@ + A 4 - 384 + 192 1 - eighth + 16th up normal + + + 384 + 1 + eighth + + + A @@ -603,10 +612,10 @@ F 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -615,15 +624,20 @@ up normal - - 768 + 512 3 quarter + + 3 + 2 + quarter + + @@ -687,19 +701,28 @@ + A 4 - 384 + 192 1 - eighth + 16th up normal + + + 384 + 1 + eighth + + + A @@ -980,10 +1003,10 @@ F 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -992,15 +1015,20 @@ up normal - - 768 + 512 3 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/AFRO08.musicxml b/test/data/grooves/AFRO08.musicxml index 9a47738f..83c18999 100644 --- a/test/data/grooves/AFRO08.musicxml +++ b/test/data/grooves/AFRO08.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/AMB01.musicxml b/test/data/grooves/AMB01.musicxml index 04f48960..dd4d3ea5 100644 --- a/test/data/grooves/AMB01.musicxml +++ b/test/data/grooves/AMB01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -258,24 +258,27 @@ F 4 - 192 + 576 1 - 16th + eighth + up normal + F 4 - 384 + 576 1 eighth + up x @@ -296,101 +299,26 @@ - - F - 4 - - 384 - - 1 - eighth - up - x - - - - - - F - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - normal - - - - - + F 4 192 - 1 16th up x - - - - F - 4 - - 48 - - - + + + 384 1 - 64th - up - x + eighth - - @@ -398,33 +326,28 @@ F 4 - 12 - - - + 384 + 1 - 256th + eighth up - x + normal - - + F 4 - 3 - + 384 1 - 1024th + eighth up x - diff --git a/test/data/grooves/AMB02.musicxml b/test/data/grooves/AMB02.musicxml index f2003f56..2d8bfb02 100644 --- a/test/data/grooves/AMB02.musicxml +++ b/test/data/grooves/AMB02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -193,22 +193,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -216,10 +219,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -227,10 +235,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/AMB03.musicxml b/test/data/grooves/AMB03.musicxml index 8ae726f3..891f1262 100644 --- a/test/data/grooves/AMB03.musicxml +++ b/test/data/grooves/AMB03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -393,15 +393,28 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -409,17 +422,18 @@ F 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + up normal - - @@ -427,15 +441,19 @@ F 4 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + up normal - + @@ -443,15 +461,13 @@ F 4 - 48 - + 192 1 - 64th + 16th up normal - @@ -459,17 +475,15 @@ F 4 - 12 + 192 - 1 - 256th + 16th up normal - @@ -477,14 +491,16 @@ F 4 - 3 + 48 + 1 - 1024th + 64th up normal + @@ -493,13 +509,17 @@ F 4 - 192 + 12 + + 1 - 16th + 256th up normal + + @@ -507,13 +527,15 @@ F 4 - 192 + 3 + 1 - 16th + 1024th up normal + @@ -521,21 +543,16 @@ F 4 - 189 + 192 1 - 32nd - - - - - + 16th up normal - + F 4 @@ -551,7 +568,7 @@ - + F 4 @@ -569,7 +586,7 @@ - + F 4 @@ -640,49 +657,15 @@ F 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - F - 4 - - 24 + 192 - 1 - 128th + 16th up normal - - - - - - F - 4 - - 6 - - - 1 - 512th - up - normal - - @@ -692,6 +675,7 @@ 48 + 1 64th @@ -699,6 +683,7 @@ normal + diff --git a/test/data/grooves/AMB04.musicxml b/test/data/grooves/AMB04.musicxml index 2a1ba362..e99e440f 100644 --- a/test/data/grooves/AMB04.musicxml +++ b/test/data/grooves/AMB04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Afro-Cuban.musicxml b/test/data/grooves/Afro-Cuban.musicxml index c78e872a..2dbd1b48 100644 --- a/test/data/grooves/Afro-Cuban.musicxml +++ b/test/data/grooves/Afro-Cuban.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Afro-CubanEnd.musicxml b/test/data/grooves/Afro-CubanEnd.musicxml index aeaa845f..1f60642e 100644 --- a/test/data/grooves/Afro-CubanEnd.musicxml +++ b/test/data/grooves/Afro-CubanEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Afro-CubanFill.musicxml b/test/data/grooves/Afro-CubanFill.musicxml index a9f1ed41..c744b65c 100644 --- a/test/data/grooves/Afro-CubanFill.musicxml +++ b/test/data/grooves/Afro-CubanFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Afro-CubanIntro.musicxml b/test/data/grooves/Afro-CubanIntro.musicxml index 71a43620..12e38ff3 100644 --- a/test/data/grooves/Afro-CubanIntro.musicxml +++ b/test/data/grooves/Afro-CubanIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Afro-CubanPlus.musicxml b/test/data/grooves/Afro-CubanPlus.musicxml index c4243d06..0c530382 100644 --- a/test/data/grooves/Afro-CubanPlus.musicxml +++ b/test/data/grooves/Afro-CubanPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Afro-CubanSus.musicxml b/test/data/grooves/Afro-CubanSus.musicxml index 315246fd..22eac2cd 100644 --- a/test/data/grooves/Afro-CubanSus.musicxml +++ b/test/data/grooves/Afro-CubanSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Afro-CubanSusPlus.musicxml b/test/data/grooves/Afro-CubanSusPlus.musicxml index 837effae..f9a41c97 100644 --- a/test/data/grooves/Afro-CubanSusPlus.musicxml +++ b/test/data/grooves/Afro-CubanSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Ambient1.musicxml b/test/data/grooves/Ambient1.musicxml index 892f8e5a..dccf0d1b 100644 --- a/test/data/grooves/Ambient1.musicxml +++ b/test/data/grooves/Ambient1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -217,6 +217,21 @@ + + + + E + 4 + + 192 + + 1 + 16th + up + normal + + + E @@ -272,11 +287,11 @@ E 4 - 96 + 384 1 - 32nd + eighth up normal @@ -288,12 +303,12 @@ E 4 - 24 + 96 1 - 128th + 32nd up normal @@ -306,14 +321,16 @@ E 4 - 6 + 24 + 1 - 512th + 128th up normal + @@ -322,13 +339,15 @@ E 4 - 384 + 6 + 1 - eighth + 512th up normal + @@ -396,98 +415,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -495,15 +441,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -732,37 +682,33 @@ + E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - + 256 1 - 256th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -770,66 +716,86 @@ E 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + eighth + up normal - - + E 4 - 288 - + 256 1 - 16th - + eighth + + 3 + 2 + eighth + up normal - + - + E 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + - + E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - @@ -837,146 +803,19 @@ E 4 - 192 + 256 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - 1 - 16th + eighth + + 3 + 2 + eighth + up normal + @@ -1050,6 +889,21 @@ + + + + E + 4 + + 192 + + 1 + 16th + up + normal + + + E @@ -1105,11 +959,11 @@ E 4 - 96 + 384 1 - 32nd + eighth up normal @@ -1121,12 +975,12 @@ E 4 - 24 + 96 1 - 128th + 32nd up normal @@ -1139,14 +993,16 @@ E 4 - 6 + 24 + 1 - 512th + 128th up normal + @@ -1155,13 +1011,15 @@ E 4 - 384 + 6 + 1 - eighth + 512th up normal + @@ -1229,98 +1087,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1328,15 +1113,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -1565,88 +1354,33 @@ + E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - E - 4 - - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -1654,97 +1388,18 @@ E 4 - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + eighth + up normal - @@ -1752,16 +1407,19 @@ E 4 - 288 - + 256 1 - 16th - + eighth + + 3 + 2 + eighth + up normal - + @@ -1769,17 +1427,28 @@ E 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -1787,15 +1456,18 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - @@ -1803,13 +1475,19 @@ E 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up normal + diff --git a/test/data/grooves/Ambient1End.musicxml b/test/data/grooves/Ambient1End.musicxml index 7cffb862..d61ca348 100644 --- a/test/data/grooves/Ambient1End.musicxml +++ b/test/data/grooves/Ambient1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -600,53 +600,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -654,11 +619,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -670,12 +635,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -688,11 +653,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -754,15 +719,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -770,17 +748,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -788,15 +767,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -828,19 +811,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -951,65 +930,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1017,17 +959,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1035,15 +978,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1060,25 +1007,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1094,19 +1022,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -1217,65 +1141,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1283,17 +1170,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1301,15 +1189,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1326,25 +1218,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1360,19 +1233,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -1483,65 +1352,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1549,17 +1381,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1567,15 +1400,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1592,25 +1429,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - @@ -1618,131 +1436,13 @@ G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 768 3 - 512th + quarter up x - diff --git a/test/data/grooves/Ambient1Intro.musicxml b/test/data/grooves/Ambient1Intro.musicxml index efca5459..038d3450 100644 --- a/test/data/grooves/Ambient1Intro.musicxml +++ b/test/data/grooves/Ambient1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -217,6 +217,21 @@ + + + + E + 4 + + 192 + + 1 + 16th + up + normal + + + E @@ -272,11 +287,11 @@ E 4 - 96 + 384 1 - 32nd + eighth up normal @@ -288,12 +303,12 @@ E 4 - 24 + 96 1 - 128th + 32nd up normal @@ -306,14 +321,16 @@ E 4 - 6 + 24 + 1 - 512th + 128th up normal + @@ -322,13 +339,15 @@ E 4 - 384 + 6 + 1 - eighth + 512th up normal + @@ -396,98 +415,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -495,15 +441,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -736,88 +686,33 @@ + E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - E - 4 - - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -825,97 +720,18 @@ E 4 - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + eighth + up normal - @@ -923,16 +739,19 @@ E 4 - 288 - + 256 1 - 16th - + eighth + + 3 + 2 + eighth + up normal - + @@ -940,17 +759,28 @@ E 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -958,15 +788,18 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - @@ -974,13 +807,19 @@ E 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up normal + @@ -1054,6 +893,21 @@ + + + + E + 4 + + 192 + + 1 + 16th + up + normal + + + E @@ -1109,11 +963,11 @@ E 4 - 96 + 384 1 - 32nd + eighth up normal @@ -1125,12 +979,12 @@ E 4 - 24 + 96 1 - 128th + 32nd up normal @@ -1143,14 +997,16 @@ E 4 - 6 + 24 + 1 - 512th + 128th up normal + @@ -1159,13 +1015,15 @@ E 4 - 384 + 6 + 1 - eighth + 512th up normal + @@ -1233,98 +1091,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - + 256 1 - 128th - up - normal + eighth + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1332,15 +1117,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -2558,53 +2347,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -2612,11 +2366,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -2628,12 +2382,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -2646,11 +2400,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -2712,63 +2466,28 @@ G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 + 128 3 16th + + 3 + 2 + 16th + up x + + + 3 + 16th + + + 2 + 16th + + @@ -2776,10 +2495,15 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x @@ -2790,118 +2514,19 @@ G 5 - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - + @@ -2909,15 +2534,13 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -2925,33 +2548,28 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - + G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -3009,32 +2627,15 @@ G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 189 + 96 + 3 32nd - - - - - up x + @@ -3042,13 +2643,17 @@ G 5 - 192 + 24 + + 3 - 16th + 128th up x + + @@ -3056,18 +2661,15 @@ G 5 - 189 + 6 + 3 - 32nd - - - - - + 512th up x + @@ -3075,15 +2677,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -3091,17 +2706,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -3109,15 +2725,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -3125,15 +2745,13 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -3141,33 +2759,28 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - + G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -3175,11 +2788,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -3191,12 +2804,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -3209,11 +2822,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -3225,11 +2838,11 @@ G 5 - 48 + 96 3 - 64th + 32nd up x @@ -3241,12 +2854,12 @@ G 5 - 12 + 24 3 - 256th + 128th up x @@ -3259,11 +2872,11 @@ G 5 - 3 + 6 3 - 1024th + 512th up x @@ -3275,13 +2888,28 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + + + 3 + 16th + + + 2 + 16th + + @@ -3289,29 +2917,15 @@ G 5 - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 192 + 128 3 16th + + 3 + 2 + 16th + up x @@ -3322,18 +2936,19 @@ G 5 - 189 + 128 3 - 32nd - - - - - + 16th + + 3 + 2 + 16th + up x + @@ -3341,15 +2956,13 @@ G 5 - 48 - + 192 3 - 64th + 16th up x - @@ -3357,33 +2970,28 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -3391,11 +2999,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -3407,12 +3015,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -3425,11 +3033,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -3491,15 +3099,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -3507,17 +3128,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -3525,15 +3147,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -3550,25 +3176,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - diff --git a/test/data/grooves/Ambient2.musicxml b/test/data/grooves/Ambient2.musicxml index 41004515..37a4cd1c 100644 --- a/test/data/grooves/Ambient2.musicxml +++ b/test/data/grooves/Ambient2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Ambient2End.musicxml b/test/data/grooves/Ambient2End.musicxml index 4f836875..0b651aad 100644 --- a/test/data/grooves/Ambient2End.musicxml +++ b/test/data/grooves/Ambient2End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Ambient2Intro.musicxml b/test/data/grooves/Ambient2Intro.musicxml index c83803dc..e8ff33d8 100644 --- a/test/data/grooves/Ambient2Intro.musicxml +++ b/test/data/grooves/Ambient2Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Arrastape-Miranda.musicxml b/test/data/grooves/Arrastape-Miranda.musicxml index 5bbc1759..59656c53 100644 --- a/test/data/grooves/Arrastape-Miranda.musicxml +++ b/test/data/grooves/Arrastape-Miranda.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Ayyub.musicxml b/test/data/grooves/Ayyub.musicxml index 97746f75..f0cbe4da 100644 --- a/test/data/grooves/Ayyub.musicxml +++ b/test/data/grooves/Ayyub.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BALD01.musicxml b/test/data/grooves/BALD01.musicxml index 5a17a22f..d93804b1 100644 --- a/test/data/grooves/BALD01.musicxml +++ b/test/data/grooves/BALD01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BALD02.musicxml b/test/data/grooves/BALD02.musicxml index 8ca0345a..23cbb902 100644 --- a/test/data/grooves/BALD02.musicxml +++ b/test/data/grooves/BALD02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -739,10 +739,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -751,7 +751,6 @@ up normal - @@ -759,13 +758,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/BALD03.musicxml b/test/data/grooves/BALD03.musicxml index 1f093903..ead469b7 100644 --- a/test/data/grooves/BALD03.musicxml +++ b/test/data/grooves/BALD03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BALD04.musicxml b/test/data/grooves/BALD04.musicxml index 84e1b7f5..dcb19b6f 100644 --- a/test/data/grooves/BALD04.musicxml +++ b/test/data/grooves/BALD04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BALD05.musicxml b/test/data/grooves/BALD05.musicxml index e51e95e8..dbab9f5d 100644 --- a/test/data/grooves/BALD05.musicxml +++ b/test/data/grooves/BALD05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BALD06.musicxml b/test/data/grooves/BALD06.musicxml index 7d4c04ac..6599e0a8 100644 --- a/test/data/grooves/BALD06.musicxml +++ b/test/data/grooves/BALD06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BALD07.musicxml b/test/data/grooves/BALD07.musicxml index 96d08bf1..cd8d8291 100644 --- a/test/data/grooves/BALD07.musicxml +++ b/test/data/grooves/BALD07.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BALD08.musicxml b/test/data/grooves/BALD08.musicxml index 9d9a8a33..c6629318 100644 --- a/test/data/grooves/BALD08.musicxml +++ b/test/data/grooves/BALD08.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BALD09.musicxml b/test/data/grooves/BALD09.musicxml index 546850e6..1519878b 100644 --- a/test/data/grooves/BALD09.musicxml +++ b/test/data/grooves/BALD09.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BALD10.musicxml b/test/data/grooves/BALD10.musicxml index 073a4385..0063352e 100644 --- a/test/data/grooves/BALD10.musicxml +++ b/test/data/grooves/BALD10.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -895,10 +895,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -907,15 +907,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -952,10 +957,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -964,15 +969,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1011,10 +1021,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1023,15 +1033,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1068,10 +1083,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1080,15 +1095,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/BALD11.musicxml b/test/data/grooves/BALD11.musicxml index f0590d1e..b1ab971e 100644 --- a/test/data/grooves/BALD11.musicxml +++ b/test/data/grooves/BALD11.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -564,102 +564,28 @@ F 5 - 192 - + 256 1 - 16th - up - x - - - - - - - F - 5 - - 48 - - - - 1 - 64th - up - x - - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - - - 1 - 1024th - up - x - - - - - - - F - 5 - - 288 - - - 1 - 16th - - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -667,23 +593,32 @@ F 5 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up x - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + diff --git a/test/data/grooves/BLUS01.musicxml b/test/data/grooves/BLUS01.musicxml index e82d0240..0f6fe345 100644 --- a/test/data/grooves/BLUS01.musicxml +++ b/test/data/grooves/BLUS01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BLUS02.musicxml b/test/data/grooves/BLUS02.musicxml index 07da5583..1f21f040 100644 --- a/test/data/grooves/BLUS02.musicxml +++ b/test/data/grooves/BLUS02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -309,98 +309,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - A - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - A - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - A - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -408,15 +335,19 @@ A 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -466,10 +397,10 @@ D 5 - 256 + 512 2 - eighth + quarter 3 2 @@ -478,15 +409,20 @@ up normal - - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -717,15 +653,15 @@ + A 5 - 576 + 768 1 - eighth - + quarter up x @@ -861,54 +797,76 @@ + G 5 - 288 - + 512 3 - 16th - + quarter + + 3 + 2 + quarter + up x - + + + 3 + quarter + + + 2 + quarter + + - + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + quarter + up x - - + - - - G - 5 - - 6 - - + + + 256 3 - 512th - up - x + eighth + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + @@ -916,33 +874,42 @@ G 5 - 192 - + 512 3 - 16th + quarter + + 3 + 2 + quarter + up x - + - - - G - 5 - - 48 - - - + + + 512 3 - 64th - up - x + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + @@ -950,188 +917,19 @@ G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + quarter + up x - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - 512 - 3 - quarter - - 3 - 2 - quarter - - - - - 3 - quarter - - - 2 - quarter - - - - - - - G - 5 - - 256 - - 3 - eighth - - 3 - 2 - quarter - - up - x - - + @@ -1378,98 +1176,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1477,59 +1202,42 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - - - - - - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - + - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + - + + + 3 + eighth + + + 2 + eighth + + @@ -1537,15 +1245,18 @@ G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up circle-x - @@ -1553,70 +1264,57 @@ G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up circle-x - - + - + + G 5 - 12 + 192 - - + 3 - 256th + 16th up - circle-x + x - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - + G 5 48 - + + 3 64th up - circle-x + x + - + G 5 @@ -1624,44 +1322,30 @@ 12 - + 3 256th up - circle-x + x - + G 5 3 - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 192 3 - 16th + 1024th up x + diff --git a/test/data/grooves/BLUS03.musicxml b/test/data/grooves/BLUS03.musicxml index 5c0c14d5..843f2e5d 100644 --- a/test/data/grooves/BLUS03.musicxml +++ b/test/data/grooves/BLUS03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BLUS04.musicxml b/test/data/grooves/BLUS04.musicxml index 3cc6afc0..573bfa52 100644 --- a/test/data/grooves/BLUS04.musicxml +++ b/test/data/grooves/BLUS04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BLUS05.musicxml b/test/data/grooves/BLUS05.musicxml index fb042de3..a117793a 100644 --- a/test/data/grooves/BLUS05.musicxml +++ b/test/data/grooves/BLUS05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -763,101 +763,28 @@ F 5 - 192 - - - 1 - 16th - up - x - - - - - - - F - 5 - - 48 - - - - 1 - 64th - up - x - - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - - - 1 - 1024th - up - x - - - - - - - F - 5 - - 96 - - - 1 - 32nd - up - x - - - - - - - F - 5 - - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -865,15 +792,18 @@ F 5 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -881,13 +811,19 @@ F 5 - 384 + 256 1 eighth + + 3 + 2 + eighth + up x + diff --git a/test/data/grooves/BLUS06.musicxml b/test/data/grooves/BLUS06.musicxml index 09e58f96..2d1ed935 100644 --- a/test/data/grooves/BLUS06.musicxml +++ b/test/data/grooves/BLUS06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BOSSA01.musicxml b/test/data/grooves/BOSSA01.musicxml index 1db46c40..3e3ad79d 100644 --- a/test/data/grooves/BOSSA01.musicxml +++ b/test/data/grooves/BOSSA01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BOSSA02.musicxml b/test/data/grooves/BOSSA02.musicxml index e45544a8..6c0eefa3 100644 --- a/test/data/grooves/BOSSA02.musicxml +++ b/test/data/grooves/BOSSA02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BVFunk.musicxml b/test/data/grooves/BVFunk.musicxml index f125bff4..cd52dced 100644 --- a/test/data/grooves/BVFunk.musicxml +++ b/test/data/grooves/BVFunk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BVFunkEnd.musicxml b/test/data/grooves/BVFunkEnd.musicxml index bd621fbd..8dddb81c 100644 --- a/test/data/grooves/BVFunkEnd.musicxml +++ b/test/data/grooves/BVFunkEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BVFunkHorns.musicxml b/test/data/grooves/BVFunkHorns.musicxml index e932e49f..17b33a4e 100644 --- a/test/data/grooves/BVFunkHorns.musicxml +++ b/test/data/grooves/BVFunkHorns.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BVFunkIntro.musicxml b/test/data/grooves/BVFunkIntro.musicxml index 80af46fa..6c2515c9 100644 --- a/test/data/grooves/BVFunkIntro.musicxml +++ b/test/data/grooves/BVFunkIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BVFunkIntro8.musicxml b/test/data/grooves/BVFunkIntro8.musicxml index 7b2981da..b1a6cbe0 100644 --- a/test/data/grooves/BVFunkIntro8.musicxml +++ b/test/data/grooves/BVFunkIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BVFunkSus.musicxml b/test/data/grooves/BVFunkSus.musicxml index 44a24980..ea69761e 100644 --- a/test/data/grooves/BVFunkSus.musicxml +++ b/test/data/grooves/BVFunkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BWMarch.musicxml b/test/data/grooves/BWMarch.musicxml index a8dd02d1..acc23db5 100644 --- a/test/data/grooves/BWMarch.musicxml +++ b/test/data/grooves/BWMarch.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BWMarchEnd.musicxml b/test/data/grooves/BWMarchEnd.musicxml index bfd41ad5..32fd9e00 100644 --- a/test/data/grooves/BWMarchEnd.musicxml +++ b/test/data/grooves/BWMarchEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -539,25 +539,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -582,25 +582,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/BWMarchFill.musicxml b/test/data/grooves/BWMarchFill.musicxml index 213d706d..820bc94b 100644 --- a/test/data/grooves/BWMarchFill.musicxml +++ b/test/data/grooves/BWMarchFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BWMarchIntro.musicxml b/test/data/grooves/BWMarchIntro.musicxml index 183d04b7..0781085e 100644 --- a/test/data/grooves/BWMarchIntro.musicxml +++ b/test/data/grooves/BWMarchIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BWMarchIntro8.musicxml b/test/data/grooves/BWMarchIntro8.musicxml index 0b63fe06..a45e6b05 100644 --- a/test/data/grooves/BWMarchIntro8.musicxml +++ b/test/data/grooves/BWMarchIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BWMarchPlus.musicxml b/test/data/grooves/BWMarchPlus.musicxml index 47dfba17..54f7c57a 100644 --- a/test/data/grooves/BWMarchPlus.musicxml +++ b/test/data/grooves/BWMarchPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BWMarchPlus2.musicxml b/test/data/grooves/BWMarchPlus2.musicxml index 274511e2..26fe64e6 100644 --- a/test/data/grooves/BWMarchPlus2.musicxml +++ b/test/data/grooves/BWMarchPlus2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BWMarchSus.musicxml b/test/data/grooves/BWMarchSus.musicxml index 569b9e2c..2113d639 100644 --- a/test/data/grooves/BWMarchSus.musicxml +++ b/test/data/grooves/BWMarchSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BWMarchSusPlus.musicxml b/test/data/grooves/BWMarchSusPlus.musicxml index 5ebd9a2c..cfd943fe 100644 --- a/test/data/grooves/BWMarchSusPlus.musicxml +++ b/test/data/grooves/BWMarchSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BWMarchSusPlus2.musicxml b/test/data/grooves/BWMarchSusPlus2.musicxml index e3f69803..f145dc4b 100644 --- a/test/data/grooves/BWMarchSusPlus2.musicxml +++ b/test/data/grooves/BWMarchSusPlus2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Baiao-Gimenez.musicxml b/test/data/grooves/Baiao-Gimenez.musicxml index a94493f9..a2b1ccb6 100644 --- a/test/data/grooves/Baiao-Gimenez.musicxml +++ b/test/data/grooves/Baiao-Gimenez.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Baiao-Miranda.musicxml b/test/data/grooves/Baiao-Miranda.musicxml index 916b15ae..f9a1024a 100644 --- a/test/data/grooves/Baiao-Miranda.musicxml +++ b/test/data/grooves/Baiao-Miranda.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Ballad.musicxml b/test/data/grooves/Ballad.musicxml index 363c08aa..8afb237a 100644 --- a/test/data/grooves/Ballad.musicxml +++ b/test/data/grooves/Ballad.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -828,24 +828,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -878,24 +879,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -958,117 +960,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - + E 4 - 3 - + 384 1 - 1024th + eighth up x - @@ -1112,117 +1025,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - + E 4 - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up x - @@ -1246,24 +1070,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -1296,24 +1121,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -1376,117 +1202,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - + E 4 - 3 - + 384 1 - 1024th + eighth up x - @@ -1530,117 +1267,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - + E 4 - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up x - diff --git a/test/data/grooves/Ballad1.musicxml b/test/data/grooves/Ballad1.musicxml index 30a2d05e..2a815b80 100644 --- a/test/data/grooves/Ballad1.musicxml +++ b/test/data/grooves/Ballad1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -828,24 +828,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -878,24 +879,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -958,117 +960,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - + E 4 - 3 - + 384 1 - 1024th + eighth up x - @@ -1112,117 +1025,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - + E 4 - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up x - @@ -1246,24 +1070,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -1296,24 +1121,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -1376,117 +1202,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - + E 4 - 3 - + 384 1 - 1024th + eighth up x - @@ -1530,117 +1267,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - + E 4 - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up x - diff --git a/test/data/grooves/Ballad128.musicxml b/test/data/grooves/Ballad128.musicxml index 7448a8b5..59c48806 100644 --- a/test/data/grooves/Ballad128.musicxml +++ b/test/data/grooves/Ballad128.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Ballad128End.musicxml b/test/data/grooves/Ballad128End.musicxml index 607acd88..77c7165c 100644 --- a/test/data/grooves/Ballad128End.musicxml +++ b/test/data/grooves/Ballad128End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Ballad128Intro1.musicxml b/test/data/grooves/Ballad128Intro1.musicxml index 485c06dc..d9c7b915 100644 --- a/test/data/grooves/Ballad128Intro1.musicxml +++ b/test/data/grooves/Ballad128Intro1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Ballad128Plus.musicxml b/test/data/grooves/Ballad128Plus.musicxml index fc32a137..d69eaf37 100644 --- a/test/data/grooves/Ballad128Plus.musicxml +++ b/test/data/grooves/Ballad128Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Ballad128Sus.musicxml b/test/data/grooves/Ballad128Sus.musicxml index 34d25a3b..6931b545 100644 --- a/test/data/grooves/Ballad128Sus.musicxml +++ b/test/data/grooves/Ballad128Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Ballad128SusPlus.musicxml b/test/data/grooves/Ballad128SusPlus.musicxml index 36b009a3..44ab38c1 100644 --- a/test/data/grooves/Ballad128SusPlus.musicxml +++ b/test/data/grooves/Ballad128SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Ballad1End.musicxml b/test/data/grooves/Ballad1End.musicxml index 23046903..522e9634 100644 --- a/test/data/grooves/Ballad1End.musicxml +++ b/test/data/grooves/Ballad1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -828,25 +828,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -865,25 +865,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -910,25 +910,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -947,25 +947,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -992,25 +992,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -1029,25 +1029,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -1074,25 +1074,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -1111,25 +1111,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/Ballad1Plus.musicxml b/test/data/grooves/Ballad1Plus.musicxml index f6e5302b..068f818f 100644 --- a/test/data/grooves/Ballad1Plus.musicxml +++ b/test/data/grooves/Ballad1Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -828,24 +828,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -878,24 +879,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -958,117 +960,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - + E 4 - 3 - + 384 1 - 1024th + eighth up x - @@ -1112,117 +1025,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - + E 4 - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up x - @@ -1246,24 +1070,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -1296,24 +1121,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -1376,117 +1202,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - + E 4 - 3 - + 384 1 - 1024th + eighth up x - @@ -1530,117 +1267,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - + E 4 - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up x - diff --git a/test/data/grooves/Ballad1Sus.musicxml b/test/data/grooves/Ballad1Sus.musicxml index bc6b2ac6..4ef15b90 100644 --- a/test/data/grooves/Ballad1Sus.musicxml +++ b/test/data/grooves/Ballad1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -828,24 +828,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -878,24 +879,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -958,117 +960,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - + E 4 - 3 - + 384 1 - 1024th + eighth up x - @@ -1112,117 +1025,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - + E 4 - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up x - @@ -1246,24 +1070,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -1296,24 +1121,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -1376,117 +1202,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - + E 4 - 3 - + 384 1 - 1024th + eighth up x - @@ -1530,117 +1267,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - + E 4 - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up x - diff --git a/test/data/grooves/Ballad1SusPlus.musicxml b/test/data/grooves/Ballad1SusPlus.musicxml index db7f9326..a34c6a8e 100644 --- a/test/data/grooves/Ballad1SusPlus.musicxml +++ b/test/data/grooves/Ballad1SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -828,24 +828,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -878,24 +879,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -958,117 +960,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - + E 4 - 3 - + 384 1 - 1024th + eighth up x - @@ -1112,117 +1025,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - + E 4 - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up x - @@ -1246,24 +1070,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -1296,24 +1121,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -1376,117 +1202,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - + E 4 - 3 - + 384 1 - 1024th + eighth up x - @@ -1530,117 +1267,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - + E 4 - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up x - diff --git a/test/data/grooves/Ballad68-44.musicxml b/test/data/grooves/Ballad68-44.musicxml index c222e964..e5966813 100644 --- a/test/data/grooves/Ballad68-44.musicxml +++ b/test/data/grooves/Ballad68-44.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Ballad68.musicxml b/test/data/grooves/Ballad68.musicxml index cef1a420..8e1c5d89 100644 --- a/test/data/grooves/Ballad68.musicxml +++ b/test/data/grooves/Ballad68.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -193,98 +193,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -292,15 +219,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -354,98 +285,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -453,15 +311,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -596,98 +458,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -695,15 +484,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -757,98 +550,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -856,15 +576,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -941,174 +665,13 @@ 768 1 - quarter - - - - - 4608 - - - - E - 4 - - 512 - - 2 - quarter - - 3 - 2 - quarter - - up - square - - - - 3 - quarter - - - 2 - quarter - - - - - - - E - 4 - - 256 - - 2 - eighth - - 3 - 2 - quarter - - up - square - - - - - - - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - - 2 - eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - - - 2 - 512th - up - square + quarter - + + 4608 + E @@ -1160,46 +723,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - + 256 2 - 1024th + eighth + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + @@ -1207,15 +749,19 @@ E 4 - 384 - + 512 2 - eighth + quarter + + 3 + 2 + quarter + up square - + @@ -1223,17 +769,28 @@ E 4 - 96 - - + 512 2 - 32nd + quarter + + 3 + 2 + quarter + up square - - + + + 3 + quarter + + + 2 + quarter + + @@ -1241,17 +798,42 @@ E 4 - 24 - - + 256 2 - 128th + eighth + + 3 + 2 + quarter + up square - - + + + + + + 256 + 2 + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1259,15 +841,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -1402,98 +988,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1501,15 +1014,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -1563,98 +1080,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1662,15 +1106,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + diff --git a/test/data/grooves/Ballad68End.musicxml b/test/data/grooves/Ballad68End.musicxml index 8d6cee43..b4f45cef 100644 --- a/test/data/grooves/Ballad68End.musicxml +++ b/test/data/grooves/Ballad68End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -193,98 +193,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -292,15 +219,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -354,98 +285,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -453,15 +311,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + diff --git a/test/data/grooves/Ballad68Intro.musicxml b/test/data/grooves/Ballad68Intro.musicxml index cd3bcbbb..3da69721 100644 --- a/test/data/grooves/Ballad68Intro.musicxml +++ b/test/data/grooves/Ballad68Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -193,98 +193,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -292,15 +219,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -354,98 +285,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -453,15 +311,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -596,98 +458,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -695,15 +484,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -757,98 +550,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -856,15 +576,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -999,98 +723,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1098,15 +749,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -1160,98 +815,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1259,15 +841,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + diff --git a/test/data/grooves/Ballad68Plus.musicxml b/test/data/grooves/Ballad68Plus.musicxml index 6ccd296e..fe3af67a 100644 --- a/test/data/grooves/Ballad68Plus.musicxml +++ b/test/data/grooves/Ballad68Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -193,98 +193,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -292,15 +219,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -354,98 +285,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -453,15 +311,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -596,98 +458,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -695,15 +484,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -757,98 +550,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -856,15 +576,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -941,174 +665,13 @@ 768 1 - quarter - - - - - 4608 - - - - E - 4 - - 512 - - 2 - quarter - - 3 - 2 - quarter - - up - square - - - - 3 - quarter - - - 2 - quarter - - - - - - - E - 4 - - 256 - - 2 - eighth - - 3 - 2 - quarter - - up - square - - - - - - - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - - 2 - eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - - - 2 - 512th - up - square + quarter - + + 4608 + E @@ -1160,46 +723,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - + 256 2 - 1024th + eighth + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + @@ -1207,15 +749,19 @@ E 4 - 384 - + 512 2 - eighth + quarter + + 3 + 2 + quarter + up square - + @@ -1223,17 +769,28 @@ E 4 - 96 - - + 512 2 - 32nd + quarter + + 3 + 2 + quarter + up square - - + + + 3 + quarter + + + 2 + quarter + + @@ -1241,17 +798,42 @@ E 4 - 24 - - + 256 2 - 128th + eighth + + 3 + 2 + quarter + up square - - + + + + + + 256 + 2 + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1259,15 +841,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -1402,98 +988,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1501,15 +1014,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -1563,98 +1080,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1662,15 +1106,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + diff --git a/test/data/grooves/Ballad68Sus.musicxml b/test/data/grooves/Ballad68Sus.musicxml index a1c98d0d..573ffcb7 100644 --- a/test/data/grooves/Ballad68Sus.musicxml +++ b/test/data/grooves/Ballad68Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -193,98 +193,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -292,15 +219,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -354,98 +285,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -453,15 +311,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -596,98 +458,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -695,15 +484,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -757,98 +550,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -856,15 +576,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -941,174 +665,13 @@ 768 1 - quarter - - - - - 4608 - - - - E - 4 - - 512 - - 2 - quarter - - 3 - 2 - quarter - - up - square - - - - 3 - quarter - - - 2 - quarter - - - - - - - E - 4 - - 256 - - 2 - eighth - - 3 - 2 - quarter - - up - square - - - - - - - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - - 2 - eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - - - 2 - 512th - up - square + quarter - + + 4608 + E @@ -1160,46 +723,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - + 256 2 - 1024th + eighth + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + @@ -1207,15 +749,19 @@ E 4 - 384 - + 512 2 - eighth + quarter + + 3 + 2 + quarter + up square - + @@ -1223,17 +769,28 @@ E 4 - 96 - - + 512 2 - 32nd + quarter + + 3 + 2 + quarter + up square - - + + + 3 + quarter + + + 2 + quarter + + @@ -1241,17 +798,42 @@ E 4 - 24 - - + 256 2 - 128th + eighth + + 3 + 2 + quarter + up square - - + + + + + + 256 + 2 + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1259,15 +841,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -1402,98 +988,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1501,15 +1014,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -1563,98 +1080,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1662,15 +1106,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + diff --git a/test/data/grooves/Ballad68SusPlus.musicxml b/test/data/grooves/Ballad68SusPlus.musicxml index e8306c0f..8d76cc35 100644 --- a/test/data/grooves/Ballad68SusPlus.musicxml +++ b/test/data/grooves/Ballad68SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -193,98 +193,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -292,15 +219,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -354,98 +285,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -453,15 +311,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -596,98 +458,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -695,15 +484,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -757,98 +550,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -856,15 +576,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -941,174 +665,13 @@ 768 1 - quarter - - - - - 4608 - - - - E - 4 - - 512 - - 2 - quarter - - 3 - 2 - quarter - - up - square - - - - 3 - quarter - - - 2 - quarter - - - - - - - E - 4 - - 256 - - 2 - eighth - - 3 - 2 - quarter - - up - square - - - - - - - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - - 2 - eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - - - 2 - 512th - up - square + quarter - + + 4608 + E @@ -1160,46 +723,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - + 256 2 - 1024th + eighth + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + @@ -1207,15 +749,19 @@ E 4 - 384 - + 512 2 - eighth + quarter + + 3 + 2 + quarter + up square - + @@ -1223,17 +769,28 @@ E 4 - 96 - - + 512 2 - 32nd + quarter + + 3 + 2 + quarter + up square - - + + + 3 + quarter + + + 2 + quarter + + @@ -1241,17 +798,42 @@ E 4 - 24 - - + 256 2 - 128th + eighth + + 3 + 2 + quarter + up square - - + + + + + + 256 + 2 + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1259,15 +841,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -1402,98 +988,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1501,15 +1014,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -1563,98 +1080,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1662,15 +1106,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + diff --git a/test/data/grooves/BalladEnd.musicxml b/test/data/grooves/BalladEnd.musicxml index 79139976..34a9b28b 100644 --- a/test/data/grooves/BalladEnd.musicxml +++ b/test/data/grooves/BalladEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -828,25 +828,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -865,25 +865,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -910,25 +910,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -947,25 +947,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -992,25 +992,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -1029,25 +1029,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -1074,25 +1074,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -1111,25 +1111,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/BalladFill.musicxml b/test/data/grooves/BalladFill.musicxml index 5843d863..c2df0da4 100644 --- a/test/data/grooves/BalladFill.musicxml +++ b/test/data/grooves/BalladFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -456,24 +456,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -506,24 +507,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x diff --git a/test/data/grooves/BalladIntro.musicxml b/test/data/grooves/BalladIntro.musicxml index 5fd2a369..86f3dbc3 100644 --- a/test/data/grooves/BalladIntro.musicxml +++ b/test/data/grooves/BalladIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -461,14 +461,15 @@ + E 4 - 192 + 384 1 - 16th + eighth up x @@ -493,24 +494,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -535,24 +537,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -577,24 +580,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -631,14 +635,15 @@ + E 4 - 192 + 384 1 - 16th + eighth up x @@ -663,24 +668,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -705,24 +711,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -747,24 +754,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -801,14 +809,15 @@ + E 4 - 192 + 384 1 - 16th + eighth up x @@ -833,24 +842,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -875,24 +885,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -917,24 +928,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -971,15 +983,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -990,25 +1002,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/BalladIntro1.musicxml b/test/data/grooves/BalladIntro1.musicxml index 481e049f..8bf1fc38 100644 --- a/test/data/grooves/BalladIntro1.musicxml +++ b/test/data/grooves/BalladIntro1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -461,14 +461,15 @@ + E 4 - 192 + 384 1 - 16th + eighth up x @@ -493,24 +494,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -535,24 +537,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -577,24 +580,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -631,14 +635,15 @@ + E 4 - 192 + 384 1 - 16th + eighth up x @@ -663,24 +668,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -705,24 +711,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -747,24 +754,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -801,14 +809,15 @@ + E 4 - 192 + 384 1 - 16th + eighth up x @@ -833,24 +842,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -875,24 +885,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -917,24 +928,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -971,15 +983,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -990,25 +1002,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/BalladIntro2.musicxml b/test/data/grooves/BalladIntro2.musicxml index e24f5850..52b9b188 100644 --- a/test/data/grooves/BalladIntro2.musicxml +++ b/test/data/grooves/BalladIntro2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -461,14 +461,15 @@ + E 4 - 192 + 384 1 - 16th + eighth up x @@ -493,24 +494,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -535,24 +537,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -577,24 +580,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -631,14 +635,15 @@ + E 4 - 192 + 384 1 - 16th + eighth up x @@ -663,24 +668,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -705,24 +711,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -747,24 +754,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -801,14 +809,15 @@ + E 4 - 192 + 384 1 - 16th + eighth up x @@ -833,24 +842,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -875,24 +885,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -917,24 +928,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -971,15 +983,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -990,25 +1002,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/BalladPlus.musicxml b/test/data/grooves/BalladPlus.musicxml index 8dbcdf23..6bc8481a 100644 --- a/test/data/grooves/BalladPlus.musicxml +++ b/test/data/grooves/BalladPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -828,24 +828,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -878,24 +879,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -958,117 +960,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - + E 4 - 3 - + 384 1 - 1024th + eighth up x - @@ -1112,117 +1025,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - + E 4 - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up x - @@ -1246,24 +1070,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -1296,24 +1121,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -1376,117 +1202,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - + E 4 - 3 - + 384 1 - 1024th + eighth up x - @@ -1530,117 +1267,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - + E 4 - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up x - diff --git a/test/data/grooves/BalladSus.musicxml b/test/data/grooves/BalladSus.musicxml index 348b7474..359e1b5b 100644 --- a/test/data/grooves/BalladSus.musicxml +++ b/test/data/grooves/BalladSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -828,24 +828,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -878,24 +879,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -958,117 +960,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - + E 4 - 3 - + 384 1 - 1024th + eighth up x - @@ -1112,117 +1025,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - + E 4 - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up x - @@ -1246,24 +1070,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -1296,24 +1121,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -1376,117 +1202,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - + E 4 - 3 - + 384 1 - 1024th + eighth up x - @@ -1530,117 +1267,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - + E 4 - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up x - diff --git a/test/data/grooves/BalladSusPlus.musicxml b/test/data/grooves/BalladSusPlus.musicxml index 8e08b331..7e5d247b 100644 --- a/test/data/grooves/BalladSusPlus.musicxml +++ b/test/data/grooves/BalladSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -828,24 +828,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -878,24 +879,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -958,117 +960,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - + E 4 - 3 - + 384 1 - 1024th + eighth up x - @@ -1112,117 +1025,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - + E 4 - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up x - @@ -1246,24 +1070,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -1296,24 +1121,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up x @@ -1376,117 +1202,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - + E 4 - 3 - + 384 1 - 1024th + eighth up x - @@ -1530,117 +1267,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - + E 4 - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up x - diff --git a/test/data/grooves/BasicRock.musicxml b/test/data/grooves/BasicRock.musicxml index 83a67899..bff7477a 100644 --- a/test/data/grooves/BasicRock.musicxml +++ b/test/data/grooves/BasicRock.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BasicRock4.musicxml b/test/data/grooves/BasicRock4.musicxml index 51c41ec8..469cd548 100644 --- a/test/data/grooves/BasicRock4.musicxml +++ b/test/data/grooves/BasicRock4.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BasicRock4Intro.musicxml b/test/data/grooves/BasicRock4Intro.musicxml index e025819d..c84b8c2f 100644 --- a/test/data/grooves/BasicRock4Intro.musicxml +++ b/test/data/grooves/BasicRock4Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BasicRock4Sus.musicxml b/test/data/grooves/BasicRock4Sus.musicxml index eb56be7d..9449a185 100644 --- a/test/data/grooves/BasicRock4Sus.musicxml +++ b/test/data/grooves/BasicRock4Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BasicRockEnd.musicxml b/test/data/grooves/BasicRockEnd.musicxml index 49c25454..fbf25d28 100644 --- a/test/data/grooves/BasicRockEnd.musicxml +++ b/test/data/grooves/BasicRockEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -451,15 +451,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -478,25 +478,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/BasicRockIntro.musicxml b/test/data/grooves/BasicRockIntro.musicxml index f96c4856..02b69980 100644 --- a/test/data/grooves/BasicRockIntro.musicxml +++ b/test/data/grooves/BasicRockIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BasicRockSus.musicxml b/test/data/grooves/BasicRockSus.musicxml index a3548c7b..f9f39869 100644 --- a/test/data/grooves/BasicRockSus.musicxml +++ b/test/data/grooves/BasicRockSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Bebop.musicxml b/test/data/grooves/Bebop.musicxml index 1f95e4c6..522eaea3 100644 --- a/test/data/grooves/Bebop.musicxml +++ b/test/data/grooves/Bebop.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BebopEnd.musicxml b/test/data/grooves/BebopEnd.musicxml index ef5b90cf..b1e3b4fc 100644 --- a/test/data/grooves/BebopEnd.musicxml +++ b/test/data/grooves/BebopEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -389,15 +389,15 @@ + F 5 - 576 + 768 1 - eighth - + quarter up diamond diff --git a/test/data/grooves/BebopIntro.musicxml b/test/data/grooves/BebopIntro.musicxml index 2b71faa3..756efceb 100644 --- a/test/data/grooves/BebopIntro.musicxml +++ b/test/data/grooves/BebopIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -506,6 +506,21 @@ + + + + F + 5 + + 192 + + 1 + 16th + up + diamond + + + 3072 @@ -585,19 +600,24 @@ - - - F - 5 - - 576 - + + + 384 + 1 eighth - - up - diamond + + + + + + 192 + + 1 + 16th + + @@ -927,22 +947,25 @@ - 384 - + 512 3 - eighth - - - - - - - 192 - - 3 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -950,10 +973,15 @@ G 5 - 192 + 512 3 - 16th + quarter + + 3 + 2 + quarter + up x @@ -961,10 +989,16 @@ - 768 + 512 3 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/BebopPlus.musicxml b/test/data/grooves/BebopPlus.musicxml index 7a94a13a..608aa275 100644 --- a/test/data/grooves/BebopPlus.musicxml +++ b/test/data/grooves/BebopPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BebopSus.musicxml b/test/data/grooves/BebopSus.musicxml index f74fbb82..c64db888 100644 --- a/test/data/grooves/BebopSus.musicxml +++ b/test/data/grooves/BebopSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BebopSusPlus.musicxml b/test/data/grooves/BebopSusPlus.musicxml index 8b45cfed..1cbb0eaf 100644 --- a/test/data/grooves/BebopSusPlus.musicxml +++ b/test/data/grooves/BebopSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Beguine.musicxml b/test/data/grooves/Beguine.musicxml index f0644e30..90e74ddb 100644 --- a/test/data/grooves/Beguine.musicxml +++ b/test/data/grooves/Beguine.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -252,25 +252,25 @@ B 4 - 192 + 768 2 - 16th + quarter up normal + D 5 - 576 + 768 2 - eighth - + quarter up normal diff --git a/test/data/grooves/Beguine1.musicxml b/test/data/grooves/Beguine1.musicxml index 015529e2..9b1ae137 100644 --- a/test/data/grooves/Beguine1.musicxml +++ b/test/data/grooves/Beguine1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -252,25 +252,25 @@ B 4 - 192 + 768 2 - 16th + quarter up normal + D 5 - 576 + 768 2 - eighth - + quarter up normal diff --git a/test/data/grooves/Beguine1Sus.musicxml b/test/data/grooves/Beguine1Sus.musicxml index b26190b9..31aaa2f4 100644 --- a/test/data/grooves/Beguine1Sus.musicxml +++ b/test/data/grooves/Beguine1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -252,25 +252,25 @@ B 4 - 192 + 768 2 - 16th + quarter up normal + D 5 - 576 + 768 2 - eighth - + quarter up normal diff --git a/test/data/grooves/Beguine2End.musicxml b/test/data/grooves/Beguine2End.musicxml index ac0dbd7e..06937acd 100644 --- a/test/data/grooves/Beguine2End.musicxml +++ b/test/data/grooves/Beguine2End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -246,15 +246,15 @@ + D 5 - 576 + 768 2 - eighth - + quarter up normal @@ -279,25 +279,25 @@ B 4 - 192 + 768 2 - 16th + quarter up normal + D 5 - 576 + 768 2 - eighth - + quarter up normal @@ -334,15 +334,15 @@ + D 5 - 576 + 768 2 - eighth - + quarter up normal diff --git a/test/data/grooves/BeguineEnd.musicxml b/test/data/grooves/BeguineEnd.musicxml index 3628e514..f450b17d 100644 --- a/test/data/grooves/BeguineEnd.musicxml +++ b/test/data/grooves/BeguineEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -252,25 +252,25 @@ B 4 - 192 + 768 2 - 16th + quarter up normal + D 5 - 576 + 768 2 - eighth - + quarter up normal diff --git a/test/data/grooves/BeguineFill.musicxml b/test/data/grooves/BeguineFill.musicxml index 492827d8..bb6e0596 100644 --- a/test/data/grooves/BeguineFill.musicxml +++ b/test/data/grooves/BeguineFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BeguineIntro.musicxml b/test/data/grooves/BeguineIntro.musicxml index 4f2ee3bd..85829467 100644 --- a/test/data/grooves/BeguineIntro.musicxml +++ b/test/data/grooves/BeguineIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -252,25 +252,25 @@ B 4 - 192 + 768 2 - 16th + quarter up normal + D 5 - 576 + 768 2 - eighth - + quarter up normal diff --git a/test/data/grooves/BeguineIntro8.musicxml b/test/data/grooves/BeguineIntro8.musicxml index b65d5d52..77f444ce 100644 --- a/test/data/grooves/BeguineIntro8.musicxml +++ b/test/data/grooves/BeguineIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -252,25 +252,25 @@ B 4 - 192 + 768 2 - 16th + quarter up normal + D 5 - 576 + 768 2 - eighth - + quarter up normal @@ -483,25 +483,25 @@ B 4 - 192 + 768 2 - 16th + quarter up normal + D 5 - 576 + 768 2 - eighth - + quarter up normal diff --git a/test/data/grooves/BeguineSus.musicxml b/test/data/grooves/BeguineSus.musicxml index e4ee32fa..22c2d67e 100644 --- a/test/data/grooves/BeguineSus.musicxml +++ b/test/data/grooves/BeguineSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -252,25 +252,25 @@ B 4 - 192 + 768 2 - 16th + quarter up normal + D 5 - 576 + 768 2 - eighth - + quarter up normal diff --git a/test/data/grooves/BeguineSusIntro.musicxml b/test/data/grooves/BeguineSusIntro.musicxml index 15e929ef..15981032 100644 --- a/test/data/grooves/BeguineSusIntro.musicxml +++ b/test/data/grooves/BeguineSusIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -252,25 +252,25 @@ B 4 - 192 + 768 2 - 16th + quarter up normal + D 5 - 576 + 768 2 - eighth - + quarter up normal diff --git a/test/data/grooves/BigBand.musicxml b/test/data/grooves/BigBand.musicxml index 44bdd7c3..5883682e 100644 --- a/test/data/grooves/BigBand.musicxml +++ b/test/data/grooves/BigBand.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -215,22 +215,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -238,10 +241,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -249,10 +257,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/BigBand1.musicxml b/test/data/grooves/BigBand1.musicxml index e189c3af..0da78332 100644 --- a/test/data/grooves/BigBand1.musicxml +++ b/test/data/grooves/BigBand1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -215,22 +215,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -238,10 +241,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -249,10 +257,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/BigBand1End.musicxml b/test/data/grooves/BigBand1End.musicxml index e9a3aaf9..28254353 100644 --- a/test/data/grooves/BigBand1End.musicxml +++ b/test/data/grooves/BigBand1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BigBand1Fill.musicxml b/test/data/grooves/BigBand1Fill.musicxml index 1c76e204..b2d874bc 100644 --- a/test/data/grooves/BigBand1Fill.musicxml +++ b/test/data/grooves/BigBand1Fill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BigBand1Plus.musicxml b/test/data/grooves/BigBand1Plus.musicxml index f315476c..978b4601 100644 --- a/test/data/grooves/BigBand1Plus.musicxml +++ b/test/data/grooves/BigBand1Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -215,22 +215,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -238,10 +241,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -249,10 +257,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/BigBand1Sus.musicxml b/test/data/grooves/BigBand1Sus.musicxml index 98fb3684..a4432d7e 100644 --- a/test/data/grooves/BigBand1Sus.musicxml +++ b/test/data/grooves/BigBand1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -215,22 +215,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -238,10 +241,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -249,10 +257,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/BigBand1SusPlus.musicxml b/test/data/grooves/BigBand1SusPlus.musicxml index 14c3625a..f3849301 100644 --- a/test/data/grooves/BigBand1SusPlus.musicxml +++ b/test/data/grooves/BigBand1SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -215,22 +215,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -238,10 +241,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -249,10 +257,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/BigBand2End.musicxml b/test/data/grooves/BigBand2End.musicxml index a52104da..baef3807 100644 --- a/test/data/grooves/BigBand2End.musicxml +++ b/test/data/grooves/BigBand2End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -215,22 +215,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -238,10 +241,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -249,10 +257,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/BigBand4End.musicxml b/test/data/grooves/BigBand4End.musicxml index 1661298a..2b1d699f 100644 --- a/test/data/grooves/BigBand4End.musicxml +++ b/test/data/grooves/BigBand4End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -215,22 +215,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -238,10 +241,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -249,10 +257,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/BigBand8.musicxml b/test/data/grooves/BigBand8.musicxml index 11735aec..fcc4f05a 100644 --- a/test/data/grooves/BigBand8.musicxml +++ b/test/data/grooves/BigBand8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -215,22 +215,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -238,10 +241,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -249,10 +257,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -281,22 +295,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -304,10 +321,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -315,10 +337,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/BigBand8Sus.musicxml b/test/data/grooves/BigBand8Sus.musicxml index e058588f..eb61964e 100644 --- a/test/data/grooves/BigBand8Sus.musicxml +++ b/test/data/grooves/BigBand8Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -215,22 +215,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -238,10 +241,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -249,10 +257,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -281,22 +295,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -304,10 +321,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -315,10 +337,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/BigBandEnd.musicxml b/test/data/grooves/BigBandEnd.musicxml index ed5ce838..e1ac04b0 100644 --- a/test/data/grooves/BigBandEnd.musicxml +++ b/test/data/grooves/BigBandEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BigBandFill.musicxml b/test/data/grooves/BigBandFill.musicxml index 06f83ee1..5a10cea8 100644 --- a/test/data/grooves/BigBandFill.musicxml +++ b/test/data/grooves/BigBandFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BigBandIntro.musicxml b/test/data/grooves/BigBandIntro.musicxml index f4fa803c..28d2d4ce 100644 --- a/test/data/grooves/BigBandIntro.musicxml +++ b/test/data/grooves/BigBandIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -215,22 +215,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -238,10 +241,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -249,10 +257,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/BigBandIntro2.musicxml b/test/data/grooves/BigBandIntro2.musicxml index 1942f5c3..48cdabc2 100644 --- a/test/data/grooves/BigBandIntro2.musicxml +++ b/test/data/grooves/BigBandIntro2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -215,22 +215,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -238,10 +241,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -249,10 +257,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/BigBandIntro8.musicxml b/test/data/grooves/BigBandIntro8.musicxml index 796c2c94..7b148de4 100644 --- a/test/data/grooves/BigBandIntro8.musicxml +++ b/test/data/grooves/BigBandIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -215,22 +215,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -238,10 +241,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -249,10 +257,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -281,22 +295,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -304,10 +321,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -315,10 +337,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/BigBandPlus.musicxml b/test/data/grooves/BigBandPlus.musicxml index 96b3f79a..a4505b5a 100644 --- a/test/data/grooves/BigBandPlus.musicxml +++ b/test/data/grooves/BigBandPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -215,22 +215,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -238,10 +241,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -249,10 +257,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/BigBandSus.musicxml b/test/data/grooves/BigBandSus.musicxml index 9f99621e..88ff1aef 100644 --- a/test/data/grooves/BigBandSus.musicxml +++ b/test/data/grooves/BigBandSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -215,22 +215,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -238,10 +241,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -249,10 +257,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/BigBandSusPlus.musicxml b/test/data/grooves/BigBandSusPlus.musicxml index e6bd7d4b..687c3269 100644 --- a/test/data/grooves/BigBandSusPlus.musicxml +++ b/test/data/grooves/BigBandSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -215,22 +215,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -238,10 +241,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -249,10 +257,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/BlueFolk.musicxml b/test/data/grooves/BlueFolk.musicxml index 202dc502..603304ef 100644 --- a/test/data/grooves/BlueFolk.musicxml +++ b/test/data/grooves/BlueFolk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BlueFolk2.musicxml b/test/data/grooves/BlueFolk2.musicxml index 49a4e619..f16edfdd 100644 --- a/test/data/grooves/BlueFolk2.musicxml +++ b/test/data/grooves/BlueFolk2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BlueFolk2Plus.musicxml b/test/data/grooves/BlueFolk2Plus.musicxml index aa8a421c..cf298a37 100644 --- a/test/data/grooves/BlueFolk2Plus.musicxml +++ b/test/data/grooves/BlueFolk2Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BlueFolk2Sus.musicxml b/test/data/grooves/BlueFolk2Sus.musicxml index 4407f37d..e93ec046 100644 --- a/test/data/grooves/BlueFolk2Sus.musicxml +++ b/test/data/grooves/BlueFolk2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BlueFolk2SusPlus.musicxml b/test/data/grooves/BlueFolk2SusPlus.musicxml index 9516e0b5..b1259bed 100644 --- a/test/data/grooves/BlueFolk2SusPlus.musicxml +++ b/test/data/grooves/BlueFolk2SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BlueFolkEnd.musicxml b/test/data/grooves/BlueFolkEnd.musicxml index 38e72300..38dc5f48 100644 --- a/test/data/grooves/BlueFolkEnd.musicxml +++ b/test/data/grooves/BlueFolkEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BlueFolkIntro.musicxml b/test/data/grooves/BlueFolkIntro.musicxml index 6ca1d005..0cc2d34d 100644 --- a/test/data/grooves/BlueFolkIntro.musicxml +++ b/test/data/grooves/BlueFolkIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BlueFolkPlus.musicxml b/test/data/grooves/BlueFolkPlus.musicxml index ae404cc6..f0ffad78 100644 --- a/test/data/grooves/BlueFolkPlus.musicxml +++ b/test/data/grooves/BlueFolkPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BlueFolkSus.musicxml b/test/data/grooves/BlueFolkSus.musicxml index eb2e5822..d8e2a45b 100644 --- a/test/data/grooves/BlueFolkSus.musicxml +++ b/test/data/grooves/BlueFolkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BlueFolkSusPlus.musicxml b/test/data/grooves/BlueFolkSusPlus.musicxml index 7e0215d1..cc4897ed 100644 --- a/test/data/grooves/BlueFolkSusPlus.musicxml +++ b/test/data/grooves/BlueFolkSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BlueGrass.musicxml b/test/data/grooves/BlueGrass.musicxml index d64d407b..abcb54b9 100644 --- a/test/data/grooves/BlueGrass.musicxml +++ b/test/data/grooves/BlueGrass.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BlueGrassBottle.musicxml b/test/data/grooves/BlueGrassBottle.musicxml index 99dfd1ef..4820ee0a 100644 --- a/test/data/grooves/BlueGrassBottle.musicxml +++ b/test/data/grooves/BlueGrassBottle.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BlueGrassBottleClap.musicxml b/test/data/grooves/BlueGrassBottleClap.musicxml index 02a61acf..1bb6ed25 100644 --- a/test/data/grooves/BlueGrassBottleClap.musicxml +++ b/test/data/grooves/BlueGrassBottleClap.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BlueGrassClap.musicxml b/test/data/grooves/BlueGrassClap.musicxml index 2ba9620e..39a8e835 100644 --- a/test/data/grooves/BlueGrassClap.musicxml +++ b/test/data/grooves/BlueGrassClap.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BlueGrassEnd.musicxml b/test/data/grooves/BlueGrassEnd.musicxml index 6278bf33..2af420f4 100644 --- a/test/data/grooves/BlueGrassEnd.musicxml +++ b/test/data/grooves/BlueGrassEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BlueGrassIntro.musicxml b/test/data/grooves/BlueGrassIntro.musicxml index fb4637d4..bab5b65d 100644 --- a/test/data/grooves/BlueGrassIntro.musicxml +++ b/test/data/grooves/BlueGrassIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BlueGrassSus.musicxml b/test/data/grooves/BlueGrassSus.musicxml index 1716921b..118271d7 100644 --- a/test/data/grooves/BlueGrassSus.musicxml +++ b/test/data/grooves/BlueGrassSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BlueGrassSusClap.musicxml b/test/data/grooves/BlueGrassSusClap.musicxml index b5903af6..fc043a01 100644 --- a/test/data/grooves/BlueGrassSusClap.musicxml +++ b/test/data/grooves/BlueGrassSusClap.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Blues.musicxml b/test/data/grooves/Blues.musicxml index f520284b..e9550d57 100644 --- a/test/data/grooves/Blues.musicxml +++ b/test/data/grooves/Blues.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Blues1.musicxml b/test/data/grooves/Blues1.musicxml index 9ea9a5f0..8eff940d 100644 --- a/test/data/grooves/Blues1.musicxml +++ b/test/data/grooves/Blues1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Blues128.musicxml b/test/data/grooves/Blues128.musicxml index 2ed658ad..c4fafa80 100644 --- a/test/data/grooves/Blues128.musicxml +++ b/test/data/grooves/Blues128.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Blues128End.musicxml b/test/data/grooves/Blues128End.musicxml index effa18bf..537c1c1f 100644 --- a/test/data/grooves/Blues128End.musicxml +++ b/test/data/grooves/Blues128End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Blues128Plus.musicxml b/test/data/grooves/Blues128Plus.musicxml index 2257adef..e74c26ad 100644 --- a/test/data/grooves/Blues128Plus.musicxml +++ b/test/data/grooves/Blues128Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Blues128Sus.musicxml b/test/data/grooves/Blues128Sus.musicxml index a4c89a5c..2357104a 100644 --- a/test/data/grooves/Blues128Sus.musicxml +++ b/test/data/grooves/Blues128Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Blues128SusPlus.musicxml b/test/data/grooves/Blues128SusPlus.musicxml index 01a73d6a..562d2f55 100644 --- a/test/data/grooves/Blues128SusPlus.musicxml +++ b/test/data/grooves/Blues128SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Blues1Sus.musicxml b/test/data/grooves/Blues1Sus.musicxml index 8de97042..2d496fd2 100644 --- a/test/data/grooves/Blues1Sus.musicxml +++ b/test/data/grooves/Blues1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Blues68.musicxml b/test/data/grooves/Blues68.musicxml index 43b0dd2b..b86fc599 100644 --- a/test/data/grooves/Blues68.musicxml +++ b/test/data/grooves/Blues68.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Blues68End.musicxml b/test/data/grooves/Blues68End.musicxml index 70023212..049a4246 100644 --- a/test/data/grooves/Blues68End.musicxml +++ b/test/data/grooves/Blues68End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Blues68Intro.musicxml b/test/data/grooves/Blues68Intro.musicxml index da989e51..bb615516 100644 --- a/test/data/grooves/Blues68Intro.musicxml +++ b/test/data/grooves/Blues68Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Blues68Plus.musicxml b/test/data/grooves/Blues68Plus.musicxml index f14a501b..f75580c5 100644 --- a/test/data/grooves/Blues68Plus.musicxml +++ b/test/data/grooves/Blues68Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Blues68Walk.musicxml b/test/data/grooves/Blues68Walk.musicxml index 5c66ec63..ccc061c4 100644 --- a/test/data/grooves/Blues68Walk.musicxml +++ b/test/data/grooves/Blues68Walk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Blues68WalkPlus.musicxml b/test/data/grooves/Blues68WalkPlus.musicxml index 5f78214e..c6db228a 100644 --- a/test/data/grooves/Blues68WalkPlus.musicxml +++ b/test/data/grooves/Blues68WalkPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BluesEnd.musicxml b/test/data/grooves/BluesEnd.musicxml index 8e30c5ce..f0be23a3 100644 --- a/test/data/grooves/BluesEnd.musicxml +++ b/test/data/grooves/BluesEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BluesIntro.musicxml b/test/data/grooves/BluesIntro.musicxml index aa6723bb..2b2c8632 100644 --- a/test/data/grooves/BluesIntro.musicxml +++ b/test/data/grooves/BluesIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -882,10 +882,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -894,15 +894,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -933,10 +938,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -945,15 +950,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/BluesSus.musicxml b/test/data/grooves/BluesSus.musicxml index 5373c4e1..c458e3fe 100644 --- a/test/data/grooves/BluesSus.musicxml +++ b/test/data/grooves/BluesSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BluesTriple.musicxml b/test/data/grooves/BluesTriple.musicxml index 07d514e3..6014be02 100644 --- a/test/data/grooves/BluesTriple.musicxml +++ b/test/data/grooves/BluesTriple.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BluesTripleL.musicxml b/test/data/grooves/BluesTripleL.musicxml index c563b708..0f4a153f 100644 --- a/test/data/grooves/BluesTripleL.musicxml +++ b/test/data/grooves/BluesTripleL.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BluesTripleLSus.musicxml b/test/data/grooves/BluesTripleLSus.musicxml index e14a308a..1c858919 100644 --- a/test/data/grooves/BluesTripleLSus.musicxml +++ b/test/data/grooves/BluesTripleLSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BluesTripleR.musicxml b/test/data/grooves/BluesTripleR.musicxml index 441d6130..781f477f 100644 --- a/test/data/grooves/BluesTripleR.musicxml +++ b/test/data/grooves/BluesTripleR.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BluesTripleRSus.musicxml b/test/data/grooves/BluesTripleRSus.musicxml index c7759c15..f237de43 100644 --- a/test/data/grooves/BluesTripleRSus.musicxml +++ b/test/data/grooves/BluesTripleRSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BluesTripleSus.musicxml b/test/data/grooves/BluesTripleSus.musicxml index ed66fbe6..10712d4f 100644 --- a/test/data/grooves/BluesTripleSus.musicxml +++ b/test/data/grooves/BluesTripleSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Bolero.musicxml b/test/data/grooves/Bolero.musicxml index dfb86c38..487aa9b5 100644 --- a/test/data/grooves/Bolero.musicxml +++ b/test/data/grooves/Bolero.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -134,117 +134,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -352,117 +263,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -570,117 +392,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -788,117 +521,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/Bolero1.musicxml b/test/data/grooves/Bolero1.musicxml index e23a7e36..a4b54e60 100644 --- a/test/data/grooves/Bolero1.musicxml +++ b/test/data/grooves/Bolero1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Bolero1End.musicxml b/test/data/grooves/Bolero1End.musicxml index c927b028..6440877d 100644 --- a/test/data/grooves/Bolero1End.musicxml +++ b/test/data/grooves/Bolero1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -187,155 +187,33 @@ + F 4 - 48 - - - 1 - 64th - up - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - F - 4 - - 3 - + 256 1 - 1024th - up - normal - - - - - - - D - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - D - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - D - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - D - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - D - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - D - 4 - - 48 - - - - 1 - 64th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -343,17 +221,18 @@ D 4 - 12 - - + 256 1 - 256th + eighth + + 3 + 2 + eighth + up normal - - @@ -361,15 +240,19 @@ D 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + eighth + up normal - + @@ -445,25 +328,25 @@ D 4 - 192 + 768 1 - 16th + quarter up normal + F 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/Bolero1Fill.musicxml b/test/data/grooves/Bolero1Fill.musicxml index 325d33ab..fbdb7253 100644 --- a/test/data/grooves/Bolero1Fill.musicxml +++ b/test/data/grooves/Bolero1Fill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Bolero1Intro.musicxml b/test/data/grooves/Bolero1Intro.musicxml index 27a82329..973daa03 100644 --- a/test/data/grooves/Bolero1Intro.musicxml +++ b/test/data/grooves/Bolero1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -709,15 +709,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/Bolero1Sus.musicxml b/test/data/grooves/Bolero1Sus.musicxml index ca5d27f4..96d3dd95 100644 --- a/test/data/grooves/Bolero1Sus.musicxml +++ b/test/data/grooves/Bolero1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Bolero1SusFill.musicxml b/test/data/grooves/Bolero1SusFill.musicxml index ebb5e73b..62dc6879 100644 --- a/test/data/grooves/Bolero1SusFill.musicxml +++ b/test/data/grooves/Bolero1SusFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BoleroAlt.musicxml b/test/data/grooves/BoleroAlt.musicxml index d6444368..e1d2828e 100644 --- a/test/data/grooves/BoleroAlt.musicxml +++ b/test/data/grooves/BoleroAlt.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -134,117 +134,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -352,117 +263,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -570,117 +392,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -788,117 +521,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/BoleroAltFill.musicxml b/test/data/grooves/BoleroAltFill.musicxml index 5146343d..1976548e 100644 --- a/test/data/grooves/BoleroAltFill.musicxml +++ b/test/data/grooves/BoleroAltFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -134,117 +134,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -352,117 +263,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -570,117 +392,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -788,117 +521,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/BoleroAltSus.musicxml b/test/data/grooves/BoleroAltSus.musicxml index fbb9ae25..37f141b0 100644 --- a/test/data/grooves/BoleroAltSus.musicxml +++ b/test/data/grooves/BoleroAltSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -134,117 +134,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -352,117 +263,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -570,117 +392,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -788,117 +521,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/BoleroAltSusFill.musicxml b/test/data/grooves/BoleroAltSusFill.musicxml index 5bf1d61d..11430496 100644 --- a/test/data/grooves/BoleroAltSusFill.musicxml +++ b/test/data/grooves/BoleroAltSusFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -134,117 +134,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -352,117 +263,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -570,117 +392,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -788,117 +521,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/BoleroEnd.musicxml b/test/data/grooves/BoleroEnd.musicxml index 54c29eec..1a6e98ee 100644 --- a/test/data/grooves/BoleroEnd.musicxml +++ b/test/data/grooves/BoleroEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -134,117 +134,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -352,117 +263,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -570,117 +392,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -788,117 +521,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/BoleroFill.musicxml b/test/data/grooves/BoleroFill.musicxml index a7233be3..6a476365 100644 --- a/test/data/grooves/BoleroFill.musicxml +++ b/test/data/grooves/BoleroFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -134,117 +134,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -352,117 +263,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -570,117 +392,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -788,117 +521,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/BoleroIntro.musicxml b/test/data/grooves/BoleroIntro.musicxml index d421d7b0..d0790f65 100644 --- a/test/data/grooves/BoleroIntro.musicxml +++ b/test/data/grooves/BoleroIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -134,117 +134,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -352,117 +263,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -570,117 +392,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -1043,15 +776,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/BoleroSus.musicxml b/test/data/grooves/BoleroSus.musicxml index ea2b8782..582f73c6 100644 --- a/test/data/grooves/BoleroSus.musicxml +++ b/test/data/grooves/BoleroSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -134,117 +134,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -352,117 +263,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -570,117 +392,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -788,117 +521,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/BoleroSusFill.musicxml b/test/data/grooves/BoleroSusFill.musicxml index b6e91f35..b2848683 100644 --- a/test/data/grooves/BoleroSusFill.musicxml +++ b/test/data/grooves/BoleroSusFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -134,117 +134,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -352,117 +263,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -570,117 +392,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -788,117 +521,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/BoneyM.musicxml b/test/data/grooves/BoneyM.musicxml index 0a0caac3..d23da54c 100644 --- a/test/data/grooves/BoneyM.musicxml +++ b/test/data/grooves/BoneyM.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1509,24 +1509,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -1696,24 +1697,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -1883,24 +1885,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2070,24 +2073,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2257,24 +2261,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2444,24 +2449,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2631,24 +2637,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2818,24 +2825,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2988,33 +2996,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - @@ -3022,15 +3025,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - @@ -3038,33 +3039,29 @@ G 5 - 192 - + 384 3 - 16th + eighth up circle-x - + + G 5 - 48 - - + 384 3 - 64th + eighth up circle-x - - @@ -3072,17 +3069,13 @@ G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - @@ -3090,15 +3083,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -3129,8 +3120,6 @@ - - G @@ -3146,6 +3135,7 @@ + G 5 @@ -3187,6 +3177,8 @@ + + G @@ -3206,15 +3198,13 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - @@ -3222,17 +3212,13 @@ G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - @@ -3240,15 +3226,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - @@ -3256,15 +3240,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up circle-x - @@ -3272,35 +3254,28 @@ G 5 - 48 - - + 384 3 - 64th + eighth up circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - @@ -3308,15 +3283,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -3333,6 +3306,8 @@ + + G @@ -3347,8 +3322,6 @@ - - G @@ -3420,19 +3393,18 @@ + G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - @@ -3440,17 +3412,13 @@ G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - @@ -3458,31 +3426,29 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + + G 5 - 192 - + 384 3 - 16th + eighth up circle-x - @@ -3490,17 +3456,13 @@ G 5 - 48 - - + 384 3 - 64th + eighth up circle-x - - @@ -3508,17 +3470,13 @@ G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - @@ -3526,15 +3484,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -3565,9 +3521,8 @@ - - + G 5 @@ -3609,6 +3564,8 @@ + + G @@ -3642,15 +3599,13 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - @@ -3658,17 +3613,13 @@ G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - @@ -3676,15 +3627,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - @@ -3692,33 +3641,28 @@ G 5 - 192 - + 384 3 - 16th + eighth up circle-x - + G 5 - 48 - - + 384 3 - 64th + eighth up circle-x - - @@ -3726,17 +3670,13 @@ G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - @@ -3744,17 +3684,17 @@ G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - + + G @@ -3783,8 +3723,6 @@ - - G @@ -3842,6 +3780,7 @@ + G 5 @@ -3860,15 +3799,13 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - @@ -3876,33 +3813,29 @@ G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - + + G 5 - 6 - + 384 3 - 512th + eighth up circle-x - @@ -3910,15 +3843,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up circle-x - @@ -3926,528 +3857,10 @@ G 5 - 48 - - + 384 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - - - G - 5 - - 384 - - 3 - eighth + eighth up circle-x @@ -4496,6 +3909,7 @@ + G 5 @@ -4509,124 +3923,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - G diff --git a/test/data/grooves/BoneyMEnd.musicxml b/test/data/grooves/BoneyMEnd.musicxml index d7d440e6..cb551b43 100644 --- a/test/data/grooves/BoneyMEnd.musicxml +++ b/test/data/grooves/BoneyMEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -714,14 +714,15 @@ + D 4 - 192 + 384 2 - 16th + eighth down x @@ -746,25 +747,25 @@ D 4 - 192 + 768 2 - 16th + quarter down x + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -919,117 +920,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - + 384 3 - 256th + eighth up circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -1118,15 +1030,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up circle-x diff --git a/test/data/grooves/BoneyMFill.musicxml b/test/data/grooves/BoneyMFill.musicxml index fe9bff72..8d8258e2 100644 --- a/test/data/grooves/BoneyMFill.musicxml +++ b/test/data/grooves/BoneyMFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -513,24 +513,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -760,106 +761,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - G @@ -875,6 +776,7 @@ + G 5 @@ -907,49 +809,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - @@ -957,15 +823,13 @@ G 5 - 48 - + 192 3 - 64th + 16th up circle-x - @@ -973,33 +837,28 @@ G 5 - 12 - - + 192 3 - 256th + 16th up circle-x - - + G 5 - 3 - + 192 3 - 1024th + 16th up circle-x - diff --git a/test/data/grooves/BoneyMIntro.musicxml b/test/data/grooves/BoneyMIntro.musicxml index e6cd4412..c5172318 100644 --- a/test/data/grooves/BoneyMIntro.musicxml +++ b/test/data/grooves/BoneyMIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -933,24 +933,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -1120,24 +1121,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -1307,24 +1309,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -1482,24 +1485,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -1652,117 +1656,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - + 384 3 - 256th + eighth up circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -1870,117 +1785,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - + 384 3 - 256th + eighth up circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -2158,99 +1984,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - + 192 3 - 256th + 16th up circle-x - - + G 5 - 3 - + 192 3 - 1024th + 16th up circle-x - diff --git a/test/data/grooves/BoneyMIntro8.musicxml b/test/data/grooves/BoneyMIntro8.musicxml index 4769343e..47753b0a 100644 --- a/test/data/grooves/BoneyMIntro8.musicxml +++ b/test/data/grooves/BoneyMIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1427,24 +1427,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -1614,24 +1615,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -1789,24 +1791,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -1934,25 +1937,25 @@ D 4 - 192 + 768 2 - 16th + quarter down x + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -2108,24 +2111,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2295,24 +2299,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2464,24 +2469,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2565,15 +2571,15 @@ + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -2612,25 +2618,25 @@ D 4 - 192 + 768 2 - 16th + quarter down x + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -2769,33 +2775,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - @@ -2803,15 +2804,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - @@ -2819,33 +2818,29 @@ G 5 - 192 - + 384 3 - 16th + eighth up circle-x - + + G 5 - 48 - - + 384 3 - 64th + eighth up circle-x - - @@ -2853,17 +2848,13 @@ G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - @@ -2871,15 +2862,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -2910,8 +2899,6 @@ - - G @@ -2927,6 +2914,7 @@ + G 5 @@ -2968,6 +2956,8 @@ + + G @@ -2987,15 +2977,13 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - @@ -3003,17 +2991,13 @@ G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - @@ -3021,15 +3005,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - @@ -3037,15 +3019,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up circle-x - @@ -3053,35 +3033,28 @@ G 5 - 48 - - + 384 3 - 64th + eighth up circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - @@ -3089,15 +3062,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -3114,31 +3085,72 @@ + + + + + 768 + 1 + quarter + + + + + + 768 + 1 + quarter + + + + + + A + 5 + + 768 + + 1 + quarter + up + x + + + + + + 768 + 1 + quarter + + + + + 3072 + G 5 - 384 + 192 3 - eighth + 16th up circle-x - - G 5 - 384 + 192 3 - eighth + 16th up circle-x @@ -3149,10 +3161,10 @@ G 5 - 384 + 192 3 - eighth + 16th up circle-x @@ -3163,10 +3175,10 @@ G 5 - 384 + 192 3 - eighth + 16th up circle-x @@ -3177,10 +3189,10 @@ G 5 - 384 + 192 3 - eighth + 16th up circle-x @@ -3191,10 +3203,10 @@ G 5 - 384 + 192 3 - eighth + 16th up circle-x @@ -3205,15 +3217,13 @@ G 5 - 96 - + 192 3 - 32nd + 16th up circle-x - @@ -3221,17 +3231,13 @@ G 5 - 24 - - + 192 3 - 128th + 16th up circle-x - - @@ -3239,15 +3245,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up circle-x - @@ -3256,14 +3260,12 @@ 5 192 - 3 16th up circle-x - @@ -3271,35 +3273,28 @@ G 5 - 48 - - + 192 3 - 64th + 16th up circle-x - - + G 5 - 12 - - + 192 3 - 256th + 16th up circle-x - - @@ -3307,15 +3302,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up circle-x - @@ -3323,10 +3316,10 @@ G 5 - 384 + 192 3 - eighth + 16th up circle-x @@ -3337,349 +3330,10 @@ G 5 - 384 + 192 3 - eighth - up - circle-x - - - - - - - - 768 - 1 - quarter - - - - - - 768 - 1 - quarter - - - - - - A - 5 - - 768 - - 1 - quarter - up - x - - - - - - 768 - 1 - quarter - - - - - 3072 - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th + 16th up circle-x @@ -3699,22 +3353,22 @@ - - G 5 - 384 + 192 3 - eighth + 16th up circle-x + + G @@ -3776,83 +3430,13 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - + 384 3 - 64th + eighth up circle-x - - @@ -3860,33 +3444,28 @@ G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -3994,117 +3573,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - + 384 3 - 256th + eighth up circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -4212,117 +3702,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - + 384 3 - 256th + eighth up circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - diff --git a/test/data/grooves/BoneyMPlus.musicxml b/test/data/grooves/BoneyMPlus.musicxml index 4d12e692..76150119 100644 --- a/test/data/grooves/BoneyMPlus.musicxml +++ b/test/data/grooves/BoneyMPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1509,24 +1509,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -1696,24 +1697,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -1883,24 +1885,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2070,24 +2073,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2257,24 +2261,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2444,24 +2449,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2631,24 +2637,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2818,24 +2825,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2988,33 +2996,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - @@ -3022,15 +3025,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - @@ -3038,33 +3039,29 @@ G 5 - 192 - + 384 3 - 16th + eighth up circle-x - + + G 5 - 48 - - + 384 3 - 64th + eighth up circle-x - - @@ -3072,17 +3069,13 @@ G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - @@ -3090,15 +3083,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -3129,8 +3120,6 @@ - - G @@ -3146,6 +3135,7 @@ + G 5 @@ -3187,6 +3177,8 @@ + + G @@ -3206,15 +3198,13 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - @@ -3222,17 +3212,13 @@ G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - @@ -3240,15 +3226,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - @@ -3256,15 +3240,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up circle-x - @@ -3272,35 +3254,28 @@ G 5 - 48 - - + 384 3 - 64th + eighth up circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - @@ -3308,15 +3283,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -3333,6 +3306,8 @@ + + G @@ -3347,8 +3322,6 @@ - - G @@ -3420,19 +3393,18 @@ + G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - @@ -3440,17 +3412,13 @@ G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - @@ -3458,31 +3426,29 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + + G 5 - 192 - + 384 3 - 16th + eighth up circle-x - @@ -3490,17 +3456,13 @@ G 5 - 48 - - + 384 3 - 64th + eighth up circle-x - - @@ -3508,17 +3470,13 @@ G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - @@ -3526,15 +3484,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -3565,9 +3521,8 @@ - - + G 5 @@ -3609,6 +3564,8 @@ + + G @@ -3642,15 +3599,13 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - @@ -3658,17 +3613,13 @@ G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - @@ -3676,15 +3627,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - @@ -3692,33 +3641,28 @@ G 5 - 192 - + 384 3 - 16th + eighth up circle-x - + G 5 - 48 - - + 384 3 - 64th + eighth up circle-x - - @@ -3726,17 +3670,13 @@ G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - @@ -3744,17 +3684,17 @@ G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - + + G @@ -3783,8 +3723,6 @@ - - G @@ -3842,6 +3780,7 @@ + G 5 @@ -3860,15 +3799,13 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - @@ -3876,33 +3813,29 @@ G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - + + G 5 - 6 - + 384 3 - 512th + eighth up circle-x - @@ -3910,15 +3843,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up circle-x - @@ -3926,528 +3857,10 @@ G 5 - 48 - - + 384 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - - - G - 5 - - 384 - - 3 - eighth + eighth up circle-x @@ -4496,6 +3909,7 @@ + G 5 @@ -4509,124 +3923,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - G diff --git a/test/data/grooves/BoneyMSus.musicxml b/test/data/grooves/BoneyMSus.musicxml index 288ef23b..04b83b00 100644 --- a/test/data/grooves/BoneyMSus.musicxml +++ b/test/data/grooves/BoneyMSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1509,24 +1509,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -1696,24 +1697,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -1883,24 +1885,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2070,24 +2073,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2257,24 +2261,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2444,24 +2449,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2631,24 +2637,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2818,24 +2825,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2988,33 +2996,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - @@ -3022,15 +3025,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - @@ -3038,33 +3039,29 @@ G 5 - 192 - + 384 3 - 16th + eighth up circle-x - + + G 5 - 48 - - + 384 3 - 64th + eighth up circle-x - - @@ -3072,17 +3069,13 @@ G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - @@ -3090,15 +3083,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -3129,8 +3120,6 @@ - - G @@ -3146,6 +3135,7 @@ + G 5 @@ -3187,6 +3177,8 @@ + + G @@ -3206,15 +3198,13 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - @@ -3222,17 +3212,13 @@ G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - @@ -3240,15 +3226,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - @@ -3256,15 +3240,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up circle-x - @@ -3272,35 +3254,28 @@ G 5 - 48 - - + 384 3 - 64th + eighth up circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - @@ -3308,15 +3283,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -3333,6 +3306,8 @@ + + G @@ -3347,8 +3322,6 @@ - - G @@ -3420,19 +3393,18 @@ + G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - @@ -3440,17 +3412,13 @@ G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - @@ -3458,31 +3426,29 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + + G 5 - 192 - + 384 3 - 16th + eighth up circle-x - @@ -3490,17 +3456,13 @@ G 5 - 48 - - + 384 3 - 64th + eighth up circle-x - - @@ -3508,17 +3470,13 @@ G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - @@ -3526,15 +3484,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -3565,9 +3521,8 @@ - - + G 5 @@ -3609,6 +3564,8 @@ + + G @@ -3642,15 +3599,13 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - @@ -3658,17 +3613,13 @@ G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - @@ -3676,15 +3627,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - @@ -3692,33 +3641,28 @@ G 5 - 192 - + 384 3 - 16th + eighth up circle-x - + G 5 - 48 - - + 384 3 - 64th + eighth up circle-x - - @@ -3726,17 +3670,13 @@ G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - @@ -3744,17 +3684,17 @@ G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - + + G @@ -3783,8 +3723,6 @@ - - G @@ -3842,6 +3780,7 @@ + G 5 @@ -3860,15 +3799,13 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - @@ -3876,33 +3813,29 @@ G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - + + G 5 - 6 - + 384 3 - 512th + eighth up circle-x - @@ -3910,15 +3843,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up circle-x - @@ -3926,528 +3857,10 @@ G 5 - 48 - - + 384 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - - - G - 5 - - 384 - - 3 - eighth + eighth up circle-x @@ -4496,6 +3909,7 @@ + G 5 @@ -4509,124 +3923,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - G diff --git a/test/data/grooves/BoneyMSusPlus.musicxml b/test/data/grooves/BoneyMSusPlus.musicxml index e9a16a41..6d6e73d2 100644 --- a/test/data/grooves/BoneyMSusPlus.musicxml +++ b/test/data/grooves/BoneyMSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1509,24 +1509,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -1696,24 +1697,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -1883,24 +1885,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2070,24 +2073,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2257,24 +2261,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2444,24 +2449,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2631,24 +2637,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2818,24 +2825,25 @@ D 4 - 192 + 384 2 - 16th + eighth down x + D 4 - 192 + 384 2 - 16th + eighth down x @@ -2988,33 +2996,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - @@ -3022,15 +3025,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - @@ -3038,33 +3039,29 @@ G 5 - 192 - + 384 3 - 16th + eighth up circle-x - + + G 5 - 48 - - + 384 3 - 64th + eighth up circle-x - - @@ -3072,17 +3069,13 @@ G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - @@ -3090,15 +3083,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -3129,8 +3120,6 @@ - - G @@ -3146,6 +3135,7 @@ + G 5 @@ -3187,6 +3177,8 @@ + + G @@ -3206,15 +3198,13 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - @@ -3222,17 +3212,13 @@ G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - @@ -3240,15 +3226,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - @@ -3256,15 +3240,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up circle-x - @@ -3272,35 +3254,28 @@ G 5 - 48 - - + 384 3 - 64th + eighth up circle-x - - + G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - @@ -3308,15 +3283,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -3333,6 +3306,8 @@ + + G @@ -3347,8 +3322,6 @@ - - G @@ -3420,19 +3393,18 @@ + G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - @@ -3440,17 +3412,13 @@ G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - @@ -3458,31 +3426,29 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + + G 5 - 192 - + 384 3 - 16th + eighth up circle-x - @@ -3490,17 +3456,13 @@ G 5 - 48 - - + 384 3 - 64th + eighth up circle-x - - @@ -3508,17 +3470,13 @@ G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - @@ -3526,15 +3484,13 @@ G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - @@ -3565,9 +3521,8 @@ - - + G 5 @@ -3609,6 +3564,8 @@ + + G @@ -3642,15 +3599,13 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - @@ -3658,17 +3613,13 @@ G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - @@ -3676,15 +3627,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - @@ -3692,33 +3641,28 @@ G 5 - 192 - + 384 3 - 16th + eighth up circle-x - + G 5 - 48 - - + 384 3 - 64th + eighth up circle-x - - @@ -3726,17 +3670,13 @@ G 5 - 12 - - + 384 3 - 256th + eighth up circle-x - - @@ -3744,17 +3684,17 @@ G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - + + G @@ -3783,8 +3723,6 @@ - - G @@ -3842,6 +3780,7 @@ + G 5 @@ -3860,15 +3799,13 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - @@ -3876,33 +3813,29 @@ G 5 - 24 - - + 384 3 - 128th + eighth up circle-x - - + + G 5 - 6 - + 384 3 - 512th + eighth up circle-x - @@ -3910,15 +3843,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up circle-x - @@ -3926,528 +3857,10 @@ G 5 - 48 - - + 384 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - - - G - 5 - - 384 - - 3 - eighth + eighth up circle-x @@ -4496,6 +3909,7 @@ + G 5 @@ -4509,124 +3923,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - G diff --git a/test/data/grooves/BossaNova.musicxml b/test/data/grooves/BossaNova.musicxml index 73b819f9..1644b1ac 100644 --- a/test/data/grooves/BossaNova.musicxml +++ b/test/data/grooves/BossaNova.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BossaNova1End.musicxml b/test/data/grooves/BossaNova1End.musicxml index a2bd0ec7..5f32c97a 100644 --- a/test/data/grooves/BossaNova1End.musicxml +++ b/test/data/grooves/BossaNova1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BossaNova1Sus.musicxml b/test/data/grooves/BossaNova1Sus.musicxml index 9cbec173..928779bd 100644 --- a/test/data/grooves/BossaNova1Sus.musicxml +++ b/test/data/grooves/BossaNova1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BossaNova1SusPlus.musicxml b/test/data/grooves/BossaNova1SusPlus.musicxml index f5ab2cd9..8db641c4 100644 --- a/test/data/grooves/BossaNova1SusPlus.musicxml +++ b/test/data/grooves/BossaNova1SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BossaNova2End.musicxml b/test/data/grooves/BossaNova2End.musicxml index 0a4226f9..606b0b5e 100644 --- a/test/data/grooves/BossaNova2End.musicxml +++ b/test/data/grooves/BossaNova2End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BossaNova2Sus.musicxml b/test/data/grooves/BossaNova2Sus.musicxml index 6b2a14c9..00607797 100644 --- a/test/data/grooves/BossaNova2Sus.musicxml +++ b/test/data/grooves/BossaNova2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BossaNova2SusPlus.musicxml b/test/data/grooves/BossaNova2SusPlus.musicxml index 2743ff33..787cbbd8 100644 --- a/test/data/grooves/BossaNova2SusPlus.musicxml +++ b/test/data/grooves/BossaNova2SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BossaNova3Sus.musicxml b/test/data/grooves/BossaNova3Sus.musicxml index d010819d..94822d33 100644 --- a/test/data/grooves/BossaNova3Sus.musicxml +++ b/test/data/grooves/BossaNova3Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BossaNova3SusPlus.musicxml b/test/data/grooves/BossaNova3SusPlus.musicxml index 79441c61..71c160ce 100644 --- a/test/data/grooves/BossaNova3SusPlus.musicxml +++ b/test/data/grooves/BossaNova3SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BossaNovaEnd.musicxml b/test/data/grooves/BossaNovaEnd.musicxml index 4dbbd371..4df3e598 100644 --- a/test/data/grooves/BossaNovaEnd.musicxml +++ b/test/data/grooves/BossaNovaEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BossaNovaFill.musicxml b/test/data/grooves/BossaNovaFill.musicxml index dadd930e..4e21c457 100644 --- a/test/data/grooves/BossaNovaFill.musicxml +++ b/test/data/grooves/BossaNovaFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -673,15 +673,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -734,25 +734,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -870,25 +870,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -1044,15 +1044,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -1105,25 +1105,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -1241,25 +1241,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/BossaNovaIntro.musicxml b/test/data/grooves/BossaNovaIntro.musicxml index 80bbbe27..a932bb3a 100644 --- a/test/data/grooves/BossaNovaIntro.musicxml +++ b/test/data/grooves/BossaNovaIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BossaNovaIntro1.musicxml b/test/data/grooves/BossaNovaIntro1.musicxml index 01f3b31a..af584688 100644 --- a/test/data/grooves/BossaNovaIntro1.musicxml +++ b/test/data/grooves/BossaNovaIntro1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BossaNovaIntro8.musicxml b/test/data/grooves/BossaNovaIntro8.musicxml index 93c5d29e..aa904381 100644 --- a/test/data/grooves/BossaNovaIntro8.musicxml +++ b/test/data/grooves/BossaNovaIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BossaNovaPlus.musicxml b/test/data/grooves/BossaNovaPlus.musicxml index 806878f7..805888f7 100644 --- a/test/data/grooves/BossaNovaPlus.musicxml +++ b/test/data/grooves/BossaNovaPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BossaNovaSus.musicxml b/test/data/grooves/BossaNovaSus.musicxml index 7dc9a4a0..d19b4591 100644 --- a/test/data/grooves/BossaNovaSus.musicxml +++ b/test/data/grooves/BossaNovaSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BossaNovaSusPlus.musicxml b/test/data/grooves/BossaNovaSusPlus.musicxml index 59768e95..0b315b25 100644 --- a/test/data/grooves/BossaNovaSusPlus.musicxml +++ b/test/data/grooves/BossaNovaSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Broadway.musicxml b/test/data/grooves/Broadway.musicxml index bd5c6266..93af77ed 100644 --- a/test/data/grooves/Broadway.musicxml +++ b/test/data/grooves/Broadway.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Broadway1.musicxml b/test/data/grooves/Broadway1.musicxml index 23538755..89542c98 100644 --- a/test/data/grooves/Broadway1.musicxml +++ b/test/data/grooves/Broadway1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Broadway1Sus.musicxml b/test/data/grooves/Broadway1Sus.musicxml index 4a576ec7..93d21fab 100644 --- a/test/data/grooves/Broadway1Sus.musicxml +++ b/test/data/grooves/Broadway1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Broadway2.musicxml b/test/data/grooves/Broadway2.musicxml index 95128e09..7401cc49 100644 --- a/test/data/grooves/Broadway2.musicxml +++ b/test/data/grooves/Broadway2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Broadway2Sus.musicxml b/test/data/grooves/Broadway2Sus.musicxml index 18d5f7c6..379a00aa 100644 --- a/test/data/grooves/Broadway2Sus.musicxml +++ b/test/data/grooves/Broadway2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BroadwayEnd.musicxml b/test/data/grooves/BroadwayEnd.musicxml index 182703ea..a9c0448e 100644 --- a/test/data/grooves/BroadwayEnd.musicxml +++ b/test/data/grooves/BroadwayEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -539,25 +539,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -582,25 +582,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/BroadwayFill.musicxml b/test/data/grooves/BroadwayFill.musicxml index c8bfe37d..da531b29 100644 --- a/test/data/grooves/BroadwayFill.musicxml +++ b/test/data/grooves/BroadwayFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BroadwayIntro.musicxml b/test/data/grooves/BroadwayIntro.musicxml index 7dd2caea..7283c5b3 100644 --- a/test/data/grooves/BroadwayIntro.musicxml +++ b/test/data/grooves/BroadwayIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BroadwayIntro8.musicxml b/test/data/grooves/BroadwayIntro8.musicxml index b0818b36..988d692b 100644 --- a/test/data/grooves/BroadwayIntro8.musicxml +++ b/test/data/grooves/BroadwayIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BroadwaySus.musicxml b/test/data/grooves/BroadwaySus.musicxml index 4415082b..a3b7d39a 100644 --- a/test/data/grooves/BroadwaySus.musicxml +++ b/test/data/grooves/BroadwaySus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BroadwayWaltz.musicxml b/test/data/grooves/BroadwayWaltz.musicxml index 6a696c3f..a524f284 100644 --- a/test/data/grooves/BroadwayWaltz.musicxml +++ b/test/data/grooves/BroadwayWaltz.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BroadwayWaltz1.musicxml b/test/data/grooves/BroadwayWaltz1.musicxml index 151b91f1..aafb1770 100644 --- a/test/data/grooves/BroadwayWaltz1.musicxml +++ b/test/data/grooves/BroadwayWaltz1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BroadwayWaltz1Sus.musicxml b/test/data/grooves/BroadwayWaltz1Sus.musicxml index ea75826b..db628cbf 100644 --- a/test/data/grooves/BroadwayWaltz1Sus.musicxml +++ b/test/data/grooves/BroadwayWaltz1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BroadwayWaltz2.musicxml b/test/data/grooves/BroadwayWaltz2.musicxml index 628474fe..81a321b9 100644 --- a/test/data/grooves/BroadwayWaltz2.musicxml +++ b/test/data/grooves/BroadwayWaltz2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BroadwayWaltz2Sus.musicxml b/test/data/grooves/BroadwayWaltz2Sus.musicxml index 413a49fb..ebd5d94e 100644 --- a/test/data/grooves/BroadwayWaltz2Sus.musicxml +++ b/test/data/grooves/BroadwayWaltz2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BroadwayWaltzEnd.musicxml b/test/data/grooves/BroadwayWaltzEnd.musicxml index 7ef6ed63..6314cb99 100644 --- a/test/data/grooves/BroadwayWaltzEnd.musicxml +++ b/test/data/grooves/BroadwayWaltzEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BroadwayWaltzIntro.musicxml b/test/data/grooves/BroadwayWaltzIntro.musicxml index 03e676f3..046cf9f8 100644 --- a/test/data/grooves/BroadwayWaltzIntro.musicxml +++ b/test/data/grooves/BroadwayWaltzIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BroadwayWaltzIntro8.musicxml b/test/data/grooves/BroadwayWaltzIntro8.musicxml index 78106cef..79395e7b 100644 --- a/test/data/grooves/BroadwayWaltzIntro8.musicxml +++ b/test/data/grooves/BroadwayWaltzIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BroadwayWaltzSus.musicxml b/test/data/grooves/BroadwayWaltzSus.musicxml index 900eeb45..8e578abb 100644 --- a/test/data/grooves/BroadwayWaltzSus.musicxml +++ b/test/data/grooves/BroadwayWaltzSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/BubbleRock.musicxml b/test/data/grooves/BubbleRock.musicxml index def425fb..1dfbfb7b 100644 --- a/test/data/grooves/BubbleRock.musicxml +++ b/test/data/grooves/BubbleRock.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -365,15 +365,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -406,25 +406,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -461,15 +461,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -502,25 +502,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -557,15 +557,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -598,25 +598,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -653,15 +653,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -686,25 +686,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/BubbleRockEnd.musicxml b/test/data/grooves/BubbleRockEnd.musicxml index 5af05971..0f7b0360 100644 --- a/test/data/grooves/BubbleRockEnd.musicxml +++ b/test/data/grooves/BubbleRockEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -311,15 +311,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -352,25 +352,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -407,15 +407,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/BubbleRockFill.musicxml b/test/data/grooves/BubbleRockFill.musicxml index c5e026a6..aadd93d9 100644 --- a/test/data/grooves/BubbleRockFill.musicxml +++ b/test/data/grooves/BubbleRockFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -265,15 +265,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -298,25 +298,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/BubbleRockIntro.musicxml b/test/data/grooves/BubbleRockIntro.musicxml index bdbdac2e..0daa23c5 100644 --- a/test/data/grooves/BubbleRockIntro.musicxml +++ b/test/data/grooves/BubbleRockIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -409,15 +409,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -450,25 +450,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -505,15 +505,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -546,25 +546,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -601,15 +601,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -642,25 +642,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -697,15 +697,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/BubbleRockPlus.musicxml b/test/data/grooves/BubbleRockPlus.musicxml index e101faef..bb0bd75b 100644 --- a/test/data/grooves/BubbleRockPlus.musicxml +++ b/test/data/grooves/BubbleRockPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -365,15 +365,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -406,25 +406,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -461,15 +461,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -502,25 +502,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -557,15 +557,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -598,25 +598,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -653,15 +653,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -686,25 +686,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/BubbleRockSus.musicxml b/test/data/grooves/BubbleRockSus.musicxml index ce0e9c52..5bf63262 100644 --- a/test/data/grooves/BubbleRockSus.musicxml +++ b/test/data/grooves/BubbleRockSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -365,15 +365,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -406,25 +406,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -461,15 +461,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -502,25 +502,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -557,15 +557,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -598,25 +598,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -653,15 +653,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -686,25 +686,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/BubbleRockSusPlus.musicxml b/test/data/grooves/BubbleRockSusPlus.musicxml index 7501c374..dd598e6f 100644 --- a/test/data/grooves/BubbleRockSusPlus.musicxml +++ b/test/data/grooves/BubbleRockSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -365,15 +365,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -406,25 +406,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -461,15 +461,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -502,25 +502,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -557,15 +557,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -598,25 +598,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -653,15 +653,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -686,25 +686,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/CNTR01.musicxml b/test/data/grooves/CNTR01.musicxml index 008aeeb8..cbcbb2d3 100644 --- a/test/data/grooves/CNTR01.musicxml +++ b/test/data/grooves/CNTR01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CNTR02.musicxml b/test/data/grooves/CNTR02.musicxml index 1a766b20..1b0c5f32 100644 --- a/test/data/grooves/CNTR02.musicxml +++ b/test/data/grooves/CNTR02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CNTR03.musicxml b/test/data/grooves/CNTR03.musicxml index 20835616..a4405b18 100644 --- a/test/data/grooves/CNTR03.musicxml +++ b/test/data/grooves/CNTR03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -263,22 +263,25 @@ - 384 - + 512 2 - eighth - - - - - - - 192 - - 2 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -286,10 +289,15 @@ D 5 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -297,10 +305,16 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -574,84 +588,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 288 - + 256 3 - 16th - + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -659,17 +617,18 @@ G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - @@ -677,29 +636,19 @@ G 5 - 6 - + 256 3 - 512th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th + eighth + + 3 + 2 + eighth + up x + @@ -918,38 +867,6 @@ - - - 48 - - 3 - 64th - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - G diff --git a/test/data/grooves/CNTR04.musicxml b/test/data/grooves/CNTR04.musicxml index 2b775b9b..ead865e7 100644 --- a/test/data/grooves/CNTR04.musicxml +++ b/test/data/grooves/CNTR04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -853,102 +853,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 288 - - - 3 - 16th - - up - x - - - - - - - G - 5 - - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -956,23 +882,32 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - - 192 + 256 3 - 16th + eighth + + 3 + 2 + eighth + + diff --git a/test/data/grooves/CNTRY.musicxml b/test/data/grooves/CNTRY.musicxml index e519eea4..27758dee 100644 --- a/test/data/grooves/CNTRY.musicxml +++ b/test/data/grooves/CNTRY.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/COUNT.musicxml b/test/data/grooves/COUNT.musicxml index 5547892a..fc432fbd 100644 --- a/test/data/grooves/COUNT.musicxml +++ b/test/data/grooves/COUNT.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Calypso.musicxml b/test/data/grooves/Calypso.musicxml index b08ec0a2..0bb551e8 100644 --- a/test/data/grooves/Calypso.musicxml +++ b/test/data/grooves/Calypso.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Calypso1.musicxml b/test/data/grooves/Calypso1.musicxml index f1dc9f61..d4a0b197 100644 --- a/test/data/grooves/Calypso1.musicxml +++ b/test/data/grooves/Calypso1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Calypso1Plus.musicxml b/test/data/grooves/Calypso1Plus.musicxml index 172bc1f8..60f6848d 100644 --- a/test/data/grooves/Calypso1Plus.musicxml +++ b/test/data/grooves/Calypso1Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Calypso1Sus.musicxml b/test/data/grooves/Calypso1Sus.musicxml index aee9960f..cdc655a8 100644 --- a/test/data/grooves/Calypso1Sus.musicxml +++ b/test/data/grooves/Calypso1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Calypso1SusPlus.musicxml b/test/data/grooves/Calypso1SusPlus.musicxml index 80dccaec..4da6dadf 100644 --- a/test/data/grooves/Calypso1SusPlus.musicxml +++ b/test/data/grooves/Calypso1SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Calypso8Intro.musicxml b/test/data/grooves/Calypso8Intro.musicxml index 10a95c7b..f5bacbe9 100644 --- a/test/data/grooves/Calypso8Intro.musicxml +++ b/test/data/grooves/Calypso8Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CalypsoEnd.musicxml b/test/data/grooves/CalypsoEnd.musicxml index a2f000f7..20b998ae 100644 --- a/test/data/grooves/CalypsoEnd.musicxml +++ b/test/data/grooves/CalypsoEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CalypsoIntro.musicxml b/test/data/grooves/CalypsoIntro.musicxml index f795bff1..261351fd 100644 --- a/test/data/grooves/CalypsoIntro.musicxml +++ b/test/data/grooves/CalypsoIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CalypsoPlus.musicxml b/test/data/grooves/CalypsoPlus.musicxml index 279775b8..bc618f46 100644 --- a/test/data/grooves/CalypsoPlus.musicxml +++ b/test/data/grooves/CalypsoPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CalypsoSus.musicxml b/test/data/grooves/CalypsoSus.musicxml index ef9b8a04..14e666bb 100644 --- a/test/data/grooves/CalypsoSus.musicxml +++ b/test/data/grooves/CalypsoSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CalypsoSusPlus.musicxml b/test/data/grooves/CalypsoSusPlus.musicxml index 5d9d7278..b8020347 100644 --- a/test/data/grooves/CalypsoSusPlus.musicxml +++ b/test/data/grooves/CalypsoSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ChaCha.musicxml b/test/data/grooves/ChaCha.musicxml index 0b3b9c4f..7bddab0d 100644 --- a/test/data/grooves/ChaCha.musicxml +++ b/test/data/grooves/ChaCha.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ChaCha1.musicxml b/test/data/grooves/ChaCha1.musicxml index a5f45c6c..86c9b654 100644 --- a/test/data/grooves/ChaCha1.musicxml +++ b/test/data/grooves/ChaCha1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ChaCha1Fill.musicxml b/test/data/grooves/ChaCha1Fill.musicxml index f7e17c8a..59feddec 100644 --- a/test/data/grooves/ChaCha1Fill.musicxml +++ b/test/data/grooves/ChaCha1Fill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ChaCha1Sus.musicxml b/test/data/grooves/ChaCha1Sus.musicxml index ba7e7af8..d728073d 100644 --- a/test/data/grooves/ChaCha1Sus.musicxml +++ b/test/data/grooves/ChaCha1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ChaChaEnd.musicxml b/test/data/grooves/ChaChaEnd.musicxml index 879c61ec..1292454c 100644 --- a/test/data/grooves/ChaChaEnd.musicxml +++ b/test/data/grooves/ChaChaEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ChaChaFill.musicxml b/test/data/grooves/ChaChaFill.musicxml index beff3edd..f0e936f4 100644 --- a/test/data/grooves/ChaChaFill.musicxml +++ b/test/data/grooves/ChaChaFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ChaChaIntro.musicxml b/test/data/grooves/ChaChaIntro.musicxml index 51854c53..73e0e755 100644 --- a/test/data/grooves/ChaChaIntro.musicxml +++ b/test/data/grooves/ChaChaIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ChaChaIntro8.musicxml b/test/data/grooves/ChaChaIntro8.musicxml index bc9bffc1..31901c9a 100644 --- a/test/data/grooves/ChaChaIntro8.musicxml +++ b/test/data/grooves/ChaChaIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ChaChaSus.musicxml b/test/data/grooves/ChaChaSus.musicxml index d16b797f..8bdbfbf3 100644 --- a/test/data/grooves/ChaChaSus.musicxml +++ b/test/data/grooves/ChaChaSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Charleston.musicxml b/test/data/grooves/Charleston.musicxml index 0923d246..6c76c396 100644 --- a/test/data/grooves/Charleston.musicxml +++ b/test/data/grooves/Charleston.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Charleston1.musicxml b/test/data/grooves/Charleston1.musicxml index ea32f9af..02bf97b0 100644 --- a/test/data/grooves/Charleston1.musicxml +++ b/test/data/grooves/Charleston1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Charleston1Plus.musicxml b/test/data/grooves/Charleston1Plus.musicxml index 25e42789..18a2b59c 100644 --- a/test/data/grooves/Charleston1Plus.musicxml +++ b/test/data/grooves/Charleston1Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Charleston1Sus.musicxml b/test/data/grooves/Charleston1Sus.musicxml index 06a855e2..bf41e8f9 100644 --- a/test/data/grooves/Charleston1Sus.musicxml +++ b/test/data/grooves/Charleston1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Charleston1SusPlus.musicxml b/test/data/grooves/Charleston1SusPlus.musicxml index 11ed7407..f4dfae29 100644 --- a/test/data/grooves/Charleston1SusPlus.musicxml +++ b/test/data/grooves/Charleston1SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Charleston1Walk.musicxml b/test/data/grooves/Charleston1Walk.musicxml index e0000117..beb785f6 100644 --- a/test/data/grooves/Charleston1Walk.musicxml +++ b/test/data/grooves/Charleston1Walk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Charleston1WalkPlus.musicxml b/test/data/grooves/Charleston1WalkPlus.musicxml index 0f5476a7..0df7fdeb 100644 --- a/test/data/grooves/Charleston1WalkPlus.musicxml +++ b/test/data/grooves/Charleston1WalkPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Charleston1WalkSus.musicxml b/test/data/grooves/Charleston1WalkSus.musicxml index 0302941b..8ed41b44 100644 --- a/test/data/grooves/Charleston1WalkSus.musicxml +++ b/test/data/grooves/Charleston1WalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Charleston1WalkSusPlus.musicxml b/test/data/grooves/Charleston1WalkSusPlus.musicxml index 07699159..26e12bc9 100644 --- a/test/data/grooves/Charleston1WalkSusPlus.musicxml +++ b/test/data/grooves/Charleston1WalkSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Charleston2.musicxml b/test/data/grooves/Charleston2.musicxml index a799dc54..ad5e9ec9 100644 --- a/test/data/grooves/Charleston2.musicxml +++ b/test/data/grooves/Charleston2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Charleston2Plus.musicxml b/test/data/grooves/Charleston2Plus.musicxml index b725b4bb..451ac416 100644 --- a/test/data/grooves/Charleston2Plus.musicxml +++ b/test/data/grooves/Charleston2Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Charleston2Sus.musicxml b/test/data/grooves/Charleston2Sus.musicxml index 10bc4072..16346a83 100644 --- a/test/data/grooves/Charleston2Sus.musicxml +++ b/test/data/grooves/Charleston2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Charleston2SusPlus.musicxml b/test/data/grooves/Charleston2SusPlus.musicxml index ead46b64..40444d2a 100644 --- a/test/data/grooves/Charleston2SusPlus.musicxml +++ b/test/data/grooves/Charleston2SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Charleston2Walk.musicxml b/test/data/grooves/Charleston2Walk.musicxml index 7f6eee23..4bdbcaea 100644 --- a/test/data/grooves/Charleston2Walk.musicxml +++ b/test/data/grooves/Charleston2Walk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Charleston2WalkPlus.musicxml b/test/data/grooves/Charleston2WalkPlus.musicxml index a1c26bea..880f331d 100644 --- a/test/data/grooves/Charleston2WalkPlus.musicxml +++ b/test/data/grooves/Charleston2WalkPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Charleston2WalkSus.musicxml b/test/data/grooves/Charleston2WalkSus.musicxml index 0121c5e3..c87fd026 100644 --- a/test/data/grooves/Charleston2WalkSus.musicxml +++ b/test/data/grooves/Charleston2WalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Charleston2WalkSusPlus.musicxml b/test/data/grooves/Charleston2WalkSusPlus.musicxml index 7fee6beb..56f50e30 100644 --- a/test/data/grooves/Charleston2WalkSusPlus.musicxml +++ b/test/data/grooves/Charleston2WalkSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CharlestonEnd.musicxml b/test/data/grooves/CharlestonEnd.musicxml index b6338662..65567295 100644 --- a/test/data/grooves/CharlestonEnd.musicxml +++ b/test/data/grooves/CharlestonEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CharlestonIntro.musicxml b/test/data/grooves/CharlestonIntro.musicxml index 9fe55f51..d599d48c 100644 --- a/test/data/grooves/CharlestonIntro.musicxml +++ b/test/data/grooves/CharlestonIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CharlestonIntro8.musicxml b/test/data/grooves/CharlestonIntro8.musicxml index 938e5b49..8f962bfa 100644 --- a/test/data/grooves/CharlestonIntro8.musicxml +++ b/test/data/grooves/CharlestonIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CharlestonPlus.musicxml b/test/data/grooves/CharlestonPlus.musicxml index 3c4f45cf..feae5cf3 100644 --- a/test/data/grooves/CharlestonPlus.musicxml +++ b/test/data/grooves/CharlestonPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CharlestonSus.musicxml b/test/data/grooves/CharlestonSus.musicxml index 788c7161..3c8fbaf4 100644 --- a/test/data/grooves/CharlestonSus.musicxml +++ b/test/data/grooves/CharlestonSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CharlestonSusPlus.musicxml b/test/data/grooves/CharlestonSusPlus.musicxml index 04b0648e..1296d683 100644 --- a/test/data/grooves/CharlestonSusPlus.musicxml +++ b/test/data/grooves/CharlestonSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CharlestonWalk.musicxml b/test/data/grooves/CharlestonWalk.musicxml index b9fde015..264c0ce5 100644 --- a/test/data/grooves/CharlestonWalk.musicxml +++ b/test/data/grooves/CharlestonWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CharlestonWalkPlus.musicxml b/test/data/grooves/CharlestonWalkPlus.musicxml index dc8a6943..d343baab 100644 --- a/test/data/grooves/CharlestonWalkPlus.musicxml +++ b/test/data/grooves/CharlestonWalkPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CharlestonWalkSus.musicxml b/test/data/grooves/CharlestonWalkSus.musicxml index 3b50b6fa..2568c334 100644 --- a/test/data/grooves/CharlestonWalkSus.musicxml +++ b/test/data/grooves/CharlestonWalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CharlestonWalkSusPlus.musicxml b/test/data/grooves/CharlestonWalkSusPlus.musicxml index ced1cd15..323d6294 100644 --- a/test/data/grooves/CharlestonWalkSusPlus.musicxml +++ b/test/data/grooves/CharlestonWalkSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Click.musicxml b/test/data/grooves/Click.musicxml index e178cb30..999f1505 100644 --- a/test/data/grooves/Click.musicxml +++ b/test/data/grooves/Click.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryBlues.musicxml b/test/data/grooves/CountryBlues.musicxml index ec4d5ee7..0d6d3d9a 100644 --- a/test/data/grooves/CountryBlues.musicxml +++ b/test/data/grooves/CountryBlues.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryBlues1.musicxml b/test/data/grooves/CountryBlues1.musicxml index 1efba4d1..0da16c1c 100644 --- a/test/data/grooves/CountryBlues1.musicxml +++ b/test/data/grooves/CountryBlues1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryBlues1Fill.musicxml b/test/data/grooves/CountryBlues1Fill.musicxml index 55ac6875..e26dcce2 100644 --- a/test/data/grooves/CountryBlues1Fill.musicxml +++ b/test/data/grooves/CountryBlues1Fill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryBlues1Sus.musicxml b/test/data/grooves/CountryBlues1Sus.musicxml index 942f545b..418786c2 100644 --- a/test/data/grooves/CountryBlues1Sus.musicxml +++ b/test/data/grooves/CountryBlues1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryBlues1Walk.musicxml b/test/data/grooves/CountryBlues1Walk.musicxml index 0841b9a8..5b910ecb 100644 --- a/test/data/grooves/CountryBlues1Walk.musicxml +++ b/test/data/grooves/CountryBlues1Walk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryBlues1WalkFill.musicxml b/test/data/grooves/CountryBlues1WalkFill.musicxml index 81433301..66e67630 100644 --- a/test/data/grooves/CountryBlues1WalkFill.musicxml +++ b/test/data/grooves/CountryBlues1WalkFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryBlues1WalkSus.musicxml b/test/data/grooves/CountryBlues1WalkSus.musicxml index 38a2196f..84dabb38 100644 --- a/test/data/grooves/CountryBlues1WalkSus.musicxml +++ b/test/data/grooves/CountryBlues1WalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryBluesEnd.musicxml b/test/data/grooves/CountryBluesEnd.musicxml index f374fd1a..d47bcaf5 100644 --- a/test/data/grooves/CountryBluesEnd.musicxml +++ b/test/data/grooves/CountryBluesEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryBluesFill.musicxml b/test/data/grooves/CountryBluesFill.musicxml index a013bd96..bddcb5f3 100644 --- a/test/data/grooves/CountryBluesFill.musicxml +++ b/test/data/grooves/CountryBluesFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryBluesIntro.musicxml b/test/data/grooves/CountryBluesIntro.musicxml index 09c3a4ed..00819a6b 100644 --- a/test/data/grooves/CountryBluesIntro.musicxml +++ b/test/data/grooves/CountryBluesIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryBluesSus.musicxml b/test/data/grooves/CountryBluesSus.musicxml index eec31dd1..2e69628f 100644 --- a/test/data/grooves/CountryBluesSus.musicxml +++ b/test/data/grooves/CountryBluesSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryBluesWalk.musicxml b/test/data/grooves/CountryBluesWalk.musicxml index 23ed06ad..40ce2ad8 100644 --- a/test/data/grooves/CountryBluesWalk.musicxml +++ b/test/data/grooves/CountryBluesWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryBluesWalkFill.musicxml b/test/data/grooves/CountryBluesWalkFill.musicxml index 51693a6d..ea7ce6c1 100644 --- a/test/data/grooves/CountryBluesWalkFill.musicxml +++ b/test/data/grooves/CountryBluesWalkFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryBluesWalkSus.musicxml b/test/data/grooves/CountryBluesWalkSus.musicxml index 468ccfcc..fa2a8026 100644 --- a/test/data/grooves/CountryBluesWalkSus.musicxml +++ b/test/data/grooves/CountryBluesWalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountrySwing.musicxml b/test/data/grooves/CountrySwing.musicxml index 07bd1036..cacec481 100644 --- a/test/data/grooves/CountrySwing.musicxml +++ b/test/data/grooves/CountrySwing.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountrySwing1.musicxml b/test/data/grooves/CountrySwing1.musicxml index 729d235d..5c6e8a7d 100644 --- a/test/data/grooves/CountrySwing1.musicxml +++ b/test/data/grooves/CountrySwing1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountrySwing1Sus.musicxml b/test/data/grooves/CountrySwing1Sus.musicxml index 3ddffe70..265c5d3a 100644 --- a/test/data/grooves/CountrySwing1Sus.musicxml +++ b/test/data/grooves/CountrySwing1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountrySwing2.musicxml b/test/data/grooves/CountrySwing2.musicxml index 54ad4600..1d5932c6 100644 --- a/test/data/grooves/CountrySwing2.musicxml +++ b/test/data/grooves/CountrySwing2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountrySwing2Sus.musicxml b/test/data/grooves/CountrySwing2Sus.musicxml index eea55daa..c645397a 100644 --- a/test/data/grooves/CountrySwing2Sus.musicxml +++ b/test/data/grooves/CountrySwing2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountrySwingEnd.musicxml b/test/data/grooves/CountrySwingEnd.musicxml index 119c01e0..db19c9b8 100644 --- a/test/data/grooves/CountrySwingEnd.musicxml +++ b/test/data/grooves/CountrySwingEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountrySwingIntro.musicxml b/test/data/grooves/CountrySwingIntro.musicxml index 6d4ebd8d..44664cc7 100644 --- a/test/data/grooves/CountrySwingIntro.musicxml +++ b/test/data/grooves/CountrySwingIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountrySwingSus.musicxml b/test/data/grooves/CountrySwingSus.musicxml index 35e62130..b48227fc 100644 --- a/test/data/grooves/CountrySwingSus.musicxml +++ b/test/data/grooves/CountrySwingSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryWaltz.musicxml b/test/data/grooves/CountryWaltz.musicxml index 7f17914e..c2374cca 100644 --- a/test/data/grooves/CountryWaltz.musicxml +++ b/test/data/grooves/CountryWaltz.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryWaltz1.musicxml b/test/data/grooves/CountryWaltz1.musicxml index bdca4cee..d9ac9c81 100644 --- a/test/data/grooves/CountryWaltz1.musicxml +++ b/test/data/grooves/CountryWaltz1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryWaltz1Sus.musicxml b/test/data/grooves/CountryWaltz1Sus.musicxml index 55d824b3..4e044434 100644 --- a/test/data/grooves/CountryWaltz1Sus.musicxml +++ b/test/data/grooves/CountryWaltz1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryWaltz1SusWalk.musicxml b/test/data/grooves/CountryWaltz1SusWalk.musicxml index 8131e84d..bb20707e 100644 --- a/test/data/grooves/CountryWaltz1SusWalk.musicxml +++ b/test/data/grooves/CountryWaltz1SusWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryWaltz1Walk.musicxml b/test/data/grooves/CountryWaltz1Walk.musicxml index 6a09e4e0..f6b7e959 100644 --- a/test/data/grooves/CountryWaltz1Walk.musicxml +++ b/test/data/grooves/CountryWaltz1Walk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryWaltz2.musicxml b/test/data/grooves/CountryWaltz2.musicxml index d144c91b..775ca722 100644 --- a/test/data/grooves/CountryWaltz2.musicxml +++ b/test/data/grooves/CountryWaltz2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryWaltz2Sus.musicxml b/test/data/grooves/CountryWaltz2Sus.musicxml index 86fd41c5..f870f567 100644 --- a/test/data/grooves/CountryWaltz2Sus.musicxml +++ b/test/data/grooves/CountryWaltz2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryWaltz2SusWalk.musicxml b/test/data/grooves/CountryWaltz2SusWalk.musicxml index 06935dc0..62d458ba 100644 --- a/test/data/grooves/CountryWaltz2SusWalk.musicxml +++ b/test/data/grooves/CountryWaltz2SusWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryWaltzEnd.musicxml b/test/data/grooves/CountryWaltzEnd.musicxml index a75e30a4..a13a853d 100644 --- a/test/data/grooves/CountryWaltzEnd.musicxml +++ b/test/data/grooves/CountryWaltzEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryWaltzIntro.musicxml b/test/data/grooves/CountryWaltzIntro.musicxml index 8d874a76..1129b001 100644 --- a/test/data/grooves/CountryWaltzIntro.musicxml +++ b/test/data/grooves/CountryWaltzIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryWaltzIntro8.musicxml b/test/data/grooves/CountryWaltzIntro8.musicxml index c0856405..95f60a26 100644 --- a/test/data/grooves/CountryWaltzIntro8.musicxml +++ b/test/data/grooves/CountryWaltzIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryWaltzSus.musicxml b/test/data/grooves/CountryWaltzSus.musicxml index 0e83c25e..7cf2e037 100644 --- a/test/data/grooves/CountryWaltzSus.musicxml +++ b/test/data/grooves/CountryWaltzSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryWaltzWalk.musicxml b/test/data/grooves/CountryWaltzWalk.musicxml index d0b40072..827d8959 100644 --- a/test/data/grooves/CountryWaltzWalk.musicxml +++ b/test/data/grooves/CountryWaltzWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/CountryWaltzWalkSus.musicxml b/test/data/grooves/CountryWaltzWalkSus.musicxml index 521bd892..7ba29608 100644 --- a/test/data/grooves/CountryWaltzWalkSus.musicxml +++ b/test/data/grooves/CountryWaltzWalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Countrywaltz2Walk.musicxml b/test/data/grooves/Countrywaltz2Walk.musicxml index 0c7268c7..3b1b0f9a 100644 --- a/test/data/grooves/Countrywaltz2Walk.musicxml +++ b/test/data/grooves/Countrywaltz2Walk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DANC01.musicxml b/test/data/grooves/DANC01.musicxml index eb3f573d..9e8b27d4 100644 --- a/test/data/grooves/DANC01.musicxml +++ b/test/data/grooves/DANC01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DANC02.musicxml b/test/data/grooves/DANC02.musicxml index 98dd2542..3c93b440 100644 --- a/test/data/grooves/DANC02.musicxml +++ b/test/data/grooves/DANC02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DANC03.musicxml b/test/data/grooves/DANC03.musicxml index 11bd38dc..2b66996d 100644 --- a/test/data/grooves/DANC03.musicxml +++ b/test/data/grooves/DANC03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DANC04.musicxml b/test/data/grooves/DANC04.musicxml index fe839aaa..c182ad21 100644 --- a/test/data/grooves/DANC04.musicxml +++ b/test/data/grooves/DANC04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DANC05.musicxml b/test/data/grooves/DANC05.musicxml index 503b2cff..9984b24b 100644 --- a/test/data/grooves/DANC05.musicxml +++ b/test/data/grooves/DANC05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -216,24 +216,25 @@ E 4 - 192 + 384 1 - 16th + eighth up x + E 4 - 192 + 384 1 - 16th + eighth up normal @@ -266,24 +267,25 @@ E 4 - 192 + 384 1 - 16th + eighth up x + E 4 - 192 + 384 1 - 16th + eighth up normal @@ -294,99 +296,28 @@ E 4 - 96 - - - 1 - 32nd - up - x - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - x - - - - - - - - E - 4 - - 6 - + 192 1 - 512th + 16th up x - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - + E 4 - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - + 192 1 - 1024th + 16th up normal - @@ -418,24 +349,25 @@ E 4 - 192 + 384 1 - 16th + eighth up x + E 4 - 192 + 384 1 - 16th + eighth up normal @@ -468,24 +400,25 @@ E 4 - 192 + 384 1 - 16th + eighth up x + E 4 - 192 + 384 1 - 16th + eighth up normal @@ -496,99 +429,28 @@ E 4 - 96 - - - 1 - 32nd - up - x - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - x - - - - - - - - E - 4 - - 6 - + 192 1 - 512th + 16th up x - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - + E 4 - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - + 192 1 - 1024th + 16th up normal - diff --git a/test/data/grooves/DANC06.musicxml b/test/data/grooves/DANC06.musicxml index cc7ee5ee..6b2cd18d 100644 --- a/test/data/grooves/DANC06.musicxml +++ b/test/data/grooves/DANC06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DANCE.musicxml b/test/data/grooves/DANCE.musicxml index aa08df99..3b0beed9 100644 --- a/test/data/grooves/DANCE.musicxml +++ b/test/data/grooves/DANCE.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DSoul.musicxml b/test/data/grooves/DSoul.musicxml index 4ebd980f..6b042f75 100644 --- a/test/data/grooves/DSoul.musicxml +++ b/test/data/grooves/DSoul.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DSoulEnd.musicxml b/test/data/grooves/DSoulEnd.musicxml index ce442ab0..ba612cb2 100644 --- a/test/data/grooves/DSoulEnd.musicxml +++ b/test/data/grooves/DSoulEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -476,14 +476,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -508,24 +509,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -550,24 +552,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -592,24 +595,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x diff --git a/test/data/grooves/DSoulFill.musicxml b/test/data/grooves/DSoulFill.musicxml index 2b0d9970..b090cdf6 100644 --- a/test/data/grooves/DSoulFill.musicxml +++ b/test/data/grooves/DSoulFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -390,14 +390,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -422,24 +423,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -464,24 +466,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -506,24 +509,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x diff --git a/test/data/grooves/DSoulIntro.musicxml b/test/data/grooves/DSoulIntro.musicxml index a89e65af..f01f4413 100644 --- a/test/data/grooves/DSoulIntro.musicxml +++ b/test/data/grooves/DSoulIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1004,14 +1004,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1036,24 +1037,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1078,24 +1080,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1120,24 +1123,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x diff --git a/test/data/grooves/DSoulPlus.musicxml b/test/data/grooves/DSoulPlus.musicxml index 299b73df..50ab8c63 100644 --- a/test/data/grooves/DSoulPlus.musicxml +++ b/test/data/grooves/DSoulPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DSoulSus.musicxml b/test/data/grooves/DSoulSus.musicxml index c1f0da34..a422c034 100644 --- a/test/data/grooves/DSoulSus.musicxml +++ b/test/data/grooves/DSoulSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DSoulSusPlus.musicxml b/test/data/grooves/DSoulSusPlus.musicxml index 245591e0..f2a00519 100644 --- a/test/data/grooves/DSoulSusPlus.musicxml +++ b/test/data/grooves/DSoulSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Dance1.musicxml b/test/data/grooves/Dance1.musicxml index 8dfb18cb..24918f98 100644 --- a/test/data/grooves/Dance1.musicxml +++ b/test/data/grooves/Dance1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Dance1End.musicxml b/test/data/grooves/Dance1End.musicxml index 4aabc19f..7b47a9fa 100644 --- a/test/data/grooves/Dance1End.musicxml +++ b/test/data/grooves/Dance1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -447,15 +447,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/Dance1Intro.musicxml b/test/data/grooves/Dance1Intro.musicxml index 90efd5f2..8d9a21b1 100644 --- a/test/data/grooves/Dance1Intro.musicxml +++ b/test/data/grooves/Dance1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Dance2.musicxml b/test/data/grooves/Dance2.musicxml index 680640fe..7397f7c6 100644 --- a/test/data/grooves/Dance2.musicxml +++ b/test/data/grooves/Dance2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Dance2End.musicxml b/test/data/grooves/Dance2End.musicxml index 5e50d5f9..721c6ceb 100644 --- a/test/data/grooves/Dance2End.musicxml +++ b/test/data/grooves/Dance2End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -614,15 +614,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/Dance2Intro.musicxml b/test/data/grooves/Dance2Intro.musicxml index dd948ee2..3ab97110 100644 --- a/test/data/grooves/Dance2Intro.musicxml +++ b/test/data/grooves/Dance2Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1398,99 +1398,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -1540,99 +1469,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - diff --git a/test/data/grooves/DancePop1.musicxml b/test/data/grooves/DancePop1.musicxml index 12638210..fd9782ae 100644 --- a/test/data/grooves/DancePop1.musicxml +++ b/test/data/grooves/DancePop1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DancePop1End.musicxml b/test/data/grooves/DancePop1End.musicxml index 8044b5d7..85144352 100644 --- a/test/data/grooves/DancePop1End.musicxml +++ b/test/data/grooves/DancePop1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -520,53 +520,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -574,11 +539,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -590,12 +555,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -608,11 +573,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -674,15 +639,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -690,17 +668,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -708,15 +687,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -748,19 +731,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -871,65 +850,28 @@ G 5 - 96 - + 128 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -937,17 +879,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -955,15 +898,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -980,25 +927,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1014,19 +942,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -1137,65 +1061,28 @@ G 5 - 96 - + 128 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1203,17 +1090,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1221,15 +1109,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1246,25 +1138,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1280,19 +1153,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -1403,65 +1272,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1469,17 +1301,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1487,15 +1320,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1512,25 +1349,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - @@ -1538,131 +1356,13 @@ G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 768 3 - 512th + quarter up x - diff --git a/test/data/grooves/DancePop1Intro.musicxml b/test/data/grooves/DancePop1Intro.musicxml index 30304ccc..d60b83e2 100644 --- a/test/data/grooves/DancePop1Intro.musicxml +++ b/test/data/grooves/DancePop1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1189,53 +1189,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -1243,11 +1208,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -1259,12 +1224,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -1277,11 +1242,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -1343,15 +1308,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1359,17 +1337,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1377,15 +1356,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1417,19 +1400,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -1540,65 +1519,28 @@ G 5 - 96 - + 128 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1606,17 +1548,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1624,15 +1567,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1649,25 +1596,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1683,19 +1611,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -1806,65 +1730,28 @@ G 5 - 96 - + 128 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1872,17 +1759,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1890,15 +1778,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1915,25 +1807,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1949,19 +1822,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -2072,65 +1941,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2138,17 +1970,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -2156,15 +1989,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -2181,25 +2018,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - @@ -2207,131 +2025,13 @@ G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 768 3 - 512th + quarter up x - diff --git a/test/data/grooves/DancePop2.musicxml b/test/data/grooves/DancePop2.musicxml index 4175c91c..1b977ba7 100644 --- a/test/data/grooves/DancePop2.musicxml +++ b/test/data/grooves/DancePop2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DancePop2End.musicxml b/test/data/grooves/DancePop2End.musicxml index 7640cefa..ffcf354f 100644 --- a/test/data/grooves/DancePop2End.musicxml +++ b/test/data/grooves/DancePop2End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -341,117 +341,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - diff --git a/test/data/grooves/DancePop2Intro.musicxml b/test/data/grooves/DancePop2Intro.musicxml index cba7f78e..832bcbea 100644 --- a/test/data/grooves/DancePop2Intro.musicxml +++ b/test/data/grooves/DancePop2Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -741,117 +741,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - diff --git a/test/data/grooves/DancePop3.musicxml b/test/data/grooves/DancePop3.musicxml index 52c4a5b9..36a7db32 100644 --- a/test/data/grooves/DancePop3.musicxml +++ b/test/data/grooves/DancePop3.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -385,22 +385,25 @@ - 384 - + 512 2 - eighth - - - - - - - 192 - - 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -408,10 +411,15 @@ E 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up square @@ -422,13 +430,19 @@ E 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up square + @@ -1373,99 +1387,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -1713,99 +1656,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - + G 5 - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - diff --git a/test/data/grooves/DancePop3End.musicxml b/test/data/grooves/DancePop3End.musicxml index c8470c3e..7124c402 100644 --- a/test/data/grooves/DancePop3End.musicxml +++ b/test/data/grooves/DancePop3End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -509,15 +509,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/DancePop3Intro.musicxml b/test/data/grooves/DancePop3Intro.musicxml index bdf7c406..495bd76b 100644 --- a/test/data/grooves/DancePop3Intro.musicxml +++ b/test/data/grooves/DancePop3Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -809,15 +809,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -836,25 +836,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/DescendingJazz.musicxml b/test/data/grooves/DescendingJazz.musicxml index 52c5a884..c13367b1 100644 --- a/test/data/grooves/DescendingJazz.musicxml +++ b/test/data/grooves/DescendingJazz.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DescendingJazzEnd.musicxml b/test/data/grooves/DescendingJazzEnd.musicxml index fae0bbac..01c6dbb4 100644 --- a/test/data/grooves/DescendingJazzEnd.musicxml +++ b/test/data/grooves/DescendingJazzEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DescendingJazzIntro.musicxml b/test/data/grooves/DescendingJazzIntro.musicxml index 696c44cb..b6c35846 100644 --- a/test/data/grooves/DescendingJazzIntro.musicxml +++ b/test/data/grooves/DescendingJazzIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DescendingJazzIntro8.musicxml b/test/data/grooves/DescendingJazzIntro8.musicxml index 0a2c6b58..a1e6ab32 100644 --- a/test/data/grooves/DescendingJazzIntro8.musicxml +++ b/test/data/grooves/DescendingJazzIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DescendingJazzPlus.musicxml b/test/data/grooves/DescendingJazzPlus.musicxml index f233b7ae..ac0628e9 100644 --- a/test/data/grooves/DescendingJazzPlus.musicxml +++ b/test/data/grooves/DescendingJazzPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DescendingJazzPlusIntro.musicxml b/test/data/grooves/DescendingJazzPlusIntro.musicxml index 20f219ea..d5f80f1f 100644 --- a/test/data/grooves/DescendingJazzPlusIntro.musicxml +++ b/test/data/grooves/DescendingJazzPlusIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DescendingJazzPlusIntro8.musicxml b/test/data/grooves/DescendingJazzPlusIntro8.musicxml index 9f219c27..1b9aaeaf 100644 --- a/test/data/grooves/DescendingJazzPlusIntro8.musicxml +++ b/test/data/grooves/DescendingJazzPlusIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DescendingJazzSus.musicxml b/test/data/grooves/DescendingJazzSus.musicxml index d4843c30..f2d42818 100644 --- a/test/data/grooves/DescendingJazzSus.musicxml +++ b/test/data/grooves/DescendingJazzSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DescendingJazzSusPlus.musicxml b/test/data/grooves/DescendingJazzSusPlus.musicxml index f5595459..7a78db2f 100644 --- a/test/data/grooves/DescendingJazzSusPlus.musicxml +++ b/test/data/grooves/DescendingJazzSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Desert.musicxml b/test/data/grooves/Desert.musicxml index fc09267b..ddd056bc 100644 --- a/test/data/grooves/Desert.musicxml +++ b/test/data/grooves/Desert.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DesertEnd.musicxml b/test/data/grooves/DesertEnd.musicxml index 8a527fdc..7d632535 100644 --- a/test/data/grooves/DesertEnd.musicxml +++ b/test/data/grooves/DesertEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DesertFill.musicxml b/test/data/grooves/DesertFill.musicxml index aa04bf8d..1ec607b1 100644 --- a/test/data/grooves/DesertFill.musicxml +++ b/test/data/grooves/DesertFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -191,20 +191,7 @@ - - G - 4 - - 192 - - 1 - 16th - up - normal - - - - + G 4 @@ -232,152 +219,6 @@ - - - G - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - G - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - G - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - G - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - G - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - G - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - G - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - G - 4 - - 192 - - 1 - 16th - up - normal - - - - - - G - 4 - - 192 - - 1 - 16th - up - normal - - - G @@ -407,19 +248,18 @@ + G 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -427,33 +267,28 @@ G 4 - 24 - - + 384 1 - 128th + eighth up normal - - + G 4 - 6 - + 384 1 - 512th + eighth up normal - @@ -461,15 +296,13 @@ G 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -477,17 +310,13 @@ G 4 - 48 - - + 384 1 - 64th + eighth up normal - - @@ -495,33 +324,28 @@ G 4 - 12 - - + 384 1 - 256th + eighth up normal - - + G 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -541,14 +365,15 @@ + G 4 - 192 + 384 1 - 16th + eighth up normal @@ -573,24 +398,25 @@ G 4 - 192 + 384 1 - 16th + eighth up normal + G 4 - 192 + 384 1 - 16th + eighth up normal @@ -615,24 +441,25 @@ G 4 - 192 + 384 1 - 16th + eighth up normal + G 4 - 192 + 384 1 - 16th + eighth up normal @@ -657,24 +484,25 @@ G 4 - 192 + 384 1 - 16th + eighth up normal + G 4 - 192 + 384 1 - 16th + eighth up normal @@ -711,20 +539,7 @@ - - G - 4 - - 192 - - 1 - 16th - up - normal - - - - + G 4 @@ -752,152 +567,6 @@ - - - G - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - G - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - G - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - G - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - G - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - G - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - G - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - G - 4 - - 192 - - 1 - 16th - up - normal - - - - - - G - 4 - - 192 - - 1 - 16th - up - normal - - - G @@ -927,19 +596,18 @@ + G 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -947,33 +615,28 @@ G 4 - 24 - - + 384 1 - 128th + eighth up normal - - + G 4 - 6 - + 384 1 - 512th + eighth up normal - @@ -981,15 +644,13 @@ G 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -997,17 +658,13 @@ G 4 - 48 - - + 384 1 - 64th + eighth up normal - - @@ -1015,33 +672,28 @@ G 4 - 12 - - + 384 1 - 256th + eighth up normal - - + G 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -1061,14 +713,15 @@ + G 4 - 192 + 384 1 - 16th + eighth up normal @@ -1093,24 +746,25 @@ G 4 - 192 + 384 1 - 16th + eighth up normal + G 4 - 192 + 384 1 - 16th + eighth up normal @@ -1163,24 +817,25 @@ G 4 - 192 + 384 1 - 16th + eighth up normal + G 4 - 192 + 384 1 - 16th + eighth up normal diff --git a/test/data/grooves/DesertSus.musicxml b/test/data/grooves/DesertSus.musicxml index 9b0705f7..383a4d00 100644 --- a/test/data/grooves/DesertSus.musicxml +++ b/test/data/grooves/DesertSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DigitalRock.musicxml b/test/data/grooves/DigitalRock.musicxml index 8401cc6d..40f6ee39 100644 --- a/test/data/grooves/DigitalRock.musicxml +++ b/test/data/grooves/DigitalRock.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -915,99 +915,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -1285,99 +1214,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - diff --git a/test/data/grooves/DigitalRockEnd.musicxml b/test/data/grooves/DigitalRockEnd.musicxml index 2eade2d0..e2c4618c 100644 --- a/test/data/grooves/DigitalRockEnd.musicxml +++ b/test/data/grooves/DigitalRockEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -395,87 +395,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - @@ -483,15 +414,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -513,24 +442,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -541,117 +471,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -659,24 +500,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -687,117 +529,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -805,24 +558,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -833,99 +587,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -959,15 +642,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/DigitalRockIntro.musicxml b/test/data/grooves/DigitalRockIntro.musicxml index 0c94d9ba..894e6863 100644 --- a/test/data/grooves/DigitalRockIntro.musicxml +++ b/test/data/grooves/DigitalRockIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -829,99 +829,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - + G 5 - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -1199,99 +1128,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - + G 5 - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -1325,14 +1183,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1385,24 +1244,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x diff --git a/test/data/grooves/DiscoSoul.musicxml b/test/data/grooves/DiscoSoul.musicxml index 8db4d74a..ab9cdb8a 100644 --- a/test/data/grooves/DiscoSoul.musicxml +++ b/test/data/grooves/DiscoSoul.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DiscoSoulEnd.musicxml b/test/data/grooves/DiscoSoulEnd.musicxml index 00ead672..b46fe01c 100644 --- a/test/data/grooves/DiscoSoulEnd.musicxml +++ b/test/data/grooves/DiscoSoulEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -476,14 +476,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -508,24 +509,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -550,24 +552,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -592,24 +595,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x diff --git a/test/data/grooves/DiscoSoulIntro.musicxml b/test/data/grooves/DiscoSoulIntro.musicxml index dc3ef115..108c2f46 100644 --- a/test/data/grooves/DiscoSoulIntro.musicxml +++ b/test/data/grooves/DiscoSoulIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1004,14 +1004,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1036,24 +1037,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1078,24 +1080,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1120,24 +1123,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x diff --git a/test/data/grooves/Dixie.musicxml b/test/data/grooves/Dixie.musicxml index 26223155..d074cbf0 100644 --- a/test/data/grooves/Dixie.musicxml +++ b/test/data/grooves/Dixie.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Dixie1.musicxml b/test/data/grooves/Dixie1.musicxml index 07f50ec4..6b6b4f73 100644 --- a/test/data/grooves/Dixie1.musicxml +++ b/test/data/grooves/Dixie1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Dixie1Sus.musicxml b/test/data/grooves/Dixie1Sus.musicxml index deee685c..2891731f 100644 --- a/test/data/grooves/Dixie1Sus.musicxml +++ b/test/data/grooves/Dixie1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Dixie2.musicxml b/test/data/grooves/Dixie2.musicxml index 2db1fec4..6cda16ee 100644 --- a/test/data/grooves/Dixie2.musicxml +++ b/test/data/grooves/Dixie2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Dixie2Sus.musicxml b/test/data/grooves/Dixie2Sus.musicxml index 7ccaea4c..2d204891 100644 --- a/test/data/grooves/Dixie2Sus.musicxml +++ b/test/data/grooves/Dixie2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Dixie3.musicxml b/test/data/grooves/Dixie3.musicxml index 953970eb..a4ba3a5c 100644 --- a/test/data/grooves/Dixie3.musicxml +++ b/test/data/grooves/Dixie3.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Dixie3Sus.musicxml b/test/data/grooves/Dixie3Sus.musicxml index 066951ea..18b2a00d 100644 --- a/test/data/grooves/Dixie3Sus.musicxml +++ b/test/data/grooves/Dixie3Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Dixie4.musicxml b/test/data/grooves/Dixie4.musicxml index f8c911f3..a99f86f2 100644 --- a/test/data/grooves/Dixie4.musicxml +++ b/test/data/grooves/Dixie4.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Dixie4Strum.musicxml b/test/data/grooves/Dixie4Strum.musicxml index 756c974a..13183013 100644 --- a/test/data/grooves/Dixie4Strum.musicxml +++ b/test/data/grooves/Dixie4Strum.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Dixie4Sus.musicxml b/test/data/grooves/Dixie4Sus.musicxml index 541a24b5..f4760f1f 100644 --- a/test/data/grooves/Dixie4Sus.musicxml +++ b/test/data/grooves/Dixie4Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DixieEnd.musicxml b/test/data/grooves/DixieEnd.musicxml index 6e21dfd4..2dfa051d 100644 --- a/test/data/grooves/DixieEnd.musicxml +++ b/test/data/grooves/DixieEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DixieIntro.musicxml b/test/data/grooves/DixieIntro.musicxml index c22fb818..cb316642 100644 --- a/test/data/grooves/DixieIntro.musicxml +++ b/test/data/grooves/DixieIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DixieIntro8.musicxml b/test/data/grooves/DixieIntro8.musicxml index ccde84d2..a1ccc9f3 100644 --- a/test/data/grooves/DixieIntro8.musicxml +++ b/test/data/grooves/DixieIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DixieMarch.musicxml b/test/data/grooves/DixieMarch.musicxml index 6faf8496..ff304b3c 100644 --- a/test/data/grooves/DixieMarch.musicxml +++ b/test/data/grooves/DixieMarch.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DixieMarchEnd.musicxml b/test/data/grooves/DixieMarchEnd.musicxml index e4196221..fdd5ee39 100644 --- a/test/data/grooves/DixieMarchEnd.musicxml +++ b/test/data/grooves/DixieMarchEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DixieMarchIntro.musicxml b/test/data/grooves/DixieMarchIntro.musicxml index 27ac0f42..965b5828 100644 --- a/test/data/grooves/DixieMarchIntro.musicxml +++ b/test/data/grooves/DixieMarchIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DixieMarchPlus.musicxml b/test/data/grooves/DixieMarchPlus.musicxml index 8a72e0cd..3a9a92a7 100644 --- a/test/data/grooves/DixieMarchPlus.musicxml +++ b/test/data/grooves/DixieMarchPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DixieMarchSus.musicxml b/test/data/grooves/DixieMarchSus.musicxml index 6d9b4206..1c6c93e8 100644 --- a/test/data/grooves/DixieMarchSus.musicxml +++ b/test/data/grooves/DixieMarchSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DixieMarchSusPlus.musicxml b/test/data/grooves/DixieMarchSusPlus.musicxml index b8bb6111..33e60dcf 100644 --- a/test/data/grooves/DixieMarchSusPlus.musicxml +++ b/test/data/grooves/DixieMarchSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DixieStrum.musicxml b/test/data/grooves/DixieStrum.musicxml index 75f6f507..36517b05 100644 --- a/test/data/grooves/DixieStrum.musicxml +++ b/test/data/grooves/DixieStrum.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DixieStrumSus.musicxml b/test/data/grooves/DixieStrumSus.musicxml index a6ad386e..d67f1a8c 100644 --- a/test/data/grooves/DixieStrumSus.musicxml +++ b/test/data/grooves/DixieStrumSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DixieSus.musicxml b/test/data/grooves/DixieSus.musicxml index 2ee659d2..63bfa600 100644 --- a/test/data/grooves/DixieSus.musicxml +++ b/test/data/grooves/DixieSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DnB01.musicxml b/test/data/grooves/DnB01.musicxml index 9cf03158..ea6ce1d0 100644 --- a/test/data/grooves/DnB01.musicxml +++ b/test/data/grooves/DnB01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -523,102 +523,28 @@ E 4 - 192 - + 256 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -626,23 +552,32 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + diff --git a/test/data/grooves/DnB02.musicxml b/test/data/grooves/DnB02.musicxml index bc8b9b7e..a0d82779 100644 --- a/test/data/grooves/DnB02.musicxml +++ b/test/data/grooves/DnB02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DnB03.musicxml b/test/data/grooves/DnB03.musicxml index 2bd40ee1..3056e02f 100644 --- a/test/data/grooves/DnB03.musicxml +++ b/test/data/grooves/DnB03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DnB04.musicxml b/test/data/grooves/DnB04.musicxml index cdc06199..39f7ff07 100644 --- a/test/data/grooves/DnB04.musicxml +++ b/test/data/grooves/DnB04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DnB05.musicxml b/test/data/grooves/DnB05.musicxml index df3627b4..0e87d86c 100644 --- a/test/data/grooves/DnB05.musicxml +++ b/test/data/grooves/DnB05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -785,83 +785,28 @@ G 5 - 96 - + 128 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + + + 3 + 16th + + + 2 + 16th + + @@ -869,15 +814,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -885,13 +833,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + diff --git a/test/data/grooves/DnB06.musicxml b/test/data/grooves/DnB06.musicxml index 53599692..d116c61e 100644 --- a/test/data/grooves/DnB06.musicxml +++ b/test/data/grooves/DnB06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -289,22 +289,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -312,10 +315,15 @@ A 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -323,10 +331,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/DooWop.musicxml b/test/data/grooves/DooWop.musicxml index 6dd77500..18761b98 100644 --- a/test/data/grooves/DooWop.musicxml +++ b/test/data/grooves/DooWop.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DooWopEnd.musicxml b/test/data/grooves/DooWopEnd.musicxml index 88ff4389..9566286e 100644 --- a/test/data/grooves/DooWopEnd.musicxml +++ b/test/data/grooves/DooWopEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DooWopFill.musicxml b/test/data/grooves/DooWopFill.musicxml index 82e58b24..606934b9 100644 --- a/test/data/grooves/DooWopFill.musicxml +++ b/test/data/grooves/DooWopFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DooWopIntro.musicxml b/test/data/grooves/DooWopIntro.musicxml index b908aa57..edafcc88 100644 --- a/test/data/grooves/DooWopIntro.musicxml +++ b/test/data/grooves/DooWopIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DooWopIntroSus.musicxml b/test/data/grooves/DooWopIntroSus.musicxml index 7e4e1df8..6c2b72a2 100644 --- a/test/data/grooves/DooWopIntroSus.musicxml +++ b/test/data/grooves/DooWopIntroSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DooWopPlus.musicxml b/test/data/grooves/DooWopPlus.musicxml index 9f12838e..e1523a01 100644 --- a/test/data/grooves/DooWopPlus.musicxml +++ b/test/data/grooves/DooWopPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DooWopSus.musicxml b/test/data/grooves/DooWopSus.musicxml index 6fb86bad..14dc623e 100644 --- a/test/data/grooves/DooWopSus.musicxml +++ b/test/data/grooves/DooWopSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/DooWopSusPlus.musicxml b/test/data/grooves/DooWopSusPlus.musicxml index bc8acc07..7629d8e6 100644 --- a/test/data/grooves/DooWopSusPlus.musicxml +++ b/test/data/grooves/DooWopSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ENDING01.musicxml b/test/data/grooves/ENDING01.musicxml index 7c627948..681d7446 100644 --- a/test/data/grooves/ENDING01.musicxml +++ b/test/data/grooves/ENDING01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ENDING02.musicxml b/test/data/grooves/ENDING02.musicxml index 0d1e4f3e..d8ac1302 100644 --- a/test/data/grooves/ENDING02.musicxml +++ b/test/data/grooves/ENDING02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ENDING03.musicxml b/test/data/grooves/ENDING03.musicxml index cc8eb569..42cebc8c 100644 --- a/test/data/grooves/ENDING03.musicxml +++ b/test/data/grooves/ENDING03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -214,87 +214,33 @@ + E 4 - 48 - + 256 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -302,15 +248,18 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - @@ -318,13 +267,19 @@ E 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + up normal + diff --git a/test/data/grooves/ENDING04.musicxml b/test/data/grooves/ENDING04.musicxml index 884b4aee..b115df34 100644 --- a/test/data/grooves/ENDING04.musicxml +++ b/test/data/grooves/ENDING04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ENDING05.musicxml b/test/data/grooves/ENDING05.musicxml index 256412bd..fd0524be 100644 --- a/test/data/grooves/ENDING05.musicxml +++ b/test/data/grooves/ENDING05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ENDING06.musicxml b/test/data/grooves/ENDING06.musicxml index 015911bc..47bf7396 100644 --- a/test/data/grooves/ENDING06.musicxml +++ b/test/data/grooves/ENDING06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -257,80 +257,25 @@ - 192 - + 256 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - A - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - A - 4 - - 24 - - - - 1 - 128th - up - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -338,15 +283,18 @@ A 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - @@ -354,13 +302,19 @@ A 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + up normal + diff --git a/test/data/grooves/ENDING07.musicxml b/test/data/grooves/ENDING07.musicxml index ff36d08e..e6cc576e 100644 --- a/test/data/grooves/ENDING07.musicxml +++ b/test/data/grooves/ENDING07.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwing.musicxml b/test/data/grooves/EasySwing.musicxml index 457916df..71ccfeff 100644 --- a/test/data/grooves/EasySwing.musicxml +++ b/test/data/grooves/EasySwing.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwing1.musicxml b/test/data/grooves/EasySwing1.musicxml index 02043084..98a90509 100644 --- a/test/data/grooves/EasySwing1.musicxml +++ b/test/data/grooves/EasySwing1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwing1Fill.musicxml b/test/data/grooves/EasySwing1Fill.musicxml index 3eebc287..1169c316 100644 --- a/test/data/grooves/EasySwing1Fill.musicxml +++ b/test/data/grooves/EasySwing1Fill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwing1Sus.musicxml b/test/data/grooves/EasySwing1Sus.musicxml index 1a19b685..ee07df59 100644 --- a/test/data/grooves/EasySwing1Sus.musicxml +++ b/test/data/grooves/EasySwing1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwing2.musicxml b/test/data/grooves/EasySwing2.musicxml index 75c1c1b5..9406fa44 100644 --- a/test/data/grooves/EasySwing2.musicxml +++ b/test/data/grooves/EasySwing2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwing2Fill.musicxml b/test/data/grooves/EasySwing2Fill.musicxml index 365afa36..07fe20a9 100644 --- a/test/data/grooves/EasySwing2Fill.musicxml +++ b/test/data/grooves/EasySwing2Fill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwing2Sus.musicxml b/test/data/grooves/EasySwing2Sus.musicxml index 12f630db..8516a4fb 100644 --- a/test/data/grooves/EasySwing2Sus.musicxml +++ b/test/data/grooves/EasySwing2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwing42.musicxml b/test/data/grooves/EasySwing42.musicxml index 58dc9792..443c06ea 100644 --- a/test/data/grooves/EasySwing42.musicxml +++ b/test/data/grooves/EasySwing42.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwing42Fill.musicxml b/test/data/grooves/EasySwing42Fill.musicxml index 57554618..9e8cb1fa 100644 --- a/test/data/grooves/EasySwing42Fill.musicxml +++ b/test/data/grooves/EasySwing42Fill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwing42Sus.musicxml b/test/data/grooves/EasySwing42Sus.musicxml index 15a19de4..b75aeda9 100644 --- a/test/data/grooves/EasySwing42Sus.musicxml +++ b/test/data/grooves/EasySwing42Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwing42Walk.musicxml b/test/data/grooves/EasySwing42Walk.musicxml index 1cb82da1..63b0aa1a 100644 --- a/test/data/grooves/EasySwing42Walk.musicxml +++ b/test/data/grooves/EasySwing42Walk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwing42WalkFill.musicxml b/test/data/grooves/EasySwing42WalkFill.musicxml index 3687ede7..2a91775e 100644 --- a/test/data/grooves/EasySwing42WalkFill.musicxml +++ b/test/data/grooves/EasySwing42WalkFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwing42WalkSus.musicxml b/test/data/grooves/EasySwing42WalkSus.musicxml index fcc4b6fb..c1d1fdbb 100644 --- a/test/data/grooves/EasySwing42WalkSus.musicxml +++ b/test/data/grooves/EasySwing42WalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwingEnd.musicxml b/test/data/grooves/EasySwingEnd.musicxml index dd315ca7..090f988c 100644 --- a/test/data/grooves/EasySwingEnd.musicxml +++ b/test/data/grooves/EasySwingEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwingFill.musicxml b/test/data/grooves/EasySwingFill.musicxml index 5d6da15e..7c70b05f 100644 --- a/test/data/grooves/EasySwingFill.musicxml +++ b/test/data/grooves/EasySwingFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwingIntro.musicxml b/test/data/grooves/EasySwingIntro.musicxml index e0b843e3..1013ecc0 100644 --- a/test/data/grooves/EasySwingIntro.musicxml +++ b/test/data/grooves/EasySwingIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwingIntro1.musicxml b/test/data/grooves/EasySwingIntro1.musicxml index ab031524..d2da154f 100644 --- a/test/data/grooves/EasySwingIntro1.musicxml +++ b/test/data/grooves/EasySwingIntro1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwingIntro2.musicxml b/test/data/grooves/EasySwingIntro2.musicxml index bb5deb9a..ade2a6ed 100644 --- a/test/data/grooves/EasySwingIntro2.musicxml +++ b/test/data/grooves/EasySwingIntro2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwingIntro3.musicxml b/test/data/grooves/EasySwingIntro3.musicxml index 0bdd819d..e6a6e10b 100644 --- a/test/data/grooves/EasySwingIntro3.musicxml +++ b/test/data/grooves/EasySwingIntro3.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwingSus.musicxml b/test/data/grooves/EasySwingSus.musicxml index b6f63fc3..617efb5f 100644 --- a/test/data/grooves/EasySwingSus.musicxml +++ b/test/data/grooves/EasySwingSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwingSusFill.musicxml b/test/data/grooves/EasySwingSusFill.musicxml index d7463fe6..d11a09cc 100644 --- a/test/data/grooves/EasySwingSusFill.musicxml +++ b/test/data/grooves/EasySwingSusFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwingWalk.musicxml b/test/data/grooves/EasySwingWalk.musicxml index a1bebbb3..03303771 100644 --- a/test/data/grooves/EasySwingWalk.musicxml +++ b/test/data/grooves/EasySwingWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwingWalkFill.musicxml b/test/data/grooves/EasySwingWalkFill.musicxml index 50939a50..62101eba 100644 --- a/test/data/grooves/EasySwingWalkFill.musicxml +++ b/test/data/grooves/EasySwingWalkFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EasySwingWalkSus.musicxml b/test/data/grooves/EasySwingWalkSus.musicxml index c9752931..8a32aa55 100644 --- a/test/data/grooves/EasySwingWalkSus.musicxml +++ b/test/data/grooves/EasySwingWalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ElectricPop.musicxml b/test/data/grooves/ElectricPop.musicxml index d07d4d95..c36e2525 100644 --- a/test/data/grooves/ElectricPop.musicxml +++ b/test/data/grooves/ElectricPop.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ElectricPopEnd.musicxml b/test/data/grooves/ElectricPopEnd.musicxml index 3c8bf46f..8a1f98b9 100644 --- a/test/data/grooves/ElectricPopEnd.musicxml +++ b/test/data/grooves/ElectricPopEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -594,15 +594,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter down normal @@ -875,15 +875,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/ElectricPopIntro.musicxml b/test/data/grooves/ElectricPopIntro.musicxml index 0056ecd0..593daadd 100644 --- a/test/data/grooves/ElectricPopIntro.musicxml +++ b/test/data/grooves/ElectricPopIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1608,25 +1608,25 @@ G 5 - 192 + 768 3 - 16th + quarter up circle-x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -1649,15 +1649,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/Evansish.musicxml b/test/data/grooves/Evansish.musicxml index 691d00af..14e34807 100644 --- a/test/data/grooves/Evansish.musicxml +++ b/test/data/grooves/Evansish.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Evansish1.musicxml b/test/data/grooves/Evansish1.musicxml index 28d2051b..7d601a0f 100644 --- a/test/data/grooves/Evansish1.musicxml +++ b/test/data/grooves/Evansish1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Evansish1Plus.musicxml b/test/data/grooves/Evansish1Plus.musicxml index 956efd21..55c05c66 100644 --- a/test/data/grooves/Evansish1Plus.musicxml +++ b/test/data/grooves/Evansish1Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Evansish1Sus.musicxml b/test/data/grooves/Evansish1Sus.musicxml index 10ff5240..0926618e 100644 --- a/test/data/grooves/Evansish1Sus.musicxml +++ b/test/data/grooves/Evansish1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Evansish1SusPlus.musicxml b/test/data/grooves/Evansish1SusPlus.musicxml index 4febe2f1..37703fbb 100644 --- a/test/data/grooves/Evansish1SusPlus.musicxml +++ b/test/data/grooves/Evansish1SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EvansishEnd.musicxml b/test/data/grooves/EvansishEnd.musicxml index 5c9a36d1..597bbd80 100644 --- a/test/data/grooves/EvansishEnd.musicxml +++ b/test/data/grooves/EvansishEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EvansishFill.musicxml b/test/data/grooves/EvansishFill.musicxml index 697c5374..1d0876a6 100644 --- a/test/data/grooves/EvansishFill.musicxml +++ b/test/data/grooves/EvansishFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EvansishIntro.musicxml b/test/data/grooves/EvansishIntro.musicxml index ec43bb08..57df4bf6 100644 --- a/test/data/grooves/EvansishIntro.musicxml +++ b/test/data/grooves/EvansishIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EvansishPlus.musicxml b/test/data/grooves/EvansishPlus.musicxml index fed3fd6d..293e86ec 100644 --- a/test/data/grooves/EvansishPlus.musicxml +++ b/test/data/grooves/EvansishPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EvansishSus.musicxml b/test/data/grooves/EvansishSus.musicxml index 0e656699..4e76981f 100644 --- a/test/data/grooves/EvansishSus.musicxml +++ b/test/data/grooves/EvansishSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/EvansishSusPlus.musicxml b/test/data/grooves/EvansishSusPlus.musicxml index 3a7860f2..9afbfb36 100644 --- a/test/data/grooves/EvansishSusPlus.musicxml +++ b/test/data/grooves/EvansishSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FUNK01.musicxml b/test/data/grooves/FUNK01.musicxml index 499595be..5c12e131 100644 --- a/test/data/grooves/FUNK01.musicxml +++ b/test/data/grooves/FUNK01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FUNK02.musicxml b/test/data/grooves/FUNK02.musicxml index abcc0724..940959ce 100644 --- a/test/data/grooves/FUNK02.musicxml +++ b/test/data/grooves/FUNK02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FUNK03.musicxml b/test/data/grooves/FUNK03.musicxml index 906eb94f..c59c2456 100644 --- a/test/data/grooves/FUNK03.musicxml +++ b/test/data/grooves/FUNK03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FUNK04.musicxml b/test/data/grooves/FUNK04.musicxml index f9099816..71af4dc4 100644 --- a/test/data/grooves/FUNK04.musicxml +++ b/test/data/grooves/FUNK04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FUNK05.musicxml b/test/data/grooves/FUNK05.musicxml index 58b857af..c4a14825 100644 --- a/test/data/grooves/FUNK05.musicxml +++ b/test/data/grooves/FUNK05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FUNK06.musicxml b/test/data/grooves/FUNK06.musicxml index 3b599b93..342f3ce2 100644 --- a/test/data/grooves/FUNK06.musicxml +++ b/test/data/grooves/FUNK06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1535,98 +1535,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - + 512 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - - 1 - eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1634,23 +1561,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1715,98 +1651,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1814,15 +1677,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/FUNK07.musicxml b/test/data/grooves/FUNK07.musicxml index 74c84487..1caade88 100644 --- a/test/data/grooves/FUNK07.musicxml +++ b/test/data/grooves/FUNK07.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -765,101 +765,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - + 256 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -867,15 +794,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -883,13 +813,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up circle-x + @@ -938,80 +874,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - + 256 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -1019,15 +900,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1035,13 +919,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -1049,101 +939,28 @@ G 5 - 192 - + 256 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -1151,15 +968,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1167,13 +987,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -1539,62 +1365,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1602,51 +1391,19 @@ F 4 - 96 - - + 512 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/FUNK08.musicxml b/test/data/grooves/FUNK08.musicxml index f2304027..f4ccc9a0 100644 --- a/test/data/grooves/FUNK08.musicxml +++ b/test/data/grooves/FUNK08.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FUNK09.musicxml b/test/data/grooves/FUNK09.musicxml index f6a175c1..f011b950 100644 --- a/test/data/grooves/FUNK09.musicxml +++ b/test/data/grooves/FUNK09.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FUNK10.musicxml b/test/data/grooves/FUNK10.musicxml index e0446c35..a3378b4d 100644 --- a/test/data/grooves/FUNK10.musicxml +++ b/test/data/grooves/FUNK10.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FUNK11.musicxml b/test/data/grooves/FUNK11.musicxml index 7adc4276..e303eb2f 100644 --- a/test/data/grooves/FUNK11.musicxml +++ b/test/data/grooves/FUNK11.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FUNK12.musicxml b/test/data/grooves/FUNK12.musicxml index 73edbb31..cfeb87fa 100644 --- a/test/data/grooves/FUNK12.musicxml +++ b/test/data/grooves/FUNK12.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FUS01.musicxml b/test/data/grooves/FUS01.musicxml index 3429766e..a93075bc 100644 --- a/test/data/grooves/FUS01.musicxml +++ b/test/data/grooves/FUS01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -636,62 +636,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -699,51 +662,19 @@ F 4 - 96 - - + 512 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/FUS02.musicxml b/test/data/grooves/FUS02.musicxml index 94c4bc30..5b4c0d29 100644 --- a/test/data/grooves/FUS02.musicxml +++ b/test/data/grooves/FUS02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FUS03.musicxml b/test/data/grooves/FUS03.musicxml index d74d1e2f..15a282a1 100644 --- a/test/data/grooves/FUS03.musicxml +++ b/test/data/grooves/FUS03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FUS04.musicxml b/test/data/grooves/FUS04.musicxml index 62a6a15f..8f6d2a39 100644 --- a/test/data/grooves/FUS04.musicxml +++ b/test/data/grooves/FUS04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FUS05.musicxml b/test/data/grooves/FUS05.musicxml index 8ee35ce6..7ed5a9ba 100644 --- a/test/data/grooves/FUS05.musicxml +++ b/test/data/grooves/FUS05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FUS06.musicxml b/test/data/grooves/FUS06.musicxml index ec663f37..f899ddda 100644 --- a/test/data/grooves/FUS06.musicxml +++ b/test/data/grooves/FUS06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FUS07.musicxml b/test/data/grooves/FUS07.musicxml index b0228ea3..ecc50edc 100644 --- a/test/data/grooves/FUS07.musicxml +++ b/test/data/grooves/FUS07.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -233,22 +233,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -256,10 +259,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -267,10 +275,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -308,22 +322,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -331,10 +348,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -342,10 +364,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/FUS08.musicxml b/test/data/grooves/FUS08.musicxml index 849f49fd..3ece1135 100644 --- a/test/data/grooves/FUS08.musicxml +++ b/test/data/grooves/FUS08.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastBigBand.musicxml b/test/data/grooves/FastBigBand.musicxml index a7f283ad..56ebb5ab 100644 --- a/test/data/grooves/FastBigBand.musicxml +++ b/test/data/grooves/FastBigBand.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1536,22 +1536,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1559,10 +1562,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -1570,10 +1578,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/FastBigBandEnd.musicxml b/test/data/grooves/FastBigBandEnd.musicxml index 935ae24d..1f512702 100644 --- a/test/data/grooves/FastBigBandEnd.musicxml +++ b/test/data/grooves/FastBigBandEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastBigBandIntro.musicxml b/test/data/grooves/FastBigBandIntro.musicxml index 137af7e0..039660e9 100644 --- a/test/data/grooves/FastBigBandIntro.musicxml +++ b/test/data/grooves/FastBigBandIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1343,22 +1343,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1366,10 +1369,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -1377,10 +1385,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/FastBlues.musicxml b/test/data/grooves/FastBlues.musicxml index a95dbf37..21765ea0 100644 --- a/test/data/grooves/FastBlues.musicxml +++ b/test/data/grooves/FastBlues.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastBlues1.musicxml b/test/data/grooves/FastBlues1.musicxml index 376695b8..3426a2cf 100644 --- a/test/data/grooves/FastBlues1.musicxml +++ b/test/data/grooves/FastBlues1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastBlues1Sus.musicxml b/test/data/grooves/FastBlues1Sus.musicxml index 398e48a9..a5fcc29b 100644 --- a/test/data/grooves/FastBlues1Sus.musicxml +++ b/test/data/grooves/FastBlues1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastBluesEnd.musicxml b/test/data/grooves/FastBluesEnd.musicxml index 80eb193f..a8beb013 100644 --- a/test/data/grooves/FastBluesEnd.musicxml +++ b/test/data/grooves/FastBluesEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -193,22 +193,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -216,10 +219,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -227,30 +235,39 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -258,10 +275,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -269,10 +291,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -326,22 +354,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -349,10 +380,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -360,10 +396,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -433,22 +475,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -456,10 +501,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -467,30 +517,39 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -498,10 +557,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -509,10 +573,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -566,22 +636,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -589,10 +662,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -600,10 +678,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/FastBluesSus.musicxml b/test/data/grooves/FastBluesSus.musicxml index ea4b9265..56cce1db 100644 --- a/test/data/grooves/FastBluesSus.musicxml +++ b/test/data/grooves/FastBluesSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastBluesWalk.musicxml b/test/data/grooves/FastBluesWalk.musicxml index e39b64fa..2704166d 100644 --- a/test/data/grooves/FastBluesWalk.musicxml +++ b/test/data/grooves/FastBluesWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastBluesWalkSus.musicxml b/test/data/grooves/FastBluesWalkSus.musicxml index 2773a7ab..f107f586 100644 --- a/test/data/grooves/FastBluesWalkSus.musicxml +++ b/test/data/grooves/FastBluesWalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastJazzWaltz.musicxml b/test/data/grooves/FastJazzWaltz.musicxml index d1f08f83..bc3d1c01 100644 --- a/test/data/grooves/FastJazzWaltz.musicxml +++ b/test/data/grooves/FastJazzWaltz.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastJazzWaltz1.musicxml b/test/data/grooves/FastJazzWaltz1.musicxml index 5270c17c..97c238ad 100644 --- a/test/data/grooves/FastJazzWaltz1.musicxml +++ b/test/data/grooves/FastJazzWaltz1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastJazzWaltz1End.musicxml b/test/data/grooves/FastJazzWaltz1End.musicxml index cf103174..1683a588 100644 --- a/test/data/grooves/FastJazzWaltz1End.musicxml +++ b/test/data/grooves/FastJazzWaltz1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastJazzWaltz1Sus.musicxml b/test/data/grooves/FastJazzWaltz1Sus.musicxml index 84085fe3..1cea6595 100644 --- a/test/data/grooves/FastJazzWaltz1Sus.musicxml +++ b/test/data/grooves/FastJazzWaltz1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastJazzWaltz2.musicxml b/test/data/grooves/FastJazzWaltz2.musicxml index f7f618e6..f1f634ea 100644 --- a/test/data/grooves/FastJazzWaltz2.musicxml +++ b/test/data/grooves/FastJazzWaltz2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastJazzWaltz2Sus.musicxml b/test/data/grooves/FastJazzWaltz2Sus.musicxml index bff9df47..a2c0cd8f 100644 --- a/test/data/grooves/FastJazzWaltz2Sus.musicxml +++ b/test/data/grooves/FastJazzWaltz2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastJazzWaltzEnd.musicxml b/test/data/grooves/FastJazzWaltzEnd.musicxml index 296a99fb..8fe97ffa 100644 --- a/test/data/grooves/FastJazzWaltzEnd.musicxml +++ b/test/data/grooves/FastJazzWaltzEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastJazzWaltzFill.musicxml b/test/data/grooves/FastJazzWaltzFill.musicxml index abf1140d..0d8924f0 100644 --- a/test/data/grooves/FastJazzWaltzFill.musicxml +++ b/test/data/grooves/FastJazzWaltzFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastJazzWaltzIntro.musicxml b/test/data/grooves/FastJazzWaltzIntro.musicxml index 889e3233..88e493b7 100644 --- a/test/data/grooves/FastJazzWaltzIntro.musicxml +++ b/test/data/grooves/FastJazzWaltzIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -660,53 +660,18 @@ + F 5 - 48 - - - 1 - 64th - up - x - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - + 192 1 - 1024th + 16th up x - @@ -714,11 +679,11 @@ F 5 - 96 + 48 1 - 32nd + 64th up x @@ -730,12 +695,12 @@ F 5 - 24 + 12 1 - 128th + 256th up x @@ -748,11 +713,11 @@ F 5 - 6 + 3 1 - 512th + 1024th up x @@ -814,15 +779,28 @@ F 5 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -830,17 +808,18 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -848,15 +827,19 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -888,19 +871,15 @@ + F 5 - 189 + 192 1 - 32nd - - - - - + 16th up x @@ -1011,65 +990,28 @@ F 5 - 96 - + 128 1 - 32nd - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - - - - - F - 5 - - 48 - - - 1 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1077,17 +1019,18 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1095,15 +1038,19 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1120,25 +1067,6 @@ - - - F - 5 - - 189 - - 1 - 32nd - - - - - - up - x - - - F @@ -1154,19 +1082,15 @@ + F 5 - 189 + 192 1 - 32nd - - - - - + 16th up x @@ -1277,65 +1201,28 @@ F 5 - 96 - + 128 1 - 32nd - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - - - - - F - 5 - - 48 - - - 1 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1343,17 +1230,18 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1361,15 +1249,19 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1386,25 +1278,6 @@ - - - F - 5 - - 189 - - 1 - 32nd - - - - - - up - x - - - \ No newline at end of file diff --git a/test/data/grooves/FastJazzWaltzIntro8.musicxml b/test/data/grooves/FastJazzWaltzIntro8.musicxml index 4418da65..02cbd3af 100644 --- a/test/data/grooves/FastJazzWaltzIntro8.musicxml +++ b/test/data/grooves/FastJazzWaltzIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1240,53 +1240,18 @@ + F 5 - 48 - - - 1 - 64th - up - x - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - + 192 1 - 1024th + 16th up x - @@ -1294,11 +1259,11 @@ F 5 - 96 + 48 1 - 32nd + 64th up x @@ -1310,12 +1275,12 @@ F 5 - 24 + 12 1 - 128th + 256th up x @@ -1328,11 +1293,11 @@ F 5 - 6 + 3 1 - 512th + 1024th up x @@ -1394,15 +1359,28 @@ F 5 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1410,17 +1388,18 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1428,15 +1407,19 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1468,19 +1451,15 @@ + F 5 - 189 + 192 1 - 32nd - - - - - + 16th up x @@ -1591,65 +1570,28 @@ F 5 - 96 - + 128 1 - 32nd - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - - - - - F - 5 - - 48 - - - 1 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1657,17 +1599,18 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1675,15 +1618,19 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1700,25 +1647,6 @@ - - - F - 5 - - 189 - - 1 - 32nd - - - - - - up - x - - - F @@ -1734,19 +1662,15 @@ + F 5 - 189 + 192 1 - 32nd - - - - - + 16th up x @@ -1857,65 +1781,28 @@ F 5 - 96 - + 128 1 - 32nd - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - - - - - F - 5 - - 48 - - - 1 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1923,17 +1810,18 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1941,15 +1829,19 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1966,25 +1858,6 @@ - - - F - 5 - - 189 - - 1 - 32nd - - - - - - up - x - - - \ No newline at end of file diff --git a/test/data/grooves/FastJazzWaltzSus.musicxml b/test/data/grooves/FastJazzWaltzSus.musicxml index 7bfdc182..b02d02c0 100644 --- a/test/data/grooves/FastJazzWaltzSus.musicxml +++ b/test/data/grooves/FastJazzWaltzSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastSwing.musicxml b/test/data/grooves/FastSwing.musicxml index 2f69aa6e..89a51ca6 100644 --- a/test/data/grooves/FastSwing.musicxml +++ b/test/data/grooves/FastSwing.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -394,98 +394,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -493,15 +420,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -591,98 +522,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -690,15 +548,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -788,98 +650,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -887,15 +676,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -985,98 +778,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1084,15 +804,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + diff --git a/test/data/grooves/FastSwingEnd.musicxml b/test/data/grooves/FastSwingEnd.musicxml index 101ad071..3b4dea88 100644 --- a/test/data/grooves/FastSwingEnd.musicxml +++ b/test/data/grooves/FastSwingEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastSwingIntro.musicxml b/test/data/grooves/FastSwingIntro.musicxml index bfa2e554..0740bbf6 100644 --- a/test/data/grooves/FastSwingIntro.musicxml +++ b/test/data/grooves/FastSwingIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -388,98 +388,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -487,15 +414,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -585,98 +516,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -684,15 +542,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + diff --git a/test/data/grooves/FastSwingIntro8.musicxml b/test/data/grooves/FastSwingIntro8.musicxml index 57007cf7..ca22f5aa 100644 --- a/test/data/grooves/FastSwingIntro8.musicxml +++ b/test/data/grooves/FastSwingIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -578,80 +578,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -659,33 +604,19 @@ F 5 - 24 - - + 512 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -775,62 +706,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + @@ -838,51 +732,19 @@ F 5 - 96 - - + 512 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -972,62 +834,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + @@ -1035,51 +860,19 @@ F 5 - 96 - - + 512 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -1169,80 +962,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1250,33 +988,19 @@ F 5 - 24 - - + 512 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -1366,62 +1090,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + @@ -1429,51 +1116,19 @@ F 5 - 96 - - + 512 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -1563,62 +1218,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + @@ -1626,51 +1244,19 @@ F 5 - 96 - - + 512 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + up x - + diff --git a/test/data/grooves/FastSwingSus.musicxml b/test/data/grooves/FastSwingSus.musicxml index 62214f52..b77dfe40 100644 --- a/test/data/grooves/FastSwingSus.musicxml +++ b/test/data/grooves/FastSwingSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -394,98 +394,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -493,15 +420,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -591,98 +522,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -690,15 +548,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -788,98 +650,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -887,15 +676,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -985,98 +778,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1084,15 +804,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + diff --git a/test/data/grooves/FastSwingWalk.musicxml b/test/data/grooves/FastSwingWalk.musicxml index 608a79df..f458ffeb 100644 --- a/test/data/grooves/FastSwingWalk.musicxml +++ b/test/data/grooves/FastSwingWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -394,98 +394,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -493,15 +420,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -591,98 +522,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -690,15 +548,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -788,98 +650,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -887,15 +676,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -985,98 +778,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1084,15 +804,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + diff --git a/test/data/grooves/FastSwingWalkSus.musicxml b/test/data/grooves/FastSwingWalkSus.musicxml index e46d4e82..9b4a9ee2 100644 --- a/test/data/grooves/FastSwingWalkSus.musicxml +++ b/test/data/grooves/FastSwingWalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -394,98 +394,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -493,15 +420,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -591,98 +522,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -690,15 +548,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -788,98 +650,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -887,15 +676,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -985,98 +778,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1084,15 +804,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + diff --git a/test/data/grooves/FastWaltz.musicxml b/test/data/grooves/FastWaltz.musicxml index d1315ff4..f48ed78d 100644 --- a/test/data/grooves/FastWaltz.musicxml +++ b/test/data/grooves/FastWaltz.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastWaltzEnd.musicxml b/test/data/grooves/FastWaltzEnd.musicxml index e4f7e0ee..45251899 100644 --- a/test/data/grooves/FastWaltzEnd.musicxml +++ b/test/data/grooves/FastWaltzEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastWaltzIntro.musicxml b/test/data/grooves/FastWaltzIntro.musicxml index d32d56e3..c4e0ef9b 100644 --- a/test/data/grooves/FastWaltzIntro.musicxml +++ b/test/data/grooves/FastWaltzIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastWaltzIntro8.musicxml b/test/data/grooves/FastWaltzIntro8.musicxml index 664c83fa..37d18544 100644 --- a/test/data/grooves/FastWaltzIntro8.musicxml +++ b/test/data/grooves/FastWaltzIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastWaltzPlus.musicxml b/test/data/grooves/FastWaltzPlus.musicxml index 554e4054..ee546389 100644 --- a/test/data/grooves/FastWaltzPlus.musicxml +++ b/test/data/grooves/FastWaltzPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastWaltzSus.musicxml b/test/data/grooves/FastWaltzSus.musicxml index f76f17d6..8395bc71 100644 --- a/test/data/grooves/FastWaltzSus.musicxml +++ b/test/data/grooves/FastWaltzSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastWaltzSusPlus.musicxml b/test/data/grooves/FastWaltzSusPlus.musicxml index ebd1867b..fc87b7af 100644 --- a/test/data/grooves/FastWaltzSusPlus.musicxml +++ b/test/data/grooves/FastWaltzSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastWaltzWalk.musicxml b/test/data/grooves/FastWaltzWalk.musicxml index 1ddb54c5..ae155a8d 100644 --- a/test/data/grooves/FastWaltzWalk.musicxml +++ b/test/data/grooves/FastWaltzWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastWaltzWalkPlus.musicxml b/test/data/grooves/FastWaltzWalkPlus.musicxml index eb52708c..16c7c2c6 100644 --- a/test/data/grooves/FastWaltzWalkPlus.musicxml +++ b/test/data/grooves/FastWaltzWalkPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastWaltzWalkSus.musicxml b/test/data/grooves/FastWaltzWalkSus.musicxml index 9d640f04..c618113a 100644 --- a/test/data/grooves/FastWaltzWalkSus.musicxml +++ b/test/data/grooves/FastWaltzWalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FastWaltzWalkSusPlus.musicxml b/test/data/grooves/FastWaltzWalkSusPlus.musicxml index 9270a39e..db76014a 100644 --- a/test/data/grooves/FastWaltzWalkSusPlus.musicxml +++ b/test/data/grooves/FastWaltzWalkSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Folk.musicxml b/test/data/grooves/Folk.musicxml index cff4f6b3..2b35219a 100644 --- a/test/data/grooves/Folk.musicxml +++ b/test/data/grooves/Folk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkArticulated.musicxml b/test/data/grooves/FolkArticulated.musicxml index 6c03e09e..c6b3e3ce 100644 --- a/test/data/grooves/FolkArticulated.musicxml +++ b/test/data/grooves/FolkArticulated.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkArticulatedSus.musicxml b/test/data/grooves/FolkArticulatedSus.musicxml index 08d47ad9..5c54cff4 100644 --- a/test/data/grooves/FolkArticulatedSus.musicxml +++ b/test/data/grooves/FolkArticulatedSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkEnd.musicxml b/test/data/grooves/FolkEnd.musicxml index 8dfaad0b..34c58bd1 100644 --- a/test/data/grooves/FolkEnd.musicxml +++ b/test/data/grooves/FolkEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkIntro.musicxml b/test/data/grooves/FolkIntro.musicxml index a7651881..57fffb06 100644 --- a/test/data/grooves/FolkIntro.musicxml +++ b/test/data/grooves/FolkIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkRock.musicxml b/test/data/grooves/FolkRock.musicxml index 0fd4127b..9c957b0a 100644 --- a/test/data/grooves/FolkRock.musicxml +++ b/test/data/grooves/FolkRock.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkRockEnd.musicxml b/test/data/grooves/FolkRockEnd.musicxml index 3d3450cc..a3a303cb 100644 --- a/test/data/grooves/FolkRockEnd.musicxml +++ b/test/data/grooves/FolkRockEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkRockFill.musicxml b/test/data/grooves/FolkRockFill.musicxml index 6d6528eb..d4619be0 100644 --- a/test/data/grooves/FolkRockFill.musicxml +++ b/test/data/grooves/FolkRockFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkRockIntro.musicxml b/test/data/grooves/FolkRockIntro.musicxml index da7fd7d8..b2c18cee 100644 --- a/test/data/grooves/FolkRockIntro.musicxml +++ b/test/data/grooves/FolkRockIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkRockPlus.musicxml b/test/data/grooves/FolkRockPlus.musicxml index 073afa27..4eda15a5 100644 --- a/test/data/grooves/FolkRockPlus.musicxml +++ b/test/data/grooves/FolkRockPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkRockSus.musicxml b/test/data/grooves/FolkRockSus.musicxml index c281bd00..fff75f1a 100644 --- a/test/data/grooves/FolkRockSus.musicxml +++ b/test/data/grooves/FolkRockSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkRockSusPlus.musicxml b/test/data/grooves/FolkRockSusPlus.musicxml index 6b9d9cd2..db64c410 100644 --- a/test/data/grooves/FolkRockSusPlus.musicxml +++ b/test/data/grooves/FolkRockSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkSus.musicxml b/test/data/grooves/FolkSus.musicxml index 69734355..27eebe34 100644 --- a/test/data/grooves/FolkSus.musicxml +++ b/test/data/grooves/FolkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkWalk.musicxml b/test/data/grooves/FolkWalk.musicxml index 7e799df2..6c6f40c5 100644 --- a/test/data/grooves/FolkWalk.musicxml +++ b/test/data/grooves/FolkWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkyJazzGuitar.musicxml b/test/data/grooves/FolkyJazzGuitar.musicxml index 5ea69f37..76a32cb4 100644 --- a/test/data/grooves/FolkyJazzGuitar.musicxml +++ b/test/data/grooves/FolkyJazzGuitar.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkyJazzGuitarEnd.musicxml b/test/data/grooves/FolkyJazzGuitarEnd.musicxml index 51502ca7..1bd20286 100644 --- a/test/data/grooves/FolkyJazzGuitarEnd.musicxml +++ b/test/data/grooves/FolkyJazzGuitarEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkyJazzGuitarIntro.musicxml b/test/data/grooves/FolkyJazzGuitarIntro.musicxml index ec45cf7a..d0dc01a1 100644 --- a/test/data/grooves/FolkyJazzGuitarIntro.musicxml +++ b/test/data/grooves/FolkyJazzGuitarIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkyJazzGuitarPlus.musicxml b/test/data/grooves/FolkyJazzGuitarPlus.musicxml index fd044e70..a2862b5a 100644 --- a/test/data/grooves/FolkyJazzGuitarPlus.musicxml +++ b/test/data/grooves/FolkyJazzGuitarPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkyJazzGuitarSus.musicxml b/test/data/grooves/FolkyJazzGuitarSus.musicxml index f198d727..2ca65245 100644 --- a/test/data/grooves/FolkyJazzGuitarSus.musicxml +++ b/test/data/grooves/FolkyJazzGuitarSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkyJazzGuitarSusPlus.musicxml b/test/data/grooves/FolkyJazzGuitarSusPlus.musicxml index 2d4efd9d..8e3b5b04 100644 --- a/test/data/grooves/FolkyJazzGuitarSusPlus.musicxml +++ b/test/data/grooves/FolkyJazzGuitarSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkyJazzPiano.musicxml b/test/data/grooves/FolkyJazzPiano.musicxml index 9e2aaec4..b38ad186 100644 --- a/test/data/grooves/FolkyJazzPiano.musicxml +++ b/test/data/grooves/FolkyJazzPiano.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkyJazzPianoEnd.musicxml b/test/data/grooves/FolkyJazzPianoEnd.musicxml index 6081ba8c..3b8965f5 100644 --- a/test/data/grooves/FolkyJazzPianoEnd.musicxml +++ b/test/data/grooves/FolkyJazzPianoEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkyJazzPianoIntro.musicxml b/test/data/grooves/FolkyJazzPianoIntro.musicxml index c64902e9..0ac81f92 100644 --- a/test/data/grooves/FolkyJazzPianoIntro.musicxml +++ b/test/data/grooves/FolkyJazzPianoIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkyJazzPianoPlus.musicxml b/test/data/grooves/FolkyJazzPianoPlus.musicxml index 12e4bf07..f1497da9 100644 --- a/test/data/grooves/FolkyJazzPianoPlus.musicxml +++ b/test/data/grooves/FolkyJazzPianoPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkyJazzPianoSus.musicxml b/test/data/grooves/FolkyJazzPianoSus.musicxml index 873c01b8..faec6a16 100644 --- a/test/data/grooves/FolkyJazzPianoSus.musicxml +++ b/test/data/grooves/FolkyJazzPianoSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FolkyJazzPianoSusPlus.musicxml b/test/data/grooves/FolkyJazzPianoSusPlus.musicxml index 3a766ec4..bb8e9d92 100644 --- a/test/data/grooves/FolkyJazzPianoSusPlus.musicxml +++ b/test/data/grooves/FolkyJazzPianoSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Forro-Miranda.musicxml b/test/data/grooves/Forro-Miranda.musicxml index 5462acff..9a143364 100644 --- a/test/data/grooves/Forro-Miranda.musicxml +++ b/test/data/grooves/Forro-Miranda.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FoxTrot1End.musicxml b/test/data/grooves/FoxTrot1End.musicxml index 8579f75c..59bf205e 100644 --- a/test/data/grooves/FoxTrot1End.musicxml +++ b/test/data/grooves/FoxTrot1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FoxTrot1Intro.musicxml b/test/data/grooves/FoxTrot1Intro.musicxml index 733576a5..70efd071 100644 --- a/test/data/grooves/FoxTrot1Intro.musicxml +++ b/test/data/grooves/FoxTrot1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FoxTrot1Plus.musicxml b/test/data/grooves/FoxTrot1Plus.musicxml index 8cec7173..5da71ba0 100644 --- a/test/data/grooves/FoxTrot1Plus.musicxml +++ b/test/data/grooves/FoxTrot1Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FoxTrot1Sus.musicxml b/test/data/grooves/FoxTrot1Sus.musicxml index 62fa35a7..89aae3a1 100644 --- a/test/data/grooves/FoxTrot1Sus.musicxml +++ b/test/data/grooves/FoxTrot1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FoxTrot1SusPlus.musicxml b/test/data/grooves/FoxTrot1SusPlus.musicxml index 2389ecdb..b7e1175a 100644 --- a/test/data/grooves/FoxTrot1SusPlus.musicxml +++ b/test/data/grooves/FoxTrot1SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FoxTrotEnd.musicxml b/test/data/grooves/FoxTrotEnd.musicxml index 7894f420..725efb6c 100644 --- a/test/data/grooves/FoxTrotEnd.musicxml +++ b/test/data/grooves/FoxTrotEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FoxTrotIntro.musicxml b/test/data/grooves/FoxTrotIntro.musicxml index be27ace6..1a8f79c9 100644 --- a/test/data/grooves/FoxTrotIntro.musicxml +++ b/test/data/grooves/FoxTrotIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FoxTrotPlus.musicxml b/test/data/grooves/FoxTrotPlus.musicxml index 197ad50b..3c42a7cb 100644 --- a/test/data/grooves/FoxTrotPlus.musicxml +++ b/test/data/grooves/FoxTrotPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FoxTrotSusPlus.musicxml b/test/data/grooves/FoxTrotSusPlus.musicxml index d0afd756..68d4d9c6 100644 --- a/test/data/grooves/FoxTrotSusPlus.musicxml +++ b/test/data/grooves/FoxTrotSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Foxtrot.musicxml b/test/data/grooves/Foxtrot.musicxml index 49c5057d..fc081a39 100644 --- a/test/data/grooves/Foxtrot.musicxml +++ b/test/data/grooves/Foxtrot.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1336,22 +1336,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -1359,10 +1362,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1370,10 +1378,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1396,22 +1410,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -1419,10 +1436,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1433,13 +1455,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -1499,102 +1527,28 @@ E 4 - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - + 256 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -1602,15 +1556,18 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - @@ -1618,13 +1575,19 @@ E 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up normal + diff --git a/test/data/grooves/Foxtrot1.musicxml b/test/data/grooves/Foxtrot1.musicxml index 6f41f288..7bf64590 100644 --- a/test/data/grooves/Foxtrot1.musicxml +++ b/test/data/grooves/Foxtrot1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FoxtrotFill.musicxml b/test/data/grooves/FoxtrotFill.musicxml index d3f04166..e9e0c114 100644 --- a/test/data/grooves/FoxtrotFill.musicxml +++ b/test/data/grooves/FoxtrotFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FoxtrotIntro.musicxml b/test/data/grooves/FoxtrotIntro.musicxml index a8885023..3a83de7d 100644 --- a/test/data/grooves/FoxtrotIntro.musicxml +++ b/test/data/grooves/FoxtrotIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1254,22 +1254,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -1277,10 +1280,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1288,10 +1296,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/FoxtrotSus.musicxml b/test/data/grooves/FoxtrotSus.musicxml index ad966d97..6363ca4f 100644 --- a/test/data/grooves/FoxtrotSus.musicxml +++ b/test/data/grooves/FoxtrotSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FrenchWaltz.musicxml b/test/data/grooves/FrenchWaltz.musicxml index 834976e3..2027e477 100644 --- a/test/data/grooves/FrenchWaltz.musicxml +++ b/test/data/grooves/FrenchWaltz.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FrenchWaltz1.musicxml b/test/data/grooves/FrenchWaltz1.musicxml index 66fabc80..c7d0545a 100644 --- a/test/data/grooves/FrenchWaltz1.musicxml +++ b/test/data/grooves/FrenchWaltz1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FrenchWaltz1End.musicxml b/test/data/grooves/FrenchWaltz1End.musicxml index fc632f35..160e0325 100644 --- a/test/data/grooves/FrenchWaltz1End.musicxml +++ b/test/data/grooves/FrenchWaltz1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FrenchWaltz1Fill.musicxml b/test/data/grooves/FrenchWaltz1Fill.musicxml index 162cc390..09c11597 100644 --- a/test/data/grooves/FrenchWaltz1Fill.musicxml +++ b/test/data/grooves/FrenchWaltz1Fill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FrenchWaltz1FillSus.musicxml b/test/data/grooves/FrenchWaltz1FillSus.musicxml index ae5de490..e3fae575 100644 --- a/test/data/grooves/FrenchWaltz1FillSus.musicxml +++ b/test/data/grooves/FrenchWaltz1FillSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FrenchWaltz1Sus.musicxml b/test/data/grooves/FrenchWaltz1Sus.musicxml index bc7eb1cd..92b8ab73 100644 --- a/test/data/grooves/FrenchWaltz1Sus.musicxml +++ b/test/data/grooves/FrenchWaltz1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FrenchWaltz2.musicxml b/test/data/grooves/FrenchWaltz2.musicxml index 8fadd1ca..6dc52341 100644 --- a/test/data/grooves/FrenchWaltz2.musicxml +++ b/test/data/grooves/FrenchWaltz2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FrenchWaltz2Fill.musicxml b/test/data/grooves/FrenchWaltz2Fill.musicxml index 20a63f61..1c7a3ee5 100644 --- a/test/data/grooves/FrenchWaltz2Fill.musicxml +++ b/test/data/grooves/FrenchWaltz2Fill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FrenchWaltz2FillSus.musicxml b/test/data/grooves/FrenchWaltz2FillSus.musicxml index a35a3108..6240f2d1 100644 --- a/test/data/grooves/FrenchWaltz2FillSus.musicxml +++ b/test/data/grooves/FrenchWaltz2FillSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FrenchWaltz2Sus.musicxml b/test/data/grooves/FrenchWaltz2Sus.musicxml index 55d32cf7..8e367940 100644 --- a/test/data/grooves/FrenchWaltz2Sus.musicxml +++ b/test/data/grooves/FrenchWaltz2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FrenchWaltz3.musicxml b/test/data/grooves/FrenchWaltz3.musicxml index 90e2a636..45a7423c 100644 --- a/test/data/grooves/FrenchWaltz3.musicxml +++ b/test/data/grooves/FrenchWaltz3.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FrenchWaltz3Fill.musicxml b/test/data/grooves/FrenchWaltz3Fill.musicxml index 2ef976ab..e5af9e87 100644 --- a/test/data/grooves/FrenchWaltz3Fill.musicxml +++ b/test/data/grooves/FrenchWaltz3Fill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FrenchWaltz3FillSus.musicxml b/test/data/grooves/FrenchWaltz3FillSus.musicxml index ed2e066b..61cf2c55 100644 --- a/test/data/grooves/FrenchWaltz3FillSus.musicxml +++ b/test/data/grooves/FrenchWaltz3FillSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FrenchWaltz3Sus.musicxml b/test/data/grooves/FrenchWaltz3Sus.musicxml index 4ff6ef45..02c7bc93 100644 --- a/test/data/grooves/FrenchWaltz3Sus.musicxml +++ b/test/data/grooves/FrenchWaltz3Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FrenchWaltzEnd.musicxml b/test/data/grooves/FrenchWaltzEnd.musicxml index d40ba189..c06be931 100644 --- a/test/data/grooves/FrenchWaltzEnd.musicxml +++ b/test/data/grooves/FrenchWaltzEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FrenchWaltzIntro.musicxml b/test/data/grooves/FrenchWaltzIntro.musicxml index 81d5ed7e..8ff5c051 100644 --- a/test/data/grooves/FrenchWaltzIntro.musicxml +++ b/test/data/grooves/FrenchWaltzIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/FrenchWaltzSus.musicxml b/test/data/grooves/FrenchWaltzSus.musicxml index 22300ae8..a0cffadd 100644 --- a/test/data/grooves/FrenchWaltzSus.musicxml +++ b/test/data/grooves/FrenchWaltzSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Funk1.musicxml b/test/data/grooves/Funk1.musicxml index 6de31313..92c0ebee 100644 --- a/test/data/grooves/Funk1.musicxml +++ b/test/data/grooves/Funk1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1788,99 +1788,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - diff --git a/test/data/grooves/Funk1End.musicxml b/test/data/grooves/Funk1End.musicxml index 8882454c..217fd12c 100644 --- a/test/data/grooves/Funk1End.musicxml +++ b/test/data/grooves/Funk1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -433,6 +433,23 @@ + + + + G + 5 + + 192 + + + 3 + 16th + up + x + + + + G @@ -440,6 +457,7 @@ 48 + 3 64th @@ -447,6 +465,7 @@ x + @@ -538,33 +557,42 @@ G 5 - 96 - + 192 3 - 32nd + 16th up circle-x - - + + G 5 - 24 - - - + 192 + 3 - 128th + 16th up - circle-x + x + + + + + + G + 5 + + 192 + + 3 + 16th + up + x - - @@ -572,34 +600,36 @@ G 5 - 6 - + 192 + 3 - 512th + 16th up circle-x - + - + G 5 48 - + + 3 64th up - x + circle-x + - + G 5 @@ -607,58 +637,46 @@ 12 - + 3 256th up - x + circle-x - + G 5 3 - + 3 1024th up - x + circle-x - + G 5 192 + 3 16th up x - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - + @@ -668,6 +686,7 @@ 48 + 3 64th @@ -675,6 +694,7 @@ x + @@ -766,33 +786,42 @@ G 5 - 96 - + 192 3 - 32nd + 16th up circle-x - - + + G 5 - 24 - - - + 192 + 3 - 128th + 16th up - circle-x + x + + + + + + G + 5 + + 192 + + 3 + 16th + up + x - - @@ -800,34 +829,36 @@ G 5 - 6 - + 192 + 3 - 512th + 16th up circle-x - + - + G 5 48 - + + 3 64th up - x + circle-x + - + G 5 @@ -835,58 +866,46 @@ 12 - + 3 256th up - x + circle-x - + G 5 3 - + 3 1024th up - x + circle-x - + G 5 192 + 3 16th up x - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - + @@ -896,6 +915,7 @@ 48 + 3 64th @@ -903,6 +923,7 @@ x + @@ -994,33 +1015,42 @@ G 5 - 96 - + 192 3 - 32nd + 16th up circle-x - - + + G 5 - 24 - - - + 192 + 3 - 128th + 16th up - circle-x + x + + + + + + G + 5 + + 192 + + 3 + 16th + up + x - - @@ -1028,34 +1058,36 @@ G 5 - 6 - + 192 + 3 - 512th + 16th up circle-x - + - + G 5 48 - + + 3 64th up - x + circle-x + - + G 5 @@ -1063,58 +1095,46 @@ 12 - + 3 256th up - x + circle-x - + G 5 3 - + 3 1024th up - x + circle-x - + G 5 192 + 3 16th up x - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - + @@ -1124,6 +1144,7 @@ 48 + 3 64th @@ -1131,6 +1152,7 @@ x + @@ -1222,99 +1244,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -1504,15 +1455,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/Funk1Intro.musicxml b/test/data/grooves/Funk1Intro.musicxml index d1b4763b..7334d184 100644 --- a/test/data/grooves/Funk1Intro.musicxml +++ b/test/data/grooves/Funk1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1744,99 +1744,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -3106,15 +3035,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/Funk2.musicxml b/test/data/grooves/Funk2.musicxml index a3b659b4..bd78a45e 100644 --- a/test/data/grooves/Funk2.musicxml +++ b/test/data/grooves/Funk2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -477,83 +477,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + + + 3 + 16th + + + 2 + 16th + + @@ -561,15 +506,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -577,13 +525,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -659,14 +613,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -705,83 +660,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + + + 3 + 16th + + + 2 + 16th + + @@ -789,15 +689,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -805,13 +708,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -873,14 +782,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -919,15 +829,28 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -935,17 +858,18 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - @@ -953,49 +877,67 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - + - + G 5 - 48 - + 307.2 3 - 64th + quarter + + 5 + 2 + quarter + up x - + + + 5 + quarter + + + 2 + quarter + + - + G 5 - 12 - - - + 307.2 + 3 - 256th + quarter + + 5 + 2 + quarter + up - x + circle-x - - @@ -1003,97 +945,102 @@ G 5 - 3 - + 307.2 3 - 1024th + quarter + + 5 + 2 + quarter + up x - - + G 5 - 192 - + 307.2 + 3 - 16th + quarter + + 5 + 2 + quarter + up - x + circle-x - + G 5 - 192 - + 307.2 3 - 16th + quarter + + 5 + 2 + quarter + up x - + - + + + G 5 - 48 - - + 192 3 - 64th + 16th up x - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1101,49 +1048,61 @@ G 5 - 96 - - + 384 + 3 - 32nd + eighth up - circle-x + x - - + G 5 - 24 - - - + 128 + 3 - 128th + 16th + + 3 + 2 + 16th + up - circle-x + x - - + + + 3 + 16th + + + 2 + 16th + + - + G 5 - 6 - - + 128 + 3 - 512th + 16th + + 3 + 2 + 16th + up - circle-x + x - @@ -1151,13 +1110,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -1165,224 +1130,24 @@ G 5 - 192 - + 384 + 3 - 16th + eighth up - circle-x + x - + G 5 - 768 + 384 3 - quarter - up - x - - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 384 - - 3 - eighth + eighth up x @@ -1508,80 +1273,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - + 256 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -1589,15 +1299,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -1605,13 +1318,19 @@ F 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + down normal + @@ -1646,80 +1365,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1727,33 +1391,19 @@ F 4 - 24 - - + 512 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -1847,80 +1497,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - + 256 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -1928,15 +1523,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -1944,13 +1542,19 @@ F 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + down normal + @@ -1985,98 +1589,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -2084,15 +1615,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/Funk2End.musicxml b/test/data/grooves/Funk2End.musicxml index b7babead..260a4085 100644 --- a/test/data/grooves/Funk2End.musicxml +++ b/test/data/grooves/Funk2End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Funk2Intro.musicxml b/test/data/grooves/Funk2Intro.musicxml index d6d2d5fa..7211b470 100644 --- a/test/data/grooves/Funk2Intro.musicxml +++ b/test/data/grooves/Funk2Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -477,83 +477,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + + + 3 + 16th + + + 2 + 16th + + @@ -561,15 +506,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -577,13 +525,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -659,14 +613,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -705,83 +660,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + + + 3 + 16th + + + 2 + 16th + + @@ -789,15 +689,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -805,13 +708,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -887,14 +796,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -989,147 +899,140 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - + 384 3 - 128th + eighth up circle-x - - + G 5 - 6 - - + 384 + 3 - 512th + eighth up - circle-x + x - - + + + G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - - + G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + - - - + G 5 - 384 + 128 3 - eighth + 16th + + 3 + 2 + 16th + up x - + G 5 - 384 + 128 3 - eighth + 16th + + 3 + 2 + 16th + up x + @@ -1146,284 +1049,67 @@ - + G 5 - 96 - - + 384 + 3 - 32nd + eighth up - x + circle-x - + G 5 - 24 - - + 384 3 - 128th + eighth up x - - - + G 5 - 6 - + 768 3 - 512th + quarter up x - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 768 - - 3 - quarter - up - x - - - - - - - - - 768 - - - percussion - - - 5 - - - + + + + + + 768 + + + percussion + + + 5 + + + F 4 @@ -1439,647 +1125,235 @@ - 384 - - 1 - eighth - - - - - - - 192 - - 1 - 16th - - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - F - 4 - - 576 - - 1 - eighth - - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - 768 - 1 - quarter - - - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - F - 4 - - 384 - - 1 - eighth - down - normal - - - - - - 768 - 1 - quarter - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - down - normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - - 1 - eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 + 384 - 1 - 256th + eighth - - 3 + 192 1 - 1024th + 16th - - - F - 4 - - 384 - - - 1 - eighth - down - normal - - - - - + F 4 - 96 - - + 192 1 - 32nd + 16th down normal - - - + F 4 - 24 - - + 576 1 - 128th + eighth + down normal - - - + F 4 - 6 - + 192 1 - 512th + 16th down normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - 12 - - + 768 1 - 256th + quarter - - + + - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + - + F 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + down normal - - - + F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - + - 12 - - + 768 1 - 256th + quarter - - - 3 - + 384 1 - 1024th + eighth - - + F 4 384 - 1 eighth down normal - - - - F - 4 - - 96 - - - + + + 256 1 - 32nd - down - normal - - - + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + - + F 4 - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + down normal - - + + + + + + + + 256 + 1 + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -2087,59 +1361,42 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - + - 3 - + 256 1 - 1024th - - + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -2147,33 +1404,42 @@ F 4 - 384 - + 512 1 - eighth + quarter + + 3 + 2 + quarter + down normal - + - - - F - 4 - - 96 - - - + + + 256 1 - 32nd - down - normal - - - + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -2181,17 +1447,42 @@ F 4 - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + down normal - - + + + + + + 256 + 1 + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -2199,15 +1490,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/Fusion.musicxml b/test/data/grooves/Fusion.musicxml index 3ed7de49..066d15a0 100644 --- a/test/data/grooves/Fusion.musicxml +++ b/test/data/grooves/Fusion.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -272,119 +272,28 @@ E 4 - 192 - - - 2 - 16th - up - square - - - - - - - E - 4 - - 48 - - - - 2 - 64th - up - square - - - - - - - - E - 4 - - 12 - - - - 2 - 256th - up - square - - - - - - - - E - 4 - - 3 - - - 2 - 1024th - up - square - - - - - - - E - 4 - - 384 - + 256 2 eighth + + 3 + 2 + quarter + up square - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - + + + 3 + eighth + + + 2 + quarter + + @@ -392,15 +301,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -486,119 +399,28 @@ E 4 - 192 - - - 2 - 16th - up - square - - - - - - - E - 4 - - 48 - - - - 2 - 64th - up - square - - - - - - - - E - 4 - - 12 - - - - 2 - 256th - up - square - - - - - - - - E - 4 - - 3 - - - 2 - 1024th - up - square - - - - - - - E - 4 - - 384 - + 256 2 eighth + + 3 + 2 + quarter + up square - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - + + + 3 + eighth + + + 2 + quarter + + @@ -606,15 +428,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -1006,89 +832,53 @@ G 5 - 48 - + 192 3 - 64th + 16th up x - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - - + G 5 - 3 - + 192 + 3 - 1024th + 16th up x - + - + G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - + 48 + + 3 64th @@ -1337,6 +1127,23 @@ + + + + G + 5 + + 192 + + + 3 + 16th + up + x + + + + G @@ -1344,6 +1151,7 @@ 48 + 3 64th @@ -1351,6 +1159,7 @@ x + @@ -1638,49 +1447,13 @@ G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -1948,6 +1721,23 @@ + + + + G + 5 + + 192 + + + 3 + 16th + up + x + + + + G @@ -1955,6 +1745,7 @@ 48 + 3 64th @@ -1962,6 +1753,7 @@ x + @@ -2249,49 +2041,13 @@ G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -2565,6 +2321,23 @@ + + + + G + 5 + + 192 + + + 3 + 16th + up + x + + + + G @@ -2572,6 +2345,7 @@ 48 + 3 64th @@ -2579,6 +2353,7 @@ x + @@ -2866,49 +2641,13 @@ G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -3205,81 +2944,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 288 - - - 1 - 16th - - down - normal - - - - - - - F - 4 - - 24 - - - + 256 1 - 128th - down - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -3287,15 +2970,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -3303,13 +2989,19 @@ F 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + down normal + @@ -3478,62 +3170,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -3541,51 +3196,19 @@ F 4 - 96 - - + 512 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -3679,62 +3302,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -3742,51 +3328,19 @@ F 4 - 96 - - + 512 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/FusionEnd.musicxml b/test/data/grooves/FusionEnd.musicxml index 10fe98c3..fb5f444b 100644 --- a/test/data/grooves/FusionEnd.musicxml +++ b/test/data/grooves/FusionEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -726,49 +726,13 @@ G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -1031,121 +995,33 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - + G 5 - 6 - + 768 3 - 512th + quarter up x - diff --git a/test/data/grooves/FusionIntro.musicxml b/test/data/grooves/FusionIntro.musicxml index cb42e3c1..c91f903d 100644 --- a/test/data/grooves/FusionIntro.musicxml +++ b/test/data/grooves/FusionIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -272,119 +272,28 @@ E 4 - 192 - - - 2 - 16th - up - square - - - - - - - E - 4 - - 48 - - - - 2 - 64th - up - square - - - - - - - - E - 4 - - 12 - - - - 2 - 256th - up - square - - - - - - - - E - 4 - - 3 - - - 2 - 1024th - up - square - - - - - - - E - 4 - - 384 - + 256 2 eighth + + 3 + 2 + quarter + up square - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - + + + 3 + eighth + + + 2 + quarter + + @@ -392,15 +301,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -964,49 +877,13 @@ G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -1274,6 +1151,23 @@ + + + + G + 5 + + 192 + + + 3 + 16th + up + x + + + + G @@ -1281,6 +1175,7 @@ 48 + 3 64th @@ -1288,6 +1183,7 @@ x + @@ -1575,49 +1471,13 @@ G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -1885,6 +1745,23 @@ + + + + G + 5 + + 192 + + + 3 + 16th + up + x + + + + G @@ -1892,6 +1769,7 @@ 48 + 3 64th @@ -1899,6 +1777,7 @@ x + @@ -2186,82 +2065,46 @@ G 5 - 48 - + 192 3 - 64th + 16th up x - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - - + G 5 - 3 - + 192 + 3 - 1024th + 16th up x - + - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - + G 5 @@ -2497,121 +2340,33 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - + G 5 - 6 - + 768 3 - 512th + quarter up x - @@ -2736,81 +2491,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - + 256 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 288 - - - 1 - 16th - - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -2818,15 +2517,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -2834,13 +2536,19 @@ F 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + down normal + @@ -3009,98 +2717,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -3108,15 +2743,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/GuitarBallad.musicxml b/test/data/grooves/GuitarBallad.musicxml index 2f81fd89..36491fc3 100644 --- a/test/data/grooves/GuitarBallad.musicxml +++ b/test/data/grooves/GuitarBallad.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/GuitarBallad1.musicxml b/test/data/grooves/GuitarBallad1.musicxml index af1b7444..ec051ce1 100644 --- a/test/data/grooves/GuitarBallad1.musicxml +++ b/test/data/grooves/GuitarBallad1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/GuitarBallad1Sus.musicxml b/test/data/grooves/GuitarBallad1Sus.musicxml index e51da8f9..291165da 100644 --- a/test/data/grooves/GuitarBallad1Sus.musicxml +++ b/test/data/grooves/GuitarBallad1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/GuitarBalladEnd.musicxml b/test/data/grooves/GuitarBalladEnd.musicxml index 801dcd29..2a1d1784 100644 --- a/test/data/grooves/GuitarBalladEnd.musicxml +++ b/test/data/grooves/GuitarBalladEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/GuitarBalladIntro.musicxml b/test/data/grooves/GuitarBalladIntro.musicxml index 8a70f5b5..99907545 100644 --- a/test/data/grooves/GuitarBalladIntro.musicxml +++ b/test/data/grooves/GuitarBalladIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/GuitarBalladSus.musicxml b/test/data/grooves/GuitarBalladSus.musicxml index 3b7bcc17..c6dc1dfd 100644 --- a/test/data/grooves/GuitarBalladSus.musicxml +++ b/test/data/grooves/GuitarBalladSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/GuitarBalladSusIntro.musicxml b/test/data/grooves/GuitarBalladSusIntro.musicxml index 3299e552..831a3364 100644 --- a/test/data/grooves/GuitarBalladSusIntro.musicxml +++ b/test/data/grooves/GuitarBalladSusIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HIP01.musicxml b/test/data/grooves/HIP01.musicxml index d2473e0f..61ff92f3 100644 --- a/test/data/grooves/HIP01.musicxml +++ b/test/data/grooves/HIP01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -545,101 +545,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - + 256 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -647,15 +574,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -663,13 +593,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + diff --git a/test/data/grooves/HIP02.musicxml b/test/data/grooves/HIP02.musicxml index 5fab9636..5c81d08c 100644 --- a/test/data/grooves/HIP02.musicxml +++ b/test/data/grooves/HIP02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HIP03.musicxml b/test/data/grooves/HIP03.musicxml index da3bed39..6e21c1b9 100644 --- a/test/data/grooves/HIP03.musicxml +++ b/test/data/grooves/HIP03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -339,80 +339,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - + 256 1 - 128th - down - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -420,15 +365,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -436,13 +384,19 @@ F 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + down normal + @@ -485,80 +439,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - + 256 1 - 1024th - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -566,15 +465,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -582,13 +484,19 @@ F 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + down normal + @@ -1199,83 +1107,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 128 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + + + 3 + 16th + + + 2 + 16th + + @@ -1283,15 +1136,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -1299,13 +1155,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + diff --git a/test/data/grooves/HIP04.musicxml b/test/data/grooves/HIP04.musicxml index f984527d..e23137eb 100644 --- a/test/data/grooves/HIP04.musicxml +++ b/test/data/grooves/HIP04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -217,539 +217,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 192 - 1 - 16th - - - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - + 256 1 - 128th - up - normal + eighth + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -757,187 +243,186 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - + - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + - + E 4 - 96 - - + 512 1 - 32nd + quarter + + 3 + 2 + quarter + up normal - - + - - - E - 4 - - 24 - - - + + + 256 1 - 128th - up - normal + eighth + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + - + E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + - 192 - + 256 1 - 16th + eighth + + 3 + 2 + eighth + - + + + 3 + eighth + + + 2 + eighth + + - - - 48 - - + + + E + 4 + + 256 + 1 - 64th + eighth + + 3 + 2 + eighth + + up + normal - - - 12 - - + 256 1 - 256th + eighth + + 3 + 2 + eighth + - - + + + - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + @@ -945,130 +430,128 @@ E 4 - 96 - - + 512 1 - 32nd + quarter + + 3 + 2 + quarter + up normal - - + - - - E - 4 - - 24 - - - + + + 256 1 - 128th - up - normal - - - + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + - + E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - + - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + - + E 4 - 288 - + 512 1 - 16th - + quarter + + 3 + 2 + quarter + up normal - + - - - E - 4 - - 24 - - - + + + 256 1 - 128th - up - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -1076,23 +559,32 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + @@ -2538,38 +2030,6 @@ - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -2716,38 +2176,6 @@ - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -2894,38 +2322,6 @@ - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -3072,38 +2468,6 @@ - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -3252,38 +2616,6 @@ - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -3430,38 +2762,6 @@ - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -3608,38 +2908,6 @@ - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -3786,38 +3054,6 @@ - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E diff --git a/test/data/grooves/HIP05.musicxml b/test/data/grooves/HIP05.musicxml index 5c9e0afb..c1b5f320 100644 --- a/test/data/grooves/HIP05.musicxml +++ b/test/data/grooves/HIP05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HIP06.musicxml b/test/data/grooves/HIP06.musicxml index 214ad81c..815837f5 100644 --- a/test/data/grooves/HIP06.musicxml +++ b/test/data/grooves/HIP06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HIP07.musicxml b/test/data/grooves/HIP07.musicxml index f572d155..472b8746 100644 --- a/test/data/grooves/HIP07.musicxml +++ b/test/data/grooves/HIP07.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HIP08.musicxml b/test/data/grooves/HIP08.musicxml index 7ecfe5c0..58322121 100644 --- a/test/data/grooves/HIP08.musicxml +++ b/test/data/grooves/HIP08.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -226,101 +226,28 @@ E 4 - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 384 - + 256 1 eighth + + 3 + 2 + quarter + up normal - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - + + + 3 + eighth + + + 2 + quarter + + @@ -328,33 +255,19 @@ E 4 - 24 - - + 512 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -575,62 +488,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -638,51 +514,19 @@ F 4 - 96 - - + 512 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/HIP09.musicxml b/test/data/grooves/HIP09.musicxml index 11270c07..3617d325 100644 --- a/test/data/grooves/HIP09.musicxml +++ b/test/data/grooves/HIP09.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HIP10.musicxml b/test/data/grooves/HIP10.musicxml index 60ecccf7..c8f4f350 100644 --- a/test/data/grooves/HIP10.musicxml +++ b/test/data/grooves/HIP10.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -492,83 +492,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 128 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + + + 3 + 16th + + + 2 + 16th + + @@ -576,15 +521,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -592,13 +540,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -1344,83 +1298,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 128 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + + + 3 + 16th + + + 2 + 16th + + @@ -1428,15 +1327,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -1444,13 +1346,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + diff --git a/test/data/grooves/HIP11.musicxml b/test/data/grooves/HIP11.musicxml index db697f01..b9a44a13 100644 --- a/test/data/grooves/HIP11.musicxml +++ b/test/data/grooves/HIP11.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HIP12.musicxml b/test/data/grooves/HIP12.musicxml index dcc066de..cada20e1 100644 --- a/test/data/grooves/HIP12.musicxml +++ b/test/data/grooves/HIP12.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -242,101 +242,28 @@ F 5 - 192 - - - 3 - 16th - up - normal - - - - - - - F - 5 - - 48 - - - - 3 - 64th - up - normal - - - - - - - - F - 5 - - 12 - - - - 3 - 256th - up - normal - - - - - - - - F - 5 - - 3 - - - 3 - 1024th - up - normal - - - - - - - F - 5 - - 384 - + 256 3 eighth + + 3 + 2 + quarter + up normal - - - - - - F - 5 - - 96 - - - - 3 - 32nd - up - normal - - - + + + 3 + eighth + + + 2 + quarter + + @@ -344,33 +271,19 @@ F 5 - 24 - - + 512 3 - 128th - up - normal - - - - - - - - F - 5 - - 6 - - - 3 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -742,101 +655,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - + 256 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -844,15 +684,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -860,57 +703,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x - - - - - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - + @@ -968,83 +773,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + + + 3 + 16th + + + 2 + 16th + + @@ -1052,15 +802,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -1068,13 +821,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -1084,101 +843,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - + 256 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -1186,15 +872,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1202,13 +891,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + diff --git a/test/data/grooves/HIP13.musicxml b/test/data/grooves/HIP13.musicxml index 40c3e64e..8c386c0e 100644 --- a/test/data/grooves/HIP13.musicxml +++ b/test/data/grooves/HIP13.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -208,102 +208,28 @@ E 4 - 192 - + 256 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -311,23 +237,32 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + @@ -550,25 +485,25 @@ E 4 - 192 + 768 1 - 16th + quarter up x + E 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/HIP14.musicxml b/test/data/grooves/HIP14.musicxml index dcf85336..60b45cc1 100644 --- a/test/data/grooves/HIP14.musicxml +++ b/test/data/grooves/HIP14.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1162,80 +1162,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1243,33 +1188,19 @@ F 4 - 24 - - + 512 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/HIP15.musicxml b/test/data/grooves/HIP15.musicxml index ba24164e..4a6f6de4 100644 --- a/test/data/grooves/HIP15.musicxml +++ b/test/data/grooves/HIP15.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1593,83 +1593,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 128 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + + + 3 + 16th + + + 2 + 16th + + @@ -1677,15 +1622,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -1693,13 +1641,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + diff --git a/test/data/grooves/HIP16.musicxml b/test/data/grooves/HIP16.musicxml index f9c71054..b8c05cff 100644 --- a/test/data/grooves/HIP16.musicxml +++ b/test/data/grooves/HIP16.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HIP17.musicxml b/test/data/grooves/HIP17.musicxml index b14aa01f..a81eb03d 100644 --- a/test/data/grooves/HIP17.musicxml +++ b/test/data/grooves/HIP17.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HIP18.musicxml b/test/data/grooves/HIP18.musicxml index e087935f..47b7c158 100644 --- a/test/data/grooves/HIP18.musicxml +++ b/test/data/grooves/HIP18.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HIP19.musicxml b/test/data/grooves/HIP19.musicxml index bb3a6c8b..7268bb50 100644 --- a/test/data/grooves/HIP19.musicxml +++ b/test/data/grooves/HIP19.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HIP20.musicxml b/test/data/grooves/HIP20.musicxml index d3f59e1f..7a4cc248 100644 --- a/test/data/grooves/HIP20.musicxml +++ b/test/data/grooves/HIP20.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HIP21.musicxml b/test/data/grooves/HIP21.musicxml index d6b7d35a..f5c3178c 100644 --- a/test/data/grooves/HIP21.musicxml +++ b/test/data/grooves/HIP21.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HIP22.musicxml b/test/data/grooves/HIP22.musicxml index f6f389d5..ad325eaa 100644 --- a/test/data/grooves/HIP22.musicxml +++ b/test/data/grooves/HIP22.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HIP23.musicxml b/test/data/grooves/HIP23.musicxml index 615da91d..50741a9d 100644 --- a/test/data/grooves/HIP23.musicxml +++ b/test/data/grooves/HIP23.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -472,16 +472,15 @@ - 256 + 512 1 - eighth + quarter 3 2 quarter - @@ -489,13 +488,19 @@ A 5 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -755,25 +760,25 @@ F 5 - 192 + 768 1 - 16th + quarter up x + A 5 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/HOUS01.musicxml b/test/data/grooves/HOUS01.musicxml index 754f44d7..3bb72f7e 100644 --- a/test/data/grooves/HOUS01.musicxml +++ b/test/data/grooves/HOUS01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -462,101 +462,28 @@ G 5 - 192 - + 256 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -564,15 +491,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -580,13 +510,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -622,101 +558,28 @@ G 5 - 192 - + 256 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -724,15 +587,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -740,13 +606,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -784,101 +656,28 @@ G 5 - 192 - + 256 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -886,15 +685,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -902,13 +704,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -944,101 +752,28 @@ G 5 - 192 - + 256 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -1046,15 +781,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1062,13 +800,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + diff --git a/test/data/grooves/HOUS02.musicxml b/test/data/grooves/HOUS02.musicxml index f08e5611..d55ab731 100644 --- a/test/data/grooves/HOUS02.musicxml +++ b/test/data/grooves/HOUS02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HOUS03.musicxml b/test/data/grooves/HOUS03.musicxml index 7bc304dc..d14d8c8c 100644 --- a/test/data/grooves/HOUS03.musicxml +++ b/test/data/grooves/HOUS03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HOUS04.musicxml b/test/data/grooves/HOUS04.musicxml index eab8d639..8549b756 100644 --- a/test/data/grooves/HOUS04.musicxml +++ b/test/data/grooves/HOUS04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HRK01.musicxml b/test/data/grooves/HRK01.musicxml index 17ef6f46..45abd85e 100644 --- a/test/data/grooves/HRK01.musicxml +++ b/test/data/grooves/HRK01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HRK02.musicxml b/test/data/grooves/HRK02.musicxml index fb539d49..19282e39 100644 --- a/test/data/grooves/HRK02.musicxml +++ b/test/data/grooves/HRK02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HRK03.musicxml b/test/data/grooves/HRK03.musicxml index 0af78a74..4fb8b95a 100644 --- a/test/data/grooves/HRK03.musicxml +++ b/test/data/grooves/HRK03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -624,24 +624,25 @@ F 5 - 192 + 384 1 - 16th + eighth up x + F 5 - 192 + 384 1 - 16th + eighth up diamond @@ -666,24 +667,25 @@ F 5 - 192 + 384 1 - 16th + eighth up x + F 5 - 192 + 384 1 - 16th + eighth up diamond @@ -708,24 +710,25 @@ F 5 - 192 + 384 1 - 16th + eighth up x + F 5 - 192 + 384 1 - 16th + eighth up diamond @@ -762,14 +765,15 @@ + F 5 - 192 + 384 1 - 16th + eighth up diamond @@ -794,24 +798,25 @@ F 5 - 192 + 384 1 - 16th + eighth up x + F 5 - 192 + 384 1 - 16th + eighth up diamond @@ -836,24 +841,25 @@ F 5 - 192 + 384 1 - 16th + eighth up x + F 5 - 192 + 384 1 - 16th + eighth up diamond @@ -878,25 +884,25 @@ F 5 - 192 + 768 1 - 16th + quarter up x + F 5 - 576 + 768 1 - eighth - + quarter up diamond @@ -1095,50 +1101,6 @@ - - - 384 - - 1 - eighth - - - - - - - 96 - - - 1 - 32nd - - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - F @@ -1222,49 +1184,28 @@ F 4 - 48 - + 153.6 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th + eighth + + 5 + 2 + eighth + down normal - + + + 5 + eighth + + + 2 + eighth + + @@ -1272,33 +1213,37 @@ F 4 - 96 - + 153.6 1 - 32nd + eighth + + 5 + 2 + eighth + down normal - - + F 4 - 24 - - + 153.6 1 - 128th + eighth + + 5 + 2 + eighth + down normal - - @@ -1306,26 +1251,15 @@ F 4 - 6 - - - 1 - 512th - down - normal - - - - - - - F - 4 - - 192 + 153.6 1 - 16th + eighth + + 5 + 2 + eighth + down normal @@ -1336,26 +1270,26 @@ F 4 - 192 + 153.6 1 - 16th + eighth + + 5 + 2 + eighth + down normal + - - - F - 4 - + + 768 - 1 quarter - down - normal diff --git a/test/data/grooves/HRK04.musicxml b/test/data/grooves/HRK04.musicxml index 5ca221de..5f2998fa 100644 --- a/test/data/grooves/HRK04.musicxml +++ b/test/data/grooves/HRK04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HRK05.musicxml b/test/data/grooves/HRK05.musicxml index bfc8d4c5..779e9547 100644 --- a/test/data/grooves/HRK05.musicxml +++ b/test/data/grooves/HRK05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HRK06.musicxml b/test/data/grooves/HRK06.musicxml index f3901fab..8aa051f8 100644 --- a/test/data/grooves/HRK06.musicxml +++ b/test/data/grooves/HRK06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -857,119 +857,28 @@ F 4 - 192 - - - 1 - 16th - down - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - down - normal - - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - + 512 1 - 1024th - down - normal - - - - - - - F - 4 - - 384 - - - 1 - eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th + quarter + + 3 + 2 + quarter + down normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -977,23 +886,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/HRK07.musicxml b/test/data/grooves/HRK07.musicxml index a3a8db14..f14e4092 100644 --- a/test/data/grooves/HRK07.musicxml +++ b/test/data/grooves/HRK07.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HappyshuffleA.musicxml b/test/data/grooves/HappyshuffleA.musicxml index 84460dd2..ff64435d 100644 --- a/test/data/grooves/HappyshuffleA.musicxml +++ b/test/data/grooves/HappyshuffleA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -818,51 +818,67 @@ G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - - + G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - + @@ -870,49 +886,96 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - - + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + + + + G + 5 + + 256 + + 3 + eighth + + 3 + 2 + eighth + + up + x + + + + 3 + eighth + + + 2 + eighth + + @@ -920,32 +983,41 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - - + G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + - + G 5 @@ -961,7 +1033,7 @@ - + G 5 @@ -979,7 +1051,7 @@ - + G 5 @@ -997,7 +1069,7 @@ - + G 5 @@ -1013,7 +1085,7 @@ - + G 5 @@ -1029,7 +1101,7 @@ - + G 5 @@ -1047,7 +1119,7 @@ - + G 5 @@ -1063,120 +1135,199 @@ - + G 5 - 384 + 192 3 - eighth + 16th up x - + G 5 192 - 3 16th up x - - + + + G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - - + G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + - + G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + + + G + 5 + + 256 + + 3 + eighth + + 3 + 2 + eighth + + up + x + + + + + + + G + 5 + + 256 + + 3 + eighth + + 3 + 2 + eighth + + up + x + + + + 3 + eighth + + + 2 + eighth + + @@ -1184,15 +1335,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1200,13 +1354,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -1356,57 +1516,73 @@ - + G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - - + G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - + @@ -1414,15 +1590,28 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -1430,66 +1619,109 @@ G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - - + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + - + G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x - + + + G + 5 + + 256 + + 3 + eighth + + 3 + 2 + eighth + + up + x + + + + + G 5 @@ -1505,7 +1737,7 @@ - + G 5 @@ -1523,7 +1755,7 @@ - + G 5 @@ -1541,7 +1773,7 @@ - + G 5 @@ -1557,7 +1789,7 @@ - + G 5 @@ -1573,7 +1805,7 @@ - + G 5 @@ -1591,7 +1823,7 @@ - + G 5 @@ -1607,829 +1839,21 @@ - + G 5 - 384 + 192 3 - eighth + 16th up x - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - + G 5 @@ -2624,101 +2048,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -2726,15 +2077,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -2742,13 +2096,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + diff --git a/test/data/grooves/HappyshuffleB.musicxml b/test/data/grooves/HappyshuffleB.musicxml index 8787a5a4..55483b59 100644 --- a/test/data/grooves/HappyshuffleB.musicxml +++ b/test/data/grooves/HappyshuffleB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -818,51 +818,67 @@ G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - - + G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - + @@ -870,49 +886,96 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - - + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + + + + G + 5 + + 256 + + 3 + eighth + + 3 + 2 + eighth + + up + x + + + + 3 + eighth + + + 2 + eighth + + @@ -920,32 +983,41 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - - + G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + - + G 5 @@ -961,7 +1033,7 @@ - + G 5 @@ -979,7 +1051,7 @@ - + G 5 @@ -997,7 +1069,7 @@ - + G 5 @@ -1013,7 +1085,7 @@ - + G 5 @@ -1029,7 +1101,7 @@ - + G 5 @@ -1047,7 +1119,7 @@ - + G 5 @@ -1063,120 +1135,199 @@ - + G 5 - 384 + 192 3 - eighth + 16th up x - + G 5 192 - 3 16th up x - - + + + G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - - + G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + - + G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + + + G + 5 + + 256 + + 3 + eighth + + 3 + 2 + eighth + + up + x + + + + + + + G + 5 + + 256 + + 3 + eighth + + 3 + 2 + eighth + + up + x + + + + 3 + eighth + + + 2 + eighth + + @@ -1184,15 +1335,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1200,13 +1354,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -1356,57 +1516,73 @@ - + G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - - + G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - + @@ -1414,15 +1590,28 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -1430,66 +1619,109 @@ G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - - + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + - + G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x - + + + G + 5 + + 256 + + 3 + eighth + + 3 + 2 + eighth + + up + x + + + + + G 5 @@ -1505,7 +1737,7 @@ - + G 5 @@ -1523,7 +1755,7 @@ - + G 5 @@ -1541,7 +1773,7 @@ - + G 5 @@ -1557,7 +1789,7 @@ - + G 5 @@ -1573,7 +1805,7 @@ - + G 5 @@ -1591,7 +1823,7 @@ - + G 5 @@ -1607,829 +1839,21 @@ - + G 5 - 384 + 192 3 - eighth + 16th up x - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - + G 5 @@ -2624,101 +2048,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -2726,15 +2077,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -2742,13 +2096,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + diff --git a/test/data/grooves/HappyshuffleC.musicxml b/test/data/grooves/HappyshuffleC.musicxml index 7a419c27..4a479965 100644 --- a/test/data/grooves/HappyshuffleC.musicxml +++ b/test/data/grooves/HappyshuffleC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -313,50 +313,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -435,50 +391,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -557,50 +469,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -803,172 +671,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1047,50 +749,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1163,56 +821,10 @@ 192 1 - 16th - up - normal - - - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th + 16th + up + normal - @@ -1293,6 +905,8 @@ + + 192 @@ -1415,50 +1029,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1537,48 +1107,82 @@ - - - 192 + + + E + 4 + + 96 + 1 - 16th + 32nd + up + normal - - - 48 + + + E + 4 + + 24 + 1 - 64th + 128th + up + normal - - - 12 - + + + E + 4 + + 6 + 1 - 256th + 512th + up + normal - - - - 3 - + + + E + 4 + + 192 + 1 - 1024th + 16th + up + normal + + + + + + E + 4 + + 192 + + 1 + 16th + up + normal - @@ -1783,50 +1387,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1905,50 +1465,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -2027,50 +1543,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E diff --git a/test/data/grooves/HappyshuffleD.musicxml b/test/data/grooves/HappyshuffleD.musicxml index 0477ccc1..dc906083 100644 --- a/test/data/grooves/HappyshuffleD.musicxml +++ b/test/data/grooves/HappyshuffleD.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -313,50 +313,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -435,50 +391,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -557,50 +469,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -803,172 +671,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1047,50 +749,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1163,56 +821,10 @@ 192 1 - 16th - up - normal - - - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th + 16th + up + normal - @@ -1293,6 +905,8 @@ + + 192 @@ -1415,50 +1029,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1537,48 +1107,82 @@ - - - 192 + + + E + 4 + + 96 + 1 - 16th + 32nd + up + normal - - - 48 + + + E + 4 + + 24 + 1 - 64th + 128th + up + normal - - - 12 - + + + E + 4 + + 6 + 1 - 256th + 512th + up + normal - - - - 3 - + + + E + 4 + + 192 + 1 - 1024th + 16th + up + normal + + + + + + E + 4 + + 192 + + 1 + 16th + up + normal - @@ -1783,50 +1387,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1905,50 +1465,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -2027,50 +1543,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E diff --git a/test/data/grooves/HappyshuffleEndingA.musicxml b/test/data/grooves/HappyshuffleEndingA.musicxml index 76c62583..0b9055c6 100644 --- a/test/data/grooves/HappyshuffleEndingA.musicxml +++ b/test/data/grooves/HappyshuffleEndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HappyshuffleEndingB.musicxml b/test/data/grooves/HappyshuffleEndingB.musicxml index fe0f69ef..441d94c6 100644 --- a/test/data/grooves/HappyshuffleEndingB.musicxml +++ b/test/data/grooves/HappyshuffleEndingB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -365,50 +365,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -487,50 +443,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -609,50 +521,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -855,50 +723,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1146,22 +970,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -1169,10 +996,15 @@ A 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1180,10 +1012,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1233,10 +1071,10 @@ B 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -1245,15 +1083,20 @@ up normal - - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/HappyshuffleEndingC.musicxml b/test/data/grooves/HappyshuffleEndingC.musicxml index d227d5f3..88815abb 100644 --- a/test/data/grooves/HappyshuffleEndingC.musicxml +++ b/test/data/grooves/HappyshuffleEndingC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -313,50 +313,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -435,50 +391,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -557,50 +469,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -803,50 +671,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -925,50 +749,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1047,50 +827,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1285,178 +1021,12 @@ 4 192 - - 1 - 16th - up - normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - + 1 - 1024th + 16th + up + normal - @@ -1537,48 +1107,82 @@ - - - 192 + + + E + 4 + + 96 + 1 - 16th + 32nd + up + normal - - - 48 + + + E + 4 + + 24 + 1 - 64th + 128th + up + normal - - - 12 - + + + E + 4 + + 6 + 1 - 256th + 512th + up + normal - - - - 3 - + + + E + 4 + + 192 + 1 - 1024th + 16th + up + normal + + + + + + E + 4 + + 192 + + 1 + 16th + up + normal - @@ -1783,50 +1387,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1905,50 +1465,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -2027,50 +1543,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -2273,50 +1745,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E diff --git a/test/data/grooves/HappyshuffleFillA.musicxml b/test/data/grooves/HappyshuffleFillA.musicxml index ff991b33..536c3e9d 100644 --- a/test/data/grooves/HappyshuffleFillA.musicxml +++ b/test/data/grooves/HappyshuffleFillA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -311,80 +311,25 @@ - 192 - + 256 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -392,15 +337,18 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - @@ -408,13 +356,19 @@ E 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + up normal + @@ -613,101 +567,28 @@ G 5 - 192 - + 256 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -715,15 +596,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -731,13 +615,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up circle-x + diff --git a/test/data/grooves/HappyshuffleFillB.musicxml b/test/data/grooves/HappyshuffleFillB.musicxml index c2274803..393e5a76 100644 --- a/test/data/grooves/HappyshuffleFillB.musicxml +++ b/test/data/grooves/HappyshuffleFillB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -396,83 +396,28 @@ D 5 - 192 - + 256 2 - 16th - up - normal - - - - - - - D - 5 - - 48 - - - - 2 - 64th - up - normal - - - - - - - - D - 5 - - 12 - - - - 2 - 256th - up - normal - - - - - - - - D - 5 - - 3 - - - 2 - 1024th - up - normal - - - - - - - B - 4 - - 384 - - - 2 eighth + + 3 + 2 + quarter + up normal - + + + 3 + eighth + + + 2 + quarter + + @@ -480,51 +425,19 @@ B 4 - 96 - - + 512 2 - 32nd - up - normal - - - - - - - - B - 4 - - 24 - - - - 2 - 128th - up - normal - - - - - - - - B - 4 - - 6 - - - 2 - 512th + quarter + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/HappyshuffleFillC.musicxml b/test/data/grooves/HappyshuffleFillC.musicxml index 4f65caf0..98eab98a 100644 --- a/test/data/grooves/HappyshuffleFillC.musicxml +++ b/test/data/grooves/HappyshuffleFillC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -367,80 +367,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - + 256 1 - 128th - up - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -448,15 +393,18 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - @@ -464,57 +412,19 @@ E 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + up normal - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - + @@ -595,50 +505,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E diff --git a/test/data/grooves/HappyshuffleFillD.musicxml b/test/data/grooves/HappyshuffleFillD.musicxml index f87e71b7..b7e43106 100644 --- a/test/data/grooves/HappyshuffleFillD.musicxml +++ b/test/data/grooves/HappyshuffleFillD.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -365,50 +365,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -550,15 +506,13 @@ E 4 - 384 - + 768 1 - eighth + quarter up normal - @@ -613,50 +567,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1052,22 +962,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1075,10 +988,15 @@ A 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1086,10 +1004,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/HappyshuffleIntroA.musicxml b/test/data/grooves/HappyshuffleIntroA.musicxml index b356f01e..7291c8a7 100644 --- a/test/data/grooves/HappyshuffleIntroA.musicxml +++ b/test/data/grooves/HappyshuffleIntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -292,80 +292,25 @@ - 192 - + 256 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + eighth + + 3 + 2 + eighth + - - + + + 3 + eighth + + + 2 + eighth + + @@ -373,15 +318,18 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - @@ -389,13 +337,19 @@ E 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + up normal + diff --git a/test/data/grooves/HappyshuffleIntroB.musicxml b/test/data/grooves/HappyshuffleIntroB.musicxml index 2b6b3af3..a2484fd7 100644 --- a/test/data/grooves/HappyshuffleIntroB.musicxml +++ b/test/data/grooves/HappyshuffleIntroB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -349,80 +349,25 @@ - 192 - + 256 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -430,15 +375,18 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - @@ -446,13 +394,19 @@ E 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + up normal + @@ -515,80 +469,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - + 256 3 - 1024th - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -596,15 +495,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -612,13 +514,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -626,83 +534,28 @@ G 5 - 192 - + 256 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -710,33 +563,18 @@ G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - @@ -744,13 +582,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -758,101 +602,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - + 256 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -860,15 +631,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -876,13 +650,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -1212,101 +992,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -1314,15 +1021,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1330,13 +1040,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up circle-x + diff --git a/test/data/grooves/HappyshuffleIntroC.musicxml b/test/data/grooves/HappyshuffleIntroC.musicxml index bffe44d1..ff8ee0ae 100644 --- a/test/data/grooves/HappyshuffleIntroC.musicxml +++ b/test/data/grooves/HappyshuffleIntroC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -380,80 +380,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - + 256 1 - 128th - up - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -461,15 +406,18 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - @@ -477,13 +425,19 @@ E 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + up normal + @@ -610,50 +564,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -732,50 +642,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -854,50 +720,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1100,50 +922,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1222,50 +1000,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1344,50 +1078,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1590,50 +1280,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1712,50 +1358,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1834,50 +1436,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -2080,50 +1638,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -2202,50 +1716,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -2326,80 +1796,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - + 256 1 - 128th - up - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -2407,15 +1822,18 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - @@ -2423,13 +1841,19 @@ E 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + up normal + @@ -2954,50 +2378,6 @@ - - - 384 - - 2 - eighth - - - - - - - 96 - - - 2 - 32nd - - - - - - - - 24 - - - 2 - 128th - - - - - - - - 6 - - 2 - 512th - - - - D diff --git a/test/data/grooves/HeavyMetal.musicxml b/test/data/grooves/HeavyMetal.musicxml index 308a8468..aee8b745 100644 --- a/test/data/grooves/HeavyMetal.musicxml +++ b/test/data/grooves/HeavyMetal.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -651,24 +651,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -849,117 +850,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - + G 5 - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - diff --git a/test/data/grooves/HeavyMetalEnd.musicxml b/test/data/grooves/HeavyMetalEnd.musicxml index 5a5bfba9..810d6db4 100644 --- a/test/data/grooves/HeavyMetalEnd.musicxml +++ b/test/data/grooves/HeavyMetalEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -307,53 +307,33 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - + 192 3 - 256th + 16th up x - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -361,11 +341,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -377,12 +357,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -395,11 +375,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -461,13 +441,13 @@ G 5 - 48 + 96 - + 3 - 64th + 32nd up - x + circle-x @@ -477,14 +457,14 @@ G 5 - 12 + 24 - + 3 - 256th + 128th up - x + circle-x @@ -495,29 +475,15 @@ G 5 - 3 + 6 - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 3 - 16th + 512th up circle-x + @@ -525,18 +491,28 @@ G 5 - 189 + 128 3 - 32nd - - - - - + 16th + + 3 + 2 + 16th + up x + + + 3 + 16th + + + 2 + 16th + + @@ -544,14 +520,15 @@ G 5 - 186 + 128 3 - 32nd - - - - + 16th + + 3 + 2 + 16th + up x @@ -562,13 +539,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -576,15 +559,10 @@ G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -595,49 +573,43 @@ G 5 - 48 - + 192 3 - 64th + 16th up circle-x - + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - circle-x + x - - + G 5 - 3 - - + 192 + 3 - 1024th + 16th up - circle-x + x - @@ -645,11 +617,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -661,12 +633,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -679,11 +651,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -729,11 +701,11 @@ G 5 - 3 + 6 3 - 1024th + 512th up x @@ -747,11 +719,11 @@ 96 - + 3 32nd up - x + circle-x @@ -764,11 +736,11 @@ 24 - + 3 128th up - x + circle-x @@ -781,11 +753,11 @@ 6 - + 3 512th up - x + circle-x @@ -795,15 +767,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -811,17 +796,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -829,15 +815,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -846,28 +836,9 @@ 5 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 189 3 - 32nd - - - - - + 16th up x @@ -878,20 +849,17 @@ G 5 - 186 - + 192 + 3 - 32nd - - - - + 16th up - x + circle-x + G 5 @@ -906,19 +874,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -931,11 +895,11 @@ 48 - + 3 64th up - circle-x + x @@ -948,11 +912,11 @@ 12 - + 3 256th up - circle-x + x @@ -965,11 +929,11 @@ 3 - + 3 1024th up - circle-x + x @@ -1031,11 +995,11 @@ 96 - + 3 32nd up - x + circle-x @@ -1048,11 +1012,11 @@ 24 - + 3 128th up - x + circle-x @@ -1063,13 +1027,13 @@ G 5 - 3 + 6 - + 3 - 1024th + 512th up - x + circle-x @@ -1079,15 +1043,28 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1095,17 +1072,18 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - @@ -1113,15 +1091,19 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - + @@ -1129,15 +1111,13 @@ G 5 - 48 - + 192 3 - 64th + 16th up x - @@ -1145,115 +1125,41 @@ G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - + G 5 192 - + 3 16th up - circle-x - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 186 - - 3 - 32nd - - - - - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up x @@ -1265,11 +1171,11 @@ 48 - + 3 64th up - circle-x + x @@ -1282,11 +1188,11 @@ 12 - + 3 256th up - circle-x + x @@ -1299,11 +1205,11 @@ 3 - + 3 1024th up - circle-x + x @@ -1365,61 +1271,11 @@ 96 - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - + 3 32nd up - x + circle-x @@ -1432,11 +1288,11 @@ 24 - + 3 128th up - x + circle-x @@ -1449,11 +1305,11 @@ 6 - + 3 512th up - x + circle-x @@ -1463,15 +1319,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1479,17 +1348,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1497,48 +1367,19 @@ G 5 - 3 - + 128 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 16th - up - circle-x - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - + + 3 + 2 + 16th + up x + @@ -1546,14 +1387,10 @@ G 5 - 186 + 192 3 - 32nd - - - - + 16th up x @@ -1576,171 +1413,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 3 - + 768 3 - 1024th + quarter up x - diff --git a/test/data/grooves/HeavyMetalIntro.musicxml b/test/data/grooves/HeavyMetalIntro.musicxml index 60490e92..f066976d 100644 --- a/test/data/grooves/HeavyMetalIntro.musicxml +++ b/test/data/grooves/HeavyMetalIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -541,600 +541,44 @@ + G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - - - G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1145,33 +589,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - - + + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1179,83 +618,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -1263,24 +647,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x - + + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1291,33 +676,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - - + + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1325,85 +705,61 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - - + G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - + + G @@ -1418,15 +774,16 @@ - + + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1437,33 +794,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - - + + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1471,83 +823,57 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - + + G 5 - 48 - - + 384 3 - 64th + eighth up x - - - + G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1555,24 +881,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x - + + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1583,33 +910,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - - + + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -1617,83 +939,57 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - - + G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -1731,24 +1027,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x diff --git a/test/data/grooves/HillCountry.musicxml b/test/data/grooves/HillCountry.musicxml index d294456c..02757abd 100644 --- a/test/data/grooves/HillCountry.musicxml +++ b/test/data/grooves/HillCountry.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HillCountryEnd.musicxml b/test/data/grooves/HillCountryEnd.musicxml index e643ecd5..ab77ab12 100644 --- a/test/data/grooves/HillCountryEnd.musicxml +++ b/test/data/grooves/HillCountryEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HillCountryFill.musicxml b/test/data/grooves/HillCountryFill.musicxml index 4b02be8d..b2e436cc 100644 --- a/test/data/grooves/HillCountryFill.musicxml +++ b/test/data/grooves/HillCountryFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HillCountryIntro.musicxml b/test/data/grooves/HillCountryIntro.musicxml index c1ae345f..fd7d8ef6 100644 --- a/test/data/grooves/HillCountryIntro.musicxml +++ b/test/data/grooves/HillCountryIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HillCountryPlus.musicxml b/test/data/grooves/HillCountryPlus.musicxml index e14e0875..cff820c3 100644 --- a/test/data/grooves/HillCountryPlus.musicxml +++ b/test/data/grooves/HillCountryPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HillCountrySus.musicxml b/test/data/grooves/HillCountrySus.musicxml index 4856cdc7..ad03aca2 100644 --- a/test/data/grooves/HillCountrySus.musicxml +++ b/test/data/grooves/HillCountrySus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HillCountrySusPlus.musicxml b/test/data/grooves/HillCountrySusPlus.musicxml index 07b570cf..5c5923df 100644 --- a/test/data/grooves/HillCountrySusPlus.musicxml +++ b/test/data/grooves/HillCountrySusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Hip-Hop.musicxml b/test/data/grooves/Hip-Hop.musicxml index a6f458fc..1df9ee26 100644 --- a/test/data/grooves/Hip-Hop.musicxml +++ b/test/data/grooves/Hip-Hop.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Hip-HopEnd.musicxml b/test/data/grooves/Hip-HopEnd.musicxml index 91fccc5b..73ed20f7 100644 --- a/test/data/grooves/Hip-HopEnd.musicxml +++ b/test/data/grooves/Hip-HopEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Hip-HopIntro.musicxml b/test/data/grooves/Hip-HopIntro.musicxml index 5c806df9..82a5cf65 100644 --- a/test/data/grooves/Hip-HopIntro.musicxml +++ b/test/data/grooves/Hip-HopIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HipHop.musicxml b/test/data/grooves/HipHop.musicxml index 4733e7d7..560af237 100644 --- a/test/data/grooves/HipHop.musicxml +++ b/test/data/grooves/HipHop.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HipHopEnd.musicxml b/test/data/grooves/HipHopEnd.musicxml index f1f6a4a6..9d52100e 100644 --- a/test/data/grooves/HipHopEnd.musicxml +++ b/test/data/grooves/HipHopEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HipHopIntro.musicxml b/test/data/grooves/HipHopIntro.musicxml index 2f68482b..45099830 100644 --- a/test/data/grooves/HipHopIntro.musicxml +++ b/test/data/grooves/HipHopIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HipHopPlus1.musicxml b/test/data/grooves/HipHopPlus1.musicxml index 1182d494..7b130327 100644 --- a/test/data/grooves/HipHopPlus1.musicxml +++ b/test/data/grooves/HipHopPlus1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HipHopPlus2.musicxml b/test/data/grooves/HipHopPlus2.musicxml index 49102cc0..b5ff634d 100644 --- a/test/data/grooves/HipHopPlus2.musicxml +++ b/test/data/grooves/HipHopPlus2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HipHopPlusPlus.musicxml b/test/data/grooves/HipHopPlusPlus.musicxml index 678c138a..f938bd92 100644 --- a/test/data/grooves/HipHopPlusPlus.musicxml +++ b/test/data/grooves/HipHopPlusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HipHopSus.musicxml b/test/data/grooves/HipHopSus.musicxml index 39ec4139..8c4f2d49 100644 --- a/test/data/grooves/HipHopSus.musicxml +++ b/test/data/grooves/HipHopSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HipHopSusPlus1.musicxml b/test/data/grooves/HipHopSusPlus1.musicxml index 19be157a..0e40e5ac 100644 --- a/test/data/grooves/HipHopSusPlus1.musicxml +++ b/test/data/grooves/HipHopSusPlus1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HipHopSusPlus2.musicxml b/test/data/grooves/HipHopSusPlus2.musicxml index d1180bd8..7fa7cbf2 100644 --- a/test/data/grooves/HipHopSusPlus2.musicxml +++ b/test/data/grooves/HipHopSusPlus2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HipHopSusPlusPlus.musicxml b/test/data/grooves/HipHopSusPlusPlus.musicxml index a7489321..f502a427 100644 --- a/test/data/grooves/HipHopSusPlusPlus.musicxml +++ b/test/data/grooves/HipHopSusPlusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/House.musicxml b/test/data/grooves/House.musicxml index a5d8e599..953cc543 100644 --- a/test/data/grooves/House.musicxml +++ b/test/data/grooves/House.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/HouseEnd.musicxml b/test/data/grooves/HouseEnd.musicxml index dc911f44..00041153 100644 --- a/test/data/grooves/HouseEnd.musicxml +++ b/test/data/grooves/HouseEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -296,15 +296,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/HouseIntro.musicxml b/test/data/grooves/HouseIntro.musicxml index b44800f7..3add9c80 100644 --- a/test/data/grooves/HouseIntro.musicxml +++ b/test/data/grooves/HouseIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -484,24 +484,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -626,117 +627,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - + G 5 - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - diff --git a/test/data/grooves/INTRO01.musicxml b/test/data/grooves/INTRO01.musicxml index cefe46c8..25e0368a 100644 --- a/test/data/grooves/INTRO01.musicxml +++ b/test/data/grooves/INTRO01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -300,51 +300,46 @@ + F 5 - 192 + 307.2 3 - 16th - up - normal - - - - - - F - 5 - - 96 - - - 3 - 32nd + quarter + + 5 + 2 + quarter + up normal - + + + 5 + quarter + + + 2 + quarter + + - - - F - 5 - - 24 - - - + + + 307.2 3 - 128th - up - normal + quarter + + 5 + 2 + quarter + - - @@ -352,67 +347,18 @@ F 5 - 6 - + 307.2 3 - 512th - up - normal - - - - - - - F - 5 - - 192 - - - 3 - 16th - up - normal - - - - - - - F - 5 - - 48 - - - - 3 - 64th - up - normal - - - - - - - - F - 5 - - 12 - - - - 3 - 256th + quarter + + 5 + 2 + quarter + up normal - - @@ -420,23 +366,32 @@ F 5 - 3 - + 307.2 3 - 1024th + quarter + + 5 + 2 + quarter + up normal - - 768 + 307.2 3 quarter + + 5 + 2 + quarter + + diff --git a/test/data/grooves/INTRO02.musicxml b/test/data/grooves/INTRO02.musicxml index 2ebb6c31..43096f5c 100644 --- a/test/data/grooves/INTRO02.musicxml +++ b/test/data/grooves/INTRO02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/INTRO03.musicxml b/test/data/grooves/INTRO03.musicxml index 1a77d1c9..aaed6fcf 100644 --- a/test/data/grooves/INTRO03.musicxml +++ b/test/data/grooves/INTRO03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/INTRO04.musicxml b/test/data/grooves/INTRO04.musicxml index 35e3751f..01107ff4 100644 --- a/test/data/grooves/INTRO04.musicxml +++ b/test/data/grooves/INTRO04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -330,80 +330,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - D - 5 - - 96 - - - 2 - 32nd - up - normal - - - - - - - D - 5 - - 24 - - - + 256 2 - 128th - up - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -411,15 +356,18 @@ D 5 - 6 - + 256 2 - 512th + eighth + + 3 + 2 + eighth + up normal - @@ -427,13 +375,19 @@ D 5 - 384 + 256 2 eighth + + 3 + 2 + eighth + up normal + diff --git a/test/data/grooves/INTRO05.musicxml b/test/data/grooves/INTRO05.musicxml index 7c4d1ac0..5032e595 100644 --- a/test/data/grooves/INTRO05.musicxml +++ b/test/data/grooves/INTRO05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -348,17 +348,70 @@ + E 4 - 192 + 384 1 - 16th + eighth + up + normal + + + + + + E + 4 + + 48 + + + + 1 + 64th + up + normal + + + + + + + + E + 4 + + 12 + + + + 1 + 256th + up + normal + + + + + + + + E + 4 + + 3 + + + 1 + 1024th up normal + diff --git a/test/data/grooves/INTRO06.musicxml b/test/data/grooves/INTRO06.musicxml index a24a71bb..0ba4afb6 100644 --- a/test/data/grooves/INTRO06.musicxml +++ b/test/data/grooves/INTRO06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/INTRO07.musicxml b/test/data/grooves/INTRO07.musicxml index 8447a0d5..12dfff28 100644 --- a/test/data/grooves/INTRO07.musicxml +++ b/test/data/grooves/INTRO07.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/INTRO08.musicxml b/test/data/grooves/INTRO08.musicxml index fc2d378c..8acdfa90 100644 --- a/test/data/grooves/INTRO08.musicxml +++ b/test/data/grooves/INTRO08.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/INTRO09.musicxml b/test/data/grooves/INTRO09.musicxml index fc7f1261..b489f2d6 100644 --- a/test/data/grooves/INTRO09.musicxml +++ b/test/data/grooves/INTRO09.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -326,119 +326,28 @@ D 5 - 192 - - - 2 - 16th - up - normal - - - - - - - D - 5 - - 48 - - - - 2 - 64th - up - normal - - - - - - - - D - 5 - - 12 - - - - 2 - 256th - up - normal - - - - - - - - D - 5 - - 3 - - - 2 - 1024th - up - normal - - - - - - - D - 5 - - 384 - + 256 2 eighth + + 3 + 2 + quarter + up normal - - - - - - D - 5 - - 96 - - - - 2 - 32nd - up - normal - - - - - - - - D - 5 - - 24 - - - - 2 - 128th - up - normal - - - + + + 3 + eighth + + + 2 + quarter + + @@ -446,15 +355,19 @@ D 5 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -754,10 +667,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -766,15 +679,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -838,10 +756,10 @@ A 5 - 256 + 512 1 - eighth + quarter 3 2 @@ -850,15 +768,20 @@ up x - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/INTRO10.musicxml b/test/data/grooves/INTRO10.musicxml index 93d1519e..f8f22eaa 100644 --- a/test/data/grooves/INTRO10.musicxml +++ b/test/data/grooves/INTRO10.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/INTRO11.musicxml b/test/data/grooves/INTRO11.musicxml index 3808c5b9..a6c141b6 100644 --- a/test/data/grooves/INTRO11.musicxml +++ b/test/data/grooves/INTRO11.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/INTRO12.musicxml b/test/data/grooves/INTRO12.musicxml index f3f469a4..e232ba7d 100644 --- a/test/data/grooves/INTRO12.musicxml +++ b/test/data/grooves/INTRO12.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -446,83 +446,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 128 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + + + 3 + 16th + + + 2 + 16th + + @@ -530,15 +475,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -546,13 +494,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + diff --git a/test/data/grooves/INTRO13.musicxml b/test/data/grooves/INTRO13.musicxml index 0578431d..55b65a23 100644 --- a/test/data/grooves/INTRO13.musicxml +++ b/test/data/grooves/INTRO13.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/INTRO14.musicxml b/test/data/grooves/INTRO14.musicxml index c79cb30f..885f6f1a 100644 --- a/test/data/grooves/INTRO14.musicxml +++ b/test/data/grooves/INTRO14.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -271,10 +271,10 @@ D 5 - 256 + 512 2 - eighth + quarter 3 2 @@ -283,15 +283,20 @@ up normal - - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -328,15 +333,15 @@ + F 5 - 576 + 768 3 - eighth - + quarter up normal diff --git a/test/data/grooves/INTRO15.musicxml b/test/data/grooves/INTRO15.musicxml index 4a16f2b4..0b190cee 100644 --- a/test/data/grooves/INTRO15.musicxml +++ b/test/data/grooves/INTRO15.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JAZZ01.musicxml b/test/data/grooves/JAZZ01.musicxml index b9efe333..e798a6c4 100644 --- a/test/data/grooves/JAZZ01.musicxml +++ b/test/data/grooves/JAZZ01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -209,98 +209,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - + 512 1 - 128th - up - normal + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + @@ -308,121 +235,57 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -430,15 +293,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/JAZZ02.musicxml b/test/data/grooves/JAZZ02.musicxml index 4f3dbd75..2a2b0c1e 100644 --- a/test/data/grooves/JAZZ02.musicxml +++ b/test/data/grooves/JAZZ02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1044,102 +1044,28 @@ F 4 - 192 - - - 1 - 16th - down - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - down - normal - - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - + 256 1 - 1024th - down - normal - - - - - - - F - 4 - - 288 - - - 1 - 16th - - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th + eighth + + 3 + 2 + eighth + down normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -1147,23 +1073,32 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + diff --git a/test/data/grooves/JAZZ03.musicxml b/test/data/grooves/JAZZ03.musicxml index 38a8913c..14c6b89e 100644 --- a/test/data/grooves/JAZZ03.musicxml +++ b/test/data/grooves/JAZZ03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -708,80 +708,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 96 - - - 1 - 32nd - up - x - - - - - - - F - 5 - - 24 - - - + 256 1 - 128th - up - x - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -789,15 +734,18 @@ F 5 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -805,13 +753,19 @@ F 5 - 384 + 256 1 eighth + + 3 + 2 + eighth + up x + @@ -1288,83 +1242,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 128 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -1372,15 +1271,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -1388,13 +1290,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + diff --git a/test/data/grooves/JAZZ04.musicxml b/test/data/grooves/JAZZ04.musicxml index 1a0d236b..f1ceebbf 100644 --- a/test/data/grooves/JAZZ04.musicxml +++ b/test/data/grooves/JAZZ04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -231,10 +231,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -243,15 +243,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -553,10 +558,10 @@ F 5 - 256 + 512 1 - eighth + quarter 3 2 @@ -565,15 +570,20 @@ up x - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1517,10 +1527,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1529,15 +1539,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JAZZ05.musicxml b/test/data/grooves/JAZZ05.musicxml index 46655123..ceb26d7a 100644 --- a/test/data/grooves/JAZZ05.musicxml +++ b/test/data/grooves/JAZZ05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -278,98 +278,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -377,113 +304,44 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -491,111 +349,42 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - + - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -603,15 +392,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -1204,80 +997,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - + 256 3 - 128th - up - x + eighth + + 3 + 2 + eighth + - - + + + 3 + eighth + + + 2 + eighth + + @@ -1285,15 +1023,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1301,13 +1042,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up circle-x + diff --git a/test/data/grooves/JAZZ06.musicxml b/test/data/grooves/JAZZ06.musicxml index e36aab25..3f52b4db 100644 --- a/test/data/grooves/JAZZ06.musicxml +++ b/test/data/grooves/JAZZ06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -725,102 +725,28 @@ F 4 - 192 - - - 2 - 16th - up - normal - - - - - - - F - 4 - - 48 - - - - 2 - 64th - up - normal - - - - - - - - F - 4 - - 12 - - - - 2 - 256th - up - normal - - - - - - - - F - 4 - - 3 - - - 2 - 1024th - up - normal - - - - - - - F - 4 - - 288 - - - 2 - 16th - - up - normal - - - - - - - F - 4 - - 24 - - + 256 2 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -828,23 +754,32 @@ F 4 - 6 - + 256 2 - 512th + eighth + + 3 + 2 + eighth + up normal - - 192 + 256 2 - 16th + eighth + + 3 + 2 + eighth + + @@ -919,102 +854,28 @@ F 4 - 192 - - - 2 - 16th - up - normal - - - - - - - F - 4 - - 48 - - - - 2 - 64th - up - normal - - - - - - - - F - 4 - - 12 - - - - 2 - 256th - up - normal - - - - - - - - F - 4 - - 3 - - - 2 - 1024th - up - normal - - - - - - - F - 4 - - 288 - - - 2 - 16th - - up - normal - - - - - - - F - 4 - - 24 - - + 256 2 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -1022,23 +883,32 @@ F 4 - 6 - + 256 2 - 512th + eighth + + 3 + 2 + eighth + up normal - - 192 + 256 2 - 16th + eighth + + 3 + 2 + eighth + + diff --git a/test/data/grooves/JAZZ07.musicxml b/test/data/grooves/JAZZ07.musicxml index 77d96694..d2d21875 100644 --- a/test/data/grooves/JAZZ07.musicxml +++ b/test/data/grooves/JAZZ07.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -534,38 +534,6 @@ - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - E @@ -924,15 +892,14 @@ E 4 - 384 - + 576 1 eighth + up normal - @@ -987,38 +954,6 @@ - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -1141,38 +1076,6 @@ - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - E @@ -1416,81 +1319,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 288 - - - 1 - 16th - - up - x - - - - - - - F - 5 - - 24 - - - + 256 1 - 128th - up - x + eighth + + 3 + 2 + eighth + - - + + + 3 + eighth + + + 2 + eighth + + @@ -1498,15 +1345,18 @@ F 5 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1514,13 +1364,19 @@ F 5 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up x + @@ -1810,97 +1666,44 @@ - 192 - + 256 1 - 16th + eighth + + 3 + 2 + eighth + - + + + 3 + eighth + + + 2 + eighth + + - - - 48 - - + + + F + 5 + + 256 + 1 - 64th + eighth + + 3 + 2 + eighth + + up + x - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 288 - - - 1 - 16th - - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - @@ -1908,13 +1711,19 @@ F 5 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up x + @@ -2100,81 +1909,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 288 - - - 1 - 16th - - up - x - - - - - - - F - 5 - - 24 - - - + 256 1 - 128th - up - x + eighth + + 3 + 2 + eighth + - - + + + 3 + eighth + + + 2 + eighth + + @@ -2182,15 +1935,18 @@ F 5 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -2198,13 +1954,19 @@ F 5 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up x + @@ -2494,81 +2256,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 288 - - - 1 - 16th - - up - x - - - - - - - F - 5 - - 24 - - - + 256 1 - 128th - up - x + eighth + + 3 + 2 + eighth + - - + + + 3 + eighth + + + 2 + eighth + + @@ -2576,15 +2282,18 @@ F 5 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -2592,13 +2301,19 @@ F 5 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up x + @@ -2643,22 +2358,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -2666,10 +2384,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -2677,10 +2400,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -2863,22 +2592,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -2886,10 +2618,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -2897,10 +2634,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -3083,22 +2826,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -3106,10 +2852,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -3117,10 +2868,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -3303,22 +3060,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -3326,10 +3086,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -3337,10 +3102,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/Jazz54.musicxml b/test/data/grooves/Jazz54.musicxml index 9a5a7430..63f643b7 100644 --- a/test/data/grooves/Jazz54.musicxml +++ b/test/data/grooves/Jazz54.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Jazz54DrumIntro.musicxml b/test/data/grooves/Jazz54DrumIntro.musicxml index 0172205b..cd1f1b40 100644 --- a/test/data/grooves/Jazz54DrumIntro.musicxml +++ b/test/data/grooves/Jazz54DrumIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Jazz54Sus.musicxml b/test/data/grooves/Jazz54Sus.musicxml index 85bddb7d..1a1fcded 100644 --- a/test/data/grooves/Jazz54Sus.musicxml +++ b/test/data/grooves/Jazz54Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Jazz54Walk.musicxml b/test/data/grooves/Jazz54Walk.musicxml index 5d3f2b05..1bcd9bb1 100644 --- a/test/data/grooves/Jazz54Walk.musicxml +++ b/test/data/grooves/Jazz54Walk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Jazz54WalkSus.musicxml b/test/data/grooves/Jazz54WalkSus.musicxml index 612923b9..689a3437 100644 --- a/test/data/grooves/Jazz54WalkSus.musicxml +++ b/test/data/grooves/Jazz54WalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzBasieA.musicxml b/test/data/grooves/JazzBasieA.musicxml index acf2fa1e..d2e675f3 100644 --- a/test/data/grooves/JazzBasieA.musicxml +++ b/test/data/grooves/JazzBasieA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzBasieB.musicxml b/test/data/grooves/JazzBasieB.musicxml index 5cbd5aa5..ec3788b8 100644 --- a/test/data/grooves/JazzBasieB.musicxml +++ b/test/data/grooves/JazzBasieB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -528,97 +528,28 @@ G 5 - 384 + 512 3 - eighth + quarter + + 3 + 2 + quarter + up x - - - - - 96 - - 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - + + + 3 + quarter + + + 2 + quarter + + @@ -626,15 +557,19 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + quarter + up circle-x - + diff --git a/test/data/grooves/JazzBasieEndingA.musicxml b/test/data/grooves/JazzBasieEndingA.musicxml index 6e1cb517..0a868845 100644 --- a/test/data/grooves/JazzBasieEndingA.musicxml +++ b/test/data/grooves/JazzBasieEndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -227,22 +227,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -250,10 +253,15 @@ G 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -261,10 +269,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -314,10 +328,10 @@ B 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -326,15 +340,20 @@ up normal - - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzBasieEndingB.musicxml b/test/data/grooves/JazzBasieEndingB.musicxml index 2e2adbf0..97de5bae 100644 --- a/test/data/grooves/JazzBasieEndingB.musicxml +++ b/test/data/grooves/JazzBasieEndingB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -287,10 +287,10 @@ E 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -299,7 +299,6 @@ up square - @@ -307,13 +306,19 @@ E 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up square + @@ -489,97 +494,28 @@ G 5 - 384 + 512 3 - eighth + quarter + + 3 + 2 + quarter + up x - - - - - 96 - - 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - + + + 3 + quarter + + + 2 + quarter + + @@ -587,15 +523,19 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + quarter + up circle-x - + @@ -679,22 +619,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -702,10 +645,15 @@ G 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -713,10 +661,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -766,10 +720,10 @@ B 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -778,15 +732,20 @@ up normal - - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzBasieEndingC.musicxml b/test/data/grooves/JazzBasieEndingC.musicxml index 1bff596e..3a83aa16 100644 --- a/test/data/grooves/JazzBasieEndingC.musicxml +++ b/test/data/grooves/JazzBasieEndingC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -850,22 +850,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -873,10 +876,15 @@ G 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -884,10 +892,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -937,10 +951,10 @@ B 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -949,15 +963,20 @@ up normal - - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzBasieFillAA.musicxml b/test/data/grooves/JazzBasieFillAA.musicxml index 5d7da109..195c5615 100644 --- a/test/data/grooves/JazzBasieFillAA.musicxml +++ b/test/data/grooves/JazzBasieFillAA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzBasieFillBA.musicxml b/test/data/grooves/JazzBasieFillBA.musicxml index 5e778007..18963fdb 100644 --- a/test/data/grooves/JazzBasieFillBA.musicxml +++ b/test/data/grooves/JazzBasieFillBA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzBasieFillBB.musicxml b/test/data/grooves/JazzBasieFillBB.musicxml index 515575d8..342bb4b3 100644 --- a/test/data/grooves/JazzBasieFillBB.musicxml +++ b/test/data/grooves/JazzBasieFillBB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -235,10 +235,10 @@ E 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -247,7 +247,6 @@ up square - @@ -255,13 +254,19 @@ E 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up square + diff --git a/test/data/grooves/JazzBasieFillCC.musicxml b/test/data/grooves/JazzBasieFillCC.musicxml index 6d789d8f..c4d927ce 100644 --- a/test/data/grooves/JazzBasieFillCC.musicxml +++ b/test/data/grooves/JazzBasieFillCC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -235,10 +235,10 @@ E 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -247,7 +247,6 @@ up square - @@ -255,13 +254,19 @@ E 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up square + diff --git a/test/data/grooves/JazzBasieFillDD.musicxml b/test/data/grooves/JazzBasieFillDD.musicxml index 9cc3271e..3d2cab70 100644 --- a/test/data/grooves/JazzBasieFillDD.musicxml +++ b/test/data/grooves/JazzBasieFillDD.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -251,10 +251,10 @@ A 5 - 256 + 512 1 - eighth + quarter 3 2 @@ -263,15 +263,20 @@ up x - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -596,10 +601,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -608,15 +613,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzBasieIntroA.musicxml b/test/data/grooves/JazzBasieIntroA.musicxml index 04677194..8968d00d 100644 --- a/test/data/grooves/JazzBasieIntroA.musicxml +++ b/test/data/grooves/JazzBasieIntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -177,10 +177,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -189,7 +189,6 @@ up x - @@ -197,13 +196,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up circle-x + diff --git a/test/data/grooves/JazzBasieIntroB.musicxml b/test/data/grooves/JazzBasieIntroB.musicxml index ad15c617..e8525fcb 100644 --- a/test/data/grooves/JazzBasieIntroB.musicxml +++ b/test/data/grooves/JazzBasieIntroB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzBasieIntroC.musicxml b/test/data/grooves/JazzBasieIntroC.musicxml index efebb43b..05ce2ba2 100644 --- a/test/data/grooves/JazzBasieIntroC.musicxml +++ b/test/data/grooves/JazzBasieIntroC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -366,97 +366,28 @@ G 5 - 384 + 512 3 - eighth + quarter + + 3 + 2 + quarter + up x - - - - - 96 - - 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - circle-x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - circle-x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - + + + 3 + quarter + + + 2 + quarter + + @@ -464,15 +395,19 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + quarter + up circle-x - + diff --git a/test/data/grooves/JazzBasieMainC.musicxml b/test/data/grooves/JazzBasieMainC.musicxml index b1fe9cfe..3fe7bcbc 100644 --- a/test/data/grooves/JazzBasieMainC.musicxml +++ b/test/data/grooves/JazzBasieMainC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzBasieMainD.musicxml b/test/data/grooves/JazzBasieMainD.musicxml index 01361128..4e2f6359 100644 --- a/test/data/grooves/JazzBasieMainD.musicxml +++ b/test/data/grooves/JazzBasieMainD.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -636,97 +636,28 @@ F 5 - 192 - - 1 - 16th - up - x - - - - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - + 256 1 eighth + + 3 + 2 + quarter + up x - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + + + 3 + eighth + + + 2 + quarter + + @@ -734,15 +665,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + diff --git a/test/data/grooves/JazzBossaA.musicxml b/test/data/grooves/JazzBossaA.musicxml index 05b3994b..aef039be 100644 --- a/test/data/grooves/JazzBossaA.musicxml +++ b/test/data/grooves/JazzBossaA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzBossaB.musicxml b/test/data/grooves/JazzBossaB.musicxml index dd073656..2d7f6052 100644 --- a/test/data/grooves/JazzBossaB.musicxml +++ b/test/data/grooves/JazzBossaB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzBossaEndingA.musicxml b/test/data/grooves/JazzBossaEndingA.musicxml index 64078744..de0ffcb3 100644 --- a/test/data/grooves/JazzBossaEndingA.musicxml +++ b/test/data/grooves/JazzBossaEndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzBossaFillAA.musicxml b/test/data/grooves/JazzBossaFillAA.musicxml index d92fd741..aba26300 100644 --- a/test/data/grooves/JazzBossaFillAA.musicxml +++ b/test/data/grooves/JazzBossaFillAA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzBossaFillBB.musicxml b/test/data/grooves/JazzBossaFillBB.musicxml index 0e27a1aa..4d1c519c 100644 --- a/test/data/grooves/JazzBossaFillBB.musicxml +++ b/test/data/grooves/JazzBossaFillBB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzBossaIntroA.musicxml b/test/data/grooves/JazzBossaIntroA.musicxml index e6b69ecf..74199dc3 100644 --- a/test/data/grooves/JazzBossaIntroA.musicxml +++ b/test/data/grooves/JazzBossaIntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzBouncyEndingA.musicxml b/test/data/grooves/JazzBouncyEndingA.musicxml index 93678a14..e5be081a 100644 --- a/test/data/grooves/JazzBouncyEndingA.musicxml +++ b/test/data/grooves/JazzBouncyEndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -301,10 +301,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -313,7 +313,6 @@ up normal - @@ -321,13 +320,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -358,10 +363,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -370,7 +375,6 @@ up normal - @@ -378,13 +382,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -537,10 +547,10 @@ G 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -549,7 +559,6 @@ up normal - @@ -557,13 +566,19 @@ G 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/JazzBouncyFillAA.musicxml b/test/data/grooves/JazzBouncyFillAA.musicxml index 21cc9d5c..32dc0f88 100644 --- a/test/data/grooves/JazzBouncyFillAA.musicxml +++ b/test/data/grooves/JazzBouncyFillAA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -310,119 +310,28 @@ E 4 - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 384 - + 256 1 eighth + + 3 + 2 + quarter + up normal - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - + + + 3 + eighth + + + 2 + quarter + + @@ -430,111 +339,42 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - + - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - + 512 1 - 128th - up - normal + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + @@ -542,23 +382,32 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -807,10 +656,10 @@ B 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -819,7 +668,6 @@ up normal - @@ -827,13 +675,19 @@ B 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/JazzBouncyFillBB.musicxml b/test/data/grooves/JazzBouncyFillBB.musicxml index 039d4929..9fd077d1 100644 --- a/test/data/grooves/JazzBouncyFillBB.musicxml +++ b/test/data/grooves/JazzBouncyFillBB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -311,119 +311,28 @@ E 4 - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 384 - + 256 1 eighth + + 3 + 2 + quarter + up normal - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - + + + 3 + eighth + + + 2 + quarter + + @@ -431,15 +340,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/JazzBouncyIntroA.musicxml b/test/data/grooves/JazzBouncyIntroA.musicxml index 25b37921..b82259ee 100644 --- a/test/data/grooves/JazzBouncyIntroA.musicxml +++ b/test/data/grooves/JazzBouncyIntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzBouncyMainA.musicxml b/test/data/grooves/JazzBouncyMainA.musicxml index 20d8df9a..f5f2a577 100644 --- a/test/data/grooves/JazzBouncyMainA.musicxml +++ b/test/data/grooves/JazzBouncyMainA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -3528,98 +3528,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - down - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -3627,15 +3554,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/JazzBouncyMainB.musicxml b/test/data/grooves/JazzBouncyMainB.musicxml index 575896a0..54753a5d 100644 --- a/test/data/grooves/JazzBouncyMainB.musicxml +++ b/test/data/grooves/JazzBouncyMainB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -441,10 +441,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -453,7 +453,6 @@ up normal - @@ -461,13 +460,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -498,10 +503,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -510,7 +515,6 @@ up normal - @@ -518,13 +522,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -859,10 +869,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -871,7 +881,6 @@ up normal - @@ -879,13 +888,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -924,10 +939,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -936,7 +951,6 @@ up normal - @@ -944,13 +958,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -981,10 +1001,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -993,7 +1013,6 @@ up normal - @@ -1001,13 +1020,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -1046,10 +1071,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1058,7 +1083,6 @@ up normal - @@ -1066,13 +1090,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -1103,10 +1133,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1115,7 +1145,6 @@ up normal - @@ -1123,13 +1152,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -1168,10 +1203,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1180,7 +1215,6 @@ up normal - @@ -1188,13 +1222,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -1331,10 +1371,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1343,7 +1383,6 @@ up normal - @@ -1351,13 +1390,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -1388,10 +1433,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1400,7 +1445,6 @@ up normal - @@ -1408,13 +1452,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -1453,10 +1503,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1465,7 +1515,6 @@ up normal - @@ -1473,13 +1522,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -1516,10 +1571,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1528,7 +1583,6 @@ up normal - @@ -1536,13 +1590,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -1673,10 +1733,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1685,7 +1745,6 @@ up normal - @@ -1693,13 +1752,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -2028,10 +2093,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -2040,7 +2105,6 @@ up normal - @@ -2048,13 +2112,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/JazzCombo.musicxml b/test/data/grooves/JazzCombo.musicxml index 656f4704..ca28aeac 100644 --- a/test/data/grooves/JazzCombo.musicxml +++ b/test/data/grooves/JazzCombo.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -219,98 +219,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -318,15 +245,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -357,98 +288,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -456,15 +314,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -560,10 +422,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -572,7 +434,6 @@ up normal - @@ -580,13 +441,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/JazzCombo1.musicxml b/test/data/grooves/JazzCombo1.musicxml index 35734b59..0da1d9db 100644 --- a/test/data/grooves/JazzCombo1.musicxml +++ b/test/data/grooves/JazzCombo1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -911,10 +911,10 @@ D 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -923,15 +923,20 @@ down x - - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -1145,10 +1150,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -1157,7 +1162,6 @@ up x - @@ -1165,13 +1169,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up circle-x + diff --git a/test/data/grooves/JazzCombo1Plus.musicxml b/test/data/grooves/JazzCombo1Plus.musicxml index a9f8f244..68e234f0 100644 --- a/test/data/grooves/JazzCombo1Plus.musicxml +++ b/test/data/grooves/JazzCombo1Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -911,10 +911,10 @@ D 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -923,15 +923,20 @@ down x - - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -1145,10 +1150,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -1157,7 +1162,6 @@ up x - @@ -1165,13 +1169,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up circle-x + diff --git a/test/data/grooves/JazzCombo1Sus.musicxml b/test/data/grooves/JazzCombo1Sus.musicxml index d1b87efe..298eb90e 100644 --- a/test/data/grooves/JazzCombo1Sus.musicxml +++ b/test/data/grooves/JazzCombo1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -911,10 +911,10 @@ D 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -923,15 +923,20 @@ down x - - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -1145,10 +1150,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -1157,7 +1162,6 @@ up x - @@ -1165,13 +1169,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up circle-x + diff --git a/test/data/grooves/JazzCombo1SusPlus.musicxml b/test/data/grooves/JazzCombo1SusPlus.musicxml index 95f2c24f..0aa2ac7a 100644 --- a/test/data/grooves/JazzCombo1SusPlus.musicxml +++ b/test/data/grooves/JazzCombo1SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -911,10 +911,10 @@ D 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -923,15 +923,20 @@ down x - - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -1145,10 +1150,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -1157,7 +1162,6 @@ up x - @@ -1165,13 +1169,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up circle-x + diff --git a/test/data/grooves/JazzCombo2.musicxml b/test/data/grooves/JazzCombo2.musicxml index 734ae22b..17a005d3 100644 --- a/test/data/grooves/JazzCombo2.musicxml +++ b/test/data/grooves/JazzCombo2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -206,15 +206,15 @@ + A 5 - 576 + 768 1 - eighth - + quarter up x @@ -442,15 +442,15 @@ + C 6 - 576 + 768 1 - eighth - + quarter up circle-x @@ -620,10 +620,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -632,7 +632,6 @@ up x - @@ -640,13 +639,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up circle-x + @@ -1386,10 +1391,10 @@ D 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -1398,15 +1403,20 @@ down x - - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzCombo2Plus.musicxml b/test/data/grooves/JazzCombo2Plus.musicxml index 90b98073..3174482a 100644 --- a/test/data/grooves/JazzCombo2Plus.musicxml +++ b/test/data/grooves/JazzCombo2Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -206,15 +206,15 @@ + A 5 - 576 + 768 1 - eighth - + quarter up x @@ -442,15 +442,15 @@ + C 6 - 576 + 768 1 - eighth - + quarter up circle-x @@ -620,10 +620,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -632,7 +632,6 @@ up x - @@ -640,13 +639,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up circle-x + @@ -1386,10 +1391,10 @@ D 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -1398,15 +1403,20 @@ down x - - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzCombo2Sus.musicxml b/test/data/grooves/JazzCombo2Sus.musicxml index 76478ce1..c6971ff1 100644 --- a/test/data/grooves/JazzCombo2Sus.musicxml +++ b/test/data/grooves/JazzCombo2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -206,15 +206,15 @@ + A 5 - 576 + 768 1 - eighth - + quarter up x @@ -442,15 +442,15 @@ + C 6 - 576 + 768 1 - eighth - + quarter up circle-x @@ -620,10 +620,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -632,7 +632,6 @@ up x - @@ -640,13 +639,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up circle-x + @@ -1386,10 +1391,10 @@ D 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -1398,15 +1403,20 @@ down x - - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzCombo2SusPlus.musicxml b/test/data/grooves/JazzCombo2SusPlus.musicxml index 6ee24dff..b28ab7e7 100644 --- a/test/data/grooves/JazzCombo2SusPlus.musicxml +++ b/test/data/grooves/JazzCombo2SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -206,15 +206,15 @@ + A 5 - 576 + 768 1 - eighth - + quarter up x @@ -442,15 +442,15 @@ + C 6 - 576 + 768 1 - eighth - + quarter up circle-x @@ -620,10 +620,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -632,7 +632,6 @@ up x - @@ -640,13 +639,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up circle-x + @@ -1386,10 +1391,10 @@ D 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -1398,15 +1403,20 @@ down x - - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzComboEnd.musicxml b/test/data/grooves/JazzComboEnd.musicxml index cbfe6998..5fe125be 100644 --- a/test/data/grooves/JazzComboEnd.musicxml +++ b/test/data/grooves/JazzComboEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzComboIntro.musicxml b/test/data/grooves/JazzComboIntro.musicxml index b2d2c605..47e60274 100644 --- a/test/data/grooves/JazzComboIntro.musicxml +++ b/test/data/grooves/JazzComboIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -219,98 +219,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -318,15 +245,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -357,98 +288,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -456,15 +314,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/JazzComboIntro2.musicxml b/test/data/grooves/JazzComboIntro2.musicxml index 73c2ac3e..bb5bbff3 100644 --- a/test/data/grooves/JazzComboIntro2.musicxml +++ b/test/data/grooves/JazzComboIntro2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzComboPlus.musicxml b/test/data/grooves/JazzComboPlus.musicxml index 2c4fb8a2..19f39641 100644 --- a/test/data/grooves/JazzComboPlus.musicxml +++ b/test/data/grooves/JazzComboPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -911,10 +911,10 @@ D 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -923,15 +923,20 @@ down x - - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -1145,10 +1150,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -1157,7 +1162,6 @@ up x - @@ -1165,13 +1169,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up circle-x + diff --git a/test/data/grooves/JazzComboSus.musicxml b/test/data/grooves/JazzComboSus.musicxml index 6dbb7f49..9339ba8b 100644 --- a/test/data/grooves/JazzComboSus.musicxml +++ b/test/data/grooves/JazzComboSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -911,10 +911,10 @@ D 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -923,15 +923,20 @@ down x - - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -1145,10 +1150,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -1157,7 +1162,6 @@ up x - @@ -1165,13 +1169,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up circle-x + diff --git a/test/data/grooves/JazzComboSusPlus.musicxml b/test/data/grooves/JazzComboSusPlus.musicxml index 3b1a6054..020b189b 100644 --- a/test/data/grooves/JazzComboSusPlus.musicxml +++ b/test/data/grooves/JazzComboSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -911,10 +911,10 @@ D 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -923,15 +923,20 @@ down x - - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -1145,10 +1150,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -1157,7 +1162,6 @@ up x - @@ -1165,13 +1169,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up circle-x + diff --git a/test/data/grooves/JazzCountryEndingA.musicxml b/test/data/grooves/JazzCountryEndingA.musicxml index d13e8f1a..be80c714 100644 --- a/test/data/grooves/JazzCountryEndingA.musicxml +++ b/test/data/grooves/JazzCountryEndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -718,98 +718,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - B - 4 - - 384 - - + 256 2 eighth - up - normal - - - - - - - B - 4 - - 96 - - - - 2 - 32nd - up - normal - - - - - - - - B - 4 - - 24 - - - - 2 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -817,15 +744,19 @@ B 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -956,10 +887,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -968,7 +899,6 @@ down normal - @@ -976,13 +906,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + down normal + diff --git a/test/data/grooves/JazzCountryFillAA.musicxml b/test/data/grooves/JazzCountryFillAA.musicxml index ebcceca9..b18815bc 100644 --- a/test/data/grooves/JazzCountryFillAA.musicxml +++ b/test/data/grooves/JazzCountryFillAA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzCountryFillBB.musicxml b/test/data/grooves/JazzCountryFillBB.musicxml index 3b888733..39486046 100644 --- a/test/data/grooves/JazzCountryFillBB.musicxml +++ b/test/data/grooves/JazzCountryFillBB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzCountryIntroA.musicxml b/test/data/grooves/JazzCountryIntroA.musicxml index 15c1ad6f..5ef59c30 100644 --- a/test/data/grooves/JazzCountryIntroA.musicxml +++ b/test/data/grooves/JazzCountryIntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzCountryMainA.musicxml b/test/data/grooves/JazzCountryMainA.musicxml index 01d8f1b5..0ee91805 100644 --- a/test/data/grooves/JazzCountryMainA.musicxml +++ b/test/data/grooves/JazzCountryMainA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzCountryMainB.musicxml b/test/data/grooves/JazzCountryMainB.musicxml index 4db31374..1b8ece52 100644 --- a/test/data/grooves/JazzCountryMainB.musicxml +++ b/test/data/grooves/JazzCountryMainB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzGrTrioEndingA.musicxml b/test/data/grooves/JazzGrTrioEndingA.musicxml index d59ed5ca..ccebd954 100644 --- a/test/data/grooves/JazzGrTrioEndingA.musicxml +++ b/test/data/grooves/JazzGrTrioEndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzGrTrioEndingB.musicxml b/test/data/grooves/JazzGrTrioEndingB.musicxml index 0338eb4a..63976f89 100644 --- a/test/data/grooves/JazzGrTrioEndingB.musicxml +++ b/test/data/grooves/JazzGrTrioEndingB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -388,10 +388,10 @@ D 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -400,7 +400,6 @@ up normal - @@ -408,13 +407,19 @@ D 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -583,6 +588,7 @@ + D 4 @@ -601,11 +607,10 @@ D 4 - 576 + 768 1 - eighth - + quarter up normal @@ -660,10 +665,10 @@ E 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -672,15 +677,20 @@ up square - - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzGrTrioFillAA.musicxml b/test/data/grooves/JazzGrTrioFillAA.musicxml index 6b4bff50..6d895f54 100644 --- a/test/data/grooves/JazzGrTrioFillAA.musicxml +++ b/test/data/grooves/JazzGrTrioFillAA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -235,10 +235,10 @@ D 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -247,7 +247,6 @@ up normal - @@ -255,13 +254,19 @@ D 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/JazzGrTrioFillAB.musicxml b/test/data/grooves/JazzGrTrioFillAB.musicxml index 02dfbe75..1be40335 100644 --- a/test/data/grooves/JazzGrTrioFillAB.musicxml +++ b/test/data/grooves/JazzGrTrioFillAB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -342,119 +342,28 @@ D 4 - 192 - - - 1 - 16th - up - normal - - - - - - - D - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - D - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - D - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - D - 4 - - 384 - + 256 1 eighth + + 3 + 2 + quarter + up normal - - - - - - D - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - D - 4 - - 24 - - - - 1 - 128th - up - normal - - - + + + 3 + eighth + + + 2 + quarter + + @@ -462,15 +371,19 @@ D 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -741,10 +654,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -753,15 +666,20 @@ up circle-x - - 768 + 512 3 quarter + + 3 + 2 + quarter + + @@ -831,10 +749,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -843,15 +761,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -962,10 +885,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -974,7 +897,6 @@ up x - @@ -982,13 +904,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + diff --git a/test/data/grooves/JazzGrTrioFillBA.musicxml b/test/data/grooves/JazzGrTrioFillBA.musicxml index 81d12897..e2cea414 100644 --- a/test/data/grooves/JazzGrTrioFillBA.musicxml +++ b/test/data/grooves/JazzGrTrioFillBA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -225,10 +225,10 @@ D 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -237,15 +237,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -404,10 +409,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -416,15 +421,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -486,10 +496,10 @@ D 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -498,7 +508,6 @@ down x - @@ -506,13 +515,19 @@ D 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + down x + diff --git a/test/data/grooves/JazzGrTrioFillBB.musicxml b/test/data/grooves/JazzGrTrioFillBB.musicxml index 53cb5914..928219f5 100644 --- a/test/data/grooves/JazzGrTrioFillBB.musicxml +++ b/test/data/grooves/JazzGrTrioFillBB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -342,119 +342,28 @@ D 4 - 192 - - - 1 - 16th - up - normal - - - - - - - D - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - D - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - D - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - D - 4 - - 384 - + 256 1 eighth + + 3 + 2 + quarter + up normal - - - - - - D - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - D - 4 - - 24 - - - - 1 - 128th - up - normal - - - + + + 3 + eighth + + + 2 + quarter + + @@ -462,15 +371,19 @@ D 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -741,10 +654,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -753,15 +666,20 @@ up circle-x - - 768 + 512 3 quarter + + 3 + 2 + quarter + + @@ -831,10 +749,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -843,15 +761,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -962,10 +885,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -974,7 +897,6 @@ up x - @@ -982,13 +904,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + diff --git a/test/data/grooves/JazzGrTrioIntroA.musicxml b/test/data/grooves/JazzGrTrioIntroA.musicxml index 83f98bdf..4e2602a6 100644 --- a/test/data/grooves/JazzGrTrioIntroA.musicxml +++ b/test/data/grooves/JazzGrTrioIntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -353,10 +353,10 @@ D 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -365,15 +365,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -594,10 +599,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -606,15 +611,20 @@ up circle-x - - 768 + 512 3 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzGrTrioIntroB.musicxml b/test/data/grooves/JazzGrTrioIntroB.musicxml index 408c3516..092af6fb 100644 --- a/test/data/grooves/JazzGrTrioIntroB.musicxml +++ b/test/data/grooves/JazzGrTrioIntroB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -448,81 +448,41 @@ D 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - D - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - D - 4 - - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + up normal - - - - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - + + + 3 + 16th + + + 2 + 16th + + - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + - @@ -530,13 +490,19 @@ D 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -959,10 +925,10 @@ D 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -971,15 +937,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1010,10 +981,10 @@ D 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1022,15 +993,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1673,94 +1649,94 @@ F 5 - 384 - + 512 1 - eighth + quarter + + 3 + 2 + quarter + up x - + + + 3 + quarter + + + 2 + quarter + + - + - F - 5 + C + 6 - 96 - - - + 256 + 1 - 32nd + eighth + + 3 + 2 + quarter + up x - - + - + + F 5 - 24 + 192 - 1 - 128th + 16th up x - - + F 5 - 6 - - - 1 - 512th - up - x - - - - - - - C - 6 - 48 - + + 1 64th up x + - + - C - 6 + F + 5 12 - + 1 256th up @@ -1770,34 +1746,20 @@ - - - C - 6 - - 3 - - - 1 - 1024th - up - x - - - - F 5 - 192 + 3 + 1 - 16th + 1024th up x + @@ -2848,10 +2810,10 @@ D 5 - 256 + 512 2 - eighth + quarter 3 2 @@ -2860,15 +2822,20 @@ up normal - - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -3075,10 +3042,10 @@ D 5 - 256 + 512 2 - eighth + quarter 3 2 @@ -3087,7 +3054,6 @@ up normal - @@ -3095,13 +3061,19 @@ D 5 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + @@ -3433,10 +3405,10 @@ E 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -3445,15 +3417,20 @@ up normal - - 768 + 512 3 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzGrTrioMainA.musicxml b/test/data/grooves/JazzGrTrioMainA.musicxml index d07cb9ee..4b400c19 100644 --- a/test/data/grooves/JazzGrTrioMainA.musicxml +++ b/test/data/grooves/JazzGrTrioMainA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzGrTrioMainB.musicxml b/test/data/grooves/JazzGrTrioMainB.musicxml index 1287983b..3d5c2c47 100644 --- a/test/data/grooves/JazzGrTrioMainB.musicxml +++ b/test/data/grooves/JazzGrTrioMainB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -351,10 +351,10 @@ D 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -363,15 +363,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -420,10 +425,10 @@ D 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -432,15 +437,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -489,10 +499,10 @@ D 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -501,15 +511,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -558,10 +573,10 @@ D 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -570,15 +585,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1098,10 +1118,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -1110,15 +1130,20 @@ up circle-x - - 768 + 512 3 quarter + + 3 + 2 + quarter + + @@ -1424,10 +1449,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -1436,15 +1461,20 @@ up circle-x - - 768 + 512 3 quarter + + 3 + 2 + quarter + + @@ -1514,10 +1544,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1526,15 +1556,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1614,10 +1649,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1626,15 +1661,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1665,10 +1705,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1677,15 +1717,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1973,10 +2018,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1985,15 +2030,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -2637,98 +2687,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - E - 5 - - 384 - - + 256 3 eighth - up - normal - - - - - - - E - 5 - - 96 - - - - 3 - 32nd - up - normal - - - - - - - - E - 5 - - 24 - - - - 3 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -2736,15 +2713,19 @@ E 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -2865,10 +2846,10 @@ F 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -2877,15 +2858,20 @@ up normal - - 768 + 512 3 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzRhumba.musicxml b/test/data/grooves/JazzRhumba.musicxml index 84081f74..dde25ddd 100644 --- a/test/data/grooves/JazzRhumba.musicxml +++ b/test/data/grooves/JazzRhumba.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzRhumbaEnd.musicxml b/test/data/grooves/JazzRhumbaEnd.musicxml index 023d69a1..6f7f1778 100644 --- a/test/data/grooves/JazzRhumbaEnd.musicxml +++ b/test/data/grooves/JazzRhumbaEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzRhumbaFill.musicxml b/test/data/grooves/JazzRhumbaFill.musicxml index 7ade3fb7..78b9090e 100644 --- a/test/data/grooves/JazzRhumbaFill.musicxml +++ b/test/data/grooves/JazzRhumbaFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -214,15 +214,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up normal @@ -247,25 +247,25 @@ F 4 - 192 + 768 1 - 16th + quarter up x + F 4 - 576 + 768 1 - eighth - + quarter up normal @@ -343,15 +343,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up normal @@ -376,25 +376,25 @@ F 4 - 192 + 768 1 - 16th + quarter up x + F 4 - 576 + 768 1 - eighth - + quarter up normal @@ -472,15 +472,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up normal @@ -505,25 +505,25 @@ F 4 - 192 + 768 1 - 16th + quarter up x + F 4 - 576 + 768 1 - eighth - + quarter up normal @@ -601,15 +601,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up normal @@ -634,25 +634,25 @@ F 4 - 192 + 768 1 - 16th + quarter up x + F 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/JazzRhumbaIntro.musicxml b/test/data/grooves/JazzRhumbaIntro.musicxml index e9423bff..b01003e1 100644 --- a/test/data/grooves/JazzRhumbaIntro.musicxml +++ b/test/data/grooves/JazzRhumbaIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzRhumbaPlus.musicxml b/test/data/grooves/JazzRhumbaPlus.musicxml index 8319842d..268cd564 100644 --- a/test/data/grooves/JazzRhumbaPlus.musicxml +++ b/test/data/grooves/JazzRhumbaPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzRhumbaSus.musicxml b/test/data/grooves/JazzRhumbaSus.musicxml index 53e1947d..ecae28f3 100644 --- a/test/data/grooves/JazzRhumbaSus.musicxml +++ b/test/data/grooves/JazzRhumbaSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzRhumbaSusPlus.musicxml b/test/data/grooves/JazzRhumbaSusPlus.musicxml index 33d4dbc3..b44bd61d 100644 --- a/test/data/grooves/JazzRhumbaSusPlus.musicxml +++ b/test/data/grooves/JazzRhumbaSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzRock.musicxml b/test/data/grooves/JazzRock.musicxml index ac741d03..8a51f65e 100644 --- a/test/data/grooves/JazzRock.musicxml +++ b/test/data/grooves/JazzRock.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzRockEnd.musicxml b/test/data/grooves/JazzRockEnd.musicxml index 427d075a..e3854e72 100644 --- a/test/data/grooves/JazzRockEnd.musicxml +++ b/test/data/grooves/JazzRockEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzRockFill.musicxml b/test/data/grooves/JazzRockFill.musicxml index 1427d974..62037576 100644 --- a/test/data/grooves/JazzRockFill.musicxml +++ b/test/data/grooves/JazzRockFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -214,98 +214,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -313,15 +240,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -375,98 +306,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -474,15 +332,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -553,98 +415,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -652,15 +441,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -714,98 +507,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -813,15 +533,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - + diff --git a/test/data/grooves/JazzRockIntro.musicxml b/test/data/grooves/JazzRockIntro.musicxml index cd0a2628..2d745adb 100644 --- a/test/data/grooves/JazzRockIntro.musicxml +++ b/test/data/grooves/JazzRockIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzRockIntro8.musicxml b/test/data/grooves/JazzRockIntro8.musicxml index 628de1e4..101ff7e4 100644 --- a/test/data/grooves/JazzRockIntro8.musicxml +++ b/test/data/grooves/JazzRockIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzRockPlus.musicxml b/test/data/grooves/JazzRockPlus.musicxml index cdee99b7..3692f9d3 100644 --- a/test/data/grooves/JazzRockPlus.musicxml +++ b/test/data/grooves/JazzRockPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzRockSus.musicxml b/test/data/grooves/JazzRockSus.musicxml index c5dc6788..ff3c00e4 100644 --- a/test/data/grooves/JazzRockSus.musicxml +++ b/test/data/grooves/JazzRockSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzRockSusPlus.musicxml b/test/data/grooves/JazzRockSusPlus.musicxml index 44d77869..99f9f1b6 100644 --- a/test/data/grooves/JazzRockSusPlus.musicxml +++ b/test/data/grooves/JazzRockSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzRockWalk.musicxml b/test/data/grooves/JazzRockWalk.musicxml index 31cb2239..722a8f98 100644 --- a/test/data/grooves/JazzRockWalk.musicxml +++ b/test/data/grooves/JazzRockWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzRockWalkPlus.musicxml b/test/data/grooves/JazzRockWalkPlus.musicxml index 7a02f89b..eb002ef2 100644 --- a/test/data/grooves/JazzRockWalkPlus.musicxml +++ b/test/data/grooves/JazzRockWalkPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzRockWalkSus.musicxml b/test/data/grooves/JazzRockWalkSus.musicxml index 2ece99e2..d273afd1 100644 --- a/test/data/grooves/JazzRockWalkSus.musicxml +++ b/test/data/grooves/JazzRockWalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzRockWalkSusPlus.musicxml b/test/data/grooves/JazzRockWalkSusPlus.musicxml index 941acc62..9bc00c88 100644 --- a/test/data/grooves/JazzRockWalkSusPlus.musicxml +++ b/test/data/grooves/JazzRockWalkSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzSwingEndingA.musicxml b/test/data/grooves/JazzSwingEndingA.musicxml index 6d0a4616..ac4def9f 100644 --- a/test/data/grooves/JazzSwingEndingA.musicxml +++ b/test/data/grooves/JazzSwingEndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -418,10 +418,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -430,7 +430,6 @@ up normal - @@ -438,13 +437,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/JazzSwingFillAA.musicxml b/test/data/grooves/JazzSwingFillAA.musicxml index ba1bf32a..572efe03 100644 --- a/test/data/grooves/JazzSwingFillAA.musicxml +++ b/test/data/grooves/JazzSwingFillAA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -514,10 +514,10 @@ G 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -526,7 +526,6 @@ up normal - @@ -534,13 +533,19 @@ G 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -580,10 +585,10 @@ E 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -592,15 +597,20 @@ up normal - - 768 + 512 3 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzSwingFillBB.musicxml b/test/data/grooves/JazzSwingFillBB.musicxml index 2d25280b..084d68d9 100644 --- a/test/data/grooves/JazzSwingFillBB.musicxml +++ b/test/data/grooves/JazzSwingFillBB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -396,10 +396,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -408,15 +408,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -502,10 +507,10 @@ E 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -514,7 +519,6 @@ up normal - @@ -522,13 +526,19 @@ E 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/JazzSwingIntroA.musicxml b/test/data/grooves/JazzSwingIntroA.musicxml index b88feb02..29a9e7b1 100644 --- a/test/data/grooves/JazzSwingIntroA.musicxml +++ b/test/data/grooves/JazzSwingIntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzSwingMainA.musicxml b/test/data/grooves/JazzSwingMainA.musicxml index e59fed9b..d0ed4f3f 100644 --- a/test/data/grooves/JazzSwingMainA.musicxml +++ b/test/data/grooves/JazzSwingMainA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzSwingMainB.musicxml b/test/data/grooves/JazzSwingMainB.musicxml index d8b99b8c..1d2bcdcb 100644 --- a/test/data/grooves/JazzSwingMainB.musicxml +++ b/test/data/grooves/JazzSwingMainB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1479,10 +1479,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -1491,7 +1491,6 @@ up circle-x - @@ -1499,13 +1498,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up x + @@ -1864,10 +1869,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -1876,7 +1881,6 @@ up circle-x - @@ -1884,13 +1888,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up x + @@ -1929,10 +1939,10 @@ F 5 - 256 + 512 1 - eighth + quarter 3 2 @@ -1941,7 +1951,6 @@ up x - @@ -1949,13 +1958,19 @@ F 5 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -2249,10 +2264,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -2261,7 +2276,6 @@ up circle-x - @@ -2269,13 +2283,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up x + @@ -2984,10 +3004,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -2996,7 +3016,6 @@ up circle-x - @@ -3004,13 +3023,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up x + @@ -3627,10 +3652,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -3639,7 +3664,6 @@ up circle-x - @@ -3647,13 +3671,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up x + diff --git a/test/data/grooves/JazzTrioEndingA.musicxml b/test/data/grooves/JazzTrioEndingA.musicxml index 2e381102..1dfac458 100644 --- a/test/data/grooves/JazzTrioEndingA.musicxml +++ b/test/data/grooves/JazzTrioEndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzTrioFillAA.musicxml b/test/data/grooves/JazzTrioFillAA.musicxml index 3bc90f76..9c73ab06 100644 --- a/test/data/grooves/JazzTrioFillAA.musicxml +++ b/test/data/grooves/JazzTrioFillAA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -220,25 +220,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -276,15 +276,15 @@ + A 5 - 576 + 768 1 - eighth - + quarter up x @@ -596,10 +596,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -608,15 +608,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzTrioFillBB.musicxml b/test/data/grooves/JazzTrioFillBB.musicxml index 511b8b97..f10c14d9 100644 --- a/test/data/grooves/JazzTrioFillBB.musicxml +++ b/test/data/grooves/JazzTrioFillBB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -220,25 +220,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -276,15 +276,15 @@ + A 5 - 576 + 768 1 - eighth - + quarter up x @@ -596,10 +596,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -608,15 +608,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzTrioIntroA.musicxml b/test/data/grooves/JazzTrioIntroA.musicxml index 6c9a0931..0d78c3f8 100644 --- a/test/data/grooves/JazzTrioIntroA.musicxml +++ b/test/data/grooves/JazzTrioIntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzTrioMainA.musicxml b/test/data/grooves/JazzTrioMainA.musicxml index 522abbb1..02cb1d85 100644 --- a/test/data/grooves/JazzTrioMainA.musicxml +++ b/test/data/grooves/JazzTrioMainA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -272,25 +272,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -379,25 +379,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -486,25 +486,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -593,25 +593,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -700,25 +700,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x @@ -807,25 +807,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/JazzTrioMainB.musicxml b/test/data/grooves/JazzTrioMainB.musicxml index 75b70de4..1052c733 100644 --- a/test/data/grooves/JazzTrioMainB.musicxml +++ b/test/data/grooves/JazzTrioMainB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -193,22 +193,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -216,10 +219,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -230,13 +238,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -265,22 +279,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -288,10 +305,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -302,13 +324,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -405,22 +433,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -428,10 +459,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -442,13 +478,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -477,22 +519,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -500,10 +545,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -514,35 +564,44 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -550,10 +609,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -564,33 +628,42 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + - 384 - + 512 1 - eighth + quarter + + 3 + 2 + quarter + - - - - - - 192 - - 1 - 16th - - + + + 3 + quarter + + + 2 + quarter + + @@ -598,10 +671,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -612,35 +690,44 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -648,10 +735,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -662,33 +754,42 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -696,10 +797,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -710,13 +816,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -745,22 +857,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -768,10 +883,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -782,35 +902,44 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -818,10 +947,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -832,33 +966,42 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -866,10 +1009,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -880,13 +1028,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -939,22 +1093,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -962,10 +1119,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -976,13 +1138,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -1033,22 +1201,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -1056,10 +1227,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1070,13 +1246,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + diff --git a/test/data/grooves/JazzWaltz.musicxml b/test/data/grooves/JazzWaltz.musicxml index acdc3446..5d46cd30 100644 --- a/test/data/grooves/JazzWaltz.musicxml +++ b/test/data/grooves/JazzWaltz.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -193,22 +193,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -216,10 +219,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -227,10 +235,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -259,22 +273,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -282,10 +299,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -293,10 +315,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -325,22 +353,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -348,10 +379,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -359,10 +395,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -459,22 +501,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -482,10 +527,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -493,10 +543,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1067,22 +1123,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1090,10 +1149,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -1101,10 +1165,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1159,22 +1229,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1182,10 +1255,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -1193,10 +1271,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1251,22 +1335,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1274,10 +1361,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -1285,10 +1377,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzWaltz1.musicxml b/test/data/grooves/JazzWaltz1.musicxml index 5895016f..fe68b486 100644 --- a/test/data/grooves/JazzWaltz1.musicxml +++ b/test/data/grooves/JazzWaltz1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzWaltz1End.musicxml b/test/data/grooves/JazzWaltz1End.musicxml index 814d8128..324014bb 100644 --- a/test/data/grooves/JazzWaltz1End.musicxml +++ b/test/data/grooves/JazzWaltz1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzWaltz1Sus.musicxml b/test/data/grooves/JazzWaltz1Sus.musicxml index c799323f..ea62e6dc 100644 --- a/test/data/grooves/JazzWaltz1Sus.musicxml +++ b/test/data/grooves/JazzWaltz1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzWaltz2.musicxml b/test/data/grooves/JazzWaltz2.musicxml index 2bb07722..33780ae6 100644 --- a/test/data/grooves/JazzWaltz2.musicxml +++ b/test/data/grooves/JazzWaltz2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzWaltz2Sus.musicxml b/test/data/grooves/JazzWaltz2Sus.musicxml index 9714b752..f583e821 100644 --- a/test/data/grooves/JazzWaltz2Sus.musicxml +++ b/test/data/grooves/JazzWaltz2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzWaltzEnd.musicxml b/test/data/grooves/JazzWaltzEnd.musicxml index 1f14020c..6780fc0b 100644 --- a/test/data/grooves/JazzWaltzEnd.musicxml +++ b/test/data/grooves/JazzWaltzEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -193,22 +193,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -216,10 +219,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -227,10 +235,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzWaltzEndingA.musicxml b/test/data/grooves/JazzWaltzEndingA.musicxml index 47b5cf40..65320b12 100644 --- a/test/data/grooves/JazzWaltzEndingA.musicxml +++ b/test/data/grooves/JazzWaltzEndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzWaltzFill.musicxml b/test/data/grooves/JazzWaltzFill.musicxml index d659974b..2aeeb006 100644 --- a/test/data/grooves/JazzWaltzFill.musicxml +++ b/test/data/grooves/JazzWaltzFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzWaltzFillAA.musicxml b/test/data/grooves/JazzWaltzFillAA.musicxml index ad9e3b73..4c638c48 100644 --- a/test/data/grooves/JazzWaltzFillAA.musicxml +++ b/test/data/grooves/JazzWaltzFillAA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzWaltzFillBB.musicxml b/test/data/grooves/JazzWaltzFillBB.musicxml index f518acdb..0c55c7b6 100644 --- a/test/data/grooves/JazzWaltzFillBB.musicxml +++ b/test/data/grooves/JazzWaltzFillBB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzWaltzIntro.musicxml b/test/data/grooves/JazzWaltzIntro.musicxml index d3733fce..4d341ed7 100644 --- a/test/data/grooves/JazzWaltzIntro.musicxml +++ b/test/data/grooves/JazzWaltzIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -193,22 +193,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -216,10 +219,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -227,10 +235,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -259,22 +273,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -282,10 +299,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -293,10 +315,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -912,22 +940,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -935,10 +966,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -946,10 +982,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1004,22 +1046,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1027,10 +1072,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -1038,10 +1088,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzWaltzIntro8.musicxml b/test/data/grooves/JazzWaltzIntro8.musicxml index 0d8752e4..3540a195 100644 --- a/test/data/grooves/JazzWaltzIntro8.musicxml +++ b/test/data/grooves/JazzWaltzIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1240,53 +1240,18 @@ + F 5 - 48 - - - 1 - 64th - up - x - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - + 192 1 - 1024th + 16th up x - @@ -1294,11 +1259,11 @@ F 5 - 96 + 48 1 - 32nd + 64th up x @@ -1310,12 +1275,12 @@ F 5 - 24 + 12 1 - 128th + 256th up x @@ -1328,11 +1293,11 @@ F 5 - 6 + 3 1 - 512th + 1024th up x @@ -1394,15 +1359,28 @@ F 5 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1410,17 +1388,18 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1428,15 +1407,19 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1468,19 +1451,15 @@ + F 5 - 189 + 192 1 - 32nd - - - - - + 16th up x @@ -1591,65 +1570,28 @@ F 5 - 96 - + 128 1 - 32nd - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - - - - - F - 5 - - 48 - - - 1 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1657,17 +1599,18 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1675,15 +1618,19 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1700,25 +1647,6 @@ - - - F - 5 - - 189 - - 1 - 32nd - - - - - - up - x - - - F @@ -1734,19 +1662,15 @@ + F 5 - 189 + 192 1 - 32nd - - - - - + 16th up x @@ -1857,65 +1781,28 @@ F 5 - 96 - + 128 1 - 32nd - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - - - - - F - 5 - - 48 - - - 1 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1923,17 +1810,18 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1941,15 +1829,19 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1966,25 +1858,6 @@ - - - F - 5 - - 189 - - 1 - 32nd - - - - - - up - x - - - \ No newline at end of file diff --git a/test/data/grooves/JazzWaltzIntroA.musicxml b/test/data/grooves/JazzWaltzIntroA.musicxml index 3317eb37..e590d1c6 100644 --- a/test/data/grooves/JazzWaltzIntroA.musicxml +++ b/test/data/grooves/JazzWaltzIntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzWaltzMainA.musicxml b/test/data/grooves/JazzWaltzMainA.musicxml index 6efbc5d3..6b530b74 100644 --- a/test/data/grooves/JazzWaltzMainA.musicxml +++ b/test/data/grooves/JazzWaltzMainA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -685,10 +685,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -697,15 +697,20 @@ up x - - 768 + 512 3 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/JazzWaltzMainB.musicxml b/test/data/grooves/JazzWaltzMainB.musicxml index 83f9a9c2..de30f8f5 100644 --- a/test/data/grooves/JazzWaltzMainB.musicxml +++ b/test/data/grooves/JazzWaltzMainB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JazzWaltzSus.musicxml b/test/data/grooves/JazzWaltzSus.musicxml index 44d8b6bc..906872a4 100644 --- a/test/data/grooves/JazzWaltzSus.musicxml +++ b/test/data/grooves/JazzWaltzSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Jive.musicxml b/test/data/grooves/Jive.musicxml index b252eff6..774cb0fc 100644 --- a/test/data/grooves/Jive.musicxml +++ b/test/data/grooves/Jive.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Jive1.musicxml b/test/data/grooves/Jive1.musicxml index 1d359c3d..c76200f5 100644 --- a/test/data/grooves/Jive1.musicxml +++ b/test/data/grooves/Jive1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Jive1Clap.musicxml b/test/data/grooves/Jive1Clap.musicxml index 6ea9b23f..38c27bac 100644 --- a/test/data/grooves/Jive1Clap.musicxml +++ b/test/data/grooves/Jive1Clap.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Jive1ClapSus.musicxml b/test/data/grooves/Jive1ClapSus.musicxml index f963cf91..6767b89f 100644 --- a/test/data/grooves/Jive1ClapSus.musicxml +++ b/test/data/grooves/Jive1ClapSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Jive1Plus.musicxml b/test/data/grooves/Jive1Plus.musicxml index 5e6d571c..c2ef80b0 100644 --- a/test/data/grooves/Jive1Plus.musicxml +++ b/test/data/grooves/Jive1Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Jive1Sus.musicxml b/test/data/grooves/Jive1Sus.musicxml index e3d726bd..84fa94be 100644 --- a/test/data/grooves/Jive1Sus.musicxml +++ b/test/data/grooves/Jive1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Jive1SusPlus.musicxml b/test/data/grooves/Jive1SusPlus.musicxml index 7f0b6bfc..b492b0ba 100644 --- a/test/data/grooves/Jive1SusPlus.musicxml +++ b/test/data/grooves/Jive1SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JiveClap.musicxml b/test/data/grooves/JiveClap.musicxml index 293d8800..f7e48402 100644 --- a/test/data/grooves/JiveClap.musicxml +++ b/test/data/grooves/JiveClap.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JiveClapSus.musicxml b/test/data/grooves/JiveClapSus.musicxml index e0012d33..ff16cab8 100644 --- a/test/data/grooves/JiveClapSus.musicxml +++ b/test/data/grooves/JiveClapSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JiveEnd.musicxml b/test/data/grooves/JiveEnd.musicxml index 1f748c96..dc34f3ab 100644 --- a/test/data/grooves/JiveEnd.musicxml +++ b/test/data/grooves/JiveEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JiveIntro.musicxml b/test/data/grooves/JiveIntro.musicxml index 74204bf8..1372fe41 100644 --- a/test/data/grooves/JiveIntro.musicxml +++ b/test/data/grooves/JiveIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -210,25 +210,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -253,25 +253,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -298,25 +298,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -341,25 +341,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -386,25 +386,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -429,25 +429,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -470,15 +470,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/JiveIntro2.musicxml b/test/data/grooves/JiveIntro2.musicxml index bf290a19..e9ad33e6 100644 --- a/test/data/grooves/JiveIntro2.musicxml +++ b/test/data/grooves/JiveIntro2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -210,25 +210,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -253,25 +253,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -298,25 +298,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -341,25 +341,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -386,25 +386,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -429,25 +429,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -470,15 +470,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/JiveIntro8.musicxml b/test/data/grooves/JiveIntro8.musicxml index 017b8a49..cd954bce 100644 --- a/test/data/grooves/JiveIntro8.musicxml +++ b/test/data/grooves/JiveIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -210,25 +210,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -253,25 +253,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -298,25 +298,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -341,25 +341,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -386,25 +386,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -429,25 +429,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -474,25 +474,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -517,25 +517,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -562,25 +562,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -605,25 +605,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -650,25 +650,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -693,25 +693,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -738,25 +738,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -781,25 +781,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -822,15 +822,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/JivePlus.musicxml b/test/data/grooves/JivePlus.musicxml index 2a4093e8..f266d33b 100644 --- a/test/data/grooves/JivePlus.musicxml +++ b/test/data/grooves/JivePlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JiveSus.musicxml b/test/data/grooves/JiveSus.musicxml index aa8e63d3..ef81998b 100644 --- a/test/data/grooves/JiveSus.musicxml +++ b/test/data/grooves/JiveSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/JiveSusPlus.musicxml b/test/data/grooves/JiveSusPlus.musicxml index efe9bfee..30df860a 100644 --- a/test/data/grooves/JiveSusPlus.musicxml +++ b/test/data/grooves/JiveSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Kfunk1A.musicxml b/test/data/grooves/Kfunk1A.musicxml index 597cf67b..ef354172 100644 --- a/test/data/grooves/Kfunk1A.musicxml +++ b/test/data/grooves/Kfunk1A.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -514,22 +514,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -537,10 +540,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -548,10 +556,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -793,22 +807,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -816,10 +833,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -827,10 +849,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/Kfunk1B.musicxml b/test/data/grooves/Kfunk1B.musicxml index 0b3db0a6..91881861 100644 --- a/test/data/grooves/Kfunk1B.musicxml +++ b/test/data/grooves/Kfunk1B.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Kfunk1EndingA.musicxml b/test/data/grooves/Kfunk1EndingA.musicxml index e574a4e5..130c8ea8 100644 --- a/test/data/grooves/Kfunk1EndingA.musicxml +++ b/test/data/grooves/Kfunk1EndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -756,22 +756,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -779,10 +782,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -790,10 +798,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1290,22 +1304,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1313,10 +1330,15 @@ A 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1327,13 +1349,19 @@ G 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/Kfunk1FillAA.musicxml b/test/data/grooves/Kfunk1FillAA.musicxml index 8ff501c4..e5ac0592 100644 --- a/test/data/grooves/Kfunk1FillAA.musicxml +++ b/test/data/grooves/Kfunk1FillAA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Kfunk1FillAB.musicxml b/test/data/grooves/Kfunk1FillAB.musicxml index 544670a6..cdf5aba8 100644 --- a/test/data/grooves/Kfunk1FillAB.musicxml +++ b/test/data/grooves/Kfunk1FillAB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Kfunk1FillBA.musicxml b/test/data/grooves/Kfunk1FillBA.musicxml index ae1a5063..4db64e1e 100644 --- a/test/data/grooves/Kfunk1FillBA.musicxml +++ b/test/data/grooves/Kfunk1FillBA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -507,6 +507,7 @@ + G 4 @@ -521,6 +522,14 @@ + + + 192 + 1 + 16th + + + 3072 diff --git a/test/data/grooves/Kfunk1FillBB.musicxml b/test/data/grooves/Kfunk1FillBB.musicxml index 331da89a..081ce3fe 100644 --- a/test/data/grooves/Kfunk1FillBB.musicxml +++ b/test/data/grooves/Kfunk1FillBB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Kfunk1IntroA.musicxml b/test/data/grooves/Kfunk1IntroA.musicxml index a5fb5f66..4a680fcc 100644 --- a/test/data/grooves/Kfunk1IntroA.musicxml +++ b/test/data/grooves/Kfunk1IntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -251,50 +251,6 @@ - - - 384 - - 1 - eighth - - - - - - - 96 - - - 1 - 32nd - - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - D @@ -360,6 +316,7 @@ + D 4 @@ -374,6 +331,20 @@ + + D + 4 + + 192 + + 1 + 16th + up + normal + + + + D 4 @@ -389,7 +360,7 @@ - + D 4 @@ -407,7 +378,7 @@ - + D 4 @@ -473,7 +444,7 @@ - + D 4 @@ -489,7 +460,7 @@ - + D 4 @@ -507,7 +478,7 @@ - + D 4 @@ -523,33 +494,33 @@ - + D 4 - 48 + 192 1 - 64th + 16th up normal - + D 4 - 12 + 48 1 - 256th + 64th up normal @@ -557,19 +528,21 @@ - + D 4 - 3 + 12 + 1 - 1024th + 256th up normal + @@ -578,13 +551,15 @@ D 4 - 192 + 3 + 1 - 16th + 1024th up normal + @@ -1162,22 +1137,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1185,10 +1163,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -1196,10 +1179,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1441,22 +1430,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1464,10 +1456,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -1475,10 +1472,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/LATN01.musicxml b/test/data/grooves/LATN01.musicxml index 94671a91..2de72afc 100644 --- a/test/data/grooves/LATN01.musicxml +++ b/test/data/grooves/LATN01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -444,102 +444,28 @@ E 4 - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - E - 4 - - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -547,23 +473,32 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + @@ -714,34 +649,25 @@ - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - + 128 1 - 512th - - + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -749,33 +675,61 @@ E 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up normal - - + + + 128 + 1 + 16th + + 3 + 2 + 16th + + + + + + E 4 - 12 - - + 256 1 - 256th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -783,75 +737,96 @@ E 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + eighth + up normal - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + - + + + E 4 - 192 - + 256 1 - 16th + eighth + + 3 + 2 + eighth + up normal - + + + 3 + eighth + + + 2 + eighth + + - + E 4 - 48 - - + 256 1 - 64th + eighth + + 3 + 2 + eighth + up normal - - - - - E - 4 - - 12 - - - + + + 256 1 - 256th - up - normal + eighth + + 3 + 2 + eighth + - - + @@ -859,15 +834,28 @@ E 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + eighth + up normal - + + + 3 + eighth + + + 2 + eighth + + @@ -875,34 +863,61 @@ E 4 - 288 - + 256 1 - 16th - + eighth + + 3 + 2 + eighth + up normal - - + + + 256 + 1 + eighth + + 3 + 2 + eighth + + + + + + E 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -910,533 +925,94 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + - - - + E 4 - 192 - + 256 1 - 16th + eighth + + 3 + 2 + eighth + up normal - + + + 3 + eighth + + + 2 + eighth + + - + E 4 - 48 - - + 256 1 - 64th + eighth + + 3 + 2 + eighth + up normal - - - - - E - 4 - - 12 - - - + + + 256 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 192 - 1 - 16th - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 192 - 1 - 16th - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 192 - 1 - 16th - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 192 - 1 - 16th + eighth + + 3 + 2 + eighth + + diff --git a/test/data/grooves/LATN02.musicxml b/test/data/grooves/LATN02.musicxml index fc7013b8..48fdbbd4 100644 --- a/test/data/grooves/LATN02.musicxml +++ b/test/data/grooves/LATN02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LATN03.musicxml b/test/data/grooves/LATN03.musicxml index e27a1079..492228dc 100644 --- a/test/data/grooves/LATN03.musicxml +++ b/test/data/grooves/LATN03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LATN04.musicxml b/test/data/grooves/LATN04.musicxml index 8eef2920..c5ee2cb4 100644 --- a/test/data/grooves/LATN04.musicxml +++ b/test/data/grooves/LATN04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LATN05.musicxml b/test/data/grooves/LATN05.musicxml index 3f4ded29..c3e6556a 100644 --- a/test/data/grooves/LATN05.musicxml +++ b/test/data/grooves/LATN05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -276,102 +276,28 @@ E 4 - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - E - 4 - - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -379,23 +305,32 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + @@ -482,102 +417,28 @@ E 4 - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - E - 4 - - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -585,23 +446,32 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + diff --git a/test/data/grooves/LATN06.musicxml b/test/data/grooves/LATN06.musicxml index faca67ed..a0208c9d 100644 --- a/test/data/grooves/LATN06.musicxml +++ b/test/data/grooves/LATN06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LATN07.musicxml b/test/data/grooves/LATN07.musicxml index f13b2518..256b9929 100644 --- a/test/data/grooves/LATN07.musicxml +++ b/test/data/grooves/LATN07.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LATN08.musicxml b/test/data/grooves/LATN08.musicxml index 9d3ba107..61c2b50a 100644 --- a/test/data/grooves/LATN08.musicxml +++ b/test/data/grooves/LATN08.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -341,102 +341,28 @@ F 5 - 192 - - - 1 - 16th - up - x - - - - - - - F - 5 - - 48 - - - - 1 - 64th - up - x - - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - - - 1 - 1024th - up - x - - - - - - - F - 5 - - 288 - - - 1 - 16th - - up - x - - - - - - - F - 5 - - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -444,23 +370,32 @@ F 5 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up x - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + @@ -681,102 +616,28 @@ F 5 - 192 - - - 1 - 16th - up - x - - - - - - - F - 5 - - 48 - - - - 1 - 64th - up - x - - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - - - 1 - 1024th - up - x - - - - - - - F - 5 - - 288 - - - 1 - 16th - - up - x - - - - - - - F - 5 - - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -784,23 +645,32 @@ F 5 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up x - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + @@ -1023,22 +893,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1046,10 +919,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1060,13 +938,19 @@ F 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + @@ -1248,22 +1132,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1271,10 +1158,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1285,13 +1177,19 @@ F 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/LATN09.musicxml b/test/data/grooves/LATN09.musicxml index 8509775b..39c0b082 100644 --- a/test/data/grooves/LATN09.musicxml +++ b/test/data/grooves/LATN09.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LATN10.musicxml b/test/data/grooves/LATN10.musicxml index f2402942..e0a5923f 100644 --- a/test/data/grooves/LATN10.musicxml +++ b/test/data/grooves/LATN10.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -620,6 +620,7 @@ + F 4 @@ -638,117 +639,28 @@ F 4 - 48 - - - 1 - 64th - up - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - F - 4 - - 3 - + 768 1 - 1024th + quarter up normal - - - - - - F - 4 - - 384 - - - 1 - eighth - up - x - - + F 4 - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 4 - - 6 - + 768 1 - 512th + quarter up x - diff --git a/test/data/grooves/LATN11.musicxml b/test/data/grooves/LATN11.musicxml index f8b50e6b..497ece1f 100644 --- a/test/data/grooves/LATN11.musicxml +++ b/test/data/grooves/LATN11.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LATN12.musicxml b/test/data/grooves/LATN12.musicxml index 2e12d8fa..b9fc5f77 100644 --- a/test/data/grooves/LATN12.musicxml +++ b/test/data/grooves/LATN12.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LFusion.musicxml b/test/data/grooves/LFusion.musicxml index 8c03decb..ba4c8c59 100644 --- a/test/data/grooves/LFusion.musicxml +++ b/test/data/grooves/LFusion.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LFusion1.musicxml b/test/data/grooves/LFusion1.musicxml index bd005d1b..eceda765 100644 --- a/test/data/grooves/LFusion1.musicxml +++ b/test/data/grooves/LFusion1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LFusion1Sus.musicxml b/test/data/grooves/LFusion1Sus.musicxml index 27af330f..731ffeff 100644 --- a/test/data/grooves/LFusion1Sus.musicxml +++ b/test/data/grooves/LFusion1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LFusionEnd.musicxml b/test/data/grooves/LFusionEnd.musicxml index 8f1ba2bc..243d6837 100644 --- a/test/data/grooves/LFusionEnd.musicxml +++ b/test/data/grooves/LFusionEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -684,15 +684,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x @@ -780,15 +780,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x @@ -876,15 +876,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x @@ -972,15 +972,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/LFusionIntro.musicxml b/test/data/grooves/LFusionIntro.musicxml index a3364235..3a81e544 100644 --- a/test/data/grooves/LFusionIntro.musicxml +++ b/test/data/grooves/LFusionIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -684,15 +684,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x @@ -780,15 +780,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x @@ -876,15 +876,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x @@ -972,15 +972,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/LFusionIntroSus.musicxml b/test/data/grooves/LFusionIntroSus.musicxml index 4f14b8f4..bcb64fb3 100644 --- a/test/data/grooves/LFusionIntroSus.musicxml +++ b/test/data/grooves/LFusionIntroSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -684,15 +684,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x @@ -780,15 +780,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x @@ -876,15 +876,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x @@ -972,15 +972,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/LFusionSus.musicxml b/test/data/grooves/LFusionSus.musicxml index 292a9e84..ea81e0df 100644 --- a/test/data/grooves/LFusionSus.musicxml +++ b/test/data/grooves/LFusionSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LatinFusion.musicxml b/test/data/grooves/LatinFusion.musicxml index 25899da4..00d9e6bd 100644 --- a/test/data/grooves/LatinFusion.musicxml +++ b/test/data/grooves/LatinFusion.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -4960,10 +4960,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -4972,7 +4972,6 @@ down normal - @@ -4980,13 +4979,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + down normal + @@ -5023,10 +5028,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -5035,7 +5040,6 @@ down normal - @@ -5043,13 +5047,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + down normal + @@ -5088,10 +5098,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -5100,7 +5110,6 @@ down normal - @@ -5108,13 +5117,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + down normal + @@ -5151,10 +5166,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -5163,7 +5178,6 @@ down normal - @@ -5171,13 +5185,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + down normal + @@ -5216,10 +5236,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -5228,7 +5248,6 @@ down normal - @@ -5236,13 +5255,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + down normal + @@ -5279,10 +5304,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -5291,7 +5316,6 @@ down normal - @@ -5299,13 +5323,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + down normal + @@ -5344,10 +5374,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -5356,7 +5386,6 @@ down normal - @@ -5364,13 +5393,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + down normal + @@ -5407,10 +5442,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -5419,7 +5454,6 @@ down normal - @@ -5427,13 +5461,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + down normal + diff --git a/test/data/grooves/LatinFusionIntro.musicxml b/test/data/grooves/LatinFusionIntro.musicxml index b8bc7b2a..b0fc83bd 100644 --- a/test/data/grooves/LatinFusionIntro.musicxml +++ b/test/data/grooves/LatinFusionIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -3527,10 +3527,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -3539,7 +3539,6 @@ down normal - @@ -3547,13 +3546,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + down normal + @@ -3590,10 +3595,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -3602,7 +3607,6 @@ down normal - @@ -3610,13 +3614,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + down normal + @@ -3655,10 +3665,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -3667,7 +3677,6 @@ down normal - @@ -3675,13 +3684,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + down normal + @@ -3718,10 +3733,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -3730,7 +3745,6 @@ down normal - @@ -3738,13 +3752,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + down normal + diff --git a/test/data/grooves/LatinHouse.musicxml b/test/data/grooves/LatinHouse.musicxml index 6b0c5a53..bcc399c5 100644 --- a/test/data/grooves/LatinHouse.musicxml +++ b/test/data/grooves/LatinHouse.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LatinHouseEnd.musicxml b/test/data/grooves/LatinHouseEnd.musicxml index 04ac2e36..c2b9b580 100644 --- a/test/data/grooves/LatinHouseEnd.musicxml +++ b/test/data/grooves/LatinHouseEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -501,15 +501,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/LatinHouseIntro.musicxml b/test/data/grooves/LatinHouseIntro.musicxml index ee45363f..1bd6b74a 100644 --- a/test/data/grooves/LatinHouseIntro.musicxml +++ b/test/data/grooves/LatinHouseIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -880,99 +880,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -1022,99 +951,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -1164,99 +1022,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -1306,99 +1093,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - diff --git a/test/data/grooves/LatinWaltz.musicxml b/test/data/grooves/LatinWaltz.musicxml index 8d77ca9f..8e6675fc 100644 --- a/test/data/grooves/LatinWaltz.musicxml +++ b/test/data/grooves/LatinWaltz.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LatinWaltzEnd.musicxml b/test/data/grooves/LatinWaltzEnd.musicxml index 5e1e6732..2ef9432a 100644 --- a/test/data/grooves/LatinWaltzEnd.musicxml +++ b/test/data/grooves/LatinWaltzEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LatinWaltzFill.musicxml b/test/data/grooves/LatinWaltzFill.musicxml index 648dee5d..a463b476 100644 --- a/test/data/grooves/LatinWaltzFill.musicxml +++ b/test/data/grooves/LatinWaltzFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LatinWaltzIntro.musicxml b/test/data/grooves/LatinWaltzIntro.musicxml index 36155896..6457159f 100644 --- a/test/data/grooves/LatinWaltzIntro.musicxml +++ b/test/data/grooves/LatinWaltzIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LatinWaltzIntro8.musicxml b/test/data/grooves/LatinWaltzIntro8.musicxml index e59d6099..7137c2d3 100644 --- a/test/data/grooves/LatinWaltzIntro8.musicxml +++ b/test/data/grooves/LatinWaltzIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LatinWaltzPlus.musicxml b/test/data/grooves/LatinWaltzPlus.musicxml index 36494958..fd3465aa 100644 --- a/test/data/grooves/LatinWaltzPlus.musicxml +++ b/test/data/grooves/LatinWaltzPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LatinWaltzSus.musicxml b/test/data/grooves/LatinWaltzSus.musicxml index 505288c6..9d7b8b20 100644 --- a/test/data/grooves/LatinWaltzSus.musicxml +++ b/test/data/grooves/LatinWaltzSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LatinWaltzSusPlus.musicxml b/test/data/grooves/LatinWaltzSusPlus.musicxml index b6200da1..96948a0b 100644 --- a/test/data/grooves/LatinWaltzSusPlus.musicxml +++ b/test/data/grooves/LatinWaltzSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Lfusion1End.musicxml b/test/data/grooves/Lfusion1End.musicxml index 36b13743..4bea3262 100644 --- a/test/data/grooves/Lfusion1End.musicxml +++ b/test/data/grooves/Lfusion1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -684,15 +684,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x @@ -780,15 +780,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x @@ -876,15 +876,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x @@ -972,15 +972,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/LightTango.musicxml b/test/data/grooves/LightTango.musicxml index fdb9aeba..abf69085 100644 --- a/test/data/grooves/LightTango.musicxml +++ b/test/data/grooves/LightTango.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LightTango1.musicxml b/test/data/grooves/LightTango1.musicxml index d276fb9b..bcb6a71a 100644 --- a/test/data/grooves/LightTango1.musicxml +++ b/test/data/grooves/LightTango1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LightTango1Sus.musicxml b/test/data/grooves/LightTango1Sus.musicxml index 48e49007..f3f85d30 100644 --- a/test/data/grooves/LightTango1Sus.musicxml +++ b/test/data/grooves/LightTango1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LightTango4End.musicxml b/test/data/grooves/LightTango4End.musicxml index 9adb1a9f..c3921929 100644 --- a/test/data/grooves/LightTango4End.musicxml +++ b/test/data/grooves/LightTango4End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LightTangoEnd.musicxml b/test/data/grooves/LightTangoEnd.musicxml index 4b338239..9dc87c70 100644 --- a/test/data/grooves/LightTangoEnd.musicxml +++ b/test/data/grooves/LightTangoEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LightTangoFill.musicxml b/test/data/grooves/LightTangoFill.musicxml index 30cea27d..54b00620 100644 --- a/test/data/grooves/LightTangoFill.musicxml +++ b/test/data/grooves/LightTangoFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LightTangoIntro.musicxml b/test/data/grooves/LightTangoIntro.musicxml index aa26d8a7..390b634f 100644 --- a/test/data/grooves/LightTangoIntro.musicxml +++ b/test/data/grooves/LightTangoIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LightTangoIntro1.musicxml b/test/data/grooves/LightTangoIntro1.musicxml index 3b2d4372..ccda90c1 100644 --- a/test/data/grooves/LightTangoIntro1.musicxml +++ b/test/data/grooves/LightTangoIntro1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/LightTangoSus.musicxml b/test/data/grooves/LightTangoSus.musicxml index 6ef46cf8..2caa5a54 100644 --- a/test/data/grooves/LightTangoSus.musicxml +++ b/test/data/grooves/LightTangoSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MTL01.musicxml b/test/data/grooves/MTL01.musicxml index 2e59546c..72a565a7 100644 --- a/test/data/grooves/MTL01.musicxml +++ b/test/data/grooves/MTL01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -586,83 +586,28 @@ F 5 - 192 - - - 1 - 16th - up - x - - - - - - - F - 5 - - 48 - - + 256 1 - 64th - up - x - - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - - - 1 - 1024th + eighth + + 3 + 2 + eighth + up x - - - - - - F - 5 - - 96 - - - 1 - 32nd - up - diamond - - + + + 3 + eighth + + + 2 + eighth + + @@ -670,33 +615,18 @@ F 5 - 24 - - + 256 1 - 128th - up - diamond - - - - - - - - F - 5 - - 6 - - - 1 - 512th + eighth + + 3 + 2 + eighth + up diamond - @@ -704,13 +634,19 @@ F 5 - 384 + 256 1 eighth + + 3 + 2 + eighth + up x + @@ -1148,80 +1084,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - + 256 1 - 128th - down - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -1229,15 +1110,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -1245,13 +1129,19 @@ F 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + down normal + diff --git a/test/data/grooves/MTL02.musicxml b/test/data/grooves/MTL02.musicxml index 695bbd95..2f9e3ef1 100644 --- a/test/data/grooves/MTL02.musicxml +++ b/test/data/grooves/MTL02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MTL03.musicxml b/test/data/grooves/MTL03.musicxml index 257cb6a6..574e6bcb 100644 --- a/test/data/grooves/MTL03.musicxml +++ b/test/data/grooves/MTL03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MTL04.musicxml b/test/data/grooves/MTL04.musicxml index 568d23eb..60cd7256 100644 --- a/test/data/grooves/MTL04.musicxml +++ b/test/data/grooves/MTL04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -329,6 +329,7 @@ + F 5 @@ -343,6 +344,14 @@ + + + 192 + 1 + 16th + + + F @@ -451,25 +460,25 @@ F 5 - 192 + 768 1 - 16th + quarter up x + A 5 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/Mambo.musicxml b/test/data/grooves/Mambo.musicxml index 6e9b44bf..9670c22d 100644 --- a/test/data/grooves/Mambo.musicxml +++ b/test/data/grooves/Mambo.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Mambo1.musicxml b/test/data/grooves/Mambo1.musicxml index cd8f8304..dd01a8c0 100644 --- a/test/data/grooves/Mambo1.musicxml +++ b/test/data/grooves/Mambo1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Mambo1Sus.musicxml b/test/data/grooves/Mambo1Sus.musicxml index cad081b5..98d08e50 100644 --- a/test/data/grooves/Mambo1Sus.musicxml +++ b/test/data/grooves/Mambo1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Mambo2.musicxml b/test/data/grooves/Mambo2.musicxml index 94268ea6..381e43d3 100644 --- a/test/data/grooves/Mambo2.musicxml +++ b/test/data/grooves/Mambo2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Mambo2Sus.musicxml b/test/data/grooves/Mambo2Sus.musicxml index 7312266f..b12ff660 100644 --- a/test/data/grooves/Mambo2Sus.musicxml +++ b/test/data/grooves/Mambo2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Mambo3.musicxml b/test/data/grooves/Mambo3.musicxml index 96f20d98..cfa70d4f 100644 --- a/test/data/grooves/Mambo3.musicxml +++ b/test/data/grooves/Mambo3.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Mambo3Sus.musicxml b/test/data/grooves/Mambo3Sus.musicxml index d5f4b34f..532209ae 100644 --- a/test/data/grooves/Mambo3Sus.musicxml +++ b/test/data/grooves/Mambo3Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MamboBreakAA.musicxml b/test/data/grooves/MamboBreakAA.musicxml index f04d7a68..56ba2be3 100644 --- a/test/data/grooves/MamboBreakAA.musicxml +++ b/test/data/grooves/MamboBreakAA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -320,22 +320,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -343,10 +346,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -357,13 +365,19 @@ F 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + @@ -414,50 +428,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - F diff --git a/test/data/grooves/MamboBreakBB.musicxml b/test/data/grooves/MamboBreakBB.musicxml index c2169126..1255135b 100644 --- a/test/data/grooves/MamboBreakBB.musicxml +++ b/test/data/grooves/MamboBreakBB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -424,22 +424,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -447,10 +450,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -461,13 +469,19 @@ F 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + @@ -561,30 +575,31 @@ + F 4 - 768 + 192 1 - quarter + 16th up normal - - 3072 - 768 - 2 + 1 quarter + + 3072 + 768 @@ -593,102 +608,41 @@ - - - F - 4 - - 384 - - 2 - eighth - up - normal - - - - - - 96 - - 2 - 32nd - - - - - - - 24 - - - 2 - 128th - - - - - - 6 - - 2 - 512th - - - - - - - F - 4 - - 192 - - - 2 - 16th - up - normal - - - - - - - F - 4 - - 48 - - - + 768 2 - 64th - up - normal + quarter - - - + F 4 - 12 - - + 512 2 - 256th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -696,15 +650,18 @@ F 4 - 3 - + 512 2 - 1024th + quarter + + 3 + 2 + quarter + up normal - @@ -712,13 +669,19 @@ F 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + @@ -1124,10 +1087,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1136,15 +1099,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/MamboEnd.musicxml b/test/data/grooves/MamboEnd.musicxml index 6a21978b..b45e2a92 100644 --- a/test/data/grooves/MamboEnd.musicxml +++ b/test/data/grooves/MamboEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MamboEndingA.musicxml b/test/data/grooves/MamboEndingA.musicxml index 09f93410..aaa16501 100644 --- a/test/data/grooves/MamboEndingA.musicxml +++ b/test/data/grooves/MamboEndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MamboEndingB.musicxml b/test/data/grooves/MamboEndingB.musicxml index 919de968..afdc3eff 100644 --- a/test/data/grooves/MamboEndingB.musicxml +++ b/test/data/grooves/MamboEndingB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -320,22 +320,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -343,10 +346,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -357,13 +365,19 @@ F 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/MamboFillAA.musicxml b/test/data/grooves/MamboFillAA.musicxml index c0128e88..a1f0c722 100644 --- a/test/data/grooves/MamboFillAA.musicxml +++ b/test/data/grooves/MamboFillAA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -320,22 +320,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -343,10 +346,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -357,13 +365,19 @@ F 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/MamboFillAB.musicxml b/test/data/grooves/MamboFillAB.musicxml index a2fafe85..667cd579 100644 --- a/test/data/grooves/MamboFillAB.musicxml +++ b/test/data/grooves/MamboFillAB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MamboFillBA.musicxml b/test/data/grooves/MamboFillBA.musicxml index a5a0c67b..e30aa958 100644 --- a/test/data/grooves/MamboFillBA.musicxml +++ b/test/data/grooves/MamboFillBA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MamboFillBB.musicxml b/test/data/grooves/MamboFillBB.musicxml index cb2d7702..1f4bc6a5 100644 --- a/test/data/grooves/MamboFillBB.musicxml +++ b/test/data/grooves/MamboFillBB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -332,22 +332,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -355,10 +358,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -369,13 +377,19 @@ F 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/MamboIntro.musicxml b/test/data/grooves/MamboIntro.musicxml index 84fd7558..a88c7bb7 100644 --- a/test/data/grooves/MamboIntro.musicxml +++ b/test/data/grooves/MamboIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MamboIntroA.musicxml b/test/data/grooves/MamboIntroA.musicxml index e353783d..c05ad061 100644 --- a/test/data/grooves/MamboIntroA.musicxml +++ b/test/data/grooves/MamboIntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -154,22 +154,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -177,10 +180,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -188,10 +196,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -303,22 +317,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -326,10 +343,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -337,10 +359,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/MamboIntroB.musicxml b/test/data/grooves/MamboIntroB.musicxml index 47fb1dcf..76cc6694 100644 --- a/test/data/grooves/MamboIntroB.musicxml +++ b/test/data/grooves/MamboIntroB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MamboMainA.musicxml b/test/data/grooves/MamboMainA.musicxml index 9f568d49..c33eef26 100644 --- a/test/data/grooves/MamboMainA.musicxml +++ b/test/data/grooves/MamboMainA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -320,22 +320,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -343,10 +346,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -357,13 +365,19 @@ F 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + @@ -505,22 +519,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -528,10 +545,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -542,13 +564,19 @@ F 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + @@ -690,22 +718,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -713,10 +744,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -727,13 +763,19 @@ F 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + @@ -875,22 +917,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -898,10 +943,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -912,13 +962,19 @@ F 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/MamboMainB.musicxml b/test/data/grooves/MamboMainB.musicxml index d4a2c5f6..50bd981e 100644 --- a/test/data/grooves/MamboMainB.musicxml +++ b/test/data/grooves/MamboMainB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -332,22 +332,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -355,10 +358,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -369,13 +377,19 @@ F 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + @@ -517,22 +531,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -540,10 +557,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -554,13 +576,19 @@ F 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + @@ -702,22 +730,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -725,10 +756,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -739,13 +775,19 @@ F 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + @@ -887,22 +929,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -910,10 +955,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -924,13 +974,19 @@ F 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/MamboSus.musicxml b/test/data/grooves/MamboSus.musicxml index d68a8282..a66d109d 100644 --- a/test/data/grooves/MamboSus.musicxml +++ b/test/data/grooves/MamboSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Maqsum.musicxml b/test/data/grooves/Maqsum.musicxml index 9023240a..3eb14fb9 100644 --- a/test/data/grooves/Maqsum.musicxml +++ b/test/data/grooves/Maqsum.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/March.musicxml b/test/data/grooves/March.musicxml index 53921797..346155a0 100644 --- a/test/data/grooves/March.musicxml +++ b/test/data/grooves/March.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/March1.musicxml b/test/data/grooves/March1.musicxml index 5f0b6f82..9056dd76 100644 --- a/test/data/grooves/March1.musicxml +++ b/test/data/grooves/March1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/March1End.musicxml b/test/data/grooves/March1End.musicxml index bdfd7a94..6c0a52fd 100644 --- a/test/data/grooves/March1End.musicxml +++ b/test/data/grooves/March1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/March1Intro.musicxml b/test/data/grooves/March1Intro.musicxml index f6b90855..8417b76f 100644 --- a/test/data/grooves/March1Intro.musicxml +++ b/test/data/grooves/March1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/March1Slow.musicxml b/test/data/grooves/March1Slow.musicxml index a7574a68..30f46b17 100644 --- a/test/data/grooves/March1Slow.musicxml +++ b/test/data/grooves/March1Slow.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/March2.musicxml b/test/data/grooves/March2.musicxml index 8d0ebf79..6c2632c9 100644 --- a/test/data/grooves/March2.musicxml +++ b/test/data/grooves/March2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/March3.musicxml b/test/data/grooves/March3.musicxml index e8371e46..4ab63ae7 100644 --- a/test/data/grooves/March3.musicxml +++ b/test/data/grooves/March3.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/March4.musicxml b/test/data/grooves/March4.musicxml index 21c710cc..9ee69d0f 100644 --- a/test/data/grooves/March4.musicxml +++ b/test/data/grooves/March4.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MarchEnd.musicxml b/test/data/grooves/MarchEnd.musicxml index 8dc1cba1..54a9895f 100644 --- a/test/data/grooves/MarchEnd.musicxml +++ b/test/data/grooves/MarchEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MellowJazz.musicxml b/test/data/grooves/MellowJazz.musicxml index b0d640b1..07c9460e 100644 --- a/test/data/grooves/MellowJazz.musicxml +++ b/test/data/grooves/MellowJazz.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MellowJazzEnd.musicxml b/test/data/grooves/MellowJazzEnd.musicxml index 372d0a8e..025ab894 100644 --- a/test/data/grooves/MellowJazzEnd.musicxml +++ b/test/data/grooves/MellowJazzEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MellowJazzFill.musicxml b/test/data/grooves/MellowJazzFill.musicxml index 9f9cfea2..90ffd6f5 100644 --- a/test/data/grooves/MellowJazzFill.musicxml +++ b/test/data/grooves/MellowJazzFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MellowJazzIntro.musicxml b/test/data/grooves/MellowJazzIntro.musicxml index a20c2b1a..8dde302d 100644 --- a/test/data/grooves/MellowJazzIntro.musicxml +++ b/test/data/grooves/MellowJazzIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MellowJazzPlus.musicxml b/test/data/grooves/MellowJazzPlus.musicxml index a47b0509..c16d31e8 100644 --- a/test/data/grooves/MellowJazzPlus.musicxml +++ b/test/data/grooves/MellowJazzPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MellowJazzSus.musicxml b/test/data/grooves/MellowJazzSus.musicxml index 0246558b..ea628798 100644 --- a/test/data/grooves/MellowJazzSus.musicxml +++ b/test/data/grooves/MellowJazzSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MellowJazzSusPlus.musicxml b/test/data/grooves/MellowJazzSusPlus.musicxml index 1dd10125..ef6b5765 100644 --- a/test/data/grooves/MellowJazzSusPlus.musicxml +++ b/test/data/grooves/MellowJazzSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MellowRB.musicxml b/test/data/grooves/MellowRB.musicxml index 137dd9fa..3ee63048 100644 --- a/test/data/grooves/MellowRB.musicxml +++ b/test/data/grooves/MellowRB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -890,62 +890,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - F - 4 - - 384 - - + 256 2 eighth - up - normal - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -953,51 +916,19 @@ F 4 - 96 - - + 512 2 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 2 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 2 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -1044,62 +975,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - F - 4 - - 384 - - + 256 2 eighth - up - normal - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1107,51 +1001,19 @@ F 4 - 96 - - + 512 2 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 2 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 2 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -1561,62 +1423,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - up - normal - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1624,51 +1449,19 @@ F 4 - 96 - - + 512 1 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -1715,62 +1508,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - up - normal - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1778,51 +1534,19 @@ F 4 - 96 - - + 512 1 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/MellowRBEnd.musicxml b/test/data/grooves/MellowRBEnd.musicxml index e4d35d65..7c565d16 100644 --- a/test/data/grooves/MellowRBEnd.musicxml +++ b/test/data/grooves/MellowRBEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MellowRBIntro.musicxml b/test/data/grooves/MellowRBIntro.musicxml index 39eaff94..7a1d3622 100644 --- a/test/data/grooves/MellowRBIntro.musicxml +++ b/test/data/grooves/MellowRBIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -980,62 +980,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - F - 4 - - 384 - - + 256 2 eighth - up - normal - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1043,51 +1006,19 @@ F 4 - 96 - - + 512 2 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 2 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 2 - 512th + quarter + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/Merengue.musicxml b/test/data/grooves/Merengue.musicxml index 4a669652..fb5b3fa3 100644 --- a/test/data/grooves/Merengue.musicxml +++ b/test/data/grooves/Merengue.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Merengue1.musicxml b/test/data/grooves/Merengue1.musicxml index 3977715d..8b3b257e 100644 --- a/test/data/grooves/Merengue1.musicxml +++ b/test/data/grooves/Merengue1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Merengue1Sus.musicxml b/test/data/grooves/Merengue1Sus.musicxml index ea1d6061..ac29b269 100644 --- a/test/data/grooves/Merengue1Sus.musicxml +++ b/test/data/grooves/Merengue1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Merengue2.musicxml b/test/data/grooves/Merengue2.musicxml index 118df04b..0387c9ff 100644 --- a/test/data/grooves/Merengue2.musicxml +++ b/test/data/grooves/Merengue2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Merengue2Sus.musicxml b/test/data/grooves/Merengue2Sus.musicxml index 28473b37..d8e2edc0 100644 --- a/test/data/grooves/Merengue2Sus.musicxml +++ b/test/data/grooves/Merengue2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MerengueEnd.musicxml b/test/data/grooves/MerengueEnd.musicxml index e83f852b..cbceffea 100644 --- a/test/data/grooves/MerengueEnd.musicxml +++ b/test/data/grooves/MerengueEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MerengueIntro.musicxml b/test/data/grooves/MerengueIntro.musicxml index 5d24e7f4..9ae9f0fd 100644 --- a/test/data/grooves/MerengueIntro.musicxml +++ b/test/data/grooves/MerengueIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MerengueSus.musicxml b/test/data/grooves/MerengueSus.musicxml index bea846ad..8173ab3d 100644 --- a/test/data/grooves/MerengueSus.musicxml +++ b/test/data/grooves/MerengueSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Metronome2-4.musicxml b/test/data/grooves/Metronome2-4.musicxml index 4ccf8698..2c8eaff3 100644 --- a/test/data/grooves/Metronome2-4.musicxml +++ b/test/data/grooves/Metronome2-4.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Metronome2.musicxml b/test/data/grooves/Metronome2.musicxml index 665f0848..7ea065ea 100644 --- a/test/data/grooves/Metronome2.musicxml +++ b/test/data/grooves/Metronome2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Metronome3.musicxml b/test/data/grooves/Metronome3.musicxml index b0cb5370..c7f1857c 100644 --- a/test/data/grooves/Metronome3.musicxml +++ b/test/data/grooves/Metronome3.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Metronome4.musicxml b/test/data/grooves/Metronome4.musicxml index 3cca3945..6129b466 100644 --- a/test/data/grooves/Metronome4.musicxml +++ b/test/data/grooves/Metronome4.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Metronome6.musicxml b/test/data/grooves/Metronome6.musicxml index c59f03ee..00f15a05 100644 --- a/test/data/grooves/Metronome6.musicxml +++ b/test/data/grooves/Metronome6.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -176,98 +176,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -275,15 +202,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -337,98 +268,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -436,15 +294,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/Metronome68.musicxml b/test/data/grooves/Metronome68.musicxml index 63ac43f1..6debe0a1 100644 --- a/test/data/grooves/Metronome68.musicxml +++ b/test/data/grooves/Metronome68.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -140,15 +140,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up normal @@ -187,25 +187,25 @@ D 4 - 192 + 768 1 - 16th + quarter up normal + F 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/MidE01.musicxml b/test/data/grooves/MidE01.musicxml index 0c97d472..22596f3b 100644 --- a/test/data/grooves/MidE01.musicxml +++ b/test/data/grooves/MidE01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/MidE02.musicxml b/test/data/grooves/MidE02.musicxml index aef5f3ed..f1261488 100644 --- a/test/data/grooves/MidE02.musicxml +++ b/test/data/grooves/MidE02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -133,10 +133,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -145,15 +145,20 @@ up x - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -294,119 +299,28 @@ F 4 - 192 - - - 2 - 16th - up - normal - - - - - - - F - 4 - - 48 - - - - 2 - 64th - up - normal - - - - - - - - F - 4 - - 12 - - - - 2 - 256th - up - normal - - - - - - - - F - 4 - - 3 - - - 2 - 1024th - up - normal - - - - - - - F - 4 - - 384 - + 256 2 eighth + + 3 + 2 + quarter + up normal - - - - - - F - 4 - - 96 - - - - 2 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 2 - 128th - up - normal - - - + + + 3 + eighth + + + 2 + quarter + + @@ -414,15 +328,19 @@ F 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -576,98 +494,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -675,15 +520,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -761,98 +610,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - F - 4 - - 384 - - + 256 2 eighth - up - normal - - - - - - - F - 4 - - 96 - - - - 2 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 2 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -860,15 +636,19 @@ F 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/MidE03.musicxml b/test/data/grooves/MidE03.musicxml index 23363e44..4085a218 100644 --- a/test/data/grooves/MidE03.musicxml +++ b/test/data/grooves/MidE03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -229,46 +229,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + @@ -276,51 +255,50 @@ E 4 - 384 - + 512 1 - eighth + quarter + + 3 + 2 + quarter + up normal - + - - - E - 4 - - 96 - - - + + + 768 1 - 32nd - up - normal + quarter - - - - - E - 4 - - 24 - - - + + + 256 1 - 128th - up - normal + eighth + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -328,17 +306,23 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + + + 768 @@ -349,356 +333,96 @@ - 192 - + 256 1 - 16th + eighth + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + - - - 48 - - + + + E + 4 + + 512 + 1 - 64th + quarter + + 3 + 2 + quarter + + up + normal - - + - 12 - - + 768 1 - 256th + quarter - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + - + E 4 - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + up normal - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - - - 768 - 1 - quarter - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 768 - 1 - quarter - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - + @@ -706,292 +430,19 @@ - 768 - - - percussion - - - 5 - - - - - F - 5 - - 512 - - 1 - quarter - - 3 - 2 - quarter - - up - x - - - - 3 - quarter - - - 2 - quarter - - - - - - - F - 5 - - 256 - - 1 - eighth - - 3 - 2 - quarter - - up - x - - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - - 1 - eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - - 1 - eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - - - + 768 + + + percussion + + + 5 + + + F 5 @@ -1040,29 +491,21 @@ - - - - - F - 5 - - 512 - + + + 256 1 - quarter + eighth 3 2 quarter - up - x 3 - quarter + eighth 2 @@ -1076,10 +519,10 @@ F 5 - 256 + 512 1 - eighth + quarter 3 2 @@ -1093,46 +536,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + @@ -1140,33 +562,48 @@ F 5 - 384 - + 512 1 - eighth + quarter + + 3 + 2 + quarter + up x - + - + F 5 - 96 - - + 512 1 - 32nd + quarter + + 3 + 2 + quarter + up x - - + + + 3 + quarter + + + 2 + quarter + + @@ -1174,77 +611,50 @@ F 5 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + quarter + up x - - + + + F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - + + + 3 + quarter + + + 2 + quarter + + @@ -1252,33 +662,42 @@ F 5 - 384 - + 256 1 eighth + + 3 + 2 + quarter + up x - + - - - F - 5 - - 96 - - - + + + 256 1 - 32nd - up - x + eighth + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1286,17 +705,42 @@ F 5 - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + up x - - + + + + + + 512 + 1 + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1304,15 +748,18 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - @@ -1320,13 +767,19 @@ F 5 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -1627,98 +1080,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - F - 4 - - 384 - - + 256 2 eighth - up - normal - - - - - - - F - 4 - - 96 - - - - 2 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 2 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1726,15 +1106,19 @@ F 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -1747,98 +1131,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - F - 4 - - 384 - - + 256 2 eighth - up - normal - - - - - - - F - 4 - - 96 - - - - 2 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 2 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1846,15 +1157,19 @@ F 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -2140,98 +1455,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - F - 4 - - 384 - - + 256 2 eighth - up - normal - - - - - - - F - 4 - - 96 - - - - 2 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 2 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -2239,15 +1481,19 @@ F 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -2260,98 +1506,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - F - 4 - - 384 - - + 256 2 eighth - up - normal - - - - - - - F - 4 - - 96 - - - - 2 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 2 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -2359,15 +1532,19 @@ F 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/MidE04.musicxml b/test/data/grooves/MidE04.musicxml index f64f7053..945c134f 100644 --- a/test/data/grooves/MidE04.musicxml +++ b/test/data/grooves/MidE04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -212,98 +212,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -311,111 +238,42 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - + - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - + 512 1 - 128th - up - normal + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + @@ -423,15 +281,18 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - @@ -439,13 +300,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -495,98 +362,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -594,111 +388,42 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - + - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - + 512 1 - 128th - up - normal + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + @@ -706,15 +431,18 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - @@ -722,13 +450,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/MiddleBigBand.musicxml b/test/data/grooves/MiddleBigBand.musicxml index da1c499e..c5bb086b 100644 --- a/test/data/grooves/MiddleBigBand.musicxml +++ b/test/data/grooves/MiddleBigBand.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -470,117 +470,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -900,117 +811,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - diff --git a/test/data/grooves/MiddleBigBandEnd.musicxml b/test/data/grooves/MiddleBigBandEnd.musicxml index 762dac7d..6a3278d3 100644 --- a/test/data/grooves/MiddleBigBandEnd.musicxml +++ b/test/data/grooves/MiddleBigBandEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -170,14 +170,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -202,24 +203,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -244,24 +246,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -286,24 +289,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -340,15 +344,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/MiddleBigBandIntro.musicxml b/test/data/grooves/MiddleBigBandIntro.musicxml index 57c29822..de75aec6 100644 --- a/test/data/grooves/MiddleBigBandIntro.musicxml +++ b/test/data/grooves/MiddleBigBandIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -470,117 +470,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -600,14 +511,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -632,24 +544,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -674,24 +587,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -716,24 +630,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -770,15 +685,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -797,25 +712,25 @@ G 5 - 192 + 768 3 - 16th + quarter up circle-x + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/MilIntro2.musicxml b/test/data/grooves/MilIntro2.musicxml index 23fc11a8..b85a2c90 100644 --- a/test/data/grooves/MilIntro2.musicxml +++ b/test/data/grooves/MilIntro2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -247,53 +247,18 @@ + E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - + 192 1 - 1024th + 16th up normal - @@ -301,11 +266,11 @@ E 4 - 96 + 48 1 - 32nd + 64th up normal @@ -317,12 +282,12 @@ E 4 - 24 + 12 1 - 128th + 256th up normal @@ -335,11 +300,11 @@ E 4 - 6 + 3 1 - 512th + 1024th up normal @@ -401,15 +366,28 @@ E 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -417,17 +395,18 @@ E 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - @@ -435,15 +414,19 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + @@ -475,19 +458,15 @@ + E 4 - 189 + 192 1 - 32nd - - - - - + 16th up normal @@ -598,65 +577,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -664,17 +606,18 @@ E 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - @@ -682,15 +625,19 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + @@ -707,25 +654,6 @@ - - - E - 4 - - 189 - - 1 - 32nd - - - - - - up - normal - - - E @@ -741,19 +669,15 @@ + E 4 - 189 + 192 1 - 32nd - - - - - + 16th up normal @@ -864,65 +788,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -930,17 +817,18 @@ E 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - @@ -948,15 +836,19 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + @@ -973,25 +865,6 @@ - - - E - 4 - - 189 - - 1 - 32nd - - - - - - up - normal - - - E @@ -1007,19 +880,15 @@ + E 4 - 189 + 192 1 - 32nd - - - - - + 16th up normal @@ -1130,65 +999,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1196,17 +1028,18 @@ E 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - @@ -1214,15 +1047,19 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + @@ -1239,25 +1076,6 @@ - - - E - 4 - - 189 - - 1 - 32nd - - - - - - up - normal - - - @@ -1265,131 +1083,13 @@ E 4 - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 768 1 - 512th + quarter up normal - diff --git a/test/data/grooves/ModernJazz.musicxml b/test/data/grooves/ModernJazz.musicxml index 6473102f..b108a112 100644 --- a/test/data/grooves/ModernJazz.musicxml +++ b/test/data/grooves/ModernJazz.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -283,22 +283,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -306,10 +309,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -317,10 +325,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/ModernJazz1.musicxml b/test/data/grooves/ModernJazz1.musicxml index b43d8a85..1c28d921 100644 --- a/test/data/grooves/ModernJazz1.musicxml +++ b/test/data/grooves/ModernJazz1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -283,22 +283,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -306,10 +309,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -317,10 +325,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/ModernJazz1Sus.musicxml b/test/data/grooves/ModernJazz1Sus.musicxml index 3728f8b8..0d5455f5 100644 --- a/test/data/grooves/ModernJazz1Sus.musicxml +++ b/test/data/grooves/ModernJazz1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -283,22 +283,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -306,10 +309,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -317,10 +325,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/ModernJazz2.musicxml b/test/data/grooves/ModernJazz2.musicxml index f7ab2d55..7ac3abc3 100644 --- a/test/data/grooves/ModernJazz2.musicxml +++ b/test/data/grooves/ModernJazz2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -283,22 +283,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -306,10 +309,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -317,10 +325,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/ModernJazz2Sus.musicxml b/test/data/grooves/ModernJazz2Sus.musicxml index 8a994fd6..293947e9 100644 --- a/test/data/grooves/ModernJazz2Sus.musicxml +++ b/test/data/grooves/ModernJazz2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -283,22 +283,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -306,10 +309,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -317,10 +325,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/ModernJazzEnd.musicxml b/test/data/grooves/ModernJazzEnd.musicxml index 5467736b..07686fde 100644 --- a/test/data/grooves/ModernJazzEnd.musicxml +++ b/test/data/grooves/ModernJazzEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ModernJazzFill.musicxml b/test/data/grooves/ModernJazzFill.musicxml index 2feecb48..06c4a03b 100644 --- a/test/data/grooves/ModernJazzFill.musicxml +++ b/test/data/grooves/ModernJazzFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ModernJazzIntro.musicxml b/test/data/grooves/ModernJazzIntro.musicxml index e8a40e48..8b768c75 100644 --- a/test/data/grooves/ModernJazzIntro.musicxml +++ b/test/data/grooves/ModernJazzIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ModernJazzSus.musicxml b/test/data/grooves/ModernJazzSus.musicxml index c4866f3e..558ba8bf 100644 --- a/test/data/grooves/ModernJazzSus.musicxml +++ b/test/data/grooves/ModernJazzSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -283,22 +283,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -306,10 +309,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -317,10 +325,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/ModernJazzWaltz.musicxml b/test/data/grooves/ModernJazzWaltz.musicxml index 201648d9..e55549d8 100644 --- a/test/data/grooves/ModernJazzWaltz.musicxml +++ b/test/data/grooves/ModernJazzWaltz.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ModernJazzWaltz1.musicxml b/test/data/grooves/ModernJazzWaltz1.musicxml index 90a1b26f..6cd5e1b0 100644 --- a/test/data/grooves/ModernJazzWaltz1.musicxml +++ b/test/data/grooves/ModernJazzWaltz1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ModernJazzWaltz1Sus.musicxml b/test/data/grooves/ModernJazzWaltz1Sus.musicxml index c0752e10..bad8a312 100644 --- a/test/data/grooves/ModernJazzWaltz1Sus.musicxml +++ b/test/data/grooves/ModernJazzWaltz1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ModernJazzWaltz2.musicxml b/test/data/grooves/ModernJazzWaltz2.musicxml index 8bd27ed6..65486c9d 100644 --- a/test/data/grooves/ModernJazzWaltz2.musicxml +++ b/test/data/grooves/ModernJazzWaltz2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ModernJazzWaltz2Sus.musicxml b/test/data/grooves/ModernJazzWaltz2Sus.musicxml index e1c7e8f4..d892cbb2 100644 --- a/test/data/grooves/ModernJazzWaltz2Sus.musicxml +++ b/test/data/grooves/ModernJazzWaltz2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ModernJazzWaltzEnd.musicxml b/test/data/grooves/ModernJazzWaltzEnd.musicxml index 0734b131..ff7cee62 100644 --- a/test/data/grooves/ModernJazzWaltzEnd.musicxml +++ b/test/data/grooves/ModernJazzWaltzEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ModernJazzWaltzFill.musicxml b/test/data/grooves/ModernJazzWaltzFill.musicxml index 513e0a45..e6343840 100644 --- a/test/data/grooves/ModernJazzWaltzFill.musicxml +++ b/test/data/grooves/ModernJazzWaltzFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ModernJazzWaltzIntro.musicxml b/test/data/grooves/ModernJazzWaltzIntro.musicxml index 391910d7..100138fa 100644 --- a/test/data/grooves/ModernJazzWaltzIntro.musicxml +++ b/test/data/grooves/ModernJazzWaltzIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -195,22 +195,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -218,10 +221,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -229,10 +237,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/ModernJazzWaltzSus.musicxml b/test/data/grooves/ModernJazzWaltzSus.musicxml index 13cc1694..327bde85 100644 --- a/test/data/grooves/ModernJazzWaltzSus.musicxml +++ b/test/data/grooves/ModernJazzWaltzSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ModernR&B.musicxml b/test/data/grooves/ModernR&B.musicxml index be4b788e..4bcad670 100644 --- a/test/data/grooves/ModernR&B.musicxml +++ b/test/data/grooves/ModernR&B.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ModernR&BEnd.musicxml b/test/data/grooves/ModernR&BEnd.musicxml index f4b3ce04..c3999b08 100644 --- a/test/data/grooves/ModernR&BEnd.musicxml +++ b/test/data/grooves/ModernR&BEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ModernR&BIntro.musicxml b/test/data/grooves/ModernR&BIntro.musicxml index d5b75469..4c63b5ce 100644 --- a/test/data/grooves/ModernR&BIntro.musicxml +++ b/test/data/grooves/ModernR&BIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/NiteJazz.musicxml b/test/data/grooves/NiteJazz.musicxml index 45a1f077..75c88401 100644 --- a/test/data/grooves/NiteJazz.musicxml +++ b/test/data/grooves/NiteJazz.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/NiteJazzEnd.musicxml b/test/data/grooves/NiteJazzEnd.musicxml index 89638ac0..43ad7613 100644 --- a/test/data/grooves/NiteJazzEnd.musicxml +++ b/test/data/grooves/NiteJazzEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/NiteJazzIntro.musicxml b/test/data/grooves/NiteJazzIntro.musicxml index 76fac30c..70efcfe1 100644 --- a/test/data/grooves/NiteJazzIntro.musicxml +++ b/test/data/grooves/NiteJazzIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/NiteJazzPlus.musicxml b/test/data/grooves/NiteJazzPlus.musicxml index 46620070..4b826567 100644 --- a/test/data/grooves/NiteJazzPlus.musicxml +++ b/test/data/grooves/NiteJazzPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/NiteJazzSus.musicxml b/test/data/grooves/NiteJazzSus.musicxml index ff9abb66..3f967728 100644 --- a/test/data/grooves/NiteJazzSus.musicxml +++ b/test/data/grooves/NiteJazzSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/NiteJazzSusPlus.musicxml b/test/data/grooves/NiteJazzSusPlus.musicxml index fa27f3c9..8f3263c8 100644 --- a/test/data/grooves/NiteJazzSusPlus.musicxml +++ b/test/data/grooves/NiteJazzSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/OldieBallad.musicxml b/test/data/grooves/OldieBallad.musicxml index b7835709..d31a6eea 100644 --- a/test/data/grooves/OldieBallad.musicxml +++ b/test/data/grooves/OldieBallad.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/OldieBalladEnd.musicxml b/test/data/grooves/OldieBalladEnd.musicxml index d29a08a5..705623eb 100644 --- a/test/data/grooves/OldieBalladEnd.musicxml +++ b/test/data/grooves/OldieBalladEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/OldieBalladIntro.musicxml b/test/data/grooves/OldieBalladIntro.musicxml index 7ae5be6b..0201ac1f 100644 --- a/test/data/grooves/OldieBalladIntro.musicxml +++ b/test/data/grooves/OldieBalladIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -787,31 +787,17 @@ 5 192 + 3 16th up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - + G 5 @@ -819,17 +805,17 @@ 48 - + 3 64th up - x + circle-x - + G 5 @@ -837,82 +823,59 @@ 12 - + 3 256th up - x + circle-x - + G 5 3 - + 3 1024th up - x + circle-x - + G 5 - 384 - + 256 3 eighth + + 3 + 2 + quarter + up x - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - + + + 3 + eighth + + + 2 + quarter + + @@ -920,15 +883,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -1123,12 +1090,66 @@ 5 192 + 3 16th up circle-x + + + + + + G + 5 + + 48 + + + + 3 + 64th + up + circle-x + + + + + + + + G + 5 + + 12 + + + + 3 + 256th + up + circle-x + + + + + + + + G + 5 + + 3 + + + 3 + 1024th + up + circle-x + + diff --git a/test/data/grooves/POP01.musicxml b/test/data/grooves/POP01.musicxml index b6a130e3..33a69ae9 100644 --- a/test/data/grooves/POP01.musicxml +++ b/test/data/grooves/POP01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/POP02.musicxml b/test/data/grooves/POP02.musicxml index 47d1c49f..83d3b31c 100644 --- a/test/data/grooves/POP02.musicxml +++ b/test/data/grooves/POP02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -219,10 +219,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -231,15 +231,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -294,10 +299,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -306,15 +311,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -351,10 +361,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -363,15 +373,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -425,10 +440,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -437,7 +452,6 @@ up circle-x - @@ -445,13 +459,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up x + @@ -581,10 +601,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -593,7 +613,6 @@ up circle-x - @@ -601,13 +620,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up x + diff --git a/test/data/grooves/POP03.musicxml b/test/data/grooves/POP03.musicxml index 8fd0bb19..df11ab03 100644 --- a/test/data/grooves/POP03.musicxml +++ b/test/data/grooves/POP03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/POP04.musicxml b/test/data/grooves/POP04.musicxml index 82772726..13f04f01 100644 --- a/test/data/grooves/POP04.musicxml +++ b/test/data/grooves/POP04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/POP05.musicxml b/test/data/grooves/POP05.musicxml index b03cdb4c..9f84e9f9 100644 --- a/test/data/grooves/POP05.musicxml +++ b/test/data/grooves/POP05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/POP06.musicxml b/test/data/grooves/POP06.musicxml index f77c8408..b7fbdb4d 100644 --- a/test/data/grooves/POP06.musicxml +++ b/test/data/grooves/POP06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -231,10 +231,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -243,15 +243,20 @@ up x - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -270,98 +275,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - x - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -369,15 +301,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -410,10 +346,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -422,15 +358,20 @@ up x - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -449,98 +390,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - x - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -548,15 +416,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -1059,119 +931,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 256 3 - 1024th - up - x - - - - - - - G - 5 - - 384 - - - 3 eighth + + 3 + 2 + quarter + up - circle-x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - circle-x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x + x - - + + + 3 + eighth + + + 2 + quarter + + @@ -1179,15 +960,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up circle-x - + @@ -1391,119 +1176,28 @@ E 4 - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 384 - + 256 1 eighth + + 3 + 2 + quarter + up normal - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - + + + 3 + eighth + + + 2 + quarter + + @@ -1511,15 +1205,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -1708,119 +1406,28 @@ E 4 - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 384 - + 256 1 eighth + + 3 + 2 + quarter + up normal - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - + + + 3 + eighth + + + 2 + quarter + + @@ -1828,15 +1435,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/POP07.musicxml b/test/data/grooves/POP07.musicxml index ebf99ecd..d19cb7d3 100644 --- a/test/data/grooves/POP07.musicxml +++ b/test/data/grooves/POP07.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/POP08.musicxml b/test/data/grooves/POP08.musicxml index 9c35ac91..957259ad 100644 --- a/test/data/grooves/POP08.musicxml +++ b/test/data/grooves/POP08.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -346,98 +346,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -445,15 +372,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -589,98 +520,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -688,15 +546,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -1222,60 +1084,60 @@ - 384 - + 512 3 - eighth + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + - - - 96 - - + + + G + 5 + + 256 + 3 - 32nd - - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th + eighth + + 3 + 2 + quarter + + up + circle-x - + + G 5 - 48 + 192 - + 3 - 64th + 16th up - circle-x + x @@ -1285,14 +1147,14 @@ G 5 - 12 + 48 - + 3 - 256th + 64th up - circle-x + x @@ -1303,14 +1165,16 @@ G 5 - 3 + 12 + - + 3 - 1024th + 256th up - circle-x + x + @@ -1319,13 +1183,15 @@ G 5 - 192 + 3 + 3 - 16th + 1024th up x + @@ -1350,119 +1216,28 @@ E 4 - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 384 - + 256 1 eighth + + 3 + 2 + quarter + up normal - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - + + + 3 + eighth + + + 2 + quarter + + @@ -1470,15 +1245,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -1486,33 +1265,48 @@ E 4 - 192 - + 256 1 - 16th + eighth + + 3 + 2 + quarter + up normal - + + + 3 + eighth + + + 2 + quarter + + - + E 4 - 48 - - + 512 1 - 64th + quarter + + 3 + 2 + quarter + up normal - - + @@ -1520,17 +1314,28 @@ E 4 - 12 - - + 256 1 - 256th + eighth + + 3 + 2 + quarter + up normal - - + + + 3 + eighth + + + 2 + quarter + + @@ -1538,227 +1343,7 @@ E 4 - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 512 + 512 1 quarter @@ -1766,366 +1351,91 @@ 3 2 quarter - - up - normal - - - - 3 - quarter - - - 2 - quarter - - - - - - - E - 4 - - 256 - - 1 - eighth - - 3 - 2 - quarter - - up - normal - - - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th + up normal - + - + E 4 - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal - + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 48 - - + 256 1 - 64th + eighth + + 3 + 2 + quarter + up normal - - + + + E 4 - 12 - - + 256 1 - 256th + eighth + + 3 + 2 + quarter + up normal - - + + + 3 + eighth + + + 2 + quarter + + @@ -2133,15 +1443,19 @@ E 4 - 3 - + 512 1 - 1024th + quarter + + 3 + 2 + quarter + up normal - + @@ -2149,15 +1463,28 @@ E 4 - 384 - + 256 1 eighth + + 3 + 2 + quarter + up normal - + + + 3 + eighth + + + 2 + quarter + + @@ -2165,17 +1492,19 @@ E 4 - 96 - - + 512 1 - 32nd + quarter + + 3 + 2 + quarter + up normal - - + @@ -2183,17 +1512,28 @@ E 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + quarter + up normal - - + + + 3 + eighth + + + 2 + quarter + + @@ -2201,15 +1541,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -2412,98 +1756,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - - 1 - eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - + 512 1 - 128th - down - normal + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + @@ -2511,23 +1782,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/POP09.musicxml b/test/data/grooves/POP09.musicxml index 7585e292..1904faa9 100644 --- a/test/data/grooves/POP09.musicxml +++ b/test/data/grooves/POP09.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -400,10 +400,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -412,15 +412,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/POP10.musicxml b/test/data/grooves/POP10.musicxml index 428caef2..a0c14f8e 100644 --- a/test/data/grooves/POP10.musicxml +++ b/test/data/grooves/POP10.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/POP11.musicxml b/test/data/grooves/POP11.musicxml index a9b3ef65..9e7a75df 100644 --- a/test/data/grooves/POP11.musicxml +++ b/test/data/grooves/POP11.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/POP12.musicxml b/test/data/grooves/POP12.musicxml index e10c3302..4768fc3b 100644 --- a/test/data/grooves/POP12.musicxml +++ b/test/data/grooves/POP12.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -264,98 +264,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -363,15 +290,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -402,10 +333,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -414,15 +345,20 @@ up circle-x - - 768 + 512 3 quarter + + 3 + 2 + quarter + + @@ -443,98 +379,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -542,15 +405,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -581,10 +448,10 @@ G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -593,15 +460,20 @@ up x - - 768 + 512 3 quarter + + 3 + 2 + quarter + + @@ -671,10 +543,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -683,15 +555,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/PUNK01.musicxml b/test/data/grooves/PUNK01.musicxml index e6a26bfb..83371dc0 100644 --- a/test/data/grooves/PUNK01.musicxml +++ b/test/data/grooves/PUNK01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PUNK02.musicxml b/test/data/grooves/PUNK02.musicxml index 5da500c1..5e9ce6bc 100644 --- a/test/data/grooves/PUNK02.musicxml +++ b/test/data/grooves/PUNK02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PianoBallad.musicxml b/test/data/grooves/PianoBallad.musicxml index b4e0cee8..035e87d8 100644 --- a/test/data/grooves/PianoBallad.musicxml +++ b/test/data/grooves/PianoBallad.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PianoBallad1.musicxml b/test/data/grooves/PianoBallad1.musicxml index 190cd1bc..6be8a7b0 100644 --- a/test/data/grooves/PianoBallad1.musicxml +++ b/test/data/grooves/PianoBallad1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PianoBallad1Sus.musicxml b/test/data/grooves/PianoBallad1Sus.musicxml index b57d4c3e..0ca3d122 100644 --- a/test/data/grooves/PianoBallad1Sus.musicxml +++ b/test/data/grooves/PianoBallad1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PianoBallad2.musicxml b/test/data/grooves/PianoBallad2.musicxml index 2b9207e5..a78c9598 100644 --- a/test/data/grooves/PianoBallad2.musicxml +++ b/test/data/grooves/PianoBallad2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PianoBallad2Sus.musicxml b/test/data/grooves/PianoBallad2Sus.musicxml index 850edfc0..817d2dbe 100644 --- a/test/data/grooves/PianoBallad2Sus.musicxml +++ b/test/data/grooves/PianoBallad2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PianoBalladEnd.musicxml b/test/data/grooves/PianoBalladEnd.musicxml index 47ca115f..3ad489ba 100644 --- a/test/data/grooves/PianoBalladEnd.musicxml +++ b/test/data/grooves/PianoBalladEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PianoBalladFill.musicxml b/test/data/grooves/PianoBalladFill.musicxml index 56c7b345..8bf69c6b 100644 --- a/test/data/grooves/PianoBalladFill.musicxml +++ b/test/data/grooves/PianoBalladFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PianoBalladIntro.musicxml b/test/data/grooves/PianoBalladIntro.musicxml index 8183caab..c049e961 100644 --- a/test/data/grooves/PianoBalladIntro.musicxml +++ b/test/data/grooves/PianoBalladIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PianoBalladIntro2.musicxml b/test/data/grooves/PianoBalladIntro2.musicxml index 2a9510da..fca8d8eb 100644 --- a/test/data/grooves/PianoBalladIntro2.musicxml +++ b/test/data/grooves/PianoBalladIntro2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PianoBalladSus.musicxml b/test/data/grooves/PianoBalladSus.musicxml index 275c8218..e47e3266 100644 --- a/test/data/grooves/PianoBalladSus.musicxml +++ b/test/data/grooves/PianoBalladSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Polka.musicxml b/test/data/grooves/Polka.musicxml index dfdc55ff..4f2fbfc6 100644 --- a/test/data/grooves/Polka.musicxml +++ b/test/data/grooves/Polka.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Polka1.musicxml b/test/data/grooves/Polka1.musicxml index a660daea..d43a4879 100644 --- a/test/data/grooves/Polka1.musicxml +++ b/test/data/grooves/Polka1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Polka1Arp.musicxml b/test/data/grooves/Polka1Arp.musicxml index 47f4c896..5fcb1a32 100644 --- a/test/data/grooves/Polka1Arp.musicxml +++ b/test/data/grooves/Polka1Arp.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Polka1Sus.musicxml b/test/data/grooves/Polka1Sus.musicxml index 0cc21d4c..b3cd9099 100644 --- a/test/data/grooves/Polka1Sus.musicxml +++ b/test/data/grooves/Polka1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Polka1SusArp.musicxml b/test/data/grooves/Polka1SusArp.musicxml index 6963abc8..bc47bfbf 100644 --- a/test/data/grooves/Polka1SusArp.musicxml +++ b/test/data/grooves/Polka1SusArp.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PolkaArp.musicxml b/test/data/grooves/PolkaArp.musicxml index 89b9831d..05df88bf 100644 --- a/test/data/grooves/PolkaArp.musicxml +++ b/test/data/grooves/PolkaArp.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PolkaEnd.musicxml b/test/data/grooves/PolkaEnd.musicxml index d7bec0b1..d41e4b32 100644 --- a/test/data/grooves/PolkaEnd.musicxml +++ b/test/data/grooves/PolkaEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PolkaFox.musicxml b/test/data/grooves/PolkaFox.musicxml index 07e8b467..7bd9a97b 100644 --- a/test/data/grooves/PolkaFox.musicxml +++ b/test/data/grooves/PolkaFox.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1022,117 +1022,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - diff --git a/test/data/grooves/PolkaFoxEnd.musicxml b/test/data/grooves/PolkaFoxEnd.musicxml index c136e02a..1fb58526 100644 --- a/test/data/grooves/PolkaFoxEnd.musicxml +++ b/test/data/grooves/PolkaFoxEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PolkaFoxIntro.musicxml b/test/data/grooves/PolkaFoxIntro.musicxml index 05d0af12..255d1bdc 100644 --- a/test/data/grooves/PolkaFoxIntro.musicxml +++ b/test/data/grooves/PolkaFoxIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -626,14 +626,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -800,15 +801,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/PolkaIntro.musicxml b/test/data/grooves/PolkaIntro.musicxml index a3a893a3..9e7c36a7 100644 --- a/test/data/grooves/PolkaIntro.musicxml +++ b/test/data/grooves/PolkaIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PolkaIntro8.musicxml b/test/data/grooves/PolkaIntro8.musicxml index c66f1ed2..d156f6d4 100644 --- a/test/data/grooves/PolkaIntro8.musicxml +++ b/test/data/grooves/PolkaIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PolkaSus.musicxml b/test/data/grooves/PolkaSus.musicxml index 8eab6aac..0c18b053 100644 --- a/test/data/grooves/PolkaSus.musicxml +++ b/test/data/grooves/PolkaSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PolkaSusArp.musicxml b/test/data/grooves/PolkaSusArp.musicxml index fcf67fbb..770b3306 100644 --- a/test/data/grooves/PolkaSusArp.musicxml +++ b/test/data/grooves/PolkaSusArp.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Pop.musicxml b/test/data/grooves/Pop.musicxml index 603e62f0..48bdd8d8 100644 --- a/test/data/grooves/Pop.musicxml +++ b/test/data/grooves/Pop.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -493,199 +493,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - - 2 - eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - - - 2 - 512th - up - square - - - - - - - 768 + 512 2 quarter - - - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 768 - - 1 - quarter - up - normal - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 768 - - 1 - quarter - up - normal - - - - - 3072 - - - - 768 - 2 - quarter - - - - - - 384 - - 2 - eighth - - - - - - - 192 - - 2 - 16th - - + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -693,137 +519,36 @@ E 4 - 192 + 512 2 - 16th - up - square - - - - - - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - - 2 - eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - - - 2 - 512th + quarter + + 3 + 2 + quarter + up square - - 768 + 512 2 quarter + + 3 + 2 + quarter + + - + 768 @@ -915,258 +640,90 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - - 2 - eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - - - 2 - 512th - up - square - - - - - - - 768 - 2 - quarter - - - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 768 - - 1 - quarter - up - normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - normal - - + 512 + 2 + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 96 - - - - 1 - 32nd + 512 + + 2 + quarter + + 3 + 2 + quarter + up - normal + square - - - - - E - 4 - - 24 - - - + + + 512 + 2 + quarter + + 3 + 2 + quarter + + + + + + + + + + 768 1 - 128th - up - normal + quarter - - - + E 4 - 6 - + 768 1 - 512th + quarter up normal - + + + + + 768 + 1 + quarter + @@ -1188,46 +745,67 @@ - 192 - + 768 2 - 16th + quarter - - 48 + 384 - 2 - 64th + eighth - - 12 - + 192 2 - 256th + 16th - + + + E + 4 + + 192 + + 2 + 16th + up + square + + + - 3 - + 512 2 - 1024th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1235,51 +813,144 @@ E 4 - 384 - + 512 2 - eighth + quarter + + 3 + 2 + quarter + up square - - + + + 512 + 2 + quarter + + 3 + 2 + quarter + + + + + + + + + + 768 + 1 + quarter + + + + E 4 - 96 - - - - 2 - 32nd + 768 + + 1 + quarter up - square + normal - - - + + + 512 + 1 + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + + + + E 4 - 24 - - - - 2 - 128th + 512 + + 1 + quarter + + 3 + 2 + quarter + up - square + normal - - + + + + + E + 4 + + 512 + + 1 + quarter + + 3 + 2 + quarter + + up + normal + + + + + + 3072 + + + + 256 + 2 + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1287,15 +958,19 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -4132,182 +3807,93 @@ 3 eighth up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x + x - - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - - + G 5 - 6 - - + 192 + 3 - 512th + 16th up - circle-x + x - - + G 5 192 - - + 3 16th up - x + circle-x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - - + G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -4449,98 +4035,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -4548,15 +4061,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -4683,98 +4200,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -4782,15 +4226,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/PopBallad.musicxml b/test/data/grooves/PopBallad.musicxml index 7b5e34a7..215ad519 100644 --- a/test/data/grooves/PopBallad.musicxml +++ b/test/data/grooves/PopBallad.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopBallad1.musicxml b/test/data/grooves/PopBallad1.musicxml index b3f26357..9424f67b 100644 --- a/test/data/grooves/PopBallad1.musicxml +++ b/test/data/grooves/PopBallad1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -704,14 +704,15 @@ + A 5 - 192 + 384 1 - 16th + eighth up x @@ -946,14 +947,15 @@ + A 5 - 192 + 384 1 - 16th + eighth up x diff --git a/test/data/grooves/PopBallad1Plus.musicxml b/test/data/grooves/PopBallad1Plus.musicxml index 821374df..53921d96 100644 --- a/test/data/grooves/PopBallad1Plus.musicxml +++ b/test/data/grooves/PopBallad1Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -704,14 +704,15 @@ + A 5 - 192 + 384 1 - 16th + eighth up x @@ -946,14 +947,15 @@ + A 5 - 192 + 384 1 - 16th + eighth up x diff --git a/test/data/grooves/PopBallad2.musicxml b/test/data/grooves/PopBallad2.musicxml index 42968672..cccfb955 100644 --- a/test/data/grooves/PopBallad2.musicxml +++ b/test/data/grooves/PopBallad2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopBallad2Plus.musicxml b/test/data/grooves/PopBallad2Plus.musicxml index d1588aff..94abb469 100644 --- a/test/data/grooves/PopBallad2Plus.musicxml +++ b/test/data/grooves/PopBallad2Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopBallad2Sus.musicxml b/test/data/grooves/PopBallad2Sus.musicxml index 3a7bfcef..a4af6323 100644 --- a/test/data/grooves/PopBallad2Sus.musicxml +++ b/test/data/grooves/PopBallad2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopBallad2SusPlus.musicxml b/test/data/grooves/PopBallad2SusPlus.musicxml index 655a86b2..56c51a56 100644 --- a/test/data/grooves/PopBallad2SusPlus.musicxml +++ b/test/data/grooves/PopBallad2SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopBalladEnd.musicxml b/test/data/grooves/PopBalladEnd.musicxml index 6e492771..b3cf06a7 100644 --- a/test/data/grooves/PopBalladEnd.musicxml +++ b/test/data/grooves/PopBalladEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopBalladIntro.musicxml b/test/data/grooves/PopBalladIntro.musicxml index 2601df0d..d1400e1f 100644 --- a/test/data/grooves/PopBalladIntro.musicxml +++ b/test/data/grooves/PopBalladIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopBalladPlus.musicxml b/test/data/grooves/PopBalladPlus.musicxml index cae9e722..97460c5e 100644 --- a/test/data/grooves/PopBalladPlus.musicxml +++ b/test/data/grooves/PopBalladPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopBalladSus.musicxml b/test/data/grooves/PopBalladSus.musicxml index 0c0aa119..2ecdcc2a 100644 --- a/test/data/grooves/PopBalladSus.musicxml +++ b/test/data/grooves/PopBalladSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopBalladSusPlus.musicxml b/test/data/grooves/PopBalladSusPlus.musicxml index 584e151e..fcd980b4 100644 --- a/test/data/grooves/PopBalladSusPlus.musicxml +++ b/test/data/grooves/PopBalladSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopEnd.musicxml b/test/data/grooves/PopEnd.musicxml index 720c1cdf..eb480f21 100644 --- a/test/data/grooves/PopEnd.musicxml +++ b/test/data/grooves/PopEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopIntro.musicxml b/test/data/grooves/PopIntro.musicxml index c1b8eab2..3dde4f83 100644 --- a/test/data/grooves/PopIntro.musicxml +++ b/test/data/grooves/PopIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -2763,117 +2763,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -3101,98 +3012,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -3200,15 +3038,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/PopPolka.musicxml b/test/data/grooves/PopPolka.musicxml index a8645abf..8105676c 100644 --- a/test/data/grooves/PopPolka.musicxml +++ b/test/data/grooves/PopPolka.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1046,117 +1046,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - diff --git a/test/data/grooves/PopPolkaEnd.musicxml b/test/data/grooves/PopPolkaEnd.musicxml index 8ba622b4..2978e5a4 100644 --- a/test/data/grooves/PopPolkaEnd.musicxml +++ b/test/data/grooves/PopPolkaEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -432,15 +432,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -493,15 +493,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/PopPolkaIntro.musicxml b/test/data/grooves/PopPolkaIntro.musicxml index 66f34738..475aeb06 100644 --- a/test/data/grooves/PopPolkaIntro.musicxml +++ b/test/data/grooves/PopPolkaIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopRock1.musicxml b/test/data/grooves/PopRock1.musicxml index 476c8116..4118c874 100644 --- a/test/data/grooves/PopRock1.musicxml +++ b/test/data/grooves/PopRock1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopRock1End.musicxml b/test/data/grooves/PopRock1End.musicxml index 31c19724..20117afd 100644 --- a/test/data/grooves/PopRock1End.musicxml +++ b/test/data/grooves/PopRock1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopRock1Intro.musicxml b/test/data/grooves/PopRock1Intro.musicxml index 822cf42e..efb17197 100644 --- a/test/data/grooves/PopRock1Intro.musicxml +++ b/test/data/grooves/PopRock1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopRock2.musicxml b/test/data/grooves/PopRock2.musicxml index ea5cb556..4ba81a17 100644 --- a/test/data/grooves/PopRock2.musicxml +++ b/test/data/grooves/PopRock2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -998,117 +998,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - diff --git a/test/data/grooves/PopRock2End.musicxml b/test/data/grooves/PopRock2End.musicxml index 653e9605..0ce7b467 100644 --- a/test/data/grooves/PopRock2End.musicxml +++ b/test/data/grooves/PopRock2End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -388,15 +388,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -461,15 +461,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/PopRock2Intro.musicxml b/test/data/grooves/PopRock2Intro.musicxml index 015aaaa5..487ed5a9 100644 --- a/test/data/grooves/PopRock2Intro.musicxml +++ b/test/data/grooves/PopRock2Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -890,15 +890,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/PopShuffle1.musicxml b/test/data/grooves/PopShuffle1.musicxml index 64cebcdd..53f7a4ba 100644 --- a/test/data/grooves/PopShuffle1.musicxml +++ b/test/data/grooves/PopShuffle1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopShuffle1End.musicxml b/test/data/grooves/PopShuffle1End.musicxml index 622d14fa..1f816b20 100644 --- a/test/data/grooves/PopShuffle1End.musicxml +++ b/test/data/grooves/PopShuffle1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopShuffle1Intro.musicxml b/test/data/grooves/PopShuffle1Intro.musicxml index 91440744..4e5175ce 100644 --- a/test/data/grooves/PopShuffle1Intro.musicxml +++ b/test/data/grooves/PopShuffle1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopShuffle2.musicxml b/test/data/grooves/PopShuffle2.musicxml index b175896e..4711caf0 100644 --- a/test/data/grooves/PopShuffle2.musicxml +++ b/test/data/grooves/PopShuffle2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -218,83 +218,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -302,15 +247,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -318,13 +266,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -378,83 +332,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -462,15 +361,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -478,13 +380,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -538,83 +446,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -622,15 +475,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -638,13 +494,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -698,83 +560,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -782,15 +589,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -798,13 +608,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + diff --git a/test/data/grooves/PopShuffle2End.musicxml b/test/data/grooves/PopShuffle2End.musicxml index 8ba42e60..b92e40d2 100644 --- a/test/data/grooves/PopShuffle2End.musicxml +++ b/test/data/grooves/PopShuffle2End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/PopShuffle2Intro.musicxml b/test/data/grooves/PopShuffle2Intro.musicxml index aee5faaf..eaf84a03 100644 --- a/test/data/grooves/PopShuffle2Intro.musicxml +++ b/test/data/grooves/PopShuffle2Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -218,83 +218,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -302,15 +247,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -318,13 +266,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -378,83 +332,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - + 128 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -462,15 +361,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -478,13 +380,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -652,83 +560,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -736,15 +589,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -752,13 +608,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -819,117 +681,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - diff --git a/test/data/grooves/PopWaltzEnd.musicxml b/test/data/grooves/PopWaltzEnd.musicxml index 03e966a7..862b60f2 100644 --- a/test/data/grooves/PopWaltzEnd.musicxml +++ b/test/data/grooves/PopWaltzEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuandoGSEndingA.musicxml b/test/data/grooves/QuandoGSEndingA.musicxml index e6e09a3d..47827223 100644 --- a/test/data/grooves/QuandoGSEndingA.musicxml +++ b/test/data/grooves/QuandoGSEndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuandoGSEndingB.musicxml b/test/data/grooves/QuandoGSEndingB.musicxml index 51320746..418edf55 100644 --- a/test/data/grooves/QuandoGSEndingB.musicxml +++ b/test/data/grooves/QuandoGSEndingB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuandoGSEndingC.musicxml b/test/data/grooves/QuandoGSEndingC.musicxml index 5c98ebb2..b3c580f8 100644 --- a/test/data/grooves/QuandoGSEndingC.musicxml +++ b/test/data/grooves/QuandoGSEndingC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuandoGSFillAA.musicxml b/test/data/grooves/QuandoGSFillAA.musicxml index 5251ccb7..9ecd1d0a 100644 --- a/test/data/grooves/QuandoGSFillAA.musicxml +++ b/test/data/grooves/QuandoGSFillAA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuandoGSFillBA.musicxml b/test/data/grooves/QuandoGSFillBA.musicxml index 8d5dbd02..04b46e8f 100644 --- a/test/data/grooves/QuandoGSFillBA.musicxml +++ b/test/data/grooves/QuandoGSFillBA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuandoGSFillBB.musicxml b/test/data/grooves/QuandoGSFillBB.musicxml index 865fde06..e16c8135 100644 --- a/test/data/grooves/QuandoGSFillBB.musicxml +++ b/test/data/grooves/QuandoGSFillBB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuandoGSFillCC.musicxml b/test/data/grooves/QuandoGSFillCC.musicxml index 76cbcfdd..648cc83c 100644 --- a/test/data/grooves/QuandoGSFillCC.musicxml +++ b/test/data/grooves/QuandoGSFillCC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuandoGSFillDD.musicxml b/test/data/grooves/QuandoGSFillDD.musicxml index d81752d8..d4863d6f 100644 --- a/test/data/grooves/QuandoGSFillDD.musicxml +++ b/test/data/grooves/QuandoGSFillDD.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuandoGSIntroA.musicxml b/test/data/grooves/QuandoGSIntroA.musicxml index 01ced9ba..9037443e 100644 --- a/test/data/grooves/QuandoGSIntroA.musicxml +++ b/test/data/grooves/QuandoGSIntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuandoGSIntroB.musicxml b/test/data/grooves/QuandoGSIntroB.musicxml index 1b93aef0..a5fe84e3 100644 --- a/test/data/grooves/QuandoGSIntroB.musicxml +++ b/test/data/grooves/QuandoGSIntroB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuandoGSIntroC.musicxml b/test/data/grooves/QuandoGSIntroC.musicxml index b3ecb5dc..283f9e23 100644 --- a/test/data/grooves/QuandoGSIntroC.musicxml +++ b/test/data/grooves/QuandoGSIntroC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuandoGSMainA.musicxml b/test/data/grooves/QuandoGSMainA.musicxml index 60f40270..2ee1fd23 100644 --- a/test/data/grooves/QuandoGSMainA.musicxml +++ b/test/data/grooves/QuandoGSMainA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuandoGSMainB.musicxml b/test/data/grooves/QuandoGSMainB.musicxml index d156fc73..12dc41d1 100644 --- a/test/data/grooves/QuandoGSMainB.musicxml +++ b/test/data/grooves/QuandoGSMainB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuandoGSMainC.musicxml b/test/data/grooves/QuandoGSMainC.musicxml index 9e7f776e..53d9283a 100644 --- a/test/data/grooves/QuandoGSMainC.musicxml +++ b/test/data/grooves/QuandoGSMainC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuandoGSMainD.musicxml b/test/data/grooves/QuandoGSMainD.musicxml index 2e9ad8bc..4065c134 100644 --- a/test/data/grooves/QuandoGSMainD.musicxml +++ b/test/data/grooves/QuandoGSMainD.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuickStep.musicxml b/test/data/grooves/QuickStep.musicxml index 047aa53a..83ed9f70 100644 --- a/test/data/grooves/QuickStep.musicxml +++ b/test/data/grooves/QuickStep.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuickStepDuh.musicxml b/test/data/grooves/QuickStepDuh.musicxml index 61565953..708ded4c 100644 --- a/test/data/grooves/QuickStepDuh.musicxml +++ b/test/data/grooves/QuickStepDuh.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuickStepDuhSus.musicxml b/test/data/grooves/QuickStepDuhSus.musicxml index 23a3eb11..2e73ea8f 100644 --- a/test/data/grooves/QuickStepDuhSus.musicxml +++ b/test/data/grooves/QuickStepDuhSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuickStepDuhSusWalk.musicxml b/test/data/grooves/QuickStepDuhSusWalk.musicxml index 91bc4ed9..984287af 100644 --- a/test/data/grooves/QuickStepDuhSusWalk.musicxml +++ b/test/data/grooves/QuickStepDuhSusWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuickStepDuhWalk.musicxml b/test/data/grooves/QuickStepDuhWalk.musicxml index 285a4128..a5ffc6ac 100644 --- a/test/data/grooves/QuickStepDuhWalk.musicxml +++ b/test/data/grooves/QuickStepDuhWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuickStepEnd.musicxml b/test/data/grooves/QuickStepEnd.musicxml index f3a9020b..79e6bd0a 100644 --- a/test/data/grooves/QuickStepEnd.musicxml +++ b/test/data/grooves/QuickStepEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -170,87 +170,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - @@ -258,99 +189,28 @@ G 5 - 6 - + 192 3 - 512th + 16th up circle-x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - + G 5 - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - @@ -358,18 +218,17 @@ G 5 - 3 - + 192 3 - 1024th + 16th up circle-x - + G 5 @@ -398,19 +257,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -421,133 +276,28 @@ G 5 - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up circle-x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - + G 5 - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - @@ -555,31 +305,28 @@ G 5 - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -587,33 +334,28 @@ G 5 - 24 - - - + 192 + 3 - 128th + 16th up - x + circle-x - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -621,33 +363,28 @@ G 5 - 48 - + 192 3 - 64th + 16th up circle-x - + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - circle-x + x - - @@ -655,18 +392,17 @@ G 5 - 3 - + 192 3 - 1024th + 16th up circle-x - + G 5 @@ -695,19 +431,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -718,33 +450,28 @@ G 5 - 48 - + 192 3 - 64th + 16th up circle-x - + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - circle-x + x - - @@ -752,31 +479,28 @@ G 5 - 3 - + 192 3 - 1024th + 16th up circle-x - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -784,33 +508,28 @@ G 5 - 24 - - - + 192 + 3 - 128th + 16th up - x + circle-x - - + G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -818,33 +537,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up circle-x - + G 5 - 24 - - - + 192 + 3 - 128th + 16th up - circle-x + x - - @@ -852,31 +566,28 @@ G 5 - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -884,578 +595,59 @@ G 5 - 24 - - - + 192 + 3 - 128th + 16th up - x + circle-x - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - + + G 5 - 48 - + 192 3 - 64th + 16th up circle-x - + G 5 - 12 - - - + 768 + 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th + quarter up x - diff --git a/test/data/grooves/QuickStepHit.musicxml b/test/data/grooves/QuickStepHit.musicxml index 818ac750..20b527da 100644 --- a/test/data/grooves/QuickStepHit.musicxml +++ b/test/data/grooves/QuickStepHit.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuickStepHitSus.musicxml b/test/data/grooves/QuickStepHitSus.musicxml index da4c7d17..2a8b2427 100644 --- a/test/data/grooves/QuickStepHitSus.musicxml +++ b/test/data/grooves/QuickStepHitSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuickStepHitSusWalk.musicxml b/test/data/grooves/QuickStepHitSusWalk.musicxml index 1d085e4e..51fe07d9 100644 --- a/test/data/grooves/QuickStepHitSusWalk.musicxml +++ b/test/data/grooves/QuickStepHitSusWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuickStepHitWalk.musicxml b/test/data/grooves/QuickStepHitWalk.musicxml index a5eb31b2..6e5753d7 100644 --- a/test/data/grooves/QuickStepHitWalk.musicxml +++ b/test/data/grooves/QuickStepHitWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuickStepIntro.musicxml b/test/data/grooves/QuickStepIntro.musicxml index f20084d1..a7c5ee9e 100644 --- a/test/data/grooves/QuickStepIntro.musicxml +++ b/test/data/grooves/QuickStepIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -256,14 +256,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -274,33 +275,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -308,49 +304,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - @@ -358,33 +333,28 @@ G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -392,24 +362,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -420,33 +391,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -454,49 +420,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - @@ -504,35 +449,32 @@ G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - + + G @@ -548,6 +490,7 @@ + G 5 @@ -566,117 +509,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 192 - 3 16th up x - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - @@ -694,6 +548,7 @@ + G 5 @@ -712,33 +567,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up circle-x - + G 5 - 24 - - - + 192 + 3 - 128th + 16th up - circle-x + x - - @@ -746,49 +596,28 @@ G 5 - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 192 - 3 16th up x - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - @@ -796,37 +625,30 @@ G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - - - G @@ -842,19 +664,18 @@ + G 5 - 48 - + 192 3 - 64th + 16th up x - @@ -862,33 +683,28 @@ G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -896,33 +712,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up circle-x - + G 5 - 24 - - - + 192 + 3 - 128th + 16th up - circle-x + x - - @@ -930,31 +741,28 @@ G 5 - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -962,33 +770,28 @@ G 5 - 24 - - - + 192 + 3 - 128th + 16th up - x + circle-x - - + G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -996,33 +799,28 @@ G 5 - 48 - + 192 3 - 64th + 16th up circle-x - + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - circle-x + x - - @@ -1030,18 +828,17 @@ G 5 - 3 - + 192 3 - 1024th + 16th up circle-x - + G 5 @@ -1070,19 +867,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -1093,33 +886,28 @@ G 5 - 48 - + 192 3 - 64th + 16th up circle-x - + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - circle-x + x - - @@ -1127,65 +915,59 @@ G 5 - 3 - + 192 3 - 1024th + 16th up circle-x - + G 5 - 96 - + 192 3 - 32nd + 16th up x - + + G 5 - 24 - - - + 192 + 3 - 128th + 16th up - x + circle-x - - + G 5 - 6 - + 768 3 - 512th + quarter up x - @@ -1193,967 +975,25 @@ G 5 - 96 - + 768 3 - 32nd + quarter up circle-x - + G 5 - 24 - - - + 768 + 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 576 - - 3 - eighth - + quarter up x diff --git a/test/data/grooves/QuickStepIntro8.musicxml b/test/data/grooves/QuickStepIntro8.musicxml index 4bdd6544..63bd2493 100644 --- a/test/data/grooves/QuickStepIntro8.musicxml +++ b/test/data/grooves/QuickStepIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -600,14 +600,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -618,33 +619,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -652,49 +648,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - @@ -702,33 +677,28 @@ G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -736,24 +706,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -764,33 +735,28 @@ G 5 - 96 - + 384 3 - 32nd + eighth up circle-x - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - circle-x + x - - @@ -798,49 +764,28 @@ G 5 - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - @@ -848,35 +793,32 @@ G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - + + G @@ -892,6 +834,7 @@ + G 5 @@ -910,117 +853,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 192 - 3 16th up x - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - @@ -1038,6 +892,7 @@ + G 5 @@ -1056,33 +911,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up circle-x - + G 5 - 24 - - - + 192 + 3 - 128th + 16th up - circle-x + x - - @@ -1090,49 +940,28 @@ G 5 - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 192 - 3 16th up x - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - @@ -1140,37 +969,30 @@ G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - - - G @@ -1186,19 +1008,18 @@ + G 5 - 48 - + 192 3 - 64th + 16th up x - @@ -1206,33 +1027,28 @@ G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -1240,33 +1056,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up circle-x - + G 5 - 24 - - - + 192 + 3 - 128th + 16th up - circle-x + x - - @@ -1274,31 +1085,28 @@ G 5 - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -1306,33 +1114,28 @@ G 5 - 24 - - - + 192 + 3 - 128th + 16th up - x + circle-x - - + G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1340,33 +1143,28 @@ G 5 - 48 - + 192 3 - 64th + 16th up circle-x - + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - circle-x + x - - @@ -1374,18 +1172,17 @@ G 5 - 3 - + 192 3 - 1024th + 16th up circle-x - + G 5 @@ -1414,19 +1211,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -1437,33 +1230,28 @@ G 5 - 48 - + 192 3 - 64th + 16th up circle-x - + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - circle-x + x - - @@ -1471,65 +1259,59 @@ G 5 - 3 - + 192 3 - 1024th + 16th up circle-x - + G 5 - 96 - + 192 3 - 32nd + 16th up x - + + G 5 - 24 - - - + 192 + 3 - 128th + 16th up - x + circle-x - - + G 5 - 6 - + 768 3 - 512th + quarter up x - @@ -1537,967 +1319,25 @@ G 5 - 96 - + 768 3 - 32nd + quarter up circle-x - + G 5 - 24 - - - + 768 + 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 576 - - 3 - eighth - + quarter up x diff --git a/test/data/grooves/QuickStepSus.musicxml b/test/data/grooves/QuickStepSus.musicxml index 41099b8e..0b4effe6 100644 --- a/test/data/grooves/QuickStepSus.musicxml +++ b/test/data/grooves/QuickStepSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuickStepSusWalk.musicxml b/test/data/grooves/QuickStepSusWalk.musicxml index 8aad5beb..830623f7 100644 --- a/test/data/grooves/QuickStepSusWalk.musicxml +++ b/test/data/grooves/QuickStepSusWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/QuickStepWalk.musicxml b/test/data/grooves/QuickStepWalk.musicxml index 9d7a0b1d..cdad5028 100644 --- a/test/data/grooves/QuickStepWalk.musicxml +++ b/test/data/grooves/QuickStepWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/R&B-Ballad.musicxml b/test/data/grooves/R&B-Ballad.musicxml index 522cbdea..87adcdbe 100644 --- a/test/data/grooves/R&B-Ballad.musicxml +++ b/test/data/grooves/R&B-Ballad.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/R&B-BalladEnd.musicxml b/test/data/grooves/R&B-BalladEnd.musicxml index 1927e6d3..dc9ff72d 100644 --- a/test/data/grooves/R&B-BalladEnd.musicxml +++ b/test/data/grooves/R&B-BalladEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/R&B-BalladFill.musicxml b/test/data/grooves/R&B-BalladFill.musicxml index b0240751..474405fc 100644 --- a/test/data/grooves/R&B-BalladFill.musicxml +++ b/test/data/grooves/R&B-BalladFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/R&B-BalladIntro.musicxml b/test/data/grooves/R&B-BalladIntro.musicxml index 02995509..4d084cc9 100644 --- a/test/data/grooves/R&B-BalladIntro.musicxml +++ b/test/data/grooves/R&B-BalladIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/R&B-BalladPlus.musicxml b/test/data/grooves/R&B-BalladPlus.musicxml index 125466c4..20738db9 100644 --- a/test/data/grooves/R&B-BalladPlus.musicxml +++ b/test/data/grooves/R&B-BalladPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/R&B-BalladSus.musicxml b/test/data/grooves/R&B-BalladSus.musicxml index 0b9f982e..48f7663d 100644 --- a/test/data/grooves/R&B-BalladSus.musicxml +++ b/test/data/grooves/R&B-BalladSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/R&B-BalladSusPlus.musicxml b/test/data/grooves/R&B-BalladSusPlus.musicxml index b86eac8d..9f14d366 100644 --- a/test/data/grooves/R&B-BalladSusPlus.musicxml +++ b/test/data/grooves/R&B-BalladSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/R&B.musicxml b/test/data/grooves/R&B.musicxml index fbde81b0..0d817869 100644 --- a/test/data/grooves/R&B.musicxml +++ b/test/data/grooves/R&B.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/R&BEnd.musicxml b/test/data/grooves/R&BEnd.musicxml index 4b1847e8..7fb6d770 100644 --- a/test/data/grooves/R&BEnd.musicxml +++ b/test/data/grooves/R&BEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/R&BFill.musicxml b/test/data/grooves/R&BFill.musicxml index ffb83c9c..8f79931d 100644 --- a/test/data/grooves/R&BFill.musicxml +++ b/test/data/grooves/R&BFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/R&BIntro.musicxml b/test/data/grooves/R&BIntro.musicxml index 9a87efd3..e5d4778e 100644 --- a/test/data/grooves/R&BIntro.musicxml +++ b/test/data/grooves/R&BIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/R&BPlus.musicxml b/test/data/grooves/R&BPlus.musicxml index 33dfb67b..24873aac 100644 --- a/test/data/grooves/R&BPlus.musicxml +++ b/test/data/grooves/R&BPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/R&BSus.musicxml b/test/data/grooves/R&BSus.musicxml index ce06eb33..e65aec6e 100644 --- a/test/data/grooves/R&BSus.musicxml +++ b/test/data/grooves/R&BSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/R&BSusPlus.musicxml b/test/data/grooves/R&BSusPlus.musicxml index 2db60c36..8ad0d50b 100644 --- a/test/data/grooves/R&BSusPlus.musicxml +++ b/test/data/grooves/R&BSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/REGG01.musicxml b/test/data/grooves/REGG01.musicxml index 9ba21846..6afc7d1e 100644 --- a/test/data/grooves/REGG01.musicxml +++ b/test/data/grooves/REGG01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -266,25 +266,25 @@ E 4 - 192 + 768 1 - 16th + quarter up x + E 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/REGG02.musicxml b/test/data/grooves/REGG02.musicxml index 85b3b202..30e02f04 100644 --- a/test/data/grooves/REGG02.musicxml +++ b/test/data/grooves/REGG02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -306,25 +306,25 @@ E 4 - 192 + 768 1 - 16th + quarter up x + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -385,81 +385,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - + 256 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 288 - - - 1 - 16th - - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -467,23 +411,32 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + diff --git a/test/data/grooves/REGG03.musicxml b/test/data/grooves/REGG03.musicxml index 76c6f122..82d7cf18 100644 --- a/test/data/grooves/REGG03.musicxml +++ b/test/data/grooves/REGG03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -236,98 +236,25 @@ - 192 - + 614.4 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - - 1 - eighth - up - x - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - x + half + + 5 + 2 + half + - - + + + 5 + half + + + 2 + half + + @@ -335,15 +262,18 @@ E 4 - 6 - + 614.4 1 - 512th + half + + 5 + 2 + half + up x - @@ -351,10 +281,15 @@ E 4 - 192 + 614.4 1 - 16th + half + + 5 + 2 + half + up x @@ -365,11 +300,15 @@ E 4 - 576 + 614.4 1 - eighth - + half + + 5 + 2 + half + up normal @@ -377,108 +316,41 @@ - 768 + 614.4 1 - quarter + half + + 5 + 2 + half + + - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - x - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -486,15 +358,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + diff --git a/test/data/grooves/REGG04.musicxml b/test/data/grooves/REGG04.musicxml index ba02923a..325e622c 100644 --- a/test/data/grooves/REGG04.musicxml +++ b/test/data/grooves/REGG04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK01.musicxml b/test/data/grooves/ROCK01.musicxml index 2bdfaf9d..b4f29dfb 100644 --- a/test/data/grooves/ROCK01.musicxml +++ b/test/data/grooves/ROCK01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK02.musicxml b/test/data/grooves/ROCK02.musicxml index 4b15fa43..dfa81361 100644 --- a/test/data/grooves/ROCK02.musicxml +++ b/test/data/grooves/ROCK02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -485,10 +485,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -497,15 +497,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -566,10 +571,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -578,15 +583,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/ROCK03.musicxml b/test/data/grooves/ROCK03.musicxml index 12709935..72e5ef91 100644 --- a/test/data/grooves/ROCK03.musicxml +++ b/test/data/grooves/ROCK03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK04.musicxml b/test/data/grooves/ROCK04.musicxml index 223db687..6b6c8a9e 100644 --- a/test/data/grooves/ROCK04.musicxml +++ b/test/data/grooves/ROCK04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK05.musicxml b/test/data/grooves/ROCK05.musicxml index b3b1b8d9..b9b81e85 100644 --- a/test/data/grooves/ROCK05.musicxml +++ b/test/data/grooves/ROCK05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK06.musicxml b/test/data/grooves/ROCK06.musicxml index 7559afd4..30ba793d 100644 --- a/test/data/grooves/ROCK06.musicxml +++ b/test/data/grooves/ROCK06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK07.musicxml b/test/data/grooves/ROCK07.musicxml index 0edfa806..e5a0206d 100644 --- a/test/data/grooves/ROCK07.musicxml +++ b/test/data/grooves/ROCK07.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -326,22 +326,25 @@ - 384 - + 512 2 - eighth - - - - - - - 192 - - 2 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -349,10 +352,15 @@ D 5 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -363,13 +371,19 @@ D 5 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/ROCK08.musicxml b/test/data/grooves/ROCK08.musicxml index 6046f23f..15623e42 100644 --- a/test/data/grooves/ROCK08.musicxml +++ b/test/data/grooves/ROCK08.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK09.musicxml b/test/data/grooves/ROCK09.musicxml index d382371e..86122c9f 100644 --- a/test/data/grooves/ROCK09.musicxml +++ b/test/data/grooves/ROCK09.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK10.musicxml b/test/data/grooves/ROCK10.musicxml index ce4a9ad9..1d530e39 100644 --- a/test/data/grooves/ROCK10.musicxml +++ b/test/data/grooves/ROCK10.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -339,38 +339,6 @@ - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - E @@ -589,38 +557,6 @@ - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - E diff --git a/test/data/grooves/ROCK11.musicxml b/test/data/grooves/ROCK11.musicxml index 24c60c4b..f5864022 100644 --- a/test/data/grooves/ROCK11.musicxml +++ b/test/data/grooves/ROCK11.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK12.musicxml b/test/data/grooves/ROCK12.musicxml index 6fcfc0f9..2409676b 100644 --- a/test/data/grooves/ROCK12.musicxml +++ b/test/data/grooves/ROCK12.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK13.musicxml b/test/data/grooves/ROCK13.musicxml index 72725030..cf1208e3 100644 --- a/test/data/grooves/ROCK13.musicxml +++ b/test/data/grooves/ROCK13.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK14.musicxml b/test/data/grooves/ROCK14.musicxml index 806185ea..f39c3268 100644 --- a/test/data/grooves/ROCK14.musicxml +++ b/test/data/grooves/ROCK14.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK15.musicxml b/test/data/grooves/ROCK15.musicxml index a907e98b..a83a8ad2 100644 --- a/test/data/grooves/ROCK15.musicxml +++ b/test/data/grooves/ROCK15.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK16.musicxml b/test/data/grooves/ROCK16.musicxml index 34c0c053..594b1258 100644 --- a/test/data/grooves/ROCK16.musicxml +++ b/test/data/grooves/ROCK16.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK17.musicxml b/test/data/grooves/ROCK17.musicxml index 41319f0b..eda2c35a 100644 --- a/test/data/grooves/ROCK17.musicxml +++ b/test/data/grooves/ROCK17.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -792,14 +792,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -920,14 +921,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x diff --git a/test/data/grooves/ROCK18.musicxml b/test/data/grooves/ROCK18.musicxml index 4cf3ca9b..603b0bff 100644 --- a/test/data/grooves/ROCK18.musicxml +++ b/test/data/grooves/ROCK18.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK19.musicxml b/test/data/grooves/ROCK19.musicxml index 233c61b2..03fb6232 100644 --- a/test/data/grooves/ROCK19.musicxml +++ b/test/data/grooves/ROCK19.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK20.musicxml b/test/data/grooves/ROCK20.musicxml index ebe80149..fea44b47 100644 --- a/test/data/grooves/ROCK20.musicxml +++ b/test/data/grooves/ROCK20.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK21.musicxml b/test/data/grooves/ROCK21.musicxml index 9e007437..585112ba 100644 --- a/test/data/grooves/ROCK21.musicxml +++ b/test/data/grooves/ROCK21.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK22.musicxml b/test/data/grooves/ROCK22.musicxml index 475d98d3..d38da36b 100644 --- a/test/data/grooves/ROCK22.musicxml +++ b/test/data/grooves/ROCK22.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK23.musicxml b/test/data/grooves/ROCK23.musicxml index bb999c0a..85f212aa 100644 --- a/test/data/grooves/ROCK23.musicxml +++ b/test/data/grooves/ROCK23.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK24.musicxml b/test/data/grooves/ROCK24.musicxml index 39352350..67a48176 100644 --- a/test/data/grooves/ROCK24.musicxml +++ b/test/data/grooves/ROCK24.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK25.musicxml b/test/data/grooves/ROCK25.musicxml index 76b6eb6a..dda9dcd8 100644 --- a/test/data/grooves/ROCK25.musicxml +++ b/test/data/grooves/ROCK25.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK26.musicxml b/test/data/grooves/ROCK26.musicxml index 96a14665..25c2ec23 100644 --- a/test/data/grooves/ROCK26.musicxml +++ b/test/data/grooves/ROCK26.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ROCK27.musicxml b/test/data/grooves/ROCK27.musicxml index d9d66e41..d22d11bc 100644 --- a/test/data/grooves/ROCK27.musicxml +++ b/test/data/grooves/ROCK27.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -568,15 +568,15 @@ + A 5 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/ROCK28.musicxml b/test/data/grooves/ROCK28.musicxml index 79384f64..0ed9d28a 100644 --- a/test/data/grooves/ROCK28.musicxml +++ b/test/data/grooves/ROCK28.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Rave.musicxml b/test/data/grooves/Rave.musicxml index c971ae0e..c1219549 100644 --- a/test/data/grooves/Rave.musicxml +++ b/test/data/grooves/Rave.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -407,1161 +407,28 @@ G 5 - 192 - + 256 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -1569,15 +436,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1585,13 +455,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up circle-x + @@ -1599,33 +475,47 @@ G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - @@ -1633,17 +523,19 @@ G 5 - 12 - - - + 256 + 3 - 256th + eighth + + 3 + 2 + eighth + up - x + circle-x - - + @@ -1651,65 +543,47 @@ G 5 - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1717,13 +591,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up circle-x + @@ -1731,15 +611,28 @@ G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -1747,51 +640,69 @@ G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - - + G 5 - 12 - - - + 256 + 3 - 256th + eighth + + 3 + 2 + eighth + up - x + circle-x - - + + + G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -1799,15 +710,18 @@ G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - @@ -1815,17 +729,19 @@ G 5 - 24 - - - + 256 + 3 - 128th + eighth + + 3 + 2 + eighth + up - x + circle-x - - + @@ -1833,45 +749,47 @@ G 5 - 6 - + 256 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 eighth + + 3 + 2 + eighth + up - circle-x + x + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - @@ -1879,17 +797,19 @@ G 5 - 48 - - - + 256 + 3 - 64th + eighth + + 3 + 2 + eighth + up - x + circle-x - - + @@ -1897,17 +817,28 @@ G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -1915,15 +846,18 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - @@ -1931,15 +865,19 @@ G 5 - 96 - - + 256 + 3 - 32nd + eighth + + 3 + 2 + eighth + up - x + circle-x - + @@ -1947,17 +885,28 @@ G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -1965,15 +914,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1981,67 +933,50 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up circle-x + - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - + G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -2049,15 +984,18 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - @@ -2065,15 +1003,19 @@ G 5 - 96 - - + 256 + 3 - 32nd + eighth + + 3 + 2 + eighth + up - x + circle-x - + @@ -2081,33 +1023,47 @@ G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -2115,13 +1071,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up circle-x + @@ -2129,15 +1091,28 @@ G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -2145,17 +1120,18 @@ G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - @@ -2163,17 +1139,19 @@ G 5 - 12 - - - + 256 + 3 - 256th + eighth + + 3 + 2 + eighth + up - x + circle-x - - + @@ -2181,49 +1159,47 @@ G 5 - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - @@ -2231,81 +1207,50 @@ G 5 - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 + 256 3 eighth + + 3 + 2 + eighth + up circle-x + + + G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -2313,15 +1258,18 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - @@ -2329,15 +1277,19 @@ G 5 - 96 - - + 256 + 3 - 32nd + eighth + + 3 + 2 + eighth + up - x + circle-x - + @@ -2345,33 +1297,47 @@ G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -2379,13 +1345,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up circle-x + @@ -2393,51 +1365,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -2445,15 +1394,18 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - @@ -2461,15 +1413,19 @@ G 5 - 96 - - + 256 + 3 - 32nd + eighth + + 3 + 2 + eighth + up - x + circle-x - + @@ -2477,17 +1433,28 @@ G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -2495,15 +1462,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -2511,13 +1481,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up circle-x + diff --git a/test/data/grooves/RaveEnd.musicxml b/test/data/grooves/RaveEnd.musicxml index 1eabcf7f..8d810e99 100644 --- a/test/data/grooves/RaveEnd.musicxml +++ b/test/data/grooves/RaveEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -330,6 +330,21 @@ + + + + G + 5 + + 192 + + 3 + 16th + up + x + + + G @@ -430,23 +445,23 @@ - + G 5 96 - + 3 32nd up - x + circle-x - + G 5 @@ -454,80 +469,78 @@ 24 - + 3 128th up - x + circle-x - + G 5 6 - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - 3 - 64th + 512th up circle-x - + - + G 5 - 12 - - - + 128 + 3 - 256th + 16th + + 3 + 2 + 16th + up - circle-x + x - - + + + 3 + 16th + + + 2 + 16th + + - + G 5 - 3 - - + 128 + 3 - 1024th + 16th + + 3 + 2 + 16th + up - circle-x + x - @@ -535,13 +548,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -549,15 +568,10 @@ G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -578,19 +592,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -696,23 +706,23 @@ - + G 5 96 - + 3 32nd up - x + circle-x - + G 5 @@ -720,28 +730,28 @@ 24 - + 3 128th up - x + circle-x - + G 5 6 - + 3 512th up - x + circle-x @@ -751,15 +761,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -767,17 +790,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -785,48 +809,19 @@ G 5 - 3 - + 128 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 16th - up - circle-x - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - + + 3 + 2 + 16th + up x + @@ -834,14 +829,10 @@ G 5 - 186 + 192 3 - 32nd - - - - + 16th up x @@ -862,19 +853,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -980,23 +967,23 @@ - + G 5 96 - + 3 32nd up - x + circle-x - + G 5 @@ -1004,28 +991,28 @@ 24 - + 3 128th up - x + circle-x - + G 5 6 - + 3 512th up - x + circle-x @@ -1035,15 +1022,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1051,17 +1051,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1069,48 +1070,19 @@ G 5 - 3 - + 128 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 16th - up - circle-x - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - + + 3 + 2 + 16th + up x + @@ -1118,14 +1090,10 @@ G 5 - 186 + 192 3 - 32nd - - - - + 16th up x @@ -1146,19 +1114,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -1264,23 +1228,23 @@ - + G 5 96 - + 3 32nd up - x + circle-x - + G 5 @@ -1288,28 +1252,28 @@ 24 - + 3 128th up - x + circle-x - + G 5 6 - + 3 512th up - x + circle-x @@ -1319,15 +1283,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1335,17 +1312,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1353,48 +1331,19 @@ G 5 - 3 - + 128 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 16th - up - circle-x - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - + + 3 + 2 + 16th + up x + @@ -1402,14 +1351,10 @@ G 5 - 186 + 192 3 - 32nd - - - - + 16th up x @@ -1432,171 +1377,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 3 - + 768 3 - 1024th + quarter up x - diff --git a/test/data/grooves/RaveIntro.musicxml b/test/data/grooves/RaveIntro.musicxml index 0fda27ae..bd65f249 100644 --- a/test/data/grooves/RaveIntro.musicxml +++ b/test/data/grooves/RaveIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -419,15 +419,28 @@ G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -435,17 +448,18 @@ G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - @@ -453,17 +467,19 @@ G 5 - 12 - - - + 256 + 3 - 256th + eighth + + 3 + 2 + eighth + up - x + circle-x - - + @@ -471,31 +487,47 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - @@ -503,17 +535,19 @@ G 5 - 24 - - - + 256 + 3 - 128th + eighth + + 3 + 2 + eighth + up - x + circle-x - - + @@ -521,29 +555,28 @@ G 5 - 6 - + 256 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 eighth + + 3 + 2 + eighth + up - circle-x + x + + + 3 + eighth + + + 2 + eighth + + @@ -551,15 +584,18 @@ G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - @@ -567,17 +603,19 @@ G 5 - 48 - - - + 256 + 3 - 64th + eighth + + 3 + 2 + eighth + up - x + circle-x - - + @@ -585,17 +623,28 @@ G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -603,15 +652,18 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - @@ -619,49 +671,69 @@ G 5 - 96 - - + 256 + 3 - 32nd + eighth + + 3 + 2 + eighth + up - x + circle-x - + - + + + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -669,13 +741,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up circle-x + @@ -683,33 +761,47 @@ G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - @@ -717,17 +809,19 @@ G 5 - 12 - - - + 256 + 3 - 256th + eighth + + 3 + 2 + eighth + up - x + circle-x - - + @@ -735,15 +829,28 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -751,15 +858,18 @@ G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - @@ -767,17 +877,19 @@ G 5 - 24 - - - + 256 + 3 - 128th + eighth + + 3 + 2 + eighth + up - x + circle-x - - + @@ -785,15 +897,28 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -801,47 +926,69 @@ G 5 - 384 - + 256 + 3 eighth + + 3 + 2 + eighth + up - circle-x + x - + G 5 - 192 - - + 256 + 3 - 16th + eighth + + 3 + 2 + eighth + up - x + circle-x - + + + G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -849,17 +996,18 @@ G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - @@ -867,15 +1015,19 @@ G 5 - 3 - - + 256 + 3 - 1024th + eighth + + 3 + 2 + eighth + up - x + circle-x - + @@ -883,33 +1035,47 @@ G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - @@ -917,1321 +1083,159 @@ G 5 - 6 - - + 256 + 3 - 512th + eighth + + 3 + 2 + eighth + up - x + circle-x - + - + G 5 - 384 - + 256 + 3 eighth + + 3 + 2 + eighth + up - circle-x + x + + + 3 + eighth + + + 2 + eighth + + - - G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - G 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 48 - - + + 256 + 3 - 64th + eighth + + 3 + 2 + eighth + up - x + circle-x - + - + G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - - + G 5 - 192 - + 256 + 3 - 16th + eighth + + 3 + 2 + eighth + up - x + circle-x + + + G @@ -2247,19 +1251,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -2370,15 +1370,28 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2386,17 +1399,18 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - @@ -2404,15 +1418,19 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - + @@ -2420,15 +1438,13 @@ G 5 - 48 - + 192 3 - 64th + 16th up x - @@ -2436,33 +1452,28 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -2470,13 +1481,15 @@ G 5 - 192 + 48 + 3 - 16th + 64th up x + @@ -2484,18 +1497,17 @@ G 5 - 189 + 12 + + 3 - 32nd - - - - - + 256th up x + + @@ -2503,13 +1515,15 @@ G 5 - 192 + 3 + 3 - 16th + 1024th up x + @@ -2517,18 +1531,15 @@ G 5 - 189 + 96 + 3 32nd - - - - - up x + @@ -2536,15 +1547,17 @@ G 5 - 48 + 24 + 3 - 64th + 128th up x + @@ -2552,16 +1565,14 @@ G 5 - 12 - + 6 3 - 256th + 512th up x - @@ -2570,15 +1581,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2586,15 +1610,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -2602,17 +1629,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -2620,15 +1649,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -2636,33 +1663,44 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - + G 5 - 24 + 192 + + 3 + 16th + up + x + + + + + + G + 5 + + 48 - 3 - 128th + 64th up x - @@ -2670,14 +1708,16 @@ G 5 - 6 + 12 + 3 - 512th + 256th up x + @@ -2686,15 +1726,15 @@ G 5 - 48 - + 3 + 3 - 64th + 1024th up x - + @@ -2702,17 +1742,15 @@ G 5 - 12 + 96 - 3 - 256th + 32nd up x - @@ -2720,14 +1758,16 @@ G 5 - 3 + 24 + 3 - 1024th + 128th up x + @@ -2736,13 +1776,15 @@ G 5 - 192 + 6 + 3 - 16th + 512th up x + @@ -2750,18 +1792,28 @@ G 5 - 189 + 128 3 - 32nd - - - - - + 16th + + 3 + 2 + 16th + up x + + + 3 + 16th + + + 2 + 16th + + @@ -2769,10 +1821,15 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x @@ -2783,18 +1840,19 @@ G 5 - 189 + 128 3 - 32nd - - - - - + 16th + + 3 + 2 + 16th + up x + @@ -2802,15 +1860,13 @@ G 5 - 48 - + 192 3 - 64th + 16th up x - @@ -2818,33 +1874,28 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -2852,11 +1903,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -2868,12 +1919,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -2886,11 +1937,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -2952,15 +2003,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2968,17 +2032,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -2986,15 +2051,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -3011,25 +2080,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - diff --git a/test/data/grooves/Rhumba.musicxml b/test/data/grooves/Rhumba.musicxml index f8e04511..d088db2e 100644 --- a/test/data/grooves/Rhumba.musicxml +++ b/test/data/grooves/Rhumba.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1250,117 +1250,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/Rhumba1.musicxml b/test/data/grooves/Rhumba1.musicxml index 204f50a2..8292e1dc 100644 --- a/test/data/grooves/Rhumba1.musicxml +++ b/test/data/grooves/Rhumba1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1250,117 +1250,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/Rhumba1Sus.musicxml b/test/data/grooves/Rhumba1Sus.musicxml index dd04d0df..55ce42f8 100644 --- a/test/data/grooves/Rhumba1Sus.musicxml +++ b/test/data/grooves/Rhumba1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1250,117 +1250,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/Rhumba2.musicxml b/test/data/grooves/Rhumba2.musicxml index fd270432..098aa7cd 100644 --- a/test/data/grooves/Rhumba2.musicxml +++ b/test/data/grooves/Rhumba2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1250,117 +1250,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/Rhumba2Sus.musicxml b/test/data/grooves/Rhumba2Sus.musicxml index 804813e5..9a3a494e 100644 --- a/test/data/grooves/Rhumba2Sus.musicxml +++ b/test/data/grooves/Rhumba2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1250,117 +1250,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/Rhumba3.musicxml b/test/data/grooves/Rhumba3.musicxml index 4076dd52..45f88a5c 100644 --- a/test/data/grooves/Rhumba3.musicxml +++ b/test/data/grooves/Rhumba3.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1250,117 +1250,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/Rhumba3Sus.musicxml b/test/data/grooves/Rhumba3Sus.musicxml index e1df9899..8a5fb5f1 100644 --- a/test/data/grooves/Rhumba3Sus.musicxml +++ b/test/data/grooves/Rhumba3Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1250,117 +1250,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/RhumbaEnd.musicxml b/test/data/grooves/RhumbaEnd.musicxml index 12f7fa97..b58f7ab6 100644 --- a/test/data/grooves/RhumbaEnd.musicxml +++ b/test/data/grooves/RhumbaEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1250,117 +1250,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/RhumbaEnd1.musicxml b/test/data/grooves/RhumbaEnd1.musicxml index 09c63561..fb237aa6 100644 --- a/test/data/grooves/RhumbaEnd1.musicxml +++ b/test/data/grooves/RhumbaEnd1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RhumbaIntro.musicxml b/test/data/grooves/RhumbaIntro.musicxml index b93a0072..ca4abea5 100644 --- a/test/data/grooves/RhumbaIntro.musicxml +++ b/test/data/grooves/RhumbaIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RhumbaSus.musicxml b/test/data/grooves/RhumbaSus.musicxml index 4cebcea5..c4e4c0be 100644 --- a/test/data/grooves/RhumbaSus.musicxml +++ b/test/data/grooves/RhumbaSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1250,117 +1250,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 384 1 - 256th + eighth up normal - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/RhumbaTriple.musicxml b/test/data/grooves/RhumbaTriple.musicxml index 3a9e36fa..18979d8b 100644 --- a/test/data/grooves/RhumbaTriple.musicxml +++ b/test/data/grooves/RhumbaTriple.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RhumbaTriple12.musicxml b/test/data/grooves/RhumbaTriple12.musicxml index 4acb3663..cbffbe9a 100644 --- a/test/data/grooves/RhumbaTriple12.musicxml +++ b/test/data/grooves/RhumbaTriple12.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RhumbaTriple12Sus.musicxml b/test/data/grooves/RhumbaTriple12Sus.musicxml index 0856ac5a..fd12d8aa 100644 --- a/test/data/grooves/RhumbaTriple12Sus.musicxml +++ b/test/data/grooves/RhumbaTriple12Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RhumbaTriple34.musicxml b/test/data/grooves/RhumbaTriple34.musicxml index 91b4fd1f..e78b427e 100644 --- a/test/data/grooves/RhumbaTriple34.musicxml +++ b/test/data/grooves/RhumbaTriple34.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RhumbaTriple34Sus.musicxml b/test/data/grooves/RhumbaTriple34Sus.musicxml index 3a7dc65e..fafe53e7 100644 --- a/test/data/grooves/RhumbaTriple34Sus.musicxml +++ b/test/data/grooves/RhumbaTriple34Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RhumbaTripleSus.musicxml b/test/data/grooves/RhumbaTripleSus.musicxml index a46b9fe4..5b45d1b2 100644 --- a/test/data/grooves/RhumbaTripleSus.musicxml +++ b/test/data/grooves/RhumbaTripleSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RnB01.musicxml b/test/data/grooves/RnB01.musicxml index d3f61c11..e034e4cf 100644 --- a/test/data/grooves/RnB01.musicxml +++ b/test/data/grooves/RnB01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RnB02.musicxml b/test/data/grooves/RnB02.musicxml index 3d92fb48..bb6ca56c 100644 --- a/test/data/grooves/RnB02.musicxml +++ b/test/data/grooves/RnB02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RnB03.musicxml b/test/data/grooves/RnB03.musicxml index 47d5e9f4..3b58f578 100644 --- a/test/data/grooves/RnB03.musicxml +++ b/test/data/grooves/RnB03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RnB04.musicxml b/test/data/grooves/RnB04.musicxml index f7d14f07..9d673644 100644 --- a/test/data/grooves/RnB04.musicxml +++ b/test/data/grooves/RnB04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RnB05.musicxml b/test/data/grooves/RnB05.musicxml index c85655ce..0ff8bfc2 100644 --- a/test/data/grooves/RnB05.musicxml +++ b/test/data/grooves/RnB05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -552,6 +552,7 @@ + G 5 @@ -570,83 +571,13 @@ G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - @@ -654,15 +585,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -850,38 +779,6 @@ - - - 96 - - 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th - - - - G @@ -1066,34 +963,25 @@ - 96 - - 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - + 128 3 - 512th - - + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -1101,33 +989,18 @@ G 5 - 48 - + 128 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1135,15 +1008,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1161,6 +1038,7 @@ + G 5 @@ -1174,56 +1052,6 @@ - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - G @@ -1292,38 +1120,6 @@ - - - 48 - - 3 - 64th - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - G diff --git a/test/data/grooves/RnB06.musicxml b/test/data/grooves/RnB06.musicxml index 7a58a1d8..19028686 100644 --- a/test/data/grooves/RnB06.musicxml +++ b/test/data/grooves/RnB06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RnB07.musicxml b/test/data/grooves/RnB07.musicxml index a79a47e9..6bb13731 100644 --- a/test/data/grooves/RnB07.musicxml +++ b/test/data/grooves/RnB07.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RnB08.musicxml b/test/data/grooves/RnB08.musicxml index 6c03dfe7..362cbf47 100644 --- a/test/data/grooves/RnB08.musicxml +++ b/test/data/grooves/RnB08.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RnB09.musicxml b/test/data/grooves/RnB09.musicxml index 94b405d5..e114d64b 100644 --- a/test/data/grooves/RnB09.musicxml +++ b/test/data/grooves/RnB09.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RnB10.musicxml b/test/data/grooves/RnB10.musicxml index 208d2231..91712a70 100644 --- a/test/data/grooves/RnB10.musicxml +++ b/test/data/grooves/RnB10.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -490,22 +490,25 @@ - 384 - - 3 - eighth - - - - - - - 192 - + 512 3 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -513,10 +516,15 @@ F 5 - 192 + 512 3 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -524,10 +532,16 @@ - 768 + 512 3 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/Rock128.musicxml b/test/data/grooves/Rock128.musicxml index 5ad25215..76c60c10 100644 --- a/test/data/grooves/Rock128.musicxml +++ b/test/data/grooves/Rock128.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Rock128End.musicxml b/test/data/grooves/Rock128End.musicxml index f694814d..9004a46b 100644 --- a/test/data/grooves/Rock128End.musicxml +++ b/test/data/grooves/Rock128End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Rock128Intro.musicxml b/test/data/grooves/Rock128Intro.musicxml index ae9f17d9..7172f81e 100644 --- a/test/data/grooves/Rock128Intro.musicxml +++ b/test/data/grooves/Rock128Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Rock128IntroSus.musicxml b/test/data/grooves/Rock128IntroSus.musicxml index 6ca0eb33..479da587 100644 --- a/test/data/grooves/Rock128IntroSus.musicxml +++ b/test/data/grooves/Rock128IntroSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Rock128Plain.musicxml b/test/data/grooves/Rock128Plain.musicxml index 50747e23..a7ac1259 100644 --- a/test/data/grooves/Rock128Plain.musicxml +++ b/test/data/grooves/Rock128Plain.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Rock128PlainPlus.musicxml b/test/data/grooves/Rock128PlainPlus.musicxml index aa68b440..55eb040b 100644 --- a/test/data/grooves/Rock128PlainPlus.musicxml +++ b/test/data/grooves/Rock128PlainPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Rock128PlainSus.musicxml b/test/data/grooves/Rock128PlainSus.musicxml index 14a72cb7..3c183621 100644 --- a/test/data/grooves/Rock128PlainSus.musicxml +++ b/test/data/grooves/Rock128PlainSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Rock128PlainSusPlus.musicxml b/test/data/grooves/Rock128PlainSusPlus.musicxml index 5e7b8870..ee531683 100644 --- a/test/data/grooves/Rock128PlainSusPlus.musicxml +++ b/test/data/grooves/Rock128PlainSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Rock128Plus.musicxml b/test/data/grooves/Rock128Plus.musicxml index 5412e5ef..168481f2 100644 --- a/test/data/grooves/Rock128Plus.musicxml +++ b/test/data/grooves/Rock128Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Rock128Sus.musicxml b/test/data/grooves/Rock128Sus.musicxml index e1ea072c..2373babf 100644 --- a/test/data/grooves/Rock128Sus.musicxml +++ b/test/data/grooves/Rock128Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Rock128SusPlus.musicxml b/test/data/grooves/Rock128SusPlus.musicxml index 51137b58..12492bc4 100644 --- a/test/data/grooves/Rock128SusPlus.musicxml +++ b/test/data/grooves/Rock128SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Rock1End.musicxml b/test/data/grooves/Rock1End.musicxml index 6fee9ea3..a6f2d5ca 100644 --- a/test/data/grooves/Rock1End.musicxml +++ b/test/data/grooves/Rock1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Rock1Intro.musicxml b/test/data/grooves/Rock1Intro.musicxml index ee99cca2..23d49573 100644 --- a/test/data/grooves/Rock1Intro.musicxml +++ b/test/data/grooves/Rock1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Rock2.musicxml b/test/data/grooves/Rock2.musicxml index 0e7499a6..2bc30206 100644 --- a/test/data/grooves/Rock2.musicxml +++ b/test/data/grooves/Rock2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -835,117 +835,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - diff --git a/test/data/grooves/Rock2End.musicxml b/test/data/grooves/Rock2End.musicxml index 2bf043c9..b5146ceb 100644 --- a/test/data/grooves/Rock2End.musicxml +++ b/test/data/grooves/Rock2End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -307,87 +307,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - @@ -395,15 +326,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -411,99 +340,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -535,87 +393,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - @@ -623,15 +412,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -639,99 +426,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -763,87 +479,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - @@ -851,15 +498,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -867,99 +512,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -991,87 +565,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - @@ -1079,15 +584,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1095,99 +598,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - diff --git a/test/data/grooves/Rock2Intro.musicxml b/test/data/grooves/Rock2Intro.musicxml index cbaf1bfc..d8fa5b74 100644 --- a/test/data/grooves/Rock2Intro.musicxml +++ b/test/data/grooves/Rock2Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -759,87 +759,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - @@ -847,15 +778,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -863,99 +792,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -987,87 +845,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - @@ -1075,15 +864,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1091,99 +878,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -1215,87 +931,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - @@ -1303,15 +950,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1319,99 +964,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - @@ -1443,87 +1017,18 @@ + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - @@ -1531,15 +1036,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1547,99 +1050,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 192 3 - 1024th + 16th up x - diff --git a/test/data/grooves/RockBallad.musicxml b/test/data/grooves/RockBallad.musicxml index 42ac3394..69b0f881 100644 --- a/test/data/grooves/RockBallad.musicxml +++ b/test/data/grooves/RockBallad.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockBallad1.musicxml b/test/data/grooves/RockBallad1.musicxml index 036e5653..2a846d92 100644 --- a/test/data/grooves/RockBallad1.musicxml +++ b/test/data/grooves/RockBallad1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockBallad1Fill.musicxml b/test/data/grooves/RockBallad1Fill.musicxml index 2b676568..6a380643 100644 --- a/test/data/grooves/RockBallad1Fill.musicxml +++ b/test/data/grooves/RockBallad1Fill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockBallad1Voice.musicxml b/test/data/grooves/RockBallad1Voice.musicxml index 0af2ef33..b86938b4 100644 --- a/test/data/grooves/RockBallad1Voice.musicxml +++ b/test/data/grooves/RockBallad1Voice.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockBalladEnd.musicxml b/test/data/grooves/RockBalladEnd.musicxml index 50463c63..e7b8019c 100644 --- a/test/data/grooves/RockBalladEnd.musicxml +++ b/test/data/grooves/RockBalladEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockBalladEnd1.musicxml b/test/data/grooves/RockBalladEnd1.musicxml index c83a5a4d..b0a65c2a 100644 --- a/test/data/grooves/RockBalladEnd1.musicxml +++ b/test/data/grooves/RockBalladEnd1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockBalladFill.musicxml b/test/data/grooves/RockBalladFill.musicxml index cbee86ef..a93ff39b 100644 --- a/test/data/grooves/RockBalladFill.musicxml +++ b/test/data/grooves/RockBalladFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockBalladIntro.musicxml b/test/data/grooves/RockBalladIntro.musicxml index a32c6714..3895c8d8 100644 --- a/test/data/grooves/RockBalladIntro.musicxml +++ b/test/data/grooves/RockBalladIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockBalladSusIntro.musicxml b/test/data/grooves/RockBalladSusIntro.musicxml index 7d5d6745..a5a42e5e 100644 --- a/test/data/grooves/RockBalladSusIntro.musicxml +++ b/test/data/grooves/RockBalladSusIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockBalladVoice.musicxml b/test/data/grooves/RockBalladVoice.musicxml index efbda89d..c3053158 100644 --- a/test/data/grooves/RockBalladVoice.musicxml +++ b/test/data/grooves/RockBalladVoice.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockWaltz.musicxml b/test/data/grooves/RockWaltz.musicxml index 40e2e40a..ed6dd2b7 100644 --- a/test/data/grooves/RockWaltz.musicxml +++ b/test/data/grooves/RockWaltz.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockWaltz1.musicxml b/test/data/grooves/RockWaltz1.musicxml index 83d96bf0..d936b7c9 100644 --- a/test/data/grooves/RockWaltz1.musicxml +++ b/test/data/grooves/RockWaltz1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockWaltz1Intro.musicxml b/test/data/grooves/RockWaltz1Intro.musicxml index 13c1a419..e2c7908e 100644 --- a/test/data/grooves/RockWaltz1Intro.musicxml +++ b/test/data/grooves/RockWaltz1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockWaltz1Sus.musicxml b/test/data/grooves/RockWaltz1Sus.musicxml index f96b1928..bf1ead2d 100644 --- a/test/data/grooves/RockWaltz1Sus.musicxml +++ b/test/data/grooves/RockWaltz1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockWaltz1Walk.musicxml b/test/data/grooves/RockWaltz1Walk.musicxml index 868779c2..8a8497b6 100644 --- a/test/data/grooves/RockWaltz1Walk.musicxml +++ b/test/data/grooves/RockWaltz1Walk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockWaltz1WalkSus.musicxml b/test/data/grooves/RockWaltz1WalkSus.musicxml index 1f93ba31..b63177bf 100644 --- a/test/data/grooves/RockWaltz1WalkSus.musicxml +++ b/test/data/grooves/RockWaltz1WalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockWaltz1intro8.musicxml b/test/data/grooves/RockWaltz1intro8.musicxml index 4ea83e8e..488f85d9 100644 --- a/test/data/grooves/RockWaltz1intro8.musicxml +++ b/test/data/grooves/RockWaltz1intro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockWaltzEnd.musicxml b/test/data/grooves/RockWaltzEnd.musicxml index e5876608..e76dcf7e 100644 --- a/test/data/grooves/RockWaltzEnd.musicxml +++ b/test/data/grooves/RockWaltzEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockWaltzIntro.musicxml b/test/data/grooves/RockWaltzIntro.musicxml index ccd6104a..68a95f1c 100644 --- a/test/data/grooves/RockWaltzIntro.musicxml +++ b/test/data/grooves/RockWaltzIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockWaltzIntro8.musicxml b/test/data/grooves/RockWaltzIntro8.musicxml index 754020df..594c28af 100644 --- a/test/data/grooves/RockWaltzIntro8.musicxml +++ b/test/data/grooves/RockWaltzIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockWaltzSus.musicxml b/test/data/grooves/RockWaltzSus.musicxml index 9db0cbdc..80754b6e 100644 --- a/test/data/grooves/RockWaltzSus.musicxml +++ b/test/data/grooves/RockWaltzSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockWaltzWalk.musicxml b/test/data/grooves/RockWaltzWalk.musicxml index 05baf29d..4a40399b 100644 --- a/test/data/grooves/RockWaltzWalk.musicxml +++ b/test/data/grooves/RockWaltzWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/RockWaltzWalkSus.musicxml b/test/data/grooves/RockWaltzWalkSus.musicxml index f35f4f4f..103cac4d 100644 --- a/test/data/grooves/RockWaltzWalkSus.musicxml +++ b/test/data/grooves/RockWaltzWalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SAMBA01.musicxml b/test/data/grooves/SAMBA01.musicxml index 231b5952..3e3234e6 100644 --- a/test/data/grooves/SAMBA01.musicxml +++ b/test/data/grooves/SAMBA01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -236,83 +236,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -320,15 +265,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -336,13 +284,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -476,65 +430,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -542,17 +459,18 @@ E 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - @@ -560,15 +478,19 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + @@ -587,7 +509,7 @@ - + E 4 @@ -601,38 +523,18 @@ - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -640,15 +542,28 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -656,15 +571,18 @@ E 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + up normal - @@ -672,33 +590,33 @@ E 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + up normal - - + - + E 4 - 6 - + 192 1 - 512th + 16th up normal - @@ -706,33 +624,27 @@ E 4 - 96 - + 192 1 - 32nd + 16th up normal - - + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - @@ -740,15 +652,13 @@ E 4 - 6 - + 192 1 - 512th + 16th up normal - @@ -756,49 +666,41 @@ E 4 - 48 - + 192 1 - 64th + 16th up normal - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - - + E 4 - 3 - + 192 1 - 1024th + 16th up normal - @@ -820,10 +722,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal @@ -834,13 +736,28 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + + + 3 + 16th + + + 2 + 16th + + @@ -848,27 +765,38 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal - + E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -885,6 +813,8 @@ + + E @@ -899,7 +829,7 @@ - + E 4 @@ -913,48 +843,72 @@ - + E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + + + 3 + 16th + + + 2 + 16th + + - + E 4 - 384 + 128 1 - eighth + 16th + + 3 + 2 + 16th + up normal - + E 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + up normal - + @@ -962,17 +916,13 @@ E 4 - 24 - - + 192 1 - 128th + 16th up normal - - @@ -980,15 +930,13 @@ E 4 - 6 - + 192 1 - 512th + 16th up normal - @@ -996,33 +944,27 @@ E 4 - 48 - + 192 1 - 64th + 16th up normal - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -1030,18 +972,16 @@ E 4 - 3 - + 192 1 - 1024th + 16th up normal - - + E 4 @@ -1055,9 +995,7 @@ - - - + E 4 @@ -1071,20 +1009,18 @@ - + E 4 - 48 - + 192 1 - 64th + 16th up normal - @@ -1092,17 +1028,13 @@ E 4 - 12 - - + 384 1 - 256th + eighth up normal - - @@ -1110,15 +1042,28 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1126,15 +1071,18 @@ E 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + up normal - @@ -1142,17 +1090,19 @@ E 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + up normal - - + @@ -1160,65 +1110,29 @@ E 4 - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - + 192 1 - 128th + 16th up normal - - + + E 4 - 6 - + 192 1 - 512th + 16th up normal - @@ -1226,33 +1140,42 @@ E 4 - 48 - + 192 1 - 64th + 16th up normal - - + E 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -1260,15 +1183,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -1276,13 +1202,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1416,49 +1348,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1466,15 +1377,18 @@ E 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up normal - @@ -1482,503 +1396,19 @@ E 4 - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 + 128 1 16th + + 3 + 2 + 16th + up normal - - - - - E - 4 - - 384 - - 1 - eighth - up - normal - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - + diff --git a/test/data/grooves/SAMBA02.musicxml b/test/data/grooves/SAMBA02.musicxml index 25f6fcea..655415a6 100644 --- a/test/data/grooves/SAMBA02.musicxml +++ b/test/data/grooves/SAMBA02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -391,22 +391,25 @@ - 384 - - 3 - eighth - - - - - - - 192 - + 512 3 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -414,10 +417,15 @@ F 5 - 192 + 512 3 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -425,10 +433,16 @@ - 768 + 512 3 quarter + + 3 + 2 + quarter + + @@ -541,22 +555,25 @@ - 384 - - 3 - eighth - - - - - - - 192 - + 512 3 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -564,10 +581,15 @@ F 5 - 192 + 512 3 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -575,10 +597,16 @@ - 768 + 512 3 quarter + + 3 + 2 + quarter + + @@ -691,22 +719,25 @@ - 384 - - 3 - eighth - - - - - - - 192 - + 512 3 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -714,10 +745,15 @@ F 5 - 192 + 512 3 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -725,10 +761,16 @@ - 768 + 512 3 quarter + + 3 + 2 + quarter + + @@ -841,22 +883,25 @@ - 384 - - 3 - eighth - - - - - - - 192 - + 512 3 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -864,10 +909,15 @@ F 5 - 192 + 512 3 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -875,10 +925,16 @@ - 768 + 512 3 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/SHFL01.musicxml b/test/data/grooves/SHFL01.musicxml index d20802ee..78261525 100644 --- a/test/data/grooves/SHFL01.musicxml +++ b/test/data/grooves/SHFL01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -846,10 +846,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -858,15 +858,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/SHFL02.musicxml b/test/data/grooves/SHFL02.musicxml index 8c40d22d..afc18c4b 100644 --- a/test/data/grooves/SHFL02.musicxml +++ b/test/data/grooves/SHFL02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1025,67 +1025,65 @@ G 5 - 384 - + 512 3 - eighth + quarter + + 3 + 2 + quarter + up x - + + + 3 + quarter + + + 2 + quarter + + - + G 5 - 96 - - - + 256 + 3 - 32nd + eighth + + 3 + 2 + quarter + up - x + circle-x - - + - + + G 5 - 24 + 192 - 3 - 128th + 16th up x - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - @@ -1095,13 +1093,15 @@ 48 - + + 3 64th up - circle-x + x + @@ -1112,11 +1112,11 @@ 12 - + 3 256th up - circle-x + x @@ -1129,27 +1129,13 @@ 3 - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 192 3 - 16th + 1024th up x + @@ -1306,97 +1292,66 @@ G 5 - 192 + 384 + 3 - 16th + eighth up circle-x - - - - - - G - 5 - - 288 - - - 3 - 16th - - up - x - + G 5 - 24 + 96 - + 3 - 128th + 32nd up - x + circle-x - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - + G 5 - 192 + 24 + 3 - 16th + 128th up circle-x + - + G 5 - 48 - + 6 3 - 64th + 512th up circle-x - @@ -1405,17 +1360,28 @@ G 5 - 12 - - - + 512 + 3 - 256th + quarter + + 3 + 2 + quarter + up - circle-x + x - - + + + 3 + quarter + + + 2 + quarter + + @@ -1423,15 +1389,19 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + quarter + up circle-x - + @@ -1485,10 +1455,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1497,15 +1467,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/SHFL03.musicxml b/test/data/grooves/SHFL03.musicxml index 4de3e958..90ffa8dd 100644 --- a/test/data/grooves/SHFL03.musicxml +++ b/test/data/grooves/SHFL03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SHFL04.musicxml b/test/data/grooves/SHFL04.musicxml index 1d26887d..a98c5a68 100644 --- a/test/data/grooves/SHFL04.musicxml +++ b/test/data/grooves/SHFL04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1538,98 +1538,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 512 1 - eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1637,23 +1564,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1711,98 +1647,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 512 1 - eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1810,23 +1673,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/SHFL05.musicxml b/test/data/grooves/SHFL05.musicxml index 9de5d959..32952acf 100644 --- a/test/data/grooves/SHFL05.musicxml +++ b/test/data/grooves/SHFL05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -928,101 +928,28 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 256 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -1030,15 +957,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1046,13 +976,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up circle-x + @@ -1500,101 +1436,28 @@ G 5 - 192 - + 256 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -1602,15 +1465,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1618,13 +1484,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up circle-x + @@ -1697,98 +1569,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 512 1 - eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1796,23 +1595,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1870,98 +1678,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 512 1 - eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1969,23 +1704,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/SKA01.musicxml b/test/data/grooves/SKA01.musicxml index afc4211e..6ad41466 100644 --- a/test/data/grooves/SKA01.musicxml +++ b/test/data/grooves/SKA01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SKA02.musicxml b/test/data/grooves/SKA02.musicxml index b3d52bed..18669203 100644 --- a/test/data/grooves/SKA02.musicxml +++ b/test/data/grooves/SKA02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SKA03.musicxml b/test/data/grooves/SKA03.musicxml index 2c2953a2..e7d59758 100644 --- a/test/data/grooves/SKA03.musicxml +++ b/test/data/grooves/SKA03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SKA04.musicxml b/test/data/grooves/SKA04.musicxml index dc74222c..fe7fdb6f 100644 --- a/test/data/grooves/SKA04.musicxml +++ b/test/data/grooves/SKA04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -204,24 +204,27 @@ E 4 - 192 + 576 1 - 16th + eighth + up x + E 4 - 384 + 576 1 eighth + up normal @@ -307,24 +310,27 @@ E 4 - 192 + 576 1 - 16th + eighth + up x + E 4 - 384 + 576 1 eighth + up normal diff --git a/test/data/grooves/Saidi.musicxml b/test/data/grooves/Saidi.musicxml index cac1796c..f97af5eb 100644 --- a/test/data/grooves/Saidi.musicxml +++ b/test/data/grooves/Saidi.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Salsa.musicxml b/test/data/grooves/Salsa.musicxml index a2808fcf..d0b078f3 100644 --- a/test/data/grooves/Salsa.musicxml +++ b/test/data/grooves/Salsa.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Salsa1EndingA.musicxml b/test/data/grooves/Salsa1EndingA.musicxml index cde5bd89..294d46ff 100644 --- a/test/data/grooves/Salsa1EndingA.musicxml +++ b/test/data/grooves/Salsa1EndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -794,22 +794,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -817,10 +820,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -828,10 +836,16 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/Salsa1EndingB.musicxml b/test/data/grooves/Salsa1EndingB.musicxml index 86ba2985..e4752200 100644 --- a/test/data/grooves/Salsa1EndingB.musicxml +++ b/test/data/grooves/Salsa1EndingB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -794,22 +794,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -817,10 +820,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -828,10 +836,16 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/Salsa1FillAA.musicxml b/test/data/grooves/Salsa1FillAA.musicxml index 565e84eb..4ce100ed 100644 --- a/test/data/grooves/Salsa1FillAA.musicxml +++ b/test/data/grooves/Salsa1FillAA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Salsa1FillAB.musicxml b/test/data/grooves/Salsa1FillAB.musicxml index e213ebf3..63eed336 100644 --- a/test/data/grooves/Salsa1FillAB.musicxml +++ b/test/data/grooves/Salsa1FillAB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Salsa1FillBA.musicxml b/test/data/grooves/Salsa1FillBA.musicxml index 43e50990..510a01b0 100644 --- a/test/data/grooves/Salsa1FillBA.musicxml +++ b/test/data/grooves/Salsa1FillBA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Salsa1FillBB.musicxml b/test/data/grooves/Salsa1FillBB.musicxml index 54090e3b..8f0ae077 100644 --- a/test/data/grooves/Salsa1FillBB.musicxml +++ b/test/data/grooves/Salsa1FillBB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Salsa1IntroA.musicxml b/test/data/grooves/Salsa1IntroA.musicxml index 15a00327..6cc2e59c 100644 --- a/test/data/grooves/Salsa1IntroA.musicxml +++ b/test/data/grooves/Salsa1IntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Salsa1IntroB.musicxml b/test/data/grooves/Salsa1IntroB.musicxml index 7dce0cc8..4e964db5 100644 --- a/test/data/grooves/Salsa1IntroB.musicxml +++ b/test/data/grooves/Salsa1IntroB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Salsa1MainA.musicxml b/test/data/grooves/Salsa1MainA.musicxml index 1e89d5a4..2dc7eec9 100644 --- a/test/data/grooves/Salsa1MainA.musicxml +++ b/test/data/grooves/Salsa1MainA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Salsa1MainB.musicxml b/test/data/grooves/Salsa1MainB.musicxml index 24d7392b..28312060 100644 --- a/test/data/grooves/Salsa1MainB.musicxml +++ b/test/data/grooves/Salsa1MainB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Salsa2EndingA.musicxml b/test/data/grooves/Salsa2EndingA.musicxml index b2beb6ba..016ac666 100644 --- a/test/data/grooves/Salsa2EndingA.musicxml +++ b/test/data/grooves/Salsa2EndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -609,38 +609,6 @@ - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - F @@ -1320,120 +1288,29 @@ F 4 - 192 - - 1 - 16th - up - normal - - - - - - F - 4 - - 192 - - 1 - 16th - up - normal - - - - - - F - 4 - - 192 - - 1 - 16th - up - normal - - - - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 192 + 288 1 16th + up normal - - - F - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - + F 4 - 12 + 24 1 - 256th + 128th up normal @@ -1441,72 +1318,82 @@ - + F 4 - 3 + 6 1 - 1024th + 512th up normal - + F 4 192 - 1 16th up normal - - + F 4 - 48 - - + 256 1 - 64th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + - + F 4 - 12 - - + 256 1 - 256th + eighth + + 3 + 2 + eighth + up normal - - @@ -1514,15 +1401,19 @@ F 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + eighth + up normal - + @@ -1718,16 +1609,13 @@ F 4 - 288 - + 384 1 - 16th - + eighth up normal - @@ -1764,38 +1652,6 @@ - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - F diff --git a/test/data/grooves/Salsa2EndingB.musicxml b/test/data/grooves/Salsa2EndingB.musicxml index 0f2dc2e5..11c7ec99 100644 --- a/test/data/grooves/Salsa2EndingB.musicxml +++ b/test/data/grooves/Salsa2EndingB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -609,38 +609,6 @@ - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - F @@ -1320,120 +1288,29 @@ F 4 - 192 - - 1 - 16th - up - normal - - - - - - F - 4 - - 192 - - 1 - 16th - up - normal - - - - - - F - 4 - - 192 - - 1 - 16th - up - normal - - - - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 192 + 288 1 16th + up normal - - - F - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - + F 4 - 12 + 24 1 - 256th + 128th up normal @@ -1441,72 +1318,82 @@ - + F 4 - 3 + 6 1 - 1024th + 512th up normal - + F 4 192 - 1 16th up normal - - + F 4 - 48 - - + 256 1 - 64th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + - + F 4 - 12 - - + 256 1 - 256th + eighth + + 3 + 2 + eighth + up normal - - @@ -1514,15 +1401,19 @@ F 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + eighth + up normal - + @@ -1718,16 +1609,13 @@ F 4 - 288 - + 384 1 - 16th - + eighth up normal - @@ -1764,38 +1652,6 @@ - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - F diff --git a/test/data/grooves/Salsa2FillAA.musicxml b/test/data/grooves/Salsa2FillAA.musicxml index 96ce1669..474e8af4 100644 --- a/test/data/grooves/Salsa2FillAA.musicxml +++ b/test/data/grooves/Salsa2FillAA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -484,65 +484,28 @@ F 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - F - 4 - - 24 - - + 128 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - F - 4 - - 48 - - - 1 - 64th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -550,36 +513,41 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - - + F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + - + F 4 diff --git a/test/data/grooves/Salsa2FillAB.musicxml b/test/data/grooves/Salsa2FillAB.musicxml index 30374fba..b4744cd7 100644 --- a/test/data/grooves/Salsa2FillAB.musicxml +++ b/test/data/grooves/Salsa2FillAB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Salsa2FillBA.musicxml b/test/data/grooves/Salsa2FillBA.musicxml index 98deefe7..04cf01cb 100644 --- a/test/data/grooves/Salsa2FillBA.musicxml +++ b/test/data/grooves/Salsa2FillBA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Salsa2FillBB.musicxml b/test/data/grooves/Salsa2FillBB.musicxml index a14783a3..1909d3e8 100644 --- a/test/data/grooves/Salsa2FillBB.musicxml +++ b/test/data/grooves/Salsa2FillBB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -337,22 +337,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -360,10 +363,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -374,13 +382,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -768,22 +782,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -791,10 +808,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -802,10 +824,16 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/Salsa2IntroA.musicxml b/test/data/grooves/Salsa2IntroA.musicxml index a5a266d6..e9245a1b 100644 --- a/test/data/grooves/Salsa2IntroA.musicxml +++ b/test/data/grooves/Salsa2IntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -871,22 +871,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -894,10 +897,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -908,33 +916,42 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -942,10 +959,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -956,13 +978,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -1068,22 +1096,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -1091,10 +1122,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1105,33 +1141,42 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -1139,10 +1184,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1153,13 +1203,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -1265,22 +1321,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -1288,10 +1347,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1302,33 +1366,42 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -1336,10 +1409,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1350,13 +1428,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -1462,22 +1546,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -1485,10 +1572,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1499,33 +1591,42 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -1533,10 +1634,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1547,13 +1653,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -2204,11 +2316,11 @@ D 4 - 48 + 96 1 - 64th + 32nd up normal @@ -2220,12 +2332,12 @@ D 4 - 12 + 24 1 - 256th + 128th up normal @@ -2238,11 +2350,11 @@ D 4 - 3 + 6 1 - 1024th + 512th up normal @@ -2255,12 +2367,66 @@ 4 192 + 1 16th up normal + + + + + + D + 4 + + 48 + + + + 1 + 64th + up + normal + + + + + + + + D + 4 + + 12 + + + + 1 + 256th + up + normal + + + + + + + + D + 4 + + 3 + + + 1 + 1024th + up + normal + + @@ -3112,15 +3278,15 @@ + E 5 - 576 + 768 2 - eighth - + quarter up triangle diff --git a/test/data/grooves/Salsa2IntroB.musicxml b/test/data/grooves/Salsa2IntroB.musicxml index 37565b4f..b24b73ce 100644 --- a/test/data/grooves/Salsa2IntroB.musicxml +++ b/test/data/grooves/Salsa2IntroB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -861,22 +861,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -884,10 +887,15 @@ D 5 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -895,10 +903,16 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/Salsa2MainA.musicxml b/test/data/grooves/Salsa2MainA.musicxml index aff9221b..1b607ebb 100644 --- a/test/data/grooves/Salsa2MainA.musicxml +++ b/test/data/grooves/Salsa2MainA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1678,22 +1678,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1701,10 +1704,15 @@ D 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1715,13 +1723,19 @@ D 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -1771,22 +1785,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1794,10 +1811,15 @@ D 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1808,13 +1830,19 @@ D 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -1922,22 +1950,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1945,10 +1976,15 @@ D 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1959,13 +1995,19 @@ D 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -2389,61 +2431,28 @@ F 4 - 192 - - 1 - 16th - up - normal - - - - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - + 256 1 eighth + + 3 + 2 + quarter + up normal - + + + 3 + eighth + + + 2 + quarter + + @@ -2451,51 +2460,19 @@ F 4 - 96 - - + 512 1 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -2616,62 +2593,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - up - normal + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + @@ -2679,51 +2619,19 @@ F 4 - 96 - - + 512 1 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -2941,80 +2849,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -3022,33 +2875,19 @@ F 4 - 24 - - + 512 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/Salsa2MainB.musicxml b/test/data/grooves/Salsa2MainB.musicxml index 39d62836..6be8cec8 100644 --- a/test/data/grooves/Salsa2MainB.musicxml +++ b/test/data/grooves/Salsa2MainB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1111,22 +1111,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1134,10 +1137,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -1148,13 +1156,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -1177,22 +1191,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1200,10 +1217,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -1214,13 +1236,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -1243,22 +1271,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1266,10 +1297,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -1280,13 +1316,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -1309,22 +1351,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1332,10 +1377,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -1346,13 +1396,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -2294,22 +2350,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -2317,10 +2376,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -2328,10 +2392,16 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -2483,22 +2553,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -2506,10 +2579,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -2517,10 +2595,16 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -2672,22 +2756,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -2695,10 +2782,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -2706,10 +2798,16 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -2861,22 +2959,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -2884,10 +2985,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -2895,10 +3001,16 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/SalsaEnd.musicxml b/test/data/grooves/SalsaEnd.musicxml index 8d66a131..d609a46c 100644 --- a/test/data/grooves/SalsaEnd.musicxml +++ b/test/data/grooves/SalsaEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -312,15 +312,15 @@ + D 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/SalsaFill.musicxml b/test/data/grooves/SalsaFill.musicxml index 092d7cbf..b8b87667 100644 --- a/test/data/grooves/SalsaFill.musicxml +++ b/test/data/grooves/SalsaFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SalsaIntro.musicxml b/test/data/grooves/SalsaIntro.musicxml index b3b82787..10eb2ded 100644 --- a/test/data/grooves/SalsaIntro.musicxml +++ b/test/data/grooves/SalsaIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SalsaPlus.musicxml b/test/data/grooves/SalsaPlus.musicxml index c94b6890..9a07b7fc 100644 --- a/test/data/grooves/SalsaPlus.musicxml +++ b/test/data/grooves/SalsaPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SalsaSus.musicxml b/test/data/grooves/SalsaSus.musicxml index b323bbd0..3fc6e92f 100644 --- a/test/data/grooves/SalsaSus.musicxml +++ b/test/data/grooves/SalsaSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SalsaSusPlus.musicxml b/test/data/grooves/SalsaSusPlus.musicxml index 06f20e73..1391a28d 100644 --- a/test/data/grooves/SalsaSusPlus.musicxml +++ b/test/data/grooves/SalsaSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Samai.musicxml b/test/data/grooves/Samai.musicxml index 4fae1a63..a52a03e5 100644 --- a/test/data/grooves/Samai.musicxml +++ b/test/data/grooves/Samai.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Samba.musicxml b/test/data/grooves/Samba.musicxml index d1c156a6..8c7d26c4 100644 --- a/test/data/grooves/Samba.musicxml +++ b/test/data/grooves/Samba.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SambaEnd.musicxml b/test/data/grooves/SambaEnd.musicxml index a5855bb9..93c5b3a4 100644 --- a/test/data/grooves/SambaEnd.musicxml +++ b/test/data/grooves/SambaEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SambaFill.musicxml b/test/data/grooves/SambaFill.musicxml index f0e9fc49..be32a466 100644 --- a/test/data/grooves/SambaFill.musicxml +++ b/test/data/grooves/SambaFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SambaIntro.musicxml b/test/data/grooves/SambaIntro.musicxml index 7d0e77ed..5c5659ec 100644 --- a/test/data/grooves/SambaIntro.musicxml +++ b/test/data/grooves/SambaIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SambaIntro1.musicxml b/test/data/grooves/SambaIntro1.musicxml index 54fe2f54..58160361 100644 --- a/test/data/grooves/SambaIntro1.musicxml +++ b/test/data/grooves/SambaIntro1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SambaIntro8.musicxml b/test/data/grooves/SambaIntro8.musicxml index 6d545826..73dd7241 100644 --- a/test/data/grooves/SambaIntro8.musicxml +++ b/test/data/grooves/SambaIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SambaPlus.musicxml b/test/data/grooves/SambaPlus.musicxml index 42da95ad..34d5d10c 100644 --- a/test/data/grooves/SambaPlus.musicxml +++ b/test/data/grooves/SambaPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SambaSus.musicxml b/test/data/grooves/SambaSus.musicxml index 289387a6..dee441f7 100644 --- a/test/data/grooves/SambaSus.musicxml +++ b/test/data/grooves/SambaSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SambaSusFill.musicxml b/test/data/grooves/SambaSusFill.musicxml index 9d778c06..32ed4315 100644 --- a/test/data/grooves/SambaSusFill.musicxml +++ b/test/data/grooves/SambaSusFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SambaSusPlus.musicxml b/test/data/grooves/SambaSusPlus.musicxml index fd272fe3..7c1975ee 100644 --- a/test/data/grooves/SambaSusPlus.musicxml +++ b/test/data/grooves/SambaSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Serenade.musicxml b/test/data/grooves/Serenade.musicxml index 83db3d44..36158fd6 100644 --- a/test/data/grooves/Serenade.musicxml +++ b/test/data/grooves/Serenade.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SerenadeEnd.musicxml b/test/data/grooves/SerenadeEnd.musicxml index fd563576..eb0104c4 100644 --- a/test/data/grooves/SerenadeEnd.musicxml +++ b/test/data/grooves/SerenadeEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SerenadeIntro.musicxml b/test/data/grooves/SerenadeIntro.musicxml index da2c0fb5..6501de5f 100644 --- a/test/data/grooves/SerenadeIntro.musicxml +++ b/test/data/grooves/SerenadeIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ShuffleBoggie.musicxml b/test/data/grooves/ShuffleBoggie.musicxml index 850d31c8..14ed2f18 100644 --- a/test/data/grooves/ShuffleBoggie.musicxml +++ b/test/data/grooves/ShuffleBoggie.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ShuffleBoggie1.musicxml b/test/data/grooves/ShuffleBoggie1.musicxml index 9ca4f706..53b19bf5 100644 --- a/test/data/grooves/ShuffleBoggie1.musicxml +++ b/test/data/grooves/ShuffleBoggie1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ShuffleBoggieEnd.musicxml b/test/data/grooves/ShuffleBoggieEnd.musicxml index 82f9ebe5..18b13d18 100644 --- a/test/data/grooves/ShuffleBoggieEnd.musicxml +++ b/test/data/grooves/ShuffleBoggieEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ShuffleBoggieFill.musicxml b/test/data/grooves/ShuffleBoggieFill.musicxml index fcf67af3..28dbfd9c 100644 --- a/test/data/grooves/ShuffleBoggieFill.musicxml +++ b/test/data/grooves/ShuffleBoggieFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ShuffleBoggieIntro.musicxml b/test/data/grooves/ShuffleBoggieIntro.musicxml index 95b8c00f..3479a3cc 100644 --- a/test/data/grooves/ShuffleBoggieIntro.musicxml +++ b/test/data/grooves/ShuffleBoggieIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ShuffleBoggieIntro4.musicxml b/test/data/grooves/ShuffleBoggieIntro4.musicxml index bb18e29d..ff34a0ad 100644 --- a/test/data/grooves/ShuffleBoggieIntro4.musicxml +++ b/test/data/grooves/ShuffleBoggieIntro4.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ShuffleBoggieSus.musicxml b/test/data/grooves/ShuffleBoggieSus.musicxml index 93136c41..232ff22c 100644 --- a/test/data/grooves/ShuffleBoggieSus.musicxml +++ b/test/data/grooves/ShuffleBoggieSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ShuffleBoogie.musicxml b/test/data/grooves/ShuffleBoogie.musicxml index b975050b..0e455378 100644 --- a/test/data/grooves/ShuffleBoogie.musicxml +++ b/test/data/grooves/ShuffleBoogie.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -299,10 +299,10 @@ E 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -311,7 +311,6 @@ up square - @@ -319,13 +318,19 @@ E 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up square + @@ -461,10 +466,10 @@ E 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -473,7 +478,6 @@ up square - @@ -481,13 +485,19 @@ E 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up square + diff --git a/test/data/grooves/ShuffleBoogieEnd.musicxml b/test/data/grooves/ShuffleBoogieEnd.musicxml index d7539ced..9d18346d 100644 --- a/test/data/grooves/ShuffleBoogieEnd.musicxml +++ b/test/data/grooves/ShuffleBoogieEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -407,15 +407,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/ShuffleBoogieIntro.musicxml b/test/data/grooves/ShuffleBoogieIntro.musicxml index e5a5cd6b..44fcc153 100644 --- a/test/data/grooves/ShuffleBoogieIntro.musicxml +++ b/test/data/grooves/ShuffleBoogieIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -299,10 +299,10 @@ E 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -311,7 +311,6 @@ up square - @@ -319,13 +318,19 @@ E 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up square + @@ -720,14 +725,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -752,24 +758,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -898,24 +905,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -940,24 +948,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x diff --git a/test/data/grooves/ShuffleRock.musicxml b/test/data/grooves/ShuffleRock.musicxml index 25b88541..c195743e 100644 --- a/test/data/grooves/ShuffleRock.musicxml +++ b/test/data/grooves/ShuffleRock.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ShuffleRockEnd.musicxml b/test/data/grooves/ShuffleRockEnd.musicxml index 8f486597..e6a87372 100644 --- a/test/data/grooves/ShuffleRockEnd.musicxml +++ b/test/data/grooves/ShuffleRockEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ShuffleRockIntro.musicxml b/test/data/grooves/ShuffleRockIntro.musicxml index 05bd6830..4a9229aa 100644 --- a/test/data/grooves/ShuffleRockIntro.musicxml +++ b/test/data/grooves/ShuffleRockIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Ska.musicxml b/test/data/grooves/Ska.musicxml index a3702fd6..032afa39 100644 --- a/test/data/grooves/Ska.musicxml +++ b/test/data/grooves/Ska.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1252,22 +1252,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1275,10 +1278,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1289,33 +1297,42 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1323,10 +1340,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1337,35 +1359,44 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1373,10 +1404,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1387,33 +1423,42 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1421,10 +1466,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1435,13 +1485,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/Ska1.musicxml b/test/data/grooves/Ska1.musicxml index 45191419..97971566 100644 --- a/test/data/grooves/Ska1.musicxml +++ b/test/data/grooves/Ska1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1507,22 +1507,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1530,10 +1533,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1544,33 +1552,42 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1578,10 +1595,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1592,35 +1614,44 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1628,10 +1659,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1642,33 +1678,42 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1676,10 +1721,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1690,13 +1740,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/Ska1Sus.musicxml b/test/data/grooves/Ska1Sus.musicxml index b25e9873..9643601a 100644 --- a/test/data/grooves/Ska1Sus.musicxml +++ b/test/data/grooves/Ska1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1507,22 +1507,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1530,10 +1533,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1544,33 +1552,42 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1578,10 +1595,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1592,35 +1614,44 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1628,10 +1659,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1642,33 +1678,42 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1676,10 +1721,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1690,13 +1740,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/SkaClap.musicxml b/test/data/grooves/SkaClap.musicxml index f50d300d..22f50ba6 100644 --- a/test/data/grooves/SkaClap.musicxml +++ b/test/data/grooves/SkaClap.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1395,22 +1395,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1418,10 +1421,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1432,33 +1440,42 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1466,10 +1483,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1480,35 +1502,44 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1516,10 +1547,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1530,33 +1566,42 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1564,10 +1609,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1578,13 +1628,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/SkaEnd.musicxml b/test/data/grooves/SkaEnd.musicxml index 6db90a01..507ae503 100644 --- a/test/data/grooves/SkaEnd.musicxml +++ b/test/data/grooves/SkaEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1252,22 +1252,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1275,10 +1278,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1289,33 +1297,42 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1323,10 +1340,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1337,35 +1359,44 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1373,10 +1404,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1387,33 +1423,42 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1421,10 +1466,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1435,13 +1485,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/SkaSus.musicxml b/test/data/grooves/SkaSus.musicxml index dbf394e2..7edae754 100644 --- a/test/data/grooves/SkaSus.musicxml +++ b/test/data/grooves/SkaSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1252,22 +1252,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1275,10 +1278,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1289,33 +1297,42 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1323,10 +1340,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1337,35 +1359,44 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1373,10 +1404,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1387,33 +1423,42 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1421,10 +1466,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1435,13 +1485,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/Slow16Beat.musicxml b/test/data/grooves/Slow16Beat.musicxml index 69c4a6d8..19e2e62d 100644 --- a/test/data/grooves/Slow16Beat.musicxml +++ b/test/data/grooves/Slow16Beat.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Slow16BeatEnd.musicxml b/test/data/grooves/Slow16BeatEnd.musicxml index 0d031678..7e58bf81 100644 --- a/test/data/grooves/Slow16BeatEnd.musicxml +++ b/test/data/grooves/Slow16BeatEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Slow16BeatIntro.musicxml b/test/data/grooves/Slow16BeatIntro.musicxml index 4d5550b1..59ecac68 100644 --- a/test/data/grooves/Slow16BeatIntro.musicxml +++ b/test/data/grooves/Slow16BeatIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowBigBand.musicxml b/test/data/grooves/SlowBigBand.musicxml index 66d4e0f0..cc023da9 100644 --- a/test/data/grooves/SlowBigBand.musicxml +++ b/test/data/grooves/SlowBigBand.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -539,6 +539,21 @@ + + + + D + 5 + + 192 + + 1 + 16th + up + x + + + 3072 @@ -596,122 +611,19 @@ - - - D - 5 - - 48 - - - 1 - 64th - up - x - - - - - - - D - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - D - 5 - - 3 - - - 1 - 1024th - up - x - - - - + D 5 - 384 - - - 1 - eighth - up - x - - - - - - - D - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - D - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - D - 5 - - 6 - + 768 1 - 512th + quarter up x - @@ -860,22 +772,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -883,10 +798,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -897,13 +817,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -952,22 +878,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -975,10 +904,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -989,13 +923,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -1142,22 +1082,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1165,10 +1108,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -1176,10 +1124,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1233,22 +1187,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1256,10 +1213,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -1267,10 +1229,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1414,22 +1382,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1437,10 +1408,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -1448,10 +1424,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1505,22 +1487,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1528,10 +1513,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -1539,10 +1529,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/SlowBigBandEnd.musicxml b/test/data/grooves/SlowBigBandEnd.musicxml index 2e70b271..4089a4d9 100644 --- a/test/data/grooves/SlowBigBandEnd.musicxml +++ b/test/data/grooves/SlowBigBandEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -350,15 +350,15 @@ + D 5 - 576 + 768 1 - eighth - + quarter up x @@ -524,22 +524,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -547,10 +550,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -558,10 +566,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/SlowBigBandIntro.musicxml b/test/data/grooves/SlowBigBandIntro.musicxml index c53fbb58..9991040c 100644 --- a/test/data/grooves/SlowBigBandIntro.musicxml +++ b/test/data/grooves/SlowBigBandIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -622,15 +622,15 @@ + D 5 - 576 + 768 1 - eighth - + quarter up x @@ -725,22 +725,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -748,10 +751,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -762,13 +770,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -817,22 +831,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -840,10 +857,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -854,13 +876,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -999,22 +1027,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1022,10 +1053,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -1033,10 +1069,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1090,22 +1132,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1113,10 +1158,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -1124,10 +1174,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1271,22 +1327,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1294,10 +1353,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -1305,10 +1369,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/SlowBlues.musicxml b/test/data/grooves/SlowBlues.musicxml index c2b0e0df..e5d97413 100644 --- a/test/data/grooves/SlowBlues.musicxml +++ b/test/data/grooves/SlowBlues.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowBlues12Triple.musicxml b/test/data/grooves/SlowBlues12Triple.musicxml index 595411cd..7c322bb8 100644 --- a/test/data/grooves/SlowBlues12Triple.musicxml +++ b/test/data/grooves/SlowBlues12Triple.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowBlues34Triple.musicxml b/test/data/grooves/SlowBlues34Triple.musicxml index d7e999f2..03c4cfb5 100644 --- a/test/data/grooves/SlowBlues34Triple.musicxml +++ b/test/data/grooves/SlowBlues34Triple.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowBlues4Triple.musicxml b/test/data/grooves/SlowBlues4Triple.musicxml index 2bdba8df..5e7e0896 100644 --- a/test/data/grooves/SlowBlues4Triple.musicxml +++ b/test/data/grooves/SlowBlues4Triple.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowBluesEnd.musicxml b/test/data/grooves/SlowBluesEnd.musicxml index 8e185f05..3fb79f47 100644 --- a/test/data/grooves/SlowBluesEnd.musicxml +++ b/test/data/grooves/SlowBluesEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowBluesFill.musicxml b/test/data/grooves/SlowBluesFill.musicxml index 81a5995c..ee5b82af 100644 --- a/test/data/grooves/SlowBluesFill.musicxml +++ b/test/data/grooves/SlowBluesFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowBluesFill1.musicxml b/test/data/grooves/SlowBluesFill1.musicxml index cc2fa691..70c97800 100644 --- a/test/data/grooves/SlowBluesFill1.musicxml +++ b/test/data/grooves/SlowBluesFill1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowBluesFill2.musicxml b/test/data/grooves/SlowBluesFill2.musicxml index 7897659a..ae2a4184 100644 --- a/test/data/grooves/SlowBluesFill2.musicxml +++ b/test/data/grooves/SlowBluesFill2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowBluesFill3.musicxml b/test/data/grooves/SlowBluesFill3.musicxml index 95e575b2..4ebe4388 100644 --- a/test/data/grooves/SlowBluesFill3.musicxml +++ b/test/data/grooves/SlowBluesFill3.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowBluesIntro.musicxml b/test/data/grooves/SlowBluesIntro.musicxml index e57c49ac..c83af767 100644 --- a/test/data/grooves/SlowBluesIntro.musicxml +++ b/test/data/grooves/SlowBluesIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowBluesSus.musicxml b/test/data/grooves/SlowBluesSus.musicxml index fed6390f..5b63b8ed 100644 --- a/test/data/grooves/SlowBluesSus.musicxml +++ b/test/data/grooves/SlowBluesSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowBluesWalk4.musicxml b/test/data/grooves/SlowBluesWalk4.musicxml index aa9a5546..89580da9 100644 --- a/test/data/grooves/SlowBluesWalk4.musicxml +++ b/test/data/grooves/SlowBluesWalk4.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowBluesWalk4Sus.musicxml b/test/data/grooves/SlowBluesWalk4Sus.musicxml index 7b5bd795..1b7010c4 100644 --- a/test/data/grooves/SlowBluesWalk4Sus.musicxml +++ b/test/data/grooves/SlowBluesWalk4Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowBluesWalk8.musicxml b/test/data/grooves/SlowBluesWalk8.musicxml index 3301ea0b..9c682051 100644 --- a/test/data/grooves/SlowBluesWalk8.musicxml +++ b/test/data/grooves/SlowBluesWalk8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowBluesWalk8Sus.musicxml b/test/data/grooves/SlowBluesWalk8Sus.musicxml index b53d9d06..6cde6e7a 100644 --- a/test/data/grooves/SlowBluesWalk8Sus.musicxml +++ b/test/data/grooves/SlowBluesWalk8Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowBolero.musicxml b/test/data/grooves/SlowBolero.musicxml index 6d8b919d..f1b8f690 100644 --- a/test/data/grooves/SlowBolero.musicxml +++ b/test/data/grooves/SlowBolero.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1429,49 +1429,28 @@ E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - + 128 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1479,10 +1458,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1493,13 +1477,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1507,10 +1497,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal @@ -1785,49 +1775,28 @@ E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - + 128 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1835,10 +1804,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1849,13 +1823,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1863,10 +1843,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal diff --git a/test/data/grooves/SlowBolero1.musicxml b/test/data/grooves/SlowBolero1.musicxml index 4cceffb2..3eea98f7 100644 --- a/test/data/grooves/SlowBolero1.musicxml +++ b/test/data/grooves/SlowBolero1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1429,49 +1429,28 @@ E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - + 128 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1479,10 +1458,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1493,13 +1477,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1507,10 +1497,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal @@ -1785,49 +1775,28 @@ E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - + 128 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1835,10 +1804,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1849,13 +1823,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1863,10 +1843,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal diff --git a/test/data/grooves/SlowBolero1Sus.musicxml b/test/data/grooves/SlowBolero1Sus.musicxml index 33444060..9efcac54 100644 --- a/test/data/grooves/SlowBolero1Sus.musicxml +++ b/test/data/grooves/SlowBolero1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1429,49 +1429,28 @@ E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - + 128 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1479,10 +1458,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1493,13 +1477,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1507,10 +1497,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal @@ -1785,49 +1775,28 @@ E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - + 128 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1835,10 +1804,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1849,13 +1823,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1863,10 +1843,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal diff --git a/test/data/grooves/SlowBoleroEnd.musicxml b/test/data/grooves/SlowBoleroEnd.musicxml index c00ba0ab..ae7eefba 100644 --- a/test/data/grooves/SlowBoleroEnd.musicxml +++ b/test/data/grooves/SlowBoleroEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowBoleroIntro.musicxml b/test/data/grooves/SlowBoleroIntro.musicxml index fa677339..0252fb55 100644 --- a/test/data/grooves/SlowBoleroIntro.musicxml +++ b/test/data/grooves/SlowBoleroIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1619,49 +1619,28 @@ E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - + 128 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1669,10 +1648,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1683,13 +1667,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1697,10 +1687,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal diff --git a/test/data/grooves/SlowBoleroIntroSus.musicxml b/test/data/grooves/SlowBoleroIntroSus.musicxml index ccf139b6..fa3379f6 100644 --- a/test/data/grooves/SlowBoleroIntroSus.musicxml +++ b/test/data/grooves/SlowBoleroIntroSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1619,49 +1619,28 @@ E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - + 128 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1669,10 +1648,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1683,13 +1667,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1697,10 +1687,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal diff --git a/test/data/grooves/SlowBoleroPlus.musicxml b/test/data/grooves/SlowBoleroPlus.musicxml index 5f543cb9..df4da436 100644 --- a/test/data/grooves/SlowBoleroPlus.musicxml +++ b/test/data/grooves/SlowBoleroPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1429,49 +1429,28 @@ E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - + 128 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1479,10 +1458,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1493,13 +1477,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1507,10 +1497,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal @@ -1785,49 +1775,28 @@ E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - + 128 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1835,10 +1804,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1849,13 +1823,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1863,10 +1843,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal diff --git a/test/data/grooves/SlowBoleroSus.musicxml b/test/data/grooves/SlowBoleroSus.musicxml index e3d6ad39..41dd555c 100644 --- a/test/data/grooves/SlowBoleroSus.musicxml +++ b/test/data/grooves/SlowBoleroSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1429,49 +1429,28 @@ E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - + 128 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1479,10 +1458,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1493,13 +1477,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1507,10 +1497,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal @@ -1785,49 +1775,28 @@ E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - + 128 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1835,10 +1804,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1849,13 +1823,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1863,10 +1843,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal diff --git a/test/data/grooves/SlowBoleroSusPlus.musicxml b/test/data/grooves/SlowBoleroSusPlus.musicxml index a91cdb81..9f5eae4e 100644 --- a/test/data/grooves/SlowBoleroSusPlus.musicxml +++ b/test/data/grooves/SlowBoleroSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1429,49 +1429,28 @@ E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - + 128 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1479,10 +1458,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1493,13 +1477,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1507,10 +1497,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal @@ -1785,49 +1775,28 @@ E 4 - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - + 128 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1835,10 +1804,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1849,13 +1823,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1863,10 +1843,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal diff --git a/test/data/grooves/SlowBroadway.musicxml b/test/data/grooves/SlowBroadway.musicxml index 0e519ec3..f346f73c 100644 --- a/test/data/grooves/SlowBroadway.musicxml +++ b/test/data/grooves/SlowBroadway.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -646,25 +646,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -689,25 +689,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -734,25 +734,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -777,25 +777,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -822,25 +822,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -865,25 +865,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -910,25 +910,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -953,25 +953,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/SlowBroadway1.musicxml b/test/data/grooves/SlowBroadway1.musicxml index 707f91f1..a90cece9 100644 --- a/test/data/grooves/SlowBroadway1.musicxml +++ b/test/data/grooves/SlowBroadway1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -646,25 +646,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -689,25 +689,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -734,25 +734,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -777,25 +777,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -822,25 +822,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -865,25 +865,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -910,25 +910,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -953,25 +953,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/SlowBroadway1Sus.musicxml b/test/data/grooves/SlowBroadway1Sus.musicxml index 4cb07a20..4e7b6478 100644 --- a/test/data/grooves/SlowBroadway1Sus.musicxml +++ b/test/data/grooves/SlowBroadway1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -646,25 +646,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -689,25 +689,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -734,25 +734,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -777,25 +777,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -822,25 +822,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -865,25 +865,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -910,25 +910,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -953,25 +953,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/SlowBroadwayEnd.musicxml b/test/data/grooves/SlowBroadwayEnd.musicxml index f05e0e87..6bdff51f 100644 --- a/test/data/grooves/SlowBroadwayEnd.musicxml +++ b/test/data/grooves/SlowBroadwayEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -539,25 +539,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -582,25 +582,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/SlowBroadwayIntro.musicxml b/test/data/grooves/SlowBroadwayIntro.musicxml index 83225d4e..9903a3ce 100644 --- a/test/data/grooves/SlowBroadwayIntro.musicxml +++ b/test/data/grooves/SlowBroadwayIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -634,25 +634,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -677,25 +677,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -722,25 +722,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -765,25 +765,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -810,25 +810,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -853,25 +853,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -898,25 +898,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -941,25 +941,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/SlowBroadwaySus.musicxml b/test/data/grooves/SlowBroadwaySus.musicxml index ee2e3153..be8da77d 100644 --- a/test/data/grooves/SlowBroadwaySus.musicxml +++ b/test/data/grooves/SlowBroadwaySus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -646,25 +646,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -689,25 +689,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -734,25 +734,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -777,25 +777,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -822,25 +822,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -865,25 +865,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -910,25 +910,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x @@ -953,25 +953,25 @@ G 5 - 192 + 768 3 - 16th + quarter up x + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/SlowCountry.musicxml b/test/data/grooves/SlowCountry.musicxml index 978c1bb6..d1c8034b 100644 --- a/test/data/grooves/SlowCountry.musicxml +++ b/test/data/grooves/SlowCountry.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowCountryEnd.musicxml b/test/data/grooves/SlowCountryEnd.musicxml index 6721a000..dda78aca 100644 --- a/test/data/grooves/SlowCountryEnd.musicxml +++ b/test/data/grooves/SlowCountryEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowCountryFill.musicxml b/test/data/grooves/SlowCountryFill.musicxml index 865c1836..a67010e1 100644 --- a/test/data/grooves/SlowCountryFill.musicxml +++ b/test/data/grooves/SlowCountryFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowCountryFillPlus.musicxml b/test/data/grooves/SlowCountryFillPlus.musicxml index 9a4276ac..3db332b0 100644 --- a/test/data/grooves/SlowCountryFillPlus.musicxml +++ b/test/data/grooves/SlowCountryFillPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowCountryIntro.musicxml b/test/data/grooves/SlowCountryIntro.musicxml index 635858bb..ad24d454 100644 --- a/test/data/grooves/SlowCountryIntro.musicxml +++ b/test/data/grooves/SlowCountryIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowCountryPlus.musicxml b/test/data/grooves/SlowCountryPlus.musicxml index cfef45b9..1fe7fc11 100644 --- a/test/data/grooves/SlowCountryPlus.musicxml +++ b/test/data/grooves/SlowCountryPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowCountrySus.musicxml b/test/data/grooves/SlowCountrySus.musicxml index f67dda86..849b034b 100644 --- a/test/data/grooves/SlowCountrySus.musicxml +++ b/test/data/grooves/SlowCountrySus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowCountrySusPlus.musicxml b/test/data/grooves/SlowCountrySusPlus.musicxml index c9ebd1eb..5a186173 100644 --- a/test/data/grooves/SlowCountrySusPlus.musicxml +++ b/test/data/grooves/SlowCountrySusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowCountryWalk.musicxml b/test/data/grooves/SlowCountryWalk.musicxml index 4d417dd0..9e17581e 100644 --- a/test/data/grooves/SlowCountryWalk.musicxml +++ b/test/data/grooves/SlowCountryWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowCountryWalkFill.musicxml b/test/data/grooves/SlowCountryWalkFill.musicxml index 1544e136..b6af0143 100644 --- a/test/data/grooves/SlowCountryWalkFill.musicxml +++ b/test/data/grooves/SlowCountryWalkFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowCountryWalkFillPlus.musicxml b/test/data/grooves/SlowCountryWalkFillPlus.musicxml index 50d3e849..4c0c6dc9 100644 --- a/test/data/grooves/SlowCountryWalkFillPlus.musicxml +++ b/test/data/grooves/SlowCountryWalkFillPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowCountryWalkPlus.musicxml b/test/data/grooves/SlowCountryWalkPlus.musicxml index 1e9f97ec..f7c564f6 100644 --- a/test/data/grooves/SlowCountryWalkPlus.musicxml +++ b/test/data/grooves/SlowCountryWalkPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowCountryWalkSus.musicxml b/test/data/grooves/SlowCountryWalkSus.musicxml index 1e3165e1..634c6b3e 100644 --- a/test/data/grooves/SlowCountryWalkSus.musicxml +++ b/test/data/grooves/SlowCountryWalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowCountryWalkSusPlus.musicxml b/test/data/grooves/SlowCountryWalkSusPlus.musicxml index 37ad5da4..42669c5b 100644 --- a/test/data/grooves/SlowCountryWalkSusPlus.musicxml +++ b/test/data/grooves/SlowCountryWalkSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowDesert.musicxml b/test/data/grooves/SlowDesert.musicxml index 8247d20c..1e721491 100644 --- a/test/data/grooves/SlowDesert.musicxml +++ b/test/data/grooves/SlowDesert.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowDesertEnd.musicxml b/test/data/grooves/SlowDesertEnd.musicxml index 018dd4a0..ecc2f57f 100644 --- a/test/data/grooves/SlowDesertEnd.musicxml +++ b/test/data/grooves/SlowDesertEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowDesertFill.musicxml b/test/data/grooves/SlowDesertFill.musicxml index c0d2667e..b1812334 100644 --- a/test/data/grooves/SlowDesertFill.musicxml +++ b/test/data/grooves/SlowDesertFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -110,20 +110,7 @@ - - G - 4 - - 192 - - 1 - 16th - up - normal - - - - + G 4 @@ -151,152 +138,6 @@ - - - G - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - G - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - G - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - G - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - G - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - G - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - G - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - G - 4 - - 192 - - 1 - 16th - up - normal - - - - - - G - 4 - - 192 - - 1 - 16th - up - normal - - - G @@ -326,19 +167,18 @@ + G 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -346,33 +186,28 @@ G 4 - 24 - - + 384 1 - 128th + eighth up normal - - + G 4 - 6 - + 384 1 - 512th + eighth up normal - @@ -380,15 +215,13 @@ G 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -396,17 +229,13 @@ G 4 - 48 - - + 384 1 - 64th + eighth up normal - - @@ -414,33 +243,28 @@ G 4 - 12 - - + 384 1 - 256th + eighth up normal - - + G 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -460,14 +284,15 @@ + G 4 - 192 + 384 1 - 16th + eighth up normal @@ -492,24 +317,25 @@ G 4 - 192 + 384 1 - 16th + eighth up normal + G 4 - 192 + 384 1 - 16th + eighth up normal @@ -534,24 +360,25 @@ G 4 - 192 + 384 1 - 16th + eighth up normal + G 4 - 192 + 384 1 - 16th + eighth up normal @@ -576,24 +403,25 @@ G 4 - 192 + 384 1 - 16th + eighth up normal + G 4 - 192 + 384 1 - 16th + eighth up normal @@ -630,20 +458,7 @@ - - G - 4 - - 192 - - 1 - 16th - up - normal - - - - + G 4 @@ -671,152 +486,6 @@ - - - G - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - G - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - G - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - G - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - G - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - G - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - G - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - G - 4 - - 192 - - 1 - 16th - up - normal - - - - - - G - 4 - - 192 - - 1 - 16th - up - normal - - - G @@ -846,19 +515,18 @@ + G 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -866,33 +534,28 @@ G 4 - 24 - - + 384 1 - 128th + eighth up normal - - + G 4 - 6 - + 384 1 - 512th + eighth up normal - @@ -900,15 +563,13 @@ G 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -916,17 +577,13 @@ G 4 - 48 - - + 384 1 - 64th + eighth up normal - - @@ -934,33 +591,28 @@ G 4 - 12 - - + 384 1 - 256th + eighth up normal - - + G 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -980,14 +632,15 @@ + G 4 - 192 + 384 1 - 16th + eighth up normal @@ -1012,24 +665,25 @@ G 4 - 192 + 384 1 - 16th + eighth up normal + G 4 - 192 + 384 1 - 16th + eighth up normal @@ -1082,24 +736,25 @@ G 4 - 192 + 384 1 - 16th + eighth up normal + G 4 - 192 + 384 1 - 16th + eighth up normal diff --git a/test/data/grooves/SlowDesertFillSus.musicxml b/test/data/grooves/SlowDesertFillSus.musicxml index 2a4f7ffb..1ff1ebd8 100644 --- a/test/data/grooves/SlowDesertFillSus.musicxml +++ b/test/data/grooves/SlowDesertFillSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -110,20 +110,7 @@ - - G - 4 - - 192 - - 1 - 16th - up - normal - - - - + G 4 @@ -151,152 +138,6 @@ - - - G - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - G - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - G - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - G - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - G - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - G - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - G - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - G - 4 - - 192 - - 1 - 16th - up - normal - - - - - - G - 4 - - 192 - - 1 - 16th - up - normal - - - G @@ -326,19 +167,18 @@ + G 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -346,33 +186,28 @@ G 4 - 24 - - + 384 1 - 128th + eighth up normal - - + G 4 - 6 - + 384 1 - 512th + eighth up normal - @@ -380,15 +215,13 @@ G 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -396,17 +229,13 @@ G 4 - 48 - - + 384 1 - 64th + eighth up normal - - @@ -414,33 +243,28 @@ G 4 - 12 - - + 384 1 - 256th + eighth up normal - - + G 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -460,14 +284,15 @@ + G 4 - 192 + 384 1 - 16th + eighth up normal @@ -492,24 +317,25 @@ G 4 - 192 + 384 1 - 16th + eighth up normal + G 4 - 192 + 384 1 - 16th + eighth up normal @@ -534,24 +360,25 @@ G 4 - 192 + 384 1 - 16th + eighth up normal + G 4 - 192 + 384 1 - 16th + eighth up normal @@ -576,24 +403,25 @@ G 4 - 192 + 384 1 - 16th + eighth up normal + G 4 - 192 + 384 1 - 16th + eighth up normal @@ -630,20 +458,7 @@ - - G - 4 - - 192 - - 1 - 16th - up - normal - - - - + G 4 @@ -671,152 +486,6 @@ - - - G - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - G - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - G - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - G - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - G - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - G - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - G - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - G - 4 - - 192 - - 1 - 16th - up - normal - - - - - - G - 4 - - 192 - - 1 - 16th - up - normal - - - G @@ -846,19 +515,18 @@ + G 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -866,33 +534,28 @@ G 4 - 24 - - + 384 1 - 128th + eighth up normal - - + G 4 - 6 - + 384 1 - 512th + eighth up normal - @@ -900,15 +563,13 @@ G 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -916,17 +577,13 @@ G 4 - 48 - - + 384 1 - 64th + eighth up normal - - @@ -934,33 +591,28 @@ G 4 - 12 - - + 384 1 - 256th + eighth up normal - - + G 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -980,14 +632,15 @@ + G 4 - 192 + 384 1 - 16th + eighth up normal @@ -1012,24 +665,25 @@ G 4 - 192 + 384 1 - 16th + eighth up normal + G 4 - 192 + 384 1 - 16th + eighth up normal @@ -1082,24 +736,25 @@ G 4 - 192 + 384 1 - 16th + eighth up normal + G 4 - 192 + 384 1 - 16th + eighth up normal diff --git a/test/data/grooves/SlowDesertPlus.musicxml b/test/data/grooves/SlowDesertPlus.musicxml index 50ce8b1d..904a1a9f 100644 --- a/test/data/grooves/SlowDesertPlus.musicxml +++ b/test/data/grooves/SlowDesertPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowDesertSus.musicxml b/test/data/grooves/SlowDesertSus.musicxml index dac7881a..0c3175c2 100644 --- a/test/data/grooves/SlowDesertSus.musicxml +++ b/test/data/grooves/SlowDesertSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowDesertSusPlus.musicxml b/test/data/grooves/SlowDesertSusPlus.musicxml index 23e820e5..72c06d6b 100644 --- a/test/data/grooves/SlowDesertSusPlus.musicxml +++ b/test/data/grooves/SlowDesertSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazz.musicxml b/test/data/grooves/SlowJazz.musicxml index 59bc60ab..c4884624 100644 --- a/test/data/grooves/SlowJazz.musicxml +++ b/test/data/grooves/SlowJazz.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazz1.musicxml b/test/data/grooves/SlowJazz1.musicxml index c9202e1c..e441257e 100644 --- a/test/data/grooves/SlowJazz1.musicxml +++ b/test/data/grooves/SlowJazz1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazz1Intro.musicxml b/test/data/grooves/SlowJazz1Intro.musicxml index 0bfa4ba5..a9e7c214 100644 --- a/test/data/grooves/SlowJazz1Intro.musicxml +++ b/test/data/grooves/SlowJazz1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazz1Plus.musicxml b/test/data/grooves/SlowJazz1Plus.musicxml index cb79de6c..b720d78c 100644 --- a/test/data/grooves/SlowJazz1Plus.musicxml +++ b/test/data/grooves/SlowJazz1Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazz1Sus.musicxml b/test/data/grooves/SlowJazz1Sus.musicxml index bc1d40de..935b3b4a 100644 --- a/test/data/grooves/SlowJazz1Sus.musicxml +++ b/test/data/grooves/SlowJazz1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazz1SusPlus.musicxml b/test/data/grooves/SlowJazz1SusPlus.musicxml index 65330dd0..401b4a22 100644 --- a/test/data/grooves/SlowJazz1SusPlus.musicxml +++ b/test/data/grooves/SlowJazz1SusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazz1Walk.musicxml b/test/data/grooves/SlowJazz1Walk.musicxml index 93b0b17a..a7eaa6ef 100644 --- a/test/data/grooves/SlowJazz1Walk.musicxml +++ b/test/data/grooves/SlowJazz1Walk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazz1WalkSus.musicxml b/test/data/grooves/SlowJazz1WalkSus.musicxml index db981b21..2ee90533 100644 --- a/test/data/grooves/SlowJazz1WalkSus.musicxml +++ b/test/data/grooves/SlowJazz1WalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazz2.musicxml b/test/data/grooves/SlowJazz2.musicxml index 87e703e2..6b80f5b9 100644 --- a/test/data/grooves/SlowJazz2.musicxml +++ b/test/data/grooves/SlowJazz2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazz2End.musicxml b/test/data/grooves/SlowJazz2End.musicxml index 253031c3..e46b5b9e 100644 --- a/test/data/grooves/SlowJazz2End.musicxml +++ b/test/data/grooves/SlowJazz2End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazz2Intro.musicxml b/test/data/grooves/SlowJazz2Intro.musicxml index 0eb22c22..d8aed9a5 100644 --- a/test/data/grooves/SlowJazz2Intro.musicxml +++ b/test/data/grooves/SlowJazz2Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazz2Sus.musicxml b/test/data/grooves/SlowJazz2Sus.musicxml index f845926d..8cea96f9 100644 --- a/test/data/grooves/SlowJazz2Sus.musicxml +++ b/test/data/grooves/SlowJazz2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazzEnd.musicxml b/test/data/grooves/SlowJazzEnd.musicxml index 14c62be3..013cd4bf 100644 --- a/test/data/grooves/SlowJazzEnd.musicxml +++ b/test/data/grooves/SlowJazzEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazzFill.musicxml b/test/data/grooves/SlowJazzFill.musicxml index 0292b4e7..1e1172d3 100644 --- a/test/data/grooves/SlowJazzFill.musicxml +++ b/test/data/grooves/SlowJazzFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazzIntro.musicxml b/test/data/grooves/SlowJazzIntro.musicxml index a2d5d9a0..d27f30b7 100644 --- a/test/data/grooves/SlowJazzIntro.musicxml +++ b/test/data/grooves/SlowJazzIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazzPlus.musicxml b/test/data/grooves/SlowJazzPlus.musicxml index e6237aff..2af1980f 100644 --- a/test/data/grooves/SlowJazzPlus.musicxml +++ b/test/data/grooves/SlowJazzPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazzSus.musicxml b/test/data/grooves/SlowJazzSus.musicxml index 20cf4134..649537cf 100644 --- a/test/data/grooves/SlowJazzSus.musicxml +++ b/test/data/grooves/SlowJazzSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazzSusPlus.musicxml b/test/data/grooves/SlowJazzSusPlus.musicxml index 954362e2..a78db727 100644 --- a/test/data/grooves/SlowJazzSusPlus.musicxml +++ b/test/data/grooves/SlowJazzSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazzWalk.musicxml b/test/data/grooves/SlowJazzWalk.musicxml index 3f45a45e..d60d1acc 100644 --- a/test/data/grooves/SlowJazzWalk.musicxml +++ b/test/data/grooves/SlowJazzWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowJazzWalkSus.musicxml b/test/data/grooves/SlowJazzWalkSus.musicxml index 40616648..c82caf11 100644 --- a/test/data/grooves/SlowJazzWalkSus.musicxml +++ b/test/data/grooves/SlowJazzWalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowRock.musicxml b/test/data/grooves/SlowRock.musicxml index 74dea924..86179ba0 100644 --- a/test/data/grooves/SlowRock.musicxml +++ b/test/data/grooves/SlowRock.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -452,98 +452,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -551,15 +478,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -613,98 +544,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -712,15 +570,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -776,98 +638,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -875,15 +664,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -937,114 +730,45 @@ - 192 - + 256 3 - 16th + eighth + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + - - - 48 - - + + + G + 5 + + 512 + 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -1100,98 +824,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1199,15 +850,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -1261,46 +916,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + @@ -1308,72 +942,116 @@ G 5 - 384 - + 512 3 - eighth + quarter + + 3 + 2 + quarter + up x - + - + + + G 5 - 96 - - + 512 3 - 32nd + quarter + + 3 + 2 + quarter + up x - - + + + 3 + quarter + + + 2 + quarter + + - + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + quarter + up x - - + - + + + 256 + 3 + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + + + + G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - + - - - + G 5 @@ -1402,7 +1080,7 @@ - + G 5 @@ -1424,137 +1102,19 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 512 - - 3 - quarter 3 2 quarter - up - x 3 - quarter + eighth 2 @@ -1563,15 +1123,15 @@ - + G 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -1583,118 +1143,6 @@ - - - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - @@ -1744,98 +1192,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1843,15 +1218,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -1888,98 +1267,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1987,15 +1293,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -2032,98 +1342,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -2131,15 +1368,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -2176,98 +1417,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -2275,15 +1443,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/SlowRockEnd.musicxml b/test/data/grooves/SlowRockEnd.musicxml index d796fee2..9b267bff 100644 --- a/test/data/grooves/SlowRockEnd.musicxml +++ b/test/data/grooves/SlowRockEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowRockIntro.musicxml b/test/data/grooves/SlowRockIntro.musicxml index 0f340983..e4672924 100644 --- a/test/data/grooves/SlowRockIntro.musicxml +++ b/test/data/grooves/SlowRockIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -458,98 +458,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -557,15 +484,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -619,98 +550,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -718,15 +576,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -782,98 +644,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -881,15 +670,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -943,98 +736,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1042,15 +762,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -1106,98 +830,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1205,15 +856,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -1267,98 +922,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1366,15 +948,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -1587,98 +1173,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1686,15 +1199,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -1731,98 +1248,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1830,15 +1274,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -1875,98 +1323,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1974,15 +1349,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/SlowSwing.musicxml b/test/data/grooves/SlowSwing.musicxml index 8b195ed1..bb1ebdfc 100644 --- a/test/data/grooves/SlowSwing.musicxml +++ b/test/data/grooves/SlowSwing.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SlowSwingIntro.musicxml b/test/data/grooves/SlowSwingIntro.musicxml index 51a88495..05dfff54 100644 --- a/test/data/grooves/SlowSwingIntro.musicxml +++ b/test/data/grooves/SlowSwingIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SoftRock.musicxml b/test/data/grooves/SoftRock.musicxml index 54273717..92c83d23 100644 --- a/test/data/grooves/SoftRock.musicxml +++ b/test/data/grooves/SoftRock.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SoftRock1.musicxml b/test/data/grooves/SoftRock1.musicxml index e7d75d3b..eaf1b5da 100644 --- a/test/data/grooves/SoftRock1.musicxml +++ b/test/data/grooves/SoftRock1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SoftRock1Sus.musicxml b/test/data/grooves/SoftRock1Sus.musicxml index ca71bf3e..f743a15a 100644 --- a/test/data/grooves/SoftRock1Sus.musicxml +++ b/test/data/grooves/SoftRock1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SoftRock2.musicxml b/test/data/grooves/SoftRock2.musicxml index 710be786..bcf8b70f 100644 --- a/test/data/grooves/SoftRock2.musicxml +++ b/test/data/grooves/SoftRock2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SoftRock2Sus.musicxml b/test/data/grooves/SoftRock2Sus.musicxml index 4201e79b..235d1ef4 100644 --- a/test/data/grooves/SoftRock2Sus.musicxml +++ b/test/data/grooves/SoftRock2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SoftRockEnd.musicxml b/test/data/grooves/SoftRockEnd.musicxml index c478ddfe..d9e20734 100644 --- a/test/data/grooves/SoftRockEnd.musicxml +++ b/test/data/grooves/SoftRockEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SoftRockFill.musicxml b/test/data/grooves/SoftRockFill.musicxml index 4555876e..f24e8576 100644 --- a/test/data/grooves/SoftRockFill.musicxml +++ b/test/data/grooves/SoftRockFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SoftRockIntro.musicxml b/test/data/grooves/SoftRockIntro.musicxml index c68c1c84..16ec5d88 100644 --- a/test/data/grooves/SoftRockIntro.musicxml +++ b/test/data/grooves/SoftRockIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SoftRockSus.musicxml b/test/data/grooves/SoftRockSus.musicxml index 3e089c22..9ea0ace1 100644 --- a/test/data/grooves/SoftRockSus.musicxml +++ b/test/data/grooves/SoftRockSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SoftRockSusIntro.musicxml b/test/data/grooves/SoftRockSusIntro.musicxml index 14f75133..bf9044a4 100644 --- a/test/data/grooves/SoftRockSusIntro.musicxml +++ b/test/data/grooves/SoftRockSusIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SoftShoeEnd.musicxml b/test/data/grooves/SoftShoeEnd.musicxml index de6fefbe..6654c54a 100644 --- a/test/data/grooves/SoftShoeEnd.musicxml +++ b/test/data/grooves/SoftShoeEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SoftShoeIntro.musicxml b/test/data/grooves/SoftShoeIntro.musicxml index 3d421349..326b96f7 100644 --- a/test/data/grooves/SoftShoeIntro.musicxml +++ b/test/data/grooves/SoftShoeIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SoftShoeIntro8.musicxml b/test/data/grooves/SoftShoeIntro8.musicxml index 5fa7c970..67b21e59 100644 --- a/test/data/grooves/SoftShoeIntro8.musicxml +++ b/test/data/grooves/SoftShoeIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SoftShoePlus.musicxml b/test/data/grooves/SoftShoePlus.musicxml index ff8377a4..33ac7f5f 100644 --- a/test/data/grooves/SoftShoePlus.musicxml +++ b/test/data/grooves/SoftShoePlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SoftShoeSus.musicxml b/test/data/grooves/SoftShoeSus.musicxml index d9cf7888..8b3ff06a 100644 --- a/test/data/grooves/SoftShoeSus.musicxml +++ b/test/data/grooves/SoftShoeSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SoftShoeSusPlus.musicxml b/test/data/grooves/SoftShoeSusPlus.musicxml index ced5b59f..61a8b85e 100644 --- a/test/data/grooves/SoftShoeSusPlus.musicxml +++ b/test/data/grooves/SoftShoeSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Softshoe.musicxml b/test/data/grooves/Softshoe.musicxml index 23f062cb..d968fa52 100644 --- a/test/data/grooves/Softshoe.musicxml +++ b/test/data/grooves/Softshoe.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Son.musicxml b/test/data/grooves/Son.musicxml index 5728feb7..ad78aeb1 100644 --- a/test/data/grooves/Son.musicxml +++ b/test/data/grooves/Son.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SonEnd.musicxml b/test/data/grooves/SonEnd.musicxml index 1ce48125..9db8e298 100644 --- a/test/data/grooves/SonEnd.musicxml +++ b/test/data/grooves/SonEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1014,15 +1014,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/SonFill.musicxml b/test/data/grooves/SonFill.musicxml index 6c8b6a19..8e14810b 100644 --- a/test/data/grooves/SonFill.musicxml +++ b/test/data/grooves/SonFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -571,14 +571,15 @@ + F 4 - 192 + 384 1 - 16th + eighth up normal diff --git a/test/data/grooves/SonFill2.musicxml b/test/data/grooves/SonFill2.musicxml index e2236710..4a80ce9f 100644 --- a/test/data/grooves/SonFill2.musicxml +++ b/test/data/grooves/SonFill2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -605,24 +605,25 @@ D 4 - 192 + 384 1 - 16th + eighth up normal + F 4 - 192 + 384 1 - 16th + eighth up normal diff --git a/test/data/grooves/SonIntro.musicxml b/test/data/grooves/SonIntro.musicxml index 9e5ba9e7..ed969f13 100644 --- a/test/data/grooves/SonIntro.musicxml +++ b/test/data/grooves/SonIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -1788,14 +1788,15 @@ + F 4 - 192 + 384 1 - 16th + eighth up normal @@ -1820,24 +1821,25 @@ D 4 - 192 + 384 1 - 16th + eighth up normal + F 4 - 192 + 384 1 - 16th + eighth up normal @@ -1862,24 +1864,25 @@ D 4 - 192 + 384 1 - 16th + eighth up normal + F 4 - 192 + 384 1 - 16th + eighth up normal @@ -1904,24 +1907,25 @@ D 4 - 192 + 384 1 - 16th + eighth up normal + F 4 - 192 + 384 1 - 16th + eighth up normal diff --git a/test/data/grooves/SonPlus.musicxml b/test/data/grooves/SonPlus.musicxml index d066c055..e0bb327c 100644 --- a/test/data/grooves/SonPlus.musicxml +++ b/test/data/grooves/SonPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SonSus.musicxml b/test/data/grooves/SonSus.musicxml index 9be3e305..f45f061a 100644 --- a/test/data/grooves/SonSus.musicxml +++ b/test/data/grooves/SonSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SonSusPlus.musicxml b/test/data/grooves/SonSusPlus.musicxml index df034762..27e0b135 100644 --- a/test/data/grooves/SonSusPlus.musicxml +++ b/test/data/grooves/SonSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Soul.musicxml b/test/data/grooves/Soul.musicxml index f62db529..9cdfb93d 100644 --- a/test/data/grooves/Soul.musicxml +++ b/test/data/grooves/Soul.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -806,117 +806,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -1124,117 +1035,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - + G 5 - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -1312,98 +1134,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1411,15 +1160,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -1448,98 +1201,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - + 512 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - - 1 - eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1547,23 +1227,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1582,80 +1271,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1663,33 +1297,19 @@ F 4 - 24 - - + 512 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -1718,98 +1338,25 @@ - 192 - + 512 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - - 1 - eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1817,23 +1364,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1854,80 +1410,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1935,33 +1436,19 @@ F 4 - 24 - - + 512 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/SoulEnd.musicxml b/test/data/grooves/SoulEnd.musicxml index 24d170f8..04e944b9 100644 --- a/test/data/grooves/SoulEnd.musicxml +++ b/test/data/grooves/SoulEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -432,117 +432,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - + G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -564,117 +475,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -724,117 +546,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - @@ -872,62 +605,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -935,51 +631,19 @@ F 4 - 96 - - + 512 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/SoulIntro.musicxml b/test/data/grooves/SoulIntro.musicxml index dc6bff6c..93ae6de5 100644 --- a/test/data/grooves/SoulIntro.musicxml +++ b/test/data/grooves/SoulIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -816,117 +816,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -1208,98 +1119,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1307,15 +1145,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -1344,98 +1186,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - - 1 - eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - + 512 1 - 128th - down - normal - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1443,23 +1212,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1478,62 +1256,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -1541,51 +1282,19 @@ F 4 - 96 - - + 512 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -1614,98 +1323,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - - 1 - eighth - down - normal - - - - - - - F - 4 - - 96 - - - + 512 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1713,23 +1349,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/SoulPop.musicxml b/test/data/grooves/SoulPop.musicxml index e980e47b..80613851 100644 --- a/test/data/grooves/SoulPop.musicxml +++ b/test/data/grooves/SoulPop.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -395,33 +395,47 @@ G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - @@ -429,17 +443,19 @@ G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - + @@ -447,76 +463,112 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - - + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + - + G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x @@ -527,15 +579,19 @@ G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - + @@ -543,17 +599,28 @@ G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -561,17 +628,18 @@ G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - @@ -579,65 +647,89 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + - + + + G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - - + G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - + @@ -645,29 +737,47 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - @@ -675,17 +785,19 @@ G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - + @@ -693,83 +805,115 @@ G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - - + G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - + - + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -777,13 +921,19 @@ G 5 - 384 - + 256 + 3 eighth + + 3 + 2 + eighth + up - x + circle-x + @@ -791,51 +941,63 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - + + G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - @@ -843,15 +1005,19 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + @@ -859,33 +1025,47 @@ G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - @@ -893,15 +1073,19 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - + @@ -909,31 +1093,47 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + + + 3 + eighth + + + 2 + eighth + + - - - + G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - @@ -941,17 +1141,19 @@ G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - + @@ -959,17 +1161,28 @@ G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -977,49 +1190,69 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - - + G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - + - + + + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -1027,15 +1260,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1043,13 +1279,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -1057,33 +1299,47 @@ G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - @@ -1091,17 +1347,19 @@ G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - + @@ -1109,65 +1367,96 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - - + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + - + G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -1175,10 +1464,15 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x @@ -1189,15 +1483,19 @@ G 5 - 192 - - + 256 + 3 - 16th + eighth + + 3 + 2 + eighth + up - x + circle-x - + @@ -1205,1944 +1503,32 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - - - - 768 - - - percussion - - - 5 - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - 768 - 1 - quarter - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - F - 4 - - 384 - - 1 - eighth - down - normal - - - - - - 384 - - 1 - eighth - - - - - - - 192 - - 1 - 16th - - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - 768 - 1 - quarter - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - F - 4 - - 384 - - 1 - eighth - down - normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - - 1 - eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - + + + + + 768 + + + percussion + + + 5 + + F @@ -3167,80 +1553,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - + 256 1 - 128th - down - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -3248,15 +1579,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -3264,13 +1598,19 @@ F 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + down normal + @@ -3308,7 +1648,7 @@ - + F @@ -3333,96 +1673,173 @@ - 192 - + 256 1 - 16th - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + - - - 48 - - + + + F + 4 + + 256 + 1 - 64th + eighth + + 3 + 2 + eighth + + down + normal - - - - - 12 - - + + + F + 4 + + 256 + 1 - 256th + eighth + + 3 + 2 + eighth + + down + normal - - + - 3 - + 256 1 - 1024th - - + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + - + F 4 - 96 - + 512 1 - 32nd + quarter + + 3 + 2 + quarter + down normal - + - + + + F 4 - 24 - - + 768 1 - 128th + quarter down normal - - - + + + 768 + 1 + quarter + + + + + + 256 + 1 + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + + + + F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -3430,91 +1847,119 @@ F 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + down normal + - 192 - - 1 - 16th - - - - - - - 48 + 384 - 1 - 64th + eighth - - 12 - + 192 1 - 256th + 16th - - - - 3 - + + + F + 4 + + 192 + 1 - 1024th + 16th + down + normal - + + F 4 - 384 - + 768 1 - eighth + quarter down normal - - + + + 768 + 1 + quarter + + + + + + 256 + 1 + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + + + + F 4 - 96 - - + 256 1 - 32nd + eighth + + 3 + 2 + eighth + down normal - - @@ -3522,17 +1967,42 @@ F 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + down normal - - + + + + + + 256 + 1 + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -3540,15 +2010,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/SoulPopEnd.musicxml b/test/data/grooves/SoulPopEnd.musicxml index fb98a381..1286534b 100644 --- a/test/data/grooves/SoulPopEnd.musicxml +++ b/test/data/grooves/SoulPopEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -421,15 +421,15 @@ + G 5 - 576 + 768 3 - eighth - + quarter up x diff --git a/test/data/grooves/SoulPopIntro.musicxml b/test/data/grooves/SoulPopIntro.musicxml index 1e938bda..b6686224 100644 --- a/test/data/grooves/SoulPopIntro.musicxml +++ b/test/data/grooves/SoulPopIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -417,37 +417,52 @@ + G 5 - 48 - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - @@ -455,65 +470,87 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + - + G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - - + G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - + @@ -521,29 +558,47 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - @@ -551,17 +606,19 @@ G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - + @@ -569,17 +626,28 @@ G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -587,65 +655,88 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - - + G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - + - + + + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -653,13 +744,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -667,33 +764,47 @@ G 5 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - @@ -701,17 +812,19 @@ G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - + @@ -719,15 +832,28 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -735,49 +861,67 @@ G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - - + G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + - + G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -785,29 +929,38 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x - + G 5 - 192 - - + 256 + 3 - 16th + eighth + + 3 + 2 + eighth + up - x + circle-x - + @@ -815,104 +968,89 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - - + + + G 5 - 12 - - + 384 3 - 256th + eighth up x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 384 3 - 32nd + eighth up x - - + G 5 - 24 - - - + 384 + 3 - 128th + eighth up - x + circle-x - - - + + G 5 - 6 - + 384 3 - 512th + eighth up x - - + G 5 @@ -926,1045 +1064,146 @@ - - - + G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - - + G 5 - 12 - - - + 384 + 3 - 256th + eighth up - x + circle-x - - - + + G 5 - 3 - + 384 3 - 1024th + eighth up x - - + + + G 5 - 96 - + 768 3 - 32nd + quarter up x - - + G 5 - 24 - - + 384 3 - 128th + eighth up x - - - + G 5 - 6 - - + 384 + 3 - 512th + eighth up - x + circle-x - - + G 5 - 384 + 768 3 - eighth + quarter up x - + G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 - 48 - - - + 384 + 3 - 64th + eighth up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - - - G - 5 - - 768 - - 3 - quarter - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 768 - - 3 - quarter - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x + circle-x @@ -2067,80 +1306,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 96 - - + 256 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -2148,15 +1332,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -2164,109 +1351,42 @@ F 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + down normal + - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -2274,15 +1394,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -2311,80 +1435,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - + 256 1 - 128th - down - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -2392,15 +1461,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -2408,13 +1480,19 @@ F 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + down normal + diff --git a/test/data/grooves/Spiritual.musicxml b/test/data/grooves/Spiritual.musicxml index 9cac27ae..94bbcb3b 100644 --- a/test/data/grooves/Spiritual.musicxml +++ b/test/data/grooves/Spiritual.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SpiritualEnd.musicxml b/test/data/grooves/SpiritualEnd.musicxml index 5cf9b916..dca2a751 100644 --- a/test/data/grooves/SpiritualEnd.musicxml +++ b/test/data/grooves/SpiritualEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SpiritualIntro.musicxml b/test/data/grooves/SpiritualIntro.musicxml index 2e722d32..9a60f388 100644 --- a/test/data/grooves/SpiritualIntro.musicxml +++ b/test/data/grooves/SpiritualIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SpiritualPlus.musicxml b/test/data/grooves/SpiritualPlus.musicxml index 47c35a7b..7a4de958 100644 --- a/test/data/grooves/SpiritualPlus.musicxml +++ b/test/data/grooves/SpiritualPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SpiritualSus.musicxml b/test/data/grooves/SpiritualSus.musicxml index dab2936c..20fc3d54 100644 --- a/test/data/grooves/SpiritualSus.musicxml +++ b/test/data/grooves/SpiritualSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SpiritualSusIntro.musicxml b/test/data/grooves/SpiritualSusIntro.musicxml index 6819c7a0..54038e8c 100644 --- a/test/data/grooves/SpiritualSusIntro.musicxml +++ b/test/data/grooves/SpiritualSusIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SpiritualSusPlus.musicxml b/test/data/grooves/SpiritualSusPlus.musicxml index 99547bed..31683381 100644 --- a/test/data/grooves/SpiritualSusPlus.musicxml +++ b/test/data/grooves/SpiritualSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Strut.musicxml b/test/data/grooves/Strut.musicxml index e542832e..8e4dcd33 100644 --- a/test/data/grooves/Strut.musicxml +++ b/test/data/grooves/Strut.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Strut2.musicxml b/test/data/grooves/Strut2.musicxml index 6c54a28d..173221d1 100644 --- a/test/data/grooves/Strut2.musicxml +++ b/test/data/grooves/Strut2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Strut2Sus.musicxml b/test/data/grooves/Strut2Sus.musicxml index b1b9f1e3..64fff464 100644 --- a/test/data/grooves/Strut2Sus.musicxml +++ b/test/data/grooves/Strut2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/StrutEnd.musicxml b/test/data/grooves/StrutEnd.musicxml index 7d16ea73..e1277dd1 100644 --- a/test/data/grooves/StrutEnd.musicxml +++ b/test/data/grooves/StrutEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -451,15 +451,15 @@ + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -478,25 +478,25 @@ E 4 - 192 + 768 1 - 16th + quarter up normal + E 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/StrutIntro.musicxml b/test/data/grooves/StrutIntro.musicxml index bbe2c86d..6d73e435 100644 --- a/test/data/grooves/StrutIntro.musicxml +++ b/test/data/grooves/StrutIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/StrutSus.musicxml b/test/data/grooves/StrutSus.musicxml index 776fcb7b..566563d0 100644 --- a/test/data/grooves/StrutSus.musicxml +++ b/test/data/grooves/StrutSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/StrutSusIntro.musicxml b/test/data/grooves/StrutSusIntro.musicxml index 6310452a..11e500a4 100644 --- a/test/data/grooves/StrutSusIntro.musicxml +++ b/test/data/grooves/StrutSusIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Swing.musicxml b/test/data/grooves/Swing.musicxml index a749ed4f..5abfaa04 100644 --- a/test/data/grooves/Swing.musicxml +++ b/test/data/grooves/Swing.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -257,10 +257,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -269,15 +269,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -326,10 +331,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -338,15 +343,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -745,22 +755,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -768,10 +781,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -779,10 +797,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -813,10 +837,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -825,15 +849,20 @@ down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1349,10 +1378,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1361,15 +1390,20 @@ up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/Swing1.musicxml b/test/data/grooves/Swing1.musicxml index d8b4b891..3e67dd2d 100644 --- a/test/data/grooves/Swing1.musicxml +++ b/test/data/grooves/Swing1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Swing1End.musicxml b/test/data/grooves/Swing1End.musicxml index 353ca6a6..57fd43c1 100644 --- a/test/data/grooves/Swing1End.musicxml +++ b/test/data/grooves/Swing1End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Swing1Plus.musicxml b/test/data/grooves/Swing1Plus.musicxml index e83e3bec..3bb40c4d 100644 --- a/test/data/grooves/Swing1Plus.musicxml +++ b/test/data/grooves/Swing1Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Swing1PlusSus.musicxml b/test/data/grooves/Swing1PlusSus.musicxml index d3d8afee..2a98e983 100644 --- a/test/data/grooves/Swing1PlusSus.musicxml +++ b/test/data/grooves/Swing1PlusSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Swing1Sus.musicxml b/test/data/grooves/Swing1Sus.musicxml index beaf8cc3..ccca72b0 100644 --- a/test/data/grooves/Swing1Sus.musicxml +++ b/test/data/grooves/Swing1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Swing1Triple.musicxml b/test/data/grooves/Swing1Triple.musicxml index cc16e8f8..329c7091 100644 --- a/test/data/grooves/Swing1Triple.musicxml +++ b/test/data/grooves/Swing1Triple.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -325,98 +325,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -424,15 +351,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -486,98 +417,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 384 - - + 256 1 eighth - up - x - - - - - - - F - 5 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -585,15 +443,19 @@ F 5 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -650,98 +512,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - circle-x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - circle-x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -749,15 +538,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up circle-x - + @@ -811,98 +604,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - circle-x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - circle-x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -910,15 +630,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up circle-x - + diff --git a/test/data/grooves/Swing1Walk.musicxml b/test/data/grooves/Swing1Walk.musicxml index c12eb948..a5c4879a 100644 --- a/test/data/grooves/Swing1Walk.musicxml +++ b/test/data/grooves/Swing1Walk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Swing1WalkPlus.musicxml b/test/data/grooves/Swing1WalkPlus.musicxml index 5c1deb4d..b19ff80c 100644 --- a/test/data/grooves/Swing1WalkPlus.musicxml +++ b/test/data/grooves/Swing1WalkPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Swing1WalkPlusSus.musicxml b/test/data/grooves/Swing1WalkPlusSus.musicxml index 4a6da9bc..77ac0d1c 100644 --- a/test/data/grooves/Swing1WalkPlusSus.musicxml +++ b/test/data/grooves/Swing1WalkPlusSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Swing1WalkSus.musicxml b/test/data/grooves/Swing1WalkSus.musicxml index 7f23ff1a..1662e971 100644 --- a/test/data/grooves/Swing1WalkSus.musicxml +++ b/test/data/grooves/Swing1WalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Swing2.musicxml b/test/data/grooves/Swing2.musicxml index ef7eee9a..bbbec772 100644 --- a/test/data/grooves/Swing2.musicxml +++ b/test/data/grooves/Swing2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Swing2End.musicxml b/test/data/grooves/Swing2End.musicxml index ca579a47..26927f34 100644 --- a/test/data/grooves/Swing2End.musicxml +++ b/test/data/grooves/Swing2End.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -522,53 +522,18 @@ + D 4 - 48 - - - 2 - 64th - down - x - - - - - - - D - 4 - - 12 - - - - 2 - 256th - down - x - - - - - - - - D - 4 - - 3 - + 192 2 - 1024th + 16th down x - @@ -576,11 +541,11 @@ D 4 - 96 + 48 2 - 32nd + 64th down x @@ -592,12 +557,12 @@ D 4 - 24 + 12 2 - 128th + 256th down x @@ -610,11 +575,11 @@ D 4 - 6 + 3 2 - 512th + 1024th down x @@ -676,15 +641,28 @@ D 4 - 48 - + 128 2 - 64th + 16th + + 3 + 2 + 16th + down x - + + + 3 + 16th + + + 2 + 16th + + @@ -692,17 +670,18 @@ D 4 - 12 - - + 128 2 - 256th + 16th + + 3 + 2 + 16th + down x - - @@ -710,15 +689,19 @@ D 4 - 3 - + 128 2 - 1024th + 16th + + 3 + 2 + 16th + down x - + @@ -750,19 +733,15 @@ + D 4 - 189 + 192 2 - 32nd - - - - - + 16th down x @@ -873,65 +852,28 @@ D 4 - 96 - - - 2 - 32nd - down - x - - - - - - - D - 4 - - 24 - - - - 2 - 128th - down - x - - - - - - - - D - 4 - - 6 - - - 2 - 512th - down - x - - - - - - - D - 4 - - 48 - + 128 2 - 64th + 16th + + 3 + 2 + 16th + down x - + + + 3 + 16th + + + 2 + 16th + + @@ -939,17 +881,18 @@ D 4 - 12 - - + 128 2 - 256th + 16th + + 3 + 2 + 16th + down x - - @@ -957,15 +900,19 @@ D 4 - 3 - + 128 2 - 1024th + 16th + + 3 + 2 + 16th + down x - + @@ -982,25 +929,6 @@ - - - D - 4 - - 189 - - 2 - 32nd - - - - - - down - x - - - D @@ -1016,19 +944,15 @@ + D 4 - 189 + 192 2 - 32nd - - - - - + 16th down x @@ -1139,65 +1063,28 @@ D 4 - 96 - - - 2 - 32nd - down - x - - - - - - - D - 4 - - 24 - - - - 2 - 128th - down - x - - - - - - - - D - 4 - - 6 - - - 2 - 512th - down - x - - - - - - - D - 4 - - 48 - + 128 2 - 64th + 16th + + 3 + 2 + 16th + down x - + + + 3 + 16th + + + 2 + 16th + + @@ -1205,17 +1092,18 @@ D 4 - 12 - - + 128 2 - 256th + 16th + + 3 + 2 + 16th + down x - - @@ -1223,15 +1111,19 @@ D 4 - 3 - + 128 2 - 1024th + 16th + + 3 + 2 + 16th + down x - + @@ -1248,25 +1140,6 @@ - - - D - 4 - - 189 - - 2 - 32nd - - - - - - down - x - - - D @@ -1282,19 +1155,15 @@ + D 4 - 189 + 192 2 - 32nd - - - - - + 16th down x @@ -1405,15 +1274,28 @@ D 4 - 96 - + 128 2 - 32nd + 16th + + 3 + 2 + 16th + down x - + + + 3 + 16th + + + 2 + 16th + + @@ -1421,17 +1303,18 @@ D 4 - 24 - - + 128 2 - 128th + 16th + + 3 + 2 + 16th + down x - - @@ -1439,65 +1322,19 @@ D 4 - 6 - + 128 2 - 512th + 16th + + 3 + 2 + 16th + down x - - - - - - D - 4 - - 48 - - - 2 - 64th - down - x - - - - - - - D - 4 - - 12 - - - - 2 - 256th - down - x - - - - - - - - D - 4 - - 3 - - - 2 - 1024th - down - x - - + @@ -1514,25 +1351,6 @@ - - - D - 4 - - 189 - - 2 - 32nd - - - - - - down - x - - - @@ -1599,131 +1417,13 @@ D 4 - 192 - - 2 - 16th - down - x - - - - - - D - 4 - - 48 - - - 2 - 64th - down - x - - - - - - - D - 4 - - 12 - - - - 2 - 256th - down - x - - - - - - - - D - 4 - - 3 - - - 2 - 1024th - down - x - - - - - - - D - 4 - - 384 - - - 2 - eighth - down - x - - - - - - - D - 4 - - 96 - - - - 2 - 32nd - down - x - - - - - - - - D - 4 - - 24 - - - - 2 - 128th - down - x - - - - - - - - D - 4 - - 6 - + 768 2 - 512th + quarter down x - @@ -1930,529 +1630,35 @@ 768 2 - quarter - - - - - - 768 - 2 - quarter - - - - - - - - - 768 - - - percussion - - - 5 - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - circle-x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x + quarter - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - circle-x + + + 768 + 2 + quarter + + + + + + 768 + + + percussion + + + 5 + + G @@ -2468,19 +1674,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up circle-x @@ -2591,65 +1793,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up circle-x - + + + 3 + 16th + + + 2 + 16th + + @@ -2657,17 +1822,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up circle-x - - @@ -2675,15 +1841,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up circle-x - + @@ -2700,25 +1870,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - circle-x - - - G @@ -2734,19 +1885,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up circle-x @@ -2857,65 +2004,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up circle-x - + + + 3 + 16th + + + 2 + 16th + + @@ -2923,17 +2033,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up circle-x - - @@ -2941,15 +2052,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up circle-x - + @@ -2971,23 +2086,17 @@ G 5 - 189 + 192 3 - 32nd - - - - - + 16th up circle-x - - + G 5 @@ -3106,15 +2215,28 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up circle-x - + + + 3 + 16th + + + 2 + 16th + + @@ -3122,17 +2244,18 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up circle-x - - @@ -3140,15 +2263,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up circle-x - + @@ -3156,15 +2283,13 @@ G 5 - 96 - + 192 3 - 32nd + 16th up circle-x - @@ -3172,33 +2297,28 @@ G 5 - 24 - - + 192 3 - 128th + 16th up circle-x - - + G 5 - 6 - + 192 3 - 512th + 16th up circle-x - @@ -3256,32 +2376,15 @@ G 5 - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 189 + 96 + 3 32nd - - - - - up circle-x + @@ -3289,13 +2392,17 @@ G 5 - 192 + 24 + + 3 - 16th + 128th up circle-x + + @@ -3303,18 +2410,15 @@ G 5 - 189 + 6 + 3 - 32nd - - - - - + 512th up circle-x + @@ -3322,15 +2426,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up circle-x - + + + 3 + 16th + + + 2 + 16th + + @@ -3338,17 +2455,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up circle-x - - @@ -3356,15 +2474,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up circle-x - + @@ -3372,49 +2494,44 @@ G 5 - 96 - + 192 3 - 32nd + 16th up circle-x - + + G 5 - 24 - - + 192 3 - 128th + 16th up circle-x - - + G 5 - 6 - + 192 3 - 512th + 16th up circle-x - @@ -3422,11 +2539,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up circle-x @@ -3438,12 +2555,12 @@ G 5 - 24 + 12 3 - 128th + 256th up circle-x @@ -3456,11 +2573,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up circle-x @@ -3472,11 +2589,11 @@ G 5 - 48 + 96 3 - 64th + 32nd up circle-x @@ -3488,12 +2605,12 @@ G 5 - 12 + 24 3 - 256th + 128th up circle-x @@ -3506,11 +2623,11 @@ G 5 - 3 + 6 3 - 1024th + 512th up circle-x @@ -3522,13 +2639,28 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up circle-x + + + 3 + 16th + + + 2 + 16th + + @@ -3536,29 +2668,15 @@ G 5 - 189 - - 3 - 32nd - - - - - - up - circle-x - - - - - - G - 5 - - 192 + 128 3 16th + + 3 + 2 + 16th + up circle-x @@ -3569,18 +2687,19 @@ G 5 - 189 + 128 3 - 32nd - - - - - + 16th + + 3 + 2 + 16th + up circle-x + @@ -3588,15 +2707,13 @@ G 5 - 48 - + 192 3 - 64th + 16th up circle-x - @@ -3604,33 +2721,28 @@ G 5 - 12 - - + 192 3 - 256th + 16th up circle-x - - + G 5 - 3 - + 192 3 - 1024th + 16th up circle-x - @@ -3638,11 +2750,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up circle-x @@ -3654,12 +2766,12 @@ G 5 - 24 + 12 3 - 128th + 256th up circle-x @@ -3672,11 +2784,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up circle-x @@ -3738,15 +2850,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up circle-x - + + + 3 + 16th + + + 2 + 16th + + @@ -3754,17 +2879,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up circle-x - - @@ -3772,15 +2898,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up circle-x - + @@ -3797,25 +2927,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - circle-x - - - G @@ -3831,19 +2942,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up circle-x @@ -3954,15 +3061,28 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up circle-x - + + + 3 + 16th + + + 2 + 16th + + @@ -3970,17 +3090,18 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up circle-x - - @@ -3988,15 +3109,19 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up circle-x - + @@ -4004,15 +3129,13 @@ G 5 - 48 - + 192 3 - 64th + 16th up circle-x - @@ -4020,33 +3143,28 @@ G 5 - 12 - - + 192 3 - 256th + 16th up circle-x - - + G 5 - 3 - + 192 3 - 1024th + 16th up circle-x - @@ -4054,13 +3172,15 @@ G 5 - 192 + 48 + 3 - 16th + 64th up circle-x + @@ -4068,34 +3188,33 @@ G 5 - 189 + 12 + + 3 - 32nd - - - - - + 256th up circle-x + + - - G 5 - 192 + 3 + 3 - 16th + 1024th up circle-x + @@ -4103,11 +3222,11 @@ G 5 - 48 + 96 3 - 64th + 32nd up circle-x @@ -4119,12 +3238,12 @@ G 5 - 12 + 24 3 - 256th + 128th up circle-x @@ -4137,11 +3256,11 @@ G 5 - 3 + 6 3 - 1024th + 512th up circle-x @@ -4153,15 +3272,28 @@ G 5 - 384 - + 128 3 - eighth + 16th + + 3 + 2 + 16th + up circle-x - + + + 3 + 16th + + + 2 + 16th + + @@ -4169,17 +3301,18 @@ G 5 - 96 - - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up circle-x - - @@ -4187,17 +3320,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up circle-x - - + @@ -4205,15 +3340,29 @@ G 5 - 6 - + 192 3 - 512th + 16th + up + circle-x + + + + + + + + G + 5 + + 768 + + 3 + quarter up circle-x - diff --git a/test/data/grooves/Swing2Plus.musicxml b/test/data/grooves/Swing2Plus.musicxml index 49dcf127..6513a5cc 100644 --- a/test/data/grooves/Swing2Plus.musicxml +++ b/test/data/grooves/Swing2Plus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Swing2PlusSus.musicxml b/test/data/grooves/Swing2PlusSus.musicxml index 0fa94d71..9078b47e 100644 --- a/test/data/grooves/Swing2PlusSus.musicxml +++ b/test/data/grooves/Swing2PlusSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Swing2Sus.musicxml b/test/data/grooves/Swing2Sus.musicxml index 5e3ebf66..b6610f8f 100644 --- a/test/data/grooves/Swing2Sus.musicxml +++ b/test/data/grooves/Swing2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Swing2Triple.musicxml b/test/data/grooves/Swing2Triple.musicxml index f9b641fa..6095d0bc 100644 --- a/test/data/grooves/Swing2Triple.musicxml +++ b/test/data/grooves/Swing2Triple.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -270,98 +270,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - x - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -369,15 +296,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -431,98 +362,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - x - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - x - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -530,15 +388,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up x - + @@ -609,98 +471,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - down - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -708,15 +497,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -770,98 +563,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - down - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - down - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -869,15 +589,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -989,98 +713,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - circle-x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - circle-x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1088,15 +739,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up circle-x - + @@ -1150,98 +805,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - + 256 3 eighth - up - circle-x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - circle-x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -1249,15 +831,19 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up circle-x - + diff --git a/test/data/grooves/SwingEnd.musicxml b/test/data/grooves/SwingEnd.musicxml index ad4cb312..27a73a28 100644 --- a/test/data/grooves/SwingEnd.musicxml +++ b/test/data/grooves/SwingEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SwingFill.musicxml b/test/data/grooves/SwingFill.musicxml index d9072051..bad1f351 100644 --- a/test/data/grooves/SwingFill.musicxml +++ b/test/data/grooves/SwingFill.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SwingIntro.musicxml b/test/data/grooves/SwingIntro.musicxml index f87f8fb8..ccf8b0ff 100644 --- a/test/data/grooves/SwingIntro.musicxml +++ b/test/data/grooves/SwingIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SwingIntro2.musicxml b/test/data/grooves/SwingIntro2.musicxml index 3a96d874..e7363709 100644 --- a/test/data/grooves/SwingIntro2.musicxml +++ b/test/data/grooves/SwingIntro2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SwingPlus.musicxml b/test/data/grooves/SwingPlus.musicxml index 2f55c677..2d3d808c 100644 --- a/test/data/grooves/SwingPlus.musicxml +++ b/test/data/grooves/SwingPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SwingPlusSus.musicxml b/test/data/grooves/SwingPlusSus.musicxml index 411fb90e..fb8586b4 100644 --- a/test/data/grooves/SwingPlusSus.musicxml +++ b/test/data/grooves/SwingPlusSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SwingSus.musicxml b/test/data/grooves/SwingSus.musicxml index 6b54afd5..3ea066c2 100644 --- a/test/data/grooves/SwingSus.musicxml +++ b/test/data/grooves/SwingSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SwingTriple.musicxml b/test/data/grooves/SwingTriple.musicxml index cc3c135d..93056e46 100644 --- a/test/data/grooves/SwingTriple.musicxml +++ b/test/data/grooves/SwingTriple.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -402,98 +402,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - D - 4 - - 384 - - + 256 2 eighth - down - x - - - - - - - D - 4 - - 96 - - - - 2 - 32nd - down - x - - - - - - - - D - 4 - - 24 - - - - 2 - 128th - down - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -501,15 +428,19 @@ D 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + down x - + @@ -563,98 +494,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - D - 4 - - 384 - - + 256 2 eighth - down - x - - - - - - - D - 4 - - 96 - - - - 2 - 32nd - down - x - - - - - - - - D - 4 - - 24 - - - - 2 - 128th - down - x + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -662,15 +520,19 @@ D 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + down x - + diff --git a/test/data/grooves/SwingWalk.musicxml b/test/data/grooves/SwingWalk.musicxml index c3949afe..da849ca9 100644 --- a/test/data/grooves/SwingWalk.musicxml +++ b/test/data/grooves/SwingWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SwingWalkPlus.musicxml b/test/data/grooves/SwingWalkPlus.musicxml index 0f958e44..927e2879 100644 --- a/test/data/grooves/SwingWalkPlus.musicxml +++ b/test/data/grooves/SwingWalkPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SwingWalkPlusSus.musicxml b/test/data/grooves/SwingWalkPlusSus.musicxml index a2b5b4e7..0c00b33f 100644 --- a/test/data/grooves/SwingWalkPlusSus.musicxml +++ b/test/data/grooves/SwingWalkPlusSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/SwingWalkSus.musicxml b/test/data/grooves/SwingWalkSus.musicxml index 84602d80..20e9d71d 100644 --- a/test/data/grooves/SwingWalkSus.musicxml +++ b/test/data/grooves/SwingWalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TECH01.musicxml b/test/data/grooves/TECH01.musicxml index 4a8edf4c..edf09196 100644 --- a/test/data/grooves/TECH01.musicxml +++ b/test/data/grooves/TECH01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -453,117 +453,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - @@ -585,117 +496,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - + G 5 - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - diff --git a/test/data/grooves/TECH02.musicxml b/test/data/grooves/TECH02.musicxml index 91edfe22..fbcf9108 100644 --- a/test/data/grooves/TECH02.musicxml +++ b/test/data/grooves/TECH02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TECH03.musicxml b/test/data/grooves/TECH03.musicxml index 802261af..e8b50df7 100644 --- a/test/data/grooves/TECH03.musicxml +++ b/test/data/grooves/TECH03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -245,22 +245,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -268,10 +271,15 @@ D 5 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -279,10 +287,16 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -326,22 +340,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -349,10 +366,15 @@ D 5 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -360,10 +382,16 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -630,38 +658,6 @@ - - - 48 - - 3 - 64th - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - G @@ -689,65 +685,28 @@ G 5 - 96 - + 128 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th + 16th + + 3 + 2 + 16th + up x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - circle-x - - + + + 3 + 16th + + + 2 + 16th + + @@ -755,33 +714,18 @@ G 5 - 12 - - + 128 3 - 256th - up - circle-x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th + 16th + + 3 + 2 + 16th + up circle-x - @@ -789,13 +733,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -1005,50 +955,6 @@ - - - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - G @@ -1117,38 +1023,6 @@ - - - 48 - - 3 - 64th - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - G @@ -1176,117 +1050,28 @@ G 5 - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up circle-x - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - + G 5 - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 384 3 - 1024th + eighth up x - diff --git a/test/data/grooves/TECH04.musicxml b/test/data/grooves/TECH04.musicxml index 22a12bc1..c6f0a970 100644 --- a/test/data/grooves/TECH04.musicxml +++ b/test/data/grooves/TECH04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -477,22 +477,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -500,10 +503,15 @@ D 5 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -511,10 +519,16 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/TECH05.musicxml b/test/data/grooves/TECH05.musicxml index 94c4076f..224c1185 100644 --- a/test/data/grooves/TECH05.musicxml +++ b/test/data/grooves/TECH05.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -292,22 +292,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -315,10 +318,15 @@ D 5 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -326,30 +334,39 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -357,10 +374,15 @@ D 5 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -368,10 +390,16 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -488,22 +516,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -511,10 +542,15 @@ D 5 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -522,30 +558,39 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -553,10 +598,15 @@ D 5 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -564,10 +614,16 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -663,25 +719,25 @@ E 4 - 192 + 768 1 - 16th + quarter up x + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -700,25 +756,25 @@ E 4 - 192 + 768 1 - 16th + quarter up x + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -739,25 +795,25 @@ E 4 - 192 + 768 1 - 16th + quarter up x + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -776,24 +832,25 @@ E 4 - 192 + 384 1 - 16th + eighth up x + E 4 - 192 + 384 1 - 16th + eighth up normal @@ -804,117 +861,28 @@ E 4 - 96 - - - 1 - 32nd - up - x - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - x - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up x - + E 4 - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/TECH06.musicxml b/test/data/grooves/TECH06.musicxml index aed3d6f9..692a01aa 100644 --- a/test/data/grooves/TECH06.musicxml +++ b/test/data/grooves/TECH06.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TECH07.musicxml b/test/data/grooves/TECH07.musicxml index 49803cad..08095499 100644 --- a/test/data/grooves/TECH07.musicxml +++ b/test/data/grooves/TECH07.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TECH08.musicxml b/test/data/grooves/TECH08.musicxml index c6e22bbe..11eea15e 100644 --- a/test/data/grooves/TECH08.musicxml +++ b/test/data/grooves/TECH08.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -237,22 +237,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -260,10 +263,15 @@ A 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -271,30 +279,39 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -302,10 +319,15 @@ A 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -313,10 +335,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -435,22 +463,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -458,10 +489,15 @@ A 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -469,10 +505,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -581,22 +623,25 @@ - 384 - - 3 - eighth - - - - - - - 192 - + 512 3 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -604,10 +649,15 @@ F 5 - 192 + 512 3 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -615,10 +665,16 @@ - 768 + 512 3 quarter + + 3 + 2 + quarter + + @@ -640,22 +696,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -663,10 +722,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -674,30 +738,39 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -705,10 +778,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -716,10 +794,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -789,22 +873,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -812,10 +899,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -823,10 +915,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/TECH09.musicxml b/test/data/grooves/TECH09.musicxml index 0890e380..7dc350f8 100644 --- a/test/data/grooves/TECH09.musicxml +++ b/test/data/grooves/TECH09.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TECH10.musicxml b/test/data/grooves/TECH10.musicxml index f49acbee..6bc69ec5 100644 --- a/test/data/grooves/TECH10.musicxml +++ b/test/data/grooves/TECH10.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/THRS01.musicxml b/test/data/grooves/THRS01.musicxml index 6f0ce518..1d13b561 100644 --- a/test/data/grooves/THRS01.musicxml +++ b/test/data/grooves/THRS01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/THRS02.musicxml b/test/data/grooves/THRS02.musicxml index 9820f3cc..ea25b2fe 100644 --- a/test/data/grooves/THRS02.musicxml +++ b/test/data/grooves/THRS02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TRIP01.musicxml b/test/data/grooves/TRIP01.musicxml index 6e1e407a..3d1ec58a 100644 --- a/test/data/grooves/TRIP01.musicxml +++ b/test/data/grooves/TRIP01.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -668,98 +668,25 @@ - 192 - + 512 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -767,15 +694,18 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - @@ -783,109 +713,42 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up x + - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - + 512 3 - 128th - up - x - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -893,15 +756,18 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - @@ -909,13 +775,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up x + @@ -1047,98 +919,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - + 512 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - G - 5 - - 384 - - - 3 - eighth - up - x - - - - - - - G - 5 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1146,15 +945,18 @@ G 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up x - @@ -1162,13 +964,19 @@ G 5 - 768 + 512 3 quarter + + 3 + 2 + quarter + up x + diff --git a/test/data/grooves/TRIP02.musicxml b/test/data/grooves/TRIP02.musicxml index def870e3..41bd8bfc 100644 --- a/test/data/grooves/TRIP02.musicxml +++ b/test/data/grooves/TRIP02.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TRIP03.musicxml b/test/data/grooves/TRIP03.musicxml index b5db31a8..790989b3 100644 --- a/test/data/grooves/TRIP03.musicxml +++ b/test/data/grooves/TRIP03.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TRIP04.musicxml b/test/data/grooves/TRIP04.musicxml index 2634f869..5649ea3d 100644 --- a/test/data/grooves/TRIP04.musicxml +++ b/test/data/grooves/TRIP04.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Tango.musicxml b/test/data/grooves/Tango.musicxml index a9ad6745..561d9086 100644 --- a/test/data/grooves/Tango.musicxml +++ b/test/data/grooves/Tango.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -252,83 +252,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -336,15 +281,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -352,17 +300,21 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + - - E @@ -377,16 +329,17 @@ + + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -613,83 +566,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -697,15 +595,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -713,17 +614,21 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + - - E @@ -738,16 +643,17 @@ + + E 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/Tango1.musicxml b/test/data/grooves/Tango1.musicxml index 70ecab7f..6b297746 100644 --- a/test/data/grooves/Tango1.musicxml +++ b/test/data/grooves/Tango1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -252,83 +252,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -336,15 +281,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -352,17 +300,21 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + - - E @@ -377,16 +329,17 @@ + + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -613,83 +566,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -697,15 +595,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -713,17 +614,21 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + - - E @@ -738,16 +643,17 @@ + + E 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/TangoClean.musicxml b/test/data/grooves/TangoClean.musicxml index 6229693a..9571bf4d 100644 --- a/test/data/grooves/TangoClean.musicxml +++ b/test/data/grooves/TangoClean.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -252,83 +252,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -336,15 +281,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -352,17 +300,21 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + - - E @@ -377,16 +329,17 @@ + + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -613,83 +566,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -697,15 +595,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -713,17 +614,21 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + - - E @@ -738,16 +643,17 @@ + + E 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/TangoCleanPlus.musicxml b/test/data/grooves/TangoCleanPlus.musicxml index 76dba74f..cbafa7c3 100644 --- a/test/data/grooves/TangoCleanPlus.musicxml +++ b/test/data/grooves/TangoCleanPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -252,83 +252,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -336,15 +281,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -352,17 +300,21 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + - - E @@ -377,16 +329,17 @@ + + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -613,83 +566,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -697,15 +595,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -713,17 +614,21 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + - - E @@ -738,16 +643,17 @@ + + E 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/TangoCleanSus.musicxml b/test/data/grooves/TangoCleanSus.musicxml index cee3f7bd..1563503b 100644 --- a/test/data/grooves/TangoCleanSus.musicxml +++ b/test/data/grooves/TangoCleanSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -252,83 +252,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -336,15 +281,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -352,17 +300,21 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + - - E @@ -377,16 +329,17 @@ + + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -613,83 +566,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -697,15 +595,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -713,17 +614,21 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + - - E @@ -738,16 +643,17 @@ + + E 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/TangoEnd.musicxml b/test/data/grooves/TangoEnd.musicxml index e7e5cd37..2afae214 100644 --- a/test/data/grooves/TangoEnd.musicxml +++ b/test/data/grooves/TangoEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -252,83 +252,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -336,15 +281,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -352,17 +300,21 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + - - E @@ -377,16 +329,17 @@ + + E 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/TangoIntro.musicxml b/test/data/grooves/TangoIntro.musicxml index bda38989..31a270f1 100644 --- a/test/data/grooves/TangoIntro.musicxml +++ b/test/data/grooves/TangoIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -252,83 +252,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -336,15 +281,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -352,17 +300,21 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + - - E @@ -377,16 +329,17 @@ + + E 4 - 576 + 768 1 - eighth - + quarter up normal @@ -613,83 +566,28 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -697,15 +595,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -713,17 +614,21 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + - - E @@ -738,16 +643,17 @@ + + E 4 - 576 + 768 1 - eighth - + quarter up normal diff --git a/test/data/grooves/TeamTechno.musicxml b/test/data/grooves/TeamTechno.musicxml index 8e6fb90a..c7bc990e 100644 --- a/test/data/grooves/TeamTechno.musicxml +++ b/test/data/grooves/TeamTechno.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TeamTechnoEnd.musicxml b/test/data/grooves/TeamTechnoEnd.musicxml index 047b9133..3b7b1c95 100644 --- a/test/data/grooves/TeamTechnoEnd.musicxml +++ b/test/data/grooves/TeamTechnoEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TeamTechnoIntro.musicxml b/test/data/grooves/TeamTechnoIntro.musicxml index be782c1a..040de661 100644 --- a/test/data/grooves/TeamTechnoIntro.musicxml +++ b/test/data/grooves/TeamTechnoIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TeamTechnoIntroPlus.musicxml b/test/data/grooves/TeamTechnoIntroPlus.musicxml index 91899751..9cf893be 100644 --- a/test/data/grooves/TeamTechnoIntroPlus.musicxml +++ b/test/data/grooves/TeamTechnoIntroPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TeamTechnoSus.musicxml b/test/data/grooves/TeamTechnoSus.musicxml index de3f250c..1881b456 100644 --- a/test/data/grooves/TeamTechnoSus.musicxml +++ b/test/data/grooves/TeamTechnoSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Techno.musicxml b/test/data/grooves/Techno.musicxml index aeff9188..9d7270f6 100644 --- a/test/data/grooves/Techno.musicxml +++ b/test/data/grooves/Techno.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TechnoEnd.musicxml b/test/data/grooves/TechnoEnd.musicxml index 5745c986..d6d0221e 100644 --- a/test/data/grooves/TechnoEnd.musicxml +++ b/test/data/grooves/TechnoEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TechnoIntro.musicxml b/test/data/grooves/TechnoIntro.musicxml index e13d7072..011f9121 100644 --- a/test/data/grooves/TechnoIntro.musicxml +++ b/test/data/grooves/TechnoIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Trance.musicxml b/test/data/grooves/Trance.musicxml index 2b742a62..e349577a 100644 --- a/test/data/grooves/Trance.musicxml +++ b/test/data/grooves/Trance.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Trance1.musicxml b/test/data/grooves/Trance1.musicxml index 624a2cfe..e1fcbffc 100644 --- a/test/data/grooves/Trance1.musicxml +++ b/test/data/grooves/Trance1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -486,80 +486,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -567,33 +512,19 @@ E 4 - 24 - - + 512 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - - - 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -652,80 +583,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 96 - - - 2 - 32nd - up - square - - - - - - - E - 4 - - 24 - - - + 256 2 - 128th - up - square - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -733,15 +609,18 @@ E 4 - 6 - + 256 2 - 512th + eighth + + 3 + 2 + eighth + up square - @@ -749,13 +628,19 @@ E 4 - 384 + 256 2 eighth + + 3 + 2 + eighth + up square + @@ -812,62 +697,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - E - 4 - - 384 - - + 256 2 eighth - up - square - - + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -875,51 +723,19 @@ E 4 - 96 - - + 512 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - - - 2 - 512th + quarter + + 3 + 2 + quarter + up square - + @@ -940,50 +756,6 @@ - - - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - E diff --git a/test/data/grooves/Trance1Bass1.musicxml b/test/data/grooves/Trance1Bass1.musicxml index b1e914db..cbf64db6 100644 --- a/test/data/grooves/Trance1Bass1.musicxml +++ b/test/data/grooves/Trance1Bass1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Trance2.musicxml b/test/data/grooves/Trance2.musicxml index 184fb48c..14ee1be0 100644 --- a/test/data/grooves/Trance2.musicxml +++ b/test/data/grooves/Trance2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Trance2Bass1.musicxml b/test/data/grooves/Trance2Bass1.musicxml index 75fc232e..60f760d1 100644 --- a/test/data/grooves/Trance2Bass1.musicxml +++ b/test/data/grooves/Trance2Bass1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TranceBass1.musicxml b/test/data/grooves/TranceBass1.musicxml index f5498946..5df4c328 100644 --- a/test/data/grooves/TranceBass1.musicxml +++ b/test/data/grooves/TranceBass1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TranceEnd.musicxml b/test/data/grooves/TranceEnd.musicxml index 54fb48d7..7b803343 100644 --- a/test/data/grooves/TranceEnd.musicxml +++ b/test/data/grooves/TranceEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TranceIntro.musicxml b/test/data/grooves/TranceIntro.musicxml index 3ce08cd5..9f9eb707 100644 --- a/test/data/grooves/TranceIntro.musicxml +++ b/test/data/grooves/TranceIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TripHop.musicxml b/test/data/grooves/TripHop.musicxml index b2e3deef..bd4234e5 100644 --- a/test/data/grooves/TripHop.musicxml +++ b/test/data/grooves/TripHop.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -574,22 +574,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -597,10 +600,15 @@ F 5 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -611,13 +619,19 @@ F 5 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -1093,22 +1107,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1116,10 +1133,15 @@ F 5 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -1130,13 +1152,19 @@ F 5 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -1768,70 +1796,18 @@ + F 4 - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - + 192 1 - 1024th - down - normal - - - - - - - E - 4 - - 288 - - - 1 16th - down normal - @@ -1839,33 +1815,13 @@ E 4 - 24 - - - - 1 - 128th - down - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth down normal - diff --git a/test/data/grooves/TripHopEnd.musicxml b/test/data/grooves/TripHopEnd.musicxml index a064935f..d3280fe1 100644 --- a/test/data/grooves/TripHopEnd.musicxml +++ b/test/data/grooves/TripHopEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -428,22 +428,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -451,10 +454,15 @@ F 5 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -465,13 +473,19 @@ F 5 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -958,15 +972,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter down normal diff --git a/test/data/grooves/TripHopIntro.musicxml b/test/data/grooves/TripHopIntro.musicxml index 44ecf85c..83eb153d 100644 --- a/test/data/grooves/TripHopIntro.musicxml +++ b/test/data/grooves/TripHopIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -568,22 +568,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -591,10 +594,15 @@ F 5 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -605,13 +613,19 @@ F 5 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -1087,22 +1101,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1110,10 +1127,15 @@ F 5 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -1124,13 +1146,19 @@ F 5 - 768 + 512 1 quarter + + 3 + 2 + quarter + up x + @@ -1635,88 +1663,18 @@ + F 4 - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - + 192 1 - 1024th - down - normal - - - - - - - E - 4 - - 288 - - - 1 16th - - down - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th down normal - - @@ -1724,15 +1682,13 @@ E 4 - 6 - + 384 1 - 512th + eighth down normal - @@ -1926,15 +1882,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter down normal diff --git a/test/data/grooves/TwiEndingB.musicxml b/test/data/grooves/TwiEndingB.musicxml index 7354e69c..7aaa0078 100644 --- a/test/data/grooves/TwiEndingB.musicxml +++ b/test/data/grooves/TwiEndingB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -344,14 +344,15 @@ + F 4 - 192 + 384 1 - 16th + eighth up diamond diff --git a/test/data/grooves/TwiFillAA.musicxml b/test/data/grooves/TwiFillAA.musicxml index 5a3a6b7a..2628611a 100644 --- a/test/data/grooves/TwiFillAA.musicxml +++ b/test/data/grooves/TwiFillAA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TwiFillAB.musicxml b/test/data/grooves/TwiFillAB.musicxml index 0bf10d49..ceb49467 100644 --- a/test/data/grooves/TwiFillAB.musicxml +++ b/test/data/grooves/TwiFillAB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -246,117 +246,28 @@ D 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - D - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - D - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - F - 4 - - 192 - - - 1 - 16th - up - diamond - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - diamond - - - + F 4 - 12 - - - - 1 - 256th - up - diamond - - - - - - - - F - 4 - - 3 - + 384 1 - 1024th + eighth up diamond - @@ -392,24 +303,25 @@ D 4 - 192 + 384 1 - 16th + eighth up normal + F 4 - 192 + 384 1 - 16th + eighth up diamond @@ -420,117 +332,28 @@ D 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - D - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - D - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - F - 4 - - 192 - - - 1 - 16th - up - diamond - - + F 4 - 48 - - - - 1 - 64th - up - diamond - - - - - - - - F - 4 - - 12 - - - - 1 - 256th - up - diamond - - - - - - - - F - 4 - - 3 - + 384 1 - 1024th + eighth up diamond - diff --git a/test/data/grooves/TwiFillBA.musicxml b/test/data/grooves/TwiFillBA.musicxml index beda4220..38214fe7 100644 --- a/test/data/grooves/TwiFillBA.musicxml +++ b/test/data/grooves/TwiFillBA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -242,15 +242,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up diamond @@ -293,16 +293,45 @@ + F 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up diamond + + + + 3 + eighth + + + 2 + eighth + + + + + + + 256 + 1 + eighth + + 3 + 2 + eighth + @@ -311,13 +340,19 @@ D 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + up normal + diff --git a/test/data/grooves/TwiFillBB.musicxml b/test/data/grooves/TwiFillBB.musicxml index 8ae35149..81ccbe2e 100644 --- a/test/data/grooves/TwiFillBB.musicxml +++ b/test/data/grooves/TwiFillBB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -248,24 +248,25 @@ D 4 - 192 + 384 1 - 16th + eighth up normal + F 4 - 192 + 384 1 - 16th + eighth up diamond @@ -290,24 +291,25 @@ D 4 - 192 + 384 1 - 16th + eighth up normal + F 4 - 192 + 384 1 - 16th + eighth up diamond @@ -318,117 +320,28 @@ D 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - D - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - D - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - F - 4 - - 192 - - - 1 - 16th - up - diamond - - + F 4 - 48 - - - - 1 - 64th - up - diamond - - - - - - - - F - 4 - - 12 - - - - 1 - 256th - up - diamond - - - - - - - - F - 4 - - 3 - + 384 1 - 1024th + eighth up diamond - diff --git a/test/data/grooves/TwiIntroB.musicxml b/test/data/grooves/TwiIntroB.musicxml index f5981fa2..397ce5f3 100644 --- a/test/data/grooves/TwiIntroB.musicxml +++ b/test/data/grooves/TwiIntroB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -766,117 +766,28 @@ D 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - D - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - D - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - F - 4 - - 192 - - - 1 - 16th - up - diamond - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - diamond - - - + F 4 - 12 - - - - 1 - 256th - up - diamond - - - - - - - - F - 4 - - 3 - + 384 1 - 1024th + eighth up diamond - diff --git a/test/data/grooves/TwiMainA.musicxml b/test/data/grooves/TwiMainA.musicxml index 019b1012..7afa42fb 100644 --- a/test/data/grooves/TwiMainA.musicxml +++ b/test/data/grooves/TwiMainA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/TwiMainB.musicxml b/test/data/grooves/TwiMainB.musicxml index f8dce8b2..32759677 100644 --- a/test/data/grooves/TwiMainB.musicxml +++ b/test/data/grooves/TwiMainB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -314,117 +314,28 @@ D 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - D - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - D - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - F - 4 - - 192 - - - 1 - 16th - up - diamond - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - diamond - - - - - - - - F - 4 - - 12 - - - - 1 - 256th - up - diamond - - - + F 4 - 3 - + 384 1 - 1024th + eighth up diamond - diff --git a/test/data/grooves/Twist.musicxml b/test/data/grooves/Twist.musicxml index bcd0fc0c..8de60fcd 100644 --- a/test/data/grooves/Twist.musicxml +++ b/test/data/grooves/Twist.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -579,24 +579,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up normal @@ -707,24 +708,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up normal @@ -835,24 +837,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up normal @@ -963,24 +966,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up normal diff --git a/test/data/grooves/Twist4.musicxml b/test/data/grooves/Twist4.musicxml index 1d0a73e1..d0eb02bf 100644 --- a/test/data/grooves/Twist4.musicxml +++ b/test/data/grooves/Twist4.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -98,15 +98,15 @@ + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -131,25 +131,25 @@ D 4 - 192 + 768 2 - 16th + quarter down x + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -186,15 +186,15 @@ + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -219,25 +219,25 @@ D 4 - 192 + 768 2 - 16th + quarter down x + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -288,15 +288,15 @@ + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -321,25 +321,25 @@ D 4 - 192 + 768 2 - 16th + quarter down x + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -376,15 +376,15 @@ + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -409,25 +409,25 @@ D 4 - 192 + 768 2 - 16th + quarter down x + D 4 - 576 + 768 2 - eighth - + quarter down x diff --git a/test/data/grooves/Twist4Sus.musicxml b/test/data/grooves/Twist4Sus.musicxml index bed0a94a..be509c46 100644 --- a/test/data/grooves/Twist4Sus.musicxml +++ b/test/data/grooves/Twist4Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -98,15 +98,15 @@ + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -131,25 +131,25 @@ D 4 - 192 + 768 2 - 16th + quarter down x + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -186,15 +186,15 @@ + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -219,25 +219,25 @@ D 4 - 192 + 768 2 - 16th + quarter down x + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -288,15 +288,15 @@ + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -321,25 +321,25 @@ D 4 - 192 + 768 2 - 16th + quarter down x + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -376,15 +376,15 @@ + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -409,25 +409,25 @@ D 4 - 192 + 768 2 - 16th + quarter down x + D 4 - 576 + 768 2 - eighth - + quarter down x diff --git a/test/data/grooves/TwistEnd.musicxml b/test/data/grooves/TwistEnd.musicxml index 0bea7276..8fe6fac9 100644 --- a/test/data/grooves/TwistEnd.musicxml +++ b/test/data/grooves/TwistEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -385,24 +385,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up normal diff --git a/test/data/grooves/TwistIntro.musicxml b/test/data/grooves/TwistIntro.musicxml index c8bf1b26..9c6206b6 100644 --- a/test/data/grooves/TwistIntro.musicxml +++ b/test/data/grooves/TwistIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -701,24 +701,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up normal @@ -829,24 +830,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up normal @@ -957,24 +959,25 @@ E 4 - 192 + 384 1 - 16th + eighth up normal + E 4 - 192 + 384 1 - 16th + eighth up normal diff --git a/test/data/grooves/TwistSus.musicxml b/test/data/grooves/TwistSus.musicxml index 478e0e96..248cb22f 100644 --- a/test/data/grooves/TwistSus.musicxml +++ b/test/data/grooves/TwistSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -98,15 +98,15 @@ + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -131,25 +131,25 @@ D 4 - 192 + 768 2 - 16th + quarter down x + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -186,15 +186,15 @@ + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -219,25 +219,25 @@ D 4 - 192 + 768 2 - 16th + quarter down x + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -288,15 +288,15 @@ + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -321,25 +321,25 @@ D 4 - 192 + 768 2 - 16th + quarter down x + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -376,15 +376,15 @@ + D 4 - 576 + 768 2 - eighth - + quarter down x @@ -409,25 +409,25 @@ D 4 - 192 + 768 2 - 16th + quarter down x + D 4 - 576 + 768 2 - eighth - + quarter down x diff --git a/test/data/grooves/VieneseWaltz.musicxml b/test/data/grooves/VieneseWaltz.musicxml index cbce55ed..0a989f8a 100644 --- a/test/data/grooves/VieneseWaltz.musicxml +++ b/test/data/grooves/VieneseWaltz.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/VieneseWaltz1.musicxml b/test/data/grooves/VieneseWaltz1.musicxml index 0d1867b1..95c56f88 100644 --- a/test/data/grooves/VieneseWaltz1.musicxml +++ b/test/data/grooves/VieneseWaltz1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/VieneseWaltz1Sus.musicxml b/test/data/grooves/VieneseWaltz1Sus.musicxml index 356f9691..9afc635e 100644 --- a/test/data/grooves/VieneseWaltz1Sus.musicxml +++ b/test/data/grooves/VieneseWaltz1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/VieneseWaltz2.musicxml b/test/data/grooves/VieneseWaltz2.musicxml index 9ea89349..687aed42 100644 --- a/test/data/grooves/VieneseWaltz2.musicxml +++ b/test/data/grooves/VieneseWaltz2.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/VieneseWaltz2Sus.musicxml b/test/data/grooves/VieneseWaltz2Sus.musicxml index a4a3a33d..7a84a106 100644 --- a/test/data/grooves/VieneseWaltz2Sus.musicxml +++ b/test/data/grooves/VieneseWaltz2Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/VieneseWaltzEnd.musicxml b/test/data/grooves/VieneseWaltzEnd.musicxml index 89a1cb0c..21a5ac92 100644 --- a/test/data/grooves/VieneseWaltzEnd.musicxml +++ b/test/data/grooves/VieneseWaltzEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/VieneseWaltzIntro.musicxml b/test/data/grooves/VieneseWaltzIntro.musicxml index 9a57b561..61b6e3f4 100644 --- a/test/data/grooves/VieneseWaltzIntro.musicxml +++ b/test/data/grooves/VieneseWaltzIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/VieneseWaltzSus.musicxml b/test/data/grooves/VieneseWaltzSus.musicxml index a7df813b..eef920a7 100644 --- a/test/data/grooves/VieneseWaltzSus.musicxml +++ b/test/data/grooves/VieneseWaltzSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/W-RockEndingA.musicxml b/test/data/grooves/W-RockEndingA.musicxml index 7ac99556..281ec3be 100644 --- a/test/data/grooves/W-RockEndingA.musicxml +++ b/test/data/grooves/W-RockEndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/W-RockEndingB.musicxml b/test/data/grooves/W-RockEndingB.musicxml index 0e3fa9cd..42f17e43 100644 --- a/test/data/grooves/W-RockEndingB.musicxml +++ b/test/data/grooves/W-RockEndingB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/W-RockFillAA.musicxml b/test/data/grooves/W-RockFillAA.musicxml index b56c8237..cdc0147e 100644 --- a/test/data/grooves/W-RockFillAA.musicxml +++ b/test/data/grooves/W-RockFillAA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/W-RockFillAB.musicxml b/test/data/grooves/W-RockFillAB.musicxml index bf353ebb..89c6e6e9 100644 --- a/test/data/grooves/W-RockFillAB.musicxml +++ b/test/data/grooves/W-RockFillAB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/W-RockFillBA.musicxml b/test/data/grooves/W-RockFillBA.musicxml index 14e9334f..c75f3732 100644 --- a/test/data/grooves/W-RockFillBA.musicxml +++ b/test/data/grooves/W-RockFillBA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/W-RockIntroA.musicxml b/test/data/grooves/W-RockIntroA.musicxml index a70e6744..99ed7633 100644 --- a/test/data/grooves/W-RockIntroA.musicxml +++ b/test/data/grooves/W-RockIntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -179,50 +179,6 @@ - - - 384 - - 1 - eighth - - - - - - - 96 - - - 1 - 32nd - - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - E @@ -306,81 +262,41 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + - 48 - + 128 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th + 16th + + 3 + 2 + 16th + - @@ -388,13 +304,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + diff --git a/test/data/grooves/W-RockMainA.musicxml b/test/data/grooves/W-RockMainA.musicxml index c17607f9..29ca33d6 100644 --- a/test/data/grooves/W-RockMainA.musicxml +++ b/test/data/grooves/W-RockMainA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/W-RockMainB.musicxml b/test/data/grooves/W-RockMainB.musicxml index 8d3a2fb3..0686aff3 100644 --- a/test/data/grooves/W-RockMainB.musicxml +++ b/test/data/grooves/W-RockMainB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Waltz.musicxml b/test/data/grooves/Waltz.musicxml index b68eeec5..6ef6a087 100644 --- a/test/data/grooves/Waltz.musicxml +++ b/test/data/grooves/Waltz.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Waltz1.musicxml b/test/data/grooves/Waltz1.musicxml index aed16c3d..3ca10286 100644 --- a/test/data/grooves/Waltz1.musicxml +++ b/test/data/grooves/Waltz1.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Waltz1Intro.musicxml b/test/data/grooves/Waltz1Intro.musicxml index e2103931..40dd99bf 100644 --- a/test/data/grooves/Waltz1Intro.musicxml +++ b/test/data/grooves/Waltz1Intro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Waltz1Intro8.musicxml b/test/data/grooves/Waltz1Intro8.musicxml index 777e8103..7a881a4b 100644 --- a/test/data/grooves/Waltz1Intro8.musicxml +++ b/test/data/grooves/Waltz1Intro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Waltz1Sus.musicxml b/test/data/grooves/Waltz1Sus.musicxml index 4f0d570d..c537a105 100644 --- a/test/data/grooves/Waltz1Sus.musicxml +++ b/test/data/grooves/Waltz1Sus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Waltz1SusIntro.musicxml b/test/data/grooves/Waltz1SusIntro.musicxml index c2bdf461..eca31195 100644 --- a/test/data/grooves/Waltz1SusIntro.musicxml +++ b/test/data/grooves/Waltz1SusIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Waltz1SusIntro8.musicxml b/test/data/grooves/Waltz1SusIntro8.musicxml index 7aa0278d..4fe919f7 100644 --- a/test/data/grooves/Waltz1SusIntro8.musicxml +++ b/test/data/grooves/Waltz1SusIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Waltz1Walk.musicxml b/test/data/grooves/Waltz1Walk.musicxml index daf93c9b..48acd7bf 100644 --- a/test/data/grooves/Waltz1Walk.musicxml +++ b/test/data/grooves/Waltz1Walk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Waltz1WalkSus.musicxml b/test/data/grooves/Waltz1WalkSus.musicxml index ee101366..6b32582d 100644 --- a/test/data/grooves/Waltz1WalkSus.musicxml +++ b/test/data/grooves/Waltz1WalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WaltzEnd.musicxml b/test/data/grooves/WaltzEnd.musicxml index 56002c03..5e0718b9 100644 --- a/test/data/grooves/WaltzEnd.musicxml +++ b/test/data/grooves/WaltzEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WaltzIntro.musicxml b/test/data/grooves/WaltzIntro.musicxml index f0aae366..e3d17c97 100644 --- a/test/data/grooves/WaltzIntro.musicxml +++ b/test/data/grooves/WaltzIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WaltzIntro8.musicxml b/test/data/grooves/WaltzIntro8.musicxml index 5300a3db..906c25a8 100644 --- a/test/data/grooves/WaltzIntro8.musicxml +++ b/test/data/grooves/WaltzIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WaltzSus.musicxml b/test/data/grooves/WaltzSus.musicxml index 7f571b56..ea2c9e3f 100644 --- a/test/data/grooves/WaltzSus.musicxml +++ b/test/data/grooves/WaltzSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WaltzSusIntro.musicxml b/test/data/grooves/WaltzSusIntro.musicxml index 1bc4d050..b5cc9ed0 100644 --- a/test/data/grooves/WaltzSusIntro.musicxml +++ b/test/data/grooves/WaltzSusIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WaltzSusIntro8.musicxml b/test/data/grooves/WaltzSusIntro8.musicxml index 0207b9d2..b722f831 100644 --- a/test/data/grooves/WaltzSusIntro8.musicxml +++ b/test/data/grooves/WaltzSusIntro8.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WaltzWalk.musicxml b/test/data/grooves/WaltzWalk.musicxml index cd4692af..2140138e 100644 --- a/test/data/grooves/WaltzWalk.musicxml +++ b/test/data/grooves/WaltzWalk.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WaltzWalkSus.musicxml b/test/data/grooves/WaltzWalkSus.musicxml index 847c9261..36b0018c 100644 --- a/test/data/grooves/WaltzWalkSus.musicxml +++ b/test/data/grooves/WaltzWalkSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WesternEndingA.musicxml b/test/data/grooves/WesternEndingA.musicxml index b138a191..04ae67fc 100644 --- a/test/data/grooves/WesternEndingA.musicxml +++ b/test/data/grooves/WesternEndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -401,25 +401,25 @@ B 5 - 192 + 768 1 - 16th + quarter up x + A 5 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/WesternEndingB.musicxml b/test/data/grooves/WesternEndingB.musicxml index ee624635..9d7b22c1 100644 --- a/test/data/grooves/WesternEndingB.musicxml +++ b/test/data/grooves/WesternEndingB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -515,25 +515,25 @@ B 5 - 192 + 768 1 - 16th + quarter up x + A 5 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/WesternFillAA.musicxml b/test/data/grooves/WesternFillAA.musicxml index b863347b..4db3cb3b 100644 --- a/test/data/grooves/WesternFillAA.musicxml +++ b/test/data/grooves/WesternFillAA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WesternFillAB.musicxml b/test/data/grooves/WesternFillAB.musicxml index 9688c8e9..ce6be6ac 100644 --- a/test/data/grooves/WesternFillAB.musicxml +++ b/test/data/grooves/WesternFillAB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WesternFillBA.musicxml b/test/data/grooves/WesternFillBA.musicxml index 2829f81e..939a0fa6 100644 --- a/test/data/grooves/WesternFillBA.musicxml +++ b/test/data/grooves/WesternFillBA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WesternFillBB.musicxml b/test/data/grooves/WesternFillBB.musicxml index 5ef3e219..c22dbaea 100644 --- a/test/data/grooves/WesternFillBB.musicxml +++ b/test/data/grooves/WesternFillBB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WesternIntroA.musicxml b/test/data/grooves/WesternIntroA.musicxml index 5e1a9048..690c378c 100644 --- a/test/data/grooves/WesternIntroA.musicxml +++ b/test/data/grooves/WesternIntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WesternIntroB.musicxml b/test/data/grooves/WesternIntroB.musicxml index 009fa9cc..39d8bc3e 100644 --- a/test/data/grooves/WesternIntroB.musicxml +++ b/test/data/grooves/WesternIntroB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -267,22 +267,25 @@ - 384 - + 512 2 - eighth - - - - - - - 192 - - 2 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -290,10 +293,15 @@ E 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up square @@ -301,10 +309,16 @@ - 768 + 512 2 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/WesternMainA.musicxml b/test/data/grooves/WesternMainA.musicxml index ff4fe2f6..a88ed8c0 100644 --- a/test/data/grooves/WesternMainA.musicxml +++ b/test/data/grooves/WesternMainA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WesternMainB.musicxml b/test/data/grooves/WesternMainB.musicxml index 94c2c793..d8fe4ac2 100644 --- a/test/data/grooves/WesternMainB.musicxml +++ b/test/data/grooves/WesternMainB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WesternSwing.musicxml b/test/data/grooves/WesternSwing.musicxml index 0a3f196a..90604ec1 100644 --- a/test/data/grooves/WesternSwing.musicxml +++ b/test/data/grooves/WesternSwing.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WesternSwingEnd.musicxml b/test/data/grooves/WesternSwingEnd.musicxml index 122d3510..e7a4527e 100644 --- a/test/data/grooves/WesternSwingEnd.musicxml +++ b/test/data/grooves/WesternSwingEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WesternSwingIntro.musicxml b/test/data/grooves/WesternSwingIntro.musicxml index 36a7bf5b..8017b48d 100644 --- a/test/data/grooves/WesternSwingIntro.musicxml +++ b/test/data/grooves/WesternSwingIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WesternSwingPlus.musicxml b/test/data/grooves/WesternSwingPlus.musicxml index 1389a779..d8dd4b92 100644 --- a/test/data/grooves/WesternSwingPlus.musicxml +++ b/test/data/grooves/WesternSwingPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WesternSwingSus.musicxml b/test/data/grooves/WesternSwingSus.musicxml index 7d35e8bf..8a900a39 100644 --- a/test/data/grooves/WesternSwingSus.musicxml +++ b/test/data/grooves/WesternSwingSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WesternSwingSusPlus.musicxml b/test/data/grooves/WesternSwingSusPlus.musicxml index f1d71780..c06b0509 100644 --- a/test/data/grooves/WesternSwingSusPlus.musicxml +++ b/test/data/grooves/WesternSwingSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/WorldPop.musicxml b/test/data/grooves/WorldPop.musicxml index c9497e9d..cfb25b47 100644 --- a/test/data/grooves/WorldPop.musicxml +++ b/test/data/grooves/WorldPop.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -500,22 +500,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -523,10 +526,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -537,13 +545,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -606,22 +620,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -629,10 +646,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -643,13 +665,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -762,98 +790,134 @@ - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + - - - 48 - - + + + F + 4 + + 512 + 1 - 64th + quarter + + 3 + 2 + quarter + + up + normal - - - 12 - - + 512 1 - 256th + quarter + + 3 + 2 + quarter + - - + + + - 3 - + 768 1 - 1024th + quarter - - - - F - 4 - - 384 - - + + + 512 1 - eighth - up - normal + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + - + F 4 - 96 - - + 256 1 - 32nd + eighth + + 3 + 2 + quarter + up normal - - + - - - F - 4 - - 24 - - - + + + 512 1 - 128th - up - normal + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + @@ -861,27 +925,36 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + - + 768 @@ -935,137 +1008,7 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 768 - 1 - quarter - - - - - - - - 768 - 1 - quarter - - - - - - 512 + 512 1 quarter @@ -1086,15 +1029,15 @@ - + F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1102,137 +1045,6 @@ up normal - - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 768 - 1 - quarter - - - - - - - - 768 - 1 - quarter @@ -1246,133 +1058,84 @@ 2 quarter - - - - 3 - quarter - - - 2 - quarter - - - - - - - F - 4 - - 256 - - 1 - eighth - - 3 - 2 - quarter - - up - normal + + - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - + 768 1 - 256th + quarter - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 512 1 - eighth - up - normal + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + - + F 4 - 96 - - + 256 1 - 32nd + eighth + + 3 + 2 + quarter + up normal - - + - - - F - 4 - - 24 - - - + + + 512 1 - 128th - up - normal + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + @@ -1380,23 +1143,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -3176,227 +2948,51 @@ - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - - - - 768 - - - percussion - - - 1 - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - up - x - - - - - - F - 4 - - 768 - - 1 - quarter - up - normal - - - - - - F - 4 - - 576 - - 1 - eighth - - up - x - - - - - - F - 4 - - 192 - - 1 - 16th - up - normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - + - F - 4 + G + 5 - 6 - - - 1 - 512th + 192 + + 3 + 16th up - normal + x - - + - F - 4 + G + 5 - 192 - - 1 - 16th + 384 + + 3 + eighth up - normal + circle-x - + + + + + 768 + + + percussion + + + 1 + + 384 @@ -3419,7 +3015,7 @@ - + F 4 @@ -3448,7 +3044,7 @@ - + F 4 @@ -3464,118 +3060,68 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - up - normal + + 3 + 2 + eighth + - - + + + 3 + eighth + + + 2 + eighth + + - + F 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - - + F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - + - + 384 @@ -3598,7 +3144,7 @@ - + F 4 @@ -3627,7 +3173,7 @@ - + F 4 @@ -3643,115 +3189,49 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - + 256 1 - 512th - up - normal + eighth + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + - + F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal + - + 384 @@ -3774,7 +3254,7 @@ - + F 4 @@ -3803,7 +3283,7 @@ - + F 4 @@ -3819,98 +3299,154 @@ - 192 - + 256 1 - 16th + eighth + + 3 + 2 + eighth + - + + + 3 + eighth + + + 2 + eighth + + - - - 48 - - + + + F + 4 + + 256 + 1 - 64th + eighth + + 3 + 2 + eighth + + up + normal - - - - - 12 - - + + + F + 4 + + 256 + 1 - 256th + eighth + + 3 + 2 + eighth + + up + normal - - + + + - 3 - + 384 1 - 1024th + eighth - - + F 4 384 - - + 1 eighth up - normal + x - - + F 4 - 96 - - + 768 1 - 32nd + quarter up normal - - - + F 4 - 24 - - + 576 + + 1 + eighth + + up + x + + + + + + F + 4 + + 192 1 - 128th + 16th up normal - - + + + + + 256 + 1 + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + @@ -3918,15 +3454,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -4182,98 +3722,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - B - 4 - - 384 - - + 256 2 eighth - up - normal - - - - - - - B - 4 - - 96 - - - - 2 - 32nd - up - normal - - - - - - - - B - 4 - - 24 - - - - 2 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -4281,15 +3748,19 @@ B 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/WorldPopEnd.musicxml b/test/data/grooves/WorldPopEnd.musicxml index 689c34fa..2447ed98 100644 --- a/test/data/grooves/WorldPopEnd.musicxml +++ b/test/data/grooves/WorldPopEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -730,98 +730,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - + 512 1 - 128th - up - normal + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + @@ -829,23 +756,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -905,98 +841,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - + 512 1 - 128th - up - normal + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + @@ -1004,23 +867,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -2398,81 +2270,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - F - 4 - - 24 - - - + 256 1 - 128th - up - normal + eighth + + 3 + 2 + eighth + - - + + + 3 + eighth + + + 2 + eighth + + @@ -2480,15 +2296,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - @@ -2496,13 +2315,19 @@ F 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up normal + @@ -2522,15 +2347,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x @@ -2629,81 +2454,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - F - 4 - - 24 - - - + 256 1 - 128th - up - normal + eighth + + 3 + 2 + eighth + - - + + + 3 + eighth + + + 2 + eighth + + @@ -2711,15 +2480,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - @@ -2727,13 +2499,19 @@ F 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up normal + @@ -2753,15 +2531,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/WorldPopIntro.musicxml b/test/data/grooves/WorldPopIntro.musicxml index c24faeca..51a1f46a 100644 --- a/test/data/grooves/WorldPopIntro.musicxml +++ b/test/data/grooves/WorldPopIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -590,22 +590,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -613,10 +616,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -627,13 +635,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -752,98 +766,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - + 512 1 - 128th - up - normal + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + @@ -851,23 +792,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -927,98 +877,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - - 1 - eighth - up - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - + 512 1 - 128th - up - normal + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + @@ -1026,23 +903,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1480,22 +1366,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -1503,10 +1392,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1514,30 +1408,39 @@ - 768 - 1 - quarter - - - - - - 384 - + 512 1 - eighth + quarter + + 3 + 2 + quarter + - + - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -1545,10 +1448,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1556,10 +1464,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -2652,81 +2566,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - F - 4 - - 24 - - - + 256 1 - 128th - up - normal + eighth + + 3 + 2 + eighth + - - + + + 3 + eighth + + + 2 + eighth + + @@ -2734,15 +2592,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - @@ -2750,13 +2611,19 @@ F 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up normal + @@ -2828,98 +2695,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -2927,15 +2721,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -2987,25 +2785,25 @@ F 4 - 192 + 768 1 - 16th + quarter up normal + F 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/Xaxado-Miranda.musicxml b/test/data/grooves/Xaxado-Miranda.musicxml index 01c0634b..fcecb909 100644 --- a/test/data/grooves/Xaxado-Miranda.musicxml +++ b/test/data/grooves/Xaxado-Miranda.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Xote-Miranda.musicxml b/test/data/grooves/Xote-Miranda.musicxml index ffd2db1b..6753934a 100644 --- a/test/data/grooves/Xote-Miranda.musicxml +++ b/test/data/grooves/Xote-Miranda.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/Zydeco.musicxml b/test/data/grooves/Zydeco.musicxml index 390c8cae..b21fa354 100644 --- a/test/data/grooves/Zydeco.musicxml +++ b/test/data/grooves/Zydeco.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ZydecoEnd.musicxml b/test/data/grooves/ZydecoEnd.musicxml index 44a42e51..389e27e1 100644 --- a/test/data/grooves/ZydecoEnd.musicxml +++ b/test/data/grooves/ZydecoEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ZydecoIntro.musicxml b/test/data/grooves/ZydecoIntro.musicxml index 933b211c..9b9d5450 100644 --- a/test/data/grooves/ZydecoIntro.musicxml +++ b/test/data/grooves/ZydecoIntro.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ZydecoPlus.musicxml b/test/data/grooves/ZydecoPlus.musicxml index 986a21b3..4b818f7c 100644 --- a/test/data/grooves/ZydecoPlus.musicxml +++ b/test/data/grooves/ZydecoPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ZydecoPlusEnd.musicxml b/test/data/grooves/ZydecoPlusEnd.musicxml index a41bde19..de0494dc 100644 --- a/test/data/grooves/ZydecoPlusEnd.musicxml +++ b/test/data/grooves/ZydecoPlusEnd.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ZydecoSus.musicxml b/test/data/grooves/ZydecoSus.musicxml index f5b89707..8c970c42 100644 --- a/test/data/grooves/ZydecoSus.musicxml +++ b/test/data/grooves/ZydecoSus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/ZydecoSusPlus.musicxml b/test/data/grooves/ZydecoSusPlus.musicxml index e767cd92..8bf6ffb6 100644 --- a/test/data/grooves/ZydecoSusPlus.musicxml +++ b/test/data/grooves/ZydecoSusPlus.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/fasttwistA.musicxml b/test/data/grooves/fasttwistA.musicxml index c544c186..436e6df8 100644 --- a/test/data/grooves/fasttwistA.musicxml +++ b/test/data/grooves/fasttwistA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/fasttwistB.musicxml b/test/data/grooves/fasttwistB.musicxml index fca8ebca..49b59d03 100644 --- a/test/data/grooves/fasttwistB.musicxml +++ b/test/data/grooves/fasttwistB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -404,117 +404,28 @@ D 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - D - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - D - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - F - 4 - - 192 - - - 1 - 16th - up - diamond - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - diamond - - - - - - - - F - 4 - - 12 - - - - 1 - 256th - up - diamond - - - + F 4 - 3 - + 384 1 - 1024th + eighth up diamond - @@ -712,117 +623,28 @@ D 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - D - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - D - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - F - 4 - - 192 - - - 1 - 16th - up - diamond - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - diamond - - - - - - - - F - 4 - - 12 - - - - 1 - 256th - up - diamond - - - + F 4 - 3 - + 384 1 - 1024th + eighth up diamond - diff --git a/test/data/grooves/fasttwistEndingA.musicxml b/test/data/grooves/fasttwistEndingA.musicxml index 6ffaa3e4..f5c5fcc4 100644 --- a/test/data/grooves/fasttwistEndingA.musicxml +++ b/test/data/grooves/fasttwistEndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -338,14 +338,15 @@ + F 4 - 192 + 384 1 - 16th + eighth up diamond diff --git a/test/data/grooves/fasttwistEndingB.musicxml b/test/data/grooves/fasttwistEndingB.musicxml index 56dc6c5e..59b9a407 100644 --- a/test/data/grooves/fasttwistEndingB.musicxml +++ b/test/data/grooves/fasttwistEndingB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -338,14 +338,15 @@ + F 4 - 192 + 384 1 - 16th + eighth up diamond diff --git a/test/data/grooves/fasttwistFillA.musicxml b/test/data/grooves/fasttwistFillA.musicxml index a5204b32..ad14d7a1 100644 --- a/test/data/grooves/fasttwistFillA.musicxml +++ b/test/data/grooves/fasttwistFillA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -258,117 +258,28 @@ D 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - D - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - D - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - F - 4 - - 192 - - - 1 - 16th - up - diamond - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - diamond - - - + F 4 - 12 - - - - 1 - 256th - up - diamond - - - - - - - - F - 4 - - 3 - + 384 1 - 1024th + eighth up diamond - @@ -404,24 +315,25 @@ D 4 - 192 + 384 1 - 16th + eighth up normal + F 4 - 192 + 384 1 - 16th + eighth up diamond @@ -432,117 +344,28 @@ D 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - D - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - D - 4 - - 6 - + 384 1 - 512th + eighth up normal - - - - - - F - 4 - - 192 - - - 1 - 16th - up - diamond - - + F 4 - 48 - - - - 1 - 64th - up - diamond - - - - - - - - F - 4 - - 12 - - - - 1 - 256th - up - diamond - - - - - - - - F - 4 - - 3 - + 384 1 - 1024th + eighth up diamond - diff --git a/test/data/grooves/fasttwistFillB.musicxml b/test/data/grooves/fasttwistFillB.musicxml index 733a4260..932cfb1b 100644 --- a/test/data/grooves/fasttwistFillB.musicxml +++ b/test/data/grooves/fasttwistFillB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/fasttwistIntroA.musicxml b/test/data/grooves/fasttwistIntroA.musicxml index 9f32c66c..131e5743 100644 --- a/test/data/grooves/fasttwistIntroA.musicxml +++ b/test/data/grooves/fasttwistIntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -242,15 +242,15 @@ + F 4 - 576 + 768 1 - eighth - + quarter up normal @@ -317,117 +317,28 @@ D 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - D - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - D - 4 - - 6 - + 384 1 - 512th - up - normal - - - - - - - F - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - F - 4 - - 12 - - - - 1 - 256th + eighth up normal - - + F 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -435,30 +346,25 @@ D 4 - 192 + 384 1 - 16th + eighth up normal + F 4 - 381 + 384 1 - 16th - - - - - - + eighth up normal diff --git a/test/data/grooves/fasttwistIntroB.musicxml b/test/data/grooves/fasttwistIntroB.musicxml index 3e458b2e..d3d61154 100644 --- a/test/data/grooves/fasttwistIntroB.musicxml +++ b/test/data/grooves/fasttwistIntroB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -412,117 +412,28 @@ D 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - D - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - D - 4 - - 6 - + 384 1 - 512th - up - normal - - - - - - - F - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - F - 4 - - 12 - - - - 1 - 256th + eighth up normal - - + F 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -540,14 +451,15 @@ + F 4 - 192 + 384 1 - 16th + eighth up normal @@ -606,103 +518,61 @@ + F 4 - 48 - - - 1 - 64th - up - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - F - 4 - - 96 - + 192 1 - 32nd + 16th up normal - + F 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + - - - F - 4 - - 6 - - + + + 256 1 - 512th - up - normal + eighth + + 3 + 2 + eighth + - @@ -710,13 +580,19 @@ D 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + up normal + @@ -756,51 +632,18 @@ + F 4 - 192 + 384 1 - 16th - up - normal - - - - - - D - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - D - 4 - - 24 - - - - 1 - 128th + eighth up normal - - @@ -808,83 +651,28 @@ D 4 - 6 - + 384 1 - 512th + eighth up normal - + F 4 - 192 - - - 1 - 16th - up - diamond - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - diamond - - - - - - - - F - 4 - - 12 - - - - 1 - 256th - up - diamond - - - - - - - - F - 4 - - 3 - + 384 1 - 1024th + eighth up diamond - @@ -1160,6 +948,7 @@ + D 4 @@ -1174,6 +963,14 @@ + + + 192 + 2 + 16th + + + D diff --git a/test/data/grooves/highfiveA.musicxml b/test/data/grooves/highfiveA.musicxml index 0538eec9..7f961e81 100644 --- a/test/data/grooves/highfiveA.musicxml +++ b/test/data/grooves/highfiveA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -226,15 +226,28 @@ E 4 - 192 - + 256 1 - 16th + eighth + + 3 + 2 + eighth + up normal - + + + 3 + eighth + + + 2 + eighth + + @@ -242,35 +255,42 @@ E 4 - 48 - - + 256 1 - 64th + eighth + + 3 + 2 + eighth + up normal - - - - - E - 4 - - 12 - - - + + + 256 1 - 256th - up - normal + eighth + + 3 + 2 + eighth + + + + + + + + + + 768 + 1 + quarter - - @@ -278,15 +298,28 @@ E 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + + + 3 + eighth + + + 2 + quarter + + @@ -294,16 +327,27 @@ E 4 - 288 - + 512 1 - 16th - + quarter + + 3 + 2 + quarter + up normal - + + + + + + 768 + 1 + quarter + @@ -311,17 +355,28 @@ E 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -329,27 +384,36 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + - + 768 @@ -363,33 +427,21 @@ E 4 - 192 - + 768 1 - 16th + quarter up normal - - - - E - 4 - - 48 - - - + + + 768 1 - 64th - up - normal + quarter - - @@ -397,17 +449,28 @@ E 4 - 12 - - + 256 1 - 256th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -415,49 +478,42 @@ E 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + eighth + up normal - - - - E - 4 - - 384 - - + + + 256 1 eighth - up - normal + + 3 + 2 + eighth + - + - - - E - 4 - - 96 - - - + + + + + 768 1 - 32nd - up - normal + quarter - - @@ -465,17 +521,28 @@ E 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + quarter + up normal - - + + + 3 + eighth + + + 2 + quarter + + @@ -483,15 +550,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -507,15 +578,28 @@ E 4 - 192 - + 256 1 - 16th + eighth + + 3 + 2 + eighth + up normal - + + + 3 + eighth + + + 2 + eighth + + @@ -523,114 +607,117 @@ E 4 - 48 - - + 256 1 - 64th + eighth + + 3 + 2 + eighth + up normal - - - - - E - 4 - - 12 - - - + + + 256 1 - 256th - up - normal + eighth + + 3 + 2 + eighth + - - + + + + + + + 768 + + + percussion + + + 5 + + - E + F 4 - 3 - - + 576 + 1 - 1024th - up + eighth + + down normal - - E + F 4 - 288 - - + 192 + 1 16th - - up + down normal - + + + + + 768 + 1 + quarter + - E + F 4 - 24 - - - + 576 + 1 - 128th - up + eighth + + down normal - - - E + F 4 - 6 - - - 1 - 512th - up - normal - - - - - - - 192 + 192 + 1 16th + down + normal - - 768 @@ -639,157 +726,113 @@ + + - E + F 4 - 768 - + 576 + 1 - quarter - up + eighth + + down normal - - - 768 - 1 - quarter - - - - E + F 4 192 - - + 1 16th - up + down normal - - - - E - 4 - - 48 - - - + + + 768 1 - 64th - up - normal + quarter - - - E + F 4 - 12 - - - + 576 + 1 - 256th - up + eighth + + down normal - - - E + F 4 - 3 - - + 192 + 1 - 1024th - up + 16th + down normal - - - - E - 4 - - 288 - - + + + 768 1 - 16th - - up - normal + quarter - + + - E + F 4 - 24 - - - + 576 + 1 - 128th - up + eighth + + down normal - - - E + F 4 - 6 - - - 1 - 512th - up - normal - - - - - - 192 + 1 16th + down + normal - - 768 @@ -800,1438 +843,119 @@ - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E + F 4 - 48 - - - + 576 + 1 - 64th - up + eighth + + down normal - - - E + F 4 - 12 - - - + 192 + 1 - 256th - up + 16th + down normal - - - - - E - 4 - - 3 - - + + + 768 1 - 1024th - up - normal + quarter - + + - E + F 4 - 384 - - + 576 + 1 eighth - up + + down normal - - E + F 4 - 96 - - - + 192 + 1 - 32nd - up + 16th + down normal - - - - - E - 4 - - 24 - - - + + + 768 1 - 128th - up - normal + quarter - - - E + F 4 - 6 - - + 768 + 1 - 512th - up + quarter + down normal - - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 192 - 1 - 16th - - - - - - - - - 768 - - - percussion - - - 5 - - - - - F - 4 - - 576 - - 1 - eighth - - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - 768 - 1 - quarter - - - - - - F - 4 - - 576 - - 1 - eighth - - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - 768 - 1 - quarter - - - - - - - - F - 4 - - 576 - - 1 - eighth - - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - 768 - 1 - quarter - - - - - - F - 4 - - 576 - - 1 - eighth - - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - 768 - 1 - quarter - - - - - - - - F - 4 - - 576 - - 1 - eighth - - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - 768 - 1 - quarter - - - - - - F - 4 - - 576 - - 1 - eighth - - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - 768 - 1 - quarter - - - - - - - - F - 4 - - 576 - - 1 - eighth - - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - 768 - 1 - quarter - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - 768 - 1 - quarter - - - - - - - - - 768 - - - percussion - - - 5 - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - 96 - - 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - 96 - - 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - 96 - - 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - 48 - - 3 - 64th - - - - - - - 12 - - - 3 - 256th - - - + - 3 - - 3 - 1024th - - - - - - - G - 5 - - 192 - - 3 - 16th - up - x + 768 + 1 + quarter - + + + + + 768 + + + percussion + + + 5 + + G @@ -2348,68 +1072,25 @@ - 96 - - 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - + 128 3 - 512th - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -2417,15 +1098,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -2433,13 +1117,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -2558,68 +1248,25 @@ - 96 - - 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - + 128 3 - 256th - up - x + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -2627,15 +1274,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -2643,13 +1293,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -2721,93 +1377,11 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - 96 - - 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th - - - - - - - G - 5 - - 48 + 96 3 - 64th + 32nd up x @@ -2819,12 +1393,12 @@ G 5 - 12 + 24 3 - 256th + 128th up x @@ -2837,29 +1411,38 @@ G 5 - 3 + 6 3 - 1024th + 512th up x - - - G - 5 - - 192 - + + + 128 3 16th - up - x + + 3 + 2 + 16th + + + + 3 + 16th + + + 2 + 16th + + @@ -2867,10 +1450,15 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x @@ -2881,33 +1469,19 @@ G 5 - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + @@ -2915,15 +1489,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -2931,11 +1503,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -2947,12 +1519,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -2965,11 +1537,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -3026,36 +1598,46 @@ - - - 48 - - 3 - 64th - - - - - - - 12 - - + + + G + 5 + + 128 + 3 - 256th + 16th + + 3 + 2 + 16th + + up + x - - + + + 3 + 16th + + + 2 + 16th + + - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + - @@ -3063,17 +1645,23 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + - + G @@ -3190,34 +1778,78 @@ - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + - + + + 3 + 16th + + + 2 + 16th + + - - - 24 - - + + + G + 5 + + 128 + 3 - 128th + 16th + + 3 + 2 + 16th + + up + x - - - - - 6 - + + + G + 5 + + 128 + 3 - 512th + 16th + + 3 + 2 + 16th + + up + x + + + + + + + G + 5 + + 192 + + 3 + 16th + up + x - @@ -3275,13 +1907,15 @@ G 5 - 192 + 96 + 3 - 16th + 32nd up x + @@ -3289,13 +1923,17 @@ G 5 - 192 + 24 + + 3 - 16th + 128th up x + + @@ -3303,15 +1941,38 @@ G 5 - 48 - + 6 + 3 - 64th + 512th up x - + + + + + + 128 + 3 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -3319,17 +1980,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -3337,15 +1999,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -3353,11 +2019,25 @@ G 5 - 96 + 192 + + 3 + 16th + up + x + + + + + + G + 5 + + 48 3 - 32nd + 64th up x @@ -3369,12 +2049,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -3387,63 +2067,49 @@ G 5 - 6 + 3 3 - 512th + 1024th up x - - + + + G + 5 + 96 + 3 32nd + up + x - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th - - - - G 5 - 48 + 24 + 3 - 64th + 128th up x + @@ -3451,33 +2117,57 @@ G 5 - 12 - + 6 3 - 256th + 512th up x - + + + 128 + 3 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + + + G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -3485,13 +2175,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -3608,36 +2304,82 @@ - - - 96 - + + + G + 5 + + 128 + 3 - 32nd + 16th + + 3 + 2 + 16th + + up + x - + + + 3 + 16th + + + 2 + 16th + + - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + - - - - - 6 - + + + G + 5 + + 128 + 3 - 512th + 16th + + 3 + 2 + 16th + + up + x + + + + + + + + + G + 5 + + 192 + + 3 + 16th + up + x - @@ -3695,13 +2437,15 @@ G 5 - 192 + 96 + 3 - 16th + 32nd up x + @@ -3709,13 +2453,17 @@ G 5 - 192 + 24 + + 3 - 16th + 128th up x + + @@ -3723,15 +2471,38 @@ G 5 - 48 - + 6 + 3 - 64th + 512th up x - + + + + + + 128 + 3 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -3739,17 +2510,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -3757,15 +2529,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -3773,11 +2549,25 @@ G 5 - 96 + 192 + + 3 + 16th + up + x + + + + + + G + 5 + + 48 3 - 32nd + 64th up x @@ -3789,12 +2579,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -3807,11 +2597,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -3870,34 +2660,44 @@ - 48 - - 3 - 64th - - - - - - - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + - - - 3 - + + + G + 5 + + 128 + 3 - 1024th + 16th + + 3 + 2 + 16th + + up + x - @@ -3905,17 +2705,21 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + - - G @@ -4032,32 +2836,126 @@ - 96 + 128 + 3 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + + + + + + G + 5 + + 128 + + 3 + 16th + + 3 + 2 + 16th + + up + x + + + + + + G + 5 + + 128 + + 3 + 16th + + 3 + 2 + 16th + + up + x + + + + + + + G + 5 + + 192 + + 3 + 16th + up + x + + + + + + G + 5 + + 48 + 3 - 32nd + 64th + up + x - - - 24 + + + G + 5 + + 12 + 3 - 128th + 256th + up + x - - - 6 + + + G + 5 + + 3 + 3 - 512th + 1024th + up + x @@ -4067,11 +2965,11 @@ G 5 - 48 + 96 3 - 64th + 32nd up x @@ -4083,12 +2981,12 @@ G 5 - 12 + 24 3 - 256th + 128th up x @@ -4101,11 +2999,11 @@ G 5 - 3 + 6 3 - 1024th + 512th up x @@ -4117,15 +3015,65 @@ G 5 - 192 + 128 + + 3 + 16th + + 3 + 2 + 16th + + up + x + + + + 3 + 16th + + + 2 + 16th + + + + + + + 128 + 3 + 16th + + 3 + 2 + 16th + + + + + + + G + 5 + + 128 3 16th + + 3 + 2 + 16th + up x + + + G @@ -4242,68 +3190,25 @@ - 96 - - 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - + 128 3 - 256th - up - x + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -4311,15 +3216,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -4327,13 +3235,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -4452,34 +3366,78 @@ - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + - + + + 3 + 16th + + + 2 + 16th + + - - - 24 - - + + + G + 5 + + 128 + 3 - 128th + 16th + + 3 + 2 + 16th + + up + x - - - - - 6 - + + + G + 5 + + 128 + 3 - 512th + 16th + + 3 + 2 + 16th + + up + x + + + + + + + G + 5 + + 192 + + 3 + 16th + up + x - @@ -4537,13 +3495,15 @@ G 5 - 192 + 96 + 3 - 16th + 32nd up x + @@ -4551,13 +3511,17 @@ G 5 - 192 + 24 + + 3 - 16th + 128th up x + + @@ -4565,15 +3529,38 @@ G 5 - 48 - + 6 + 3 - 64th + 512th up x - + + + + + + 128 + 3 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -4581,17 +3568,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -4599,15 +3587,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -4615,11 +3607,25 @@ G 5 - 96 + 192 + + 3 + 16th + up + x + + + + + + G + 5 + + 48 3 - 32nd + 64th up x @@ -4631,12 +3637,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -4649,11 +3655,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -4710,36 +3716,46 @@ - - - 48 - - 3 - 64th - - - - - - - 12 - - + + + G + 5 + + 128 + 3 - 256th + 16th + + 3 + 2 + 16th + + up + x - - + + + 3 + 16th + + + 2 + 16th + + - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + - @@ -4747,13 +3763,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + diff --git a/test/data/grooves/highfiveB.musicxml b/test/data/grooves/highfiveB.musicxml index 8308dea9..0f0dafac 100644 --- a/test/data/grooves/highfiveB.musicxml +++ b/test/data/grooves/highfiveB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -226,15 +226,28 @@ E 4 - 192 - + 256 1 - 16th + eighth + + 3 + 2 + eighth + up normal - + + + 3 + eighth + + + 2 + eighth + + @@ -242,35 +255,42 @@ E 4 - 48 - - + 256 1 - 64th + eighth + + 3 + 2 + eighth + up normal - - - - - E - 4 - - 12 - - - + + + 256 1 - 256th - up - normal + eighth + + 3 + 2 + eighth + + + + + + + + + + 768 + 1 + quarter - - @@ -278,15 +298,28 @@ E 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + + + 3 + eighth + + + 2 + quarter + + @@ -294,16 +327,27 @@ E 4 - 288 - + 512 1 - 16th - + quarter + + 3 + 2 + quarter + up normal - + + + + + + 768 + 1 + quarter + @@ -311,17 +355,28 @@ E 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -329,27 +384,36 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + - + 768 @@ -363,33 +427,21 @@ E 4 - 192 - + 768 1 - 16th + quarter up normal - - - - E - 4 - - 48 - - - + + + 768 1 - 64th - up - normal + quarter - - @@ -397,17 +449,28 @@ E 4 - 12 - - + 256 1 - 256th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -415,49 +478,42 @@ E 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + eighth + up normal - - - - E - 4 - - 384 - - + + + 256 1 eighth - up - normal + + 3 + 2 + eighth + - + - - - E - 4 - - 96 - - - + + + + + 768 1 - 32nd - up - normal + quarter - - @@ -465,17 +521,28 @@ E 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + quarter + up normal - - + + + 3 + eighth + + + 2 + quarter + + @@ -483,15 +550,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -507,15 +578,28 @@ E 4 - 192 - + 256 1 - 16th + eighth + + 3 + 2 + eighth + up normal - + + + 3 + eighth + + + 2 + eighth + + @@ -523,631 +607,359 @@ E 4 - 48 - - + 256 1 - 64th + eighth + + 3 + 2 + eighth + up normal - - - - - E - 4 - - 12 - - - + + + 256 1 - 256th - up - normal + eighth + + 3 + 2 + eighth + - - + + + + + + + 768 + + + percussion + + + 5 + + - E + F 4 - 3 - - + 576 + 1 - 1024th - up + eighth + + down normal - - E + F 4 - 288 - - + 192 + 1 16th - - up + down normal - + + + + + 768 + 1 + quarter + - E + F 4 - 24 - - - + 576 + 1 - 128th - up + eighth + + down normal - - - E + F 4 - 6 - - + 192 + 1 - 512th - up - normal + 16th + down + normal - - 192 + 768 1 - 16th + quarter - - + + 3072 + 768 - 1 + 2 quarter - E + D 4 768 - - 1 + + 2 quarter - up - normal + down + x 768 - 1 + 2 quarter - E + D 4 - 192 - - - 1 - 16th - up - normal + 768 + + 2 + quarter + down + x - + + - E + F 4 - 48 - - - + 576 + 1 - 64th - up + eighth + + down normal - - - E + F 4 - 12 - - - + 192 + 1 - 256th - up + 16th + down normal - - - - - E - 4 - - 3 - - + + + 768 1 - 1024th - up - normal + quarter - - E + F 4 - 288 - - + 576 + 1 - 16th + eighth - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up + down normal - - - E + F 4 - 6 - - + 192 + 1 - 512th - up + 16th + down normal - - 192 + 768 1 - 16th + quarter - - + + 3072 + 768 - 1 + 2 quarter - E + D 4 - 192 - - - 1 - 16th - up - normal + 768 + + 2 + quarter + down + x + + + + + + 768 + 2 + quarter - - E + D 4 - 48 - - - - 1 - 64th - up - normal + 768 + + 2 + quarter + down + x - - + + - E + F 4 - 12 - - - + 576 + 1 - 256th - up + eighth + + down normal - - - E + F 4 - 3 - - + 192 + 1 - 1024th - up + 16th + down normal - - - - E - 4 - - 384 - - + + + 768 1 - eighth - up - normal + quarter - - E + F 4 - 96 - - - + 576 + 1 - 32nd - up + eighth + + down normal - - - E + F 4 - 24 - - - + 192 + 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 192 - 1 - 16th - - - - - - - - - 768 - - - percussion - - - 5 - - - - - F - 4 - - 576 - - 1 - eighth - - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - 768 - 1 - quarter - - - - - - F - 4 - - 576 - - 1 - eighth - - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down + 16th + down normal @@ -1208,7 +1020,7 @@ - + F @@ -1251,25 +1063,10 @@ F 4 - 576 - - 1 - eighth - - down - normal - - - - - - F - 4 - - 192 + 768 1 - 16th + quarter down normal @@ -1305,1121 +1102,48 @@ quarter down x - - - - - - 768 - 2 - quarter - - - - - - D - 4 - - 768 - - 2 - quarter - down - x - - - - - - - - F - 4 - - 576 - - 1 - eighth - - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - 768 - 1 - quarter - - - - - - F - 4 - - 576 - - 1 - eighth - - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - 768 - 1 - quarter - - - - - 3072 - - - - 768 - 2 - quarter - - - - - - D - 4 - - 768 - - 2 - quarter - down - x - - - - - - 768 - 2 - quarter - - - - - - D - 4 - - 768 - - 2 - quarter - down - x - - - - - - - - F - 4 - - 576 - - 1 - eighth - - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - 768 - 1 - quarter - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - 768 - 1 - quarter - - - - - 3072 - - - - 768 - 2 - quarter - - - - - - D - 4 - - 768 - - 2 - quarter - down - x - - - - - - 768 - 2 - quarter - - - - - - D - 4 - - 768 - - 2 - quarter - down - x - - - - - - - - - 768 - - - percussion - - - 5 - - - - - F - 5 - - 192 - - 1 - 16th - up - x - - - - - - F - 5 - - 48 - - - 1 - 64th - up - x - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - - - 1 - 1024th - up - x - - - - - - - F - 5 - - 96 - - - 1 - 32nd - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - - - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - F - 5 - - 48 - - - 1 - 64th - up - x - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - - - 1 - 1024th - up - x - - - - - - - F - 5 - - 192 - - 1 - 16th - up - x - - - - - - F - 5 - - 192 - - 1 - 16th - up - x - - - - - - F - 5 - - 48 - - - 1 - 64th - up - x - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - - - 1 - 1024th - up - x - - - - - - - F - 5 - - 96 - - - 1 - 32nd - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - - - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - F - 5 - - 48 - - - 1 - 64th - up - x - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - - - 1 - 1024th - up - x - - - - - - - F - 5 - - 192 - - 1 - 16th - up - x - - - - - - F - 5 - - 192 - - 1 - 16th - up - x - - - - - - F - 5 - - 48 - - - 1 - 64th - up - x - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - - - 1 - 1024th - up - x - - - - - - - F - 5 - - 96 - - - 1 - 32nd - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - - - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - F - 5 - - 48 - - - 1 - 64th - up - x - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - - - 1 - 1024th - up - x - - - - - - - F - 5 - - 192 - - 1 - 16th - up - x - - - - - - F - 5 - - 192 - - 1 - 16th - up - x - - - - - - F - 5 - - 48 - - - 1 - 64th - up - x - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - - - 1 - 1024th - up - x - - - - - - - F - 5 - - 96 - - - 1 - 32nd - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - - - - - F - 5 - - 96 - - - 1 - 32nd - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - - - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - + - 3 - - 1 - 1024th + 768 + 2 + quarter - - F - 5 + D + 4 - 192 - - 1 - 16th - up + 768 + + 2 + quarter + down x - + + + + + 768 + + + percussion + + + 5 + + F @@ -2536,68 +1260,25 @@ - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - + 128 1 - 512th - - - - - - - F - 5 - - 48 - - - 1 - 64th - up - x - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -2605,15 +1286,18 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -2621,13 +1305,19 @@ F 5 - 192 + 128 1 16th + + 3 + 2 + 16th + up x + @@ -2746,68 +1436,25 @@ - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - F - 5 - - 48 - - - 1 - 64th - up - x - - - - - - - F - 5 - - 12 - - - + 128 1 - 256th - up - x + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -2815,15 +1462,18 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -2831,13 +1481,19 @@ F 5 - 192 + 128 1 16th + + 3 + 2 + 16th + up x + @@ -2909,93 +1565,11 @@ F 5 - 96 - - - 1 - 32nd - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - - - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - F - 5 - - 48 + 96 1 - 64th + 32nd up x @@ -3007,12 +1581,12 @@ F 5 - 12 + 24 1 - 256th + 128th up x @@ -3025,29 +1599,38 @@ F 5 - 3 + 6 1 - 1024th + 512th up x - - - F - 5 - - 192 - + + + 128 1 16th - up - x + + 3 + 2 + 16th + + + + 3 + 16th + + + 2 + 16th + + @@ -3055,10 +1638,15 @@ F 5 - 192 + 128 1 16th + + 3 + 2 + 16th + up x @@ -3069,33 +1657,19 @@ F 5 - 48 - - - 1 - 64th - up - x - - - - - - - F - 5 - - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - + @@ -3103,15 +1677,13 @@ F 5 - 3 - + 192 1 - 1024th + 16th up x - @@ -3119,11 +1691,11 @@ F 5 - 96 + 48 1 - 32nd + 64th up x @@ -3135,12 +1707,12 @@ F 5 - 24 + 12 1 - 128th + 256th up x @@ -3153,11 +1725,11 @@ F 5 - 6 + 3 1 - 512th + 1024th up x @@ -3214,36 +1786,46 @@ - - - 48 - - 1 - 64th - - - - - - - 12 - - + + + F + 5 + + 128 + 1 - 256th + 16th + + 3 + 2 + 16th + + up + x - - + + + 3 + 16th + + + 2 + 16th + + - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + - @@ -3251,17 +1833,23 @@ F 5 - 192 + 128 1 16th + + 3 + 2 + 16th + up x + - + F @@ -3378,34 +1966,78 @@ - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + - + + + 3 + 16th + + + 2 + 16th + + - - - 24 - - + + + F + 5 + + 128 + 1 - 128th + 16th + + 3 + 2 + 16th + + up + x - - - - - 6 - + + + F + 5 + + 128 + 1 - 512th + 16th + + 3 + 2 + 16th + + up + x + + + + + + + F + 5 + + 192 + + 1 + 16th + up + x - @@ -3463,13 +2095,15 @@ F 5 - 192 + 96 + 1 - 16th + 32nd up x + @@ -3477,13 +2111,17 @@ F 5 - 192 + 24 + + 1 - 16th + 128th up x + + @@ -3491,15 +2129,38 @@ F 5 - 48 - + 6 + 1 - 64th + 512th up x - + + + + + + 128 + 1 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -3507,17 +2168,18 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -3525,15 +2187,19 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -3541,11 +2207,25 @@ F 5 - 96 + 192 + + 1 + 16th + up + x + + + + + + F + 5 + + 48 1 - 32nd + 64th up x @@ -3557,12 +2237,12 @@ F 5 - 24 + 12 1 - 128th + 256th up x @@ -3575,63 +2255,49 @@ F 5 - 6 + 3 1 - 512th + 1024th up x - - + + + F + 5 + 96 + 1 32nd + up + x - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - F 5 - 48 + 24 + 1 - 64th + 128th up x + @@ -3639,33 +2305,57 @@ F 5 - 12 - + 6 1 - 256th + 512th up x - + + + 128 + 1 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + + + F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -3673,13 +2363,19 @@ F 5 - 192 + 128 1 16th + + 3 + 2 + 16th + up x + @@ -3796,36 +2492,82 @@ - - - 96 - + + + F + 5 + + 128 + 1 - 32nd + 16th + + 3 + 2 + 16th + + up + x - + + + 3 + 16th + + + 2 + 16th + + - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + - - - - - 6 - + + + F + 5 + + 128 + 1 - 512th + 16th + + 3 + 2 + 16th + + up + x + + + + + + + + + F + 5 + + 192 + + 1 + 16th + up + x - @@ -3883,13 +2625,15 @@ F 5 - 192 + 96 + 1 - 16th + 32nd up x + @@ -3897,13 +2641,17 @@ F 5 - 192 + 24 + + 1 - 16th + 128th up x + + @@ -3911,15 +2659,38 @@ F 5 - 48 - + 6 + 1 - 64th + 512th up x - + + + + + + 128 + 1 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -3927,17 +2698,18 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -3945,15 +2717,19 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -3961,11 +2737,25 @@ F 5 - 96 + 192 + + 1 + 16th + up + x + + + + + + F + 5 + + 48 1 - 32nd + 64th up x @@ -3977,12 +2767,12 @@ F 5 - 24 + 12 1 - 128th + 256th up x @@ -3995,11 +2785,11 @@ F 5 - 6 + 3 1 - 512th + 1024th up x @@ -4058,34 +2848,44 @@ - 48 - - 1 - 64th - - - - - - - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + - - - 3 - + + + F + 5 + + 128 + 1 - 1024th + 16th + + 3 + 2 + 16th + + up + x - @@ -4093,17 +2893,21 @@ F 5 - 192 + 128 1 16th + + 3 + 2 + 16th + up x + - - F @@ -4220,32 +3024,126 @@ - 96 + 128 + 1 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + + + + + + F + 5 + + 128 + + 1 + 16th + + 3 + 2 + 16th + + up + x + + + + + + F + 5 + + 128 + + 1 + 16th + + 3 + 2 + 16th + + up + x + + + + + + + F + 5 + + 192 + + 1 + 16th + up + x + + + + + + F + 5 + + 48 + 1 - 32nd + 64th + up + x - - - 24 + + + F + 5 + + 12 + 1 - 128th + 256th + up + x - - - 6 + + + F + 5 + + 3 + 1 - 512th + 1024th + up + x @@ -4255,11 +3153,11 @@ F 5 - 48 + 96 1 - 64th + 32nd up x @@ -4271,12 +3169,12 @@ F 5 - 12 + 24 1 - 256th + 128th up x @@ -4289,11 +3187,11 @@ F 5 - 3 + 6 1 - 1024th + 512th up x @@ -4305,15 +3203,65 @@ F 5 - 192 + 128 + + 1 + 16th + + 3 + 2 + 16th + + up + x + + + + 3 + 16th + + + 2 + 16th + + + + + + + 128 + 1 + 16th + + 3 + 2 + 16th + + + + + + + F + 5 + + 128 1 16th + + 3 + 2 + 16th + up x + + + F @@ -4430,68 +3378,25 @@ - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - F - 5 - - 48 - - - 1 - 64th - up - x - - - - - - - F - 5 - - 12 - - - + 128 1 - 256th - up - x + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -4499,15 +3404,18 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -4515,13 +3423,19 @@ F 5 - 192 + 128 1 16th + + 3 + 2 + 16th + up x + @@ -4640,34 +3554,78 @@ - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + - + + + 3 + 16th + + + 2 + 16th + + - - - 24 - - + + + F + 5 + + 128 + 1 - 128th + 16th + + 3 + 2 + 16th + + up + x - - - - - 6 - + + + F + 5 + + 128 + 1 - 512th + 16th + + 3 + 2 + 16th + + up + x + + + + + + + F + 5 + + 192 + + 1 + 16th + up + x - @@ -4725,13 +3683,15 @@ F 5 - 192 + 96 + 1 - 16th + 32nd up x + @@ -4739,13 +3699,17 @@ F 5 - 192 + 24 + + 1 - 16th + 128th up x + + @@ -4753,15 +3717,38 @@ F 5 - 48 - + 6 + 1 - 64th + 512th up x - + + + + + + 128 + 1 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -4769,17 +3756,18 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -4787,15 +3775,19 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -4803,11 +3795,25 @@ F 5 - 96 + 192 + + 1 + 16th + up + x + + + + + + F + 5 + + 48 1 - 32nd + 64th up x @@ -4819,12 +3825,12 @@ F 5 - 24 + 12 1 - 128th + 256th up x @@ -4837,11 +3843,11 @@ F 5 - 6 + 3 1 - 512th + 1024th up x @@ -4898,36 +3904,46 @@ - - - 48 - - 1 - 64th - - - - - - - 12 - - + + + F + 5 + + 128 + 1 - 256th + 16th + + 3 + 2 + 16th + + up + x - - + + + 3 + 16th + + + 2 + 16th + + - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + - @@ -4935,13 +3951,19 @@ F 5 - 192 + 128 1 16th + + 3 + 2 + 16th + up x + diff --git a/test/data/grooves/highfiveE.musicxml b/test/data/grooves/highfiveE.musicxml index ce6ee16c..cf68ddbb 100644 --- a/test/data/grooves/highfiveE.musicxml +++ b/test/data/grooves/highfiveE.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -359,68 +359,25 @@ - 96 - - 1 - 32nd - - - - - - - 24 - - + 128 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -428,15 +385,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -444,13 +404,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -569,68 +535,25 @@ - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - + 128 1 - 256th - up - normal + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -638,15 +561,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -654,13 +580,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -779,68 +711,25 @@ - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - + 128 1 - 256th - up - normal + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -848,15 +737,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -864,13 +756,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -992,81 +890,41 @@ E 4 - 96 - + 128 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th + 16th + + 3 + 2 + 16th + up normal - - - - - - 48 - - 1 - 64th - - + + + 3 + 16th + + + 2 + 16th + + - 12 - - + 128 1 - 256th - - - - - - - - 3 - - 1 - 1024th + 16th + + 3 + 2 + 16th + - @@ -1074,13 +932,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1183,248 +1047,38 @@ - - 768 - 1 - quarter - - - - - - 768 - 1 - quarter - - - - - - - - - 768 - - - percussion - - - 5 - - - - - A - 4 - - 192 - - 1 - 16th - up - normal - - - - - - A - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - A - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - A - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - A - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - A - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - A - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - A - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - A - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - A - 4 - - 3 - - + + 768 1 - 1024th - up - normal + quarter - - - - A - 4 - - 192 - + + + 768 1 - 16th - up - normal + quarter + + + + + + 768 + + + percussion + + + 5 + + A @@ -1541,68 +1195,25 @@ - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - A - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - A - 4 - - 12 - - - + 128 1 - 256th - up - normal + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -1610,15 +1221,18 @@ A 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -1626,13 +1240,19 @@ A 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1751,34 +1371,78 @@ - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + - + + + 3 + 16th + + + 2 + 16th + + - - - 24 - - + + + A + 4 + + 128 + 1 - 128th + 16th + + 3 + 2 + 16th + + up + normal - - - - - 6 - + + + A + 4 + + 128 + 1 - 512th + 16th + + 3 + 2 + 16th + + up + normal + + + + + + + A + 4 + + 192 + + 1 + 16th + up + normal - @@ -1836,13 +1500,15 @@ A 4 - 192 + 96 + 1 - 16th + 32nd up normal + @@ -1850,13 +1516,17 @@ A 4 - 192 + 24 + + 1 - 16th + 128th up normal + + @@ -1864,15 +1534,38 @@ A 4 - 48 - + 6 + 1 - 64th + 512th up normal - + + + + + + 128 + 1 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -1880,17 +1573,18 @@ A 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - @@ -1898,15 +1592,19 @@ A 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + @@ -1914,11 +1612,25 @@ A 4 - 96 + 192 + + 1 + 16th + up + normal + + + + + + A + 4 + + 48 1 - 32nd + 64th up normal @@ -1930,12 +1642,12 @@ A 4 - 24 + 12 1 - 128th + 256th up normal @@ -1948,11 +1660,11 @@ A 4 - 6 + 3 1 - 512th + 1024th up normal @@ -2009,36 +1721,46 @@ - - - 48 - - 1 - 64th - - - - - - - 12 - - + + + A + 4 + + 128 + 1 - 256th + 16th + + 3 + 2 + 16th + + up + normal - - + + + 3 + 16th + + + 2 + 16th + + - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + - @@ -2046,13 +1768,19 @@ A 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + diff --git a/test/data/grooves/highfiveFA.musicxml b/test/data/grooves/highfiveFA.musicxml index ff584c85..5ffa52cd 100644 --- a/test/data/grooves/highfiveFA.musicxml +++ b/test/data/grooves/highfiveFA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -275,68 +275,25 @@ - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - + 128 1 - 256th - up - normal - - - + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -344,15 +301,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -360,13 +320,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -550,68 +516,25 @@ - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - A - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - A - 4 - - 12 - - - + 128 1 - 256th - up - normal - - - + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -619,15 +542,18 @@ A 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -635,13 +561,19 @@ A 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -779,68 +711,25 @@ - 96 - - 2 - 32nd - - - - - - - 24 - - - 2 - 128th - - - - - - - - 6 - - 2 - 512th - - - - - - - D - 5 - - 48 - - - 2 - 64th - up - normal - - - - - - - D - 5 - - 12 - - - + 128 2 - 256th - up - normal - - - + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -848,15 +737,18 @@ D 5 - 3 - + 128 2 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -864,13 +756,19 @@ D 5 - 192 + 128 2 16th + + 3 + 2 + 16th + up normal + @@ -1008,68 +906,25 @@ - 96 - - 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th - - - - - - - F - 5 - - 48 - - - 3 - 64th - up - normal - - - - - - - F - 5 - - 12 - - - + 128 3 - 256th - up - normal - - - + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -1077,15 +932,18 @@ F 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -1093,13 +951,19 @@ F 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up normal + diff --git a/test/data/grooves/highfiveFB.musicxml b/test/data/grooves/highfiveFB.musicxml index e4e6cce3..712ddb90 100644 --- a/test/data/grooves/highfiveFB.musicxml +++ b/test/data/grooves/highfiveFB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -275,68 +275,25 @@ - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - + 128 1 - 256th - up - normal - - - + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -344,15 +301,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -360,13 +320,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -550,68 +516,25 @@ - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - A - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - A - 4 - - 12 - - - + 128 1 - 256th - up - normal - - - + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -619,15 +542,18 @@ A 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -635,13 +561,19 @@ A 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -779,68 +711,25 @@ - 96 - - 2 - 32nd - - - - - - - 24 - - - 2 - 128th - - - - - - - - 6 - - 2 - 512th - - - - - - - D - 5 - - 48 - - - 2 - 64th - up - normal - - - - - - - D - 5 - - 12 - - - + 128 2 - 256th - up - normal - - - + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -848,15 +737,18 @@ D 5 - 3 - + 128 2 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -864,13 +756,19 @@ D 5 - 192 + 128 2 16th + + 3 + 2 + 16th + up normal + @@ -1008,68 +906,25 @@ - 96 - - 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th - - - - - - - F - 5 - - 48 - - - 3 - 64th - up - normal - - - - - - - F - 5 - - 12 - - - + 128 3 - 256th - up - normal - - - + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -1077,15 +932,18 @@ F 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -1093,13 +951,19 @@ F 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up normal + diff --git a/test/data/grooves/kbossaA.musicxml b/test/data/grooves/kbossaA.musicxml index 30ea9e15..f3c199ae 100644 --- a/test/data/grooves/kbossaA.musicxml +++ b/test/data/grooves/kbossaA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kbossaB.musicxml b/test/data/grooves/kbossaB.musicxml index 637f4cc3..15d944e6 100644 --- a/test/data/grooves/kbossaB.musicxml +++ b/test/data/grooves/kbossaB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kbossaC.musicxml b/test/data/grooves/kbossaC.musicxml index 2742965b..aad7edaf 100644 --- a/test/data/grooves/kbossaC.musicxml +++ b/test/data/grooves/kbossaC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kbossaEndingA.musicxml b/test/data/grooves/kbossaEndingA.musicxml index 6012092f..fee76a62 100644 --- a/test/data/grooves/kbossaEndingA.musicxml +++ b/test/data/grooves/kbossaEndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kbossaEndingB.musicxml b/test/data/grooves/kbossaEndingB.musicxml index aa8c27a2..51514809 100644 --- a/test/data/grooves/kbossaEndingB.musicxml +++ b/test/data/grooves/kbossaEndingB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kbossaEndingC.musicxml b/test/data/grooves/kbossaEndingC.musicxml index 1b8e68e7..aad2f8ea 100644 --- a/test/data/grooves/kbossaEndingC.musicxml +++ b/test/data/grooves/kbossaEndingC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kbossaEndingD.musicxml b/test/data/grooves/kbossaEndingD.musicxml index 4ec8de4b..5701acf4 100644 --- a/test/data/grooves/kbossaEndingD.musicxml +++ b/test/data/grooves/kbossaEndingD.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kbossaFillA.musicxml b/test/data/grooves/kbossaFillA.musicxml index 11a63f10..b11784da 100644 --- a/test/data/grooves/kbossaFillA.musicxml +++ b/test/data/grooves/kbossaFillA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kbossaFillAB.musicxml b/test/data/grooves/kbossaFillAB.musicxml index c5e3b134..de83de53 100644 --- a/test/data/grooves/kbossaFillAB.musicxml +++ b/test/data/grooves/kbossaFillAB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kbossaFillB.musicxml b/test/data/grooves/kbossaFillB.musicxml index dec72405..e4724e43 100644 --- a/test/data/grooves/kbossaFillB.musicxml +++ b/test/data/grooves/kbossaFillB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kbossaFillC.musicxml b/test/data/grooves/kbossaFillC.musicxml index 8edc11f5..e5080810 100644 --- a/test/data/grooves/kbossaFillC.musicxml +++ b/test/data/grooves/kbossaFillC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kbossaIntroA.musicxml b/test/data/grooves/kbossaIntroA.musicxml index 5e029494..fea8d0c4 100644 --- a/test/data/grooves/kbossaIntroA.musicxml +++ b/test/data/grooves/kbossaIntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kbossaIntroB.musicxml b/test/data/grooves/kbossaIntroB.musicxml index fcd8dd71..36060b12 100644 --- a/test/data/grooves/kbossaIntroB.musicxml +++ b/test/data/grooves/kbossaIntroB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kbossaIntroC.musicxml b/test/data/grooves/kbossaIntroC.musicxml index 5aa2a457..4c0a704a 100644 --- a/test/data/grooves/kbossaIntroC.musicxml +++ b/test/data/grooves/kbossaIntroC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kwestballadA.musicxml b/test/data/grooves/kwestballadA.musicxml index a472bd8e..d167a0cc 100644 --- a/test/data/grooves/kwestballadA.musicxml +++ b/test/data/grooves/kwestballadA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kwestballadB.musicxml b/test/data/grooves/kwestballadB.musicxml index cc57350f..8b8f9adb 100644 --- a/test/data/grooves/kwestballadB.musicxml +++ b/test/data/grooves/kwestballadB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kwestballadC.musicxml b/test/data/grooves/kwestballadC.musicxml index 230f5c1c..9abb0dad 100644 --- a/test/data/grooves/kwestballadC.musicxml +++ b/test/data/grooves/kwestballadC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -379,10 +379,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -391,7 +391,6 @@ up normal - @@ -399,13 +398,19 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal + @@ -413,11 +418,10 @@ E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/kwestballadD.musicxml b/test/data/grooves/kwestballadD.musicxml index a46d93fc..567aa350 100644 --- a/test/data/grooves/kwestballadD.musicxml +++ b/test/data/grooves/kwestballadD.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -379,10 +379,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -391,7 +391,6 @@ up normal - @@ -399,13 +398,19 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal + @@ -413,11 +418,10 @@ E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/kwestballadEndingA.musicxml b/test/data/grooves/kwestballadEndingA.musicxml index dfef1823..c356ee0c 100644 --- a/test/data/grooves/kwestballadEndingA.musicxml +++ b/test/data/grooves/kwestballadEndingA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -239,75 +239,75 @@ - 384 - - 1 - eighth - - - - - - - 96 - - - 1 - 32nd - - - - - - - - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + - - - 6 - + + + E + 4 + + 256 + 1 - 512th + eighth + + 3 + 2 + quarter + + up + normal - + - + + E 4 - 48 + 192 1 - 64th + 16th up normal - + E 4 - 12 + 48 1 - 256th + 64th up normal @@ -315,19 +315,21 @@ - + E 4 - 3 + 12 + 1 - 1024th + 256th up normal + @@ -336,13 +338,15 @@ E 4 - 192 + 3 + 1 - 16th + 1024th up normal + diff --git a/test/data/grooves/kwestballadEndingB.musicxml b/test/data/grooves/kwestballadEndingB.musicxml index f68a159b..87c26815 100644 --- a/test/data/grooves/kwestballadEndingB.musicxml +++ b/test/data/grooves/kwestballadEndingB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -239,75 +239,75 @@ - 384 - - 1 - eighth - - - - - - - 96 - - - 1 - 32nd - - - - - - - - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + - - - 6 - + + + E + 4 + + 256 + 1 - 512th + eighth + + 3 + 2 + quarter + + up + normal - + - + + E 4 - 48 + 192 1 - 64th + 16th up normal - + E 4 - 12 + 48 1 - 256th + 64th up normal @@ -315,19 +315,21 @@ - + E 4 - 3 + 12 + 1 - 1024th + 256th up normal + @@ -336,13 +338,15 @@ E 4 - 192 + 3 + 1 - 16th + 1024th up normal + diff --git a/test/data/grooves/kwestballadEndingC.musicxml b/test/data/grooves/kwestballadEndingC.musicxml index 39d12a74..c0f4cf2d 100644 --- a/test/data/grooves/kwestballadEndingC.musicxml +++ b/test/data/grooves/kwestballadEndingC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -239,75 +239,75 @@ - 384 - - 1 - eighth - - - - - - - 96 - - - 1 - 32nd - - - - - - - - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + - - - 6 - + + + E + 4 + + 256 + 1 - 512th + eighth + + 3 + 2 + quarter + + up + normal - + - + + E 4 - 48 + 192 1 - 64th + 16th up normal - + E 4 - 12 + 48 1 - 256th + 64th up normal @@ -315,19 +315,21 @@ - + E 4 - 3 + 12 + 1 - 1024th + 256th up normal + @@ -336,13 +338,15 @@ E 4 - 192 + 3 + 1 - 16th + 1024th up normal + diff --git a/test/data/grooves/kwestballadEndingD.musicxml b/test/data/grooves/kwestballadEndingD.musicxml index b2e1851f..1f99c2d7 100644 --- a/test/data/grooves/kwestballadEndingD.musicxml +++ b/test/data/grooves/kwestballadEndingD.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -239,75 +239,75 @@ - 384 - - 1 - eighth - - - - - - - 96 - - - 1 - 32nd - - - - - - - - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + - - - 6 - + + + E + 4 + + 256 + 1 - 512th + eighth + + 3 + 2 + quarter + + up + normal - + - + + E 4 - 48 + 192 1 - 64th + 16th up normal - + E 4 - 12 + 48 1 - 256th + 64th up normal @@ -315,19 +315,21 @@ - + E 4 - 3 + 12 + 1 - 1024th + 256th up normal + @@ -336,13 +338,15 @@ E 4 - 192 + 3 + 1 - 16th + 1024th up normal + diff --git a/test/data/grooves/kwestballadFillA.musicxml b/test/data/grooves/kwestballadFillA.musicxml index e17ac4f2..453e8184 100644 --- a/test/data/grooves/kwestballadFillA.musicxml +++ b/test/data/grooves/kwestballadFillA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kwestballadFillAB.musicxml b/test/data/grooves/kwestballadFillAB.musicxml index 9c343e18..0fa5316e 100644 --- a/test/data/grooves/kwestballadFillAB.musicxml +++ b/test/data/grooves/kwestballadFillAB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kwestballadFillB.musicxml b/test/data/grooves/kwestballadFillB.musicxml index 0cfe69b6..75e44ecc 100644 --- a/test/data/grooves/kwestballadFillB.musicxml +++ b/test/data/grooves/kwestballadFillB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kwestballadFillC.musicxml b/test/data/grooves/kwestballadFillC.musicxml index e829340d..40d9df3e 100644 --- a/test/data/grooves/kwestballadFillC.musicxml +++ b/test/data/grooves/kwestballadFillC.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/kwestballadIntroA.musicxml b/test/data/grooves/kwestballadIntroA.musicxml index 9debb0cb..7011866d 100644 --- a/test/data/grooves/kwestballadIntroA.musicxml +++ b/test/data/grooves/kwestballadIntroA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -213,10 +213,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -225,7 +225,6 @@ up normal - @@ -233,13 +232,19 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal + @@ -247,11 +252,10 @@ E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/kwestballadIntroB.musicxml b/test/data/grooves/kwestballadIntroB.musicxml index f0c3990a..bb9994a7 100644 --- a/test/data/grooves/kwestballadIntroB.musicxml +++ b/test/data/grooves/kwestballadIntroB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -213,10 +213,10 @@ E 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -225,7 +225,6 @@ up normal - @@ -233,13 +232,19 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal + @@ -247,11 +252,10 @@ E 4 - 576 + 768 1 - eighth - + quarter up x diff --git a/test/data/grooves/metal1A.musicxml b/test/data/grooves/metal1A.musicxml index 98d1b1df..d04f7a7a 100644 --- a/test/data/grooves/metal1A.musicxml +++ b/test/data/grooves/metal1A.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/metal1B.musicxml b/test/data/grooves/metal1B.musicxml index e29ecc46..76f7ebd2 100644 --- a/test/data/grooves/metal1B.musicxml +++ b/test/data/grooves/metal1B.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/metal1E.musicxml b/test/data/grooves/metal1E.musicxml index de101016..3d7ac642 100644 --- a/test/data/grooves/metal1E.musicxml +++ b/test/data/grooves/metal1E.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/metal1FA.musicxml b/test/data/grooves/metal1FA.musicxml index 409c7f6d..2a217d8c 100644 --- a/test/data/grooves/metal1FA.musicxml +++ b/test/data/grooves/metal1FA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/metal1FB.musicxml b/test/data/grooves/metal1FB.musicxml index 74833141..15e75c46 100644 --- a/test/data/grooves/metal1FB.musicxml +++ b/test/data/grooves/metal1FB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/metal2A.musicxml b/test/data/grooves/metal2A.musicxml index 6de2eae5..6a5b5b0d 100644 --- a/test/data/grooves/metal2A.musicxml +++ b/test/data/grooves/metal2A.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -509,767 +509,28 @@ F 4 - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - F - 4 - - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - down - normal - - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - F - 4 - - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - down - normal - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - F - 4 - - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - down - normal - - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - F - 4 - - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - down - normal - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - F - 4 - - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - down - normal - - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - F - 4 - - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - down - normal - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - F - 4 - - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -1277,15 +538,18 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - @@ -1293,17 +557,21 @@ F 4 - 192 + 128 1 16th + + 3 + 2 + 16th + down normal + - - F @@ -1423,15 +691,28 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1439,17 +720,18 @@ F 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - @@ -1457,15 +739,19 @@ F 4 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + down normal - + @@ -1473,15 +759,13 @@ F 4 - 48 - + 192 1 - 64th + 16th down normal - @@ -1489,17 +773,15 @@ F 4 - 12 + 48 - 1 - 256th + 64th down normal - @@ -1507,14 +789,16 @@ F 4 - 3 + 12 + 1 - 1024th + 256th down normal + @@ -1523,13 +807,15 @@ F 4 - 192 + 3 + 1 - 16th + 1024th down normal + @@ -1537,13 +823,15 @@ F 4 - 192 + 96 + 1 - 16th + 32nd down normal + @@ -1551,15 +839,17 @@ F 4 - 48 + 24 + 1 - 64th + 128th down normal + @@ -1567,16 +857,14 @@ F 4 - 12 - + 6 1 - 256th + 512th down normal - @@ -1585,15 +873,28 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1601,15 +902,18 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - @@ -1617,17 +921,19 @@ F 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - + @@ -1635,15 +941,13 @@ F 4 - 6 - + 192 1 - 512th + 16th down normal - @@ -1651,11 +955,11 @@ F 4 - 96 + 48 1 - 32nd + 64th down normal @@ -1667,12 +971,12 @@ F 4 - 24 + 12 1 - 128th + 256th down normal @@ -1685,11 +989,11 @@ F 4 - 6 + 3 1 - 512th + 1024th down normal @@ -1701,11 +1005,11 @@ F 4 - 48 + 96 1 - 64th + 32nd down normal @@ -1717,12 +1021,12 @@ F 4 - 12 + 24 1 - 256th + 128th down normal @@ -1735,11 +1039,11 @@ F 4 - 3 + 6 1 - 1024th + 512th down normal @@ -1751,13 +1055,28 @@ F 4 - 192 + 128 1 16th + + 3 + 2 + 16th + down normal + + + 3 + 16th + + + 2 + 16th + + @@ -1765,10 +1084,15 @@ F 4 - 192 + 128 1 16th + + 3 + 2 + 16th + down normal @@ -1779,49 +1103,35 @@ F 4 - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - + + + F 4 - 3 - + 192 1 - 1024th + 16th down normal - @@ -1829,11 +1139,11 @@ F 4 - 96 + 48 1 - 32nd + 64th down normal @@ -1845,12 +1155,12 @@ F 4 - 24 + 12 1 - 128th + 256th down normal @@ -1863,11 +1173,11 @@ F 4 - 6 + 3 1 - 512th + 1024th down normal @@ -1929,33 +1239,28 @@ F 4 - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -1963,15 +1268,18 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - @@ -1979,13 +1287,19 @@ F 4 - 192 + 128 1 16th + + 3 + 2 + 16th + down normal + @@ -2107,15 +1421,28 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -2123,17 +1450,18 @@ F 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - @@ -2141,15 +1469,33 @@ F 4 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + + down + normal + + + + + + + F + 4 + + 192 + + 1 + 16th down normal - @@ -2183,7 +1529,39 @@ normal - + + + + + + F + 4 + + 3 + + + 1 + 1024th + down + normal + + + + + + + F + 4 + + 96 + + + 1 + 32nd + down + normal + + @@ -2191,14 +1569,16 @@ F 4 - 3 + 24 + 1 - 1024th + 128th down normal + @@ -2207,29 +1587,44 @@ F 4 - 192 + 6 + 1 - 16th + 512th down normal + - - F 4 - 192 + 128 1 16th + + 3 + 2 + 16th + down normal + + + 3 + 16th + + + 2 + 16th + + @@ -2237,15 +1632,18 @@ F 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + down normal - @@ -2253,17 +1651,19 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - + @@ -2271,15 +1671,13 @@ F 4 - 3 - + 192 1 - 1024th + 16th down normal - @@ -2287,11 +1685,11 @@ F 4 - 96 + 48 1 - 32nd + 64th down normal @@ -2303,12 +1701,12 @@ F 4 - 24 + 12 1 - 128th + 256th down normal @@ -2321,11 +1719,11 @@ F 4 - 6 + 3 1 - 512th + 1024th down normal @@ -2387,33 +1785,28 @@ F 4 - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -2421,15 +1814,18 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - @@ -2437,15 +1833,23 @@ F 4 - 192 + 128 1 16th + + 3 + 2 + 16th + down normal + + + F @@ -2565,15 +1969,28 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -2581,17 +1998,18 @@ F 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - @@ -2599,15 +2017,19 @@ F 4 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + down normal - + @@ -2615,15 +2037,13 @@ F 4 - 48 - + 192 1 - 64th + 16th down normal - @@ -2631,17 +2051,15 @@ F 4 - 12 + 48 - 1 - 256th + 64th down normal - @@ -2649,14 +2067,16 @@ F 4 - 3 + 12 + 1 - 1024th + 256th down normal + @@ -2665,13 +2085,15 @@ F 4 - 192 + 3 + 1 - 16th + 1024th down normal + @@ -2679,13 +2101,15 @@ F 4 - 192 + 96 + 1 - 16th + 32nd down normal + @@ -2693,15 +2117,17 @@ F 4 - 48 + 24 + 1 - 64th + 128th down normal + @@ -2709,16 +2135,14 @@ F 4 - 12 - + 6 1 - 256th + 512th down normal - @@ -2727,15 +2151,28 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -2743,15 +2180,18 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - @@ -2759,17 +2199,19 @@ F 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - + @@ -2777,15 +2219,13 @@ F 4 - 6 - + 192 1 - 512th + 16th down normal - @@ -2793,11 +2233,11 @@ F 4 - 96 + 48 1 - 32nd + 64th down normal @@ -2809,12 +2249,12 @@ F 4 - 24 + 12 1 - 128th + 256th down normal @@ -2827,11 +2267,11 @@ F 4 - 6 + 3 1 - 512th + 1024th down normal @@ -2843,11 +2283,11 @@ F 4 - 48 + 96 1 - 64th + 32nd down normal @@ -2859,12 +2299,12 @@ F 4 - 12 + 24 1 - 256th + 128th down normal @@ -2877,11 +2317,11 @@ F 4 - 3 + 6 1 - 1024th + 512th down normal @@ -2893,13 +2333,28 @@ F 4 - 192 + 128 1 16th + + 3 + 2 + 16th + down normal + + + 3 + 16th + + + 2 + 16th + + @@ -2907,10 +2362,15 @@ F 4 - 192 + 128 1 16th + + 3 + 2 + 16th + down normal @@ -2921,33 +2381,19 @@ F 4 - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - + @@ -2955,15 +2401,13 @@ F 4 - 3 - + 192 1 - 1024th + 16th down normal - @@ -2971,11 +2415,11 @@ F 4 - 96 + 48 1 - 32nd + 64th down normal @@ -2987,12 +2431,12 @@ F 4 - 24 + 12 1 - 128th + 256th down normal @@ -3005,11 +2449,11 @@ F 4 - 6 + 3 1 - 512th + 1024th down normal @@ -3071,33 +2515,28 @@ F 4 - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -3105,15 +2544,18 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - @@ -3121,13 +2563,19 @@ F 4 - 192 + 128 1 16th + + 3 + 2 + 16th + down normal + diff --git a/test/data/grooves/metal2B.musicxml b/test/data/grooves/metal2B.musicxml index be0825c1..4c20051c 100644 --- a/test/data/grooves/metal2B.musicxml +++ b/test/data/grooves/metal2B.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -509,15 +509,28 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -525,17 +538,18 @@ F 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - @@ -543,15 +557,19 @@ F 4 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + down normal - + @@ -559,15 +577,13 @@ F 4 - 48 - + 192 1 - 64th + 16th down normal - @@ -575,17 +591,15 @@ F 4 - 12 + 48 - 1 - 256th + 64th down normal - @@ -593,14 +607,16 @@ F 4 - 3 + 12 + 1 - 1024th + 256th down normal + @@ -609,13 +625,15 @@ F 4 - 192 + 3 + 1 - 16th + 1024th down normal + @@ -623,13 +641,15 @@ F 4 - 192 + 96 + 1 - 16th + 32nd down normal + @@ -637,15 +657,17 @@ F 4 - 48 + 24 + 1 - 64th + 128th down normal + @@ -653,16 +675,14 @@ F 4 - 12 - + 6 1 - 256th + 512th down normal - @@ -671,15 +691,28 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -687,15 +720,18 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - @@ -703,17 +739,19 @@ F 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - + @@ -721,15 +759,13 @@ F 4 - 6 - + 192 1 - 512th + 16th down normal - @@ -737,11 +773,11 @@ F 4 - 96 + 48 1 - 32nd + 64th down normal @@ -753,12 +789,12 @@ F 4 - 24 + 12 1 - 128th + 256th down normal @@ -771,11 +807,11 @@ F 4 - 6 + 3 1 - 512th + 1024th down normal @@ -787,11 +823,11 @@ F 4 - 48 + 96 1 - 64th + 32nd down normal @@ -803,12 +839,12 @@ F 4 - 12 + 24 1 - 256th + 128th down normal @@ -821,11 +857,11 @@ F 4 - 3 + 6 1 - 1024th + 512th down normal @@ -837,13 +873,28 @@ F 4 - 192 + 128 1 16th + + 3 + 2 + 16th + down normal + + + 3 + 16th + + + 2 + 16th + + @@ -851,10 +902,15 @@ F 4 - 192 + 128 1 16th + + 3 + 2 + 16th + down normal @@ -865,33 +921,19 @@ F 4 - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - + @@ -899,15 +941,13 @@ F 4 - 3 - + 192 1 - 1024th + 16th down normal - @@ -915,11 +955,11 @@ F 4 - 96 + 48 1 - 32nd + 64th down normal @@ -931,12 +971,12 @@ F 4 - 24 + 12 1 - 128th + 256th down normal @@ -949,11 +989,11 @@ F 4 - 6 + 3 1 - 512th + 1024th down normal @@ -1015,15 +1055,28 @@ F 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1031,17 +1084,18 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - @@ -1049,31 +1103,70 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - + + + + + 3072 + + + + 768 + 2 + quarter + - F + D 4 - 192 - - 1 - 16th + 768 + + 2 + quarter down - normal + x + + + + + + 768 + 2 + quarter + + + + + + D + 4 + + 768 + + 2 + quarter + down + x + + F @@ -1193,15 +1286,28 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1209,17 +1315,18 @@ F 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - @@ -1227,15 +1334,33 @@ F 4 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + + down + normal + + + + + + + F + 4 + + 192 + + 1 + 16th down normal - @@ -1293,648 +1418,15 @@ F 4 - 192 + 96 + 1 - 16th + 32nd down normal - - - - 3072 - - - - 768 - 2 - quarter - - - - - - D - 4 - - 768 - - 2 - quarter - down - x - - - - - - 768 - 2 - quarter - - - - - - D - 4 - - 768 - - 2 - quarter - down - x - - - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - F - 4 - - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - down - normal - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - F - 4 - - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - down - normal - - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - F - 4 - - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - down - normal - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - F - 4 - - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - down - normal - - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - F - 4 - - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - down - normal - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - F - 4 - - 96 - - - 1 - 32nd - down - normal - - + @@ -1976,33 +1468,28 @@ F 4 - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -2010,15 +1497,18 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - @@ -2026,13 +1516,19 @@ F 4 - 192 + 128 1 16th + + 3 + 2 + 16th + down normal + @@ -2154,173 +1650,44 @@ F 4 - 96 - - - 1 - 32nd - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - F - 4 - - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - down - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - down - normal - - - - - - - F - 4 - - 192 + 128 1 16th + + 3 + 2 + 16th + down normal + + + 3 + 16th + + + 2 + 16th + + - - 3072 - - - - 768 - 2 - quarter - - - - - - D - 4 - - 768 - - 2 - quarter - down - x - - - - - - 768 - 2 - quarter - - - - - - D - 4 - - 768 - - 2 - quarter - down - x - - - - - F 4 - 192 + 128 1 16th + + 3 + 2 + 16th + down normal @@ -2331,33 +1698,19 @@ F 4 - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - + @@ -2365,15 +1718,13 @@ F 4 - 3 - + 192 1 - 1024th + 16th down normal - @@ -2381,11 +1732,11 @@ F 4 - 96 + 48 1 - 32nd + 64th down normal @@ -2397,12 +1748,12 @@ F 4 - 24 + 12 1 - 128th + 256th down normal @@ -2415,11 +1766,11 @@ F 4 - 6 + 3 1 - 512th + 1024th down normal @@ -2481,15 +1832,28 @@ F 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -2497,17 +1861,18 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - @@ -2515,31 +1880,70 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - + + + + + 3072 + + + + 768 + 2 + quarter + - F + D 4 - 192 - - 1 - 16th + 768 + + 2 + quarter down - normal + x + + + + + + 768 + 2 + quarter + + + + + + D + 4 + + 768 + + 2 + quarter + down + x + + F @@ -2659,15 +2063,28 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -2675,17 +2092,18 @@ F 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - @@ -2693,15 +2111,19 @@ F 4 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + down normal - + @@ -2709,15 +2131,13 @@ F 4 - 48 - + 192 1 - 64th + 16th down normal - @@ -2725,17 +2145,15 @@ F 4 - 12 + 48 - 1 - 256th + 64th down normal - @@ -2743,14 +2161,16 @@ F 4 - 3 + 12 + 1 - 1024th + 256th down normal + @@ -2759,13 +2179,15 @@ F 4 - 192 + 3 + 1 - 16th + 1024th down normal + @@ -2773,13 +2195,15 @@ F 4 - 192 + 96 + 1 - 16th + 32nd down normal + @@ -2787,15 +2211,17 @@ F 4 - 48 + 24 + 1 - 64th + 128th down normal + @@ -2803,16 +2229,14 @@ F 4 - 12 - + 6 1 - 256th + 512th down normal - @@ -2821,15 +2245,28 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -2837,15 +2274,18 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - @@ -2853,17 +2293,19 @@ F 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - + @@ -2871,15 +2313,13 @@ F 4 - 6 - + 192 1 - 512th + 16th down normal - @@ -2887,11 +2327,11 @@ F 4 - 96 + 48 1 - 32nd + 64th down normal @@ -2903,12 +2343,12 @@ F 4 - 24 + 12 1 - 128th + 256th down normal @@ -2921,11 +2361,11 @@ F 4 - 6 + 3 1 - 512th + 1024th down normal @@ -2937,11 +2377,11 @@ F 4 - 48 + 96 1 - 64th + 32nd down normal @@ -2953,12 +2393,12 @@ F 4 - 12 + 24 1 - 256th + 128th down normal @@ -2971,11 +2411,11 @@ F 4 - 3 + 6 1 - 1024th + 512th down normal @@ -2987,13 +2427,28 @@ F 4 - 192 + 128 1 16th + + 3 + 2 + 16th + down normal + + + 3 + 16th + + + 2 + 16th + + @@ -3001,10 +2456,15 @@ F 4 - 192 + 128 1 16th + + 3 + 2 + 16th + down normal @@ -3015,33 +2475,19 @@ F 4 - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - + @@ -3049,15 +2495,13 @@ F 4 - 3 - + 192 1 - 1024th + 16th down normal - @@ -3065,11 +2509,11 @@ F 4 - 96 + 48 1 - 32nd + 64th down normal @@ -3081,12 +2525,12 @@ F 4 - 24 + 12 1 - 128th + 256th down normal @@ -3099,11 +2543,11 @@ F 4 - 6 + 3 1 - 512th + 1024th down normal @@ -3165,33 +2609,28 @@ F 4 - 48 - - - 1 - 64th - down - normal - - - - - - - F - 4 - - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -3199,15 +2638,18 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - @@ -3215,13 +2657,19 @@ F 4 - 192 + 128 1 16th + + 3 + 2 + 16th + down normal + diff --git a/test/data/grooves/metal2E.musicxml b/test/data/grooves/metal2E.musicxml index 4a8fe062..acf67944 100644 --- a/test/data/grooves/metal2E.musicxml +++ b/test/data/grooves/metal2E.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/metal2FA.musicxml b/test/data/grooves/metal2FA.musicxml index be557858..64d42cc5 100644 --- a/test/data/grooves/metal2FA.musicxml +++ b/test/data/grooves/metal2FA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/metal2FB.musicxml b/test/data/grooves/metal2FB.musicxml index 238fe618..b295ae23 100644 --- a/test/data/grooves/metal2FB.musicxml +++ b/test/data/grooves/metal2FB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -278,83 +278,28 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 128 1 - 512th - up - normal - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -362,15 +307,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -378,13 +326,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -571,83 +525,28 @@ A 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - A - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - A - 4 - - 6 - + 128 1 - 512th - up - normal - - - - - - - A - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - A - 4 - - 12 - - - - 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -655,15 +554,18 @@ A 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -671,13 +573,19 @@ A 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -818,83 +726,28 @@ D 5 - 96 - - - 2 - 32nd - up - normal - - - - - - - D - 5 - - 24 - - - - 2 - 128th - up - normal - - - - - - - - D - 5 - - 6 - + 128 2 - 512th - up - normal - - - - - - - D - 5 - - 48 - - - 2 - 64th - up - normal - - - - - - - D - 5 - - 12 - - - - 2 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -902,15 +755,18 @@ D 5 - 3 - + 128 2 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -918,13 +774,19 @@ D 5 - 192 + 128 2 16th + + 3 + 2 + 16th + up normal + @@ -1065,83 +927,28 @@ F 5 - 96 - - - 3 - 32nd - up - normal - - - - - - - F - 5 - - 24 - - - - 3 - 128th - up - normal - - - - - - - - F - 5 - - 6 - + 128 3 - 512th - up - normal - - - - - - - F - 5 - - 48 - - - 3 - 64th - up - normal - - - - - - - F - 5 - - 12 - - - - 3 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -1149,15 +956,18 @@ F 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -1165,13 +975,19 @@ F 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up normal + diff --git a/test/data/grooves/rock1A.musicxml b/test/data/grooves/rock1A.musicxml index d772b6ef..478b7118 100644 --- a/test/data/grooves/rock1A.musicxml +++ b/test/data/grooves/rock1A.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/rock1B.musicxml b/test/data/grooves/rock1B.musicxml index bc0d0f76..90ffe9d3 100644 --- a/test/data/grooves/rock1B.musicxml +++ b/test/data/grooves/rock1B.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/rock1E.musicxml b/test/data/grooves/rock1E.musicxml index 9300c6a4..93bf5773 100644 --- a/test/data/grooves/rock1E.musicxml +++ b/test/data/grooves/rock1E.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/rock1FA.musicxml b/test/data/grooves/rock1FA.musicxml index 146f4c4e..3410d0a7 100644 --- a/test/data/grooves/rock1FA.musicxml +++ b/test/data/grooves/rock1FA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/rock1FB.musicxml b/test/data/grooves/rock1FB.musicxml index 749fd7c4..8544a1e4 100644 --- a/test/data/grooves/rock1FB.musicxml +++ b/test/data/grooves/rock1FB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/slowrockA.musicxml b/test/data/grooves/slowrockA.musicxml index 19dbb7e4..0f6e9edb 100644 --- a/test/data/grooves/slowrockA.musicxml +++ b/test/data/grooves/slowrockA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/slowrockB.musicxml b/test/data/grooves/slowrockB.musicxml index 670f3928..1a646167 100644 --- a/test/data/grooves/slowrockB.musicxml +++ b/test/data/grooves/slowrockB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/slowrockE.musicxml b/test/data/grooves/slowrockE.musicxml index b18852cb..6123a8a2 100644 --- a/test/data/grooves/slowrockE.musicxml +++ b/test/data/grooves/slowrockE.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/slowrockFA.musicxml b/test/data/grooves/slowrockFA.musicxml index b9bd7e7b..ca6ba57d 100644 --- a/test/data/grooves/slowrockFA.musicxml +++ b/test/data/grooves/slowrockFA.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 diff --git a/test/data/grooves/slowrockFB.musicxml b/test/data/grooves/slowrockFB.musicxml index ba4d7618..0402d649 100644 --- a/test/data/grooves/slowrockFB.musicxml +++ b/test/data/grooves/slowrockFB.musicxml @@ -8,8 +8,8 @@ - musicxml-grooves 2.8.0 - 2024-09-20 + musicxml-grooves 2.8.1 + 2024-09-25 @@ -210,98 +210,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -309,15 +236,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -371,98 +302,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -470,15 +328,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -648,98 +510,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - A - 4 - - 384 - - + 256 1 eighth - up - normal - - - - - - - A - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - A - 4 - - 24 - - - - 1 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -747,15 +536,19 @@ A 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -812,98 +605,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - F - 5 - - 384 - - + 256 3 eighth - up - normal - - - - - - - F - 5 - - 96 - - - - 3 - 32nd - up - normal - - - - - - - - F - 5 - - 24 - - - - 3 - 128th - up - normal + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -911,15 +631,19 @@ F 5 - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + up normal - +