From 4ddb584215cf6ceb144574075f41b78306537856 Mon Sep 17 00:00:00 2001 From: Karim Ratib Date: Thu, 26 Sep 2024 22:55:40 -0700 Subject: [PATCH] Better tuplet detection for #51 --- build/filter.sef.json | 2 +- build/groove.sef.json | 2 +- build/mma.sef.json | 2 +- build/musicxml.sef.json | 2 +- build/timemap.sef.json | 2 +- build/unroll.sef.json | 2 +- package-lock.json | 38 +- package.json | 2 +- src/js/musicxml-grooves.js | 63 +- test/data/grooves/04JAZZ01.musicxml | 212 +- test/data/grooves/04JAZZ02.musicxml | 4 +- test/data/grooves/04JAZZ03.musicxml | 4 +- test/data/grooves/04JAZZ04.musicxml | 567 +- 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 | 220 +- 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 | 2516 +------ test/data/grooves/16Beat3End.musicxml | 512 +- test/data/grooves/16Beat3Intro.musicxml | 1574 +---- test/data/grooves/16BeatBallad1.musicxml | 123 +- test/data/grooves/16BeatBallad1End.musicxml | 1510 +--- test/data/grooves/16BeatBallad1Intro.musicxml | 242 +- test/data/grooves/16BeatBallad2.musicxml | 1763 +---- test/data/grooves/16BeatBallad2End.musicxml | 879 +-- test/data/grooves/16BeatBallad2Intro.musicxml | 2168 +----- test/data/grooves/16BeatBallad3.musicxml | 1720 +---- test/data/grooves/16BeatBallad3End.musicxml | 964 +-- test/data/grooves/16BeatBallad3Intro.musicxml | 2196 +----- 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 | 2575 ++----- test/data/grooves/16Shuffle1End.musicxml | 282 +- test/data/grooves/16Shuffle1Intro.musicxml | 793 +-- 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 | 220 +- 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 | 966 +-- 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 | 833 +-- test/data/grooves/68BalladEnd.musicxml | 536 +- test/data/grooves/68BalladIntro.musicxml | 1339 +--- 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 | 964 +-- test/data/grooves/80sPopIntro.musicxml | 834 +-- test/data/grooves/8Beat.musicxml | 1006 +-- test/data/grooves/8Beat1.musicxml | 116 +- test/data/grooves/8Beat1End.musicxml | 4 +- test/data/grooves/8Beat1Intro.musicxml | 60 +- 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 | 137 +- test/data/grooves/8Beat3End.musicxml | 15 +- test/data/grooves/8Beat3Intro.musicxml | 161 +- 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 | 152 +- test/data/grooves/8BeatPop2End.musicxml | 78 +- test/data/grooves/8BeatPop2Intro.musicxml | 226 +- 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 | 204 +- test/data/grooves/AFRO08.musicxml | 212 +- test/data/grooves/AMB01.musicxml | 117 +- test/data/grooves/AMB02.musicxml | 54 +- test/data/grooves/AMB03.musicxml | 299 +- 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 | 1818 +---- test/data/grooves/Ambient1End.musicxml | 956 +-- test/data/grooves/Ambient1Intro.musicxml | 2696 ++------ test/data/grooves/Ambient2.musicxml | 3208 +-------- test/data/grooves/Ambient2End.musicxml | 544 +- test/data/grooves/Ambient2Intro.musicxml | 2144 +----- 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 | 1680 +---- 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 | 138 +- 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 | 964 +-- test/data/grooves/DancePop1Intro.musicxml | 964 +-- 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 | 1079 +-- 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 | 611 +- .../data/grooves/FastJazzWaltzIntro8.musicxml | 611 +- 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 | 1701 +---- test/data/grooves/Funk1End.musicxml | 461 +- test/data/grooves/Funk1Intro.musicxml | 1467 +--- test/data/grooves/Funk2.musicxml | 1123 +-- test/data/grooves/Funk2End.musicxml | 4 +- test/data/grooves/Funk2Intro.musicxml | 1417 +--- test/data/grooves/Fusion.musicxml | 2666 ++------ test/data/grooves/FusionEnd.musicxml | 356 +- test/data/grooves/FusionIntro.musicxml | 1659 +---- 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 | 1132 +-- test/data/grooves/HIP04.musicxml | 3692 ++-------- 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 | 137 +- test/data/grooves/HIP10.musicxml | 784 +-- test/data/grooves/HIP11.musicxml | 4 +- test/data/grooves/HIP12.musicxml | 651 +- test/data/grooves/HIP13.musicxml | 143 +- test/data/grooves/HIP14.musicxml | 257 +- test/data/grooves/HIP15.musicxml | 786 +-- 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 | 1898 ++---- test/data/grooves/HappyshuffleB.musicxml | 1898 ++---- test/data/grooves/HappyshuffleC.musicxml | 650 +- test/data/grooves/HappyshuffleD.musicxml | 650 +- .../data/grooves/HappyshuffleEndingA.musicxml | 4 +- .../data/grooves/HappyshuffleEndingB.musicxml | 297 +- .../data/grooves/HappyshuffleEndingC.musicxml | 692 +- test/data/grooves/HappyshuffleFillA.musicxml | 296 +- test/data/grooves/HappyshuffleFillB.musicxml | 139 +- test/data/grooves/HappyshuffleFillC.musicxml | 310 +- test/data/grooves/HappyshuffleFillD.musicxml | 263 +- test/data/grooves/HappyshuffleIntroA.musicxml | 112 +- test/data/grooves/HappyshuffleIntroB.musicxml | 832 +-- test/data/grooves/HappyshuffleIntroC.musicxml | 752 +- test/data/grooves/HeavyMetal.musicxml | 112 +- test/data/grooves/HeavyMetalEnd.musicxml | 1108 +-- 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 | 157 +- test/data/grooves/INTRO06.musicxml | 78 +- 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 | 186 +- 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 | 269 +- test/data/grooves/JAZZ03.musicxml | 476 +- test/data/grooves/JAZZ04.musicxml | 179 +- test/data/grooves/JAZZ05.musicxml | 463 +- test/data/grooves/JAZZ06.musicxml | 262 +- test/data/grooves/JAZZ07.musicxml | 1985 ++---- 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 | 611 +- 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 | 194 +- 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 | 333 +- test/data/grooves/LATN01.musicxml | 984 +-- 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 | 510 +- 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 | 6068 ++++++----------- test/data/grooves/LatinFusionIntro.musicxml | 1834 +---- 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 | 2285 ++----- 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 | 956 +-- 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 | 168 +- test/data/grooves/OldieBalladEnd.musicxml | 4 +- test/data/grooves/OldieBalladIntro.musicxml | 539 +- 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 | 2954 ++------ 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 | 384 +- test/data/grooves/PopIntro.musicxml | 1464 +--- 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 | 94 +- test/data/grooves/ROCK07.musicxml | 52 +- test/data/grooves/ROCK08.musicxml | 4 +- test/data/grooves/ROCK09.musicxml | 4 +- test/data/grooves/ROCK10.musicxml | 180 +- 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 | 1010 +-- test/data/grooves/RaveIntro.musicxml | 2494 ++----- 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 | 466 +- 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 | 1168 +--- test/data/grooves/SHFL05.musicxml | 1216 +--- 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 | 727 +- test/data/grooves/Salsa2EndingB.musicxml | 727 +- 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 | 660 +- test/data/grooves/Salsa2IntroB.musicxml | 572 +- 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 | 315 +- 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 | 252 +- test/data/grooves/SlowBolero1.musicxml | 252 +- test/data/grooves/SlowBolero1Sus.musicxml | 252 +- test/data/grooves/SlowBoleroEnd.musicxml | 4 +- test/data/grooves/SlowBoleroIntro.musicxml | 128 +- test/data/grooves/SlowBoleroIntroSus.musicxml | 128 +- test/data/grooves/SlowBoleroPlus.musicxml | 252 +- test/data/grooves/SlowBoleroSus.musicxml | 252 +- test/data/grooves/SlowBoleroSusPlus.musicxml | 252 +- 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 | 3145 ++------- 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 | 254 +- test/data/grooves/TwiIntroB.musicxml | 225 +- 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 | 4324 +++--------- test/data/grooves/highfiveB.musicxml | 4270 +++--------- test/data/grooves/highfiveE.musicxml | 1790 ++--- test/data/grooves/highfiveFA.musicxml | 748 +- test/data/grooves/highfiveFB.musicxml | 748 +- 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 | 119 +- test/data/grooves/kwestballadEndingB.musicxml | 119 +- test/data/grooves/kwestballadEndingC.musicxml | 119 +- test/data/grooves/kwestballadEndingD.musicxml | 119 +- 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 | 2416 ++----- test/data/grooves/metal2B.musicxml | 2526 ++----- test/data/grooves/metal2E.musicxml | 4 +- test/data/grooves/metal2FA.musicxml | 4 +- test/data/grooves/metal2FB.musicxml | 796 +-- 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 +- 1800 files changed, 51126 insertions(+), 184337 deletions(-) diff --git a/build/filter.sef.json b/build/filter.sef.json index f7292fdc..0ce7f75a 100644 --- a/build/filter.sef.json +++ b/build/filter.sef.json @@ -1 +1 @@ -{"N":"package","version":"10","packageVersion":"1","saxonVersion":"SaxonJS 2.6","target":"JS","targetVersion":"2","name":"TOP-LEVEL","relocatable":"true","buildDateTime":"2024-09-16T22:47:15.421-07:00","ns":"xml=~ xsl=~","C":[{"N":"co","binds":"","id":"0","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}filter","sType":"* ","slots":"200","module":"filter.xsl","flags":"r","as":"","ns":"xml=~ xsl=~","C":[{"N":"str","sType":"1AS ","val":"","role":"select"}]}]},{"N":"co","id":"1","binds":"0 1","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"1","ns":"xml=~ xsl=~","minImp":"0","flags":"s","slots":"200","line":"23","module":"filter.xsl","expand-text":"false","match":"*[local-name()=tokenize($filter,'\\|')]","prio":"0.5","matches":"NE","C":[{"N":"p.withPredicate","role":"match","sType":"1NE","ns":"= xml=~ fn=~ xsl=~ ","C":[{"N":"p.nodeTest","test":"NE"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"fn","name":"local-name","C":[{"N":"dot"}]},{"N":"fn","name":"tokenize","C":[{"N":"treat","as":"AS","diag":"0|0||tokenize","C":[{"N":"check","card":"?","diag":"0|0||tokenize","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||tokenize","C":[{"N":"check","card":"?","diag":"0|0||tokenize","C":[{"N":"data","diag":"0|0||tokenize","C":[{"N":"gVarRef","name":"Q{}filter","bSlot":"0"}]}]}]}]}]},{"N":"str","val":"\\|"}]}]}]},{"N":"empty","sType":"0 ","role":"action"}]},{"N":"templateRule","rank":"1","prec":"0","seq":"0","ns":"xml=~ xsl=~","minImp":"0","flags":"s","slots":"200","line":"17","module":"filter.xsl","expand-text":"false","match":"node()|@*","prio":"-0.5","matches":"N u[NT,NP,NC,NE]","C":[{"N":"p.nodeTest","role":"match","test":"N u[NT,NP,NC,NE]","sType":"1N u[NT,NP,NC,NE]"},{"N":"copy","sType":"1N u[1NT ,1NP ,1NC ,1NE ] ","flags":"cin","role":"action","line":"18","C":[{"N":"applyT","sType":"* ","line":"19","mode":"#unnamed","bSlot":"1","C":[{"N":"docOrder","sType":"*N u[N u[N u[N u[NT,NP],NC],NE],NA]","role":"select","line":"19","C":[{"N":"union","op":"|","sType":"*N u[N u[N u[N u[NT,NP],NC],NE],NA]","ns":"= xml=~ fn=~ xsl=~ ","C":[{"N":"axis","name":"child","nodeTest":"*N u[NT,NP,NC,NE]"},{"N":"axis","name":"attribute","nodeTest":"*NA"}]}]}]}]}]},{"N":"templateRule","rank":"2","prec":"0","seq":"0","ns":"xml=~ xsl=~","minImp":"0","flags":"s","slots":"200","line":"17","module":"filter.xsl","expand-text":"false","match":"node()|@*","prio":"-0.5","matches":"NA","C":[{"N":"p.nodeTest","role":"match","test":"NA","sType":"1NA"},{"N":"copy","sType":"1NA ","flags":"cin","role":"action","line":"18","C":[{"N":"applyT","sType":"* ","line":"19","mode":"#unnamed","bSlot":"1","C":[{"N":"docOrder","sType":"*N u[N u[N u[N u[NT,NP],NC],NE],NA]","role":"select","line":"19","C":[{"N":"union","op":"|","sType":"*N u[N u[N u[N u[NT,NP],NC],NE],NA]","ns":"= xml=~ fn=~ xsl=~ ","C":[{"N":"axis","name":"child","nodeTest":"*N u[NT,NP,NC,NE]"},{"N":"axis","name":"attribute","nodeTest":"*NA"}]}]}]}]}]}]}]},{"N":"overridden"},{"N":"output","C":[{"N":"property","name":"Q{http://saxon.sf.net/}stylesheet-version","value":"10"},{"N":"property","name":"omit-xml-declaration","value":"no"},{"N":"property","name":"indent","value":"yes"}]},{"N":"decimalFormat"}],"Σ":"c521f3b7"} \ No newline at end of file +{"N":"package","version":"10","packageVersion":"1","saxonVersion":"SaxonJS 2.6","target":"JS","targetVersion":"2","name":"TOP-LEVEL","relocatable":"true","buildDateTime":"2024-09-26T22:49:48.865-07:00","ns":"xml=~ xsl=~","C":[{"N":"co","binds":"","id":"0","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}filter","sType":"* ","slots":"200","module":"filter.xsl","flags":"r","as":"","ns":"xml=~ xsl=~","C":[{"N":"str","sType":"1AS ","val":"","role":"select"}]}]},{"N":"co","id":"1","binds":"0 1","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"1","ns":"xml=~ xsl=~","minImp":"0","flags":"s","slots":"200","line":"23","module":"filter.xsl","expand-text":"false","match":"*[local-name()=tokenize($filter,'\\|')]","prio":"0.5","matches":"NE","C":[{"N":"p.withPredicate","role":"match","sType":"1NE","ns":"= xml=~ fn=~ xsl=~ ","C":[{"N":"p.nodeTest","test":"NE"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"fn","name":"local-name","C":[{"N":"dot"}]},{"N":"fn","name":"tokenize","C":[{"N":"treat","as":"AS","diag":"0|0||tokenize","C":[{"N":"check","card":"?","diag":"0|0||tokenize","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||tokenize","C":[{"N":"check","card":"?","diag":"0|0||tokenize","C":[{"N":"data","diag":"0|0||tokenize","C":[{"N":"gVarRef","name":"Q{}filter","bSlot":"0"}]}]}]}]}]},{"N":"str","val":"\\|"}]}]}]},{"N":"empty","sType":"0 ","role":"action"}]},{"N":"templateRule","rank":"1","prec":"0","seq":"0","ns":"xml=~ xsl=~","minImp":"0","flags":"s","slots":"200","line":"17","module":"filter.xsl","expand-text":"false","match":"node()|@*","prio":"-0.5","matches":"N u[NT,NP,NC,NE]","C":[{"N":"p.nodeTest","role":"match","test":"N u[NT,NP,NC,NE]","sType":"1N u[NT,NP,NC,NE]"},{"N":"copy","sType":"1N u[1NT ,1NP ,1NC ,1NE ] ","flags":"cin","role":"action","line":"18","C":[{"N":"applyT","sType":"* ","line":"19","mode":"#unnamed","bSlot":"1","C":[{"N":"docOrder","sType":"*N u[N u[N u[N u[NT,NP],NC],NE],NA]","role":"select","line":"19","C":[{"N":"union","op":"|","sType":"*N u[N u[N u[N u[NT,NP],NC],NE],NA]","ns":"= xml=~ fn=~ xsl=~ ","C":[{"N":"axis","name":"child","nodeTest":"*N u[NT,NP,NC,NE]"},{"N":"axis","name":"attribute","nodeTest":"*NA"}]}]}]}]}]},{"N":"templateRule","rank":"2","prec":"0","seq":"0","ns":"xml=~ xsl=~","minImp":"0","flags":"s","slots":"200","line":"17","module":"filter.xsl","expand-text":"false","match":"node()|@*","prio":"-0.5","matches":"NA","C":[{"N":"p.nodeTest","role":"match","test":"NA","sType":"1NA"},{"N":"copy","sType":"1NA ","flags":"cin","role":"action","line":"18","C":[{"N":"applyT","sType":"* ","line":"19","mode":"#unnamed","bSlot":"1","C":[{"N":"docOrder","sType":"*N u[N u[N u[N u[NT,NP],NC],NE],NA]","role":"select","line":"19","C":[{"N":"union","op":"|","sType":"*N u[N u[N u[N u[NT,NP],NC],NE],NA]","ns":"= xml=~ fn=~ xsl=~ ","C":[{"N":"axis","name":"child","nodeTest":"*N u[NT,NP,NC,NE]"},{"N":"axis","name":"attribute","nodeTest":"*NA"}]}]}]}]}]}]}]},{"N":"overridden"},{"N":"output","C":[{"N":"property","name":"Q{http://saxon.sf.net/}stylesheet-version","value":"10"},{"N":"property","name":"omit-xml-declaration","value":"no"},{"N":"property","name":"indent","value":"yes"}]},{"N":"decimalFormat"}],"Σ":"c55266b7"} \ No newline at end of file diff --git a/build/groove.sef.json b/build/groove.sef.json index c28bd2b4..750e4978 100644 --- a/build/groove.sef.json +++ b/build/groove.sef.json @@ -1 +1 @@ -{"N":"package","version":"30","packageVersion":"1","saxonVersion":"SaxonJS 2.6","target":"JS","targetVersion":"2","name":"TOP-LEVEL","relocatable":"true","buildDateTime":"2024-09-16T22:47:16.085-07:00","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"co","id":"0","uniform":"true","binds":"6 4 2 3 1 5","C":[{"N":"template","flags":"os","module":"groove.xsl","slots":"200","name":"Q{}groove","line":"29","expand-text":"false","sType":"* ","C":[{"N":"sequence","role":"body","sType":"* ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nMidiText Generated by github.com/infojunkie/musicxml-midi\nKeySig "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"32","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"gVarRef","sType":"* ","name":"Q{}keysig","bSlot":"0","role":"select","line":"32"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nTempo "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"33","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"gVarRef","sType":"* ","name":"Q{}tempo","bSlot":"1","role":"select","line":"33"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nGroove "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"34","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"gVarRef","sType":"* ","name":"Q{}groove","bSlot":"2","role":"select","line":"34"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nMidiMark Groove:"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"35","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"gVarRef","sType":"* ","name":"Q{}groove","bSlot":"2","role":"select","line":"35"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nSet Duration $( round( $_Time * 60000 / $_Tempo ) )\n "}]},{"N":"let","var":"Q{}chordSeq","slot":"0","sType":"* ","line":"38","C":[{"N":"fn","name":"tokenize","sType":"*AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"38","C":[{"N":"treat","as":"AS","diag":"0|0||fn:tokenize","C":[{"N":"check","card":"?","diag":"0|0||fn:tokenize","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||fn:tokenize","C":[{"N":"check","card":"?","diag":"0|0||fn:tokenize","C":[{"N":"data","diag":"0|0||fn:tokenize","C":[{"N":"gVarRef","name":"Q{}chords","bSlot":"3"}]}]}]}]}]},{"N":"str","val":"\\s*,\\s*"}]},{"N":"callT","bSlot":"4","sType":"* ","name":"Q{}measure","line":"39","C":[{"N":"withParam","name":"Q{}i","slot":"0","sType":"1ADI","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"40"}]},{"N":"withParam","name":"Q{}count","slot":"0","sType":"* ","C":[{"N":"gVarRef","name":"Q{}count","bSlot":"5","sType":"* ","role":"select","line":"41"}]},{"N":"withParam","name":"Q{}chordSeq","slot":"0","sType":"*","C":[{"N":"varRef","name":"Q{}chordSeq","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"42"}]}]}]}]}]}]},{"N":"co","id":"1","uniform":"true","binds":"1","C":[{"N":"template","flags":"os","module":"groove.xsl","slots":"200","name":"Q{}measure","line":"46","expand-text":"false","sType":"* ","C":[{"N":"sequence","role":"body","sType":"* ","C":[{"N":"param","name":"Q{}i","slot":"0","sType":"* ","as":"* ","flags":"","line":"47","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"0","sType":"* "}]},{"N":"param","name":"Q{}count","slot":"1","sType":"* ","as":"* ","flags":"","line":"48","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"1","sType":"* "}]},{"N":"param","name":"Q{}chordSeq","slot":"2","sType":"* ","as":"* ","flags":"","line":"49","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"2","sType":"* "}]},{"N":"choose","sType":"* ","line":"50","C":[{"N":"gc","op":"<","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"50","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}i","slot":"0"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"varRef","name":"Q{}count","slot":"1"}]}]},{"N":"sequence","sType":"* ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nMidiMark 0 Measure:"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"52","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"varRef","sType":"*","name":"Q{}i","slot":"0","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"52"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":": $Duration\n"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"53","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"filter","sType":"*","flags":"p","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"53","C":[{"N":"varRef","name":"Q{}chordSeq","slot":"2"},{"N":"arith","op":"+","calc":"a+a","C":[{"N":"int","val":"1"},{"N":"arith","op":"mod","calc":"a%a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}i","slot":"0"}]}]},{"N":"fn","name":"count","C":[{"N":"varRef","name":"Q{}chordSeq","slot":"2"}]}]}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"callT","bSlot":"0","sType":"* ","name":"Q{}measure","line":"54","C":[{"N":"withParam","name":"Q{}i","slot":"0","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"55","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}i","slot":"0"}]}]},{"N":"int","val":"1"}]}]},{"N":"withParam","name":"Q{}count","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}count","slot":"1","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"56"}]},{"N":"withParam","name":"Q{}chordSeq","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}chordSeq","slot":"2","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"57"}]}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]}]},{"N":"co","binds":"","id":"2","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}groove","sType":"* ","slots":"200","module":"groove.xsl","flags":"r","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"str","sType":"1AS ","val":"","role":"select"}]}]},{"N":"co","binds":"","id":"3","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}chords","sType":"* ","slots":"200","module":"groove.xsl","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"str","val":"z","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"24"}]}]},{"N":"co","binds":"","id":"4","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}tempo","sType":"* ","slots":"200","module":"groove.xsl","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"int","val":"120","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"25"}]}]},{"N":"co","binds":"","id":"5","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}count","sType":"* ","slots":"200","module":"groove.xsl","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"int","val":"4","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"26"}]}]},{"N":"co","binds":"","id":"6","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}keysig","sType":"* ","slots":"200","module":"groove.xsl","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"str","val":"C","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"27"}]}]},{"N":"co","binds":"","id":"7","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","prec":""}]},{"N":"overridden"},{"N":"output","C":[{"N":"property","name":"Q{http://saxon.sf.net/}stylesheet-version","value":"30"},{"N":"property","name":"method","value":"text"},{"N":"property","name":"media-type","value":"text/plain"},{"N":"property","name":"omit-xml-declaration","value":"yes"}]},{"N":"decimalFormat"}],"Σ":"d3df46c9"} \ No newline at end of file +{"N":"package","version":"30","packageVersion":"1","saxonVersion":"SaxonJS 2.6","target":"JS","targetVersion":"2","name":"TOP-LEVEL","relocatable":"true","buildDateTime":"2024-09-26T22:49:49.301-07:00","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"co","id":"0","uniform":"true","binds":"6 4 2 3 1 5","C":[{"N":"template","flags":"os","module":"groove.xsl","slots":"200","name":"Q{}groove","line":"29","expand-text":"false","sType":"* ","C":[{"N":"sequence","role":"body","sType":"* ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nMidiText Generated by github.com/infojunkie/musicxml-midi\nKeySig "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"32","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"gVarRef","sType":"* ","name":"Q{}keysig","bSlot":"0","role":"select","line":"32"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nTempo "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"33","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"gVarRef","sType":"* ","name":"Q{}tempo","bSlot":"1","role":"select","line":"33"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nGroove "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"34","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"gVarRef","sType":"* ","name":"Q{}groove","bSlot":"2","role":"select","line":"34"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nMidiMark Groove:"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"35","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"gVarRef","sType":"* ","name":"Q{}groove","bSlot":"2","role":"select","line":"35"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nSet Duration $( round( $_Time * 60000 / $_Tempo ) )\n "}]},{"N":"let","var":"Q{}chordSeq","slot":"0","sType":"* ","line":"38","C":[{"N":"fn","name":"tokenize","sType":"*AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"38","C":[{"N":"treat","as":"AS","diag":"0|0||fn:tokenize","C":[{"N":"check","card":"?","diag":"0|0||fn:tokenize","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||fn:tokenize","C":[{"N":"check","card":"?","diag":"0|0||fn:tokenize","C":[{"N":"data","diag":"0|0||fn:tokenize","C":[{"N":"gVarRef","name":"Q{}chords","bSlot":"3"}]}]}]}]}]},{"N":"str","val":"\\s*,\\s*"}]},{"N":"callT","bSlot":"4","sType":"* ","name":"Q{}measure","line":"39","C":[{"N":"withParam","name":"Q{}i","slot":"0","sType":"1ADI","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"40"}]},{"N":"withParam","name":"Q{}count","slot":"0","sType":"* ","C":[{"N":"gVarRef","name":"Q{}count","bSlot":"5","sType":"* ","role":"select","line":"41"}]},{"N":"withParam","name":"Q{}chordSeq","slot":"0","sType":"*","C":[{"N":"varRef","name":"Q{}chordSeq","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"42"}]}]}]}]}]}]},{"N":"co","id":"1","uniform":"true","binds":"1","C":[{"N":"template","flags":"os","module":"groove.xsl","slots":"200","name":"Q{}measure","line":"46","expand-text":"false","sType":"* ","C":[{"N":"sequence","role":"body","sType":"* ","C":[{"N":"param","name":"Q{}i","slot":"0","sType":"* ","as":"* ","flags":"","line":"47","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"0","sType":"* "}]},{"N":"param","name":"Q{}count","slot":"1","sType":"* ","as":"* ","flags":"","line":"48","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"1","sType":"* "}]},{"N":"param","name":"Q{}chordSeq","slot":"2","sType":"* ","as":"* ","flags":"","line":"49","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"2","sType":"* "}]},{"N":"choose","sType":"* ","line":"50","C":[{"N":"gc","op":"<","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"50","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}i","slot":"0"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"varRef","name":"Q{}count","slot":"1"}]}]},{"N":"sequence","sType":"* ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nMidiMark 0 Measure:"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"52","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"varRef","sType":"*","name":"Q{}i","slot":"0","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"52"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":": $Duration\n"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"53","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"filter","sType":"*","flags":"p","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"53","C":[{"N":"varRef","name":"Q{}chordSeq","slot":"2"},{"N":"arith","op":"+","calc":"a+a","C":[{"N":"int","val":"1"},{"N":"arith","op":"mod","calc":"a%a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}i","slot":"0"}]}]},{"N":"fn","name":"count","C":[{"N":"varRef","name":"Q{}chordSeq","slot":"2"}]}]}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"callT","bSlot":"0","sType":"* ","name":"Q{}measure","line":"54","C":[{"N":"withParam","name":"Q{}i","slot":"0","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"55","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}i","slot":"0"}]}]},{"N":"int","val":"1"}]}]},{"N":"withParam","name":"Q{}count","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}count","slot":"1","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"56"}]},{"N":"withParam","name":"Q{}chordSeq","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}chordSeq","slot":"2","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"57"}]}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]}]},{"N":"co","binds":"","id":"2","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}groove","sType":"* ","slots":"200","module":"groove.xsl","flags":"r","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"str","sType":"1AS ","val":"","role":"select"}]}]},{"N":"co","binds":"","id":"3","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}chords","sType":"* ","slots":"200","module":"groove.xsl","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"str","val":"z","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"24"}]}]},{"N":"co","binds":"","id":"4","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}tempo","sType":"* ","slots":"200","module":"groove.xsl","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"int","val":"120","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"25"}]}]},{"N":"co","binds":"","id":"5","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}count","sType":"* ","slots":"200","module":"groove.xsl","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"int","val":"4","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"26"}]}]},{"N":"co","binds":"","id":"6","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}keysig","sType":"* ","slots":"200","module":"groove.xsl","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"str","val":"C","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"27"}]}]},{"N":"co","binds":"","id":"7","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","prec":""}]},{"N":"overridden"},{"N":"output","C":[{"N":"property","name":"Q{http://saxon.sf.net/}stylesheet-version","value":"30"},{"N":"property","name":"method","value":"text"},{"N":"property","name":"media-type","value":"text/plain"},{"N":"property","name":"omit-xml-declaration","value":"yes"}]},{"N":"decimalFormat"}],"Σ":"d3ace4c9"} \ No newline at end of file diff --git a/build/mma.sef.json b/build/mma.sef.json index 2966d90e..63824af5 100644 --- a/build/mma.sef.json +++ b/build/mma.sef.json @@ -1 +1 @@ -{"N":"package","version":"30","packageVersion":"1","saxonVersion":"SaxonJS 2.6","target":"JS","targetVersion":"2","name":"TOP-LEVEL","relocatable":"true","buildDateTime":"2024-09-16T22:47:17.226-07:00","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"co","binds":"","id":"0","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs","as":"1AO ","slots":"203","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[1AO ,1AO ,1AO ] ","sType":"1F r[1AO ] a[1AO ,1AO ,1AO ] ","line":"114","C":[{"N":"arg","slot":"0","name":"Q{}time","as":"AO ","sType":"AO "},{"N":"arg","slot":"1","name":"Q{}divisions","as":"AO ","sType":"AO "},{"N":"arg","slot":"2","name":"Q{}tempo","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","role":"body","C":[{"N":"arith","op":"div","calc":"a/a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"body","line":"118","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}time","slot":"0"}]}]},{"N":"int","val":"60000"}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisions","slot":"1"}]}]}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}tempo","slot":"2"}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"1","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks","as":"1AO ","slots":"202","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[1AO ,1AO ] ","sType":"1F r[1AO ] a[1AO ,1AO ] ","line":"124","C":[{"N":"arg","slot":"0","name":"Q{}time","as":"AO ","sType":"AO "},{"N":"arg","slot":"1","name":"Q{}divisions","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","role":"body","C":[{"N":"fn","name":"round","sType":"?A m[AO,AD,AF]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"body","line":"127","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||round","C":[{"N":"check","card":"?","diag":"0|0||round","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||round","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}time","slot":"0"}]}]},{"N":"int","val":"192"}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisions","slot":"1"}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"2","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration","as":"1AO ","slots":"201","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[* ] ","sType":"1F r[1AO ] a[* ] ","line":"133","C":[{"N":"arg","slot":"0","name":"Q{}harmony","as":"* ","sType":"* "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","role":"body","C":[{"N":"let","var":"Q{}id","slot":"1","sType":"*A ","line":"135","role":"body","C":[{"N":"fn","name":"generate-id","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"135","C":[{"N":"treat","as":"N","diag":"0|0||generate-id","C":[{"N":"check","card":"?","diag":"0|0||generate-id","C":[{"N":"varRef","name":"Q{}harmony","slot":"0"}]}]}]},{"N":"fn","name":"sum","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"138","C":[{"N":"data","diag":"0|0||sum","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}harmony","slot":"0"}]},{"N":"filter","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"and","C":[{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"fn","name":"generate-id","C":[{"N":"fn","name":"reverse","C":[{"N":"first","C":[{"N":"axis","name":"preceding-sibling","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]}]}]},{"N":"data","diag":"1|1||gc","C":[{"N":"varRef","name":"Q{}id","slot":"1"}]}]}]}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"3","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.mellowood.ca/mma}note","as":"1ADI ","slots":"202","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","module":"mma.xsl","flags":"muu","sig":"1F r[1ADI ] a[* ,* ] ","sType":"1F r[1ADI ] a[* ,* ] ","line":"73","C":[{"N":"arg","slot":"0","name":"Q{}step","as":"* ","sType":"* "},{"N":"arg","slot":"1","name":"Q{}alter","as":"* ","sType":"* "},{"N":"check","card":"1","sType":"1ADI ","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}note()","role":"body","C":[{"N":"treat","as":"ADI ","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}note()","role":"body","C":[{"N":"check","card":"1","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}note()","role":"body","C":[{"N":"cvUntyped","to":"ADI","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}note()","role":"body","C":[{"N":"data","sType":"*A ","role":"body","C":[{"N":"choose","sType":"? ","type":"item()*","role":"body","line":"76","C":[{"N":"or","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"77","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"G"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"1"}]}]},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"A"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"-1"}]}]}]},{"N":"int","val":"-4","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"100"},{"N":"or","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"78","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"A"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"1"}]}]},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"B"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"-1"}]}]}]},{"N":"int","val":"-2","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"102"},{"N":"or","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"79","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"C"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"1"}]}]},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"D"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"-1"}]}]}]},{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"104"},{"N":"or","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"80","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"D"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"1"}]}]},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"E"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"-1"}]}]}]},{"N":"int","val":"3","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"106"},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"81","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"G"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"-1"}]}]},{"N":"int","val":"-6","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"108"},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"82","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"C"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"-1"}]}]},{"N":"int","val":"-1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"110"},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"83","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"B"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"1"}]}]},{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"112"},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"84","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"F"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"-1"}]}]},{"N":"int","val":"4","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"114"},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"85","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"E"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"1"}]}]},{"N":"int","val":"5","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"116"},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"86","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"F"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"1"}]}]},{"N":"int","val":"6","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"118"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"87","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"G"}]},{"N":"int","val":"-5","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"120"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"88","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"A"}]},{"N":"int","val":"-3","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"122"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"89","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"D"}]},{"N":"int","val":"2","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"124"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"90","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"B"}]},{"N":"int","val":"-1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"126"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"91","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"C"}]},{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"128"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"92","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"E"}]},{"N":"int","val":"4","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"130"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"93","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"F"}]},{"N":"int","val":"5","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"132"},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"4","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.mellowood.ca/mma}groove","as":"* ","slots":"202","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","module":"mma.xsl","flags":"muu","sig":"1F r[* ] a[* ,* ] ","sType":"1F r[* ] a[* ,* ] ","line":"100","C":[{"N":"arg","slot":"0","name":"Q{}groove","as":"* ","sType":"* "},{"N":"arg","slot":"1","name":"Q{}time","as":"* ","sType":"* "},{"N":"choose","sType":"? ","type":"item()*","role":"body","line":"107","C":[{"N":"or","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"108","C":[{"N":"fn","name":"contains","C":[{"N":"fn","name":"lower-case","C":[{"N":"treat","as":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"data","diag":"0|0||lower-case","C":[{"N":"varRef","name":"Q{}groove","slot":"0"}]}]}]}]}]}]},{"N":"str","val":"swing"},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]},{"N":"fn","name":"contains","C":[{"N":"fn","name":"lower-case","C":[{"N":"treat","as":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"data","diag":"0|0||lower-case","C":[{"N":"varRef","name":"Q{}groove","slot":"0"}]}]}]}]}]}]},{"N":"str","val":"jazz"},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]},{"N":"choose","sType":"?AS ","type":"item()*","line":"109","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"110","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}time","slot":"1"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}beats,NE nQ{http://www.w3.org/1999/xhtml}beats]"}]}]}]},{"N":"int","val":"5"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}time","slot":"1"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}beat-type,NE nQ{http://www.w3.org/1999/xhtml}beat-type]"}]}]}]},{"N":"int","val":"4"}]}]},{"N":"str","val":"Jazz54","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"140"},{"N":"true"},{"N":"str","val":"Swing","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"142"}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]},{"N":"co","binds":"","id":"5","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.mellowood.ca/mma}mod","as":"1AO ","slots":"202","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","module":"mma.xsl","flags":"muu","sig":"1F r[1AO ] a[1AO ,1AO ] ","sType":"1F r[1AO ] a[1AO ,1AO ] ","line":"122","C":[{"N":"arg","slot":"0","name":"Q{}dividend","as":"AO ","sType":"AO "},{"N":"arg","slot":"1","name":"Q{}divisor","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}mod()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}mod()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}mod()","role":"body","C":[{"N":"arith","op":"-","calc":"a-a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"body","line":"125","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}dividend","slot":"0"}]}]},{"N":"arith","op":"*","calc":"a*a","C":[{"N":"fn","name":"floor","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||floor","C":[{"N":"check","card":"?","diag":"0|0||floor","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||floor","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}dividend","slot":"0"}]}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisor","slot":"1"}]}]}]}]}]}]}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisor","slot":"1"}]}]}]}]}]}]}]}]}]},{"N":"co","id":"6","vis":"PRIVATE","ex:uniform":"true","binds":"6 11","C":[{"N":"function","name":"Q{http://www.mellowood.ca/mma}noteDuration","as":"1AO ","slots":"202","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","module":"mma.xsl","flags":"muu","sig":"1F r[1AO ] a[* ,1AO ] ","sType":"1F r[1AO ] a[* ,1AO ] ","line":"131","C":[{"N":"arg","slot":"0","name":"Q{}note","as":"* ","sType":"* "},{"N":"arg","slot":"1","name":"Q{}duration","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}noteDuration()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}noteDuration()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}noteDuration()","role":"body","C":[{"N":"let","var":"Q{}tie","slot":"2","sType":"*A ","line":"134","role":"body","C":[{"N":"docOrder","sType":"*NE u[NE u[NE nQ{}tied,NE nQ{http://www.w3.org/1999/xhtml}tied],NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]]","role":"select","line":"134","C":[{"N":"choose","sType":"*NE u[NE u[NE nQ{}tied,NE nQ{http://www.w3.org/1999/xhtml}tied],NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}note","slot":"0"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}cue,NE nQ{http://www.w3.org/1999/xhtml}cue]"}]}]},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}note","slot":"0"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}notations,NE nQ{http://www.w3.org/1999/xhtml}notations]"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tied,NE nQ{http://www.w3.org/1999/xhtml}tied]"}]}]},{"N":"true"},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}note","slot":"0"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]"}]}]}]}]},{"N":"choose","sType":"?A ","type":"item()*","line":"135","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"136","C":[{"N":"filter","C":[{"N":"varRef","name":"Q{}tie","slot":"2"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"stop"}]}]},{"N":"fn","name":"not","C":[{"N":"filter","C":[{"N":"varRef","name":"Q{}tie","slot":"2"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"start"}]}]}]}]},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"154","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}duration","slot":"1"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}note","slot":"0"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]},{"N":"true"},{"N":"ufCall","name":"Q{http://www.mellowood.ca/mma}noteDuration","coId":"6","sType":"1AO","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"144","bSlot":"0","C":[{"N":"choose","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}note","slot":"0"}]},{"N":"filter","C":[{"N":"filter","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"1"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]}]}]}]},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}note","slot":"0"}]},{"N":"first","C":[{"N":"filter","C":[{"N":"filter","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"1"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]}]}]}]}]},{"N":"true"},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}note","slot":"0"}]},{"N":"axis","name":"parent","nodeTest":"?N"}]},{"N":"first","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"first","C":[{"N":"filter","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"1"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]}]}]}]}]}]},{"N":"check","card":"1","diag":"0|1||mma:noteDuration","C":[{"N":"convert","to":"AO","flags":"","C":[{"N":"cvUntyped","to":"AO","diag":"0|1||mma:noteDuration","C":[{"N":"arith","op":"+","calc":"a+a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}duration","slot":"1"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}note","slot":"0"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"7","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}useSef","sType":"AB ","slots":"200","module":"mma.xsl","as":"AB ","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"false","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"25"}]}]},{"N":"co","binds":"","id":"8","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}chordVolume","sType":"* ","slots":"200","module":"mma.xsl","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"int","val":"50","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"26"}]}]},{"N":"co","binds":"","id":"9","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}melodyInstrument","sType":"* ","slots":"200","module":"mma.xsl","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"str","val":"TenorSax","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"27"}]}]},{"N":"co","binds":"","id":"10","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}chordInstrument","sType":"* ","slots":"200","module":"mma.xsl","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"str","val":"Piano1","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"28"}]}]},{"N":"co","binds":"","id":"11","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}melodyVoice","sType":"* ","slots":"200","module":"mma.xsl","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"29"}]}]},{"N":"co","binds":"","id":"12","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}globalGroove","sType":"* ","slots":"200","module":"mma.xsl","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"str","val":"","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"30"}]}]},{"N":"co","binds":"","id":"13","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}renumberMeasures","sType":"AB ","slots":"200","module":"mma.xsl","as":"AB ","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"false","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"31"}]}]},{"N":"co","id":"14","vis":"PUBLIC","ex:uniform":"true","binds":"13","C":[{"N":"globalVariable","name":"Q{}stylesheetParams","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","module":"mma.xsl","slots":"200","sType":"1FM","C":[{"N":"map","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"154","C":[{"N":"fn","name":"QName","C":[{"N":"str","val":""},{"N":"str","val":"renumberMeasures"}]},{"N":"gVarRef","name":"Q{}renumberMeasures","bSlot":"0"}]}]}]},{"N":"co","id":"15","vis":"PUBLIC","ex:uniform":"true","binds":"7 14","C":[{"N":"globalVariable","name":"Q{}unrolled","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","module":"mma.xsl","slots":"200","sType":"?ND ","C":[{"N":"doc","sType":"1ND ","base":"file:///home/kratib/src/infojunkie/musicxml-midi/src/xsl/mma.xsl","role":"select","C":[{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"* ","line":"156","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"156","C":[{"N":"gVarRef","name":"Q{}useSef","bSlot":"0"}]},{"N":"lookup","op":"?","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"161","C":[{"N":"fn","name":"transform","C":[{"N":"map","C":[{"N":"str","val":"source-node"},{"N":"root"},{"N":"str","val":"stylesheet-node"},{"N":"fn","name":"doc","C":[{"N":"str","val":"unroll.xsl"}]},{"N":"str","val":"stylesheet-params"},{"N":"gVarRef","name":"Q{}stylesheetParams","bSlot":"1"}]}]},{"N":"str","val":"output"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"163","C":[{"N":"gVarRef","name":"Q{}useSef","bSlot":"0","sType":"AB ","line":"163"},{"N":"lookup","op":"?","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"168","C":[{"N":"fn","name":"transform","C":[{"N":"map","C":[{"N":"str","val":"source-node"},{"N":"root"},{"N":"str","val":"package-text"},{"N":"fn","name":"unparsed-text","C":[{"N":"str","val":"unroll.sef.json"}]},{"N":"str","val":"stylesheet-params"},{"N":"gVarRef","name":"Q{}stylesheetParams","bSlot":"1"}]}]},{"N":"str","val":"output"}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]}]}]},{"N":"co","id":"16","binds":"16 22 12 4 18 0 20 11 21 17 10 9 23 15","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"10","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"595","module":"mma.xsl","expand-text":"false","match":"key","prio":"0","matches":"NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"sequence","role":"action","sType":"* ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nKeySig "}]},{"N":"choose","sType":"* ","type":"item()*","line":"596","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}fifths,NE nQ{http://www.w3.org/1999/xhtml}fifths]","sType":"*NE u[NE nQ{}fifths,NE nQ{http://www.w3.org/1999/xhtml}fifths]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"597"},{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"598","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"599","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}fifths,NE nQ{http://www.w3.org/1999/xhtml}fifths]"}]},{"N":"int","val":"0"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"0"}]},{"N":"gc","op":"<","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"600","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}fifths,NE nQ{http://www.w3.org/1999/xhtml}fifths]"}]},{"N":"int","val":"0"}]},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","flags":"l","sType":"1NT ","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"arith","sType":"1AO","op":"*","calc":"d*d","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"7","C":[{"N":"convert","to":"AO","flags":"","C":[{"N":"int","val":"-1"}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}fifths,NE nQ{http://www.w3.org/1999/xhtml}fifths]"}]}]}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"b"}]}]},{"N":"gc","op":">","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"601","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}fifths,NE nQ{http://www.w3.org/1999/xhtml}fifths]"}]},{"N":"int","val":"0"}]},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","flags":"l","sType":"1NT ","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"axis","sType":"*NE u[NE nQ{}fifths,NE nQ{http://www.w3.org/1999/xhtml}fifths]","name":"child","nodeTest":"*NE u[NE nQ{}fifths,NE nQ{http://www.w3.org/1999/xhtml}fifths]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"9"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"#"}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"? ","line":"603","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}mode,NE nQ{http://www.w3.org/1999/xhtml}mode]","sType":"*NE u[NE nQ{}mode,NE nQ{http://www.w3.org/1999/xhtml}mode]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"603"},{"N":"choose","sType":"? ","type":"item()*","line":"604","C":[{"N":"compareToString","op":"eq","val":"none","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"605","C":[{"N":"fn","name":"lower-case","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"data","diag":"0|0||lower-case","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}mode,NE nQ{http://www.w3.org/1999/xhtml}mode]"}]}]}]}]}]},{"N":"empty","sType":"0 "},{"N":"compareToString","op":"eq","val":"major","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"606","C":[{"N":"fn","name":"lower-case","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"data","diag":"0|0||lower-case","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}mode,NE nQ{http://www.w3.org/1999/xhtml}mode]"}]}]}]}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":" Major"}]},{"N":"compareToString","op":"eq","val":"minor","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"607","C":[{"N":"fn","name":"lower-case","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"data","diag":"0|0||lower-case","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}mode,NE nQ{http://www.w3.org/1999/xhtml}mode]"}]}]}]}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":" Minor"}]},{"N":"true"},{"N":"message","sType":"0 ","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"sequence","role":"select","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"[KeySig] Unhandled mode "}]},{"N":"valueOf","flags":"l","sType":"1NT ","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"axis","sType":"*NE u[NE nQ{}mode,NE nQ{http://www.w3.org/1999/xhtml}mode]","name":"child","nodeTest":"*NE u[NE nQ{}mode,NE nQ{http://www.w3.org/1999/xhtml}mode]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"17"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]},{"N":"str","sType":"1AS ","val":"false","role":"terminate"},{"N":"str","sType":"1AS ","val":"Q{http://www.w3.org/2005/xqt-errors}XTMM9000","role":"error"}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]},{"N":"true"},{"N":"sequence","sType":"* ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"0"}]},{"N":"message","sType":"0 ","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"sequence","role":"select","sType":"*N ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"[KeySig] Unhandled key signature "}]},{"N":"copyOf","flags":"c","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=http://ns.saxonica.com/xslt/export","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","C":[{"N":"dot","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"20"}]}]},{"N":"str","sType":"1AS ","val":"false","role":"terminate"},{"N":"str","sType":"1AS ","val":"Q{http://www.w3.org/2005/xqt-errors}XTMM9000","role":"error"}]}]}]}]}]},{"N":"templateRule","rank":"1","prec":"0","seq":"9","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"587","module":"mma.xsl","expand-text":"false","match":"time","prio":"0","matches":"NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","sType":"1NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"sequence","role":"action","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nTime "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"588","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"arith","sType":"?AO","op":"div","calc":"d/d","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"588","C":[{"N":"arith","op":"*","calc":"d*d","C":[{"N":"cvUntyped","to":"AO","diag":"1|0|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}beats,NE nQ{http://www.w3.org/1999/xhtml}beats]"}]}]}]},{"N":"convert","to":"AO","flags":"","C":[{"N":"int","val":"4"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}beat-type,NE nQ{http://www.w3.org/1999/xhtml}beat-type]"}]}]}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nTimeSig "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"589","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"axis","sType":"*NE u[NE nQ{}beats,NE nQ{http://www.w3.org/1999/xhtml}beats]","name":"child","nodeTest":"*NE u[NE nQ{}beats,NE nQ{http://www.w3.org/1999/xhtml}beats]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"589"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"/"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"589","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"axis","sType":"*NE u[NE nQ{}beat-type,NE nQ{http://www.w3.org/1999/xhtml}beat-type]","name":"child","nodeTest":"*NE u[NE nQ{}beat-type,NE nQ{http://www.w3.org/1999/xhtml}beat-type]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"589"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]}]},{"N":"templateRule","rank":"2","prec":"0","seq":"2","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"235","module":"mma.xsl","expand-text":"false","match":"measure","prio":"0","matches":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"sequence","role":"action","sType":"* ","C":[{"N":"applyT","sType":"* ","line":"239","mode":"#unnamed","bSlot":"0","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"239","C":[{"N":"slash","op":"/","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]"}]}]}]},{"N":"applyT","sType":"* ","line":"244","mode":"#unnamed","bSlot":"0","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"244","C":[{"N":"slash","op":"/","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]"}]}]}]},{"N":"applyT","sType":"* ","line":"249","mode":"Q{}tempo","bSlot":"1","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"249","C":[{"N":"slash","op":"/","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tempo"}]}]}]}]},{"N":"let","var":"Q{}groove","slot":"0","sType":"* ","line":"254","C":[{"N":"doc","sType":"1ND ","base":"file:///home/kratib/src/infojunkie/musicxml-midi/src/xsl/mma.xsl","role":"select","C":[{"N":"choose","sType":"? ","type":"item()*","line":"255","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"256","C":[{"N":"attVal","name":"Q{}number"},{"N":"str","val":"0"}]},{"N":"empty","sType":"0 "},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"257","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}number"},{"N":"str","val":"1"}]},{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"gVarRef","name":"Q{}globalGroove","bSlot":"2"}]},{"N":"str","val":""}]}]},{"N":"compareToString","op":"ne","val":"default","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","C":[{"N":"fn","name":"lower-case","C":[{"N":"treat","as":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"data","diag":"0|0||lower-case","C":[{"N":"gVarRef","name":"Q{}globalGroove","bSlot":"2"}]}]}]}]}]}]}]}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"258","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"gVarRef","sType":"* ","name":"Q{}globalGroove","bSlot":"2","role":"select","line":"258"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"vc","op":"eq","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"260","C":[{"N":"fn","name":"accumulator-before","C":[{"N":"str","val":"Q{}groove"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}groove"}]}]},{"N":"empty","sType":"0 "},{"N":"true"},{"N":"valueOf","flags":"l","sType":"1NT ","line":"265","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"ufCall","sType":"*","name":"Q{http://www.mellowood.ca/mma}groove","coId":"4","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"265","bSlot":"3","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}play,NE nQ{http://www.w3.org/1999/xhtml}play]"}]},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}other-play,NE nQ{http://www.w3.org/1999/xhtml}other-play]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"groove"}]}]}]},{"N":"axis","name":"child","nodeTest":"*NT"}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}time"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]}]},{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"269","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"270","C":[{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}groove","slot":"0"}]},{"N":"str","val":""}]},{"N":"compareToString","op":"ne","val":"none","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","C":[{"N":"fn","name":"lower-case","C":[{"N":"treat","as":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"data","diag":"0|0||lower-case","C":[{"N":"varRef","name":"Q{}groove","slot":"0"}]}]}]}]}]}]}]}]},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nGroove "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"271","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"varRef","sType":"*","name":"Q{}groove","slot":"0","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"271"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nMidiMark Groove:"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"272","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"varRef","sType":"*","name":"Q{}groove","slot":"0","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"272"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"274","C":[{"N":"and","C":[{"N":"compareToString","op":"ne","val":"none","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","C":[{"N":"fn","name":"lower-case","C":[{"N":"treat","as":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"data","diag":"0|0||lower-case","C":[{"N":"varRef","name":"Q{}groove","slot":"0"}]}]}]}]}]}]}]},{"N":"compareToString","op":"ne","val":"","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}groove"}]}]}]},{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"ufCall","name":"Q{http://www.mellowood.ca/mma}groove","coId":"4","bSlot":"3","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}groove"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}time"}]}]}]},{"N":"str","val":""}]}]},{"N":"empty","sType":"0 "},{"N":"true"},{"N":"sequence","sType":"* ","C":[{"N":"applyT","sType":"* ","line":"276","mode":"Q{}sequence","bSlot":"4","C":[{"N":"first","sType":"?NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"276","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]},{"N":"withParam","name":"Q{}start","slot":"0","sType":"1ADI","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"277"}]}]},{"N":"choose","sType":"* ","line":"279","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"279","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]},{"N":"applyT","sType":"* ","line":"283","mode":"Q{}sequence","bSlot":"4","C":[{"N":"docOrder","sType":"*NE ","role":"select","line":"283","C":[{"N":"fn","name":"accumulator-after","sType":"*NE ","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"str","val":"Q{}harmony"}]}]},{"N":"withParam","name":"Q{}start","slot":"0","sType":"1ADI","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"284"}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\n"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"MidiMark Measure:"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"294","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"ifCall","sType":"*","name":"Q{http://saxon.sf.net/}apply","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"294","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}measureIndex"}]},{"N":"arrayBlock","C":[{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}number"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":":"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"300","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"ufCall","sType":"1AO","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs","coId":"0","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"300","bSlot":"5","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}measureDuration"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}tempo"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\n"}]},{"N":"applyT","sType":"* ","line":"306","mode":"Q{}riff","bSlot":"6","C":[{"N":"filter","sType":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"306","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"7"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]}]},{"N":"applyT","sType":"* ","line":"307","mode":"Q{}pitch","bSlot":"8","C":[{"N":"filter","sType":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"307","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"7"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\n"}]},{"N":"applyT","sType":"* ","line":"313","mode":"Q{}onset","bSlot":"9","C":[{"N":"first","sType":"?NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"313","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]},{"N":"withParam","name":"Q{}start","slot":"0","sType":"1ADI","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"314"}]}]},{"N":"choose","sType":"* ","line":"316","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"316","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]},{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"? ","line":"320","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"320","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}harmony"}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":" z"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"applyT","sType":"* ","line":"321","mode":"Q{}onset","bSlot":"9","C":[{"N":"docOrder","sType":"*NE ","role":"select","line":"321","C":[{"N":"fn","name":"accumulator-after","sType":"*NE ","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"str","val":"Q{}harmony"}]}]},{"N":"withParam","name":"Q{}start","slot":"0","sType":"1ADI","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"322"}]}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"330","C":[{"N":"docOrder","sType":"*NE","line":"330","C":[{"N":"docOrder","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"slash","op":"/","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}time"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}beat-type,NE nQ{http://www.w3.org/1999/xhtml}beat-type]"}]}]}]},{"N":"let","var":"Q{}durationDifference","slot":"1","sType":"* ","line":"331","C":[{"N":"fn","name":"round","sType":"?A m[AO,AD,AF]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"331","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||round","C":[{"N":"check","card":"?","diag":"0|0||round","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||round","C":[{"N":"arith","op":"-","calc":"a-a","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"fn","name":"sum","C":[{"N":"data","diag":"0|0||sum","C":[{"N":"slash","op":"/","C":[{"N":"filter","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"7"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]},{"N":"arith","op":"div","calc":"d/d","C":[{"N":"arith","op":"*","calc":"d*d","C":[{"N":"cvUntyped","to":"AO","diag":"1|0|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}time"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}beats,NE nQ{http://www.w3.org/1999/xhtml}beats]"}]}]}]}]}]},{"N":"convert","to":"AO","flags":"","C":[{"N":"int","val":"4"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}time"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}beat-type,NE nQ{http://www.w3.org/1999/xhtml}beat-type]"}]}]}]}]}]}]}]}]}]}]}]},{"N":"choose","sType":"* ","line":"332","C":[{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"332","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}durationDifference","slot":"1"}]},{"N":"int","val":"0"}]},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nBeatAdjust "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"333","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"varRef","sType":"*","name":"Q{}durationDifference","slot":"1","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"333"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]}]}]},{"N":"templateRule","rank":"3","prec":"0","seq":"1","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"186","module":"mma.xsl","expand-text":"false","match":"score-partwise","prio":"0","matches":"NE u[NE nQ{}score-partwise,NE nQ{http://www.w3.org/1999/xhtml}score-partwise]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}score-partwise,NE nQ{http://www.w3.org/1999/xhtml}score-partwise]","sType":"1NE u[NE nQ{}score-partwise,NE nQ{http://www.w3.org/1999/xhtml}score-partwise]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"sequence","role":"action","sType":"* ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nMidiText Generated by github.com/infojunkie/musicxml-midi\n\nBegin Chord-Custom\n Voice "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"191","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"gVarRef","sType":"* ","name":"Q{}chordInstrument","bSlot":"10","role":"select","line":"191"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\n Octave 5\n Articulate 80\n Volume f\nEnd\n\nSolo Voice "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"197","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"gVarRef","sType":"* ","name":"Q{}melodyInstrument","bSlot":"11","role":"select","line":"197"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\n\nDefChord mb6 (0, 3, 7, 8) (0, 2, 3, 5, 7, 8, 10)\nDefChord 7(add6) (0, 4, 7, 9, 10) (0, 2, 4, 5, 7, 9, 10)\nDefChord +(addM7)(add9) (0, 4, 8, 11, 14) (0, 2, 4, 5, 8, 9, 11)\nDefChord +7(add9) (0, 4, 8, 10, 14) (0, 2, 4, 5, 8, 9, 10)\nDefChord 7+#9 (0, 4, 8, 10, 15) (0, 3, 4, 5, 8, 9, 10)\nDefChord 7+b9 (0, 4, 8, 10, 13) (0, 1, 4, 5, 8, 9, 10)\nDefChord 7b9#9 (0, 4, 7, 10, 13, 15) (0, 1, 3, 4, 5, 7, 10)\nDefChord 7b5b9#9#5 (0, 4, 6, 8, 10, 13, 15) (0, 1, 3, 5, 6, 8, 10)\nDefChord 7susb13 (0, 5, 10, 20) (0, 2, 5, 5, 8, 9, 10)\nDefChord 7(add3)(add4) (0, 4, 5, 7, 10) (0, 2, 4, 5, 7, 9, 10)\nDefChord M7+ (0, 4, 8, 11) (0, 2, 4, 5, 8, 9, 11)\nDefChord dimb13 (0, 3, 6, 9, 8) (0, 2, 3, 5, 6, 8, 9)\nDefChord 13(omit3) (0, 7, 10, 21) (0, 2, 5, 5, 7, 9, 10)\nDefChord m(add2) (0, 2, 3, 7) (0, 2, 3, 5, 7, 8, 8)\nDefChord m7+#9 (0, 3, 8, 10, 15) (0, 3, 3, 5, 8, 8, 10)\nDefChord m7+b9 (0, 3, 8, 10, 13) (0, 1, 3, 5, 8, 8, 10)\nDefChord m7+b9#11 (0, 3, 8, 10, 13, 18) (0, 1, 3, 6, 8, 9, 10)\nDefChord m7b5(add9)(add11) (0, 3, 6, 10, 14, 17) (0, 2, 3, 5, 6, 9, 10)\nDefChord m7+ (0, 3, 7, 11) (0, 2, 3, 5, 7, 8, 11)\nDefChord mM7b5 (0, 3, 6, 11) (0, 2, 3, 5, 6, 8, 11)\nDefChord (omit3)(add9) (0, 0, 7, 14) (0, 2, 4, 5, 7, 9, 10)\nDefChord sus#9 (0, 5, 7, 15) (0, 2, 5, 5, 7, 9, 11)\nDefChord susb9 (0, 5, 7, 13) (0, 2, 5, 5, 7, 9, 11)\n\nPlugin Slash"}]},{"N":"applyT","sType":"* ","line":"224","mode":"Q{}declaration","bSlot":"12","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"224","C":[{"N":"docOrder","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"root"},{"N":"axis","name":"descendant-or-self","nodeTest":"*N"}]},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass,NE nQ{http://www.w3.org/1999/xhtml}bass]"}]}]}]}]},{"N":"withParam","name":"Q{}definition","slot":"0","sType":"1AB","C":[{"N":"true","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"225"}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\n"}]},{"N":"applyT","sType":"* ","line":"229","mode":"#unnamed","bSlot":"0","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"229","C":[{"N":"slash","op":"/","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}part,NE nQ{http://www.w3.org/1999/xhtml}part]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]}]}]}]},{"N":"templateRule","rank":"4","prec":"0","seq":"0","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"177","module":"mma.xsl","expand-text":"false","match":"/","prio":"-0.5","matches":"ND","C":[{"N":"p.nodeTest","role":"match","test":"ND","sType":"1ND","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"applyT","sType":"* ","line":"178","mode":"#unnamed","role":"action","bSlot":"0","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"178","C":[{"N":"slash","op":"/","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"gVarRef","name":"Q{}unrolled","bSlot":"13"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}score-partwise,NE nQ{http://www.w3.org/1999/xhtml}score-partwise]"}]}]}]}]}]}]},{"N":"co","id":"17","binds":"19 17 2","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","name":"Q{}onset","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"3","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"341","module":"mma.xsl","expand-text":"false","match":"harmony","prio":"0","matches":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"sequence","role":"action","sType":"* ","C":[{"N":"param","name":"Q{}start","slot":"0","sType":"* ","as":"* ","flags":"","line":"342","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"0","sType":"* "}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":" "}]},{"N":"applyT","sType":"* ","line":"344","mode":"Q{}name","bSlot":"0","C":[{"N":"dot","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"344"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"@"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"345","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"varRef","sType":"*","name":"Q{}start","slot":"0","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"345"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"applyT","sType":"* ","line":"346","mode":"Q{}onset","bSlot":"1","C":[{"N":"first","sType":"?NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"346","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]},{"N":"withParam","name":"Q{}start","slot":"0","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"347","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}start","slot":"0"}]}]},{"N":"arith","op":"div","calc":"d/d","C":[{"N":"ufCall","name":"Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration","coId":"2","bSlot":"2","C":[{"N":"dot"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]}]}]}]}]}]},{"N":"co","id":"18","binds":"2 1 8 18","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","name":"Q{}sequence","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"4","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"354","module":"mma.xsl","expand-text":"false","match":"harmony","prio":"0","matches":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"sequence","role":"action","sType":"* ","C":[{"N":"param","name":"Q{}start","slot":"0","sType":"* ","as":"* ","flags":"","line":"355","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"0","sType":"* "}]},{"N":"choose","sType":"? ","line":"356","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"356","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}start","slot":"0"}]},{"N":"int","val":"1"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nChord-Custom Sequence { "}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"358","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"varRef","sType":"*","name":"Q{}start","slot":"0","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"358"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":" "}]},{"N":"let","var":"Q{}duration","slot":"1","sType":"* ","line":"364","C":[{"N":"doc","sType":"1ND ","base":"file:///home/kratib/src/infojunkie/musicxml-midi/src/xsl/mma.xsl","role":"select","C":[{"N":"valueOf","flags":"l","sType":"1NT ","line":"365","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"ufCall","sType":"1AO","name":"Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration","coId":"2","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"365","bSlot":"0","C":[{"N":"dot"}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]},{"N":"sequence","sType":"* ","C":[{"N":"valueOf","flags":"l","sType":"1NT ","line":"367","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"ufCall","sType":"1AO","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks","coId":"1","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"367","bSlot":"1","C":[{"N":"convert","to":"AO","flags":"","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||musicxml:timeToMIDITicks","C":[{"N":"check","card":"1","diag":"0|0||musicxml:timeToMIDITicks","C":[{"N":"data","diag":"0|0||musicxml:timeToMIDITicks","C":[{"N":"varRef","name":"Q{}duration","slot":"1"}]}]}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"t "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"368","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"gVarRef","sType":"* ","name":"Q{}chordVolume","bSlot":"2","role":"select","line":"368"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"; "}]},{"N":"applyT","sType":"* ","line":"369","mode":"Q{}sequence","bSlot":"3","C":[{"N":"first","sType":"?NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"369","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]},{"N":"withParam","name":"Q{}start","slot":"0","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"370","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}start","slot":"0"}]}]},{"N":"arith","op":"div","calc":"a/a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}duration","slot":"1"}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]}]},{"N":"choose","sType":"? ","line":"372","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"372","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"}"}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]}]}]}]}]},{"N":"co","id":"19","binds":"5 3","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","name":"Q{}name","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"5","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"378","module":"mma.xsl","expand-text":"false","match":"harmony","prio":"0","matches":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"sequence","role":"action","sType":"* ","C":[{"N":"param","name":"Q{}definition","slot":"0","sType":"* ","as":"* ","flags":"","line":"379","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"0","sType":"* "}]},{"N":"choose","sType":"* ","type":"item()*","line":"380","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"381","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"none"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"z"}]},{"N":"true"},{"N":"sequence","sType":"* ","C":[{"N":"valueOf","flags":"l","sType":"1NT ","line":"383","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"383","C":[{"N":"slash","op":"/","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root,NE nQ{http://www.w3.org/1999/xhtml}root]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root-step,NE nQ{http://www.w3.org/1999/xhtml}root-step]"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"384","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"choose","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"384","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root,NE nQ{http://www.w3.org/1999/xhtml}root]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root-alter,NE nQ{http://www.w3.org/1999/xhtml}root-alter]"}]}]},{"N":"str","val":"1"}]},{"N":"str","val":"#"},{"N":"true"},{"N":"choose","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root,NE nQ{http://www.w3.org/1999/xhtml}root]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root-alter,NE nQ{http://www.w3.org/1999/xhtml}root-alter]"}]}]},{"N":"str","val":"-1"}]},{"N":"str","val":"b"},{"N":"true"},{"N":"str","val":""}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"choose","sType":"? ","type":"item()*","line":"386","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"387","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"augmented"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"+"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"388","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"augmented-seventh"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"+7"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"389","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"diminished"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"dim"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"390","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"diminished-seventh"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"dim7"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"391","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"dominant"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"7"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"392","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"dominant-11th"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"11"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"393","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"dominant-13th"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"13"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"394","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"dominant-ninth"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"9"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"395","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"French"}]},{"N":"empty","sType":"0 "},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"396","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"German"}]},{"N":"empty","sType":"0 "},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"397","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"half-diminished"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"m7b5"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"398","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"Italian"}]},{"N":"empty","sType":"0 "},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"399","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"major"}]},{"N":"empty","sType":"0 "},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"400","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"major-11th"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"M11"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"401","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"major-13th"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"M13"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"402","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"major-minor"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"mM7"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"403","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"major-ninth"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"M9"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"404","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"major-seventh"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"M7"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"405","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"major-sixth"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"6"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"406","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"minor"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"m"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"407","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"minor-11th"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"m11"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"408","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"minor-13th"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"m13"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"409","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"minor-ninth"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"m9"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"410","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"minor-seventh"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"m7"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"411","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"minor-sixth"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"m6"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"412","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"Neapolitan"}]},{"N":"empty","sType":"0 "},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"413","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"other"}]},{"N":"empty","sType":"0 "},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"414","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"pedal"}]},{"N":"empty","sType":"0 "},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"415","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"power"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"5"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"416","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"suspended-fourth"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"sus"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"417","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"suspended-second"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"sus2"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"418","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"Tristan"}]},{"N":"empty","sType":"0 "},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"let","var":"Q{}sus","slot":"1","sType":"* ","line":"435","C":[{"N":"doc","sType":"1ND ","base":"file:///home/kratib/src/infojunkie/musicxml-midi/src/xsl/mma.xsl","role":"select","C":[{"N":"choose","sType":"? ","type":"item()*","line":"436","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"437","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]"},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-type,NE nQ{http://www.w3.org/1999/xhtml}degree-type]"}]},{"N":"str","val":"add"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"4"}]}]}]},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]"},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-type,NE nQ{http://www.w3.org/1999/xhtml}degree-type]"}]},{"N":"str","val":"subtract"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"3"}]}]}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"sus"}]},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"438","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]"},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-type,NE nQ{http://www.w3.org/1999/xhtml}degree-type]"}]},{"N":"str","val":"add"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"2"}]}]}]},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]"},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-type,NE nQ{http://www.w3.org/1999/xhtml}degree-type]"}]},{"N":"str","val":"subtract"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"3"}]}]}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"sus2"}]},{"N":"filter","sType":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"439","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]"},{"N":"and","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-type,NE nQ{http://www.w3.org/1999/xhtml}degree-type]"}]},{"N":"str","val":"alter"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"5"}]}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-alter,NE nQ{http://www.w3.org/1999/xhtml}degree-alter]"}]},{"N":"str","val":"1"}]}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"+"}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]},{"N":"sequence","sType":"* ","C":[{"N":"valueOf","flags":"l","sType":"1NT ","line":"443","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"varRef","sType":"*","name":"Q{}sus","slot":"1","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"443"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"forEach","sType":"*NT ","line":"444","C":[{"N":"filter","sType":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"444","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]"},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-type,NE nQ{http://www.w3.org/1999/xhtml}degree-type]"}]},{"N":"str","val":"subtract"}]},{"N":"fn","name":"not","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"3"}]},{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}sus","slot":"1"}]},{"N":"str","val":""}]}]}]}]}]},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"(omit"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"446","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"axis","sType":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"446"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":")"}]}]}]},{"N":"forEach","sType":"*NT ","line":"449","C":[{"N":"filter","sType":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"449","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]"},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-type,NE nQ{http://www.w3.org/1999/xhtml}degree-type]"}]},{"N":"str","val":"alter"}]},{"N":"fn","name":"not","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"5"}]},{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}sus","slot":"1"}]},{"N":"str","val":""}]}]}]}]}]},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","flags":"l","sType":"1NT ","line":"450","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"choose","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"450","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-alter,NE nQ{http://www.w3.org/1999/xhtml}degree-alter]"}]},{"N":"str","val":"1"}]},{"N":"str","val":"#"},{"N":"true"},{"N":"choose","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-alter,NE nQ{http://www.w3.org/1999/xhtml}degree-alter]"}]},{"N":"str","val":"-1"}]},{"N":"str","val":"b"},{"N":"true"},{"N":"str","val":""}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"451","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"axis","sType":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"451"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]}]},{"N":"forEach","sType":"*NT ","line":"453","C":[{"N":"filter","sType":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"453","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]"},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-type,NE nQ{http://www.w3.org/1999/xhtml}degree-type]"}]},{"N":"str","val":"add"}]},{"N":"fn","name":"not","C":[{"N":"and","C":[{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"4"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"2"}]}]},{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}sus","slot":"1"}]},{"N":"str","val":""}]}]}]}]}]},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","flags":"l","sType":"1NT ","line":"454","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"choose","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"454","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-alter,NE nQ{http://www.w3.org/1999/xhtml}degree-alter]"}]},{"N":"str","val":"1"}]},{"N":"str","val":"#"},{"N":"true"},{"N":"choose","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-alter,NE nQ{http://www.w3.org/1999/xhtml}degree-alter]"}]},{"N":"str","val":"-1"}]},{"N":"str","val":"b"},{"N":"true"},{"N":"str","val":"(add"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"455","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"choose","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"455","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"7"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-alter,NE nQ{http://www.w3.org/1999/xhtml}degree-alter]"}]},{"N":"str","val":"0"}]}]},{"N":"str","val":"M7"},{"N":"true"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"456","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"choose","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"456","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-alter,NE nQ{http://www.w3.org/1999/xhtml}degree-alter]"}]},{"N":"str","val":"1"}]},{"N":"str","val":""},{"N":"true"},{"N":"choose","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-alter,NE nQ{http://www.w3.org/1999/xhtml}degree-alter]"}]},{"N":"str","val":"-1"}]},{"N":"str","val":""},{"N":"true"},{"N":"str","val":")"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]}]},{"N":"choose","sType":"* ","line":"461","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass,NE nQ{http://www.w3.org/1999/xhtml}bass]","sType":"*NE u[NE nQ{}bass,NE nQ{http://www.w3.org/1999/xhtml}bass]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"461"},{"N":"choose","sType":"*NT ","type":"item()*","line":"462","C":[{"N":"varRef","name":"Q{}definition","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"463"},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"/"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"465","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"465","C":[{"N":"slash","op":"/","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass,NE nQ{http://www.w3.org/1999/xhtml}bass]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass-step,NE nQ{http://www.w3.org/1999/xhtml}bass-step]"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"466","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"choose","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"466","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass,NE nQ{http://www.w3.org/1999/xhtml}bass]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass-alter,NE nQ{http://www.w3.org/1999/xhtml}bass-alter]"}]}]},{"N":"str","val":"1"}]},{"N":"str","val":"#"},{"N":"true"},{"N":"choose","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass,NE nQ{http://www.w3.org/1999/xhtml}bass]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass-alter,NE nQ{http://www.w3.org/1999/xhtml}bass-alter]"}]}]},{"N":"str","val":"-1"}]},{"N":"str","val":"b"},{"N":"true"},{"N":"str","val":""}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]},{"N":"true"},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","flags":"d","C":[{"N":"str","sType":"1AS ","val":"<"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"470","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"ufCall","sType":"1AO","name":"Q{http://www.mellowood.ca/mma}mod","coId":"5","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"470","bSlot":"0","C":[{"N":"convert","to":"AO","flags":"","C":[{"N":"arith","op":"-","calc":"i-i","C":[{"N":"ufCall","name":"Q{http://www.mellowood.ca/mma}note","coId":"3","bSlot":"1","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass,NE nQ{http://www.w3.org/1999/xhtml}bass]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass-step,NE nQ{http://www.w3.org/1999/xhtml}bass-step]"}]},{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass,NE nQ{http://www.w3.org/1999/xhtml}bass]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass-alter,NE nQ{http://www.w3.org/1999/xhtml}bass-alter]"}]}]},{"N":"ufCall","name":"Q{http://www.mellowood.ca/mma}note","coId":"3","bSlot":"1","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root,NE nQ{http://www.w3.org/1999/xhtml}root]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root-step,NE nQ{http://www.w3.org/1999/xhtml}root-step]"}]},{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root,NE nQ{http://www.w3.org/1999/xhtml}root]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root-alter,NE nQ{http://www.w3.org/1999/xhtml}root-alter]"}]}]}]}]},{"N":"convert","to":"AO","flags":"","C":[{"N":"int","val":"-12"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]}]}]}]}]}]}]},{"N":"co","id":"20","binds":"11 6","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","name":"Q{}riff","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"6","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"481","module":"mma.xsl","expand-text":"false","match":"note","prio":"0","matches":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"let","var":"Q{}tieStop","slot":"0","sType":"* ","line":"499","role":"action","C":[{"N":"fn","name":"accumulator-after","sType":"AB ","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"499","C":[{"N":"str","val":"Q{}tieStop"}]},{"N":"let","var":"Q{}tieStart","slot":"1","sType":"* ","line":"500","C":[{"N":"ifCall","name":"Q{http://saxon.sf.net/}apply","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"500","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}tieStart"}]},{"N":"arrayBlock","C":[{"N":"str","val":"current"}]}]},{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"* ","line":"502","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"502","C":[{"N":"fn","name":"reverse","C":[{"N":"filter","C":[{"N":"axis","name":"preceding-sibling","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"0"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]}]}]},{"N":"sequence","sType":"* ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"Solo Riff "}]},{"N":"choose","sType":"? ","line":"504","C":[{"N":"varRef","name":"Q{}tieStop","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"504"},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"~"}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"? ","line":"507","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}grace,NE nQ{http://www.w3.org/1999/xhtml}grace]","sType":"*NE u[NE nQ{}grace,NE nQ{http://www.w3.org/1999/xhtml}grace]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"507"},{"N":"valueOf","sType":"1NT ","flags":"d","C":[{"N":"str","sType":"1AS ","val":""}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"511","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"511","C":[{"N":"or","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"},{"N":"varRef","name":"Q{}tieStop","slot":"0"}]}]},{"N":"let","var":"Q{}duration","slot":"2","sType":"* ","line":"512","C":[{"N":"doc","sType":"1ND ","base":"file:///home/kratib/src/infojunkie/musicxml-midi/src/xsl/mma.xsl","role":"select","C":[{"N":"choose","sType":"?NT ","type":"item()*","line":"513","C":[{"N":"varRef","name":"Q{}tieStart","slot":"1","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"514"},{"N":"valueOf","flags":"l","sType":"1NT ","line":"515","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"ufCall","sType":"1AO","name":"Q{http://www.mellowood.ca/mma}noteDuration","coId":"6","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"515","bSlot":"1","C":[{"N":"dot"},{"N":"convert","to":"AO","flags":"","C":[{"N":"int","val":"0"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"true"},{"N":"valueOf","flags":"l","sType":"1NT ","line":"518","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"axis","sType":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"518"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]}]},{"N":"sequence","sType":"? ","C":[{"N":"choose","sType":"? ","line":"522","C":[{"N":"ifCall","name":"Q{http://saxon.sf.net/}apply","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"522","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}hasMeasurePrintedAnyNote"}]},{"N":"arrayBlock","C":[{"N":"str","val":"previous"}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":";"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"523","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"fn","sType":"?A","name":"floor","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"523","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||floor","C":[{"N":"check","card":"?","diag":"0|0||floor","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||floor","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"int","val":"192"},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}duration","slot":"2"}]}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"t"}]}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"527","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"527","C":[{"N":"varRef","name":"Q{}tieStop","slot":"0"}]},{"N":"choose","sType":"* ","type":"item()*","line":"528","C":[{"N":"or","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"529","C":[{"N":"or","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}rest,NE nQ{http://www.w3.org/1999/xhtml}rest]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}cue,NE nQ{http://www.w3.org/1999/xhtml}cue]"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}notehead,NE nQ{http://www.w3.org/1999/xhtml}notehead]"}]},{"N":"str","val":"slash"}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"r"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]","sType":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"530"},{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"? ","line":"531","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"531"},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":","}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"532","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"fn","name":"lower-case","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"532","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"data","diag":"0|0||lower-case","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}step,NE nQ{http://www.w3.org/1999/xhtml}step]"}]}]}]}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","flags":"d","sType":"1NT ","line":"533","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"choose","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"533","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}alter,NE nQ{http://www.w3.org/1999/xhtml}alter]"}]}]},{"N":"str","val":"1"}]},{"N":"str","val":"#"},{"N":"true"},{"N":"choose","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}alter,NE nQ{http://www.w3.org/1999/xhtml}alter]"}]}]},{"N":"str","val":"-1"}]},{"N":"str","val":"&"},{"N":"true"},{"N":"str","val":"n"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"choose","sType":"* ","type":"item()*","line":"534","C":[{"N":"gc","op":">","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"535","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}octave,NE nQ{http://www.w3.org/1999/xhtml}octave]"}]}]},{"N":"int","val":"4"}]},{"N":"forEach","sType":"*NT ","line":"536","C":[{"N":"to","sType":"*ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"536","C":[{"N":"int","val":"1"},{"N":"treat","as":"ADI","diag":"1|1||to","C":[{"N":"check","card":"?","diag":"1|1||to","C":[{"N":"cvUntyped","to":"ADI","diag":"1|1||to","C":[{"N":"check","card":"?","diag":"1|1||to","C":[{"N":"data","diag":"1|1||to","C":[{"N":"cast","flags":"ae","as":"ADI","C":[{"N":"arith","op":"-","calc":"d-d","C":[{"N":"cvUntyped","to":"AO","diag":"1|0|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}octave,NE nQ{http://www.w3.org/1999/xhtml}octave]"}]}]}]}]},{"N":"convert","to":"AO","flags":"","C":[{"N":"int","val":"4"}]}]}]}]}]}]}]}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"+"}]}]},{"N":"gc","op":"<","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"538","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}octave,NE nQ{http://www.w3.org/1999/xhtml}octave]"}]}]},{"N":"int","val":"4"}]},{"N":"forEach","sType":"*NT ","line":"539","C":[{"N":"to","sType":"*ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"539","C":[{"N":"int","val":"1"},{"N":"treat","as":"ADI","diag":"1|1||to","C":[{"N":"check","card":"?","diag":"1|1||to","C":[{"N":"cvUntyped","to":"ADI","diag":"1|1||to","C":[{"N":"check","card":"?","diag":"1|1||to","C":[{"N":"data","diag":"1|1||to","C":[{"N":"cast","flags":"ae","as":"ADI","C":[{"N":"arith","op":"-","calc":"d-d","C":[{"N":"convert","to":"AO","flags":"","C":[{"N":"int","val":"4"}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}octave,NE nQ{http://www.w3.org/1999/xhtml}octave]"}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"-"}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"546","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"546","C":[{"N":"filter","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"0"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]}]},{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"? ","line":"547","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"547","C":[{"N":"ifCall","name":"Q{http://saxon.sf.net/}apply","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}hasMeasurePrintedAnyNote"}]},{"N":"arrayBlock","C":[{"N":"str","val":"current"}]}]}]},{"N":"valueOf","sType":"1NT ","flags":"d","C":[{"N":"str","sType":"1AS ","val":"<>"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"? ","line":"550","C":[{"N":"varRef","name":"Q{}tieStart","slot":"1","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"550"},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"~"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":";"}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]}]}]}]}]},{"N":"co","id":"21","binds":"1","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","name":"Q{}pitch","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"7","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"558","module":"mma.xsl","expand-text":"false","match":"note","prio":"0","matches":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"choose","sType":"* ","type":"item()*","role":"action","line":"559","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"560","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}alter,NE nQ{http://www.w3.org/1999/xhtml}alter]"}]}]},{"N":"empty","sType":"0 "},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"561","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"cast","flags":"ae","as":"AO","C":[{"N":"check","card":"?","diag":"0|0||xs:double","C":[{"N":"data","diag":"0|0||xs:double","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}alter,NE nQ{http://www.w3.org/1999/xhtml}alter]"}]}]}]}]}]},{"N":"fn","name":"round","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||round","C":[{"N":"check","card":"?","diag":"0|0||round","C":[{"N":"data","diag":"0|0||round","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}alter,NE nQ{http://www.w3.org/1999/xhtml}alter]"}]}]}]}]}]}]},{"N":"empty","sType":"0 "},{"N":"vc","op":"le","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"562","C":[{"N":"fn","name":"abs","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||abs","C":[{"N":"check","card":"?","diag":"0|0||abs","C":[{"N":"data","diag":"0|0||abs","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}alter,NE nQ{http://www.w3.org/1999/xhtml}alter]"}]}]}]}]}]},{"N":"int","val":"2"}]},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nSolo MidiNote PB "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"563","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"ufCall","sType":"1AO","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks","coId":"1","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"563","bSlot":"0","C":[{"N":"fn","name":"accumulator-before","C":[{"N":"str","val":"Q{}noteOnset"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":" "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"565","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"fn","sType":"?A m[AO,AD,AF]","name":"round","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"565","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||round","C":[{"N":"check","card":"?","diag":"0|0||round","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||round","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"int","val":"4096"},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"cast","flags":"ae","as":"AO","C":[{"N":"check","card":"?","diag":"0|0||xs:double","C":[{"N":"data","diag":"0|0||xs:double","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}alter,NE nQ{http://www.w3.org/1999/xhtml}alter]"}]}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nSolo MidiNote PB "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"566","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"ufCall","sType":"1AO","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks","coId":"1","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"566","bSlot":"0","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}noteOnset"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":" 0"}]}]},{"N":"true"},{"N":"message","sType":"0 ","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"sequence","role":"select","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"[PitchBend] Unhandled pitch/alter value of "}]},{"N":"valueOf","flags":"l","sType":"1NT ","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"13","C":[{"N":"slash","op":"/","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}alter,NE nQ{http://www.w3.org/1999/xhtml}alter]"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]},{"N":"str","sType":"1AS ","val":"false","role":"terminate"},{"N":"str","sType":"1AS ","val":"Q{http://www.w3.org/2005/xqt-errors}XTMM9000","role":"error"}]}]}]}]}]},{"N":"co","binds":"","id":"22","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","name":"Q{}tempo","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"8","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"578","module":"mma.xsl","expand-text":"false","match":"sound","prio":"0","matches":"NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]","sType":"1NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"sequence","role":"action","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nTempo "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"579","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"axis","sType":"*NA nQ{}tempo","name":"attribute","nodeTest":"*NA nQ{}tempo","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"579"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]}]}]}]},{"N":"co","id":"23","binds":"19","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","name":"Q{}declaration","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"11","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"619","module":"mma.xsl","expand-text":"false","match":"harmony","prio":"0","matches":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"choose","sType":"* ","role":"action","line":"620","C":[{"N":"let","var":"fn-current","slot":"199","xpath":"not(preceding::harmony[deep-equal(.,current())])","loc":"xsl:if/@test","line":"620","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","sType":"1AB","C":[{"N":"dot"},{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"fn","name":"reverse","C":[{"N":"filter","C":[{"N":"axis","name":"preceding","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"},{"N":"fn","name":"deep-equal","C":[{"N":"dot"},{"N":"varRef","name":"fn-current","slot":"199"},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]}]}]}]},{"N":"sequence","sType":"* ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\n@Slash "}]},{"N":"applyT","sType":"* ","line":"621","mode":"Q{}name","bSlot":"0","C":[{"N":"dot","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"621"},{"N":"withParam","name":"Q{}definition","slot":"0","sType":"1AB","C":[{"N":"true","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"622"}]}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]}]},{"N":"overridden"},{"N":"output","C":[{"N":"property","name":"Q{http://saxon.sf.net/}stylesheet-version","value":"30"},{"N":"property","name":"method","value":"text"},{"N":"property","name":"media-type","value":"text/plain"},{"N":"property","name":"omit-xml-declaration","value":"yes"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}divisions","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"18"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}divisions,NE nQ{http://www.w3.org/1999/xhtml}divisions]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}divisions,NE nQ{http://www.w3.org/1999/xhtml}divisions]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"axis","name":"child","nodeTest":"*NT","sType":"*NT","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"19"}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}tempo","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"120","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"22"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withPredicate","role":"match","sType":"1NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tempo"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tempo","sType":"*NA nQ{}tempo","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"23"}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}metronome","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"26"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.withPredicate","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]"},{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}direction-type,NE nQ{http://www.w3.org/1999/xhtml}direction-type]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}metronome,NE nQ{http://www.w3.org/1999/xhtml}metronome]"}]}]},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"dot","sType":"1NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"27"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}time","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"30"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"31"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}clef","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"34"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"35"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}key","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"38"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"39"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1FM","slots":"5","name":"Q{}measureIndex","as":"map(*)","ex:asJ":"FM k[1AS ] v[1ADI ] ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}_new","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"42"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"FM k[1AS ] v[1ADI ] ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"choose","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"43","C":[{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}contains","C":[{"N":"treat","as":"FM","diag":"0|0||map:contains","C":[{"N":"check","card":"1","diag":"0|0||map:contains","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:contains","C":[{"N":"attVal","name":"Q{}number"}]}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}put","C":[{"N":"treat","as":"FM","diag":"0|0||map:put","C":[{"N":"check","card":"1","diag":"0|0||map:put","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:put","C":[{"N":"attVal","name":"Q{}number"}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}get","C":[{"N":"treat","as":"FM","diag":"0|0||map:get","C":[{"N":"check","card":"1","diag":"0|0||map:get","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:get","C":[{"N":"attVal","name":"Q{}number"}]}]}]},{"N":"true"},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}put","C":[{"N":"treat","as":"FM","diag":"0|0||map:put","C":[{"N":"check","card":"1","diag":"0|0||map:put","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:put","C":[{"N":"attVal","name":"Q{}number"}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}size","C":[{"N":"treat","as":"FM","diag":"0|0||map:size","C":[{"N":"check","card":"1","diag":"0|0||map:size","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}measureDuration","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"46"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"47"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}forward,NE nQ{http://www.w3.org/1999/xhtml}forward]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}forward,NE nQ{http://www.w3.org/1999/xhtml}forward]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"48","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}backup,NE nQ{http://www.w3.org/1999/xhtml}backup]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}backup,NE nQ{http://www.w3.org/1999/xhtml}backup]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"-","calc":"a-a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"49","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"51","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"52"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"23"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"25","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}measureOnset","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"58"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"59"}]}]}]}]}]}]},{"N":"post","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"60","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}measureDuration"}]}]}]}]}]}]}]}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteDuration","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"63"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"65","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"66"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"33"},{"N":"filter","sType":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"67","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"stop"}]}]},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"35","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]},{"N":"true"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","sType":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"37"}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteOnset","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"73"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"74"}]}]}]}]},{"N":"post","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"76","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"77"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"43"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"45","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteBeat","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"83"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"84"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"86","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"87"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"51"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"53","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"arith","op":"div","calc":"d/d","C":[{"N":"cvUntyped","to":"AO","diag":"1|0|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}harmony","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"93"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"dot","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"94"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}harmonyPreviousDuration","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"97"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"98"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"99"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"101","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"102"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"62"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"64","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1AS","slots":"5","name":"Q{}groove","as":"xs:string","ex:asJ":"AS ","C":[{"N":"str","val":"","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"init","line":"36"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AS ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}other-play,NE nQ{http://www.w3.org/1999/xhtml}other-play]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.withPredicate","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}other-play,NE nQ{http://www.w3.org/1999/xhtml}other-play]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"groove"}]}]},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}play,NE nQ{http://www.w3.org/1999/xhtml}play]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"}]}]},{"N":"check","card":"1","sType":"1AS ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"treat","as":"AS ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"check","card":"1","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"cvUntyped","to":"AS","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"axis","name":"child","nodeTest":"*NT","sType":"*NT","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"37"}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","sType":"1FM k[AS] v[1AB]","binds":"11","slots":"5","name":"Q{}tieStart","as":"map(*)","ex:asJ":"FM k[1AS ] v[1AB ] ","C":[{"N":"map","sType":"1FM k[AS] v[1AB]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"init","line":"43","C":[{"N":"str","val":"current"},{"N":"false"},{"N":"str","val":"previous"},{"N":"false"}]},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"FM k[1AS ] v[1AB ] ","slots":"5","prio":"0.5","C":[{"N":"p.withPredicate","role":"match","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.withPredicate","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"0"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]}]},{"N":"map","sType":"1FM k[AS] v[*]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"47","C":[{"N":"str","val":"previous"},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}get","C":[{"N":"treat","as":"FM","diag":"0|0||map:get","C":[{"N":"check","card":"1","diag":"0|0||map:get","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"str","val":"current"}]},{"N":"str","val":"current"},{"N":"or","C":[{"N":"fn","name":"exists","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"start"}]}]}]},{"N":"fn","name":"exists","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}notations,NE nQ{http://www.w3.org/1999/xhtml}notations]"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tied,NE nQ{http://www.w3.org/1999/xhtml}tied]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"start"}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","sType":"1AB","binds":"11","slots":"5","name":"Q{}tieStop","as":"xs:boolean","ex:asJ":"AB ","C":[{"N":"false","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"init","line":"50"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AB ","slots":"5","prio":"0.5","C":[{"N":"p.withPredicate","role":"match","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.withPredicate","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"0"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]}]},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"53","C":[{"N":"or","C":[{"N":"fn","name":"exists","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"stop"}]}]}]},{"N":"fn","name":"exists","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}notations,NE nQ{http://www.w3.org/1999/xhtml}notations]"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tied,NE nQ{http://www.w3.org/1999/xhtml}tied]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"stop"}]}]}]}]}]},{"N":"ifCall","name":"Q{http://saxon.sf.net/}apply","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}tieStart"}]},{"N":"arrayBlock","C":[{"N":"str","val":"previous"}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","sType":"1FM k[AS] v[1AB]","binds":"11","slots":"5","name":"Q{}hasMeasurePrintedAnyNote","as":"map(*)","ex:asJ":"FM k[1AS ] v[1AB ] ","C":[{"N":"map","sType":"1FM k[AS] v[1AB]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"init","line":"59","C":[{"N":"str","val":"previous"},{"N":"false"},{"N":"str","val":"current"},{"N":"false"}]},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"FM k[1AS ] v[1AB ] ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"map","sType":"1FM k[AS] v[1AB]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"63","C":[{"N":"str","val":"previous"},{"N":"false"},{"N":"str","val":"current"},{"N":"false"}]}]},{"N":"accRule","valueType":"FM k[1AS ] v[1AB ] ","slots":"5","prio":"0.5","C":[{"N":"p.withPredicate","role":"match","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.withPredicate","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"0"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]}]},{"N":"map","sType":"1FM k[AS] v[*]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"67","C":[{"N":"str","val":"previous"},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}get","C":[{"N":"treat","as":"FM","diag":"0|0||map:get","C":[{"N":"check","card":"1","diag":"0|0||map:get","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"str","val":"current"}]},{"N":"str","val":"current"},{"N":"or","C":[{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}get","C":[{"N":"treat","as":"FM","diag":"0|0||map:get","C":[{"N":"check","card":"1","diag":"0|0||map:get","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"str","val":"current"}]},{"N":"fn","name":"not","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}tieStop"}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"decimalFormat"}],"Σ":"6f0e86a5"} \ No newline at end of file +{"N":"package","version":"30","packageVersion":"1","saxonVersion":"SaxonJS 2.6","target":"JS","targetVersion":"2","name":"TOP-LEVEL","relocatable":"true","buildDateTime":"2024-09-26T22:49:50.092-07:00","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"co","binds":"","id":"0","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs","as":"1AO ","slots":"203","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[1AO ,1AO ,1AO ] ","sType":"1F r[1AO ] a[1AO ,1AO ,1AO ] ","line":"114","C":[{"N":"arg","slot":"0","name":"Q{}time","as":"AO ","sType":"AO "},{"N":"arg","slot":"1","name":"Q{}divisions","as":"AO ","sType":"AO "},{"N":"arg","slot":"2","name":"Q{}tempo","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","role":"body","C":[{"N":"arith","op":"div","calc":"a/a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"body","line":"118","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}time","slot":"0"}]}]},{"N":"int","val":"60000"}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisions","slot":"1"}]}]}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}tempo","slot":"2"}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"1","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks","as":"1AO ","slots":"202","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[1AO ,1AO ] ","sType":"1F r[1AO ] a[1AO ,1AO ] ","line":"124","C":[{"N":"arg","slot":"0","name":"Q{}time","as":"AO ","sType":"AO "},{"N":"arg","slot":"1","name":"Q{}divisions","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","role":"body","C":[{"N":"fn","name":"round","sType":"?A m[AO,AD,AF]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"body","line":"127","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||round","C":[{"N":"check","card":"?","diag":"0|0||round","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||round","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}time","slot":"0"}]}]},{"N":"int","val":"192"}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisions","slot":"1"}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"2","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration","as":"1AO ","slots":"201","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[* ] ","sType":"1F r[1AO ] a[* ] ","line":"133","C":[{"N":"arg","slot":"0","name":"Q{}harmony","as":"* ","sType":"* "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","role":"body","C":[{"N":"let","var":"Q{}id","slot":"1","sType":"*A ","line":"135","role":"body","C":[{"N":"fn","name":"generate-id","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"135","C":[{"N":"treat","as":"N","diag":"0|0||generate-id","C":[{"N":"check","card":"?","diag":"0|0||generate-id","C":[{"N":"varRef","name":"Q{}harmony","slot":"0"}]}]}]},{"N":"fn","name":"sum","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"138","C":[{"N":"data","diag":"0|0||sum","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}harmony","slot":"0"}]},{"N":"filter","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"and","C":[{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"fn","name":"generate-id","C":[{"N":"fn","name":"reverse","C":[{"N":"first","C":[{"N":"axis","name":"preceding-sibling","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]}]}]},{"N":"data","diag":"1|1||gc","C":[{"N":"varRef","name":"Q{}id","slot":"1"}]}]}]}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"3","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.mellowood.ca/mma}note","as":"1ADI ","slots":"202","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","module":"mma.xsl","flags":"muu","sig":"1F r[1ADI ] a[* ,* ] ","sType":"1F r[1ADI ] a[* ,* ] ","line":"73","C":[{"N":"arg","slot":"0","name":"Q{}step","as":"* ","sType":"* "},{"N":"arg","slot":"1","name":"Q{}alter","as":"* ","sType":"* "},{"N":"check","card":"1","sType":"1ADI ","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}note()","role":"body","C":[{"N":"treat","as":"ADI ","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}note()","role":"body","C":[{"N":"check","card":"1","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}note()","role":"body","C":[{"N":"cvUntyped","to":"ADI","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}note()","role":"body","C":[{"N":"data","sType":"*A ","role":"body","C":[{"N":"choose","sType":"? ","type":"item()*","role":"body","line":"76","C":[{"N":"or","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"77","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"G"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"1"}]}]},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"A"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"-1"}]}]}]},{"N":"int","val":"-4","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"100"},{"N":"or","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"78","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"A"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"1"}]}]},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"B"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"-1"}]}]}]},{"N":"int","val":"-2","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"102"},{"N":"or","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"79","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"C"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"1"}]}]},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"D"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"-1"}]}]}]},{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"104"},{"N":"or","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"80","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"D"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"1"}]}]},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"E"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"-1"}]}]}]},{"N":"int","val":"3","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"106"},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"81","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"G"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"-1"}]}]},{"N":"int","val":"-6","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"108"},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"82","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"C"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"-1"}]}]},{"N":"int","val":"-1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"110"},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"83","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"B"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"1"}]}]},{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"112"},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"84","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"F"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"-1"}]}]},{"N":"int","val":"4","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"114"},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"85","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"E"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"1"}]}]},{"N":"int","val":"5","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"116"},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"86","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"F"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}alter","slot":"1"}]},{"N":"str","val":"1"}]}]},{"N":"int","val":"6","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"118"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"87","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"G"}]},{"N":"int","val":"-5","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"120"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"88","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"A"}]},{"N":"int","val":"-3","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"122"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"89","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"D"}]},{"N":"int","val":"2","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"124"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"90","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"B"}]},{"N":"int","val":"-1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"126"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"91","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"C"}]},{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"128"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"92","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"E"}]},{"N":"int","val":"4","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"130"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"93","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}step","slot":"0"}]},{"N":"str","val":"F"}]},{"N":"int","val":"5","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"132"},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"4","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.mellowood.ca/mma}groove","as":"* ","slots":"202","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","module":"mma.xsl","flags":"muu","sig":"1F r[* ] a[* ,* ] ","sType":"1F r[* ] a[* ,* ] ","line":"100","C":[{"N":"arg","slot":"0","name":"Q{}groove","as":"* ","sType":"* "},{"N":"arg","slot":"1","name":"Q{}time","as":"* ","sType":"* "},{"N":"choose","sType":"? ","type":"item()*","role":"body","line":"107","C":[{"N":"or","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"108","C":[{"N":"fn","name":"contains","C":[{"N":"fn","name":"lower-case","C":[{"N":"treat","as":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"data","diag":"0|0||lower-case","C":[{"N":"varRef","name":"Q{}groove","slot":"0"}]}]}]}]}]}]},{"N":"str","val":"swing"},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]},{"N":"fn","name":"contains","C":[{"N":"fn","name":"lower-case","C":[{"N":"treat","as":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"data","diag":"0|0||lower-case","C":[{"N":"varRef","name":"Q{}groove","slot":"0"}]}]}]}]}]}]},{"N":"str","val":"jazz"},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]},{"N":"choose","sType":"?AS ","type":"item()*","line":"109","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"110","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}time","slot":"1"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}beats,NE nQ{http://www.w3.org/1999/xhtml}beats]"}]}]}]},{"N":"int","val":"5"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}time","slot":"1"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}beat-type,NE nQ{http://www.w3.org/1999/xhtml}beat-type]"}]}]}]},{"N":"int","val":"4"}]}]},{"N":"str","val":"Jazz54","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"140"},{"N":"true"},{"N":"str","val":"Swing","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"142"}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]},{"N":"co","binds":"","id":"5","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.mellowood.ca/mma}mod","as":"1AO ","slots":"202","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","module":"mma.xsl","flags":"muu","sig":"1F r[1AO ] a[1AO ,1AO ] ","sType":"1F r[1AO ] a[1AO ,1AO ] ","line":"122","C":[{"N":"arg","slot":"0","name":"Q{}dividend","as":"AO ","sType":"AO "},{"N":"arg","slot":"1","name":"Q{}divisor","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}mod()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}mod()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}mod()","role":"body","C":[{"N":"arith","op":"-","calc":"a-a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"body","line":"125","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}dividend","slot":"0"}]}]},{"N":"arith","op":"*","calc":"a*a","C":[{"N":"fn","name":"floor","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||floor","C":[{"N":"check","card":"?","diag":"0|0||floor","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||floor","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}dividend","slot":"0"}]}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisor","slot":"1"}]}]}]}]}]}]}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisor","slot":"1"}]}]}]}]}]}]}]}]}]},{"N":"co","id":"6","vis":"PRIVATE","ex:uniform":"true","binds":"6 11","C":[{"N":"function","name":"Q{http://www.mellowood.ca/mma}noteDuration","as":"1AO ","slots":"202","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","module":"mma.xsl","flags":"muu","sig":"1F r[1AO ] a[* ,1AO ] ","sType":"1F r[1AO ] a[* ,1AO ] ","line":"131","C":[{"N":"arg","slot":"0","name":"Q{}note","as":"* ","sType":"* "},{"N":"arg","slot":"1","name":"Q{}duration","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}noteDuration()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}noteDuration()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.mellowood.ca/mma}noteDuration()","role":"body","C":[{"N":"let","var":"Q{}tie","slot":"2","sType":"*A ","line":"134","role":"body","C":[{"N":"docOrder","sType":"*NE u[NE u[NE nQ{}tied,NE nQ{http://www.w3.org/1999/xhtml}tied],NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]]","role":"select","line":"134","C":[{"N":"choose","sType":"*NE u[NE u[NE nQ{}tied,NE nQ{http://www.w3.org/1999/xhtml}tied],NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}note","slot":"0"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}cue,NE nQ{http://www.w3.org/1999/xhtml}cue]"}]}]},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}note","slot":"0"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}notations,NE nQ{http://www.w3.org/1999/xhtml}notations]"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tied,NE nQ{http://www.w3.org/1999/xhtml}tied]"}]}]},{"N":"true"},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}note","slot":"0"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]"}]}]}]}]},{"N":"choose","sType":"?A ","type":"item()*","line":"135","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"136","C":[{"N":"filter","C":[{"N":"varRef","name":"Q{}tie","slot":"2"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"stop"}]}]},{"N":"fn","name":"not","C":[{"N":"filter","C":[{"N":"varRef","name":"Q{}tie","slot":"2"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"start"}]}]}]}]},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"154","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}duration","slot":"1"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}note","slot":"0"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]},{"N":"true"},{"N":"ufCall","name":"Q{http://www.mellowood.ca/mma}noteDuration","coId":"6","sType":"1AO","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"144","bSlot":"0","C":[{"N":"choose","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}note","slot":"0"}]},{"N":"filter","C":[{"N":"filter","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"1"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]}]}]}]},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}note","slot":"0"}]},{"N":"first","C":[{"N":"filter","C":[{"N":"filter","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"1"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]}]}]}]}]},{"N":"true"},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}note","slot":"0"}]},{"N":"axis","name":"parent","nodeTest":"?N"}]},{"N":"first","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"first","C":[{"N":"filter","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"1"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]}]}]}]}]}]},{"N":"check","card":"1","diag":"0|1||mma:noteDuration","C":[{"N":"convert","to":"AO","flags":"","C":[{"N":"cvUntyped","to":"AO","diag":"0|1||mma:noteDuration","C":[{"N":"arith","op":"+","calc":"a+a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}duration","slot":"1"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}note","slot":"0"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"7","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}useSef","sType":"AB ","slots":"200","module":"mma.xsl","as":"AB ","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"false","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"25"}]}]},{"N":"co","binds":"","id":"8","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}chordVolume","sType":"* ","slots":"200","module":"mma.xsl","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"int","val":"50","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"26"}]}]},{"N":"co","binds":"","id":"9","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}melodyInstrument","sType":"* ","slots":"200","module":"mma.xsl","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"str","val":"TenorSax","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"27"}]}]},{"N":"co","binds":"","id":"10","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}chordInstrument","sType":"* ","slots":"200","module":"mma.xsl","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"str","val":"Piano1","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"28"}]}]},{"N":"co","binds":"","id":"11","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}melodyVoice","sType":"* ","slots":"200","module":"mma.xsl","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"29"}]}]},{"N":"co","binds":"","id":"12","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}globalGroove","sType":"* ","slots":"200","module":"mma.xsl","as":"","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"str","val":"","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"30"}]}]},{"N":"co","binds":"","id":"13","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}renumberMeasures","sType":"AB ","slots":"200","module":"mma.xsl","as":"AB ","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"false","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"31"}]}]},{"N":"co","id":"14","vis":"PUBLIC","ex:uniform":"true","binds":"13","C":[{"N":"globalVariable","name":"Q{}stylesheetParams","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","module":"mma.xsl","slots":"200","sType":"1FM","C":[{"N":"map","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"154","C":[{"N":"fn","name":"QName","C":[{"N":"str","val":""},{"N":"str","val":"renumberMeasures"}]},{"N":"gVarRef","name":"Q{}renumberMeasures","bSlot":"0"}]}]}]},{"N":"co","id":"15","vis":"PUBLIC","ex:uniform":"true","binds":"7 14","C":[{"N":"globalVariable","name":"Q{}unrolled","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","module":"mma.xsl","slots":"200","sType":"?ND ","C":[{"N":"doc","sType":"1ND ","base":"file:///home/kratib/src/infojunkie/musicxml-midi/src/xsl/mma.xsl","role":"select","C":[{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"* ","line":"156","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"156","C":[{"N":"gVarRef","name":"Q{}useSef","bSlot":"0"}]},{"N":"lookup","op":"?","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"161","C":[{"N":"fn","name":"transform","C":[{"N":"map","C":[{"N":"str","val":"source-node"},{"N":"root"},{"N":"str","val":"stylesheet-node"},{"N":"fn","name":"doc","C":[{"N":"str","val":"unroll.xsl"}]},{"N":"str","val":"stylesheet-params"},{"N":"gVarRef","name":"Q{}stylesheetParams","bSlot":"1"}]}]},{"N":"str","val":"output"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"163","C":[{"N":"gVarRef","name":"Q{}useSef","bSlot":"0","sType":"AB ","line":"163"},{"N":"lookup","op":"?","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"168","C":[{"N":"fn","name":"transform","C":[{"N":"map","C":[{"N":"str","val":"source-node"},{"N":"root"},{"N":"str","val":"package-text"},{"N":"fn","name":"unparsed-text","C":[{"N":"str","val":"unroll.sef.json"}]},{"N":"str","val":"stylesheet-params"},{"N":"gVarRef","name":"Q{}stylesheetParams","bSlot":"1"}]}]},{"N":"str","val":"output"}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]}]}]},{"N":"co","id":"16","binds":"16 22 12 4 18 0 20 11 21 17 10 9 23 15","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"10","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"595","module":"mma.xsl","expand-text":"false","match":"key","prio":"0","matches":"NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"sequence","role":"action","sType":"* ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nKeySig "}]},{"N":"choose","sType":"* ","type":"item()*","line":"596","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}fifths,NE nQ{http://www.w3.org/1999/xhtml}fifths]","sType":"*NE u[NE nQ{}fifths,NE nQ{http://www.w3.org/1999/xhtml}fifths]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"597"},{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"598","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"599","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}fifths,NE nQ{http://www.w3.org/1999/xhtml}fifths]"}]},{"N":"int","val":"0"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"0"}]},{"N":"gc","op":"<","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"600","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}fifths,NE nQ{http://www.w3.org/1999/xhtml}fifths]"}]},{"N":"int","val":"0"}]},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","flags":"l","sType":"1NT ","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"arith","sType":"1AO","op":"*","calc":"d*d","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"7","C":[{"N":"convert","to":"AO","flags":"","C":[{"N":"int","val":"-1"}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}fifths,NE nQ{http://www.w3.org/1999/xhtml}fifths]"}]}]}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"b"}]}]},{"N":"gc","op":">","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"601","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}fifths,NE nQ{http://www.w3.org/1999/xhtml}fifths]"}]},{"N":"int","val":"0"}]},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","flags":"l","sType":"1NT ","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"axis","sType":"*NE u[NE nQ{}fifths,NE nQ{http://www.w3.org/1999/xhtml}fifths]","name":"child","nodeTest":"*NE u[NE nQ{}fifths,NE nQ{http://www.w3.org/1999/xhtml}fifths]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"9"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"#"}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"? ","line":"603","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}mode,NE nQ{http://www.w3.org/1999/xhtml}mode]","sType":"*NE u[NE nQ{}mode,NE nQ{http://www.w3.org/1999/xhtml}mode]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"603"},{"N":"choose","sType":"? ","type":"item()*","line":"604","C":[{"N":"compareToString","op":"eq","val":"none","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"605","C":[{"N":"fn","name":"lower-case","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"data","diag":"0|0||lower-case","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}mode,NE nQ{http://www.w3.org/1999/xhtml}mode]"}]}]}]}]}]},{"N":"empty","sType":"0 "},{"N":"compareToString","op":"eq","val":"major","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"606","C":[{"N":"fn","name":"lower-case","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"data","diag":"0|0||lower-case","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}mode,NE nQ{http://www.w3.org/1999/xhtml}mode]"}]}]}]}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":" Major"}]},{"N":"compareToString","op":"eq","val":"minor","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"607","C":[{"N":"fn","name":"lower-case","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"data","diag":"0|0||lower-case","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}mode,NE nQ{http://www.w3.org/1999/xhtml}mode]"}]}]}]}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":" Minor"}]},{"N":"true"},{"N":"message","sType":"0 ","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"sequence","role":"select","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"[KeySig] Unhandled mode "}]},{"N":"valueOf","flags":"l","sType":"1NT ","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"axis","sType":"*NE u[NE nQ{}mode,NE nQ{http://www.w3.org/1999/xhtml}mode]","name":"child","nodeTest":"*NE u[NE nQ{}mode,NE nQ{http://www.w3.org/1999/xhtml}mode]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"17"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]},{"N":"str","sType":"1AS ","val":"false","role":"terminate"},{"N":"str","sType":"1AS ","val":"Q{http://www.w3.org/2005/xqt-errors}XTMM9000","role":"error"}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]},{"N":"true"},{"N":"sequence","sType":"* ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"0"}]},{"N":"message","sType":"0 ","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"sequence","role":"select","sType":"*N ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"[KeySig] Unhandled key signature "}]},{"N":"copyOf","flags":"c","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=http://ns.saxonica.com/xslt/export","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","C":[{"N":"dot","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"20"}]}]},{"N":"str","sType":"1AS ","val":"false","role":"terminate"},{"N":"str","sType":"1AS ","val":"Q{http://www.w3.org/2005/xqt-errors}XTMM9000","role":"error"}]}]}]}]}]},{"N":"templateRule","rank":"1","prec":"0","seq":"9","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"587","module":"mma.xsl","expand-text":"false","match":"time","prio":"0","matches":"NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","sType":"1NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"sequence","role":"action","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nTime "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"588","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"arith","sType":"?AO","op":"div","calc":"d/d","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"588","C":[{"N":"arith","op":"*","calc":"d*d","C":[{"N":"cvUntyped","to":"AO","diag":"1|0|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}beats,NE nQ{http://www.w3.org/1999/xhtml}beats]"}]}]}]},{"N":"convert","to":"AO","flags":"","C":[{"N":"int","val":"4"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}beat-type,NE nQ{http://www.w3.org/1999/xhtml}beat-type]"}]}]}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nTimeSig "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"589","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"axis","sType":"*NE u[NE nQ{}beats,NE nQ{http://www.w3.org/1999/xhtml}beats]","name":"child","nodeTest":"*NE u[NE nQ{}beats,NE nQ{http://www.w3.org/1999/xhtml}beats]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"589"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"/"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"589","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"axis","sType":"*NE u[NE nQ{}beat-type,NE nQ{http://www.w3.org/1999/xhtml}beat-type]","name":"child","nodeTest":"*NE u[NE nQ{}beat-type,NE nQ{http://www.w3.org/1999/xhtml}beat-type]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"589"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]}]},{"N":"templateRule","rank":"2","prec":"0","seq":"2","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"235","module":"mma.xsl","expand-text":"false","match":"measure","prio":"0","matches":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"sequence","role":"action","sType":"* ","C":[{"N":"applyT","sType":"* ","line":"239","mode":"#unnamed","bSlot":"0","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"239","C":[{"N":"slash","op":"/","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]"}]}]}]},{"N":"applyT","sType":"* ","line":"244","mode":"#unnamed","bSlot":"0","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"244","C":[{"N":"slash","op":"/","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]"}]}]}]},{"N":"applyT","sType":"* ","line":"249","mode":"Q{}tempo","bSlot":"1","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"249","C":[{"N":"slash","op":"/","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tempo"}]}]}]}]},{"N":"let","var":"Q{}groove","slot":"0","sType":"* ","line":"254","C":[{"N":"doc","sType":"1ND ","base":"file:///home/kratib/src/infojunkie/musicxml-midi/src/xsl/mma.xsl","role":"select","C":[{"N":"choose","sType":"? ","type":"item()*","line":"255","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"256","C":[{"N":"attVal","name":"Q{}number"},{"N":"str","val":"0"}]},{"N":"empty","sType":"0 "},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"257","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}number"},{"N":"str","val":"1"}]},{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"gVarRef","name":"Q{}globalGroove","bSlot":"2"}]},{"N":"str","val":""}]}]},{"N":"compareToString","op":"ne","val":"default","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","C":[{"N":"fn","name":"lower-case","C":[{"N":"treat","as":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"data","diag":"0|0||lower-case","C":[{"N":"gVarRef","name":"Q{}globalGroove","bSlot":"2"}]}]}]}]}]}]}]}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"258","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"gVarRef","sType":"* ","name":"Q{}globalGroove","bSlot":"2","role":"select","line":"258"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"vc","op":"eq","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"260","C":[{"N":"fn","name":"accumulator-before","C":[{"N":"str","val":"Q{}groove"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}groove"}]}]},{"N":"empty","sType":"0 "},{"N":"true"},{"N":"valueOf","flags":"l","sType":"1NT ","line":"265","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"ufCall","sType":"*","name":"Q{http://www.mellowood.ca/mma}groove","coId":"4","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"265","bSlot":"3","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}play,NE nQ{http://www.w3.org/1999/xhtml}play]"}]},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}other-play,NE nQ{http://www.w3.org/1999/xhtml}other-play]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"groove"}]}]}]},{"N":"axis","name":"child","nodeTest":"*NT"}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}time"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]}]},{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"269","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"270","C":[{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}groove","slot":"0"}]},{"N":"str","val":""}]},{"N":"compareToString","op":"ne","val":"none","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","C":[{"N":"fn","name":"lower-case","C":[{"N":"treat","as":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"data","diag":"0|0||lower-case","C":[{"N":"varRef","name":"Q{}groove","slot":"0"}]}]}]}]}]}]}]}]},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nGroove "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"271","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"varRef","sType":"*","name":"Q{}groove","slot":"0","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"271"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nMidiMark Groove:"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"272","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"varRef","sType":"*","name":"Q{}groove","slot":"0","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"272"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"274","C":[{"N":"and","C":[{"N":"compareToString","op":"ne","val":"none","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","C":[{"N":"fn","name":"lower-case","C":[{"N":"treat","as":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"data","diag":"0|0||lower-case","C":[{"N":"varRef","name":"Q{}groove","slot":"0"}]}]}]}]}]}]}]},{"N":"compareToString","op":"ne","val":"","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}groove"}]}]}]},{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"ufCall","name":"Q{http://www.mellowood.ca/mma}groove","coId":"4","bSlot":"3","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}groove"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}time"}]}]}]},{"N":"str","val":""}]}]},{"N":"empty","sType":"0 "},{"N":"true"},{"N":"sequence","sType":"* ","C":[{"N":"applyT","sType":"* ","line":"276","mode":"Q{}sequence","bSlot":"4","C":[{"N":"first","sType":"?NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"276","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]},{"N":"withParam","name":"Q{}start","slot":"0","sType":"1ADI","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"277"}]}]},{"N":"choose","sType":"* ","line":"279","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"279","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]},{"N":"applyT","sType":"* ","line":"283","mode":"Q{}sequence","bSlot":"4","C":[{"N":"docOrder","sType":"*NE ","role":"select","line":"283","C":[{"N":"fn","name":"accumulator-after","sType":"*NE ","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"str","val":"Q{}harmony"}]}]},{"N":"withParam","name":"Q{}start","slot":"0","sType":"1ADI","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"284"}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\n"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"MidiMark Measure:"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"294","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"ifCall","sType":"*","name":"Q{http://saxon.sf.net/}apply","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"294","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}measureIndex"}]},{"N":"arrayBlock","C":[{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}number"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":":"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"300","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"ufCall","sType":"1AO","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs","coId":"0","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"300","bSlot":"5","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}measureDuration"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}tempo"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\n"}]},{"N":"applyT","sType":"* ","line":"306","mode":"Q{}riff","bSlot":"6","C":[{"N":"filter","sType":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"306","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"7"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]}]},{"N":"applyT","sType":"* ","line":"307","mode":"Q{}pitch","bSlot":"8","C":[{"N":"filter","sType":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"307","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"7"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\n"}]},{"N":"applyT","sType":"* ","line":"313","mode":"Q{}onset","bSlot":"9","C":[{"N":"first","sType":"?NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"313","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]},{"N":"withParam","name":"Q{}start","slot":"0","sType":"1ADI","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"314"}]}]},{"N":"choose","sType":"* ","line":"316","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"316","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]},{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"? ","line":"320","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"320","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}harmony"}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":" z"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"applyT","sType":"* ","line":"321","mode":"Q{}onset","bSlot":"9","C":[{"N":"docOrder","sType":"*NE ","role":"select","line":"321","C":[{"N":"fn","name":"accumulator-after","sType":"*NE ","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"str","val":"Q{}harmony"}]}]},{"N":"withParam","name":"Q{}start","slot":"0","sType":"1ADI","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"322"}]}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"330","C":[{"N":"docOrder","sType":"*NE","line":"330","C":[{"N":"docOrder","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"slash","op":"/","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}time"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}beat-type,NE nQ{http://www.w3.org/1999/xhtml}beat-type]"}]}]}]},{"N":"let","var":"Q{}durationDifference","slot":"1","sType":"* ","line":"331","C":[{"N":"fn","name":"round","sType":"?A m[AO,AD,AF]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"331","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||round","C":[{"N":"check","card":"?","diag":"0|0||round","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||round","C":[{"N":"arith","op":"-","calc":"a-a","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"fn","name":"sum","C":[{"N":"data","diag":"0|0||sum","C":[{"N":"slash","op":"/","C":[{"N":"filter","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"7"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]},{"N":"arith","op":"div","calc":"d/d","C":[{"N":"arith","op":"*","calc":"d*d","C":[{"N":"cvUntyped","to":"AO","diag":"1|0|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}time"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}beats,NE nQ{http://www.w3.org/1999/xhtml}beats]"}]}]}]}]}]},{"N":"convert","to":"AO","flags":"","C":[{"N":"int","val":"4"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}time"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}beat-type,NE nQ{http://www.w3.org/1999/xhtml}beat-type]"}]}]}]}]}]}]}]}]}]}]}]},{"N":"choose","sType":"* ","line":"332","C":[{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"332","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}durationDifference","slot":"1"}]},{"N":"int","val":"0"}]},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nBeatAdjust "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"333","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"varRef","sType":"*","name":"Q{}durationDifference","slot":"1","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"333"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]}]}]},{"N":"templateRule","rank":"3","prec":"0","seq":"1","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"186","module":"mma.xsl","expand-text":"false","match":"score-partwise","prio":"0","matches":"NE u[NE nQ{}score-partwise,NE nQ{http://www.w3.org/1999/xhtml}score-partwise]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}score-partwise,NE nQ{http://www.w3.org/1999/xhtml}score-partwise]","sType":"1NE u[NE nQ{}score-partwise,NE nQ{http://www.w3.org/1999/xhtml}score-partwise]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"sequence","role":"action","sType":"* ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nMidiText Generated by github.com/infojunkie/musicxml-midi\n\nBegin Chord-Custom\n Voice "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"191","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"gVarRef","sType":"* ","name":"Q{}chordInstrument","bSlot":"10","role":"select","line":"191"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\n Octave 5\n Articulate 80\n Volume f\nEnd\n\nSolo Voice "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"197","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"gVarRef","sType":"* ","name":"Q{}melodyInstrument","bSlot":"11","role":"select","line":"197"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\n\nDefChord mb6 (0, 3, 7, 8) (0, 2, 3, 5, 7, 8, 10)\nDefChord 7(add6) (0, 4, 7, 9, 10) (0, 2, 4, 5, 7, 9, 10)\nDefChord +(addM7)(add9) (0, 4, 8, 11, 14) (0, 2, 4, 5, 8, 9, 11)\nDefChord +7(add9) (0, 4, 8, 10, 14) (0, 2, 4, 5, 8, 9, 10)\nDefChord 7+#9 (0, 4, 8, 10, 15) (0, 3, 4, 5, 8, 9, 10)\nDefChord 7+b9 (0, 4, 8, 10, 13) (0, 1, 4, 5, 8, 9, 10)\nDefChord 7b9#9 (0, 4, 7, 10, 13, 15) (0, 1, 3, 4, 5, 7, 10)\nDefChord 7b5b9#9#5 (0, 4, 6, 8, 10, 13, 15) (0, 1, 3, 5, 6, 8, 10)\nDefChord 7susb13 (0, 5, 10, 20) (0, 2, 5, 5, 8, 9, 10)\nDefChord 7(add3)(add4) (0, 4, 5, 7, 10) (0, 2, 4, 5, 7, 9, 10)\nDefChord M7+ (0, 4, 8, 11) (0, 2, 4, 5, 8, 9, 11)\nDefChord dimb13 (0, 3, 6, 9, 8) (0, 2, 3, 5, 6, 8, 9)\nDefChord 13(omit3) (0, 7, 10, 21) (0, 2, 5, 5, 7, 9, 10)\nDefChord m(add2) (0, 2, 3, 7) (0, 2, 3, 5, 7, 8, 8)\nDefChord m7+#9 (0, 3, 8, 10, 15) (0, 3, 3, 5, 8, 8, 10)\nDefChord m7+b9 (0, 3, 8, 10, 13) (0, 1, 3, 5, 8, 8, 10)\nDefChord m7+b9#11 (0, 3, 8, 10, 13, 18) (0, 1, 3, 6, 8, 9, 10)\nDefChord m7b5(add9)(add11) (0, 3, 6, 10, 14, 17) (0, 2, 3, 5, 6, 9, 10)\nDefChord m7+ (0, 3, 7, 11) (0, 2, 3, 5, 7, 8, 11)\nDefChord mM7b5 (0, 3, 6, 11) (0, 2, 3, 5, 6, 8, 11)\nDefChord (omit3)(add9) (0, 0, 7, 14) (0, 2, 4, 5, 7, 9, 10)\nDefChord sus#9 (0, 5, 7, 15) (0, 2, 5, 5, 7, 9, 11)\nDefChord susb9 (0, 5, 7, 13) (0, 2, 5, 5, 7, 9, 11)\n\nPlugin Slash"}]},{"N":"applyT","sType":"* ","line":"224","mode":"Q{}declaration","bSlot":"12","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"224","C":[{"N":"docOrder","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"root"},{"N":"axis","name":"descendant-or-self","nodeTest":"*N"}]},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass,NE nQ{http://www.w3.org/1999/xhtml}bass]"}]}]}]}]},{"N":"withParam","name":"Q{}definition","slot":"0","sType":"1AB","C":[{"N":"true","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"225"}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\n"}]},{"N":"applyT","sType":"* ","line":"229","mode":"#unnamed","bSlot":"0","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"229","C":[{"N":"slash","op":"/","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}part,NE nQ{http://www.w3.org/1999/xhtml}part]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]}]}]}]},{"N":"templateRule","rank":"4","prec":"0","seq":"0","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"177","module":"mma.xsl","expand-text":"false","match":"/","prio":"-0.5","matches":"ND","C":[{"N":"p.nodeTest","role":"match","test":"ND","sType":"1ND","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"applyT","sType":"* ","line":"178","mode":"#unnamed","role":"action","bSlot":"0","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"178","C":[{"N":"slash","op":"/","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"gVarRef","name":"Q{}unrolled","bSlot":"13"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}score-partwise,NE nQ{http://www.w3.org/1999/xhtml}score-partwise]"}]}]}]}]}]}]},{"N":"co","id":"17","binds":"19 17 2","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","name":"Q{}onset","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"3","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"341","module":"mma.xsl","expand-text":"false","match":"harmony","prio":"0","matches":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"sequence","role":"action","sType":"* ","C":[{"N":"param","name":"Q{}start","slot":"0","sType":"* ","as":"* ","flags":"","line":"342","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"0","sType":"* "}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":" "}]},{"N":"applyT","sType":"* ","line":"344","mode":"Q{}name","bSlot":"0","C":[{"N":"dot","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"344"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"@"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"345","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"varRef","sType":"*","name":"Q{}start","slot":"0","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"345"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"applyT","sType":"* ","line":"346","mode":"Q{}onset","bSlot":"1","C":[{"N":"first","sType":"?NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"346","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]},{"N":"withParam","name":"Q{}start","slot":"0","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"347","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}start","slot":"0"}]}]},{"N":"arith","op":"div","calc":"d/d","C":[{"N":"ufCall","name":"Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration","coId":"2","bSlot":"2","C":[{"N":"dot"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]}]}]}]}]}]},{"N":"co","id":"18","binds":"2 1 8 18","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","name":"Q{}sequence","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"4","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"354","module":"mma.xsl","expand-text":"false","match":"harmony","prio":"0","matches":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"sequence","role":"action","sType":"* ","C":[{"N":"param","name":"Q{}start","slot":"0","sType":"* ","as":"* ","flags":"","line":"355","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"0","sType":"* "}]},{"N":"choose","sType":"? ","line":"356","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"356","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}start","slot":"0"}]},{"N":"int","val":"1"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nChord-Custom Sequence { "}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"358","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"varRef","sType":"*","name":"Q{}start","slot":"0","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"358"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":" "}]},{"N":"let","var":"Q{}duration","slot":"1","sType":"* ","line":"364","C":[{"N":"doc","sType":"1ND ","base":"file:///home/kratib/src/infojunkie/musicxml-midi/src/xsl/mma.xsl","role":"select","C":[{"N":"valueOf","flags":"l","sType":"1NT ","line":"365","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"ufCall","sType":"1AO","name":"Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration","coId":"2","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"365","bSlot":"0","C":[{"N":"dot"}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]},{"N":"sequence","sType":"* ","C":[{"N":"valueOf","flags":"l","sType":"1NT ","line":"367","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"ufCall","sType":"1AO","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks","coId":"1","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"367","bSlot":"1","C":[{"N":"convert","to":"AO","flags":"","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||musicxml:timeToMIDITicks","C":[{"N":"check","card":"1","diag":"0|0||musicxml:timeToMIDITicks","C":[{"N":"data","diag":"0|0||musicxml:timeToMIDITicks","C":[{"N":"varRef","name":"Q{}duration","slot":"1"}]}]}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"t "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"368","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"gVarRef","sType":"* ","name":"Q{}chordVolume","bSlot":"2","role":"select","line":"368"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"; "}]},{"N":"applyT","sType":"* ","line":"369","mode":"Q{}sequence","bSlot":"3","C":[{"N":"first","sType":"?NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"369","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]},{"N":"withParam","name":"Q{}start","slot":"0","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"370","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}start","slot":"0"}]}]},{"N":"arith","op":"div","calc":"a/a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}duration","slot":"1"}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]}]},{"N":"choose","sType":"? ","line":"372","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"372","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"}"}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]}]}]}]}]},{"N":"co","id":"19","binds":"5 3","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","name":"Q{}name","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"5","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"378","module":"mma.xsl","expand-text":"false","match":"harmony","prio":"0","matches":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"sequence","role":"action","sType":"* ","C":[{"N":"param","name":"Q{}definition","slot":"0","sType":"* ","as":"* ","flags":"","line":"379","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"0","sType":"* "}]},{"N":"choose","sType":"* ","type":"item()*","line":"380","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"381","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"none"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"z"}]},{"N":"true"},{"N":"sequence","sType":"* ","C":[{"N":"valueOf","flags":"l","sType":"1NT ","line":"383","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"383","C":[{"N":"slash","op":"/","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root,NE nQ{http://www.w3.org/1999/xhtml}root]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root-step,NE nQ{http://www.w3.org/1999/xhtml}root-step]"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"384","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"choose","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"384","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root,NE nQ{http://www.w3.org/1999/xhtml}root]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root-alter,NE nQ{http://www.w3.org/1999/xhtml}root-alter]"}]}]},{"N":"str","val":"1"}]},{"N":"str","val":"#"},{"N":"true"},{"N":"choose","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root,NE nQ{http://www.w3.org/1999/xhtml}root]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root-alter,NE nQ{http://www.w3.org/1999/xhtml}root-alter]"}]}]},{"N":"str","val":"-1"}]},{"N":"str","val":"b"},{"N":"true"},{"N":"str","val":""}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"choose","sType":"? ","type":"item()*","line":"386","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"387","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"augmented"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"+"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"388","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"augmented-seventh"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"+7"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"389","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"diminished"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"dim"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"390","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"diminished-seventh"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"dim7"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"391","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"dominant"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"7"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"392","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"dominant-11th"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"11"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"393","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"dominant-13th"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"13"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"394","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"dominant-ninth"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"9"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"395","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"French"}]},{"N":"empty","sType":"0 "},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"396","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"German"}]},{"N":"empty","sType":"0 "},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"397","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"half-diminished"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"m7b5"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"398","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"Italian"}]},{"N":"empty","sType":"0 "},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"399","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"major"}]},{"N":"empty","sType":"0 "},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"400","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"major-11th"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"M11"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"401","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"major-13th"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"M13"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"402","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"major-minor"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"mM7"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"403","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"major-ninth"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"M9"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"404","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"major-seventh"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"M7"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"405","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"major-sixth"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"6"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"406","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"minor"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"m"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"407","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"minor-11th"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"m11"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"408","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"minor-13th"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"m13"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"409","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"minor-ninth"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"m9"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"410","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"minor-seventh"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"m7"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"411","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"minor-sixth"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"m6"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"412","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"Neapolitan"}]},{"N":"empty","sType":"0 "},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"413","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"other"}]},{"N":"empty","sType":"0 "},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"414","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"pedal"}]},{"N":"empty","sType":"0 "},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"415","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"power"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"5"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"416","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"suspended-fourth"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"sus"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"417","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"suspended-second"}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"sus2"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"418","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}kind,NE nQ{http://www.w3.org/1999/xhtml}kind]"}]},{"N":"str","val":"Tristan"}]},{"N":"empty","sType":"0 "},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"let","var":"Q{}sus","slot":"1","sType":"* ","line":"435","C":[{"N":"doc","sType":"1ND ","base":"file:///home/kratib/src/infojunkie/musicxml-midi/src/xsl/mma.xsl","role":"select","C":[{"N":"choose","sType":"? ","type":"item()*","line":"436","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"437","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]"},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-type,NE nQ{http://www.w3.org/1999/xhtml}degree-type]"}]},{"N":"str","val":"add"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"4"}]}]}]},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]"},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-type,NE nQ{http://www.w3.org/1999/xhtml}degree-type]"}]},{"N":"str","val":"subtract"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"3"}]}]}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"sus"}]},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"438","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]"},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-type,NE nQ{http://www.w3.org/1999/xhtml}degree-type]"}]},{"N":"str","val":"add"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"2"}]}]}]},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]"},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-type,NE nQ{http://www.w3.org/1999/xhtml}degree-type]"}]},{"N":"str","val":"subtract"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"3"}]}]}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"sus2"}]},{"N":"filter","sType":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"439","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]"},{"N":"and","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-type,NE nQ{http://www.w3.org/1999/xhtml}degree-type]"}]},{"N":"str","val":"alter"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"5"}]}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-alter,NE nQ{http://www.w3.org/1999/xhtml}degree-alter]"}]},{"N":"str","val":"1"}]}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"+"}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]},{"N":"sequence","sType":"* ","C":[{"N":"valueOf","flags":"l","sType":"1NT ","line":"443","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"varRef","sType":"*","name":"Q{}sus","slot":"1","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"443"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"forEach","sType":"*NT ","line":"444","C":[{"N":"filter","sType":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"444","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]"},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-type,NE nQ{http://www.w3.org/1999/xhtml}degree-type]"}]},{"N":"str","val":"subtract"}]},{"N":"fn","name":"not","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"3"}]},{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}sus","slot":"1"}]},{"N":"str","val":""}]}]}]}]}]},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"(omit"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"446","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"axis","sType":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"446"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":")"}]}]}]},{"N":"forEach","sType":"*NT ","line":"449","C":[{"N":"filter","sType":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"449","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]"},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-type,NE nQ{http://www.w3.org/1999/xhtml}degree-type]"}]},{"N":"str","val":"alter"}]},{"N":"fn","name":"not","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"5"}]},{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}sus","slot":"1"}]},{"N":"str","val":""}]}]}]}]}]},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","flags":"l","sType":"1NT ","line":"450","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"choose","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"450","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-alter,NE nQ{http://www.w3.org/1999/xhtml}degree-alter]"}]},{"N":"str","val":"1"}]},{"N":"str","val":"#"},{"N":"true"},{"N":"choose","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-alter,NE nQ{http://www.w3.org/1999/xhtml}degree-alter]"}]},{"N":"str","val":"-1"}]},{"N":"str","val":"b"},{"N":"true"},{"N":"str","val":""}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"451","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"axis","sType":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"451"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]}]},{"N":"forEach","sType":"*NT ","line":"453","C":[{"N":"filter","sType":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"453","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree,NE nQ{http://www.w3.org/1999/xhtml}degree]"},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-type,NE nQ{http://www.w3.org/1999/xhtml}degree-type]"}]},{"N":"str","val":"add"}]},{"N":"fn","name":"not","C":[{"N":"and","C":[{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"4"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"2"}]}]},{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}sus","slot":"1"}]},{"N":"str","val":""}]}]}]}]}]},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","flags":"l","sType":"1NT ","line":"454","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"choose","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"454","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-alter,NE nQ{http://www.w3.org/1999/xhtml}degree-alter]"}]},{"N":"str","val":"1"}]},{"N":"str","val":"#"},{"N":"true"},{"N":"choose","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-alter,NE nQ{http://www.w3.org/1999/xhtml}degree-alter]"}]},{"N":"str","val":"-1"}]},{"N":"str","val":"b"},{"N":"true"},{"N":"str","val":"(add"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"455","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"choose","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"455","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]},{"N":"str","val":"7"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-alter,NE nQ{http://www.w3.org/1999/xhtml}degree-alter]"}]},{"N":"str","val":"0"}]}]},{"N":"str","val":"M7"},{"N":"true"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-value,NE nQ{http://www.w3.org/1999/xhtml}degree-value]"}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"456","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"choose","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"456","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-alter,NE nQ{http://www.w3.org/1999/xhtml}degree-alter]"}]},{"N":"str","val":"1"}]},{"N":"str","val":""},{"N":"true"},{"N":"choose","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}degree-alter,NE nQ{http://www.w3.org/1999/xhtml}degree-alter]"}]},{"N":"str","val":"-1"}]},{"N":"str","val":""},{"N":"true"},{"N":"str","val":")"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]}]},{"N":"choose","sType":"* ","line":"461","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass,NE nQ{http://www.w3.org/1999/xhtml}bass]","sType":"*NE u[NE nQ{}bass,NE nQ{http://www.w3.org/1999/xhtml}bass]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"461"},{"N":"choose","sType":"*NT ","type":"item()*","line":"462","C":[{"N":"varRef","name":"Q{}definition","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"463"},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"/"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"465","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"465","C":[{"N":"slash","op":"/","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass,NE nQ{http://www.w3.org/1999/xhtml}bass]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass-step,NE nQ{http://www.w3.org/1999/xhtml}bass-step]"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"466","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"choose","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"466","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass,NE nQ{http://www.w3.org/1999/xhtml}bass]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass-alter,NE nQ{http://www.w3.org/1999/xhtml}bass-alter]"}]}]},{"N":"str","val":"1"}]},{"N":"str","val":"#"},{"N":"true"},{"N":"choose","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass,NE nQ{http://www.w3.org/1999/xhtml}bass]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass-alter,NE nQ{http://www.w3.org/1999/xhtml}bass-alter]"}]}]},{"N":"str","val":"-1"}]},{"N":"str","val":"b"},{"N":"true"},{"N":"str","val":""}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]},{"N":"true"},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","flags":"d","C":[{"N":"str","sType":"1AS ","val":"<"}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"470","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"ufCall","sType":"1AO","name":"Q{http://www.mellowood.ca/mma}mod","coId":"5","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"470","bSlot":"0","C":[{"N":"convert","to":"AO","flags":"","C":[{"N":"arith","op":"-","calc":"i-i","C":[{"N":"ufCall","name":"Q{http://www.mellowood.ca/mma}note","coId":"3","bSlot":"1","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass,NE nQ{http://www.w3.org/1999/xhtml}bass]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass-step,NE nQ{http://www.w3.org/1999/xhtml}bass-step]"}]},{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass,NE nQ{http://www.w3.org/1999/xhtml}bass]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}bass-alter,NE nQ{http://www.w3.org/1999/xhtml}bass-alter]"}]}]},{"N":"ufCall","name":"Q{http://www.mellowood.ca/mma}note","coId":"3","bSlot":"1","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root,NE nQ{http://www.w3.org/1999/xhtml}root]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root-step,NE nQ{http://www.w3.org/1999/xhtml}root-step]"}]},{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root,NE nQ{http://www.w3.org/1999/xhtml}root]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}root-alter,NE nQ{http://www.w3.org/1999/xhtml}root-alter]"}]}]}]}]},{"N":"convert","to":"AO","flags":"","C":[{"N":"int","val":"-12"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]}]}]}]}]}]}]},{"N":"co","id":"20","binds":"11 6","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","name":"Q{}riff","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"6","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"481","module":"mma.xsl","expand-text":"false","match":"note","prio":"0","matches":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"let","var":"Q{}tieStop","slot":"0","sType":"* ","line":"499","role":"action","C":[{"N":"fn","name":"accumulator-after","sType":"AB ","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"499","C":[{"N":"str","val":"Q{}tieStop"}]},{"N":"let","var":"Q{}tieStart","slot":"1","sType":"* ","line":"500","C":[{"N":"ifCall","name":"Q{http://saxon.sf.net/}apply","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"500","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}tieStart"}]},{"N":"arrayBlock","C":[{"N":"str","val":"current"}]}]},{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"* ","line":"502","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"502","C":[{"N":"fn","name":"reverse","C":[{"N":"filter","C":[{"N":"axis","name":"preceding-sibling","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"0"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]}]}]},{"N":"sequence","sType":"* ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"Solo Riff "}]},{"N":"choose","sType":"? ","line":"504","C":[{"N":"varRef","name":"Q{}tieStop","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"504"},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"~"}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"? ","line":"507","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}grace,NE nQ{http://www.w3.org/1999/xhtml}grace]","sType":"*NE u[NE nQ{}grace,NE nQ{http://www.w3.org/1999/xhtml}grace]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"507"},{"N":"valueOf","sType":"1NT ","flags":"d","C":[{"N":"str","sType":"1AS ","val":""}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"511","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"511","C":[{"N":"or","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"},{"N":"varRef","name":"Q{}tieStop","slot":"0"}]}]},{"N":"let","var":"Q{}duration","slot":"2","sType":"* ","line":"512","C":[{"N":"doc","sType":"1ND ","base":"file:///home/kratib/src/infojunkie/musicxml-midi/src/xsl/mma.xsl","role":"select","C":[{"N":"choose","sType":"?NT ","type":"item()*","line":"513","C":[{"N":"varRef","name":"Q{}tieStart","slot":"1","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"514"},{"N":"valueOf","flags":"l","sType":"1NT ","line":"515","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"ufCall","sType":"1AO","name":"Q{http://www.mellowood.ca/mma}noteDuration","coId":"6","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"515","bSlot":"1","C":[{"N":"dot"},{"N":"convert","to":"AO","flags":"","C":[{"N":"int","val":"0"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"true"},{"N":"valueOf","flags":"l","sType":"1NT ","line":"518","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"axis","sType":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"518"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]}]},{"N":"sequence","sType":"? ","C":[{"N":"choose","sType":"? ","line":"522","C":[{"N":"ifCall","name":"Q{http://saxon.sf.net/}apply","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"522","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}hasMeasurePrintedAnyNote"}]},{"N":"arrayBlock","C":[{"N":"str","val":"previous"}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":";"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"523","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"fn","sType":"?A","name":"floor","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"523","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||floor","C":[{"N":"check","card":"?","diag":"0|0||floor","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||floor","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"int","val":"192"},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}duration","slot":"2"}]}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"t"}]}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"527","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"527","C":[{"N":"varRef","name":"Q{}tieStop","slot":"0"}]},{"N":"choose","sType":"* ","type":"item()*","line":"528","C":[{"N":"or","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"529","C":[{"N":"or","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}rest,NE nQ{http://www.w3.org/1999/xhtml}rest]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}cue,NE nQ{http://www.w3.org/1999/xhtml}cue]"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}notehead,NE nQ{http://www.w3.org/1999/xhtml}notehead]"}]},{"N":"str","val":"slash"}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"r"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]","sType":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"530"},{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"? ","line":"531","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"531"},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":","}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"532","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"fn","name":"lower-case","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"532","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||lower-case","C":[{"N":"check","card":"?","diag":"0|0||lower-case","C":[{"N":"data","diag":"0|0||lower-case","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}step,NE nQ{http://www.w3.org/1999/xhtml}step]"}]}]}]}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","flags":"d","sType":"1NT ","line":"533","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"choose","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"533","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}alter,NE nQ{http://www.w3.org/1999/xhtml}alter]"}]}]},{"N":"str","val":"1"}]},{"N":"str","val":"#"},{"N":"true"},{"N":"choose","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}alter,NE nQ{http://www.w3.org/1999/xhtml}alter]"}]}]},{"N":"str","val":"-1"}]},{"N":"str","val":"&"},{"N":"true"},{"N":"str","val":"n"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"choose","sType":"* ","type":"item()*","line":"534","C":[{"N":"gc","op":">","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"535","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}octave,NE nQ{http://www.w3.org/1999/xhtml}octave]"}]}]},{"N":"int","val":"4"}]},{"N":"forEach","sType":"*NT ","line":"536","C":[{"N":"to","sType":"*ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"536","C":[{"N":"int","val":"1"},{"N":"treat","as":"ADI","diag":"1|1||to","C":[{"N":"check","card":"?","diag":"1|1||to","C":[{"N":"cvUntyped","to":"ADI","diag":"1|1||to","C":[{"N":"check","card":"?","diag":"1|1||to","C":[{"N":"data","diag":"1|1||to","C":[{"N":"cast","flags":"ae","as":"ADI","C":[{"N":"arith","op":"-","calc":"d-d","C":[{"N":"cvUntyped","to":"AO","diag":"1|0|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}octave,NE nQ{http://www.w3.org/1999/xhtml}octave]"}]}]}]}]},{"N":"convert","to":"AO","flags":"","C":[{"N":"int","val":"4"}]}]}]}]}]}]}]}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"+"}]}]},{"N":"gc","op":"<","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"538","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}octave,NE nQ{http://www.w3.org/1999/xhtml}octave]"}]}]},{"N":"int","val":"4"}]},{"N":"forEach","sType":"*NT ","line":"539","C":[{"N":"to","sType":"*ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"539","C":[{"N":"int","val":"1"},{"N":"treat","as":"ADI","diag":"1|1||to","C":[{"N":"check","card":"?","diag":"1|1||to","C":[{"N":"cvUntyped","to":"ADI","diag":"1|1||to","C":[{"N":"check","card":"?","diag":"1|1||to","C":[{"N":"data","diag":"1|1||to","C":[{"N":"cast","flags":"ae","as":"ADI","C":[{"N":"arith","op":"-","calc":"d-d","C":[{"N":"convert","to":"AO","flags":"","C":[{"N":"int","val":"4"}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}octave,NE nQ{http://www.w3.org/1999/xhtml}octave]"}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"-"}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"546","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"546","C":[{"N":"filter","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"0"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]}]},{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"? ","line":"547","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"547","C":[{"N":"ifCall","name":"Q{http://saxon.sf.net/}apply","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}hasMeasurePrintedAnyNote"}]},{"N":"arrayBlock","C":[{"N":"str","val":"current"}]}]}]},{"N":"valueOf","sType":"1NT ","flags":"d","C":[{"N":"str","sType":"1AS ","val":"<>"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"? ","line":"550","C":[{"N":"varRef","name":"Q{}tieStart","slot":"1","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"550"},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"~"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":";"}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]}]}]}]}]},{"N":"co","id":"21","binds":"1","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","name":"Q{}pitch","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"7","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"558","module":"mma.xsl","expand-text":"false","match":"note","prio":"0","matches":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"choose","sType":"* ","type":"item()*","role":"action","line":"559","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"560","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}alter,NE nQ{http://www.w3.org/1999/xhtml}alter]"}]}]},{"N":"empty","sType":"0 "},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"561","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"cast","flags":"ae","as":"AO","C":[{"N":"check","card":"?","diag":"0|0||xs:double","C":[{"N":"data","diag":"0|0||xs:double","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}alter,NE nQ{http://www.w3.org/1999/xhtml}alter]"}]}]}]}]}]},{"N":"fn","name":"round","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||round","C":[{"N":"check","card":"?","diag":"0|0||round","C":[{"N":"data","diag":"0|0||round","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}alter,NE nQ{http://www.w3.org/1999/xhtml}alter]"}]}]}]}]}]}]},{"N":"empty","sType":"0 "},{"N":"vc","op":"le","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","line":"562","C":[{"N":"fn","name":"abs","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||abs","C":[{"N":"check","card":"?","diag":"0|0||abs","C":[{"N":"data","diag":"0|0||abs","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}alter,NE nQ{http://www.w3.org/1999/xhtml}alter]"}]}]}]}]}]},{"N":"int","val":"2"}]},{"N":"sequence","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nSolo MidiNote PB "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"563","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"ufCall","sType":"1AO","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks","coId":"1","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"563","bSlot":"0","C":[{"N":"fn","name":"accumulator-before","C":[{"N":"str","val":"Q{}noteOnset"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":" "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"565","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"fn","sType":"?A m[AO,AD,AF]","name":"round","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"565","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||round","C":[{"N":"check","card":"?","diag":"0|0||round","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||round","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"int","val":"4096"},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"cast","flags":"ae","as":"AO","C":[{"N":"check","card":"?","diag":"0|0||xs:double","C":[{"N":"data","diag":"0|0||xs:double","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}alter,NE nQ{http://www.w3.org/1999/xhtml}alter]"}]}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nSolo MidiNote PB "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"566","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"ufCall","sType":"1AO","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks","coId":"1","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"566","bSlot":"0","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}noteOnset"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]},{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":" 0"}]}]},{"N":"true"},{"N":"message","sType":"0 ","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","C":[{"N":"sequence","role":"select","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"[PitchBend] Unhandled pitch/alter value of "}]},{"N":"valueOf","flags":"l","sType":"1NT ","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"13","C":[{"N":"slash","op":"/","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}pitch,NE nQ{http://www.w3.org/1999/xhtml}pitch]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}alter,NE nQ{http://www.w3.org/1999/xhtml}alter]"}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]},{"N":"str","sType":"1AS ","val":"false","role":"terminate"},{"N":"str","sType":"1AS ","val":"Q{http://www.w3.org/2005/xqt-errors}XTMM9000","role":"error"}]}]}]}]}]},{"N":"co","binds":"","id":"22","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","name":"Q{}tempo","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"8","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"578","module":"mma.xsl","expand-text":"false","match":"sound","prio":"0","matches":"NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]","sType":"1NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"sequence","role":"action","sType":"*NT ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\nTempo "}]},{"N":"valueOf","flags":"l","sType":"1NT ","line":"579","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"axis","sType":"*NA nQ{}tempo","name":"attribute","nodeTest":"*NA nQ{}tempo","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"579"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]}]}]}]},{"N":"co","id":"23","binds":"19","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","name":"Q{}declaration","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"11","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","minImp":"0","flags":"s","slots":"200","line":"619","module":"mma.xsl","expand-text":"false","match":"harmony","prio":"0","matches":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ "},{"N":"choose","sType":"* ","role":"action","line":"620","C":[{"N":"let","var":"fn-current","slot":"199","xpath":"not(preceding::harmony[deep-equal(.,current())])","loc":"xsl:if/@test","line":"620","ns":"xml=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~","sType":"1AB","C":[{"N":"dot"},{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","C":[{"N":"fn","name":"reverse","C":[{"N":"filter","C":[{"N":"axis","name":"preceding","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"},{"N":"fn","name":"deep-equal","C":[{"N":"dot"},{"N":"varRef","name":"fn-current","slot":"199"},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]}]}]}]},{"N":"sequence","sType":"* ","C":[{"N":"valueOf","sType":"1NT ","C":[{"N":"str","sType":"1AS ","val":"\n@Slash "}]},{"N":"applyT","sType":"* ","line":"621","mode":"Q{}name","bSlot":"0","C":[{"N":"dot","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"621"},{"N":"withParam","name":"Q{}definition","slot":"0","sType":"1AB","C":[{"N":"true","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"622"}]}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]}]},{"N":"overridden"},{"N":"output","C":[{"N":"property","name":"Q{http://saxon.sf.net/}stylesheet-version","value":"30"},{"N":"property","name":"method","value":"text"},{"N":"property","name":"media-type","value":"text/plain"},{"N":"property","name":"omit-xml-declaration","value":"yes"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}divisions","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"18"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}divisions,NE nQ{http://www.w3.org/1999/xhtml}divisions]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}divisions,NE nQ{http://www.w3.org/1999/xhtml}divisions]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"axis","name":"child","nodeTest":"*NT","sType":"*NT","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"19"}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}tempo","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"120","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"22"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withPredicate","role":"match","sType":"1NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tempo"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tempo","sType":"*NA nQ{}tempo","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"23"}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}metronome","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"26"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.withPredicate","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]"},{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}direction-type,NE nQ{http://www.w3.org/1999/xhtml}direction-type]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}metronome,NE nQ{http://www.w3.org/1999/xhtml}metronome]"}]}]},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"dot","sType":"1NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"27"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}time","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"30"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"31"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}clef","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"34"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"35"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}key","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"38"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"39"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1FM","slots":"5","name":"Q{}measureIndex","as":"map(*)","ex:asJ":"FM k[1AS ] v[1ADI ] ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}_new","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"42"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"FM k[1AS ] v[1ADI ] ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"choose","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"43","C":[{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}contains","C":[{"N":"treat","as":"FM","diag":"0|0||map:contains","C":[{"N":"check","card":"1","diag":"0|0||map:contains","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:contains","C":[{"N":"attVal","name":"Q{}number"}]}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}put","C":[{"N":"treat","as":"FM","diag":"0|0||map:put","C":[{"N":"check","card":"1","diag":"0|0||map:put","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:put","C":[{"N":"attVal","name":"Q{}number"}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}get","C":[{"N":"treat","as":"FM","diag":"0|0||map:get","C":[{"N":"check","card":"1","diag":"0|0||map:get","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:get","C":[{"N":"attVal","name":"Q{}number"}]}]}]},{"N":"true"},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}put","C":[{"N":"treat","as":"FM","diag":"0|0||map:put","C":[{"N":"check","card":"1","diag":"0|0||map:put","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:put","C":[{"N":"attVal","name":"Q{}number"}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}size","C":[{"N":"treat","as":"FM","diag":"0|0||map:size","C":[{"N":"check","card":"1","diag":"0|0||map:size","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}measureDuration","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"46"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"47"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}forward,NE nQ{http://www.w3.org/1999/xhtml}forward]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}forward,NE nQ{http://www.w3.org/1999/xhtml}forward]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"48","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}backup,NE nQ{http://www.w3.org/1999/xhtml}backup]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}backup,NE nQ{http://www.w3.org/1999/xhtml}backup]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"-","calc":"a-a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"49","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"51","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"52"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"23"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"25","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}measureOnset","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"58"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"59"}]}]}]}]}]}]},{"N":"post","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"60","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}measureDuration"}]}]}]}]}]}]}]}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteDuration","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"63"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"65","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"66"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"33"},{"N":"filter","sType":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"67","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"stop"}]}]},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"35","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]},{"N":"true"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","sType":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"37"}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteOnset","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"73"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"74"}]}]}]}]},{"N":"post","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"76","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"77"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"43"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"45","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteBeat","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"83"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"84"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"86","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"87"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"51"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"53","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"arith","op":"div","calc":"d/d","C":[{"N":"cvUntyped","to":"AO","diag":"1|0|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}harmony","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"93"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"dot","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"94"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}harmonyPreviousDuration","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"97"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"98"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"99"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"101","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"102"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"62"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"64","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1AS","slots":"5","name":"Q{}groove","as":"xs:string","ex:asJ":"AS ","C":[{"N":"str","val":"","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"init","line":"36"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AS ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}other-play,NE nQ{http://www.w3.org/1999/xhtml}other-play]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.withPredicate","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}other-play,NE nQ{http://www.w3.org/1999/xhtml}other-play]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"groove"}]}]},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}play,NE nQ{http://www.w3.org/1999/xhtml}play]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"}]}]},{"N":"check","card":"1","sType":"1AS ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"treat","as":"AS ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"check","card":"1","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"cvUntyped","to":"AS","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"axis","name":"child","nodeTest":"*NT","sType":"*NT","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"37"}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","sType":"1FM k[AS] v[1AB]","binds":"11","slots":"5","name":"Q{}tieStart","as":"map(*)","ex:asJ":"FM k[1AS ] v[1AB ] ","C":[{"N":"map","sType":"1FM k[AS] v[1AB]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"init","line":"43","C":[{"N":"str","val":"current"},{"N":"false"},{"N":"str","val":"previous"},{"N":"false"}]},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"FM k[1AS ] v[1AB ] ","slots":"5","prio":"0.5","C":[{"N":"p.withPredicate","role":"match","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.withPredicate","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"0"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]}]},{"N":"map","sType":"1FM k[AS] v[*]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"47","C":[{"N":"str","val":"previous"},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}get","C":[{"N":"treat","as":"FM","diag":"0|0||map:get","C":[{"N":"check","card":"1","diag":"0|0||map:get","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"str","val":"current"}]},{"N":"str","val":"current"},{"N":"or","C":[{"N":"fn","name":"exists","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"start"}]}]}]},{"N":"fn","name":"exists","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}notations,NE nQ{http://www.w3.org/1999/xhtml}notations]"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tied,NE nQ{http://www.w3.org/1999/xhtml}tied]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"start"}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","sType":"1AB","binds":"11","slots":"5","name":"Q{}tieStop","as":"xs:boolean","ex:asJ":"AB ","C":[{"N":"false","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"init","line":"50"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AB ","slots":"5","prio":"0.5","C":[{"N":"p.withPredicate","role":"match","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.withPredicate","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"0"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]}]},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"53","C":[{"N":"or","C":[{"N":"fn","name":"exists","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"stop"}]}]}]},{"N":"fn","name":"exists","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}notations,NE nQ{http://www.w3.org/1999/xhtml}notations]"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tied,NE nQ{http://www.w3.org/1999/xhtml}tied]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"stop"}]}]}]}]}]},{"N":"ifCall","name":"Q{http://saxon.sf.net/}apply","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}tieStart"}]},{"N":"arrayBlock","C":[{"N":"str","val":"previous"}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","sType":"1FM k[AS] v[1AB]","binds":"11","slots":"5","name":"Q{}hasMeasurePrintedAnyNote","as":"map(*)","ex:asJ":"FM k[1AS ] v[1AB ] ","C":[{"N":"map","sType":"1FM k[AS] v[1AB]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"init","line":"59","C":[{"N":"str","val":"previous"},{"N":"false"},{"N":"str","val":"current"},{"N":"false"}]},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"FM k[1AS ] v[1AB ] ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ "},{"N":"map","sType":"1FM k[AS] v[1AB]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"63","C":[{"N":"str","val":"previous"},{"N":"false"},{"N":"str","val":"current"},{"N":"false"}]}]},{"N":"accRule","valueType":"FM k[1AS ] v[1AB ] ","slots":"5","prio":"0.5","C":[{"N":"p.withPredicate","role":"match","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ex=~ ","C":[{"N":"p.withPredicate","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"gVarRef","name":"Q{}melodyVoice","bSlot":"0"}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}voice,NE nQ{http://www.w3.org/1999/xhtml}voice]"}]}]}]},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]}]},{"N":"map","sType":"1FM k[AS] v[*]","ns":"= xml=~ fn=~ xsl=~ xs=~ mma=http://www.mellowood.ca/mma musicxml=http://www.w3.org/2021/06/musicxml40 map=~ array=~ ","role":"select","line":"67","C":[{"N":"str","val":"previous"},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}get","C":[{"N":"treat","as":"FM","diag":"0|0||map:get","C":[{"N":"check","card":"1","diag":"0|0||map:get","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"str","val":"current"}]},{"N":"str","val":"current"},{"N":"or","C":[{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}get","C":[{"N":"treat","as":"FM","diag":"0|0||map:get","C":[{"N":"check","card":"1","diag":"0|0||map:get","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"str","val":"current"}]},{"N":"fn","name":"not","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}tieStop"}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"decimalFormat"}],"Σ":"6f7eca25"} \ No newline at end of file diff --git a/build/musicxml.sef.json b/build/musicxml.sef.json index 0b315a01..64744d48 100644 --- a/build/musicxml.sef.json +++ b/build/musicxml.sef.json @@ -1 +1 @@ -{"N":"package","version":"30","packageVersion":"1","saxonVersion":"SaxonJS 2.6","target":"JS","targetVersion":"2","name":"TOP-LEVEL","relocatable":"true","buildDateTime":"2024-09-16T22:47:18.361-07:00","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"co","binds":"","id":"0","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs","as":"1AO ","slots":"203","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[1AO ,1AO ,1AO ] ","sType":"1F r[1AO ] a[1AO ,1AO ,1AO ] ","line":"114","C":[{"N":"arg","slot":"0","name":"Q{}time","as":"AO ","sType":"AO "},{"N":"arg","slot":"1","name":"Q{}divisions","as":"AO ","sType":"AO "},{"N":"arg","slot":"2","name":"Q{}tempo","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","role":"body","C":[{"N":"arith","op":"div","calc":"a/a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"body","line":"118","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}time","slot":"0"}]}]},{"N":"int","val":"60000"}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisions","slot":"1"}]}]}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}tempo","slot":"2"}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"1","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks","as":"1AO ","slots":"202","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[1AO ,1AO ] ","sType":"1F r[1AO ] a[1AO ,1AO ] ","line":"124","C":[{"N":"arg","slot":"0","name":"Q{}time","as":"AO ","sType":"AO "},{"N":"arg","slot":"1","name":"Q{}divisions","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","role":"body","C":[{"N":"fn","name":"round","sType":"?A m[AO,AD,AF]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"body","line":"127","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||round","C":[{"N":"check","card":"?","diag":"0|0||round","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||round","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}time","slot":"0"}]}]},{"N":"int","val":"192"}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisions","slot":"1"}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"2","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration","as":"1AO ","slots":"201","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[* ] ","sType":"1F r[1AO ] a[* ] ","line":"133","C":[{"N":"arg","slot":"0","name":"Q{}harmony","as":"* ","sType":"* "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","role":"body","C":[{"N":"let","var":"Q{}id","slot":"1","sType":"*A ","line":"135","role":"body","C":[{"N":"fn","name":"generate-id","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"135","C":[{"N":"treat","as":"N","diag":"0|0||generate-id","C":[{"N":"check","card":"?","diag":"0|0||generate-id","C":[{"N":"varRef","name":"Q{}harmony","slot":"0"}]}]}]},{"N":"fn","name":"sum","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"138","C":[{"N":"data","diag":"0|0||sum","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}harmony","slot":"0"}]},{"N":"filter","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"and","C":[{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"fn","name":"generate-id","C":[{"N":"fn","name":"reverse","C":[{"N":"first","C":[{"N":"axis","name":"preceding-sibling","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]}]}]},{"N":"data","diag":"1|1||gc","C":[{"N":"varRef","name":"Q{}id","slot":"1"}]}]}]}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"3","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","prec":""}]},{"N":"overridden"},{"N":"output","C":[{"N":"property","name":"Q{http://saxon.sf.net/}stylesheet-version","value":"30"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}divisions","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"18"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}divisions,NE nQ{http://www.w3.org/1999/xhtml}divisions]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}divisions,NE nQ{http://www.w3.org/1999/xhtml}divisions]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"axis","name":"child","nodeTest":"*NT","sType":"*NT","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"19"}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}tempo","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"120","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"22"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withPredicate","role":"match","sType":"1NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tempo"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tempo","sType":"*NA nQ{}tempo","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"23"}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}metronome","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"26"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.withPredicate","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]"},{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}direction-type,NE nQ{http://www.w3.org/1999/xhtml}direction-type]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}metronome,NE nQ{http://www.w3.org/1999/xhtml}metronome]"}]}]},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"dot","sType":"1NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"27"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}time","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"30"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"31"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}clef","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"34"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"35"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}key","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"38"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"39"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1FM","slots":"5","name":"Q{}measureIndex","as":"map(*)","ex:asJ":"FM k[1AS ] v[1ADI ] ","C":[{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}_new","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"42"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"FM k[1AS ] v[1ADI ] ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"choose","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"43","C":[{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}contains","C":[{"N":"treat","as":"FM","diag":"0|0||map:contains","C":[{"N":"check","card":"1","diag":"0|0||map:contains","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:contains","C":[{"N":"attVal","name":"Q{}number"}]}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}put","C":[{"N":"treat","as":"FM","diag":"0|0||map:put","C":[{"N":"check","card":"1","diag":"0|0||map:put","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:put","C":[{"N":"attVal","name":"Q{}number"}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}get","C":[{"N":"treat","as":"FM","diag":"0|0||map:get","C":[{"N":"check","card":"1","diag":"0|0||map:get","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:get","C":[{"N":"attVal","name":"Q{}number"}]}]}]},{"N":"true"},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}put","C":[{"N":"treat","as":"FM","diag":"0|0||map:put","C":[{"N":"check","card":"1","diag":"0|0||map:put","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:put","C":[{"N":"attVal","name":"Q{}number"}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}size","C":[{"N":"treat","as":"FM","diag":"0|0||map:size","C":[{"N":"check","card":"1","diag":"0|0||map:size","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}measureDuration","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"46"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"47"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}forward,NE nQ{http://www.w3.org/1999/xhtml}forward]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}forward,NE nQ{http://www.w3.org/1999/xhtml}forward]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"48","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}backup,NE nQ{http://www.w3.org/1999/xhtml}backup]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}backup,NE nQ{http://www.w3.org/1999/xhtml}backup]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"-","calc":"a-a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"49","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"51","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"52"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"23"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"25","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}measureOnset","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"58"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"59"}]}]}]}]}]}]},{"N":"post","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"60","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}measureDuration"}]}]}]}]}]}]}]}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteDuration","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"63"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"65","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"66"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"33"},{"N":"filter","sType":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"67","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"stop"}]}]},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"35","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]},{"N":"true"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","sType":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"37"}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteOnset","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"73"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"74"}]}]}]}]},{"N":"post","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"76","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"77"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"43"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"45","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteBeat","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"83"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"84"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"86","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"87"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"51"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"53","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"arith","op":"div","calc":"d/d","C":[{"N":"cvUntyped","to":"AO","diag":"1|0|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}harmony","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"93"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"dot","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"94"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}harmonyPreviousDuration","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"97"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"98"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"99"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"101","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"102"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"62"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"64","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"decimalFormat"}],"Σ":"7290d3b"} \ No newline at end of file +{"N":"package","version":"30","packageVersion":"1","saxonVersion":"SaxonJS 2.6","target":"JS","targetVersion":"2","name":"TOP-LEVEL","relocatable":"true","buildDateTime":"2024-09-26T22:49:51.06-07:00","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"co","binds":"","id":"0","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs","as":"1AO ","slots":"203","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[1AO ,1AO ,1AO ] ","sType":"1F r[1AO ] a[1AO ,1AO ,1AO ] ","line":"114","C":[{"N":"arg","slot":"0","name":"Q{}time","as":"AO ","sType":"AO "},{"N":"arg","slot":"1","name":"Q{}divisions","as":"AO ","sType":"AO "},{"N":"arg","slot":"2","name":"Q{}tempo","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","role":"body","C":[{"N":"arith","op":"div","calc":"a/a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"body","line":"118","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}time","slot":"0"}]}]},{"N":"int","val":"60000"}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisions","slot":"1"}]}]}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}tempo","slot":"2"}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"1","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks","as":"1AO ","slots":"202","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[1AO ,1AO ] ","sType":"1F r[1AO ] a[1AO ,1AO ] ","line":"124","C":[{"N":"arg","slot":"0","name":"Q{}time","as":"AO ","sType":"AO "},{"N":"arg","slot":"1","name":"Q{}divisions","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","role":"body","C":[{"N":"fn","name":"round","sType":"?A m[AO,AD,AF]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"body","line":"127","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||round","C":[{"N":"check","card":"?","diag":"0|0||round","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||round","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}time","slot":"0"}]}]},{"N":"int","val":"192"}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisions","slot":"1"}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"2","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration","as":"1AO ","slots":"201","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[* ] ","sType":"1F r[1AO ] a[* ] ","line":"133","C":[{"N":"arg","slot":"0","name":"Q{}harmony","as":"* ","sType":"* "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","role":"body","C":[{"N":"let","var":"Q{}id","slot":"1","sType":"*A ","line":"135","role":"body","C":[{"N":"fn","name":"generate-id","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"135","C":[{"N":"treat","as":"N","diag":"0|0||generate-id","C":[{"N":"check","card":"?","diag":"0|0||generate-id","C":[{"N":"varRef","name":"Q{}harmony","slot":"0"}]}]}]},{"N":"fn","name":"sum","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"138","C":[{"N":"data","diag":"0|0||sum","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}harmony","slot":"0"}]},{"N":"filter","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"and","C":[{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"fn","name":"generate-id","C":[{"N":"fn","name":"reverse","C":[{"N":"first","C":[{"N":"axis","name":"preceding-sibling","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]}]}]},{"N":"data","diag":"1|1||gc","C":[{"N":"varRef","name":"Q{}id","slot":"1"}]}]}]}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"3","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","prec":""}]},{"N":"overridden"},{"N":"output","C":[{"N":"property","name":"Q{http://saxon.sf.net/}stylesheet-version","value":"30"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}divisions","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"18"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}divisions,NE nQ{http://www.w3.org/1999/xhtml}divisions]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}divisions,NE nQ{http://www.w3.org/1999/xhtml}divisions]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"axis","name":"child","nodeTest":"*NT","sType":"*NT","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"19"}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}tempo","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"120","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"22"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withPredicate","role":"match","sType":"1NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tempo"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tempo","sType":"*NA nQ{}tempo","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"23"}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}metronome","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"26"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.withPredicate","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]"},{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}direction-type,NE nQ{http://www.w3.org/1999/xhtml}direction-type]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}metronome,NE nQ{http://www.w3.org/1999/xhtml}metronome]"}]}]},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"dot","sType":"1NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"27"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}time","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"30"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"31"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}clef","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"34"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"35"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}key","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"38"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"39"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1FM","slots":"5","name":"Q{}measureIndex","as":"map(*)","ex:asJ":"FM k[1AS ] v[1ADI ] ","C":[{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}_new","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"42"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"FM k[1AS ] v[1ADI ] ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"choose","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"43","C":[{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}contains","C":[{"N":"treat","as":"FM","diag":"0|0||map:contains","C":[{"N":"check","card":"1","diag":"0|0||map:contains","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:contains","C":[{"N":"attVal","name":"Q{}number"}]}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}put","C":[{"N":"treat","as":"FM","diag":"0|0||map:put","C":[{"N":"check","card":"1","diag":"0|0||map:put","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:put","C":[{"N":"attVal","name":"Q{}number"}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}get","C":[{"N":"treat","as":"FM","diag":"0|0||map:get","C":[{"N":"check","card":"1","diag":"0|0||map:get","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:get","C":[{"N":"attVal","name":"Q{}number"}]}]}]},{"N":"true"},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}put","C":[{"N":"treat","as":"FM","diag":"0|0||map:put","C":[{"N":"check","card":"1","diag":"0|0||map:put","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:put","C":[{"N":"attVal","name":"Q{}number"}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}size","C":[{"N":"treat","as":"FM","diag":"0|0||map:size","C":[{"N":"check","card":"1","diag":"0|0||map:size","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}measureDuration","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"46"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"47"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}forward,NE nQ{http://www.w3.org/1999/xhtml}forward]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}forward,NE nQ{http://www.w3.org/1999/xhtml}forward]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"48","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}backup,NE nQ{http://www.w3.org/1999/xhtml}backup]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}backup,NE nQ{http://www.w3.org/1999/xhtml}backup]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"-","calc":"a-a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"49","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"51","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"52"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"23"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"25","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}measureOnset","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"58"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"59"}]}]}]}]}]}]},{"N":"post","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"60","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}measureDuration"}]}]}]}]}]}]}]}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteDuration","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"63"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"65","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"66"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"33"},{"N":"filter","sType":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"67","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"stop"}]}]},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"35","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]},{"N":"true"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","sType":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"37"}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteOnset","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"73"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"74"}]}]}]}]},{"N":"post","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"76","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"77"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"43"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"45","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteBeat","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"83"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"84"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"86","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"87"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"51"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"53","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"arith","op":"div","calc":"d/d","C":[{"N":"cvUntyped","to":"AO","diag":"1|0|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}harmony","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"93"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"dot","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"94"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}harmonyPreviousDuration","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"97"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"98"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"99"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"101","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"102"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"62"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"64","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"decimalFormat"}],"Σ":"3f72527b"} \ No newline at end of file diff --git a/build/timemap.sef.json b/build/timemap.sef.json index 7267f3b6..5579515e 100644 --- a/build/timemap.sef.json +++ b/build/timemap.sef.json @@ -1 +1 @@ -{"N":"package","version":"30","packageVersion":"1","saxonVersion":"SaxonJS 2.6","target":"JS","targetVersion":"2","name":"TOP-LEVEL","relocatable":"true","buildDateTime":"2024-09-16T22:47:19.031-07:00","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"co","binds":"","id":"0","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs","as":"1AO ","slots":"203","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[1AO ,1AO ,1AO ] ","sType":"1F r[1AO ] a[1AO ,1AO ,1AO ] ","line":"114","C":[{"N":"arg","slot":"0","name":"Q{}time","as":"AO ","sType":"AO "},{"N":"arg","slot":"1","name":"Q{}divisions","as":"AO ","sType":"AO "},{"N":"arg","slot":"2","name":"Q{}tempo","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","role":"body","C":[{"N":"arith","op":"div","calc":"a/a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"body","line":"118","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}time","slot":"0"}]}]},{"N":"int","val":"60000"}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisions","slot":"1"}]}]}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}tempo","slot":"2"}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"1","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks","as":"1AO ","slots":"202","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[1AO ,1AO ] ","sType":"1F r[1AO ] a[1AO ,1AO ] ","line":"124","C":[{"N":"arg","slot":"0","name":"Q{}time","as":"AO ","sType":"AO "},{"N":"arg","slot":"1","name":"Q{}divisions","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","role":"body","C":[{"N":"fn","name":"round","sType":"?A m[AO,AD,AF]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"body","line":"127","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||round","C":[{"N":"check","card":"?","diag":"0|0||round","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||round","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}time","slot":"0"}]}]},{"N":"int","val":"192"}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisions","slot":"1"}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"2","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration","as":"1AO ","slots":"201","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[* ] ","sType":"1F r[1AO ] a[* ] ","line":"133","C":[{"N":"arg","slot":"0","name":"Q{}harmony","as":"* ","sType":"* "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","role":"body","C":[{"N":"let","var":"Q{}id","slot":"1","sType":"*A ","line":"135","role":"body","C":[{"N":"fn","name":"generate-id","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"135","C":[{"N":"treat","as":"N","diag":"0|0||generate-id","C":[{"N":"check","card":"?","diag":"0|0||generate-id","C":[{"N":"varRef","name":"Q{}harmony","slot":"0"}]}]}]},{"N":"fn","name":"sum","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"138","C":[{"N":"data","diag":"0|0||sum","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}harmony","slot":"0"}]},{"N":"filter","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"and","C":[{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"fn","name":"generate-id","C":[{"N":"fn","name":"reverse","C":[{"N":"first","C":[{"N":"axis","name":"preceding-sibling","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]}]}]},{"N":"data","diag":"1|1||gc","C":[{"N":"varRef","name":"Q{}id","slot":"1"}]}]}]}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"3","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}useSef","sType":"AB ","slots":"200","module":"timemap.xsl","as":"AB ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"false","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"23"}]}]},{"N":"co","binds":"","id":"4","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}renumberMeasures","sType":"AB ","slots":"200","module":"timemap.xsl","as":"AB ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"false","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"24"}]}]},{"N":"co","id":"5","vis":"PUBLIC","ex:uniform":"true","binds":"4","C":[{"N":"globalVariable","name":"Q{}stylesheetParams","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"timemap.xsl","slots":"200","sType":"1FM","C":[{"N":"map","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"31","C":[{"N":"fn","name":"QName","C":[{"N":"str","val":""},{"N":"str","val":"renumberMeasures"}]},{"N":"gVarRef","name":"Q{}renumberMeasures","bSlot":"0"}]}]}]},{"N":"co","id":"6","vis":"PUBLIC","ex:uniform":"true","binds":"3 5","C":[{"N":"globalVariable","name":"Q{}unrolled","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"timemap.xsl","slots":"200","sType":"?ND ","C":[{"N":"doc","sType":"1ND ","base":"file:///home/kratib/src/infojunkie/musicxml-midi/src/xsl/timemap.xsl","role":"select","C":[{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"* ","line":"33","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"33","C":[{"N":"gVarRef","name":"Q{}useSef","bSlot":"0"}]},{"N":"lookup","op":"?","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"38","C":[{"N":"fn","name":"transform","C":[{"N":"map","C":[{"N":"str","val":"source-node"},{"N":"root"},{"N":"str","val":"stylesheet-node"},{"N":"fn","name":"doc","C":[{"N":"str","val":"unroll.xsl"}]},{"N":"str","val":"stylesheet-params"},{"N":"gVarRef","name":"Q{}stylesheetParams","bSlot":"1"}]}]},{"N":"str","val":"output"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"40","C":[{"N":"gVarRef","name":"Q{}useSef","bSlot":"0","sType":"AB ","line":"40"},{"N":"lookup","op":"?","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"45","C":[{"N":"fn","name":"transform","C":[{"N":"map","C":[{"N":"str","val":"source-node"},{"N":"root"},{"N":"str","val":"package-text"},{"N":"fn","name":"unparsed-text","C":[{"N":"str","val":"unroll.sef.json"}]},{"N":"str","val":"stylesheet-params"},{"N":"gVarRef","name":"Q{}stylesheetParams","bSlot":"1"}]}]},{"N":"str","val":"output"}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]}]}]},{"N":"co","id":"7","binds":"0 7 6","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"2","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","minImp":"0","flags":"s","slots":"200","line":"63","module":"timemap.xsl","ex:asJ":"*FM ","expand-text":"false","match":"measure","as":"map(*)*","prio":"0","matches":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ "},{"N":"map","sType":"1FM k[AS] v[*]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"action","line":"79","C":[{"N":"str","val":"measure"},{"N":"ifCall","name":"Q{http://saxon.sf.net/}apply","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}measureIndex"}]},{"N":"arrayBlock","C":[{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}number"}]}]},{"N":"str","val":"timestamp"},{"N":"ufCall","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs","coId":"0","bSlot":"0","C":[{"N":"fn","name":"accumulator-before","C":[{"N":"str","val":"Q{}measureOnset"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}tempo"}]}]},{"N":"str","val":"duration"},{"N":"ufCall","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs","coId":"0","bSlot":"0","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}measureDuration"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}tempo"}]}]}]}]},{"N":"templateRule","rank":"1","prec":"0","seq":"1","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","minImp":"0","flags":"s","slots":"200","line":"56","module":"timemap.xsl","ex:asJ":"FA ","expand-text":"false","match":"part","as":"array(*)","prio":"0","matches":"NE u[NE nQ{}part,NE nQ{http://www.w3.org/1999/xhtml}part]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}part,NE nQ{http://www.w3.org/1999/xhtml}part]","sType":"1NE u[NE nQ{}part,NE nQ{http://www.w3.org/1999/xhtml}part]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ "},{"N":"check","card":"1","sType":"1FA ","diag":"2|0|XTTE0505|template result","role":"action","C":[{"N":"let","var":"Q{}output","slot":"0","sType":"*FA ","line":"57","role":"action","C":[{"N":"treat","as":"FM ","diag":"2|0|XTTE0570|xsl:variable name=\"Q{}output\"","C":[{"N":"applyT","sType":"* ","line":"58","mode":"#unnamed","bSlot":"1","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"58"}]}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/array}_from-sequence","sType":"1FA v[*]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"60","C":[{"N":"varRef","name":"Q{}output","slot":"0"}]}]}]}]},{"N":"templateRule","rank":"2","prec":"0","seq":"0","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","minImp":"0","flags":"s","slots":"200","line":"52","module":"timemap.xsl","expand-text":"false","match":"/","prio":"-0.5","matches":"ND","C":[{"N":"p.nodeTest","role":"match","test":"ND","sType":"1ND","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ "},{"N":"applyT","sType":"* ","line":"53","mode":"#unnamed","role":"action","bSlot":"1","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"53","C":[{"N":"docOrder","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"gVarRef","name":"Q{}unrolled","bSlot":"2"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}score-partwise,NE nQ{http://www.w3.org/1999/xhtml}score-partwise]"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}part,NE nQ{http://www.w3.org/1999/xhtml}part]"}]}]}]}]}]}]}]},{"N":"overridden"},{"N":"output","C":[{"N":"property","name":"Q{http://saxon.sf.net/}stylesheet-version","value":"30"},{"N":"property","name":"method","value":"json"},{"N":"property","name":"indent","value":"yes"},{"N":"property","name":"encoding","value":"UTF-8"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}divisions","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"18"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}divisions,NE nQ{http://www.w3.org/1999/xhtml}divisions]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}divisions,NE nQ{http://www.w3.org/1999/xhtml}divisions]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"axis","name":"child","nodeTest":"*NT","sType":"*NT","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"19"}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}tempo","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"120","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"22"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withPredicate","role":"match","sType":"1NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tempo"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tempo","sType":"*NA nQ{}tempo","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"23"}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}metronome","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"26"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.withPredicate","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]"},{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}direction-type,NE nQ{http://www.w3.org/1999/xhtml}direction-type]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}metronome,NE nQ{http://www.w3.org/1999/xhtml}metronome]"}]}]},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"dot","sType":"1NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"27"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}time","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"30"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"31"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}clef","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"34"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"35"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}key","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"38"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"39"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1FM","slots":"5","name":"Q{}measureIndex","as":"map(*)","ex:asJ":"FM k[1AS ] v[1ADI ] ","C":[{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}_new","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"42"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"FM k[1AS ] v[1ADI ] ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"choose","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"43","C":[{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}contains","C":[{"N":"treat","as":"FM","diag":"0|0||map:contains","C":[{"N":"check","card":"1","diag":"0|0||map:contains","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:contains","C":[{"N":"attVal","name":"Q{}number"}]}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}put","C":[{"N":"treat","as":"FM","diag":"0|0||map:put","C":[{"N":"check","card":"1","diag":"0|0||map:put","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:put","C":[{"N":"attVal","name":"Q{}number"}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}get","C":[{"N":"treat","as":"FM","diag":"0|0||map:get","C":[{"N":"check","card":"1","diag":"0|0||map:get","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:get","C":[{"N":"attVal","name":"Q{}number"}]}]}]},{"N":"true"},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}put","C":[{"N":"treat","as":"FM","diag":"0|0||map:put","C":[{"N":"check","card":"1","diag":"0|0||map:put","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:put","C":[{"N":"attVal","name":"Q{}number"}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}size","C":[{"N":"treat","as":"FM","diag":"0|0||map:size","C":[{"N":"check","card":"1","diag":"0|0||map:size","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}measureDuration","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"46"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"47"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}forward,NE nQ{http://www.w3.org/1999/xhtml}forward]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}forward,NE nQ{http://www.w3.org/1999/xhtml}forward]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"48","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}backup,NE nQ{http://www.w3.org/1999/xhtml}backup]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}backup,NE nQ{http://www.w3.org/1999/xhtml}backup]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"-","calc":"a-a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"49","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"51","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"52"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"23"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"25","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}measureOnset","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"58"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"59"}]}]}]}]}]}]},{"N":"post","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"60","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}measureDuration"}]}]}]}]}]}]}]}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteDuration","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"63"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"65","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"66"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"33"},{"N":"filter","sType":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"67","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"stop"}]}]},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"35","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]},{"N":"true"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","sType":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"37"}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteOnset","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"73"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"74"}]}]}]}]},{"N":"post","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"76","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"77"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"43"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"45","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteBeat","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"83"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"84"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"86","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"87"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"51"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"53","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"arith","op":"div","calc":"d/d","C":[{"N":"cvUntyped","to":"AO","diag":"1|0|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}harmony","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"93"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"dot","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"94"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}harmonyPreviousDuration","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"97"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"98"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"99"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"101","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"102"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"62"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"64","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"decimalFormat"}],"Σ":"d2d35616"} \ No newline at end of file +{"N":"package","version":"30","packageVersion":"1","saxonVersion":"SaxonJS 2.6","target":"JS","targetVersion":"2","name":"TOP-LEVEL","relocatable":"true","buildDateTime":"2024-09-26T22:49:51.664-07:00","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"co","binds":"","id":"0","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs","as":"1AO ","slots":"203","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[1AO ,1AO ,1AO ] ","sType":"1F r[1AO ] a[1AO ,1AO ,1AO ] ","line":"114","C":[{"N":"arg","slot":"0","name":"Q{}time","as":"AO ","sType":"AO "},{"N":"arg","slot":"1","name":"Q{}divisions","as":"AO ","sType":"AO "},{"N":"arg","slot":"2","name":"Q{}tempo","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","role":"body","C":[{"N":"arith","op":"div","calc":"a/a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"body","line":"118","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}time","slot":"0"}]}]},{"N":"int","val":"60000"}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisions","slot":"1"}]}]}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}tempo","slot":"2"}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"1","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks","as":"1AO ","slots":"202","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[1AO ,1AO ] ","sType":"1F r[1AO ] a[1AO ,1AO ] ","line":"124","C":[{"N":"arg","slot":"0","name":"Q{}time","as":"AO ","sType":"AO "},{"N":"arg","slot":"1","name":"Q{}divisions","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","role":"body","C":[{"N":"fn","name":"round","sType":"?A m[AO,AD,AF]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"body","line":"127","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||round","C":[{"N":"check","card":"?","diag":"0|0||round","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||round","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}time","slot":"0"}]}]},{"N":"int","val":"192"}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisions","slot":"1"}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"2","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration","as":"1AO ","slots":"201","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[* ] ","sType":"1F r[1AO ] a[* ] ","line":"133","C":[{"N":"arg","slot":"0","name":"Q{}harmony","as":"* ","sType":"* "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","role":"body","C":[{"N":"let","var":"Q{}id","slot":"1","sType":"*A ","line":"135","role":"body","C":[{"N":"fn","name":"generate-id","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"135","C":[{"N":"treat","as":"N","diag":"0|0||generate-id","C":[{"N":"check","card":"?","diag":"0|0||generate-id","C":[{"N":"varRef","name":"Q{}harmony","slot":"0"}]}]}]},{"N":"fn","name":"sum","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"138","C":[{"N":"data","diag":"0|0||sum","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}harmony","slot":"0"}]},{"N":"filter","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"and","C":[{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"fn","name":"generate-id","C":[{"N":"fn","name":"reverse","C":[{"N":"first","C":[{"N":"axis","name":"preceding-sibling","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]}]}]},{"N":"data","diag":"1|1||gc","C":[{"N":"varRef","name":"Q{}id","slot":"1"}]}]}]}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"3","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}useSef","sType":"AB ","slots":"200","module":"timemap.xsl","as":"AB ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"false","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"23"}]}]},{"N":"co","binds":"","id":"4","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}renumberMeasures","sType":"AB ","slots":"200","module":"timemap.xsl","as":"AB ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"false","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"24"}]}]},{"N":"co","id":"5","vis":"PUBLIC","ex:uniform":"true","binds":"4","C":[{"N":"globalVariable","name":"Q{}stylesheetParams","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"timemap.xsl","slots":"200","sType":"1FM","C":[{"N":"map","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"31","C":[{"N":"fn","name":"QName","C":[{"N":"str","val":""},{"N":"str","val":"renumberMeasures"}]},{"N":"gVarRef","name":"Q{}renumberMeasures","bSlot":"0"}]}]}]},{"N":"co","id":"6","vis":"PUBLIC","ex:uniform":"true","binds":"3 5","C":[{"N":"globalVariable","name":"Q{}unrolled","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"timemap.xsl","slots":"200","sType":"?ND ","C":[{"N":"doc","sType":"1ND ","base":"file:///home/kratib/src/infojunkie/musicxml-midi/src/xsl/timemap.xsl","role":"select","C":[{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"* ","line":"33","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"33","C":[{"N":"gVarRef","name":"Q{}useSef","bSlot":"0"}]},{"N":"lookup","op":"?","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"38","C":[{"N":"fn","name":"transform","C":[{"N":"map","C":[{"N":"str","val":"source-node"},{"N":"root"},{"N":"str","val":"stylesheet-node"},{"N":"fn","name":"doc","C":[{"N":"str","val":"unroll.xsl"}]},{"N":"str","val":"stylesheet-params"},{"N":"gVarRef","name":"Q{}stylesheetParams","bSlot":"1"}]}]},{"N":"str","val":"output"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"40","C":[{"N":"gVarRef","name":"Q{}useSef","bSlot":"0","sType":"AB ","line":"40"},{"N":"lookup","op":"?","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"45","C":[{"N":"fn","name":"transform","C":[{"N":"map","C":[{"N":"str","val":"source-node"},{"N":"root"},{"N":"str","val":"package-text"},{"N":"fn","name":"unparsed-text","C":[{"N":"str","val":"unroll.sef.json"}]},{"N":"str","val":"stylesheet-params"},{"N":"gVarRef","name":"Q{}stylesheetParams","bSlot":"1"}]}]},{"N":"str","val":"output"}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]}]}]},{"N":"co","id":"7","binds":"0 7 6","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"2","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","minImp":"0","flags":"s","slots":"200","line":"63","module":"timemap.xsl","ex:asJ":"*FM ","expand-text":"false","match":"measure","as":"map(*)*","prio":"0","matches":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ "},{"N":"map","sType":"1FM k[AS] v[*]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"action","line":"79","C":[{"N":"str","val":"measure"},{"N":"ifCall","name":"Q{http://saxon.sf.net/}apply","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}measureIndex"}]},{"N":"arrayBlock","C":[{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}number"}]}]},{"N":"str","val":"timestamp"},{"N":"ufCall","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs","coId":"0","bSlot":"0","C":[{"N":"fn","name":"accumulator-before","C":[{"N":"str","val":"Q{}measureOnset"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}tempo"}]}]},{"N":"str","val":"duration"},{"N":"ufCall","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs","coId":"0","bSlot":"0","C":[{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}measureDuration"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}tempo"}]}]}]}]},{"N":"templateRule","rank":"1","prec":"0","seq":"1","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","minImp":"0","flags":"s","slots":"200","line":"56","module":"timemap.xsl","ex:asJ":"FA ","expand-text":"false","match":"part","as":"array(*)","prio":"0","matches":"NE u[NE nQ{}part,NE nQ{http://www.w3.org/1999/xhtml}part]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}part,NE nQ{http://www.w3.org/1999/xhtml}part]","sType":"1NE u[NE nQ{}part,NE nQ{http://www.w3.org/1999/xhtml}part]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ "},{"N":"check","card":"1","sType":"1FA ","diag":"2|0|XTTE0505|template result","role":"action","C":[{"N":"let","var":"Q{}output","slot":"0","sType":"*FA ","line":"57","role":"action","C":[{"N":"treat","as":"FM ","diag":"2|0|XTTE0570|xsl:variable name=\"Q{}output\"","C":[{"N":"applyT","sType":"* ","line":"58","mode":"#unnamed","bSlot":"1","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"58"}]}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/array}_from-sequence","sType":"1FA v[*]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"60","C":[{"N":"varRef","name":"Q{}output","slot":"0"}]}]}]}]},{"N":"templateRule","rank":"2","prec":"0","seq":"0","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","minImp":"0","flags":"s","slots":"200","line":"52","module":"timemap.xsl","expand-text":"false","match":"/","prio":"-0.5","matches":"ND","C":[{"N":"p.nodeTest","role":"match","test":"ND","sType":"1ND","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ "},{"N":"applyT","sType":"* ","line":"53","mode":"#unnamed","role":"action","bSlot":"1","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"53","C":[{"N":"docOrder","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"gVarRef","name":"Q{}unrolled","bSlot":"2"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}score-partwise,NE nQ{http://www.w3.org/1999/xhtml}score-partwise]"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}part,NE nQ{http://www.w3.org/1999/xhtml}part]"}]}]}]}]}]}]}]},{"N":"overridden"},{"N":"output","C":[{"N":"property","name":"Q{http://saxon.sf.net/}stylesheet-version","value":"30"},{"N":"property","name":"method","value":"json"},{"N":"property","name":"indent","value":"yes"},{"N":"property","name":"encoding","value":"UTF-8"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}divisions","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"18"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}divisions,NE nQ{http://www.w3.org/1999/xhtml}divisions]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}divisions,NE nQ{http://www.w3.org/1999/xhtml}divisions]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"axis","name":"child","nodeTest":"*NT","sType":"*NT","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"19"}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}tempo","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"120","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"22"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withPredicate","role":"match","sType":"1NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tempo"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tempo","sType":"*NA nQ{}tempo","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"23"}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}metronome","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"26"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.withPredicate","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]"},{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}direction-type,NE nQ{http://www.w3.org/1999/xhtml}direction-type]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}metronome,NE nQ{http://www.w3.org/1999/xhtml}metronome]"}]}]},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"dot","sType":"1NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"27"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}time","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"30"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"31"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}clef","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"34"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"35"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}key","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"38"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"39"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1FM","slots":"5","name":"Q{}measureIndex","as":"map(*)","ex:asJ":"FM k[1AS ] v[1ADI ] ","C":[{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}_new","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"42"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"FM k[1AS ] v[1ADI ] ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"choose","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"43","C":[{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}contains","C":[{"N":"treat","as":"FM","diag":"0|0||map:contains","C":[{"N":"check","card":"1","diag":"0|0||map:contains","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:contains","C":[{"N":"attVal","name":"Q{}number"}]}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}put","C":[{"N":"treat","as":"FM","diag":"0|0||map:put","C":[{"N":"check","card":"1","diag":"0|0||map:put","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:put","C":[{"N":"attVal","name":"Q{}number"}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}get","C":[{"N":"treat","as":"FM","diag":"0|0||map:get","C":[{"N":"check","card":"1","diag":"0|0||map:get","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:get","C":[{"N":"attVal","name":"Q{}number"}]}]}]},{"N":"true"},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}put","C":[{"N":"treat","as":"FM","diag":"0|0||map:put","C":[{"N":"check","card":"1","diag":"0|0||map:put","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:put","C":[{"N":"attVal","name":"Q{}number"}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}size","C":[{"N":"treat","as":"FM","diag":"0|0||map:size","C":[{"N":"check","card":"1","diag":"0|0||map:size","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}measureDuration","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"46"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"47"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}forward,NE nQ{http://www.w3.org/1999/xhtml}forward]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}forward,NE nQ{http://www.w3.org/1999/xhtml}forward]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"48","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}backup,NE nQ{http://www.w3.org/1999/xhtml}backup]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}backup,NE nQ{http://www.w3.org/1999/xhtml}backup]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"-","calc":"a-a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"49","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"51","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"52"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"23"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"25","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}measureOnset","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"58"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"59"}]}]}]}]}]}]},{"N":"post","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"60","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}measureDuration"}]}]}]}]}]}]}]}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteDuration","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"63"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"65","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"66"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"33"},{"N":"filter","sType":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"67","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"stop"}]}]},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"35","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]},{"N":"true"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","sType":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"37"}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteOnset","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"73"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"74"}]}]}]}]},{"N":"post","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"76","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"77"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"43"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"45","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteBeat","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"83"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"84"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"86","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"87"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"51"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"53","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"arith","op":"div","calc":"d/d","C":[{"N":"cvUntyped","to":"AO","diag":"1|0|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}harmony","as":"element()*","ex:asJ":"*NE ","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"93"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"dot","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"94"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}harmonyPreviousDuration","as":"xs:double","ex:asJ":"AO ","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"97"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"98"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"99"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"101","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"102"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"62"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"64","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"decimalFormat"}],"Σ":"d2a30e56"} \ No newline at end of file diff --git a/build/unroll.sef.json b/build/unroll.sef.json index 0ec82db9..6d2c16cb 100644 --- a/build/unroll.sef.json +++ b/build/unroll.sef.json @@ -1 +1 @@ -{"N":"package","version":"30","packageVersion":"1","saxonVersion":"SaxonJS 2.6","target":"JS","targetVersion":"2","name":"TOP-LEVEL","relocatable":"true","buildDateTime":"2024-09-16T22:47:19.881-07:00","ns":"xml=~ xsl=~ xs=~ map=~","C":[{"N":"co","binds":"","id":"0","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs","as":"1AO ","slots":"203","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[1AO ,1AO ,1AO ] ","sType":"1F r[1AO ] a[1AO ,1AO ,1AO ] ","line":"114","C":[{"N":"arg","slot":"0","name":"Q{}time","as":"AO ","sType":"AO "},{"N":"arg","slot":"1","name":"Q{}divisions","as":"AO ","sType":"AO "},{"N":"arg","slot":"2","name":"Q{}tempo","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","role":"body","C":[{"N":"arith","op":"div","calc":"a/a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"body","line":"118","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}time","slot":"0"}]}]},{"N":"int","val":"60000"}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisions","slot":"1"}]}]}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}tempo","slot":"2"}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"1","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks","as":"1AO ","slots":"202","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[1AO ,1AO ] ","sType":"1F r[1AO ] a[1AO ,1AO ] ","line":"124","C":[{"N":"arg","slot":"0","name":"Q{}time","as":"AO ","sType":"AO "},{"N":"arg","slot":"1","name":"Q{}divisions","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","role":"body","C":[{"N":"fn","name":"round","sType":"?A m[AO,AD,AF]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"body","line":"127","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||round","C":[{"N":"check","card":"?","diag":"0|0||round","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||round","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}time","slot":"0"}]}]},{"N":"int","val":"192"}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisions","slot":"1"}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"2","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration","as":"1AO ","slots":"201","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[* ] ","sType":"1F r[1AO ] a[* ] ","line":"133","C":[{"N":"arg","slot":"0","name":"Q{}harmony","as":"* ","sType":"* "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","role":"body","C":[{"N":"let","var":"Q{}id","slot":"1","sType":"*A ","line":"135","role":"body","C":[{"N":"fn","name":"generate-id","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"135","C":[{"N":"treat","as":"N","diag":"0|0||generate-id","C":[{"N":"check","card":"?","diag":"0|0||generate-id","C":[{"N":"varRef","name":"Q{}harmony","slot":"0"}]}]}]},{"N":"fn","name":"sum","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"138","C":[{"N":"data","diag":"0|0||sum","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}harmony","slot":"0"}]},{"N":"filter","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"and","C":[{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"fn","name":"generate-id","C":[{"N":"fn","name":"reverse","C":[{"N":"first","C":[{"N":"axis","name":"preceding-sibling","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]}]}]},{"N":"data","diag":"1|1||gc","C":[{"N":"varRef","name":"Q{}id","slot":"1"}]}]}]}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"3","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}renumberMeasures","sType":"AB ","slots":"200","module":"unroll.xsl","as":"AB ","ns":"xml=~ xsl=~ xs=~ map=~","C":[{"N":"false","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"25"}]}]},{"N":"co","id":"4","binds":"4 3","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"2","ns":"xml=~ xsl=~ xs=~ map=~","minImp":"0","flags":"s","slots":"200","line":"61","module":"unroll.xsl","expand-text":"false","match":"measure","prio":"0","matches":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ "},{"N":"sequence","role":"action","sType":"* ","C":[{"N":"param","name":"Q{}previousMeasure","slot":"0","sType":"* ","as":"* ","flags":"","line":"62","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"0","sType":"* "}]},{"N":"param","name":"Q{}previousTime","slot":"1","sType":"* ","as":"* ","flags":"","line":"63","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"1","sType":"* "}]},{"N":"param","name":"Q{}previousDivisions","slot":"2","sType":"* ","as":"* ","flags":"","line":"64","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"2","sType":"* "}]},{"N":"param","name":"Q{}previousKey","slot":"3","sType":"* ","as":"* ","flags":"","line":"65","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"3","sType":"* "}]},{"N":"param","name":"Q{}previousClef","slot":"4","sType":"* ","as":"* ","flags":"","line":"66","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"4","sType":"* "}]},{"N":"param","name":"Q{}previousMetronome","slot":"5","sType":"* ","as":"* ","flags":"","line":"67","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"5","sType":"* "}]},{"N":"param","name":"Q{}repeatMeasure","slot":"6","sType":"* ","as":"* ","flags":"","line":"68","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"6","sType":"* "}]},{"N":"param","name":"Q{}repeatCount","slot":"7","sType":"* ","as":"* ","flags":"","line":"69","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"7","sType":"* "}]},{"N":"param","name":"Q{}jump","slot":"8","sType":"* ","as":"* ","flags":"","line":"70","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"8","sType":"* "}]},{"N":"param","name":"Q{}measureNumber","slot":"9","sType":"ADI ","as":"ADI ","flags":"","line":"71","C":[{"N":"check","card":"1","sType":"1ADI ","diag":"2|0|XTTE0570|xsl:param name=\"Q{}measureNumber\"","role":"select","C":[{"N":"treat","as":"ADI ","diag":"2|0|XTTE0570|xsl:param name=\"Q{}measureNumber\"","role":"select","C":[{"N":"check","card":"1","diag":"2|0|XTTE0570|xsl:param name=\"Q{}measureNumber\"","role":"select","C":[{"N":"cvUntyped","to":"ADI","sType":"*A ","diag":"2|0|XTTE0570|xsl:param name=\"Q{}measureNumber\"","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"empty","sType":"0 ","role":"select"}]}]}]}]}]},{"N":"check","card":"1","sType":"1ADI ","diag":"2|1|XTTE0590|xsl:param name=\"Q{}measureNumber\"","role":"conversion","C":[{"N":"treat","as":"ADI ","diag":"2|1|XTTE0590|xsl:param name=\"Q{}measureNumber\"","role":"conversion","C":[{"N":"check","card":"1","diag":"2|1|XTTE0590|xsl:param name=\"Q{}measureNumber\"","role":"conversion","C":[{"N":"cvUntyped","to":"ADI","sType":"*A ","diag":"2|1|XTTE0590|xsl:param name=\"Q{}measureNumber\"","role":"conversion","C":[{"N":"data","sType":"*A ","role":"conversion","C":[{"N":"supplied","role":"conversion","slot":"9","sType":"* "}]}]}]}]}]}]},{"N":"let","var":"Q{}time","slot":"10","sType":"* ","line":"73","C":[{"N":"docOrder","sType":"*NE ","role":"select","line":"73","C":[{"N":"fn","name":"accumulator-after","sType":"*NE ","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"str","val":"Q{}time"}]}]},{"N":"let","var":"Q{}divisions","slot":"11","sType":"* ","line":"74","C":[{"N":"fn","name":"accumulator-after","sType":"AO ","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"74","C":[{"N":"str","val":"Q{}divisions"}]},{"N":"let","var":"Q{}key","slot":"12","sType":"* ","line":"75","C":[{"N":"docOrder","sType":"*NE ","role":"select","line":"75","C":[{"N":"fn","name":"accumulator-after","sType":"*NE ","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"str","val":"Q{}key"}]}]},{"N":"let","var":"Q{}clef","slot":"13","sType":"* ","line":"76","C":[{"N":"docOrder","sType":"*NE ","role":"select","line":"76","C":[{"N":"fn","name":"accumulator-after","sType":"*NE ","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"str","val":"Q{}clef"}]}]},{"N":"let","var":"Q{}metronome","slot":"14","sType":"* ","line":"77","C":[{"N":"docOrder","sType":"*NE ","role":"select","line":"77","C":[{"N":"fn","name":"accumulator-after","sType":"*NE ","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"str","val":"Q{}metronome"}]}]},{"N":"choose","sType":"* ","type":"item()*","line":"82","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"18","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}type"}]}]},{"N":"str","val":"start"}]}]},{"N":"fn","name":"not","C":[{"N":"fn","name":"index-of","C":[{"N":"fn","name":"tokenize","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||tokenize","C":[{"N":"check","card":"?","diag":"0|0||tokenize","C":[{"N":"data","diag":"0|0||tokenize","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"start"}]}]}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}number"}]}]}]}]}]},{"N":"str","val":"\\s*,\\s*"}]},{"N":"fn","name":"format-number","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||format-number","C":[{"N":"check","card":"?","diag":"0|0||format-number","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||format-number","C":[{"N":"check","card":"?","diag":"0|0||format-number","C":[{"N":"data","diag":"0|0||format-number","C":[{"N":"varRef","name":"Q{}repeatCount","slot":"7"}]}]}]}]}]},{"N":"str","val":"0"}]},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]}]},{"N":"let","var":"Q{}nextMeasure","slot":"15","sType":"* ","line":"83","C":[{"N":"first","sType":"?NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"83","C":[{"N":"filter","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}type"}]}]}]},{"N":"str","val":"start"}]},{"N":"fn","name":"index-of","C":[{"N":"fn","name":"tokenize","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||tokenize","C":[{"N":"check","card":"?","diag":"0|0||tokenize","C":[{"N":"data","diag":"0|0||tokenize","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"start"}]}]}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}number"}]}]}]}]}]},{"N":"str","val":"\\s*,\\s*"}]},{"N":"fn","name":"format-number","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||format-number","C":[{"N":"check","card":"?","diag":"0|0||format-number","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||format-number","C":[{"N":"check","card":"?","diag":"0|0||format-number","C":[{"N":"data","diag":"0|0||format-number","C":[{"N":"varRef","name":"Q{}repeatCount","slot":"7"}]}]}]}]}]},{"N":"str","val":"0"}]},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]}]}]},{"N":"applyT","sType":"* ","line":"84","mode":"#unnamed","bSlot":"0","C":[{"N":"varRef","name":"Q{}nextMeasure","slot":"15","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"84"},{"N":"withParam","name":"Q{}repeatMeasure","slot":"6","sType":"*","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"85"}]},{"N":"withParam","name":"Q{}repeatCount","slot":"7","sType":"*","C":[{"N":"varRef","name":"Q{}repeatCount","slot":"7","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"86"}]},{"N":"withParam","name":"Q{}jump","slot":"8","sType":"*","C":[{"N":"varRef","name":"Q{}jump","slot":"8","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"87"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"88"}]},{"N":"withParam","name":"Q{}previousTime","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"89"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"90"}]},{"N":"withParam","name":"Q{}previousKey","slot":"3","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"91"}]},{"N":"withParam","name":"Q{}previousClef","slot":"4","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"92"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"5","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"93"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"9","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"94","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}measureNumber","slot":"9"}]}]},{"N":"int","val":"1"}]}]}]}]},{"N":"true"},{"N":"sequence","sType":"* ","C":[{"N":"copy","sType":"1NE u[1NE nQ{}measure ,1NE nQ{http://www.w3.org/1999/xhtml}measure ] ","flags":"cin","line":"104","C":[{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"* ","line":"105","C":[{"N":"gVarRef","name":"Q{}renumberMeasures","bSlot":"1","sType":"AB ","line":"105"},{"N":"sequence","sType":"* ","C":[{"N":"att","name":"number","sType":"1NA ","line":"106","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"valueOf","sType":"1NT ","flags":"l","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"varRef","sType":"*","name":"Q{}measureNumber","slot":"9","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"35"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":""}]}]},{"N":"applyT","sType":"* ","line":"107","mode":"#unnamed","bSlot":"0","C":[{"N":"filter","sType":"*NA","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"107","C":[{"N":"axis","name":"attribute","nodeTest":"*NA"},{"N":"compareToString","op":"ne","val":"number","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","C":[{"N":"fn","name":"local-name","C":[{"N":"dot"}]}]}]}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"109","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"109","C":[{"N":"gVarRef","name":"Q{}renumberMeasures","bSlot":"1"}]},{"N":"applyT","sType":"* ","line":"110","mode":"#unnamed","bSlot":"0","C":[{"N":"axis","name":"attribute","nodeTest":"*NA","sType":"*NA","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"110"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"let","var":"Q{}attributes","slot":"15","sType":"* ","line":"118","C":[{"N":"treat","as":"NE ","diag":"2|0|XTTE0570|xsl:variable name=\"Q{}attributes\"","C":[{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"? ","line":"119","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"119","C":[{"N":"and","C":[{"N":"varRef","name":"Q{}divisions","slot":"11"},{"N":"fn","name":"not","C":[{"N":"fn","name":"deep-equal","C":[{"N":"varRef","name":"Q{}divisions","slot":"11"},{"N":"varRef","name":"Q{}previousDivisions","slot":"2"},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]}]},{"N":"fn","name":"not","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"dot"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}divisions,NE nQ{http://www.w3.org/1999/xhtml}divisions]"}]}]}]}]},{"N":"elem","type":"element()","name":"divisions","sType":"1NE ","nsuri":"","line":"120","C":[{"N":"copyOf","flags":"c","ns":"xml=~ xsl=~ xs=~ map=~ ex=http://ns.saxonica.com/xslt/export","line":"121","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"121"}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"124","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"124","C":[{"N":"and","C":[{"N":"varRef","name":"Q{}key","slot":"12"},{"N":"fn","name":"not","C":[{"N":"fn","name":"deep-equal","C":[{"N":"varRef","name":"Q{}key","slot":"12"},{"N":"varRef","name":"Q{}previousKey","slot":"3"},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]}]},{"N":"fn","name":"not","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"dot"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]"}]}]}]}]},{"N":"copyOf","flags":"c","ns":"xml=~ xsl=~ xs=~ map=~ ex=http://ns.saxonica.com/xslt/export","line":"125","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"125"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"127","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"127","C":[{"N":"and","C":[{"N":"varRef","name":"Q{}time","slot":"10"},{"N":"fn","name":"not","C":[{"N":"fn","name":"deep-equal","C":[{"N":"varRef","name":"Q{}time","slot":"10"},{"N":"varRef","name":"Q{}previousTime","slot":"1"},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]}]},{"N":"fn","name":"not","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"dot"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]"}]}]}]}]},{"N":"copyOf","flags":"c","ns":"xml=~ xsl=~ xs=~ map=~ ex=http://ns.saxonica.com/xslt/export","line":"128","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"128"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"130","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"130","C":[{"N":"and","C":[{"N":"varRef","name":"Q{}clef","slot":"13"},{"N":"fn","name":"not","C":[{"N":"fn","name":"deep-equal","C":[{"N":"varRef","name":"Q{}clef","slot":"13"},{"N":"varRef","name":"Q{}previousClef","slot":"4"},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]}]},{"N":"fn","name":"not","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"dot"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]"}]}]}]}]},{"N":"copyOf","flags":"c","ns":"xml=~ xsl=~ xs=~ map=~ ex=http://ns.saxonica.com/xslt/export","line":"131","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"131"}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]},{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"? ","line":"134","C":[{"N":"compareToInt","op":"gt","val":"0","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"134","C":[{"N":"fn","name":"count","C":[{"N":"varRef","name":"Q{}attributes","slot":"15"}]}]},{"N":"elem","type":"element()","name":"attributes","sType":"1NE ","nsuri":"","line":"135","C":[{"N":"copyOf","flags":"c","ns":"xml=~ xsl=~ xs=~ map=~ ex=http://ns.saxonica.com/xslt/export","line":"136","sType":"*","C":[{"N":"varRef","name":"Q{}attributes","slot":"15","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"136"}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"let","var":"Q{}direction","slot":"16","sType":"* ","line":"139","C":[{"N":"treat","as":"NE ","diag":"2|0|XTTE0570|xsl:variable name=\"Q{}direction\"","C":[{"N":"choose","sType":"* ","line":"140","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"140","C":[{"N":"and","C":[{"N":"varRef","name":"Q{}metronome","slot":"14"},{"N":"fn","name":"not","C":[{"N":"fn","name":"deep-equal","C":[{"N":"varRef","name":"Q{}metronome","slot":"14"},{"N":"varRef","name":"Q{}previousMetronome","slot":"5"},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]}]},{"N":"fn","name":"not","C":[{"N":"slash","op":"/","C":[{"N":"dot"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]"},{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}direction-type,NE nQ{http://www.w3.org/1999/xhtml}direction-type]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}metronome,NE nQ{http://www.w3.org/1999/xhtml}metronome]"}]}]}]}]}]},{"N":"copyOf","flags":"c","ns":"xml=~ xsl=~ xs=~ map=~ ex=http://ns.saxonica.com/xslt/export","line":"141","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"141"}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]},{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"* ","line":"144","C":[{"N":"compareToInt","op":"gt","val":"0","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"144","C":[{"N":"fn","name":"count","C":[{"N":"varRef","name":"Q{}direction","slot":"16"}]}]},{"N":"copyOf","flags":"c","ns":"xml=~ xsl=~ xs=~ map=~ ex=http://ns.saxonica.com/xslt/export","line":"145","sType":"*","C":[{"N":"varRef","name":"Q{}direction","slot":"16","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"145"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"applyT","sType":"* ","line":"155","mode":"#unnamed","bSlot":"0","C":[{"N":"filter","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"155","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"fn","name":"not","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"axis","name":"self","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"self","nodeTest":"*NE"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}segno"}]}]}]}]},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"self","nodeTest":"*NE"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}dalsegno"}]}]}]}]},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"self","nodeTest":"*NE"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}fine"}]}]}]}]},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"self","nodeTest":"*NE"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}dacapo"}]}]}]}]},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"self","nodeTest":"*NE"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tocoda"}]}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"choose","sType":"* ","type":"item()*","line":"161","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"166","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}fine"}]}]}]},{"N":"str","val":"yes"}]},{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}jump","slot":"8"}]},{"N":"str","val":""}]}]},{"N":"empty","sType":"0 "},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"172","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tocoda"}]}]},{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}jump","slot":"8"}]},{"N":"str","val":""}]}]},{"N":"let","var":"Q{}coda","slot":"15","sType":"* ","line":"173","C":[{"N":"docOrder","sType":"*NA nQ{}tocoda","role":"select","line":"173","C":[{"N":"docOrder","sType":"*NA nQ{}tocoda","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tocoda"}]}]}]},{"N":"let","var":"Q{}nextMeasure","slot":"16","sType":"* ","line":"174","C":[{"N":"filter","sType":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"174","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}coda"}]}]}]},{"N":"data","diag":"1|1||gc","C":[{"N":"varRef","name":"Q{}coda","slot":"15"}]}]}]},{"N":"applyT","sType":"* ","line":"175","mode":"#unnamed","bSlot":"0","C":[{"N":"varRef","name":"Q{}nextMeasure","slot":"16","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"175"},{"N":"withParam","name":"Q{}repeatMeasure","slot":"6","sType":"*NE","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"176","C":[{"N":"docOrder","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"root"},{"N":"axis","name":"descendant-or-self","nodeTest":"*N"}]},{"N":"first","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]}]}]}]},{"N":"withParam","name":"Q{}repeatCount","slot":"7","sType":"1ADI","C":[{"N":"int","val":"10000","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"177"}]},{"N":"withParam","name":"Q{}jump","slot":"8","sType":"*","C":[{"N":"varRef","name":"Q{}coda","slot":"15","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"178"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"179"}]},{"N":"withParam","name":"Q{}previousTime","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"180"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"181"}]},{"N":"withParam","name":"Q{}previousKey","slot":"3","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"182"}]},{"N":"withParam","name":"Q{}previousClef","slot":"4","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"183"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"5","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"184"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"9","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"185","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}measureNumber","slot":"9"}]}]},{"N":"int","val":"1"}]}]}]}]}]},{"N":"or","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"192","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}repeat,NE nQ{http://www.w3.org/1999/xhtml}repeat]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}direction"}]}]}]},{"N":"str","val":"forward"}]},{"N":"vc","op":"eq","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","C":[{"N":"fn","name":"generate-id","C":[{"N":"dot"}]},{"N":"fn","name":"generate-id","C":[{"N":"treat","as":"N","diag":"0|0||generate-id","C":[{"N":"check","card":"?","diag":"0|0||generate-id","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6"}]}]}]}]}]},{"N":"applyT","sType":"* ","line":"193","mode":"#unnamed","bSlot":"0","C":[{"N":"first","sType":"?NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"193","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"withParam","name":"Q{}repeatMeasure","slot":"6","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"194"}]},{"N":"withParam","name":"Q{}repeatCount","slot":"7","sType":"*","C":[{"N":"choose","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"195","C":[{"N":"vc","op":"eq","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","C":[{"N":"fn","name":"generate-id","C":[{"N":"dot"}]},{"N":"fn","name":"generate-id","C":[{"N":"treat","as":"N","diag":"0|0||generate-id","C":[{"N":"check","card":"?","diag":"0|0||generate-id","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6"}]}]}]}]},{"N":"varRef","name":"Q{}repeatCount","slot":"7"},{"N":"true"},{"N":"int","val":"1"}]}]},{"N":"withParam","name":"Q{}jump","slot":"8","sType":"*","C":[{"N":"varRef","name":"Q{}jump","slot":"8","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"196"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"197"}]},{"N":"withParam","name":"Q{}previousTime","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"198"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"199"}]},{"N":"withParam","name":"Q{}previousKey","slot":"3","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"200"}]},{"N":"withParam","name":"Q{}previousClef","slot":"4","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"201"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"5","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"202"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"9","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"203","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}measureNumber","slot":"9"}]}]},{"N":"int","val":"1"}]}]}]},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"213","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}repeat,NE nQ{http://www.w3.org/1999/xhtml}repeat]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}direction"}]}]}]},{"N":"str","val":"backward"}]},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}jump","slot":"8"}]},{"N":"str","val":""}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}repeat,NE nQ{http://www.w3.org/1999/xhtml}repeat]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}after-jump"}]}]}]},{"N":"str","val":"yes"}]}]}]},{"N":"gc","op":">","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"choose","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}repeat,NE nQ{http://www.w3.org/1999/xhtml}repeat]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}times"}]}]},{"N":"fn","name":"number","C":[{"N":"check","card":"?","diag":"0|0||number","C":[{"N":"data","diag":"0|0||number","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}repeat,NE nQ{http://www.w3.org/1999/xhtml}repeat]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}times"}]}]}]}]}]},{"N":"true"},{"N":"int","val":"2"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"varRef","name":"Q{}repeatCount","slot":"7"}]}]}]},{"N":"applyT","sType":"* ","line":"214","mode":"#unnamed","bSlot":"0","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"214"},{"N":"withParam","name":"Q{}repeatMeasure","slot":"6","sType":"*","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"215"}]},{"N":"withParam","name":"Q{}repeatCount","slot":"7","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"216","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}repeatCount","slot":"7"}]}]},{"N":"int","val":"1"}]}]},{"N":"withParam","name":"Q{}jump","slot":"8","sType":"*","C":[{"N":"varRef","name":"Q{}jump","slot":"8","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"217"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"218"}]},{"N":"withParam","name":"Q{}previousTime","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"219"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"220"}]},{"N":"withParam","name":"Q{}previousKey","slot":"3","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"221"}]},{"N":"withParam","name":"Q{}previousClef","slot":"4","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"222"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"5","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"223"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"9","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"224","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}measureNumber","slot":"9"}]}]},{"N":"int","val":"1"}]}]}]},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"234","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}type"}]}]},{"N":"str","val":"stop"}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}repeat,NE nQ{http://www.w3.org/1999/xhtml}repeat]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}direction"}]}]}]},{"N":"str","val":"backward"}]},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6"}]},{"N":"filter","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"},{"N":"and","C":[{"N":"and","C":[{"N":"fn","name":"reverse","C":[{"N":"filter","C":[{"N":"first","C":[{"N":"filter","C":[{"N":"axis","name":"preceding-sibling","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}repeat,NE nQ{http://www.w3.org/1999/xhtml}repeat]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}direction"}]}]}]},{"N":"str","val":"forward"}]}]}]},{"N":"vc","op":"eq","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","C":[{"N":"fn","name":"generate-id","C":[{"N":"dot"}]},{"N":"fn","name":"generate-id","C":[{"N":"treat","as":"N","diag":"0|0||generate-id","C":[{"N":"check","card":"?","diag":"0|0||generate-id","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6"}]}]}]}]}]}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}type"}]}]}]},{"N":"str","val":"start"}]}]},{"N":"fn","name":"index-of","C":[{"N":"fn","name":"tokenize","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||tokenize","C":[{"N":"check","card":"?","diag":"0|0||tokenize","C":[{"N":"data","diag":"0|0||tokenize","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"start"}]}]}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}number"}]}]}]}]}]},{"N":"str","val":"\\s*,\\s*"}]},{"N":"fn","name":"format-number","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||format-number","C":[{"N":"check","card":"?","diag":"0|0||format-number","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||format-number","C":[{"N":"arith","op":"+","calc":"a+a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}repeatCount","slot":"7"}]}]},{"N":"int","val":"1"}]}]}]}]},{"N":"str","val":"0"}]},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]}]}]}]}]},{"N":"applyT","sType":"* ","line":"235","mode":"#unnamed","bSlot":"0","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"235"},{"N":"withParam","name":"Q{}repeatMeasure","slot":"6","sType":"*","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"236"}]},{"N":"withParam","name":"Q{}repeatCount","slot":"7","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"237","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}repeatCount","slot":"7"}]}]},{"N":"int","val":"1"}]}]},{"N":"withParam","name":"Q{}jump","slot":"8","sType":"*","C":[{"N":"varRef","name":"Q{}jump","slot":"8","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"238"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"239"}]},{"N":"withParam","name":"Q{}previousTime","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"240"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"241"}]},{"N":"withParam","name":"Q{}previousKey","slot":"3","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"242"}]},{"N":"withParam","name":"Q{}previousClef","slot":"4","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"243"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"5","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"244"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"9","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"245","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}measureNumber","slot":"9"}]}]},{"N":"int","val":"1"}]}]}]},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"251","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}dacapo"}]}]}]},{"N":"str","val":"yes"}]},{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}jump","slot":"8"}]},{"N":"str","val":"capo"}]}]},{"N":"applyT","sType":"* ","line":"252","mode":"#unnamed","bSlot":"0","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"252","C":[{"N":"docOrder","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"root"},{"N":"axis","name":"descendant-or-self","nodeTest":"*N"}]},{"N":"first","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]}]}]},{"N":"withParam","name":"Q{}repeatMeasure","slot":"6","sType":"*NE","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"253","C":[{"N":"docOrder","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"root"},{"N":"axis","name":"descendant-or-self","nodeTest":"*N"}]},{"N":"first","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]}]}]}]},{"N":"withParam","name":"Q{}repeatCount","slot":"7","sType":"1ADI","C":[{"N":"int","val":"10000","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"254"}]},{"N":"withParam","name":"Q{}jump","slot":"8","sType":"1AS","C":[{"N":"str","val":"capo","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"255"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"256"}]},{"N":"withParam","name":"Q{}previousTime","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"257"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"258"}]},{"N":"withParam","name":"Q{}previousKey","slot":"3","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"259"}]},{"N":"withParam","name":"Q{}previousClef","slot":"4","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"260"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"5","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"261"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"9","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"262","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}measureNumber","slot":"9"}]}]},{"N":"int","val":"1"}]}]}]},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"268","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}dalsegno"}]}]},{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}jump","slot":"8"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}dalsegno"}]}]}]}]}]},{"N":"let","var":"Q{}segno","slot":"15","sType":"* ","line":"269","C":[{"N":"docOrder","sType":"*NA nQ{}dalsegno","role":"select","line":"269","C":[{"N":"docOrder","sType":"*NA nQ{}dalsegno","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}dalsegno"}]}]}]},{"N":"let","var":"Q{}nextMeasure","slot":"16","sType":"* ","line":"270","C":[{"N":"fn","name":"reverse","sType":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"270","C":[{"N":"filter","C":[{"N":"axis","name":"preceding-sibling","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}segno"}]}]}]},{"N":"data","diag":"1|1||gc","C":[{"N":"varRef","name":"Q{}segno","slot":"15"}]}]}]}]},{"N":"applyT","sType":"* ","line":"271","mode":"#unnamed","bSlot":"0","C":[{"N":"varRef","name":"Q{}nextMeasure","slot":"16","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"271"},{"N":"withParam","name":"Q{}repeatMeasure","slot":"6","sType":"*NE","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"272","C":[{"N":"docOrder","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"root"},{"N":"axis","name":"descendant-or-self","nodeTest":"*N"}]},{"N":"first","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]}]}]}]},{"N":"withParam","name":"Q{}repeatCount","slot":"7","sType":"1ADI","C":[{"N":"int","val":"10000","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"273"}]},{"N":"withParam","name":"Q{}jump","slot":"8","sType":"*","C":[{"N":"varRef","name":"Q{}segno","slot":"15","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"274"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"275"}]},{"N":"withParam","name":"Q{}previousTime","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"276"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"277"}]},{"N":"withParam","name":"Q{}previousKey","slot":"3","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"278"}]},{"N":"withParam","name":"Q{}previousClef","slot":"4","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"279"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"5","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"280"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"9","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"281","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}measureNumber","slot":"9"}]}]},{"N":"int","val":"1"}]}]}]}]}]},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"287","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}repeat,NE nQ{http://www.w3.org/1999/xhtml}repeat]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}direction"}]}]}]},{"N":"str","val":"backward"}]},{"N":"gc","op":"<=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"fn","name":"number","C":[{"N":"check","card":"?","diag":"0|0||number","C":[{"N":"data","diag":"0|0||number","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}repeat,NE nQ{http://www.w3.org/1999/xhtml}repeat]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}times"}]}]}]}]}]},{"N":"data","diag":"1|1||gc","C":[{"N":"varRef","name":"Q{}repeatCount","slot":"7"}]}]}]},{"N":"applyT","sType":"* ","line":"288","mode":"#unnamed","bSlot":"0","C":[{"N":"first","sType":"?NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"288","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"withParam","name":"Q{}repeatMeasure","slot":"6","sType":"*NE","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"289","C":[{"N":"docOrder","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"root"},{"N":"axis","name":"descendant-or-self","nodeTest":"*N"}]},{"N":"first","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]}]}]}]},{"N":"withParam","name":"Q{}repeatCount","slot":"7","sType":"1ADI","C":[{"N":"int","val":"10000","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"290"}]},{"N":"withParam","name":"Q{}jump","slot":"8","sType":"*","C":[{"N":"varRef","name":"Q{}jump","slot":"8","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"291"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"292"}]},{"N":"withParam","name":"Q{}previousTime","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"293"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"294"}]},{"N":"withParam","name":"Q{}previousKey","slot":"3","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"295"}]},{"N":"withParam","name":"Q{}previousClef","slot":"4","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"296"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"5","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"297"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"9","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"298","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}measureNumber","slot":"9"}]}]},{"N":"int","val":"1"}]}]}]},{"N":"true"},{"N":"applyT","sType":"* ","line":"305","mode":"#unnamed","bSlot":"0","C":[{"N":"first","sType":"?NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"305","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"withParam","name":"Q{}repeatMeasure","slot":"6","sType":"*","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"306"}]},{"N":"withParam","name":"Q{}repeatCount","slot":"7","sType":"*","C":[{"N":"varRef","name":"Q{}repeatCount","slot":"7","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"307"}]},{"N":"withParam","name":"Q{}jump","slot":"8","sType":"*","C":[{"N":"varRef","name":"Q{}jump","slot":"8","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"308"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"309"}]},{"N":"withParam","name":"Q{}previousTime","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"310"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"311"}]},{"N":"withParam","name":"Q{}previousKey","slot":"3","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"312"}]},{"N":"withParam","name":"Q{}previousClef","slot":"4","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"313"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"5","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"314"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"9","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"315","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}measureNumber","slot":"9"}]}]},{"N":"int","val":"1"}]}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"templateRule","rank":"1","prec":"0","seq":"1","ns":"xml=~ xsl=~ xs=~ map=~","minImp":"0","flags":"s","slots":"200","line":"34","module":"unroll.xsl","expand-text":"false","match":"part","prio":"0","matches":"NE u[NE nQ{}part,NE nQ{http://www.w3.org/1999/xhtml}part]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}part,NE nQ{http://www.w3.org/1999/xhtml}part]","sType":"1NE u[NE nQ{}part,NE nQ{http://www.w3.org/1999/xhtml}part]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ "},{"N":"copy","sType":"1NE u[1NE nQ{}part ,1NE nQ{http://www.w3.org/1999/xhtml}part ] ","flags":"cin","role":"action","line":"35","C":[{"N":"sequence","sType":"* ","C":[{"N":"applyT","sType":"* ","line":"36","mode":"#unnamed","bSlot":"0","C":[{"N":"axis","name":"attribute","nodeTest":"*NA","sType":"*NA","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"36"}]},{"N":"applyT","sType":"* ","line":"37","mode":"#unnamed","bSlot":"0","C":[{"N":"first","sType":"?NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"37","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"withParam","name":"Q{}repeatMeasure","slot":"0","sType":"?NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"first","sType":"?NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"38","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"withParam","name":"Q{}repeatCount","slot":"0","sType":"1ADI","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"39"}]},{"N":"withParam","name":"Q{}jump","slot":"0","sType":"1AS ","C":[{"N":"str","sType":"1AS ","val":"","role":"select"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1AS ","C":[{"N":"str","sType":"1AS ","val":"","role":"select"}]},{"N":"withParam","name":"Q{}previousTime","slot":"0","sType":"0E","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"42"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"0","sType":"0E","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"43"}]},{"N":"withParam","name":"Q{}previousKey","slot":"0","sType":"0E","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"44"}]},{"N":"withParam","name":"Q{}previousClef","slot":"0","sType":"0E","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"45"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"0","sType":"0E","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"46"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"0","sType":"*","C":[{"N":"choose","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"47","C":[{"N":"compareToString","op":"ne","val":"NaN","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","C":[{"N":"fn","name":"string","C":[{"N":"fn","name":"number","C":[{"N":"check","card":"?","diag":"0|0||number","C":[{"N":"data","diag":"0|0||number","C":[{"N":"slash","op":"/","C":[{"N":"first","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}number"}]}]}]}]}]}]},{"N":"slash","op":"/","C":[{"N":"first","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}number"}]},{"N":"true"},{"N":"int","val":"0"}]}]}]}]}]}]},{"N":"templateRule","rank":"2","prec":"0","seq":"4","ns":"xml=~ xsl=~ xs=~ map=~","minImp":"0","flags":"s","slots":"200","line":"334","module":"unroll.xsl","expand-text":"false","match":"*|@*|comment()|processing-instruction()","prio":"-0.5","matches":"NE","C":[{"N":"p.nodeTest","role":"match","test":"NE","sType":"1NE"},{"N":"copy","sType":"1NE ","flags":"cin","role":"action","line":"335","C":[{"N":"applyT","sType":"* ","line":"337","mode":"#unnamed","bSlot":"0","C":[{"N":"docOrder","sType":"*N u[N u[N u[N u[NE,NA],NC],NP],NT]","role":"select","line":"337","C":[{"N":"union","op":"|","sType":"*N u[N u[N u[N u[NE,NA],NC],NP],NT]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"attribute","nodeTest":"*NA"}]},{"N":"axis","name":"child","nodeTest":"*NC"}]},{"N":"axis","name":"child","nodeTest":"*NP"}]},{"N":"axis","name":"child","nodeTest":"*NT"}]}]}]}]}]},{"N":"templateRule","rank":"3","prec":"0","seq":"4","ns":"xml=~ xsl=~ xs=~ map=~","minImp":"0","flags":"s","slots":"200","line":"334","module":"unroll.xsl","expand-text":"false","match":"*|@*|comment()|processing-instruction()","prio":"-0.5","matches":"NA","C":[{"N":"p.nodeTest","role":"match","test":"NA","sType":"1NA"},{"N":"copy","sType":"1NA ","flags":"cin","role":"action","line":"335","C":[{"N":"applyT","sType":"* ","line":"337","mode":"#unnamed","bSlot":"0","C":[{"N":"docOrder","sType":"*N u[N u[N u[N u[NE,NA],NC],NP],NT]","role":"select","line":"337","C":[{"N":"union","op":"|","sType":"*N u[N u[N u[N u[NE,NA],NC],NP],NT]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"attribute","nodeTest":"*NA"}]},{"N":"axis","name":"child","nodeTest":"*NC"}]},{"N":"axis","name":"child","nodeTest":"*NP"}]},{"N":"axis","name":"child","nodeTest":"*NT"}]}]}]}]}]},{"N":"templateRule","rank":"4","prec":"0","seq":"4","ns":"xml=~ xsl=~ xs=~ map=~","minImp":"0","flags":"s","slots":"200","line":"334","module":"unroll.xsl","expand-text":"false","match":"*|@*|comment()|processing-instruction()","prio":"-0.5","matches":"NC","C":[{"N":"p.nodeTest","role":"match","test":"NC","sType":"1NC"},{"N":"copy","sType":"1NC ","flags":"cin","role":"action","line":"335","C":[{"N":"applyT","sType":"* ","line":"337","mode":"#unnamed","bSlot":"0","C":[{"N":"docOrder","sType":"*N u[N u[N u[N u[NE,NA],NC],NP],NT]","role":"select","line":"337","C":[{"N":"union","op":"|","sType":"*N u[N u[N u[N u[NE,NA],NC],NP],NT]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"attribute","nodeTest":"*NA"}]},{"N":"axis","name":"child","nodeTest":"*NC"}]},{"N":"axis","name":"child","nodeTest":"*NP"}]},{"N":"axis","name":"child","nodeTest":"*NT"}]}]}]}]}]},{"N":"templateRule","rank":"5","prec":"0","seq":"4","ns":"xml=~ xsl=~ xs=~ map=~","minImp":"0","flags":"s","slots":"200","line":"334","module":"unroll.xsl","expand-text":"false","match":"*|@*|comment()|processing-instruction()","prio":"-0.5","matches":"NP","C":[{"N":"p.nodeTest","role":"match","test":"NP","sType":"1NP"},{"N":"copy","sType":"1NP ","flags":"cin","role":"action","line":"335","C":[{"N":"applyT","sType":"* ","line":"337","mode":"#unnamed","bSlot":"0","C":[{"N":"docOrder","sType":"*N u[N u[N u[N u[NE,NA],NC],NP],NT]","role":"select","line":"337","C":[{"N":"union","op":"|","sType":"*N u[N u[N u[N u[NE,NA],NC],NP],NT]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"attribute","nodeTest":"*NA"}]},{"N":"axis","name":"child","nodeTest":"*NC"}]},{"N":"axis","name":"child","nodeTest":"*NP"}]},{"N":"axis","name":"child","nodeTest":"*NT"}]}]}]}]}]},{"N":"templateRule","rank":"6","prec":"0","seq":"3","ns":"xml=~ xsl=~ xs=~ map=~","minImp":"0","flags":"s","slots":"200","line":"326","module":"unroll.xsl","expand-text":"false","match":"text()","prio":"-0.5","matches":"NT","C":[{"N":"p.nodeTest","role":"match","test":"NT","sType":"1NT","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ "},{"N":"valueOf","flags":"l","sType":"1NT ","role":"action","line":"327","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"dot","sType":"1NT","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"327"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]},{"N":"templateRule","rank":"7","prec":"0","seq":"0","ns":"xml=~ xsl=~ xs=~ map=~","minImp":"0","flags":"s","slots":"200","line":"30","module":"unroll.xsl","expand-text":"false","match":"/","prio":"-0.5","matches":"ND","C":[{"N":"p.nodeTest","role":"match","test":"ND","sType":"1ND","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ "},{"N":"applyT","sType":"* ","line":"31","mode":"#unnamed","role":"action","bSlot":"0","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"31","C":[{"N":"slash","op":"/","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"dot"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}score-partwise,NE nQ{http://www.w3.org/1999/xhtml}score-partwise]"}]}]}]}]}]}]},{"N":"overridden"},{"N":"output","C":[{"N":"property","name":"Q{http://saxon.sf.net/}stylesheet-version","value":"30"},{"N":"property","name":"method","value":"xml"},{"N":"property","name":"indent","value":"yes"},{"N":"property","name":"encoding","value":"UTF-8"},{"N":"property","name":"omit-xml-declaration","value":"no"},{"N":"property","name":"standalone","value":"no"},{"N":"property","name":"doctype-system","value":"http://www.musicxml.org/dtds/partwise.dtd"},{"N":"property","name":"doctype-public","value":"-//Recordare//DTD MusicXML 4.0 Partwise//EN"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}divisions","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"18"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}divisions,NE nQ{http://www.w3.org/1999/xhtml}divisions]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}divisions,NE nQ{http://www.w3.org/1999/xhtml}divisions]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"axis","name":"child","nodeTest":"*NT","sType":"*NT","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"19"}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}tempo","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"120","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"22"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withPredicate","role":"match","sType":"1NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tempo"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tempo","sType":"*NA nQ{}tempo","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"23"}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}metronome","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"26"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ ","C":[{"N":"p.withPredicate","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]"},{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}direction-type,NE nQ{http://www.w3.org/1999/xhtml}direction-type]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}metronome,NE nQ{http://www.w3.org/1999/xhtml}metronome]"}]}]},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"dot","sType":"1NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"27"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}time","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"30"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"31"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}clef","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"34"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"35"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}key","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"38"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"39"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1FM","slots":"5","name":"Q{}measureIndex","as":"map(*)","ex:asJ":"FM k[1AS ] v[1ADI ] ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}_new","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"42"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"FM k[1AS ] v[1ADI ] ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"choose","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"43","C":[{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}contains","C":[{"N":"treat","as":"FM","diag":"0|0||map:contains","C":[{"N":"check","card":"1","diag":"0|0||map:contains","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:contains","C":[{"N":"attVal","name":"Q{}number"}]}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}put","C":[{"N":"treat","as":"FM","diag":"0|0||map:put","C":[{"N":"check","card":"1","diag":"0|0||map:put","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:put","C":[{"N":"attVal","name":"Q{}number"}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}get","C":[{"N":"treat","as":"FM","diag":"0|0||map:get","C":[{"N":"check","card":"1","diag":"0|0||map:get","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:get","C":[{"N":"attVal","name":"Q{}number"}]}]}]},{"N":"true"},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}put","C":[{"N":"treat","as":"FM","diag":"0|0||map:put","C":[{"N":"check","card":"1","diag":"0|0||map:put","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:put","C":[{"N":"attVal","name":"Q{}number"}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}size","C":[{"N":"treat","as":"FM","diag":"0|0||map:size","C":[{"N":"check","card":"1","diag":"0|0||map:size","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}measureDuration","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"46"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"47"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}forward,NE nQ{http://www.w3.org/1999/xhtml}forward]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}forward,NE nQ{http://www.w3.org/1999/xhtml}forward]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"48","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}backup,NE nQ{http://www.w3.org/1999/xhtml}backup]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}backup,NE nQ{http://www.w3.org/1999/xhtml}backup]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"-","calc":"a-a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"49","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"51","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"52"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"23"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"25","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}measureOnset","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"58"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"59"}]}]}]}]}]}]},{"N":"post","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"60","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}measureDuration"}]}]}]}]}]}]}]}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteDuration","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"63"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"65","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"66"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"33"},{"N":"filter","sType":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"67","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"stop"}]}]},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"35","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]},{"N":"true"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","sType":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"37"}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteOnset","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"73"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"74"}]}]}]}]},{"N":"post","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"76","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"77"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"43"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"45","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteBeat","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"83"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"84"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"86","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"87"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"51"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"53","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"arith","op":"div","calc":"d/d","C":[{"N":"cvUntyped","to":"AO","diag":"1|0|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}harmony","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"93"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"dot","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"94"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}harmonyPreviousDuration","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"97"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"98"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"99"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"101","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"102"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"62"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"64","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"decimalFormat"}],"Σ":"29ea7d7e"} \ No newline at end of file +{"N":"package","version":"30","packageVersion":"1","saxonVersion":"SaxonJS 2.6","target":"JS","targetVersion":"2","name":"TOP-LEVEL","relocatable":"true","buildDateTime":"2024-09-26T22:49:52.45-07:00","ns":"xml=~ xsl=~ xs=~ map=~","C":[{"N":"co","binds":"","id":"0","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs","as":"1AO ","slots":"203","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[1AO ,1AO ,1AO ] ","sType":"1F r[1AO ] a[1AO ,1AO ,1AO ] ","line":"114","C":[{"N":"arg","slot":"0","name":"Q{}time","as":"AO ","sType":"AO "},{"N":"arg","slot":"1","name":"Q{}divisions","as":"AO ","sType":"AO "},{"N":"arg","slot":"2","name":"Q{}tempo","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMillisecs()","role":"body","C":[{"N":"arith","op":"div","calc":"a/a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"body","line":"118","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}time","slot":"0"}]}]},{"N":"int","val":"60000"}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisions","slot":"1"}]}]}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}tempo","slot":"2"}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"1","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks","as":"1AO ","slots":"202","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[1AO ,1AO ] ","sType":"1F r[1AO ] a[1AO ,1AO ] ","line":"124","C":[{"N":"arg","slot":"0","name":"Q{}time","as":"AO ","sType":"AO "},{"N":"arg","slot":"1","name":"Q{}divisions","as":"AO ","sType":"AO "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}timeToMIDITicks()","role":"body","C":[{"N":"fn","name":"round","sType":"?A m[AO,AD,AF]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"body","line":"127","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||round","C":[{"N":"check","card":"?","diag":"0|0||round","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||round","C":[{"N":"arith","op":"div","calc":"a/a","C":[{"N":"arith","op":"*","calc":"a*a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}time","slot":"0"}]}]},{"N":"int","val":"192"}]},{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"varRef","name":"Q{}divisions","slot":"1"}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"2","vis":"PRIVATE","ex:uniform":"true","C":[{"N":"function","name":"Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration","as":"1AO ","slots":"201","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","module":"musicxml.xsl","flags":"muu","sig":"1F r[1AO ] a[* ] ","sType":"1F r[1AO ] a[* ] ","line":"133","C":[{"N":"arg","slot":"0","name":"Q{}harmony","as":"* ","sType":"* "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","role":"body","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","flags":"p","role":"body","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XTTE0780|function Q{http://www.w3.org/2021/06/musicxml40}harmonyDuration()","role":"body","C":[{"N":"let","var":"Q{}id","slot":"1","sType":"*A ","line":"135","role":"body","C":[{"N":"fn","name":"generate-id","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"135","C":[{"N":"treat","as":"N","diag":"0|0||generate-id","C":[{"N":"check","card":"?","diag":"0|0||generate-id","C":[{"N":"varRef","name":"Q{}harmony","slot":"0"}]}]}]},{"N":"fn","name":"sum","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"138","C":[{"N":"data","diag":"0|0||sum","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}harmony","slot":"0"}]},{"N":"filter","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]"},{"N":"and","C":[{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]"}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"fn","name":"generate-id","C":[{"N":"fn","name":"reverse","C":[{"N":"first","C":[{"N":"axis","name":"preceding-sibling","nodeTest":"*NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]"}]}]}]},{"N":"data","diag":"1|1||gc","C":[{"N":"varRef","name":"Q{}id","slot":"1"}]}]}]}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]},{"N":"co","binds":"","id":"3","vis":"PUBLIC","ex:uniform":"true","C":[{"N":"globalParam","name":"Q{}renumberMeasures","sType":"AB ","slots":"200","module":"unroll.xsl","as":"AB ","ns":"xml=~ xsl=~ xs=~ map=~","C":[{"N":"false","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"25"}]}]},{"N":"co","id":"4","binds":"4 3","C":[{"N":"mode","onNo":"TC","flags":"","patternSlots":"0","prec":"","C":[{"N":"templateRule","rank":"0","prec":"0","seq":"2","ns":"xml=~ xsl=~ xs=~ map=~","minImp":"0","flags":"s","slots":"200","line":"61","module":"unroll.xsl","expand-text":"false","match":"measure","prio":"0","matches":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ "},{"N":"sequence","role":"action","sType":"* ","C":[{"N":"param","name":"Q{}previousMeasure","slot":"0","sType":"* ","as":"* ","flags":"","line":"62","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"0","sType":"* "}]},{"N":"param","name":"Q{}previousTime","slot":"1","sType":"* ","as":"* ","flags":"","line":"63","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"1","sType":"* "}]},{"N":"param","name":"Q{}previousDivisions","slot":"2","sType":"* ","as":"* ","flags":"","line":"64","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"2","sType":"* "}]},{"N":"param","name":"Q{}previousKey","slot":"3","sType":"* ","as":"* ","flags":"","line":"65","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"3","sType":"* "}]},{"N":"param","name":"Q{}previousClef","slot":"4","sType":"* ","as":"* ","flags":"","line":"66","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"4","sType":"* "}]},{"N":"param","name":"Q{}previousMetronome","slot":"5","sType":"* ","as":"* ","flags":"","line":"67","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"5","sType":"* "}]},{"N":"param","name":"Q{}repeatMeasure","slot":"6","sType":"* ","as":"* ","flags":"","line":"68","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"6","sType":"* "}]},{"N":"param","name":"Q{}repeatCount","slot":"7","sType":"* ","as":"* ","flags":"","line":"69","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"7","sType":"* "}]},{"N":"param","name":"Q{}jump","slot":"8","sType":"* ","as":"* ","flags":"","line":"70","C":[{"N":"str","sType":"1AS ","val":"","role":"select"},{"N":"supplied","role":"conversion","slot":"8","sType":"* "}]},{"N":"param","name":"Q{}measureNumber","slot":"9","sType":"ADI ","as":"ADI ","flags":"","line":"71","C":[{"N":"check","card":"1","sType":"1ADI ","diag":"2|0|XTTE0570|xsl:param name=\"Q{}measureNumber\"","role":"select","C":[{"N":"treat","as":"ADI ","diag":"2|0|XTTE0570|xsl:param name=\"Q{}measureNumber\"","role":"select","C":[{"N":"check","card":"1","diag":"2|0|XTTE0570|xsl:param name=\"Q{}measureNumber\"","role":"select","C":[{"N":"cvUntyped","to":"ADI","sType":"*A ","diag":"2|0|XTTE0570|xsl:param name=\"Q{}measureNumber\"","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"empty","sType":"0 ","role":"select"}]}]}]}]}]},{"N":"check","card":"1","sType":"1ADI ","diag":"2|1|XTTE0590|xsl:param name=\"Q{}measureNumber\"","role":"conversion","C":[{"N":"treat","as":"ADI ","diag":"2|1|XTTE0590|xsl:param name=\"Q{}measureNumber\"","role":"conversion","C":[{"N":"check","card":"1","diag":"2|1|XTTE0590|xsl:param name=\"Q{}measureNumber\"","role":"conversion","C":[{"N":"cvUntyped","to":"ADI","sType":"*A ","diag":"2|1|XTTE0590|xsl:param name=\"Q{}measureNumber\"","role":"conversion","C":[{"N":"data","sType":"*A ","role":"conversion","C":[{"N":"supplied","role":"conversion","slot":"9","sType":"* "}]}]}]}]}]}]},{"N":"let","var":"Q{}time","slot":"10","sType":"* ","line":"73","C":[{"N":"docOrder","sType":"*NE ","role":"select","line":"73","C":[{"N":"fn","name":"accumulator-after","sType":"*NE ","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"str","val":"Q{}time"}]}]},{"N":"let","var":"Q{}divisions","slot":"11","sType":"* ","line":"74","C":[{"N":"fn","name":"accumulator-after","sType":"AO ","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"74","C":[{"N":"str","val":"Q{}divisions"}]},{"N":"let","var":"Q{}key","slot":"12","sType":"* ","line":"75","C":[{"N":"docOrder","sType":"*NE ","role":"select","line":"75","C":[{"N":"fn","name":"accumulator-after","sType":"*NE ","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"str","val":"Q{}key"}]}]},{"N":"let","var":"Q{}clef","slot":"13","sType":"* ","line":"76","C":[{"N":"docOrder","sType":"*NE ","role":"select","line":"76","C":[{"N":"fn","name":"accumulator-after","sType":"*NE ","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"str","val":"Q{}clef"}]}]},{"N":"let","var":"Q{}metronome","slot":"14","sType":"* ","line":"77","C":[{"N":"docOrder","sType":"*NE ","role":"select","line":"77","C":[{"N":"fn","name":"accumulator-after","sType":"*NE ","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"str","val":"Q{}metronome"}]}]},{"N":"choose","sType":"* ","type":"item()*","line":"82","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"18","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}type"}]}]},{"N":"str","val":"start"}]}]},{"N":"fn","name":"not","C":[{"N":"fn","name":"index-of","C":[{"N":"fn","name":"tokenize","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||tokenize","C":[{"N":"check","card":"?","diag":"0|0||tokenize","C":[{"N":"data","diag":"0|0||tokenize","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"start"}]}]}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}number"}]}]}]}]}]},{"N":"str","val":"\\s*,\\s*"}]},{"N":"fn","name":"format-number","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||format-number","C":[{"N":"check","card":"?","diag":"0|0||format-number","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||format-number","C":[{"N":"check","card":"?","diag":"0|0||format-number","C":[{"N":"data","diag":"0|0||format-number","C":[{"N":"varRef","name":"Q{}repeatCount","slot":"7"}]}]}]}]}]},{"N":"str","val":"0"}]},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]}]},{"N":"let","var":"Q{}nextMeasure","slot":"15","sType":"* ","line":"83","C":[{"N":"first","sType":"?NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"83","C":[{"N":"filter","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"},{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}type"}]}]}]},{"N":"str","val":"start"}]},{"N":"fn","name":"index-of","C":[{"N":"fn","name":"tokenize","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||tokenize","C":[{"N":"check","card":"?","diag":"0|0||tokenize","C":[{"N":"data","diag":"0|0||tokenize","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"start"}]}]}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}number"}]}]}]}]}]},{"N":"str","val":"\\s*,\\s*"}]},{"N":"fn","name":"format-number","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||format-number","C":[{"N":"check","card":"?","diag":"0|0||format-number","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||format-number","C":[{"N":"check","card":"?","diag":"0|0||format-number","C":[{"N":"data","diag":"0|0||format-number","C":[{"N":"varRef","name":"Q{}repeatCount","slot":"7"}]}]}]}]}]},{"N":"str","val":"0"}]},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]}]}]},{"N":"applyT","sType":"* ","line":"84","mode":"#unnamed","bSlot":"0","C":[{"N":"varRef","name":"Q{}nextMeasure","slot":"15","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"84"},{"N":"withParam","name":"Q{}repeatMeasure","slot":"6","sType":"*","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"85"}]},{"N":"withParam","name":"Q{}repeatCount","slot":"7","sType":"*","C":[{"N":"varRef","name":"Q{}repeatCount","slot":"7","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"86"}]},{"N":"withParam","name":"Q{}jump","slot":"8","sType":"*","C":[{"N":"varRef","name":"Q{}jump","slot":"8","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"87"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"88"}]},{"N":"withParam","name":"Q{}previousTime","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"89"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"90"}]},{"N":"withParam","name":"Q{}previousKey","slot":"3","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"91"}]},{"N":"withParam","name":"Q{}previousClef","slot":"4","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"92"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"5","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"93"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"9","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"94","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}measureNumber","slot":"9"}]}]},{"N":"int","val":"1"}]}]}]}]},{"N":"true"},{"N":"sequence","sType":"* ","C":[{"N":"copy","sType":"1NE u[1NE nQ{}measure ,1NE nQ{http://www.w3.org/1999/xhtml}measure ] ","flags":"cin","line":"104","C":[{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"* ","line":"105","C":[{"N":"gVarRef","name":"Q{}renumberMeasures","bSlot":"1","sType":"AB ","line":"105"},{"N":"sequence","sType":"* ","C":[{"N":"att","name":"number","sType":"1NA ","line":"106","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"valueOf","sType":"1NT ","flags":"l","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"varRef","sType":"*","name":"Q{}measureNumber","slot":"9","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"35"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":""}]}]},{"N":"applyT","sType":"* ","line":"107","mode":"#unnamed","bSlot":"0","C":[{"N":"filter","sType":"*NA","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"107","C":[{"N":"axis","name":"attribute","nodeTest":"*NA"},{"N":"compareToString","op":"ne","val":"number","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","C":[{"N":"fn","name":"local-name","C":[{"N":"dot"}]}]}]}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"109","C":[{"N":"fn","name":"not","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"109","C":[{"N":"gVarRef","name":"Q{}renumberMeasures","bSlot":"1"}]},{"N":"applyT","sType":"* ","line":"110","mode":"#unnamed","bSlot":"0","C":[{"N":"axis","name":"attribute","nodeTest":"*NA","sType":"*NA","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"110"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"let","var":"Q{}attributes","slot":"15","sType":"* ","line":"118","C":[{"N":"treat","as":"NE ","diag":"2|0|XTTE0570|xsl:variable name=\"Q{}attributes\"","C":[{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"? ","line":"119","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"119","C":[{"N":"and","C":[{"N":"varRef","name":"Q{}divisions","slot":"11"},{"N":"fn","name":"not","C":[{"N":"fn","name":"deep-equal","C":[{"N":"varRef","name":"Q{}divisions","slot":"11"},{"N":"varRef","name":"Q{}previousDivisions","slot":"2"},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]}]},{"N":"fn","name":"not","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"dot"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}divisions,NE nQ{http://www.w3.org/1999/xhtml}divisions]"}]}]}]}]},{"N":"elem","type":"element()","name":"divisions","sType":"1NE ","nsuri":"","line":"120","C":[{"N":"copyOf","flags":"c","ns":"xml=~ xsl=~ xs=~ map=~ ex=http://ns.saxonica.com/xslt/export","line":"121","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"121"}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"124","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"124","C":[{"N":"and","C":[{"N":"varRef","name":"Q{}key","slot":"12"},{"N":"fn","name":"not","C":[{"N":"fn","name":"deep-equal","C":[{"N":"varRef","name":"Q{}key","slot":"12"},{"N":"varRef","name":"Q{}previousKey","slot":"3"},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]}]},{"N":"fn","name":"not","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"dot"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]"}]}]}]}]},{"N":"copyOf","flags":"c","ns":"xml=~ xsl=~ xs=~ map=~ ex=http://ns.saxonica.com/xslt/export","line":"125","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"125"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"127","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"127","C":[{"N":"and","C":[{"N":"varRef","name":"Q{}time","slot":"10"},{"N":"fn","name":"not","C":[{"N":"fn","name":"deep-equal","C":[{"N":"varRef","name":"Q{}time","slot":"10"},{"N":"varRef","name":"Q{}previousTime","slot":"1"},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]}]},{"N":"fn","name":"not","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"dot"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]"}]}]}]}]},{"N":"copyOf","flags":"c","ns":"xml=~ xsl=~ xs=~ map=~ ex=http://ns.saxonica.com/xslt/export","line":"128","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"128"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"choose","sType":"* ","line":"130","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"130","C":[{"N":"and","C":[{"N":"varRef","name":"Q{}clef","slot":"13"},{"N":"fn","name":"not","C":[{"N":"fn","name":"deep-equal","C":[{"N":"varRef","name":"Q{}clef","slot":"13"},{"N":"varRef","name":"Q{}previousClef","slot":"4"},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]}]},{"N":"fn","name":"not","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"dot"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]"}]}]}]}]},{"N":"copyOf","flags":"c","ns":"xml=~ xsl=~ xs=~ map=~ ex=http://ns.saxonica.com/xslt/export","line":"131","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"131"}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]}]},{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"? ","line":"134","C":[{"N":"compareToInt","op":"gt","val":"0","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"134","C":[{"N":"fn","name":"count","C":[{"N":"varRef","name":"Q{}attributes","slot":"15"}]}]},{"N":"elem","type":"element()","name":"attributes","sType":"1NE ","nsuri":"","line":"135","C":[{"N":"copyOf","flags":"c","ns":"xml=~ xsl=~ xs=~ map=~ ex=http://ns.saxonica.com/xslt/export","line":"136","sType":"*","C":[{"N":"varRef","name":"Q{}attributes","slot":"15","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"136"}]}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"let","var":"Q{}direction","slot":"16","sType":"* ","line":"139","C":[{"N":"treat","as":"NE ","diag":"2|0|XTTE0570|xsl:variable name=\"Q{}direction\"","C":[{"N":"choose","sType":"* ","line":"140","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"140","C":[{"N":"and","C":[{"N":"varRef","name":"Q{}metronome","slot":"14"},{"N":"fn","name":"not","C":[{"N":"fn","name":"deep-equal","C":[{"N":"varRef","name":"Q{}metronome","slot":"14"},{"N":"varRef","name":"Q{}previousMetronome","slot":"5"},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]}]},{"N":"fn","name":"not","C":[{"N":"slash","op":"/","C":[{"N":"dot"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]"},{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}direction-type,NE nQ{http://www.w3.org/1999/xhtml}direction-type]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}metronome,NE nQ{http://www.w3.org/1999/xhtml}metronome]"}]}]}]}]}]},{"N":"copyOf","flags":"c","ns":"xml=~ xsl=~ xs=~ map=~ ex=http://ns.saxonica.com/xslt/export","line":"141","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"141"}]},{"N":"true"},{"N":"empty","sType":"0 "}]}]},{"N":"sequence","sType":"* ","C":[{"N":"choose","sType":"* ","line":"144","C":[{"N":"compareToInt","op":"gt","val":"0","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"144","C":[{"N":"fn","name":"count","C":[{"N":"varRef","name":"Q{}direction","slot":"16"}]}]},{"N":"copyOf","flags":"c","ns":"xml=~ xsl=~ xs=~ map=~ ex=http://ns.saxonica.com/xslt/export","line":"145","sType":"*","C":[{"N":"varRef","name":"Q{}direction","slot":"16","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"145"}]},{"N":"true"},{"N":"empty","sType":"0 "}]},{"N":"applyT","sType":"* ","line":"155","mode":"#unnamed","bSlot":"0","C":[{"N":"filter","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"155","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"fn","name":"not","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"axis","name":"self","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"self","nodeTest":"*NE"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}segno"}]}]}]}]},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"self","nodeTest":"*NE"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}dalsegno"}]}]}]}]},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"self","nodeTest":"*NE"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}fine"}]}]}]}]},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"self","nodeTest":"*NE"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}dacapo"}]}]}]}]},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"self","nodeTest":"*NE"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tocoda"}]}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"choose","sType":"* ","type":"item()*","line":"161","C":[{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"166","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}fine"}]}]}]},{"N":"str","val":"yes"}]},{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}jump","slot":"8"}]},{"N":"str","val":""}]}]},{"N":"empty","sType":"0 "},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"172","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tocoda"}]}]},{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}jump","slot":"8"}]},{"N":"str","val":""}]}]},{"N":"let","var":"Q{}coda","slot":"15","sType":"* ","line":"173","C":[{"N":"docOrder","sType":"*NA nQ{}tocoda","role":"select","line":"173","C":[{"N":"docOrder","sType":"*NA nQ{}tocoda","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tocoda"}]}]}]},{"N":"let","var":"Q{}nextMeasure","slot":"16","sType":"* ","line":"174","C":[{"N":"filter","sType":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"174","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}coda"}]}]}]},{"N":"data","diag":"1|1||gc","C":[{"N":"varRef","name":"Q{}coda","slot":"15"}]}]}]},{"N":"applyT","sType":"* ","line":"175","mode":"#unnamed","bSlot":"0","C":[{"N":"varRef","name":"Q{}nextMeasure","slot":"16","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"175"},{"N":"withParam","name":"Q{}repeatMeasure","slot":"6","sType":"*NE","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"176","C":[{"N":"docOrder","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"root"},{"N":"axis","name":"descendant-or-self","nodeTest":"*N"}]},{"N":"first","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]}]}]}]},{"N":"withParam","name":"Q{}repeatCount","slot":"7","sType":"1ADI","C":[{"N":"int","val":"10000","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"177"}]},{"N":"withParam","name":"Q{}jump","slot":"8","sType":"*","C":[{"N":"varRef","name":"Q{}coda","slot":"15","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"178"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"179"}]},{"N":"withParam","name":"Q{}previousTime","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"180"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"181"}]},{"N":"withParam","name":"Q{}previousKey","slot":"3","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"182"}]},{"N":"withParam","name":"Q{}previousClef","slot":"4","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"183"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"5","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"184"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"9","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"185","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}measureNumber","slot":"9"}]}]},{"N":"int","val":"1"}]}]}]}]}]},{"N":"or","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"192","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}repeat,NE nQ{http://www.w3.org/1999/xhtml}repeat]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}direction"}]}]}]},{"N":"str","val":"forward"}]},{"N":"vc","op":"eq","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","C":[{"N":"fn","name":"generate-id","C":[{"N":"dot"}]},{"N":"fn","name":"generate-id","C":[{"N":"treat","as":"N","diag":"0|0||generate-id","C":[{"N":"check","card":"?","diag":"0|0||generate-id","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6"}]}]}]}]}]},{"N":"applyT","sType":"* ","line":"193","mode":"#unnamed","bSlot":"0","C":[{"N":"first","sType":"?NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"193","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"withParam","name":"Q{}repeatMeasure","slot":"6","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"194"}]},{"N":"withParam","name":"Q{}repeatCount","slot":"7","sType":"*","C":[{"N":"choose","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"195","C":[{"N":"vc","op":"eq","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","C":[{"N":"fn","name":"generate-id","C":[{"N":"dot"}]},{"N":"fn","name":"generate-id","C":[{"N":"treat","as":"N","diag":"0|0||generate-id","C":[{"N":"check","card":"?","diag":"0|0||generate-id","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6"}]}]}]}]},{"N":"varRef","name":"Q{}repeatCount","slot":"7"},{"N":"true"},{"N":"int","val":"1"}]}]},{"N":"withParam","name":"Q{}jump","slot":"8","sType":"*","C":[{"N":"varRef","name":"Q{}jump","slot":"8","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"196"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"197"}]},{"N":"withParam","name":"Q{}previousTime","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"198"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"199"}]},{"N":"withParam","name":"Q{}previousKey","slot":"3","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"200"}]},{"N":"withParam","name":"Q{}previousClef","slot":"4","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"201"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"5","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"202"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"9","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"203","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}measureNumber","slot":"9"}]}]},{"N":"int","val":"1"}]}]}]},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"213","C":[{"N":"and","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}repeat,NE nQ{http://www.w3.org/1999/xhtml}repeat]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}direction"}]}]}]},{"N":"str","val":"backward"}]},{"N":"or","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}jump","slot":"8"}]},{"N":"str","val":""}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}repeat,NE nQ{http://www.w3.org/1999/xhtml}repeat]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}after-jump"}]}]}]},{"N":"str","val":"yes"}]}]}]},{"N":"gc","op":">","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"choose","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}repeat,NE nQ{http://www.w3.org/1999/xhtml}repeat]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}times"}]}]},{"N":"fn","name":"number","C":[{"N":"check","card":"?","diag":"0|0||number","C":[{"N":"data","diag":"0|0||number","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}repeat,NE nQ{http://www.w3.org/1999/xhtml}repeat]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}times"}]}]}]}]}]},{"N":"true"},{"N":"int","val":"2"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"varRef","name":"Q{}repeatCount","slot":"7"}]}]}]},{"N":"applyT","sType":"* ","line":"214","mode":"#unnamed","bSlot":"0","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"214"},{"N":"withParam","name":"Q{}repeatMeasure","slot":"6","sType":"*","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"215"}]},{"N":"withParam","name":"Q{}repeatCount","slot":"7","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"216","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}repeatCount","slot":"7"}]}]},{"N":"int","val":"1"}]}]},{"N":"withParam","name":"Q{}jump","slot":"8","sType":"*","C":[{"N":"varRef","name":"Q{}jump","slot":"8","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"217"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"218"}]},{"N":"withParam","name":"Q{}previousTime","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"219"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"220"}]},{"N":"withParam","name":"Q{}previousKey","slot":"3","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"221"}]},{"N":"withParam","name":"Q{}previousClef","slot":"4","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"222"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"5","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"223"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"9","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"224","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}measureNumber","slot":"9"}]}]},{"N":"int","val":"1"}]}]}]},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"234","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}type"}]}]},{"N":"str","val":"stop"}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}repeat,NE nQ{http://www.w3.org/1999/xhtml}repeat]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}direction"}]}]}]},{"N":"str","val":"backward"}]},{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"treat","as":"N","diag":"1|0|XPTY0019|slash","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6"}]},{"N":"filter","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"},{"N":"and","C":[{"N":"and","C":[{"N":"fn","name":"reverse","C":[{"N":"filter","C":[{"N":"first","C":[{"N":"filter","C":[{"N":"axis","name":"preceding-sibling","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}repeat,NE nQ{http://www.w3.org/1999/xhtml}repeat]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}direction"}]}]}]},{"N":"str","val":"forward"}]}]}]},{"N":"vc","op":"eq","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","C":[{"N":"fn","name":"generate-id","C":[{"N":"dot"}]},{"N":"fn","name":"generate-id","C":[{"N":"treat","as":"N","diag":"0|0||generate-id","C":[{"N":"check","card":"?","diag":"0|0||generate-id","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6"}]}]}]}]}]}]},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}type"}]}]}]},{"N":"str","val":"start"}]}]},{"N":"fn","name":"index-of","C":[{"N":"fn","name":"tokenize","C":[{"N":"cvUntyped","to":"AS","diag":"0|0||tokenize","C":[{"N":"check","card":"?","diag":"0|0||tokenize","C":[{"N":"data","diag":"0|0||tokenize","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"start"}]}]}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}number"}]}]}]}]}]},{"N":"str","val":"\\s*,\\s*"}]},{"N":"fn","name":"format-number","C":[{"N":"treat","as":"A m[AO,AD,AF]","diag":"0|0||format-number","C":[{"N":"check","card":"?","diag":"0|0||format-number","C":[{"N":"cvUntyped","to":"AO","diag":"0|0||format-number","C":[{"N":"arith","op":"+","calc":"a+a","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}repeatCount","slot":"7"}]}]},{"N":"int","val":"1"}]}]}]}]},{"N":"str","val":"0"}]},{"N":"str","val":"http://www.w3.org/2005/xpath-functions/collation/codepoint"}]}]}]}]}]}]},{"N":"applyT","sType":"* ","line":"235","mode":"#unnamed","bSlot":"0","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"235"},{"N":"withParam","name":"Q{}repeatMeasure","slot":"6","sType":"*","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"236"}]},{"N":"withParam","name":"Q{}repeatCount","slot":"7","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"237","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}repeatCount","slot":"7"}]}]},{"N":"int","val":"1"}]}]},{"N":"withParam","name":"Q{}jump","slot":"8","sType":"*","C":[{"N":"varRef","name":"Q{}jump","slot":"8","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"238"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"239"}]},{"N":"withParam","name":"Q{}previousTime","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"240"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"241"}]},{"N":"withParam","name":"Q{}previousKey","slot":"3","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"242"}]},{"N":"withParam","name":"Q{}previousClef","slot":"4","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"243"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"5","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"244"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"9","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"245","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}measureNumber","slot":"9"}]}]},{"N":"int","val":"1"}]}]}]},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"251","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}dacapo"}]}]}]},{"N":"str","val":"yes"}]},{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}jump","slot":"8"}]},{"N":"str","val":"capo"}]}]},{"N":"applyT","sType":"* ","line":"252","mode":"#unnamed","bSlot":"0","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"252","C":[{"N":"docOrder","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"root"},{"N":"axis","name":"descendant-or-self","nodeTest":"*N"}]},{"N":"first","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]}]}]},{"N":"withParam","name":"Q{}repeatMeasure","slot":"6","sType":"*NE","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"253","C":[{"N":"docOrder","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"root"},{"N":"axis","name":"descendant-or-self","nodeTest":"*N"}]},{"N":"first","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]}]}]}]},{"N":"withParam","name":"Q{}repeatCount","slot":"7","sType":"1ADI","C":[{"N":"int","val":"10000","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"254"}]},{"N":"withParam","name":"Q{}jump","slot":"8","sType":"1AS","C":[{"N":"str","val":"capo","sType":"1AS","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"255"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"256"}]},{"N":"withParam","name":"Q{}previousTime","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"257"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"258"}]},{"N":"withParam","name":"Q{}previousKey","slot":"3","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"259"}]},{"N":"withParam","name":"Q{}previousClef","slot":"4","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"260"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"5","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"261"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"9","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"262","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}measureNumber","slot":"9"}]}]},{"N":"int","val":"1"}]}]}]},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"268","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}dalsegno"}]}]},{"N":"gc","op":"!=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"varRef","name":"Q{}jump","slot":"8"}]},{"N":"data","diag":"1|1||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}dalsegno"}]}]}]}]}]},{"N":"let","var":"Q{}segno","slot":"15","sType":"* ","line":"269","C":[{"N":"docOrder","sType":"*NA nQ{}dalsegno","role":"select","line":"269","C":[{"N":"docOrder","sType":"*NA nQ{}dalsegno","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}dalsegno"}]}]}]},{"N":"let","var":"Q{}nextMeasure","slot":"16","sType":"* ","line":"270","C":[{"N":"fn","name":"reverse","sType":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"270","C":[{"N":"filter","C":[{"N":"axis","name":"preceding-sibling","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}segno"}]}]}]},{"N":"data","diag":"1|1||gc","C":[{"N":"varRef","name":"Q{}segno","slot":"15"}]}]}]}]},{"N":"applyT","sType":"* ","line":"271","mode":"#unnamed","bSlot":"0","C":[{"N":"varRef","name":"Q{}nextMeasure","slot":"16","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"271"},{"N":"withParam","name":"Q{}repeatMeasure","slot":"6","sType":"*NE","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"272","C":[{"N":"docOrder","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"root"},{"N":"axis","name":"descendant-or-self","nodeTest":"*N"}]},{"N":"first","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]}]}]}]},{"N":"withParam","name":"Q{}repeatCount","slot":"7","sType":"1ADI","C":[{"N":"int","val":"10000","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"273"}]},{"N":"withParam","name":"Q{}jump","slot":"8","sType":"*","C":[{"N":"varRef","name":"Q{}segno","slot":"15","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"274"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"275"}]},{"N":"withParam","name":"Q{}previousTime","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"276"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"277"}]},{"N":"withParam","name":"Q{}previousKey","slot":"3","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"278"}]},{"N":"withParam","name":"Q{}previousClef","slot":"4","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"279"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"5","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"280"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"9","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"281","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}measureNumber","slot":"9"}]}]},{"N":"int","val":"1"}]}]}]}]}]},{"N":"and","sType":"1AB","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","line":"287","C":[{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"data","diag":"1|0||gc","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"filter","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"fn","name":"not","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}ending,NE nQ{http://www.w3.org/1999/xhtml}ending]"}]}]},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}repeat,NE nQ{http://www.w3.org/1999/xhtml}repeat]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}direction"}]}]}]},{"N":"str","val":"backward"}]},{"N":"gc","op":"<=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"fn","name":"number","C":[{"N":"check","card":"?","diag":"0|0||number","C":[{"N":"data","diag":"0|0||number","C":[{"N":"docOrder","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}barline,NE nQ{http://www.w3.org/1999/xhtml}barline]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}repeat,NE nQ{http://www.w3.org/1999/xhtml}repeat]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}times"}]}]}]}]}]},{"N":"data","diag":"1|1||gc","C":[{"N":"varRef","name":"Q{}repeatCount","slot":"7"}]}]}]},{"N":"applyT","sType":"* ","line":"288","mode":"#unnamed","bSlot":"0","C":[{"N":"first","sType":"?NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"288","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"withParam","name":"Q{}repeatMeasure","slot":"6","sType":"*NE","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"289","C":[{"N":"docOrder","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"slash","op":"/","C":[{"N":"slash","op":"/","C":[{"N":"root"},{"N":"axis","name":"descendant-or-self","nodeTest":"*N"}]},{"N":"first","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]}]}]}]},{"N":"withParam","name":"Q{}repeatCount","slot":"7","sType":"1ADI","C":[{"N":"int","val":"10000","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"290"}]},{"N":"withParam","name":"Q{}jump","slot":"8","sType":"*","C":[{"N":"varRef","name":"Q{}jump","slot":"8","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"291"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"292"}]},{"N":"withParam","name":"Q{}previousTime","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"293"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"294"}]},{"N":"withParam","name":"Q{}previousKey","slot":"3","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"295"}]},{"N":"withParam","name":"Q{}previousClef","slot":"4","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"296"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"5","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"297"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"9","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"298","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}measureNumber","slot":"9"}]}]},{"N":"int","val":"1"}]}]}]},{"N":"true"},{"N":"applyT","sType":"* ","line":"305","mode":"#unnamed","bSlot":"0","C":[{"N":"first","sType":"?NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"305","C":[{"N":"axis","name":"following-sibling","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"withParam","name":"Q{}repeatMeasure","slot":"6","sType":"*","C":[{"N":"varRef","name":"Q{}repeatMeasure","slot":"6","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"306"}]},{"N":"withParam","name":"Q{}repeatCount","slot":"7","sType":"*","C":[{"N":"varRef","name":"Q{}repeatCount","slot":"7","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"307"}]},{"N":"withParam","name":"Q{}jump","slot":"8","sType":"*","C":[{"N":"varRef","name":"Q{}jump","slot":"8","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"308"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"dot","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"309"}]},{"N":"withParam","name":"Q{}previousTime","slot":"1","sType":"*","C":[{"N":"varRef","name":"Q{}time","slot":"10","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"310"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"2","sType":"*","C":[{"N":"varRef","name":"Q{}divisions","slot":"11","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"311"}]},{"N":"withParam","name":"Q{}previousKey","slot":"3","sType":"*","C":[{"N":"varRef","name":"Q{}key","slot":"12","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"312"}]},{"N":"withParam","name":"Q{}previousClef","slot":"4","sType":"*","C":[{"N":"varRef","name":"Q{}clef","slot":"13","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"313"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"5","sType":"*","C":[{"N":"varRef","name":"Q{}metronome","slot":"14","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"314"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"9","sType":"?A","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"315","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}measureNumber","slot":"9"}]}]},{"N":"int","val":"1"}]}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"templateRule","rank":"1","prec":"0","seq":"1","ns":"xml=~ xsl=~ xs=~ map=~","minImp":"0","flags":"s","slots":"200","line":"34","module":"unroll.xsl","expand-text":"false","match":"part","prio":"0","matches":"NE u[NE nQ{}part,NE nQ{http://www.w3.org/1999/xhtml}part]","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}part,NE nQ{http://www.w3.org/1999/xhtml}part]","sType":"1NE u[NE nQ{}part,NE nQ{http://www.w3.org/1999/xhtml}part]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ "},{"N":"copy","sType":"1NE u[1NE nQ{}part ,1NE nQ{http://www.w3.org/1999/xhtml}part ] ","flags":"cin","role":"action","line":"35","C":[{"N":"sequence","sType":"* ","C":[{"N":"applyT","sType":"* ","line":"36","mode":"#unnamed","bSlot":"0","C":[{"N":"axis","name":"attribute","nodeTest":"*NA","sType":"*NA","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"36"}]},{"N":"applyT","sType":"* ","line":"37","mode":"#unnamed","bSlot":"0","C":[{"N":"first","sType":"?NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"37","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"withParam","name":"Q{}repeatMeasure","slot":"0","sType":"?NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","C":[{"N":"first","sType":"?NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"38","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"withParam","name":"Q{}repeatCount","slot":"0","sType":"1ADI","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"39"}]},{"N":"withParam","name":"Q{}jump","slot":"0","sType":"1AS ","C":[{"N":"str","sType":"1AS ","val":"","role":"select"}]},{"N":"withParam","name":"Q{}previousMeasure","slot":"0","sType":"1AS ","C":[{"N":"str","sType":"1AS ","val":"","role":"select"}]},{"N":"withParam","name":"Q{}previousTime","slot":"0","sType":"0E","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"42"}]},{"N":"withParam","name":"Q{}previousDivisions","slot":"0","sType":"0E","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"43"}]},{"N":"withParam","name":"Q{}previousKey","slot":"0","sType":"0E","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"44"}]},{"N":"withParam","name":"Q{}previousClef","slot":"0","sType":"0E","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"45"}]},{"N":"withParam","name":"Q{}previousMetronome","slot":"0","sType":"0E","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"46"}]},{"N":"withParam","name":"Q{}measureNumber","slot":"0","sType":"*","C":[{"N":"choose","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"47","C":[{"N":"compareToString","op":"ne","val":"NaN","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","C":[{"N":"fn","name":"string","C":[{"N":"fn","name":"number","C":[{"N":"check","card":"?","diag":"0|0||number","C":[{"N":"data","diag":"0|0||number","C":[{"N":"slash","op":"/","C":[{"N":"first","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}number"}]}]}]}]}]}]},{"N":"slash","op":"/","C":[{"N":"first","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}number"}]},{"N":"true"},{"N":"int","val":"0"}]}]}]}]}]}]},{"N":"templateRule","rank":"2","prec":"0","seq":"4","ns":"xml=~ xsl=~ xs=~ map=~","minImp":"0","flags":"s","slots":"200","line":"334","module":"unroll.xsl","expand-text":"false","match":"*|@*|comment()|processing-instruction()","prio":"-0.5","matches":"NE","C":[{"N":"p.nodeTest","role":"match","test":"NE","sType":"1NE"},{"N":"copy","sType":"1NE ","flags":"cin","role":"action","line":"335","C":[{"N":"applyT","sType":"* ","line":"337","mode":"#unnamed","bSlot":"0","C":[{"N":"docOrder","sType":"*N u[N u[N u[N u[NE,NA],NC],NP],NT]","role":"select","line":"337","C":[{"N":"union","op":"|","sType":"*N u[N u[N u[N u[NE,NA],NC],NP],NT]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"attribute","nodeTest":"*NA"}]},{"N":"axis","name":"child","nodeTest":"*NC"}]},{"N":"axis","name":"child","nodeTest":"*NP"}]},{"N":"axis","name":"child","nodeTest":"*NT"}]}]}]}]}]},{"N":"templateRule","rank":"3","prec":"0","seq":"4","ns":"xml=~ xsl=~ xs=~ map=~","minImp":"0","flags":"s","slots":"200","line":"334","module":"unroll.xsl","expand-text":"false","match":"*|@*|comment()|processing-instruction()","prio":"-0.5","matches":"NA","C":[{"N":"p.nodeTest","role":"match","test":"NA","sType":"1NA"},{"N":"copy","sType":"1NA ","flags":"cin","role":"action","line":"335","C":[{"N":"applyT","sType":"* ","line":"337","mode":"#unnamed","bSlot":"0","C":[{"N":"docOrder","sType":"*N u[N u[N u[N u[NE,NA],NC],NP],NT]","role":"select","line":"337","C":[{"N":"union","op":"|","sType":"*N u[N u[N u[N u[NE,NA],NC],NP],NT]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"attribute","nodeTest":"*NA"}]},{"N":"axis","name":"child","nodeTest":"*NC"}]},{"N":"axis","name":"child","nodeTest":"*NP"}]},{"N":"axis","name":"child","nodeTest":"*NT"}]}]}]}]}]},{"N":"templateRule","rank":"4","prec":"0","seq":"4","ns":"xml=~ xsl=~ xs=~ map=~","minImp":"0","flags":"s","slots":"200","line":"334","module":"unroll.xsl","expand-text":"false","match":"*|@*|comment()|processing-instruction()","prio":"-0.5","matches":"NC","C":[{"N":"p.nodeTest","role":"match","test":"NC","sType":"1NC"},{"N":"copy","sType":"1NC ","flags":"cin","role":"action","line":"335","C":[{"N":"applyT","sType":"* ","line":"337","mode":"#unnamed","bSlot":"0","C":[{"N":"docOrder","sType":"*N u[N u[N u[N u[NE,NA],NC],NP],NT]","role":"select","line":"337","C":[{"N":"union","op":"|","sType":"*N u[N u[N u[N u[NE,NA],NC],NP],NT]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"attribute","nodeTest":"*NA"}]},{"N":"axis","name":"child","nodeTest":"*NC"}]},{"N":"axis","name":"child","nodeTest":"*NP"}]},{"N":"axis","name":"child","nodeTest":"*NT"}]}]}]}]}]},{"N":"templateRule","rank":"5","prec":"0","seq":"4","ns":"xml=~ xsl=~ xs=~ map=~","minImp":"0","flags":"s","slots":"200","line":"334","module":"unroll.xsl","expand-text":"false","match":"*|@*|comment()|processing-instruction()","prio":"-0.5","matches":"NP","C":[{"N":"p.nodeTest","role":"match","test":"NP","sType":"1NP"},{"N":"copy","sType":"1NP ","flags":"cin","role":"action","line":"335","C":[{"N":"applyT","sType":"* ","line":"337","mode":"#unnamed","bSlot":"0","C":[{"N":"docOrder","sType":"*N u[N u[N u[N u[NE,NA],NC],NP],NT]","role":"select","line":"337","C":[{"N":"union","op":"|","sType":"*N u[N u[N u[N u[NE,NA],NC],NP],NT]","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"union","op":"|","C":[{"N":"axis","name":"child","nodeTest":"*NE"},{"N":"axis","name":"attribute","nodeTest":"*NA"}]},{"N":"axis","name":"child","nodeTest":"*NC"}]},{"N":"axis","name":"child","nodeTest":"*NP"}]},{"N":"axis","name":"child","nodeTest":"*NT"}]}]}]}]}]},{"N":"templateRule","rank":"6","prec":"0","seq":"3","ns":"xml=~ xsl=~ xs=~ map=~","minImp":"0","flags":"s","slots":"200","line":"326","module":"unroll.xsl","expand-text":"false","match":"text()","prio":"-0.5","matches":"NT","C":[{"N":"p.nodeTest","role":"match","test":"NT","sType":"1NT","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ "},{"N":"valueOf","flags":"l","sType":"1NT ","role":"action","line":"327","C":[{"N":"fn","name":"string-join","role":"select","C":[{"N":"forEach","sType":"*AS ","C":[{"N":"data","sType":"*A ","C":[{"N":"mergeAdj","C":[{"N":"dot","sType":"1NT","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","role":"select","line":"327"}]}]},{"N":"fn","name":"string","sType":"1AS ","C":[{"N":"dot"}]}]},{"N":"str","sType":"1AS ","val":" "}]}]}]},{"N":"templateRule","rank":"7","prec":"0","seq":"0","ns":"xml=~ xsl=~ xs=~ map=~","minImp":"0","flags":"s","slots":"200","line":"30","module":"unroll.xsl","expand-text":"false","match":"/","prio":"-0.5","matches":"ND","C":[{"N":"p.nodeTest","role":"match","test":"ND","sType":"1ND","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ "},{"N":"applyT","sType":"* ","line":"31","mode":"#unnamed","role":"action","bSlot":"0","C":[{"N":"docOrder","sType":"*NE","role":"select","line":"31","C":[{"N":"slash","op":"/","sType":"*NE","ns":"= xml=~ fn=~ xsl=~ xs=~ map=~ ","C":[{"N":"dot"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}score-partwise,NE nQ{http://www.w3.org/1999/xhtml}score-partwise]"}]}]}]}]}]}]},{"N":"overridden"},{"N":"output","C":[{"N":"property","name":"Q{http://saxon.sf.net/}stylesheet-version","value":"30"},{"N":"property","name":"method","value":"xml"},{"N":"property","name":"indent","value":"yes"},{"N":"property","name":"encoding","value":"UTF-8"},{"N":"property","name":"omit-xml-declaration","value":"no"},{"N":"property","name":"standalone","value":"no"},{"N":"property","name":"doctype-system","value":"http://www.musicxml.org/dtds/partwise.dtd"},{"N":"property","name":"doctype-public","value":"-//Recordare//DTD MusicXML 4.0 Partwise//EN"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}divisions","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"18"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}divisions,NE nQ{http://www.w3.org/1999/xhtml}divisions]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}divisions,NE nQ{http://www.w3.org/1999/xhtml}divisions]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"axis","name":"child","nodeTest":"*NT","sType":"*NT","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"19"}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}tempo","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"120","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"22"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withPredicate","role":"match","sType":"1NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}sound,NE nQ{http://www.w3.org/1999/xhtml}sound]"},{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tempo"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"axis","name":"attribute","nodeTest":"*NA nQ{}tempo","sType":"*NA nQ{}tempo","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"23"}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}metronome","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"26"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ ","C":[{"N":"p.withPredicate","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]"},{"N":"slash","op":"/","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}direction-type,NE nQ{http://www.w3.org/1999/xhtml}direction-type]"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}metronome,NE nQ{http://www.w3.org/1999/xhtml}metronome]"}]}]},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"dot","sType":"1NE u[NE nQ{}direction,NE nQ{http://www.w3.org/1999/xhtml}direction]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"27"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}time","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"30"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}time,NE nQ{http://www.w3.org/1999/xhtml}time]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"31"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}clef","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"34"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}clef,NE nQ{http://www.w3.org/1999/xhtml}clef]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"35"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}key","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"38"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]"},{"N":"p.withUpper","axis":"parent","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}attributes,NE nQ{http://www.w3.org/1999/xhtml}attributes]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]}]},{"N":"dot","sType":"1NE u[NE nQ{}key,NE nQ{http://www.w3.org/1999/xhtml}key]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"39"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1FM","slots":"5","name":"Q{}measureIndex","as":"map(*)","ex:asJ":"FM k[1AS ] v[1ADI ] ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}_new","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"42"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"FM k[1AS ] v[1ADI ] ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"choose","sType":"1FM","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"43","C":[{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}contains","C":[{"N":"treat","as":"FM","diag":"0|0||map:contains","C":[{"N":"check","card":"1","diag":"0|0||map:contains","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:contains","C":[{"N":"attVal","name":"Q{}number"}]}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}put","C":[{"N":"treat","as":"FM","diag":"0|0||map:put","C":[{"N":"check","card":"1","diag":"0|0||map:put","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:put","C":[{"N":"attVal","name":"Q{}number"}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}get","C":[{"N":"treat","as":"FM","diag":"0|0||map:get","C":[{"N":"check","card":"1","diag":"0|0||map:get","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:get","C":[{"N":"attVal","name":"Q{}number"}]}]}]},{"N":"true"},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}put","C":[{"N":"treat","as":"FM","diag":"0|0||map:put","C":[{"N":"check","card":"1","diag":"0|0||map:put","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"check","card":"1","diag":"0|1||map:put","C":[{"N":"attVal","name":"Q{}number"}]},{"N":"ifCall","name":"Q{http://www.w3.org/2005/xpath-functions/map}size","C":[{"N":"treat","as":"FM","diag":"0|0||map:size","C":[{"N":"check","card":"1","diag":"0|0||map:size","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}measureDuration","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"46"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"47"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}forward,NE nQ{http://www.w3.org/1999/xhtml}forward]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}forward,NE nQ{http://www.w3.org/1999/xhtml}forward]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"48","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0.5","C":[{"N":"p.withUpper","role":"match","axis":"parent","sType":"1NE u[NE nQ{}backup,NE nQ{http://www.w3.org/1999/xhtml}backup]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ ","C":[{"N":"p.nodeTest","test":"NE u[NE nQ{}backup,NE nQ{http://www.w3.org/1999/xhtml}backup]"},{"N":"p.nodeTest","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]"}]},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"-","calc":"a-a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"49","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"51","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"52"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"23"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"25","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}measureOnset","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"58"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"data","sType":"*A ","role":"select","C":[{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"59"}]}]}]}]}]}]},{"N":"post","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"60","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}measureDuration"}]}]}]}]}]}]}]}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteDuration","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"63"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"65","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"66"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"33"},{"N":"filter","sType":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"67","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}tie,NE nQ{http://www.w3.org/1999/xhtml}tie]"},{"N":"gc","op":"=","comp":"GAC|http://www.w3.org/2005/xpath-functions/collation/codepoint","card":"1:1","C":[{"N":"attVal","name":"Q{}type"},{"N":"str","val":"stop"}]}]},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"35","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]},{"N":"true"},{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","sType":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"37"}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteOnset","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"73"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"74"}]}]}]}]},{"N":"post","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"76","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"77"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"43"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"45","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}noteBeat","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"83"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"1","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"84"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"86","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"87"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"51"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"53","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"arith","op":"div","calc":"d/d","C":[{"N":"cvUntyped","to":"AO","diag":"1|0|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]},{"N":"fn","name":"accumulator-after","C":[{"N":"str","val":"Q{}divisions"}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"0E","slots":"5","name":"Q{}harmony","as":"element()*","ex:asJ":"*NE ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"empty","sType":"0E","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"93"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"*NE ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"dot","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"94"}]}]},{"N":"post","slots":"0"}]},{"N":"accumulator","binds":"","sType":"1ADI","slots":"5","name":"Q{}harmonyPreviousDuration","as":"xs:double","ex:asJ":"AO ","ns":"xml=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"init","line":"97"},{"N":"pre","slots":"0","C":[{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","sType":"1NE u[NE nQ{}measure,NE nQ{http://www.w3.org/1999/xhtml}measure]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"98"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","sType":"1NE u[NE nQ{}harmony,NE nQ{http://www.w3.org/1999/xhtml}harmony]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","role":"select","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","role":"select","C":[{"N":"int","val":"0","sType":"1ADI","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"99"}]}]}]},{"N":"accRule","valueType":"AO ","slots":"5","prio":"0","C":[{"N":"p.nodeTest","role":"match","test":"NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","sType":"1NE u[NE nQ{}note,NE nQ{http://www.w3.org/1999/xhtml}note]","ns":"= xml=~ fn=~ musicxml=http://www.w3.org/2021/06/musicxml40 xsl=~ xs=~ map=~ ex=~ "},{"N":"check","card":"1","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"convert","to":"AO","sType":"1AO ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","flags":"p","C":[{"N":"cvUntyped","to":"AO","sType":"*A ","diag":"2|0|XPTY0004|xsl:accumulator-rule/@select","C":[{"N":"data","sType":"*A ","C":[{"N":"choose","sType":"* ","type":"item()*","line":"101","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","sType":"*NE u[NE nQ{}chord,NE nQ{http://www.w3.org/1999/xhtml}chord]","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","line":"102"},{"N":"varRef","name":"Q{}value","slot":"0","sType":"*","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"62"},{"N":"true"},{"N":"arith","op":"+","calc":"a+a","sType":"?A","ns":"= xml=~ fn=~ xsl=~ xs=~ musicxml=http://www.w3.org/2021/06/musicxml40 map=~ ","role":"select","line":"64","C":[{"N":"check","card":"?","diag":"1|0||arith","C":[{"N":"data","diag":"1|0||arith","C":[{"N":"varRef","name":"Q{}value","slot":"0"}]}]},{"N":"cvUntyped","to":"AO","diag":"1|1|FORG0001|arith","C":[{"N":"check","card":"?","diag":"1|1||arith","C":[{"N":"data","diag":"1|1||arith","C":[{"N":"axis","name":"child","nodeTest":"*NE u[NE nQ{}duration,NE nQ{http://www.w3.org/1999/xhtml}duration]"}]}]}]}]}]}]}]}]}]}]}]},{"N":"post","slots":"0"}]},{"N":"decimalFormat"}],"Σ":"11b1307e"} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 2a5e65fe..a0bd49ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "musicxml-midi", - "version": "2.8.1", + "version": "2.8.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "musicxml-midi", - "version": "2.8.1", + "version": "2.8.2", "hasInstallScript": true, "license": "GPL-3.0-only", "dependencies": { @@ -1317,9 +1317,9 @@ } }, "node_modules/@types/node": { - "version": "22.5.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz", - "integrity": "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==", + "version": "22.7.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.3.tgz", + "integrity": "sha512-qXKfhXXqGTyBskvWEzJZPUxSslAiLaB6JGP1ic/XTH9ctGgzdgYguuLP1C601aRTSDNlLb0jbKqXjZ48GNraSA==", "dev": true, "license": "MIT", "dependencies": { @@ -1783,9 +1783,9 @@ "license": "BSD-2-Clause" }, "node_modules/browserslist": { - "version": "4.23.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", - "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz", + "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==", "dev": true, "funding": [ { @@ -1803,8 +1803,8 @@ ], "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001646", - "electron-to-chromium": "^1.5.4", + "caniuse-lite": "^1.0.30001663", + "electron-to-chromium": "^1.5.28", "node-releases": "^2.0.18", "update-browserslist-db": "^1.1.0" }, @@ -1892,9 +1892,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001662", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001662.tgz", - "integrity": "sha512-sgMUVwLmGseH8ZIrm1d51UbrhqMCH3jvS7gF/M6byuHOnKyLOBL7W8yz5V02OHwgLGA36o/AFhWzzh4uc5aqTA==", + "version": "1.0.30001664", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz", + "integrity": "sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==", "dev": true, "funding": [ { @@ -2608,9 +2608,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.26", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.26.tgz", - "integrity": "sha512-Z+OMe9M/V6Ep9n/52+b7lkvYEps26z4Yz3vjWL1V61W0q+VLF1pOHhMY17sa4roz4AWmULSI8E6SAojZA5L0YQ==", + "version": "1.5.29", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz", + "integrity": "sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==", "dev": true, "license": "ISC" }, @@ -5476,9 +5476,9 @@ } }, "node_modules/package-json-from-dist": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", - "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", "license": "BlueOak-1.0.0" }, "node_modules/parse-json": { diff --git a/package.json b/package.json index ab6f4b55..db156e50 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "musicxml-midi", - "version": "2.8.1", + "version": "2.8.2", "description": "MusicXML to MIDI converter", "type": "module", "directories": { diff --git a/src/js/musicxml-grooves.js b/src/js/musicxml-grooves.js index 31ed18be..e62f01cd 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', @@ -62,6 +69,9 @@ const options = { }, 'dashes': { type: 'boolean' + }, + 'tracks': { + type: 'string' } } const { values: args } = (() => { @@ -105,6 +115,7 @@ const instruments = await SaxonJS.getResource({ const grid = args['grid'].split(',').map(g => parseInt(g.trim())) const grooves = 'grooves' in args ? args['grooves'].split(',').map(g => g.trim()) : [] +const tracks = 'tracks' in args ? args['tracks'].split(',').map(t => t.trim()) : [] for (const groove of JSON.parse(fs.readFileSync('build/grooves.json'))) { if (grooves.length > 0 && grooves.indexOf(groove.groove) < 0) continue @@ -135,7 +146,10 @@ for (const groove of JSON.parse(fs.readFileSync('build/grooves.json'))) { * Main entrypoint for MusicXML generation. */ function createMusicXML(groove) { - groove.tracks = groove.tracks.filter(t => t.track.startsWith('DRUM')).reverse() + groove.tracks = groove.tracks.filter( + t => t.track.startsWith('DRUM') && + (tracks.length === 0 || tracks.find(tt => tt.localeCompare(t.track.replace('DRUM-', ''), undefined, {sensitivity: 'base'}) == 0)) + ).reverse() if (!groove.tracks.length) { throw Error(`[${groove.groove}] No drum tracks found.`) } @@ -480,11 +494,13 @@ function createMeasureNotes(groove, part, measure) { // Generate note types, durations and extra notes as needed. // Ignore notes that have already been processed by an earlier iteration in createNoteTiming(). + // Also ignore notes that are dropped by the timing algorithm. .reduce((notes, note, index, input) => { const extra = 'musicXml' in note ? [] : createNoteTiming(note, index, input) notes.push(note, ...extra) return notes }, []) + .filter(n => 'musicXml' in n) // Generate MusicXML. // When voices change, we backup to the beginning of the measure. @@ -582,19 +598,15 @@ function quantizeNoteOnset(note, index, notes, beats, grid) { if (onset !== undefined) { return onset } - - if (isFirstNote || notes[index-1].quantized.onset < candidate.multiple) { + if (isFirstNote || notes[index-1].quantized.onset <= candidate.multiple) { return candidate } }, undefined) // Validate the quantization. if (onset === undefined) { - console.warn(`[${note.track}:${note.measure+1}] Failed to quantize note onset at ${note.onset} to avoid collision with previous note. Moving it manually.`) - onset = { - multiple: notes[index-1].quantized.onset + DIVISIONS_1024th, - error_sgn: scoreOnset - (notes[index-1].quantized.onset + DIVISIONS_1024th) - } + console.error(`[${note.track}:${note.measure+1}] Failed to quantize note onset at ${note.onset} to avoid collision with previous note. Dropping it.`) + return } // Store the note. @@ -606,14 +618,13 @@ function quantizeNoteOnset(note, index, notes, beats, grid) { /** * Quantize a single note duration. - * Don't let duration remain at 0. */ function quantizeNoteDuration(note, index, notes, beats, grid) { const isFirstNote = index === 0 || notes[index-1].voice !== note.voice const isLastNote = index === notes.length - 1 || notes[index+1].voice !== note.voice const scoreOffset = Math.min( note.quantized.onset + note.quantized.duration, - isLastNote ? beats * DIVISIONS : notes[index+1].quantized.onset + isLastNote ? beats * DIVISIONS : notes[index+1].quantized.onset + (notes[index+1].quantized.onset === note.quantized.onset ? notes[index+1].quantized.onset : 0) ) let offset = grid.map(unit => { return nearestMultiple(scoreOffset, DIVISIONS/unit) @@ -630,13 +641,8 @@ function quantizeNoteDuration(note, index, notes, beats, grid) { if (offset === undefined) { // TODO Handle this case. - console.warn(`[${note.track}:${note.measure+1}] Failed to quantize note duration at ${note.onset} to avoid zero duration.`) - } - - // Adjust the note duration if it crosses the measure boundary. - if (offset.multiple > beats * DIVISIONS) { - console.warn(`[${note.track}:${note.measure+1}] Quantized note duration at ${note.onset} crosses measure boundary. Reducing the duration.`) - offset.multiple = beats * DIVISIONS + console.warn(`[${note.track}:${note.measure+1}] Failed to quantize note duration at ${note.onset} to avoid zero duration. Dropping it.`) + return [] } // Store the note. @@ -766,7 +772,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) @@ -774,13 +780,13 @@ 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) => { + tuplet.forEach((n, i, t) => { n.quantized = { duration: target / tupletCount, - onset: note.quantized.onset + (i * target / tupletCount) + onset: i === 0 ? note.quantized.onset : (t[i-1].quantized.onset + t[i-1].quantized.duration) } n.musicXml = { duration: target / tupletCount, @@ -804,7 +810,7 @@ function createNoteTiming(note, index, notes) { // - Sum up to a quarter // - Each be within a triplet multiple of a quarter // - Fall within the same quarter note, instead of crossing quarter not boundaries - if (entry === DIVISIONS_EIGHTH && entry < note.quantized.duration && note.quantized.duration < entry * 2) { + if (entry === DIVISIONS_EIGHTH && entry / 2 < note.quantized.duration && note.quantized.duration < entry * 2) { const target = entry * 2 const pair = tuplets(note, index, notes, 2) const ratio = Math.round(target / 3) @@ -815,6 +821,10 @@ function createNoteTiming(note, index, notes) { Math.floor(pair[0].quantized.onset / target) === Math.floor(pair[1].quantized.onset / target) ) { pair.forEach((n, i, t) => { + n.quantized = { + duration: n.quantized.duration > ratio ? target * 2 / 3 : target / 3, + onset: i === 0 ? note.quantized.onset : (t[i-1].quantized.onset + t[i-1].quantized.duration) + } n.musicXml = { duration: n.quantized.duration, type: n.quantized.duration > ratio ? lookupType(target) : lookupType(entry), @@ -862,7 +872,14 @@ function createNoteTiming(note, index, notes) { // Check that the gap is all filled. if (gap > Number.EPSILON) { - console.warn(`[${note.track}:${note.measure+1}] Remaining gap of ${gap} left after note at ${note.onset}.`) + const isFirstNote = index === 0 || notes[index-1].voice !== note.voice + if (!isFirstNote && !('midi' in note && notes[index-1].midi != note.midi)) { + console.warn(`[${note.track}:${note.measure+1}] Remaining gap of ${gap} left after note 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.`) } // Close up the last tie. diff --git a/test/data/grooves/04JAZZ01.musicxml b/test/data/grooves/04JAZZ01.musicxml index fb21e004..58da36ed 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-27 @@ -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..846999fe 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-27 diff --git a/test/data/grooves/04JAZZ03.musicxml b/test/data/grooves/04JAZZ03.musicxml index 422dd25f..5c1d4688 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-27 diff --git a/test/data/grooves/04JAZZ04.musicxml b/test/data/grooves/04JAZZ04.musicxml index 1e4512b1..a5ba9977 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-27 @@ -286,15 +286,13 @@ D 5 - 96 - + 384 2 - 32nd + eighth up normal - @@ -331,74 +329,6 @@ - - - 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 - - - - 3072 @@ -431,79 +361,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 - + + + 3 + eighth + + + 2 + quarter + + @@ -511,51 +390,19 @@ F 5 - 96 - - + 512 3 - 32nd - up - normal - - - - - - - - F - 5 - - 24 - - - - 3 - 128th - up - normal - - - - - - - - F - 5 - - 6 - - - 3 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -1003,50 +850,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - F @@ -1130,83 +933,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 - + + + 3 + eighth + + + 2 + quarter + + @@ -1214,51 +962,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 - + @@ -1665,50 +1381,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - F @@ -1792,83 +1464,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 - + + + 3 + eighth + + + 2 + quarter + + @@ -1876,51 +1493,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/08Beat01.musicxml b/test/data/grooves/08Beat01.musicxml index 302e70ec..4e43f48e 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-27 diff --git a/test/data/grooves/08Beat02.musicxml b/test/data/grooves/08Beat02.musicxml index 1238337e..4388c749 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-27 diff --git a/test/data/grooves/08Beat03.musicxml b/test/data/grooves/08Beat03.musicxml index 2a60f483..e8e6cc70 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-27 diff --git a/test/data/grooves/08Beat04.musicxml b/test/data/grooves/08Beat04.musicxml index 77b394a6..98328490 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-27 diff --git a/test/data/grooves/08Beat05.musicxml b/test/data/grooves/08Beat05.musicxml index 3f6d3b4b..a3767768 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-27 diff --git a/test/data/grooves/08Beat06.musicxml b/test/data/grooves/08Beat06.musicxml index c20e0c22..471410eb 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-27 diff --git a/test/data/grooves/08Beat07.musicxml b/test/data/grooves/08Beat07.musicxml index 234eb021..8e34e514 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-27 diff --git a/test/data/grooves/08Beat08.musicxml b/test/data/grooves/08Beat08.musicxml index 2ee1ed83..216353e6 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-27 @@ -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..6f51b172 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-27 @@ -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..356b5f10 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-27 @@ -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..606155cc 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-27 @@ -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..f79bb8a7 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-27 @@ -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..0ad10273 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-27 diff --git a/test/data/grooves/16Beat02.musicxml b/test/data/grooves/16Beat02.musicxml index 6634ce7f..3a54b00b 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-27 diff --git a/test/data/grooves/16Beat03.musicxml b/test/data/grooves/16Beat03.musicxml index 12de4b13..c6a6b4bc 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-27 diff --git a/test/data/grooves/16Beat04.musicxml b/test/data/grooves/16Beat04.musicxml index 897c05e4..bf14e86c 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-27 diff --git a/test/data/grooves/16Beat05.musicxml b/test/data/grooves/16Beat05.musicxml index d7c92778..4affb95f 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-27 diff --git a/test/data/grooves/16Beat06.musicxml b/test/data/grooves/16Beat06.musicxml index 6f51a224..e490fa3a 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-27 diff --git a/test/data/grooves/16Beat07.musicxml b/test/data/grooves/16Beat07.musicxml index 9794acda..4b5ec6c9 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-27 diff --git a/test/data/grooves/16Beat08.musicxml b/test/data/grooves/16Beat08.musicxml index 3691de24..b6c6b84c 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-27 diff --git a/test/data/grooves/16Beat09.musicxml b/test/data/grooves/16Beat09.musicxml index 03e6bc8f..8183ed39 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-27 @@ -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..e019f732 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-27 @@ -634,117 +634,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 - - 96 - - - 2 - 32nd - down - x - - - - - - - D - 4 - - 24 - - - - 2 - 128th - down - x - - - - - - - - D - 4 - - 6 - + 384 2 - 512th + eighth down x - @@ -879,117 +775,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 - - 96 - - - 2 - 32nd - down - x - - - - - - - D - 4 - - 24 - - - - 2 - 128th - down - x - - - - - - - - D - 4 - - 6 - + 384 2 - 512th + eighth down x - diff --git a/test/data/grooves/16Beat10.musicxml b/test/data/grooves/16Beat10.musicxml index 6c740eea..0da30be6 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-27 diff --git a/test/data/grooves/16Beat11.musicxml b/test/data/grooves/16Beat11.musicxml index 71085eb5..8025d6be 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-27 diff --git a/test/data/grooves/16Beat12.musicxml b/test/data/grooves/16Beat12.musicxml index e89e2bdc..c521b2ec 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-27 diff --git a/test/data/grooves/16Beat2.musicxml b/test/data/grooves/16Beat2.musicxml index 5427c543..deb6fc84 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-27 @@ -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..8f7cde78 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-27 @@ -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..6dc2a14c 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-27 @@ -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..6b83ce09 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-27 @@ -455,98 +455,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 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 - - - + 512 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,62 +667,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 384 - - + 512 1 - eighth - down - normal - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -858,1687 +693,202 @@ E 4 - 96 - - + 512 1 - 32nd + quarter + + 3 + 2 + quarter + down normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - 768 - 1 - quarter - - - - - - - - E - 4 - - 768 - - 1 - quarter - down - normal - - - - - - 384 - - 1 - eighth - - - - - - - 192 - - 1 - 16th - - - - - - - E - 4 - - 192 - - 1 - 16th - down - normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 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 - - - - - - - - E - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 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 - - - - - - - - E - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - - - - 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 - - - - - - - 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 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 + + + 512 + 1 + quarter + + 3 + 2 + quarter + - + - + + + - G - 5 + E + 4 - 96 - - - 3 - 32nd - up - x + 768 + + 1 + quarter + down + normal - - - - G - 5 - - 24 + + + 384 - - - 3 - 128th - up - x + 1 + eighth - - - - G - 5 - - 6 + + + 192 - - 3 - 512th - up - x + 1 + 16th - + - G - 5 + E + 4 192 - - 3 + + 1 16th - up - x + down + normal - + + + 256 + 1 + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + + + + - G - 5 + E + 4 - 192 - - 3 - 16th - up - x + 512 + + 1 + quarter + + 3 + 2 + quarter + + down + normal + - + + + 256 + 1 + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + + + + + + E + 4 + + 512 + + 1 + quarter + + 3 + 2 + quarter + + down + normal + + + + + + + + + + 768 + + + percussion + + + 5 + + + G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 @@ -2556,7 +906,7 @@ - + G 5 @@ -2574,7 +924,7 @@ - + G 5 @@ -2590,20 +940,18 @@ - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -2611,33 +959,27 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -2673,51 +1015,13 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - + 384 3 - 256th + eighth up x - - @@ -2725,31 +1029,13 @@ G 5 - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - + 192 3 - 32nd + 16th up x - @@ -2757,33 +1043,27 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -2814,23 +1094,23 @@ - + + + G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 @@ -2848,7 +1128,7 @@ - + G 5 @@ -2866,7 +1146,7 @@ - + G 5 @@ -2882,20 +1162,18 @@ - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -2903,33 +1181,27 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -2960,22 +1232,18 @@ - - G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -2983,67 +1251,55 @@ G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -3051,113 +1307,109 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + + + G 5 - 6 - + 384 3 - 512th + eighth up x - - + G 5 - 192 + 48 + + 3 - 16th + 64th up x + + - + G 5 - 192 + 12 + + 3 - 16th + 256th up x + + - + G 5 - 192 - + 3 + 3 - 16th + 1024th up x - + - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -3165,31 +1417,27 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -3197,33 +1445,27 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -3254,20 +1496,18 @@ - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -3275,80 +1515,74 @@ G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - + + G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 + 48 + 3 - 32nd + 64th up x + - + G 5 - 24 + 12 3 - 128th + 256th up x @@ -3356,23 +1590,23 @@ - + G 5 - 6 + 3 3 - 512th + 1024th up x - + G 5 @@ -3405,83 +1639,69 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -3489,33 +1709,27 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - diff --git a/test/data/grooves/16Beat3End.musicxml b/test/data/grooves/16Beat3End.musicxml index 70b1d5a6..63076575 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-27 @@ -342,98 +342,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 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 - - - + 512 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 + + @@ -522,15 +458,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -585,56 +519,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - G @@ -668,117 +552,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 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up x - @@ -814,117 +594,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 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up x - @@ -960,117 +636,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 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up x - diff --git a/test/data/grooves/16Beat3Intro.musicxml b/test/data/grooves/16Beat3Intro.musicxml index 9d75681a..94431a61 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-27 @@ -422,98 +422,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 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 - - - + 512 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 - + 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 + + @@ -691,23 +554,32 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -836,1042 +708,16 @@ 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 - + 384 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - - 3 - 16th + eighth up x - - + G 5 @@ -1889,7 +735,7 @@ - + G 5 @@ -1907,7 +753,7 @@ - + G 5 @@ -1923,20 +769,18 @@ - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -1944,33 +788,27 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -2001,22 +839,18 @@ - - G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -2024,67 +858,55 @@ G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -2092,113 +914,109 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + + + G 5 - 6 - + 384 3 - 512th + eighth up x - - + G 5 - 192 + 48 + + 3 - 16th + 64th up x + + - + G 5 - 192 + 12 + + 3 - 16th + 256th up x + + - + G 5 - 192 - + 3 + 3 - 16th + 1024th up x - + - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -2206,31 +1024,27 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -2238,33 +1052,27 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -2295,20 +1103,18 @@ - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -2316,80 +1122,74 @@ G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - + + G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 + 48 + 3 - 32nd + 64th up x + - + G 5 - 24 + 12 3 - 128th + 256th up x @@ -2397,23 +1197,23 @@ - + G 5 - 6 + 3 3 - 512th + 1024th up x - + G 5 @@ -2446,83 +1246,69 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -2530,33 +1316,27 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - diff --git a/test/data/grooves/16BeatBallad1.musicxml b/test/data/grooves/16BeatBallad1.musicxml index 4c0aec7a..06800632 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-27 @@ -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..f1e765cc 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-27 @@ -330,6 +330,36 @@ + + + + G + 5 + + 192 + + 3 + 16th + up + x + + + + + + + G + 5 + + 192 + + 3 + 16th + up + circle-x + + + G @@ -430,20 +460,52 @@ + + + G + 5 + + 128 + + 3 + 16th + + 3 + 2 + 16th + + up + x + + + + 3 + 16th + + + 2 + 16th + + + + G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up circle-x - @@ -451,45 +513,104 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up circle-x - - + + + + + + G + 5 + + 192 + + 3 + 16th + up + x + + G 5 - 6 - + 192 3 - 512th + 16th + up + circle-x + + + + + + G + 5 + + 192 + + 3 + 16th up circle-x - + G 5 - 96 + 192 + + 3 + 16th + up + x + + + + + + + G + 5 + + 192 + + 3 + 16th + up + circle-x + + + + + + G + 5 + + 48 3 - 32nd + 64th up x @@ -501,12 +622,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -535,11 +656,11 @@ G 5 - 48 + 96 3 - 64th + 32nd up circle-x @@ -551,12 +672,12 @@ G 5 - 12 + 24 3 - 256th + 128th up circle-x @@ -569,48 +690,44 @@ G 5 - 3 + 6 3 - 1024th + 512th up circle-x - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - G 5 - 189 + 128 3 - 32nd - - - - - + 16th + + 3 + 2 + 16th + up x + + + 3 + 16th + + + 2 + 16th + + @@ -618,14 +735,15 @@ G 5 - 186 + 128 3 - 32nd - - - - + 16th + + 3 + 2 + 16th + up circle-x @@ -636,13 +754,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up circle-x + @@ -650,33 +774,25 @@ G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x + G 5 - 186 + 192 3 - 32nd - - - - + 16th up circle-x @@ -687,49 +803,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 - @@ -737,11 +847,11 @@ G 5 - 96 + 48 3 - 32nd + 64th up x @@ -753,12 +863,12 @@ G 5 - 24 + 12 3 - 128th + 256th up x @@ -771,11 +881,11 @@ G 5 - 6 + 3 3 - 512th + 1024th up x @@ -821,31 +931,44 @@ G 5 - 3 + 6 3 - 1024th + 512th up circle-x - + G 5 - 96 - - + 128 + 3 - 32nd + 16th + + 3 + 2 + 16th + up - circle-x + x - + + + 3 + 16th + + + 2 + 16th + + @@ -853,17 +976,18 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up circle-x - - @@ -871,15 +995,19 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up circle-x - + @@ -887,906 +1015,61 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - - + + G 5 - 24 - - - + 192 + 3 - 128th + 16th up - x + circle-x - - - + G 5 - 3 - - + 192 + 3 - 1024th + 16th up - x + 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 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 186 - - 3 - 32nd - - - - - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 186 - - 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 - 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 - - 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 - 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 - circle-x - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 186 - - 3 - 32nd - - - - - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 186 - - 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 - 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 - - 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 - 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 - - + 192 + 3 - 1024th + 16th up - circle-x + x - + G 5 @@ -1805,52 +1088,49 @@ G 5 - 189 + 48 + 3 - 32nd - - - - - + 64th up x + - + G 5 - 186 - + 12 + + + 3 - 32nd - - - - + 256th up - circle-x + x + + - - - + G 5 - 192 - + 3 + + 3 - 16th + 1024th up - circle-x + x + @@ -1858,11 +1138,11 @@ G 5 - 48 + 96 3 - 64th + 32nd up circle-x @@ -1874,12 +1154,12 @@ G 5 - 12 + 24 3 - 256th + 128th up circle-x @@ -1892,11 +1172,11 @@ G 5 - 3 + 6 3 - 1024th + 512th up circle-x @@ -1908,65 +1188,67 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + + + 3 + 16th + + + 2 + 16th + + - + G 5 - 6 - - + 128 + 3 - 512th + 16th + + 3 + 2 + 16th + up - x + circle-x - - + G 5 - 384 - - + 128 + 3 - eighth + 16th + + 3 + 2 + 16th + up - x + circle-x - + @@ -1974,51 +1256,44 @@ G 5 - 96 - - + 192 3 - 32nd + 16th up x - - - + + G 5 - 24 - - - + 192 + 3 - 128th + 16th up - x + circle-x - - + + G 5 - 3 - + 768 3 - 1024th + quarter up x - @@ -2199,98 +1474,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 + + @@ -2298,15 +1500,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/16BeatBallad1Intro.musicxml b/test/data/grooves/16BeatBallad1Intro.musicxml index a314f120..99828703 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-27 @@ -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..aba5d088 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-27 @@ -535,15 +535,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -598,20 +596,18 @@ - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -619,36 +615,30 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - - + G 5 @@ -662,7 +652,7 @@ - + G 5 @@ -677,100 +667,134 @@ + + G + 5 + + 384 + + 3 + eighth + up + x + + + + G 5 192 - 3 16th up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - - + + + G + 5 + + 192 + + 3 + 16th + up + x + + + + + + + + G + 5 + + 384 + + 3 + eighth + up + x + + + + G 5 - 96 + 48 + 3 - 32nd + 64th up x + - + G 5 - 24 + 12 3 - 128th + 256th up x @@ -778,23 +802,23 @@ - + G 5 - 6 + 3 3 - 512th + 1024th up x - + G 5 @@ -808,7 +832,7 @@ - + G 5 @@ -827,51 +851,41 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -879,31 +893,27 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -911,33 +921,27 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -954,7 +958,7 @@ - + G 5 @@ -968,20 +972,20 @@ + + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1036,57 +1040,49 @@ - + G 5 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - - + G 5 @@ -1100,7 +1096,7 @@ - + G 5 @@ -1114,58 +1110,46 @@ - - - + G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -1173,1284 +1157,60 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 192 3 - 128th + 16th 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - + + + G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 @@ -2468,7 +1228,7 @@ - + G 5 @@ -2486,7 +1246,7 @@ - + G 5 @@ -2502,54 +1262,46 @@ - + G 5 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -2585,117 +1337,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 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up x - @@ -2731,120 +1379,45 @@ 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 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - - + 192 + 3 - 128th + 16th up - x + circle-x - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - + G 5 @@ -2858,20 +1431,6 @@ - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - diff --git a/test/data/grooves/16BeatBallad2End.musicxml b/test/data/grooves/16BeatBallad2End.musicxml index fa0b7ddb..5c9d90ca 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-27 @@ -496,206 +496,7 @@ - - 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 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - + G 5 @@ -728,184 +529,28 @@ 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 - - - 3 - 512th - up - x - - - - - - - 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 + + @@ -913,17 +558,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -931,15 +577,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -956,25 +606,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -990,156 +621,18 @@ + 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 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - @@ -1147,15 +640,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1163,15 +654,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1179,17 +683,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1197,15 +702,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1222,25 +731,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1256,38 +746,18 @@ + G 5 - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - + 192 3 - 64th + 16th up x - @@ -1295,17 +765,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -1313,15 +779,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1329,15 +808,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -1345,17 +827,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -1363,15 +847,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1379,33 +861,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -1413,15 +890,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1429,15 +904,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1445,17 +933,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1463,15 +952,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1488,80 +981,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..cbfacf0a 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-27 @@ -565,15 +565,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -628,56 +626,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - G @@ -711,51 +659,41 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -763,31 +701,27 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -795,36 +729,30 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - - + G 5 @@ -838,7 +766,7 @@ - + G 5 @@ -852,23 +780,23 @@ - + + + G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 @@ -886,7 +814,7 @@ - + G 5 @@ -904,7 +832,7 @@ - + G 5 @@ -920,71 +848,7 @@ - - - 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 @@ -998,122 +862,74 @@ - + 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 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -1121,1451 +937,16 @@ 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-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 - - - 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 - - 189 + 192 3 - 32nd - - - - - + 16th up x - + G 5 @@ -2579,102 +960,93 @@ - + G 5 - 189 + 384 3 - 32nd - - - - - + eighth up x - + G 5 - 48 - + 192 3 - 64th + 16th up x - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - - + + + G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 + 48 + 3 - 32nd + 64th up x + - + G 5 - 24 + 12 3 - 128th + 256th up x @@ -2682,123 +1054,107 @@ - + G 5 - 6 + 3 3 - 512th + 1024th up x - + G 5 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - - + G 5 - 48 - + 192 3 - 64th + 16th up x - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 @@ -2812,122 +1168,106 @@ - + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x - + G 5 - 192 + 384 3 - 16th + eighth up x - + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x - + G 5 - 48 - + 192 3 - 64th + 16th up x - + + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -2935,17 +1275,13 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -2953,15 +1289,28 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2969,15 +1318,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -2985,17 +1337,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -3003,15 +1357,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -3019,33 +1371,28 @@ G 5 - 48 - + 192 3 - 64th + 16th up x - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -3053,15 +1400,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -3069,13 +1414,28 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + + + 3 + 16th + + + 2 + 16th + + @@ -3083,15 +1443,15 @@ G 5 - 189 + 128 3 - 32nd - - - - - + 16th + + 3 + 2 + 16th + up x @@ -3102,13 +1462,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -3116,15 +1482,10 @@ G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -3135,33 +1496,28 @@ G 5 - 48 - + 192 3 - 64th + 16th up x - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -3169,15 +1525,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -3185,15 +1539,28 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -3201,17 +1568,18 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - @@ -3219,15 +1587,19 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - + @@ -3235,15 +1607,13 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -3251,33 +1621,28 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - + G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -3285,15 +1650,13 @@ G 5 - 48 - + 192 3 - 64th + 16th up x - @@ -3301,17 +1664,28 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + + + 3 + 16th + + + 2 + 16th + + @@ -3319,15 +1693,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -3335,13 +1712,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -3349,15 +1732,10 @@ G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x diff --git a/test/data/grooves/16BeatBallad3.musicxml b/test/data/grooves/16BeatBallad3.musicxml index 0c7fe443..3e651c11 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-27 @@ -852,15 +852,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -915,56 +913,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - G @@ -998,164 +946,170 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 192 + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - + G 5 - 192 + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x + - + + + G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 @@ -1173,7 +1127,7 @@ - + G 5 @@ -1191,7 +1145,7 @@ - + G 5 @@ -1212,52 +1166,16 @@ 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 @@ -1271,34 +1189,32 @@ - + G 5 - 192 + 384 3 - 16th + eighth up x - + G 5 192 - 3 16th up x - @@ -1306,102 +1222,83 @@ G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - - + G 5 - 288 - + 192 3 16th - up x - - + G 5 - 24 - - + 384 3 - 128th + eighth up x - - - + G 5 - 6 - - + 192 + 3 - 512th + 16th up - x + circle-x - @@ -1419,21 +1316,19 @@ - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1488,57 +1383,49 @@ - + G 5 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - - + G 5 @@ -1552,7 +1439,7 @@ - + G 5 @@ -1566,1138 +1453,21 @@ - - - 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 - - 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 - - 192 - - 3 - 16th - up - circle-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 - - 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 - - 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 - - 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 - - 288 - - - 3 - 16th - - 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 - - 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 - + 384 3 - 512th + eighth up x - - + G 5 @@ -2711,7 +1481,7 @@ - + G 5 @@ -2725,169 +1495,91 @@ - + 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 - - + + + 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 - + 384 3 - 16th + eighth up x - - + G 5 @@ -2905,7 +1597,7 @@ - + G 5 @@ -2923,7 +1615,7 @@ - + G 5 @@ -2940,56 +1632,6 @@ - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - G 5 @@ -3003,7 +1645,7 @@ - + G 5 @@ -3017,38 +1659,32 @@ - + G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - @@ -3056,83 +1692,69 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - diff --git a/test/data/grooves/16BeatBallad3End.musicxml b/test/data/grooves/16BeatBallad3End.musicxml index 2847eba5..52e11cc8 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-27 @@ -565,650 +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 - - - - 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 - - - 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 - - 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 - - - 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 - - - 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 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - 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 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - @@ -1216,15 +584,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1232,15 +598,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1248,17 +627,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1266,15 +646,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1291,25 +675,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1325,38 +690,18 @@ + G 5 - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - + 192 3 - 64th + 16th up x - @@ -1364,17 +709,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -1382,15 +723,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1398,15 +752,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -1414,17 +771,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -1432,15 +791,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1448,33 +805,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -1482,15 +834,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1498,15 +848,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1514,17 +877,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1532,15 +896,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1557,27 +925,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - G @@ -1593,19 +940,18 @@ + G 5 - 48 - + 192 3 - 64th + 16th up x - @@ -1613,17 +959,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -1631,15 +973,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1647,15 +1002,18 @@ G 5 - 384 - + 128 3 - eighth + 16th + + 3 + 2 + 16th + up x - @@ -1663,17 +1021,19 @@ G 5 - 96 - - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - - + @@ -1681,33 +1041,29 @@ G 5 - 24 - - + 192 3 - 128th + 16th 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..791175ad 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-27 @@ -892,15 +892,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -955,56 +953,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - G @@ -1038,164 +986,170 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 192 + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - + G 5 - 192 + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x + - + + + G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 @@ -1213,7 +1167,7 @@ - + G 5 @@ -1231,7 +1185,7 @@ - + G 5 @@ -1248,70 +1202,6 @@ - - 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 @@ -1325,56 +1215,46 @@ - + G 5 192 - 3 16th up x - - + G 5 - 48 - - + 384 3 - 64th + eighth up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -1382,1472 +1262,30 @@ G 5 - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 288 - + 192 3 16th - - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth 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 - - 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 - - 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 - - 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 - - 192 - - 3 - 16th - up - circle-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 - - 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 - - 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 - - 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 - - 288 - - - 3 - 16th - - 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 - - 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 - - - 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 @@ -2861,102 +1299,89 @@ - + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x - + G 5 - 48 - + 384 3 - 64th + eighth up x - - + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - x + circle-x - - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - - + + + G 5 - 96 - + 384 3 - 32nd + eighth up x - - + G 5 - 24 + 48 3 - 128th + 64th up x @@ -2964,156 +1389,139 @@ - + G 5 - 6 + 12 + 3 - 512th + 256th up x + - + G 5 - 96 - + 3 + 3 - 32nd + 1024th up x - + - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 192 3 - 512th + 16th up x - - + G 5 - 48 - + 384 3 - 64th + eighth up x - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - - + G 5 - 192 + 384 3 - 16th + eighth up x - + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x - + G 5 @@ -3127,89 +1535,103 @@ - + G 5 - 189 + 256 3 - 32nd - - - - - + 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 - - + + + G 5 - 3 - + 192 3 - 1024th + 16th up x - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -3217,17 +1639,13 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -3235,15 +1653,28 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -3251,15 +1682,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -3267,17 +1701,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -3285,15 +1721,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -3301,33 +1735,28 @@ G 5 - 48 - + 192 3 - 64th + 16th up x - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -3335,15 +1764,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -3351,13 +1778,28 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + + + 3 + 16th + + + 2 + 16th + + @@ -3365,15 +1807,15 @@ G 5 - 189 + 128 3 - 32nd - - - - - + 16th + + 3 + 2 + 16th + up x @@ -3384,13 +1826,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -3398,15 +1846,10 @@ G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -3417,33 +1860,28 @@ G 5 - 48 - + 192 3 - 64th + 16th up x - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -3451,15 +1889,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -3467,15 +1903,28 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -3483,17 +1932,18 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - @@ -3501,15 +1951,19 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - + @@ -3517,15 +1971,13 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -3533,33 +1985,28 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - + G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -3567,15 +2014,13 @@ G 5 - 48 - + 192 3 - 64th + 16th up x - @@ -3583,17 +2028,28 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + + + 3 + 16th + + + 2 + 16th + + @@ -3601,15 +2057,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -3617,13 +2076,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -3631,15 +2096,10 @@ G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x diff --git a/test/data/grooves/16FUS01.musicxml b/test/data/grooves/16FUS01.musicxml index ee9de53a..5ed421c2 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-27 diff --git a/test/data/grooves/16FUS02.musicxml b/test/data/grooves/16FUS02.musicxml index 6150c907..985c4eff 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-27 diff --git a/test/data/grooves/16FUS03.musicxml b/test/data/grooves/16FUS03.musicxml index e85b04f0..b4924f1f 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-27 diff --git a/test/data/grooves/16FUS04.musicxml b/test/data/grooves/16FUS04.musicxml index 110660a9..b15d5c91 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-27 diff --git a/test/data/grooves/16Shuffle1.musicxml b/test/data/grooves/16Shuffle1.musicxml index d321ed4e..03ca5c19 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-27 @@ -661,15 +661,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -724,56 +722,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - G @@ -949,74 +897,136 @@ + + G + 5 + + 384 + + 3 + eighth + up + x + + + + G 5 192 - 3 16th up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - - + G 5 - 3 - + 192 + + 3 + 16th + up + circle-x + + + + + + G + 5 + + 192 3 - 1024th + 16th up x + + + + + + + 192 + + 3 + 16th + + + + + + + 48 + + + 3 + 64th + + - + + + 12 + + + 3 + 256th + + + + + + + + 3 + + 3 + 1024th + + + + + G 5 @@ -1032,7 +1042,7 @@ - + G 5 @@ -1050,7 +1060,7 @@ - + G 5 @@ -1066,17 +1076,17 @@ - + G 5 192 - + 3 16th up - x + circle-x @@ -1094,199 +1104,159 @@ - + G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - - + 192 + + 3 - 512th + 16th up - x + circle-x - + - + G 5 - 192 + 48 + + 3 - 16th + 64th up circle-x + + - + G 5 - 192 - + 12 + + + 3 - 16th + 256th up - x - - - - - - - - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th + circle-x - - + + + G + 5 + 3 + 3 1024th + up + circle-x - + G 5 @@ -1302,7 +1272,7 @@ - + G 5 @@ -1320,7 +1290,7 @@ - + G 5 @@ -1336,21 +1306,21 @@ - + G 5 192 - + 3 16th up - circle-x + x - + G 5 @@ -1364,23 +1334,23 @@ - + + + G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 @@ -1398,7 +1368,7 @@ - + G 5 @@ -1416,7 +1386,7 @@ - + G 5 @@ -1432,217 +1402,198 @@ - + G 5 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 96 + 3 - 512th + 32nd up x - + - + G 5 - 192 + 24 + + 3 - 16th + 128th up x + + - + G 5 - 192 + 6 + 3 - 16th + 512th up x + - + G 5 192 - - + 3 16th up - x + circle-x - - + + G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - - + G 5 192 - + 3 16th up - x + circle-x - + G 5 @@ -1656,75 +1607,53 @@ - - - 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 @@ -1740,7 +1669,7 @@ - + G 5 @@ -1758,7 +1687,7 @@ - + G 5 @@ -1774,21 +1703,21 @@ - + G 5 192 - + 3 16th up - x + circle-x - + G 5 @@ -1802,127 +1731,63 @@ - - - + G 5 - 192 - + 384 3 - 16th + 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 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - - + G 5 @@ -1936,7 +1801,7 @@ - + G 5 @@ -1950,62 +1815,18 @@ - - - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - G 5 - 96 + 192 - + 3 - 32nd + 16th up - x + circle-x @@ -2015,62 +1836,30 @@ G 5 - 24 + 48 - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 96 - 3 - 32nd + 64th up circle-x + - + G 5 - 24 + 12 3 - 128th + 256th up circle-x @@ -2078,49 +1867,49 @@ - + G 5 - 6 + 3 3 - 512th + 1024th up circle-x - + G 5 - 48 + 96 3 - 64th + 32nd up x - + G 5 - 12 + 24 3 - 256th + 128th up x @@ -2128,23 +1917,23 @@ - + G 5 - 3 + 6 3 - 1024th + 512th up x - + G 5 @@ -2158,1533 +1947,98 @@ - + G 5 192 - - + 3 16th up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x + circle-x - - - + + G 5 - 3 - + 192 3 - 1024th + 16th 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 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - - - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - - 3 - 1024th - - - - - - - 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 - circle-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 - - 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 - - 192 - - 3 - 16th - up - 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 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - - - - - - - 768 - - - percussion - - - 5 - - - - - 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 - - - - - - - 384 - - 1 - eighth - - - - - - - 192 - - 1 - 16th - - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - - - 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 - - - - - - - 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 - - - - - - + + + + + 768 + + + percussion + + + 5 + + + F 4 - 6 - + 768 1 - 512th + quarter down normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - 12 + 384 - 1 - 256th + eighth - - 3 + 192 1 - 1024th + 16th - + F 4 - 384 - + 192 1 - eighth + 16th down normal - @@ -3692,55 +2046,86 @@ F 4 - 96 - - + 256 1 - 32nd + eighth + + 3 + 2 + quarter + down normal - - + + + 3 + eighth + + + 2 + quarter + + - + F 4 - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + down normal + + + + + + + 384 + + 1 + eighth + + + + + 192 + + 1 + 16th + - + F 4 - 6 - + 192 1 - 512th + 16th down normal - - + F @@ -3794,83 +2179,140 @@ F 4 - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal - + + + 3 + quarter + + + 2 + quarter + + - + F 4 - 48 - - + 512 1 - 64th + quarter + + 3 + 2 + quarter + down normal - - + + + 512 + 1 + quarter + + 3 + 2 + quarter + + + + + + + F 4 - 12 - - + 768 1 - 256th + quarter down normal + + + + + + 384 + + 1 + eighth + + + + + 192 + + 1 + 16th + - + F 4 - 3 - + 192 1 - 1024th + 16th down normal - - + F 4 - 384 - + 256 1 eighth + + 3 + 2 + quarter + down normal - + + + 3 + eighth + + + 2 + quarter + + @@ -3878,147 +2320,184 @@ F 4 - 96 - - + 512 1 - 32nd + quarter + + 3 + 2 + quarter + down normal - - + - + + + 256 + 1 + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + + + + F 4 - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + down normal - - + - + + + F 4 - 6 - + 768 1 - 512th + quarter down normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - 12 + 384 - 1 - 256th + eighth - - 3 + 192 1 - 1024th + 16th - + F 4 - 384 - + 192 1 - eighth + 16th down normal - - + F 4 - 96 - - + 256 1 - 32nd + eighth + + 3 + 2 + quarter + down normal - - + + + 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 + + @@ -4026,15 +2505,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..697dc0d8 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-27 @@ -531,15 +531,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -594,56 +592,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - G @@ -823,117 +771,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 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up x - @@ -969,117 +813,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 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up x - @@ -1168,15 +908,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..74edcb59 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-27 @@ -665,15 +665,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -728,56 +726,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - G @@ -957,117 +905,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 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up x - @@ -1103,117 +947,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 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up x - @@ -1373,117 +1113,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 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up x - @@ -1500,136 +1136,32 @@ - - - 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 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -1823,14 +1355,15 @@ + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1883,24 +1416,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -2111,119 +1645,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 + + @@ -2231,15 +1674,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -2331,119 +1778,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 - - - 1 - eighth - down - normal - - - - - - - F - 4 - - 96 - - - - 1 - 32nd - down - normal - - - - - - - - F - 4 - - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + down normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -2451,23 +1807,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..9a469568 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-27 diff --git a/test/data/grooves/16Shuffle2End.musicxml b/test/data/grooves/16Shuffle2End.musicxml index 17894716..bd03bd11 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-27 @@ -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..7e45689c 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-27 diff --git a/test/data/grooves/16beat1A.musicxml b/test/data/grooves/16beat1A.musicxml index 6a4b8b5e..d6d88acd 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-27 diff --git a/test/data/grooves/16beat1B.musicxml b/test/data/grooves/16beat1B.musicxml index 1b2582da..e44dbfd0 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-27 diff --git a/test/data/grooves/16beat1E.musicxml b/test/data/grooves/16beat1E.musicxml index 95e8f16e..7fb973ec 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-27 diff --git a/test/data/grooves/16beat1End.musicxml b/test/data/grooves/16beat1End.musicxml index 9e3a72f0..3bddecb9 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-27 diff --git a/test/data/grooves/16beat1FA.musicxml b/test/data/grooves/16beat1FA.musicxml index c5d8b99b..671475df 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-27 diff --git a/test/data/grooves/16beat1FB.musicxml b/test/data/grooves/16beat1FB.musicxml index fc6dc7eb..80b56233 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-27 diff --git a/test/data/grooves/16beat1Intro.musicxml b/test/data/grooves/16beat1Intro.musicxml index 0bba81cd..bc3ad2b8 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-27 @@ -914,117 +914,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 - - 96 - - - 2 - 32nd - down - x - - - - - - - D - 4 - - 24 - - - - 2 - 128th - down - x - - - - - - - - D - 4 - - 6 - + 384 2 - 512th + eighth down x - @@ -1310,117 +1206,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 - - 96 - - - 2 - 32nd - down - x - - - - - - - D - 4 - - 24 - - - - 2 - 128th - down - x - - - - - - - - D - 4 - - 6 - + 384 2 - 512th + eighth down x - diff --git a/test/data/grooves/16beat2A.musicxml b/test/data/grooves/16beat2A.musicxml index 18680ab3..adaf0d0b 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-27 diff --git a/test/data/grooves/16beat2B.musicxml b/test/data/grooves/16beat2B.musicxml index c4ccaab9..dc166b71 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-27 diff --git a/test/data/grooves/16beat2E.musicxml b/test/data/grooves/16beat2E.musicxml index 967a09dc..22c7b682 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-27 diff --git a/test/data/grooves/16beat2FA.musicxml b/test/data/grooves/16beat2FA.musicxml index be830ed0..866de859 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-27 diff --git a/test/data/grooves/16beat2FB.musicxml b/test/data/grooves/16beat2FB.musicxml index 2abc1cec..2abe24a3 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-27 diff --git a/test/data/grooves/50sRock.musicxml b/test/data/grooves/50sRock.musicxml index eee8ad8c..ab174561 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-27 @@ -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..25ab3efa 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-27 diff --git a/test/data/grooves/50sRock1Plus.musicxml b/test/data/grooves/50sRock1Plus.musicxml index aae7ac93..954ed555 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-27 diff --git a/test/data/grooves/50sRock1Sus.musicxml b/test/data/grooves/50sRock1Sus.musicxml index d6398c4e..f476c372 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-27 diff --git a/test/data/grooves/50sRock1SusPlus.musicxml b/test/data/grooves/50sRock1SusPlus.musicxml index fc3f64a3..24dede4a 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-27 diff --git a/test/data/grooves/50sRockEnd.musicxml b/test/data/grooves/50sRockEnd.musicxml index 170d5af2..4e21c3b5 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-27 diff --git a/test/data/grooves/50sRockIntro.musicxml b/test/data/grooves/50sRockIntro.musicxml index cd3d9788..feb00bad 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-27 diff --git a/test/data/grooves/50sRockIntro1.musicxml b/test/data/grooves/50sRockIntro1.musicxml index 642cecf1..6686565f 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-27 diff --git a/test/data/grooves/50sRockPlus.musicxml b/test/data/grooves/50sRockPlus.musicxml index 80303510..9a839662 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-27 @@ -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..1805ed63 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-27 @@ -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..5ab1f16a 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-27 @@ -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..a130c9db 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-27 @@ -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..6dbe83a3 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-27 @@ -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..4b0fea5b 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-27 @@ -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..48397b1c 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-27 @@ -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..d701dff1 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-27 @@ -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..01dc1ff1 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-27 @@ -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..bf4011fa 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-27 @@ -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..8eb91b68 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-27 diff --git a/test/data/grooves/50s_RockFillBA.musicxml b/test/data/grooves/50s_RockFillBA.musicxml index 69879b8b..7bf61174 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-27 diff --git a/test/data/grooves/50s_RockFillBB.musicxml b/test/data/grooves/50s_RockFillBB.musicxml index 78458bbb..2c7331df 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-27 @@ -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..3a6f3433 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-27 diff --git a/test/data/grooves/50s_RockFillDD.musicxml b/test/data/grooves/50s_RockFillDD.musicxml index 366862ff..392b0872 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-27 diff --git a/test/data/grooves/50s_RockIntroA.musicxml b/test/data/grooves/50s_RockIntroA.musicxml index 05353170..d4bced75 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-27 diff --git a/test/data/grooves/50s_RockIntroB.musicxml b/test/data/grooves/50s_RockIntroB.musicxml index 575bfe79..dd465798 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-27 @@ -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..35ec29ef 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-27 diff --git a/test/data/grooves/60sPop.musicxml b/test/data/grooves/60sPop.musicxml index 0a5b26d0..ee555b4b 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-27 @@ -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..fb9b75ac 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-27 diff --git a/test/data/grooves/60sPopIntro.musicxml b/test/data/grooves/60sPopIntro.musicxml index ee416811..87789b60 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-27 @@ -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..be50e50a 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-27 diff --git a/test/data/grooves/60sRock1.musicxml b/test/data/grooves/60sRock1.musicxml index 2767fdd0..96a4f96d 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-27 diff --git a/test/data/grooves/60sRock1Plus.musicxml b/test/data/grooves/60sRock1Plus.musicxml index 13c1d757..537d2597 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-27 diff --git a/test/data/grooves/60sRock1Sus.musicxml b/test/data/grooves/60sRock1Sus.musicxml index eb720b72..b0257b70 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-27 diff --git a/test/data/grooves/60sRock1SusPlus.musicxml b/test/data/grooves/60sRock1SusPlus.musicxml index e554ef6c..8de47a70 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-27 diff --git a/test/data/grooves/60sRockEnd.musicxml b/test/data/grooves/60sRockEnd.musicxml index 4108a8e3..5cf2b5fc 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-27 @@ -428,472 +428,7 @@ - - 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 - - - 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 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - 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 - - - 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 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - + G 5 @@ -908,25 +443,7 @@ - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - - + G 5 @@ -945,168 +462,13 @@ 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 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up x - @@ -1114,15 +476,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1130,17 +505,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1148,15 +524,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1173,25 +553,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1207,38 +568,18 @@ + G 5 - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - + 192 3 - 64th + 16th up x - @@ -1246,17 +587,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -1264,15 +601,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1280,15 +630,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -1296,17 +649,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -1314,15 +669,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1330,33 +683,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -1364,15 +712,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1380,15 +726,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1396,17 +755,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1414,15 +774,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1439,27 +803,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - G @@ -1475,19 +818,18 @@ + G 5 - 48 - + 192 3 - 64th + 16th up x - @@ -1495,17 +837,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -1513,15 +851,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1529,15 +880,18 @@ G 5 - 384 - + 128 3 - eighth + 16th + + 3 + 2 + 16th + up x - @@ -1545,17 +899,19 @@ G 5 - 96 - - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - - + @@ -1563,33 +919,29 @@ G 5 - 24 - - + 192 3 - 128th + 16th 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..4e620957 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-27 @@ -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..0cd6852a 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-27 diff --git a/test/data/grooves/60sRockSus.musicxml b/test/data/grooves/60sRockSus.musicxml index fbe1c61e..7dc0ada4 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-27 diff --git a/test/data/grooves/60sRockSusPlus.musicxml b/test/data/grooves/60sRockSusPlus.musicxml index 6abf63c7..453eaff5 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-27 diff --git a/test/data/grooves/60sSoul.musicxml b/test/data/grooves/60sSoul.musicxml index a486401f..71ec5fa3 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-27 diff --git a/test/data/grooves/60sSoulEnd.musicxml b/test/data/grooves/60sSoulEnd.musicxml index 5aadbfc3..c895988f 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-27 diff --git a/test/data/grooves/60sSoulIntro.musicxml b/test/data/grooves/60sSoulIntro.musicxml index 19f764ac..64f369c4 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-27 diff --git a/test/data/grooves/68BLUS.musicxml b/test/data/grooves/68BLUS.musicxml index 25d67c2c..4b46309e 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-27 diff --git a/test/data/grooves/68Ballad.musicxml b/test/data/grooves/68Ballad.musicxml index 89118cf4..863d6be2 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-27 @@ -256,15 +256,13 @@ E 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -301,74 +299,6 @@ - - - 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 @@ -429,15 +359,13 @@ E 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -474,74 +402,6 @@ - - - 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 @@ -602,15 +462,13 @@ E 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -647,74 +505,6 @@ - - - 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 @@ -775,15 +565,13 @@ E 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -820,74 +608,6 @@ - - - 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 @@ -2110,171 +1830,48 @@ + E 4 - 48 - + 192 1 - 64th + 16th 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 - - + 192 1 - 128th + 16th up normal - - + E 4 - 3 - + 768 1 - 1024th + quarter up normal - @@ -2366,171 +1963,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 +2096,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 - @@ -2830,117 +2181,13 @@ 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 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/68BalladEnd.musicxml b/test/data/grooves/68BalladEnd.musicxml index 87e13891..b5f0a4cf 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-27 @@ -228,15 +228,13 @@ E 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -273,74 +271,6 @@ - - - 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 @@ -930,369 +860,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 +1212,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..cd7176a1 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-27 @@ -302,15 +302,13 @@ E 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -347,74 +345,6 @@ - - - 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 @@ -475,15 +405,13 @@ E 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -520,74 +448,6 @@ - - - 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 @@ -648,15 +508,13 @@ E 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -693,74 +551,6 @@ - - - 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 @@ -1699,171 +1489,98 @@ + F 4 - 48 - + 192 1 - 64th + 16th down normal - - + + F 4 - 12 - - + 768 1 - 256th + quarter down normal - - - - - F - 4 - - 3 - - + + + 768 1 - 1024th - down - normal + quarter - - + + + 384 + 1 + eighth + + + + F 4 384 - 1 eighth down normal - - + F 4 - 96 - - + 768 1 - 32nd + quarter down normal - - - + + 3072 + + - F + D 4 - 24 - - - - 1 - 128th + 192 + + 2 + 16th down - normal + x - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - 768 - 1 - quarter - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - down - normal - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - 3072 - - + + D 4 @@ -1878,432 +1595,188 @@ + 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 - + 768 2 - 512th + quarter down x - - - - D - 4 - - 96 - - + + + 768 2 - 32nd - down - x + quarter - - - - D - 4 - - 24 - - - + + + 768 2 - 128th - down - x + quarter - - - - - D - 4 - - 3 - - + + + 768 2 - 1024th - down - x + quarter - - - - D - 4 - - 96 - - - 2 - 32nd - down - x + + + + + + 768 + + + percussion + + + 5 + + + + + 768 + 3 + quarter - - + - D - 4 + G + 5 - 24 - - - 2 - 128th - down - x + 768 + + 3 + quarter + up + circle-x - - - - D - 4 - - 96 - - - 2 - 32nd - down - x + + + 768 + 3 + quarter - - - - D - 4 - - 18 - - - - 2 - 256th - - down - x + + + 768 + 3 + quarter - - - - - D - 4 - - 3 - - - 2 - 1024th - down - x + + + + + 768 + 3 + quarter - - + - 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 - - - - - - 768 - 3 - quarter - - - - - - - - 768 - 3 - quarter - - - - - - G - 5 + G + 5 768 @@ -2511,283 +1984,27 @@ - - - - 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 - - + + + + 768 + + + percussion + + + 1 + + + + + 768 1 - 1024th - up - normal + quarter - @@ -2863,7 +2080,7 @@ - + E @@ -2879,171 +2096,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 - @@ -3119,7 +2213,7 @@ - + E @@ -3135,203 +2229,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..6b24f7ed 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-27 diff --git a/test/data/grooves/68MarchEnd.musicxml b/test/data/grooves/68MarchEnd.musicxml index cd0f25a7..ebd7f790 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-27 diff --git a/test/data/grooves/68MarchFill.musicxml b/test/data/grooves/68MarchFill.musicxml index f5facf67..3fa34f79 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-27 diff --git a/test/data/grooves/68MarchFill2.musicxml b/test/data/grooves/68MarchFill2.musicxml index 30f09a84..02a4589c 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-27 diff --git a/test/data/grooves/68MarchIntro.musicxml b/test/data/grooves/68MarchIntro.musicxml index 8066eae5..43379f66 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-27 diff --git a/test/data/grooves/68MarchMetronome.musicxml b/test/data/grooves/68MarchMetronome.musicxml index 2938b56b..015f1b3b 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-27 diff --git a/test/data/grooves/68MarchPlus.musicxml b/test/data/grooves/68MarchPlus.musicxml index 990d232e..0385552d 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-27 diff --git a/test/data/grooves/68MarchSus.musicxml b/test/data/grooves/68MarchSus.musicxml index d948742d..3527786a 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-27 diff --git a/test/data/grooves/68MarchSusPlus.musicxml b/test/data/grooves/68MarchSusPlus.musicxml index 945c0b22..1b91e22a 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-27 diff --git a/test/data/grooves/68Swing.musicxml b/test/data/grooves/68Swing.musicxml index 53ab6eec..e7007291 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-27 diff --git a/test/data/grooves/68Swing1.musicxml b/test/data/grooves/68Swing1.musicxml index 882751b0..150a86af 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-27 diff --git a/test/data/grooves/68Swing1Plus.musicxml b/test/data/grooves/68Swing1Plus.musicxml index f1a862c1..e4f86603 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-27 diff --git a/test/data/grooves/68Swing1Sus.musicxml b/test/data/grooves/68Swing1Sus.musicxml index ae175cac..8112c68b 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-27 diff --git a/test/data/grooves/68Swing1SusPlus.musicxml b/test/data/grooves/68Swing1SusPlus.musicxml index 2edafcd3..6f900476 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-27 diff --git a/test/data/grooves/68Swing2.musicxml b/test/data/grooves/68Swing2.musicxml index 84b6be6d..feff16b1 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-27 diff --git a/test/data/grooves/68Swing2Plus.musicxml b/test/data/grooves/68Swing2Plus.musicxml index 1e403db3..36d7f4c6 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-27 diff --git a/test/data/grooves/68Swing2Sus.musicxml b/test/data/grooves/68Swing2Sus.musicxml index 82b70d68..c65883b3 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-27 diff --git a/test/data/grooves/68Swing2SusPlus.musicxml b/test/data/grooves/68Swing2SusPlus.musicxml index 06a90f10..d779f062 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-27 diff --git a/test/data/grooves/68SwingEnd.musicxml b/test/data/grooves/68SwingEnd.musicxml index 6555492f..2d8b95fe 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-27 diff --git a/test/data/grooves/68SwingIntro.musicxml b/test/data/grooves/68SwingIntro.musicxml index d09be612..9ee2d7a9 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-27 diff --git a/test/data/grooves/68SwingPlus.musicxml b/test/data/grooves/68SwingPlus.musicxml index 7a4831d2..f32cc348 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-27 diff --git a/test/data/grooves/68SwingSus.musicxml b/test/data/grooves/68SwingSus.musicxml index feac06a5..2eb950c0 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-27 diff --git a/test/data/grooves/68SwingSusPlus.musicxml b/test/data/grooves/68SwingSusPlus.musicxml index c8851b9f..f05d735f 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-27 diff --git a/test/data/grooves/80sPop.musicxml b/test/data/grooves/80sPop.musicxml index e8dd33e9..81b28df9 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-27 diff --git a/test/data/grooves/80sPopEnd.musicxml b/test/data/grooves/80sPopEnd.musicxml index 65302530..92174787 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-27 @@ -782,532 +782,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 - - 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 - - 192 - - 3 - 16th - up - x - - - - - - 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 - - - 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 - - - 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 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - + 192 3 - 64th + 16th up x - @@ -1315,17 +801,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -1333,15 +815,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1349,15 +844,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -1365,17 +863,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -1383,15 +883,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1399,33 +897,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -1433,15 +926,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1449,15 +940,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1465,17 +969,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1483,15 +988,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1508,25 +1017,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1542,38 +1032,18 @@ + G 5 - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - + 192 3 - 64th + 16th up x - @@ -1581,17 +1051,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -1599,15 +1065,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1615,15 +1094,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -1631,17 +1113,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -1649,15 +1133,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1665,33 +1147,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -1699,15 +1176,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1715,15 +1190,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1731,17 +1219,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1749,15 +1238,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1774,25 +1267,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - @@ -1841,131 +1315,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..71d4dc0e 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-27 @@ -1974,453 +1974,7 @@ - - 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 - - - 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 - - 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 - - - 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 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - + G 5 @@ -2434,25 +1988,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -2472,68 +2007,28 @@ G 5 - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2541,15 +2036,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -2557,17 +2055,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -2575,15 +2075,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -2591,33 +2089,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -2625,15 +2118,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -2641,15 +2132,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2657,17 +2161,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -2675,15 +2180,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -2700,25 +2209,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -2734,38 +2224,18 @@ + G 5 - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - + 192 3 - 64th + 16th up x - @@ -2773,17 +2243,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -2791,15 +2257,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2807,15 +2286,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -2823,17 +2305,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -2841,15 +2325,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -2857,33 +2339,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -2891,15 +2368,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -2907,15 +2382,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2923,17 +2411,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -2941,15 +2430,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -2966,25 +2459,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - diff --git a/test/data/grooves/8Beat.musicxml b/test/data/grooves/8Beat.musicxml index 989a2957..6eecf1a0 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-27 @@ -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..f3450d72 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-27 @@ -290,15 +290,13 @@ E 4 - 192 - + 384 2 - 16th + eighth up square - @@ -353,56 +351,6 @@ - - - E - 4 - - 96 - - - 2 - 32nd - up - square - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - - - 2 - 512th - up - square - - - - E @@ -514,15 +462,13 @@ E 4 - 192 - + 384 2 - 16th + eighth up square - @@ -577,56 +523,6 @@ - - - E - 4 - - 96 - - - 2 - 32nd - up - square - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - - - 2 - 512th - up - square - - - - E diff --git a/test/data/grooves/8Beat1End.musicxml b/test/data/grooves/8Beat1End.musicxml index 556f01b8..6edf4256 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-27 diff --git a/test/data/grooves/8Beat1Intro.musicxml b/test/data/grooves/8Beat1Intro.musicxml index 699e9dbd..3bc4bc4c 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-27 @@ -290,15 +290,13 @@ E 4 - 192 - + 384 2 - 16th + eighth up square - @@ -353,56 +351,6 @@ - - - E - 4 - - 96 - - - 2 - 32nd - up - square - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - - - 2 - 512th - up - square - - - - E diff --git a/test/data/grooves/8Beat1Plus.musicxml b/test/data/grooves/8Beat1Plus.musicxml index b7ce17ef..d9638306 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-27 @@ -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..03f8f233 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-27 @@ -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..4a8c5310 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-27 @@ -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..2204f6e9 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-27 diff --git a/test/data/grooves/8Beat2End.musicxml b/test/data/grooves/8Beat2End.musicxml index 791f59a7..42cb9cd0 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-27 diff --git a/test/data/grooves/8Beat2Intro.musicxml b/test/data/grooves/8Beat2Intro.musicxml index 46460822..8faa1d71 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-27 diff --git a/test/data/grooves/8Beat3.musicxml b/test/data/grooves/8Beat3.musicxml index 6193624f..bb2b6116 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-27 @@ -511,115 +511,28 @@ 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 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - + 512 3 - 256th + quarter + + 3 + 2 + quarter + up x - - + + + 3 + quarter + + + 2 + quarter + + @@ -627,15 +540,19 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + quarter + up x - + diff --git a/test/data/grooves/8Beat3End.musicxml b/test/data/grooves/8Beat3End.musicxml index 0f6e4427..b1afba81 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-27 @@ -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..d00e3e76 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-27 @@ -537,24 +537,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -610,115 +611,28 @@ G 5 - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 512 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th + quarter + + 3 + 2 + quarter + up x - - + + + 3 + quarter + + + 2 + quarter + + @@ -726,15 +640,19 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + quarter + up x - + @@ -770,24 +688,25 @@ G 5 - 192 + 384 3 - 16th + eighth up circle-x + G 5 - 192 + 384 3 - 16th + eighth up x @@ -870,15 +789,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..e354c55f 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-27 diff --git a/test/data/grooves/8BeatBallad1Intro.musicxml b/test/data/grooves/8BeatBallad1Intro.musicxml index 34ddde93..e2ddf763 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-27 diff --git a/test/data/grooves/8BeatBallad2.musicxml b/test/data/grooves/8BeatBallad2.musicxml index 89f1acfa..5bed01cd 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-27 diff --git a/test/data/grooves/8BeatBallad2End.musicxml b/test/data/grooves/8BeatBallad2End.musicxml index dcb5c2fe..039e2daf 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-27 diff --git a/test/data/grooves/8BeatBallad2Intro.musicxml b/test/data/grooves/8BeatBallad2Intro.musicxml index 6deddee4..ea21fe73 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-27 diff --git a/test/data/grooves/8BeatBallad3.musicxml b/test/data/grooves/8BeatBallad3.musicxml index 0e80a33d..60d894f7 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-27 diff --git a/test/data/grooves/8BeatBallad3End.musicxml b/test/data/grooves/8BeatBallad3End.musicxml index 0776f80b..95989cd7 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-27 diff --git a/test/data/grooves/8BeatBallad3Intro.musicxml b/test/data/grooves/8BeatBallad3Intro.musicxml index 178f1259..cf912e3b 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-27 diff --git a/test/data/grooves/8BeatDance.musicxml b/test/data/grooves/8BeatDance.musicxml index b4a88761..79bcec6d 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-27 diff --git a/test/data/grooves/8BeatDanceEnd.musicxml b/test/data/grooves/8BeatDanceEnd.musicxml index 9fc9ba1d..c5a365b1 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-27 diff --git a/test/data/grooves/8BeatDanceIntro.musicxml b/test/data/grooves/8BeatDanceIntro.musicxml index 0644050d..7b82de2e 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-27 diff --git a/test/data/grooves/8BeatEnd.musicxml b/test/data/grooves/8BeatEnd.musicxml index 2cb70161..89c537f1 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-27 @@ -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..25021492 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-27 @@ -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..b656775c 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-27 @@ -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..9f740ba8 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-27 @@ -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..57782890 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-27 diff --git a/test/data/grooves/8BeatPop1End.musicxml b/test/data/grooves/8BeatPop1End.musicxml index 2fa80451..61b36811 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-27 diff --git a/test/data/grooves/8BeatPop1Intro.musicxml b/test/data/grooves/8BeatPop1Intro.musicxml index e4ef8046..64217fa1 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-27 diff --git a/test/data/grooves/8BeatPop2.musicxml b/test/data/grooves/8BeatPop2.musicxml index f67845d4..1988ec7a 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-27 @@ -1228,16 +1228,14 @@ E 4 - 288 - + 576 1 - 16th + eighth up normal - @@ -1274,74 +1272,6 @@ - - - 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 - - - - 768 @@ -1381,16 +1311,14 @@ E 4 - 288 - + 576 1 - 16th + eighth up normal - @@ -1427,74 +1355,6 @@ - - - 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 - - - - 768 diff --git a/test/data/grooves/8BeatPop2End.musicxml b/test/data/grooves/8BeatPop2End.musicxml index 890001d3..fd8ab555 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-27 @@ -934,16 +934,14 @@ E 4 - 288 - + 576 1 - 16th + eighth up normal - @@ -980,74 +978,6 @@ - - - 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 - - - - 768 diff --git a/test/data/grooves/8BeatPop2Intro.musicxml b/test/data/grooves/8BeatPop2Intro.musicxml index a93b1c27..81569305 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-27 @@ -1798,16 +1798,14 @@ E 4 - 288 - + 576 1 - 16th + eighth up normal - @@ -1844,74 +1842,6 @@ - - - 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 - - - - 768 @@ -1951,16 +1881,14 @@ E 4 - 288 - + 576 1 - 16th + eighth up normal - @@ -1997,74 +1925,6 @@ - - - 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 - - - - 768 @@ -2104,16 +1964,14 @@ E 4 - 288 - + 576 1 - 16th + eighth up normal - @@ -2150,74 +2008,6 @@ - - - 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 - - - - 768 diff --git a/test/data/grooves/8BeatPop3.musicxml b/test/data/grooves/8BeatPop3.musicxml index b21d8fd7..c0c20050 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-27 diff --git a/test/data/grooves/8BeatPop3End.musicxml b/test/data/grooves/8BeatPop3End.musicxml index 5ca572e6..033dae5a 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-27 @@ -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..10a23cd6 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-27 @@ -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..e1341688 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-27 @@ -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..549a27df 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-27 @@ -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..3a793547 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-27 @@ -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..054cb2ea 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-27 @@ -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..c42ac658 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-27 @@ -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..d276e45b 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-27 @@ -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..1e37baca 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-27 diff --git a/test/data/grooves/8beat1B.musicxml b/test/data/grooves/8beat1B.musicxml index 9cfcea69..18698223 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-27 diff --git a/test/data/grooves/8beat1E.musicxml b/test/data/grooves/8beat1E.musicxml index 9203f83e..8b6f1db0 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-27 diff --git a/test/data/grooves/8beat1FA.musicxml b/test/data/grooves/8beat1FA.musicxml index 85d41c0f..27957fc0 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-27 diff --git a/test/data/grooves/8beat1FB.musicxml b/test/data/grooves/8beat1FB.musicxml index 68996e6b..2aa4086b 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-27 diff --git a/test/data/grooves/8beat2A.musicxml b/test/data/grooves/8beat2A.musicxml index cef0b9fc..e62f8bac 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-27 diff --git a/test/data/grooves/8beat2B.musicxml b/test/data/grooves/8beat2B.musicxml index cb222179..4b744cf2 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-27 diff --git a/test/data/grooves/8beat2E.musicxml b/test/data/grooves/8beat2E.musicxml index 66c93981..7d79394d 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-27 diff --git a/test/data/grooves/8beat2FA.musicxml b/test/data/grooves/8beat2FA.musicxml index 5dd428c8..74ffbf81 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-27 diff --git a/test/data/grooves/8beat2FB.musicxml b/test/data/grooves/8beat2FB.musicxml index c48ab278..6c663d46 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-27 diff --git a/test/data/grooves/8beatmotownA.musicxml b/test/data/grooves/8beatmotownA.musicxml index 8e4f1c60..5968057a 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-27 diff --git a/test/data/grooves/8beatmotownB.musicxml b/test/data/grooves/8beatmotownB.musicxml index c01930b1..afa1fc24 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-27 @@ -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..d870b061 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-27 @@ -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..3f6fba95 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-27 @@ -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..dd3de0f6 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-27 @@ -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..57f04cee 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-27 @@ -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..3fe00461 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-27 @@ -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..a63977bd 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-27 @@ -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..10c2c1d9 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-27 diff --git a/test/data/grooves/8beatmotownFillBA.musicxml b/test/data/grooves/8beatmotownFillBA.musicxml index 2f09a3cc..ba28c504 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-27 diff --git a/test/data/grooves/8beatmotownFillC.musicxml b/test/data/grooves/8beatmotownFillC.musicxml index 68d2d4ca..2c844a33 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-27 @@ -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..994fd01d 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-27 diff --git a/test/data/grooves/8beatmotownIntroA.musicxml b/test/data/grooves/8beatmotownIntroA.musicxml index 2f10dee5..1554c9dd 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-27 @@ -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..128f42df 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-27 @@ -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..81e02299 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-27 @@ -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..1fcd8dec 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-27 @@ -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..c399c0bf 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-27 @@ -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..cdbd49f6 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-27 diff --git a/test/data/grooves/AFRO04.musicxml b/test/data/grooves/AFRO04.musicxml index 34e41456..bbf5807b 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-27 @@ -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..6a23c575 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-27 @@ -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..a0f53090 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-27 @@ -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..b1f8aef7 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-27 @@ -310,19 +310,28 @@ + A 4 - 384 + 192 1 - eighth + 16th up normal + + + 384 + 1 + eighth + + + A @@ -423,15 +432,13 @@ D 5 - 96 - + 384 2 - 32nd + eighth up normal - @@ -468,74 +475,6 @@ - - - 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 @@ -603,10 +542,10 @@ F 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -615,15 +554,20 @@ up normal - - 768 + 512 3 quarter + + 3 + 2 + quarter + + @@ -687,19 +631,28 @@ + A 4 - 384 + 192 1 - eighth + 16th up normal + + + 384 + 1 + eighth + + + A @@ -800,15 +753,13 @@ D 5 - 96 - + 384 2 - 32nd + eighth up normal - @@ -845,74 +796,6 @@ - - - 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 @@ -980,10 +863,10 @@ F 5 - 256 + 512 3 - eighth + quarter 3 2 @@ -992,15 +875,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..2cc3750f 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-27 @@ -575,16 +575,14 @@ E 4 - 288 - + 576 1 - 16th + eighth up x - @@ -621,189 +619,33 @@ - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - x - - - - E 4 - 192 + 512 1 - 16th - up - x - - - - - - E - 4 - - 288 - - - 1 - 16th - - up - x - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - x - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - x - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th + quarter + + 3 + 2 + quarter + up x - - + + + 3 + quarter + + + 2 + quarter + + @@ -811,15 +653,19 @@ E 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up x - + diff --git a/test/data/grooves/AMB01.musicxml b/test/data/grooves/AMB01.musicxml index 04f48960..60152e6b 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-27 @@ -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..91539a47 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-27 @@ -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..784dac0e 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-27 @@ -393,65 +393,28 @@ F 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - F - 4 - - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -459,17 +422,18 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - @@ -477,15 +441,19 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + @@ -516,207 +484,18 @@ - - - F - 4 - - 189 - - 1 - 32nd - - - - - - up - normal - - - - - - F - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - F - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - up - normal - - - - F 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - F - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - F - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - F - 4 - - 12 - - + 192 1 - 256th + 16th up normal - - @@ -724,15 +503,13 @@ F 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/AMB04.musicxml b/test/data/grooves/AMB04.musicxml index 2a1ba362..9e9ac70e 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-27 diff --git a/test/data/grooves/Afro-Cuban.musicxml b/test/data/grooves/Afro-Cuban.musicxml index c78e872a..ed91d4a3 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-27 diff --git a/test/data/grooves/Afro-CubanEnd.musicxml b/test/data/grooves/Afro-CubanEnd.musicxml index aeaa845f..4ed9afc6 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-27 diff --git a/test/data/grooves/Afro-CubanFill.musicxml b/test/data/grooves/Afro-CubanFill.musicxml index a9f1ed41..64e9323a 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-27 diff --git a/test/data/grooves/Afro-CubanIntro.musicxml b/test/data/grooves/Afro-CubanIntro.musicxml index 71a43620..7403ef49 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-27 diff --git a/test/data/grooves/Afro-CubanPlus.musicxml b/test/data/grooves/Afro-CubanPlus.musicxml index c4243d06..cad335cf 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-27 diff --git a/test/data/grooves/Afro-CubanSus.musicxml b/test/data/grooves/Afro-CubanSus.musicxml index 315246fd..9af8ca0e 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-27 diff --git a/test/data/grooves/Afro-CubanSusPlus.musicxml b/test/data/grooves/Afro-CubanSusPlus.musicxml index 837effae..bdebdf03 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-27 diff --git a/test/data/grooves/Ambient1.musicxml b/test/data/grooves/Ambient1.musicxml index 892f8e5a..4cbd8b9a 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-27 @@ -218,103 +218,33 @@ + 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 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + + + 3 + quarter + + + 2 + quarter + + @@ -322,10 +252,15 @@ E 4 - 384 + 512 1 - eighth + quarter + + 3 + 2 + quarter + up normal @@ -336,13 +271,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -396,98 +337,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 +363,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -590,393 +462,179 @@ E 4 - 384 - + 576 1 eighth + up normal - - + E 4 - 96 - - + 192 1 - 32nd + 16th up normal - - - + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - - + + E 4 - 6 - + 256 1 - 512th + 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 + eighth + + 3 + 2 + eighth + up normal - - + - + E 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + eighth + up normal - + + + 3 + eighth + + + 2 + eighth + + - + E 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up normal - + 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 - up - normal - - - - - - - - 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 - - - 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 + @@ -1051,19 +709,33 @@ + E 4 - 48 - + 512 1 - 64th + quarter + + 3 + 2 + quarter + up normal - + + + 3 + quarter + + + 2 + quarter + + @@ -1071,17 +743,18 @@ E 4 - 12 - - + 512 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - @@ -1089,662 +762,282 @@ E 4 - 3 - + 512 1 - 1024th + quarter + + 3 + 2 + quarter + up normal - + - + E 4 - 96 - + 512 1 - 32nd + quarter + + 3 + 2 + quarter + up normal - + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + quarter + up normal - - + - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 384 - + + + 256 1 eighth - up - normal - - - - - - E - 4 - - 768 - - 1 - quarter - up - normal - - - - - - E - 4 - - 512 - - 1 - quarter 3 2 quarter - up - normal 3 - quarter + eighth - - 2 - quarter - - - - - - - E - 4 - - 256 - - 1 - eighth - - 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 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - 3072 - - - - 768 - 2 - quarter - - - - - - 768 - 2 - quarter - - - - - - E - 4 - - 768 - - 2 - quarter - up - square - - - - - - 384 - 2 - eighth - - - - - - E - 4 - - 384 - - 2 - eighth - up - square - - - - - - - - 384 - 1 - eighth - - - - - - E - 4 - - 384 - - 1 - eighth - 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 - - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - + + 2 + quarter + + - + E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal + - - - E - 4 - - 48 - - - 1 - 64th - up - normal + + 3072 + + + + 768 + 2 + quarter - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal + + + 768 + 2 + quarter - - - + E 4 - 3 - - - 1 - 1024th + 768 + + 2 + quarter up - normal + square - - + + + 384 + 2 + eighth + + + + E 4 - 288 - - - 1 - 16th - + 384 + + 2 + eighth up - normal + square - - - - E - 4 - - 24 - - - + + + + + 384 1 - 128th - up - normal + eighth - - - + E 4 - 6 - + 384 1 - 512th + eighth up normal - - + E 4 - 192 + 576 1 - 16th + eighth + up normal - + E 4 192 - 1 16th up normal - - + E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + + E 4 - 12 - - + 256 1 - 256th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + - + E 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + eighth + up normal - @@ -1752,16 +1045,19 @@ E 4 - 288 - + 256 1 - 16th - + eighth + + 3 + 2 + eighth + up normal - + @@ -1769,17 +1065,28 @@ E 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -1787,15 +1094,18 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - @@ -1803,13 +1113,19 @@ E 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up normal + @@ -2170,191 +1486,89 @@ 5 - - - - G - 5 - - 384 - - 3 - eighth - 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 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 384 - - 3 - eighth - up - 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 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 384 3 - 32nd + eighth up x - - + G 5 - 24 - - + 384 3 - 128th + eighth up x - - @@ -2362,15 +1576,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -2492,117 +1704,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 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up x - @@ -2724,117 +1832,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 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up x - @@ -2956,117 +1960,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 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up x - diff --git a/test/data/grooves/Ambient1End.musicxml b/test/data/grooves/Ambient1End.musicxml index 7cffb862..ebc8a195 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-27 @@ -600,453 +600,7 @@ - - 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 - - - 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 - - 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 - - - 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 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - + G 5 @@ -1060,25 +614,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1098,184 +633,28 @@ 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 - - - 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 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1283,17 +662,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1301,15 +681,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1326,25 +710,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1360,38 +725,18 @@ + G 5 - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - + 192 3 - 64th + 16th up x - @@ -1399,17 +744,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -1417,15 +758,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1433,15 +787,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -1449,17 +806,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -1467,15 +826,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1483,33 +840,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -1517,15 +869,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1533,15 +883,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1549,17 +912,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1567,15 +931,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1592,27 +960,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - G @@ -1628,19 +975,18 @@ + G 5 - 48 - + 192 3 - 64th + 16th up x - @@ -1648,17 +994,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -1666,15 +1008,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1682,15 +1037,18 @@ G 5 - 384 - + 128 3 - eighth + 16th + + 3 + 2 + 16th + up x - @@ -1698,17 +1056,19 @@ G 5 - 96 - - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - - + @@ -1716,33 +1076,29 @@ G 5 - 24 - - + 192 3 - 128th + 16th 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..da212273 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-27 @@ -218,103 +218,33 @@ + 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 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + + + 3 + quarter + + + 2 + quarter + + @@ -322,10 +252,15 @@ E 4 - 384 + 512 1 - eighth + quarter + + 3 + 2 + quarter + up normal @@ -336,13 +271,19 @@ E 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + up normal + @@ -396,98 +337,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 +363,19 @@ E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -594,393 +466,411 @@ E 4 - 384 - + 576 1 eighth + up normal - - + E 4 - 96 - - + 192 1 - 32nd + 16th up normal - - - + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - - + + E 4 - 6 - + 256 1 - 512th + 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 + eighth + + 3 + 2 + eighth + up normal - - + - + E 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + eighth + up normal - + + + 3 + eighth + + + 2 + eighth + + - + E 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up normal - + E 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up normal + - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal + + 3072 + + + + 768 + 2 + quarter - - - - E - 4 - - 288 - - - 1 - 16th - - up - normal + + + 768 + 2 + quarter - - + E 4 - 24 - - - - 1 - 128th + 768 + + 2 + quarter up - normal + square - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal + + + 384 + 2 + eighth - - + E 4 - 192 - - 1 - 16th + 384 + + 2 + eighth up - normal + square - + + + E 4 192 - 1 16th up normal - - + + E 4 - 48 - - + 512 1 - 64th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 12 - - + 512 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - - + E 4 - 3 - + 512 1 - 1024th + quarter + + 3 + 2 + quarter + up normal - + - + E 4 - 288 - + 512 1 - 16th - + quarter + + 3 + 2 + quarter + up normal - + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + quarter + up normal - - + - - - E - 4 - - 6 - - + + + 256 1 - 512th - up - normal + eighth + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + - + E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal + @@ -1039,122 +929,106 @@ - - + + E 4 - 192 + 384 1 - 16th + eighth up normal - + E 4 - 48 - + 384 1 - 64th + eighth up normal - - + E 4 - 12 - - + 384 1 - 256th + eighth up normal - - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - - + E 4 - 96 - + 384 1 - 32nd + eighth up normal - - + E 4 - 24 - - + 384 1 - 128th + eighth up normal - - - + E 4 - 6 - + 384 1 - 512th + eighth up normal - - + E 4 @@ -1168,425 +1042,269 @@ - - - E - 4 - + + 3072 + + + 768 - - 1 + 2 quarter - up - normal - - - E - 4 - - 512 - - 1 + + + 768 + 2 quarter - - 3 - 2 - quarter - - up - normal - - - 3 - quarter - - - 2 - quarter - - - + E 4 - 256 - - 1 - eighth - - 3 - 2 - quarter - + 768 + + 2 + quarter up - normal - - - - - - - 192 - - 1 - 16th + square - - - - 48 - - - 1 - 64th + + + E + 4 + + 768 + + 2 + quarter + up + square - - - - - 12 - - + + + + + + 768 + + + percussion + + + 5 + + + + + F + 4 + + 768 + 1 - 256th + quarter + down + normal - - - 3 - - 1 - 1024th - - - - - - - E - 4 - 384 - - 1 eighth - up - normal - - + - E + F 4 - 96 - - - + 384 + 1 - 32nd - up + eighth + down normal - - - - - E - 4 - - 24 - - - + + + 384 1 - 128th - up - normal + eighth - - - + - E + F 4 - 6 - - + 384 + 1 - 512th - up + eighth + down normal - - - - - - 3072 - - - - 768 - 2 - quarter 768 - 2 + 1 quarter - + + + - E + F 4 768 - - 2 + + 1 quarter - up - square + down + normal 384 - 2 + 1 eighth - + - E + F 4 384 - - 2 + + 1 eighth - up - square + down + normal - - - - - E - 4 - + + 384 - 1 eighth - up - normal - + - E + F 4 384 - + 1 eighth - up + down normal - + + + 768 + 1 + quarter + + + + + + - E + F 4 - 384 - + 768 + 1 - eighth - up + quarter + down normal - + - E + F 4 - 384 - + 768 + 1 - eighth - up + quarter + down normal - + - E + F 4 - 384 - + 768 + 1 - eighth - up + quarter + down normal - + - E + F 4 - 384 - + 768 + 1 - eighth - up + quarter + down normal - - - E - 4 - - 384 - - 1 - eighth - up - normal - - - - - - E - 4 - - 384 - - 1 - eighth - up - normal - - - - - 3072 - - - - 768 - 2 - quarter - - - + + 768 - 2 - quarter - - - - - - E - 4 - - 768 - - 2 - quarter - up - square - - - - - - E - 4 - - 768 - - 2 - quarter - up - square - - - - - - - - - 768 - - - percussion - - - 5 - - - - - F - 4 - - 768 - 1 quarter - down - normal @@ -1598,7 +1316,7 @@ - + F 4 @@ -1620,7 +1338,7 @@ - + F 4 @@ -1643,284 +1361,82 @@ - - + + + + + 768 + + + percussion + + + 5 + + + - F - 4 + G + 5 - 768 - - 1 - quarter - down - normal - - - - - 384 - 1 + + 3 eighth + up + x - + - F - 4 + G + 5 384 - - 1 - eighth - down - normal - - - - - - 384 - 1 + + 3 eighth + up + x - + - F - 4 + G + 5 384 - - 1 + + 3 eighth - down - normal - - - - - - 768 - 1 - quarter - - - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal + up + x - + - F - 4 + G + 5 - 768 - - 1 - quarter - down - normal + 384 + + 3 + eighth + up + x - + - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - - - 768 - 1 - quarter - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - down - normal - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - down - normal - - - - - - 768 - 1 - quarter - - - - - - - - - 768 - - - percussion - - - 5 - - - - - G - 5 - - 384 - - 3 - eighth - 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 - - 384 - - 3 - eighth - up - x - - - - - - G - 5 + G + 5 384 @@ -1931,847 +1447,35 @@ - - - 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 - - 384 - - 3 - eighth - 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 - - 384 - - 3 - eighth - 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 - - 384 - - 3 - eighth - 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 - - 384 - - 3 - eighth - 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 - - 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 - + 384 3 - 1024th + eighth up x - - + G 5 - 192 + 384 3 - 16th + eighth up x - + G 5 @@ -2785,355 +1489,305 @@ - + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x - + + + 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 - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - - + G 5 - 96 - + 384 3 - 32nd + eighth up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 192 3 - 512th + 16th up x - - + + + 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 - 192 + 384 3 - 16th + eighth up x - + G 5 - 189 + 384 3 - 32nd - - - - - + eighth up x - + G 5 - 192 + 384 3 - 16th + eighth up x - + G 5 - 189 + 384 3 - 32nd - - - - - + eighth up x - + 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 - 96 - + 192 3 - 32nd + 16th up x - @@ -3141,17 +1795,13 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -3159,15 +1809,28 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -3175,15 +1838,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -3191,17 +1857,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -3209,15 +1877,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -3225,33 +1891,28 @@ G 5 - 48 - + 192 3 - 64th + 16th up x - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -3259,15 +1920,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -3275,13 +1934,28 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + + + 3 + 16th + + + 2 + 16th + + @@ -3289,15 +1963,15 @@ G 5 - 189 + 128 3 - 32nd - - - - - + 16th + + 3 + 2 + 16th + up x @@ -3308,13 +1982,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -3322,15 +2002,10 @@ G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -3341,33 +2016,28 @@ G 5 - 48 - + 192 3 - 64th + 16th up x - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -3375,15 +2045,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -3391,15 +2059,28 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -3407,17 +2088,18 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - @@ -3425,15 +2107,19 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - + @@ -3441,15 +2127,13 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -3457,33 +2141,28 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - + G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -3491,15 +2170,13 @@ G 5 - 48 - + 192 3 - 64th + 16th up x - @@ -3507,17 +2184,28 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + + + 3 + 16th + + + 2 + 16th + + @@ -3525,15 +2213,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -3541,13 +2232,19 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -3555,15 +2252,10 @@ G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x diff --git a/test/data/grooves/Ambient2.musicxml b/test/data/grooves/Ambient2.musicxml index 41004515..b2f777df 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-27 @@ -264,117 +264,102 @@ E 4 - 96 - + 384 1 - 32nd + eighth up normal - - - - E - 4 - - 24 - - - + + + 768 1 - 128th - up - normal + quarter - - - + E 4 - 6 - + 192 1 - 512th + 16th up normal - - + E 4 - 192 - + 576 1 - 16th + eighth + up normal - - + + + + + 768 + 1 + quarter + + + + E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -415,7 +400,7 @@ - + 768 @@ -457,117 +442,102 @@ E 4 - 96 - + 384 1 - 32nd + eighth up normal - - - - E - 4 - - 24 - - - + + + 768 1 - 128th - up - normal + quarter - - - + E 4 - 6 - + 192 1 - 512th + 16th up normal - - + E 4 - 192 - + 576 1 - 16th + eighth + up normal - - + + + + + 768 + 1 + quarter + + + + E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -608,7 +578,22 @@ - + + + + + 768 + + + percussion + + + 1 + + 768 @@ -617,150 +602,135 @@ - + E 4 192 - + 1 16th up - normal + back slashed - + E 4 192 - + 1 16th up - normal + back slashed - + E 4 - 96 - - + 384 + 1 - 32nd + eighth up - normal + back slashed - - - - E - 4 - - 24 - - - + + + 768 1 - 128th - up - normal + quarter - - - + E 4 - 6 - - + 192 + 1 - 512th + 16th up - normal + back slashed - - + E 4 - 192 - - + 576 + 1 - 16th + eighth + up - normal + back slashed - - + + + + + 768 + 1 + quarter + + + + E 4 - 48 - - - + 192 + 1 - 64th + 16th up - normal + back slashed - - - + E 4 - 12 - - - + 192 + 1 - 256th + 16th up - normal + back slashed - - - + E 4 - 3 - - + 384 + 1 - 1024th + eighth up - normal + back slashed - @@ -771,37 +741,37 @@ - + E 4 192 - + 1 16th up - normal + back slashed - + E 4 576 - + 1 eighth up - normal + back slashed - + 768 @@ -810,206 +780,87 @@ - + E 4 192 - + 1 16th up - normal + back slashed - + E 4 192 - + 1 16th up - normal + back slashed - + E 4 - 96 - - + 384 + 1 - 32nd + eighth up - normal + back slashed - - - - E - 4 - - 24 - - - + + + 768 1 - 128th - up - normal + quarter - - - + E 4 - 6 - - + 192 + 1 - 512th + 16th up - normal + back slashed - - - - 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 - - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - + E 4 576 - + 1 eighth up - normal + back slashed - - - - - 768 - - - percussion - - - 1 - - + 768 @@ -1051,117 +902,13 @@ E 4 - 96 - - - 1 - 32nd - up - back slashed - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - back slashed - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - back slashed - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - back slashed - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - back slashed - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - back slashed - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up back slashed - @@ -1197,2198 +944,53 @@ eighth up - back slashed - - - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 192 - - 1 - 16th - up - back slashed - - - - - - E - 4 - - 192 - - 1 - 16th - up - back slashed - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - back slashed - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - back slashed - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - back slashed - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - back slashed - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - back slashed - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - back slashed - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - back slashed - - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 192 - - 1 - 16th - up - back slashed - - - - - - E - 4 - - 576 - - 1 - eighth - - up - back slashed - - - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 192 - - 1 - 16th - up - back slashed - - - - - - E - 4 - - 192 - - 1 - 16th - up - back slashed - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - back slashed - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - back slashed - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - back slashed - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - back slashed - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - back slashed - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - back slashed - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - back slashed - - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 192 - - 1 - 16th - up - back slashed - - - - - - E - 4 - - 576 - - 1 - eighth - - up - back slashed - - - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 192 - - 1 - 16th - up - back slashed - - - - - - E - 4 - - 192 - - 1 - 16th - up - back slashed - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - back slashed - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - back slashed - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - back slashed - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - back slashed - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - back slashed - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - back slashed - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - back slashed - - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 192 - - 1 - 16th - up - back slashed - - - - - - E - 4 - - 576 - - 1 - eighth - - up - back slashed - - - - - - - - - 768 - - - percussion - - - 1 - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 + back slashed - - + + + + + + 768 + + + percussion + + + 1 + + + E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -3396,18 +998,16 @@ E 4 - 3 - + 384 1 - 1024th + eighth up normal - - + E 4 @@ -3421,7 +1021,7 @@ - + E 4 @@ -3435,38 +1035,32 @@ - + E 4 - 96 - + 384 1 - 32nd + eighth up normal - - + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - @@ -3474,15 +1068,13 @@ E 4 - 6 - + 192 1 - 512th + 16th up normal - @@ -3490,15 +1082,13 @@ E 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -3506,17 +1096,13 @@ E 4 - 48 - - + 192 1 - 64th + 16th up normal - - @@ -3524,17 +1110,13 @@ E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -3542,19 +1124,17 @@ E 4 - 3 - + 384 1 - 1024th + eighth up normal - - + E @@ -3588,65 +1168,55 @@ E 4 - 96 - + 384 1 - 32nd + eighth up normal - - + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - - + E 4 - 6 - + 192 1 - 512th + 16th up normal - - + E 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -3654,54 +1224,44 @@ E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - - + E 4 @@ -3715,7 +1275,7 @@ - + E 4 @@ -3729,70 +1289,62 @@ - + E 4 - 96 - + 384 1 - 32nd + eighth up normal - - + + + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - - + E 4 - 6 - + 192 1 - 512th + 16th up normal - - + E 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -3800,17 +1352,13 @@ E 4 - 48 - - + 192 1 - 64th + 16th up normal - - @@ -3818,17 +1366,13 @@ E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -3836,15 +1380,13 @@ E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -3880,15 +1422,13 @@ E 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -3896,17 +1436,13 @@ E 4 - 24 - - + 192 1 - 128th + 16th up normal - - @@ -3914,15 +1450,13 @@ E 4 - 6 - + 192 1 - 512th + 16th up normal - @@ -3930,51 +1464,43 @@ E 4 - 192 - + 384 1 - 16th + eighth up normal - - + + + E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -3982,18 +1508,16 @@ E 4 - 3 - + 384 1 - 1024th + eighth up normal - - + E 4 @@ -4007,7 +1531,7 @@ - + E 4 @@ -4021,38 +1545,32 @@ - + E 4 - 96 - + 384 1 - 32nd + eighth up normal - - + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - @@ -4060,15 +1578,13 @@ E 4 - 6 - + 192 1 - 512th + 16th up normal - @@ -4076,15 +1592,13 @@ E 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -4092,17 +1606,13 @@ E 4 - 48 - - + 192 1 - 64th + 16th up normal - - @@ -4110,17 +1620,13 @@ E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -4128,15 +1634,13 @@ E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -4517,116 +2021,28 @@ F 4 - 192 - - 1 - 16th - down - normal - - - - - - F - 4 - - 288 - - - 1 - 16th - - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal - - - - - - - F - 4 - - 192 - - - 1 - 16th - down - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - down - normal - - - - - - - - F - 4 - - 12 - - + 512 1 - 256th + quarter + + 3 + 2 + quarter + down normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -4634,15 +2050,19 @@ F 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/Ambient2End.musicxml b/test/data/grooves/Ambient2End.musicxml index 4f836875..b04708ca 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-27 @@ -377,117 +377,13 @@ E 4 - 96 - + 384 1 - 32nd - up - back slashed - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - back slashed - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - back slashed - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - back slashed - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - back slashed - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - back slashed - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + eighth up back slashed - @@ -617,117 +513,13 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - + 384 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + eighth up normal - @@ -763,117 +555,13 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 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 + eighth up normal - @@ -909,128 +597,10 @@ E 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - + 384 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 - - 192 - - 1 - 16th + eighth up normal @@ -1050,88 +620,18 @@ - - - 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 - - - @@ -1139,33 +639,13 @@ E 4 - 12 - - + 384 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/Ambient2Intro.musicxml b/test/data/grooves/Ambient2Intro.musicxml index c83803dc..0a777eeb 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-27 @@ -322,117 +322,13 @@ 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 - + 384 1 - 1024th + eighth up normal - @@ -515,117 +411,13 @@ 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 - + 384 1 - 1024th + eighth up normal - @@ -769,117 +561,13 @@ E 4 - 96 - - - 1 - 32nd - up - back slashed - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - back slashed - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - back slashed - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - back slashed - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - back slashed - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - back slashed - - - - - - - - E - 4 - - 3 - + 384 1 - 1024th + eighth up back slashed - @@ -943,1603 +631,223 @@ - - - E - 4 - - 192 - - 1 - 16th - up - back slashed - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - back slashed - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - back slashed - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - back slashed - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - back slashed - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - back slashed - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - back slashed - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - back slashed - - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 192 - - 1 - 16th - up - back slashed - - - - - - E - 4 - - 576 - - 1 - eighth - - up - back slashed - - - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 192 - - 1 - 16th - up - back slashed - - - - - - E - 4 - - 192 - - 1 - 16th - up - back slashed - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - back slashed - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - back slashed - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - back slashed - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - back slashed - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - back slashed - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - back slashed - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - back slashed - - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 192 - - 1 - 16th - up - back slashed - - - - - - E - 4 - - 576 - - 1 - eighth - - up - back slashed - - - - - - - - E - 4 - - 768 - - 1 - quarter - up - back slashed - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 768 - - 1 - quarter - up - back slashed - - - - - - 768 - 1 - quarter - - - - - - - - - 768 - - - percussion - - - 1 - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 + back slashed - - + E 4 - 48 - - - + 384 + 1 - 64th + eighth up - normal + back slashed - - - - - E - 4 - - 12 - - - + + + 768 1 - 256th - up - normal + quarter - - - + E 4 - 3 - - + 192 + 1 - 1024th + 16th up - normal + back slashed - - + E 4 - 192 - + 576 + 1 - 16th + eighth + up - normal + back slashed - + + + + + 768 + 1 + quarter + + + + E 4 192 - + 1 16th up - normal + back slashed - + E 4 - 96 - - + 192 + 1 - 32nd + 16th up - normal + back slashed - - + E 4 - 24 - - - + 384 + 1 - 128th + eighth up - normal + back slashed - - - - - E - 4 - - 6 - - + + + 768 1 - 512th - up - normal + quarter - - + E 4 192 - - + 1 16th up - normal + back slashed - - + E 4 - 48 - - - + 576 + 1 - 64th + eighth + up - normal + back slashed - - - + + + E 4 - 12 - - - + 768 + 1 - 256th + quarter up - normal + back slashed - - - + + + 768 + 1 + quarter + + + + E 4 - 3 - - + 768 + 1 - 1024th + quarter up - normal + back slashed + + + + + + 768 + 1 + quarter - - + + + + + 768 + + + percussion + + + 1 + + E @@ -2573,65 +881,55 @@ E 4 - 96 - + 384 1 - 32nd + eighth up normal - - + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - - + E 4 - 6 - + 192 1 - 512th + 16th up normal - - + E 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -2639,54 +937,44 @@ E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - - + E 4 @@ -2700,7 +988,7 @@ - + E 4 @@ -2714,70 +1002,62 @@ - + E 4 - 96 - + 384 1 - 32nd + eighth up normal - - + + + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - - + E 4 - 6 - + 192 1 - 512th + 16th up normal - - + E 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -2785,17 +1065,13 @@ E 4 - 48 - - + 192 1 - 64th + 16th up normal - - @@ -2803,17 +1079,13 @@ E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -2821,15 +1093,13 @@ E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -2865,15 +1135,13 @@ E 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -2881,17 +1149,13 @@ E 4 - 24 - - + 192 1 - 128th + 16th up normal - - @@ -2899,15 +1163,13 @@ E 4 - 6 - + 192 1 - 512th + 16th up normal - @@ -2915,51 +1177,43 @@ E 4 - 192 - + 384 1 - 16th + eighth up normal - - + + + E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -2967,18 +1221,16 @@ E 4 - 3 - + 384 1 - 1024th + eighth up normal - - + E 4 @@ -2992,7 +1244,7 @@ - + E 4 @@ -3006,38 +1258,32 @@ - + E 4 - 96 - + 384 1 - 32nd + eighth up normal - - + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - @@ -3045,15 +1291,13 @@ E 4 - 6 - + 192 1 - 512th + 16th up normal - @@ -3061,15 +1305,13 @@ E 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -3077,17 +1319,13 @@ E 4 - 48 - - + 192 1 - 64th + 16th up normal - - @@ -3095,17 +1333,13 @@ E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -3113,15 +1347,13 @@ E 4 - 3 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/Arrastape-Miranda.musicxml b/test/data/grooves/Arrastape-Miranda.musicxml index 5bbc1759..f60f3d3a 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-27 diff --git a/test/data/grooves/Ayyub.musicxml b/test/data/grooves/Ayyub.musicxml index 97746f75..54b96b8d 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-27 diff --git a/test/data/grooves/BALD01.musicxml b/test/data/grooves/BALD01.musicxml index 5a17a22f..2b03e3a5 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-27 diff --git a/test/data/grooves/BALD02.musicxml b/test/data/grooves/BALD02.musicxml index 8ca0345a..ffbb25bb 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-27 @@ -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..93722792 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-27 diff --git a/test/data/grooves/BALD04.musicxml b/test/data/grooves/BALD04.musicxml index 84e1b7f5..7fd188fb 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-27 diff --git a/test/data/grooves/BALD05.musicxml b/test/data/grooves/BALD05.musicxml index e51e95e8..45bb9f83 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-27 diff --git a/test/data/grooves/BALD06.musicxml b/test/data/grooves/BALD06.musicxml index 7d4c04ac..ebcbaa68 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-27 diff --git a/test/data/grooves/BALD07.musicxml b/test/data/grooves/BALD07.musicxml index 96d08bf1..28cb27f1 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-27 diff --git a/test/data/grooves/BALD08.musicxml b/test/data/grooves/BALD08.musicxml index 9d9a8a33..140a2b5c 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-27 diff --git a/test/data/grooves/BALD09.musicxml b/test/data/grooves/BALD09.musicxml index 546850e6..ca1efc57 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-27 diff --git a/test/data/grooves/BALD10.musicxml b/test/data/grooves/BALD10.musicxml index 073a4385..3af84ddb 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-27 @@ -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..7350be21 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-27 @@ -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..7e1b17ef 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-27 diff --git a/test/data/grooves/BLUS02.musicxml b/test/data/grooves/BLUS02.musicxml index 07da5583..a10792ba 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-27 @@ -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..004e2ef2 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-27 diff --git a/test/data/grooves/BLUS04.musicxml b/test/data/grooves/BLUS04.musicxml index 3cc6afc0..392ded0c 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-27 diff --git a/test/data/grooves/BLUS05.musicxml b/test/data/grooves/BLUS05.musicxml index fb042de3..1d065beb 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-27 @@ -291,15 +291,13 @@ F 5 - 192 - + 384 1 - 16th + eighth up x - @@ -359,15 +357,13 @@ F 5 - 96 - + 384 1 - 32nd + eighth up x - @@ -375,17 +371,13 @@ F 5 - 24 - - + 384 1 - 128th + eighth up x - - @@ -393,31 +385,42 @@ F 5 - 6 - + 384 1 - 512th + eighth up x - - + F 5 - 96 - + 256 1 - 32nd + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -425,17 +428,18 @@ F 5 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + eighth + up x - - @@ -443,31 +447,33 @@ F 5 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up x - + - + F 5 - 192 - + 384 1 - 16th + eighth up x - @@ -475,697 +481,210 @@ F 5 - 48 - - + 384 1 - 64th + eighth up x - - - + + 3072 + + - F + G 5 - 12 - - - - 1 - 256th + 256 + + 3 + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + - F + G 5 - 3 - - - 1 - 1024th + 256 + + 3 + eighth + + 3 + 2 + eighth + up x - - F + G 5 - 192 - - - 1 - 16th + 256 + + 3 + eighth + + 3 + 2 + eighth + up x - + - + - F + G 5 - 48 - - - - 1 - 64th + 256 + + 3 + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + - F + G 5 - 12 - - - - 1 - 256th + 256 + + 3 + eighth + + 3 + 2 + eighth + up x - - - F + G 5 - 3 - - - 1 - 1024th + 256 + + 3 + eighth + + 3 + 2 + eighth + up x - + - + - F + G 5 - 96 - - - 1 - 32nd + 256 + + 3 + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - F + G 5 - 24 - - - - 1 - 128th + 256 + + 3 + eighth + + 3 + 2 + eighth + up x - - - F + G 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 - - - - - - - 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 - - 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 - - 384 - - 1 - eighth - 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 - - - - - - - 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 - - - - - - 3072 - - - - G - 5 - - 256 - - 3 - eighth - - 3 - 2 - eighth - - up - x - - - - 3 - eighth - - - 2 - eighth - - - - - - - G - 5 - - 256 - - 3 + 256 + + 3 eighth 3 @@ -1175,652 +694,91 @@ 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 - - - - - - - G - 5 - - 256 - - 3 - 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 - - - - - - - G - 5 - - 256 - - 3 - 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 - - - - - - - G - 5 - - 256 - - 3 - eighth - - 3 - 2 - eighth - - up - x - - - - - - G - 5 - - 256 - - 3 - eighth - - 3 - 2 - eighth - - up - circle-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 - - - - - - - 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 - - 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 + G 5 - 96 - - - 1 - 32nd + 256 + + 3 + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + - F + G 5 - 24 - - - - 1 - 128th + 256 + + 3 + eighth + + 3 + 2 + eighth + up x - - - + - F + G 5 - 6 - - - 1 - 512th + 256 + + 3 + eighth + + 3 + 2 + eighth + up - x + circle-x - + + + F 5 - 192 - + 384 1 - 16th + eighth up x - @@ -1875,20 +833,6 @@ - - - A - 5 - - 384 - - 1 - eighth - up - x - - - F @@ -1908,151 +852,13 @@ 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 - - + 384 1 - 128th + eighth up x - - @@ -2060,31 +866,27 @@ F 5 - 6 - + 384 1 - 512th + eighth up x - - + - F + A 5 - 192 - - + 384 + 1 - 16th + eighth up x - @@ -2092,35 +894,27 @@ F 5 - 48 - - + 384 1 - 64th + eighth up x - - - + F 5 - 12 - - + 384 1 - 256th + eighth up x - - @@ -2128,15 +922,13 @@ F 5 - 3 - + 384 1 - 1024th + eighth up x - diff --git a/test/data/grooves/BLUS06.musicxml b/test/data/grooves/BLUS06.musicxml index 09e58f96..a3ce14eb 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-27 diff --git a/test/data/grooves/BOSSA01.musicxml b/test/data/grooves/BOSSA01.musicxml index 1db46c40..74afed75 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-27 diff --git a/test/data/grooves/BOSSA02.musicxml b/test/data/grooves/BOSSA02.musicxml index e45544a8..362f877c 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-27 diff --git a/test/data/grooves/BVFunk.musicxml b/test/data/grooves/BVFunk.musicxml index f125bff4..fe74e857 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-27 diff --git a/test/data/grooves/BVFunkEnd.musicxml b/test/data/grooves/BVFunkEnd.musicxml index bd621fbd..ec4cc315 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-27 diff --git a/test/data/grooves/BVFunkHorns.musicxml b/test/data/grooves/BVFunkHorns.musicxml index e932e49f..f689e672 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-27 diff --git a/test/data/grooves/BVFunkIntro.musicxml b/test/data/grooves/BVFunkIntro.musicxml index 80af46fa..9f805555 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-27 diff --git a/test/data/grooves/BVFunkIntro8.musicxml b/test/data/grooves/BVFunkIntro8.musicxml index 7b2981da..ff106c15 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-27 diff --git a/test/data/grooves/BVFunkSus.musicxml b/test/data/grooves/BVFunkSus.musicxml index 44a24980..7c6de92a 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-27 diff --git a/test/data/grooves/BWMarch.musicxml b/test/data/grooves/BWMarch.musicxml index a8dd02d1..1723c832 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-27 diff --git a/test/data/grooves/BWMarchEnd.musicxml b/test/data/grooves/BWMarchEnd.musicxml index bfd41ad5..68fcd3a1 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-27 @@ -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..52eab736 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-27 diff --git a/test/data/grooves/BWMarchIntro.musicxml b/test/data/grooves/BWMarchIntro.musicxml index 183d04b7..6bc88dbf 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-27 diff --git a/test/data/grooves/BWMarchIntro8.musicxml b/test/data/grooves/BWMarchIntro8.musicxml index 0b63fe06..c22b2ba1 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-27 diff --git a/test/data/grooves/BWMarchPlus.musicxml b/test/data/grooves/BWMarchPlus.musicxml index 47dfba17..48036fde 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-27 diff --git a/test/data/grooves/BWMarchPlus2.musicxml b/test/data/grooves/BWMarchPlus2.musicxml index 274511e2..9de9c6fb 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-27 diff --git a/test/data/grooves/BWMarchSus.musicxml b/test/data/grooves/BWMarchSus.musicxml index 569b9e2c..ccb9e6d2 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-27 diff --git a/test/data/grooves/BWMarchSusPlus.musicxml b/test/data/grooves/BWMarchSusPlus.musicxml index 5ebd9a2c..3a12604d 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-27 diff --git a/test/data/grooves/BWMarchSusPlus2.musicxml b/test/data/grooves/BWMarchSusPlus2.musicxml index e3f69803..ad33034d 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-27 diff --git a/test/data/grooves/Baiao-Gimenez.musicxml b/test/data/grooves/Baiao-Gimenez.musicxml index a94493f9..731d3523 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-27 diff --git a/test/data/grooves/Baiao-Miranda.musicxml b/test/data/grooves/Baiao-Miranda.musicxml index 916b15ae..5f598edd 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-27 diff --git a/test/data/grooves/Ballad.musicxml b/test/data/grooves/Ballad.musicxml index 363c08aa..952c8a6c 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-27 @@ -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..a3c03781 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-27 @@ -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..9b7da55d 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-27 diff --git a/test/data/grooves/Ballad128End.musicxml b/test/data/grooves/Ballad128End.musicxml index 607acd88..0c91371e 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-27 diff --git a/test/data/grooves/Ballad128Intro1.musicxml b/test/data/grooves/Ballad128Intro1.musicxml index 485c06dc..7a9a5af6 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-27 diff --git a/test/data/grooves/Ballad128Plus.musicxml b/test/data/grooves/Ballad128Plus.musicxml index fc32a137..c71403a3 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-27 diff --git a/test/data/grooves/Ballad128Sus.musicxml b/test/data/grooves/Ballad128Sus.musicxml index 34d25a3b..cf48177d 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-27 diff --git a/test/data/grooves/Ballad128SusPlus.musicxml b/test/data/grooves/Ballad128SusPlus.musicxml index 36b009a3..4c928430 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-27 diff --git a/test/data/grooves/Ballad1End.musicxml b/test/data/grooves/Ballad1End.musicxml index 23046903..5013bb65 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-27 @@ -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..8b8ca2b4 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-27 @@ -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..8519ae36 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-27 @@ -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..d384ed58 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-27 @@ -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..68bce07b 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-27 diff --git a/test/data/grooves/Ballad68.musicxml b/test/data/grooves/Ballad68.musicxml index cef1a420..03b394fb 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-27 @@ -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..127d647e 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-27 @@ -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..28d7d8c3 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-27 @@ -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..b22ad70a 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-27 @@ -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..7271b1fc 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-27 @@ -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..bbe80c17 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-27 @@ -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..ce049bca 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-27 @@ -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..b18cca5d 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-27 @@ -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..73641f51 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-27 @@ -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..712ae2fc 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-27 @@ -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..beb29708 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-27 @@ -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..1658c66d 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-27 @@ -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..e408644c 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-27 @@ -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..6cbea22b 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-27 @@ -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..bd6cdad3 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-27 diff --git a/test/data/grooves/BasicRock4.musicxml b/test/data/grooves/BasicRock4.musicxml index 51c41ec8..8b5cfb03 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-27 diff --git a/test/data/grooves/BasicRock4Intro.musicxml b/test/data/grooves/BasicRock4Intro.musicxml index e025819d..ef2a80e4 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-27 diff --git a/test/data/grooves/BasicRock4Sus.musicxml b/test/data/grooves/BasicRock4Sus.musicxml index eb56be7d..2bef3f50 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-27 diff --git a/test/data/grooves/BasicRockEnd.musicxml b/test/data/grooves/BasicRockEnd.musicxml index 49c25454..fbcb4272 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-27 @@ -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..e428febb 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-27 diff --git a/test/data/grooves/BasicRockSus.musicxml b/test/data/grooves/BasicRockSus.musicxml index a3548c7b..af598434 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-27 diff --git a/test/data/grooves/Bebop.musicxml b/test/data/grooves/Bebop.musicxml index 1f95e4c6..a1002b05 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-27 diff --git a/test/data/grooves/BebopEnd.musicxml b/test/data/grooves/BebopEnd.musicxml index ef5b90cf..88d6b501 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-27 @@ -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..85d51cf5 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-27 @@ -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..b5298f1d 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-27 diff --git a/test/data/grooves/BebopSus.musicxml b/test/data/grooves/BebopSus.musicxml index f74fbb82..6533e546 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-27 diff --git a/test/data/grooves/BebopSusPlus.musicxml b/test/data/grooves/BebopSusPlus.musicxml index 8b45cfed..75d4dfad 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-27 diff --git a/test/data/grooves/Beguine.musicxml b/test/data/grooves/Beguine.musicxml index f0644e30..58e6117d 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-27 @@ -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..8a526ac4 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-27 @@ -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..47ddd9fc 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-27 @@ -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..4c12b9f9 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-27 @@ -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..816de13d 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-27 @@ -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..f156d2c8 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-27 diff --git a/test/data/grooves/BeguineIntro.musicxml b/test/data/grooves/BeguineIntro.musicxml index 4f2ee3bd..18e44a19 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-27 @@ -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..7c362951 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-27 @@ -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..884427ea 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-27 @@ -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..f99572a0 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-27 @@ -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..02652b67 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-27 @@ -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..3c53ceb5 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-27 @@ -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..0744e03d 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-27 diff --git a/test/data/grooves/BigBand1Fill.musicxml b/test/data/grooves/BigBand1Fill.musicxml index 1c76e204..6408948f 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-27 diff --git a/test/data/grooves/BigBand1Plus.musicxml b/test/data/grooves/BigBand1Plus.musicxml index f315476c..bbdc4c08 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-27 @@ -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..2ad7ec00 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-27 @@ -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..3e530876 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-27 @@ -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..e37a8b18 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-27 @@ -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..0ebf8b64 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-27 @@ -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..e0128ecc 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-27 @@ -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..f1cfc50f 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-27 @@ -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..c50fb240 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-27 diff --git a/test/data/grooves/BigBandFill.musicxml b/test/data/grooves/BigBandFill.musicxml index 06f83ee1..ca61b3be 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-27 diff --git a/test/data/grooves/BigBandIntro.musicxml b/test/data/grooves/BigBandIntro.musicxml index f4fa803c..ae72315e 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-27 @@ -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..47a1ba92 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-27 @@ -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..c44e1fa8 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-27 @@ -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..3d0fa4ac 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-27 @@ -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..6e356841 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-27 @@ -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..e499cf23 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-27 @@ -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..ae9c1de2 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-27 diff --git a/test/data/grooves/BlueFolk2.musicxml b/test/data/grooves/BlueFolk2.musicxml index 49a4e619..6e74fbef 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-27 diff --git a/test/data/grooves/BlueFolk2Plus.musicxml b/test/data/grooves/BlueFolk2Plus.musicxml index aa8a421c..78a84c44 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-27 diff --git a/test/data/grooves/BlueFolk2Sus.musicxml b/test/data/grooves/BlueFolk2Sus.musicxml index 4407f37d..a50106fe 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-27 diff --git a/test/data/grooves/BlueFolk2SusPlus.musicxml b/test/data/grooves/BlueFolk2SusPlus.musicxml index 9516e0b5..3e85a665 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-27 diff --git a/test/data/grooves/BlueFolkEnd.musicxml b/test/data/grooves/BlueFolkEnd.musicxml index 38e72300..ec767605 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-27 diff --git a/test/data/grooves/BlueFolkIntro.musicxml b/test/data/grooves/BlueFolkIntro.musicxml index 6ca1d005..09617c06 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-27 diff --git a/test/data/grooves/BlueFolkPlus.musicxml b/test/data/grooves/BlueFolkPlus.musicxml index ae404cc6..56319b50 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-27 diff --git a/test/data/grooves/BlueFolkSus.musicxml b/test/data/grooves/BlueFolkSus.musicxml index eb2e5822..1ce63f8e 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-27 diff --git a/test/data/grooves/BlueFolkSusPlus.musicxml b/test/data/grooves/BlueFolkSusPlus.musicxml index 7e0215d1..c7aae6e3 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-27 diff --git a/test/data/grooves/BlueGrass.musicxml b/test/data/grooves/BlueGrass.musicxml index d64d407b..3c9188dd 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-27 diff --git a/test/data/grooves/BlueGrassBottle.musicxml b/test/data/grooves/BlueGrassBottle.musicxml index 99dfd1ef..015b2472 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-27 diff --git a/test/data/grooves/BlueGrassBottleClap.musicxml b/test/data/grooves/BlueGrassBottleClap.musicxml index 02a61acf..e662c46b 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-27 diff --git a/test/data/grooves/BlueGrassClap.musicxml b/test/data/grooves/BlueGrassClap.musicxml index 2ba9620e..c174f6cd 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-27 diff --git a/test/data/grooves/BlueGrassEnd.musicxml b/test/data/grooves/BlueGrassEnd.musicxml index 6278bf33..3b821f8e 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-27 diff --git a/test/data/grooves/BlueGrassIntro.musicxml b/test/data/grooves/BlueGrassIntro.musicxml index fb4637d4..9d8eec5b 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-27 diff --git a/test/data/grooves/BlueGrassSus.musicxml b/test/data/grooves/BlueGrassSus.musicxml index 1716921b..a8d2c73d 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-27 diff --git a/test/data/grooves/BlueGrassSusClap.musicxml b/test/data/grooves/BlueGrassSusClap.musicxml index b5903af6..e93a5891 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-27 diff --git a/test/data/grooves/Blues.musicxml b/test/data/grooves/Blues.musicxml index f520284b..31e19d9c 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-27 diff --git a/test/data/grooves/Blues1.musicxml b/test/data/grooves/Blues1.musicxml index 9ea9a5f0..d07d324e 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-27 diff --git a/test/data/grooves/Blues128.musicxml b/test/data/grooves/Blues128.musicxml index 2ed658ad..847dc848 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-27 diff --git a/test/data/grooves/Blues128End.musicxml b/test/data/grooves/Blues128End.musicxml index effa18bf..b514ab71 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-27 diff --git a/test/data/grooves/Blues128Plus.musicxml b/test/data/grooves/Blues128Plus.musicxml index 2257adef..d9c0009e 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-27 diff --git a/test/data/grooves/Blues128Sus.musicxml b/test/data/grooves/Blues128Sus.musicxml index a4c89a5c..7aebe876 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-27 diff --git a/test/data/grooves/Blues128SusPlus.musicxml b/test/data/grooves/Blues128SusPlus.musicxml index 01a73d6a..c11945d7 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-27 diff --git a/test/data/grooves/Blues1Sus.musicxml b/test/data/grooves/Blues1Sus.musicxml index 8de97042..61d0ca4f 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-27 diff --git a/test/data/grooves/Blues68.musicxml b/test/data/grooves/Blues68.musicxml index 43b0dd2b..0364092b 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-27 diff --git a/test/data/grooves/Blues68End.musicxml b/test/data/grooves/Blues68End.musicxml index 70023212..6bf17787 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-27 diff --git a/test/data/grooves/Blues68Intro.musicxml b/test/data/grooves/Blues68Intro.musicxml index da989e51..e04e0840 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-27 diff --git a/test/data/grooves/Blues68Plus.musicxml b/test/data/grooves/Blues68Plus.musicxml index f14a501b..6d778d43 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-27 diff --git a/test/data/grooves/Blues68Walk.musicxml b/test/data/grooves/Blues68Walk.musicxml index 5c66ec63..e2495538 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-27 diff --git a/test/data/grooves/Blues68WalkPlus.musicxml b/test/data/grooves/Blues68WalkPlus.musicxml index 5f78214e..304b8886 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-27 diff --git a/test/data/grooves/BluesEnd.musicxml b/test/data/grooves/BluesEnd.musicxml index 8e30c5ce..4e9a9318 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-27 diff --git a/test/data/grooves/BluesIntro.musicxml b/test/data/grooves/BluesIntro.musicxml index aa6723bb..5d007926 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-27 @@ -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..f16258e8 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-27 diff --git a/test/data/grooves/BluesTriple.musicxml b/test/data/grooves/BluesTriple.musicxml index 07d514e3..1490f608 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-27 diff --git a/test/data/grooves/BluesTripleL.musicxml b/test/data/grooves/BluesTripleL.musicxml index c563b708..cf7f012c 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-27 diff --git a/test/data/grooves/BluesTripleLSus.musicxml b/test/data/grooves/BluesTripleLSus.musicxml index e14a308a..9f8cafbc 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-27 diff --git a/test/data/grooves/BluesTripleR.musicxml b/test/data/grooves/BluesTripleR.musicxml index 441d6130..9d331000 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-27 diff --git a/test/data/grooves/BluesTripleRSus.musicxml b/test/data/grooves/BluesTripleRSus.musicxml index c7759c15..0ddfa746 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-27 diff --git a/test/data/grooves/BluesTripleSus.musicxml b/test/data/grooves/BluesTripleSus.musicxml index ed66fbe6..3e9ddef5 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-27 diff --git a/test/data/grooves/Bolero.musicxml b/test/data/grooves/Bolero.musicxml index dfb86c38..1c7c118a 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-27 @@ -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..d2603b54 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-27 diff --git a/test/data/grooves/Bolero1End.musicxml b/test/data/grooves/Bolero1End.musicxml index c927b028..0ef66bce 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-27 @@ -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..5a6d291d 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-27 diff --git a/test/data/grooves/Bolero1Intro.musicxml b/test/data/grooves/Bolero1Intro.musicxml index 27a82329..0b94dd5b 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-27 @@ -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..7d576e00 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-27 diff --git a/test/data/grooves/Bolero1SusFill.musicxml b/test/data/grooves/Bolero1SusFill.musicxml index ebb5e73b..9f87dcf6 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-27 diff --git a/test/data/grooves/BoleroAlt.musicxml b/test/data/grooves/BoleroAlt.musicxml index d6444368..47017843 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-27 @@ -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..6a772f21 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-27 @@ -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..6c6fe0f3 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-27 @@ -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..788fd926 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-27 @@ -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..98907b10 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-27 @@ -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..7c49774f 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-27 @@ -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..ed34c1fe 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-27 @@ -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..02565ceb 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-27 @@ -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..aece47bc 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-27 @@ -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..68b3b967 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-27 @@ -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..e42df094 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-27 @@ -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..3cf4703d 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-27 @@ -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..4613b103 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-27 @@ -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..f64c5bc2 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-27 @@ -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..338aca60 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-27 @@ -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..5a7468ed 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-27 @@ -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..f464442d 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-27 @@ -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..cfd41025 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-27 diff --git a/test/data/grooves/BossaNova1End.musicxml b/test/data/grooves/BossaNova1End.musicxml index a2bd0ec7..0f06239b 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-27 diff --git a/test/data/grooves/BossaNova1Sus.musicxml b/test/data/grooves/BossaNova1Sus.musicxml index 9cbec173..a2f12c3c 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-27 diff --git a/test/data/grooves/BossaNova1SusPlus.musicxml b/test/data/grooves/BossaNova1SusPlus.musicxml index f5ab2cd9..5bdad829 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-27 diff --git a/test/data/grooves/BossaNova2End.musicxml b/test/data/grooves/BossaNova2End.musicxml index 0a4226f9..5a8315af 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-27 diff --git a/test/data/grooves/BossaNova2Sus.musicxml b/test/data/grooves/BossaNova2Sus.musicxml index 6b2a14c9..2cd2e7bc 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-27 diff --git a/test/data/grooves/BossaNova2SusPlus.musicxml b/test/data/grooves/BossaNova2SusPlus.musicxml index 2743ff33..c90f589a 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-27 diff --git a/test/data/grooves/BossaNova3Sus.musicxml b/test/data/grooves/BossaNova3Sus.musicxml index d010819d..42b13e96 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-27 diff --git a/test/data/grooves/BossaNova3SusPlus.musicxml b/test/data/grooves/BossaNova3SusPlus.musicxml index 79441c61..ec9b79f0 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-27 diff --git a/test/data/grooves/BossaNovaEnd.musicxml b/test/data/grooves/BossaNovaEnd.musicxml index 4dbbd371..b77d4815 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-27 diff --git a/test/data/grooves/BossaNovaFill.musicxml b/test/data/grooves/BossaNovaFill.musicxml index dadd930e..430ca640 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-27 @@ -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..5f3b19a1 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-27 diff --git a/test/data/grooves/BossaNovaIntro1.musicxml b/test/data/grooves/BossaNovaIntro1.musicxml index 01f3b31a..83265f8d 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-27 diff --git a/test/data/grooves/BossaNovaIntro8.musicxml b/test/data/grooves/BossaNovaIntro8.musicxml index 93c5d29e..b155b8b5 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-27 diff --git a/test/data/grooves/BossaNovaPlus.musicxml b/test/data/grooves/BossaNovaPlus.musicxml index 806878f7..3bb6368c 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-27 diff --git a/test/data/grooves/BossaNovaSus.musicxml b/test/data/grooves/BossaNovaSus.musicxml index 7dc9a4a0..5ece49dc 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-27 diff --git a/test/data/grooves/BossaNovaSusPlus.musicxml b/test/data/grooves/BossaNovaSusPlus.musicxml index 59768e95..485f0423 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-27 diff --git a/test/data/grooves/Broadway.musicxml b/test/data/grooves/Broadway.musicxml index bd5c6266..d74820f1 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-27 diff --git a/test/data/grooves/Broadway1.musicxml b/test/data/grooves/Broadway1.musicxml index 23538755..64400c8b 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-27 diff --git a/test/data/grooves/Broadway1Sus.musicxml b/test/data/grooves/Broadway1Sus.musicxml index 4a576ec7..517fc3a8 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-27 diff --git a/test/data/grooves/Broadway2.musicxml b/test/data/grooves/Broadway2.musicxml index 95128e09..7c3d0a35 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-27 diff --git a/test/data/grooves/Broadway2Sus.musicxml b/test/data/grooves/Broadway2Sus.musicxml index 18d5f7c6..b0618fd6 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-27 diff --git a/test/data/grooves/BroadwayEnd.musicxml b/test/data/grooves/BroadwayEnd.musicxml index 182703ea..fb9f343e 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-27 @@ -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..314620ae 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-27 diff --git a/test/data/grooves/BroadwayIntro.musicxml b/test/data/grooves/BroadwayIntro.musicxml index 7dd2caea..f8988a22 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-27 diff --git a/test/data/grooves/BroadwayIntro8.musicxml b/test/data/grooves/BroadwayIntro8.musicxml index b0818b36..6aa72e59 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-27 diff --git a/test/data/grooves/BroadwaySus.musicxml b/test/data/grooves/BroadwaySus.musicxml index 4415082b..faad94c3 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-27 diff --git a/test/data/grooves/BroadwayWaltz.musicxml b/test/data/grooves/BroadwayWaltz.musicxml index 6a696c3f..beca0cd3 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-27 diff --git a/test/data/grooves/BroadwayWaltz1.musicxml b/test/data/grooves/BroadwayWaltz1.musicxml index 151b91f1..f5e6ffe2 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-27 diff --git a/test/data/grooves/BroadwayWaltz1Sus.musicxml b/test/data/grooves/BroadwayWaltz1Sus.musicxml index ea75826b..504af34e 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-27 diff --git a/test/data/grooves/BroadwayWaltz2.musicxml b/test/data/grooves/BroadwayWaltz2.musicxml index 628474fe..edeb7e64 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-27 diff --git a/test/data/grooves/BroadwayWaltz2Sus.musicxml b/test/data/grooves/BroadwayWaltz2Sus.musicxml index 413a49fb..2914abf7 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-27 diff --git a/test/data/grooves/BroadwayWaltzEnd.musicxml b/test/data/grooves/BroadwayWaltzEnd.musicxml index 7ef6ed63..bbc02b3c 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-27 diff --git a/test/data/grooves/BroadwayWaltzIntro.musicxml b/test/data/grooves/BroadwayWaltzIntro.musicxml index 03e676f3..f390dc9c 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-27 diff --git a/test/data/grooves/BroadwayWaltzIntro8.musicxml b/test/data/grooves/BroadwayWaltzIntro8.musicxml index 78106cef..8644dfaa 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-27 diff --git a/test/data/grooves/BroadwayWaltzSus.musicxml b/test/data/grooves/BroadwayWaltzSus.musicxml index 900eeb45..858da657 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-27 diff --git a/test/data/grooves/BubbleRock.musicxml b/test/data/grooves/BubbleRock.musicxml index def425fb..a768a65c 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-27 @@ -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..71d53385 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-27 @@ -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..d6892364 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-27 @@ -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..b388b1e3 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-27 @@ -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..8c546232 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-27 @@ -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..4ceaaba6 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-27 @@ -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..411d498f 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-27 @@ -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..0422eb1b 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-27 diff --git a/test/data/grooves/CNTR02.musicxml b/test/data/grooves/CNTR02.musicxml index 1a766b20..78b7f1a8 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-27 diff --git a/test/data/grooves/CNTR03.musicxml b/test/data/grooves/CNTR03.musicxml index 20835616..0e4e09b5 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-27 @@ -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..8f02bcef 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-27 @@ -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..6dd5be27 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-27 diff --git a/test/data/grooves/COUNT.musicxml b/test/data/grooves/COUNT.musicxml index 5547892a..0e44533a 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-27 diff --git a/test/data/grooves/Calypso.musicxml b/test/data/grooves/Calypso.musicxml index b08ec0a2..4ad8f41f 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-27 diff --git a/test/data/grooves/Calypso1.musicxml b/test/data/grooves/Calypso1.musicxml index f1dc9f61..ed51f312 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-27 diff --git a/test/data/grooves/Calypso1Plus.musicxml b/test/data/grooves/Calypso1Plus.musicxml index 172bc1f8..737c852d 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-27 diff --git a/test/data/grooves/Calypso1Sus.musicxml b/test/data/grooves/Calypso1Sus.musicxml index aee9960f..10554384 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-27 diff --git a/test/data/grooves/Calypso1SusPlus.musicxml b/test/data/grooves/Calypso1SusPlus.musicxml index 80dccaec..9ba30c4a 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-27 diff --git a/test/data/grooves/Calypso8Intro.musicxml b/test/data/grooves/Calypso8Intro.musicxml index 10a95c7b..764b7af1 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-27 diff --git a/test/data/grooves/CalypsoEnd.musicxml b/test/data/grooves/CalypsoEnd.musicxml index a2f000f7..14a076e4 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-27 diff --git a/test/data/grooves/CalypsoIntro.musicxml b/test/data/grooves/CalypsoIntro.musicxml index f795bff1..5a9c6eb5 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-27 diff --git a/test/data/grooves/CalypsoPlus.musicxml b/test/data/grooves/CalypsoPlus.musicxml index 279775b8..9e1546e9 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-27 diff --git a/test/data/grooves/CalypsoSus.musicxml b/test/data/grooves/CalypsoSus.musicxml index ef9b8a04..d1207a95 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-27 diff --git a/test/data/grooves/CalypsoSusPlus.musicxml b/test/data/grooves/CalypsoSusPlus.musicxml index 5d9d7278..0ab90741 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-27 diff --git a/test/data/grooves/ChaCha.musicxml b/test/data/grooves/ChaCha.musicxml index 0b3b9c4f..b4b30288 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-27 diff --git a/test/data/grooves/ChaCha1.musicxml b/test/data/grooves/ChaCha1.musicxml index a5f45c6c..ab46fc88 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-27 diff --git a/test/data/grooves/ChaCha1Fill.musicxml b/test/data/grooves/ChaCha1Fill.musicxml index f7e17c8a..797f51dc 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-27 diff --git a/test/data/grooves/ChaCha1Sus.musicxml b/test/data/grooves/ChaCha1Sus.musicxml index ba7e7af8..35b92ab7 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-27 diff --git a/test/data/grooves/ChaChaEnd.musicxml b/test/data/grooves/ChaChaEnd.musicxml index 879c61ec..de31c2e8 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-27 diff --git a/test/data/grooves/ChaChaFill.musicxml b/test/data/grooves/ChaChaFill.musicxml index beff3edd..c3e102f3 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-27 diff --git a/test/data/grooves/ChaChaIntro.musicxml b/test/data/grooves/ChaChaIntro.musicxml index 51854c53..9f93946b 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-27 diff --git a/test/data/grooves/ChaChaIntro8.musicxml b/test/data/grooves/ChaChaIntro8.musicxml index bc9bffc1..5d67443e 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-27 diff --git a/test/data/grooves/ChaChaSus.musicxml b/test/data/grooves/ChaChaSus.musicxml index d16b797f..6c43f938 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-27 diff --git a/test/data/grooves/Charleston.musicxml b/test/data/grooves/Charleston.musicxml index 0923d246..6a29e603 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-27 diff --git a/test/data/grooves/Charleston1.musicxml b/test/data/grooves/Charleston1.musicxml index ea32f9af..0fd24899 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-27 diff --git a/test/data/grooves/Charleston1Plus.musicxml b/test/data/grooves/Charleston1Plus.musicxml index 25e42789..2c7a99e7 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-27 diff --git a/test/data/grooves/Charleston1Sus.musicxml b/test/data/grooves/Charleston1Sus.musicxml index 06a855e2..08310ffb 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-27 diff --git a/test/data/grooves/Charleston1SusPlus.musicxml b/test/data/grooves/Charleston1SusPlus.musicxml index 11ed7407..aea35de1 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-27 diff --git a/test/data/grooves/Charleston1Walk.musicxml b/test/data/grooves/Charleston1Walk.musicxml index e0000117..db8683d7 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-27 diff --git a/test/data/grooves/Charleston1WalkPlus.musicxml b/test/data/grooves/Charleston1WalkPlus.musicxml index 0f5476a7..511da960 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-27 diff --git a/test/data/grooves/Charleston1WalkSus.musicxml b/test/data/grooves/Charleston1WalkSus.musicxml index 0302941b..c6f79cb1 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-27 diff --git a/test/data/grooves/Charleston1WalkSusPlus.musicxml b/test/data/grooves/Charleston1WalkSusPlus.musicxml index 07699159..2a08dee0 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-27 diff --git a/test/data/grooves/Charleston2.musicxml b/test/data/grooves/Charleston2.musicxml index a799dc54..b38be4e4 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-27 diff --git a/test/data/grooves/Charleston2Plus.musicxml b/test/data/grooves/Charleston2Plus.musicxml index b725b4bb..f561e205 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-27 diff --git a/test/data/grooves/Charleston2Sus.musicxml b/test/data/grooves/Charleston2Sus.musicxml index 10bc4072..5a4b8858 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-27 diff --git a/test/data/grooves/Charleston2SusPlus.musicxml b/test/data/grooves/Charleston2SusPlus.musicxml index ead46b64..585373c2 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-27 diff --git a/test/data/grooves/Charleston2Walk.musicxml b/test/data/grooves/Charleston2Walk.musicxml index 7f6eee23..6572e717 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-27 diff --git a/test/data/grooves/Charleston2WalkPlus.musicxml b/test/data/grooves/Charleston2WalkPlus.musicxml index a1c26bea..1a70041d 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-27 diff --git a/test/data/grooves/Charleston2WalkSus.musicxml b/test/data/grooves/Charleston2WalkSus.musicxml index 0121c5e3..7fee061b 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-27 diff --git a/test/data/grooves/Charleston2WalkSusPlus.musicxml b/test/data/grooves/Charleston2WalkSusPlus.musicxml index 7fee6beb..b072b3ba 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-27 diff --git a/test/data/grooves/CharlestonEnd.musicxml b/test/data/grooves/CharlestonEnd.musicxml index b6338662..2958c15a 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-27 diff --git a/test/data/grooves/CharlestonIntro.musicxml b/test/data/grooves/CharlestonIntro.musicxml index 9fe55f51..6aa10c79 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-27 diff --git a/test/data/grooves/CharlestonIntro8.musicxml b/test/data/grooves/CharlestonIntro8.musicxml index 938e5b49..79d2d74e 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-27 diff --git a/test/data/grooves/CharlestonPlus.musicxml b/test/data/grooves/CharlestonPlus.musicxml index 3c4f45cf..ff71889d 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-27 diff --git a/test/data/grooves/CharlestonSus.musicxml b/test/data/grooves/CharlestonSus.musicxml index 788c7161..2286f53d 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-27 diff --git a/test/data/grooves/CharlestonSusPlus.musicxml b/test/data/grooves/CharlestonSusPlus.musicxml index 04b0648e..7f6200b1 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-27 diff --git a/test/data/grooves/CharlestonWalk.musicxml b/test/data/grooves/CharlestonWalk.musicxml index b9fde015..e121ba60 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-27 diff --git a/test/data/grooves/CharlestonWalkPlus.musicxml b/test/data/grooves/CharlestonWalkPlus.musicxml index dc8a6943..92a083e6 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-27 diff --git a/test/data/grooves/CharlestonWalkSus.musicxml b/test/data/grooves/CharlestonWalkSus.musicxml index 3b50b6fa..646d3b35 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-27 diff --git a/test/data/grooves/CharlestonWalkSusPlus.musicxml b/test/data/grooves/CharlestonWalkSusPlus.musicxml index ced1cd15..7ebcedda 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-27 diff --git a/test/data/grooves/Click.musicxml b/test/data/grooves/Click.musicxml index e178cb30..3f9b4e38 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-27 diff --git a/test/data/grooves/CountryBlues.musicxml b/test/data/grooves/CountryBlues.musicxml index ec4d5ee7..7266a4cd 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-27 diff --git a/test/data/grooves/CountryBlues1.musicxml b/test/data/grooves/CountryBlues1.musicxml index 1efba4d1..4683d3dc 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-27 diff --git a/test/data/grooves/CountryBlues1Fill.musicxml b/test/data/grooves/CountryBlues1Fill.musicxml index 55ac6875..79fffd9a 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-27 diff --git a/test/data/grooves/CountryBlues1Sus.musicxml b/test/data/grooves/CountryBlues1Sus.musicxml index 942f545b..48ad7be4 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-27 diff --git a/test/data/grooves/CountryBlues1Walk.musicxml b/test/data/grooves/CountryBlues1Walk.musicxml index 0841b9a8..d3fabf63 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-27 diff --git a/test/data/grooves/CountryBlues1WalkFill.musicxml b/test/data/grooves/CountryBlues1WalkFill.musicxml index 81433301..56e3ea91 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-27 diff --git a/test/data/grooves/CountryBlues1WalkSus.musicxml b/test/data/grooves/CountryBlues1WalkSus.musicxml index 38a2196f..5ee9a989 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-27 diff --git a/test/data/grooves/CountryBluesEnd.musicxml b/test/data/grooves/CountryBluesEnd.musicxml index f374fd1a..d5a08ba6 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-27 diff --git a/test/data/grooves/CountryBluesFill.musicxml b/test/data/grooves/CountryBluesFill.musicxml index a013bd96..9881ad48 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-27 diff --git a/test/data/grooves/CountryBluesIntro.musicxml b/test/data/grooves/CountryBluesIntro.musicxml index 09c3a4ed..b74f7c1c 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-27 diff --git a/test/data/grooves/CountryBluesSus.musicxml b/test/data/grooves/CountryBluesSus.musicxml index eec31dd1..18d4a284 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-27 diff --git a/test/data/grooves/CountryBluesWalk.musicxml b/test/data/grooves/CountryBluesWalk.musicxml index 23ed06ad..f395e7bd 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-27 diff --git a/test/data/grooves/CountryBluesWalkFill.musicxml b/test/data/grooves/CountryBluesWalkFill.musicxml index 51693a6d..72488d1f 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-27 diff --git a/test/data/grooves/CountryBluesWalkSus.musicxml b/test/data/grooves/CountryBluesWalkSus.musicxml index 468ccfcc..73a6014c 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-27 diff --git a/test/data/grooves/CountrySwing.musicxml b/test/data/grooves/CountrySwing.musicxml index 07bd1036..06fe2eb2 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-27 diff --git a/test/data/grooves/CountrySwing1.musicxml b/test/data/grooves/CountrySwing1.musicxml index 729d235d..49175e6a 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-27 diff --git a/test/data/grooves/CountrySwing1Sus.musicxml b/test/data/grooves/CountrySwing1Sus.musicxml index 3ddffe70..a8965f51 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-27 diff --git a/test/data/grooves/CountrySwing2.musicxml b/test/data/grooves/CountrySwing2.musicxml index 54ad4600..9f370aea 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-27 diff --git a/test/data/grooves/CountrySwing2Sus.musicxml b/test/data/grooves/CountrySwing2Sus.musicxml index eea55daa..f5d67eaa 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-27 diff --git a/test/data/grooves/CountrySwingEnd.musicxml b/test/data/grooves/CountrySwingEnd.musicxml index 119c01e0..787a3670 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-27 diff --git a/test/data/grooves/CountrySwingIntro.musicxml b/test/data/grooves/CountrySwingIntro.musicxml index 6d4ebd8d..86435658 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-27 diff --git a/test/data/grooves/CountrySwingSus.musicxml b/test/data/grooves/CountrySwingSus.musicxml index 35e62130..026a198b 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-27 diff --git a/test/data/grooves/CountryWaltz.musicxml b/test/data/grooves/CountryWaltz.musicxml index 7f17914e..728553fa 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-27 diff --git a/test/data/grooves/CountryWaltz1.musicxml b/test/data/grooves/CountryWaltz1.musicxml index bdca4cee..d232dc36 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-27 diff --git a/test/data/grooves/CountryWaltz1Sus.musicxml b/test/data/grooves/CountryWaltz1Sus.musicxml index 55d824b3..10fd8d14 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-27 diff --git a/test/data/grooves/CountryWaltz1SusWalk.musicxml b/test/data/grooves/CountryWaltz1SusWalk.musicxml index 8131e84d..f865021a 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-27 diff --git a/test/data/grooves/CountryWaltz1Walk.musicxml b/test/data/grooves/CountryWaltz1Walk.musicxml index 6a09e4e0..506a3432 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-27 diff --git a/test/data/grooves/CountryWaltz2.musicxml b/test/data/grooves/CountryWaltz2.musicxml index d144c91b..94df9c77 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-27 diff --git a/test/data/grooves/CountryWaltz2Sus.musicxml b/test/data/grooves/CountryWaltz2Sus.musicxml index 86fd41c5..71abb49c 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-27 diff --git a/test/data/grooves/CountryWaltz2SusWalk.musicxml b/test/data/grooves/CountryWaltz2SusWalk.musicxml index 06935dc0..71841dfe 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-27 diff --git a/test/data/grooves/CountryWaltzEnd.musicxml b/test/data/grooves/CountryWaltzEnd.musicxml index a75e30a4..df98e9e4 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-27 diff --git a/test/data/grooves/CountryWaltzIntro.musicxml b/test/data/grooves/CountryWaltzIntro.musicxml index 8d874a76..274598f2 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-27 diff --git a/test/data/grooves/CountryWaltzIntro8.musicxml b/test/data/grooves/CountryWaltzIntro8.musicxml index c0856405..5d15ee12 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-27 diff --git a/test/data/grooves/CountryWaltzSus.musicxml b/test/data/grooves/CountryWaltzSus.musicxml index 0e83c25e..430447b1 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-27 diff --git a/test/data/grooves/CountryWaltzWalk.musicxml b/test/data/grooves/CountryWaltzWalk.musicxml index d0b40072..ebb6ec38 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-27 diff --git a/test/data/grooves/CountryWaltzWalkSus.musicxml b/test/data/grooves/CountryWaltzWalkSus.musicxml index 521bd892..9f131c57 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-27 diff --git a/test/data/grooves/Countrywaltz2Walk.musicxml b/test/data/grooves/Countrywaltz2Walk.musicxml index 0c7268c7..bd528783 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-27 diff --git a/test/data/grooves/DANC01.musicxml b/test/data/grooves/DANC01.musicxml index eb3f573d..fdceb2ac 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-27 diff --git a/test/data/grooves/DANC02.musicxml b/test/data/grooves/DANC02.musicxml index 98dd2542..1eb01bcd 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-27 diff --git a/test/data/grooves/DANC03.musicxml b/test/data/grooves/DANC03.musicxml index 11bd38dc..d753c0c6 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-27 @@ -594,116 +594,28 @@ E 4 - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 512 1 - 512th - up - normal - - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -711,15 +623,19 @@ E 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/DANC04.musicxml b/test/data/grooves/DANC04.musicxml index fe839aaa..310e0512 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-27 diff --git a/test/data/grooves/DANC05.musicxml b/test/data/grooves/DANC05.musicxml index 503b2cff..e76f81c2 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-27 @@ -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..4cc3c7d4 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-27 diff --git a/test/data/grooves/DANCE.musicxml b/test/data/grooves/DANCE.musicxml index aa08df99..b649fb80 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-27 diff --git a/test/data/grooves/DSoul.musicxml b/test/data/grooves/DSoul.musicxml index 4ebd980f..cf4c2727 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-27 diff --git a/test/data/grooves/DSoulEnd.musicxml b/test/data/grooves/DSoulEnd.musicxml index ce442ab0..319e5dcb 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-27 @@ -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..03f5cb5e 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-27 @@ -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..229437d5 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-27 @@ -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..7e2d53e2 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-27 diff --git a/test/data/grooves/DSoulSus.musicxml b/test/data/grooves/DSoulSus.musicxml index c1f0da34..507558b3 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-27 diff --git a/test/data/grooves/DSoulSusPlus.musicxml b/test/data/grooves/DSoulSusPlus.musicxml index 245591e0..72c5beb1 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-27 diff --git a/test/data/grooves/Dance1.musicxml b/test/data/grooves/Dance1.musicxml index 8dfb18cb..0933ace3 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-27 diff --git a/test/data/grooves/Dance1End.musicxml b/test/data/grooves/Dance1End.musicxml index 4aabc19f..558d0583 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-27 @@ -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..318b2326 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-27 diff --git a/test/data/grooves/Dance2.musicxml b/test/data/grooves/Dance2.musicxml index 680640fe..1d8b99cb 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-27 diff --git a/test/data/grooves/Dance2End.musicxml b/test/data/grooves/Dance2End.musicxml index 5e50d5f9..9259c8b9 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-27 @@ -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..ca5b819b 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-27 @@ -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..dc9e799d 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-27 diff --git a/test/data/grooves/DancePop1End.musicxml b/test/data/grooves/DancePop1End.musicxml index 8044b5d7..3d8311c8 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-27 @@ -520,650 +520,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 - - 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 - - 192 - - 3 - 16th - up - x - - - - - - 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 - - - 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 - - - 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 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - 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 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - @@ -1171,15 +539,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1187,15 +553,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1203,17 +582,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1221,15 +601,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1246,25 +630,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1280,38 +645,18 @@ + G 5 - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - + 192 3 - 64th + 16th up x - @@ -1319,17 +664,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -1337,15 +678,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1353,15 +707,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -1369,17 +726,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -1387,15 +746,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1403,33 +760,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -1437,15 +789,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1453,15 +803,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1469,17 +832,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1487,15 +851,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1512,27 +880,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - G @@ -1548,19 +895,18 @@ + G 5 - 48 - + 192 3 - 64th + 16th up x - @@ -1568,17 +914,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -1586,15 +928,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1602,15 +957,18 @@ G 5 - 384 - + 128 3 - eighth + 16th + + 3 + 2 + 16th + up x - @@ -1618,17 +976,19 @@ G 5 - 96 - - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - - + @@ -1636,33 +996,29 @@ G 5 - 24 - - + 192 3 - 128th + 16th 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..518e8263 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-27 @@ -1189,650 +1189,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 - - 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 - - 192 - - 3 - 16th - up - x - - - - - - 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 - - - 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 - - - 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 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - 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 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 192 3 - 128th + 16th up x - - @@ -1840,15 +1208,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -1856,15 +1222,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1872,17 +1251,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1890,15 +1270,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1915,25 +1299,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -1949,38 +1314,18 @@ + G 5 - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - + 192 3 - 64th + 16th up x - @@ -1988,17 +1333,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -2006,15 +1347,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2022,15 +1376,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -2038,17 +1395,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -2056,15 +1415,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -2072,33 +1429,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -2106,15 +1458,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -2122,15 +1472,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2138,17 +1501,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -2156,15 +1520,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -2181,27 +1549,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - G @@ -2217,19 +1564,18 @@ + G 5 - 48 - + 192 3 - 64th + 16th up x - @@ -2237,17 +1583,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -2255,15 +1597,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2271,15 +1626,18 @@ G 5 - 384 - + 128 3 - eighth + 16th + + 3 + 2 + 16th + up x - @@ -2287,17 +1645,19 @@ G 5 - 96 - - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - - + @@ -2305,33 +1665,29 @@ G 5 - 24 - - + 192 3 - 128th + 16th 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..07a58042 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-27 diff --git a/test/data/grooves/DancePop2End.musicxml b/test/data/grooves/DancePop2End.musicxml index 7640cefa..8b934630 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-27 @@ -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..2afb75ab 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-27 @@ -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..5fb7d1a7 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-27 @@ -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..0b8d5024 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-27 @@ -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..2f36a057 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-27 @@ -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..3ddf4432 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-27 diff --git a/test/data/grooves/DescendingJazzEnd.musicxml b/test/data/grooves/DescendingJazzEnd.musicxml index fae0bbac..a8f8c887 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-27 diff --git a/test/data/grooves/DescendingJazzIntro.musicxml b/test/data/grooves/DescendingJazzIntro.musicxml index 696c44cb..49436dd6 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-27 diff --git a/test/data/grooves/DescendingJazzIntro8.musicxml b/test/data/grooves/DescendingJazzIntro8.musicxml index 0a2c6b58..875c09bc 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-27 diff --git a/test/data/grooves/DescendingJazzPlus.musicxml b/test/data/grooves/DescendingJazzPlus.musicxml index f233b7ae..417a1b0a 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-27 diff --git a/test/data/grooves/DescendingJazzPlusIntro.musicxml b/test/data/grooves/DescendingJazzPlusIntro.musicxml index 20f219ea..6808b836 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-27 diff --git a/test/data/grooves/DescendingJazzPlusIntro8.musicxml b/test/data/grooves/DescendingJazzPlusIntro8.musicxml index 9f219c27..0bceae19 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-27 diff --git a/test/data/grooves/DescendingJazzSus.musicxml b/test/data/grooves/DescendingJazzSus.musicxml index d4843c30..a822cf93 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-27 diff --git a/test/data/grooves/DescendingJazzSusPlus.musicxml b/test/data/grooves/DescendingJazzSusPlus.musicxml index f5595459..f1e9f4e1 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-27 diff --git a/test/data/grooves/Desert.musicxml b/test/data/grooves/Desert.musicxml index fc09267b..ce6ebdb8 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-27 diff --git a/test/data/grooves/DesertEnd.musicxml b/test/data/grooves/DesertEnd.musicxml index 8a527fdc..8d481551 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-27 diff --git a/test/data/grooves/DesertFill.musicxml b/test/data/grooves/DesertFill.musicxml index aa04bf8d..611076b4 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-27 @@ -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..e11591c3 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-27 diff --git a/test/data/grooves/DigitalRock.musicxml b/test/data/grooves/DigitalRock.musicxml index 8401cc6d..2e1a9d4a 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-27 @@ -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..bdb6d740 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-27 @@ -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..24a93cee 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-27 @@ -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..82bb4dc4 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-27 diff --git a/test/data/grooves/DiscoSoulEnd.musicxml b/test/data/grooves/DiscoSoulEnd.musicxml index 00ead672..dcebc4cc 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-27 @@ -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..f53fbec9 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-27 @@ -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..22baef5d 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-27 diff --git a/test/data/grooves/Dixie1.musicxml b/test/data/grooves/Dixie1.musicxml index 07f50ec4..d9f6bbc6 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-27 diff --git a/test/data/grooves/Dixie1Sus.musicxml b/test/data/grooves/Dixie1Sus.musicxml index deee685c..15202863 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-27 diff --git a/test/data/grooves/Dixie2.musicxml b/test/data/grooves/Dixie2.musicxml index 2db1fec4..6716f6c0 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-27 diff --git a/test/data/grooves/Dixie2Sus.musicxml b/test/data/grooves/Dixie2Sus.musicxml index 7ccaea4c..fe59c5e8 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-27 diff --git a/test/data/grooves/Dixie3.musicxml b/test/data/grooves/Dixie3.musicxml index 953970eb..90e9958f 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-27 diff --git a/test/data/grooves/Dixie3Sus.musicxml b/test/data/grooves/Dixie3Sus.musicxml index 066951ea..1286d665 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-27 diff --git a/test/data/grooves/Dixie4.musicxml b/test/data/grooves/Dixie4.musicxml index f8c911f3..a6038719 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-27 diff --git a/test/data/grooves/Dixie4Strum.musicxml b/test/data/grooves/Dixie4Strum.musicxml index 756c974a..d62a5054 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-27 diff --git a/test/data/grooves/Dixie4Sus.musicxml b/test/data/grooves/Dixie4Sus.musicxml index 541a24b5..e58ef3b1 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-27 diff --git a/test/data/grooves/DixieEnd.musicxml b/test/data/grooves/DixieEnd.musicxml index 6e21dfd4..f9346ee2 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-27 diff --git a/test/data/grooves/DixieIntro.musicxml b/test/data/grooves/DixieIntro.musicxml index c22fb818..5fa74224 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-27 diff --git a/test/data/grooves/DixieIntro8.musicxml b/test/data/grooves/DixieIntro8.musicxml index ccde84d2..3c0c1e6e 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-27 diff --git a/test/data/grooves/DixieMarch.musicxml b/test/data/grooves/DixieMarch.musicxml index 6faf8496..fa407f45 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-27 diff --git a/test/data/grooves/DixieMarchEnd.musicxml b/test/data/grooves/DixieMarchEnd.musicxml index e4196221..d1ae4918 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-27 diff --git a/test/data/grooves/DixieMarchIntro.musicxml b/test/data/grooves/DixieMarchIntro.musicxml index 27ac0f42..cc7f38ff 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-27 diff --git a/test/data/grooves/DixieMarchPlus.musicxml b/test/data/grooves/DixieMarchPlus.musicxml index 8a72e0cd..fab0219b 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-27 diff --git a/test/data/grooves/DixieMarchSus.musicxml b/test/data/grooves/DixieMarchSus.musicxml index 6d9b4206..1fd6bbe1 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-27 diff --git a/test/data/grooves/DixieMarchSusPlus.musicxml b/test/data/grooves/DixieMarchSusPlus.musicxml index b8bb6111..3f22b8d6 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-27 diff --git a/test/data/grooves/DixieStrum.musicxml b/test/data/grooves/DixieStrum.musicxml index 75f6f507..ac79cc6e 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-27 diff --git a/test/data/grooves/DixieStrumSus.musicxml b/test/data/grooves/DixieStrumSus.musicxml index a6ad386e..3b67e635 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-27 diff --git a/test/data/grooves/DixieSus.musicxml b/test/data/grooves/DixieSus.musicxml index 2ee659d2..8b2581f8 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-27 diff --git a/test/data/grooves/DnB01.musicxml b/test/data/grooves/DnB01.musicxml index 9cf03158..413e1e47 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-27 @@ -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..5cf0d627 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-27 diff --git a/test/data/grooves/DnB03.musicxml b/test/data/grooves/DnB03.musicxml index 2bd40ee1..9ff477be 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-27 diff --git a/test/data/grooves/DnB04.musicxml b/test/data/grooves/DnB04.musicxml index cdc06199..b867674e 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-27 diff --git a/test/data/grooves/DnB05.musicxml b/test/data/grooves/DnB05.musicxml index df3627b4..d571dc70 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-27 @@ -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..a81aa5a6 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-27 @@ -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..d008b9ce 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-27 diff --git a/test/data/grooves/DooWopEnd.musicxml b/test/data/grooves/DooWopEnd.musicxml index 88ff4389..82a8b413 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-27 diff --git a/test/data/grooves/DooWopFill.musicxml b/test/data/grooves/DooWopFill.musicxml index 82e58b24..8590fb5a 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-27 diff --git a/test/data/grooves/DooWopIntro.musicxml b/test/data/grooves/DooWopIntro.musicxml index b908aa57..2b36e611 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-27 diff --git a/test/data/grooves/DooWopIntroSus.musicxml b/test/data/grooves/DooWopIntroSus.musicxml index 7e4e1df8..c0c4ca8e 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-27 diff --git a/test/data/grooves/DooWopPlus.musicxml b/test/data/grooves/DooWopPlus.musicxml index 9f12838e..b688a92f 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-27 diff --git a/test/data/grooves/DooWopSus.musicxml b/test/data/grooves/DooWopSus.musicxml index 6fb86bad..66d9127a 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-27 diff --git a/test/data/grooves/DooWopSusPlus.musicxml b/test/data/grooves/DooWopSusPlus.musicxml index bc8acc07..5b85fc67 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-27 diff --git a/test/data/grooves/ENDING01.musicxml b/test/data/grooves/ENDING01.musicxml index 7c627948..7d8dd82c 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-27 diff --git a/test/data/grooves/ENDING02.musicxml b/test/data/grooves/ENDING02.musicxml index 0d1e4f3e..4353a012 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-27 diff --git a/test/data/grooves/ENDING03.musicxml b/test/data/grooves/ENDING03.musicxml index cc8eb569..ac7d0b12 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-27 @@ -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..bf317221 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-27 diff --git a/test/data/grooves/ENDING05.musicxml b/test/data/grooves/ENDING05.musicxml index 256412bd..94f82c1d 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-27 diff --git a/test/data/grooves/ENDING06.musicxml b/test/data/grooves/ENDING06.musicxml index 015911bc..d1103125 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-27 @@ -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..2df6090d 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-27 diff --git a/test/data/grooves/EasySwing.musicxml b/test/data/grooves/EasySwing.musicxml index 457916df..13bb0e10 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-27 diff --git a/test/data/grooves/EasySwing1.musicxml b/test/data/grooves/EasySwing1.musicxml index 02043084..10271134 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-27 diff --git a/test/data/grooves/EasySwing1Fill.musicxml b/test/data/grooves/EasySwing1Fill.musicxml index 3eebc287..349d5d7e 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-27 diff --git a/test/data/grooves/EasySwing1Sus.musicxml b/test/data/grooves/EasySwing1Sus.musicxml index 1a19b685..33c7a381 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-27 diff --git a/test/data/grooves/EasySwing2.musicxml b/test/data/grooves/EasySwing2.musicxml index 75c1c1b5..c68b172b 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-27 diff --git a/test/data/grooves/EasySwing2Fill.musicxml b/test/data/grooves/EasySwing2Fill.musicxml index 365afa36..73f51cad 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-27 diff --git a/test/data/grooves/EasySwing2Sus.musicxml b/test/data/grooves/EasySwing2Sus.musicxml index 12f630db..52a4268d 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-27 diff --git a/test/data/grooves/EasySwing42.musicxml b/test/data/grooves/EasySwing42.musicxml index 58dc9792..4e51dbea 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-27 diff --git a/test/data/grooves/EasySwing42Fill.musicxml b/test/data/grooves/EasySwing42Fill.musicxml index 57554618..9ac0a3ac 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-27 diff --git a/test/data/grooves/EasySwing42Sus.musicxml b/test/data/grooves/EasySwing42Sus.musicxml index 15a19de4..0a4c1403 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-27 diff --git a/test/data/grooves/EasySwing42Walk.musicxml b/test/data/grooves/EasySwing42Walk.musicxml index 1cb82da1..aa2b13f3 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-27 diff --git a/test/data/grooves/EasySwing42WalkFill.musicxml b/test/data/grooves/EasySwing42WalkFill.musicxml index 3687ede7..c385178a 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-27 diff --git a/test/data/grooves/EasySwing42WalkSus.musicxml b/test/data/grooves/EasySwing42WalkSus.musicxml index fcc4b6fb..8109a5de 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-27 diff --git a/test/data/grooves/EasySwingEnd.musicxml b/test/data/grooves/EasySwingEnd.musicxml index dd315ca7..b65e2895 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-27 diff --git a/test/data/grooves/EasySwingFill.musicxml b/test/data/grooves/EasySwingFill.musicxml index 5d6da15e..a5744b6f 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-27 diff --git a/test/data/grooves/EasySwingIntro.musicxml b/test/data/grooves/EasySwingIntro.musicxml index e0b843e3..07626d03 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-27 diff --git a/test/data/grooves/EasySwingIntro1.musicxml b/test/data/grooves/EasySwingIntro1.musicxml index ab031524..871c657a 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-27 diff --git a/test/data/grooves/EasySwingIntro2.musicxml b/test/data/grooves/EasySwingIntro2.musicxml index bb5deb9a..d92621f8 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-27 diff --git a/test/data/grooves/EasySwingIntro3.musicxml b/test/data/grooves/EasySwingIntro3.musicxml index 0bdd819d..f65af14c 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-27 diff --git a/test/data/grooves/EasySwingSus.musicxml b/test/data/grooves/EasySwingSus.musicxml index b6f63fc3..be999528 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-27 diff --git a/test/data/grooves/EasySwingSusFill.musicxml b/test/data/grooves/EasySwingSusFill.musicxml index d7463fe6..a7a03be8 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-27 diff --git a/test/data/grooves/EasySwingWalk.musicxml b/test/data/grooves/EasySwingWalk.musicxml index a1bebbb3..f1edec4f 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-27 diff --git a/test/data/grooves/EasySwingWalkFill.musicxml b/test/data/grooves/EasySwingWalkFill.musicxml index 50939a50..d232b84a 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-27 diff --git a/test/data/grooves/EasySwingWalkSus.musicxml b/test/data/grooves/EasySwingWalkSus.musicxml index c9752931..ea87cc8d 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-27 diff --git a/test/data/grooves/ElectricPop.musicxml b/test/data/grooves/ElectricPop.musicxml index d07d4d95..308db100 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-27 diff --git a/test/data/grooves/ElectricPopEnd.musicxml b/test/data/grooves/ElectricPopEnd.musicxml index 3c8bf46f..5e39e264 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-27 @@ -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..28d0db6e 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-27 @@ -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..5c71cb42 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-27 diff --git a/test/data/grooves/Evansish1.musicxml b/test/data/grooves/Evansish1.musicxml index 28d2051b..8124d1a4 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-27 diff --git a/test/data/grooves/Evansish1Plus.musicxml b/test/data/grooves/Evansish1Plus.musicxml index 956efd21..2f94d767 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-27 diff --git a/test/data/grooves/Evansish1Sus.musicxml b/test/data/grooves/Evansish1Sus.musicxml index 10ff5240..0ef9e30a 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-27 diff --git a/test/data/grooves/Evansish1SusPlus.musicxml b/test/data/grooves/Evansish1SusPlus.musicxml index 4febe2f1..2c14b558 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-27 diff --git a/test/data/grooves/EvansishEnd.musicxml b/test/data/grooves/EvansishEnd.musicxml index 5c9a36d1..86e5b9cc 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-27 diff --git a/test/data/grooves/EvansishFill.musicxml b/test/data/grooves/EvansishFill.musicxml index 697c5374..6f60524b 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-27 diff --git a/test/data/grooves/EvansishIntro.musicxml b/test/data/grooves/EvansishIntro.musicxml index ec43bb08..42034fe1 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-27 diff --git a/test/data/grooves/EvansishPlus.musicxml b/test/data/grooves/EvansishPlus.musicxml index fed3fd6d..8df721c0 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-27 diff --git a/test/data/grooves/EvansishSus.musicxml b/test/data/grooves/EvansishSus.musicxml index 0e656699..b8980ae7 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-27 diff --git a/test/data/grooves/EvansishSusPlus.musicxml b/test/data/grooves/EvansishSusPlus.musicxml index 3a7860f2..a03187cb 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-27 diff --git a/test/data/grooves/FUNK01.musicxml b/test/data/grooves/FUNK01.musicxml index 499595be..10fbb5e6 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-27 diff --git a/test/data/grooves/FUNK02.musicxml b/test/data/grooves/FUNK02.musicxml index abcc0724..9ac13802 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-27 diff --git a/test/data/grooves/FUNK03.musicxml b/test/data/grooves/FUNK03.musicxml index 906eb94f..b554eeff 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-27 diff --git a/test/data/grooves/FUNK04.musicxml b/test/data/grooves/FUNK04.musicxml index f9099816..d7f03f19 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-27 diff --git a/test/data/grooves/FUNK05.musicxml b/test/data/grooves/FUNK05.musicxml index 58b857af..b61bcdf4 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-27 diff --git a/test/data/grooves/FUNK06.musicxml b/test/data/grooves/FUNK06.musicxml index 3b599b93..9aaeae73 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-27 @@ -208,15 +208,13 @@ E 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -271,70 +269,6 @@ - - - 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 @@ -355,116 +289,12 @@ 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 - - @@ -472,10 +302,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal @@ -501,50 +331,12 @@ 4 192 - 1 16th up normal - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - @@ -552,15 +344,13 @@ E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -568,49 +358,41 @@ E 4 - 96 - + 192 1 - 32nd + 16th up normal - - + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - - + E 4 - 6 - + 384 1 - 512th + eighth up normal - @@ -627,555 +409,65 @@ - - - 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 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - 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 - + 384 1 - 1024th + eighth up normal - - + E 4 - 96 + 48 + 1 - 32nd + 64th up normal + - + E 4 - 24 + 12 1 - 128th + 256th up normal @@ -1183,16 +475,16 @@ - + E 4 - 6 + 3 1 - 512th + 1024th up normal @@ -1232,67 +524,55 @@ E 4 - 192 - + 384 1 - 16th + eighth up normal - - + E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - - + E 4 - 3 - + 384 1 - 1024th + eighth up normal - @@ -1300,15 +580,13 @@ E 4 - 96 - + 192 1 - 32nd + 16th up normal - @@ -1316,33 +594,27 @@ E 4 - 24 - - + 192 1 - 128th + 16th up normal - - - + E 4 - 6 - + 384 1 - 512th + eighth up normal - @@ -1535,98 +807,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 + + @@ -1634,23 +833,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1715,98 +923,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 +949,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..afd70970 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-27 @@ -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..ac16dad0 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-27 diff --git a/test/data/grooves/FUNK09.musicxml b/test/data/grooves/FUNK09.musicxml index f6a175c1..a8f31b68 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-27 diff --git a/test/data/grooves/FUNK10.musicxml b/test/data/grooves/FUNK10.musicxml index e0446c35..883ce373 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-27 diff --git a/test/data/grooves/FUNK11.musicxml b/test/data/grooves/FUNK11.musicxml index 7adc4276..3ca0467b 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-27 diff --git a/test/data/grooves/FUNK12.musicxml b/test/data/grooves/FUNK12.musicxml index 73edbb31..23d1e084 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-27 diff --git a/test/data/grooves/FUS01.musicxml b/test/data/grooves/FUS01.musicxml index 3429766e..047733dd 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-27 @@ -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..6875f9a8 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-27 diff --git a/test/data/grooves/FUS03.musicxml b/test/data/grooves/FUS03.musicxml index d74d1e2f..c3a28222 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-27 diff --git a/test/data/grooves/FUS04.musicxml b/test/data/grooves/FUS04.musicxml index 62a6a15f..3acb2320 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-27 diff --git a/test/data/grooves/FUS05.musicxml b/test/data/grooves/FUS05.musicxml index 8ee35ce6..47472d46 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-27 diff --git a/test/data/grooves/FUS06.musicxml b/test/data/grooves/FUS06.musicxml index ec663f37..8a673673 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-27 diff --git a/test/data/grooves/FUS07.musicxml b/test/data/grooves/FUS07.musicxml index b0228ea3..b25afb2c 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-27 @@ -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..21db2131 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-27 diff --git a/test/data/grooves/FastBigBand.musicxml b/test/data/grooves/FastBigBand.musicxml index a7f283ad..5536bd28 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-27 @@ -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..71f73eda 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-27 diff --git a/test/data/grooves/FastBigBandIntro.musicxml b/test/data/grooves/FastBigBandIntro.musicxml index 137af7e0..10da7de4 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-27 @@ -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..374796f0 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-27 diff --git a/test/data/grooves/FastBlues1.musicxml b/test/data/grooves/FastBlues1.musicxml index 376695b8..68da5a5c 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-27 diff --git a/test/data/grooves/FastBlues1Sus.musicxml b/test/data/grooves/FastBlues1Sus.musicxml index 398e48a9..6baf908a 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-27 diff --git a/test/data/grooves/FastBluesEnd.musicxml b/test/data/grooves/FastBluesEnd.musicxml index 80eb193f..a69a2d27 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-27 @@ -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..141fa50d 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-27 diff --git a/test/data/grooves/FastBluesWalk.musicxml b/test/data/grooves/FastBluesWalk.musicxml index e39b64fa..7bd8be69 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-27 diff --git a/test/data/grooves/FastBluesWalkSus.musicxml b/test/data/grooves/FastBluesWalkSus.musicxml index 2773a7ab..589844b7 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-27 diff --git a/test/data/grooves/FastJazzWaltz.musicxml b/test/data/grooves/FastJazzWaltz.musicxml index d1f08f83..0c1bafea 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-27 diff --git a/test/data/grooves/FastJazzWaltz1.musicxml b/test/data/grooves/FastJazzWaltz1.musicxml index 5270c17c..d59fc632 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-27 diff --git a/test/data/grooves/FastJazzWaltz1End.musicxml b/test/data/grooves/FastJazzWaltz1End.musicxml index cf103174..68281353 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-27 diff --git a/test/data/grooves/FastJazzWaltz1Sus.musicxml b/test/data/grooves/FastJazzWaltz1Sus.musicxml index 84085fe3..c643747a 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-27 diff --git a/test/data/grooves/FastJazzWaltz2.musicxml b/test/data/grooves/FastJazzWaltz2.musicxml index f7f618e6..bd849cf5 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-27 diff --git a/test/data/grooves/FastJazzWaltz2Sus.musicxml b/test/data/grooves/FastJazzWaltz2Sus.musicxml index bff9df47..297a8894 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-27 diff --git a/test/data/grooves/FastJazzWaltzEnd.musicxml b/test/data/grooves/FastJazzWaltzEnd.musicxml index 296a99fb..3c86bfb3 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-27 diff --git a/test/data/grooves/FastJazzWaltzFill.musicxml b/test/data/grooves/FastJazzWaltzFill.musicxml index abf1140d..82262cad 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-27 diff --git a/test/data/grooves/FastJazzWaltzIntro.musicxml b/test/data/grooves/FastJazzWaltzIntro.musicxml index 889e3233..fa9e5150 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-27 @@ -660,206 +660,7 @@ - - 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 - - - - - - - F - 5 - - 48 - - - 1 - 64th - up - x - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - - - 1 - 1024th - up - x - - - - - + F 5 @@ -892,184 +693,28 @@ F 5 - 189 - - 1 - 32nd - - - - - - up - x - - - - - - F - 5 - - 48 - + 128 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 - - - - - - - F - 5 - - 48 - - - 1 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1077,17 +722,18 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1095,15 +741,19 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1120,25 +770,6 @@ - - - F - 5 - - 189 - - 1 - 32nd - - - - - - up - x - - - F @@ -1154,38 +785,18 @@ + F 5 - 189 - - 1 - 32nd - - - - - - up - x - - - - - - F - 5 - - 48 - + 192 1 - 64th + 16th up x - @@ -1193,17 +804,13 @@ F 5 - 12 - - + 192 1 - 256th + 16th up x - - @@ -1211,15 +818,28 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1227,15 +847,18 @@ F 5 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -1243,17 +866,19 @@ F 5 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -1261,15 +886,13 @@ F 5 - 6 - + 192 1 - 512th + 16th up x - @@ -1277,33 +900,28 @@ F 5 - 96 - + 192 1 - 32nd + 16th up x - + F 5 - 24 - - + 192 1 - 128th + 16th up x - - @@ -1311,15 +929,13 @@ F 5 - 6 - + 192 1 - 512th + 16th up x - @@ -1327,15 +943,28 @@ F 5 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1343,17 +972,18 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1361,15 +991,19 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1386,25 +1020,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..031dc4f2 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-27 @@ -1240,206 +1240,7 @@ - - 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 - - - - - - - F - 5 - - 48 - - - 1 - 64th - up - x - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - - - 1 - 1024th - up - x - - - - - + F 5 @@ -1472,184 +1273,28 @@ F 5 - 189 - - 1 - 32nd - - - - - - up - x - - - - - - F - 5 - - 48 - + 128 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 - - - - - - - F - 5 - - 48 - - - 1 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1657,17 +1302,18 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1675,15 +1321,19 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1700,25 +1350,6 @@ - - - F - 5 - - 189 - - 1 - 32nd - - - - - - up - x - - - F @@ -1734,38 +1365,18 @@ + F 5 - 189 - - 1 - 32nd - - - - - - up - x - - - - - - F - 5 - - 48 - + 192 1 - 64th + 16th up x - @@ -1773,17 +1384,13 @@ F 5 - 12 - - + 192 1 - 256th + 16th up x - - @@ -1791,15 +1398,28 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1807,15 +1427,18 @@ F 5 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -1823,17 +1446,19 @@ F 5 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -1841,15 +1466,13 @@ F 5 - 6 - + 192 1 - 512th + 16th up x - @@ -1857,33 +1480,28 @@ F 5 - 96 - + 192 1 - 32nd + 16th up x - + F 5 - 24 - - + 192 1 - 128th + 16th up x - - @@ -1891,15 +1509,13 @@ F 5 - 6 - + 192 1 - 512th + 16th up x - @@ -1907,15 +1523,28 @@ F 5 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1923,17 +1552,18 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1941,15 +1571,19 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1966,25 +1600,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..dc120fdd 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-27 diff --git a/test/data/grooves/FastSwing.musicxml b/test/data/grooves/FastSwing.musicxml index 2f69aa6e..57fa8c14 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-27 @@ -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..928eacc2 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-27 diff --git a/test/data/grooves/FastSwingIntro.musicxml b/test/data/grooves/FastSwingIntro.musicxml index bfa2e554..f26e498f 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-27 @@ -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..433aa614 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-27 @@ -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..68f6dd99 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-27 @@ -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..8e668ac6 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-27 @@ -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..612421c8 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-27 @@ -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..2538727b 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-27 diff --git a/test/data/grooves/FastWaltzEnd.musicxml b/test/data/grooves/FastWaltzEnd.musicxml index e4f7e0ee..54ea467b 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-27 diff --git a/test/data/grooves/FastWaltzIntro.musicxml b/test/data/grooves/FastWaltzIntro.musicxml index d32d56e3..c84ea9fa 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-27 diff --git a/test/data/grooves/FastWaltzIntro8.musicxml b/test/data/grooves/FastWaltzIntro8.musicxml index 664c83fa..89b4dad3 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-27 diff --git a/test/data/grooves/FastWaltzPlus.musicxml b/test/data/grooves/FastWaltzPlus.musicxml index 554e4054..5ff2a03a 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-27 diff --git a/test/data/grooves/FastWaltzSus.musicxml b/test/data/grooves/FastWaltzSus.musicxml index f76f17d6..2f5cb3a2 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-27 diff --git a/test/data/grooves/FastWaltzSusPlus.musicxml b/test/data/grooves/FastWaltzSusPlus.musicxml index ebd1867b..cc182656 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-27 diff --git a/test/data/grooves/FastWaltzWalk.musicxml b/test/data/grooves/FastWaltzWalk.musicxml index 1ddb54c5..03bdd5c6 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-27 diff --git a/test/data/grooves/FastWaltzWalkPlus.musicxml b/test/data/grooves/FastWaltzWalkPlus.musicxml index eb52708c..5764a720 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-27 diff --git a/test/data/grooves/FastWaltzWalkSus.musicxml b/test/data/grooves/FastWaltzWalkSus.musicxml index 9d640f04..9e72ac1a 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-27 diff --git a/test/data/grooves/FastWaltzWalkSusPlus.musicxml b/test/data/grooves/FastWaltzWalkSusPlus.musicxml index 9270a39e..aeb00db6 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-27 diff --git a/test/data/grooves/Folk.musicxml b/test/data/grooves/Folk.musicxml index cff4f6b3..8519d6ee 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-27 diff --git a/test/data/grooves/FolkArticulated.musicxml b/test/data/grooves/FolkArticulated.musicxml index 6c03e09e..2a60c802 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-27 diff --git a/test/data/grooves/FolkArticulatedSus.musicxml b/test/data/grooves/FolkArticulatedSus.musicxml index 08d47ad9..d0a73558 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-27 diff --git a/test/data/grooves/FolkEnd.musicxml b/test/data/grooves/FolkEnd.musicxml index 8dfaad0b..4fa6cfe3 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-27 diff --git a/test/data/grooves/FolkIntro.musicxml b/test/data/grooves/FolkIntro.musicxml index a7651881..0dc2bfeb 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-27 diff --git a/test/data/grooves/FolkRock.musicxml b/test/data/grooves/FolkRock.musicxml index 0fd4127b..6f464ec1 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-27 diff --git a/test/data/grooves/FolkRockEnd.musicxml b/test/data/grooves/FolkRockEnd.musicxml index 3d3450cc..2af3d6aa 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-27 diff --git a/test/data/grooves/FolkRockFill.musicxml b/test/data/grooves/FolkRockFill.musicxml index 6d6528eb..91a5b88a 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-27 diff --git a/test/data/grooves/FolkRockIntro.musicxml b/test/data/grooves/FolkRockIntro.musicxml index da7fd7d8..8dcba633 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-27 diff --git a/test/data/grooves/FolkRockPlus.musicxml b/test/data/grooves/FolkRockPlus.musicxml index 073afa27..d227b360 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-27 diff --git a/test/data/grooves/FolkRockSus.musicxml b/test/data/grooves/FolkRockSus.musicxml index c281bd00..f1a7ed20 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-27 diff --git a/test/data/grooves/FolkRockSusPlus.musicxml b/test/data/grooves/FolkRockSusPlus.musicxml index 6b9d9cd2..8d6b9a00 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-27 diff --git a/test/data/grooves/FolkSus.musicxml b/test/data/grooves/FolkSus.musicxml index 69734355..d82341fa 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-27 diff --git a/test/data/grooves/FolkWalk.musicxml b/test/data/grooves/FolkWalk.musicxml index 7e799df2..0efd9d74 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-27 diff --git a/test/data/grooves/FolkyJazzGuitar.musicxml b/test/data/grooves/FolkyJazzGuitar.musicxml index 5ea69f37..63fd0ed8 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-27 diff --git a/test/data/grooves/FolkyJazzGuitarEnd.musicxml b/test/data/grooves/FolkyJazzGuitarEnd.musicxml index 51502ca7..9cffa215 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-27 diff --git a/test/data/grooves/FolkyJazzGuitarIntro.musicxml b/test/data/grooves/FolkyJazzGuitarIntro.musicxml index ec45cf7a..c512cc65 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-27 diff --git a/test/data/grooves/FolkyJazzGuitarPlus.musicxml b/test/data/grooves/FolkyJazzGuitarPlus.musicxml index fd044e70..7fb7620d 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-27 diff --git a/test/data/grooves/FolkyJazzGuitarSus.musicxml b/test/data/grooves/FolkyJazzGuitarSus.musicxml index f198d727..caf91edb 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-27 diff --git a/test/data/grooves/FolkyJazzGuitarSusPlus.musicxml b/test/data/grooves/FolkyJazzGuitarSusPlus.musicxml index 2d4efd9d..d4ee0fa2 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-27 diff --git a/test/data/grooves/FolkyJazzPiano.musicxml b/test/data/grooves/FolkyJazzPiano.musicxml index 9e2aaec4..c9e5577d 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-27 diff --git a/test/data/grooves/FolkyJazzPianoEnd.musicxml b/test/data/grooves/FolkyJazzPianoEnd.musicxml index 6081ba8c..41dd71b5 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-27 diff --git a/test/data/grooves/FolkyJazzPianoIntro.musicxml b/test/data/grooves/FolkyJazzPianoIntro.musicxml index c64902e9..00d2bac1 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-27 diff --git a/test/data/grooves/FolkyJazzPianoPlus.musicxml b/test/data/grooves/FolkyJazzPianoPlus.musicxml index 12e4bf07..456fc6d4 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-27 diff --git a/test/data/grooves/FolkyJazzPianoSus.musicxml b/test/data/grooves/FolkyJazzPianoSus.musicxml index 873c01b8..069df6f4 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-27 diff --git a/test/data/grooves/FolkyJazzPianoSusPlus.musicxml b/test/data/grooves/FolkyJazzPianoSusPlus.musicxml index 3a766ec4..e0ea7edb 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-27 diff --git a/test/data/grooves/Forro-Miranda.musicxml b/test/data/grooves/Forro-Miranda.musicxml index 5462acff..b55db08c 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-27 diff --git a/test/data/grooves/FoxTrot1End.musicxml b/test/data/grooves/FoxTrot1End.musicxml index 8579f75c..f362bda3 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-27 diff --git a/test/data/grooves/FoxTrot1Intro.musicxml b/test/data/grooves/FoxTrot1Intro.musicxml index 733576a5..557be367 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-27 diff --git a/test/data/grooves/FoxTrot1Plus.musicxml b/test/data/grooves/FoxTrot1Plus.musicxml index 8cec7173..7617f88a 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-27 diff --git a/test/data/grooves/FoxTrot1Sus.musicxml b/test/data/grooves/FoxTrot1Sus.musicxml index 62fa35a7..f32a4c78 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-27 diff --git a/test/data/grooves/FoxTrot1SusPlus.musicxml b/test/data/grooves/FoxTrot1SusPlus.musicxml index 2389ecdb..f30a9511 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-27 diff --git a/test/data/grooves/FoxTrotEnd.musicxml b/test/data/grooves/FoxTrotEnd.musicxml index 7894f420..38c3dad1 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-27 diff --git a/test/data/grooves/FoxTrotIntro.musicxml b/test/data/grooves/FoxTrotIntro.musicxml index be27ace6..c0f07156 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-27 diff --git a/test/data/grooves/FoxTrotPlus.musicxml b/test/data/grooves/FoxTrotPlus.musicxml index 197ad50b..27815c46 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-27 diff --git a/test/data/grooves/FoxTrotSusPlus.musicxml b/test/data/grooves/FoxTrotSusPlus.musicxml index d0afd756..67980888 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-27 diff --git a/test/data/grooves/Foxtrot.musicxml b/test/data/grooves/Foxtrot.musicxml index 49c5057d..dbc588b4 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-27 @@ -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..37f64c6c 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-27 diff --git a/test/data/grooves/FoxtrotFill.musicxml b/test/data/grooves/FoxtrotFill.musicxml index d3f04166..5e34dc6a 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-27 diff --git a/test/data/grooves/FoxtrotIntro.musicxml b/test/data/grooves/FoxtrotIntro.musicxml index a8885023..532a5d0e 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-27 @@ -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..8d4858aa 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-27 diff --git a/test/data/grooves/FrenchWaltz.musicxml b/test/data/grooves/FrenchWaltz.musicxml index 834976e3..b1e35c47 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-27 diff --git a/test/data/grooves/FrenchWaltz1.musicxml b/test/data/grooves/FrenchWaltz1.musicxml index 66fabc80..b1e6921f 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-27 diff --git a/test/data/grooves/FrenchWaltz1End.musicxml b/test/data/grooves/FrenchWaltz1End.musicxml index fc632f35..375e406c 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-27 diff --git a/test/data/grooves/FrenchWaltz1Fill.musicxml b/test/data/grooves/FrenchWaltz1Fill.musicxml index 162cc390..4bfc9b34 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-27 diff --git a/test/data/grooves/FrenchWaltz1FillSus.musicxml b/test/data/grooves/FrenchWaltz1FillSus.musicxml index ae5de490..d7b09ac6 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-27 diff --git a/test/data/grooves/FrenchWaltz1Sus.musicxml b/test/data/grooves/FrenchWaltz1Sus.musicxml index bc7eb1cd..bb44d975 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-27 diff --git a/test/data/grooves/FrenchWaltz2.musicxml b/test/data/grooves/FrenchWaltz2.musicxml index 8fadd1ca..ca62c7d4 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-27 diff --git a/test/data/grooves/FrenchWaltz2Fill.musicxml b/test/data/grooves/FrenchWaltz2Fill.musicxml index 20a63f61..446415da 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-27 diff --git a/test/data/grooves/FrenchWaltz2FillSus.musicxml b/test/data/grooves/FrenchWaltz2FillSus.musicxml index a35a3108..9d1eebd4 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-27 diff --git a/test/data/grooves/FrenchWaltz2Sus.musicxml b/test/data/grooves/FrenchWaltz2Sus.musicxml index 55d32cf7..7e8595d2 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-27 diff --git a/test/data/grooves/FrenchWaltz3.musicxml b/test/data/grooves/FrenchWaltz3.musicxml index 90e2a636..f998243d 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-27 diff --git a/test/data/grooves/FrenchWaltz3Fill.musicxml b/test/data/grooves/FrenchWaltz3Fill.musicxml index 2ef976ab..bd088b50 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-27 diff --git a/test/data/grooves/FrenchWaltz3FillSus.musicxml b/test/data/grooves/FrenchWaltz3FillSus.musicxml index ed2e066b..4222986a 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-27 diff --git a/test/data/grooves/FrenchWaltz3Sus.musicxml b/test/data/grooves/FrenchWaltz3Sus.musicxml index 4ff6ef45..16177545 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-27 diff --git a/test/data/grooves/FrenchWaltzEnd.musicxml b/test/data/grooves/FrenchWaltzEnd.musicxml index d40ba189..f446e093 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-27 diff --git a/test/data/grooves/FrenchWaltzIntro.musicxml b/test/data/grooves/FrenchWaltzIntro.musicxml index 81d5ed7e..933ff4e4 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-27 diff --git a/test/data/grooves/FrenchWaltzSus.musicxml b/test/data/grooves/FrenchWaltzSus.musicxml index 22300ae8..083aa1ff 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-27 diff --git a/test/data/grooves/Funk1.musicxml b/test/data/grooves/Funk1.musicxml index 6de31313..8489258e 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-27 @@ -646,15 +646,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -709,56 +707,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - G @@ -792,51 +740,41 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -844,31 +782,27 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -876,33 +810,27 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -933,20 +861,20 @@ + + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1001,20 +929,18 @@ - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -1022,33 +948,27 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -1084,67 +1004,27 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - + 384 3 - 256th + eighth up x - - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -1152,52 +1032,45 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 384 3 - 128th + eighth up x - - - + G 5 - 6 - - + 192 + 3 - 512th + 16th up - x + circle-x - + G 5 @@ -1226,21 +1099,19 @@ - + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1295,20 +1166,18 @@ - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -1316,33 +1185,27 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -1378,51 +1241,41 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -1430,1177 +1283,13 @@ G 5 - 3 - + 384 3 - 1024th + 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 - - 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 - - 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 - - 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 - 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 - - 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 - - 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 - - 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 - - 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 - - @@ -2631,20 +1320,20 @@ + + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -2699,56 +1388,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - G @@ -2782,117 +1421,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 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up x - @@ -2928,83 +1463,27 @@ 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 - 96 - + 192 3 - 32nd + 16th up x - @@ -3012,33 +1491,27 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - diff --git a/test/data/grooves/Funk1End.musicxml b/test/data/grooves/Funk1End.musicxml index 8882454c..b2037b3d 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-27 @@ -433,6 +433,21 @@ + + + + G + 5 + + 384 + + 3 + eighth + up + x + + + G @@ -440,6 +455,7 @@ 48 + 3 64th @@ -447,6 +463,7 @@ x + @@ -483,38 +500,33 @@ - + G 5 - 96 - - + 192 + 3 - 32nd + 16th up - x + circle-x - - + + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -522,15 +534,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -538,11 +548,11 @@ G 5 - 96 + 192 3 - 32nd + 16th up circle-x @@ -554,12 +564,12 @@ G 5 - 24 + 48 3 - 128th + 64th up circle-x @@ -568,38 +578,6 @@ - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - G 5 @@ -607,60 +585,46 @@ 12 - + 3 256th up - x + circle-x - + G 5 3 - + 3 1024th up - x + circle-x - + G 5 - 192 + 384 3 - 16th + eighth up x - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - G @@ -668,6 +632,7 @@ 48 + 3 64th @@ -675,6 +640,7 @@ x + @@ -711,38 +677,33 @@ - + G 5 - 96 - - + 192 + 3 - 32nd + 16th up - x + circle-x - - + + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -750,15 +711,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -766,11 +725,11 @@ G 5 - 96 + 192 3 - 32nd + 16th up circle-x @@ -782,12 +741,12 @@ G 5 - 24 + 48 3 - 128th + 64th up circle-x @@ -796,38 +755,6 @@ - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - G 5 @@ -835,60 +762,46 @@ 12 - + 3 256th up - x + circle-x - + G 5 3 - + 3 1024th up - x + circle-x - + G 5 - 192 + 384 3 - 16th + eighth up x - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - G @@ -896,6 +809,7 @@ 48 + 3 64th @@ -903,6 +817,7 @@ x + @@ -939,38 +854,33 @@ - + G 5 - 96 - - + 192 + 3 - 32nd + 16th up - x + circle-x - - + + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -978,15 +888,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -994,11 +902,11 @@ G 5 - 96 + 192 3 - 32nd + 16th up circle-x @@ -1010,12 +918,12 @@ G 5 - 24 + 48 3 - 128th + 64th up circle-x @@ -1024,38 +932,6 @@ - - G - 5 - - 6 - - - 3 - 512th - up - circle-x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - G 5 @@ -1063,60 +939,46 @@ 12 - + 3 256th up - x + circle-x - + G 5 3 - + 3 1024th up - x + circle-x - + G 5 - 192 + 384 3 - 16th + eighth up x - - - G - 5 - - 192 - - 3 - 16th - up - circle-x - - - G @@ -1124,6 +986,7 @@ 48 + 3 64th @@ -1131,6 +994,7 @@ x + @@ -1167,154 +1031,33 @@ - - - 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 - + 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 +1247,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..67929b29 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-27 @@ -602,1200 +602,23 @@ 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 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 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - + 384 + 3 - 512th + eighth up - circle-x + x - - + G 5 48 + 3 64th @@ -1803,9 +626,10 @@ x + - + G 5 @@ -1823,7 +647,7 @@ - + G 5 @@ -1839,7 +663,7 @@ - + G 5 @@ -1853,22 +677,18 @@ - - - + G 5 192 - 3 16th up x - @@ -1876,35 +696,41 @@ G 5 - 48 - - + 384 3 - 64th + eighth up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th + up + x + + + + + + G + 5 + + 192 + + 3 + 16th up x - - @@ -1912,31 +738,27 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -1944,33 +766,27 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -2001,20 +817,20 @@ + + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -2069,20 +885,18 @@ - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -2090,33 +904,27 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -2148,37 +956,45 @@ + + G + 5 + + 384 + + 3 + eighth + up + x + + + + G 5 192 - 3 16th up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - @@ -2186,33 +1002,42 @@ G 5 - 12 - - + 384 3 - 256th + eighth up x - - - + G 5 - 3 - + 192 + + 3 + 16th + up + circle-x + + + + + + + G + 5 + + 192 3 - 1024th + 16th up x - @@ -2220,28 +1045,60 @@ G 5 - 96 + 192 + + 3 + 16th + up + x + + + + + + + + G + 5 + + 384 + + 3 + eighth + up + x + + + + + + G + 5 + + 48 + 3 - 32nd + 64th up x + - + G 5 - 24 + 12 3 - 128th + 256th up x @@ -2249,16 +1106,16 @@ - + G 5 - 6 + 3 3 - 512th + 1024th up x @@ -2298,51 +1155,41 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -2350,31 +1197,27 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -2382,33 +1225,27 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -3106,15 +1943,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..95da7b1f 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-27 @@ -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..2f9bc64c 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-27 diff --git a/test/data/grooves/Funk2Intro.musicxml b/test/data/grooves/Funk2Intro.musicxml index d6d2d5fa..0a0ef9d2 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-27 @@ -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..9166d95c 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-27 @@ -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,1287 +428,38 @@ E 4 - 6 - + 512 - 2 - 512th - up - square - - - - - - - - - - 768 - - - percussion - - - 5 - - - - - 768 - 2 - quarter - - - - - - E - 5 - - 768 - - 2 - quarter - up - triangle - - - - - - E - 5 - - 768 - - 2 - quarter - up - triangle - - - - - - E - 5 - - 768 - - 2 - quarter - up - triangle - - - - - 3072 - - - - 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 - 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 - - 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 - - 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 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - - - 768 - 2 - quarter - - - - - - E - 5 - - 768 - - 2 - quarter - up - triangle - - - - - - E - 5 - - 768 - - 2 - quarter - up - triangle - - - - - - E - 5 - - 576 - - 2 - eighth - - up - triangle - - - - - - E - 5 - - 192 - - 2 - 16th - up - triangle - - - - - 3072 - - - - 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 - 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 - - 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 - - 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 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th + 2 + quarter + + 3 + 2 + quarter + up - x + square + - + + + + + 768 + + + percussion + + + 5 + + 768 @@ -1895,7 +468,7 @@ - + E 5 @@ -1909,7 +482,7 @@ - + E 5 @@ -1923,26 +496,32 @@ - - + + + E + 5 + 768 + 2 quarter + up + triangle 3072 - + G 5 - 192 + 384 3 - 16th + eighth up x @@ -1955,6 +534,7 @@ 48 + 3 64th @@ -1962,6 +542,7 @@ x + @@ -1998,56 +579,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - G @@ -2194,107 +725,232 @@ - + G 5 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - - + G 5 - 48 - + 192 + + 3 + 16th + up + x + + + + + + G + 5 + + 192 + + 3 + 16th + up + x + + + + + + G + 5 + + 384 + + 3 + eighth + up + circle-x + + + + + + G + 5 + + 192 + + 3 + 16th + up + x + + + + + + G + 5 + + 192 + + 3 + 16th + up + x + + + + + + + + 768 + 2 + quarter + + + + + + E + 5 + + 768 + + 2 + quarter + up + triangle + + + + + + E + 5 + + 768 + + 2 + quarter + up + triangle + + + + + + E + 5 + + 576 + + 2 + eighth + + up + triangle + + + + + + E + 5 + + 192 + + 2 + 16th + up + triangle + + + + + 3072 + + + + G + 5 + + 192 3 - 64th + 16th up x - - + + G 5 - 12 - - + 384 3 - 256th + eighth up x - - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - - + G 5 @@ -2308,23 +964,23 @@ - + G 5 192 - + 3 16th up - x + circle-x - + G 5 @@ -2332,17 +988,17 @@ 48 - + 3 64th up - x + circle-x - + G 5 @@ -2350,33 +1006,33 @@ 12 - + 3 256th up - x + circle-x - + G 5 3 - + 3 1024th up - x + circle-x - + G 5 @@ -2392,7 +1048,7 @@ - + G 5 @@ -2410,7 +1066,7 @@ - + G 5 @@ -2426,6 +1082,48 @@ + + + G + 5 + + 192 + + 3 + 16th + up + x + + + + + + G + 5 + + 192 + + 3 + 16th + up + x + + + + + + G + 5 + + 384 + + 3 + eighth + up + x + + + G @@ -2497,7 +1195,7 @@ - + 768 @@ -2506,7 +1204,7 @@ - + E 5 @@ -2520,7 +1218,7 @@ - + E 5 @@ -2534,17 +1232,11 @@ - - - E - 5 - + + 768 - 2 quarter - up - triangle @@ -2566,22 +1258,83 @@ + + + G + 5 + + 384 + + 3 + eighth + up + x + + + + + + G + 5 + + 192 + + 3 + 16th + up + x + + + + + + 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 @@ -2589,33 +1342,33 @@ 12 - + 3 256th up - x + circle-x - + G 5 3 - + 3 1024th up - x + circle-x - + G 5 @@ -2631,7 +1384,7 @@ - + G 5 @@ -2649,7 +1402,7 @@ - + G 5 @@ -2665,7 +1418,7 @@ - + G 5 @@ -2679,7 +1432,7 @@ - + G 5 @@ -2693,225 +1446,189 @@ - + G 5 - 192 - - + 384 + 3 - 16th + eighth up - circle-x + x - - + G 5 - 48 - - - + 192 + 3 - 64th + 16th up - circle-x + x - - - + G 5 - 12 - - - + 192 + 3 - 256th + 16th up - circle-x + x - - - + G 5 - 3 - + 384 3 - 1024th + eighth up circle-x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 192 3 - 512th + 16th up x - - + + + + + 768 + 2 + quarter + + + + - G + E 5 - 96 - - - 3 - 32nd + 768 + + 2 + quarter up - x + triangle - - + - G + E 5 - 24 - - - - 3 - 128th + 768 + + 2 + quarter up - x + triangle - - - + - G + E 5 - 6 - - - 3 - 512th + 768 + + 2 + quarter up - x + triangle - - + + 3072 + + G 5 - 48 - + 192 3 - 64th + 16th up x - - + + G 5 - 12 - - + 384 3 - 256th + eighth up x - - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - - + G 5 @@ -2925,23 +1642,23 @@ - + G 5 192 - + 3 16th up - x + circle-x - + G 5 @@ -2949,17 +1666,17 @@ 48 - + 3 64th up - x + circle-x - + G 5 @@ -2967,33 +1684,33 @@ 12 - + 3 256th up - x + circle-x - + G 5 3 - + 3 1024th up - x + circle-x - + G 5 @@ -3009,7 +1726,7 @@ - + G 5 @@ -3027,7 +1744,7 @@ - + G 5 @@ -3043,6 +1760,48 @@ + + + G + 5 + + 192 + + 3 + 16th + up + x + + + + + + G + 5 + + 192 + + 3 + 16th + up + x + + + + + + G + 5 + + 384 + + 3 + eighth + up + x + + + G @@ -3140,128 +1899,53 @@ 1 eighth - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - down - normal - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - down - normal - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th + down + normal - - - - - 12 - - + + + F + 4 + + 192 + 1 - 256th + 16th + down + normal - - - 3 - + 384 1 - 1024th + eighth - - + F 4 - 288 - + 384 1 - 16th - + eighth down normal - + + + + + 384 + 1 + eighth + @@ -3269,17 +1953,36 @@ F 4 - 24 - - + 384 1 - 128th + eighth down normal - - + + + + + 256 + 1 + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -3287,15 +1990,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -3303,13 +2009,19 @@ F 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + down normal + @@ -3478,98 +2190,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 + + @@ -3577,15 +2216,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -3679,98 +2322,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 + + @@ -3778,15 +2348,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + diff --git a/test/data/grooves/FusionEnd.musicxml b/test/data/grooves/FusionEnd.musicxml index 10fe98c3..449c810d 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-27 @@ -412,15 +412,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -475,56 +473,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - G @@ -671,107 +619,7 @@ - - - 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 @@ -785,20 +633,18 @@ - + G 5 192 - 3 16th up x - @@ -806,101 +652,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 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up x - @@ -1031,121 +789,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..f8d8db13 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-27 @@ -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 - + @@ -650,15 +563,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -713,56 +624,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - G @@ -909,107 +770,91 @@ - + G 5 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - - + G 5 - 48 - + 192 3 - 64th + 16th up x - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - - + G 5 - 3 - - + 384 + 3 - 1024th + eighth up - x + circle-x - - + G 5 @@ -1023,213 +868,39 @@ - + G 5 192 - 3 16th up x - - - - G - 5 - - 48 - - - - 3 - 64th - up - x + + + + + 768 + 2 + quarter - - - - - 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 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - - - 768 - 2 - quarter - - - - - - 768 - 2 - quarter - - - - + + + 768 + 2 + quarter + + + + E 5 @@ -1275,103 +946,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 - + 384 3 - 512th + eighth up x - @@ -1520,253 +1106,7 @@ - - - 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 - - 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 @@ -1780,458 +1120,197 @@ - - - G - 5 - - 384 - - 3 - eighth - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - - - 768 - 2 - quarter - - - - - - E - 5 - - 768 - - 2 - quarter - up - triangle - - - - - - E - 5 - - 768 - - 2 - quarter - up - triangle - - - - - - 768 - 2 - quarter - - - - - 3072 - - - - 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 - circle-x - - - - - - - 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 + x - - + G 5 - 96 - + 384 3 - 32nd + eighth up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 192 3 - 512th + 16th up x - - + G 5 - 96 - - + 384 + 3 - 32nd + eighth up - x + circle-x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 192 3 - 512th + 16th up x - - + + + + + 768 + 2 + quarter + + + + + + E + 5 + + 768 + + 2 + quarter + up + triangle + + + + + + E + 5 + + 768 + + 2 + quarter + up + triangle + + + + + + 768 + 2 + quarter + + + + + 3072 + + G 5 - 48 - + 192 3 - 64th + 16th up x - - + + G 5 - 12 - - + 384 3 - 256th + eighth up x - - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - - + G 5 @@ -2245,23 +1324,23 @@ - + G 5 192 - + 3 16th up - x + circle-x - + G 5 @@ -2269,17 +1348,17 @@ 48 - + 3 64th up - x + circle-x - + G 5 @@ -2287,33 +1366,33 @@ 12 - + 3 256th up - x + circle-x - + G 5 3 - + 3 1024th up - x + circle-x - + G 5 @@ -2329,7 +1408,7 @@ - + G 5 @@ -2347,7 +1426,7 @@ - + G 5 @@ -2363,7 +1442,7 @@ - + G 5 @@ -2377,7 +1456,7 @@ - + G 5 @@ -2391,21 +1470,21 @@ - + G 5 384 - + 3 eighth up - circle-x + x - + G 5 @@ -2419,7 +1498,7 @@ - + G 5 @@ -2433,185 +1512,139 @@ - - - - - 768 - 2 - quarter - - - - - - 768 - 2 - quarter - - - - - - E - 5 - - 768 - - 2 - quarter - up - triangle - - - - - - E - 5 - - 768 - - 2 - quarter - up - triangle - - - - - 3072 - - + G 5 - 192 + 384 3 - 16th + eighth up circle-x - + G 5 - 48 - + 192 3 - 64th + 16th up x - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - - + + + + + 768 + 2 + quarter + + + + + + 768 + 2 + quarter + + + + - G + E 5 - 3 - - - 3 - 1024th + 768 + + 2 + quarter up - x + triangle - - G + E 5 - 384 - - - 3 - eighth + 768 + + 2 + quarter up - x + triangle - + + 3072 + G 5 - 96 - - - + 192 + 3 - 32nd + 16th up - x + circle-x - - - + + G 5 - 24 - - + 192 3 - 128th + 16th up x - - + G 5 - 6 - + 768 3 - 512th + quarter up x - @@ -2736,81 +1769,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 288 - - + 256 1 - 16th - - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - down - normal - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -2818,15 +1795,18 @@ F 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + down normal - @@ -2834,13 +1814,19 @@ F 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + down normal + @@ -3009,98 +1995,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 +2021,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..67ecf1e5 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-27 diff --git a/test/data/grooves/GuitarBallad1.musicxml b/test/data/grooves/GuitarBallad1.musicxml index af1b7444..07a82d2d 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-27 diff --git a/test/data/grooves/GuitarBallad1Sus.musicxml b/test/data/grooves/GuitarBallad1Sus.musicxml index e51da8f9..a4e12be7 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-27 diff --git a/test/data/grooves/GuitarBalladEnd.musicxml b/test/data/grooves/GuitarBalladEnd.musicxml index 801dcd29..9a5bf48e 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-27 diff --git a/test/data/grooves/GuitarBalladIntro.musicxml b/test/data/grooves/GuitarBalladIntro.musicxml index 8a70f5b5..c7a8e14b 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-27 diff --git a/test/data/grooves/GuitarBalladSus.musicxml b/test/data/grooves/GuitarBalladSus.musicxml index 3b7bcc17..8ff2a11b 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-27 diff --git a/test/data/grooves/GuitarBalladSusIntro.musicxml b/test/data/grooves/GuitarBalladSusIntro.musicxml index 3299e552..7cf9da40 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-27 diff --git a/test/data/grooves/HIP01.musicxml b/test/data/grooves/HIP01.musicxml index d2473e0f..71e92dd8 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-27 @@ -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..2615788b 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-27 diff --git a/test/data/grooves/HIP03.musicxml b/test/data/grooves/HIP03.musicxml index da3bed39..3b6d3cb3 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-27 @@ -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 - - 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 + + @@ -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 + @@ -643,15 +551,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -706,57 +612,21 @@ - - - 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 @@ -770,15 +640,15 @@ - + G 5 - 192 + 384 3 - 16th + eighth up x @@ -790,14 +660,12 @@ 5 192 - 3 16th up x - @@ -805,35 +673,27 @@ G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -841,15 +701,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -857,49 +715,56 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 384 3 - 128th + eighth up x - - - + G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -907,10 +772,15 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x @@ -921,29 +791,35 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + + + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1003,575 +879,13 @@ G 5 - 96 - + 192 3 - 32nd + 16th 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 - - 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 - - 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 - - @@ -1593,10 +907,10 @@ G 5 - 192 + 384 3 - 16th + eighth up x @@ -1608,116 +922,12 @@ 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 - - @@ -1739,47 +949,27 @@ G 5 - 192 + 384 3 - 16th + eighth up x - + G 5 192 - 3 16th up x - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - @@ -1787,17 +977,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -1805,65 +991,13 @@ G 5 - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up x - diff --git a/test/data/grooves/HIP04.musicxml b/test/data/grooves/HIP04.musicxml index f984527d..0909871e 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-27 @@ -217,46 +217,68 @@ - 192 - - 1 - 16th - - - - - - - 48 - - + 256 1 - 64th + eighth + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + - - - 12 - - + + + E + 4 + + 512 + 1 - 256th + quarter + + 3 + 2 + quarter + + up + normal - - + - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + @@ -264,33 +286,42 @@ E 4 - 384 - + 512 1 - eighth + quarter + + 3 + 2 + quarter + up normal - + - - - E - 4 - - 96 - - - + + + 256 1 - 32nd - up - normal + eighth + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -298,17 +329,42 @@ E 4 - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + up normal - - + + + + + + 256 + 1 + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -316,93 +372,143 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - - 192 - + 256 1 - 16th + eighth + + 3 + 2 + eighth + - + + + - 48 - - + 256 1 - 64th + eighth + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + - - - 12 - - + + + E + 4 + + 512 + 1 - 256th + quarter + + 3 + 2 + quarter + + up + normal - - + - 3 - + 256 1 - 1024th - - + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + - + E 4 - 384 - + 512 1 - eighth + quarter + + 3 + 2 + quarter + up normal - + - - - E - 4 - - 96 - - - + + + 256 1 - 32nd - up - normal + eighth + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + @@ -410,111 +516,146 @@ E 4 - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + up normal - - + - + + + 256 + 1 + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + + + + E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - - 192 - + 256 1 - 16th + eighth + + 3 + 2 + eighth + - + + + + + + + 768 + + + percussion + + + 1 + + - 48 - - + 768 1 - 64th + quarter - - - - - 12 - - + + + E + 4 + + 768 + 1 - 256th + quarter + up + normal - - - 3 - + 768 1 - 1024th + quarter - - + E 4 - 384 - - + 768 + 1 - eighth + quarter up normal - - - - E - 4 - - 96 - - - + + + + + 768 1 - 32nd - up - normal + quarter - - @@ -522,17 +663,21 @@ E 4 - 24 - - - + 768 + 1 - 128th + quarter up normal - - + + + + + 768 + 1 + quarter + @@ -540,3004 +685,504 @@ E 4 - 6 - - + 768 + 1 - 512th + quarter 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 - - - - 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 - - - - - - - - - 768 - - - percussion - - - 1 - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 768 - - 1 - quarter - up - normal - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 768 - - 1 - quarter - up - normal - - - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 768 - - 1 - quarter - up - normal - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 768 - - 1 - quarter - up - normal - - - - - - - - - 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 - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-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 - - 192 - - 3 - 16th - up - circle-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 - - 192 - - 3 - 16th - up - circle-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 - - 192 - - 3 - 16th - up - circle-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 - - 192 - - 3 - 16th - up - circle-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 - - 192 - - 3 - 16th - up - circle-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 - - 192 - - 3 - 16th - up - circle-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 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - - - - 768 - - - percussion - - - 1 - - - - - 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 - - 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 - - - - - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - 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 - - 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 - - - - - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - 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 - - 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 - - - - - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - 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 - - - - - + + + + + + 768 + + + percussion + + + 5 + + + - E - 4 + G + 5 - 192 - - - 1 - 16th + 384 + + 3 + eighth up - normal + x - - + - E - 4 + G + 5 48 - - 1 + + 3 64th up - normal + x - + - E - 4 + G + 5 12 - - 1 + + 3 256th up - normal + x - + - E - 4 + G + 5 3 - - 1 + + 3 1024th up - normal - - - - - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th + x - + - E - 4 + G + 5 192 - - 1 + + 3 16th up - normal + circle-x - - - + - E - 4 + G + 5 192 - - 1 + + 3 16th up - normal - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal + x - - - + - E - 4 + G + 5 - 3 - - - 1 - 1024th + 384 + + 3 + eighth up - normal + x - - + - E - 4 + G + 5 192 - - - 1 + + 3 16th up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal + circle-x - - - + - E - 4 + G + 5 - 12 - - - - 1 - 256th + 192 + + 3 + 16th up - normal + x - - - + - E - 4 + G + 5 - 3 - - - 1 - 1024th + 384 + + 3 + eighth up - normal + x - - - - 48 - - 1 - 64th + + + G + 5 + + 192 + + 3 + 16th + up + circle-x - - - - 12 - - - 1 - 256th + + + G + 5 + + 192 + + 3 + 16th + up + x - - - - - 3 - - 1 - 1024th + + + G + 5 + + 384 + + 3 + eighth + up + x - - + - E - 4 + G + 5 192 - - 1 + + 3 16th up - normal + circle-x - E - 4 + G + 5 192 - - 1 + + 3 16th up - normal + x - + + + - E - 4 + G + 5 + + 384 + + 3 + eighth + up + x + + + + + + G + 5 48 - - 1 + + + 3 64th up - normal + x + - + - E - 4 + G + 5 12 - - 1 + + 3 256th up - normal + x - + - E - 4 + G + 5 3 - - 1 + + 3 1024th up - normal + x - + - E - 4 + G + 5 192 - - - 1 + + 3 16th up - normal + circle-x - - + - E - 4 + G + 5 - 48 - - - - 1 - 64th + 192 + + 3 + 16th up - normal + x - - - + - E - 4 + G + 5 - 12 - - - - 1 - 256th + 384 + + 3 + eighth up - normal + x - - - + - E - 4 + G + 5 - 3 - - - 1 - 1024th + 192 + + 3 + 16th up - normal - - - - - - - 48 - - 1 - 64th + circle-x - - - - 12 - - - 1 - 256th + + + G + 5 + + 192 + + 3 + 16th + up + x - - - - - 3 - - 1 - 1024th + + + G + 5 + + 384 + + 3 + eighth + up + x - - + - E - 4 + G + 5 192 - - 1 + + 3 16th up - normal + circle-x - + - E - 4 + G + 5 192 - - 1 + + 3 16th up - normal + x - + - E - 4 + G + 5 - 48 - - - 1 - 64th + 384 + + 3 + eighth up - normal + x - - + - E - 4 + G + 5 - 12 - - - - 1 - 256th + 192 + + 3 + 16th up - normal + circle-x - - - + + + G + 5 + + 192 + + 3 + 16th + up + x + + + + + + + + + 768 + + + percussion + + + 1 + + + E 4 - 3 - + 576 1 - 1024th + eighth + up normal - @@ -3546,14 +1191,12 @@ 4 192 - 1 16th up normal - @@ -3561,17 +1204,14 @@ E 4 - 48 - - + 576 1 - 64th + eighth + up normal - - @@ -3579,17 +1219,13 @@ E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -3597,47 +1233,14 @@ E 4 - 3 - + 576 1 - 1024th + eighth + up normal - - - - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - @@ -3659,10 +1262,11 @@ E 4 - 192 + 576 1 - 16th + eighth + up normal @@ -3673,33 +1277,30 @@ E 4 - 48 - + 192 1 - 64th + 16th up normal - + + E 4 - 12 - - + 576 1 - 256th + eighth + up normal - - @@ -3707,15 +1308,13 @@ E 4 - 3 - + 192 1 - 1024th + 16th up normal - @@ -3723,99 +1322,72 @@ E 4 - 192 - + 576 1 - 16th + eighth + up normal - - + E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 576 1 - 256th + eighth + up normal - - - + E 4 - 3 - + 192 1 - 1024th + 16th up normal - - - - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - 3 - + + + E + 4 + + 576 + 1 - 1024th + eighth + + up + normal - diff --git a/test/data/grooves/HIP05.musicxml b/test/data/grooves/HIP05.musicxml index 5c9e0afb..a1d062a5 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-27 diff --git a/test/data/grooves/HIP06.musicxml b/test/data/grooves/HIP06.musicxml index 214ad81c..909ecf47 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-27 diff --git a/test/data/grooves/HIP07.musicxml b/test/data/grooves/HIP07.musicxml index f572d155..b620a5fa 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-27 diff --git a/test/data/grooves/HIP08.musicxml b/test/data/grooves/HIP08.musicxml index 7ecfe5c0..7ce0c970 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-27 @@ -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..1c9246cc 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-27 @@ -481,115 +481,28 @@ 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 - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -597,15 +510,19 @@ E 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/HIP10.musicxml b/test/data/grooves/HIP10.musicxml index 60ecccf7..59d91311 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-27 @@ -492,83 +492,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 + + @@ -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 + @@ -634,79 +588,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 + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -714,17 +617,18 @@ G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - @@ -732,15 +636,19 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - + @@ -757,124 +665,6 @@ - - - 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 @@ -952,79 +742,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 + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -1032,17 +771,18 @@ G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - @@ -1050,15 +790,19 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - + @@ -1075,124 +819,6 @@ - - - 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 @@ -1226,151 +852,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 - - 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 - - + 384 3 - 128th + eighth up x - - @@ -1378,49 +866,28 @@ 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 + + @@ -1428,15 +895,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -1444,13 +914,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..b18880eb 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-27 diff --git a/test/data/grooves/HIP12.musicxml b/test/data/grooves/HIP12.musicxml index dcc066de..0b8f780e 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-27 @@ -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,83 +655,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 + + @@ -826,33 +684,18 @@ G 5 - 24 - - + 256 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 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 - + 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 + + @@ -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 - - - - 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 + + @@ -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 + @@ -1252,117 +947,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 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 384 3 - 512th + eighth up x - diff --git a/test/data/grooves/HIP13.musicxml b/test/data/grooves/HIP13.musicxml index 40c3e64e..ac772c88 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-27 @@ -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..d9629c28 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-27 @@ -971,116 +971,28 @@ E 4 - 192 - - 1 - 16th - 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 - + 512 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -1088,15 +1000,19 @@ E 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + @@ -1162,80 +1078,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 +1104,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..afbac571 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-27 @@ -701,15 +701,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -764,56 +762,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - G @@ -889,67 +837,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 - + 384 3 - 1024th + eighth up x - @@ -957,33 +851,27 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -991,15 +879,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -1030,20 +916,20 @@ + + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1098,56 +984,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - G @@ -1162,72 +998,32 @@ - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - G 5 192 - 3 16th up x - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - + G 5 - 12 - - + 384 3 - 256th + eighth up x - - @@ -1235,31 +1031,27 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -1267,17 +1059,13 @@ G 5 - 24 - - + 384 3 - 128th + eighth up x - - @@ -1285,26 +1073,44 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + - + G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x @@ -1315,10 +1121,10 @@ G 5 - 192 + 384 3 - 16th + eighth up x @@ -1329,495 +1135,13 @@ G 5 - 192 - + 384 3 - 16th + 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 - - 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 - - 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 - - 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 - - diff --git a/test/data/grooves/HIP16.musicxml b/test/data/grooves/HIP16.musicxml index f9c71054..e7348955 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-27 diff --git a/test/data/grooves/HIP17.musicxml b/test/data/grooves/HIP17.musicxml index b14aa01f..b74c1fcf 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-27 diff --git a/test/data/grooves/HIP18.musicxml b/test/data/grooves/HIP18.musicxml index e087935f..ea099f8b 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-27 diff --git a/test/data/grooves/HIP19.musicxml b/test/data/grooves/HIP19.musicxml index bb3a6c8b..d20a0087 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-27 diff --git a/test/data/grooves/HIP20.musicxml b/test/data/grooves/HIP20.musicxml index d3f59e1f..1d5ba1b0 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-27 diff --git a/test/data/grooves/HIP21.musicxml b/test/data/grooves/HIP21.musicxml index d6b7d35a..5c69c2f6 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-27 diff --git a/test/data/grooves/HIP22.musicxml b/test/data/grooves/HIP22.musicxml index f6f389d5..b3666257 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-27 diff --git a/test/data/grooves/HIP23.musicxml b/test/data/grooves/HIP23.musicxml index 615da91d..1765628e 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-27 @@ -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..6b1c1ef9 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-27 @@ -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..c4e70ae9 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-27 diff --git a/test/data/grooves/HOUS03.musicxml b/test/data/grooves/HOUS03.musicxml index 7bc304dc..897bafc2 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-27 diff --git a/test/data/grooves/HOUS04.musicxml b/test/data/grooves/HOUS04.musicxml index eab8d639..37697764 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-27 diff --git a/test/data/grooves/HRK01.musicxml b/test/data/grooves/HRK01.musicxml index 17ef6f46..cbbfde99 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-27 diff --git a/test/data/grooves/HRK02.musicxml b/test/data/grooves/HRK02.musicxml index fb539d49..e1939787 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-27 diff --git a/test/data/grooves/HRK03.musicxml b/test/data/grooves/HRK03.musicxml index 0af78a74..de461641 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-27 @@ -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..9239eb12 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-27 diff --git a/test/data/grooves/HRK05.musicxml b/test/data/grooves/HRK05.musicxml index bfc8d4c5..0b22c40d 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-27 diff --git a/test/data/grooves/HRK06.musicxml b/test/data/grooves/HRK06.musicxml index f3901fab..69df4867 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-27 @@ -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..bd25195e 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-27 diff --git a/test/data/grooves/HappyshuffleA.musicxml b/test/data/grooves/HappyshuffleA.musicxml index 84460dd2..dfbb8af4 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-27 @@ -818,101 +818,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 + + @@ -920,15 +847,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -936,13 +866,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -950,101 +886,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 + + @@ -1052,15 +915,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1068,13 +934,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -1082,67 +954,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 + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -1150,49 +983,18 @@ G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - @@ -1200,1367 +1002,427 @@ 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 - - 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 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + - + G 5 - 96 - + 384 3 - 32nd + eighth up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 192 3 - 512th + 16th up x - - + + + 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 - - + G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up 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 - 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 - - + G 5 - 192 + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x + - + G 5 - 192 + 384 3 - 16th + eighth up x - - - + G 5 192 - 3 16th up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up 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 - 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 - @@ -2568,152 +1430,176 @@ G 5 - 192 + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x + - + G 5 - 192 + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x - + G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + - + G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - - + + + G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 + 48 + 3 - 32nd + 64th up x + - + G 5 - 24 + 12 3 - 128th + 256th up x @@ -2721,152 +1607,158 @@ - + G 5 - 6 + 3 3 - 512th + 1024th up x - + G 5 - 384 + 192 3 - eighth + 16th up 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 - - - + 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 - + 384 3 - 512th + eighth up x - diff --git a/test/data/grooves/HappyshuffleB.musicxml b/test/data/grooves/HappyshuffleB.musicxml index 8787a5a4..438c3818 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-27 @@ -818,101 +818,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 + + @@ -920,15 +847,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -936,13 +866,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -950,101 +886,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 + + @@ -1052,15 +915,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -1068,13 +934,19 @@ G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + @@ -1082,67 +954,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 + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -1150,49 +983,18 @@ G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - @@ -1200,1367 +1002,427 @@ 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 - - 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 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + - + G 5 - 96 - + 384 3 - 32nd + eighth up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 192 3 - 512th + 16th up x - - + + + 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 - - + G 5 - 48 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up 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 - 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 - - + G 5 - 192 + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x + - + G 5 - 192 + 384 3 - 16th + eighth up x - - - + G 5 192 - 3 16th up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up 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 - 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 - @@ -2568,152 +1430,176 @@ G 5 - 192 + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x + - + G 5 - 192 + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x - + G 5 - 384 + 256 3 eighth + + 3 + 2 + eighth + up x + - + G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - - + + + G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 + 48 + 3 - 32nd + 64th up x + - + G 5 - 24 + 12 3 - 128th + 256th up x @@ -2721,152 +1607,158 @@ - + G 5 - 6 + 3 3 - 512th + 1024th up x - + G 5 - 384 + 192 3 - eighth + 16th up 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 - - - + 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 - + 384 3 - 512th + eighth up x - diff --git a/test/data/grooves/HappyshuffleC.musicxml b/test/data/grooves/HappyshuffleC.musicxml index 7a419c27..18f0db8f 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-27 @@ -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..48cbb881 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-27 @@ -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..a782786d 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-27 diff --git a/test/data/grooves/HappyshuffleEndingB.musicxml b/test/data/grooves/HappyshuffleEndingB.musicxml index fe0f69ef..81f58b20 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-27 @@ -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 @@ -990,15 +814,13 @@ E 4 - 48 - + 192 1 - 64th + 16th up normal - @@ -1035,56 +857,6 @@ - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - E @@ -1146,22 +918,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -1169,10 +944,15 @@ A 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1180,10 +960,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1233,10 +1019,10 @@ B 4 - 256 + 512 2 - eighth + quarter 3 2 @@ -1245,15 +1031,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..577ae990 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-27 @@ -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..eb10a34f 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-27 @@ -311,80 +311,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 + + @@ -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 + @@ -439,15 +393,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -502,56 +454,6 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - G @@ -613,101 +515,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 + + @@ -715,15 +544,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -731,13 +563,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..72e9140b 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-27 @@ -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..88683903 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-27 @@ -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 @@ -694,117 +560,13 @@ 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 - + 384 1 - 1024th + eighth up normal - diff --git a/test/data/grooves/HappyshuffleFillD.musicxml b/test/data/grooves/HappyshuffleFillD.musicxml index f87e71b7..b560f52f 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-27 @@ -365,50 +365,6 @@ - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - E @@ -500,15 +456,14 @@ E 4 - 48 - + 576 1 - 64th + eighth + up normal - @@ -550,111 +505,13 @@ 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 - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - @@ -757,15 +614,13 @@ F 5 - 192 - + 384 1 - 16th + eighth up x - @@ -820,56 +675,6 @@ - - - F - 5 - - 96 - - - 1 - 32nd - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - - F @@ -1052,22 +857,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1075,10 +883,15 @@ A 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1086,10 +899,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/HappyshuffleIntroA.musicxml b/test/data/grooves/HappyshuffleIntroA.musicxml index b356f01e..6f68e096 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-27 @@ -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..047bb14e 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-27 @@ -349,80 +349,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 + + @@ -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,46 +469,25 @@ - 192 - - 3 - 16th - - - - - - - 48 - - - 3 - 64th - - - - - - - - 12 - - - 3 - 256th - - - - - - - - 3 - + 256 3 - 1024th - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -562,184 +495,221 @@ 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 - 192 - + 256 3 - 16th + eighth + + 3 + 2 + 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 - - - + G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + - + G 5 - 96 - + 384 3 - 32nd + eighth up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 192 3 - 512th + 16th up x - - + + + G 5 @@ -753,23 +723,7 @@ - - - G - 5 - - 192 - - - 3 - 16th - up - x - - - - - + G 5 @@ -787,7 +741,7 @@ - + G 5 @@ -805,7 +759,7 @@ - + G 5 @@ -821,57 +775,49 @@ - + G 5 - 96 - + 192 3 - 32nd + 16th up x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - - + G 5 @@ -885,458 +831,72 @@ - + 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 - - - - 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 - - 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 - - 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 + 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..4fff3d31 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-27 @@ -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..75a967b6 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-27 @@ -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..64f1a691 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-27 @@ -307,37 +307,33 @@ + G 5 - 48 - + 192 3 - 64th + 16th up x - + G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -345,15 +341,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -363,11 +357,11 @@ 96 - + 3 32nd up - x + circle-x @@ -380,11 +374,11 @@ 24 - + 3 128th up - x + circle-x @@ -397,46 +391,12 @@ 6 - + 3 512th up - x - - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x + circle-x - @@ -445,15 +405,28 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -461,15 +434,18 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - @@ -477,17 +453,19 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + @@ -495,15 +473,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -521,37 +497,30 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x + G 5 - 186 + 192 3 - 32nd - - - - + 16th up x @@ -576,18 +545,15 @@ G 5 - 189 - + 96 + + 3 32nd - - - - - up - x + circle-x + @@ -595,15 +561,17 @@ G 5 - 48 + 24 + 3 - 64th + 128th up circle-x + @@ -611,16 +579,14 @@ G 5 - 12 - + 6 3 - 256th + 512th up circle-x - @@ -629,15 +595,28 @@ G 5 - 3 - - + 128 + 3 - 1024th + 16th + + 3 + 2 + 16th + up - circle-x + x - + + + 3 + 16th + + + 2 + 16th + + @@ -645,15 +624,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -661,17 +643,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -679,15 +663,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -695,33 +677,43 @@ G 5 - 96 - + 192 + + 3 + 16th + up + circle-x + + + + + + + G + 5 + + 192 3 - 32nd + 16th up x - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -729,15 +721,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -747,11 +737,11 @@ 96 - + 3 32nd up - x + circle-x @@ -764,11 +754,11 @@ 24 - + 3 128th up - x + circle-x @@ -781,11 +771,11 @@ 6 - + 3 512th up - x + circle-x @@ -795,15 +785,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -811,17 +814,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -829,15 +833,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -846,11 +854,11 @@ 5 192 - + 3 16th up - circle-x + x @@ -859,39 +867,32 @@ G 5 - 189 - + 192 + 3 - 32nd - - - - - + 16th up - x + circle-x + G 5 - 186 + 192 3 - 32nd - - - - + 16th up x + G 5 @@ -910,15 +911,10 @@ G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x @@ -929,11 +925,11 @@ G 5 - 48 + 96 3 - 64th + 32nd up circle-x @@ -945,12 +941,12 @@ G 5 - 12 + 24 3 - 256th + 128th up circle-x @@ -963,11 +959,11 @@ G 5 - 3 + 6 3 - 1024th + 512th up circle-x @@ -979,15 +975,28 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -995,17 +1004,18 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - @@ -1013,15 +1023,19 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - + @@ -1029,718 +1043,44 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - + + G 5 - 24 - - - + 192 + 3 - 128th + 16th up - x + circle-x - - + G 5 - 3 - + 768 3 - 1024th + quarter 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 - 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 - - - - - - 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 - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - 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 - - 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 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 186 - - 3 - 32nd - - - - - up - x - - - - - - - - G - 5 - - 192 - - 3 - 16th - up - circle-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 - - 96 - - - - 3 - 32nd - up - x - - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - diff --git a/test/data/grooves/HeavyMetalIntro.musicxml b/test/data/grooves/HeavyMetalIntro.musicxml index 60490e92..88a1f72e 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-27 @@ -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..203b5d1f 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-27 diff --git a/test/data/grooves/HillCountryEnd.musicxml b/test/data/grooves/HillCountryEnd.musicxml index e643ecd5..c59b6c6f 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-27 diff --git a/test/data/grooves/HillCountryFill.musicxml b/test/data/grooves/HillCountryFill.musicxml index 4b02be8d..f1225b50 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-27 diff --git a/test/data/grooves/HillCountryIntro.musicxml b/test/data/grooves/HillCountryIntro.musicxml index c1ae345f..3a722aa1 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-27 diff --git a/test/data/grooves/HillCountryPlus.musicxml b/test/data/grooves/HillCountryPlus.musicxml index e14e0875..2d46667c 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-27 diff --git a/test/data/grooves/HillCountrySus.musicxml b/test/data/grooves/HillCountrySus.musicxml index 4856cdc7..5fdb3f17 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-27 diff --git a/test/data/grooves/HillCountrySusPlus.musicxml b/test/data/grooves/HillCountrySusPlus.musicxml index 07b570cf..15e01720 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-27 diff --git a/test/data/grooves/Hip-Hop.musicxml b/test/data/grooves/Hip-Hop.musicxml index a6f458fc..3b56cc9c 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-27 diff --git a/test/data/grooves/Hip-HopEnd.musicxml b/test/data/grooves/Hip-HopEnd.musicxml index 91fccc5b..a62f738c 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-27 diff --git a/test/data/grooves/Hip-HopIntro.musicxml b/test/data/grooves/Hip-HopIntro.musicxml index 5c806df9..4799a132 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-27 diff --git a/test/data/grooves/HipHop.musicxml b/test/data/grooves/HipHop.musicxml index 4733e7d7..3cbdb1e0 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-27 diff --git a/test/data/grooves/HipHopEnd.musicxml b/test/data/grooves/HipHopEnd.musicxml index f1f6a4a6..5c14a160 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-27 diff --git a/test/data/grooves/HipHopIntro.musicxml b/test/data/grooves/HipHopIntro.musicxml index 2f68482b..0cc4f5d0 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-27 diff --git a/test/data/grooves/HipHopPlus1.musicxml b/test/data/grooves/HipHopPlus1.musicxml index 1182d494..477dea07 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-27 diff --git a/test/data/grooves/HipHopPlus2.musicxml b/test/data/grooves/HipHopPlus2.musicxml index 49102cc0..53d5b29c 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-27 diff --git a/test/data/grooves/HipHopPlusPlus.musicxml b/test/data/grooves/HipHopPlusPlus.musicxml index 678c138a..8b9a355b 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-27 diff --git a/test/data/grooves/HipHopSus.musicxml b/test/data/grooves/HipHopSus.musicxml index 39ec4139..bcf55044 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-27 diff --git a/test/data/grooves/HipHopSusPlus1.musicxml b/test/data/grooves/HipHopSusPlus1.musicxml index 19be157a..002bb3c9 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-27 diff --git a/test/data/grooves/HipHopSusPlus2.musicxml b/test/data/grooves/HipHopSusPlus2.musicxml index d1180bd8..d57b71f0 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-27 diff --git a/test/data/grooves/HipHopSusPlusPlus.musicxml b/test/data/grooves/HipHopSusPlusPlus.musicxml index a7489321..5019bccb 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-27 diff --git a/test/data/grooves/House.musicxml b/test/data/grooves/House.musicxml index a5d8e599..b702090a 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-27 diff --git a/test/data/grooves/HouseEnd.musicxml b/test/data/grooves/HouseEnd.musicxml index dc911f44..f88d5c4e 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-27 @@ -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..0d357d72 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-27 @@ -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..cc6f90fb 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-27 @@ -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..30eac25b 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-27 diff --git a/test/data/grooves/INTRO03.musicxml b/test/data/grooves/INTRO03.musicxml index 1a77d1c9..fcb6f66c 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-27 diff --git a/test/data/grooves/INTRO04.musicxml b/test/data/grooves/INTRO04.musicxml index 35e3751f..f19df13f 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-27 @@ -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..9094b4f0 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-27 @@ -220,15 +220,13 @@ E 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -265,74 +263,6 @@ - - - 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 @@ -348,14 +278,15 @@ + E 4 - 192 + 384 1 - 16th + eighth up normal @@ -366,15 +297,13 @@ E 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -411,74 +340,6 @@ - - - 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 - - - - diff --git a/test/data/grooves/INTRO06.musicxml b/test/data/grooves/INTRO06.musicxml index a24a71bb..3ff2fba3 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-27 @@ -354,15 +354,13 @@ E 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -399,74 +397,6 @@ - - - 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 - - - - \ No newline at end of file diff --git a/test/data/grooves/INTRO07.musicxml b/test/data/grooves/INTRO07.musicxml index 8447a0d5..b5abc9ea 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-27 diff --git a/test/data/grooves/INTRO08.musicxml b/test/data/grooves/INTRO08.musicxml index fc2d378c..3edbd9d7 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-27 diff --git a/test/data/grooves/INTRO09.musicxml b/test/data/grooves/INTRO09.musicxml index fc7f1261..4711a81a 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-27 @@ -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..5ea3b435 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-27 diff --git a/test/data/grooves/INTRO11.musicxml b/test/data/grooves/INTRO11.musicxml index 3808c5b9..8473fb85 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-27 diff --git a/test/data/grooves/INTRO12.musicxml b/test/data/grooves/INTRO12.musicxml index f3f469a4..7451d105 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-27 @@ -234,15 +234,13 @@ E 4 - 96 - + 384 1 - 32nd + eighth up normal - @@ -279,74 +277,6 @@ - - - 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 - - - - @@ -446,83 +376,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 + + @@ -530,15 +405,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -546,13 +424,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..364ada1b 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-27 diff --git a/test/data/grooves/INTRO14.musicxml b/test/data/grooves/INTRO14.musicxml index c79cb30f..3a9c1070 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-27 @@ -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..19863c9c 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-27 diff --git a/test/data/grooves/JAZZ01.musicxml b/test/data/grooves/JAZZ01.musicxml index b9efe333..4dde1db8 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-27 @@ -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..b704da5f 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-27 @@ -490,74 +490,6 @@ - - - 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 @@ -764,74 +696,6 @@ - - - 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 @@ -1044,102 +908,28 @@ F 4 - 192 - + 256 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 - - 288 - - - 1 - 16th - - down - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th + eighth + + 3 + 2 + eighth + down normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -1147,23 +937,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..e3bdee0e 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-27 @@ -379,15 +379,13 @@ F 5 - 48 - + 192 1 - 64th + 16th up x - @@ -424,56 +422,6 @@ - - - F - 5 - - 96 - - - 1 - 32nd - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - - F @@ -565,117 +513,13 @@ 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 - + 384 1 - 512th + eighth up x - @@ -708,80 +552,25 @@ - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - + 256 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 5 - - 96 - - - 1 - 32nd - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -789,15 +578,18 @@ F 5 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -805,13 +597,19 @@ F 5 - 384 + 256 1 eighth + + 3 + 2 + eighth + up x + @@ -1188,165 +986,13 @@ 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 - + 192 1 - 64th + 16th up normal - @@ -1354,17 +1000,28 @@ E 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -1372,15 +1029,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -1388,13 +1048,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..7297db60 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-27 @@ -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 + + @@ -755,142 +765,6 @@ - - - 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 - - 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 @@ -1517,10 +1391,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -1529,15 +1403,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..e056542f 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-27 @@ -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..fd7cb168 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-27 @@ -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..b13a45af 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-27 @@ -439,15 +439,13 @@ E 4 - 48 - + 192 1 - 64th + 16th up normal - @@ -484,88 +482,6 @@ - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - E @@ -740,16 +656,14 @@ E 4 - 288 - + 576 1 - 16th + eighth up normal - @@ -786,74 +700,6 @@ - - - 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 - - - - @@ -924,15 +770,14 @@ E 4 - 384 - + 576 1 eighth + up normal - @@ -940,114 +785,95 @@ E 4 - 96 - - + 192 1 - 32nd + 16th up normal - - - - - E - 4 - - 24 - - - + + + 192 1 - 128th - up - normal + 16th - - - + E 4 - 6 - + 192 1 - 512th + 16th up normal - - - - - - 48 - - 1 - 64th - - - - + + + E + 4 + 12 + 1 256th + up + normal - - + + + E + 4 + 3 + 1 1024th + up + normal - + E 4 192 + 1 16th up normal + - - - 192 - 1 - 16th - - - - + E 4 48 + 1 64th @@ -1055,9 +881,10 @@ normal + - + E 4 @@ -1075,7 +902,7 @@ - + E 4 @@ -1091,705 +918,36 @@ - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - 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 - - - - - - - - - - 768 - - - percussion - - - 5 - - - - - F - 5 - - 576 - - 1 - eighth - - up - x - - - - - - F - 5 - - 192 - - 1 - 16th - up - x - - - - - - 192 - 1 - 16th - - - - - - F - 5 - - 288 - - - 1 - 16th - - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - 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 - - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 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 - - - - - - - F - 5 - - 192 - - 1 - 16th - up - x - - - - - - 192 - 1 - 16th - - - - - - F - 5 - - 288 - - - 1 - 16th - - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - 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 - - 576 - - 1 - eighth - - up - x - - - - - - F - 5 - - 192 - - 1 - 16th - up - x - - - - - - 192 - 1 - 16th - - - - - - F - 5 - - 288 - - - 1 - 16th - - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - - - - - F - 5 - - 192 - - - 1 - 16th - up - x - - - - - - - F - 5 - - 48 - - - - 1 - 64th - up - x - - - - - + + + + + + 768 + + + percussion + + + 5 + + F 5 - 12 - - + 576 1 - 256th + eighth + up x - - @@ -1797,59 +955,21 @@ F 5 - 3 - + 192 1 - 1024th + 16th up x - 192 - 1 16th - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - @@ -1857,16 +977,14 @@ F 5 - 288 - + 576 1 - 16th + eighth up x - @@ -1903,55 +1021,43 @@ - - - F - 5 - - 192 - - 1 - 16th - up - x - - - - 192 - 1 - 16th - - - - - - F - 5 - - 576 - + 256 1 eighth - - up - x + + 3 + 2 + eighth + + + + 3 + eighth + + + 2 + eighth + + - - F 5 - 576 + 256 1 eighth - + + 3 + 2 + eighth + up x @@ -1962,13 +1068,19 @@ F 5 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up x + @@ -1984,16 +1096,14 @@ F 5 - 288 - + 576 1 - 16th + eighth up x - @@ -2030,20 +1140,21 @@ + + F 5 - 192 - + 576 1 - 16th + eighth + up x - @@ -2051,130 +1162,93 @@ F 5 - 48 - - + 192 1 - 64th + 16th up x - - - - - F - 5 - - 12 - - - + + + 192 1 - 256th - up - x + 16th - - - + F 5 - 3 - + 576 1 - 1024th + eighth + up x - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - + F 5 - 288 + 24 + 1 - 16th - + 128th up x + - + F 5 - 24 - + 6 1 - 128th + 512th up x - - + + + + + + 256 + 1 + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + @@ -2182,15 +1256,18 @@ F 5 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -2198,13 +1275,19 @@ F 5 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up x + @@ -2220,34 +1303,31 @@ F 5 - 288 - + 576 1 - 16th + eighth up x - + + F 5 - 24 - - + 576 1 - 128th + eighth + up x - - @@ -2255,62 +1335,49 @@ F 5 - 6 - + 192 1 - 512th + 16th up x - - - - F - 5 - + + 192 - - 1 16th - up - x - - + F 5 - 48 - - + 576 1 - 64th + eighth + up x - - - + F 5 - 12 + 24 1 - 256th + 128th up x @@ -2318,34 +1385,59 @@ - + F 5 - 3 + 6 1 - 1024th + 512th up x - - + + + 256 + 1 + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + + + F 5 - 576 + 256 1 eighth - + + 3 + 2 + eighth + up x @@ -2356,13 +1448,19 @@ F 5 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up x + @@ -2378,16 +1476,14 @@ F 5 - 288 - + 576 1 - 16th + eighth up x - @@ -2424,20 +1520,21 @@ + + F 5 - 192 - + 576 1 - 16th + eighth + up x - @@ -2445,35 +1542,21 @@ F 5 - 48 - - + 192 1 - 64th + 16th up x - - - - - F - 5 - - 12 - - - + + + 192 1 - 256th - up - x + 16th - - @@ -2481,59 +1564,14 @@ F 5 - 3 - + 576 1 - 1024th + eighth + up x - - - - - - 192 - - 1 - 16th - - - - - - - 48 - - - 1 - 64th - - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - @@ -2541,16 +1579,17 @@ F 5 - 288 + 24 + 1 - 16th - + 128th up x + @@ -2558,33 +1597,57 @@ F 5 - 24 - + 6 1 - 128th + 512th up x - + + + 256 + 1 + eighth + + 3 + 2 + eighth + + + + + 3 + eighth + + + 2 + eighth + + + + F 5 - - 6 - + + 256 1 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -2592,13 +1655,19 @@ F 5 - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + up x + @@ -2643,22 +1712,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -2666,10 +1738,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -2677,10 +1754,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -2745,16 +1828,14 @@ F 4 - 288 - + 576 2 - 16th + eighth up normal - @@ -2791,94 +1872,29 @@ - - - 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 - - - - - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -2886,10 +1902,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -2897,10 +1918,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -2965,84 +1992,14 @@ F 4 - 288 - - - 2 - 16th - - up - normal - - - - - - - F - 4 - - 24 - - - - 2 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 2 - 512th - up - normal - - - - - - - F - 4 - - 192 - - - 2 - 16th - up - normal - - - - - - - F - 4 - - 48 - - + 576 2 - 64th + eighth + up normal - - @@ -3050,12 +2007,12 @@ F 4 - 12 + 24 2 - 256th + 128th up normal @@ -3068,11 +2025,11 @@ F 4 - 3 + 6 2 - 1024th + 512th up normal @@ -3083,22 +2040,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -3106,10 +2066,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -3117,10 +2082,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -3185,16 +2156,14 @@ F 4 - 288 - + 576 2 - 16th + eighth up normal - @@ -3231,94 +2200,29 @@ - - - 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 - - - - - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th + quarter + + 3 + 2 + quarter + - + + + 3 + quarter + + + 2 + quarter + + @@ -3326,10 +2230,15 @@ F 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up x @@ -3337,10 +2246,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -3405,16 +2320,14 @@ F 4 - 288 - + 576 2 - 16th + eighth up normal - @@ -3451,74 +2364,6 @@ - - - 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 - - - - diff --git a/test/data/grooves/Jazz54.musicxml b/test/data/grooves/Jazz54.musicxml index 9a5a7430..786f13a3 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-27 diff --git a/test/data/grooves/Jazz54DrumIntro.musicxml b/test/data/grooves/Jazz54DrumIntro.musicxml index 0172205b..5fd74b96 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-27 diff --git a/test/data/grooves/Jazz54Sus.musicxml b/test/data/grooves/Jazz54Sus.musicxml index 85bddb7d..af84816a 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-27 diff --git a/test/data/grooves/Jazz54Walk.musicxml b/test/data/grooves/Jazz54Walk.musicxml index 5d3f2b05..a1234e1d 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-27 diff --git a/test/data/grooves/Jazz54WalkSus.musicxml b/test/data/grooves/Jazz54WalkSus.musicxml index 612923b9..6d4b8d98 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-27 diff --git a/test/data/grooves/JazzBasieA.musicxml b/test/data/grooves/JazzBasieA.musicxml index acf2fa1e..85614cbc 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-27 diff --git a/test/data/grooves/JazzBasieB.musicxml b/test/data/grooves/JazzBasieB.musicxml index 5cbd5aa5..0e6a4a5f 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-27 @@ -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..3dbdab10 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-27 @@ -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..df9ecfde 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-27 @@ -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..292db281 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-27 @@ -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..c7a74ade 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-27 diff --git a/test/data/grooves/JazzBasieFillBA.musicxml b/test/data/grooves/JazzBasieFillBA.musicxml index 5e778007..a377f5a1 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-27 diff --git a/test/data/grooves/JazzBasieFillBB.musicxml b/test/data/grooves/JazzBasieFillBB.musicxml index 515575d8..10b72084 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-27 @@ -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..91936000 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-27 @@ -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..dd1020e2 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-27 @@ -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..4660cfa5 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-27 @@ -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..9f965737 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-27 diff --git a/test/data/grooves/JazzBasieIntroC.musicxml b/test/data/grooves/JazzBasieIntroC.musicxml index efebb43b..37178792 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-27 @@ -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..69cbb1cf 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-27 diff --git a/test/data/grooves/JazzBasieMainD.musicxml b/test/data/grooves/JazzBasieMainD.musicxml index 01361128..bab5e545 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-27 @@ -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..79781a88 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-27 diff --git a/test/data/grooves/JazzBossaB.musicxml b/test/data/grooves/JazzBossaB.musicxml index dd073656..821f824b 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-27 diff --git a/test/data/grooves/JazzBossaEndingA.musicxml b/test/data/grooves/JazzBossaEndingA.musicxml index 64078744..6d61e309 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-27 diff --git a/test/data/grooves/JazzBossaFillAA.musicxml b/test/data/grooves/JazzBossaFillAA.musicxml index d92fd741..211dece1 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-27 diff --git a/test/data/grooves/JazzBossaFillBB.musicxml b/test/data/grooves/JazzBossaFillBB.musicxml index 0e27a1aa..ce4c3745 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-27 diff --git a/test/data/grooves/JazzBossaIntroA.musicxml b/test/data/grooves/JazzBossaIntroA.musicxml index e6b69ecf..cfa6b969 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-27 diff --git a/test/data/grooves/JazzBouncyEndingA.musicxml b/test/data/grooves/JazzBouncyEndingA.musicxml index 93678a14..b8670c5d 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-27 @@ -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..7fcbf9b4 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-27 @@ -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..785aa241 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-27 @@ -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..1e7ba903 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-27 diff --git a/test/data/grooves/JazzBouncyMainA.musicxml b/test/data/grooves/JazzBouncyMainA.musicxml index 20d8df9a..5620521b 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-27 @@ -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..d2a89b02 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-27 @@ -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..f1592cee 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-27 @@ -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..7cde3e58 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-27 @@ -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..57424d29 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-27 @@ -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..e27624ea 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-27 @@ -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..62ee0363 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-27 @@ -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..71a8fb19 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-27 @@ -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..5ebcea47 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-27 @@ -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..aa9b980e 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-27 @@ -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..db9ca510 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-27 @@ -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..f145faa1 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-27 diff --git a/test/data/grooves/JazzComboIntro.musicxml b/test/data/grooves/JazzComboIntro.musicxml index b2d2c605..a95badc2 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-27 @@ -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..89ebca14 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-27 diff --git a/test/data/grooves/JazzComboPlus.musicxml b/test/data/grooves/JazzComboPlus.musicxml index 2c4fb8a2..29a2ef6d 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-27 @@ -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..24bbba2d 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-27 @@ -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..7d93cde4 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-27 @@ -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..c08dc7fc 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-27 @@ -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..72811cba 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-27 diff --git a/test/data/grooves/JazzCountryFillBB.musicxml b/test/data/grooves/JazzCountryFillBB.musicxml index 3b888733..98af6339 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-27 diff --git a/test/data/grooves/JazzCountryIntroA.musicxml b/test/data/grooves/JazzCountryIntroA.musicxml index 15c1ad6f..efbb7a19 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-27 diff --git a/test/data/grooves/JazzCountryMainA.musicxml b/test/data/grooves/JazzCountryMainA.musicxml index 01d8f1b5..ea7f9d5c 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-27 diff --git a/test/data/grooves/JazzCountryMainB.musicxml b/test/data/grooves/JazzCountryMainB.musicxml index 4db31374..dc5c961b 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-27 diff --git a/test/data/grooves/JazzGrTrioEndingA.musicxml b/test/data/grooves/JazzGrTrioEndingA.musicxml index d59ed5ca..c7bfb05f 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-27 diff --git a/test/data/grooves/JazzGrTrioEndingB.musicxml b/test/data/grooves/JazzGrTrioEndingB.musicxml index 0338eb4a..c783bf75 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-27 @@ -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..8be877f6 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-27 @@ -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..f2634d61 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-27 @@ -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..85fa4fef 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-27 @@ -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..2504a51a 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-27 @@ -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..1b7583c1 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-27 @@ -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..3fc2c31b 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-27 @@ -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..59213ce5 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-27 diff --git a/test/data/grooves/JazzGrTrioMainB.musicxml b/test/data/grooves/JazzGrTrioMainB.musicxml index 1287983b..0da7dc73 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-27 @@ -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..5d1f3b63 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-27 diff --git a/test/data/grooves/JazzRhumbaEnd.musicxml b/test/data/grooves/JazzRhumbaEnd.musicxml index 023d69a1..c12fa978 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-27 diff --git a/test/data/grooves/JazzRhumbaFill.musicxml b/test/data/grooves/JazzRhumbaFill.musicxml index 7ade3fb7..d387d901 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-27 @@ -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..7d4671ed 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-27 diff --git a/test/data/grooves/JazzRhumbaPlus.musicxml b/test/data/grooves/JazzRhumbaPlus.musicxml index 8319842d..51635c11 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-27 diff --git a/test/data/grooves/JazzRhumbaSus.musicxml b/test/data/grooves/JazzRhumbaSus.musicxml index 53e1947d..25a30fa0 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-27 diff --git a/test/data/grooves/JazzRhumbaSusPlus.musicxml b/test/data/grooves/JazzRhumbaSusPlus.musicxml index 33d4dbc3..e8d05e7a 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-27 diff --git a/test/data/grooves/JazzRock.musicxml b/test/data/grooves/JazzRock.musicxml index ac741d03..682ca828 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-27 diff --git a/test/data/grooves/JazzRockEnd.musicxml b/test/data/grooves/JazzRockEnd.musicxml index 427d075a..500bccdf 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-27 diff --git a/test/data/grooves/JazzRockFill.musicxml b/test/data/grooves/JazzRockFill.musicxml index 1427d974..fd3bb664 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-27 @@ -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..70dfb83a 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-27 diff --git a/test/data/grooves/JazzRockIntro8.musicxml b/test/data/grooves/JazzRockIntro8.musicxml index 628de1e4..122b1515 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-27 diff --git a/test/data/grooves/JazzRockPlus.musicxml b/test/data/grooves/JazzRockPlus.musicxml index cdee99b7..1b9e4da3 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-27 diff --git a/test/data/grooves/JazzRockSus.musicxml b/test/data/grooves/JazzRockSus.musicxml index c5dc6788..9202172f 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-27 diff --git a/test/data/grooves/JazzRockSusPlus.musicxml b/test/data/grooves/JazzRockSusPlus.musicxml index 44d77869..c2b9c702 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-27 diff --git a/test/data/grooves/JazzRockWalk.musicxml b/test/data/grooves/JazzRockWalk.musicxml index 31cb2239..63193a7c 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-27 diff --git a/test/data/grooves/JazzRockWalkPlus.musicxml b/test/data/grooves/JazzRockWalkPlus.musicxml index 7a02f89b..cea8fbf7 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-27 diff --git a/test/data/grooves/JazzRockWalkSus.musicxml b/test/data/grooves/JazzRockWalkSus.musicxml index 2ece99e2..53ace98c 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-27 diff --git a/test/data/grooves/JazzRockWalkSusPlus.musicxml b/test/data/grooves/JazzRockWalkSusPlus.musicxml index 941acc62..a4af5fd9 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-27 diff --git a/test/data/grooves/JazzSwingEndingA.musicxml b/test/data/grooves/JazzSwingEndingA.musicxml index 6d0a4616..3b7ba5bb 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-27 @@ -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..8f7518aa 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-27 @@ -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..cf8f4d8b 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-27 @@ -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..f8a3a54a 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-27 diff --git a/test/data/grooves/JazzSwingMainA.musicxml b/test/data/grooves/JazzSwingMainA.musicxml index e59fed9b..cb4d24be 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-27 diff --git a/test/data/grooves/JazzSwingMainB.musicxml b/test/data/grooves/JazzSwingMainB.musicxml index d8b99b8c..6affa9d2 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-27 @@ -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..7b2bf82f 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-27 diff --git a/test/data/grooves/JazzTrioFillAA.musicxml b/test/data/grooves/JazzTrioFillAA.musicxml index 3bc90f76..76e82818 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-27 @@ -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..6b11247b 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-27 @@ -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..4d49d13b 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-27 diff --git a/test/data/grooves/JazzTrioMainA.musicxml b/test/data/grooves/JazzTrioMainA.musicxml index 522abbb1..6befde7e 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-27 @@ -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..1e52ee0f 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-27 @@ -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..804d7542 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-27 @@ -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..725b77ac 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-27 diff --git a/test/data/grooves/JazzWaltz1End.musicxml b/test/data/grooves/JazzWaltz1End.musicxml index 814d8128..5b53b74b 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-27 diff --git a/test/data/grooves/JazzWaltz1Sus.musicxml b/test/data/grooves/JazzWaltz1Sus.musicxml index c799323f..c2465113 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-27 diff --git a/test/data/grooves/JazzWaltz2.musicxml b/test/data/grooves/JazzWaltz2.musicxml index 2bb07722..38710a81 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-27 diff --git a/test/data/grooves/JazzWaltz2Sus.musicxml b/test/data/grooves/JazzWaltz2Sus.musicxml index 9714b752..46eccaee 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-27 diff --git a/test/data/grooves/JazzWaltzEnd.musicxml b/test/data/grooves/JazzWaltzEnd.musicxml index 1f14020c..4cc340a5 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-27 @@ -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..41b80c82 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-27 diff --git a/test/data/grooves/JazzWaltzFill.musicxml b/test/data/grooves/JazzWaltzFill.musicxml index d659974b..2081f1b5 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-27 diff --git a/test/data/grooves/JazzWaltzFillAA.musicxml b/test/data/grooves/JazzWaltzFillAA.musicxml index ad9e3b73..a4610abb 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-27 diff --git a/test/data/grooves/JazzWaltzFillBB.musicxml b/test/data/grooves/JazzWaltzFillBB.musicxml index f518acdb..ce6b69c9 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-27 diff --git a/test/data/grooves/JazzWaltzIntro.musicxml b/test/data/grooves/JazzWaltzIntro.musicxml index d3733fce..ee0f39ff 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-27 @@ -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..a90d623d 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-27 @@ -1240,206 +1240,7 @@ - - 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 - - - - - - - F - 5 - - 48 - - - 1 - 64th - up - x - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - - - 1 - 1024th - up - x - - - - - + F 5 @@ -1472,184 +1273,28 @@ F 5 - 189 - - 1 - 32nd - - - - - - up - x - - - - - - F - 5 - - 48 - + 128 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 - - - - - - - F - 5 - - 48 - - - 1 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1657,17 +1302,18 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1675,15 +1321,19 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1700,25 +1350,6 @@ - - - F - 5 - - 189 - - 1 - 32nd - - - - - - up - x - - - F @@ -1734,38 +1365,18 @@ + F 5 - 189 - - 1 - 32nd - - - - - - up - x - - - - - - F - 5 - - 48 - + 192 1 - 64th + 16th up x - @@ -1773,17 +1384,13 @@ F 5 - 12 - - + 192 1 - 256th + 16th up x - - @@ -1791,15 +1398,28 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1807,15 +1427,18 @@ F 5 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -1823,17 +1446,19 @@ F 5 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -1841,15 +1466,13 @@ F 5 - 6 - + 192 1 - 512th + 16th up x - @@ -1857,33 +1480,28 @@ F 5 - 96 - + 192 1 - 32nd + 16th up x - + F 5 - 24 - - + 192 1 - 128th + 16th up x - - @@ -1891,15 +1509,13 @@ F 5 - 6 - + 192 1 - 512th + 16th up x - @@ -1907,15 +1523,28 @@ F 5 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1923,17 +1552,18 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1941,15 +1571,19 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1966,25 +1600,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..ef7e1a3f 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-27 diff --git a/test/data/grooves/JazzWaltzMainA.musicxml b/test/data/grooves/JazzWaltzMainA.musicxml index 6efbc5d3..7ca3d92f 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-27 @@ -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..76b3dd1c 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-27 diff --git a/test/data/grooves/JazzWaltzSus.musicxml b/test/data/grooves/JazzWaltzSus.musicxml index 44d8b6bc..df86490e 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-27 diff --git a/test/data/grooves/Jive.musicxml b/test/data/grooves/Jive.musicxml index b252eff6..511eb19e 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-27 diff --git a/test/data/grooves/Jive1.musicxml b/test/data/grooves/Jive1.musicxml index 1d359c3d..365a1ac8 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-27 diff --git a/test/data/grooves/Jive1Clap.musicxml b/test/data/grooves/Jive1Clap.musicxml index 6ea9b23f..941e37b4 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-27 diff --git a/test/data/grooves/Jive1ClapSus.musicxml b/test/data/grooves/Jive1ClapSus.musicxml index f963cf91..f100b85c 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-27 diff --git a/test/data/grooves/Jive1Plus.musicxml b/test/data/grooves/Jive1Plus.musicxml index 5e6d571c..f29e791d 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-27 diff --git a/test/data/grooves/Jive1Sus.musicxml b/test/data/grooves/Jive1Sus.musicxml index e3d726bd..f8718bca 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-27 diff --git a/test/data/grooves/Jive1SusPlus.musicxml b/test/data/grooves/Jive1SusPlus.musicxml index 7f0b6bfc..6648c323 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-27 diff --git a/test/data/grooves/JiveClap.musicxml b/test/data/grooves/JiveClap.musicxml index 293d8800..2a9a18e8 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-27 diff --git a/test/data/grooves/JiveClapSus.musicxml b/test/data/grooves/JiveClapSus.musicxml index e0012d33..062680b1 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-27 diff --git a/test/data/grooves/JiveEnd.musicxml b/test/data/grooves/JiveEnd.musicxml index 1f748c96..6f7f895a 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-27 diff --git a/test/data/grooves/JiveIntro.musicxml b/test/data/grooves/JiveIntro.musicxml index 74204bf8..835a1d2e 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-27 @@ -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..6e85d138 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-27 @@ -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..fdebd8c7 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-27 @@ -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..1ce28355 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-27 diff --git a/test/data/grooves/JiveSus.musicxml b/test/data/grooves/JiveSus.musicxml index aa8e63d3..94c31083 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-27 diff --git a/test/data/grooves/JiveSusPlus.musicxml b/test/data/grooves/JiveSusPlus.musicxml index efe9bfee..088a240f 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-27 diff --git a/test/data/grooves/Kfunk1A.musicxml b/test/data/grooves/Kfunk1A.musicxml index 597cf67b..dc2f465a 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-27 @@ -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..df7cf830 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-27 diff --git a/test/data/grooves/Kfunk1EndingA.musicxml b/test/data/grooves/Kfunk1EndingA.musicxml index e574a4e5..3a70d33b 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-27 @@ -368,99 +368,13 @@ E 4 - 48 - - - 2 - 64th - up - square - - - - - - - E - 4 - - 12 - - - - 2 - 256th - up - square - - - - - - - - E - 4 - - 3 - - - 2 - 1024th - up - square - - - - - - - E - 4 - - 96 - - - 2 - 32nd - up - square - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - + 192 2 - 512th + 16th up square - @@ -756,22 +670,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -779,10 +696,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -790,10 +712,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1290,22 +1218,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1313,10 +1244,15 @@ A 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1327,13 +1263,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..0d49136f 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-27 diff --git a/test/data/grooves/Kfunk1FillAB.musicxml b/test/data/grooves/Kfunk1FillAB.musicxml index 544670a6..966fe300 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-27 diff --git a/test/data/grooves/Kfunk1FillBA.musicxml b/test/data/grooves/Kfunk1FillBA.musicxml index ae1a5063..a72e427f 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-27 @@ -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..2825ca45 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-27 diff --git a/test/data/grooves/Kfunk1IntroA.musicxml b/test/data/grooves/Kfunk1IntroA.musicxml index a5fb5f66..c1093582 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-27 @@ -251,50 +251,6 @@ - - - 384 - - 1 - eighth - - - - - - - 96 - - - 1 - 32nd - - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - D @@ -360,6 +316,7 @@ + D 4 @@ -378,133 +335,13 @@ D 4 - 48 - - - 1 - 64th - up - normal - - - - - - - D - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - D - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - D - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - D - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - D - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - D - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - D - 4 - - 24 - - + 192 1 - 128th + 16th up normal - - @@ -512,31 +349,13 @@ D 4 - 6 - - - 1 - 512th - up - normal - - - - - - - D - 4 - - 48 - + 192 1 - 64th + 16th up normal - @@ -544,44 +363,10 @@ D 4 - 12 - - - - 1 - 256th - up - normal - - - - - - - - D - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - D - 4 - - 192 + 384 1 - 16th + eighth up normal @@ -1162,22 +947,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1185,10 +973,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -1196,10 +989,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1441,22 +1240,25 @@ - 384 - + 512 1 - eighth - - - - - - - 192 - - 1 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1464,10 +1266,15 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + down normal @@ -1475,10 +1282,16 @@ - 768 + 512 1 quarter + + 3 + 2 + quarter + + diff --git a/test/data/grooves/LATN01.musicxml b/test/data/grooves/LATN01.musicxml index 94671a91..3ebffa8d 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-27 @@ -444,102 +444,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 + + @@ -547,23 +473,32 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + @@ -599,183 +534,36 @@ 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 - + 384 1 - 512th + eighth up normal - - - - - - 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 + + @@ -783,23 +571,32 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - - 192 + 128 1 16th + + 3 + 2 + 16th + + @@ -807,102 +604,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 + + @@ -910,23 +633,32 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + @@ -936,102 +668,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 + + @@ -1039,75 +697,32 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - - 192 - 1 - 16th - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - + 256 1 - 256th - up - normal + eighth + + 3 + 2 + eighth + - - + @@ -1115,50 +730,28 @@ 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 + + @@ -1166,75 +759,32 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - - 192 + 256 1 - 16th - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal + eighth + + 3 + 2 + eighth + - - + @@ -1242,50 +792,28 @@ E 4 - 3 - + 256 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 + + @@ -1293,75 +821,32 @@ E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - - 192 + 256 1 - 16th - - - - - - E - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal + eighth + + 3 + 2 + eighth + - - + @@ -1369,50 +854,28 @@ E 4 - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 288 - + 256 1 - 16th - - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -1420,23 +883,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/LATN02.musicxml b/test/data/grooves/LATN02.musicxml index fc7013b8..c17dff22 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-27 diff --git a/test/data/grooves/LATN03.musicxml b/test/data/grooves/LATN03.musicxml index e27a1079..f327e4f2 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-27 diff --git a/test/data/grooves/LATN04.musicxml b/test/data/grooves/LATN04.musicxml index 8eef2920..7542f61a 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-27 diff --git a/test/data/grooves/LATN05.musicxml b/test/data/grooves/LATN05.musicxml index 3f4ded29..cd955843 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-27 @@ -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..82f25611 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-27 diff --git a/test/data/grooves/LATN07.musicxml b/test/data/grooves/LATN07.musicxml index f13b2518..494b2c02 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-27 diff --git a/test/data/grooves/LATN08.musicxml b/test/data/grooves/LATN08.musicxml index 9d3ba107..b3b900a8 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-27 @@ -222,16 +222,14 @@ F 5 - 288 - + 576 1 - 16th + eighth up x - @@ -268,175 +266,33 @@ - - - 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 - 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 + + @@ -444,23 +300,32 @@ F 5 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up x - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + @@ -562,16 +427,14 @@ F 5 - 288 - + 576 1 - 16th + eighth up x - @@ -608,140 +471,33 @@ - - - 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 - 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 + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -749,58 +505,32 @@ F 5 - 288 - + 256 1 - 16th - - up - x - - - - - - - F - 5 - - 24 - - - - 1 - 128th + eighth + + 3 + 2 + eighth + up x - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - 192 + 256 1 - 16th + eighth + + 3 + 2 + eighth + + @@ -1023,22 +753,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1046,10 +779,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1060,13 +798,19 @@ F 4 - 768 + 512 2 quarter + + 3 + 2 + quarter + up normal + @@ -1248,22 +992,25 @@ - 384 - - 2 - eighth - - - - - - - 192 - + 512 2 - 16th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1271,10 +1018,15 @@ F 4 - 192 + 512 2 - 16th + quarter + + 3 + 2 + quarter + up normal @@ -1285,13 +1037,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..670e7daf 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-27 diff --git a/test/data/grooves/LATN10.musicxml b/test/data/grooves/LATN10.musicxml index f2402942..955d5fea 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-27 @@ -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..0f1f3a3f 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-27 diff --git a/test/data/grooves/LATN12.musicxml b/test/data/grooves/LATN12.musicxml index 2e12d8fa..3a9c2d02 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-27 diff --git a/test/data/grooves/LFusion.musicxml b/test/data/grooves/LFusion.musicxml index 8c03decb..a09540bf 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-27 diff --git a/test/data/grooves/LFusion1.musicxml b/test/data/grooves/LFusion1.musicxml index bd005d1b..112138a2 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-27 diff --git a/test/data/grooves/LFusion1Sus.musicxml b/test/data/grooves/LFusion1Sus.musicxml index 27af330f..fb705330 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-27 diff --git a/test/data/grooves/LFusionEnd.musicxml b/test/data/grooves/LFusionEnd.musicxml index 8f1ba2bc..056c4cad 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-27 @@ -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..137090de 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-27 @@ -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..54382e02 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-27 @@ -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..993cb383 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-27 diff --git a/test/data/grooves/LatinFusion.musicxml b/test/data/grooves/LatinFusion.musicxml index 25899da4..52ff7ae9 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-27 @@ -715,16 +715,14 @@ F 5 - 288 - + 576 1 - 16th + eighth up x - @@ -761,33 +759,40 @@ - + + + 192 + 1 + 16th + + + + F 5 - 192 - + 576 1 - 16th + eighth + up x - - + F 5 - 48 + 24 1 - 64th + 128th up x @@ -795,38 +800,78 @@ - + F 5 - 12 - + 6 1 - 256th + 512th up x - - + F 5 - 3 - + 384 1 - 1024th + eighth + up + x + + + + + + F + 5 + + 384 + + 1 + eighth + up + x + + + + + + + + F + 5 + + 384 + + 1 + eighth + up + x + + + + + + F + 5 + + 384 + + 1 + eighth up x - @@ -837,24 +882,22 @@ - + F 5 - 288 - + 576 1 - 16th + eighth up x - - + F 5 @@ -872,7 +915,7 @@ - + F 5 @@ -888,51 +931,40 @@ - - - F - 5 - + + 192 - - 1 16th - up - x - - + F 5 - 48 - - + 576 1 - 64th + eighth + up x - - - + F 5 - 12 + 24 1 - 256th + 128th up x @@ -940,23 +972,23 @@ - + F 5 - 3 + 6 1 - 1024th + 512th up x - + F 5 @@ -970,7 +1002,7 @@ - + F 5 @@ -985,22 +1017,16 @@ - - - - F - 5 - + + + 384 - 1 eighth - up - x - + F 5 @@ -1022,24 +1048,22 @@ - + F 5 - 288 - + 576 1 - 16th + eighth up x - - + F 5 @@ -1057,7 +1081,7 @@ - + F 5 @@ -1073,51 +1097,40 @@ - - - F - 5 - + + 192 - - 1 16th - up - x - - + F 5 - 48 - - + 576 1 - 64th + eighth + up x - - - + F 5 - 12 + 24 1 - 256th + 128th up x @@ -1125,188 +1138,201 @@ - + F 5 - 3 + 6 1 - 1024th + 512th up x - - - 192 - 1 - 16th - - - - + F 5 - 288 - + 384 1 - 16th - + eighth up x - - + F 5 - 24 - - + 384 1 - 128th + eighth up x - - - + + + F 5 - 6 - + 384 1 - 512th + eighth up x - - + F 5 - 192 - + 384 1 - 16th + eighth up x - - + F 5 - 48 - - + 512 1 - 64th + quarter + + 3 + 2 + quarter + up x - - + + + 3 + quarter + + + 2 + quarter + + - + F 5 - 12 - - + 256 1 - 256th + eighth + + 3 + 2 + quarter + up x - - + - + + + 192 + 1 + 16th + + + + F 5 - 3 - + 576 1 - 1024th + eighth + up x - - + F 5 - 384 + 24 + + 1 - eighth + 128th up x + + - + F 5 - 384 + 6 + 1 - eighth + 512th up x + - - - - + + + F + 5 + 384 + 1 eighth + up + x - + F 5 @@ -1320,237 +1346,244 @@ - - + + + + + + 768 + + + percussion + + + 1 + + + + + E + 4 + 192 + 1 16th + up + x - + - F - 5 + E + 4 - 288 - - + 192 + 1 16th - up - x + normal - - + - F - 5 + E + 4 - 24 - - - + 192 + 1 - 128th + 16th up x - - - + - F - 5 + E + 4 - 6 - - + 192 + 1 - 512th + 16th up x - - + - F - 5 + E + 4 192 - - + 1 16th up x - - + - F - 5 + E + 4 - 48 - - - + 192 + 1 - 64th + 16th up - x + normal - - - + - F - 5 + E + 4 - 12 - - - + 192 + 1 - 256th + 16th up x - - - F - 5 + E + 4 - 3 - - + 192 + 1 - 1024th + 16th up x - - - + + + E + 4 + 192 + 1 16th + up + x - + - F - 5 + E + 4 - 288 - - + 192 + 1 16th - up - x + normal - - + - F - 5 + E + 4 - 24 - - - + 192 + 1 - 128th + 16th up x - - - + - F - 5 + E + 4 - 6 - - + 192 + 1 - 512th + 16th up x - - + - F - 5 + E + 4 192 - - + 1 16th up x - - + - F - 5 + E + 4 - 48 - - - + 192 + 1 - 64th + 16th + up + normal + + + + + + E + 4 + + 384 + + 1 + eighth up x - - - + - F - 5 + E + 4 - 12 + 24 - + 1 - 256th + 128th up x @@ -1558,87 +1591,87 @@ - + - F - 5 + E + 4 - 3 + 6 - + 1 - 1024th + 512th up x - + + + - F - 5 + E + 4 - 384 - + 192 + 1 - eighth + 16th up x - + - F - 5 + E + 4 - 384 - + 192 + 1 - eighth + 16th up - x + normal - - - + - F - 5 + E + 4 - 384 - + 192 + 1 - eighth + 16th up x - + - F - 5 + E + 4 - 384 - + 192 + 1 - eighth + 16th up x - + - F - 5 + E + 4 192 - + 1 16th up @@ -1646,229 +1679,157 @@ - + - F - 5 + E + 4 - 288 - - + 192 + 1 16th - up - x + normal - - + - F - 5 + E + 4 - 24 - - - + 192 + 1 - 128th + 16th up x - - - + - F - 5 + E + 4 - 6 - - + 192 + 1 - 512th + 16th up x - - + - F - 5 + E + 4 192 - - + 1 16th up x - - + - F - 5 + E + 4 - 48 - - - + 192 + 1 - 64th + 16th up - x + normal - - - + - F - 5 + E + 4 - 12 - - - + 192 + 1 - 256th + 16th up x - - - + - F - 5 + E + 4 - 3 - - + 192 + 1 - 1024th + 16th up x - - - + + + E + 4 + 192 + 1 16th + up + x - + - F - 5 + E + 4 - 288 - - + 192 + 1 16th - up - x + normal - - + - F - 5 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 5 - - 6 - - - 1 - 512th - up - x - - - - - - - F - 5 - - 192 - - - 1 - 16th - up - x - - - - - - - F - 5 + E + 4 - 48 - - - + 384 + 1 - 64th + eighth up x - - - + - F - 5 + E + 4 - 12 + 24 - + 1 - 256th + 128th up x @@ -1876,67 +1837,24 @@ - + - F - 5 + E + 4 - 3 + 6 - + 1 - 1024th + 512th up x - - - F - 5 - - 384 - - 1 - eighth - up - x - - - - - - F - 5 - - 384 - - 1 - eighth - up - x - - - - - - - - 768 - - - percussion - - - 1 - - + E @@ -2138,15 +2056,13 @@ E 4 - 96 - + 384 1 - 32nd + eighth up x - @@ -2183,76 +2099,8 @@ - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - x - - - - - + E @@ -2454,15 +2302,13 @@ E 4 - 96 - + 384 1 - 32nd + eighth up x - @@ -2499,51 +2345,64 @@ - + + + + + + 768 + + + percussion + + + 1 + + + - E + F 4 - 192 - - + 384 + 1 - 16th + eighth up - x + normal - - + - E + F 4 - 48 + 96 - - + 1 - 64th + 32nd up x - - + - E + F 4 - 12 + 24 - + 1 - 256th + 128th up x @@ -2551,213 +2410,148 @@ - + - E + F 4 - 3 + 6 - + 1 - 1024th + 512th up x - - - - - E - 4 - - 192 - - 1 - 16th - up - x - - - - + - E + F 4 192 - + + 1 16th up normal + - - - E - 4 - - 192 - - 1 - 16th - up - x - - - - - - E - 4 - - 192 - - 1 - 16th - up - x - - - - - - E - 4 - - 192 - - 1 - 16th - up - x - - - - + - E + F 4 - 192 - + 48 + + + 1 - 16th + 64th up normal + + - - - E - 4 - - 192 - - 1 - 16th - up - x - - - - - - E - 4 - - 192 - - 1 - 16th - up - x - - - - + - E + F 4 - 192 - + 12 + + + 1 - 16th + 256th up - x + normal + + - + - E + F 4 - 192 - + 3 + + 1 - 16th + 1024th up normal + - - - E - 4 - - 192 - + + + 512 1 - 16th - up - x + quarter + + 3 + 2 + quarter + + + + 3 + quarter + + + 2 + quarter + + - + - E + F 4 - 192 - + 256 + 1 - 16th + eighth + + 3 + 2 + quarter + up - x + normal + - - - E - 4 - + + 192 - 1 16th - up - x - + - E + F 4 192 - + 1 16th up @@ -2765,14 +2559,14 @@ - + - E + F 4 96 - + 1 32nd up @@ -2781,15 +2575,15 @@ - + - E + F 4 24 - + 1 128th up @@ -2799,14 +2593,14 @@ - + - E + F 4 6 - + 1 512th up @@ -2815,265 +2609,321 @@ - + - E + F 4 192 - + 1 16th up - x + normal - + - E + F 4 48 - + 1 64th up - x + normal - + - E + F 4 12 - + 1 256th up - x + normal - + - E + F 4 3 - + 1 1024th up - x + normal - - - - - E - 4 - - 192 - + + + 768 1 - 16th - up - x + quarter - + + 3072 + + + + 768 + 2 + quarter + + + + - E + F 4 - 192 - - 1 - 16th + 768 + + 2 + quarter up normal - + + + 768 + 2 + quarter + + + + - E + F 4 - 192 - - 1 - 16th + 768 + + 2 + quarter up - x + normal - + + + - E + F 4 - 192 - + 384 + 1 - 16th + eighth up - x + normal - + - E + F 4 - 192 - + 96 + + 1 - 16th + 32nd up x + - E + F 4 - 192 - + 24 + + + 1 - 16th + 128th up - normal + x + + - + - E + F 4 - 192 - + 6 + + 1 - 16th + 512th up x + - + - E + F 4 192 - + + 1 16th up - x + normal + - + - E + F 4 - 192 - + 48 + + + 1 - 16th + 64th up - x + normal + + - + - E + F 4 - 192 - + 12 + + + 1 - 16th + 256th up normal + + - + - E + F 4 - 192 - + 3 + + 1 - 16th + 1024th up - x + normal + - + + + 512 + 1 + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + + + + - E + F 4 - 192 - + 256 + 1 - 16th + eighth + + 3 + 2 + quarter + up - x + normal + - - - E - 4 - + + 192 - 1 16th - up - x - + - E + F 4 192 - + 1 16th up @@ -3081,14 +2931,14 @@ - + - E + F 4 96 - + 1 32nd up @@ -3097,15 +2947,15 @@ - + - E + F 4 24 - + 1 128th up @@ -3115,14 +2965,14 @@ - + - E + F 4 6 - + 1 512th up @@ -3131,91 +2981,131 @@ - + - E + F 4 192 - + 1 16th up - x + normal - + - E + F 4 48 - + 1 64th up - x + normal - + - E + F 4 12 - + 1 256th up - x + normal - + - E + F 4 3 - + 1 1024th up - x + normal + + + 768 + 1 + quarter + + + + + 3072 + + + + 768 + 2 + quarter + + + + + + F + 4 + + 768 + + 2 + quarter + up + normal + + + + + + 768 + 2 + quarter + + + + + + F + 4 + + 768 + + 2 + quarter + up + normal + + + - - - - - 768 - - - percussion - - - 1 - - + F @@ -3587,7 +3477,7 @@ - + F @@ -3959,361 +3849,394 @@ - - - - F - 4 - - 384 - + + + + + 768 + + + percussion + + + 1 + + + + + 768 1 - eighth - up - normal + quarter - - - F - 4 - - 96 - - + + + 768 1 - 32nd - up - x + quarter - - - - F - 4 - - 24 - - - + + + 768 1 - 128th - up - x + quarter - - - + + + 384 + 1 + eighth + + + + - F + E 4 - 6 - - + 384 + 1 - 512th + eighth up x - - - - F - 4 - - 192 - - + + + + + 768 1 - 16th - up - normal + quarter - - - - F - 4 - - 48 - - - + + + 768 1 - 64th - up - normal + quarter - - - - - F - 4 - - 12 - - - + + + 768 1 - 256th - up - normal + quarter - - - + + + 384 + 1 + eighth + + + + - F + E 4 - 3 - - + 384 + 1 - 1024th + eighth up - normal + x - + + - 512 + 768 1 quarter - - 3 - 2 - quarter - - - - 3 - quarter - - - 2 - quarter - - - + + + 768 + 1 + quarter + + + + + + 768 + 1 + quarter + + + + + + 384 + 1 + eighth + + + + - F + E 4 - 256 - + 384 + 1 eighth - - 3 - 2 - quarter - up - normal + x - + + - 192 + 768 1 - 16th + quarter - - - F - 4 - - 192 - + + + 768 1 - 16th - up - normal + quarter - + + + 768 + 1 + quarter + + + + + + 384 + 1 + eighth + + + + - F + E 4 - 96 - - + 384 + 1 - 32nd + eighth up x - - + + + + + + 768 + + + percussion + + + 5 + + + F 4 - 24 - - - + 512 + 1 - 128th - up - x + quarter + + 3 + 2 + quarter + + down + normal - - + + + 3 + quarter + + + 2 + quarter + + - + F 4 - 6 - - + 512 + 1 - 512th - up - x + quarter + + 3 + 2 + quarter + + down + normal - - + F 4 - 192 - - + 512 + 1 - 16th - up + quarter + + 3 + 2 + quarter + + down normal - + - + F 4 - 48 - - - + 512 + 1 - 64th - up + quarter + + 3 + 2 + quarter + + down normal - - + + + 3 + quarter + + + 2 + quarter + + - + F 4 - 12 - - - + 512 + 1 - 256th - up + quarter + + 3 + 2 + quarter + + down normal - - - + F 4 - 3 - - + 512 + 1 - 1024th - up + quarter + + 3 + 2 + quarter + + down normal - + - - - 768 - 1 - quarter - - - - - 3072 - - - - 768 - 2 - quarter - - - - + + + F 4 - 768 - - 2 + 512 + + 1 quarter - up + + 3 + 2 + quarter + + down normal - - - - - 768 - 2 - quarter - + + + 3 + quarter + + + 2 + quarter + + @@ -4321,152 +4244,185 @@ F 4 - 768 - - 2 + 512 + + 1 quarter - up + + 3 + 2 + quarter + + down normal - - - + F 4 - 384 - + 512 + 1 - eighth - up + quarter + + 3 + 2 + quarter + + down normal + - + F 4 - 96 - - + 512 + 1 - 32nd - up - x + quarter + + 3 + 2 + quarter + + down + normal - + + + 3 + quarter + + + 2 + quarter + + - + F 4 - 24 - - - + 512 + 1 - 128th - up - x + quarter + + 3 + 2 + quarter + + down + normal - - - + F 4 - 6 - - + 512 + 1 - 512th - up - x + quarter + + 3 + 2 + quarter + + down + normal - + - + + + F 4 - 192 - - + 512 + 1 - 16th - up + quarter + + 3 + 2 + quarter + + down normal - + + + 3 + quarter + + + 2 + quarter + + - + F 4 - 48 - - - + 512 + 1 - 64th - up + quarter + + 3 + 2 + quarter + + down normal - - - + F 4 - 12 - - - + 512 + 1 - 256th - up + quarter + + 3 + 2 + quarter + + down normal - - + - + F 4 - 3 - - - 1 - 1024th - up - normal - - - - - - 512 + 1 quarter @@ -4474,6 +4430,8 @@ 2 quarter + down + normal @@ -4487,224 +4445,186 @@ - + F 4 - 256 - + 512 + 1 - eighth + quarter 3 2 quarter - up + down normal - - - - 192 - 1 - 16th - - - - + F 4 - 192 - + 512 + 1 - 16th - up + quarter + + 3 + 2 + quarter + + down normal + - - - F - 4 - - 96 - - - 1 - 32nd - up - x - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - x - - - - - + + + F 4 - 192 - - + 512 + 1 - 16th - up + quarter + + 3 + 2 + quarter + + down normal - + + + 3 + quarter + + + 2 + quarter + + - + F 4 - 48 - - - + 512 + 1 - 64th - up + quarter + + 3 + 2 + quarter + + down normal - - - + F 4 - 12 - - - + 512 + 1 - 256th - up + quarter + + 3 + 2 + quarter + + down normal - - + - + F 4 - 3 - - - 1 - 1024th - up - normal - - - - - - - 768 + 512 + 1 quarter + + 3 + 2 + quarter + + down + normal + + + 3 + quarter + + + 2 + quarter + + - - 3072 - - - - 768 - 2 - quarter - - - - + F 4 - 768 - - 2 + 512 + + 1 quarter - up + + 3 + 2 + quarter + + down normal - - - 768 - 2 - quarter - - - - + F 4 - 768 - - 2 + 512 + + 1 quarter - up + + 3 + 2 + quarter + + down normal + - + 768 @@ -4719,1957 +4639,28 @@ 1 - - - 768 - 1 - quarter - - - - - - 768 - 1 - quarter - - - - - - 768 - 1 - quarter - - - - - - 384 + + + F + 4 + + 576 + 1 eighth - - - - - - E - 4 - - 384 - - 1 - eighth - up - x - - - - - - - - 768 - 1 - quarter - - - - - - 768 - 1 - quarter - - - - - - 768 - 1 - quarter - - - - - - 384 - 1 - eighth - - - - - - E - 4 - - 384 - - 1 - eighth - up - x - - - - - - - - 768 - 1 - quarter - - - - - - 768 - 1 - quarter - - - - - - 768 - 1 - quarter - - - - - - 384 - 1 - eighth - - - - - - E - 4 - - 384 - - 1 - eighth - up - x - - - - - - - - 768 - 1 - quarter - - - - - - 768 - 1 - quarter - - - - - - 768 - 1 - quarter - - - - - - 384 - 1 - eighth - - - - - - E - 4 - - 384 - - 1 - eighth - up - x - - - - - - - - - 768 - - - percussion - - - 5 - - - - - F - 4 - - 512 - - 1 - quarter - - 3 - 2 - quarter - - down - normal - - - - 3 - quarter - - - 2 - quarter - - - - - - - F - 4 - - 256 - - 1 - eighth - - 3 - 2 - quarter - - down - normal - - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - F - 4 - - 512 - - 1 - quarter - - 3 - 2 - quarter - - down - normal - - - - 3 - quarter - - - 2 - quarter - - - - - - - F - 4 - - 256 - - 1 - eighth - - 3 - 2 - quarter - - down - normal - - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - - - F - 4 - - 512 - - 1 - quarter - - 3 - 2 - quarter - - down - normal - - - - 3 - quarter - - - 2 - quarter - - - - - - - F - 4 - - 256 - - 1 - eighth - - 3 - 2 - quarter - - down - normal - - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - F - 4 - - 512 - - 1 - quarter - - 3 - 2 - quarter - - down - normal - - - - 3 - quarter - - - 2 - quarter - - - - - - - F - 4 - - 256 - - 1 - eighth - - 3 - 2 - quarter - - down - normal - - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - - - F - 4 - - 512 - - 1 - quarter - - 3 - 2 - quarter - - down - normal - - - - 3 - quarter - - - 2 - quarter - - - - - - - F - 4 - - 256 - - 1 - eighth - - 3 - 2 - quarter - - down - normal - - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - F - 4 - - 512 - - 1 - quarter - - 3 - 2 - quarter - - down - normal - - - - 3 - quarter - - - 2 - quarter - - - - - - - F - 4 - - 256 - - 1 - eighth - - 3 - 2 - quarter - - down - normal - - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - - - F - 4 - - 512 - - 1 - quarter - - 3 - 2 - quarter - - down - normal - - - - 3 - quarter - - - 2 - quarter - - - - - - - F - 4 - - 256 - - 1 - eighth - - 3 - 2 - quarter - - down - normal - - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - F - 4 - - 512 - - 1 - quarter - - 3 - 2 - quarter - - down - normal - - - - 3 - quarter - - - 2 - quarter - - - - - - - F - 4 - - 256 - - 1 - eighth - - 3 - 2 - quarter - - down - normal - - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - - - - 768 - - - percussion - - - 1 - - - - - F - 4 - - 576 - - 1 - eighth - - up - normal - - - - - - F - 4 - - 192 - - 1 - 16th - up - normal - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - up - normal - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - up - normal - - - - - - 192 - 1 - 16th - - - - - - F - 4 - - 576 - - 1 - eighth - - up - normal - - - - - - - - F - 4 - - 576 - - 1 - eighth - - up - normal - - - - - - F - 4 - - 192 - - 1 - 16th - up - normal - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - up - normal - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - up - normal - - - - - - 192 - 1 - 16th - - - - - - F - 4 - - 576 - - 1 - eighth - - up - normal - - - - - - - - F - 4 - - 576 - - 1 - eighth - - up - normal - - - - - - F - 4 - - 192 - - 1 - 16th - up - normal - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - up - normal - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - up - normal - - - - - - 192 - 1 - 16th - - - - - - F - 4 - - 576 - - 1 - eighth - - up - normal - - - - - - - - F - 4 - - 576 - - 1 - eighth - - up - normal - - - - - - F - 4 - - 192 - - 1 - 16th - up - normal - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - up - normal - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - up - normal - - - - - - 192 - 1 - 16th - - - - - - F - 4 - - 576 - - 1 - eighth - - up - normal - - - - - - - - - 768 - - - percussion - - - 1 - - - - - 768 - 1 - quarter - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - up - normal - - - - - - 768 - 1 - quarter - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - up - normal - - - - - - - - 768 - 1 - quarter - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - up - normal - - - - - - 768 - 1 - quarter - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - up - normal - - - - - - - - 768 - 1 - quarter - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - up - normal - - - - - - 768 - 1 - quarter - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - up - normal - - - - - - - - 768 - 1 - quarter - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - up - normal - - - - - - 768 - 1 - quarter - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 384 - - 1 - eighth - up - normal - - - - - - - - - 768 - - - percussion - - - 1 - - - - - 384 - 1 - eighth - - - - - - E - 4 - - 384 - - 1 - eighth - up - normal - - - - - - 192 - 1 - 16th - - - - - - E - 4 - - 576 - - 1 - eighth - - up - normal - - - - - - E - 4 - - 576 - - 1 - eighth - - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - 384 - 1 - eighth - - - - - - E - 4 - - 384 - - 1 - eighth - up - normal - - - - - - - - 384 - 1 - eighth - - - - - - E - 4 - - 384 - - 1 - eighth - up - normal - - - - - - 192 - 1 - 16th - - - - - - E - 4 - - 576 - - 1 - eighth - - up - normal - - - - - - E - 4 - - 576 - - 1 - eighth - - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - 384 - 1 - eighth - - - - - - E - 4 - - 384 - - 1 - eighth - up - normal - - - - - - - - 384 - 1 - eighth - - - - - - E - 4 - - 384 - - 1 - eighth - up - normal - - - - - - 192 - 1 - 16th - - - - - - E - 4 - - 576 - - 1 - eighth - - up - normal - - - - - - E - 4 - - 576 - - 1 - eighth - - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - 384 - 1 - eighth - - - - - - E - 4 - - 384 - - 1 - eighth - up - normal - - - - - - - - 384 - 1 - eighth - - - - - - E - 4 - - 384 - - 1 - eighth - up - normal - - - - - - 192 - 1 - 16th - - - - - - E - 4 - - 576 - - 1 - eighth - - up - normal - - - - - - E - 4 - - 576 - - 1 - eighth - - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - 384 - 1 - eighth - - - - - - E - 4 - - 384 - - 1 - eighth - up - normal - - - - - - - - - 768 - - - percussion - - - 1 - - - - - E - 4 - - 192 - - 1 - 16th - 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 - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + up normal - - + - E + F 4 192 - + 1 16th up @@ -6677,132 +4668,97 @@ - - - E - 4 - - 288 - - + + + 384 1 - 16th - - up - normal + eighth - - + - E + F 4 - 24 - - - + 384 + 1 - 128th + eighth up normal - - - - - E - 4 - - 6 - - + + + 384 1 - 512th - up - normal + eighth - - + - E + F 4 - 192 - - + 384 + 1 - 16th + eighth up normal - - - - E - 4 - - 48 - - - + + + 192 1 - 64th - up - normal + 16th - - - + - E + F 4 - 12 - - - + 576 + 1 - 256th + eighth + up normal - - - + + + - E + F 4 - 3 - - + 576 + 1 - 1024th + eighth + up normal - - + - E + F 4 192 - + 1 16th up @@ -6810,456 +4766,495 @@ - - - E - 4 - + + 384 - 1 eighth - up - normal - + - E + F 4 - 192 - + 384 + 1 - 16th + eighth up normal - + + + 384 + 1 + eighth + + + + - E + F 4 - 192 - + 384 + 1 - 16th + eighth up normal - - - E - 4 - - 288 - - + + + 192 1 16th - - up - normal - - + - E + F 4 - 24 - - - + 576 + 1 - 128th + eighth + up normal - - - + + + - E + F 4 - 6 - - + 576 + 1 - 512th + eighth + up normal - - + - E + F 4 192 - - + 1 16th up normal - - + + + 384 + 1 + eighth + + + + - E + F 4 - 48 - - - + 384 + 1 - 64th + eighth up normal - - - + + + 384 + 1 + eighth + + + + - E + F 4 - 12 - - - + 384 + 1 - 256th + eighth up normal - - - + + + 192 + 1 + 16th + + + + - E + F 4 - 3 - - + 576 + 1 - 1024th + eighth + up normal - - - + + - E + F 4 - 192 - + 576 + 1 - 16th + eighth + up normal - + - E + F 4 - 288 - - + 192 + 1 16th - up normal - - + + + 384 + 1 + eighth + + + + - E + F 4 - 24 - - - + 384 + 1 - 128th + eighth up normal - - + + + + + 384 + 1 + eighth + - E + F 4 - 6 - - + 384 + 1 - 512th + eighth up normal - - - - E - 4 - + + 192 - - 1 16th - up - normal - - + - E + F 4 - 48 - - - + 576 + 1 - 64th + eighth + up normal - - - - - E - 4 - - 12 - - - + + + + + + 768 + + + percussion + + + 1 + + + + + 768 1 - 256th - up - normal + quarter - - - + + + 384 + 1 + eighth + + + + - E + F 4 - 3 - - + 384 + 1 - 1024th + eighth up normal - - + + + 768 + 1 + quarter + + + + + + 384 + 1 + eighth + + + + - E + F 4 - 192 - + 384 + 1 - 16th + eighth up normal - + + + + + 768 + 1 + quarter + + + + + + 384 + 1 + eighth + + + + - E + F 4 - 288 - - + 384 + 1 - 16th - + eighth up normal - - + + + 768 + 1 + quarter + + + + + + 384 + 1 + eighth + + + + - E + F 4 - 24 - - - + 384 + 1 - 128th + eighth up normal - - - + + + + + 768 + 1 + quarter + + + + + + 384 + 1 + eighth + + + + - E + F 4 - 6 - - + 384 + 1 - 512th + eighth up normal - - - - E - 4 - - 192 - - + + + 768 1 - 16th - up - normal + quarter - - - - E - 4 - - 48 - - - + + + 384 1 - 64th - up - normal + eighth - - - + - E + F 4 - 12 - - - + 384 + 1 - 256th + eighth up normal - - - - - E - 4 - - 3 - - + + + + + 768 1 - 1024th - up - normal + quarter - - - - E - 4 - - 192 - + + + 384 1 - 16th - up - normal + eighth - + - E + F 4 384 - + 1 eighth up @@ -7267,428 +5262,414 @@ - + + + 768 + 1 + quarter + + + + + + 384 + 1 + eighth + + + + - E + F 4 - 192 - + 384 + 1 - 16th + eighth up normal - + + + + + + 768 + + + percussion + + + 1 + + + + + 384 + 1 + eighth + + + + E 4 - 192 - + 384 + 1 - 16th + eighth up normal - - - E - 4 - - 288 - - + + + 192 1 16th - - up - normal - - + E 4 - 24 - - - + 576 + 1 - 128th + eighth + up normal - - - + E 4 - 6 - - + 576 + 1 - 512th + eighth + up normal - - + E 4 192 - - + 1 16th up normal - - - - E - 4 - - 48 - - - + + + 384 1 - 64th - up - normal + eighth - - - + E 4 - 12 - - - + 384 + 1 - 256th + eighth up normal - - - - - E - 4 - - 3 - - + + + + + 384 1 - 1024th - up - normal + eighth - - - - + E 4 - 192 - + 384 + 1 - 16th + eighth up normal - - - E - 4 - - 288 - - + + + 192 1 16th - - up - normal - - + E 4 - 24 - - - + 576 + 1 - 128th + eighth + up normal - - - + E 4 - 6 - - + 576 + 1 - 512th + eighth + up normal - - + E 4 192 - - + 1 16th up normal - - - - E - 4 - - 48 - - - + + + 384 1 - 64th - up - normal + eighth - - - + E 4 - 12 - - - + 384 + 1 - 256th + eighth up normal - - - + + + + + 384 + 1 + eighth + + + + E 4 - 3 - - + 384 + 1 - 1024th + eighth up normal - - - - E - 4 - + + 192 - 1 16th - up - normal - + E 4 - 288 - - + 576 + 1 - 16th + eighth up normal - - + E 4 - 24 - - - + 576 + 1 - 128th + eighth + up normal - - - + E 4 - 6 - - + 192 + 1 - 512th + 16th up normal - - + + + 384 + 1 + eighth + + + + E 4 - 192 - - + 384 + 1 - 16th + eighth up normal - - + + + + + 384 + 1 + eighth + + + + E 4 - 48 - - - + 384 + 1 - 64th + eighth up normal - - - + + + 192 + 1 + 16th + + + + E 4 - 12 - - - + 576 + 1 - 256th + eighth + up normal - - - + E 4 - 3 - - + 576 + 1 - 1024th + eighth + up normal - - + E 4 192 - + 1 16th up @@ -7696,13 +5677,21 @@ - + + + 384 + 1 + eighth + + + + E 4 384 - + 1 eighth up @@ -7710,99 +5699,147 @@ - + + + + + + 768 + + + percussion + + + 1 + + + E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + quarter + up normal + - + E 4 - 288 - + 512 1 - 16th - + quarter + + 3 + 2 + quarter + up normal - + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + quarter + up normal - - + - + E 4 - 6 - + 192 1 - 512th + 16th up normal - - + E 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -7810,35 +5847,42 @@ E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 512 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -7846,215 +5890,290 @@ E 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + - + E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 288 - + 256 1 - 16th - + eighth + + 3 + 2 + quarter + up normal - + - + E 4 - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + quarter + up normal - + - + E 4 192 - 1 16th up normal - - + E 4 - 48 - - + 384 1 - 64th + eighth up normal - - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - - + E 4 - 3 - + 512 1 - 1024th + quarter + + 3 + 2 + quarter + up normal - + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + quarter + up normal + - + + + E 4 - 288 - + 512 1 - 16th - + quarter + + 3 + 2 + quarter + up normal - + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + quarter + up normal - - + - + E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + + + 3 + quarter + + + 2 + quarter + + @@ -8062,190 +6181,238 @@ E 4 - 192 - + 256 1 - 16th + eighth + + 3 + 2 + quarter + up normal - + - + E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 384 1 - 256th + eighth up normal - - - + E 4 - 3 - + 192 1 - 1024th + 16th up normal - - + E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 384 + 256 1 eighth + + 3 + 2 + quarter + up normal + - + + + E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + quarter + up normal + - + E 4 - 288 - + 512 1 - 16th - + quarter + + 3 + 2 + quarter + up normal - + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + quarter + up normal - - + - + E 4 - 6 - + 192 1 - 512th + 16th up normal - - + E 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -8253,35 +6420,42 @@ E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 512 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -8289,15 +6463,19 @@ E 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/LatinFusionIntro.musicxml b/test/data/grooves/LatinFusionIntro.musicxml index b8bc7b2a..ab64f3ed 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-27 @@ -797,16 +797,14 @@ F 5 - 288 - + 576 1 - 16th + eighth up x - @@ -843,74 +841,6 @@ - - - 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 - - - - 192 @@ -924,16 +854,14 @@ F 5 - 288 - + 576 1 - 16th + eighth up x - @@ -970,74 +898,6 @@ - - - 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 @@ -1103,16 +963,14 @@ F 5 - 288 - + 576 1 - 16th + eighth up x - @@ -1149,51 +1007,40 @@ - - - F - 5 - + + 192 - - 1 16th - up - x - - + F 5 - 48 - - + 576 1 - 64th + eighth + up x - - - + F 5 - 12 + 24 1 - 256th + 128th up x @@ -1201,210 +1048,83 @@ - + F 5 - 3 + 6 1 - 1024th + 512th up x - - - 192 - 1 - 16th - - - - + F 5 - 288 - + 384 1 - 16th - + eighth up x - - + F 5 - 24 - - + 384 1 - 128th + eighth up x - - - + + + F 5 - 6 - + 768 1 - 512th + quarter up x - - - - F - 5 - - 192 - - + + + 768 1 - 16th - up - x + quarter - - + F 5 - 48 - - + 768 1 - 64th - up - x - - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - - - 1 - 1024th - up - x - - - - - - - F - 5 - - 384 - - 1 - eighth - up - x - - - - - - F - 5 - - 384 - - 1 - eighth - up - x - - - - - - - - F - 5 - - 768 - - 1 - quarter - up - x - - - - - - 768 - 1 - quarter - - - - - - F - 5 - - 768 - - 1 - quarter + quarter up x @@ -1806,15 +1526,13 @@ E 4 - 96 - + 384 1 - 32nd + eighth up x - @@ -1851,74 +1569,6 @@ - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - x - - - - @@ -2122,15 +1772,13 @@ E 4 - 96 - + 384 1 - 32nd + eighth up x - @@ -2167,74 +1815,6 @@ - - - E - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - x - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - x - - - - @@ -3527,10 +3107,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -3539,7 +3119,6 @@ down normal - @@ -3547,13 +3126,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + down normal + @@ -3590,10 +3175,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -3602,7 +3187,6 @@ down normal - @@ -3610,14 +3194,20 @@ F 4 - 768 + 512 1 quarter - down - normal - - + + 3 + 2 + quarter + + down + normal + + + @@ -3655,10 +3245,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -3667,7 +3257,6 @@ down normal - @@ -3675,13 +3264,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + down normal + @@ -3718,10 +3313,10 @@ F 4 - 256 + 512 1 - eighth + quarter 3 2 @@ -3730,7 +3325,6 @@ down normal - @@ -3738,13 +3332,19 @@ F 4 - 768 + 512 1 quarter + + 3 + 2 + quarter + down normal + @@ -4836,197 +4436,268 @@ E 4 - 192 + 512 1 - 16th + quarter + + 3 + 2 + quarter + up normal + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 288 - + 256 1 - 16th - + eighth + + 3 + 2 + quarter + up normal - + - + E 4 - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + quarter + up normal - + - + E 4 192 - 1 16th up normal - - + E 4 - 48 - - + 384 1 - 64th + eighth up normal - - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - - + E 4 - 3 - + 512 1 - 1024th + quarter + + 3 + 2 + quarter + up normal - + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 192 + 256 1 - 16th + eighth + + 3 + 2 + quarter + up normal + - + + + E 4 - 288 - + 512 1 - 16th - + quarter + + 3 + 2 + quarter + up normal - + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 24 - - + 256 1 - 128th + eighth + + 3 + 2 + quarter + up normal - - + - + E 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + up normal - + + + 3 + quarter + + + 2 + quarter + + @@ -5034,937 +4705,190 @@ E 4 - 192 - + 256 1 - 16th + eighth + + 3 + 2 + quarter + up normal - + - + E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 384 1 - 256th - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 384 - - 1 - eighth - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 - 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 - - 288 - - - 1 - 16th - - 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 - - 192 - - 1 - 16th - 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 - 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 - - 384 - - 1 - eighth - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - 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 - 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 - - 288 - - - 1 - 16th - - 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 - - 192 - - 1 - 16th + eighth up normal - + E 4 - 288 - + 192 1 16th - up normal - - + E 4 - 24 - - + 512 1 - 128th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + - + E 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + quarter + 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 - - + 512 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -5972,15 +4896,19 @@ E 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + @@ -6030,116 +4958,28 @@ E 4 - 192 - - 1 - 16th - 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 - up - normal - - - - - - - E - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - E - 4 - - 12 - - + 512 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -6147,15 +4987,19 @@ E 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/LatinHouse.musicxml b/test/data/grooves/LatinHouse.musicxml index 6b0c5a53..66091849 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-27 diff --git a/test/data/grooves/LatinHouseEnd.musicxml b/test/data/grooves/LatinHouseEnd.musicxml index 04ac2e36..31d5a1a4 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-27 @@ -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..1b5dee98 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-27 @@ -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..09255283 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-27 diff --git a/test/data/grooves/LatinWaltzEnd.musicxml b/test/data/grooves/LatinWaltzEnd.musicxml index 5e1e6732..67df619e 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-27 diff --git a/test/data/grooves/LatinWaltzFill.musicxml b/test/data/grooves/LatinWaltzFill.musicxml index 648dee5d..d7e3d292 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-27 diff --git a/test/data/grooves/LatinWaltzIntro.musicxml b/test/data/grooves/LatinWaltzIntro.musicxml index 36155896..21768629 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-27 diff --git a/test/data/grooves/LatinWaltzIntro8.musicxml b/test/data/grooves/LatinWaltzIntro8.musicxml index e59d6099..4169cffc 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-27 diff --git a/test/data/grooves/LatinWaltzPlus.musicxml b/test/data/grooves/LatinWaltzPlus.musicxml index 36494958..def8b841 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-27 diff --git a/test/data/grooves/LatinWaltzSus.musicxml b/test/data/grooves/LatinWaltzSus.musicxml index 505288c6..bd03041c 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-27 diff --git a/test/data/grooves/LatinWaltzSusPlus.musicxml b/test/data/grooves/LatinWaltzSusPlus.musicxml index b6200da1..d1775927 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-27 diff --git a/test/data/grooves/Lfusion1End.musicxml b/test/data/grooves/Lfusion1End.musicxml index 36b13743..3592e235 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-27 @@ -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..ae672d96 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-27 diff --git a/test/data/grooves/LightTango1.musicxml b/test/data/grooves/LightTango1.musicxml index d276fb9b..a6c9ef5f 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-27 diff --git a/test/data/grooves/LightTango1Sus.musicxml b/test/data/grooves/LightTango1Sus.musicxml index 48e49007..9c16e3e5 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-27 diff --git a/test/data/grooves/LightTango4End.musicxml b/test/data/grooves/LightTango4End.musicxml index 9adb1a9f..ab18ecbe 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-27 diff --git a/test/data/grooves/LightTangoEnd.musicxml b/test/data/grooves/LightTangoEnd.musicxml index 4b338239..4980be9a 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-27 diff --git a/test/data/grooves/LightTangoFill.musicxml b/test/data/grooves/LightTangoFill.musicxml index 30cea27d..eb13bf22 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-27 diff --git a/test/data/grooves/LightTangoIntro.musicxml b/test/data/grooves/LightTangoIntro.musicxml index aa26d8a7..81d1ce5e 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-27 diff --git a/test/data/grooves/LightTangoIntro1.musicxml b/test/data/grooves/LightTangoIntro1.musicxml index 3b2d4372..2df3e1fc 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-27 diff --git a/test/data/grooves/LightTangoSus.musicxml b/test/data/grooves/LightTangoSus.musicxml index 6ef46cf8..a92e1af2 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-27 diff --git a/test/data/grooves/MTL01.musicxml b/test/data/grooves/MTL01.musicxml index 2e59546c..c830a230 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-27 @@ -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..d315b8d3 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-27 diff --git a/test/data/grooves/MTL03.musicxml b/test/data/grooves/MTL03.musicxml index 257cb6a6..878d095a 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-27 diff --git a/test/data/grooves/MTL04.musicxml b/test/data/grooves/MTL04.musicxml index 568d23eb..e7e69659 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-27 @@ -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..4efb896b 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-27 diff --git a/test/data/grooves/Mambo1.musicxml b/test/data/grooves/Mambo1.musicxml index cd8f8304..a724b4aa 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-27 diff --git a/test/data/grooves/Mambo1Sus.musicxml b/test/data/grooves/Mambo1Sus.musicxml index cad081b5..bc4ca405 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-27 diff --git a/test/data/grooves/Mambo2.musicxml b/test/data/grooves/Mambo2.musicxml index 94268ea6..ddf04fb2 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-27 diff --git a/test/data/grooves/Mambo2Sus.musicxml b/test/data/grooves/Mambo2Sus.musicxml index 7312266f..249389c6 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-27 diff --git a/test/data/grooves/Mambo3.musicxml b/test/data/grooves/Mambo3.musicxml index 96f20d98..bcda6e70 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-27 diff --git a/test/data/grooves/Mambo3Sus.musicxml b/test/data/grooves/Mambo3Sus.musicxml index d5f4b34f..2d3e0491 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-27 diff --git a/test/data/grooves/MamboBreakAA.musicxml b/test/data/grooves/MamboBreakAA.musicxml index f04d7a68..686e6826 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-27 @@ -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..d58c9dd8 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-27 @@ -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..f4efa277 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-27 diff --git a/test/data/grooves/MamboEndingA.musicxml b/test/data/grooves/MamboEndingA.musicxml index 09f93410..db8756be 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-27 diff --git a/test/data/grooves/MamboEndingB.musicxml b/test/data/grooves/MamboEndingB.musicxml index 919de968..dcddeb08 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-27 @@ -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..1efde91e 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-27 @@ -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..4c9a05da 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-27 diff --git a/test/data/grooves/MamboFillBA.musicxml b/test/data/grooves/MamboFillBA.musicxml index a5a0c67b..c1167a8d 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-27 diff --git a/test/data/grooves/MamboFillBB.musicxml b/test/data/grooves/MamboFillBB.musicxml index cb2d7702..c7802d30 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-27 @@ -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..a463ffff 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-27 diff --git a/test/data/grooves/MamboIntroA.musicxml b/test/data/grooves/MamboIntroA.musicxml index e353783d..1c43ff0b 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-27 @@ -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..3a979572 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-27 diff --git a/test/data/grooves/MamboMainA.musicxml b/test/data/grooves/MamboMainA.musicxml index 9f568d49..7cac8643 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-27 @@ -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..2c86f1a5 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-27 @@ -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..3fe17c76 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-27 diff --git a/test/data/grooves/Maqsum.musicxml b/test/data/grooves/Maqsum.musicxml index 9023240a..32627c1e 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-27 diff --git a/test/data/grooves/March.musicxml b/test/data/grooves/March.musicxml index 53921797..9e898722 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-27 diff --git a/test/data/grooves/March1.musicxml b/test/data/grooves/March1.musicxml index 5f0b6f82..66972289 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-27 diff --git a/test/data/grooves/March1End.musicxml b/test/data/grooves/March1End.musicxml index bdfd7a94..927acb65 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-27 diff --git a/test/data/grooves/March1Intro.musicxml b/test/data/grooves/March1Intro.musicxml index f6b90855..fcc0b548 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-27 diff --git a/test/data/grooves/March1Slow.musicxml b/test/data/grooves/March1Slow.musicxml index a7574a68..dec29d0d 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-27 diff --git a/test/data/grooves/March2.musicxml b/test/data/grooves/March2.musicxml index 8d0ebf79..4b4ab94c 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-27 diff --git a/test/data/grooves/March3.musicxml b/test/data/grooves/March3.musicxml index e8371e46..3d4ef70a 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-27 diff --git a/test/data/grooves/March4.musicxml b/test/data/grooves/March4.musicxml index 21c710cc..52860952 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-27 diff --git a/test/data/grooves/MarchEnd.musicxml b/test/data/grooves/MarchEnd.musicxml index 8dc1cba1..9dadd7d9 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-27 diff --git a/test/data/grooves/MellowJazz.musicxml b/test/data/grooves/MellowJazz.musicxml index b0d640b1..2a4abf23 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-27 diff --git a/test/data/grooves/MellowJazzEnd.musicxml b/test/data/grooves/MellowJazzEnd.musicxml index 372d0a8e..081ee090 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-27 diff --git a/test/data/grooves/MellowJazzFill.musicxml b/test/data/grooves/MellowJazzFill.musicxml index 9f9cfea2..0affda3b 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-27 diff --git a/test/data/grooves/MellowJazzIntro.musicxml b/test/data/grooves/MellowJazzIntro.musicxml index a20c2b1a..04320e60 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-27 diff --git a/test/data/grooves/MellowJazzPlus.musicxml b/test/data/grooves/MellowJazzPlus.musicxml index a47b0509..0ed4be15 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-27 diff --git a/test/data/grooves/MellowJazzSus.musicxml b/test/data/grooves/MellowJazzSus.musicxml index 0246558b..35c00a1a 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-27 diff --git a/test/data/grooves/MellowJazzSusPlus.musicxml b/test/data/grooves/MellowJazzSusPlus.musicxml index 1dd10125..5bf67987 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-27 diff --git a/test/data/grooves/MellowRB.musicxml b/test/data/grooves/MellowRB.musicxml index 137dd9fa..a9a83048 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-27 @@ -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..1919ceae 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-27 diff --git a/test/data/grooves/MellowRBIntro.musicxml b/test/data/grooves/MellowRBIntro.musicxml index 39eaff94..2e4200f7 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-27 @@ -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..8ac25103 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-27 diff --git a/test/data/grooves/Merengue1.musicxml b/test/data/grooves/Merengue1.musicxml index 3977715d..3edd6124 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-27 diff --git a/test/data/grooves/Merengue1Sus.musicxml b/test/data/grooves/Merengue1Sus.musicxml index ea1d6061..1465f387 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-27 diff --git a/test/data/grooves/Merengue2.musicxml b/test/data/grooves/Merengue2.musicxml index 118df04b..da2ba3f6 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-27 diff --git a/test/data/grooves/Merengue2Sus.musicxml b/test/data/grooves/Merengue2Sus.musicxml index 28473b37..8f552dca 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-27 diff --git a/test/data/grooves/MerengueEnd.musicxml b/test/data/grooves/MerengueEnd.musicxml index e83f852b..a2dca345 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-27 diff --git a/test/data/grooves/MerengueIntro.musicxml b/test/data/grooves/MerengueIntro.musicxml index 5d24e7f4..37dc313a 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-27 diff --git a/test/data/grooves/MerengueSus.musicxml b/test/data/grooves/MerengueSus.musicxml index bea846ad..c6667815 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-27 diff --git a/test/data/grooves/Metronome2-4.musicxml b/test/data/grooves/Metronome2-4.musicxml index 4ccf8698..544f65a2 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-27 diff --git a/test/data/grooves/Metronome2.musicxml b/test/data/grooves/Metronome2.musicxml index 665f0848..e34adaf4 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-27 diff --git a/test/data/grooves/Metronome3.musicxml b/test/data/grooves/Metronome3.musicxml index b0cb5370..57647d72 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-27 diff --git a/test/data/grooves/Metronome4.musicxml b/test/data/grooves/Metronome4.musicxml index 3cca3945..80ded7f6 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-27 diff --git a/test/data/grooves/Metronome6.musicxml b/test/data/grooves/Metronome6.musicxml index c59f03ee..d5cd2d46 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-27 @@ -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..3b2388a8 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-27 @@ -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..0bb54246 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-27 diff --git a/test/data/grooves/MidE02.musicxml b/test/data/grooves/MidE02.musicxml index aef5f3ed..dddb42c1 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-27 @@ -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..58d51bd6 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-27 @@ -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,1516 +333,472 @@ - 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 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + - + E 4 - 384 - + 512 1 - eighth + quarter + + 3 + 2 + quarter + up normal - + - + + + + + + 768 + + + percussion + + + 5 + + + - E - 4 + F + 5 - 96 - - - + 512 + 1 - 32nd + quarter + + 3 + 2 + quarter + up - normal + x - - + + + 3 + quarter + + + 2 + quarter + + - + - E - 4 + F + 5 - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - + 256 + 1 - 512th + eighth + + 3 + 2 + quarter + up - normal - - - - - - - - - 768 - 1 - quarter - - - - - - 192 - - 1 - 16th + x - + - 48 - - + 256 1 - 64th + eighth + + 3 + 2 + quarter + - - + + + 3 + eighth + + + 2 + quarter + + - - - 12 - - + + + F + 5 + + 512 + 1 - 256th + quarter + + 3 + 2 + quarter + + up + x - - + - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + - + + + 3 + eighth + + + 2 + quarter + + - + - E - 4 + F + 5 - 384 - - + 512 + 1 - eighth + quarter + + 3 + 2 + quarter + up - normal + x - + - E - 4 + F + 5 - 96 - - - + 512 + 1 - 32nd + quarter + + 3 + 2 + quarter + up - normal + x - - + + + 3 + quarter + + + 2 + quarter + + - + - E - 4 + F + 5 - 24 - - - + 256 + 1 - 128th + eighth + + 3 + 2 + quarter + up - normal + x - - + - + + + - E - 4 + F + 5 - 6 - - - 1 - 512th - up - normal - - - - - - - 768 + 512 + 1 quarter + + 3 + 2 + quarter + + up + x + + + 3 + quarter + + + 2 + quarter + + - - - 192 - + + + F + 5 + + 256 + 1 - 16th + eighth + + 3 + 2 + quarter + + up + x - + - 48 - - + 256 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 - - - percussion - - - 5 - - - - - F - 5 - - 512 - - 1 - quarter - - 3 - 2 - quarter - - up - x + eighth + + 3 + 2 + quarter + 3 - quarter + eighth 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 - - - - - - - F - 5 - - 512 - - 1 - quarter - - 3 - 2 - quarter - - up - x - - - - 3 - quarter - - - 2 - quarter - - - - - - - F - 5 - - 256 - - 1 - eighth - - 3 - 2 - quarter - - up - x - - - - - - - - - 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 - - - - - - - F - 5 - - 768 - - 1 - quarter - up - x - - - - - - - - - 768 - - - percussion - - - 1 - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 96 - - - 1 - 32nd - up - x - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - x - - - - - - - F - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - F - 4 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - up - x - - - - - - - 768 - 1 - quarter - - - - - - 384 - 1 - eighth - - - - - - F - 4 - - 96 - - - 1 - 32nd - up - x - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - x - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - x - - - - - - - F - 4 - - 192 - - - 1 - 16th - up - x - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - x - - - - - - - - F - 4 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 4 - - 3 - - - 1 - 1024th - up - x - - - - - - - 768 - 1 - quarter - - - - - 3072 - - - - 768 - 2 - quarter - - - - - - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - - - - - - F - 4 - - 384 - - - 2 - eighth - up - normal - - - - - - - F - 4 - - 96 - - - - 2 - 32nd - up - normal - - - - - - - - F - 4 - - 24 - - - - 2 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 2 - 512th - up - normal - - - - - - - 768 - 2 - quarter - - - - - - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - - 2 - 1024th - - + + - + F - 4 + 5 - 384 - - - 2 - eighth + 512 + + 1 + quarter + + 3 + 2 + quarter + up - normal + x - + - - - F - 4 - - 96 - - - - 2 - 32nd - up - normal + + + 512 + 1 + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + - + F - 4 + 5 - 24 - - - - 2 - 128th + 512 + + 1 + quarter + + 3 + 2 + quarter + up - normal + x - - F - 4 + 5 - 6 - - - 2 - 512th + 512 + + 1 + quarter + + 3 + 2 + quarter + up - normal + x - + - + + + + + 768 + + + percussion + + + 1 + + 384 @@ -1872,15 +812,13 @@ F 4 - 96 - + 384 1 - 32nd + eighth up x - @@ -1917,33 +855,47 @@ - + + + 768 + 1 + quarter + + + + + + 384 + 1 + eighth + + + + F 4 - 192 - + 384 1 - 16th + eighth up x - - + F 4 - 48 + 24 1 - 64th + 128th up x @@ -1951,48 +903,137 @@ - + F 4 - 12 - + 6 1 - 256th + 512th up x - - + + + 768 + 1 + quarter + + + + + 3072 + + + + 768 + 2 + quarter + + + + + + 256 + 2 + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + + + + F 4 - 3 - - - 1 - 1024th + 512 + + 2 + quarter + + 3 + 2 + quarter + up - x + normal - + 768 - 1 + 2 + quarter + + + + + + 256 + 2 + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + + + + + + F + 4 + + 512 + + 2 quarter + + 3 + 2 + quarter + + up + normal + + + 384 @@ -2006,15 +1047,13 @@ F 4 - 96 - + 384 1 - 32nd + eighth up x - @@ -2051,51 +1090,47 @@ - - - F - 4 - - 192 - - + + + 768 1 - 16th - up - x + quarter - - + + + 384 + 1 + eighth + + + + F 4 - 48 - - + 384 1 - 64th + eighth up x - - - + F 4 - 12 + 24 1 - 256th + 128th up x @@ -2103,16 +1138,16 @@ - + F 4 - 3 + 6 1 - 1024th + 512th up x @@ -2140,98 +1175,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 +1201,19 @@ F 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up normal - + @@ -2260,98 +1226,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 +1252,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..ceeba5f2 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-27 @@ -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..96949419 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-27 @@ -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..4f30dc02 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-27 @@ -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..536f12f8 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-27 @@ -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..c1dd422d 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-27 @@ -247,453 +247,7 @@ - - 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 - - 189 - - 1 - 32nd - - - - - - 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 @@ -707,25 +261,6 @@ - - - E - 4 - - 189 - - 1 - 32nd - - - - - - up - normal - - - E @@ -745,184 +280,28 @@ E 4 - 189 - - 1 - 32nd - - - - - - 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 - - + 128 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 +309,18 @@ E 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - @@ -948,15 +328,19 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + @@ -973,25 +357,6 @@ - - - E - 4 - - 189 - - 1 - 32nd - - - - - - up - normal - - - E @@ -1007,38 +372,18 @@ + E 4 - 189 - - 1 - 32nd - - - - - - up - normal - - - - - - E - 4 - - 48 - + 192 1 - 64th + 16th up normal - @@ -1046,17 +391,13 @@ E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -1064,15 +405,28 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1080,15 +434,18 @@ E 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + up normal - @@ -1096,17 +453,19 @@ E 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + up normal - - + @@ -1114,15 +473,13 @@ E 4 - 6 - + 192 1 - 512th + 16th up normal - @@ -1130,33 +487,28 @@ E 4 - 96 - + 192 1 - 32nd + 16th up normal - + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - @@ -1164,15 +516,13 @@ E 4 - 6 - + 192 1 - 512th + 16th up normal - @@ -1180,15 +530,28 @@ E 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1196,17 +559,18 @@ E 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - @@ -1214,15 +578,19 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + @@ -1239,27 +607,6 @@ - - - E - 4 - - 189 - - 1 - 32nd - - - - - - up - normal - - - - - E @@ -1275,19 +622,18 @@ + E 4 - 48 - + 192 1 - 64th + 16th up normal - @@ -1295,17 +641,13 @@ E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -1313,15 +655,28 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1329,15 +684,18 @@ E 4 - 384 - + 128 1 - eighth + 16th + + 3 + 2 + 16th + up normal - @@ -1345,17 +703,19 @@ E 4 - 96 - - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + up normal - - + @@ -1363,33 +723,29 @@ E 4 - 24 - - + 192 1 - 128th + 16th 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..8bde8491 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-27 @@ -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..77e0e311 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-27 @@ -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..27e9ca78 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-27 @@ -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..899316a2 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-27 @@ -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..96c5c0fb 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-27 @@ -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..64aa2128 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-27 diff --git a/test/data/grooves/ModernJazzFill.musicxml b/test/data/grooves/ModernJazzFill.musicxml index 2feecb48..f1e99bff 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-27 diff --git a/test/data/grooves/ModernJazzIntro.musicxml b/test/data/grooves/ModernJazzIntro.musicxml index e8a40e48..920262e4 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-27 diff --git a/test/data/grooves/ModernJazzSus.musicxml b/test/data/grooves/ModernJazzSus.musicxml index c4866f3e..63d1208f 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-27 @@ -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..6ac2b1bd 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-27 diff --git a/test/data/grooves/ModernJazzWaltz1.musicxml b/test/data/grooves/ModernJazzWaltz1.musicxml index 90a1b26f..c12c5ef7 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-27 diff --git a/test/data/grooves/ModernJazzWaltz1Sus.musicxml b/test/data/grooves/ModernJazzWaltz1Sus.musicxml index c0752e10..fd1dcd0c 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-27 diff --git a/test/data/grooves/ModernJazzWaltz2.musicxml b/test/data/grooves/ModernJazzWaltz2.musicxml index 8bd27ed6..59581bca 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-27 diff --git a/test/data/grooves/ModernJazzWaltz2Sus.musicxml b/test/data/grooves/ModernJazzWaltz2Sus.musicxml index e1c7e8f4..d5ff8a14 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-27 diff --git a/test/data/grooves/ModernJazzWaltzEnd.musicxml b/test/data/grooves/ModernJazzWaltzEnd.musicxml index 0734b131..06776451 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-27 diff --git a/test/data/grooves/ModernJazzWaltzFill.musicxml b/test/data/grooves/ModernJazzWaltzFill.musicxml index 513e0a45..706847c7 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-27 diff --git a/test/data/grooves/ModernJazzWaltzIntro.musicxml b/test/data/grooves/ModernJazzWaltzIntro.musicxml index 391910d7..4e4de6a6 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-27 @@ -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..162ad1d5 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-27 diff --git a/test/data/grooves/ModernR&B.musicxml b/test/data/grooves/ModernR&B.musicxml index be4b788e..b30e2dcb 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-27 diff --git a/test/data/grooves/ModernR&BEnd.musicxml b/test/data/grooves/ModernR&BEnd.musicxml index f4b3ce04..20512b16 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-27 diff --git a/test/data/grooves/ModernR&BIntro.musicxml b/test/data/grooves/ModernR&BIntro.musicxml index d5b75469..1040a4f1 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-27 diff --git a/test/data/grooves/NiteJazz.musicxml b/test/data/grooves/NiteJazz.musicxml index 45a1f077..5da3b9c8 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-27 diff --git a/test/data/grooves/NiteJazzEnd.musicxml b/test/data/grooves/NiteJazzEnd.musicxml index 89638ac0..a11b84b6 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-27 diff --git a/test/data/grooves/NiteJazzIntro.musicxml b/test/data/grooves/NiteJazzIntro.musicxml index 76fac30c..97002ea4 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-27 diff --git a/test/data/grooves/NiteJazzPlus.musicxml b/test/data/grooves/NiteJazzPlus.musicxml index 46620070..1f838ce0 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-27 diff --git a/test/data/grooves/NiteJazzSus.musicxml b/test/data/grooves/NiteJazzSus.musicxml index ff9abb66..98ff8313 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-27 diff --git a/test/data/grooves/NiteJazzSusPlus.musicxml b/test/data/grooves/NiteJazzSusPlus.musicxml index fa27f3c9..f1d060a0 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-27 diff --git a/test/data/grooves/OldieBallad.musicxml b/test/data/grooves/OldieBallad.musicxml index b7835709..70b4ed5b 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-27 @@ -684,15 +684,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -747,172 +745,18 @@ - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - x - - - - G 5 - 96 - + 384 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 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - - - - - - G - 5 - - 3 - - - 3 - 1024th + eighth up x - diff --git a/test/data/grooves/OldieBalladEnd.musicxml b/test/data/grooves/OldieBalladEnd.musicxml index d29a08a5..ffd959e2 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-27 diff --git a/test/data/grooves/OldieBalladIntro.musicxml b/test/data/grooves/OldieBalladIntro.musicxml index 7ae5be6b..1d67cc46 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-27 @@ -663,155 +663,23 @@ - - - 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 - - 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 @@ -819,17 +687,17 @@ 48 - + 3 64th up - x + circle-x - + G 5 @@ -837,82 +705,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,102 +765,32 @@ G 5 - 6 - - - 3 - 512th - 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 - + 768 3 - 1024th + quarter up x - - + G 5 192 - + 3 16th up - x + circle-x - + G 5 @@ -1023,67 +798,17 @@ 48 - + 3 64th up - x - - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x + circle-x - - - G - 5 - - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - + G 5 @@ -1091,44 +816,30 @@ 12 - + 3 256th up - x + circle-x - + G 5 3 - - 3 - 1024th - up - x - - - - - - - G - 5 - - 192 3 - 16th + 1024th up circle-x + @@ -1206,15 +917,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -1269,172 +978,18 @@ - - - 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 - - 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/POP01.musicxml b/test/data/grooves/POP01.musicxml index b6a130e3..d2d1907f 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-27 diff --git a/test/data/grooves/POP02.musicxml b/test/data/grooves/POP02.musicxml index 47d1c49f..d1e3e646 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-27 @@ -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..f79ae4fd 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-27 diff --git a/test/data/grooves/POP04.musicxml b/test/data/grooves/POP04.musicxml index 82772726..805af281 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-27 diff --git a/test/data/grooves/POP05.musicxml b/test/data/grooves/POP05.musicxml index b03cdb4c..ab03a2d6 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-27 diff --git a/test/data/grooves/POP06.musicxml b/test/data/grooves/POP06.musicxml index f77c8408..bb9ece96 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-27 @@ -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..ec0d77d0 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-27 diff --git a/test/data/grooves/POP08.musicxml b/test/data/grooves/POP08.musicxml index 9c35ac91..d4c661a3 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-27 @@ -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..c4b0f04e 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-27 @@ -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..30362ec4 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-27 diff --git a/test/data/grooves/POP11.musicxml b/test/data/grooves/POP11.musicxml index a9b3ef65..a8015c2a 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-27 diff --git a/test/data/grooves/POP12.musicxml b/test/data/grooves/POP12.musicxml index e10c3302..6adea2a4 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-27 @@ -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..bf62d09d 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-27 diff --git a/test/data/grooves/PUNK02.musicxml b/test/data/grooves/PUNK02.musicxml index 5da500c1..39f2a76d 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-27 diff --git a/test/data/grooves/PianoBallad.musicxml b/test/data/grooves/PianoBallad.musicxml index b4e0cee8..09a29756 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-27 diff --git a/test/data/grooves/PianoBallad1.musicxml b/test/data/grooves/PianoBallad1.musicxml index 190cd1bc..bac0c95a 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-27 diff --git a/test/data/grooves/PianoBallad1Sus.musicxml b/test/data/grooves/PianoBallad1Sus.musicxml index b57d4c3e..a565e2ea 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-27 diff --git a/test/data/grooves/PianoBallad2.musicxml b/test/data/grooves/PianoBallad2.musicxml index 2b9207e5..31b7367d 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-27 diff --git a/test/data/grooves/PianoBallad2Sus.musicxml b/test/data/grooves/PianoBallad2Sus.musicxml index 850edfc0..c1041731 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-27 diff --git a/test/data/grooves/PianoBalladEnd.musicxml b/test/data/grooves/PianoBalladEnd.musicxml index 47ca115f..78d7b033 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-27 diff --git a/test/data/grooves/PianoBalladFill.musicxml b/test/data/grooves/PianoBalladFill.musicxml index 56c7b345..468e3d82 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-27 diff --git a/test/data/grooves/PianoBalladIntro.musicxml b/test/data/grooves/PianoBalladIntro.musicxml index 8183caab..9770d218 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-27 diff --git a/test/data/grooves/PianoBalladIntro2.musicxml b/test/data/grooves/PianoBalladIntro2.musicxml index 2a9510da..749a5d0f 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-27 diff --git a/test/data/grooves/PianoBalladSus.musicxml b/test/data/grooves/PianoBalladSus.musicxml index 275c8218..ca641d72 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-27 diff --git a/test/data/grooves/Polka.musicxml b/test/data/grooves/Polka.musicxml index dfdc55ff..6e044a36 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-27 diff --git a/test/data/grooves/Polka1.musicxml b/test/data/grooves/Polka1.musicxml index a660daea..c23e7981 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-27 diff --git a/test/data/grooves/Polka1Arp.musicxml b/test/data/grooves/Polka1Arp.musicxml index 47f4c896..5d16f9a8 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-27 diff --git a/test/data/grooves/Polka1Sus.musicxml b/test/data/grooves/Polka1Sus.musicxml index 0cc21d4c..c64445c6 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-27 diff --git a/test/data/grooves/Polka1SusArp.musicxml b/test/data/grooves/Polka1SusArp.musicxml index 6963abc8..099f10a1 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-27 diff --git a/test/data/grooves/PolkaArp.musicxml b/test/data/grooves/PolkaArp.musicxml index 89b9831d..616ffea8 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-27 diff --git a/test/data/grooves/PolkaEnd.musicxml b/test/data/grooves/PolkaEnd.musicxml index d7bec0b1..708fa032 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-27 diff --git a/test/data/grooves/PolkaFox.musicxml b/test/data/grooves/PolkaFox.musicxml index 07e8b467..4e44cdda 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-27 @@ -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..0b76f4cb 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-27 diff --git a/test/data/grooves/PolkaFoxIntro.musicxml b/test/data/grooves/PolkaFoxIntro.musicxml index 05d0af12..188ea558 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-27 @@ -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..294caed8 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-27 diff --git a/test/data/grooves/PolkaIntro8.musicxml b/test/data/grooves/PolkaIntro8.musicxml index c66f1ed2..8181b006 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-27 diff --git a/test/data/grooves/PolkaSus.musicxml b/test/data/grooves/PolkaSus.musicxml index 8eab6aac..d30840fd 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-27 diff --git a/test/data/grooves/PolkaSusArp.musicxml b/test/data/grooves/PolkaSusArp.musicxml index fcf67fbb..003cebf1 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-27 diff --git a/test/data/grooves/Pop.musicxml b/test/data/grooves/Pop.musicxml index 603e62f0..d94388ee 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-27 @@ -493,98 +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 - - - + 512 2 - 128th - up - square - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -592,23 +519,32 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -704,98 +640,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - + 512 2 - 1024th - - - - - - - E - 4 - - 384 - - - 2 - eighth - up - square - - - - - - - E - 4 - - 96 - - - - 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -803,23 +666,32 @@ E 4 - 6 - + 512 2 - 512th + quarter + + 3 + 2 + quarter + up square - - 768 + 512 2 quarter + + 3 + 2 + quarter + + @@ -915,46 +787,25 @@ - 192 - - 2 - 16th - - - - - - - 48 - - - 2 - 64th - - - - - - - - 12 - - - 2 - 256th - - - - - - - - 3 - + 512 2 - 1024th - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -962,75 +813,32 @@ E 4 - 384 - + 512 2 - eighth + quarter + + 3 + 2 + quarter + up square - - - - E - 4 - - 96 - - - + + + 512 2 - 32nd - up - square - - - - - - - - E - 4 - - 24 - - - - 2 - 128th - up - square - - - - - - - - E - 4 - - 6 - - - 2 - 512th - up - square - - - - - - - 768 - 2 - quarter + quarter + + 3 + 2 + quarter + + @@ -1043,1741 +851,238 @@ - - - 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 - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - E - 4 - - 768 - - 1 - quarter - up - normal - - - - - 3072 - - - - 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 - - - - - - - 384 - - 2 - eighth - - - - - - - 192 - - 2 - 16th - - - - - - - E - 4 - - 192 - - 2 - 16th - up - square - - - - - - 768 - 2 - quarter - - - - - - 768 - 2 - quarter - - - - - - - - - 768 - - - percussion - - - 1 - - - - - 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 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - 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 - 192 - + 768 + 1 - 16th + quarter up normal - + + + 512 + 1 + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + + + + E 4 - 192 - + 512 + 1 - 16th + quarter + + 3 + 2 + quarter + up normal - + E 4 - 192 - - + 512 + 1 - 16th + quarter + + 3 + 2 + quarter + up normal - + - + + 3072 + + + + 256 + 2 + eighth + + 3 + 2 + quarter + + + + + 3 + eighth + + + 2 + quarter + + + + + E 4 - 48 - - - - 1 - 64th + 512 + + 2 + quarter + + 3 + 2 + quarter + up - normal + square + + + + + + + 384 + + 2 + eighth + + + + + 192 + + 2 + 16th + - + E 4 - 12 - - - - 1 - 256th + 192 + + 2 + 16th up - normal + square + + + + + + 768 + 2 + quarter - - + + + 768 + 2 + quarter + + + + + + + + + 768 + + + percussion + + + 1 + + E 4 - 3 - + 384 1 - 1024th + eighth up normal - - + E 4 - 96 + 48 + 1 - 32nd + 64th up normal + - + E 4 - 24 + 12 1 - 128th + 256th up normal @@ -2785,16 +1090,16 @@ - + E 4 - 6 + 3 1 - 512th + 1024th up normal @@ -2834,51 +1139,41 @@ E 4 - 192 - + 384 1 - 16th + eighth up normal - - + E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -2886,65 +1181,55 @@ E 4 - 3 - + 384 1 - 1024th + eighth up normal - - + E 4 - 96 - + 192 1 - 32nd + 16th up normal - - + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - - + E 4 - 6 - + 384 1 - 512th + eighth up normal - @@ -2975,20 +1260,20 @@ + + E 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -3043,56 +1328,6 @@ - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - E @@ -3121,58 +1356,46 @@ - - E 4 - 192 - + 384 1 - 16th + eighth up normal - - + E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -3180,65 +1403,55 @@ E 4 - 3 - + 384 1 - 1024th + eighth up normal - - + E 4 - 96 - + 192 1 - 32nd + 16th up normal - - + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - - + E 4 - 6 - + 384 1 - 512th + eighth up normal - @@ -3269,20 +1482,20 @@ + + E 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -3337,54 +1550,46 @@ - + E 4 - 96 - + 192 1 - 32nd + 16th up normal - - + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - - + E 4 - 6 - + 384 1 - 512th + eighth up normal - @@ -3416,37 +1621,45 @@ + + E + 4 + + 384 + + 1 + eighth + up + normal + + + + E 4 192 - 1 16th up normal - - + E 4 - 48 - - + 192 1 - 64th + 16th up normal - - @@ -3454,62 +1667,88 @@ E 4 - 12 - - + 384 1 - 256th + eighth + up + normal + + + + + + E + 4 + + 192 + + 1 + 16th + up + normal + + + + + + E + 4 + + 192 + + 1 + 16th up normal - - + + E 4 - 3 - + 384 1 - 1024th + eighth up normal - - + E 4 - 96 + 48 + 1 - 32nd + 64th up normal + - + E 4 - 24 + 12 1 - 128th + 256th up normal @@ -3517,16 +1756,16 @@ - + E 4 - 6 + 3 1 - 512th + 1024th up normal @@ -3566,51 +1805,41 @@ E 4 - 192 - + 384 1 - 16th + eighth up normal - - + E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -3618,65 +1847,55 @@ E 4 - 3 - + 384 1 - 1024th + eighth up normal - - + E 4 - 96 - + 192 1 - 32nd + 16th up normal - - + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - - + E 4 - 6 - + 384 1 - 512th + eighth up normal - @@ -4094,87 +2313,17 @@ - - - G - 5 - - 384 - - 3 - eighth - 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 - - 192 - - 3 - 16th - up - x - - - - + G 5 - 192 - + 384 + 3 - 16th + eighth up - circle-x + x @@ -4192,122 +2341,103 @@ - + G 5 - 96 - - + 384 + 3 - 32nd + eighth 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 +2579,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 +2605,19 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - + @@ -4683,98 +2744,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 +2770,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..02ef3d91 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-27 diff --git a/test/data/grooves/PopBallad1.musicxml b/test/data/grooves/PopBallad1.musicxml index b3f26357..14ee2c49 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-27 @@ -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..9f8fa282 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-27 @@ -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..fe9083c6 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-27 diff --git a/test/data/grooves/PopBallad2Plus.musicxml b/test/data/grooves/PopBallad2Plus.musicxml index d1588aff..b8f0ffc7 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-27 diff --git a/test/data/grooves/PopBallad2Sus.musicxml b/test/data/grooves/PopBallad2Sus.musicxml index 3a7bfcef..6ea7d0d2 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-27 diff --git a/test/data/grooves/PopBallad2SusPlus.musicxml b/test/data/grooves/PopBallad2SusPlus.musicxml index 655a86b2..182b5d83 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-27 diff --git a/test/data/grooves/PopBalladEnd.musicxml b/test/data/grooves/PopBalladEnd.musicxml index 6e492771..e8478a94 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-27 diff --git a/test/data/grooves/PopBalladIntro.musicxml b/test/data/grooves/PopBalladIntro.musicxml index 2601df0d..d4c527be 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-27 diff --git a/test/data/grooves/PopBalladPlus.musicxml b/test/data/grooves/PopBalladPlus.musicxml index cae9e722..34cced50 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-27 diff --git a/test/data/grooves/PopBalladSus.musicxml b/test/data/grooves/PopBalladSus.musicxml index 0c0aa119..325ed1ef 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-27 diff --git a/test/data/grooves/PopBalladSusPlus.musicxml b/test/data/grooves/PopBalladSusPlus.musicxml index 584e151e..5b9d7814 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-27 diff --git a/test/data/grooves/PopEnd.musicxml b/test/data/grooves/PopEnd.musicxml index 720c1cdf..02698826 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-27 @@ -572,15 +572,13 @@ E 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -635,56 +633,6 @@ - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - E @@ -718,117 +666,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 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - @@ -864,117 +708,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 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - @@ -1010,117 +750,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 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - diff --git a/test/data/grooves/PopIntro.musicxml b/test/data/grooves/PopIntro.musicxml index c1b8eab2..cf5a564e 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-27 @@ -624,893 +624,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 - - 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 - - - - - - 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 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - 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 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - E - 4 - - 192 - + 384 1 - 16th + eighth up normal - @@ -1565,56 +685,6 @@ - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - E @@ -1648,51 +718,41 @@ E 4 - 192 - + 384 1 - 16th + eighth up normal - - + E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -1700,65 +760,55 @@ E 4 - 3 - + 384 1 - 1024th + eighth up normal - - + E 4 - 96 - + 192 1 - 32nd + 16th up normal - - + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - - + E 4 - 6 - + 384 1 - 512th + eighth up normal - @@ -1790,21 +840,19 @@ - + E 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -1859,56 +907,6 @@ - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - E @@ -1942,51 +940,41 @@ E 4 - 192 - + 384 1 - 16th + eighth up normal - - + E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -1994,65 +982,13 @@ E 4 - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - + 384 1 - 512th + eighth up normal - @@ -2088,96 +1024,88 @@ E 4 - 192 - + 384 1 - 16th + eighth up normal - - + E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - + + E 4 - 3 - + 384 1 - 1024th + eighth up normal - - + E 4 - 96 + 48 + 1 - 32nd + 64th up normal + - + E 4 - 24 + 12 1 - 128th + 256th up normal @@ -2185,16 +1113,16 @@ - + E 4 - 6 + 3 1 - 512th + 1024th up normal @@ -2234,51 +1162,41 @@ E 4 - 192 - + 384 1 - 16th + eighth up normal - - + E 4 - 48 - - + 192 1 - 64th + 16th up normal - - - + E 4 - 12 - - + 192 1 - 256th + 16th up normal - - @@ -2286,65 +1204,55 @@ E 4 - 3 - + 384 1 - 1024th + eighth up normal - - + E 4 - 96 - + 192 1 - 32nd + 16th up normal - - + E 4 - 24 - - + 192 1 - 128th + 16th up normal - - - + E 4 - 6 - + 384 1 - 512th + eighth up normal - @@ -2763,117 +1671,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 +1920,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 +1946,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..28fb093c 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-27 @@ -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..58de4a59 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-27 @@ -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..637a3ec0 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-27 diff --git a/test/data/grooves/PopRock1.musicxml b/test/data/grooves/PopRock1.musicxml index 476c8116..53b93b0a 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-27 diff --git a/test/data/grooves/PopRock1End.musicxml b/test/data/grooves/PopRock1End.musicxml index 31c19724..f1f711ce 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-27 diff --git a/test/data/grooves/PopRock1Intro.musicxml b/test/data/grooves/PopRock1Intro.musicxml index 822cf42e..5f4255e1 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-27 diff --git a/test/data/grooves/PopRock2.musicxml b/test/data/grooves/PopRock2.musicxml index ea5cb556..86fec01f 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-27 @@ -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..829561c1 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-27 @@ -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..f0ad804a 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-27 @@ -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..8200b3c1 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-27 diff --git a/test/data/grooves/PopShuffle1End.musicxml b/test/data/grooves/PopShuffle1End.musicxml index 622d14fa..930bdd8c 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-27 diff --git a/test/data/grooves/PopShuffle1Intro.musicxml b/test/data/grooves/PopShuffle1Intro.musicxml index 91440744..30e2b4ad 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-27 diff --git a/test/data/grooves/PopShuffle2.musicxml b/test/data/grooves/PopShuffle2.musicxml index b175896e..4761c4dd 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-27 @@ -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..c34a0bdc 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-27 diff --git a/test/data/grooves/PopShuffle2Intro.musicxml b/test/data/grooves/PopShuffle2Intro.musicxml index aee5faaf..ae3c29e6 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-27 @@ -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..a6ddd9fb 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-27 diff --git a/test/data/grooves/QuandoGSEndingA.musicxml b/test/data/grooves/QuandoGSEndingA.musicxml index e6e09a3d..df33d493 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-27 diff --git a/test/data/grooves/QuandoGSEndingB.musicxml b/test/data/grooves/QuandoGSEndingB.musicxml index 51320746..d79daf60 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-27 diff --git a/test/data/grooves/QuandoGSEndingC.musicxml b/test/data/grooves/QuandoGSEndingC.musicxml index 5c98ebb2..7d021d00 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-27 diff --git a/test/data/grooves/QuandoGSFillAA.musicxml b/test/data/grooves/QuandoGSFillAA.musicxml index 5251ccb7..1e018fe1 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-27 diff --git a/test/data/grooves/QuandoGSFillBA.musicxml b/test/data/grooves/QuandoGSFillBA.musicxml index 8d5dbd02..cf69d9b4 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-27 diff --git a/test/data/grooves/QuandoGSFillBB.musicxml b/test/data/grooves/QuandoGSFillBB.musicxml index 865fde06..74c4a9c2 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-27 diff --git a/test/data/grooves/QuandoGSFillCC.musicxml b/test/data/grooves/QuandoGSFillCC.musicxml index 76cbcfdd..5be884d5 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-27 diff --git a/test/data/grooves/QuandoGSFillDD.musicxml b/test/data/grooves/QuandoGSFillDD.musicxml index d81752d8..e988e5b2 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-27 diff --git a/test/data/grooves/QuandoGSIntroA.musicxml b/test/data/grooves/QuandoGSIntroA.musicxml index 01ced9ba..32af8bd2 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-27 diff --git a/test/data/grooves/QuandoGSIntroB.musicxml b/test/data/grooves/QuandoGSIntroB.musicxml index 1b93aef0..f6af8cea 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-27 diff --git a/test/data/grooves/QuandoGSIntroC.musicxml b/test/data/grooves/QuandoGSIntroC.musicxml index b3ecb5dc..3d2aa8fd 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-27 diff --git a/test/data/grooves/QuandoGSMainA.musicxml b/test/data/grooves/QuandoGSMainA.musicxml index 60f40270..c0e1b2bb 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-27 diff --git a/test/data/grooves/QuandoGSMainB.musicxml b/test/data/grooves/QuandoGSMainB.musicxml index d156fc73..07abee54 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-27 diff --git a/test/data/grooves/QuandoGSMainC.musicxml b/test/data/grooves/QuandoGSMainC.musicxml index 9e7f776e..f603cf2e 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-27 diff --git a/test/data/grooves/QuandoGSMainD.musicxml b/test/data/grooves/QuandoGSMainD.musicxml index 2e9ad8bc..514ac2af 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-27 diff --git a/test/data/grooves/QuickStep.musicxml b/test/data/grooves/QuickStep.musicxml index 047aa53a..6529e423 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-27 diff --git a/test/data/grooves/QuickStepDuh.musicxml b/test/data/grooves/QuickStepDuh.musicxml index 61565953..93e9198e 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-27 diff --git a/test/data/grooves/QuickStepDuhSus.musicxml b/test/data/grooves/QuickStepDuhSus.musicxml index 23a3eb11..e29510bd 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-27 diff --git a/test/data/grooves/QuickStepDuhSusWalk.musicxml b/test/data/grooves/QuickStepDuhSusWalk.musicxml index 91bc4ed9..60de9704 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-27 diff --git a/test/data/grooves/QuickStepDuhWalk.musicxml b/test/data/grooves/QuickStepDuhWalk.musicxml index 285a4128..7c5d3830 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-27 diff --git a/test/data/grooves/QuickStepEnd.musicxml b/test/data/grooves/QuickStepEnd.musicxml index f3a9020b..8e8881b7 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-27 @@ -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..bb08f48b 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-27 diff --git a/test/data/grooves/QuickStepHitSus.musicxml b/test/data/grooves/QuickStepHitSus.musicxml index da4c7d17..23be70d7 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-27 diff --git a/test/data/grooves/QuickStepHitSusWalk.musicxml b/test/data/grooves/QuickStepHitSusWalk.musicxml index 1d085e4e..8b3b7e95 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-27 diff --git a/test/data/grooves/QuickStepHitWalk.musicxml b/test/data/grooves/QuickStepHitWalk.musicxml index a5eb31b2..5f18619d 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-27 diff --git a/test/data/grooves/QuickStepIntro.musicxml b/test/data/grooves/QuickStepIntro.musicxml index f20084d1..5e5a5cbd 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-27 @@ -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..b1a01a3f 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-27 @@ -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..63624b8d 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-27 diff --git a/test/data/grooves/QuickStepSusWalk.musicxml b/test/data/grooves/QuickStepSusWalk.musicxml index 8aad5beb..04f4930d 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-27 diff --git a/test/data/grooves/QuickStepWalk.musicxml b/test/data/grooves/QuickStepWalk.musicxml index 9d7a0b1d..5ea39368 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-27 diff --git a/test/data/grooves/R&B-Ballad.musicxml b/test/data/grooves/R&B-Ballad.musicxml index 522cbdea..33cc78cc 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-27 diff --git a/test/data/grooves/R&B-BalladEnd.musicxml b/test/data/grooves/R&B-BalladEnd.musicxml index 1927e6d3..1564dc89 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-27 diff --git a/test/data/grooves/R&B-BalladFill.musicxml b/test/data/grooves/R&B-BalladFill.musicxml index b0240751..c10ac04c 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-27 diff --git a/test/data/grooves/R&B-BalladIntro.musicxml b/test/data/grooves/R&B-BalladIntro.musicxml index 02995509..2afb1ada 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-27 diff --git a/test/data/grooves/R&B-BalladPlus.musicxml b/test/data/grooves/R&B-BalladPlus.musicxml index 125466c4..30c2a3c7 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-27 diff --git a/test/data/grooves/R&B-BalladSus.musicxml b/test/data/grooves/R&B-BalladSus.musicxml index 0b9f982e..b1bc7d0c 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-27 diff --git a/test/data/grooves/R&B-BalladSusPlus.musicxml b/test/data/grooves/R&B-BalladSusPlus.musicxml index b86eac8d..e0d6caa2 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-27 diff --git a/test/data/grooves/R&B.musicxml b/test/data/grooves/R&B.musicxml index fbde81b0..37a0aa7a 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-27 diff --git a/test/data/grooves/R&BEnd.musicxml b/test/data/grooves/R&BEnd.musicxml index 4b1847e8..76c48633 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-27 diff --git a/test/data/grooves/R&BFill.musicxml b/test/data/grooves/R&BFill.musicxml index ffb83c9c..6abb7604 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-27 diff --git a/test/data/grooves/R&BIntro.musicxml b/test/data/grooves/R&BIntro.musicxml index 9a87efd3..13f3f685 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-27 diff --git a/test/data/grooves/R&BPlus.musicxml b/test/data/grooves/R&BPlus.musicxml index 33dfb67b..4156b781 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-27 diff --git a/test/data/grooves/R&BSus.musicxml b/test/data/grooves/R&BSus.musicxml index ce06eb33..edbeafc2 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-27 diff --git a/test/data/grooves/R&BSusPlus.musicxml b/test/data/grooves/R&BSusPlus.musicxml index 2db60c36..e05c7fa6 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-27 diff --git a/test/data/grooves/REGG01.musicxml b/test/data/grooves/REGG01.musicxml index 9ba21846..7b8e266b 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-27 @@ -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..4739b793 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-27 @@ -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..ef126093 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-27 @@ -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..bb99c7d7 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-27 diff --git a/test/data/grooves/ROCK01.musicxml b/test/data/grooves/ROCK01.musicxml index 2bdfaf9d..407ea9b2 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-27 diff --git a/test/data/grooves/ROCK02.musicxml b/test/data/grooves/ROCK02.musicxml index 4b15fa43..3557df88 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-27 @@ -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..282c95ce 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-27 diff --git a/test/data/grooves/ROCK04.musicxml b/test/data/grooves/ROCK04.musicxml index 223db687..77a0b480 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-27 diff --git a/test/data/grooves/ROCK05.musicxml b/test/data/grooves/ROCK05.musicxml index b3b1b8d9..41ebfe05 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-27 diff --git a/test/data/grooves/ROCK06.musicxml b/test/data/grooves/ROCK06.musicxml index 7559afd4..3061b760 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-27 @@ -978,99 +978,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 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up x - diff --git a/test/data/grooves/ROCK07.musicxml b/test/data/grooves/ROCK07.musicxml index 0edfa806..a07f54c9 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-27 @@ -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..97060ff3 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-27 diff --git a/test/data/grooves/ROCK09.musicxml b/test/data/grooves/ROCK09.musicxml index d382371e..81b72f64 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-27 diff --git a/test/data/grooves/ROCK10.musicxml b/test/data/grooves/ROCK10.musicxml index ce4a9ad9..a0c9fc44 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-27 @@ -226,15 +226,13 @@ E 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -289,88 +287,6 @@ - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - E @@ -476,15 +392,13 @@ E 4 - 192 - + 384 1 - 16th + eighth up normal - @@ -539,88 +453,6 @@ - - - E - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 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..9701c636 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-27 diff --git a/test/data/grooves/ROCK12.musicxml b/test/data/grooves/ROCK12.musicxml index 6fcfc0f9..58240906 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-27 diff --git a/test/data/grooves/ROCK13.musicxml b/test/data/grooves/ROCK13.musicxml index 72725030..8c26da37 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-27 diff --git a/test/data/grooves/ROCK14.musicxml b/test/data/grooves/ROCK14.musicxml index 806185ea..be36adf6 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-27 diff --git a/test/data/grooves/ROCK15.musicxml b/test/data/grooves/ROCK15.musicxml index a907e98b..af622cd9 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-27 diff --git a/test/data/grooves/ROCK16.musicxml b/test/data/grooves/ROCK16.musicxml index 34c0c053..3c90751b 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-27 diff --git a/test/data/grooves/ROCK17.musicxml b/test/data/grooves/ROCK17.musicxml index 41319f0b..2a5d2000 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-27 @@ -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..7c45e576 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-27 diff --git a/test/data/grooves/ROCK19.musicxml b/test/data/grooves/ROCK19.musicxml index 233c61b2..aeba22f7 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-27 diff --git a/test/data/grooves/ROCK20.musicxml b/test/data/grooves/ROCK20.musicxml index ebe80149..7eb45d2a 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-27 diff --git a/test/data/grooves/ROCK21.musicxml b/test/data/grooves/ROCK21.musicxml index 9e007437..715651d1 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-27 diff --git a/test/data/grooves/ROCK22.musicxml b/test/data/grooves/ROCK22.musicxml index 475d98d3..93e00d58 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-27 diff --git a/test/data/grooves/ROCK23.musicxml b/test/data/grooves/ROCK23.musicxml index bb999c0a..1bcb7b9f 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-27 diff --git a/test/data/grooves/ROCK24.musicxml b/test/data/grooves/ROCK24.musicxml index 39352350..3b2b456a 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-27 diff --git a/test/data/grooves/ROCK25.musicxml b/test/data/grooves/ROCK25.musicxml index 76b6eb6a..77b66b07 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-27 diff --git a/test/data/grooves/ROCK26.musicxml b/test/data/grooves/ROCK26.musicxml index 96a14665..8ea54bf8 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-27 diff --git a/test/data/grooves/ROCK27.musicxml b/test/data/grooves/ROCK27.musicxml index d9d66e41..01a5c034 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-27 @@ -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..ea52aca9 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-27 diff --git a/test/data/grooves/Rave.musicxml b/test/data/grooves/Rave.musicxml index c971ae0e..5dfd9a73 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-27 @@ -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..5df60584 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-27 @@ -331,523 +331,7 @@ - - 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 - - - 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 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - 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 - - - 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 - - - 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 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 186 - - 3 - 32nd - - - - - up - x - - - - + G 5 @@ -858,60 +342,7 @@ 16th up x - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - - - 3 - 64th - up - x - - - - - - - G - 5 - - 12 - - - - 3 - 256th - up - x - - - + @@ -919,34 +350,32 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - - + G 5 96 - + 3 32nd up - x + circle-x - + G 5 @@ -954,28 +383,28 @@ 24 - + 3 128th up - x + circle-x - + G 5 6 - + 3 512th up - x + circle-x @@ -985,15 +414,28 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1001,17 +443,18 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - @@ -1019,15 +462,19 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - + @@ -1035,15 +482,13 @@ G 5 - 48 - + 192 3 - 64th + 16th up x - @@ -1051,98 +496,92 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - + G 5 - 3 - + 192 3 - 1024th + 16th up x - - + G 5 192 - + 3 16th up - circle-x + x - + G 5 - 189 - + 96 + + 3 32nd - - - - - up - x + circle-x + - + G 5 - 186 - + 24 + + + 3 - 32nd - - - - + 128th up - x + circle-x + + - + G 5 - 192 - + 6 + + 3 - 16th + 512th up - x + circle-x + @@ -1150,18 +589,28 @@ G 5 - 189 + 128 3 - 32nd - - - - - + 16th + + 3 + 2 + 16th + up x + + + 3 + 16th + + + 2 + 16th + + @@ -1169,15 +618,18 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - @@ -1185,17 +637,19 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + @@ -1203,15 +657,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -1219,33 +671,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -1253,34 +700,32 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - - + G 5 96 - + 3 32nd up - x + circle-x - + G 5 @@ -1288,28 +733,28 @@ 24 - + 3 128th up - x + circle-x - + G 5 6 - + 3 512th up - x + circle-x @@ -1319,15 +764,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -1335,17 +793,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1353,28 +812,32 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + - + G 5 192 - + 3 16th up - circle-x + x @@ -1383,100 +846,90 @@ G 5 - 189 + 192 3 - 32nd - - - - - + 16th up x + G 5 - 186 + 192 3 - 32nd - - - - + 16th up x - - G 5 192 - + 3 16th up - circle-x + x - + G 5 - 48 + 96 - + 3 - 64th + 32nd up - x + circle-x - + G 5 - 12 + 24 - + 3 - 256th + 128th up - x + circle-x - + G 5 - 3 + 6 - + 3 - 1024th + 512th up - x + circle-x @@ -1486,33 +939,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + + + 3 + 16th + + + 2 + 16th + + @@ -1520,15 +968,18 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - @@ -1536,15 +987,19 @@ G 5 - 384 - + 128 3 - eighth + 16th + + 3 + 2 + 16th + up x - + @@ -1552,51 +1007,44 @@ G 5 - 96 - - + 192 3 - 32nd + 16th up x - - + + G 5 - 24 - - - + 192 + 3 - 128th + 16th up - x + circle-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..3ced16ca 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-27 @@ -419,1489 +419,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 - - - - 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 - - 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 - - + 256 3 - 64th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -1909,17 +448,18 @@ G 5 - 12 - - + 256 3 - 256th + eighth + + 3 + 2 + eighth + up x - - @@ -1927,15 +467,19 @@ G 5 - 3 - - + 256 + 3 - 1024th + eighth + + 3 + 2 + eighth + up - x + circle-x - + @@ -1943,33 +487,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 - - @@ -1977,527 +535,707 @@ G 5 - 6 - - - 3 - 512th - up - x - - - - - - - G - 5 - - 384 + 256 3 eighth + + 3 + 2 + eighth + up circle-x + - - - + 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 + circle-x - - + - + 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 + circle-x - - + - + + + G 5 - 6 - + 256 3 - 512th + 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 + circle-x - - + - + G 5 - 6 - + 256 3 - 512th + 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 + circle-x - - + - + G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 192 + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - + G 5 - 192 - + 256 + 3 - 16th + eighth + + 3 + 2 + eighth + up - x + circle-x + - + G 5 - 189 + 256 3 - 32nd - - - - - + 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 + circle-x - - + - + + + 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 + circle-x - - + - + G 5 - 6 - + 256 3 - 512th + 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 + circle-x - - + - + G 5 - 6 - + 256 3 - 512th + 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 + circle-x - - + - + G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + - + G 5 - 192 + 256 3 - 16th + eighth + + 3 + 2 + eighth + up x - + G 5 - 189 - + 256 + 3 - 32nd - - - - - + eighth + + 3 + 2 + eighth + up - x + circle-x + + + G @@ -2513,38 +1251,18 @@ + G 5 - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - + 192 3 - 64th + 16th up x - @@ -2552,17 +1270,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -2570,15 +1284,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2586,15 +1313,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -2602,17 +1332,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -2620,15 +1352,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -2636,33 +1366,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -2670,15 +1395,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -2686,15 +1409,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2702,17 +1438,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -2720,15 +1457,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -2745,25 +1486,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - G @@ -2779,38 +1501,18 @@ + G 5 - 189 - - 3 - 32nd - - - - - - up - x - - - - - - G - 5 - - 48 - + 192 3 - 64th + 16th up x - @@ -2818,17 +1520,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -2836,15 +1534,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2852,15 +1563,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -2868,17 +1582,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -2886,15 +1602,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -2902,33 +1616,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -2936,15 +1645,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - @@ -2952,15 +1659,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + @@ -2968,17 +1688,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -2986,15 +1707,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -3011,25 +1736,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - x - - - diff --git a/test/data/grooves/Rhumba.musicxml b/test/data/grooves/Rhumba.musicxml index f8e04511..76af076a 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-27 @@ -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..6feea5f9 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-27 @@ -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..344363b5 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-27 @@ -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..a5ca1fd7 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-27 @@ -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..ec8cc53b 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-27 @@ -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..4c1417ac 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-27 @@ -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..e74a9f2e 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-27 @@ -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..e4e9963b 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-27 @@ -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..494127d7 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-27 diff --git a/test/data/grooves/RhumbaIntro.musicxml b/test/data/grooves/RhumbaIntro.musicxml index b93a0072..3fcc4235 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-27 diff --git a/test/data/grooves/RhumbaSus.musicxml b/test/data/grooves/RhumbaSus.musicxml index 4cebcea5..3577badf 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-27 @@ -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..880bc085 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-27 diff --git a/test/data/grooves/RhumbaTriple12.musicxml b/test/data/grooves/RhumbaTriple12.musicxml index 4acb3663..5216a49a 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-27 diff --git a/test/data/grooves/RhumbaTriple12Sus.musicxml b/test/data/grooves/RhumbaTriple12Sus.musicxml index 0856ac5a..2e01a00d 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-27 diff --git a/test/data/grooves/RhumbaTriple34.musicxml b/test/data/grooves/RhumbaTriple34.musicxml index 91b4fd1f..16335007 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-27 diff --git a/test/data/grooves/RhumbaTriple34Sus.musicxml b/test/data/grooves/RhumbaTriple34Sus.musicxml index 3a7dc65e..984a82ee 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-27 diff --git a/test/data/grooves/RhumbaTripleSus.musicxml b/test/data/grooves/RhumbaTripleSus.musicxml index a46b9fe4..565186d1 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-27 diff --git a/test/data/grooves/RnB01.musicxml b/test/data/grooves/RnB01.musicxml index d3f61c11..cfb5b3f5 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-27 diff --git a/test/data/grooves/RnB02.musicxml b/test/data/grooves/RnB02.musicxml index 3d92fb48..fa09df46 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-27 diff --git a/test/data/grooves/RnB03.musicxml b/test/data/grooves/RnB03.musicxml index 47d5e9f4..7d273f3a 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-27 diff --git a/test/data/grooves/RnB04.musicxml b/test/data/grooves/RnB04.musicxml index f7d14f07..a66b4efa 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-27 diff --git a/test/data/grooves/RnB05.musicxml b/test/data/grooves/RnB05.musicxml index c85655ce..1d298770 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-27 @@ -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 - @@ -755,131 +684,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 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 192 3 - 512th + 16th up x - - - - - - 96 - - 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th - - @@ -969,147 +780,36 @@ 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 - + 192 3 - 512th + 16th up x - - - - - - 96 - - 3 - 32nd - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th - - - - - - - G - 5 - - 48 - - + 128 3 - 64th - up - x - - + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -1117,17 +817,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - @@ -1135,15 +836,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - + @@ -1161,6 +866,7 @@ + G 5 @@ -1174,56 +880,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 +948,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..fc336e1b 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-27 diff --git a/test/data/grooves/RnB07.musicxml b/test/data/grooves/RnB07.musicxml index a79a47e9..f2674358 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-27 diff --git a/test/data/grooves/RnB08.musicxml b/test/data/grooves/RnB08.musicxml index 6c03dfe7..d451fb5d 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-27 diff --git a/test/data/grooves/RnB09.musicxml b/test/data/grooves/RnB09.musicxml index 94b405d5..c0295f7f 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-27 diff --git a/test/data/grooves/RnB10.musicxml b/test/data/grooves/RnB10.musicxml index 208d2231..aee1a947 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-27 @@ -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..5f4c2ea3 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-27 diff --git a/test/data/grooves/Rock128End.musicxml b/test/data/grooves/Rock128End.musicxml index f694814d..bc9cc219 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-27 diff --git a/test/data/grooves/Rock128Intro.musicxml b/test/data/grooves/Rock128Intro.musicxml index ae9f17d9..208c32cf 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-27 diff --git a/test/data/grooves/Rock128IntroSus.musicxml b/test/data/grooves/Rock128IntroSus.musicxml index 6ca0eb33..e57e9f6d 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-27 diff --git a/test/data/grooves/Rock128Plain.musicxml b/test/data/grooves/Rock128Plain.musicxml index 50747e23..29aa6fa9 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-27 diff --git a/test/data/grooves/Rock128PlainPlus.musicxml b/test/data/grooves/Rock128PlainPlus.musicxml index aa68b440..f8027119 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-27 diff --git a/test/data/grooves/Rock128PlainSus.musicxml b/test/data/grooves/Rock128PlainSus.musicxml index 14a72cb7..dfdcd8a2 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-27 diff --git a/test/data/grooves/Rock128PlainSusPlus.musicxml b/test/data/grooves/Rock128PlainSusPlus.musicxml index 5e7b8870..a01282ab 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-27 diff --git a/test/data/grooves/Rock128Plus.musicxml b/test/data/grooves/Rock128Plus.musicxml index 5412e5ef..9cb7841c 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-27 diff --git a/test/data/grooves/Rock128Sus.musicxml b/test/data/grooves/Rock128Sus.musicxml index e1ea072c..5b40258c 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-27 diff --git a/test/data/grooves/Rock128SusPlus.musicxml b/test/data/grooves/Rock128SusPlus.musicxml index 51137b58..81db03c6 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-27 diff --git a/test/data/grooves/Rock1End.musicxml b/test/data/grooves/Rock1End.musicxml index 6fee9ea3..01251dcf 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-27 diff --git a/test/data/grooves/Rock1Intro.musicxml b/test/data/grooves/Rock1Intro.musicxml index ee99cca2..fab7b835 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-27 diff --git a/test/data/grooves/Rock2.musicxml b/test/data/grooves/Rock2.musicxml index 0e7499a6..478b3cbf 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-27 @@ -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..03dcfd5a 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-27 @@ -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..db0bdc88 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-27 @@ -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..055f646b 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-27 diff --git a/test/data/grooves/RockBallad1.musicxml b/test/data/grooves/RockBallad1.musicxml index 036e5653..bc79699c 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-27 diff --git a/test/data/grooves/RockBallad1Fill.musicxml b/test/data/grooves/RockBallad1Fill.musicxml index 2b676568..b6dc2004 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-27 diff --git a/test/data/grooves/RockBallad1Voice.musicxml b/test/data/grooves/RockBallad1Voice.musicxml index 0af2ef33..d7da7175 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-27 diff --git a/test/data/grooves/RockBalladEnd.musicxml b/test/data/grooves/RockBalladEnd.musicxml index 50463c63..f3570d8e 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-27 diff --git a/test/data/grooves/RockBalladEnd1.musicxml b/test/data/grooves/RockBalladEnd1.musicxml index c83a5a4d..1670278e 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-27 diff --git a/test/data/grooves/RockBalladFill.musicxml b/test/data/grooves/RockBalladFill.musicxml index cbee86ef..b650ca97 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-27 diff --git a/test/data/grooves/RockBalladIntro.musicxml b/test/data/grooves/RockBalladIntro.musicxml index a32c6714..74dfef1a 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-27 diff --git a/test/data/grooves/RockBalladSusIntro.musicxml b/test/data/grooves/RockBalladSusIntro.musicxml index 7d5d6745..cced409c 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-27 diff --git a/test/data/grooves/RockBalladVoice.musicxml b/test/data/grooves/RockBalladVoice.musicxml index efbda89d..52034894 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-27 diff --git a/test/data/grooves/RockWaltz.musicxml b/test/data/grooves/RockWaltz.musicxml index 40e2e40a..4bfb50ec 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-27 diff --git a/test/data/grooves/RockWaltz1.musicxml b/test/data/grooves/RockWaltz1.musicxml index 83d96bf0..0887ea7a 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-27 diff --git a/test/data/grooves/RockWaltz1Intro.musicxml b/test/data/grooves/RockWaltz1Intro.musicxml index 13c1a419..e2752469 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-27 diff --git a/test/data/grooves/RockWaltz1Sus.musicxml b/test/data/grooves/RockWaltz1Sus.musicxml index f96b1928..31959e41 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-27 diff --git a/test/data/grooves/RockWaltz1Walk.musicxml b/test/data/grooves/RockWaltz1Walk.musicxml index 868779c2..a98f2fd6 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-27 diff --git a/test/data/grooves/RockWaltz1WalkSus.musicxml b/test/data/grooves/RockWaltz1WalkSus.musicxml index 1f93ba31..7f94a700 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-27 diff --git a/test/data/grooves/RockWaltz1intro8.musicxml b/test/data/grooves/RockWaltz1intro8.musicxml index 4ea83e8e..6520b67d 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-27 diff --git a/test/data/grooves/RockWaltzEnd.musicxml b/test/data/grooves/RockWaltzEnd.musicxml index e5876608..7ae4d6c6 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-27 diff --git a/test/data/grooves/RockWaltzIntro.musicxml b/test/data/grooves/RockWaltzIntro.musicxml index ccd6104a..bba9db79 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-27 diff --git a/test/data/grooves/RockWaltzIntro8.musicxml b/test/data/grooves/RockWaltzIntro8.musicxml index 754020df..2db97437 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-27 diff --git a/test/data/grooves/RockWaltzSus.musicxml b/test/data/grooves/RockWaltzSus.musicxml index 9db0cbdc..7a73a69d 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-27 diff --git a/test/data/grooves/RockWaltzWalk.musicxml b/test/data/grooves/RockWaltzWalk.musicxml index 05baf29d..22c9ba53 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-27 diff --git a/test/data/grooves/RockWaltzWalkSus.musicxml b/test/data/grooves/RockWaltzWalkSus.musicxml index f35f4f4f..b0253d55 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-27 diff --git a/test/data/grooves/SAMBA01.musicxml b/test/data/grooves/SAMBA01.musicxml index 231b5952..04caf82d 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-27 @@ -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..6e3f4031 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-27 @@ -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..4d800604 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-27 @@ -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..c3f907df 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-27 @@ -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..2b02cd5e 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-27 diff --git a/test/data/grooves/SHFL04.musicxml b/test/data/grooves/SHFL04.musicxml index 1d26887d..8ca935be 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-27 @@ -303,15 +303,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -371,15 +369,13 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -387,33 +383,27 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - - + G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -449,51 +439,13 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - + 384 3 - 256th + eighth up x - - @@ -501,31 +453,13 @@ G 5 - 3 - - - 3 - 1024th - up - x - - - - - - - G - 5 - - 96 - + 192 3 - 32nd + 16th up x - @@ -533,17 +467,13 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -551,15 +481,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -568,11 +496,11 @@ 5 192 - + 3 16th up - x + circle-x @@ -590,20 +518,20 @@ + + G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -658,20 +586,18 @@ - + G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -679,17 +605,13 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -697,15 +619,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -741,33 +661,27 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - - + G 5 - 48 - - + 192 3 - 64th + 16th up x - - @@ -775,17 +689,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -793,843 +703,132 @@ G 5 - 3 - + 384 3 - 1024th + eighth up x - - + G 5 - 96 - - + 192 + 3 - 32nd + 16th up - x + circle-x - - + G 5 - 24 - - + 192 3 - 128th + 16th up x - - + + + + + + 768 + + + percussion + + + 5 + + - G - 5 + F + 4 - 6 - - - 3 - 512th - up - x + 576 + + 1 + eighth + + down + normal - - G - 5 + F + 4 192 - - 3 + + 1 16th - up - circle-x + down + normal - - - G - 5 - - 192 - - 3 - 16th - up - x + + + 384 + 1 + eighth - - - G - 5 + F + 4 - 192 - - - 3 - 16th - up - x + 384 + + 1 + eighth + down + normal - - - - - - 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 - - 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 - - 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 - - 192 - - 3 - 16th - up - circle-x - - - - - - G - 5 - - 192 - - 3 - 16th - up - x - - - - - - - - - 768 - - - percussion - - - 5 - - - - - F - 4 - - 576 - - 1 - eighth - - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - 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 - - - + 512 1 - 128th - down - normal + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + @@ -1637,23 +836,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1711,98 +919,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 + + @@ -1810,23 +945,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..6ed339b9 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-27 @@ -490,15 +490,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -558,15 +556,13 @@ G 5 - 96 - - + 192 + 3 - 32nd + 16th up - x + circle-x - @@ -574,17 +570,13 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -592,15 +584,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -636,51 +626,13 @@ G 5 - 192 - - - 3 - 16th - up - x - - - - - - - G - 5 - - 48 - - - - 3 - 64th - up - x - - - - - - - - G - 5 - - 12 - - + 384 3 - 256th + eighth up x - - @@ -688,15 +640,13 @@ G 5 - 3 - - + 192 + 3 - 1024th + 16th up - x + circle-x - @@ -704,15 +654,13 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -720,17 +668,28 @@ G 5 - 24 - - + 256 3 - 128th + eighth + + 3 + 2 + eighth + up x - - + + + 3 + eighth + + + 2 + eighth + + @@ -738,15 +697,18 @@ G 5 - 6 - + 256 3 - 512th + eighth + + 3 + 2 + eighth + up x - @@ -754,43 +716,35 @@ G 5 - 192 + 256 3 - 16th + eighth + + 3 + 2 + eighth + up circle-x + + + G 5 - 192 - - 3 - 16th - up - x - - - - - - G - 5 - - 192 - + 384 3 - 16th + eighth up x - @@ -850,15 +804,13 @@ G 5 - 96 - - + 192 + 3 - 32nd + 16th up - x + circle-x - @@ -866,17 +818,13 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -884,15 +832,13 @@ G 5 - 6 - + 384 3 - 512th + eighth up x - @@ -928,15 +874,13 @@ G 5 - 192 - + 384 3 - 16th + eighth up x - @@ -944,17 +888,13 @@ G 5 - 48 - - - + 192 + 3 - 64th + 16th up - x + circle-x - - @@ -962,17 +902,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -980,15 +916,28 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + eighth + up x - + + + 3 + eighth + + + 2 + eighth + + @@ -996,15 +945,18 @@ G 5 - 96 - + 256 3 - 32nd + eighth + + 3 + 2 + eighth + up x - @@ -1012,783 +964,110 @@ G 5 - 24 - - - + 256 + 3 - 128th + eighth + + 3 + 2 + eighth + up - x + circle-x - - + - + + + + + + 768 + + + percussion + + + 5 + + + - G - 5 + F + 4 - 6 - - - 3 - 512th - up - x + 576 + + 1 + eighth + + down + normal - - G - 5 + F + 4 + 192 + + 1 + 16th + down + normal + + + + + 384 - - 3 + 1 eighth - up - circle-x - - - + - G - 5 + F + 4 - 192 - - - 3 - 16th - up - x + 384 + + 1 + eighth + down + normal - - - - - - 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 - circle-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 - - 192 - - 3 - 16th - up - circle-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 - - 192 - - 3 - 16th - up - circle-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 - circle-x - - - - - - - - - 768 - - - percussion - - - 5 - - - - - F - 4 - - 576 - - 1 - eighth - - down - normal - - - - - - F - 4 - - 192 - - 1 - 16th - down - normal - - - - - - 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 - - - + 512 1 - 128th - down - normal - - - + quarter + + 3 + 2 + quarter + + + + + 3 + quarter + + + 2 + quarter + + @@ -1796,23 +1075,32 @@ F 4 - 6 - + 512 1 - 512th + quarter + + 3 + 2 + quarter + down normal - - 768 + 512 1 quarter + + 3 + 2 + quarter + + @@ -1870,98 +1158,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 + + @@ -1969,23 +1184,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..ca49aada 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-27 diff --git a/test/data/grooves/SKA02.musicxml b/test/data/grooves/SKA02.musicxml index b3d52bed..f8c3473d 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-27 diff --git a/test/data/grooves/SKA03.musicxml b/test/data/grooves/SKA03.musicxml index 2c2953a2..7a59dad1 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-27 diff --git a/test/data/grooves/SKA04.musicxml b/test/data/grooves/SKA04.musicxml index dc74222c..6845418a 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-27 @@ -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..1375b5dd 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-27 diff --git a/test/data/grooves/Salsa.musicxml b/test/data/grooves/Salsa.musicxml index a2808fcf..232af689 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-27 diff --git a/test/data/grooves/Salsa1EndingA.musicxml b/test/data/grooves/Salsa1EndingA.musicxml index cde5bd89..5057dba9 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-27 @@ -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..22b9bcf4 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-27 @@ -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..0d6c2ba4 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-27 diff --git a/test/data/grooves/Salsa1FillAB.musicxml b/test/data/grooves/Salsa1FillAB.musicxml index e213ebf3..207e518a 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-27 diff --git a/test/data/grooves/Salsa1FillBA.musicxml b/test/data/grooves/Salsa1FillBA.musicxml index 43e50990..7b7914fa 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-27 diff --git a/test/data/grooves/Salsa1FillBB.musicxml b/test/data/grooves/Salsa1FillBB.musicxml index 54090e3b..82e365ca 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-27 diff --git a/test/data/grooves/Salsa1IntroA.musicxml b/test/data/grooves/Salsa1IntroA.musicxml index 15a00327..e25290d5 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-27 diff --git a/test/data/grooves/Salsa1IntroB.musicxml b/test/data/grooves/Salsa1IntroB.musicxml index 7dce0cc8..09335199 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-27 diff --git a/test/data/grooves/Salsa1MainA.musicxml b/test/data/grooves/Salsa1MainA.musicxml index 1e89d5a4..7c09ad29 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-27 diff --git a/test/data/grooves/Salsa1MainB.musicxml b/test/data/grooves/Salsa1MainB.musicxml index 24d7392b..5212ddf7 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-27 diff --git a/test/data/grooves/Salsa2EndingA.musicxml b/test/data/grooves/Salsa2EndingA.musicxml index b2beb6ba..e5405cfb 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-27 @@ -514,15 +514,13 @@ F 4 - 48 - + 192 1 - 64th + 16th up normal - @@ -559,88 +557,6 @@ - - - F - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - F @@ -714,116 +630,28 @@ F 4 - 192 - - 1 - 16th - up - normal - - - - - - F - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - F - 4 - - 192 - + 512 1 - 16th - up - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - F - 4 - - 12 - - - - 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -831,15 +659,19 @@ F 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + @@ -847,116 +679,28 @@ F 4 - 192 + 512 1 - 16th - up - normal - - - - - - F - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - F - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - F - 4 - - 12 - - - - 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -964,132 +708,48 @@ F 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + F 4 - - 192 - - 1 - 16th - up - normal - - - - - - F - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - F - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - F - 4 - - 12 - - + + 512 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -1097,15 +757,19 @@ F 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + @@ -1315,20 +979,6 @@ - - - F - 4 - - 192 - - 1 - 16th - up - normal - - - F @@ -1348,97 +998,28 @@ F 4 - 192 - - 1 - 16th - up - normal - - - - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - F - 4 - - 12 - - + 256 1 - 256th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -1446,67 +1027,18 @@ F 4 - 3 - - - 1 - 1024th - up - normal - - - - - - - F - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - F - 4 - - 12 - - + 256 1 - 256th + eighth + + 3 + 2 + eighth + up normal - - @@ -1514,15 +1046,19 @@ F 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + eighth + up normal - + @@ -1718,16 +1254,13 @@ F 4 - 288 - + 384 1 - 16th - + eighth up normal - @@ -1764,38 +1297,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..d47998f7 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-27 @@ -514,15 +514,13 @@ F 4 - 48 - + 192 1 - 64th + 16th up normal - @@ -559,88 +557,6 @@ - - - F - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - F @@ -714,116 +630,28 @@ F 4 - 192 - - 1 - 16th - up - normal - - - - - - F - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - F - 4 - - 192 - + 512 1 - 16th - up - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - F - 4 - - 12 - - - - 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -831,15 +659,19 @@ F 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + @@ -847,116 +679,28 @@ F 4 - 192 + 512 1 - 16th - up - normal - - - - - - F - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - F - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - F - 4 - - 12 - - - - 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -964,132 +708,48 @@ F 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + F 4 - - 192 - - 1 - 16th - up - normal - - - - - - F - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - F - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - F - 4 - - 12 - - + + 512 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -1097,15 +757,19 @@ F 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + @@ -1315,20 +979,6 @@ - - - F - 4 - - 192 - - 1 - 16th - up - normal - - - F @@ -1348,97 +998,28 @@ F 4 - 192 - - 1 - 16th - up - normal - - - - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - F - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - F - 4 - - 12 - - + 256 1 - 256th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -1446,67 +1027,18 @@ F 4 - 3 - - - 1 - 1024th - up - normal - - - - - - - F - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - F - 4 - - 12 - - + 256 1 - 256th + eighth + + 3 + 2 + eighth + up normal - - @@ -1514,15 +1046,19 @@ F 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + eighth + up normal - + @@ -1718,16 +1254,13 @@ F 4 - 288 - + 384 1 - 16th - + eighth up normal - @@ -1764,38 +1297,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..8fd46153 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-27 @@ -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..712ff44f 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-27 diff --git a/test/data/grooves/Salsa2FillBA.musicxml b/test/data/grooves/Salsa2FillBA.musicxml index 98deefe7..b5d707db 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-27 diff --git a/test/data/grooves/Salsa2FillBB.musicxml b/test/data/grooves/Salsa2FillBB.musicxml index a14783a3..70478d84 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-27 @@ -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..b8a22795 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-27 @@ -871,22 +871,25 @@ - 384 - - 1 - eighth - - - - - - - 192 - + 512 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 + @@ -2104,15 +2216,28 @@ D 4 - 96 - + 512 1 - 32nd + quarter + + 3 + 2 + quarter + up normal - + + + 3 + quarter + + + 2 + quarter + + @@ -2149,235 +2274,54 @@ - - - D - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - D - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - D - 4 - - 6 - - - 1 - 512th - 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 + 256 1 - 16th + eighth + + 3 + 2 + quarter + up normal + + D 4 - 192 - - 1 - 16th - up - normal - - - - - - D - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - D - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - D - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - D - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - D - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - D - 4 - - 12 - - + 512 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -2385,15 +2329,19 @@ D 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + @@ -3112,15 +3060,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..3dc74635 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-27 @@ -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 + + @@ -1359,15 +1373,13 @@ F 4 - 48 - + 192 1 - 64th + 16th up normal - @@ -1409,151 +1421,28 @@ F 4 - 96 - - - 1 - 32nd - up - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - 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 - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - F - 4 - - 12 - - + 512 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -1561,132 +1450,49 @@ F 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + + F 4 - 192 - - 1 - 16th - up - normal - - - - - - F - 4 - - 288 - - - 1 - 16th - - up - normal - - - - - - - F - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - F - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - F - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - F - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - F - 4 - - 12 - - + 512 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -1694,15 +1500,19 @@ F 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + @@ -1724,16 +1534,14 @@ D 4 - 288 - + 576 1 - 16th + eighth up normal - @@ -1770,189 +1578,33 @@ - - - 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 - - 288 - - - 1 - 16th - - up - normal - - - - - - - D - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - D - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - D - 4 - - 192 - - - 1 - 16th - up - normal - - - - - - - D - 4 - - 48 - - - - 1 - 64th - up - normal - - - - - - - - D - 4 - - 12 - - + 512 1 - 256th + quarter + + 3 + 2 + quarter + up normal - - + + + 3 + quarter + + + 2 + quarter + + @@ -1960,15 +1612,19 @@ D 4 - 3 - + 256 1 - 1024th + eighth + + 3 + 2 + quarter + up normal - + diff --git a/test/data/grooves/Salsa2MainA.musicxml b/test/data/grooves/Salsa2MainA.musicxml index aff9221b..94ac47fb 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-27 @@ -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..2478fbe2 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-27 @@ -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..5da4583b 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-27 @@ -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..91d4a4e2 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-27 diff --git a/test/data/grooves/SalsaIntro.musicxml b/test/data/grooves/SalsaIntro.musicxml index b3b82787..252fbdc8 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-27 diff --git a/test/data/grooves/SalsaPlus.musicxml b/test/data/grooves/SalsaPlus.musicxml index c94b6890..156cafdf 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-27 diff --git a/test/data/grooves/SalsaSus.musicxml b/test/data/grooves/SalsaSus.musicxml index b323bbd0..b1768b85 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-27 diff --git a/test/data/grooves/SalsaSusPlus.musicxml b/test/data/grooves/SalsaSusPlus.musicxml index 06f20e73..76c5bddc 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-27 diff --git a/test/data/grooves/Samai.musicxml b/test/data/grooves/Samai.musicxml index 4fae1a63..f2621403 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-27 diff --git a/test/data/grooves/Samba.musicxml b/test/data/grooves/Samba.musicxml index d1c156a6..38eb2731 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-27 diff --git a/test/data/grooves/SambaEnd.musicxml b/test/data/grooves/SambaEnd.musicxml index a5855bb9..7d08cc8f 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-27 diff --git a/test/data/grooves/SambaFill.musicxml b/test/data/grooves/SambaFill.musicxml index f0e9fc49..56cf32ab 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-27 diff --git a/test/data/grooves/SambaIntro.musicxml b/test/data/grooves/SambaIntro.musicxml index 7d0e77ed..04d77536 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-27 diff --git a/test/data/grooves/SambaIntro1.musicxml b/test/data/grooves/SambaIntro1.musicxml index 54fe2f54..d3f79f0b 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-27 diff --git a/test/data/grooves/SambaIntro8.musicxml b/test/data/grooves/SambaIntro8.musicxml index 6d545826..7021d5dc 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-27 diff --git a/test/data/grooves/SambaPlus.musicxml b/test/data/grooves/SambaPlus.musicxml index 42da95ad..d2845439 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-27 diff --git a/test/data/grooves/SambaSus.musicxml b/test/data/grooves/SambaSus.musicxml index 289387a6..b6b6a508 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-27 diff --git a/test/data/grooves/SambaSusFill.musicxml b/test/data/grooves/SambaSusFill.musicxml index 9d778c06..65703c0d 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-27 diff --git a/test/data/grooves/SambaSusPlus.musicxml b/test/data/grooves/SambaSusPlus.musicxml index fd272fe3..969c7b7c 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-27 diff --git a/test/data/grooves/Serenade.musicxml b/test/data/grooves/Serenade.musicxml index 83db3d44..8b36416c 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-27 diff --git a/test/data/grooves/SerenadeEnd.musicxml b/test/data/grooves/SerenadeEnd.musicxml index fd563576..f7dbf8a0 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-27 diff --git a/test/data/grooves/SerenadeIntro.musicxml b/test/data/grooves/SerenadeIntro.musicxml index da2c0fb5..006f0616 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-27 diff --git a/test/data/grooves/ShuffleBoggie.musicxml b/test/data/grooves/ShuffleBoggie.musicxml index 850d31c8..a614681c 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-27 diff --git a/test/data/grooves/ShuffleBoggie1.musicxml b/test/data/grooves/ShuffleBoggie1.musicxml index 9ca4f706..bd3e7552 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-27 diff --git a/test/data/grooves/ShuffleBoggieEnd.musicxml b/test/data/grooves/ShuffleBoggieEnd.musicxml index 82f9ebe5..a0a798fe 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-27 diff --git a/test/data/grooves/ShuffleBoggieFill.musicxml b/test/data/grooves/ShuffleBoggieFill.musicxml index fcf67af3..bbf70c9e 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-27 diff --git a/test/data/grooves/ShuffleBoggieIntro.musicxml b/test/data/grooves/ShuffleBoggieIntro.musicxml index 95b8c00f..19aa3799 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-27 diff --git a/test/data/grooves/ShuffleBoggieIntro4.musicxml b/test/data/grooves/ShuffleBoggieIntro4.musicxml index bb18e29d..1e51f105 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-27 diff --git a/test/data/grooves/ShuffleBoggieSus.musicxml b/test/data/grooves/ShuffleBoggieSus.musicxml index 93136c41..f4f17f58 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-27 diff --git a/test/data/grooves/ShuffleBoogie.musicxml b/test/data/grooves/ShuffleBoogie.musicxml index b975050b..b033df30 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-27 @@ -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..1028efb7 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-27 @@ -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..83a7658d 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-27 @@ -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 @@ -1088,115 +1097,28 @@ G 5 - 384 - - 3 - eighth - up - x - - - - - - G - 5 - - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + 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 - - - + + + 3 + quarter + + + 2 + quarter + + @@ -1204,29 +1126,19 @@ G 5 - 3 - + 256 3 - 1024th - up - circle-x - - - - - - - G - 5 - - 384 - - 3 eighth + + 3 + 2 + quarter + up - x + circle-x + @@ -1262,101 +1174,28 @@ G 5 - 96 - - - 3 - 32nd - up - x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - x - - - - - - - - G - 5 - - 6 - + 512 3 - 512th + quarter + + 3 + 2 + quarter + 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 - - - + + + 3 + quarter + + + 2 + quarter + + @@ -1364,15 +1203,19 @@ G 5 - 3 - + 256 3 - 1024th + eighth + + 3 + 2 + quarter + up circle-x - + diff --git a/test/data/grooves/ShuffleRock.musicxml b/test/data/grooves/ShuffleRock.musicxml index 25b88541..f3f39597 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-27 diff --git a/test/data/grooves/ShuffleRockEnd.musicxml b/test/data/grooves/ShuffleRockEnd.musicxml index 8f486597..88e37167 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-27 diff --git a/test/data/grooves/ShuffleRockIntro.musicxml b/test/data/grooves/ShuffleRockIntro.musicxml index 05bd6830..426db71b 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-27 diff --git a/test/data/grooves/Ska.musicxml b/test/data/grooves/Ska.musicxml index a3702fd6..3d7c12fe 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-27 @@ -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..445cb834 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-27 @@ -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..27134c20 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-27 @@ -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..e3790839 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-27 @@ -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..99766e20 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-27 @@ -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..fc89604f 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-27 @@ -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..50f9a107 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-27 diff --git a/test/data/grooves/Slow16BeatEnd.musicxml b/test/data/grooves/Slow16BeatEnd.musicxml index 0d031678..8c74990f 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-27 diff --git a/test/data/grooves/Slow16BeatIntro.musicxml b/test/data/grooves/Slow16BeatIntro.musicxml index 4d5550b1..5ecf7537 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-27 diff --git a/test/data/grooves/SlowBigBand.musicxml b/test/data/grooves/SlowBigBand.musicxml index 66d4e0f0..8865d1b7 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-27 @@ -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..2372fe54 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-27 @@ -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..bc585142 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-27 @@ -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..cedbb02d 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-27 diff --git a/test/data/grooves/SlowBlues12Triple.musicxml b/test/data/grooves/SlowBlues12Triple.musicxml index 595411cd..acfbcd10 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-27 diff --git a/test/data/grooves/SlowBlues34Triple.musicxml b/test/data/grooves/SlowBlues34Triple.musicxml index d7e999f2..6918776e 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-27 diff --git a/test/data/grooves/SlowBlues4Triple.musicxml b/test/data/grooves/SlowBlues4Triple.musicxml index 2bdba8df..c6622ddf 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-27 diff --git a/test/data/grooves/SlowBluesEnd.musicxml b/test/data/grooves/SlowBluesEnd.musicxml index 8e185f05..d00abe2b 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-27 diff --git a/test/data/grooves/SlowBluesFill.musicxml b/test/data/grooves/SlowBluesFill.musicxml index 81a5995c..ef97d7f4 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-27 diff --git a/test/data/grooves/SlowBluesFill1.musicxml b/test/data/grooves/SlowBluesFill1.musicxml index cc2fa691..e9dca412 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-27 diff --git a/test/data/grooves/SlowBluesFill2.musicxml b/test/data/grooves/SlowBluesFill2.musicxml index 7897659a..8bafc3ba 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-27 diff --git a/test/data/grooves/SlowBluesFill3.musicxml b/test/data/grooves/SlowBluesFill3.musicxml index 95e575b2..dbaf4849 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-27 diff --git a/test/data/grooves/SlowBluesIntro.musicxml b/test/data/grooves/SlowBluesIntro.musicxml index e57c49ac..a913bd1b 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-27 diff --git a/test/data/grooves/SlowBluesSus.musicxml b/test/data/grooves/SlowBluesSus.musicxml index fed6390f..921b3191 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-27 diff --git a/test/data/grooves/SlowBluesWalk4.musicxml b/test/data/grooves/SlowBluesWalk4.musicxml index aa9a5546..2207a68a 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-27 diff --git a/test/data/grooves/SlowBluesWalk4Sus.musicxml b/test/data/grooves/SlowBluesWalk4Sus.musicxml index 7b5bd795..f8bc6052 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-27 diff --git a/test/data/grooves/SlowBluesWalk8.musicxml b/test/data/grooves/SlowBluesWalk8.musicxml index 3301ea0b..cffa7ac4 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-27 diff --git a/test/data/grooves/SlowBluesWalk8Sus.musicxml b/test/data/grooves/SlowBluesWalk8Sus.musicxml index b53d9d06..af7e8945 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-27 diff --git a/test/data/grooves/SlowBolero.musicxml b/test/data/grooves/SlowBolero.musicxml index 6d8b919d..0ab7e4bc 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-27 @@ -1379,99 +1379,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 - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1479,10 +1408,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1493,13 +1427,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1507,10 +1447,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal @@ -1735,99 +1675,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 - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1835,10 +1704,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1849,13 +1723,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1863,10 +1743,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..5ee5147e 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-27 @@ -1379,99 +1379,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 - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1479,10 +1408,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1493,13 +1427,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1507,10 +1447,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal @@ -1735,99 +1675,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 - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1835,10 +1704,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1849,13 +1723,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1863,10 +1743,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..9a2088ab 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-27 @@ -1379,99 +1379,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 - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1479,10 +1408,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1493,13 +1427,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1507,10 +1447,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal @@ -1735,99 +1675,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 - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1835,10 +1704,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1849,13 +1723,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1863,10 +1743,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..37ce490b 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-27 diff --git a/test/data/grooves/SlowBoleroIntro.musicxml b/test/data/grooves/SlowBoleroIntro.musicxml index fa677339..310e3b3a 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-27 @@ -1569,99 +1569,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 - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1669,10 +1598,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1683,13 +1617,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1697,10 +1637,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..6cc810d2 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-27 @@ -1569,99 +1569,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 - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1669,10 +1598,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1683,13 +1617,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1697,10 +1637,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..a9b4114a 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-27 @@ -1379,99 +1379,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 - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1479,10 +1408,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1493,13 +1427,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1507,10 +1447,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal @@ -1735,99 +1675,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 - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1835,10 +1704,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1849,13 +1723,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1863,10 +1743,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..134bf474 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-27 @@ -1379,99 +1379,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 - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1479,10 +1408,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1493,13 +1427,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1507,10 +1447,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal @@ -1735,99 +1675,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 - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1835,10 +1704,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1849,13 +1723,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1863,10 +1743,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..8b09df63 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-27 @@ -1379,99 +1379,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 - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1479,10 +1408,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1493,13 +1427,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1507,10 +1447,10 @@ E 4 - 192 + 384 1 - 16th + eighth up normal @@ -1735,99 +1675,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 - up - normal - - - - - - - - E - 4 - - 3 - - - 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + + + 3 + 16th + + + 2 + 16th + + @@ -1835,10 +1704,15 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal @@ -1849,13 +1723,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1863,10 +1743,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..a30aeb20 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-27 @@ -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..bb5a544d 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-27 @@ -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..57133993 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-27 @@ -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..7d0d8eca 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-27 @@ -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..e67460cb 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-27 @@ -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..21c3427c 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-27 @@ -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..a4bc6b66 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-27 diff --git a/test/data/grooves/SlowCountryEnd.musicxml b/test/data/grooves/SlowCountryEnd.musicxml index 6721a000..a064726b 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-27 diff --git a/test/data/grooves/SlowCountryFill.musicxml b/test/data/grooves/SlowCountryFill.musicxml index 865c1836..00fbeff1 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-27 diff --git a/test/data/grooves/SlowCountryFillPlus.musicxml b/test/data/grooves/SlowCountryFillPlus.musicxml index 9a4276ac..a1baf878 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-27 diff --git a/test/data/grooves/SlowCountryIntro.musicxml b/test/data/grooves/SlowCountryIntro.musicxml index 635858bb..239aed56 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-27 diff --git a/test/data/grooves/SlowCountryPlus.musicxml b/test/data/grooves/SlowCountryPlus.musicxml index cfef45b9..a51a262d 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-27 diff --git a/test/data/grooves/SlowCountrySus.musicxml b/test/data/grooves/SlowCountrySus.musicxml index f67dda86..e0a67bd7 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-27 diff --git a/test/data/grooves/SlowCountrySusPlus.musicxml b/test/data/grooves/SlowCountrySusPlus.musicxml index c9ebd1eb..bdcb0886 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-27 diff --git a/test/data/grooves/SlowCountryWalk.musicxml b/test/data/grooves/SlowCountryWalk.musicxml index 4d417dd0..9afb38d6 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-27 diff --git a/test/data/grooves/SlowCountryWalkFill.musicxml b/test/data/grooves/SlowCountryWalkFill.musicxml index 1544e136..85b77a1f 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-27 diff --git a/test/data/grooves/SlowCountryWalkFillPlus.musicxml b/test/data/grooves/SlowCountryWalkFillPlus.musicxml index 50d3e849..24a6b3c4 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-27 diff --git a/test/data/grooves/SlowCountryWalkPlus.musicxml b/test/data/grooves/SlowCountryWalkPlus.musicxml index 1e9f97ec..aecc822d 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-27 diff --git a/test/data/grooves/SlowCountryWalkSus.musicxml b/test/data/grooves/SlowCountryWalkSus.musicxml index 1e3165e1..1d773ef3 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-27 diff --git a/test/data/grooves/SlowCountryWalkSusPlus.musicxml b/test/data/grooves/SlowCountryWalkSusPlus.musicxml index 37ad5da4..00e4d53c 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-27 diff --git a/test/data/grooves/SlowDesert.musicxml b/test/data/grooves/SlowDesert.musicxml index 8247d20c..69d21319 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-27 diff --git a/test/data/grooves/SlowDesertEnd.musicxml b/test/data/grooves/SlowDesertEnd.musicxml index 018dd4a0..21c63337 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-27 diff --git a/test/data/grooves/SlowDesertFill.musicxml b/test/data/grooves/SlowDesertFill.musicxml index c0d2667e..71579a14 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-27 @@ -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..fb945bff 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-27 @@ -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..bf393a57 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-27 diff --git a/test/data/grooves/SlowDesertSus.musicxml b/test/data/grooves/SlowDesertSus.musicxml index dac7881a..e8668d5d 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-27 diff --git a/test/data/grooves/SlowDesertSusPlus.musicxml b/test/data/grooves/SlowDesertSusPlus.musicxml index 23e820e5..061ae263 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-27 diff --git a/test/data/grooves/SlowJazz.musicxml b/test/data/grooves/SlowJazz.musicxml index 59bc60ab..f48bb9ba 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-27 diff --git a/test/data/grooves/SlowJazz1.musicxml b/test/data/grooves/SlowJazz1.musicxml index c9202e1c..09a65c49 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-27 diff --git a/test/data/grooves/SlowJazz1Intro.musicxml b/test/data/grooves/SlowJazz1Intro.musicxml index 0bfa4ba5..9da91f07 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-27 diff --git a/test/data/grooves/SlowJazz1Plus.musicxml b/test/data/grooves/SlowJazz1Plus.musicxml index cb79de6c..37deb067 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-27 diff --git a/test/data/grooves/SlowJazz1Sus.musicxml b/test/data/grooves/SlowJazz1Sus.musicxml index bc1d40de..3a53c9d7 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-27 diff --git a/test/data/grooves/SlowJazz1SusPlus.musicxml b/test/data/grooves/SlowJazz1SusPlus.musicxml index 65330dd0..f4527c54 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-27 diff --git a/test/data/grooves/SlowJazz1Walk.musicxml b/test/data/grooves/SlowJazz1Walk.musicxml index 93b0b17a..d359023f 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-27 diff --git a/test/data/grooves/SlowJazz1WalkSus.musicxml b/test/data/grooves/SlowJazz1WalkSus.musicxml index db981b21..46beabd9 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-27 diff --git a/test/data/grooves/SlowJazz2.musicxml b/test/data/grooves/SlowJazz2.musicxml index 87e703e2..6bcf1528 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-27 diff --git a/test/data/grooves/SlowJazz2End.musicxml b/test/data/grooves/SlowJazz2End.musicxml index 253031c3..a82dd0a2 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-27 diff --git a/test/data/grooves/SlowJazz2Intro.musicxml b/test/data/grooves/SlowJazz2Intro.musicxml index 0eb22c22..c08bdb06 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-27 diff --git a/test/data/grooves/SlowJazz2Sus.musicxml b/test/data/grooves/SlowJazz2Sus.musicxml index f845926d..ccab28b9 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-27 diff --git a/test/data/grooves/SlowJazzEnd.musicxml b/test/data/grooves/SlowJazzEnd.musicxml index 14c62be3..440cbdc7 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-27 diff --git a/test/data/grooves/SlowJazzFill.musicxml b/test/data/grooves/SlowJazzFill.musicxml index 0292b4e7..70e129ad 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-27 diff --git a/test/data/grooves/SlowJazzIntro.musicxml b/test/data/grooves/SlowJazzIntro.musicxml index a2d5d9a0..c2c95340 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-27 diff --git a/test/data/grooves/SlowJazzPlus.musicxml b/test/data/grooves/SlowJazzPlus.musicxml index e6237aff..ee4e3275 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-27 diff --git a/test/data/grooves/SlowJazzSus.musicxml b/test/data/grooves/SlowJazzSus.musicxml index 20cf4134..cccb611b 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-27 diff --git a/test/data/grooves/SlowJazzSusPlus.musicxml b/test/data/grooves/SlowJazzSusPlus.musicxml index 954362e2..a0152f47 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-27 diff --git a/test/data/grooves/SlowJazzWalk.musicxml b/test/data/grooves/SlowJazzWalk.musicxml index 3f45a45e..ffd30661 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-27 diff --git a/test/data/grooves/SlowJazzWalkSus.musicxml b/test/data/grooves/SlowJazzWalkSus.musicxml index 40616648..93cdef9e 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-27 diff --git a/test/data/grooves/SlowRock.musicxml b/test/data/grooves/SlowRock.musicxml index 74dea924..a31bad5e 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-27 @@ -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..0ff284ec 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-27 diff --git a/test/data/grooves/SlowRockIntro.musicxml b/test/data/grooves/SlowRockIntro.musicxml index 0f340983..0d8380bc 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-27 @@ -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..1a1f384f 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-27 diff --git a/test/data/grooves/SlowSwingIntro.musicxml b/test/data/grooves/SlowSwingIntro.musicxml index 51a88495..df022bf2 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-27 diff --git a/test/data/grooves/SoftRock.musicxml b/test/data/grooves/SoftRock.musicxml index 54273717..2833670c 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-27 diff --git a/test/data/grooves/SoftRock1.musicxml b/test/data/grooves/SoftRock1.musicxml index e7d75d3b..6c926882 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-27 diff --git a/test/data/grooves/SoftRock1Sus.musicxml b/test/data/grooves/SoftRock1Sus.musicxml index ca71bf3e..dcd11ddf 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-27 diff --git a/test/data/grooves/SoftRock2.musicxml b/test/data/grooves/SoftRock2.musicxml index 710be786..9ce9ad9a 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-27 diff --git a/test/data/grooves/SoftRock2Sus.musicxml b/test/data/grooves/SoftRock2Sus.musicxml index 4201e79b..a2f26956 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-27 diff --git a/test/data/grooves/SoftRockEnd.musicxml b/test/data/grooves/SoftRockEnd.musicxml index c478ddfe..f55c8076 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-27 diff --git a/test/data/grooves/SoftRockFill.musicxml b/test/data/grooves/SoftRockFill.musicxml index 4555876e..82aca679 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-27 diff --git a/test/data/grooves/SoftRockIntro.musicxml b/test/data/grooves/SoftRockIntro.musicxml index c68c1c84..006b50e2 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-27 diff --git a/test/data/grooves/SoftRockSus.musicxml b/test/data/grooves/SoftRockSus.musicxml index 3e089c22..d4de6282 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-27 diff --git a/test/data/grooves/SoftRockSusIntro.musicxml b/test/data/grooves/SoftRockSusIntro.musicxml index 14f75133..bd815c04 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-27 diff --git a/test/data/grooves/SoftShoeEnd.musicxml b/test/data/grooves/SoftShoeEnd.musicxml index de6fefbe..c7390089 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-27 diff --git a/test/data/grooves/SoftShoeIntro.musicxml b/test/data/grooves/SoftShoeIntro.musicxml index 3d421349..6395f3e3 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-27 diff --git a/test/data/grooves/SoftShoeIntro8.musicxml b/test/data/grooves/SoftShoeIntro8.musicxml index 5fa7c970..2ee1c16f 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-27 diff --git a/test/data/grooves/SoftShoePlus.musicxml b/test/data/grooves/SoftShoePlus.musicxml index ff8377a4..9b783441 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-27 diff --git a/test/data/grooves/SoftShoeSus.musicxml b/test/data/grooves/SoftShoeSus.musicxml index d9cf7888..cbc65de0 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-27 diff --git a/test/data/grooves/SoftShoeSusPlus.musicxml b/test/data/grooves/SoftShoeSusPlus.musicxml index ced5b59f..9981b810 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-27 diff --git a/test/data/grooves/Softshoe.musicxml b/test/data/grooves/Softshoe.musicxml index 23f062cb..79b25735 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-27 diff --git a/test/data/grooves/Son.musicxml b/test/data/grooves/Son.musicxml index 5728feb7..b51dc1fe 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-27 diff --git a/test/data/grooves/SonEnd.musicxml b/test/data/grooves/SonEnd.musicxml index 1ce48125..72734026 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-27 @@ -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..4a5de93d 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-27 @@ -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..6d4dc32f 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-27 @@ -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..7b27df00 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-27 @@ -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..2e11fa82 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-27 diff --git a/test/data/grooves/SonSus.musicxml b/test/data/grooves/SonSus.musicxml index 9be3e305..40212557 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-27 diff --git a/test/data/grooves/SonSusPlus.musicxml b/test/data/grooves/SonSusPlus.musicxml index df034762..abf642e8 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-27 diff --git a/test/data/grooves/Soul.musicxml b/test/data/grooves/Soul.musicxml index f62db529..32bec7f4 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-27 @@ -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..3a7b729b 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-27 @@ -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..accec80d 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-27 @@ -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..a8da9480 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-27 @@ -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..30439883 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-27 @@ -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..f020085d 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-27 @@ -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..4448c4f7 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-27 diff --git a/test/data/grooves/SpiritualEnd.musicxml b/test/data/grooves/SpiritualEnd.musicxml index 5cf9b916..961ef5e5 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-27 diff --git a/test/data/grooves/SpiritualIntro.musicxml b/test/data/grooves/SpiritualIntro.musicxml index 2e722d32..4e2cec29 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-27 diff --git a/test/data/grooves/SpiritualPlus.musicxml b/test/data/grooves/SpiritualPlus.musicxml index 47c35a7b..7cba8231 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-27 diff --git a/test/data/grooves/SpiritualSus.musicxml b/test/data/grooves/SpiritualSus.musicxml index dab2936c..9fe3d5cd 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-27 diff --git a/test/data/grooves/SpiritualSusIntro.musicxml b/test/data/grooves/SpiritualSusIntro.musicxml index 6819c7a0..e5615f37 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-27 diff --git a/test/data/grooves/SpiritualSusPlus.musicxml b/test/data/grooves/SpiritualSusPlus.musicxml index 99547bed..068d5cb0 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-27 diff --git a/test/data/grooves/Strut.musicxml b/test/data/grooves/Strut.musicxml index e542832e..3575b3f1 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-27 diff --git a/test/data/grooves/Strut2.musicxml b/test/data/grooves/Strut2.musicxml index 6c54a28d..bb8823ea 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-27 diff --git a/test/data/grooves/Strut2Sus.musicxml b/test/data/grooves/Strut2Sus.musicxml index b1b9f1e3..1d551b47 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-27 diff --git a/test/data/grooves/StrutEnd.musicxml b/test/data/grooves/StrutEnd.musicxml index 7d16ea73..f711c6ca 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-27 @@ -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..d7522a1e 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-27 diff --git a/test/data/grooves/StrutSus.musicxml b/test/data/grooves/StrutSus.musicxml index 776fcb7b..8af75b6b 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-27 diff --git a/test/data/grooves/StrutSusIntro.musicxml b/test/data/grooves/StrutSusIntro.musicxml index 6310452a..2cd8f9c7 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-27 diff --git a/test/data/grooves/Swing.musicxml b/test/data/grooves/Swing.musicxml index a749ed4f..96a6fb3d 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-27 @@ -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..3c2a27d7 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-27 diff --git a/test/data/grooves/Swing1End.musicxml b/test/data/grooves/Swing1End.musicxml index 353ca6a6..eb667e51 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-27 diff --git a/test/data/grooves/Swing1Plus.musicxml b/test/data/grooves/Swing1Plus.musicxml index e83e3bec..1f97e482 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-27 diff --git a/test/data/grooves/Swing1PlusSus.musicxml b/test/data/grooves/Swing1PlusSus.musicxml index d3d8afee..fe66bdae 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-27 diff --git a/test/data/grooves/Swing1Sus.musicxml b/test/data/grooves/Swing1Sus.musicxml index beaf8cc3..b7f2d5c6 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-27 diff --git a/test/data/grooves/Swing1Triple.musicxml b/test/data/grooves/Swing1Triple.musicxml index cc16e8f8..1cee0d3a 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-27 @@ -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..f9175c28 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-27 diff --git a/test/data/grooves/Swing1WalkPlus.musicxml b/test/data/grooves/Swing1WalkPlus.musicxml index 5c1deb4d..fc7704e5 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-27 diff --git a/test/data/grooves/Swing1WalkPlusSus.musicxml b/test/data/grooves/Swing1WalkPlusSus.musicxml index 4a6da9bc..a9eb6caf 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-27 diff --git a/test/data/grooves/Swing1WalkSus.musicxml b/test/data/grooves/Swing1WalkSus.musicxml index 7f23ff1a..e7ae7414 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-27 diff --git a/test/data/grooves/Swing2.musicxml b/test/data/grooves/Swing2.musicxml index ef7eee9a..f82b0463 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-27 diff --git a/test/data/grooves/Swing2End.musicxml b/test/data/grooves/Swing2End.musicxml index ca579a47..e0adea75 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-27 @@ -522,137 +522,18 @@ + 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 - - + 192 2 - 128th + 16th down x - - @@ -660,15 +541,13 @@ D 4 - 6 - + 192 2 - 512th + 16th down x - @@ -676,15 +555,28 @@ D 4 - 48 - + 128 2 - 64th + 16th + + 3 + 2 + 16th + down x - + + + 3 + 16th + + + 2 + 16th + + @@ -692,17 +584,18 @@ D 4 - 12 - - + 128 2 - 256th + 16th + + 3 + 2 + 16th + down x - - @@ -710,15 +603,19 @@ D 4 - 3 - + 128 2 - 1024th + 16th + + 3 + 2 + 16th + down x - + @@ -750,38 +647,18 @@ + D 4 - 189 - - 2 - 32nd - - - - - - down - x - - - - - - D - 4 - - 48 - + 192 2 - 64th + 16th down x - @@ -789,17 +666,13 @@ D 4 - 12 - - + 192 2 - 256th + 16th down x - - @@ -807,15 +680,28 @@ D 4 - 3 - + 128 2 - 1024th + 16th + + 3 + 2 + 16th + down x - + + + 3 + 16th + + + 2 + 16th + + @@ -823,15 +709,18 @@ D 4 - 96 - + 128 2 - 32nd + 16th + + 3 + 2 + 16th + down x - @@ -839,17 +728,19 @@ D 4 - 24 - - + 128 2 - 128th + 16th + + 3 + 2 + 16th + down x - - + @@ -857,15 +748,13 @@ D 4 - 6 - + 192 2 - 512th + 16th down x - @@ -873,33 +762,28 @@ D 4 - 96 - + 192 2 - 32nd + 16th down x - + D 4 - 24 - - + 192 2 - 128th + 16th down x - - @@ -907,15 +791,13 @@ D 4 - 6 - + 192 2 - 512th + 16th down x - @@ -923,15 +805,28 @@ D 4 - 48 - + 128 2 - 64th + 16th + + 3 + 2 + 16th + down x - + + + 3 + 16th + + + 2 + 16th + + @@ -939,17 +834,18 @@ D 4 - 12 - - + 128 2 - 256th + 16th + + 3 + 2 + 16th + down x - - @@ -957,15 +853,19 @@ D 4 - 3 - + 128 2 - 1024th + 16th + + 3 + 2 + 16th + down x - + @@ -982,25 +882,6 @@ - - - D - 4 - - 189 - - 2 - 32nd - - - - - - down - x - - - D @@ -1016,19 +897,15 @@ + D 4 - 189 + 192 2 - 32nd - - - - - + 16th down x @@ -1039,15 +916,13 @@ D 4 - 48 - + 192 2 - 64th + 16th down x - @@ -1055,17 +930,28 @@ D 4 - 12 - - + 128 2 - 256th + 16th + + 3 + 2 + 16th + down x - - + + + 3 + 16th + + + 2 + 16th + + @@ -1073,15 +959,18 @@ D 4 - 3 - + 128 2 - 1024th + 16th + + 3 + 2 + 16th + down x - @@ -1089,15 +978,19 @@ D 4 - 96 - + 128 2 - 32nd + 16th + + 3 + 2 + 16th + down x - + @@ -1105,99 +998,88 @@ D 4 - 24 - - + 192 2 - 128th + 16th down x - - + + - D + E 4 - 6 - - - 2 - 512th + 768 + + 1 + quarter down - x + normal - - D + E 4 - 96 - - - 2 - 32nd + 768 + + 1 + quarter down - x + normal - - D + E 4 - 24 - - - - 2 - 128th + 768 + + 1 + quarter down - x + normal - - - D + E 4 - 6 - - - 2 - 512th + 768 + + 1 + quarter down - x + normal - + + 3072 + D 4 - 48 - + 768 2 - 64th + quarter down x - @@ -1205,17 +1087,13 @@ D 4 - 12 - - + 768 2 - 256th + quarter down x - - @@ -1223,15 +1101,13 @@ D 4 - 3 - + 768 2 - 1024th + quarter down x - @@ -1239,2018 +1115,206 @@ D 4 - 192 + 768 2 - 16th + quarter down x + + - D + E 4 - 189 - - 2 - 32nd - - - - - + 768 + + 1 + quarter down - x + normal - - - D - 4 - - 192 - - 2 - 16th - down - x + + + 768 + 1 + quarter - D + E 4 - 189 - - 2 - 32nd - - - - - + 768 + + 1 + quarter down - x + normal - - - D - 4 - - 48 - - - 2 - 64th - down - x + + + 768 + 1 + quarter - + + 3072 + D 4 - 12 - - + 768 2 - 256th + quarter 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 - - 6 - - - 2 - 512th - 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 - - 192 - - 2 - 16th - down - x - - - - - - D - 4 - - 189 - - 2 - 32nd - - - - - - down - x - - - - - - - - E - 4 - - 768 - - 1 - quarter - down - normal - - - - - - E - 4 - - 768 - - 1 - quarter - down - normal - - - - - - E - 4 - - 768 - - 1 - quarter - down - normal - - - - - - E - 4 - - 768 - - 1 - quarter - down - normal - - - - - 3072 - - - - 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 - - - 2 - 512th - down - x - - - - - - - D - 4 - - 768 - - 2 - quarter - down - x - - - - - - D - 4 - - 768 - - 2 - quarter - down - x - - - - - - D - 4 - - 768 - - 2 - quarter - down - x - - - - - - - - E - 4 - - 768 - - 1 - quarter - down - normal - - - - - - 768 - 1 - quarter - - - - - - E - 4 - - 768 - - 1 - quarter - down - normal - - - - - - 768 - 1 - quarter - - - - - 3072 - - - - D - 4 - - 768 - - 2 - quarter - down - x - - - - - - 768 - 2 - quarter - - - - - - D - 4 - - 768 - - 2 - quarter - down - x - - - - - - 768 - 2 - quarter - - - - - - - - E - 4 - - 768 - - 1 - quarter - down - normal - - - - - - 768 - 1 - quarter - - - - - - 768 - 1 - quarter - - - - - - 768 - 1 - quarter - - - - - 3072 - - - - D - 4 - - 768 - - 2 - quarter - down - x - - - - - - 768 - 2 - quarter - - - - - - 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 - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - - 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 - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - - 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 - - - - - - G - 5 - - 189 - - 3 - 32nd - - - - - - 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 - - 96 - - - 3 - 32nd - up - circle-x - - - - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x - - - - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x + + + 768 + 2 + quarter - - G - 5 + D + 4 - 96 - - - 3 - 32nd - up - circle-x + 768 + + 2 + quarter + down + x - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x + + + 768 + 2 + quarter - - + + - G - 5 + E + 4 - 3 - - - 3 - 1024th - up - circle-x + 768 + + 1 + quarter + down + normal - - - - G - 5 - - 96 - - - 3 - 32nd - up - circle-x + + + 768 + 1 + quarter - - - - G - 5 - - 24 - - - - 3 - 128th - up - circle-x + + + 768 + 1 + quarter - - - - - G - 5 - - 6 - - - 3 - 512th - up - circle-x + + + 768 + 1 + quarter - + + 3072 + - G - 5 + D + 4 - 48 - - - 3 - 64th - up - circle-x + 768 + + 2 + quarter + down + x - - - - G - 5 - - 12 - - - - 3 - 256th - up - circle-x + + + 768 + 2 + quarter - - - - - G - 5 - - 3 - - - 3 - 1024th - up - circle-x + + + 768 + 2 + quarter + + + + + + 768 + 2 + quarter - + + + + + + 768 + + + percussion + + + 5 + + G @@ -3266,19 +1330,15 @@ + G 5 - 189 + 192 3 - 32nd - - - - - + 16th up circle-x @@ -3303,18 +1363,28 @@ G 5 - 189 + 128 3 - 32nd - - - - - + 16th + + 3 + 2 + 16th + up circle-x + + + 3 + 16th + + + 2 + 16th + + @@ -3322,15 +1392,18 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up circle-x - @@ -3338,17 +1411,19 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up circle-x - - + @@ -3356,15 +1431,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up circle-x - @@ -3372,33 +1445,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up circle-x - + G 5 - 24 - - + 192 3 - 128th + 16th up circle-x - - @@ -3406,15 +1474,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up circle-x - @@ -3422,15 +1488,28 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up circle-x - + + + 3 + 16th + + + 2 + 16th + + @@ -3438,17 +1517,18 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up circle-x - - @@ -3456,15 +1536,19 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up circle-x - + @@ -3472,15 +1556,13 @@ G 5 - 48 - + 192 3 - 64th + 16th up circle-x - @@ -3488,33 +1570,28 @@ G 5 - 12 - - + 192 3 - 256th + 16th up circle-x - - + G 5 - 3 - + 192 3 - 1024th + 16th up circle-x - @@ -3536,18 +1613,28 @@ G 5 - 189 + 128 3 - 32nd - - - - - + 16th + + 3 + 2 + 16th + up circle-x + + + 3 + 16th + + + 2 + 16th + + @@ -3555,10 +1642,15 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up circle-x @@ -3569,18 +1661,19 @@ G 5 - 189 + 128 3 - 32nd - - - - - + 16th + + 3 + 2 + 16th + up circle-x + @@ -3588,15 +1681,13 @@ G 5 - 48 - + 192 3 - 64th + 16th up circle-x - @@ -3604,33 +1695,28 @@ G 5 - 12 - - + 192 3 - 256th + 16th up circle-x - - + G 5 - 3 - + 192 3 - 1024th + 16th up circle-x - @@ -3638,15 +1724,13 @@ G 5 - 96 - + 192 3 - 32nd + 16th up circle-x - @@ -3654,17 +1738,28 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up circle-x - - + + + 3 + 16th + + + 2 + 16th + + @@ -3672,15 +1767,18 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up circle-x - @@ -3688,15 +1786,19 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up circle-x - + @@ -3704,49 +1806,44 @@ G 5 - 24 - - + 192 3 - 128th + 16th up circle-x - - + + G 5 - 6 - + 192 3 - 512th + 16th up circle-x - + G 5 - 48 - + 192 3 - 64th + 16th up circle-x - @@ -3754,17 +1851,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up circle-x - - @@ -3772,15 +1865,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up circle-x - + + + 3 + 16th + + + 2 + 16th + + @@ -3788,10 +1894,15 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up circle-x @@ -3802,18 +1913,19 @@ G 5 - 189 + 128 3 - 32nd - - - - - + 16th + + 3 + 2 + 16th + up circle-x + @@ -3835,34 +1947,28 @@ G 5 - 189 + 192 3 - 32nd - - - - - + 16th up circle-x + G 5 - 48 - + 192 3 - 64th + 16th up circle-x - @@ -3870,17 +1976,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up circle-x - - @@ -3888,15 +1990,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up circle-x - + + + 3 + 16th + + + 2 + 16th + + @@ -3904,15 +2019,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up circle-x - @@ -3920,17 +2038,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up circle-x - - + @@ -3938,15 +2058,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up circle-x - @@ -3954,33 +2072,28 @@ G 5 - 96 - + 192 3 - 32nd + 16th up circle-x - + G 5 - 24 - - + 192 3 - 128th + 16th up circle-x - - @@ -3988,15 +2101,13 @@ G 5 - 6 - + 192 3 - 512th + 16th up circle-x - @@ -4004,15 +2115,28 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up circle-x - + + + 3 + 16th + + + 2 + 16th + + @@ -4020,17 +2144,18 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up circle-x - - @@ -4038,15 +2163,19 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up circle-x - + @@ -4063,27 +2192,6 @@ - - - G - 5 - - 189 - - 3 - 32nd - - - - - - up - circle-x - - - - - G @@ -4099,19 +2207,18 @@ + G 5 - 48 - + 192 3 - 64th + 16th up circle-x - @@ -4119,17 +2226,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up circle-x - - @@ -4137,15 +2240,28 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up circle-x - + + + 3 + 16th + + + 2 + 16th + + @@ -4153,15 +2269,18 @@ G 5 - 384 - + 128 3 - eighth + 16th + + 3 + 2 + 16th + up circle-x - @@ -4169,17 +2288,19 @@ G 5 - 96 - - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up circle-x - - + @@ -4187,33 +2308,29 @@ G 5 - 24 - - + 192 3 - 128th + 16th up circle-x - - + + G 5 - 6 - + 768 3 - 512th + quarter up circle-x - diff --git a/test/data/grooves/Swing2Plus.musicxml b/test/data/grooves/Swing2Plus.musicxml index 49dcf127..6af5904a 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-27 diff --git a/test/data/grooves/Swing2PlusSus.musicxml b/test/data/grooves/Swing2PlusSus.musicxml index 0fa94d71..94faa322 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-27 diff --git a/test/data/grooves/Swing2Sus.musicxml b/test/data/grooves/Swing2Sus.musicxml index 5e3ebf66..5f37c8a8 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-27 diff --git a/test/data/grooves/Swing2Triple.musicxml b/test/data/grooves/Swing2Triple.musicxml index f9b641fa..f0014dc9 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-27 @@ -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..3024702b 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-27 diff --git a/test/data/grooves/SwingFill.musicxml b/test/data/grooves/SwingFill.musicxml index d9072051..e266297b 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-27 diff --git a/test/data/grooves/SwingIntro.musicxml b/test/data/grooves/SwingIntro.musicxml index f87f8fb8..954ba78a 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-27 diff --git a/test/data/grooves/SwingIntro2.musicxml b/test/data/grooves/SwingIntro2.musicxml index 3a96d874..356b019d 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-27 diff --git a/test/data/grooves/SwingPlus.musicxml b/test/data/grooves/SwingPlus.musicxml index 2f55c677..8a5a236b 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-27 diff --git a/test/data/grooves/SwingPlusSus.musicxml b/test/data/grooves/SwingPlusSus.musicxml index 411fb90e..c0425e80 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-27 diff --git a/test/data/grooves/SwingSus.musicxml b/test/data/grooves/SwingSus.musicxml index 6b54afd5..da757d5e 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-27 diff --git a/test/data/grooves/SwingTriple.musicxml b/test/data/grooves/SwingTriple.musicxml index cc3c135d..70d42374 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-27 @@ -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..38144635 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-27 diff --git a/test/data/grooves/SwingWalkPlus.musicxml b/test/data/grooves/SwingWalkPlus.musicxml index 0f958e44..e4e95d5f 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-27 diff --git a/test/data/grooves/SwingWalkPlusSus.musicxml b/test/data/grooves/SwingWalkPlusSus.musicxml index a2b5b4e7..e5ef7d4e 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-27 diff --git a/test/data/grooves/SwingWalkSus.musicxml b/test/data/grooves/SwingWalkSus.musicxml index 84602d80..79f9902e 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-27 diff --git a/test/data/grooves/TECH01.musicxml b/test/data/grooves/TECH01.musicxml index 4a8edf4c..57309624 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-27 @@ -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..07015c4d 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-27 diff --git a/test/data/grooves/TECH03.musicxml b/test/data/grooves/TECH03.musicxml index 802261af..1ae13b40 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-27 @@ -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..a3ff057e 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-27 @@ -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..82955c5a 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-27 @@ -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..4794efc3 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-27 diff --git a/test/data/grooves/TECH07.musicxml b/test/data/grooves/TECH07.musicxml index 49803cad..61a62dc6 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-27 diff --git a/test/data/grooves/TECH08.musicxml b/test/data/grooves/TECH08.musicxml index c6e22bbe..bd67dec9 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-27 @@ -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..9a72ca34 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-27 diff --git a/test/data/grooves/TECH10.musicxml b/test/data/grooves/TECH10.musicxml index f49acbee..5f07a492 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-27 diff --git a/test/data/grooves/THRS01.musicxml b/test/data/grooves/THRS01.musicxml index 6f0ce518..c9433ae0 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-27 diff --git a/test/data/grooves/THRS02.musicxml b/test/data/grooves/THRS02.musicxml index 9820f3cc..72d7bf97 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-27 diff --git a/test/data/grooves/TRIP01.musicxml b/test/data/grooves/TRIP01.musicxml index 6e1e407a..d2ba8b70 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-27 @@ -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..d346949b 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-27 diff --git a/test/data/grooves/TRIP03.musicxml b/test/data/grooves/TRIP03.musicxml index b5db31a8..9c4abf66 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-27 diff --git a/test/data/grooves/TRIP04.musicxml b/test/data/grooves/TRIP04.musicxml index 2634f869..dc0d88c8 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-27 diff --git a/test/data/grooves/Tango.musicxml b/test/data/grooves/Tango.musicxml index a9ad6745..859d4b99 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-27 @@ -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..46669b2d 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-27 @@ -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..93131348 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-27 @@ -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..c8c7ff0b 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-27 @@ -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..a99edccf 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-27 @@ -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..1ad7c31a 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-27 @@ -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..670d2823 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-27 @@ -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..2c1f6198 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-27 diff --git a/test/data/grooves/TeamTechnoEnd.musicxml b/test/data/grooves/TeamTechnoEnd.musicxml index 047b9133..7a4689db 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-27 diff --git a/test/data/grooves/TeamTechnoIntro.musicxml b/test/data/grooves/TeamTechnoIntro.musicxml index be782c1a..e4c73dc0 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-27 diff --git a/test/data/grooves/TeamTechnoIntroPlus.musicxml b/test/data/grooves/TeamTechnoIntroPlus.musicxml index 91899751..9d81a25a 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-27 diff --git a/test/data/grooves/TeamTechnoSus.musicxml b/test/data/grooves/TeamTechnoSus.musicxml index de3f250c..619e9a88 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-27 diff --git a/test/data/grooves/Techno.musicxml b/test/data/grooves/Techno.musicxml index aeff9188..f00811c2 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-27 diff --git a/test/data/grooves/TechnoEnd.musicxml b/test/data/grooves/TechnoEnd.musicxml index 5745c986..60e076f8 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-27 diff --git a/test/data/grooves/TechnoIntro.musicxml b/test/data/grooves/TechnoIntro.musicxml index e13d7072..485202ef 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-27 diff --git a/test/data/grooves/Trance.musicxml b/test/data/grooves/Trance.musicxml index 2b742a62..f1637b6d 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-27 diff --git a/test/data/grooves/Trance1.musicxml b/test/data/grooves/Trance1.musicxml index 624a2cfe..51155b43 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-27 @@ -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..8a5eba72 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-27 diff --git a/test/data/grooves/Trance2.musicxml b/test/data/grooves/Trance2.musicxml index 184fb48c..2daa801f 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-27 diff --git a/test/data/grooves/Trance2Bass1.musicxml b/test/data/grooves/Trance2Bass1.musicxml index 75fc232e..b2bf8d01 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-27 diff --git a/test/data/grooves/TranceBass1.musicxml b/test/data/grooves/TranceBass1.musicxml index f5498946..a2666b14 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-27 diff --git a/test/data/grooves/TranceEnd.musicxml b/test/data/grooves/TranceEnd.musicxml index 54fb48d7..d24bf4dd 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-27 diff --git a/test/data/grooves/TranceIntro.musicxml b/test/data/grooves/TranceIntro.musicxml index 3ce08cd5..9f112a57 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-27 diff --git a/test/data/grooves/TripHop.musicxml b/test/data/grooves/TripHop.musicxml index b2e3deef..4be2368c 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-27 @@ -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..a13ca637 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-27 @@ -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..47116b48 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-27 @@ -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..15c9b8c3 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-27 @@ -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..9b52417d 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-27 diff --git a/test/data/grooves/TwiFillAB.musicxml b/test/data/grooves/TwiFillAB.musicxml index 0bf10d49..a7b90631 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-27 @@ -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..6145b327 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-27 @@ -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..28b36d6a 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-27 @@ -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 - @@ -503,115 +416,28 @@ 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 - - - - - - - E - 4 - - 192 - + 512 2 - 16th - up - square - - - - - - - E - 4 - - 48 - - - - 2 - 64th - up - square - - - - - - - - E - 4 - - 12 - - - - 2 - 256th + quarter + + 3 + 2 + quarter + up square - - + + + 3 + quarter + + + 2 + quarter + + @@ -619,15 +445,19 @@ E 4 - 3 - + 256 2 - 1024th + eighth + + 3 + 2 + quarter + up square - + diff --git a/test/data/grooves/TwiIntroB.musicxml b/test/data/grooves/TwiIntroB.musicxml index f5981fa2..38b68d27 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-27 @@ -552,97 +552,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 - - 96 - + 256 1 - 32nd - up - normal - - - - - - - D - 4 - - 24 - - - - 1 - 128th + eighth + + 3 + 2 + eighth + up normal - - + + + 3 + eighth + + + 2 + eighth + + @@ -650,15 +581,18 @@ D 4 - 6 - + 256 1 - 512th + eighth + + 3 + 2 + eighth + up normal - @@ -666,13 +600,19 @@ D 4 - 384 + 256 1 eighth + + 3 + 2 + eighth + up normal + @@ -766,117 +706,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..92ed9217 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-27 diff --git a/test/data/grooves/TwiMainB.musicxml b/test/data/grooves/TwiMainB.musicxml index f8dce8b2..4f53f138 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-27 @@ -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..379f9b18 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-27 @@ -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..a5b97b4d 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-27 @@ -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..2153e6fc 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-27 @@ -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..b7b4b855 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-27 @@ -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..ced825cd 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-27 @@ -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..d9545bd2 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-27 @@ -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..9dce743b 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-27 diff --git a/test/data/grooves/VieneseWaltz1.musicxml b/test/data/grooves/VieneseWaltz1.musicxml index 0d1867b1..27abedbd 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-27 diff --git a/test/data/grooves/VieneseWaltz1Sus.musicxml b/test/data/grooves/VieneseWaltz1Sus.musicxml index 356f9691..f7a8434b 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-27 diff --git a/test/data/grooves/VieneseWaltz2.musicxml b/test/data/grooves/VieneseWaltz2.musicxml index 9ea89349..ce938786 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-27 diff --git a/test/data/grooves/VieneseWaltz2Sus.musicxml b/test/data/grooves/VieneseWaltz2Sus.musicxml index a4a3a33d..7ca313b5 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-27 diff --git a/test/data/grooves/VieneseWaltzEnd.musicxml b/test/data/grooves/VieneseWaltzEnd.musicxml index 89a1cb0c..91479352 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-27 diff --git a/test/data/grooves/VieneseWaltzIntro.musicxml b/test/data/grooves/VieneseWaltzIntro.musicxml index 9a57b561..094113a0 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-27 diff --git a/test/data/grooves/VieneseWaltzSus.musicxml b/test/data/grooves/VieneseWaltzSus.musicxml index a7df813b..1447c7e7 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-27 diff --git a/test/data/grooves/W-RockEndingA.musicxml b/test/data/grooves/W-RockEndingA.musicxml index 7ac99556..24b679df 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-27 diff --git a/test/data/grooves/W-RockEndingB.musicxml b/test/data/grooves/W-RockEndingB.musicxml index 0e3fa9cd..b1347d03 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-27 diff --git a/test/data/grooves/W-RockFillAA.musicxml b/test/data/grooves/W-RockFillAA.musicxml index b56c8237..8cd1fd58 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-27 diff --git a/test/data/grooves/W-RockFillAB.musicxml b/test/data/grooves/W-RockFillAB.musicxml index bf353ebb..fcfad7b6 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-27 diff --git a/test/data/grooves/W-RockFillBA.musicxml b/test/data/grooves/W-RockFillBA.musicxml index 14e9334f..4b756201 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-27 diff --git a/test/data/grooves/W-RockIntroA.musicxml b/test/data/grooves/W-RockIntroA.musicxml index a70e6744..c250f26a 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-27 @@ -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..db225c75 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-27 diff --git a/test/data/grooves/W-RockMainB.musicxml b/test/data/grooves/W-RockMainB.musicxml index 8d3a2fb3..b8ea94a4 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-27 diff --git a/test/data/grooves/Waltz.musicxml b/test/data/grooves/Waltz.musicxml index b68eeec5..2d960db0 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-27 diff --git a/test/data/grooves/Waltz1.musicxml b/test/data/grooves/Waltz1.musicxml index aed16c3d..93bf2eb6 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-27 diff --git a/test/data/grooves/Waltz1Intro.musicxml b/test/data/grooves/Waltz1Intro.musicxml index e2103931..2c000efa 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-27 diff --git a/test/data/grooves/Waltz1Intro8.musicxml b/test/data/grooves/Waltz1Intro8.musicxml index 777e8103..79bc5062 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-27 diff --git a/test/data/grooves/Waltz1Sus.musicxml b/test/data/grooves/Waltz1Sus.musicxml index 4f0d570d..7d30225f 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-27 diff --git a/test/data/grooves/Waltz1SusIntro.musicxml b/test/data/grooves/Waltz1SusIntro.musicxml index c2bdf461..f06b504b 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-27 diff --git a/test/data/grooves/Waltz1SusIntro8.musicxml b/test/data/grooves/Waltz1SusIntro8.musicxml index 7aa0278d..bbed0154 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-27 diff --git a/test/data/grooves/Waltz1Walk.musicxml b/test/data/grooves/Waltz1Walk.musicxml index daf93c9b..b9b33340 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-27 diff --git a/test/data/grooves/Waltz1WalkSus.musicxml b/test/data/grooves/Waltz1WalkSus.musicxml index ee101366..f8487c38 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-27 diff --git a/test/data/grooves/WaltzEnd.musicxml b/test/data/grooves/WaltzEnd.musicxml index 56002c03..99538c7c 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-27 diff --git a/test/data/grooves/WaltzIntro.musicxml b/test/data/grooves/WaltzIntro.musicxml index f0aae366..7bffde56 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-27 diff --git a/test/data/grooves/WaltzIntro8.musicxml b/test/data/grooves/WaltzIntro8.musicxml index 5300a3db..a0fee1a8 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-27 diff --git a/test/data/grooves/WaltzSus.musicxml b/test/data/grooves/WaltzSus.musicxml index 7f571b56..c09d0092 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-27 diff --git a/test/data/grooves/WaltzSusIntro.musicxml b/test/data/grooves/WaltzSusIntro.musicxml index 1bc4d050..49cda4f8 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-27 diff --git a/test/data/grooves/WaltzSusIntro8.musicxml b/test/data/grooves/WaltzSusIntro8.musicxml index 0207b9d2..4e3c6219 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-27 diff --git a/test/data/grooves/WaltzWalk.musicxml b/test/data/grooves/WaltzWalk.musicxml index cd4692af..51b7e968 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-27 diff --git a/test/data/grooves/WaltzWalkSus.musicxml b/test/data/grooves/WaltzWalkSus.musicxml index 847c9261..fa1892cd 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-27 diff --git a/test/data/grooves/WesternEndingA.musicxml b/test/data/grooves/WesternEndingA.musicxml index b138a191..ebfb3ffd 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-27 @@ -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..a94a4b1c 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-27 @@ -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..e67e92cd 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-27 diff --git a/test/data/grooves/WesternFillAB.musicxml b/test/data/grooves/WesternFillAB.musicxml index 9688c8e9..e1fe3266 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-27 diff --git a/test/data/grooves/WesternFillBA.musicxml b/test/data/grooves/WesternFillBA.musicxml index 2829f81e..57361470 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-27 diff --git a/test/data/grooves/WesternFillBB.musicxml b/test/data/grooves/WesternFillBB.musicxml index 5ef3e219..92a8235b 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-27 diff --git a/test/data/grooves/WesternIntroA.musicxml b/test/data/grooves/WesternIntroA.musicxml index 5e1a9048..b045272f 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-27 diff --git a/test/data/grooves/WesternIntroB.musicxml b/test/data/grooves/WesternIntroB.musicxml index 009fa9cc..5409cf49 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-27 @@ -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..8364d285 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-27 diff --git a/test/data/grooves/WesternMainB.musicxml b/test/data/grooves/WesternMainB.musicxml index 94c2c793..eb0d649b 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-27 diff --git a/test/data/grooves/WesternSwing.musicxml b/test/data/grooves/WesternSwing.musicxml index 0a3f196a..b90be643 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-27 diff --git a/test/data/grooves/WesternSwingEnd.musicxml b/test/data/grooves/WesternSwingEnd.musicxml index 122d3510..c6937666 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-27 diff --git a/test/data/grooves/WesternSwingIntro.musicxml b/test/data/grooves/WesternSwingIntro.musicxml index 36a7bf5b..1aa503c6 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-27 diff --git a/test/data/grooves/WesternSwingPlus.musicxml b/test/data/grooves/WesternSwingPlus.musicxml index 1389a779..21c37140 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-27 diff --git a/test/data/grooves/WesternSwingSus.musicxml b/test/data/grooves/WesternSwingSus.musicxml index 7d35e8bf..beecd271 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-27 diff --git a/test/data/grooves/WesternSwingSusPlus.musicxml b/test/data/grooves/WesternSwingSusPlus.musicxml index f1d71780..9979f8a5 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-27 diff --git a/test/data/grooves/WorldPop.musicxml b/test/data/grooves/WorldPop.musicxml index c9497e9d..cabdfa45 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-27 @@ -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..61b23826 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-27 @@ -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..18a62dcd 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-27 @@ -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..49c338a3 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-27 diff --git a/test/data/grooves/Xote-Miranda.musicxml b/test/data/grooves/Xote-Miranda.musicxml index ffd2db1b..4993ef05 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-27 diff --git a/test/data/grooves/Zydeco.musicxml b/test/data/grooves/Zydeco.musicxml index 390c8cae..1b361cc1 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-27 diff --git a/test/data/grooves/ZydecoEnd.musicxml b/test/data/grooves/ZydecoEnd.musicxml index 44a42e51..0c0f65ba 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-27 diff --git a/test/data/grooves/ZydecoIntro.musicxml b/test/data/grooves/ZydecoIntro.musicxml index 933b211c..f45ae856 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-27 diff --git a/test/data/grooves/ZydecoPlus.musicxml b/test/data/grooves/ZydecoPlus.musicxml index 986a21b3..21af9d42 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-27 diff --git a/test/data/grooves/ZydecoPlusEnd.musicxml b/test/data/grooves/ZydecoPlusEnd.musicxml index a41bde19..b731d7fd 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-27 diff --git a/test/data/grooves/ZydecoSus.musicxml b/test/data/grooves/ZydecoSus.musicxml index f5b89707..70514348 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-27 diff --git a/test/data/grooves/ZydecoSusPlus.musicxml b/test/data/grooves/ZydecoSusPlus.musicxml index e767cd92..3d0098c4 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-27 diff --git a/test/data/grooves/fasttwistA.musicxml b/test/data/grooves/fasttwistA.musicxml index c544c186..5ceb96d0 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-27 diff --git a/test/data/grooves/fasttwistB.musicxml b/test/data/grooves/fasttwistB.musicxml index fca8ebca..4cb94615 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-27 @@ -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..d3ec9596 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-27 @@ -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..789a4bd6 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-27 @@ -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..3b9c7a5b 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-27 @@ -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..1a3cdf7b 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-27 diff --git a/test/data/grooves/fasttwistIntroA.musicxml b/test/data/grooves/fasttwistIntroA.musicxml index 9f32c66c..e5ad6993 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-27 @@ -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..bfcbbf3b 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-27 @@ -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..1bf5a8f0 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-27 @@ -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,132 +607,152 @@ 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 + 16th + down normal - - 192 + 768 1 - 16th + quarter - - - - 768 + + + + F + 4 + + 576 + 1 - quarter + eighth + + down + normal - E + F 4 - 768 - + 192 + 1 - quarter - up + 16th + down normal @@ -663,133 +767,109 @@ - E + F 4 - 192 - - + 576 + 1 - 16th - up + eighth + + down normal - - E + F 4 - 48 - - - + 192 + 1 - 64th - up + 16th + down normal - - + + + 768 + 1 + quarter + + + + + - E + F 4 - 12 - - - + 576 + 1 - 256th - up + eighth + + down normal - - - E + F 4 - 3 - - + 192 + 1 - 1024th - up + 16th + down normal - + + + + + 768 + 1 + quarter + - E + F 4 - 288 - - + 576 + 1 - 16th + eighth - up + down normal - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E + F 4 - 6 - - - 1 - 512th - up - normal - - - - - - 192 + 1 16th + down + normal - - 768 @@ -798,140 +878,35 @@ + + - 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 + F 4 - 384 - - + 576 + 1 eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up + + down normal - - - E + F 4 - 6 - - + 192 + 1 - 512th - up + 16th + down normal - @@ -944,134 +919,29 @@ - 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 + F 4 - 6 - - + 768 + 1 - 512th - up + quarter + down normal - - 192 + 768 1 - 16th + quarter - + 768 @@ -1088,2458 +958,53 @@ - F - 4 + G + 5 - 576 - - 1 - eighth - - down - normal + 192 + + 3 + 16th + up + x - F - 4 + G + 5 192 - - 1 + + 3 16th - down - normal + up + x - 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 - - - - - - - - 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 - - - - - - - - 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 - - - + 128 3 - 256th - up - x + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -3547,15 +1012,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -3563,15 +1031,19 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - + @@ -3579,17 +1051,13 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -3597,47 +1065,36 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - - - - - - 96 - - 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + - + + + 3 + 16th + + + 2 + 16th + + @@ -3645,15 +1102,18 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - @@ -3661,17 +1121,19 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + @@ -3679,15 +1141,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -3704,18 +1164,27 @@ - - - G - 5 - - 192 - + + + 128 3 16th - up - x + + 3 + 2 + 16th + + + + 3 + 16th + + + 2 + 16th + + @@ -3723,15 +1192,18 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - @@ -3739,17 +1211,19 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + @@ -3757,15 +1231,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -3773,15 +1245,13 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -3789,33 +1259,41 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + + + 3 + 16th + + + 2 + 16th + + - - - G - 5 - - 6 - - + + + 128 3 - 512th - up - x + 16th + + 3 + 2 + 16th + - @@ -3823,33 +1301,35 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - + + + G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -3857,47 +1337,36 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - - - - - - 48 - - 3 - 64th - - - - - - - 12 - - - 3 - 256th - - - - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + - + + + 3 + 16th + + + 2 + 16th + + @@ -3905,29 +1374,38 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x - - G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + @@ -3935,15 +1413,13 @@ G 5 - 48 - + 192 3 - 64th + 16th up x - @@ -3951,17 +1427,36 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - + + + + + 128 + 3 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -3969,15 +1464,18 @@ G 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -3985,15 +1483,19 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - + @@ -4001,17 +1503,13 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -4019,47 +1517,36 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - - 96 - + 128 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th + 16th + + 3 + 2 + 16th + - + + + 3 + 16th + + + 2 + 16th + + @@ -4067,15 +1554,18 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - @@ -4083,17 +1573,19 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + @@ -4101,15 +1593,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -4131,12 +1621,40 @@ G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x + + + + 3 + 16th + + + 2 + 16th + + + + + + + 128 + 3 + 16th + + 3 + 2 + 16th + @@ -4145,33 +1663,35 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + + + G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -4179,15 +1699,36 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - + + + + + 128 + 3 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -4195,15 +1736,18 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -4211,17 +1755,19 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -4229,47 +1775,50 @@ G 5 - 6 - + 192 3 - 512th + 16th up x - - - - - - 96 - - 3 - 32nd - - - - - 24 - - + + + G + 5 + + 192 + 3 - 128th + 16th + up + x - - - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + - + + + 3 + 16th + + + 2 + 16th + + @@ -4277,15 +1826,18 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - @@ -4293,17 +1845,19 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + @@ -4311,15 +1865,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -4336,15 +1888,43 @@ + + + 128 + 3 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + + + G 5 - 192 + 128 3 16th + + 3 + 2 + 16th + up x @@ -4355,15 +1935,19 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - + @@ -4371,17 +1955,13 @@ G 5 - 12 - - + 192 3 - 256th + 16th up x - - @@ -4389,15 +1969,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -4405,15 +1983,41 @@ G 5 - 96 - + 128 3 - 32nd + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + + + + + + 128 + 3 + 16th + + 3 + 2 + 16th + + @@ -4421,65 +2025,72 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - + + + G 5 - 6 - + 192 3 - 512th + 16th up x - - - - - - 96 - - 3 - 32nd - - - - - 24 - - + + + G + 5 + + 192 + 3 - 128th + 16th + up + x - - - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + - + + + 3 + 16th + + + 2 + 16th + + @@ -4487,15 +2098,18 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - @@ -4503,17 +2117,19 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + @@ -4521,15 +2137,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -4546,18 +2160,27 @@ - - - G - 5 - - 192 - + + + 128 3 16th - up - x + + 3 + 2 + 16th + + + + 3 + 16th + + + 2 + 16th + + @@ -4565,15 +2188,18 @@ G 5 - 48 - + 128 3 - 64th + 16th + + 3 + 2 + 16th + up x - @@ -4581,17 +2207,19 @@ G 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up x - - + @@ -4599,15 +2227,13 @@ G 5 - 3 - + 192 3 - 1024th + 16th up x - @@ -4615,15 +2241,36 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - + + + + + 128 + 3 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -4631,17 +2278,18 @@ G 5 - 24 - - + 128 3 - 128th + 16th + + 3 + 2 + 16th + up x - - @@ -4649,15 +2297,19 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - + @@ -4665,15 +2317,13 @@ G 5 - 96 - + 192 3 - 32nd + 16th up x - @@ -4681,17 +2331,13 @@ G 5 - 24 - - + 192 3 - 128th + 16th up x - - @@ -4699,47 +2345,41 @@ G 5 - 6 - + 128 3 - 512th + 16th + + 3 + 2 + 16th + up x - - - - - - 48 - - 3 - 64th - - + + + 3 + 16th + + + 2 + 16th + + - 12 - - + 128 3 - 256th - - - - - - - - 3 - - 3 - 1024th + 16th + + 3 + 2 + 16th + - @@ -4747,13 +2387,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..188de93c 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-27 @@ -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,569 +607,297 @@ 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 + 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 + down normal - - E + F 4 - 24 - - - + 192 + 1 - 128th - up + 16th + down normal - - - - - E - 4 - - 6 - - + + + 768 1 - 512th - up - normal - - - - - - - 192 - 1 - 16th + quarter - - + + 3072 + 768 - 1 + 2 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 - - 384 - - - 1 - eighth - up - normal - - - - - - - E - 4 - - 96 - - - - 1 - 32nd - up - normal - - - - - - - - E - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - E + D 4 - 6 - - - 1 - 512th - up - normal + 768 + + 2 + quarter + down + x - 768 - 1 + 2 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 + D 4 - 6 - - - 1 - 512th - up - normal - - - - - - - 192 - 1 - 16th + 768 + + 2 + quarter + down + x - - - - - 768 - - - percussion - - - 5 - - + F @@ -1208,7 +1020,7 @@ - + F @@ -1251,256 +1063,10 @@ F 4 - 576 - - 1 - eighth - - down - normal - - - - - - F - 4 - - 192 + 768 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 - - 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 + quarter down normal @@ -1597,2137 +1163,36 @@ F 5 - 48 - - - 1 - 64th - up - x - - - - - - - F - 5 - - 12 - - - - 1 - 256th - up - x - - - - - - - - F - 5 - - 3 - + 192 1 - 1024th + 16th 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 - - - - - - - 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 - - - - - - - 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 - - - - - - - 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 - - - + 128 1 - 256th - up - x + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -3735,15 +1200,18 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -3751,15 +1219,19 @@ F 5 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + up x - + @@ -3767,17 +1239,13 @@ F 5 - 24 - - + 192 1 - 128th + 16th up x - - @@ -3785,47 +1253,36 @@ F 5 - 6 - + 192 1 - 512th + 16th up x - - - - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + - + + + 3 + 16th + + + 2 + 16th + + @@ -3833,15 +1290,18 @@ F 5 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up x - @@ -3849,17 +1309,19 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - + @@ -3867,15 +1329,13 @@ F 5 - 3 - + 192 1 - 1024th + 16th up x - @@ -3892,18 +1352,27 @@ - - - F - 5 - - 192 - + + + 128 1 16th - up - x + + 3 + 2 + 16th + + + + 3 + 16th + + + 2 + 16th + + @@ -3911,15 +1380,18 @@ F 5 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up x - @@ -3927,17 +1399,19 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - + @@ -3945,15 +1419,13 @@ F 5 - 3 - + 192 1 - 1024th + 16th up x - @@ -3961,15 +1433,13 @@ F 5 - 96 - + 192 1 - 32nd + 16th up x - @@ -3977,33 +1447,41 @@ F 5 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + up x - - + + + 3 + 16th + + + 2 + 16th + + - - - F - 5 - - 6 - - + + + 128 1 - 512th - up - x + 16th + + 3 + 2 + 16th + - @@ -4011,33 +1489,35 @@ F 5 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + up x - + + + F 5 - 24 - - + 192 1 - 128th + 16th up x - - @@ -4045,47 +1525,36 @@ F 5 - 6 - + 192 1 - 512th + 16th up x - - - - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + - + + + 3 + 16th + + + 2 + 16th + + @@ -4093,29 +1562,38 @@ F 5 - 192 + 128 1 16th + + 3 + 2 + 16th + up x - - F 5 - 192 + 128 1 16th + + 3 + 2 + 16th + up x + @@ -4123,15 +1601,13 @@ F 5 - 48 - + 192 1 - 64th + 16th up x - @@ -4139,17 +1615,36 @@ F 5 - 12 - - + 192 1 - 256th + 16th up x - - + + + + + 128 + 1 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -4157,15 +1652,18 @@ F 5 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up x - @@ -4173,15 +1671,19 @@ F 5 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + up x - + @@ -4189,17 +1691,13 @@ F 5 - 24 - - + 192 1 - 128th + 16th up x - - @@ -4207,47 +1705,36 @@ F 5 - 6 - + 192 1 - 512th + 16th up x - - 96 - + 128 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th + 16th + + 3 + 2 + 16th + - + + + 3 + 16th + + + 2 + 16th + + @@ -4255,15 +1742,18 @@ F 5 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up x - @@ -4271,17 +1761,19 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - + @@ -4289,15 +1781,13 @@ F 5 - 3 - + 192 1 - 1024th + 16th up x - @@ -4319,12 +1809,40 @@ F 5 - 192 + 128 1 16th + + 3 + 2 + 16th + up x + + + + 3 + 16th + + + 2 + 16th + + + + + + + 128 + 1 + 16th + + 3 + 2 + 16th + @@ -4333,33 +1851,35 @@ F 5 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up x - + + + F 5 - 12 - - + 192 1 - 256th + 16th up x - - @@ -4367,15 +1887,36 @@ F 5 - 3 - + 192 1 - 1024th + 16th up x - + + + + + 128 + 1 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -4383,15 +1924,18 @@ F 5 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + up x - @@ -4399,17 +1943,19 @@ F 5 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + up x - - + @@ -4417,47 +1963,50 @@ F 5 - 6 - + 192 1 - 512th + 16th up x - - - - - - 96 - - 1 - 32nd - - - - - 24 - - + + + F + 5 + + 192 + 1 - 128th + 16th + up + x - - - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + - + + + 3 + 16th + + + 2 + 16th + + @@ -4465,15 +2014,18 @@ F 5 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up x - @@ -4481,17 +2033,19 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - + @@ -4499,15 +2053,13 @@ F 5 - 3 - + 192 1 - 1024th + 16th up x - @@ -4524,15 +2076,43 @@ + + + 128 + 1 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + + + F 5 - 192 + 128 1 16th + + 3 + 2 + 16th + up x @@ -4543,15 +2123,19 @@ F 5 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up x - + @@ -4559,17 +2143,13 @@ F 5 - 12 - - + 192 1 - 256th + 16th up x - - @@ -4577,15 +2157,13 @@ F 5 - 3 - + 192 1 - 1024th + 16th up x - @@ -4593,15 +2171,41 @@ F 5 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + up x - + + + 3 + 16th + + + 2 + 16th + + + + + + + 128 + 1 + 16th + + 3 + 2 + 16th + + @@ -4609,65 +2213,72 @@ F 5 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + up x - - + + + F 5 - 6 - + 192 1 - 512th + 16th up x - - - - - - 96 - - 1 - 32nd - - - - - 24 - - + + + F + 5 + + 192 + 1 - 128th + 16th + up + x - - - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + - + + + 3 + 16th + + + 2 + 16th + + @@ -4675,15 +2286,18 @@ F 5 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up x - @@ -4691,17 +2305,19 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - + @@ -4709,15 +2325,13 @@ F 5 - 3 - + 192 1 - 1024th + 16th up x - @@ -4734,18 +2348,27 @@ - - - F - 5 - - 192 - + + + 128 1 16th - up - x + + 3 + 2 + 16th + + + + 3 + 16th + + + 2 + 16th + + @@ -4753,15 +2376,18 @@ F 5 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + up x - @@ -4769,17 +2395,19 @@ F 5 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up x - - + @@ -4787,15 +2415,13 @@ F 5 - 3 - + 192 1 - 1024th + 16th up x - @@ -4803,15 +2429,36 @@ F 5 - 96 - + 192 1 - 32nd + 16th up x - + + + + + 128 + 1 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -4819,17 +2466,18 @@ F 5 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + up x - - @@ -4837,15 +2485,19 @@ F 5 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + up x - + @@ -4853,15 +2505,13 @@ F 5 - 96 - + 192 1 - 32nd + 16th up x - @@ -4869,17 +2519,13 @@ F 5 - 24 - - + 192 1 - 128th + 16th up x - - @@ -4887,47 +2533,41 @@ F 5 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + up x - - - - - - 48 - - 1 - 64th - - + + + 3 + 16th + + + 2 + 16th + + - 12 - - + 128 1 - 256th - - - - - - - - 3 - - 1 - 1024th + 16th + + 3 + 2 + 16th + - @@ -4935,13 +2575,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..907fbbda 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-27 @@ -262,1176 +262,84 @@ 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 - - - - - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - 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 - - 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 - - - - - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - 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 - - 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 - - - - - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - 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 - - 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 - - - - - - - 48 - - 1 - 64th - - - - - - - 12 - - - 1 - 256th - - - - - - - - 3 - - 1 - 1024th - - - - - - - E - 4 - - 192 - - 1 - 16th - up - normal - - - - - - - - - - - 768 - - - percussion - - - 5 - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - - - F - 4 - - 768 - - 1 - quarter - down - normal - - - - - - 768 - 1 - quarter - - - - - - 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 + 16th up normal - - + + + + + 128 + 1 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + - A + E 4 - 3 - - + 128 + 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - - A + E 4 - 192 - + 128 + 1 16th + + 3 + 2 + 16th + up normal + - A + E 4 192 - + 1 16th up @@ -1441,193 +349,191 @@ - A + E 4 - 48 - - + 192 + 1 - 64th + 16th up normal - - - - A - 4 - - 12 - - - + + + 128 1 - 256th - up - normal + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + - A + E 4 - 3 - - + 128 + 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - - A + E 4 - 96 - - + 128 + 1 - 32nd + 16th + + 3 + 2 + 16th + up normal - + - A + E 4 - 24 - - - + 192 + 1 - 128th + 16th up normal - - - A + E 4 - 6 - - + 192 + 1 - 512th + 16th up normal - - - - - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + - + + + 3 + 16th + + + 2 + 16th + + - A + E 4 - 48 - - + 128 + 1 - 64th + 16th + + 3 + 2 + 16th + up normal - - A + E 4 - 12 - - - + 128 + 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + - A + E 4 - 3 - - + 192 + 1 - 1024th + 16th up normal - - A + E 4 192 - + 1 16th up @@ -1637,164 +543,210 @@ - A + E 4 - 192 - + 128 + 1 16th + + 3 + 2 + 16th + up normal + + + + 3 + 16th + + + 2 + 16th + + + + + + + 128 + 1 + 16th + + 3 + 2 + 16th + - A + E 4 - 48 - - + 128 + 1 - 64th + 16th + + 3 + 2 + 16th + up normal - + + + + + + + + + 768 + + + percussion + + + 5 + + - A + F 4 - 12 - - - + 768 + 1 - 256th - up + quarter + down normal - - - A + F 4 - 3 - - + 768 + 1 - 1024th - up + quarter + down normal - - A + F 4 - 96 - - + 768 + 1 - 32nd - up + quarter + down normal - - A + F 4 - 24 - - - + 768 + 1 - 128th - up + quarter + down normal - - + + - A + F 4 - 6 - - + 768 + 1 - 512th - up + quarter + down normal - - 96 - + 768 1 - 32nd + quarter - - 24 - - + 768 1 - 128th + quarter - - - 6 - + 768 1 - 512th + quarter - + + + + + + 768 + + + percussion + + + 5 + + A 4 - 48 - + 192 1 - 64th + 16th up normal - @@ -1802,17 +754,36 @@ A 4 - 12 - - + 192 1 - 256th + 16th up normal - - + + + + + 128 + 1 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -1820,15 +791,18 @@ A 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -1836,13 +810,19 @@ A 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -1864,15 +844,36 @@ A 4 - 48 - + 192 1 - 64th + 16th up normal - + + + + + 128 + 1 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -1880,17 +881,18 @@ A 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - @@ -1898,15 +900,19 @@ A 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - + @@ -1914,15 +920,13 @@ A 4 - 96 - + 192 1 - 32nd + 16th up normal - @@ -1930,17 +934,36 @@ A 4 - 24 - - + 192 1 - 128th + 16th up normal - - + + + + + 128 + 1 + 16th + + 3 + 2 + 16th + + + + + 3 + 16th + + + 2 + 16th + + @@ -1948,15 +971,18 @@ A 4 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + up normal - @@ -1964,15 +990,19 @@ A 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + up normal - + @@ -1980,17 +1010,13 @@ A 4 - 24 - - + 192 1 - 128th + 16th up normal - - @@ -1998,47 +1024,55 @@ A 4 - 6 - + 192 1 - 512th + 16th up normal - - - - - - 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 +1080,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..2fbe4eb2 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-27 @@ -178,165 +178,36 @@ 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 - + 192 1 - 512th + 16th up normal - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - E - 4 - - 48 - - + 128 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -344,15 +215,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -360,13 +234,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -453,165 +333,36 @@ 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 - + 192 1 - 512th + 16th up normal - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - A - 4 - - 48 - - + 128 1 - 64th - up - normal - - - - - - - A - 4 - - 12 - - - - 1 - 256th - up - normal + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -619,15 +370,18 @@ A 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -635,13 +389,19 @@ A 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -682,165 +442,36 @@ D 5 - 48 - - - 2 - 64th - up - normal - - - - - - - D - 5 - - 12 - - - - 2 - 256th - up - normal - - - - - - - - D - 5 - - 3 - - - 2 - 1024th - up - normal - - - - - - - D - 5 - - 96 - - - 2 - 32nd - up - normal - - - - - - - D - 5 - - 24 - - - - 2 - 128th - up - normal - - - - - - - - D - 5 - - 6 - + 192 2 - 512th + 16th up normal - - 96 - - 2 - 32nd - - - - - - - 24 - - - 2 - 128th - - - - - - - - 6 - - 2 - 512th - - - - - - - D - 5 - - 48 - - + 128 2 - 64th - up - normal - - - - - - - D - 5 - - 12 - - - - 2 - 256th - up - normal + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -848,15 +479,18 @@ D 5 - 3 - + 128 2 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -864,13 +498,19 @@ D 5 - 192 + 128 2 16th + + 3 + 2 + 16th + up normal + @@ -911,165 +551,36 @@ F 5 - 48 - - - 3 - 64th - up - normal - - - - - - - F - 5 - - 12 - - - - 3 - 256th - up - normal - - - - - - - - F - 5 - - 3 - - - 3 - 1024th - up - normal - - - - - - - F - 5 - - 96 - - - 3 - 32nd - up - normal - - - - - - - F - 5 - - 24 - - - - 3 - 128th - up - normal - - - - - - - - F - 5 - - 6 - + 192 3 - 512th + 16th up normal - - 96 - - 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th - - - - - - - F - 5 - - 48 - - + 128 3 - 64th - up - normal - - - - - - - F - 5 - - 12 - - - - 3 - 256th - up - normal + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -1077,15 +588,18 @@ F 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -1093,13 +607,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..3c347fda 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-27 @@ -178,165 +178,36 @@ 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 - + 192 1 - 512th + 16th up normal - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - E - 4 - - 48 - - + 128 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - - 1 - 256th - up - normal + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -344,15 +215,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -360,13 +234,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -453,165 +333,36 @@ 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 - + 192 1 - 512th + 16th up normal - - 96 - - 1 - 32nd - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - A - 4 - - 48 - - + 128 1 - 64th - up - normal - - - - - - - A - 4 - - 12 - - - - 1 - 256th - up - normal + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -619,15 +370,18 @@ A 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -635,13 +389,19 @@ A 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -682,165 +442,36 @@ D 5 - 48 - - - 2 - 64th - up - normal - - - - - - - D - 5 - - 12 - - - - 2 - 256th - up - normal - - - - - - - - D - 5 - - 3 - - - 2 - 1024th - up - normal - - - - - - - D - 5 - - 96 - - - 2 - 32nd - up - normal - - - - - - - D - 5 - - 24 - - - - 2 - 128th - up - normal - - - - - - - - D - 5 - - 6 - + 192 2 - 512th + 16th up normal - - 96 - - 2 - 32nd - - - - - - - 24 - - - 2 - 128th - - - - - - - - 6 - - 2 - 512th - - - - - - - D - 5 - - 48 - - + 128 2 - 64th - up - normal - - - - - - - D - 5 - - 12 - - - - 2 - 256th - up - normal + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -848,15 +479,18 @@ D 5 - 3 - + 128 2 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -864,13 +498,19 @@ D 5 - 192 + 128 2 16th + + 3 + 2 + 16th + up normal + @@ -911,165 +551,36 @@ F 5 - 48 - - - 3 - 64th - up - normal - - - - - - - F - 5 - - 12 - - - - 3 - 256th - up - normal - - - - - - - - F - 5 - - 3 - - - 3 - 1024th - up - normal - - - - - - - F - 5 - - 96 - - - 3 - 32nd - up - normal - - - - - - - F - 5 - - 24 - - - - 3 - 128th - up - normal - - - - - - - - F - 5 - - 6 - + 192 3 - 512th + 16th up normal - - 96 - - 3 - 32nd - - - - - - - 24 - - - 3 - 128th - - - - - - - - 6 - - 3 - 512th - - - - - - - F - 5 - - 48 - - + 128 3 - 64th - up - normal - - - - - - - F - 5 - - 12 - - - - 3 - 256th - up - normal + 16th + + 3 + 2 + 16th + - - + + + 3 + 16th + + + 2 + 16th + + @@ -1077,15 +588,18 @@ F 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -1093,13 +607,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..fe002718 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-27 diff --git a/test/data/grooves/kbossaB.musicxml b/test/data/grooves/kbossaB.musicxml index 637f4cc3..ae250bd3 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-27 diff --git a/test/data/grooves/kbossaC.musicxml b/test/data/grooves/kbossaC.musicxml index 2742965b..61b0768e 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-27 diff --git a/test/data/grooves/kbossaEndingA.musicxml b/test/data/grooves/kbossaEndingA.musicxml index 6012092f..bb050622 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-27 diff --git a/test/data/grooves/kbossaEndingB.musicxml b/test/data/grooves/kbossaEndingB.musicxml index aa8c27a2..79149cc3 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-27 diff --git a/test/data/grooves/kbossaEndingC.musicxml b/test/data/grooves/kbossaEndingC.musicxml index 1b8e68e7..3c976e67 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-27 diff --git a/test/data/grooves/kbossaEndingD.musicxml b/test/data/grooves/kbossaEndingD.musicxml index 4ec8de4b..6f29bfbb 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-27 diff --git a/test/data/grooves/kbossaFillA.musicxml b/test/data/grooves/kbossaFillA.musicxml index 11a63f10..d59196af 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-27 diff --git a/test/data/grooves/kbossaFillAB.musicxml b/test/data/grooves/kbossaFillAB.musicxml index c5e3b134..c02c1062 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-27 diff --git a/test/data/grooves/kbossaFillB.musicxml b/test/data/grooves/kbossaFillB.musicxml index dec72405..54e87879 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-27 diff --git a/test/data/grooves/kbossaFillC.musicxml b/test/data/grooves/kbossaFillC.musicxml index 8edc11f5..a9283341 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-27 diff --git a/test/data/grooves/kbossaIntroA.musicxml b/test/data/grooves/kbossaIntroA.musicxml index 5e029494..900c6281 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-27 diff --git a/test/data/grooves/kbossaIntroB.musicxml b/test/data/grooves/kbossaIntroB.musicxml index fcd8dd71..ec2e23b9 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-27 diff --git a/test/data/grooves/kbossaIntroC.musicxml b/test/data/grooves/kbossaIntroC.musicxml index 5aa2a457..307d2254 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-27 diff --git a/test/data/grooves/kwestballadA.musicxml b/test/data/grooves/kwestballadA.musicxml index a472bd8e..50deb7c2 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-27 diff --git a/test/data/grooves/kwestballadB.musicxml b/test/data/grooves/kwestballadB.musicxml index cc57350f..69f16518 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-27 diff --git a/test/data/grooves/kwestballadC.musicxml b/test/data/grooves/kwestballadC.musicxml index 230f5c1c..500e5fda 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-27 @@ -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..6d60dc28 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-27 @@ -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..828e1c45 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-27 @@ -239,80 +239,25 @@ - 384 - - 1 - eighth - - - - - - - 96 - - - 1 - 32nd - - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - + 512 1 - 256th - up - normal + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + @@ -320,29 +265,19 @@ E 4 - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 192 + 256 1 - 16th + eighth + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/kwestballadEndingB.musicxml b/test/data/grooves/kwestballadEndingB.musicxml index f68a159b..69bd744d 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-27 @@ -239,80 +239,25 @@ - 384 - - 1 - eighth - - - - - - - 96 - - - 1 - 32nd - - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - + 512 1 - 256th - up - normal + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + @@ -320,29 +265,19 @@ E 4 - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 192 + 256 1 - 16th + eighth + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/kwestballadEndingC.musicxml b/test/data/grooves/kwestballadEndingC.musicxml index 39d12a74..b5fabc49 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-27 @@ -239,80 +239,25 @@ - 384 - - 1 - eighth - - - - - - - 96 - - - 1 - 32nd - - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - + 512 1 - 256th - up - normal + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + @@ -320,29 +265,19 @@ E 4 - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 192 + 256 1 - 16th + eighth + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/kwestballadEndingD.musicxml b/test/data/grooves/kwestballadEndingD.musicxml index b2e1851f..a0a06d96 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-27 @@ -239,80 +239,25 @@ - 384 - - 1 - eighth - - - - - - - 96 - - - 1 - 32nd - - - - - - - - 24 - - - 1 - 128th - - - - - - - - 6 - - 1 - 512th - - - - - - - E - 4 - - 48 - - - 1 - 64th - up - normal - - - - - - - E - 4 - - 12 - - - + 512 1 - 256th - up - normal + quarter + + 3 + 2 + quarter + - - + + + 3 + quarter + + + 2 + quarter + + @@ -320,29 +265,19 @@ E 4 - 3 - - - 1 - 1024th - up - normal - - - - - - - E - 4 - - 192 + 256 1 - 16th + eighth + + 3 + 2 + quarter + up normal + diff --git a/test/data/grooves/kwestballadFillA.musicxml b/test/data/grooves/kwestballadFillA.musicxml index e17ac4f2..f6c3a506 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-27 diff --git a/test/data/grooves/kwestballadFillAB.musicxml b/test/data/grooves/kwestballadFillAB.musicxml index 9c343e18..ba422af3 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-27 diff --git a/test/data/grooves/kwestballadFillB.musicxml b/test/data/grooves/kwestballadFillB.musicxml index 0cfe69b6..9e9617e4 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-27 diff --git a/test/data/grooves/kwestballadFillC.musicxml b/test/data/grooves/kwestballadFillC.musicxml index e829340d..d04a41a7 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-27 diff --git a/test/data/grooves/kwestballadIntroA.musicxml b/test/data/grooves/kwestballadIntroA.musicxml index 9debb0cb..b38c842a 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-27 @@ -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..1847ab5b 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-27 @@ -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..0162869f 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-27 diff --git a/test/data/grooves/metal1B.musicxml b/test/data/grooves/metal1B.musicxml index e29ecc46..b06cd52d 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-27 diff --git a/test/data/grooves/metal1E.musicxml b/test/data/grooves/metal1E.musicxml index de101016..4321a975 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-27 diff --git a/test/data/grooves/metal1FA.musicxml b/test/data/grooves/metal1FA.musicxml index 409c7f6d..e0c36f4f 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-27 diff --git a/test/data/grooves/metal1FB.musicxml b/test/data/grooves/metal1FB.musicxml index 74833141..fd0562b8 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-27 diff --git a/test/data/grooves/metal2A.musicxml b/test/data/grooves/metal2A.musicxml index 6de2eae5..f67b9ddf 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-27 @@ -404,1576 +404,6 @@ - - - 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 - - - - 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 - - - - 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 @@ -1993,13 +423,28 @@ F 4 - 192 + 128 1 16th + + 3 + 2 + 16th + down normal + + + 3 + 16th + + + 2 + 16th + + @@ -2007,15 +452,18 @@ F 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + down normal - @@ -2023,17 +471,19 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - + @@ -2041,15 +491,13 @@ F 4 - 3 - + 192 1 - 1024th + 16th down normal - @@ -2057,15 +505,13 @@ F 4 - 96 - + 192 1 - 32nd + 16th down normal - @@ -2073,17 +519,28 @@ F 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -2091,15 +548,18 @@ F 4 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + down normal - @@ -2107,15 +567,19 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - + @@ -2123,17 +587,13 @@ F 4 - 24 - - + 192 1 - 128th + 16th down normal - - @@ -2141,15 +601,13 @@ F 4 - 6 - + 192 1 - 512th + 16th down normal - @@ -2157,15 +615,28 @@ F 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -2173,17 +644,18 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - @@ -2191,15 +663,19 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - + @@ -2216,8 +692,6 @@ - - F @@ -2237,83 +711,28 @@ 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 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -2321,15 +740,18 @@ F 4 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + down normal - @@ -2337,33 +759,35 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - + + + F 4 - 24 - - + 192 1 - 128th + 16th down normal - - @@ -2371,15 +795,13 @@ F 4 - 6 - + 192 1 - 512th + 16th down normal - @@ -2387,15 +809,28 @@ F 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -2403,17 +838,18 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - @@ -2421,15 +857,19 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - + @@ -2465,83 +905,28 @@ 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 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -2549,15 +934,18 @@ F 4 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + down normal - @@ -2565,15 +953,19 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - + @@ -2581,17 +973,13 @@ F 4 - 24 - - + 192 1 - 128th + 16th down normal - - @@ -2599,15 +987,13 @@ F 4 - 6 - + 192 1 - 512th + 16th down normal - @@ -2615,15 +1001,28 @@ F 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -2631,17 +1030,18 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - @@ -2649,15 +1049,19 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - + @@ -2693,83 +1097,28 @@ 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 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -2777,15 +1126,18 @@ F 4 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + down normal - @@ -2793,33 +1145,35 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - + + + F 4 - 24 - - + 192 1 - 128th + 16th down normal - - @@ -2827,15 +1181,13 @@ F 4 - 6 - + 192 1 - 512th + 16th down normal - @@ -2843,15 +1195,28 @@ F 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -2859,17 +1224,18 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - @@ -2877,15 +1243,19 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - + @@ -2921,15 +1291,28 @@ F 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -2937,17 +1320,18 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - @@ -2955,15 +1339,19 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - + @@ -2971,15 +1359,13 @@ F 4 - 96 - + 192 1 - 32nd + 16th down normal - @@ -2987,17 +1373,13 @@ F 4 - 24 - - + 192 1 - 128th + 16th down normal - - @@ -3005,15 +1387,28 @@ F 4 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -3021,15 +1416,18 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - @@ -3037,17 +1435,19 @@ F 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - + @@ -3055,15 +1455,13 @@ F 4 - 6 - + 192 1 - 512th + 16th down normal - @@ -3071,15 +1469,13 @@ F 4 - 48 - + 192 1 - 64th + 16th down normal - @@ -3087,17 +1483,28 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -3105,15 +1512,18 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - @@ -3121,13 +1531,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..5ffad854 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-27 @@ -409,1694 +409,13 @@ 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 - - - - 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 - - - - - 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 - - - - - - - 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 - + 192 1 - 1024th + 16th down normal - @@ -2104,15 +423,28 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -2120,17 +452,18 @@ F 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - @@ -2138,15 +471,19 @@ F 4 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + down normal - + @@ -2154,15 +491,13 @@ F 4 - 96 - + 192 1 - 32nd + 16th down normal - @@ -2170,17 +505,13 @@ F 4 - 24 - - + 192 1 - 128th + 16th down normal - - @@ -2188,15 +519,28 @@ F 4 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -2204,15 +548,18 @@ F 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + down normal - @@ -2220,17 +567,19 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - + @@ -2238,15 +587,13 @@ F 4 - 3 - + 192 1 - 1024th + 16th down normal - @@ -2263,67 +610,33 @@ - - 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 + + + 3 + 16th + + + 2 + 16th + + @@ -2331,15 +644,18 @@ F 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + down normal - @@ -2347,17 +663,19 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - + @@ -2365,15 +683,13 @@ F 4 - 3 - + 192 1 - 1024th + 16th down normal - @@ -2381,15 +697,13 @@ F 4 - 96 - + 192 1 - 32nd + 16th down normal - @@ -2397,17 +711,28 @@ F 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -2415,15 +740,18 @@ F 4 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + down normal - @@ -2431,99 +759,82 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - + - - - F - 4 - - 24 - - - - 1 - 128th - down - normal + + 3072 + + + + 768 + 2 + quarter - - - F + D 4 - 6 - - - 1 - 512th + 768 + + 2 + quarter down - normal + x - - - - F - 4 - - 48 - - - 1 - 64th - down - normal + + + 768 + 2 + quarter - - F + D 4 - 12 - - - - 1 - 256th + 768 + + 2 + quarter down - normal + x - - + + F 4 - 3 - + 192 1 - 1024th + 16th down normal - @@ -2545,13 +856,28 @@ F 4 - 192 + 128 1 16th + + 3 + 2 + 16th + down normal + + + 3 + 16th + + + 2 + 16th + + @@ -2559,15 +885,18 @@ F 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + down normal - @@ -2575,17 +904,19 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - + @@ -2593,15 +924,13 @@ F 4 - 3 - + 192 1 - 1024th + 16th down normal - @@ -2609,15 +938,13 @@ F 4 - 96 - + 192 1 - 32nd + 16th down normal - @@ -2625,17 +952,28 @@ F 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -2643,15 +981,18 @@ F 4 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + down normal - @@ -2659,15 +1000,19 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - + @@ -2675,17 +1020,13 @@ F 4 - 24 - - + 192 1 - 128th + 16th down normal - - @@ -2693,15 +1034,13 @@ F 4 - 6 - + 192 1 - 512th + 16th down normal - @@ -2709,15 +1048,28 @@ F 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -2725,17 +1077,18 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - @@ -2743,15 +1096,19 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - + @@ -2787,15 +1144,28 @@ F 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -2803,17 +1173,18 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - @@ -2821,99 +1192,82 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - + - - - F - 4 - - 96 - - - 1 - 32nd - down - normal + + 3072 + + + + 768 + 2 + quarter - - F + D 4 - 24 - - - - 1 - 128th + 768 + + 2 + quarter down - normal + x - - - - - F - 4 - - 6 - - - 1 - 512th - down - normal + + + 768 + 2 + quarter - - F + D 4 - 96 - - - 1 - 32nd + 768 + + 2 + quarter down - normal + x - + + F 4 - 24 - - + 192 1 - 128th + 16th down normal - - @@ -2921,15 +1275,13 @@ F 4 - 6 - + 192 1 - 512th + 16th down normal - @@ -2937,15 +1289,28 @@ F 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -2953,17 +1318,18 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - @@ -2971,15 +1337,19 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - + @@ -3015,15 +1385,28 @@ F 4 - 48 - + 128 1 - 64th + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -3031,17 +1414,18 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - @@ -3049,15 +1433,19 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - + @@ -3065,15 +1453,13 @@ F 4 - 96 - + 192 1 - 32nd + 16th down normal - @@ -3081,17 +1467,13 @@ F 4 - 24 - - + 192 1 - 128th + 16th down normal - - @@ -3099,15 +1481,28 @@ F 4 - 6 - + 128 1 - 512th + 16th + + 3 + 2 + 16th + down normal - + + + 3 + 16th + + + 2 + 16th + + @@ -3115,15 +1510,18 @@ F 4 - 96 - + 128 1 - 32nd + 16th + + 3 + 2 + 16th + down normal - @@ -3131,17 +1529,19 @@ F 4 - 24 - - + 128 1 - 128th + 16th + + 3 + 2 + 16th + down normal - - + @@ -3149,15 +1549,13 @@ F 4 - 6 - + 192 1 - 512th + 16th down normal - @@ -3165,15 +1563,13 @@ F 4 - 48 - + 192 1 - 64th + 16th down normal - @@ -3181,17 +1577,28 @@ F 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + down normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -3199,15 +1606,18 @@ F 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + down normal - @@ -3215,13 +1625,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..2923b517 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-27 diff --git a/test/data/grooves/metal2FA.musicxml b/test/data/grooves/metal2FA.musicxml index be557858..01133281 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-27 diff --git a/test/data/grooves/metal2FB.musicxml b/test/data/grooves/metal2FB.musicxml index 238fe618..7f79f6ba 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-27 @@ -178,165 +178,13 @@ 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 - + 192 1 - 64th + 16th up normal - @@ -344,17 +192,28 @@ E 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -362,15 +221,18 @@ E 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -378,13 +240,19 @@ E 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -471,165 +339,13 @@ 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 - - - - - - - A - 4 - - 96 - - - 1 - 32nd - up - normal - - - - - - - A - 4 - - 24 - - - - 1 - 128th - up - normal - - - - - - - - A - 4 - - 6 - - - 1 - 512th - up - normal - - - - - - - A - 4 - - 48 - + 192 1 - 64th + 16th up normal - @@ -637,17 +353,28 @@ A 4 - 12 - - + 128 1 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -655,15 +382,18 @@ A 4 - 3 - + 128 1 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -671,13 +401,19 @@ A 4 - 192 + 128 1 16th + + 3 + 2 + 16th + up normal + @@ -718,165 +454,13 @@ D 5 - 48 - - - 2 - 64th - up - normal - - - - - - - D - 5 - - 12 - - - - 2 - 256th - up - normal - - - - - - - - D - 5 - - 3 - - - 2 - 1024th - up - normal - - - - - - - D - 5 - - 96 - - - 2 - 32nd - up - normal - - - - - - - D - 5 - - 24 - - - - 2 - 128th - up - normal - - - - - - - - D - 5 - - 6 - - - 2 - 512th - up - normal - - - - - - - D - 5 - - 96 - - - 2 - 32nd - up - normal - - - - - - - D - 5 - - 24 - - - - 2 - 128th - up - normal - - - - - - - - D - 5 - - 6 - - - 2 - 512th - up - normal - - - - - - - D - 5 - - 48 - + 192 2 - 64th + 16th up normal - @@ -884,17 +468,28 @@ D 5 - 12 - - + 128 2 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -902,15 +497,18 @@ D 5 - 3 - + 128 2 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -918,13 +516,19 @@ D 5 - 192 + 128 2 16th + + 3 + 2 + 16th + up normal + @@ -965,165 +569,13 @@ F 5 - 48 - - - 3 - 64th - up - normal - - - - - - - F - 5 - - 12 - - - - 3 - 256th - up - normal - - - - - - - - F - 5 - - 3 - - - 3 - 1024th - up - normal - - - - - - - F - 5 - - 96 - - - 3 - 32nd - up - normal - - - - - - - F - 5 - - 24 - - - - 3 - 128th - up - normal - - - - - - - - F - 5 - - 6 - - - 3 - 512th - up - normal - - - - - - - F - 5 - - 96 - - - 3 - 32nd - up - normal - - - - - - - F - 5 - - 24 - - - - 3 - 128th - up - normal - - - - - - - - F - 5 - - 6 - - - 3 - 512th - up - normal - - - - - - - F - 5 - - 48 - + 192 3 - 64th + 16th up normal - @@ -1131,17 +583,28 @@ F 5 - 12 - - + 128 3 - 256th + 16th + + 3 + 2 + 16th + up normal - - + + + 3 + 16th + + + 2 + 16th + + @@ -1149,15 +612,18 @@ F 5 - 3 - + 128 3 - 1024th + 16th + + 3 + 2 + 16th + up normal - @@ -1165,13 +631,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..9cde0b94 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-27 diff --git a/test/data/grooves/rock1B.musicxml b/test/data/grooves/rock1B.musicxml index bc0d0f76..38c6548c 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-27 diff --git a/test/data/grooves/rock1E.musicxml b/test/data/grooves/rock1E.musicxml index 9300c6a4..83b81d2b 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-27 diff --git a/test/data/grooves/rock1FA.musicxml b/test/data/grooves/rock1FA.musicxml index 146f4c4e..9b5f8216 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-27 diff --git a/test/data/grooves/rock1FB.musicxml b/test/data/grooves/rock1FB.musicxml index 749fd7c4..92e1c326 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-27 diff --git a/test/data/grooves/slowrockA.musicxml b/test/data/grooves/slowrockA.musicxml index 19dbb7e4..c2ff8e11 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-27 diff --git a/test/data/grooves/slowrockB.musicxml b/test/data/grooves/slowrockB.musicxml index 670f3928..c6258202 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-27 diff --git a/test/data/grooves/slowrockE.musicxml b/test/data/grooves/slowrockE.musicxml index b18852cb..15b1e3df 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-27 diff --git a/test/data/grooves/slowrockFA.musicxml b/test/data/grooves/slowrockFA.musicxml index b9bd7e7b..5a95ddd1 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-27 diff --git a/test/data/grooves/slowrockFB.musicxml b/test/data/grooves/slowrockFB.musicxml index ba4d7618..cd96c035 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-27 @@ -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 - +