@coderline/alphatab 1.3.0-alpha.891 → 1.3.0-alpha.898

package/dist/alphaTab.mjs

@@ -1,5 +1,5 @@
 /**
- * alphaTab v1.3.0-alpha.891 (develop, build 891)
+ * alphaTab v1.3.0-alpha.898 (develop, build 898)
  * 
  * Copyright © 2024, Daniel Kuschny and Contributors, All rights reserved.
  * 
@@ -16807,10 +16807,9 @@ class Queue {
  * Represents a beat and when it is actually played according to the generated audio.
  */
 class BeatTickLookupItem {
-    constructor(beat, playbackStart, playbackDuration) {
+    constructor(beat, playbackStart) {
         this.beat = beat;
         this.playbackStart = playbackStart;
-        this.playbackDuration = playbackDuration;
     }
 }
 /**
@@ -16848,13 +16847,13 @@ class BeatTickLookup {
      * Marks the given beat as highlighed as part of this lookup.
      * @param beat The beat to add.
      */
-    highlightBeat(beat, playbackStart, playbackDuration) {
-        if (beat.isEmpty) {
+    highlightBeat(beat, playbackStart) {
+        if (beat.isEmpty && !beat.voice.isEmpty) {
             return;
         }
         if (!this._highlightedBeats.has(beat.id)) {
             this._highlightedBeats.set(beat.id, true);
-            this.highlightedBeats.push(new BeatTickLookupItem(beat, playbackStart, playbackDuration));
+            this.highlightedBeats.push(new BeatTickLookupItem(beat, playbackStart));
         }
     }
     /**
@@ -16952,10 +16951,14 @@ class MasterBarTickLookup {
     }
     /**
      * Adds a new beat to this masterbar following the slicing logic required by the MidiTickLookup.
+     * @param beat The beat to add to this masterbat
+     * @param beatPlaybackStart The original start of this beat. This time is relevant for highlighting.
+     * @param sliceStart The slice start to which this beat should be added. This time is relevant for creating new slices.
+     * @param sliceDuration The slice duration to which this beat should be added. This time is relevant for creating new slices.
      * @returns The first item of the chain which was affected.
      */
-    addBeat(beat, start, duration) {
-        const end = start + duration;
+    addBeat(beat, beatPlaybackStart, sliceStart, sliceDuration) {
+        const end = sliceStart + sliceDuration;
         // We have following scenarios we cover overall on inserts
         // Technically it would be possible to merge some code paths and work with loops
         // to handle all scenarios in a shorter piece of code. 
@@ -17045,28 +17048,28 @@ class MasterBarTickLookup {
         //              |     L 1    |    L2     |
         // Variant A
         if (this.firstBeat == null) {
-            const n1 = new BeatTickLookup(start, end);
-            n1.highlightBeat(beat, start, duration);
+            const n1 = new BeatTickLookup(sliceStart, end);
+            n1.highlightBeat(beat, beatPlaybackStart);
             this.insertAfter(this.firstBeat, n1);
         }
         // Variant B
         // Variant C
-        else if (start >= this.lastBeat.end) {
+        else if (sliceStart >= this.lastBeat.end) {
             // using the end here allows merge of B & C
             const n1 = new BeatTickLookup(this.lastBeat.end, end);
-            n1.highlightBeat(beat, start, duration);
+            n1.highlightBeat(beat, beatPlaybackStart);
             this.insertAfter(this.lastBeat, n1);
         }
         else {
             let l1 = null;
-            if (start < this.firstBeat.start) {
+            if (sliceStart < this.firstBeat.start) {
                 l1 = this.firstBeat;
             }
             else {
                 let current = this.firstBeat;
                 while (current != null) {
                     // find item where we fall into
-                    if (start >= current.start && start < current.end) {
+                    if (sliceStart >= current.start && sliceStart < current.end) {
                         l1 = current;
                         break;
                     }
@@ -17079,99 +17082,99 @@ class MasterBarTickLookup {
             }
             // those scenarios should only happen if we insert before the 
             // first item (e.g. for grace notes starting < 0)
-            if (start < l1.start) {
+            if (sliceStart < l1.start) {
                 // Variant D
                 // Variant E
                 if (end == l1.start) {
                     // using firstBeat.start here allows merge of D & E
-                    const n1 = new BeatTickLookup(start, l1.start);
-                    n1.highlightBeat(beat, start, duration);
+                    const n1 = new BeatTickLookup(sliceStart, l1.start);
+                    n1.highlightBeat(beat, beatPlaybackStart);
                     this.insertBefore(this.firstBeat, n1);
                 }
                 // Variant F
                 else if (end < l1.end) {
-                    const n1 = new BeatTickLookup(start, l1.start);
-                    n1.highlightBeat(beat, start, duration);
+                    const n1 = new BeatTickLookup(sliceStart, l1.start);
+                    n1.highlightBeat(beat, beatPlaybackStart);
                     this.insertBefore(l1, n1);
                     const n2 = new BeatTickLookup(l1.start, end);
                     for (const b of l1.highlightedBeats) {
-                        n2.highlightBeat(b.beat, b.playbackStart, b.playbackDuration);
+                        n2.highlightBeat(b.beat, b.playbackStart);
                     }
-                    n2.highlightBeat(beat, start, duration);
+                    n2.highlightBeat(beat, beatPlaybackStart);
                     this.insertBefore(l1, n2);
                     l1.start = end;
                 }
                 // Variant G
                 else if (end == l1.end) {
-                    const n1 = new BeatTickLookup(start, l1.start);
-                    n1.highlightBeat(beat, start, duration);
-                    l1.highlightBeat(beat, start, duration);
+                    const n1 = new BeatTickLookup(sliceStart, l1.start);
+                    n1.highlightBeat(beat, beatPlaybackStart);
+                    l1.highlightBeat(beat, beatPlaybackStart);
                     this.insertBefore(l1, n1);
                 }
                 // Variant H
                 else /* end > this.firstBeat.end */ {
-                    const n1 = new BeatTickLookup(start, l1.start);
-                    n1.highlightBeat(beat, start, duration);
-                    l1.highlightBeat(beat, start, duration);
+                    const n1 = new BeatTickLookup(sliceStart, l1.start);
+                    n1.highlightBeat(beat, beatPlaybackStart);
+                    l1.highlightBeat(beat, beatPlaybackStart);
                     this.insertBefore(l1, n1);
-                    this.addBeat(beat, l1.end, end - l1.end);
+                    this.addBeat(beat, beatPlaybackStart, l1.end, end - l1.end);
                 }
             }
-            else if (start > l1.start) {
+            else if (sliceStart > l1.start) {
                 // variant I
                 if (end == l1.end) {
-                    const n1 = new BeatTickLookup(l1.start, start);
+                    const n1 = new BeatTickLookup(l1.start, sliceStart);
                     for (const b of l1.highlightedBeats) {
-                        n1.highlightBeat(b.beat, b.playbackStart, b.playbackDuration);
+                        n1.highlightBeat(b.beat, b.playbackStart);
                     }
-                    l1.start = start;
-                    l1.highlightBeat(beat, start, duration);
+                    l1.start = sliceStart;
+                    l1.highlightBeat(beat, beatPlaybackStart);
                     this.insertBefore(l1, n1);
                 }
                 // Variant J
                 else if (end < l1.end) {
-                    const n1 = new BeatTickLookup(l1.start, start);
+                    const n1 = new BeatTickLookup(l1.start, sliceStart);
                     this.insertBefore(l1, n1);
-                    const n2 = new BeatTickLookup(start, end);
+                    const n2 = new BeatTickLookup(sliceStart, end);
                     this.insertBefore(l1, n2);
                     for (const b of l1.highlightedBeats) {
-                        n1.highlightBeat(b.beat, b.playbackStart, b.playbackDuration);
-                        n2.highlightBeat(b.beat, b.playbackStart, b.playbackDuration);
+                        n1.highlightBeat(b.beat, b.playbackStart);
+                        n2.highlightBeat(b.beat, b.playbackStart);
                     }
-                    n2.highlightBeat(beat, start, duration);
+                    n2.highlightBeat(beat, beatPlaybackStart);
                     l1.start = end;
                 }
                 // Variant K
                 else /* end > l1.end */ {
-                    const n1 = new BeatTickLookup(l1.start, start);
+                    const n1 = new BeatTickLookup(l1.start, sliceStart);
                     for (const b of l1.highlightedBeats) {
-                        n1.highlightBeat(b.beat, b.playbackStart, b.playbackDuration);
+                        n1.highlightBeat(b.beat, b.playbackStart);
                     }
-                    l1.start = start;
-                    l1.highlightBeat(beat, start, duration);
+                    l1.start = sliceStart;
+                    l1.highlightBeat(beat, beatPlaybackStart);
                     this.insertBefore(l1, n1);
-                    this.addBeat(beat, l1.end, end - l1.end);
+                    this.addBeat(beat, beatPlaybackStart, l1.end, end - l1.end);
                 }
             }
             else /* start == l1.start */ {
                 // Variant L
                 if (end === l1.end) {
-                    l1.highlightBeat(beat, start, end);
+                    l1.highlightBeat(beat, beatPlaybackStart);
                 }
                 // Variant M
                 else if (end < l1.end) {
                     const n1 = new BeatTickLookup(l1.start, end);
                     for (const b of l1.highlightedBeats) {
-                        n1.highlightBeat(b.beat, b.playbackStart, b.playbackDuration);
+                        n1.highlightBeat(b.beat, b.playbackStart);
                     }
-                    n1.highlightBeat(beat, start, duration);
+                    n1.highlightBeat(beat, beatPlaybackStart);
                     l1.start = end;
                     this.insertBefore(l1, n1);
                 }
                 // variant N
                 else /* end > l1.end */ {
-                    l1.highlightBeat(beat, start, duration);
-                    this.addBeat(beat, l1.end, end - l1.end);
+                    l1.highlightBeat(beat, beatPlaybackStart);
+                    this.addBeat(beat, beatPlaybackStart, l1.end, end - l1.end);
                 }
             }
         }
@@ -17494,8 +17497,25 @@ class MidiTickLookup {
         }
     }
     addBeat(beat, start, duration) {
-        var _a;
-        (_a = this._currentMasterBar) === null || _a === void 0 ? void 0 : _a.addBeat(beat, start, duration);
+        const currentMasterBar = this._currentMasterBar;
+        if (currentMasterBar) {
+            // pre-beat grace notes at the start of the bar we also add the beat to the previous bar
+            if (start < 0 && currentMasterBar.previousMasterBar) {
+                const previousStart = currentMasterBar.previousMasterBar.end + start;
+                const previousEnd = previousStart + duration;
+                // add to previous bar 
+                currentMasterBar.previousMasterBar.addBeat(beat, previousStart, previousStart, currentMasterBar.previousMasterBar.end - previousStart);
+                // overlap to current bar?
+                if (previousEnd > currentMasterBar.previousMasterBar.end) {
+                    // the start is negative and representing the overlap to the previous bar.
+                    const overlapDuration = duration + start;
+                    currentMasterBar.addBeat(beat, start, 0, overlapDuration);
+                }
+            }
+            else {
+                currentMasterBar.addBeat(beat, start, start, duration);
+            }
+        }
     }
 }
 
@@ -42826,8 +42846,8 @@ class CoreSettings {
 // </auto-generated>
 class VersionInfo {
 }
-VersionInfo.version = '1.3.0-alpha.891';
-VersionInfo.date = '2024-01-16T01:25:36.345Z';
+VersionInfo.version = '1.3.0-alpha.898';
+VersionInfo.date = '2024-01-23T01:33:07.438Z';
 
 var index$5 = /*#__PURE__*/Object.freeze({
     __proto__: null,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@coderline/alphatab",
-    "version": "1.3.0-alpha.891",
+    "version": "1.3.0-alpha.898",
     "description": "alphaTab is a music notation and guitar tablature rendering library",
     "keywords": [
         "guitar",