@tspro/web-music-score 4.0.1 → 4.1.0

package/dist/score/index.d.mts

@@ -1,8 +1,8 @@
-import { N as NoteOptions, R as RestOptions, S as StaffPreset, a as ScoreConfiguration, M as MDocument, V as VoiceId, T as TupletOptions, F as Fermata, b as StaffTabOrGroups, c as Navigation, A as AnnotationText, d as Annotation, L as Label, C as Connective, e as TieType, f as NoteAnchor, g as VerticalPosition } from '../music-objects-DJQ4d2OA.mjs';
-export { a6 as Arpeggio, $ as Clef, D as DivRect, a8 as DynamicsAnnotation, q as MAccidental, s as MArpeggio, E as MBarLineLeft, B as MBarLineRight, t as MBeamGroup, r as MConnective, v as MEnding, _ as MExtensionLine, w as MFermata, x as MHeader, y as MImage, z as MMeasure, H as MNoteGroup, o as MPlaybackButtons, m as MPlayer, n as MRenderer, K as MRest, P as MRhythmColumn, Q as MScoreRow, X as MSignature, Y as MSpecialText, U as MStaff, u as MStaffBeamGroup, I as MStaffNoteGroup, O as MStaffRest, G as MStaffTabBarLine, W as MTab, J as MTabNoteGroup, Z as MText, p as MusicInterface, aa as PlayState, ab as PlayStateChangeListener, i as ScoreEvent, l as ScoreEventListener, h as ScoreEventType, k as ScoreObjectEvent, j as ScoreStaffPosEvent, a0 as StaffConfig, a7 as StaffTabOrGroup, a5 as Stem, a3 as StringNumber, a1 as TabConfig, a9 as TempoAnnotation, a4 as getStringNumbers, a2 as getVoiceIds } from '../music-objects-DJQ4d2OA.mjs';
+import { N as NoteOptions, R as RestOptions, S as StaffPreset, a as ScoreConfiguration, M as MDocument, V as VoiceId, T as TupletOptions, F as Fermata, b as StaffTabOrGroups, c as Navigation, A as AnnotationText, d as Annotation, L as Label, C as Connective, e as TieType, f as NoteAnchor, g as VerticalPosition } from '../music-objects-DIaqNPjs.mjs';
+export { a6 as Arpeggio, $ as Clef, D as DivRect, a8 as DynamicsAnnotation, q as MAccidental, s as MArpeggio, E as MBarLineLeft, B as MBarLineRight, t as MBeamGroup, r as MConnective, v as MEnding, _ as MExtensionLine, w as MFermata, x as MHeader, y as MImage, z as MMeasure, H as MNoteGroup, o as MPlaybackButtons, m as MPlayer, n as MRenderer, K as MRest, P as MRhythmColumn, Q as MScoreRow, X as MSignature, Y as MSpecialText, U as MStaff, u as MStaffBeamGroup, I as MStaffNoteGroup, O as MStaffRest, G as MStaffTabBarLine, W as MTab, J as MTabNoteGroup, Z as MText, p as MusicInterface, aa as PlayState, ab as PlayStateChangeListener, i as ScoreEvent, l as ScoreEventListener, h as ScoreEventType, k as ScoreObjectEvent, j as ScoreStaffPosEvent, a0 as StaffConfig, a7 as StaffTabOrGroup, a5 as Stem, a3 as StringNumber, a1 as TabConfig, a9 as TempoAnnotation, a4 as getStringNumbers, a2 as getVoiceIds } from '../music-objects-DIaqNPjs.mjs';
 import { N as Note } from '../note-eA2xPPiG.mjs';
