@tspro/web-music-score 5.1.0 → 5.2.0

package/dist/{music-objects-DTDFSro0.d.mts → music-objects-CB05XryE.d.mts}

@@ -801,7 +801,7 @@ declare class ObjBeamGroup extends MusicObject {
     private readonly staffObjects;
     private constructor();
     private get showTupletRatio();
-    static createBeam(noteGroups: ObjNoteGroup[]): void;
+    static createBeam(noteGroups: ObjNoteGroup[]): boolean;
     static createOldStyleTriplet(symbols: RhythmSymbol[]): number;
     static createTuplet(symbols: RhythmSymbol[], tupletRatio: TupletRatio & TupletOptions): void;
     getMusicInterface(): MBeamGroup;
@@ -815,6 +815,7 @@ declare class ObjBeamGroup extends MusicObject {
     getFirstSymbol(): RhythmSymbol | undefined;
     getLastSymbol(): RhythmSymbol | undefined;
     get stemDir(): Stem.Up | Stem.Down;
+    get color(): string;
     layout(renderer: Renderer): void;
     updateRect(): void;
     updateStemTips(): void;
@@ -912,17 +913,11 @@ type ScorePlayerNote = {
     slur: undefined | "first" | "slurred";
 };
 type RhythmSymbol = ObjNoteGroup | ObjRest;
-type LyricsContainerData = {
-    lyricsContainer: LyricsContainer;
-    verse: VerseNumber;
-    line: ObjNotationLine;
-    vpos: VerticalPos;
-};
 declare class ObjRhythmColumn extends MusicObject {
     readonly measure: ObjMeasure;
     readonly positionTicks: number;
     private readonly voiceSymbol;
-    private readonly lyricsContainers;
+    private readonly lyricsContainerCache;
     private minDiatonicId?;
     private maxDiatonicId?;
     private staffMinDiatonicId;
@@ -958,7 +953,6 @@ declare class ObjRhythmColumn extends MusicObject {
     getArpeggioDir(): Arpeggio;
     setVoiceSymbol(voiceId: VoiceId, symbol: RhythmSymbol): void;
     getVoiceSymbol(voiceId: VoiceId): RhythmSymbol | undefined;
-    getLyricsContainerDatas(): ReadonlyArray<LyricsContainerData>;
     getLyricsContainer(verse: VerseNumber, line: ObjNotationLine, vpos: VerticalPos, lyricsLength?: NoteLength): LyricsContainer | undefined;
     getMinWidth(): number;
     setupNoteHeadDisplacements(): void;

package/dist/{music-objects-CMdYZeC6.d.ts → music-objects-CwPOlqFi.d.ts}

@@ -1,5 +1,5 @@
-import { N as Note, A as Accidental } from './note-eA2xPPiG.js';
-import { R as RhythmProps, N as NoteLength, i as NoteLengthStr, k as TupletRatio, d as Tempo, K as KeySignature, b as TimeSignature } from './tempo-GrstpD9G.js';
+import { N as Note, A as Accidental } from './note-CgCIBwvR.js';
+import { R as RhythmProps, N as NoteLength, i as NoteLengthStr, k as TupletRatio, d as Tempo, K as KeySignature, b as TimeSignature } from './tempo-DMt3iwz9.js';
 import { Vec2 } from '@tspro/ts-utils-lib';
 
 /**
@@ -801,7 +801,7 @@ declare class ObjBeamGroup extends MusicObject {
     private readonly staffObjects;
     private constructor();
     private get showTupletRatio();
-    static createBeam(noteGroups: ObjNoteGroup[]): void;
+    static createBeam(noteGroups: ObjNoteGroup[]): boolean;
     static createOldStyleTriplet(symbols: RhythmSymbol[]): number;
     static createTuplet(symbols: RhythmSymbol[], tupletRatio: TupletRatio & TupletOptions): void;
     getMusicInterface(): MBeamGroup;
@@ -815,6 +815,7 @@ declare class ObjBeamGroup extends MusicObject {
     getFirstSymbol(): RhythmSymbol | undefined;
     getLastSymbol(): RhythmSymbol | undefined;
     get stemDir(): Stem.Up | Stem.Down;
+    get color(): string;
     layout(renderer: Renderer): void;
     updateRect(): void;
     updateStemTips(): void;
@@ -912,17 +913,11 @@ type ScorePlayerNote = {
     slur: undefined | "first" | "slurred";
 };
 type RhythmSymbol = ObjNoteGroup | ObjRest;
-type LyricsContainerData = {
-    lyricsContainer: LyricsContainer;
-    verse: VerseNumber;
-    line: ObjNotationLine;
-    vpos: VerticalPos;
-};
 declare class ObjRhythmColumn extends MusicObject {
     readonly measure: ObjMeasure;
     readonly positionTicks: number;
     private readonly voiceSymbol;
-    private readonly lyricsContainers;
+    private readonly lyricsContainerCache;
     private minDiatonicId?;
     private maxDiatonicId?;
     private staffMinDiatonicId;
@@ -958,7 +953,6 @@ declare class ObjRhythmColumn extends MusicObject {
     getArpeggioDir(): Arpeggio;
     setVoiceSymbol(voiceId: VoiceId, symbol: RhythmSymbol): void;
     getVoiceSymbol(voiceId: VoiceId): RhythmSymbol | undefined;
-    getLyricsContainerDatas(): ReadonlyArray<LyricsContainerData>;
     getLyricsContainer(verse: VerseNumber, line: ObjNotationLine, vpos: VerticalPos, lyricsLength?: NoteLength): LyricsContainer | undefined;
     getMinWidth(): number;
     setupNoteHeadDisplacements(): void;

package/dist/{note-eA2xPPiG.d.ts → note-CgCIBwvR.d.ts}

@@ -288,7 +288,7 @@ declare class Note {
      * @param b - Note b.
      * @returns - -1, 0 or 1.
      */
-    static compareFunc(a: Note, b: Note): 1 | 0 | -1;
+    static compareFunc(a: Note, b: Note): 1 | -1 | 0;
 }
 
 export { type Accidental as A, DefaultPitchNotation as D, GuitarNoteLabel as G, Note as N, type ParsedNote as P, SymbolSet as S, type NoteLetter as a, PitchNotation as b, PitchNotationList as c, DefaultGuitarNoteLabel as d, GuitarNoteLabelList as e, validateGuitarNoteLabel as f, getPitchNotationName as g, validatePitchNotation as v };

package/dist/pieces/index.d.mts

@@ -1,4 +1,4 @@
-import { M as MDocument } from '../music-objects-DTDFSro0.mjs';
+import { M as MDocument } from '../music-objects-CB05XryE.mjs';
 import '../note-eA2xPPiG.mjs';
 import '../tempo-dkctPkCS.mjs';
 import '@tspro/ts-utils-lib';

package/dist/pieces/index.d.ts

@@ -1,6 +1,6 @@
-import { M as MDocument } from '../music-objects-CMdYZeC6.js';
-import '../note-eA2xPPiG.js';
-import '../tempo-GrstpD9G.js';
+import { M as MDocument } from '../music-objects-CwPOlqFi.js';
+import '../note-CgCIBwvR.js';
+import '../tempo-DMt3iwz9.js';
 import '@tspro/ts-utils-lib';
 
 /**

package/dist/pieces/index.js

@@ -1,4 +1,4 @@
-/* WebMusicScore v5.1.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v5.2.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 "use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/pieces/index.mjs

@@ -1,5 +1,5 @@
-/* WebMusicScore v5.1.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
-import "../chunk-2EQHSQWO.mjs";
+/* WebMusicScore v5.2.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+import "../chunk-LC5JMIVF.mjs";
 
 // src/pieces/frere-jacques.ts
 import { DocumentBuilder } from "@tspro/web-music-score/score";

package/dist/react-ui/index.d.mts

@@ -3,7 +3,7 @@ import * as React from 'react';
 import { c as Scale, S as ScaleType } from '../scale-DQP3b9Zx.mjs';
 import { b as PitchNotation, G as GuitarNoteLabel, N as Note } from '../note-eA2xPPiG.mjs';
 import { H as Handedness } from '../guitar-DdexKdN6.mjs';
-import { D as DivRect, M as MDocument, n as ScoreEventListener, p as MRenderer, q as MPlaybackButtons } from '../music-objects-DTDFSro0.mjs';
+import { D as DivRect, M as MDocument, n as ScoreEventListener, p as MRenderer, q as MPlaybackButtons } from '../music-objects-CB05XryE.mjs';
 import '../tempo-dkctPkCS.mjs';
 import '@tspro/ts-utils-lib';
 

package/dist/react-ui/index.d.ts

@@ -1,10 +1,10 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as React from 'react';
-import { c as Scale, S as ScaleType } from '../scale-DGx3tJH4.js';
-import { b as PitchNotation, G as GuitarNoteLabel, N as Note } from '../note-eA2xPPiG.js';
-import { H as Handedness } from '../guitar-CaZJDA05.js';
-import { D as DivRect, M as MDocument, n as ScoreEventListener, p as MRenderer, q as MPlaybackButtons } from '../music-objects-CMdYZeC6.js';
-import '../tempo-GrstpD9G.js';
+import { c as Scale, S as ScaleType } from '../scale-CBW4eTz7.js';
+import { b as PitchNotation, G as GuitarNoteLabel, N as Note } from '../note-CgCIBwvR.js';
+import { H as Handedness } from '../guitar-BsSayRsH.js';
+import { D as DivRect, M as MDocument, n as ScoreEventListener, p as MRenderer, q as MPlaybackButtons } from '../music-objects-CwPOlqFi.js';
+import '../tempo-DMt3iwz9.js';
 import '@tspro/ts-utils-lib';
 
 interface CircleOfFifthsProps {

package/dist/react-ui/index.js

@@ -1,4 +1,4 @@
-/* WebMusicScore v5.1.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v5.2.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;

package/dist/react-ui/index.mjs

@@ -1,7 +1,7 @@
-/* WebMusicScore v5.1.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v5.2.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 import {
   __publicField
-} from "../chunk-2EQHSQWO.mjs";
+} from "../chunk-LC5JMIVF.mjs";
 
 // src/react-ui/circle-of-fifths.tsx
 import * as React from "react";

package/dist/{scale-DGx3tJH4.d.ts → scale-CBW4eTz7.d.ts}

@@ -1,5 +1,5 @@
-import { N as Note, S as SymbolSet } from './note-eA2xPPiG.js';
-import { K as KeySignature } from './tempo-GrstpD9G.js';
+import { N as Note, S as SymbolSet } from './note-CgCIBwvR.js';
+import { K as KeySignature } from './tempo-DMt3iwz9.js';
 
 /** Interval direction type. */
 type IntervalDirection = "Unison" | "Ascending" | "Descending";

package/dist/score/index.d.mts

@@ -1,5 +1,5 @@
-import { N as NoteOptions, R as RestOptions, S as StaffPreset, a as ScoreConfiguration, M as MDocument, V as VoiceId, T as TupletOptions, b as VerseNumber, L as LyricsOptions, c as StaffTabOrGroups, F as Fermata, d as Navigation, A as AnnotationText, e as Annotation, f as Label, C as Connective, g as TieType, h as NoteAnchor, i as VerticalPosition } from '../music-objects-DTDFSro0.mjs';
-export { ad as Arpeggio, a5 as BaseConfig, a4 as Clef, D as DivRect, ah as DynamicsAnnotation, af as LyricsAlign, ag as LyricsHyphen, s as MAccidental, u as MArpeggio, H as MBarLineLeft, G as MBarLineRight, v as MBeamGroup, t as MConnective, x as MEnding, a3 as MExtensionLine, y as MFermata, z as MHeader, B as MImage, a2 as MLyrics, E as MMeasure, J as MNoteGroup, q as MPlaybackButtons, o as MPlayer, p as MRenderer, P as MRest, U as MRhythmColumn, W as MScoreRow, a0 as MSpecialText, X as MStaff, w as MStaffBeamGroup, K as MStaffNoteGroup, Q as MStaffRest, Z as MStaffSignature, I as MStaffTabBarLine, Y as MTab, O as MTabNoteGroup, $ as MTabRhythm, _ as MTabSignature, a1 as MText, r as MusicInterface, aj as PlayState, ak as PlayStateChangeListener, k as ScoreEvent, n as ScoreEventListener, j as ScoreEventType, m as ScoreObjectEvent, l as ScoreStaffPosEvent, a6 as StaffConfig, ae as StaffTabOrGroup, ac as Stem, a9 as StringNumber, a7 as TabConfig, ai as TempoAnnotation, aa as getStringNumbers, ab as getVerseNumbers, a8 as getVoiceIds } from '../music-objects-DTDFSro0.mjs';
+import { N as NoteOptions, R as RestOptions, S as StaffPreset, a as ScoreConfiguration, M as MDocument, V as VoiceId, T as TupletOptions, b as VerseNumber, L as LyricsOptions, c as StaffTabOrGroups, F as Fermata, d as Navigation, A as AnnotationText, e as Annotation, f as Label, C as Connective, g as TieType, h as NoteAnchor, i as VerticalPosition } from '../music-objects-CB05XryE.mjs';
+export { ad as Arpeggio, a5 as BaseConfig, a4 as Clef, D as DivRect, ah as DynamicsAnnotation, af as LyricsAlign, ag as LyricsHyphen, s as MAccidental, u as MArpeggio, H as MBarLineLeft, G as MBarLineRight, v as MBeamGroup, t as MConnective, x as MEnding, a3 as MExtensionLine, y as MFermata, z as MHeader, B as MImage, a2 as MLyrics, E as MMeasure, J as MNoteGroup, q as MPlaybackButtons, o as MPlayer, p as MRenderer, P as MRest, U as MRhythmColumn, W as MScoreRow, a0 as MSpecialText, X as MStaff, w as MStaffBeamGroup, K as MStaffNoteGroup, Q as MStaffRest, Z as MStaffSignature, I as MStaffTabBarLine, Y as MTab, O as MTabNoteGroup, $ as MTabRhythm, _ as MTabSignature, a1 as MText, r as MusicInterface, aj as PlayState, ak as PlayStateChangeListener, k as ScoreEvent, n as ScoreEventListener, j as ScoreEventType, m as ScoreObjectEvent, l as ScoreStaffPosEvent, a6 as StaffConfig, ae as StaffTabOrGroup, ac as Stem, a9 as StringNumber, a7 as TabConfig, ai as TempoAnnotation, aa as getStringNumbers, ab as getVerseNumbers, a8 as getVoiceIds } from '../music-objects-CB05XryE.mjs';
 import { N as Note } from '../note-eA2xPPiG.mjs';
 import { S as ScaleType, c as Scale } from '../scale-DQP3b9Zx.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-dkctPkCS.mjs';

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, b as VerseNumber, L as LyricsOptions, c as StaffTabOrGroups, F as Fermata, d as Navigation, A as AnnotationText, e as Annotation, f as Label, C as Connective, g as TieType, h as NoteAnchor, i as VerticalPosition } from '../music-objects-CMdYZeC6.js';
-export { ad as Arpeggio, a5 as BaseConfig, a4 as Clef, D as DivRect, ah as DynamicsAnnotation, af as LyricsAlign, ag as LyricsHyphen, s as MAccidental, u as MArpeggio, H as MBarLineLeft, G as MBarLineRight, v as MBeamGroup, t as MConnective, x as MEnding, a3 as MExtensionLine, y as MFermata, z as MHeader, B as MImage, a2 as MLyrics, E as MMeasure, J as MNoteGroup, q as MPlaybackButtons, o as MPlayer, p as MRenderer, P as MRest, U as MRhythmColumn, W as MScoreRow, a0 as MSpecialText, X as MStaff, w as MStaffBeamGroup, K as MStaffNoteGroup, Q as MStaffRest, Z as MStaffSignature, I as MStaffTabBarLine, Y as MTab, O as MTabNoteGroup, $ as MTabRhythm, _ as MTabSignature, a1 as MText, r as MusicInterface, aj as PlayState, ak as PlayStateChangeListener, k as ScoreEvent, n as ScoreEventListener, j as ScoreEventType, m as ScoreObjectEvent, l as ScoreStaffPosEvent, a6 as StaffConfig, ae as StaffTabOrGroup, ac as Stem, a9 as StringNumber, a7 as TabConfig, ai as TempoAnnotation, aa as getStringNumbers, ab as getVerseNumbers, a8 as getVoiceIds } from '../music-objects-CMdYZeC6.js';
-import { N as Note } from '../note-eA2xPPiG.js';
-import { S as ScaleType, c as Scale } from '../scale-DGx3tJH4.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-GrstpD9G.js';
+import { N as NoteOptions, R as RestOptions, S as StaffPreset, a as ScoreConfiguration, M as MDocument, V as VoiceId, T as TupletOptions, b as VerseNumber, L as LyricsOptions, c as StaffTabOrGroups, F as Fermata, d as Navigation, A as AnnotationText, e as Annotation, f as Label, C as Connective, g as TieType, h as NoteAnchor, i as VerticalPosition } from '../music-objects-CwPOlqFi.js';
+export { ad as Arpeggio, a5 as BaseConfig, a4 as Clef, D as DivRect, ah as DynamicsAnnotation, af as LyricsAlign, ag as LyricsHyphen, s as MAccidental, u as MArpeggio, H as MBarLineLeft, G as MBarLineRight, v as MBeamGroup, t as MConnective, x as MEnding, a3 as MExtensionLine, y as MFermata, z as MHeader, B as MImage, a2 as MLyrics, E as MMeasure, J as MNoteGroup, q as MPlaybackButtons, o as MPlayer, p as MRenderer, P as MRest, U as MRhythmColumn, W as MScoreRow, a0 as MSpecialText, X as MStaff, w as MStaffBeamGroup, K as MStaffNoteGroup, Q as MStaffRest, Z as MStaffSignature, I as MStaffTabBarLine, Y as MTab, O as MTabNoteGroup, $ as MTabRhythm, _ as MTabSignature, a1 as MText, r as MusicInterface, aj as PlayState, ak as PlayStateChangeListener, k as ScoreEvent, n as ScoreEventListener, j as ScoreEventType, m as ScoreObjectEvent, l as ScoreStaffPosEvent, a6 as StaffConfig, ae as StaffTabOrGroup, ac as Stem, a9 as StringNumber, a7 as TabConfig, ai as TempoAnnotation, aa as getStringNumbers, ab as getVerseNumbers, a8 as getVoiceIds } from '../music-objects-CwPOlqFi.js';
+import { N as Note } from '../note-CgCIBwvR.js';
+import { S as ScaleType, c as Scale } from '../scale-CBW4eTz7.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-DMt3iwz9.js';
 import '@tspro/ts-utils-lib';
 
 /** Tuplet builder type. */

package/dist/score/index.js

@@ -1,4 +1,4 @@
-/* WebMusicScore v5.1.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v5.2.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -3126,7 +3126,7 @@ var ObjRhythmColumn = class extends MusicObject {
     this.measure = measure;
     this.positionTicks = positionTicks;
     __publicField(this, "voiceSymbol", []);
-    __publicField(this, "lyricsContainers", []);
+    __publicField(this, "lyricsContainerCache", /* @__PURE__ */ new Map());
     __publicField(this, "minDiatonicId");
     __publicField(this, "maxDiatonicId");
     __publicField(this, "staffMinDiatonicId", /* @__PURE__ */ new Map());
@@ -3252,18 +3252,20 @@ var ObjRhythmColumn = class extends MusicObject {
   getVoiceSymbol(voiceId) {
     return this.voiceSymbol[voiceId];
   }
-  getLyricsContainerDatas() {
-    return this.lyricsContainers;
-  }
   getLyricsContainer(verse, line, vpos, lyricsLength) {
-    let data = this.lyricsContainers.find((data2) => data2.verse === verse && data2.line === line && data2.vpos === vpos);
-    if (data === void 0 && lyricsLength !== void 0) {
-      data = { lyricsContainer: new LyricsContainer(this, (0, import_theory5.validateNoteLength)(lyricsLength)), verse, line, vpos };
-      this.lyricsContainers.push(data);
-      this.requestLayout();
-      this.requestRectUpdate();
+    let vposMap = this.lyricsContainerCache.get(line);
+    if (vposMap === void 0) {
+      this.lyricsContainerCache.set(line, vposMap = /* @__PURE__ */ new Map());
+    }
+    let verseMap = vposMap.get(vpos);
+    if (verseMap === void 0) {
+      vposMap.set(vpos, verseMap = /* @__PURE__ */ new Map());
     }
-    return data == null ? void 0 : data.lyricsContainer;
+    let lyricsContainer = verseMap.get(verse);
+    if (lyricsContainer === void 0 && lyricsLength !== void 0) {
+      verseMap.set(verse, lyricsContainer = new LyricsContainer(this, (0, import_theory5.validateNoteLength)(lyricsLength)));
+    }
+    return lyricsContainer;
   }
   getMinWidth() {
     let maxNoteSize = Math.max(...this.voiceSymbol.map((s) => s.rhythmProps.noteSize));
@@ -4036,6 +4038,10 @@ var Player = class _Player {
       return;
     }
     const col = this.playerColumnSequence[this.playPos];
+    if (!col) {
+      this.stop();
+      return;
+    }
     const getDuration = (ticks, tempo2) => {
       let seconds = calcTicksDuration(ticks, tempo2);
       return Math.max(0, seconds);
@@ -4120,6 +4126,9 @@ var Player = class _Player {
       return void 0;
     }
     let col = this.playerColumnSequence[this.playPos];
+    if (!col) {
+      return void 0;
+    }
     let measure = col.measure;
     let x = col.getRect().centerX;
     let top = measure.row.getRect().top;
@@ -4498,6 +4507,12 @@ var ObjStaffBeamGroup = class extends MusicObject {
     }
   }
 };
+var InvalidBeamGroup = class {
+  constructor(beamGroup, message) {
+    this.beamGroup = beamGroup;
+    this.message = message;
+  }
+};
 var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
   constructor(symbols, tupletRatio) {
     super(symbols[0].measure);
@@ -4538,10 +4553,27 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
         let first = i === 0;
         let last = i === this.symbols.length - 1;
         if (first && sym.getRightBeamCount() === 0 || last && sym.getLeftBeamCount() === 0 || !first && !last && (sym.getLeftBeamCount() === 0 || sym.getRightBeamCount() === 0)) {
-          this.detach();
+          throw new InvalidBeamGroup(this, "Beam has zero left or right beam count!");
         }
       });
     }
+    if (symbols.some((symbol) => symbol.voiceId !== symbols[0].voiceId)) {
+      if (this.type === 0 /* RegularBeam */) {
+        throw new InvalidBeamGroup(this, "Beam symbols have different voiceId.");
+      } else {
+        throw new import_core11.MusicError(import_core11.MusicErrorType.Score, `Tuplet symbols have different voiceId.`);
+      }
+    }
+    symbols[0].row.getStaves().forEach((staff) => {
+      if (staff.getActualStaff(symbols[0].ownDiatonicId) && staff.containsVoiceId(symbols[0].voiceId)) {
+        symbols.forEach((sym) => {
+          let actualStaff = staff.getActualStaff(sym.ownDiatonicId);
+          if (!actualStaff || !actualStaff.containsVoiceId(sym.voiceId)) {
+            throw new InvalidBeamGroup(this, "Some of beam or tuplet symbols are not visible!");
+          }
+        });
+      }
+    });
   }
   get showTupletRatio() {
     var _a;
@@ -4549,26 +4581,54 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
   }
   static createBeam(noteGroups) {
     if (noteGroups.length > 1 && noteGroups.every((ng) => !ng.hasTuplet())) {
-      new _ObjBeamGroup(noteGroups, void 0);
+      try {
+        new _ObjBeamGroup(noteGroups, void 0);
+        return true;
+      } catch (err) {
+        if (err instanceof InvalidBeamGroup) {
+          err.beamGroup.detach();
+        } else {
+          throw err;
+        }
+      }
     }
+    return false;
   }
   static createOldStyleTriplet(symbols) {
-    let s2 = symbols.slice(0, 2);
-    let n2 = s2.map((s) => s.rhythmProps.noteSize);
-    if (s2.length === 2 && s2.every((s) => s.oldStyleTriplet && s.getBeamGroup() === void 0) && (n2[0] * 2 === n2[1] || n2[1] * 2 === n2[0])) {
-      new _ObjBeamGroup(s2, import_theory7.Tuplet.Triplet);
-      return 2;
-    }
-    let s3 = symbols.slice(0, 3);
-    let n3 = s3.map((s) => s.rhythmProps.noteSize);
-    if (s3.length === 3 && s3.every((s) => s.oldStyleTriplet && s.getBeamGroup() === void 0) && n3.every((n) => n === n3[0])) {
-      new _ObjBeamGroup(s3, import_theory7.Tuplet.Triplet);
-      return 3;
+    try {
+      let s2 = symbols.slice(0, 2);
+      let n2 = s2.map((s) => s.rhythmProps.noteSize);
+      if (s2.length === 2 && s2.every((s) => s.oldStyleTriplet && s.getBeamGroup() === void 0) && (n2[0] * 2 === n2[1] || n2[1] * 2 === n2[0])) {
+        new _ObjBeamGroup(s2, import_theory7.Tuplet.Triplet);
+        return 2;
+      }
+      let s3 = symbols.slice(0, 3);
+      let n3 = s3.map((s) => s.rhythmProps.noteSize);
+      if (s3.length === 3 && s3.every((s) => s.oldStyleTriplet && s.getBeamGroup() === void 0) && n3.every((n) => n === n3[0])) {
+        new _ObjBeamGroup(s3, import_theory7.Tuplet.Triplet);
+        return 3;
+      }
+    } catch (err) {
+      if (err instanceof InvalidBeamGroup) {
+        console.error(err.message);
+        err.beamGroup.detach();
+      } else {
+        throw err;
+      }
     }
     return 0;
   }
   static createTuplet(symbols, tupletRatio) {
-    new _ObjBeamGroup(symbols, tupletRatio);
+    try {
+      new _ObjBeamGroup(symbols, tupletRatio);
+    } catch (err) {
+      if (err instanceof InvalidBeamGroup) {
+        console.error(err.message);
+        err.beamGroup.detach();
+      } else {
+        throw err;
+      }
+    }
   }
   getMusicInterface() {
     return this.mi;
@@ -4613,6 +4673,9 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
   get stemDir() {
     return this.symbols[0].ownStemDir;
   }
+  get color() {
+    return this.symbols[0].color;
+  }
   layout(renderer) {
     this.requestRectUpdate();
     this.staffObjects.length = 0;
@@ -4620,12 +4683,8 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
     if (symbols.length === 0) {
       return;
     }
-    let voiceId = symbols[0].voiceId;
-    if (symbols.some((symbol) => symbol.voiceId !== voiceId)) {
-      return;
-    }
     let { unitSize } = renderer;
-    let { stemDir } = this;
+    let { stemDir, type } = this;
     let symbolsBeamCoords = symbols.map((s) => s.getBeamCoords());
     symbolsBeamCoords[0].map((s) => s == null ? void 0 : s.staff).forEach((mainStaff, index) => {
       var _a, _b;
@@ -4661,7 +4720,7 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
       }
       let leftStemHeight = (_a = symbolStemHeight[0]) != null ? _a : 0;
       let rightStemHeight = (_b = symbolStemHeight[symbolStemHeight.length - 1]) != null ? _b : 0;
-      if (this.type !== 2 /* TupletGroup */) {
+      if (type !== 2 /* TupletGroup */) {
         let leftDy = leftStemHeight < rightStemHeight ? Math.sqrt(rightStemHeight - leftStemHeight) : 0;
         let rightDy = rightStemHeight < leftStemHeight ? Math.sqrt(leftStemHeight - rightStemHeight) : 0;
         if (stemDir === "up" /* Up */) {
@@ -4699,21 +4758,21 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
       rightY += raiseBeamY;
       symbolY = symbolY.map((y) => y === void 0 ? void 0 : y + raiseBeamY);
       let obj = new ObjStaffBeamGroup(mainStaff, this);
-      if (this.type === 2 /* TupletGroup */) {
+      if (type === 2 /* TupletGroup */) {
         let ef = unitSize / (rightX - leftX);
         let l = import_ts_utils_lib9.Utils.Math.interpolateCoord(leftX, leftY + groupLineDy, rightX, rightY + groupLineDy, -ef);
         let r = import_ts_utils_lib9.Utils.Math.interpolateCoord(leftX, leftY + groupLineDy, rightX, rightY + groupLineDy, 1 + ef);
         obj.points.push(new BeamPoint(leftStaff, this, leftSymbol, l.x, l.y));
         obj.points.push(new BeamPoint(rightStaff, this, rightSymbol, r.x, r.y));
         obj.tupletNumberOffsetY = 0;
-      } else if (this.type === 0 /* RegularBeam */ || this.type === 1 /* TupletBeam */) {
+      } else if (type === 0 /* RegularBeam */ || type === 1 /* TupletBeam */) {
         raiseBeamY *= 0.5;
         let { beamThickness } = renderer;
         const beamHeight = (i) => {
           let sym = symbols[i];
           if (sym instanceof ObjNoteGroup) {
             let beamCount = sym instanceof ObjNoteGroup ? Math.max(sym.getLeftBeamCount(), sym.getRightBeamCount()) : 0;
-            return DocumentSettings.BeamSeparation * unitSize * (this.stemDir === "up" /* Up */ ? beamCount - 1 : 0);
+            return DocumentSettings.BeamSeparation * unitSize * (stemDir === "up" /* Up */ ? beamCount - 1 : 0);
           } else {
             return 0;
           }
@@ -4724,8 +4783,16 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
           let symY = symbolY[i];
           if (symStaff && symX !== void 0 && symY !== void 0) {
             let pt = new BeamPoint(symStaff, this, sym, symX, symY);
-            pt.topBeamsHeight = beamThickness / 2 + (stemDir === "down" /* Down */ ? beamHeight(i) : 0);
-            pt.bottomBeamsHeight = beamThickness / 2 + (stemDir === "up" /* Up */ ? beamHeight(i) : 0);
+            switch (stemDir) {
+              case "up" /* Up */:
+                pt.topBeamsHeight = beamThickness / 2;
+                pt.bottomBeamsHeight = beamThickness / 2 + beamHeight(i);
+                break;
+              case "down" /* Down */:
+                pt.topBeamsHeight = beamThickness / 2 + beamHeight(i);
+                pt.bottomBeamsHeight = beamThickness / 2;
+                break;
+            }
             obj.points.push(pt);
           }
         });
@@ -4778,53 +4845,52 @@ var ObjBeamGroup = class _ObjBeamGroup extends MusicObject {
   }
   draw(renderer) {
     let { unitSize, beamThickness, lineWidth } = renderer;
-    let color = "black";
-    this.staffObjects.forEach((obj) => {
-      if (this.type === 2 /* TupletGroup */) {
-        let l = obj.points[0];
-        let r = obj.points[obj.points.length - 1];
-        if (l && r) {
-          let tf = obj.tupletNumber ? obj.tupletNumber.getRect().width / (r.x - l.x) * 1.2 : 0;
-          let lc = import_ts_utils_lib9.Utils.Math.interpolateCoord(l.x, l.y, r.x, r.y, 0.5 - tf / 2);
-          let rc = import_ts_utils_lib9.Utils.Math.interpolateCoord(l.x, l.y, r.x, r.y, 0.5 + tf / 2);
-          let tipH = this.stemDir === "up" /* Up */ ? unitSize : -unitSize;
-          renderer.drawLine(l.x, l.y, lc.x, lc.y, color, lineWidth);
-          renderer.drawLine(rc.x, rc.y, r.x, r.y, color, lineWidth);
-          renderer.drawLine(l.x, l.y, l.x, l.y + tipH, color, lineWidth);
-          renderer.drawLine(r.x, r.y, r.x, r.y + tipH, color, lineWidth);
+    let { stemDir, color, type } = this;
+    if (type === 2 /* TupletGroup */) {
+      let tipHeight = (stemDir === "up" /* Up */ ? 1 : -1) * unitSize;
+      this.staffObjects.forEach((obj) => {
+        let { x: lx, y: ly } = obj.points[0];
+        let { x: rx, y: ry } = obj.points[obj.points.length - 1];
+        if (obj.tupletNumber) {
+          let tf = obj.tupletNumber.getRect().width / (rx - lx) * 1.2;
+          let lc = import_ts_utils_lib9.Utils.Math.interpolateCoord(lx, ly, rx, ry, 0.5 - tf / 2);
+          let rc = import_ts_utils_lib9.Utils.Math.interpolateCoord(lx, ly, rx, ry, 0.5 + tf / 2);
+          renderer.drawLine(lx, ly, lc.x, lc.y, color, lineWidth);
+          renderer.drawLine(rc.x, rc.y, rx, ry, color, lineWidth);
+        } else {
+          renderer.drawLine(lx, ly, rx, ry, color, lineWidth);
         }
-      } else if (this.type === 0 /* RegularBeam */ || this.type === 1 /* TupletBeam */) {
-        let beamSeparation = DocumentSettings.BeamSeparation * unitSize * (this.stemDir === "up" /* Up */ ? 1 : -1);
+        renderer.drawLine(lx, ly, lx, ly + tipHeight, color, lineWidth);
+        renderer.drawLine(rx, ry, rx, ry + tipHeight, color, lineWidth);
+      });
+    } else if (type === 0 /* RegularBeam */ || type === 1 /* TupletBeam */) {
+      this.staffObjects.forEach((obj) => {
         let noteGroupPoints = obj.points.filter((p) => p.symbol instanceof ObjNoteGroup);
+        let { x: lx, y: ly } = noteGroupPoints[0];
+        let { x: rx, y: ry } = noteGroupPoints[noteGroupPoints.length - 1];
+        let beamSeparation = DocumentSettings.BeamSeparation * unitSize * (stemDir === "up" /* Up */ ? 1 : -1) * (1 + 0.5 * Math.abs(Math.atan2(ry - ly, rx - lx)));
         for (let i = 0; i < noteGroupPoints.length - 1; i++) {
-          let left = noteGroupPoints[i];
-          let right = noteGroupPoints[i + 1];
-          if (!(left.symbol instanceof ObjNoteGroup && right.symbol instanceof ObjNoteGroup)) {
-            continue;
-          }
-          let leftBeamCount = left.symbol.getRightBeamCount();
-          let rightBeamCount = right.symbol.getLeftBeamCount();
-          let lx = left.x;
-          let ly = left.y;
-          let rx = right.x;
-          let ry = right.y;
-          let dy = beamSeparation * (1 + 0.5 * Math.abs(Math.atan2(ry - ly, rx - lx)));
+          let { x: lx2, y: ly2, symbol: lsymbol } = noteGroupPoints[i];
+          let { x: rx2, y: ry2, symbol: rsymbol } = noteGroupPoints[i + 1];
+          let leftBeamCount = lsymbol.getRightBeamCount();
+          let rightBeamCount = rsymbol.getLeftBeamCount();
           for (let beamId = 0; beamId < Math.max(leftBeamCount, rightBeamCount); beamId++) {
             if (beamId < leftBeamCount && beamId < rightBeamCount) {
-              renderer.drawLine(lx, ly, rx, ry, color, beamThickness);
+              renderer.drawLine(lx2, ly2, rx2, ry2, color, beamThickness);
             } else if (leftBeamCount > rightBeamCount) {
-              renderer.drawPartialLine(lx, ly, rx, ry, 0, 0.25, color, beamThickness);
+              renderer.drawPartialLine(lx2, ly2, rx2, ry2, 0, 0.25, color, beamThickness);
             } else if (rightBeamCount > leftBeamCount) {
-              renderer.drawPartialLine(lx, ly, rx, ry, 0.75, 1, color, beamThickness);
+              renderer.drawPartialLine(lx2, ly2, rx2, ry2, 0.75, 1, color, beamThickness);
             }
-            ly += dy;
-            ry += dy;
+            ly2 += beamSeparation;
+            ry2 += beamSeparation;
           }
         }
-      }
-      if (obj.tupletNumber) {
-        obj.tupletNumber.draw(renderer);
-      }
+      });
+    }
+    this.staffObjects.forEach((obj) => {
+      var _a;
+      return (_a = obj.tupletNumber) == null ? void 0 : _a.draw(renderer);
     });
   }
   setBeamCounts() {
@@ -6249,18 +6315,15 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
   getLyricsObjects(line, vpos, verse) {
     let vposMap = this.lyricsObjectsCache.get(line);
     if (vposMap === void 0) {
-      vposMap = /* @__PURE__ */ new Map();
-      this.lyricsObjectsCache.set(line, vposMap);
+      this.lyricsObjectsCache.set(line, vposMap = /* @__PURE__ */ new Map());
     }
     let verseMap = vposMap.get(vpos);
     if (verseMap === void 0) {
-      verseMap = /* @__PURE__ */ new Map();
-      vposMap.set(vpos, verseMap);
+      vposMap.set(vpos, verseMap = /* @__PURE__ */ new Map());
     }
     let lyricsArr = verseMap.get(verse);
     if (lyricsArr === void 0) {
-      lyricsArr = [];
-      verseMap.set(verse, lyricsArr);
+      verseMap.set(verse, lyricsArr = []);
     }
     return lyricsArr;
   }
@@ -6387,22 +6450,24 @@ var _ObjMeasure = class _ObjMeasure extends MusicObject {
         if (beamGroupSize.length > 1) {
           beamGroupSizeList.unshift([import_ts_utils_lib13.Utils.Math.sum(beamGroupSize)]);
         }
-        let beamsCreated = false;
+        let beamCreated = false;
         let groupStartTicksSave = groupStartTicks;
-        while (beamGroupSizeList.length > 0 && !beamsCreated) {
+        while (beamGroupSizeList.length > 0 && !beamCreated) {
           let beamGroupSize2 = beamGroupSizeList.shift();
           groupStartTicks = groupStartTicksSave;
           beamGroupSize2.forEach((beamGroupSize3) => {
             let beamGroupTicks = beamGroupSize3 * import_theory9.NoteLengthProps.get("8n").ticks;
+            let groupEndTicks = groupStartTicks + beamGroupTicks;
             let groupSymbols = symbols.filter((symbol) => {
               let symbolStartTicks = upBeatStartTicks + symbol.col.positionTicks;
-              let symbolTicks = symbol.rhythmProps.ticks;
-              return symbolStartTicks >= groupStartTicks && symbolStartTicks + symbolTicks <= groupStartTicks + beamGroupTicks;
+              let symbolEndTicks = symbolStartTicks + symbol.rhythmProps.ticks;
+              return symbolStartTicks >= groupStartTicks && symbolEndTicks <= groupEndTicks;
             });
-            let groupNotesTicks = import_ts_utils_lib13.Utils.Math.sum(groupSymbols.map((sym) => sym.rhythmProps.ticks));
-            if (groupNotesTicks === beamGroupTicks && groupSymbols.every((n) => n instanceof ObjNoteGroup) && (groupSymbols.every((n) => n.rhythmProps.flagCount === 1) || beamGroupSizeList.length === 0)) {
-              ObjBeamGroup.createBeam(groupSymbols);
-              beamsCreated = true;
+            let groupSymbolsTicks = import_ts_utils_lib13.Utils.Math.sum(groupSymbols.map((sym) => sym.rhythmProps.ticks));
+            if (groupSymbolsTicks === beamGroupTicks && groupSymbols.every((n) => n instanceof ObjNoteGroup) && (groupSymbols.every((n) => n.rhythmProps.flagCount === 1) || beamGroupSizeList.length === 0)) {
+              if (ObjBeamGroup.createBeam(groupSymbols)) {
+                beamCreated = true;
+              }
             }
             groupStartTicks += beamGroupTicks;
           });