beam 4 1/8 in duple time.

AaronDavidNewman · May 26, 2024 · d0d7050 · d0d7050
1 parent e6dae19
commit d0d7050
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/smo/data/score.ts b/src/smo/data/score.ts
@@ -261,6 +261,10 @@ export class SmoScore {
     if (!this.formattingManager) {
       this.formattingManager = new SmoFormattingManager(SmoFormattingManager.defaults);
     }
+    // Set beaming rules based on preferences.
+    const pref = this.preferences;
+    SmoMeasure.defaultDupleDuration = pref.defaultDupleDuration;
+    SmoMeasure.defaultTripleDuration = pref.defaultTripleDuration;
     if (this.staves.length) {
       this.numberStaves();
     }

diff --git a/src/smo/xform/beamers.ts b/src/smo/xform/beamers.ts
@@ -127,6 +127,15 @@ export class SmoBeamer {
     }
     return false;
   }
+  allEighth() {
+    for (var i = 0; i < this.currentGroup.length; ++i) {
+      const cg = this.currentGroup[i];
+      if (cg.tickCount !== 2048) {
+        return false;
+      }
+    }
+    return true;
+  }
   beamNote(tickmap: TickMap, index: number, note: SmoNote) {
     this.beamBeats = note.beamBeats;
     this.duration += tickmap.deltaMap[index];
@@ -151,7 +160,6 @@ export class SmoBeamer {
         this._advanceGroup();
         return;
       }
-
       // is this beamable length-wise
       const stemTicks = SmoMusic.closestDurationTickLtEq(note.tickCount) * tuplet.durationMap[tupletIndex];
       if (note.noteType === 'n' && stemTicks < 4096) {
@@ -177,6 +185,14 @@ export class SmoBeamer {
       this._completeGroup(tickmap.voice);
       this._advanceGroup();
     }
+    if (this.measure.timeSignature.actualBeats % 4 === 0) {
+        if (this.duration < 8192 && this.allEighth()) {
+          return;
+        } else if (this.duration === 8192) {
+          this._completeGroup(tickmap.voice);
+          this._advanceGroup();    
+        }
+    }
 
     if (this.duration === this.beamBeats) {
       this._completeGroup(tickmap.voice);