-import { S as ScaleType, c as Scale } from '../scale-BbDJTbrG.mjs';
-import { N as NoteLength, h as NoteLengthStr, K as KeySignature, a as TimeSignature, T as TimeSignatureString, j as TupletRatio } from '../tempo-CtUhvJbr.mjs';
+import { S as ScaleType, c as Scale } from '../scale-bnD0WnMV.mjs';
+import { N as NoteLength, i as NoteLengthStr, K as KeySignature, b as TimeSignature, T as TimeSignatures, B as BeamGrouping, k as TupletRatio } from '../tempo-S85Q7uJA.mjs';
 import '@tspro/ts-utils-lib';
 
 /** Tuplet builder type. */
@@ -140,10 +140,25 @@ declare class DocumentBuilder {
     setKeySignature(scale: Scale): DocumentBuilder;
     /**
      * Set time signature for current measure and forward.
-     * @param timeSignature - TimeSignature  object instance or string (e.g. "3/4").
+     * @param timeSignature - TimeSignature object instance.
      * @returns - This document builder instance.
      */
-    setTimeSignature(timeSignature: TimeSignature | TimeSignatureString): DocumentBuilder;
+    setTimeSignature(timeSignature: TimeSignature): DocumentBuilder;
+    /**
+     * Set time signature for current measure and forward.
+     * @param timeSignature - TimeSignatures enum value or string (e.g. "3/4").
+     * @param beamGrouping - Beam grouping (e.g. "3-2" for time signature "5/8").
+     * @returns - This document builder instance.
+     */
+    setTimeSignature(timeSignature: TimeSignatures | `${TimeSignatures}`, beamGrouping?: BeamGrouping | `${BeamGrouping}`): DocumentBuilder;
+    /**
+     * Set time signature for current measure and forward.
+     * @param beatCount - Beat count of time signature (e.g. 3 in "3/4").
+     * @param beatSize - Beat size of time signature (e.g. 4 in "3/4").
+     * @param beamGrouping - Beam grouping (e.g. "3-2" for time signature "5/8").
+     * @returns - This document builder instance.
+     */
+    setTimeSignature(beatCount: number, beatSize: number, beamGrouping?: BeamGrouping | `${BeamGrouping}`): DocumentBuilder;
     /**
      * Set tempo.
      * @param beatsPerMinute - Tempo beats per minute.

package/dist/score/index.d.ts

@@ -1,8 +1,8 @@
-import { N as NoteOptions, R as RestOptions, S as StaffPreset, a as ScoreConfiguration, M as MDocument, V as VoiceId, T as TupletOptions, F as Fermata, b as StaffTabOrGroups, c as Navigation, A as AnnotationText, d as Annotation, L as Label, C as Connective, e as TieType, f as NoteAnchor, g as VerticalPosition } from '../music-objects-Dc3kR-XF.js';
-export { a6 as Arpeggio, $ as Clef, D as DivRect, a8 as DynamicsAnnotation, q as MAccidental, s as MArpeggio, E as MBarLineLeft, B as MBarLineRight, t as MBeamGroup, r as MConnective, v as MEnding, _ as MExtensionLine, w as MFermata, x as MHeader, y as MImage, z as MMeasure, H as MNoteGroup, o as MPlaybackButtons, m as MPlayer, n as MRenderer, K as MRest, P as MRhythmColumn, Q as MScoreRow, X as MSignature, Y as MSpecialText, U as MStaff, u as MStaffBeamGroup, I as MStaffNoteGroup, O as MStaffRest, G as MStaffTabBarLine, W as MTab, J as MTabNoteGroup, Z as MText, p as MusicInterface, aa as PlayState, ab as PlayStateChangeListener, i as ScoreEvent, l as ScoreEventListener, h as ScoreEventType, k as ScoreObjectEvent, j as ScoreStaffPosEvent, a0 as StaffConfig, a7 as StaffTabOrGroup, a5 as Stem, a3 as StringNumber, a1 as TabConfig, a9 as TempoAnnotation, a4 as getStringNumbers, a2 as getVoiceIds } from '../music-objects-Dc3kR-XF.js';
+import { N as NoteOptions, R as RestOptions, S as StaffPreset, a as ScoreConfiguration, M as MDocument, V as VoiceId, T as TupletOptions, F as Fermata, b as StaffTabOrGroups, c as Navigation, A as AnnotationText, d as Annotation, L as Label, C as Connective, e as TieType, f as NoteAnchor, g as VerticalPosition } from '../music-objects-xJJNlFwK.js';
+export { a6 as Arpeggio, $ as Clef, D as DivRect, a8 as DynamicsAnnotation, q as MAccidental, s as MArpeggio, E as MBarLineLeft, B as MBarLineRight, t as MBeamGroup, r as MConnective, v as MEnding, _ as MExtensionLine, w as MFermata, x as MHeader, y as MImage, z as MMeasure, H as MNoteGroup, o as MPlaybackButtons, m as MPlayer, n as MRenderer, K as MRest, P as MRhythmColumn, Q as MScoreRow, X as MSignature, Y as MSpecialText, U as MStaff, u as MStaffBeamGroup, I as MStaffNoteGroup, O as MStaffRest, G as MStaffTabBarLine, W as MTab, J as MTabNoteGroup, Z as MText, p as MusicInterface, aa as PlayState, ab as PlayStateChangeListener, i as ScoreEvent, l as ScoreEventListener, h as ScoreEventType, k as ScoreObjectEvent, j as ScoreStaffPosEvent, a0 as StaffConfig, a7 as StaffTabOrGroup, a5 as Stem, a3 as StringNumber, a1 as TabConfig, a9 as TempoAnnotation, a4 as getStringNumbers, a2 as getVoiceIds } from '../music-objects-xJJNlFwK.js';
 import { N as Note } from '../note-eA2xPPiG.js';
-import { S as ScaleType, c as Scale } from '../scale-B2Icbetz.js';
-import { N as NoteLength, h as NoteLengthStr, K as KeySignature, a as TimeSignature, T as TimeSignatureString, j as TupletRatio } from '../tempo-Dt8aHpol.js';
+import { S as ScaleType, c as Scale } from '../scale-DQNA-YLD.js';
+import { N as NoteLength, i as NoteLengthStr, K as KeySignature, b as TimeSignature, T as TimeSignatures, B as BeamGrouping, k as TupletRatio } from '../tempo-Bp1UzsrZ.js';
 import '@tspro/ts-utils-lib';
 
 /** Tuplet builder type. */
@@ -140,10 +140,25 @@ declare class DocumentBuilder {
     setKeySignature(scale: Scale): DocumentBuilder;
     /**
      * Set time signature for current measure and forward.
-     * @param timeSignature - TimeSignature  object instance or string (e.g. "3/4").
+     * @param timeSignature - TimeSignature object instance.
      * @returns - This document builder instance.
      */
-    setTimeSignature(timeSignature: TimeSignature | TimeSignatureString): DocumentBuilder;
+    setTimeSignature(timeSignature: TimeSignature): DocumentBuilder;
+    /**
+     * Set time signature for current measure and forward.
+     * @param timeSignature - TimeSignatures enum value or string (e.g. "3/4").
+     * @param beamGrouping - Beam grouping (e.g. "3-2" for time signature "5/8").
+     * @returns - This document builder instance.
+     */
+    setTimeSignature(timeSignature: TimeSignatures | `${TimeSignatures}`, beamGrouping?: BeamGrouping | `${BeamGrouping}`): DocumentBuilder;
+    /**
+     * Set time signature for current measure and forward.
+     * @param beatCount - Beat count of time signature (e.g. 3 in "3/4").
+     * @param beatSize - Beat size of time signature (e.g. 4 in "3/4").
+     * @param beamGrouping - Beam grouping (e.g. "3-2" for time signature "5/8").
+     * @returns - This document builder instance.
+     */
+    setTimeSignature(beatCount: number, beatSize: number, beamGrouping?: BeamGrouping | `${BeamGrouping}`): DocumentBuilder;
     /**
      * Set tempo.
      * @param beatsPerMinute - Tempo beats per minute.

package/dist/score/index.js

@@ -1,4 +1,4 @@
-/* WebMusicScore v4.0.1 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v4.1.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -124,11 +124,11 @@ var DivRect = class _DivRect {
   /**
    * Create rect from basic left, top, width and height arguments.
    * 
-   * @param left -
-   * @param top -
-   * @param width -
-   * @param height -
-   * @returns 
+   * @param left - Left coordinate.
+   * @param top - Top coordinate.
+   * @param width - With.
+   * @param height - Height.
+   * @returns - DivRect.
    */
   static create(left, top, width, height) {
     return new _DivRect(left, left + width, top, top + height);
@@ -138,9 +138,9 @@ var DivRect = class _DivRect {
    * 
    * @param centerX - Center x-coordinate.
    * @param centerY - Center y-coordinate.
-   * @param width -
-   * @param height -
-   * @returns 
+   * @param width - Width.
+   * @param height - Height.
+   * @returns - DivRect.
    */
   static createCentered(centerX, centerY, width, height) {
     return new _DivRect(centerX - width / 2, centerX + width / 2, centerY - height / 2, centerY + height / 2);
@@ -152,43 +152,43 @@ var DivRect = class _DivRect {
    * @param rightw - Right section width.
    * @param toph - Top section height.
    * @param bottomh - Bottomsection height.
-   * @returns 
+   * @returns - DivRect.
    */
   static createSections(leftw, rightw, toph, bottomh) {
     return new _DivRect(-leftw, 0, rightw, -toph, 0, bottomh);
   }
   /**
-   * Width.
+   * Width getter.
    */
   get width() {
     return this.right - this.left;
   }
   /**
-   * Height.
+   * Height getter.
    */
   get height() {
     return this.bottom - this.top;
   }
   /**
-   * Left section width.
+   * Left section width getter.
    */
   get leftw() {
     return this.centerX - this.left;
   }
   /**
-   * Right section width.
+   * Right section width getter.
    */
   get rightw() {
     return this.right - this.centerX;
   }
   /**
-   * Top section height.
+   * Top section height getter.
    */
   get toph() {
     return this.centerY - this.top;
   }
   /**
-   * Bottom section height.
+   * Bottom section height getter.
    */
   get bottomh() {
     return this.bottom - this.centerY;
@@ -196,9 +196,9 @@ var DivRect = class _DivRect {
   /**
    * Does this Rect contain given (x, y)-point?
    * 
-   * @param x -
-   * @param y -
-   * @returns 
+   * @param x - X-coordinate.
+   * @param y - Y-coordinate.
+   * @returns - True/false.
    */
   contains(x, y) {
     return x >= this.left && x <= this.right && y >= this.top && y <= this.bottom;
@@ -206,9 +206,9 @@ var DivRect = class _DivRect {
   /**
    * Do a and b rects overlap?
    * 
-   * @param a -
-   * @param b -
-   * @returns 
+   * @param a - DivRect a.
+   * @param b - DivRect b.
+   * @returns - True/false.
    */
   static overlap(a, b) {
     return a.right > b.left && a.left < b.right && a.bottom > b.top && a.top < b.bottom;
@@ -216,17 +216,18 @@ var DivRect = class _DivRect {
   /**
    * Do horizontal measures of a and b rects overlap?
    * 
-   * @param a -
-   * @param b -
-   * @returns 
+   * @param a - DivRect a.
+   * @param b - DivRect b.
+   * @returns - True/false.
    */
   static overlapX(a, b) {
     return a.right > b.left && a.left < b.right;
   }
   /**
    * Check if this Rect equals with given Rect.
-   * @param b -
-   * @returns 
+   * @param a - DivRect a.
+   * @param b - DivRect b.
+   * @returns - True/false.
    */
   static equals(a, b) {
     if (a == null && b == null) {
@@ -238,10 +239,11 @@ var DivRect = class _DivRect {
     }
   }
   /**
-   * Check if frame (ignoring centerX/Y) of this Rect equals with given Rect, ignoring centerX and centerY.
+   * Check if frame of this Rect equals with given Rect, ignoring center x- and center y-coordinates.
    * 
-   * @param b -
-   * @returns 
+   * @param a - DivRect a.
+   * @param b - DivRect b.
+   * @returns - True/false.
    */
   static equalsFrame(a, b) {
     if (a == null && b == null) {
@@ -255,7 +257,7 @@ var DivRect = class _DivRect {
   /**
    * Created duplicate of this Rect.
    * 
-   * @returns 
+   * @returns - Duplicate.
    */
   copy() {
     return new _DivRect(this.left, this.centerX, this.right, this.top, this.centerY, this.bottom);
@@ -263,9 +265,9 @@ var DivRect = class _DivRect {
   /**
    * Move this rect by (dx, dy). Modifies this Rect.
    * 
-   * @param dx -
-   * @param dy -
-   * @returns 
+   * @param dx - Offset amount in x-direction.
+   * @param dy - Offset amount in y-direction.
+   * @returns - This DivRect instance.
    */
   offsetInPlace(dx, dy) {
     this.left += dx;
@@ -279,9 +281,9 @@ var DivRect = class _DivRect {
   /**
    * Move this rect by (dx, dy). Immutable, returns modified copy.
    * 
-   * @param dx -
-   * @param dy -
-   * @returns 
+   * @param dx - Offset amount in x-direction.
+   * @param dy - Offset amount in y-direction.
+   * @returns - DivRect copy with applied offset.
    */
   offsetCopy(dx, dy) {
     return this.copy().offsetInPlace(dx, dy);
@@ -289,8 +291,8 @@ var DivRect = class _DivRect {
   /**
    * Expand this Rect by given Rect. Modifies this Rect.
    * 
-   * @param rect - 
-   * @returns 
+   * @param rect - DivRect to expand this instance with.
+   * @returns - This DivRect instance.
    */
   expandInPlace(rect) {
     this.left = Math.min(this.left, rect.left);
@@ -302,8 +304,8 @@ var DivRect = class _DivRect {
   /**
    * Expand this Rect by given Rect. Immutable, returns modified copy.
    * 
-   * @param rect -
-   * @returns 
+   * @param rect - DivRect to expand this instance with.
+   * @returns - Expanded copy of this DivRect.
    */
   expandCopy(rect) {
     return this.copy().expandInPlace(rect);
@@ -311,8 +313,8 @@ var DivRect = class _DivRect {
   /**
    * Clip this Rect by given Rect. Mmodifies this Rect.
    * 
-   * @param clipRect -
-   * @returns 
+   * @param clipRect - DivRect to clip this instance with.
+   * @returns - This DivRect instance.
    */
   clipInPlace(clipRect) {
     this.left = Math.max(this.left, clipRect.left);
@@ -326,8 +328,8 @@ var DivRect = class _DivRect {
   /**
    * Clip this Rect by given Rect. Immutable, return modified copy.
    * 
-   * @param clipRect -
-   * @returns 
+   * @param clipRect - DivRecto to clip this instance with.
+   * @returns - Clipped DivRect copy.
    */
   clipCopy(clipRect) {
     return this.copy().clipInPlace(clipRect);
@@ -335,9 +337,9 @@ var DivRect = class _DivRect {
   /**
    * Scale Rect. Anchor pos is (centerX, centerY). Modifies this Rect.
    * 
-   * @param scaleX -
-   * @param scaleY -
-   * @returns Copy of scaled Rect.
+   * @param scaleX - Scale x-amount.
+   * @param scaleY - Scale y-amount. If undefined then scale x-amount is used.
+   * @returns This DivRect instance.
    */
   scaleInPlace(scaleX, scaleY) {
     scaleY = scaleY != null ? scaleY : scaleX;
@@ -350,13 +352,17 @@ var DivRect = class _DivRect {
   /**
    * Scale Rect. Anchor pos is (centerX, centerY). Immutable, returns modified copy.
    * 
-   * @param scaleX -
-   * @param scaleY -
-   * @returns Copy of scaled Rect.
+   * @param scaleX - Scale x-amount.
+   * @param scaleY - Scale y-amount. If undefined then scale x-amount is used.
+   * @returns Scaled copy of this DivRect.
    */
   scaleCopy(scaleX, scaleY) {
     return this.copy().scaleInPlace(scaleX, scaleY);
   }
+  /**
+   * Get this DivRect instance.
+   * @returns - This DivRect instance.
+   */
   getRect() {
     return this;
   }
@@ -1365,9 +1371,9 @@ var ObjSignature = class extends MusicObject {
     if (showTimeSignature) {
       let timeSignature = this.measure.getTimeSignature();
       let beatCount = timeSignature.beatCount.toString();
-      this.beatCountText = new ObjText(this, { text: beatCount, scale: 1.4 }, 0, 0.5);
+      this.beatCountText = new ObjText(this, { text: beatCount, scale: 1.4 }, 0.5, 0.5);
       let beatSize = timeSignature.beatSize.toString();
-      this.beatSizeText = new ObjText(this, { text: beatSize, scale: 1.4 }, 0, 0.5);
+      this.beatSizeText = new ObjText(this, { text: beatSize, scale: 1.4 }, 0.5, 0.5);
     } else {
       this.beatCountText = this.beatSizeText = void 0;
     }
@@ -1457,6 +1463,7 @@ var ObjSignature = class extends MusicObject {
     return [this];
   }
   layout(renderer) {
+    var _a, _b, _c, _d, _e, _f;
     let { unitSize } = renderer;
     let { staff } = this;
     let paddingX = unitSize;
@@ -1501,15 +1508,16 @@ var ObjSignature = class extends MusicObject {
       });
     }
     let right = x;
+    (_a = this.beatCountText) == null ? void 0 : _a.layout(renderer);
+    (_b = this.beatSizeText) == null ? void 0 : _b.layout(renderer);
+    let tsWidth = Math.max((_d = (_c = this.beatCountText) == null ? void 0 : _c.getRect().width) != null ? _d : 0, (_f = (_e = this.beatSizeText) == null ? void 0 : _e.getRect().width) != null ? _f : 0);
     if (this.beatCountText) {
-      this.beatCountText.layout(renderer);
-      this.beatCountText.offset(x + paddingX, staff.getDiatonicIdY(staff.middleLineDiatonicId + 2));
+      this.beatCountText.offset(x + tsWidth / 2 + paddingX, staff.getDiatonicIdY(staff.middleLineDiatonicId + 2));
       this.rect.expandInPlace(this.beatCountText.getRect());
       right = Math.max(right, this.rect.right);
     }
     if (this.beatSizeText) {
-      this.beatSizeText.layout(renderer);
-      this.beatSizeText.offset(x + paddingX, staff.getDiatonicIdY(staff.bottomLineDiatonicId + 2));
+      this.beatSizeText.offset(x + tsWidth / 2 + paddingX, staff.getDiatonicIdY(staff.bottomLineDiatonicId + 2));
       this.rect.expandInPlace(this.beatSizeText.getRect());
       right = Math.max(right, this.rect.right);
     }
@@ -2898,11 +2906,10 @@ var ObjNoteGroup = class _ObjNoteGroup extends MusicObject {
   }
   setStemTipY(staff, stemTipY) {
     let obj = this.staffObjects.find((obj2) => obj2.staff === staff);
-    if (!(obj == null ? void 0 : obj.stemTip) || stemTipY === obj.stemTip.centerY) {
-      return;
+    if (this.hasBeamCount() && (obj == null ? void 0 : obj.stemTip) && stemTipY !== obj.stemTip.centerY) {
+      obj.stemTip.top = obj.stemTip.centerY = obj.stemTip.bottom = stemTipY;
+      this.requestRectUpdate();
     }
-    obj.stemTip.top = obj.stemTip.centerY = obj.stemTip.bottom = stemTipY;
-    this.requestRectUpdate();
   }
   offset(dx, dy) {
     this.staffObjects.forEach((obj) => obj.offset(dx, 0));
@@ -5111,7 +5118,7 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   setTimeSignature(timeSignature) {
     var _a;
     (_a = this.getPrevMeasure()) == null ? void 0 : _a.endSection();
-    this.alterTimeSignature = timeSignature instanceof import_theory10.TimeSignature ? timeSignature : new import_theory10.TimeSignature(timeSignature);
+    this.alterTimeSignature = timeSignature;
     this.updateTimeSignature();
   }
   updateTimeSignature() {
@@ -5641,52 +5648,77 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         return false;
       }
     });
+    let ts = this.getTimeSignature();
+    if (!this.needBeamsUpdate || ts.beamGroupSizes.length === 0) {
+      return;
+    }
     getVoiceIds().forEach((voiceId) => {
-      let symbols = this.getVoiceSymbols(voiceId);
-      if (symbols.length <= 2) {
-        return;
-      }
-      if (!DebugSettings.DisableBeams) {
-        let groupSymbols = [];
+      let symbols = this.getVoiceSymbols(voiceId).slice();
+      if (symbols.length >= 2) {
+        let symbolsStartTicks = this.isUpBeat() ? Math.max(0, this.getMeasureTicks() - this.getConsumedTicks()) : 0;
         let groupStartTicks = 0;
-        let groupEndTicks = 0;
-        if (this.isUpBeat()) {
-          let startTicks = Math.max(0, this.getMeasureTicks() - this.getConsumedTicks());
-          groupStartTicks = groupEndTicks = startTicks;
-        }
-        let ts = this.getTimeSignature();
-        symbols.forEach((symbol) => {
-          groupSymbols.push(symbol);
-          groupEndTicks += symbol.rhythmProps.ticks;
-          if (groupStartTicks === 0 && groupEndTicks === ts.beamGroupLength) {
-            _ObjMeasure.setupBeamGroup(groupSymbols);
-          }
-          while (groupEndTicks >= ts.beamGroupLength) {
-            groupSymbols = [];
-            groupStartTicks = groupEndTicks = groupEndTicks - ts.beamGroupLength;
+        for (let groupId = 0; groupId < ts.beamGroupSizes.length; groupId++) {
+          let beamGroupSize = ts.beamGroupSizes[groupId];
+          let groupSizeSum = 0;
+          beamGroupSize.forEach((s) => groupSizeSum += s);
+          let groupLength = groupSizeSum * import_theory9.NoteLengthProps.get("8n").ticks;
+          let groupSymbols = [];
+          let groupSymbolsLength = 0;
+          while (symbols.length > 0 && groupSymbolsLength < groupLength) {
+            let symbol = symbols[0];
+            if (symbol.col.positionTicks >= groupStartTicks) {
+              groupSymbols.push(symbol);
+              groupSymbolsLength += symbol.rhythmProps.ticks;
+              symbols.shift();
+            } else {
+              break;
+            }
           }
-        });
+          _ObjMeasure.setupBeamGroup(groupSymbols, beamGroupSize);
+          symbolsStartTicks += groupSymbolsLength;
+          groupStartTicks += groupLength;
+        }
       }
     });
     this.needBeamsUpdate = false;
     this.requestLayout();
   }
-  static setupBeamGroup(groupSymbols) {
+  static setupBeamGroup(groupSymbols, mainBeamGroupSizeArr) {
+    if (mainBeamGroupSizeArr.length === 0) {
+      return false;
+    }
     let groupNotes = groupSymbols.map((s) => {
       var _a;
       return s instanceof ObjNoteGroup && ((_a = s.getBeamGroup()) == null ? void 0 : _a.isTuplet()) !== true ? s : void 0;
     });
     ObjNoteGroup.setBeamCounts(groupNotes);
-    let beamNotes = [];
-    groupNotes.forEach((noteGroup) => {
-      if (noteGroup && noteGroup.hasBeamCount()) {
-        beamNotes.push(noteGroup);
-      } else {
-        ObjBeamGroup.createBeam(beamNotes);
-        beamNotes = [];
-      }
-    });
-    ObjBeamGroup.createBeam(beamNotes);
+    let beamGroupSizeArrList = [mainBeamGroupSizeArr];
+    if (mainBeamGroupSizeArr.length > 1) {
+      let sum = 0;
+      mainBeamGroupSizeArr.forEach((s) => sum += s);
+      beamGroupSizeArrList.unshift([sum]);
+    }
+    let beamsCreated = false;
+    while (beamGroupSizeArrList.length > 0 && !beamsCreated) {
+      let beamGroupSizeArr = beamGroupSizeArrList.shift();
+      let groupSymbolsCopy = groupSymbols.slice();
+      beamGroupSizeArr.forEach((beamGroupSize) => {
+        var _a;
+        let beamGroupLength = beamGroupSize * import_theory9.NoteLengthProps.get("8n").ticks;
+        let beamNotesLength = 0;
+        let beamNotes = [];
+        while (beamNotesLength < beamGroupLength && groupSymbolsCopy.length > 0) {
+          let symbol = groupSymbolsCopy.shift();
+          beamNotesLength += symbol.rhythmProps.ticks;
+          beamNotes.push(symbol instanceof ObjNoteGroup && ((_a = symbol.getBeamGroup()) == null ? void 0 : _a.isTuplet()) !== true ? symbol : void 0);
+        }
+        if (beamNotesLength === beamGroupLength && beamNotes.every((n) => n !== void 0) && (beamNotes.every((n) => n.rhythmProps.flagCount === 1) || beamGroupSizeArrList.length === 0)) {
+          ObjBeamGroup.createBeam(beamNotes);
+          beamsCreated = true;
+        }
+      });
+    }
+    return beamsCreated;
   }
   getBarLineLeft() {
     return this.barLineLeft;
@@ -7203,14 +7235,16 @@ var DocumentBuilder = class {
     this.getMeasure().setKeySignature(...args);
     return this;
   }
-  /**
-   * Set time signature for current measure and forward.
-   * @param timeSignature - TimeSignature  object instance or string (e.g. "3/4").
-   * @returns - This document builder instance.
-   */
-  setTimeSignature(timeSignature) {
-    assertArg(timeSignature instanceof import_theory13.TimeSignature || import_ts_utils_lib13.Utils.Is.isNonEmptyString(timeSignature), "timeSignature", timeSignature);
-    this.getMeasure().setTimeSignature(timeSignature);
+  setTimeSignature(...args) {
+    if (args[0] instanceof import_theory13.TimeSignature) {
+      this.getMeasure().setTimeSignature(args[0]);
+    } else if (import_ts_utils_lib13.Utils.Is.isEnumValue(args[0], import_theory13.TimeSignatures) && import_ts_utils_lib13.Utils.Is.isEnumValueOrUndefined(args[1], import_theory13.BeamGrouping)) {
+      this.getMeasure().setTimeSignature(new import_theory13.TimeSignature(args[0], args[1]));
+    } else if (import_ts_utils_lib13.Utils.Is.isIntegerGte(args[0], 1) && import_ts_utils_lib13.Utils.Is.isIntegerGte(args[1], 1) && import_ts_utils_lib13.Utils.Is.isEnumValueOrUndefined(args[2], import_theory13.BeamGrouping)) {
+      this.getMeasure().setTimeSignature(new import_theory13.TimeSignature(args[0], args[1], args[2]));
+    } else {
+      assertArg(false, "timeSignature args", args);
+    }
     return this;
   }
   setTempo(beatsPerMinute, beatLength, dotted) {