@tspro/web-music-score 3.0.0 → 3.0.1

package/dist/{interface-DXyXwLBB.d.ts → interface-1TQHxSpb.d.ts}

@@ -1345,14 +1345,15 @@ declare abstract class MusicObject {
 
 declare class ObjArpeggio extends MusicObject {
     readonly col: ObjRhythmColumn;
+    readonly line: ObjStaff | ObjTab;
     readonly arpeggioDir: Arpeggio;
     private topArrowHeight;
     private bottomArrowHeight;
-    private static NumCycles;
     private cycleHeight;
+    private numCycles;
     private color;
     readonly mi: MArpeggio;
-    constructor(col: ObjRhythmColumn, arpeggioDir: Arpeggio);
+    constructor(col: ObjRhythmColumn, line: ObjStaff | ObjTab, arpeggioDir: Arpeggio);
     getMusicInterface(): MArpeggio;
     pick(x: number, y: number): MusicObject[];
     layout(renderer: Renderer): void;
@@ -1765,4 +1766,4 @@ declare class MPlaybackButtons {
     private static addOnClickListener;
 }
 
-export { getVoiceIds as $, Annotation as A, MStaffRest as B, Connective as C, DivRect as D, MRhythmColumn as E, Fermata as F, MScoreRow as G, MStaff as H, MTab as I, MSignature as J, MSpecialText as K, Label as L, MDocument as M, type NoteOptions as N, ObjMeasure as O, MText as P, MExtensionLine as Q, type RestOptions as R, StaffPreset as S, TieType as T, MPlayer as U, MRenderer as V, MPlaybackButtons as W, Clef as X, type StaffConfig as Y, type TabConfig as Z, type VoiceId as _, type ScoreConfiguration as a, type StringNumber as a0, getStringNumbers as a1, Stem as a2, Arpeggio as a3, type ConnectiveSpan as a4, PlayState as a5, type PlayStateChangeListener as a6, Navigation as b, NoteAnchor as c, type ScoreEventType as d, ScoreEvent as e, ScoreStaffPosEvent as f, ScoreObjectEvent as g, type ScoreEventListener as h, MusicInterface as i, MAccidental as j, MConnective as k, MArpeggio as l, MBeamGroup as m, MStaffBeamGroup as n, MEnding as o, MFermata as p, MHeader as q, MImage as r, MMeasure as s, MBarLineRight as t, MBarLineLeft as u, MStaffTabBarLine as v, MNoteGroup as w, MStaffNoteGroup as x, MTabNoteGroup as y, MRest as z };
+export { type StringNumber as $, Annotation as A, MStaffRest as B, Connective as C, DivRect as D, MRhythmColumn as E, Fermata as F, MScoreRow as G, MStaff as H, MTab as I, MSignature as J, MSpecialText as K, Label as L, MDocument as M, type NoteOptions as N, MText as O, MExtensionLine as P, MPlayer as Q, type RestOptions as R, StaffPreset as S, TieType as T, MRenderer as U, MPlaybackButtons as V, Clef as W, type StaffConfig as X, type TabConfig as Y, type VoiceId as Z, getVoiceIds as _, type ScoreConfiguration as a, getStringNumbers as a0, Stem as a1, Arpeggio as a2, type ConnectiveSpan as a3, PlayState as a4, type PlayStateChangeListener as a5, Navigation as b, NoteAnchor as c, type ScoreEventType as d, ScoreEvent as e, ScoreStaffPosEvent as f, ScoreObjectEvent as g, type ScoreEventListener as h, MusicInterface as i, MAccidental as j, MConnective as k, MArpeggio as l, MBeamGroup as m, MStaffBeamGroup as n, MEnding as o, MFermata as p, MHeader as q, MImage as r, MMeasure as s, MBarLineRight as t, MBarLineLeft as u, MStaffTabBarLine as v, MNoteGroup as w, MStaffNoteGroup as x, MTabNoteGroup as y, MRest as z };

package/dist/{interface-CLb7xa7_.d.mts → interface-DkUnsAjj.d.mts}

@@ -1345,14 +1345,15 @@ declare abstract class MusicObject {
 
 declare class ObjArpeggio extends MusicObject {
     readonly col: ObjRhythmColumn;
+    readonly line: ObjStaff | ObjTab;
     readonly arpeggioDir: Arpeggio;
     private topArrowHeight;
     private bottomArrowHeight;
-    private static NumCycles;
     private cycleHeight;
+    private numCycles;
     private color;
     readonly mi: MArpeggio;
-    constructor(col: ObjRhythmColumn, arpeggioDir: Arpeggio);
+    constructor(col: ObjRhythmColumn, line: ObjStaff | ObjTab, arpeggioDir: Arpeggio);
     getMusicInterface(): MArpeggio;
     pick(x: number, y: number): MusicObject[];
     layout(renderer: Renderer): void;
@@ -1765,4 +1766,4 @@ declare class MPlaybackButtons {
     private static addOnClickListener;
 }
 
-export { getVoiceIds as $, Annotation as A, MStaffRest as B, Connective as C, DivRect as D, MRhythmColumn as E, Fermata as F, MScoreRow as G, MStaff as H, MTab as I, MSignature as J, MSpecialText as K, Label as L, MDocument as M, type NoteOptions as N, ObjMeasure as O, MText as P, MExtensionLine as Q, type RestOptions as R, StaffPreset as S, TieType as T, MPlayer as U, MRenderer as V, MPlaybackButtons as W, Clef as X, type StaffConfig as Y, type TabConfig as Z, type VoiceId as _, type ScoreConfiguration as a, type StringNumber as a0, getStringNumbers as a1, Stem as a2, Arpeggio as a3, type ConnectiveSpan as a4, PlayState as a5, type PlayStateChangeListener as a6, Navigation as b, NoteAnchor as c, type ScoreEventType as d, ScoreEvent as e, ScoreStaffPosEvent as f, ScoreObjectEvent as g, type ScoreEventListener as h, MusicInterface as i, MAccidental as j, MConnective as k, MArpeggio as l, MBeamGroup as m, MStaffBeamGroup as n, MEnding as o, MFermata as p, MHeader as q, MImage as r, MMeasure as s, MBarLineRight as t, MBarLineLeft as u, MStaffTabBarLine as v, MNoteGroup as w, MStaffNoteGroup as x, MTabNoteGroup as y, MRest as z };
+export { type StringNumber as $, Annotation as A, MStaffRest as B, Connective as C, DivRect as D, MRhythmColumn as E, Fermata as F, MScoreRow as G, MStaff as H, MTab as I, MSignature as J, MSpecialText as K, Label as L, MDocument as M, type NoteOptions as N, MText as O, MExtensionLine as P, MPlayer as Q, type RestOptions as R, StaffPreset as S, TieType as T, MRenderer as U, MPlaybackButtons as V, Clef as W, type StaffConfig as X, type TabConfig as Y, type VoiceId as Z, getVoiceIds as _, type ScoreConfiguration as a, getStringNumbers as a0, Stem as a1, Arpeggio as a2, type ConnectiveSpan as a3, PlayState as a4, type PlayStateChangeListener as a5, Navigation as b, NoteAnchor as c, type ScoreEventType as d, ScoreEvent as e, ScoreStaffPosEvent as f, ScoreObjectEvent as g, type ScoreEventListener as h, MusicInterface as i, MAccidental as j, MConnective as k, MArpeggio as l, MBeamGroup as m, MStaffBeamGroup as n, MEnding as o, MFermata as p, MHeader as q, MImage as r, MMeasure as s, MBarLineRight as t, MBarLineLeft as u, MStaffTabBarLine as v, MNoteGroup as w, MStaffNoteGroup as x, MTabNoteGroup as y, MRest as z };

package/dist/pieces/index.d.mts

@@ -1,4 +1,4 @@
-import { M as MDocument } from '../interface-CLb7xa7_.mjs';
+import { M as MDocument } from '../interface-DkUnsAjj.mjs';
 import '../note-B5ZtlHc8.mjs';
 import '../tempo-TjQKn46X.mjs';
 import '@tspro/ts-utils-lib';

package/dist/pieces/index.d.ts

@@ -1,4 +1,4 @@
-import { M as MDocument } from '../interface-DXyXwLBB.js';
+import { M as MDocument } from '../interface-1TQHxSpb.js';
 import '../note-B5ZtlHc8.js';
 import '../tempo-DoJd-UYT.js';
 import '@tspro/ts-utils-lib';

package/dist/pieces/index.js

@@ -1,4 +1,4 @@
-/* WebMusicScore v3.0.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v3.0.1 | (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 v3.0.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
-import "../chunk-ZWFAOHYM.mjs";
+/* WebMusicScore v3.0.1 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+import "../chunk-4AS76G4O.mjs";
 
 // src/pieces/frere-jacques.ts
 import { NoteLength, ScaleType } from "@tspro/web-music-score/theory";

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-C-YS5iVG.mjs';
 import { b as PitchNotation, G as GuitarNoteLabel, N as Note } from '../note-B5ZtlHc8.mjs';
 import { H as Handedness } from '../guitar-zASF7B1g.mjs';
-import { D as DivRect, M as MDocument, h as ScoreEventListener, V as MRenderer, W as MPlaybackButtons } from '../interface-CLb7xa7_.mjs';
+import { D as DivRect, M as MDocument, h as ScoreEventListener, U as MRenderer, V as MPlaybackButtons } from '../interface-DkUnsAjj.mjs';
 import '../tempo-TjQKn46X.mjs';
 import '@tspro/ts-utils-lib';
 

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

@@ -3,7 +3,7 @@ import * as React from 'react';
 import { c as Scale, S as ScaleType } from '../scale-B_2MZaT9.js';
 import { b as PitchNotation, G as GuitarNoteLabel, N as Note } from '../note-B5ZtlHc8.js';
 import { H as Handedness } from '../guitar-BIFwFT31.js';
-import { D as DivRect, M as MDocument, h as ScoreEventListener, V as MRenderer, W as MPlaybackButtons } from '../interface-DXyXwLBB.js';
+import { D as DivRect, M as MDocument, h as ScoreEventListener, U as MRenderer, V as MPlaybackButtons } from '../interface-1TQHxSpb.js';
 import '../tempo-DoJd-UYT.js';
 import '@tspro/ts-utils-lib';
 

package/dist/react-ui/index.js

@@ -1,4 +1,4 @@
-/* WebMusicScore v3.0.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v3.0.1 | (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 v3.0.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v3.0.1 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 import {
   __publicField
-} from "../chunk-ZWFAOHYM.mjs";
+} from "../chunk-4AS76G4O.mjs";
 
 // src/react-ui/circle-of-fifths.tsx
 import * as React from "react";

package/dist/score/index.d.mts

@@ -1,5 +1,5 @@
-import { S as StaffPreset, a as ScoreConfiguration, O as ObjMeasure, M as MDocument, N as NoteOptions, R as RestOptions, F as Fermata, b as Navigation, C as Connective, T as TieType, c as NoteAnchor, L as Label, A as Annotation } from '../interface-CLb7xa7_.mjs';
-export { a3 as Arpeggio, X as Clef, a4 as ConnectiveSpan, D as DivRect, j as MAccidental, l as MArpeggio, u as MBarLineLeft, t as MBarLineRight, m as MBeamGroup, k as MConnective, o as MEnding, Q as MExtensionLine, p as MFermata, q as MHeader, r as MImage, s as MMeasure, w as MNoteGroup, W as MPlaybackButtons, U as MPlayer, V as MRenderer, z as MRest, E as MRhythmColumn, G as MScoreRow, J as MSignature, K as MSpecialText, H as MStaff, n as MStaffBeamGroup, x as MStaffNoteGroup, B as MStaffRest, v as MStaffTabBarLine, I as MTab, y as MTabNoteGroup, P as MText, i as MusicInterface, a5 as PlayState, a6 as PlayStateChangeListener, e as ScoreEvent, h as ScoreEventListener, d as ScoreEventType, g as ScoreObjectEvent, f as ScoreStaffPosEvent, Y as StaffConfig, a2 as Stem, a0 as StringNumber, Z as TabConfig, _ as VoiceId, a1 as getStringNumbers, $ as getVoiceIds } from '../interface-CLb7xa7_.mjs';
+import { S as StaffPreset, a as ScoreConfiguration, M as MDocument, N as NoteOptions, R as RestOptions, F as Fermata, b as Navigation, C as Connective, T as TieType, c as NoteAnchor, L as Label, A as Annotation } from '../interface-DkUnsAjj.mjs';
+export { a2 as Arpeggio, W as Clef, a3 as ConnectiveSpan, D as DivRect, j as MAccidental, l as MArpeggio, u as MBarLineLeft, t as MBarLineRight, m as MBeamGroup, k as MConnective, o as MEnding, P as MExtensionLine, p as MFermata, q as MHeader, r as MImage, s as MMeasure, w as MNoteGroup, V as MPlaybackButtons, Q as MPlayer, U as MRenderer, z as MRest, E as MRhythmColumn, G as MScoreRow, J as MSignature, K as MSpecialText, H as MStaff, n as MStaffBeamGroup, x as MStaffNoteGroup, B as MStaffRest, v as MStaffTabBarLine, I as MTab, y as MTabNoteGroup, O as MText, i as MusicInterface, a4 as PlayState, a5 as PlayStateChangeListener, e as ScoreEvent, h as ScoreEventListener, d as ScoreEventType, g as ScoreObjectEvent, f as ScoreStaffPosEvent, X as StaffConfig, a1 as Stem, $ as StringNumber, Y as TabConfig, Z as VoiceId, a0 as getStringNumbers, _ as getVoiceIds } from '../interface-DkUnsAjj.mjs';
 import { N as Note } from '../note-B5ZtlHc8.mjs';
 import { S as ScaleType, c as Scale } from '../scale-C-YS5iVG.mjs';
 import { K as KeySignature, a as TimeSignature, T as TimeSignatureString, N as NoteLength } from '../tempo-TjQKn46X.mjs';
@@ -10,7 +10,7 @@ declare class DocumentBuilder {
     constructor();
     setScoreConfiguration(staffPreset: StaffPreset): DocumentBuilder;
     setScoreConfiguration(config: ScoreConfiguration): DocumentBuilder;
-    getMeasure(): ObjMeasure;
+    private getMeasure;
     getDocument(): MDocument;
     setHeader(title?: string, composer?: string, arranger?: string): DocumentBuilder;
     setMeasuresPerRow(measuresPerRow: number): DocumentBuilder;

package/dist/score/index.d.ts

@@ -1,5 +1,5 @@
-import { S as StaffPreset, a as ScoreConfiguration, O as ObjMeasure, M as MDocument, N as NoteOptions, R as RestOptions, F as Fermata, b as Navigation, C as Connective, T as TieType, c as NoteAnchor, L as Label, A as Annotation } from '../interface-DXyXwLBB.js';
-export { a3 as Arpeggio, X as Clef, a4 as ConnectiveSpan, D as DivRect, j as MAccidental, l as MArpeggio, u as MBarLineLeft, t as MBarLineRight, m as MBeamGroup, k as MConnective, o as MEnding, Q as MExtensionLine, p as MFermata, q as MHeader, r as MImage, s as MMeasure, w as MNoteGroup, W as MPlaybackButtons, U as MPlayer, V as MRenderer, z as MRest, E as MRhythmColumn, G as MScoreRow, J as MSignature, K as MSpecialText, H as MStaff, n as MStaffBeamGroup, x as MStaffNoteGroup, B as MStaffRest, v as MStaffTabBarLine, I as MTab, y as MTabNoteGroup, P as MText, i as MusicInterface, a5 as PlayState, a6 as PlayStateChangeListener, e as ScoreEvent, h as ScoreEventListener, d as ScoreEventType, g as ScoreObjectEvent, f as ScoreStaffPosEvent, Y as StaffConfig, a2 as Stem, a0 as StringNumber, Z as TabConfig, _ as VoiceId, a1 as getStringNumbers, $ as getVoiceIds } from '../interface-DXyXwLBB.js';
+import { S as StaffPreset, a as ScoreConfiguration, M as MDocument, N as NoteOptions, R as RestOptions, F as Fermata, b as Navigation, C as Connective, T as TieType, c as NoteAnchor, L as Label, A as Annotation } from '../interface-1TQHxSpb.js';
+export { a2 as Arpeggio, W as Clef, a3 as ConnectiveSpan, D as DivRect, j as MAccidental, l as MArpeggio, u as MBarLineLeft, t as MBarLineRight, m as MBeamGroup, k as MConnective, o as MEnding, P as MExtensionLine, p as MFermata, q as MHeader, r as MImage, s as MMeasure, w as MNoteGroup, V as MPlaybackButtons, Q as MPlayer, U as MRenderer, z as MRest, E as MRhythmColumn, G as MScoreRow, J as MSignature, K as MSpecialText, H as MStaff, n as MStaffBeamGroup, x as MStaffNoteGroup, B as MStaffRest, v as MStaffTabBarLine, I as MTab, y as MTabNoteGroup, O as MText, i as MusicInterface, a4 as PlayState, a5 as PlayStateChangeListener, e as ScoreEvent, h as ScoreEventListener, d as ScoreEventType, g as ScoreObjectEvent, f as ScoreStaffPosEvent, X as StaffConfig, a1 as Stem, $ as StringNumber, Y as TabConfig, Z as VoiceId, a0 as getStringNumbers, _ as getVoiceIds } from '../interface-1TQHxSpb.js';
 import { N as Note } from '../note-B5ZtlHc8.js';
 import { S as ScaleType, c as Scale } from '../scale-B_2MZaT9.js';
 import { K as KeySignature, a as TimeSignature, T as TimeSignatureString, N as NoteLength } from '../tempo-DoJd-UYT.js';
@@ -10,7 +10,7 @@ declare class DocumentBuilder {
     constructor();
     setScoreConfiguration(staffPreset: StaffPreset): DocumentBuilder;
     setScoreConfiguration(config: ScoreConfiguration): DocumentBuilder;
-    getMeasure(): ObjMeasure;
+    private getMeasure;
     getDocument(): MDocument;
     setHeader(title?: string, composer?: string, arranger?: string): DocumentBuilder;
     setMeasuresPerRow(measuresPerRow: number): DocumentBuilder;

package/dist/score/index.js

@@ -1,4 +1,4 @@
-/* WebMusicScore v3.0.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v3.0.1 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -1790,14 +1790,16 @@ var Audio = __toESM(require("@tspro/web-music-score/audio"));
 var import_theory7 = require("@tspro/web-music-score/theory");
 
 // src/score/engine/obj-arpeggio.ts
-var _ObjArpeggio = class _ObjArpeggio extends MusicObject {
-  constructor(col, arpeggioDir) {
+var ObjArpeggio = class extends MusicObject {
+  constructor(col, line, arpeggioDir) {
     super(col);
     this.col = col;
+    this.line = line;
     this.arpeggioDir = arpeggioDir;
     __publicField(this, "topArrowHeight", 0);
     __publicField(this, "bottomArrowHeight", 0);
     __publicField(this, "cycleHeight", 0);
+    __publicField(this, "numCycles", 0);
     __publicField(this, "color", "black");
     __publicField(this, "mi");
     this.mi = new MArpeggio(this);
@@ -1812,10 +1814,13 @@ var _ObjArpeggio = class _ObjArpeggio extends MusicObject {
     let { unitSize } = renderer;
     this.topArrowHeight = this.arpeggioDir === 0 /* Up */ ? unitSize : 0;
     this.bottomArrowHeight = this.arpeggioDir === 1 /* Down */ ? unitSize : 0;
+    let top = this.line instanceof ObjStaff ? this.line.getTopLineY() : this.line.getTopStringY();
+    let bottom = this.line instanceof ObjStaff ? this.line.getBottomLineY() : this.line.getBottomStringY();
     this.cycleHeight = unitSize * 2;
+    this.numCycles = Math.ceil((bottom - top) / this.cycleHeight) + 2;
     let width = unitSize * 2;
-    let height = _ObjArpeggio.NumCycles * this.cycleHeight + this.topArrowHeight + this.bottomArrowHeight;
-    this.rect = new DivRect(-width / 2, width / 2, -height / 2, height / 2);
+    let height = this.numCycles * this.cycleHeight;
+    this.rect = new DivRect(-width / 2, width / 2, -height / 2 - this.topArrowHeight, height / 2 + this.bottomArrowHeight);
   }
   offset(dx, dy) {
     this.rect.offsetInPlace(dx, dy);
@@ -1825,14 +1830,13 @@ var _ObjArpeggio = class _ObjArpeggio extends MusicObject {
     if (!ctx) {
       return;
     }
-    let { lineWidth, unitSize } = renderer;
+    let { lineWidth } = renderer;
     let { rect, topArrowHeight, bottomArrowHeight } = this;
     renderer.drawDebugRect(this.rect);
     ctx.strokeStyle = ctx.fillStyle = this.color;
     ctx.lineWidth = lineWidth * 2;
     ctx.beginPath();
-    for (let i = 0; i < _ObjArpeggio.NumCycles; i++) {
-      let y = rect.top + topArrowHeight + i * this.cycleHeight;
+    for (let i = 0, y = rect.top + topArrowHeight; i < this.numCycles; i++, y += this.cycleHeight) {
       ctx.moveTo(rect.centerX, y);
       ctx.quadraticCurveTo(rect.left, y + this.cycleHeight / 4, rect.centerX, y + this.cycleHeight / 2);
       ctx.quadraticCurveTo(rect.right, y + this.cycleHeight * 3 / 4, rect.centerX, y + this.cycleHeight);
@@ -1841,21 +1845,19 @@ var _ObjArpeggio = class _ObjArpeggio extends MusicObject {
     if (topArrowHeight > 0) {
       ctx.beginPath();
       ctx.moveTo(rect.centerX, rect.top);
-      ctx.lineTo(rect.right, rect.top + unitSize);
-      ctx.lineTo(rect.left, rect.top + unitSize);
+      ctx.lineTo(rect.right, rect.top + topArrowHeight);
+      ctx.lineTo(rect.left, rect.top + topArrowHeight);
       ctx.fill();
     }
     if (bottomArrowHeight > 0) {
       ctx.beginPath();
       ctx.moveTo(rect.centerX, rect.bottom);
-      ctx.lineTo(rect.left, rect.bottom - unitSize);
-      ctx.lineTo(rect.right, rect.bottom - unitSize);
+      ctx.lineTo(rect.left, rect.bottom - bottomArrowHeight);
+      ctx.lineTo(rect.right, rect.bottom - bottomArrowHeight);
       ctx.fill();
     }
   }
 };
-__publicField(_ObjArpeggio, "NumCycles", 5);
-var ObjArpeggio = _ObjArpeggio;
 
 // src/score/engine/obj-rest.ts
 var import_theory4 = require("@tspro/web-music-score/theory");
@@ -3510,12 +3512,12 @@ var ObjRhythmColumn = class extends MusicObject {
     });
     if (this.arpeggioDir !== void 0) {
       let arpeggioWidth = 0;
-      this.arpeggios = row.getStaves().map((staff) => {
-        let arpeggio = new ObjArpeggio(this, this.getArpeggioDir());
+      this.arpeggios = row.getNotationLines().map((line) => {
+        let arpeggio = new ObjArpeggio(this, line, this.getArpeggioDir());
         arpeggio.layout(renderer);
-        arpeggio.offset(-leftw - arpeggio.getRect().right, staff.getMiddleLineY() - arpeggio.getRect().centerY);
+        arpeggio.offset(-leftw - arpeggio.getRect().right, line.getRect().centerY - arpeggio.getRect().centerY);
         arpeggioWidth = Math.max(arpeggioWidth, arpeggio.getRect().width);
-        staff.addObject(arpeggio);
+        line.addObject(arpeggio);
         return arpeggio;
       });
       leftw += arpeggioWidth;

package/dist/score/index.mjs

@@ -1,7 +1,7 @@
-/* WebMusicScore v3.0.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v3.0.1 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 import {
   __publicField
-} from "../chunk-ZWFAOHYM.mjs";
+} from "../chunk-4AS76G4O.mjs";
 
 // src/score/pub/div-rect.ts
 import { Utils } from "@tspro/ts-utils-lib";
@@ -1707,14 +1707,16 @@ import * as Audio from "@tspro/web-music-score/audio";
 import { Note as Note6, NoteLength as NoteLength4 } from "@tspro/web-music-score/theory";
 
 // src/score/engine/obj-arpeggio.ts
-var _ObjArpeggio = class _ObjArpeggio extends MusicObject {
-  constructor(col, arpeggioDir) {
+var ObjArpeggio = class extends MusicObject {
+  constructor(col, line, arpeggioDir) {
     super(col);
     this.col = col;
+    this.line = line;
     this.arpeggioDir = arpeggioDir;
     __publicField(this, "topArrowHeight", 0);
     __publicField(this, "bottomArrowHeight", 0);
     __publicField(this, "cycleHeight", 0);
+    __publicField(this, "numCycles", 0);
     __publicField(this, "color", "black");
     __publicField(this, "mi");
     this.mi = new MArpeggio(this);
@@ -1729,10 +1731,13 @@ var _ObjArpeggio = class _ObjArpeggio extends MusicObject {
     let { unitSize } = renderer;
     this.topArrowHeight = this.arpeggioDir === 0 /* Up */ ? unitSize : 0;
     this.bottomArrowHeight = this.arpeggioDir === 1 /* Down */ ? unitSize : 0;
+    let top = this.line instanceof ObjStaff ? this.line.getTopLineY() : this.line.getTopStringY();
+    let bottom = this.line instanceof ObjStaff ? this.line.getBottomLineY() : this.line.getBottomStringY();
     this.cycleHeight = unitSize * 2;
+    this.numCycles = Math.ceil((bottom - top) / this.cycleHeight) + 2;
     let width = unitSize * 2;
-    let height = _ObjArpeggio.NumCycles * this.cycleHeight + this.topArrowHeight + this.bottomArrowHeight;
-    this.rect = new DivRect(-width / 2, width / 2, -height / 2, height / 2);
+    let height = this.numCycles * this.cycleHeight;
+    this.rect = new DivRect(-width / 2, width / 2, -height / 2 - this.topArrowHeight, height / 2 + this.bottomArrowHeight);
   }
   offset(dx, dy) {
     this.rect.offsetInPlace(dx, dy);
@@ -1742,14 +1747,13 @@ var _ObjArpeggio = class _ObjArpeggio extends MusicObject {
     if (!ctx) {
       return;
     }
-    let { lineWidth, unitSize } = renderer;
+    let { lineWidth } = renderer;
     let { rect, topArrowHeight, bottomArrowHeight } = this;
     renderer.drawDebugRect(this.rect);
     ctx.strokeStyle = ctx.fillStyle = this.color;
     ctx.lineWidth = lineWidth * 2;
     ctx.beginPath();
-    for (let i = 0; i < _ObjArpeggio.NumCycles; i++) {
-      let y = rect.top + topArrowHeight + i * this.cycleHeight;
+    for (let i = 0, y = rect.top + topArrowHeight; i < this.numCycles; i++, y += this.cycleHeight) {
       ctx.moveTo(rect.centerX, y);
       ctx.quadraticCurveTo(rect.left, y + this.cycleHeight / 4, rect.centerX, y + this.cycleHeight / 2);
       ctx.quadraticCurveTo(rect.right, y + this.cycleHeight * 3 / 4, rect.centerX, y + this.cycleHeight);
@@ -1758,21 +1762,19 @@ var _ObjArpeggio = class _ObjArpeggio extends MusicObject {
     if (topArrowHeight > 0) {
       ctx.beginPath();
       ctx.moveTo(rect.centerX, rect.top);
-      ctx.lineTo(rect.right, rect.top + unitSize);
-      ctx.lineTo(rect.left, rect.top + unitSize);
+      ctx.lineTo(rect.right, rect.top + topArrowHeight);
+      ctx.lineTo(rect.left, rect.top + topArrowHeight);
       ctx.fill();
     }
     if (bottomArrowHeight > 0) {
       ctx.beginPath();
       ctx.moveTo(rect.centerX, rect.bottom);
-      ctx.lineTo(rect.left, rect.bottom - unitSize);
-      ctx.lineTo(rect.right, rect.bottom - unitSize);
+      ctx.lineTo(rect.left, rect.bottom - bottomArrowHeight);
+      ctx.lineTo(rect.right, rect.bottom - bottomArrowHeight);
       ctx.fill();
     }
   }
 };
-__publicField(_ObjArpeggio, "NumCycles", 5);
-var ObjArpeggio = _ObjArpeggio;
 
 // src/score/engine/obj-rest.ts
 import { Note as Note4, NoteLength, RhythmProps } from "@tspro/web-music-score/theory";
@@ -3427,12 +3429,12 @@ var ObjRhythmColumn = class extends MusicObject {
     });
     if (this.arpeggioDir !== void 0) {
       let arpeggioWidth = 0;
-      this.arpeggios = row.getStaves().map((staff) => {
-        let arpeggio = new ObjArpeggio(this, this.getArpeggioDir());
+      this.arpeggios = row.getNotationLines().map((line) => {
+        let arpeggio = new ObjArpeggio(this, line, this.getArpeggioDir());
         arpeggio.layout(renderer);
-        arpeggio.offset(-leftw - arpeggio.getRect().right, staff.getMiddleLineY() - arpeggio.getRect().centerY);
+        arpeggio.offset(-leftw - arpeggio.getRect().right, line.getRect().centerY - arpeggio.getRect().centerY);
         arpeggioWidth = Math.max(arpeggioWidth, arpeggio.getRect().width);
-        staff.addObject(arpeggio);
+        line.addObject(arpeggio);
         return arpeggio;
       });
       leftw += arpeggioWidth;

package/dist/theory/index.js

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

package/dist/theory/index.mjs

@@ -1,7 +1,7 @@
-/* WebMusicScore v3.0.0 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
+/* WebMusicScore v3.0.1 | (c) 2023 PahkaSoft | MIT License | Includes: Tone.js (MIT License) */
 import {
   __publicField
-} from "../chunk-ZWFAOHYM.mjs";
+} from "../chunk-4AS76G4O.mjs";
 
 // src/theory/chord.ts
 import { Utils as Utils6 } from "@tspro/ts-utils-lib";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@tspro/web-music-score",
-    "version": "3.0.0",
+    "version": "3.0.1",
     "author": "PahkaSoft",
     "license": "MIT",
     "private": false,