@tspro/web-music-score 5.2.0 → 5.4.0

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

@@ -1,207 +1,6 @@
-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';
-
-/**
- * DivRect class, left, top, right, bottom rectangle divided into four sections by centerX, centerY.
- */
-declare class DivRect {
-    left: number;
-    centerX: number;
-    right: number;
-    top: number;
-    centerY: number;
-    bottom: number;
-    /**
-     * Create rectangle with all zero values.
-     */
-    constructor();
-    /**
-     * Create rectangle with left, right, top, bottom.
-     * Properties centerX and centerY will be centered in the middle.
-     *
-     * @param left - Left coordinate.
-     * @param right - Right coordinate.
-     * @param top - Top coordinate.
-     * @param bottom - Bottom coordinate.
-     */
-    constructor(left: number, right: number, top: number, bottom: number);
-    /**
-     * Create rectangle with full arguments.
-     *
-     * @param left - Left coordinate.
-     * @param centerX - Center x-coordinate.
-     * @param right - Right coordinate.
-     * @param top - Top coordinate.
-     * @param centerY - Center y-coordinate.
-     * @param bottom - Bottom coordinate.
-     */
-    constructor(left: number, centerX: number, right: number, top: number, centerY: number, bottom: number);
-    /**
-     * Create rect from basic left, top, width and height arguments.
-     *
-     * @param left - Left coordinate.
-     * @param top - Top coordinate.
-     * @param width - With.
-     * @param height - Height.
-     * @returns - DivRect.
-     */
-    static create(left: number, top: number, width: number, height: number): DivRect;
-    /**
-     * Create rect from centerX, centerY, width, height arguments.
-     *
-     * @param centerX - Center x-coordinate.
-     * @param centerY - Center y-coordinate.
-     * @param width - Width.
-     * @param height - Height.
-     * @returns - DivRect.
-     */
-    static createCentered(centerX: number, centerY: number, width: number, height: number): DivRect;
-    /**
-     * Create rect from sections.
-     *
-     * @param leftw - Left section width.
-     * @param rightw - Right section width.
-     * @param toph - Top section height.
-     * @param bottomh - Bottomsection height.
-     * @returns - DivRect.
-     */
-    static createSections(leftw: number, rightw: number, toph: number, bottomh: number): DivRect;
-    /**
-     * Width getter.
-     */
-    get width(): number;
-    /**
-     * Height getter.
-     */
-    get height(): number;
-    /**
-     * Left section width getter.
-     */
-    get leftw(): number;
-    /**
-     * Right section width getter.
-     */
-    get rightw(): number;
-    /**
-     * Top section height getter.
-     */
-    get toph(): number;
-    /**
-     * Bottom section height getter.
-     */
-    get bottomh(): number;
-    /**
-     * Does this Rect contain given (x, y)-point?
-     *
-     * @param x - X-coordinate.
-     * @param y - Y-coordinate.
-     * @returns - True/false.
-     */
-    contains(x: number, y: number): boolean;
-    /**
-     * Do a and b rects overlap?
-     *
-     * @param a - DivRect a.
-     * @param b - DivRect b.
-     * @returns - True/false.
-     */
-    static overlap(a: DivRect, b: DivRect): boolean;
-    /**
-     * Do horizontal measures of a and b rects overlap?
-     *
-     * @param a - DivRect a.
-     * @param b - DivRect b.
-     * @returns - True/false.
-     */
-    static overlapX(a: DivRect, b: DivRect): boolean;
-    /**
-     * Check if this Rect equals with given Rect.
-     * @param a - DivRect a.
-     * @param b - DivRect b.
-     * @returns - True/false.
-     */
-    static equals(a: DivRect | null | undefined, b: DivRect | null | undefined): boolean;
-    /**
-     * Check if frame of this Rect equals with given Rect, ignoring center x- and center y-coordinates.
-     *
-     * @param a - DivRect a.
-     * @param b - DivRect b.
-     * @returns - True/false.
-     */
-    static equalsFrame(a: DivRect | null | undefined, b: DivRect | null | undefined): boolean;
-    /**
-     * Created duplicate of this Rect.
-     *
-     * @returns - Duplicate.
-     */
-    copy(): DivRect;
-    /**
-     * Move this rect by (dx, dy). Modifies this Rect.
-     *
-     * @param dx - Offset amount in x-direction.
-     * @param dy - Offset amount in y-direction.
-     * @returns - This DivRect instance.
-     */
-    offsetInPlace(dx: number, dy: number): DivRect;
-    /**
-     * Move this rect by (dx, dy). Immutable, returns modified copy.
-     *
-     * @param dx - Offset amount in x-direction.
-     * @param dy - Offset amount in y-direction.
-     * @returns - DivRect copy with applied offset.
-     */
-    offsetCopy(dx: number, dy: number): DivRect;
-    /**
-     * Expand this Rect by given Rect. Modifies this Rect.
-     *
-     * @param rect - DivRect to expand this instance with.
-     * @returns - This DivRect instance.
-     */
-    expandInPlace(rect: DivRect): DivRect;
-    /**
-     * Expand this Rect by given Rect. Immutable, returns modified copy.
-     *
-     * @param rect - DivRect to expand this instance with.
-     * @returns - Expanded copy of this DivRect.
-     */
-    expandCopy(rect: DivRect): DivRect;
-    /**
-     * Clip this Rect by given Rect. Mmodifies this Rect.
-     *
-     * @param clipRect - DivRect to clip this instance with.
-     * @returns - This DivRect instance.
-     */
-    clipInPlace(clipRect: DivRect): DivRect;
-    /**
-     * Clip this Rect by given Rect. Immutable, return modified copy.
-     *
-     * @param clipRect - DivRecto to clip this instance with.
-     * @returns - Clipped DivRect copy.
-     */
-    clipCopy(clipRect: DivRect): DivRect;
-    /**
-     * Scale Rect. Anchor pos is (centerX, centerY). Modifies this 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: number, scaleY?: number): DivRect;
-    /**
-     * Scale Rect. Anchor pos is (centerX, centerY). Immutable, returns modified copy.
-     *
-     * @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: number, scaleY?: number): DivRect;
-    /**
-     * Get this DivRect instance.
-     * @returns - This DivRect instance.
-     */
-    getRect(): DivRect;
-}
+import { N as Note, A as Accidental } from './note-CJuq5aBy.js';
+import { R as RhythmProps, N as NoteLength, i as NoteLengthStr, l as TupletRatio, d as Tempo, K as KeySignature, b as TimeSignature } from './tempo-BnUjm25M.js';
+import { AnchoredRect, Rect, Vec } from '@tspro/ts-utils-lib';
 
 /** Staff preset values for score configuration. */
 declare enum StaffPreset {
@@ -229,8 +28,12 @@ declare enum Clef {
 type BaseConfig = {
     /** Name for this staff/tab config. */
     name?: string;
-    /** Voice ids that are presented in this staff/tab. */
-    voiceIds?: number[];
+    /** Voice id that is presented in this staff/tab. Single value or array.*/
+    voiceId?: VoiceId | VoiceId[];
+    /** @deprecated - Use `voiceId` instead. */
+    voiceIds?: VoiceId | VoiceId[];
+    /** Staves/tabs with same instrument name a re grouped together with left brace. */
+    instrument?: string;
 };
 /** Staff config to add staff notation line in score configuration. */
 type StaffConfig = BaseConfig & {
@@ -265,14 +68,20 @@ type ScoreConfiguration = StaffConfig | TabConfig | (StaffConfig | TabConfig)[];
 type VoiceId = 0 | 1 | 2 | 3;
 /** Get supported voice ids. Returns [0, 1, 2, 3]. */
 declare function getVoiceIds(): ReadonlyArray<VoiceId>;
+declare function isVoiceId(voiceId: unknown): voiceId is VoiceId;
+declare function validateVoiceId(voiceId: unknown): VoiceId;
 /** Strng number. */
 type StringNumber = 1 | 2 | 3 | 4 | 5 | 6;
 /** Get string numbers. Returns [0, 1, 2, 3, 4, 5]. */
 declare function getStringNumbers(): ReadonlyArray<StringNumber>;
+declare function isStringNumber(stringNum: unknown): stringNum is VerseNumber;
+declare function validateStringNumber(stringNum: unknown): VerseNumber;
 /** Verse number. */
 type VerseNumber = 1 | 2 | 3;
 /** Get supported verse numbers. Returns [1, 2, 3]. */
 declare function getVerseNumbers(): ReadonlyArray<VerseNumber>;
+declare function isVerseNumber(verse: unknown): verse is VerseNumber;
+declare function validateVerseNumber(verseNum: unknown): VerseNumber;
 /** Stem direction enum. */
 declare enum Stem {
     /** Auto stem direction. */
@@ -333,6 +142,11 @@ declare enum VerticalPosition {
 type StaffTabOrGroup = number | string;
 /** Staff/tab/group snglevalue or array of values. */
 type StaffTabOrGroups = StaffTabOrGroup | StaffTabOrGroup[];
+/** Measure options. */
+type MeasureOptions = {
+    /** show measure number? */
+    showNumber?: boolean;
+};
 /** Options for notes/chords. */
 type NoteOptions = {
     /** Stem direction. */
@@ -513,9 +327,9 @@ declare class ObjAccidental extends MusicObject {
     constructor(parent: MusicObject, diatonicId: number, accidental: Accidental, color?: string);
     getMusicInterface(): MAccidental;
     pick(x: number, y: number): MusicObject[];
-    layout(renderer: Renderer): void;
+    layout(ctx: RenderContext): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 
 type BoxType = "square" | "rectangle" | "circle" | "ellipse";
@@ -551,40 +365,42 @@ declare class ObjText extends MusicObject {
     updateAnchorX(anchorX: number): void;
     updateAnchorY(anchorY: number): void;
     pick(x: number, y: number): MusicObject[];
-    layout(renderer: Renderer): void;
+    layout(ctx: RenderContext): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 
 type NotationLineObject = {
-    getRect: () => DivRect;
+    getRect: () => AnchoredRect;
     offset?: (dx: number, dy: number) => void;
     offsetInPlace?: (dx: number, dy: number) => void;
 };
 declare abstract class ObjNotationLine extends MusicObject {
+    readonly row: ObjScoreRow;
     protected readonly objects: NotationLineObject[];
     abstract readonly id: number;
     abstract readonly name: string;
     private layoutGroups;
-    constructor(parent: MusicObject);
+    constructor(row: ObjScoreRow);
     addObject(o: NotationLineObject): void;
     removeObjects(): void;
     getLayoutGroup(lauoutGroupId: LayoutGroupId): LayoutGroup;
-    resetLayoutGroups(renderer: Renderer): void;
-    layoutLayoutGroups(renderer: Renderer): void;
+    resetLayoutGroups(ctx: RenderContext): void;
+    layoutLayoutGroups(ctx: RenderContext): void;
     private setObjectY;
     private alignObjectsY;
-    layoutLayoutGroup(renderer: Renderer, layoutGroup: LayoutGroup, verticalPos: VerticalPos): void;
+    layoutLayoutGroup(ctx: RenderContext, layoutGroup: LayoutGroup, verticalPos: VerticalPos): void;
+    abstract getConfig(): StaffConfig | TabConfig;
     abstract calcTop(): number;
     abstract calcBottom(): number;
     abstract getTopLineY(): number;
     abstract getBottomLineY(): number;
     abstract containsVoiceId(voiceId: number): boolean;
     abstract containsDiatonicId(diatonicId: number): boolean;
-    abstract layoutWidth(renderer: Renderer): void;
-    abstract layoutHeight(renderer: Renderer): void;
+    abstract layoutWidth(ctx: RenderContext): void;
+    abstract layoutHeight(ctx: RenderContext): void;
     abstract offset(dx: number, dy: number): void;
-    abstract draw(renderer: Renderer): void;
+    abstract draw(ctx: RenderContext): void;
 }
 declare class ObjStaff extends ObjNotationLine {
     readonly row: ObjScoreRow;
@@ -605,6 +421,7 @@ declare class ObjStaff extends ObjNotationLine {
     getMusicInterface(): MStaff;
     get isOctaveDown(): boolean;
     get name(): string;
+    getConfig(): StaffConfig | TabConfig;
     getTopLineY(): number;
     getMiddleLineY(): number;
     getBottomLineY(): number;
@@ -617,14 +434,14 @@ declare class ObjStaff extends ObjNotationLine {
     getDiatonicIdAt(y: number): number | undefined;
     isLine(diatonicId: number): boolean;
     isSpace(diatonicId: number): boolean;
-    containsVoiceId(voiceId: number): boolean;
+    containsVoiceId(voiceId: VoiceId): boolean;
     calcTop(): number;
     calcBottom(): number;
     pick(x: number, y: number): MusicObject[];
-    layoutHeight(renderer: Renderer): void;
-    layoutWidth(renderer: Renderer): void;
+    layoutHeight(ctx: RenderContext): void;
+    layoutWidth(ctx: RenderContext): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 declare class ObjTab extends ObjNotationLine {
     readonly row: ObjScoreRow;
@@ -638,6 +455,7 @@ declare class ObjTab extends ObjNotationLine {
     constructor(row: ObjScoreRow, tabConfig: TabConfig, id: number);
     getMusicInterface(): MTab;
     get name(): string;
+    getConfig(): StaffConfig | TabConfig;
     getTuningName(): string | undefined;
     getTuningStrings(): ReadonlyArray<Note>;
     /** Return Y coordinate of string. */
@@ -648,26 +466,26 @@ declare class ObjTab extends ObjNotationLine {
     getBottomLineY(): number;
     getTop(): number;
     getBottom(): number;
-    containsVoiceId(voiceId: number): boolean;
+    containsVoiceId(voiceId: VoiceId): boolean;
     containsDiatonicId(diatonicId: number): boolean;
     calcTop(): number;
     calcBottom(): number;
     pick(x: number, y: number): MusicObject[];
-    layoutHeight(renderer: Renderer): void;
-    layoutWidth(renderer: Renderer): void;
+    layoutHeight(ctx: RenderContext): void;
+    layoutWidth(ctx: RenderContext): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 
 declare class ObjStaffNoteGroup extends MusicObject {
     readonly staff: ObjStaff;
     readonly noteGroup: ObjNoteGroup;
-    noteHeadRects: DivRect[];
-    dotRects: DivRect[];
+    noteHeadRects: AnchoredRect[];
+    dotRects: AnchoredRect[];
     accidentals: ObjAccidental[];
-    stemTip?: DivRect;
-    stemBase?: DivRect;
-    flagRects: DivRect[];
+    stemTip?: AnchoredRect;
+    stemBase?: AnchoredRect;
+    flagRects: AnchoredRect[];
     private prevTopNoteY;
     private prevBottomNoteY;
     readonly mi: MStaffNoteGroup;
@@ -675,7 +493,7 @@ declare class ObjStaffNoteGroup extends MusicObject {
     getMusicInterface(): MusicInterface;
     pick(x: number, y: number): MusicObject[];
     updateRect(): void;
-    getRect(): DivRect;
+    getRect(): AnchoredRect;
     offset(dx: number, dy: number): void;
 }
 declare class ObjTabNoteGroup extends MusicObject {
@@ -693,11 +511,12 @@ declare class ObjNoteGroup extends MusicObject {
     readonly col: ObjRhythmColumn;
     readonly voiceId: VoiceId;
     readonly notes: ReadonlyArray<Note>;
-    readonly minDiatonicId: number;
-    readonly maxDiatonicId: number;
-    readonly ownDiatonicId: number;
-    readonly ownStemDir: Stem.Up | Stem.Down;
-    readonly ownString: StringNumber[];
+    readonly options?: NoteOptions | undefined;
+    readonly setDiatonicId: number;
+    readonly setStringsNumbers?: StringNumber[];
+    private runningDiatonicId;
+    private runningStemDir;
+    private runningStringNumbers;
     readonly color: string;
     readonly staccato: boolean;
     readonly diamond: boolean;
@@ -711,16 +530,21 @@ declare class ObjNoteGroup extends MusicObject {
     private beamGroup?;
     private readonly staffObjects;
     private readonly tabObjects;
+    private isNoteDisplaced;
     readonly mi: MNoteGroup;
-    constructor(col: ObjRhythmColumn, voiceId: VoiceId, notes: ReadonlyArray<Note>, noteLength: NoteLength | NoteLengthStr, options?: NoteOptions, tupletRatio?: TupletRatio);
+    constructor(col: ObjRhythmColumn, voiceId: VoiceId, notes: ReadonlyArray<Note>, noteLength: NoteLength | NoteLengthStr, options?: NoteOptions | undefined, tupletRatio?: TupletRatio);
     getMusicInterface(): MNoteGroup;
     get doc(): ObjDocument;
     get measure(): ObjMeasure;
     get row(): ObjScoreRow;
+    get minDiatonicId(): number;
+    get maxDiatonicId(): number;
+    getDiatonicId(staff?: ObjStaff): number;
     get stemDir(): Stem.Up | Stem.Down;
+    setNoteDisplacement(note: Note, isDisplaced: boolean): void;
     enableConnective(line: ObjNotationLine): boolean;
     startConnective(connectiveProps: ConnectiveProps): void;
-    getStaticObjects(line: ObjNotationLine): ReadonlyArray<MusicObject>;
+    updateRunningArguments(diatonicId: number, stemDir: Stem.Up | Stem.Down, stringNumbers: StringNumber[]): void;
     pick(x: number, y: number): MusicObject[];
     getTopNote(): Note;
     getBottomNote(): Note;
@@ -728,8 +552,8 @@ declare class ObjNoteGroup extends MusicObject {
         x: number;
         y: number;
     };
-    getFretNumberString(noteIndex: number): number | undefined;
-    getFretNumber(tabObj: ObjTabNoteGroup, noteIndex: number): number | undefined;
+    getFretNumberString(noteIndex: number): StringNumber | undefined;
+    getFretNumber(tab: ObjTab, noteIndex: number): number | undefined;
     private getNextNoteGroup;
     collectConnectiveProps(): void;
     removeConnectiveProps(): void;
@@ -743,7 +567,7 @@ declare class ObjNoteGroup extends MusicObject {
         y: number;
         stemHeight: number;
     } | undefined)[];
-    getStemHeight(renderer: Renderer): number;
+    getStemHeight(ctx: RenderContext): number;
     hasBeamCount(): boolean;
     getLeftBeamCount(): number;
     getRightBeamCount(): number;
@@ -754,12 +578,12 @@ declare class ObjNoteGroup extends MusicObject {
     visibleInStaff(staff: ObjStaff): boolean;
     getPlayTicks(note: Note): number;
     updateAccidentalState(accState: AccidentalState): void;
-    layout(renderer: Renderer, accState: AccidentalState): void;
+    layout(ctx: RenderContext, accState: AccidentalState): void;
     updateRect(): void;
     setStemTipY(staff: ObjStaff, stemTipY: number): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
-    getDotVerticalDisplacement(staff: ObjStaff, diatonicId: number, stemDir: Stem): 1 | 0 | -1;
+    draw(ctx: RenderContext): void;
+    getDotVerticalDisplacement(staff: ObjStaff, diatonicId: number, stemDir: Stem): 0 | 1 | -1;
     static hasSameNotes(ng1: ObjNoteGroup, ng2: ObjNoteGroup): boolean;
 }
 
@@ -778,7 +602,7 @@ declare class BeamPoint {
     bottomBeamsHeight: number;
     constructor(staff: ObjStaff, beamGroup: ObjBeamGroup, symbol: RhythmSymbol, x: number, y: number);
     offset(dx: number, dy: number): void;
-    getRect(): DivRect;
+    getRect(): AnchoredRect;
 }
 declare class ObjStaffBeamGroup extends MusicObject {
     readonly staff: ObjStaff;
@@ -800,6 +624,7 @@ declare class ObjBeamGroup extends MusicObject {
     private readonly type;
     private readonly staffObjects;
     private constructor();
+    get stemDir(): Stem.Up | Stem.Down;
     private get showTupletRatio();
     static createBeam(noteGroups: ObjNoteGroup[]): boolean;
     static createOldStyleTriplet(symbols: RhythmSymbol[]): number;
@@ -814,13 +639,12 @@ declare class ObjBeamGroup extends MusicObject {
     getSymbols(): ReadonlyArray<RhythmSymbol>;
     getFirstSymbol(): RhythmSymbol | undefined;
     getLastSymbol(): RhythmSymbol | undefined;
-    get stemDir(): Stem.Up | Stem.Down;
     get color(): string;
-    layout(renderer: Renderer): void;
+    layout(ctx: RenderContext): void;
     updateRect(): void;
     updateStemTips(): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
     private setBeamCounts;
     private setTupletBeamCounts;
 }
@@ -828,8 +652,8 @@ declare class ObjBeamGroup extends MusicObject {
 declare class ObjStaffRest extends MusicObject {
     readonly staff: ObjStaff;
     readonly rest: ObjRest;
-    restRect: DivRect;
-    dotRects: DivRect[];
+    restRect: AnchoredRect;
+    dotRects: AnchoredRect[];
     readonly mi: MStaffRest;
     constructor(staff: ObjStaff, rest: ObjRest);
     getMusicInterface(): MusicInterface;
@@ -840,22 +664,27 @@ declare class ObjStaffRest extends MusicObject {
 declare class ObjRest extends MusicObject {
     readonly col: ObjRhythmColumn;
     readonly voiceId: VoiceId;
-    readonly ownStemDir: Stem.Up | Stem.Down;
-    readonly ownDiatonicId: number;
+    readonly options?: RestOptions | undefined;
     readonly color: string;
     readonly hide: boolean;
     readonly oldStyleTriplet: boolean;
     readonly rhythmProps: RhythmProps;
+    static UndefinedDiatonicId: number;
+    readonly setDiatonicId: number;
+    private runningDiatonicId;
+    private runningStemDir;
     private beamGroup?;
     readonly staffObjects: ObjStaffRest[];
     readonly mi: MRest;
-    constructor(col: ObjRhythmColumn, voiceId: VoiceId, noteLength: NoteLength | NoteLengthStr, options?: RestOptions, tupletRatio?: TupletRatio);
+    constructor(col: ObjRhythmColumn, voiceId: VoiceId, noteLength: NoteLength | NoteLengthStr, options?: RestOptions | undefined, tupletRatio?: TupletRatio);
     getMusicInterface(): MRest;
     get doc(): ObjDocument;
     get measure(): ObjMeasure;
     get row(): ObjScoreRow;
     get noteLength(): NoteLength;
+    getDiatonicId(staff?: ObjStaff): number;
     get stemDir(): Stem.Up | Stem.Down;
+    updateRunningArguments(diatonicId: number, stemDir: Stem.Up | Stem.Down, stringNumbers: StringNumber[]): void;
     getStaticObjects(line: ObjNotationLine): ReadonlyArray<MusicObject>;
     pick(x: number, y: number): MusicObject[];
     getBeamGroup(): ObjBeamGroup | undefined;
@@ -872,38 +701,32 @@ declare class ObjRest extends MusicObject {
     visibleInStaff(staff: ObjStaff): boolean;
     private getRestDotVerticalDisplacement;
     updateAccidentalState(accState: AccidentalState): void;
-    layout(renderer: Renderer, accState: AccidentalState): void;
+    layout(ctx: RenderContext, accState: AccidentalState): void;
     updateRect(): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 
-declare class LyricsContainer {
-    readonly col: ObjRhythmColumn;
-    readonly lyricsObjects: ObjLyrics[];
-    readonly rhythmProps: RhythmProps;
-    constructor(col: ObjRhythmColumn, lyricsLength: NoteLength);
-    addLyricsObject(lyricsObj: ObjLyrics): void;
-}
 declare class ObjLyrics extends MusicObject {
     readonly col: ObjRhythmColumn;
     readonly verse: VerseNumber;
     readonly line: ObjNotationLine;
     readonly vpos: VerticalPos;
     private nextLyricsObject?;
+    readonly rhythmProps: RhythmProps;
     private readonly color;
     private readonly hyphen?;
     private readonly text;
     readonly mi: MLyrics;
-    constructor(col: ObjRhythmColumn, verse: VerseNumber, line: ObjNotationLine, vpos: VerticalPos, lyricsText: string, lyricsOptions?: LyricsOptions);
+    constructor(col: ObjRhythmColumn, verse: VerseNumber, line: ObjNotationLine, vpos: VerticalPos, lyricsLength: NoteLength, lyricsText: string, lyricsOptions?: LyricsOptions);
     getMusicInterface(): MLyrics;
     get measure(): ObjMeasure;
     getText(): string;
     setNextLyricsObject(lyricsObj: ObjLyrics): void;
     pick(x: number, y: number): MusicObject[];
-    layout(renderer: Renderer): void;
+    layout(ctx: RenderContext): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 
 type ScorePlayerNote = {
@@ -917,14 +740,13 @@ declare class ObjRhythmColumn extends MusicObject {
     readonly measure: ObjMeasure;
     readonly positionTicks: number;
     private readonly voiceSymbol;
-    private readonly lyricsContainerCache;
+    private readonly lyricsObject;
     private minDiatonicId?;
     private maxDiatonicId?;
     private staffMinDiatonicId;
     private staffMaxDiatonicId;
     private arpeggioDir;
     private arpeggios;
-    private noteHeadDisplacements;
     private readonly playerProps;
     private needLayout;
     private shapeRects;
@@ -944,8 +766,7 @@ declare class ObjRhythmColumn extends MusicObject {
      */
     getNextColumn(): ObjRhythmColumn | undefined;
     getTicksToNextColumn(): number;
-    getShapeRects(): DivRect[];
-    getStaticObjects(line: ObjNotationLine): ReadonlyArray<MusicObject>;
+    getShapeRects(): AnchoredRect[];
     get doc(): ObjDocument;
     get row(): ObjScoreRow;
     pick(x: number, y: number): MusicObject[];
@@ -953,18 +774,18 @@ declare class ObjRhythmColumn extends MusicObject {
     getArpeggioDir(): Arpeggio;
     setVoiceSymbol(voiceId: VoiceId, symbol: RhythmSymbol): void;
     getVoiceSymbol(voiceId: VoiceId): RhythmSymbol | undefined;
-    getLyricsContainer(verse: VerseNumber, line: ObjNotationLine, vpos: VerticalPos, lyricsLength?: NoteLength): LyricsContainer | undefined;
+    getLyricsObject(verse: VerseNumber, line: ObjNotationLine, vpos: VerticalPos): ObjLyrics | undefined;
+    addLyricsObject(lyricsObj: ObjLyrics): void;
     getMinWidth(): number;
-    setupNoteHeadDisplacements(): void;
-    getNoteHeadDisplacement(noteGroup: ObjNoteGroup, note: Note): -1 | 0 | 1;
+    updateNoteDisplacements(): void;
     isEmpty(): boolean;
     getPlayerNotes(): ScorePlayerNote[];
     requestLayout(): void;
-    layout(renderer: Renderer, accState: AccidentalState): void;
+    layout(ctx: RenderContext, accState: AccidentalState): void;
     layoutDone(): void;
     updateRect(): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 
 type PlayerColumn = ObjRhythmColumn | ObjBarLineRight;
@@ -996,26 +817,34 @@ declare enum BarLineType {
 declare class ObjStaffTabBarLine extends MusicObject {
     readonly barLine: ObjBarLine;
     readonly line: ObjNotationLine;
-    lineRects: DivRect[];
-    dotRects: DivRect[];
+    verticalLines: {
+        left: number;
+        width: number;
+    }[];
+    dots: {
+        x: number;
+        y: number;
+        r: number;
+    }[];
     readonly mi: MStaffTabBarLine;
     constructor(barLine: ObjBarLine, line: ObjNotationLine);
     getMusicInterface(): MusicInterface;
     pick(x: number, y: number): MusicObject[];
-    setRect(r: DivRect): void;
+    setRect(r: AnchoredRect): void;
     offset(dx: number, dy: number): void;
 }
 declare abstract class ObjBarLine extends MusicObject {
     readonly measure: ObjMeasure;
     protected staffTabObjects: ObjStaffTabBarLine[];
+    protected staffTabObjectGroups: ObjStaffTabBarLine[][];
     protected barLineType: BarLineType;
     constructor(measure: ObjMeasure);
     abstract solveBarLineType(): BarLineType;
     pick(x: number, y: number): MusicObject[];
-    layout(renderer: Renderer): void;
+    layout(ctx: RenderContext): void;
     updateRect(): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 declare class ObjBarLineLeft extends ObjBarLine {
     readonly mi: MBarLineLeft;
@@ -1034,7 +863,6 @@ declare class ObjBarLineRight extends ObjBarLine {
 
 declare class ObjConnective extends MusicObject {
     readonly connectiveProps: ConnectiveProps;
-    readonly line: ObjNotationLine;
     readonly measure: ObjMeasure;
     private lx;
     private ly;
@@ -1045,6 +873,7 @@ declare class ObjConnective extends MusicObject {
     private cp2x;
     private cp2y;
     private arcHeight;
+    private readonly line;
     private readonly leftNoteGroup;
     private readonly leftNoteId;
     private readonly rightNoteGroup?;
@@ -1056,13 +885,14 @@ declare class ObjConnective extends MusicObject {
     getMusicInterface(): MConnective;
     isInsideMeasure(): boolean;
     pick(x: number, y: number): MusicObject[];
-    layout(renderer: Renderer): void;
+    layout(ctx: RenderContext): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 
 declare class ObjMeasure extends MusicObject {
     readonly row: ObjScoreRow;
+    private readonly options;
     static readonly MinFlexContentWidth = 10;
     private prevMeasure;
     private nextMeasure;
@@ -1085,9 +915,6 @@ declare class ObjMeasure extends MusicObject {
     private leftSolidAreaWidth;
     private minColumnsAreaWidth;
     private rightSolidAreaWidth;
-    private useDiatonicId;
-    private useStemDir;
-    private useString;
     private voiceSymbols;
     private lastAddedRhythmColumn?;
     private lastAddedRhythmSymbol?;
@@ -1104,7 +931,7 @@ declare class ObjMeasure extends MusicObject {
     private staticObjectsCache;
     private lyricsObjectsCache;
     readonly mi: MMeasure;
-    constructor(row: ObjScoreRow);
+    constructor(row: ObjScoreRow, options: MeasureOptions);
     getMusicInterface(): MMeasure;
     get doc(): ObjDocument;
     isPartialMeasure(): boolean;
@@ -1112,9 +939,11 @@ declare class ObjMeasure extends MusicObject {
     resetPassCount(): void;
     incPassCount(): void;
     getPassCount(): number;
-    updateOwnDiatonicId(voiceId: number, setDiatonicId?: number): number;
-    updateOwnStemDir(symbol: RhythmSymbol, setStemDir?: Stem): Stem.Up | Stem.Down;
-    updateOwnString(symbol: RhythmSymbol, setString?: StringNumber[]): StringNumber[];
+    updateRunningArguments(runningArgs?: {
+        diatonicId: number;
+        stemDir: Stem;
+        stringNumbers: StringNumber[];
+    }[]): void;
     pick(x: number, y: number): MusicObject[];
     getMeasureNumber(): number;
     getColumns(): ReadonlyArray<ObjRhythmColumn>;
@@ -1168,7 +997,7 @@ declare class ObjMeasure extends MusicObject {
     private getRhythmColumn;
     getMeasureTicks(): number;
     getConsumedTicks(voiceId?: VoiceId): number;
-    getColumnsContentRect(): DivRect;
+    getColumnsContentRect(): AnchoredRect;
     getLeftSolidAreaWidth(): number;
     getMinColumnsAreaWidth(): number;
     getRightSolidAreaWidth(): number;
@@ -1176,9 +1005,9 @@ declare class ObjMeasure extends MusicObject {
     getMinWidth(): number;
     getStaffLineLeft(): number;
     getStaffLineRight(): number;
-    private getLyricsObjects;
     getPrevLyricsObject(lyricsObj: ObjLyrics): ObjLyrics | undefined;
     getStaticObjects(line: ObjNotationLine): ReadonlyArray<MusicObject>;
+    addStaticObject(line: ObjNotationLine, staticObj: MusicObject): void;
     removeLayoutObjects(musicObj: MusicObject): void;
     addConnectiveObject(connective: ObjConnective): void;
     removeConnectiveObjects(): void;
@@ -1193,15 +1022,15 @@ declare class ObjMeasure extends MusicObject {
     getVoiceSymbols(voiceId: VoiceId): ReadonlyArray<RhythmSymbol>;
     completeRests(voiceId?: VoiceId | VoiceId[]): void;
     requestLayout(): void;
-    layout(renderer: Renderer): void;
-    layoutWidth(renderer: Renderer, width: number): void;
-    layoutConnectives(renderer: Renderer): void;
-    layoutBeams(renderer: Renderer): void;
+    layout(ctx: RenderContext): void;
+    layoutWidth(ctx: RenderContext, width: number): void;
+    layoutConnectives(ctx: RenderContext): void;
+    layoutBeams(ctx: RenderContext): void;
     alignStemsToBeams(): void;
     layoutDone(): void;
     updateRect(): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 
 declare class ObjScoreRow extends MusicObject {
@@ -1211,8 +1040,10 @@ declare class ObjScoreRow extends MusicObject {
     private nextRow?;
     private minWidth;
     private readonly notationLines;
+    private readonly instrumentLineGroups;
     private readonly staves;
     private readonly tabs;
+    private readonly instrumentNames;
     private readonly measures;
     private needLayout;
     readonly mi: MScoreRow;
@@ -1220,6 +1051,8 @@ declare class ObjScoreRow extends MusicObject {
     getMusicInterface(): MScoreRow;
     private createNotationLines;
     getNotationLines(): ReadonlyArray<ObjNotationLine>;
+    getInstrumentLineGroups(): ReadonlyArray<ReadonlyArray<ObjNotationLine>>;
+    findMatchingLine(line: ObjNotationLine): ObjNotationLine | undefined;
     getStaves(): ReadonlyArray<ObjStaff>;
     getTabs(): ReadonlyArray<ObjTab>;
     get hasStaff(): boolean;
@@ -1227,10 +1060,10 @@ declare class ObjScoreRow extends MusicObject {
     getTopStaff(): ObjStaff;
     getBottomStaff(): ObjStaff;
     getStaff(diatonicId: number): ObjStaff | undefined;
-    resetLayoutGroups(renderer: Renderer): void;
-    layoutLayoutGroups(renderer: Renderer): void;
+    resetLayoutGroups(ctx: RenderContext): void;
+    layoutLayoutGroups(ctx: RenderContext): void;
     pick(x: number, y: number): MusicObject[];
-    getConnectivesContentRect(): DivRect;
+    getConnectivesContentRect(): AnchoredRect;
     getDiatonicIdAt(y: number): number | undefined;
     addMeasure(m: ObjMeasure): void;
     getMeasures(): ReadonlyArray<ObjMeasure>;
@@ -1241,21 +1074,23 @@ declare class ObjScoreRow extends MusicObject {
     getFirstMeasure(): ObjMeasure | undefined;
     getLastMeasure(): ObjMeasure | undefined;
     getMinWidth(): number;
+    solveAutoStemDir(symbols: ReadonlyArray<RhythmSymbol>): Stem.Up | Stem.Down;
+    getInstrumentNameWidth(ctx: RenderContext): number;
     requestLayout(): void;
-    layout(renderer: Renderer): void;
-    layoutWidth(renderer: Renderer, width: number): void;
+    layout(ctx: RenderContext): void;
+    layoutWidth(ctx: RenderContext, left: number, right: number): void;
     updateRect(): void;
     alignStemsToBeams(): void;
-    layoutSetNotationLines(renderer: Renderer): void;
-    layoutPadding(renderer: Renderer): void;
+    layoutSetNotationLines(ctx: RenderContext): void;
+    layoutPadding(ctx: RenderContext): void;
     layoutDone(): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 
 declare class ObjDocument extends MusicObject {
     private needLayout;
-    private renderer?;
+    private ctx?;
     private readonly rows;
     private readonly measures;
     private measuresPerRow;
@@ -1270,7 +1105,7 @@ declare class ObjDocument extends MusicObject {
     setScoreConfiguration(config: StaffPreset | ScoreConfiguration): void;
     setMeasuresPerRow(measuresPerRow: number): void;
     addConnectiveProps(connectiveProps: ConnectiveProps): void;
-    setRenderer(renderer?: Renderer): void;
+    setRenderContext(ctx?: RenderContext): void;
     setHeader(title?: string, composer?: string, arranger?: string): void;
     getTitle(): string | undefined;
     getComposer(): string | undefined;
@@ -1284,14 +1119,20 @@ declare class ObjDocument extends MusicObject {
     getRows(): ReadonlyArray<ObjScoreRow>;
     getMeasures(): ReadonlyArray<ObjMeasure>;
     requestNewRow(): void;
-    addMeasure(): ObjMeasure;
+    addMeasure(measureOptions: MeasureOptions): ObjMeasure;
     addStaffGroup(groupName: string, layoutElements: number | string | (number | string)[], verticalPosition: VerticalPosition): void;
     getStaffGroup(groupName: string): StaffGroup | undefined;
     getVoiceSymbols(voiceId: VoiceId): ReadonlyArray<RhythmSymbol>;
     removeLayoutObjects(musicObj: MusicObject): void;
     private forEachMeasure;
     resetMeasures(): void;
-    updateCursorRect(cursorRect?: DivRect): void;
+    updateCursorRect(cursorRect?: Rect): void;
+    getInstrumentGroupSize(ctx: RenderContext): {
+        nameLeft: number;
+        nameRight: number;
+        braceLeft: number;
+        braceRight: number;
+    };
     requestLayout(): void;
     requestFullLayout(): void;
     layout(): void;
@@ -1304,16 +1145,15 @@ declare class ObjDocument extends MusicObject {
 }
 
 declare enum ImageAsset {
-    TrebleClefPng = 0,
-    BassClefPng = 1
+    G_Clef = 0,
+    F_Clef = 1
 }
-declare class Renderer {
+declare class RenderContext {
     private readonly mi;
     readonly devicePixelRatio: number;
     readonly fontSize: number;
     readonly unitSize: number;
-    readonly lineWidth: number;
-    readonly beamThickness: number;
+    readonly _lineWidth: number;
     private scoreEventListener?;
     private canvas?;
     private ctx?;
@@ -1329,8 +1169,8 @@ declare class Renderer {
     private onMouseMoveFn;
     private onMouseLeaveFn;
     private onTouchEndFn;
-    constructor(mi: MRenderer);
-    getMusicInterface(): MRenderer;
+    constructor(mi: MRenderContext);
+    getMusicInterface(): MRenderContext;
     get doc(): ObjDocument | undefined;
     private finishImageAsset;
     getImageAsset(imageAsset: ImageAsset): HTMLImageElement | undefined;
@@ -1338,7 +1178,7 @@ declare class Renderer {
     setCanvas(canvas: HTMLCanvasElement): void;
     setScoreEventListener(fn: ScoreEventListener): void;
     needMouseInput(): boolean;
-    getMousePos(e: MouseEvent): Vec2;
+    getMousePos(e: MouseEvent): Vec;
     private updateCurStaffPos;
     private updateCurObjects;
     onClick(e: MouseEvent): void;
@@ -1351,25 +1191,49 @@ declare class Renderer {
         scoreRow: ObjScoreRow;
         diatonicId: number;
     }): void;
-    updateCursorRect(cursorRect: DivRect | undefined): void;
+    updateCursorRect(cursorRect: Rect | undefined): void;
     updateCanvasSize(): void;
     draw(): void;
     drawHilightStaffPosRect(): void;
     drawHilightObjectRect(): void;
     drawPlayCursor(): void;
-    txFromScreenCoord(screenCoord: Vec2): Vec2;
-    txToScreenCoord(coord: Vec2): Vec2;
-    getCanvasContext(): CanvasRenderingContext2D | undefined;
+    txFromScreenCoord(screenCoord: Vec): Vec;
+    txToScreenCoord(coord: Vec): Vec;
     clearCanvas(): void;
-    getTextWidth(text: string, font: string): number;
-    drawDebugRect(r: DivRect): void;
-    fillCircle(x: number, y: number, radius: number, color?: string): void;
-    drawLine(startX: number, startY: number, endX: number, endY: number, color?: string, lineWidth?: number): void;
-    drawPartialLine(startX: number, startY: number, endX: number, endY: number, startT: number, endT: number, color?: string, lineWidth?: number): void;
+    drawDebugRect(r: AnchoredRect | Rect): void;
     drawLedgerLines(staff: ObjStaff, diatonicId: number, x: number): void;
-    getRestRect(restSize: number): DivRect;
-    drawRest(restSize: number, x: number, y: number, color: string): void;
-    drawFlag(rect: DivRect, dir: "up" | "down"): void;
+    getRestRect(restSize: number): AnchoredRect;
+    drawRest(restSize: number, x: number, y: number): void;
+    drawFlag(rect: Rect | AnchoredRect, dir: "up" | "down"): void;
+    color(color: string): RenderContext;
+    lineColor(color: string): RenderContext;
+    fillColor(color: string): RenderContext;
+    lineWidth(lineWidth?: number): RenderContext;
+    font(font: string): RenderContext;
+    beginPath(): RenderContext;
+    stroke(): RenderContext;
+    fill(): RenderContext;
+    moveTo(x: number, y: number): RenderContext;
+    lineTo(x: number, y: number): RenderContext;
+    bezierCurveTo(x1: number, y1: number, x2: number, y2: number, x3: number, y3: number): RenderContext;
+    quadraticCurveTo(x1: number, y1: number, x2: number, y2: number): RenderContext;
+    fillRect(x: number, y: number, w: number, h: number): RenderContext;
+    setLineDash(pattern: number[]): RenderContext;
+    drawImage(img: CanvasImageSource, x: number, y: number, w: number, h: number): RenderContext;
+    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number): RenderContext;
+    clip(): RenderContext;
+    save(): RenderContext;
+    restore(): RenderContext;
+    rect(x: number, y: number, w: number, h: number): RenderContext;
+    scale(x: number, y: number): RenderContext;
+    strokeRect(x: number, y: number, w: number, h: number): RenderContext;
+    fillText(text: string, x: number, y: number): RenderContext;
+    getTextWidth(text: string, font: string): number;
+    arc(x: number, y: number, radius: number, startRadians: number, endRadians: number): void;
+    fillCircle(x: number, y: number, radius: number): void;
+    strokeLine(startX: number, startY: number, endX: number, endY: number): void;
+    strokePartialLine(startX: number, startY: number, endX: number, endY: number, startT: number, endT: number): void;
+    drawBrace(rect: AnchoredRect, side: "left" | "right"): void;
 }
 
 declare class ObjEnding extends MusicObject {
@@ -1380,15 +1244,15 @@ declare class ObjEnding extends MusicObject {
     readonly mi: MEnding;
     constructor(measure: ObjMeasure, passages: number[]);
     getMusicInterface(): MEnding;
-    getShapeRects(): DivRect[];
+    getShapeRects(): AnchoredRect[];
     isSingleMeasureEnding(): boolean;
     hasPassage(pass: number): boolean;
     getHighestPassage(): number;
     pick(x: number, y: number): MusicObject[];
-    layout(renderer: Renderer): void;
-    layoutFitToMeasure(renderer: Renderer): void;
+    layout(ctx: RenderContext): void;
+    layoutFitToMeasure(ctx: RenderContext): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 
 declare class ObjFermata extends MusicObject {
@@ -1399,9 +1263,9 @@ declare class ObjFermata extends MusicObject {
     getMusicInterface(): MFermata;
     static getFermataPositions(anchor: ObjRhythmColumn | ObjBarLineRight): VerticalPos[];
     pick(x: number, y: number): MusicObject[];
-    layout(renderer: Renderer): void;
+    layout(ctx: RenderContext): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 
 declare class ObjSpecialText extends MusicObject {
@@ -1415,9 +1279,9 @@ declare class ObjSpecialText extends MusicObject {
     getMusicInterface(): MSpecialText;
     getText(): string;
     pick(x: number, y: number): MusicObject[];
-    layout(renderer: Renderer): void;
+    layout(ctx: RenderContext): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 
 type ExtensionLineStyle = "solid" | "dashed";
@@ -1457,27 +1321,27 @@ declare class ObjExtensionLine extends MusicObject {
     getMusicInterface(): MExtensionLine;
     private getLineLeft;
     private getLineRight;
-    layoutFitToMeasure(renderer: Renderer): void;
+    layoutFitToMeasure(ctx: RenderContext): void;
     pick(x: number, y: number): MusicObject[];
-    layout(renderer: Renderer): void;
+    layout(ctx: RenderContext): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 
 declare class ObjTabRhythm extends MusicObject {
     readonly measure: ObjMeasure;
     readonly tab: ObjTab;
-    private readonly voiceIds;
+    private readonly voiceId;
     readonly mi: MTabRhythm;
     constructor(measure: ObjMeasure, tab: ObjTab);
     getMusicInterface(): MTabRhythm;
     pick(x: number, y: number): MusicObject[];
-    layout(renderer: Renderer): void;
+    layout(ctx: RenderContext): void;
     private hasTuplets;
-    layoutFitToMeasure(renderer: Renderer): void;
+    layoutFitToMeasure(ctx: RenderContext): void;
     offset(dx: number, dy: number): void;
     private readonly tupletPartsTextObjMap;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 
 declare enum LayoutGroupId {
@@ -1515,25 +1379,27 @@ declare class LayoutObjectWrapper {
     readonly layoutGroup: LayoutGroup;
     private positionResolved;
     constructor(musicObj: LayoutableMusicObject, line: ObjNotationLine, layoutGroupId: LayoutGroupId, verticalPos: VerticalPos);
-    clearPositionResolved(): void;
+    resetPositionResolved(): void;
     setPositionResolved(): void;
     isPositionResolved(): boolean;
-    resolveClosestToStaffY(renderer: Renderer): number;
+    resolveClosestToStaffY(ctx: RenderContext): number;
     getTextContent(): string | undefined;
-    layout(renderer: Renderer): void;
+    layout(ctx: RenderContext): void;
     offset(dx: number, dy: number): void;
-    getRect(): DivRect;
+    getRect(): AnchoredRect;
 }
 declare class LayoutGroup {
     readonly layoutGroupId: number;
-    private readonly layoutObjectTable;
+    private readonly layoutObject;
     readonly rowAlign: boolean;
     readonly widensColumn: boolean;
+    readonly padding: number;
     constructor(layoutGroupId: number);
     getLayoutObjects(verticalPos: VerticalPos): Readonly<LayoutObjectWrapper[]>;
     add(layoutObj: LayoutObjectWrapper): void;
     remove(layoutObj: LayoutObjectWrapper): void;
-    clearPositionAndLayout(renderer: Renderer): void;
+    layout(ctx: RenderContext): void;
+    getPadding(ctx: RenderContext): number;
 }
 
 declare class MusicObjectLink {
@@ -1552,11 +1418,11 @@ declare abstract class MusicObject {
     constructor(parent: MusicObject | undefined);
     abstract getMusicInterface(): MusicInterface;
     getParent(): MusicObject | undefined;
-    protected rect: DivRect;
+    protected rect: AnchoredRect;
     private needRectUpdate;
     requestRectUpdate(): void;
     updateRect(): void;
-    getRect(): DivRect;
+    getRect(): AnchoredRect;
     /**
      * Most objects are simple rects in shape.
      * Some objects might be more complex consisting of multiple rects.
@@ -1564,7 +1430,7 @@ declare abstract class MusicObject {
      *
      * @returns Array of rects.
      */
-    getShapeRects(): DivRect[];
+    getShapeRects(): AnchoredRect[];
     /**
      * Pick objects.
      *
@@ -1593,9 +1459,9 @@ declare class ObjArpeggio extends MusicObject {
     constructor(col: ObjRhythmColumn, line: ObjNotationLine, arpeggioDir: Arpeggio);
     getMusicInterface(): MArpeggio;
     pick(x: number, y: number): MusicObject[];
-    layout(renderer: Renderer): void;
+    layout(ctx: RenderContext): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 
 declare class ObjHeader extends MusicObject {
@@ -1609,9 +1475,9 @@ declare class ObjHeader extends MusicObject {
     constructor(doc: ObjDocument, title?: string | undefined, composer?: string | undefined, arranger?: string | undefined);
     getMusicInterface(): MHeader;
     pick(x: number, y: number): MusicObject[];
-    layoutWidth(renderer: Renderer, width: number): void;
+    layoutWidth(ctx: RenderContext, left: number, right: number): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 
 declare class ObjImage extends MusicObject {
@@ -1623,9 +1489,9 @@ declare class ObjImage extends MusicObject {
     constructor(parent: MusicObject, image: HTMLImageElement, anchorX: number, anchorY: number, imageScale: number);
     getMusicInterface(): MImage;
     pick(x: number, y: number): MusicObject[];
-    layout(renderer: Renderer): void;
+    layout(ctx: RenderContext): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 
 declare class ObjStaffSignature extends MusicObject {
@@ -1642,16 +1508,16 @@ declare class ObjStaffSignature extends MusicObject {
     readonly mi: MStaffSignature;
     constructor(measure: ObjMeasure, staff: ObjStaff);
     getMusicInterface(): MStaffSignature;
-    updateClefImage(renderer: Renderer, showClef: boolean): void;
+    updateClefImage(ctx: RenderContext, showClef: boolean): void;
     updateMeasureNumber(showMeasureNumber: boolean): void;
     updateKeySignature(showKeySignature: boolean): void;
     updateTimeSignature(showTimeSignature: boolean): void;
     updateTempo(showTempo: boolean): void;
     private getAccidentalDiatonicId;
     pick(x: number, y: number): MusicObject[];
-    layout(renderer: Renderer): void;
+    layout(ctx: RenderContext): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 declare class ObjTabSignature extends MusicObject {
     readonly measure: ObjMeasure;
@@ -1667,9 +1533,9 @@ declare class ObjTabSignature extends MusicObject {
     updateTimeSignature(showTimeSignature: boolean): void;
     updateTempo(showTempo: boolean): void;
     pick(x: number, y: number): MusicObject[];
-    layout(renderer: Renderer): void;
+    layout(ctx: RenderContext): void;
     offset(dx: number, dy: number): void;
-    draw(renderer: Renderer): void;
+    draw(ctx: RenderContext): void;
 }
 
 /** Score event type. */
@@ -1685,29 +1551,37 @@ declare abstract class ScoreEvent {
 }
 /** Score staff position event for clicking/entering/leaving staff position (diatonic id) in staff notation line. */
 declare class ScoreStaffPosEvent extends ScoreEvent {
-    readonly renderer: MRenderer;
+    readonly renderContext: MRenderContext;
     readonly scoreRow: MScoreRow;
     readonly diatonicId: number;
     /**
      * Create new score staff position event.
      * @param type - Score event type.
-     * @param renderer - Renderer.
+     * @param renderContext - Render context.
      * @param scoreRow - Score row.
      * @param diatonicId - Diatonic id that was clicked/entered/left.
      */
-    constructor(type: ScoreEventType, renderer: MRenderer, scoreRow: MScoreRow, diatonicId: number);
+    constructor(type: ScoreEventType, renderContext: MRenderContext, scoreRow: MScoreRow, diatonicId: number);
+    /**
+     * @deprecated - Provided for legacy support, use renderContext instead.
+     */
+    get renderer(): MRenderer;
 }
 /** Score object event for clicking/entering/leaving score object. */
 declare class ScoreObjectEvent extends ScoreEvent {
-    readonly renderer: MRenderer;
+    readonly renderContext: MRenderContext;
     readonly objects: MusicInterface[];
     /**
      * Create new score object event.
      * @param type - Score event type.
-     * @param renderer - Renderer.
+     * @param renderContext - Render context.
      * @param objects - Array of objects, last object in this array is the top object that was clicked/entered/left, previous objects are it's parent objects.
      */
-    constructor(type: ScoreEventType, renderer: MRenderer, objects: MusicInterface[]);
+    constructor(type: ScoreEventType, renderContext: MRenderContext, objects: MusicInterface[]);
+    /**
+     * @deprecated - Provided for legacy support, use renderContext instead.
+     */
+    get renderer(): MRenderer;
     /** Top object getter. */
     get topObject(): MusicInterface;
     /**
@@ -1750,25 +1624,25 @@ declare class MPlayer {
      */
     stop(): this;
 }
-/** Renderer class. */
-declare class MRenderer {
-    private readonly renderer;
+/** Render context class. */
+declare class MRenderContext {
+    private readonly ctx;
     /**
-     * Create new renderer instance.
+     * Create new render context instance.
      */
     constructor();
     /**
-     * Attach music document to this renderer.
+     * Attach music document to this render context.
      * @param doc - Music document.
-     * @returns - This renderer instance.
+     * @returns - This render context instance.
      */
-    setDocument(doc?: MDocument): MRenderer;
+    setDocument(doc?: MDocument): MRenderContext;
     /**
-     * Set target canvas html element for this renderer.
+     * Set target canvas html element for this render context.
      * @param canvas - HTML canvas element or element id.
-     * @returns - This renderer instance.
+     * @returns - This render context instance.
      */
-    setCanvas(canvas: HTMLCanvasElement | string): MRenderer;
+    setCanvas(canvas: HTMLCanvasElement | string): MRenderContext;
     /**
      * Set score event listener.
      * @param scoreEventListener - Score event listener.
@@ -1792,6 +1666,12 @@ declare class MRenderer {
      */
     draw(): void;
 }
+/**
+ * Renderer class.
+ * @deprecated - Use MRenderContext instead.
+ * */
+declare class MRenderer extends MRenderContext {
+}
 /** Playback buttons helper class. */
 declare class MPlaybackButtons {
     private playButton?;
@@ -2468,4 +2348,4 @@ declare class MExtensionLine extends MusicInterface {
     getMusicObject(): ObjExtensionLine;
 }
 
-export { MTabRhythm as $, type AnnotationText as A, MImage as B, Connective as C, DivRect as D, MMeasure as E, Fermata as F, MBarLineRight as G, MBarLineLeft as H, MStaffTabBarLine as I, MNoteGroup as J, MStaffNoteGroup as K, type LyricsOptions as L, MDocument as M, type NoteOptions as N, MTabNoteGroup as O, MRest as P, MStaffRest as Q, type RestOptions as R, StaffPreset as S, type TupletOptions as T, MRhythmColumn as U, type VoiceId as V, MScoreRow as W, MStaff as X, MTab as Y, MStaffSignature as Z, MTabSignature as _, type ScoreConfiguration as a, MSpecialText as a0, MText as a1, MLyrics as a2, MExtensionLine as a3, Clef as a4, type BaseConfig as a5, type StaffConfig as a6, type TabConfig as a7, getVoiceIds as a8, type StringNumber as a9, getStringNumbers as aa, getVerseNumbers as ab, Stem as ac, Arpeggio as ad, type StaffTabOrGroup as ae, LyricsAlign as af, LyricsHyphen as ag, DynamicsAnnotation as ah, TempoAnnotation as ai, PlayState as aj, type PlayStateChangeListener as ak, type VerseNumber as b, type StaffTabOrGroups as c, Navigation as d, Annotation as e, Label as f, TieType as g, NoteAnchor as h, VerticalPosition as i, type ScoreEventType as j, ScoreEvent as k, ScoreStaffPosEvent as l, ScoreObjectEvent as m, type ScoreEventListener as n, MPlayer as o, MRenderer as p, MPlaybackButtons as q, MusicInterface as r, MAccidental as s, MConnective as t, MArpeggio as u, MBeamGroup as v, MStaffBeamGroup as w, MEnding as x, MFermata as y, MHeader as z };
+export { MTabSignature as $, type AnnotationText as A, MFermata as B, Connective as C, MHeader as D, MImage as E, Fermata as F, MMeasure as G, MBarLineRight as H, MBarLineLeft as I, MStaffTabBarLine as J, MNoteGroup as K, type LyricsOptions as L, MDocument as M, type NoteOptions as N, MStaffNoteGroup as O, MTabNoteGroup as P, MRest as Q, type RestOptions as R, StaffPreset as S, type TupletOptions as T, MStaffRest as U, type VoiceId as V, MRhythmColumn as W, MScoreRow as X, MStaff as Y, MTab as Z, MStaffSignature as _, type ScoreConfiguration as a, MTabRhythm as a0, MSpecialText as a1, MText as a2, MLyrics as a3, MExtensionLine as a4, Clef as a5, type BaseConfig as a6, type StaffConfig as a7, type TabConfig as a8, getVoiceIds as a9, isVoiceId as aa, validateVoiceId as ab, type StringNumber as ac, getStringNumbers as ad, isStringNumber as ae, validateStringNumber as af, getVerseNumbers as ag, isVerseNumber as ah, validateVerseNumber as ai, Stem as aj, Arpeggio as ak, type StaffTabOrGroup as al, LyricsAlign as am, LyricsHyphen as an, DynamicsAnnotation as ao, TempoAnnotation as ap, PlayState as aq, type PlayStateChangeListener as ar, type MeasureOptions as b, type VerseNumber as c, type StaffTabOrGroups as d, Navigation as e, Annotation as f, Label as g, TieType as h, NoteAnchor as i, VerticalPosition as j, type ScoreEventType as k, ScoreEvent as l, ScoreStaffPosEvent as m, ScoreObjectEvent as n, type ScoreEventListener as o, MPlayer as p, MRenderContext as q, MRenderer as r, MPlaybackButtons as s, MusicInterface as t, MAccidental as u, MConnective as v, MArpeggio as w, MBeamGroup as x, MStaffBeamGroup as y, MEnding as z };