@coderline/alphatab 1.8.0-alpha.1669 → 1.8.0-alpha.1670

package/dist/alphaTab.core.mjs

@@ -1,5 +1,5 @@
 /*!
- * alphaTab v1.8.0-alpha.1669 (develop, build 1669)
+ * alphaTab v1.8.0-alpha.1670 (develop, build 1670)
  *
  * Copyright © 2026, Daniel Kuschny and Contributors, All rights reserved.
  *
@@ -203,9 +203,9 @@ class AlphaTabError extends Error {
  * @internal
  */
 class VersionInfo {
-    static version = '1.8.0-alpha.1669';
-    static date = '2026-01-08T02:24:31.439Z';
-    static commit = 'f7c00b0b8db32011293f475bf5e930d21c1903ac';
+    static version = '1.8.0-alpha.1670';
+    static date = '2026-01-09T02:24:51.076Z';
+    static commit = 'c4cd0c6435ec1bed778365efd389cb1b52df7ff3';
     static print(print) {
         print(`alphaTab ${VersionInfo.version}`);
         print(`commit: ${VersionInfo.commit}`);
@@ -1315,6 +1315,23 @@ var NotationElement;
      * The key signature for numbered notation staff.
      */
     NotationElement[NotationElement["EffectNumberedNotationKeySignature"] = 51] = "EffectNumberedNotationKeySignature";
+    /**
+     * The fretboard numbers shown in chord diagrams.
+     */
+    NotationElement[NotationElement["ChordDiagramFretboardNumbers"] = 52] = "ChordDiagramFretboardNumbers";
+    /**
+     * The bar numbers.
+     */
+    NotationElement[NotationElement["BarNumber"] = 53] = "BarNumber";
+    /**
+     * The repeat count indicator shown above the thick bar line to describe
+     * how many repeats should be played.
+     */
+    NotationElement[NotationElement["RepeatCount"] = 54] = "RepeatCount";
+    /**
+     * The slurs shown on bend effects within the score staff.
+     */
+    NotationElement[NotationElement["ScoreBendSlur"] = 55] = "ScoreBendSlur";
 })(NotationElement || (NotationElement = {}));
 /**
  * The notation settings control how various music notation elements are shown and behaving
@@ -2174,6 +2191,11 @@ class Bar {
      * Gets or sets the type of key signature (major/minor)
      */
     keySignatureType = KeySignatureType.Major;
+    /**
+     * How bar numbers should be displayed.
+     * If specified, overrides the value from the stylesheet on score level.
+     */
+    barNumberDisplay;
     /**
      * The bar line to draw on the left side of the bar with an "automatic" type resolved to the actual one.
      * @param isFirstOfSystem  Whether the bar is the first one in the system.
@@ -2668,6 +2690,25 @@ var TrackNameOrientation;
      */
     TrackNameOrientation[TrackNameOrientation["Vertical"] = 1] = "Vertical";
 })(TrackNameOrientation || (TrackNameOrientation = {}));
+/**
+ * How bar numbers are displayed
+ * @public
+ */
+var BarNumberDisplay;
+(function (BarNumberDisplay) {
+    /**
+     * Show bar numbers on all bars.
+     */
+    BarNumberDisplay[BarNumberDisplay["AllBars"] = 0] = "AllBars";
+    /**
+     * Show bar numbers on the first bar of every system.
+     */
+    BarNumberDisplay[BarNumberDisplay["FirstOfSystem"] = 1] = "FirstOfSystem";
+    /**
+     * Hide all bar numbers
+     */
+    BarNumberDisplay[BarNumberDisplay["Hide"] = 2] = "Hide";
+})(BarNumberDisplay || (BarNumberDisplay = {}));
 /**
  * This class represents the rendering stylesheet.
  * It contains settings which control the display of the score when rendered.
@@ -2761,6 +2802,10 @@ class RenderStylesheet {
      * {@link hideEmptyStaves}
      */
     showSingleStaffBrackets = false;
+    /**
+     * How bar numbers should be displayed.
+     */
+    barNumberDisplay = BarNumberDisplay.AllBars;
 }
 
 /**
@@ -8432,6 +8477,12 @@ class AlphaTex1EnumMappings {
         ['buzzroll', 1]
     ]);
     static tremoloPickingStyleReversed = AlphaTex1EnumMappings._reverse(AlphaTex1EnumMappings.tremoloPickingStyle);
+    static barNumberDisplay = new Map([
+        ['allbars', 0],
+        ['firstofsystem', 1],
+        ['hide', 2]
+    ]);
+    static barNumberDisplayReversed = AlphaTex1EnumMappings._reverse(AlphaTex1EnumMappings.barNumberDisplay);
     static keySignaturesMinorReversed = new Map([
         [-7, 'abminor'],
         [-6, 'ebminor'],
@@ -8626,7 +8677,8 @@ class AlphaTex1LanguageDefinitions {
         ['chorddiagramsinscore', [[[[10], 1, ['true', 'false']]]]],
         ['hideemptystaves', null],
         ['hideemptystavesinfirstsystem', null],
-        ['showsinglestaffbrackets', null]
+        ['showsinglestaffbrackets', null],
+        ['defaultbarnumberdisplay', [[[[10, 17], 0, ['allbars', 'firstofsystem', 'hide']]]]]
     ]);
     static staffMetaDataSignatures = AlphaTex1LanguageDefinitions._signatures([
         ['tuning', [[[[10, 17], 0, ['piano', 'none', 'voice']]], [[[10, 17], 5]]]],
@@ -8911,7 +8963,8 @@ class AlphaTex1LanguageDefinitions {
         ['sph', [[[[16], 2]]]],
         ['spu', [[[[16], 2]]]],
         ['db', null],
-        ['voicemode', [[[[10, 17], 0, ['staffwise', 'barwise']]]]]
+        ['voicemode', [[[[10, 17], 0, ['staffwise', 'barwise']]]]],
+        ['barnumberdisplay', [[[[10, 17], 0, ['allbars', 'firstofsystem', 'hide']]]]]
     ]);
     static metaDataProperties = AlphaTex1LanguageDefinitions._metaProps([
         [
@@ -8969,6 +9022,7 @@ class AlphaTex1LanguageDefinitions {
         ['hideemptystaves', null],
         ['hideemptystavesinfirstsystem', null],
         ['showsinglestaffbrackets', null],
+        ['defaultbarnumberdisplay', null],
         [
             'tuning',
             [
@@ -9025,7 +9079,8 @@ class AlphaTex1LanguageDefinitions {
         ['sph', null],
         ['spu', null],
         ['db', null],
-        ['voicemode', null]
+        ['voicemode', null],
+        ['barnumberdisplay', null]
     ]);
     static metaDataSignatures = [
         AlphaTex1LanguageDefinitions.scoreMetaDataSignatures,
@@ -12876,6 +12931,13 @@ class AlphaTex1LanguageHandler {
             case 'showsinglestaffbrackets':
                 score.stylesheet.showSingleStaffBrackets = true;
                 return ApplyNodeResult.Applied;
+            case 'defaultbarnumberdisplay':
+                const barNumberDisplay = AlphaTex1LanguageHandler._parseEnumValue(importer, metaData.arguments, 'bar number display', AlphaTex1EnumMappings.barNumberDisplay);
+                if (barNumberDisplay === undefined) {
+                    return ApplyNodeResult.NotAppliedSemanticError;
+                }
+                score.stylesheet.barNumberDisplay = barNumberDisplay;
+                return ApplyNodeResult.Applied;
             default:
                 return ApplyNodeResult.NotAppliedUnrecognizedMarker;
         }
@@ -13367,6 +13429,13 @@ class AlphaTex1LanguageHandler {
                 bar.masterBar.isDoubleBar = true;
                 bar.barLineRight = BarLineStyle.LightLight;
                 return ApplyNodeResult.Applied;
+            case 'barnumberdisplay':
+                const barNumberDisplay = AlphaTex1LanguageHandler._parseEnumValue(importer, metaData.arguments, 'bar number display', AlphaTex1EnumMappings.barNumberDisplay);
+                if (barNumberDisplay === undefined) {
+                    return ApplyNodeResult.NotAppliedSemanticError;
+                }
+                bar.barNumberDisplay = barNumberDisplay;
+                return ApplyNodeResult.Applied;
             default:
                 return ApplyNodeResult.NotAppliedUnrecognizedMarker;
         }
@@ -14734,6 +14803,9 @@ class AlphaTex1LanguageHandler {
         if (stylesheet.showSingleStaffBrackets) {
             nodes.push(Atnf.meta('showSingleStaffBrackets'));
         }
+        if (stylesheet.barNumberDisplay !== BarNumberDisplay.AllBars) {
+            nodes.push(Atnf.identMeta('defaultBarNumberDisplay', BarNumberDisplay[stylesheet.barNumberDisplay]));
+        }
         // Unsupported:
         // 'globaldisplaychorddiagramsontop',
         // 'pertrackchorddiagramsontop',
@@ -14867,6 +14939,9 @@ class AlphaTex1LanguageHandler {
                 }
             ];
         }
+        if (bar.barNumberDisplay !== undefined) {
+            nodes.push(Atnf.identMeta('barNumberDisplay', BarNumberDisplay[bar.barNumberDisplay]));
+        }
         return nodes;
     }
     static _buildStaffMetaDataNodes(nodes, staff) {
@@ -19535,6 +19610,10 @@ class Gp3To5Importer extends ScoreImporter {
             this.readTrack();
         }
     }
+    /**
+     * Guitar Pro 3-6 changes to a bass clef if any string tuning is below B2;
+     */
+    static _bassClefTuningThreshold = ModelUtils.parseTuning('B2').realValue;
     readTrack() {
         const newTrack = new Track();
         newTrack.ensureStaveCount(1);
@@ -19615,11 +19694,11 @@ class Gp3To5Importer extends ScoreImporter {
             this.data.readByte();
             // `12` for all tunings which have bass clefs
             const clefMode = IOHelper.readInt32LE(this.data);
-            if (clefMode === 12) {
-                this._clefsPerTrack.set(index, Clef.F4);
+            if (clefMode === 12 || tuning[tuning.length - 1] < Gp3To5Importer._bassClefTuningThreshold) {
+                this._clefsPerTrack.set(newTrack.index, Clef.F4);
             }
             else {
-                this._clefsPerTrack.set(index, Clef.G2);
+                this._clefsPerTrack.set(newTrack.index, Clef.G2);
             }
             // Unknown, no UI setting seem to affect this
             IOHelper.readInt32LE(this.data);
@@ -19651,11 +19730,11 @@ class Gp3To5Importer extends ScoreImporter {
             }
         }
         else {
-            if (GeneralMidi.isBass(newTrack.playbackInfo.program)) {
-                this._clefsPerTrack.set(index, Clef.F4);
+            if (tuning[tuning.length - 1] < Gp3To5Importer._bassClefTuningThreshold) {
+                this._clefsPerTrack.set(newTrack.index, Clef.F4);
             }
             else {
-                this._clefsPerTrack.set(index, Clef.G2);
+                this._clefsPerTrack.set(newTrack.index, Clef.G2);
             }
         }
     }
@@ -20929,6 +21008,19 @@ class BinaryStylesheet {
                     ModelUtils.getOrCreateHeaderFooterStyle(score, ScoreSubElement.CopyrightSecondLine).isVisible =
                         value;
                     break;
+                case 'System/barIndexDrawType':
+                    switch (value) {
+                        case 0:
+                            score.stylesheet.barNumberDisplay = BarNumberDisplay.AllBars;
+                            break;
+                        case 1:
+                            score.stylesheet.barNumberDisplay = BarNumberDisplay.FirstOfSystem;
+                            break;
+                        case 2:
+                            score.stylesheet.barNumberDisplay = BarNumberDisplay.Hide;
+                            break;
+                    }
+                    break;
             }
         }
     }
@@ -21118,6 +21210,17 @@ class BinaryStylesheet {
                 }
             }
         }
+        switch (score.stylesheet.barNumberDisplay) {
+            case BarNumberDisplay.AllBars:
+                binaryStylesheet.addValue('System/barIndexDrawType', 0, DataType.Integer);
+                break;
+            case BarNumberDisplay.FirstOfSystem:
+                binaryStylesheet.addValue('System/barIndexDrawType', 1, DataType.Integer);
+                break;
+            case BarNumberDisplay.Hide:
+                binaryStylesheet.addValue('System/barIndexDrawType', 2, DataType.Integer);
+                break;
+        }
         const writer = ByteBuffer.withCapacity(128);
         binaryStylesheet.writeTo(writer);
         return writer.toArray();
@@ -24824,6 +24927,8 @@ class MusicXmlImporter extends ScoreImporter {
     _idToTrackInfo = new Map();
     _indexToTrackInfo = new Map();
     _staffToContext = new Map();
+    _currentBarNumberDisplayPart;
+    _currentBarNumberDisplayBar;
     _divisionsPerQuarterNote = 1;
     _currentDynamics = DynamicValue.F;
     get name() {
@@ -25437,20 +25542,29 @@ class MusicXmlImporter extends ScoreImporter {
                     break;
             }
         }
+        this._currentBarNumberDisplayPart = undefined;
     }
     _parsePartwiseMeasure(element, track, index) {
         const masterBar = this._getOrCreateMasterBar(element, index);
-        this._parsePartMeasure(element, masterBar, track);
+        const implicit = element.attributes.get('implicit') === 'yes';
+        this._parsePartMeasure(element, masterBar, track, implicit, true);
+        this._currentBarNumberDisplayBar = undefined;
     }
     _parseTimewiseMeasure(element, index) {
         const masterBar = this._getOrCreateMasterBar(element, index);
+        const implicit = element.attributes.get('implicit') === 'yes';
         for (const c of element.childElements()) {
             switch (c.localName) {
                 case 'part':
-                    this._parseTimewisePart(c, masterBar);
+                    this._parseTimewisePart(c, masterBar, implicit);
+                    this._currentBarNumberDisplayPart = undefined;
+                    break;
+                case 'print':
+                    this._parsePrint(c, masterBar, undefined, true);
                     break;
             }
         }
+        this._currentBarNumberDisplayBar = undefined;
     }
     _getOrCreateMasterBar(element, index) {
         const implicit = element.attributes.get('implicit') === 'yes';
@@ -25469,13 +25583,13 @@ class MusicXmlImporter extends ScoreImporter {
         const masterBar = this._score.masterBars[index];
         return masterBar;
     }
-    _parseTimewisePart(element, masterBar) {
+    _parseTimewisePart(element, masterBar, implicit) {
         const id = element.attributes.get('id');
         if (!id || !this._idToTrackInfo.has(id)) {
             return;
         }
         const track = this._idToTrackInfo.get(id).track;
-        this._parsePartMeasure(element, masterBar, track);
+        this._parsePartMeasure(element, masterBar, track, implicit, false);
     }
     // current measure state
     /**
@@ -25487,7 +25601,7 @@ class MusicXmlImporter extends ScoreImporter {
      * to access the current voice/staff (e.g. on rests when we don't have notes)
      */
     _lastBeat = null;
-    _parsePartMeasure(element, masterBar, track) {
+    _parsePartMeasure(element, masterBar, track, implicit, isPartwise) {
         this._musicalPosition = 0;
         this._lastBeat = null;
         masterBar.alternateEndings = this._nextMasterBarRepeatEnding;
@@ -25514,7 +25628,7 @@ class MusicXmlImporter extends ScoreImporter {
                     break;
                 // case 'figured-bass': Not supported
                 case 'print':
-                    this._parsePrint(c, masterBar, track);
+                    this._parsePrint(c, masterBar, track, true);
                     break;
                 case 'sound':
                     this._parseSound(c, masterBar, track);
@@ -25535,16 +25649,51 @@ class MusicXmlImporter extends ScoreImporter {
         this._applySimileMarks(masterBar, track);
         // initial empty staff and voice (if no other elements created something already)
         const staff = this._getOrCreateStaff(track, 0);
-        this._getOrCreateBar(staff, masterBar);
+        const bar = this._getOrCreateBar(staff, masterBar);
+        if (implicit) {
+            bar.barNumberDisplay = BarNumberDisplay.Hide;
+        }
+        else if (isPartwise) {
+            bar.barNumberDisplay = this._currentBarNumberDisplayBar ?? this._currentBarNumberDisplayPart;
+        }
+        else {
+            bar.barNumberDisplay = this._currentBarNumberDisplayPart ?? this._currentBarNumberDisplayBar;
+        }
         // clear measure attribute
         this._keyAllStaves = null;
     }
-    _parsePrint(element, masterBar, track) {
-        if (element.getAttribute('new-system', 'no') === 'yes') {
-            track.addLineBreaks(masterBar.index);
+    _parsePrint(element, masterBar, track, isMeasurePrint) {
+        if (track !== undefined) {
+            if (element.getAttribute('new-system', 'no') === 'yes') {
+                track.addLineBreaks(masterBar.index);
+            }
+            else if (element.getAttribute('new-page', 'no') === 'yes') {
+                track.addLineBreaks(masterBar.index);
+            }
+        }
+        let newDisplay = undefined;
+        for (const c of element.childElements()) {
+            switch (c.localName) {
+                case 'measure-numbering':
+                    switch (c.innerText) {
+                        case 'none':
+                            newDisplay = BarNumberDisplay.Hide;
+                            break;
+                        case 'measure':
+                            newDisplay = BarNumberDisplay.AllBars;
+                            break;
+                        case 'system':
+                            newDisplay = BarNumberDisplay.FirstOfSystem;
+                            break;
+                    }
+                    break;
+            }
         }
-        else if (element.getAttribute('new-page', 'no') === 'yes') {
-            track.addLineBreaks(masterBar.index);
+        if (isMeasurePrint) {
+            this._currentBarNumberDisplayBar = newDisplay;
+        }
+        else {
+            this._currentBarNumberDisplayPart = newDisplay;
         }
     }
     _applySimileMarks(masterBar, track) {
@@ -26654,7 +26803,7 @@ class MusicXmlImporter extends ScoreImporter {
         if (unit !== null && perMinute > 0) {
             const tempoAutomation = new Automation();
             tempoAutomation.type = AutomationType.Tempo;
-            tempoAutomation.value = (perMinute * (unit / 4)) | 0;
+            tempoAutomation.value = perMinute * (unit / 4);
             tempoAutomation.ratioPosition = ratioPosition;
             if (!this._hasSameTempo(masterBar, tempoAutomation)) {
                 masterBar.tempoAutomations.push(tempoAutomation);
@@ -29583,7 +29732,7 @@ class MidiFileSequencer {
             }
             if (mEvent.type === MidiEventType.TempoChange) {
                 const meta = mEvent;
-                bpm = meta.beatsPerMinute;
+                bpm = MidiFileSequencer._sanitizeBpm(meta.beatsPerMinute);
                 state.tempoChanges.push(new MidiFileSequencerTempoChange(bpm, absTick, absTime));
                 metronomeLengthInMillis = metronomeLengthInTicks * (60000.0 / (bpm * midiFile.division));
             }
@@ -29701,7 +29850,7 @@ class MidiFileSequencer {
                 }
                 else {
                     const previousSyncPoint = syncPoints[i - 1];
-                    previousModifiedTempo = previousSyncPoint.syncBpm;
+                    previousModifiedTempo = MidiFileSequencer._sanitizeBpm(previousSyncPoint.syncBpm);
                     previousMillisecondOffset = previousSyncPoint.syncTime;
                     previousTick = previousSyncPoint.synthTick;
                 }
@@ -29725,7 +29874,7 @@ class MidiFileSequencer {
                         syncPoint.syncTime = interpolatedMillisecondOffset;
                         syncPoint.syncBpm = previousModifiedTempo;
                     }
-                    bpm = state.tempoChanges[tempoChangeIndex].bpm;
+                    bpm = MidiFileSequencer._sanitizeBpm(state.tempoChanges[tempoChangeIndex].bpm);
                     tempoChangeIndex++;
                 }
                 deltaTick = p.synthTick - absTick;
@@ -29746,10 +29895,13 @@ class MidiFileSequencer {
         this._updateCurrentTempo(state, timePosition);
         const lastTempoChange = state.tempoChanges[state.tempoChangeIndex];
         const timeDiff = timePosition - lastTempoChange.time;
-        const ticks = (timeDiff / (60000.0 / (lastTempoChange.bpm * state.division))) | 0;
+        const ticks = (timeDiff / (60000.0 / (MidiFileSequencer._sanitizeBpm(lastTempoChange.bpm) * state.division))) | 0;
         // we add 1 for possible rounding errors.(floating point issuses)
         return lastTempoChange.ticks + ticks + 1;
     }
+    static _sanitizeBpm(bpm) {
+        return Math.max(bpm, 1); // prevent <0 bpms. Doesn't make sense and can cause endless loops
+    }
     currentUpdateCurrentTempo(timePosition) {
         this._updateCurrentTempo(this._mainState, timePosition * this.playbackSpeed);
     }
@@ -37481,6 +37633,7 @@ class BarSerializer {
         o.set("barlineright", obj.barLineRight);
         o.set("keysignature", obj.keySignature);
         o.set("keysignaturetype", obj.keySignatureType);
+        o.set("barnumberdisplay", obj.barNumberDisplay);
         if (obj.style) {
             o.set("style", BarStyleSerializer.toJson(obj.style));
         }
@@ -37534,6 +37687,9 @@ class BarSerializer {
             case "keysignaturetype":
                 obj.keySignatureType = JsonHelper.parseEnum(v, KeySignatureType);
                 return true;
+            case "barnumberdisplay":
+                obj.barNumberDisplay = JsonHelper.parseEnum(v, BarNumberDisplay);
+                return true;
             case "style":
                 if (v) {
                     obj.style = new BarStyle();
@@ -38028,6 +38184,7 @@ class RenderStylesheetSerializer {
         o.set("hideemptystaves", obj.hideEmptyStaves);
         o.set("hideemptystavesinfirstsystem", obj.hideEmptyStavesInFirstSystem);
         o.set("showsinglestaffbrackets", obj.showSingleStaffBrackets);
+        o.set("barnumberdisplay", obj.barNumberDisplay);
         return o;
     }
     static setProperty(obj, property, v) {
@@ -38098,6 +38255,9 @@ class RenderStylesheetSerializer {
             case "showsinglestaffbrackets":
                 obj.showSingleStaffBrackets = v;
                 return true;
+            case "barnumberdisplay":
+                obj.barNumberDisplay = JsonHelper.parseEnum(v, BarNumberDisplay);
+                return true;
         }
         return false;
     }
@@ -41829,25 +41989,20 @@ class RenderingResourcesSerializer {
         const o = new Map();
         o.set("smuflfontfamilyname", obj.smuflFontFamilyName);
         o.set("engravingsettings", EngravingSettingsSerializer.toJson(obj.engravingSettings));
-        o.set("copyrightfont", Font.toJson(obj.copyrightFont));
-        o.set("titlefont", Font.toJson(obj.titleFont));
-        o.set("subtitlefont", Font.toJson(obj.subTitleFont));
-        o.set("wordsfont", Font.toJson(obj.wordsFont));
-        o.set("effectfont", Font.toJson(obj.effectFont));
-        o.set("timerfont", Font.toJson(obj.timerFont));
-        o.set("directionsfont", Font.toJson(obj.directionsFont));
-        o.set("fretboardnumberfont", Font.toJson(obj.fretboardNumberFont));
+        {
+            const m = new Map();
+            o.set("elementfonts", m);
+            for (const [k, v] of obj.elementFonts) {
+                m.set(k.toString(), Font.toJson(v));
+            }
+        }
         o.set("numberednotationfont", Font.toJson(obj.numberedNotationFont));
         o.set("numberednotationgracefont", Font.toJson(obj.numberedNotationGraceFont));
         o.set("tablaturefont", Font.toJson(obj.tablatureFont));
         o.set("gracefont", Font.toJson(obj.graceFont));
         o.set("stafflinecolor", Color.toJson(obj.staffLineColor));
         o.set("barseparatorcolor", Color.toJson(obj.barSeparatorColor));
-        o.set("barnumberfont", Font.toJson(obj.barNumberFont));
         o.set("barnumbercolor", Color.toJson(obj.barNumberColor));
-        o.set("fingeringfont", Font.toJson(obj.fingeringFont));
-        o.set("inlinefingeringfont", Font.toJson(obj.inlineFingeringFont));
-        o.set("markerfont", Font.toJson(obj.markerFont));
         o.set("mainglyphcolor", Color.toJson(obj.mainGlyphColor));
         o.set("secondaryglyphcolor", Color.toJson(obj.secondaryGlyphColor));
         o.set("scoreinfocolor", Color.toJson(obj.scoreInfoColor));
@@ -41858,29 +42013,10 @@ class RenderingResourcesSerializer {
             case "smuflfontfamilyname":
                 obj.smuflFontFamilyName = v;
                 return true;
-            case "copyrightfont":
-                obj.copyrightFont = Font.fromJson(v);
-                return true;
-            case "titlefont":
-                obj.titleFont = Font.fromJson(v);
-                return true;
-            case "subtitlefont":
-                obj.subTitleFont = Font.fromJson(v);
-                return true;
-            case "wordsfont":
-                obj.wordsFont = Font.fromJson(v);
-                return true;
-            case "effectfont":
-                obj.effectFont = Font.fromJson(v);
-                return true;
-            case "timerfont":
-                obj.timerFont = Font.fromJson(v);
-                return true;
-            case "directionsfont":
-                obj.directionsFont = Font.fromJson(v);
-                return true;
-            case "fretboardnumberfont":
-                obj.fretboardNumberFont = Font.fromJson(v);
+            case "elementfonts":
+                JsonHelper.forEach(v, (v, k) => {
+                    obj.elementFonts.set(JsonHelper.parseEnum(k, NotationElement), Font.fromJson(v));
+                });
                 return true;
             case "numberednotationfont":
                 obj.numberedNotationFont = Font.fromJson(v);
@@ -41900,21 +42036,9 @@ class RenderingResourcesSerializer {
             case "barseparatorcolor":
                 obj.barSeparatorColor = Color.fromJson(v);
                 return true;
-            case "barnumberfont":
-                obj.barNumberFont = Font.fromJson(v);
-                return true;
             case "barnumbercolor":
                 obj.barNumberColor = Color.fromJson(v);
                 return true;
-            case "fingeringfont":
-                obj.fingeringFont = Font.fromJson(v);
-                return true;
-            case "inlinefingeringfont":
-                obj.inlineFingeringFont = Font.fromJson(v);
-                return true;
-            case "markerfont":
-                obj.markerFont = Font.fromJson(v);
-                return true;
             case "mainglyphcolor":
                 obj.mainGlyphColor = Color.fromJson(v);
                 return true;
@@ -41971,6 +42095,46 @@ var StaveProfile;
 class RenderingResources {
     static _sansFont = 'Arial, sans-serif';
     static _serifFont = 'Georgia, serif';
+    static _effectFont = new Font(RenderingResources._serifFont, 12, FontStyle.Italic);
+    /**
+     * The default fonts for notation elements if not specified by the user.
+     */
+    static defaultFonts = new Map([
+        [NotationElement.ScoreTitle, new Font(RenderingResources._serifFont, 32, FontStyle.Plain)],
+        [NotationElement.ScoreSubTitle, new Font(RenderingResources._serifFont, 20, FontStyle.Plain)],
+        [NotationElement.ScoreArtist, new Font(RenderingResources._serifFont, 20, FontStyle.Plain)],
+        [NotationElement.ScoreAlbum, new Font(RenderingResources._serifFont, 20, FontStyle.Plain)],
+        [NotationElement.ScoreWords, new Font(RenderingResources._serifFont, 15, FontStyle.Plain)],
+        [NotationElement.ScoreMusic, new Font(RenderingResources._serifFont, 15, FontStyle.Plain)],
+        [NotationElement.ScoreWordsAndMusic, new Font(RenderingResources._serifFont, 15, FontStyle.Plain)],
+        [NotationElement.ScoreCopyright, new Font(RenderingResources._sansFont, 12, FontStyle.Plain, FontWeight.Bold)],
+        [NotationElement.EffectBeatTimer, new Font(RenderingResources._serifFont, 12, FontStyle.Plain)],
+        [NotationElement.EffectDirections, new Font(RenderingResources._serifFont, 14, FontStyle.Plain)],
+        [NotationElement.ChordDiagramFretboardNumbers, new Font(RenderingResources._sansFont, 11, FontStyle.Plain)],
+        [NotationElement.EffectFingering, new Font(RenderingResources._serifFont, 14, FontStyle.Plain)],
+        [NotationElement.EffectMarker, new Font(RenderingResources._serifFont, 14, FontStyle.Plain, FontWeight.Bold)],
+        [NotationElement.EffectCapo, RenderingResources._effectFont],
+        [NotationElement.EffectFreeTime, RenderingResources._effectFont],
+        [NotationElement.EffectLyrics, RenderingResources._effectFont],
+        [NotationElement.EffectTap, RenderingResources._effectFont],
+        [NotationElement.ChordDiagrams, RenderingResources._effectFont],
+        [NotationElement.EffectChordNames, RenderingResources._effectFont],
+        [NotationElement.EffectText, RenderingResources._effectFont],
+        [NotationElement.EffectPalmMute, RenderingResources._effectFont],
+        [NotationElement.EffectLetRing, RenderingResources._effectFont],
+        [NotationElement.EffectBeatBarre, RenderingResources._effectFont],
+        [NotationElement.EffectTripletFeel, RenderingResources._effectFont],
+        [NotationElement.EffectHarmonics, RenderingResources._effectFont],
+        [NotationElement.EffectPickSlide, RenderingResources._effectFont],
+        [NotationElement.GuitarTuning, RenderingResources._effectFont],
+        [NotationElement.EffectRasgueado, RenderingResources._effectFont],
+        [NotationElement.EffectWhammyBar, RenderingResources._effectFont],
+        [NotationElement.TrackNames, RenderingResources._effectFont],
+        [NotationElement.RepeatCount, new Font(RenderingResources._sansFont, 11, FontStyle.Plain)],
+        [NotationElement.BarNumber, new Font(RenderingResources._sansFont, 11, FontStyle.Plain)],
+        [NotationElement.ScoreBendSlur, new Font(RenderingResources._sansFont, 11, FontStyle.Plain)],
+        [NotationElement.EffectAlternateEndings, new Font(RenderingResources._serifFont, 15, FontStyle.Plain)]
+    ]);
     /**
      * The name of the SMuFL Font to use for rendering music symbols.
      *
@@ -41997,50 +42161,168 @@ class RenderingResources {
      * The font to use for displaying the songs copyright information in the header of the music sheet.
      * @defaultValue `bold 12px Arial, sans-serif`
      * @since 0.9.6
+     * @deprecated use {@link elementFonts} with {@link NotationElement.ScoreCopyright}
+     */
+    get copyrightFont() {
+        return this.elementFonts.get(NotationElement.ScoreCopyright);
+    }
+    /**
+     * @deprecated use {@link elementFonts} with {@link NotationElement.ScoreCopyright}
      */
-    copyrightFont = new Font(RenderingResources._sansFont, 12, FontStyle.Plain, FontWeight.Bold);
+    set copyrightFont(value) {
+        this.elementFonts.set(NotationElement.ScoreCopyright, value);
+    }
     /**
      * The font to use for displaying the songs title in the header of the music sheet.
      * @defaultValue `32px Georgia, serif`
      * @since 0.9.6
+     * @deprecated use {@link elementFonts} with {@link NotationElement.ScoreTitle}
+     */
+    get titleFont() {
+        return this.elementFonts.get(NotationElement.ScoreTitle);
+    }
+    /**
+     * @deprecated use {@link elementFonts} with {@link NotationElement.ScoreTitle}
      */
-    titleFont = new Font(RenderingResources._serifFont, 32, FontStyle.Plain);
+    set titleFont(value) {
+        this.elementFonts.set(NotationElement.ScoreTitle, value);
+    }
     /**
      * The font to use for displaying the songs subtitle in the header of the music sheet.
      * @defaultValue `20px Georgia, serif`
      * @since 0.9.6
+     * @deprecated use {@link elementFonts} with {@link NotationElement.ScoreSubTitle}
+     */
+    get subTitleFont() {
+        return this.elementFonts.get(NotationElement.ScoreSubTitle);
+    }
+    /**
+     * @deprecated use {@link elementFonts} with {@link NotationElement.ScoreSubTitle}
      */
-    subTitleFont = new Font(RenderingResources._serifFont, 20, FontStyle.Plain);
+    set subTitleFont(value) {
+        this.elementFonts.set(NotationElement.ScoreSubTitle, value);
+    }
     /**
      * The font to use for displaying the lyrics information in the header of the music sheet.
      * @defaultValue `15px Arial, sans-serif`
      * @since 0.9.6
+     * @deprecated use {@link elementFonts} with {@link NotationElement.ScoreWords}
      */
-    wordsFont = new Font(RenderingResources._serifFont, 15, FontStyle.Plain);
+    get wordsFont() {
+        return this.elementFonts.get(NotationElement.ScoreWords);
+    }
     /**
-     * The font to use for displaying certain effect related elements in the music sheet.
-     * @defaultValue `italic 12px Georgia, serif`
-     * @since 0.9.6
+     * @deprecated use {@link elementFonts} with {@link NotationElement.ScoreWords}
      */
-    effectFont = new Font(RenderingResources._serifFont, 12, FontStyle.Italic);
+    set wordsFont(value) {
+        this.elementFonts.set(NotationElement.ScoreWords, value);
+    }
     /**
      * The font to use for displaying beat time information in the music sheet.
      * @defaultValue `12px Georgia, serif`
      * @since 1.4.0
+     * @deprecated use {@link elementFonts} with {@link NotationElement.EffectBeatTimer}
+     */
+    get timerFont() {
+        return this.elementFonts.get(NotationElement.EffectBeatTimer);
+    }
+    /**
+     * @deprecated use {@link elementFonts} with {@link NotationElement.EffectBeatTimer}
      */
-    timerFont = new Font(RenderingResources._serifFont, 12, FontStyle.Plain);
+    set timerFont(value) {
+        this.elementFonts.set(NotationElement.EffectBeatTimer, value);
+    }
     /**
      * The font to use for displaying the directions texts.
      * @defaultValue `14px Georgia, serif`
      * @since 1.4.0
+     * @deprecated use {@link elementFonts} with {@link NotationElement.EffectDirections}
+     */
+    get directionsFont() {
+        return this.elementFonts.get(NotationElement.EffectDirections);
+    }
+    /**
+     * @deprecated use {@link elementFonts} with {@link NotationElement.EffectDirections}
      */
-    directionsFont = new Font(RenderingResources._serifFont, 14, FontStyle.Plain);
+    set directionsFont(value) {
+        this.elementFonts.set(NotationElement.EffectDirections, value);
+    }
     /**
      * The font to use for displaying the fretboard numbers in chord diagrams.
      * @defaultValue `11px Arial, sans-serif`
      * @since 0.9.6
+     * @deprecated use {@link elementFonts} with {@link NotationElement.ChordDiagramFretboardNumbers}
+     */
+    get fretboardNumberFont() {
+        return this.elementFonts.get(NotationElement.ChordDiagramFretboardNumbers);
+    }
+    /**
+     * @deprecated use {@link elementFonts} with {@link NotationElement.ChordDiagramFretboardNumbers}
+     */
+    set fretboardNumberFont(value) {
+        this.elementFonts.set(NotationElement.ChordDiagramFretboardNumbers, value);
+    }
+    /**
+     * Unused, see deprecation note.
+     * @defaultValue `14px Georgia, serif`
+     * @since 0.9.6
+     * @deprecated Since 1.7.0 alphaTab uses the glyphs contained in the SMuFL font
+     * @json_ignore
      */
-    fretboardNumberFont = new Font(RenderingResources._sansFont, 11, FontStyle.Plain);
+    fingeringFont = RenderingResources._effectFont;
+    /**
+     * Unused, see deprecation note.
+     * @defaultValue `12px Georgia, serif`
+     * @since 1.4.0
+     * @deprecated Since 1.7.0 alphaTab uses the glyphs contained in the SMuFL font
+     * @json_ignore
+     */
+    inlineFingeringFont = RenderingResources._effectFont;
+    /**
+     * The font to use for section marker labels shown above the music sheet.
+     * @defaultValue `bold 14px Georgia, serif`
+     * @since 0.9.6
+     * @deprecated use {@link elementFonts} with {@link NotationElement.EffectMarker}
+     */
+    get markerFont() {
+        return this.elementFonts.get(NotationElement.EffectMarker);
+    }
+    /**
+     * @deprecated use {@link elementFonts} with {@link NotationElement.EffectMarker}
+     */
+    set markerFont(value) {
+        this.elementFonts.set(NotationElement.EffectMarker, value);
+    }
+    /**
+     * Ununsed, see deprecation note.
+     * @defaultValue `italic 12px Georgia, serif`
+     * @since 0.9.6
+     * @deprecated use {@link elementFonts} with the respective
+     * @json_ignore
+     */
+    effectFont = RenderingResources._effectFont;
+    /**
+     * The font to use for displaying the bar numbers above the music sheet.
+     * @defaultValue `11px Arial, sans-serif`
+     * @since 0.9.6
+     * @deprecated use {@link elementFonts} with {@link NotationElement.BarNumber}
+     */
+    get barNumberFont() {
+        return this.elementFonts.get(NotationElement.BarNumber);
+    }
+    /**
+     * @deprecated use {@link elementFonts} with {@link NotationElement.BarNumber}
+     */
+    set barNumberFont(value) {
+        this.elementFonts.set(NotationElement.BarNumber, value);
+    }
+    // NOTE: the main staff fonts are still own properties.
+    /**
+     * The fonts used by individual elements. Check {@link defaultFonts} for the elements which have custom fonts.
+     * Removing fonts from this map can lead to unexpected side effects and errors. Only update it with new values.
+     * @json_immutable
+     */
+    elementFonts = new Map();
     /**
      * The font to use for displaying the numbered music notation in the music sheet.
      * @defaultValue `14px Arial, sans-serif`
@@ -42077,38 +42359,12 @@ class RenderingResources {
      * @since 0.9.6
      */
     barSeparatorColor = new Color(34, 34, 17, 0xff);
-    /**
-     * The font to use for displaying the bar numbers above the music sheet.
-     * @defaultValue `11px Arial, sans-serif`
-     * @since 0.9.6
-     */
-    barNumberFont = new Font(RenderingResources._sansFont, 11, FontStyle.Plain);
     /**
      * The color to use for displaying the bar numbers above the music sheet.
      * @defaultValue `rgb(200, 0, 0)`
      * @since 0.9.6
      */
     barNumberColor = new Color(200, 0, 0, 0xff);
-    /**
-     * The font to use for displaying finger information in the music sheet.
-     * @defaultValue `14px Georgia, serif`
-     * @since 0.9.6
-     * @deprecated Since 1.7.0 alphaTab uses the glyphs contained in the SMuFL font
-     */
-    fingeringFont = new Font(RenderingResources._serifFont, 14, FontStyle.Plain);
-    /**
-     * The font to use for displaying finger information when inline into the music sheet.
-     * @defaultValue `12px Georgia, serif`
-     * @since 1.4.0
-     * @deprecated Since 1.7.0 alphaTab uses the glyphs contained in the SMuFL font
-     */
-    inlineFingeringFont = new Font(RenderingResources._serifFont, 12, FontStyle.Plain);
-    /**
-     * The font to use for section marker labels shown above the music sheet.
-     * @defaultValue `bold 14px Georgia, serif`
-     * @since 0.9.6
-     */
-    markerFont = new Font(RenderingResources._serifFont, 14, FontStyle.Plain, FontWeight.Bold);
     /**
      * The color to use for music notation elements of the primary voice.
      * @defaultValue `rgb(0, 0, 0)`
@@ -42127,28 +42383,50 @@ class RenderingResources {
      * @since 0.9.6
      */
     scoreInfoColor = new Color(0, 0, 0, 0xff);
+    constructor() {
+        for (const [k, v] of RenderingResources.defaultFonts) {
+            this.elementFonts.set(k, v.withSize(v.size));
+        }
+    }
     /**
      * @internal
      * @param element
      */
     getFontForElement(element) {
+        let notationElement = NotationElement.ScoreWords;
         switch (element) {
             case ScoreSubElement.Title:
-                return this.titleFont;
+                notationElement = NotationElement.ScoreTitle;
+                break;
             case ScoreSubElement.SubTitle:
+                notationElement = NotationElement.ScoreSubTitle;
+                break;
             case ScoreSubElement.Artist:
+                notationElement = NotationElement.ScoreArtist;
+                break;
             case ScoreSubElement.Album:
-                return this.subTitleFont;
+                notationElement = NotationElement.ScoreAlbum;
+                break;
             case ScoreSubElement.Words:
+                notationElement = NotationElement.ScoreWords;
+                break;
             case ScoreSubElement.Music:
+                notationElement = NotationElement.ScoreMusic;
+                break;
             case ScoreSubElement.WordsAndMusic:
-            case ScoreSubElement.Transcriber:
-                return this.wordsFont;
+                notationElement = NotationElement.ScoreWordsAndMusic;
+                break;
             case ScoreSubElement.Copyright:
             case ScoreSubElement.CopyrightSecondLine:
-                return this.copyrightFont;
+                notationElement = NotationElement.ScoreCopyright;
+                break;
+            default:
+                notationElement = NotationElement.ScoreWords;
+                break;
         }
-        return this.wordsFont;
+        return this.elementFonts.has(notationElement)
+            ? this.elementFonts.get(notationElement)
+            : RenderingResources.defaultFonts.get(NotationElement.ScoreWords);
     }
 }
 
@@ -42453,6 +42731,13 @@ class DisplaySettings {
      * @defaultValue `5`
      */
     trackStaffPaddingBetween = 5;
+    /**
+     * The additional padding to apply between multiple lyric lines.
+     * @since 1.8.0
+     * @category Display
+     * @defaultValue `5`
+     */
+    lyricLinesPaddingBetween = 5;
     /**
      * The mode used to arrange staves and systems.
      * @since 1.3.0
@@ -42563,6 +42848,7 @@ class DisplaySettingsSerializer {
         o.set("staffpaddingleft", obj.staffPaddingLeft);
         o.set("effectbandpaddingbottom", obj.effectBandPaddingBottom);
         o.set("trackstaffpaddingbetween", obj.trackStaffPaddingBetween);
+        o.set("lyriclinespaddingbetween", obj.lyricLinesPaddingBetween);
         o.set("systemslayoutmode", obj.systemsLayoutMode);
         return o;
     }
@@ -42649,6 +42935,9 @@ class DisplaySettingsSerializer {
             case "trackstaffpaddingbetween":
                 obj.trackStaffPaddingBetween = v;
                 return true;
+            case "lyriclinespaddingbetween":
+                obj.lyricLinesPaddingBetween = v;
+                return true;
             case "systemslayoutmode":
                 obj.systemsLayoutMode = JsonHelper.parseEnum(v, SystemsLayoutMode);
                 return true;
@@ -55357,23 +55646,20 @@ class BrowserUiFacade {
         this._contents = '';
         const element = api.container;
         if (settings.core.tex) {
-            this._contents = element.element.innerText;
+            this._contents = element.element.textContent;
             element.element.innerText = '';
         }
         this._createStyleElements(settings);
         this._file = settings.core.file;
     }
     _setupFontCheckers(settings) {
-        this._registerFontChecker(settings.display.resources.copyrightFont);
-        this._registerFontChecker(settings.display.resources.effectFont);
+        for (const font of settings.display.resources.elementFonts.values()) {
+            this._registerFontChecker(font);
+        }
         this._registerFontChecker(settings.display.resources.graceFont);
-        this._registerFontChecker(settings.display.resources.markerFont);
         this._registerFontChecker(settings.display.resources.tablatureFont);
-        this._registerFontChecker(settings.display.resources.titleFont);
-        this._registerFontChecker(settings.display.resources.wordsFont);
-        this._registerFontChecker(settings.display.resources.barNumberFont);
-        this._registerFontChecker(settings.display.resources.fretboardNumberFont);
-        this._registerFontChecker(settings.display.resources.subTitleFont);
+        this._registerFontChecker(settings.display.resources.numberedNotationFont);
+        this._registerFontChecker(settings.display.resources.numberedNotationGraceFont);
     }
     _registerFontChecker(font) {
         if (!this._fontCheckers.has(font.families.join(', '))) {
@@ -57210,7 +57496,9 @@ class AlternateEndingsGlyph extends EffectGlyph {
     }
     doLayout() {
         super.doLayout();
-        this.height = this.renderer.resources.wordsFont.size + this.renderer.smuflMetrics.alternateEndingsPadding * 2;
+        this.height =
+            this.renderer.resources.elementFonts.get(NotationElement.EffectAlternateEndings).size +
+                this.renderer.smuflMetrics.alternateEndingsPadding * 2;
         let endingsStrings = '';
         for (let i = 0, j = this._endings.length; i < j; i++) {
             endingsStrings += this._endings[i] + 1;
@@ -57246,7 +57534,7 @@ class AlternateEndingsGlyph extends EffectGlyph {
             const baseline = canvas.textBaseline;
             canvas.textBaseline = TextBaseline.Top;
             const res = this.renderer.resources;
-            canvas.font = res.wordsFont;
+            canvas.font = res.elementFonts.get(NotationElement.EffectAlternateEndings);
             canvas.fillText(this._endingsString, cx + this.x + this.renderer.smuflMetrics.alternateEndingsPadding, cy + this.y + this.renderer.smuflMetrics.alternateEndingsPadding);
             canvas.textBaseline = baseline;
         }
@@ -57388,10 +57676,12 @@ class LineRangedGlyph extends GroupedEffectGlyph {
     _label;
     _dashed;
     _labelWidth = 0;
-    constructor(label, dashed = true) {
+    _fontElement;
+    constructor(label, fontElement, dashed = true) {
         super(BeatXPosition.OnNotes);
         this._label = label;
         this._dashed = dashed;
+        this._fontElement = fontElement;
     }
     doLayout() {
         if (this.renderer.settings.notation.extendLineEffectsToBeatEnd) {
@@ -57399,14 +57689,14 @@ class LineRangedGlyph extends GroupedEffectGlyph {
             this.forceGroupedRendering = true;
         }
         super.doLayout();
-        this.renderer.scoreRenderer.canvas.font = this.renderer.resources.effectFont;
+        this.renderer.scoreRenderer.canvas.font = this.renderer.resources.elementFonts.get(this._fontElement);
         const size = this.renderer.scoreRenderer.canvas.measureText(this._label);
         this.height = size.height;
         this._labelWidth = size.width;
     }
     paintNonGrouped(cx, cy, canvas) {
         const res = this.renderer.resources;
-        canvas.font = res.effectFont;
+        canvas.font = res.elementFonts.get(this._fontElement);
         const b = canvas.textBaseline;
         canvas.textBaseline = TextBaseline.Middle;
         canvas.fillText(this._label, cx + this.x - this._labelWidth / 2, cy + this.y + this.height / 2);
@@ -57467,7 +57757,7 @@ class BeatBarreEffectInfo extends EffectInfo {
                 break;
         }
         barre += `B ${BeatBarreEffectInfo.toRoman(beat.barreFret)}`;
-        return new LineRangedGlyph(barre, false);
+        return new LineRangedGlyph(barre, NotationElement.EffectBeatBarre, false);
     }
     static _romanLetters = new Map([
         // ['M', 1000],
@@ -57517,7 +57807,7 @@ class BeatTimerGlyph extends EffectGlyph {
         const seconds = ((this._timer - minutes * 60000) / 1000) | 0;
         this._text = `${minutes}:${seconds.toString().padStart(2, '0')}`;
         const c = this.renderer.scoreRenderer.canvas;
-        c.font = this.renderer.resources.timerFont;
+        c.font = this.renderer.resources.elementFonts.get(NotationElement.EffectBeatTimer);
         const size = c.measureText(this._text);
         this._textHeight = c.font.size + this.renderer.smuflMetrics.beatTimerPadding * 2;
         this._textWidth = size.width + this.renderer.smuflMetrics.beatTimerPadding * 2;
@@ -57529,7 +57819,7 @@ class BeatTimerGlyph extends EffectGlyph {
         const f = canvas.font;
         const b = canvas.textBaseline;
         const a = canvas.textAlign;
-        canvas.font = this.renderer.resources.timerFont;
+        canvas.font = this.renderer.resources.elementFonts.get(NotationElement.EffectBeatTimer);
         canvas.textBaseline = TextBaseline.Middle;
         canvas.textAlign = TextAlign.Center;
         canvas.fillText(this._text, cx + this.x, cy + this.y + this.height / 2);
@@ -57638,7 +57928,7 @@ class CapoEffectInfo extends EffectInfo {
         return beat.index === 0 && beat.voice.bar.index === 0 && beat.voice.bar.staff.capo !== 0;
     }
     createNewGlyph(renderer, beat) {
-        return new TextGlyph(0, 0, `Capo. fret ${beat.voice.bar.staff.capo}`, renderer.resources.effectFont, TextAlign.Left);
+        return new TextGlyph(0, 0, `Capo. fret ${beat.voice.bar.staff.capo}`, renderer.resources.elementFonts.get(NotationElement.EffectCapo), TextAlign.Left);
     }
     canExpand(_from, _to) {
         return false;
@@ -57655,31 +57945,41 @@ class ChordDiagramGlyph extends EffectGlyph {
     _fretRow = 0;
     _firstFretSpacing = 0;
     _center;
-    constructor(x, y, chord, center = false) {
+    _fontElement;
+    constructor(x, y, chord, fontElement, center = false) {
         super(x, y);
         this._chord = chord;
         this._center = center;
+        this._fontElement = fontElement;
     }
     doLayout() {
         super.doLayout();
         const res = this.renderer.resources;
-        this._textRow = res.effectFont.size * 1.5;
-        this._fretRow = res.effectFont.size * 1.5;
-        if (this._chord.firstFret > 1) {
-            this._firstFretSpacing = this.renderer.smuflMetrics.chordDiagramFretSpacing;
-        }
-        else {
-            this._firstFretSpacing = 0;
-        }
-        this.height =
-            this._textRow +
+        const font = res.elementFonts.get(this._fontElement);
+        this._textRow = font.size * 1.5;
+        this._fretRow = font.size * 1.5;
+        this.height = this._textRow;
+        this.width = 2 * this.renderer.smuflMetrics.chordDiagramPaddingX;
+        if (this.renderer.settings.notation.isNotationElementVisible(NotationElement.ChordDiagramFretboardNumbers)) {
+            if (this._chord.firstFret > 1) {
+                this._firstFretSpacing = this.renderer.smuflMetrics.chordDiagramFretSpacing;
+            }
+            else {
+                this._firstFretSpacing = 0;
+            }
+            this.height +=
                 this._fretRow +
-                ChordDiagramGlyph._frets * this.renderer.smuflMetrics.chordDiagramFretSpacing +
-                2 * this.renderer.smuflMetrics.chordDiagramPaddingY;
-        this.width =
-            this._firstFretSpacing +
-                (this._chord.strings.length - 1) * this.renderer.smuflMetrics.chordDiagramStringSpacing +
-                2 * this.renderer.smuflMetrics.chordDiagramPaddingX;
+                    ChordDiagramGlyph._frets * this.renderer.smuflMetrics.chordDiagramFretSpacing +
+                    2 * this.renderer.smuflMetrics.chordDiagramPaddingY;
+            this.width +=
+                this._firstFretSpacing +
+                    (this._chord.strings.length - 1) * this.renderer.smuflMetrics.chordDiagramStringSpacing;
+        }
+        else if (this._chord.showName) {
+            const canvas = this.renderer.scoreRenderer.canvas;
+            canvas.font = font;
+            this.width += canvas.measureText(this._chord.name).width;
+        }
     }
     paint(cx, cy, canvas) {
         cx += this.x + this.renderer.smuflMetrics.chordDiagramPaddingX + this._firstFretSpacing;
@@ -57687,25 +57987,35 @@ class ChordDiagramGlyph extends EffectGlyph {
         if (this._center) {
             cx -= this.width / 2;
         }
-        const stringSpacing = this.renderer.smuflMetrics.chordDiagramStringSpacing;
-        const fretSpacing = this.renderer.smuflMetrics.chordDiagramFretSpacing;
         const res = this.renderer.resources;
         const lineWidth = res.engravingSettings.chordDiagramLineWidth;
         const w = this.width - 2 * this.renderer.smuflMetrics.chordDiagramPaddingX - this._firstFretSpacing + lineWidth;
-        const circleHeight = res.engravingSettings.glyphHeights.get(MusicFontSymbol.FretboardFilledCircle);
-        const circleTopOffset = res.engravingSettings.glyphTop.get(MusicFontSymbol.FretboardFilledCircle);
-        const xTopOffset = res.engravingSettings.glyphHeights.get(MusicFontSymbol.FretboardX) / 2;
-        const oTopOffset = res.engravingSettings.glyphHeights.get(MusicFontSymbol.FretboardO) / 2;
         const align = canvas.textAlign;
         const baseline = canvas.textBaseline;
-        canvas.font = res.effectFont;
+        const font = res.elementFonts.get(this._fontElement);
+        canvas.font = font;
         canvas.textAlign = TextAlign.Center;
         canvas.textBaseline = TextBaseline.Top;
         if (this._chord.showName) {
-            canvas.fillText(this._chord.name, cx + w / 2, cy + res.effectFont.size / 2);
+            canvas.fillText(this._chord.name, cx + w / 2, cy + font.size / 2);
+        }
+        if (this.renderer.settings.notation.isNotationElementVisible(NotationElement.ChordDiagramFretboardNumbers)) {
+            this._paintFretboard(cx, cy, canvas, w);
         }
+        canvas.textAlign = align;
+        canvas.textBaseline = baseline;
+    }
+    _paintFretboard(cx, cy, canvas, w) {
         cy += this._textRow;
-        canvas.font = res.fretboardNumberFont;
+        const res = this.renderer.resources;
+        const stringSpacing = this.renderer.smuflMetrics.chordDiagramStringSpacing;
+        const fretSpacing = this.renderer.smuflMetrics.chordDiagramFretSpacing;
+        const circleHeight = res.engravingSettings.glyphHeights.get(MusicFontSymbol.FretboardFilledCircle);
+        const circleTopOffset = res.engravingSettings.glyphTop.get(MusicFontSymbol.FretboardFilledCircle);
+        const xTopOffset = res.engravingSettings.glyphHeights.get(MusicFontSymbol.FretboardX) / 2;
+        const oTopOffset = res.engravingSettings.glyphHeights.get(MusicFontSymbol.FretboardO) / 2;
+        const lineWidth = res.engravingSettings.chordDiagramLineWidth;
+        canvas.font = res.elementFonts.get(NotationElement.ChordDiagramFretboardNumbers);
         canvas.textBaseline = TextBaseline.Middle;
         for (let i = 0; i < this._chord.strings.length; i++) {
             const x = cx + i * stringSpacing;
@@ -57768,8 +58078,6 @@ class ChordDiagramGlyph extends EffectGlyph {
             const xRight = cx + (this._chord.strings.length - strings[0] - 1) * stringSpacing;
             canvas.fillRect(xLeft, y - circleHeight / 2, xRight - xLeft, circleHeight);
         }
-        canvas.textAlign = align;
-        canvas.textBaseline = baseline;
     }
 }
 
@@ -57795,8 +58103,8 @@ class ChordsEffectInfo extends EffectInfo {
     createNewGlyph(renderer, beat) {
         const showDiagram = beat.voice.bar.staff.track.score.stylesheet.globalDisplayChordDiagramsInScore;
         return showDiagram
-            ? new ChordDiagramGlyph(0, 0, beat.chord, true)
-            : new TextGlyph(0, 0, beat.chord.name, renderer.resources.effectFont, TextAlign.Center);
+            ? new ChordDiagramGlyph(0, 0, beat.chord, NotationElement.EffectChordNames, true)
+            : new TextGlyph(0, 0, beat.chord.name, renderer.resources.elementFonts.get(NotationElement.EffectChordNames), TextAlign.Center);
     }
     canExpand(_from, _to) {
         return false;
@@ -57907,14 +58215,14 @@ class JumpDirectionGlyph extends Glyph {
     }
     doLayout() {
         const c = this.renderer.scoreRenderer.canvas;
-        c.font = this.renderer.resources.directionsFont;
+        c.font = this.renderer.resources.elementFonts.get(NotationElement.EffectDirections);
         this.height = c.measureText(this._text).height;
     }
     paint(cx, cy, canvas) {
         const font = canvas.font;
         const baseline = canvas.textBaseline;
         const align = canvas.textAlign;
-        canvas.font = this.renderer.resources.directionsFont;
+        canvas.font = this.renderer.resources.elementFonts.get(NotationElement.EffectDirections);
         canvas.textBaseline = TextBaseline.Middle;
         canvas.textAlign = TextAlign.Right;
         canvas.fillText(this._text, cx + this.x, cy + this.y + this.height / 2);
@@ -58810,7 +59118,7 @@ class FreeTimeEffectInfo extends EffectInfo {
             (masterBar.index === 0 || masterBar.isFreeTime !== masterBar.previousMasterBar.isFreeTime));
     }
     createNewGlyph(renderer, _beat) {
-        return new TextGlyph(0, 0, 'Free time', renderer.resources.effectFont, TextAlign.Left);
+        return new TextGlyph(0, 0, 'Free time', renderer.resources.elementFonts.get(NotationElement.EffectFreeTime), TextAlign.Left);
     }
     canExpand(_from, _to) {
         return true;
@@ -58948,7 +59256,7 @@ class HarmonicsEffectInfo extends NoteEffectInfoBase {
         return EffectBarGlyphSizing.GroupedOnBeat;
     }
     createNewGlyph(_renderer, _beat) {
-        return new LineRangedGlyph(HarmonicsEffectInfo.harmonicToString(this._harmonicType));
+        return new LineRangedGlyph(HarmonicsEffectInfo.harmonicToString(this._harmonicType), NotationElement.EffectHarmonics);
     }
     static harmonicToString(type) {
         switch (type) {
@@ -59021,7 +59329,7 @@ class LetRingEffectInfo extends EffectInfo {
         return EffectBarGlyphSizing.GroupedOnBeat;
     }
     createNewGlyph(_renderer, _beat) {
-        return new LineRangedGlyph('LetRing');
+        return new LineRangedGlyph('LetRing', NotationElement.EffectLetRing);
     }
     canExpand(_from, _to) {
         return true;
@@ -59033,6 +59341,7 @@ class LetRingEffectInfo extends EffectInfo {
  */
 class LyricsGlyph extends EffectGlyph {
     _lines;
+    _linePositions = [];
     font;
     textAlign;
     constructor(x, y, lines, font, textAlign = TextAlign.Center) {
@@ -59043,7 +59352,17 @@ class LyricsGlyph extends EffectGlyph {
     }
     doLayout() {
         super.doLayout();
-        this.height = this.font.size * this._lines.length;
+        const lineSpacing = this.renderer.settings.display.lyricLinesPaddingBetween;
+        const canvas = this.renderer.scoreRenderer.canvas;
+        canvas.font = this.font;
+        let y = 0;
+        for (const line of this._lines) {
+            this._linePositions.push(y);
+            const size = canvas.measureText(line.length > 0 ? line : ' ');
+            y += size.height + lineSpacing;
+        }
+        y -= lineSpacing;
+        this.height = y;
     }
     paint(cx, cy, canvas) {
         canvas.font = this.font;
@@ -59051,7 +59370,7 @@ class LyricsGlyph extends EffectGlyph {
         canvas.textAlign = this.textAlign;
         for (let i = 0; i < this._lines.length; i++) {
             if (this._lines[i]) {
-                canvas.fillText(this._lines[i], cx + this.x, cy + this.y + i * this.font.size);
+                canvas.fillText(this._lines[i], cx + this.x, cy + this.y + this._linePositions[i]);
             }
         }
         canvas.textAlign = old;
@@ -59078,7 +59397,7 @@ class LyricsEffectInfo extends EffectInfo {
         return !!beat.lyrics;
     }
     createNewGlyph(renderer, beat) {
-        return new LyricsGlyph(0, 0, beat.lyrics, renderer.resources.effectFont, TextAlign.Center);
+        return new LyricsGlyph(0, 0, beat.lyrics, renderer.resources.elementFonts.get(NotationElement.EffectLyrics), TextAlign.Center);
     }
     canExpand(_from, _to) {
         return true;
@@ -59110,7 +59429,7 @@ class MarkerEffectInfo extends EffectInfo {
     createNewGlyph(renderer, beat) {
         return new TextGlyph(0, 0, !beat.voice.bar.masterBar.section.marker
             ? beat.voice.bar.masterBar.section.text
-            : `[${beat.voice.bar.masterBar.section.marker}] ${beat.voice.bar.masterBar.section.text}`, renderer.resources.markerFont, TextAlign.Left);
+            : `[${beat.voice.bar.masterBar.section.marker}] ${beat.voice.bar.masterBar.section.text}`, renderer.resources.elementFonts.get(NotationElement.EffectMarker), TextAlign.Left);
     }
     canExpand(_from, _to) {
         return true;
@@ -59549,7 +59868,7 @@ class PalmMuteEffectInfo extends NoteEffectInfoBase {
         return EffectBarGlyphSizing.GroupedOnBeat;
     }
     createNewGlyph(_renderer, _beat) {
-        return new LineRangedGlyph('P.M.');
+        return new LineRangedGlyph('P.M.', NotationElement.EffectPalmMute);
     }
 }
 
@@ -59567,7 +59886,7 @@ class PickSlideEffectInfo extends NoteEffectInfoBase {
         return EffectBarGlyphSizing.GroupedOnBeat;
     }
     createNewGlyph(_renderer, _beat) {
-        return new LineRangedGlyph('P.S.');
+        return new LineRangedGlyph('P.S.', NotationElement.EffectPickSlide);
     }
 }
 
@@ -59642,7 +59961,7 @@ class RasgueadoEffectInfo extends EffectInfo {
         return EffectBarGlyphSizing.GroupedOnBeat;
     }
     createNewGlyph(_renderer, _beat) {
-        return new LineRangedGlyph('rasg.');
+        return new LineRangedGlyph('rasg.', NotationElement.EffectRasgueado);
     }
     canExpand(_from, _to) {
         return true;
@@ -63250,12 +63569,12 @@ class TapEffectInfo extends EffectInfo {
     createNewGlyph(renderer, beat) {
         const res = renderer.resources;
         if (beat.slap) {
-            return new TextGlyph(0, 0, 'S', res.effectFont, TextAlign.Center);
+            return new TextGlyph(0, 0, 'S', res.elementFonts.get(NotationElement.EffectTap), TextAlign.Center);
         }
         if (beat.pop) {
-            return new TextGlyph(0, 0, 'P', res.effectFont, TextAlign.Center);
+            return new TextGlyph(0, 0, 'P', res.elementFonts.get(NotationElement.EffectTap), TextAlign.Center);
         }
-        return new TextGlyph(0, 0, 'T', res.effectFont, TextAlign.Center);
+        return new TextGlyph(0, 0, 'T', res.elementFonts.get(NotationElement.EffectTap), TextAlign.Center);
     }
     canExpand(_from, _to) {
         return true;
@@ -63284,7 +63603,7 @@ class BarTempoGlyph extends EffectGlyph {
         for (const automation of this._tempoAutomations) {
             let x = cx + this.renderer.getRatioPositionX(automation.ratioPosition);
             const res = this.renderer.resources;
-            canvas.font = res.markerFont;
+            canvas.font = res.elementFonts.get(NotationElement.EffectMarker);
             const notePosY = cy +
                 this.y +
                 this.height +
@@ -63362,7 +63681,7 @@ class TextEffectInfo extends EffectInfo {
         return !!beat.text;
     }
     createNewGlyph(renderer, beat) {
-        return new TextGlyph(0, 0, beat.text, renderer.resources.effectFont, TextAlign.Left);
+        return new TextGlyph(0, 0, beat.text, renderer.resources.elementFonts.get(NotationElement.EffectText), TextAlign.Left);
     }
     canExpand(_from, _to) {
         return true;
@@ -63487,7 +63806,7 @@ class TripletFeelGlyph extends EffectGlyph {
         const textY = cy + this.height;
         const b = canvas.textBaseline;
         canvas.textBaseline = TextBaseline.Bottom;
-        canvas.font = this.renderer.resources.effectFont;
+        canvas.font = this.renderer.resources.elementFonts.get(NotationElement.EffectTripletFeel);
         canvas.fillText('(', cx, textY);
         cx += canvas.measureText('( ').width;
         cx = this._drawGroup(cx, noteY + this._tupletHeight, canvas, leftNotes);
@@ -63729,7 +64048,7 @@ class WhammyBarEffectInfo extends EffectInfo {
         return beat.hasWhammyBar;
     }
     createNewGlyph(_renderer, _beat) {
-        return new LineRangedGlyph('w/bar');
+        return new LineRangedGlyph('w/bar', NotationElement.EffectWhammyBar);
     }
     canExpand(_from, _to) {
         return true;
@@ -63881,7 +64200,7 @@ class RowContainerGlyph extends GlyphGroup {
 class ChordDiagramContainerGlyph extends RowContainerGlyph {
     addChord(chord) {
         if (chord.strings.length > 0) {
-            const chordDiagram = new ChordDiagramGlyph(0, 0, chord);
+            const chordDiagram = new ChordDiagramGlyph(0, 0, chord, NotationElement.ChordDiagrams);
             chordDiagram.renderer = this.renderer;
             chordDiagram.doLayout();
             this.glyphs.push(chordDiagram);
@@ -63945,7 +64264,7 @@ class TuningGlyph extends GlyphGroup {
         this.height = 0;
         // Track name
         if (this._trackLabel.length > 0) {
-            const trackName = new TextGlyph(0, this.height, this._trackLabel, res.effectFont, TextAlign.Left);
+            const trackName = new TextGlyph(0, this.height, this._trackLabel, res.elementFonts.get(NotationElement.GuitarTuning), TextAlign.Left);
             trackName.renderer = this.renderer;
             trackName.doLayout();
             this.height += trackName.height;
@@ -63953,7 +64272,7 @@ class TuningGlyph extends GlyphGroup {
         }
         // Name
         if (tuning.name.length > 0) {
-            const tuningName = new TextGlyph(0, this.height, tuning.name, res.effectFont, TextAlign.Left);
+            const tuningName = new TextGlyph(0, this.height, tuning.name, res.elementFonts.get(NotationElement.GuitarTuning), TextAlign.Left);
             tuningName.renderer = this.renderer;
             tuningName.doLayout();
             this.height += tuningName.height;
@@ -63961,7 +64280,7 @@ class TuningGlyph extends GlyphGroup {
         }
         const circleScale = this.renderer.smuflMetrics.tuningGlyphCircleNumberScale;
         const circleHeight = this.renderer.smuflMetrics.glyphHeights.get(MusicFontSymbol.GuitarString0) * circleScale;
-        this.renderer.scoreRenderer.canvas.font = res.effectFont;
+        this.renderer.scoreRenderer.canvas.font = res.elementFonts.get(NotationElement.GuitarTuning);
         const stringColumnWidth = (circleHeight + this.renderer.scoreRenderer.canvas.measureText(' = Gb').width) *
             res.engravingSettings.tuningGlyphStringColumnScale;
         this.width = Math.max(this.renderer.scoreRenderer.canvas.measureText(this._trackLabel).width, Math.max(this.renderer.scoreRenderer.canvas.measureText(tuning.name).width, 2 * stringColumnWidth));
@@ -63975,7 +64294,7 @@ class TuningGlyph extends GlyphGroup {
                 const symbol = (MusicFontSymbol.GuitarString0 + (i + 1));
                 this.addGlyph(new MusicFontGlyph(currentX, currentY + circleHeight, circleScale, symbol));
                 const str = ` = ${Tuning.getTextForTuning(tuning.tunings[i], false)}`;
-                this.addGlyph(new TextGlyph(currentX + circleHeight, currentY + circleHeight / 2, str, res.effectFont, TextAlign.Left, TextBaseline.Middle));
+                this.addGlyph(new TextGlyph(currentX + circleHeight, currentY + circleHeight / 2, str, res.elementFonts.get(NotationElement.GuitarTuning), TextAlign.Left, TextBaseline.Middle));
                 currentY += circleHeight + this.renderer.smuflMetrics.tuningGlyphStringRowPadding;
                 const bottomY = currentY;
                 if (this.height < bottomY) {
@@ -65027,7 +65346,7 @@ class StaffSystem {
                 let hasAnyTrackName = false;
                 if (shouldRender) {
                     const canvas = this.layout.renderer.canvas;
-                    const res = settings.display.resources.effectFont;
+                    const res = settings.display.resources.elementFonts.get(NotationElement.TrackNames);
                     canvas.font = res;
                     for (const t of tracks) {
                         let trackNameText = '';
@@ -65181,7 +65500,7 @@ class StaffSystem {
             // Draw track names
             const settings = this.layout.renderer.settings;
             const hasTrackName = this.layout.renderer.settings.notation.isNotationElementVisible(NotationElement.TrackNames);
-            canvas.font = res.effectFont;
+            canvas.font = res.elementFonts.get(NotationElement.TrackNames);
             if (hasTrackName) {
                 const stylesheet = this.layout.renderer.score.stylesheet;
                 const trackNamePolicy = this.layout.renderer.tracks.length === 1
@@ -65871,7 +66190,10 @@ class ScoreLayout {
         const msg = 'rendered by alphaTab';
         const resources = this.renderer.settings.display.resources;
         const size = 12;
-        const font = Font.withFamilyList(resources.copyrightFont.families, size, FontStyle.Plain, FontWeight.Bold);
+        const fontFamilies = resources.elementFonts.has(NotationElement.ScoreCopyright)
+            ? resources.elementFonts.get(NotationElement.ScoreCopyright).families
+            : resources.tablatureFont.families;
+        const font = Font.withFamilyList(fontFamilies, size, FontStyle.Plain, FontWeight.Bold);
         const fakeBarRenderer = new BarRendererBase(this.renderer, this.renderer.tracks[0].staves[0].bars[0]);
         const glyph = new TextGlyph(0, 0, msg, font, TextAlign.Center, undefined, resources.mainGlyphColor);
         glyph.renderer = fakeBarRenderer;
@@ -66784,13 +67106,7 @@ class BarNumberGlyph extends Glyph {
         this._number = `${num}  `;
     }
     doLayout() {
-        // TODO: activate this and update paddings accordingly.
-        // if (!this.renderer.staff!.isFirstInSystem) {
-        //     this.width = 0;
-        //     this.height = 0;
-        //     return;
-        // }
-        this.renderer.scoreRenderer.canvas.font = this.renderer.resources.barNumberFont;
+        this.renderer.scoreRenderer.canvas.font = this.renderer.resources.elementFonts.get(NotationElement.BarNumber);
         const size = this.renderer.scoreRenderer.canvas.measureText(this._number);
         this.width = size.width;
         this.height = size.height;
@@ -66804,7 +67120,7 @@ class BarNumberGlyph extends Glyph {
         try {
             const res = this.renderer.resources;
             const baseline = canvas.textBaseline;
-            canvas.font = res.barNumberFont;
+            canvas.font = res.elementFonts.get(NotationElement.BarNumber);
             canvas.textBaseline = TextBaseline.Top;
             canvas.fillText(this._number, cx + this.x, cy + this.y);
             canvas.textBaseline = baseline;
@@ -67903,7 +68219,7 @@ class RepeatCountGlyph extends Glyph {
         this._count = count;
     }
     doLayout() {
-        this.renderer.scoreRenderer.canvas.font = this.renderer.resources.barNumberFont;
+        this.renderer.scoreRenderer.canvas.font = this.renderer.resources.elementFonts.get(NotationElement.RepeatCount);
         const size = this.renderer.scoreRenderer.canvas.measureText(`x${this._count}`);
         this.width = 0; // do not account width
         this.height = size.height;
@@ -67914,7 +68230,7 @@ class RepeatCountGlyph extends Glyph {
         try {
             const res = this.renderer.resources;
             const oldAlign = canvas.textAlign;
-            canvas.font = res.barNumberFont;
+            canvas.font = res.elementFonts.get(NotationElement.RepeatCount);
             canvas.textAlign = TextAlign.Right;
             const s = `x${this._count}`;
             const w = canvas.measureText(s).width / 1.5;
@@ -68039,11 +68355,12 @@ class LineBarRenderer extends BarRendererBase {
     }
     createStartSpacing() {
         if (this._startSpacing) {
-            return;
+            return false;
         }
         const padding = this.index === 0 ? this.settings.display.firstStaffPaddingLeft : this.settings.display.staffPaddingLeft;
         this.addPreBeatGlyph(new SpacingGlyph(0, 0, padding));
         this._startSpacing = true;
+        return true;
     }
     paintTuplets(cx, cy, canvas, beatElement, bracketsAsArcs = false) {
         for (const v of this.voiceContainer.voiceDrawOrder) {
@@ -68385,16 +68702,45 @@ class LineBarRenderer extends BarRendererBase {
         super.createPreBeatGlyphs();
         this.addPreBeatGlyph(new BarLineGlyph(false, this.bar.staff.track.score.stylesheet.extendBarLines));
         this.createLinePreBeatGlyphs();
+        let hasSpaceAfterStartGlyphs = false;
         if (this.index === 0) {
-            this.createStartSpacing();
+            hasSpaceAfterStartGlyphs = this.createStartSpacing();
+        }
+        if (this.shouldCreateBarNumber()) {
+            this.addPreBeatGlyph(new BarNumberGlyph(0, this.getLineHeight(-0.5), this.bar.index + 1));
+        }
+        else if (!hasSpaceAfterStartGlyphs) {
+            this.addPreBeatGlyph(new SpacingGlyph(0, 0, this.smuflMetrics.oneStaffSpace));
         }
-        this.addPreBeatGlyph(new BarNumberGlyph(0, this.getLineHeight(-0.5), this.bar.index + 1));
+    }
+    shouldCreateBarNumber() {
+        let display = BarNumberDisplay.AllBars;
+        if (!this.settings.notation.isNotationElementVisible(NotationElement.BarNumber)) {
+            display = BarNumberDisplay.Hide;
+        }
+        else if (this.bar.barNumberDisplay !== undefined) {
+            display = this.bar.barNumberDisplay;
+        }
+        else {
+            display = this.bar.staff.track.score.stylesheet.barNumberDisplay;
+        }
+        switch (display) {
+            case BarNumberDisplay.AllBars:
+                return true;
+            case BarNumberDisplay.FirstOfSystem:
+                return this.isFirstOfStaff;
+            case BarNumberDisplay.Hide:
+                return false;
+        }
+        return true;
     }
     createPostBeatGlyphs() {
         super.createPostBeatGlyphs();
         const lastBar = this.lastBar;
         this.addPostBeatGlyph(new BarLineGlyph(true, this.bar.staff.track.score.stylesheet.extendBarLines));
-        if (lastBar.masterBar.isRepeatEnd && lastBar.masterBar.repeatCount > 2) {
+        if (lastBar.masterBar.isRepeatEnd &&
+            lastBar.masterBar.repeatCount > 2 &&
+            this.settings.notation.isNotationElementVisible(NotationElement.RepeatCount)) {
             this.addPostBeatGlyph(new RepeatCountGlyph(0, this.getLineHeight(-0.5), this.bar.masterBar.repeatCount));
         }
     }
@@ -68958,8 +69304,13 @@ class NumberedBarRenderer extends LineBarRenderer {
             this.addPreBeatGlyph(new BarLineGlyph(false, this.bar.staff.track.score.stylesheet.extendBarLines));
         }
         this.createLinePreBeatGlyphs();
-        this.createStartSpacing();
-        this.addPreBeatGlyph(new BarNumberGlyph(0, this.getLineHeight(-0.5), this.bar.index + 1));
+        const hasSpaceAfterStartGlyphs = this.createStartSpacing();
+        if (this.shouldCreateBarNumber()) {
+            this.addPreBeatGlyph(new BarNumberGlyph(0, this.getLineHeight(-0.5), this.bar.index + 1));
+        }
+        else if (!hasSpaceAfterStartGlyphs) {
+            this.addPreBeatGlyph(new SpacingGlyph(0, 0, this.smuflMetrics.oneStaffSpace));
+        }
     }
     createLinePreBeatGlyphs() {
         if (this._isOnlyNumbered &&
@@ -71507,7 +71858,7 @@ class ScoreBendGlyph extends ScoreHelperNotesBaseGlyph {
             if (note.bendStyle === BendStyle.Gradual) {
                 const res = this.renderer.resources;
                 const c = this.renderer.scoreRenderer.canvas;
-                c.font = res.barNumberFont; // see note in paint()
+                c.font = res.elementFonts.get(NotationElement.ScoreBendSlur);
                 slurHeight += c.measureText('grad.').height;
             }
             if (slurHeight > maxSlurHeight) {
@@ -71607,11 +71958,16 @@ class ScoreBendGlyph extends ScoreHelperNotesBaseGlyph {
         this._notes.sort((a, b) => {
             return b.displayValue - a.displayValue;
         });
+        // draw slurs
+        if (this.renderer.settings.notation.isNotationElementVisible(NotationElement.ScoreBendSlur)) {
+            this._paintSlurs(cx, cy, canvas, startNoteRenderer, startX, middleX, endBeatX);
+        }
+    }
+    _paintSlurs(cx, cy, canvas, startNoteRenderer, startX, middleX, endBeatX) {
         const directionBeat = this._beat.graceType === GraceType.BendGrace ? this._beat.nextBeat : this._beat;
         let direction = this._notes.length === 1 ? this.getTieDirection(directionBeat, startNoteRenderer) : BeamDirection.Up;
         const noteHeadHeight = this.renderer.smuflMetrics.glyphHeights.get(MusicFontSymbol.NoteheadBlack);
-        // draw slurs
-        canvas.font = this.renderer.resources.barNumberFont; // we have never have set it explicitly, that's the current state
+        canvas.font = this.renderer.resources.elementFonts.get(NotationElement.ScoreBendSlur);
         for (let i = 0; i < this._notes.length; i++) {
             const note = this._notes[i];
             const _ = ElementStyleHelper.note(canvas, NoteSubElement.StandardNotationEffects, note);
@@ -79740,6 +80096,7 @@ const _barrel$3 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty(
     BackingTrack,
     Bar,
     get BarLineStyle () { return BarLineStyle; },
+    get BarNumberDisplay () { return BarNumberDisplay; },
     BarStyle,
     get BarSubElement () { return BarSubElement; },
     get BarreShape () { return BarreShape; },