chordsheetjs 13.2.2 → 14.1.0

package/lib/module.js

@@ -304,6 +304,7 @@ const $72b24102c7d826fd$export$4b194284baed1659 = 'verse';
 const $72b24102c7d826fd$export$609cc0ea1637d6a0 = 'part';
 const $72b24102c7d826fd$export$6a5a2eab72b6e3d = 'ly';
 const $72b24102c7d826fd$export$92249c36c213e508 = 'abc';
+const $72b24102c7d826fd$export$5a2cf64ea612936a = 'textblock';
 const $72b24102c7d826fd$export$27c95a7104c1f7aa = 'symbol';
 const $72b24102c7d826fd$export$4d318981b5a83836 = 'numeric';
 const $72b24102c7d826fd$export$1321df9b16c30c6a = 'numeral';
@@ -2476,7 +2477,7 @@ const $4d72f408c2526a1c$var$PREFERS_FLAT_NUMBERS = [
 var $4d72f408c2526a1c$export$2e2bcd8739ae039 = $4d72f408c2526a1c$var$Key;
 
 
-// Generated by peggy v. 5.0.6 (ts-pegjs plugin v. 3.1.0 )
+// Generated by peggy v. 5.1.0 (ts-pegjs plugin v. 3.1.0 )
 //
 // https://peggyjs.org/   https://github.com/metadevpro/ts-pegjs
 "use strict";
@@ -4135,7 +4136,7 @@ const $33f7017b34767c5f$export$98e6a39c04603d36 = $33f7017b34767c5f$var$peg$pars
 var $f0449e2486cb2372$export$2e2bcd8739ae039 = $f0449e2486cb2372$var$Chord;
 
 
-// Generated by peggy v. 5.0.6 (ts-pegjs plugin v. 3.1.0 )
+// Generated by peggy v. 5.1.0 (ts-pegjs plugin v. 3.1.0 )
 //
 // https://peggyjs.org/   https://github.com/metadevpro/ts-pegjs
 "use strict";
@@ -5111,6 +5112,8 @@ const $a41c1115e2898cb2$export$4f5168acae064e01 = 'start_of_chorus';
 const $a41c1115e2898cb2$export$b7e6dcd848b88f43 = 'start_of_grid';
 const $a41c1115e2898cb2$export$634ff7795b596e62 = 'start_of_ly';
 const $a41c1115e2898cb2$export$8dd1111100e0e88d = 'start_of_tab';
+const $a41c1115e2898cb2$export$4252eb8e075f7d7a = 'start_of_textblock';
+const $a41c1115e2898cb2$export$f1e557abc415d751 = 'end_of_textblock';
 const $a41c1115e2898cb2$export$deca399f8cd9b7dc = 'start_of_verse';
 const $a41c1115e2898cb2$export$2b9510a208875fc9 = 'start_of_part';
 const $a41c1115e2898cb2$export$5895c693c74b9cf4 = 'subtitle';
@@ -5140,6 +5143,7 @@ const $20fa79e30605b67d$var$START_TAG_TO_SECTION_TYPE = {
     [(0, $a41c1115e2898cb2$export$b7e6dcd848b88f43)]: (0, $72b24102c7d826fd$export$e2b0b9a5e613f348),
     [(0, $a41c1115e2898cb2$export$634ff7795b596e62)]: (0, $72b24102c7d826fd$export$6a5a2eab72b6e3d),
     [(0, $a41c1115e2898cb2$export$8dd1111100e0e88d)]: (0, $72b24102c7d826fd$export$f1c9dd0f5207dd5e),
+    [(0, $a41c1115e2898cb2$export$4252eb8e075f7d7a)]: (0, $72b24102c7d826fd$export$5a2cf64ea612936a),
     [(0, $a41c1115e2898cb2$export$deca399f8cd9b7dc)]: (0, $72b24102c7d826fd$export$4b194284baed1659)
 };
 const $20fa79e30605b67d$var$END_TAG_TO_SECTION_TYPE = {
@@ -5149,6 +5153,7 @@ const $20fa79e30605b67d$var$END_TAG_TO_SECTION_TYPE = {
     [(0, $a41c1115e2898cb2$export$4b28ac1ae75aff60)]: (0, $72b24102c7d826fd$export$e2b0b9a5e613f348),
     [(0, $a41c1115e2898cb2$export$e3f6cdbd95b1f8f)]: (0, $72b24102c7d826fd$export$6a5a2eab72b6e3d),
     [(0, $a41c1115e2898cb2$export$66a0ef3ffeab32b7)]: (0, $72b24102c7d826fd$export$f1c9dd0f5207dd5e),
+    [(0, $a41c1115e2898cb2$export$f1e557abc415d751)]: (0, $72b24102c7d826fd$export$5a2cf64ea612936a),
     [(0, $a41c1115e2898cb2$export$640d294ab83f9040)]: (0, $72b24102c7d826fd$export$4b194284baed1659)
 };
 const $20fa79e30605b67d$var$SECTION_START_REGEX = /^start_of_(.+)$/;
@@ -5279,6 +5284,7 @@ const $b58c551853385714$var$DIRECTIVES_WITH_RENDERABLE_LABEL = [
     (0, $a41c1115e2898cb2$export$b7e6dcd848b88f43),
     (0, $a41c1115e2898cb2$export$634ff7795b596e62),
     (0, $a41c1115e2898cb2$export$8dd1111100e0e88d),
+    (0, $a41c1115e2898cb2$export$4252eb8e075f7d7a),
     (0, $a41c1115e2898cb2$export$deca399f8cd9b7dc),
     (0, $a41c1115e2898cb2$export$2b9510a208875fc9)
 ];
@@ -6241,7 +6247,8 @@ var $4afcde69e7cb3e85$export$2e2bcd8739ae039 = $4afcde69e7cb3e85$var$Ternary;
    * @param {Song} song The song to be formatted
    * @returns {string} The ChordPro string
    */ format(song) {
-        const { lines: lines, metadata: metadata } = song;
+        const { lines: lines } = song;
+        const metadata = song.getMetadata(this.configuration);
         const { metadataLines: metadataLines, contentLines: contentLines } = this.separateMetadataFromContent(lines);
         const formattedMetadataLines = this.formatMetadataSection(metadataLines);
         const formattedContentLines = this.formatContentSection(contentLines, metadata);
@@ -6518,6 +6525,7 @@ var $7011f990fc73fda8$export$2e2bcd8739ae039 = $7011f990fc73fda8$var$Font;
         this.transposeKey = null;
         this.lineNumber = null;
         this.selector = null;
+        this.selectorIsNegated = false;
         /**
    * The text font that applies to this line. Is derived from the directives:
    * `textfont`, `textsize` and `textcolour`
@@ -6766,7 +6774,7 @@ function $709af735c74ed550$var$appendValue(array, value) {
  * See {@link Metadata#get}
  */ class $709af735c74ed550$var$Metadata extends (0, $56f32ce29e8cb670$export$2e2bcd8739ae039) {
     constructor(metadata = {}){
-        super(), this.metadata = {};
+        super(), this.metadata = {}, this.providers = new Map();
         if (metadata instanceof $709af735c74ed550$var$Metadata) this.assign(metadata.metadata);
         else this.assign(metadata);
     }
@@ -6799,6 +6807,9 @@ function $709af735c74ed550$var$appendValue(array, value) {
             value
         ];
     }
+    setProvider(key, provider) {
+        this.providers.set(key, provider);
+    }
     set(key, value) {
         if (value) this.metadata[key] = value;
         else delete this.metadata[key];
@@ -6833,12 +6844,25 @@ function $709af735c74ed550$var$appendValue(array, value) {
    */ get(prop) {
         if (prop === (0, $a41c1115e2898cb2$export$430b1920f5feeae)) return this.calculateKeyFromCapo();
         if (prop in this.metadata) return this.metadata[prop];
+        const provider = this.providers.get(prop);
+        if (provider) return provider();
         return this.getArrayItem(prop);
     }
     /**
-   * Returns all metadata values, including generated values like `_key`.
+   * Returns all metadata values, including provider values and generated values like `_key`.
    * @returns {Object.<string, string|string[]>} the metadata values
    */ all() {
+        const all = {};
+        this.providers.forEach((provider, providerKey)=>{
+            const value = provider();
+            if (value !== null) all[providerKey] = value;
+        });
+        Object.assign(all, this.metadata);
+        const key = this.calculateKeyFromCapo();
+        if (key) all[0, $a41c1115e2898cb2$export$430b1920f5feeae] = key;
+        return all;
+    }
+    ownMetadata() {
         const all = {
             ...this.metadata
         };
@@ -6847,7 +6871,7 @@ function $709af735c74ed550$var$appendValue(array, value) {
         return all;
     }
     [Symbol.iterator]() {
-        return Object.entries(this.all())[Symbol.iterator]();
+        return Object.entries(this.ownMetadata())[Symbol.iterator]();
     }
     /**
    * Returns a single metadata value. If the actual value is an array, it returns the first value. Else, it returns
@@ -6884,7 +6908,9 @@ function $709af735c74ed550$var$appendValue(array, value) {
    * Returns a deep clone of this Metadata object
    * @returns {Metadata} the cloned Metadata object
    */ clone() {
-        return new $709af735c74ed550$var$Metadata(this.metadata);
+        const cloned = new $709af735c74ed550$var$Metadata(this.metadata);
+        this.providers.forEach((provider, key)=>cloned.setProvider(key, provider));
+        return cloned;
     }
     calculateKeyFromCapo() {
         const capoString = this.getSingle((0, $a41c1115e2898cb2$export$866f445d49bad88e));
@@ -6972,6 +6998,9 @@ function $ca405333ab46d462$var$getCommonValue(values, fallback) {
         const selectors = this.lines.map((line)=>line.selector).filter((selector)=>selector !== null);
         return $ca405333ab46d462$var$getCommonValue(selectors, null);
     }
+    get selectorIsNegated() {
+        return this.lines.some((line)=>line.selectorIsNegated);
+    }
     /**
    * Indicates whether the paragraph contains lines with renderable items.
    * @see {@link Line.hasRenderableItems}
@@ -7147,6 +7176,7 @@ class $4132ae2381aed81f$var$SongBuilder {
         this.metadata = new (0, $709af735c74ed550$export$2e2bcd8739ae039)();
         this.sectionType = (0, $72b24102c7d826fd$export$c53d0f541b41b88e);
         this.selector = null;
+        this.selectorIsNegated = false;
         this.transposeKey = null;
         this.warnings = [];
         this.song = song;
@@ -7164,16 +7194,17 @@ class $4132ae2381aed81f$var$SongBuilder {
             this.currentLine = new (0, $a449f9ee1c7acbe4$export$2e2bcd8739ae039)();
             this.lines.push(this.currentLine);
         }
-        this.setCurrentProperties(this.sectionType, this.selector);
+        this.setCurrentProperties(this.sectionType, this.selector, this.selectorIsNegated);
         this.currentLine.transposeKey = this.transposeKey ?? this.currentKey;
         this.currentLine.key = this.currentKey || this.song.getMetadata().getSingle((0, $a41c1115e2898cb2$export$7167c830cefcb6b5));
         this.currentLine.lineNumber = this.lines.length - 1;
         return this.currentLine;
     }
-    setCurrentProperties(sectionType, selector = null) {
+    setCurrentProperties(sectionType, selector = null, isNegated = false) {
         if (!this.currentLine) throw new Error('Expected this.currentLine to be present');
         this.currentLine.type = sectionType;
         this.currentLine.selector = selector;
+        this.currentLine.selectorIsNegated = isNegated;
         this.currentLine.textFont = this.fontStack.textFont.clone();
         this.currentLine.chordFont = this.fontStack.chordFont.clone();
     }
@@ -7223,14 +7254,16 @@ class $4132ae2381aed81f$var$SongBuilder {
     startSection(sectionType, tag) {
         this.checkCurrentSectionType((0, $72b24102c7d826fd$export$c53d0f541b41b88e), tag);
         this.selector = tag.selector;
+        this.selectorIsNegated = tag.isNegated;
         if (sectionType === (0, $72b24102c7d826fd$export$609cc0ea1637d6a0) && tag.value) this.sectionType = tag.value.split(' ')[0].toLowerCase();
         else this.sectionType = sectionType;
-        this.setCurrentProperties(sectionType, tag.selector);
+        this.setCurrentProperties(sectionType, tag.selector, tag.isNegated);
     }
     endSection(sectionType, tag) {
         this.checkCurrentSectionType(sectionType, tag);
         this.sectionType = (0, $72b24102c7d826fd$export$c53d0f541b41b88e);
         this.selector = null;
+        this.selectorIsNegated = false;
     }
     checkCurrentSectionType(sectionType, tag) {
         if (this.sectionType !== sectionType && !(sectionType === 'part' && tag.name === 'end_of_part')) this.addWarning(`Unexpected tag {${tag.originalName}}, current section is: ${this.sectionType}`, tag);
@@ -7754,6 +7787,33 @@ function $f5b90e5dc4871932$export$efb38dd75b8e2957({ selector: selector, isNegat
 
 
 
+function $05ed9bcf33bcd31b$var$formatDate(date) {
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    return `${year}-${month}-${day}`;
+}
+function $05ed9bcf33bcd31b$export$12c349605689fe7a() {
+    const providers = new Map();
+    providers.set('chordpro', ()=>'ChordPro');
+    providers.set('chordpro.version', ()=>'14.0.0');
+    providers.set('today', ()=>$05ed9bcf33bcd31b$var$formatDate(new Date()));
+    return providers;
+}
+function $05ed9bcf33bcd31b$export$9b09a67f52000acf(configuration) {
+    const providers = $05ed9bcf33bcd31b$export$12c349605689fe7a();
+    const { instrument: instrument, user: user } = configuration;
+    providers.set('instrument', ()=>instrument?.type ?? null);
+    providers.set('instrument.type', ()=>instrument?.type ?? null);
+    providers.set('instrument.description', ()=>instrument?.description ?? null);
+    providers.set('tuning', ()=>instrument?.tuning ?? null);
+    providers.set('user', ()=>user?.name ?? null);
+    providers.set('user.name', ()=>user?.name ?? null);
+    providers.set('user.fullname', ()=>user?.fullname ?? null);
+    return providers;
+}
+
+
 
 /**
  * Represents a song in a chord sheet. Currently a chord sheet can only have one song.
@@ -7796,6 +7856,20 @@ function $f5b90e5dc4871932$export$efb38dd75b8e2957({ selector: selector, isNegat
         const expandedLines = this.lines.flatMap((line)=>(0, $3ac0d01fe66a7db4$export$2e2bcd8739ae039).expand(line, this));
         return this.selectRenderableItems(this.linesToParagraphs(expandedLines));
     }
+    filterParagraphs(paragraphs, configuration) {
+        const context = {
+            configuration: configuration,
+            metadata: this.metadata
+        };
+        return paragraphs.filter((paragraph)=>{
+            const { selector: selector, selectorIsNegated: selectorIsNegated } = paragraph;
+            if (!selector) return true;
+            return (0, $f5b90e5dc4871932$export$efb38dd75b8e2957)({
+                selector: selector,
+                isNegated: selectorIsNegated
+            }, context);
+        });
+    }
     linesToParagraphs(lines) {
         let currentParagraph = new (0, $ca405333ab46d462$export$2e2bcd8739ae039)();
         const paragraphs = [
@@ -8156,6 +8230,16 @@ Or set the song key before changing key:
     }
     getMetadata(configuration) {
         const metadata = new (0, $709af735c74ed550$export$2e2bcd8739ae039)();
+        const providers = configuration ? (0, $05ed9bcf33bcd31b$export$9b09a67f52000acf)(configuration) : (0, $05ed9bcf33bcd31b$export$12c349605689fe7a)();
+        providers.forEach((provider, key)=>metadata.setProvider(key, provider));
+        const chords = ()=>this.getChords();
+        metadata.setProvider('chords', ()=>{
+            const c = chords();
+            return c.length ? c.join(', ') : null;
+        });
+        metadata.setProvider('numchords', ()=>chords().length.toString());
+        metadata.setProvider('key_actual', ()=>metadata.getSingle('_key') ?? metadata.getSingle('key'));
+        metadata.setProvider('key_from', ()=>metadata.getSingle('key'));
         this.foreachItem((item)=>{
             if (!(item instanceof (0, $b58c551853385714$export$2e2bcd8739ae039))) return;
             const tag = item;
@@ -8539,7 +8623,7 @@ function $1582051153255182$export$ce8f3be11402ed10(items, chopFirstWord) {
 }
 
 
-// Generated by peggy v. 5.0.6 (ts-pegjs plugin v. 3.1.0 )
+// Generated by peggy v. 5.1.0 (ts-pegjs plugin v. 3.1.0 )
 //
 // https://peggyjs.org/   https://github.com/metadevpro/ts-pegjs
 "use strict";
@@ -9121,31 +9205,35 @@ function $d19fa9f128cdbd26$var$peg$parse(input, options) {
     const peg$c151 = peg$literalExpectation("end_of_tab", false);
     const peg$c152 = "eot";
     const peg$c153 = peg$literalExpectation("eot", false);
-    const peg$c154 = peg$anyExpectation();
-    const peg$c155 = peg$otherExpectation("whitespace");
-    const peg$c156 = peg$otherExpectation("optional whitespace");
-    const peg$c157 = /^[ \t\n\r]/;
-    const peg$c158 = peg$classExpectation([
+    const peg$c154 = "start_of_textblock";
+    const peg$c155 = peg$literalExpectation("start_of_textblock", false);
+    const peg$c156 = "end_of_textblock";
+    const peg$c157 = peg$literalExpectation("end_of_textblock", false);
+    const peg$c158 = peg$anyExpectation();
+    const peg$c159 = peg$otherExpectation("whitespace");
+    const peg$c160 = peg$otherExpectation("optional whitespace");
+    const peg$c161 = /^[ \t\n\r]/;
+    const peg$c162 = peg$classExpectation([
         " ",
         "\t",
         "\n",
         "\r"
     ], false, false);
-    const peg$c159 = peg$otherExpectation("space");
-    const peg$c160 = /^[ \t]/;
-    const peg$c161 = peg$classExpectation([
+    const peg$c163 = peg$otherExpectation("space");
+    const peg$c164 = /^[ \t]/;
+    const peg$c165 = peg$classExpectation([
         " ",
         "\t"
     ], false, false);
-    const peg$c162 = /^[\n\r]/;
-    const peg$c163 = peg$classExpectation([
+    const peg$c166 = /^[\n\r]/;
+    const peg$c167 = peg$classExpectation([
         "\n",
         "\r"
     ], false, false);
-    const peg$c164 = "\n";
-    const peg$c165 = peg$literalExpectation("\n", false);
-    const peg$c166 = "\r";
-    const peg$c167 = peg$literalExpectation("\r", false);
+    const peg$c168 = "\n";
+    const peg$c169 = peg$literalExpectation("\n", false);
+    const peg$c170 = "\r";
+    const peg$c171 = peg$literalExpectation("\r", false);
     let peg$currPos = 0;
     let peg$savedPos = 0;
     const peg$posDetailsCache = [
@@ -11333,7 +11421,10 @@ function $d19fa9f128cdbd26$var$peg$parse(input, options) {
             s0 = peg$parseGridSection();
             if (s0 === peg$FAILED) {
                 s0 = peg$parseLySection();
-                if (s0 === peg$FAILED) s0 = peg$parseTabSection();
+                if (s0 === peg$FAILED) {
+                    s0 = peg$parseTabSection();
+                    if (s0 === peg$FAILED) s0 = peg$parseTextblockSection();
+                }
             }
         }
         return s0;
@@ -12262,6 +12353,228 @@ function $d19fa9f128cdbd26$var$peg$parse(input, options) {
         }
         return s0;
     }
+    function peg$parseTextblockSection() {
+        let s0, s1, s2, s3, s4, s5, s6, s7;
+        s0 = peg$currPos;
+        s1 = peg$parseTextblockStartTag();
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parseNewLine();
+            if (s2 !== peg$FAILED) {
+                s3 = peg$currPos;
+                s4 = [];
+                s5 = peg$currPos;
+                s6 = peg$currPos;
+                peg$silentFails++;
+                s7 = peg$parseTextblockEndTag();
+                peg$silentFails--;
+                if (s7 === peg$FAILED) s6 = undefined;
+                else {
+                    peg$currPos = s6;
+                    s6 = peg$FAILED;
+                }
+                if (s6 !== peg$FAILED) {
+                    s7 = peg$parseSectionCharacter();
+                    if (s7 !== peg$FAILED) {
+                        s6 = [
+                            s6,
+                            s7
+                        ];
+                        s5 = s6;
+                    } else {
+                        peg$currPos = s5;
+                        s5 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s5;
+                    s5 = peg$FAILED;
+                }
+                while(s5 !== peg$FAILED){
+                    s4.push(s5);
+                    s5 = peg$currPos;
+                    s6 = peg$currPos;
+                    peg$silentFails++;
+                    s7 = peg$parseTextblockEndTag();
+                    peg$silentFails--;
+                    if (s7 === peg$FAILED) s6 = undefined;
+                    else {
+                        peg$currPos = s6;
+                        s6 = peg$FAILED;
+                    }
+                    if (s6 !== peg$FAILED) {
+                        s7 = peg$parseSectionCharacter();
+                        if (s7 !== peg$FAILED) {
+                            s6 = [
+                                s6,
+                                s7
+                            ];
+                            s5 = s6;
+                        } else {
+                            peg$currPos = s5;
+                            s5 = peg$FAILED;
+                        }
+                    } else {
+                        peg$currPos = s5;
+                        s5 = peg$FAILED;
+                    }
+                }
+                if (s4 !== peg$FAILED) s3 = input.substring(s3, peg$currPos);
+                else s3 = s4;
+                if (s3 !== peg$FAILED) {
+                    s4 = peg$parseTextblockEndTag();
+                    if (s4 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$c128(s1, s3, s4);
+                        s0 = s1;
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        return s0;
+    }
+    function peg$parseTextblockStartTag() {
+        let s0, s1, s2, s3, s4, s5, s6, s7, s8;
+        s0 = peg$currPos;
+        if (input.charCodeAt(peg$currPos) === 123) {
+            s1 = peg$c43;
+            peg$currPos++;
+        } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) peg$fail(peg$c44);
+        }
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parse_();
+            if (s2 !== peg$FAILED) {
+                if (input.substr(peg$currPos, 18) === peg$c154) {
+                    s3 = peg$c154;
+                    peg$currPos += 18;
+                } else {
+                    s3 = peg$FAILED;
+                    if (peg$silentFails === 0) peg$fail(peg$c155);
+                }
+                if (s3 !== peg$FAILED) {
+                    s4 = peg$parseTagSelector();
+                    if (s4 === peg$FAILED) s4 = null;
+                    if (s4 !== peg$FAILED) {
+                        s5 = peg$parse_();
+                        if (s5 !== peg$FAILED) {
+                            s6 = peg$parseTagColonWithValue();
+                            if (s6 === peg$FAILED) s6 = null;
+                            if (s6 !== peg$FAILED) {
+                                s7 = peg$parse_();
+                                if (s7 !== peg$FAILED) {
+                                    if (input.charCodeAt(peg$currPos) === 125) {
+                                        s8 = peg$c29;
+                                        peg$currPos++;
+                                    } else {
+                                        s8 = peg$FAILED;
+                                        if (peg$silentFails === 0) peg$fail(peg$c30);
+                                    }
+                                    if (s8 !== peg$FAILED) {
+                                        peg$savedPos = s0;
+                                        s1 = peg$c65(s3, s4, s6);
+                                        s0 = s1;
+                                    } else {
+                                        peg$currPos = s0;
+                                        s0 = peg$FAILED;
+                                    }
+                                } else {
+                                    peg$currPos = s0;
+                                    s0 = peg$FAILED;
+                                }
+                            } else {
+                                peg$currPos = s0;
+                                s0 = peg$FAILED;
+                            }
+                        } else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        return s0;
+    }
+    function peg$parseTextblockEndTag() {
+        let s0, s1, s2, s3, s4, s5;
+        s0 = peg$currPos;
+        if (input.charCodeAt(peg$currPos) === 123) {
+            s1 = peg$c43;
+            peg$currPos++;
+        } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) peg$fail(peg$c44);
+        }
+        if (s1 !== peg$FAILED) {
+            s2 = peg$parse_();
+            if (s2 !== peg$FAILED) {
+                if (input.substr(peg$currPos, 16) === peg$c156) {
+                    s3 = peg$c156;
+                    peg$currPos += 16;
+                } else {
+                    s3 = peg$FAILED;
+                    if (peg$silentFails === 0) peg$fail(peg$c157);
+                }
+                if (s3 !== peg$FAILED) {
+                    s4 = peg$parse_();
+                    if (s4 !== peg$FAILED) {
+                        if (input.charCodeAt(peg$currPos) === 125) {
+                            s5 = peg$c29;
+                            peg$currPos++;
+                        } else {
+                            s5 = peg$FAILED;
+                            if (peg$silentFails === 0) peg$fail(peg$c30);
+                        }
+                        if (s5 !== peg$FAILED) {
+                            peg$savedPos = s0;
+                            s1 = peg$c133(s3);
+                            s0 = s1;
+                        } else {
+                            peg$currPos = s0;
+                            s0 = peg$FAILED;
+                        }
+                    } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                    }
+                } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                }
+            } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+            }
+        } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+        }
+        return s0;
+    }
     function peg$parseSectionCharacter() {
         let s0;
         if (input.length > peg$currPos) {
@@ -12269,7 +12582,7 @@ function $d19fa9f128cdbd26$var$peg$parse(input, options) {
             peg$currPos++;
         } else {
             s0 = peg$FAILED;
-            if (peg$silentFails === 0) peg$fail(peg$c154);
+            if (peg$silentFails === 0) peg$fail(peg$c158);
         }
         return s0;
     }
@@ -12286,7 +12599,7 @@ function $d19fa9f128cdbd26$var$peg$parse(input, options) {
         peg$silentFails--;
         if (s0 === peg$FAILED) {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) peg$fail(peg$c155);
+            if (peg$silentFails === 0) peg$fail(peg$c159);
         }
         return s0;
     }
@@ -12302,18 +12615,18 @@ function $d19fa9f128cdbd26$var$peg$parse(input, options) {
         peg$silentFails--;
         if (s0 === peg$FAILED) {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) peg$fail(peg$c156);
+            if (peg$silentFails === 0) peg$fail(peg$c160);
         }
         return s0;
     }
     function peg$parseWhitespaceCharacter() {
         let s0;
-        if (peg$c157.test(input.charAt(peg$currPos))) {
+        if (peg$c161.test(input.charAt(peg$currPos))) {
             s0 = input.charAt(peg$currPos);
             peg$currPos++;
         } else {
             s0 = peg$FAILED;
-            if (peg$silentFails === 0) peg$fail(peg$c158);
+            if (peg$silentFails === 0) peg$fail(peg$c162);
         }
         return s0;
     }
@@ -12322,21 +12635,21 @@ function $d19fa9f128cdbd26$var$peg$parse(input, options) {
         peg$silentFails++;
         s0 = peg$currPos;
         s1 = [];
-        if (peg$c160.test(input.charAt(peg$currPos))) {
+        if (peg$c164.test(input.charAt(peg$currPos))) {
             s2 = input.charAt(peg$currPos);
             peg$currPos++;
         } else {
             s2 = peg$FAILED;
-            if (peg$silentFails === 0) peg$fail(peg$c161);
+            if (peg$silentFails === 0) peg$fail(peg$c165);
         }
         if (s2 !== peg$FAILED) while(s2 !== peg$FAILED){
             s1.push(s2);
-            if (peg$c160.test(input.charAt(peg$currPos))) {
+            if (peg$c164.test(input.charAt(peg$currPos))) {
                 s2 = input.charAt(peg$currPos);
                 peg$currPos++;
             } else {
                 s2 = peg$FAILED;
-                if (peg$silentFails === 0) peg$fail(peg$c161);
+                if (peg$silentFails === 0) peg$fail(peg$c165);
             }
         }
         else s1 = peg$FAILED;
@@ -12345,18 +12658,18 @@ function $d19fa9f128cdbd26$var$peg$parse(input, options) {
         peg$silentFails--;
         if (s0 === peg$FAILED) {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) peg$fail(peg$c159);
+            if (peg$silentFails === 0) peg$fail(peg$c163);
         }
         return s0;
     }
     function peg$parseNewLine() {
         let s0;
-        if (peg$c162.test(input.charAt(peg$currPos))) {
+        if (peg$c166.test(input.charAt(peg$currPos))) {
             s0 = input.charAt(peg$currPos);
             peg$currPos++;
         } else {
             s0 = peg$FAILED;
-            if (peg$silentFails === 0) peg$fail(peg$c163);
+            if (peg$silentFails === 0) peg$fail(peg$c167);
         }
         if (s0 === peg$FAILED) s0 = peg$parseCarriageReturnLineFeed();
         return s0;
@@ -12386,22 +12699,22 @@ function $d19fa9f128cdbd26$var$peg$parse(input, options) {
     function peg$parseLineFeed() {
         let s0;
         if (input.charCodeAt(peg$currPos) === 10) {
-            s0 = peg$c164;
+            s0 = peg$c168;
             peg$currPos++;
         } else {
             s0 = peg$FAILED;
-            if (peg$silentFails === 0) peg$fail(peg$c165);
+            if (peg$silentFails === 0) peg$fail(peg$c169);
         }
         return s0;
     }
     function peg$parseCarriageReturn() {
         let s0;
         if (input.charCodeAt(peg$currPos) === 13) {
-            s0 = peg$c166;
+            s0 = peg$c170;
             peg$currPos++;
         } else {
             s0 = peg$FAILED;
-            if (peg$silentFails === 0) peg$fail(peg$c167);
+            if (peg$silentFails === 0) peg$fail(peg$c171);
         }
         return s0;
     }
@@ -12856,7 +13169,8 @@ var $dfcb12f4c26c139d$export$2e2bcd8739ae039 = {
     }
     formatHeader() {
         // Process metadata according to configuration
-        const orderedMetadata = (0, $dfcb12f4c26c139d$export$5c964b66c4a8abfb)(this.song.metadata.all(), this.configuration.metadata);
+        const songMetadata = this.song.getMetadata(this.configuration);
+        const orderedMetadata = (0, $dfcb12f4c26c139d$export$5c964b66c4a8abfb)(songMetadata.ownMetadata(), this.configuration.metadata);
         const metadata = orderedMetadata.map(([key, value])=>{
             if (Array.isArray(value)) return `${key}: ${value.join(',')}`;
             if (typeof value === 'undefined' || value === null || value === '') return `${key}:`;
@@ -12865,8 +13179,10 @@ var $dfcb12f4c26c139d$export$2e2bcd8739ae039 = {
         return metadata ? `${metadata}\n\n` : '';
     }
     formatParagraphs() {
-        const { bodyParagraphs: bodyParagraphs, bodyParagraphs: { length: count }, metadata: metadata } = this.song;
-        const formattedParagraphs = bodyParagraphs.map((paragraph)=>this.formatParagraph(paragraph, metadata));
+        const metadata = this.song.getMetadata(this.configuration);
+        const paragraphs = this.song.filterParagraphs(this.song.bodyParagraphs, this.configuration);
+        const count = paragraphs.length;
+        const formattedParagraphs = paragraphs.map((paragraph)=>this.formatParagraph(paragraph, metadata));
         const combined = formattedParagraphs.join('\n\n');
         if (formattedParagraphs[count - 1].length === 0) return combined.substring(0, combined.length - 1);
         return combined;
@@ -13145,7 +13461,7 @@ function $698d1b7df9bab6b4$export$f0dcc8f253e2c535(newLine, lines, trailingLine,
 }
 
 
-// Generated by peggy v. 5.0.6 (ts-pegjs plugin v. 3.1.0 )
+// Generated by peggy v. 5.1.0 (ts-pegjs plugin v. 3.1.0 )
 //
 // https://peggyjs.org/   https://github.com/metadevpro/ts-pegjs
 "use strict";
@@ -25282,7 +25598,7 @@ var $b58bece5a707e8d1$export$2e2bcd8739ae039 = $b58bece5a707e8d1$var$ChordsOverW
 
 
 
-var $ee682089fac609da$export$2e2bcd8739ae039 = ({ configuration: configuration, configuration: { key: key, cssClasses: c }, song: song, renderBlankLines: renderBlankLines = false, song: { title: title, subtitle: subtitle, metadata: metadata }, bodyParagraphs: bodyParagraphs })=>(0, $dfcb12f4c26c139d$export$6ea1b0eb82ead3f)(`
+var $ee682089fac609da$export$2e2bcd8739ae039 = ({ configuration: configuration, configuration: { key: key, cssClasses: c }, song: song, metadata: metadata, renderBlankLines: renderBlankLines = false, song: { title: title, subtitle: subtitle }, bodyParagraphs: bodyParagraphs })=>(0, $dfcb12f4c26c139d$export$6ea1b0eb82ead3f)(`
   ${(0, $dfcb12f4c26c139d$export$a55877ca9db47377)(title, ()=>`<h1 class="${c.title}">${title}</h1>`)}
   ${(0, $dfcb12f4c26c139d$export$a55877ca9db47377)(subtitle, ()=>`<h2 class="${c.subtitle}">${subtitle}</h2>`)}
 
@@ -25383,10 +25699,12 @@ const $24ff40cf6e6a7e2f$export$2969e7e19d88b575 = {
    * @returns {string} The HTML string
    */ format(song) {
         const { bodyParagraphs: bodyParagraphs, expandedBodyParagraphs: expandedBodyParagraphs } = song;
+        const paragraphs = this.configuration.expandChorusDirective ? expandedBodyParagraphs : bodyParagraphs;
         return this.template({
             song: song,
+            metadata: song.getMetadata(this.configuration),
             configuration: this.configuration,
-            bodyParagraphs: this.configuration.expandChorusDirective ? expandedBodyParagraphs : bodyParagraphs
+            bodyParagraphs: song.filterParagraphs(paragraphs, this.configuration)
         });
     }
     /**
@@ -25457,7 +25775,7 @@ var $79e99f27b77a3c71$export$2e2bcd8739ae039 = $79e99f27b77a3c71$var$HtmlDivForm
 
 
 
-var $9c5f7d5454a05db6$export$2e2bcd8739ae039 = ({ configuration: configuration, configuration: { key: key, cssClasses: c }, song: song, renderBlankLines: renderBlankLines = false, song: { title: title, subtitle: subtitle, bodyLines: bodyLines, metadata: metadata }, bodyParagraphs: bodyParagraphs })=>(0, $dfcb12f4c26c139d$export$6ea1b0eb82ead3f)(`
+var $9c5f7d5454a05db6$export$2e2bcd8739ae039 = ({ configuration: configuration, configuration: { key: key, cssClasses: c }, song: song, metadata: metadata, renderBlankLines: renderBlankLines = false, song: { title: title, subtitle: subtitle, bodyLines: bodyLines }, bodyParagraphs: bodyParagraphs })=>(0, $dfcb12f4c26c139d$export$6ea1b0eb82ead3f)(`
   ${(0, $dfcb12f4c26c139d$export$a55877ca9db47377)(title, ()=>`<h1 class="${c.title}">${title}</h1>`)}
   ${(0, $dfcb12f4c26c139d$export$a55877ca9db47377)(subtitle, ()=>`<h2 class="${c.subtitle}">${subtitle}</h2>`)}
 
@@ -26346,7 +26664,7 @@ var $fb708a54a5f79aab$export$2e2bcd8739ae039 = $fb708a54a5f79aab$var$Condition;
    * @returns {string} the chord sheet
    */ format(song, metadata) {
         this.song = song;
-        this.metadata = metadata || song.metadata;
+        this.metadata = metadata || song.getMetadata(this.configuration);
         return [
             this.formatHeader(),
             this.formatParagraphs()
@@ -26364,7 +26682,8 @@ var $fb708a54a5f79aab$export$2e2bcd8739ae039 = $fb708a54a5f79aab$var$Condition;
     formatParagraphs() {
         const { bodyParagraphs: bodyParagraphs, expandedBodyParagraphs: expandedBodyParagraphs } = this.song;
         const { expandChorusDirective: expandChorusDirective } = this.configuration;
-        return (expandChorusDirective ? expandedBodyParagraphs : bodyParagraphs).map((paragraph)=>this.formatParagraph(paragraph, this.metadata)).join('\n\n');
+        const paragraphs = expandChorusDirective ? expandedBodyParagraphs : bodyParagraphs;
+        return this.song.filterParagraphs(paragraphs, this.configuration).map((paragraph)=>this.formatParagraph(paragraph, this.metadata)).join('\n\n');
     }
     formatParagraph(paragraph, metadata) {
         if (paragraph.isLiteral()) return [
@@ -26461,10 +26780,10 @@ class $6be14f9184cf598f$export$f1e5feaa438be04f {
    * Determines if a content item should be rendered based on conditions
    */ shouldRenderContent(contentItem) {
         if (!contentItem.condition) return true;
-        const metadata = {
-            ...this.context.metadata.all(),
-            ...this.context.extraMetadata
-        };
+        const { metadata: songMetadata, extraMetadata: extraMetadata } = this.context;
+        const metadata = new Proxy({}, {
+            get: (_, prop)=>extraMetadata?.[prop] ?? songMetadata.get(prop)
+        });
         return new (0, $fb708a54a5f79aab$export$2e2bcd8739ae039)(contentItem.condition, metadata).evaluate();
     }
     /**
@@ -26541,7 +26860,9 @@ class $6be14f9184cf598f$export$f1e5feaa438be04f {
             const parsed = new (0, $6ba1c85836253a53$export$2e2bcd8739ae039)().parse(template);
             return new (0, $e2dfad8e72d5aab0$export$2e2bcd8739ae039)().format(parsed, metadata);
         } catch (e) {
-            throw new Error(`Error evaluating template\n\n${template}\n\n: ${e.message}`);
+            throw new Error(`Error evaluating template\n\n${template}\n\n: ${e.message}`, {
+                cause: e
+            });
         }
     }
     /**
@@ -27593,8 +27914,7 @@ class $106cb69a2606bfa2$export$e6ce86b8bc39728b {
     /**
    * Removes hyphens from lyrics for lyrics-only mode
    */ removeHyphens(lyrics) {
-        let cleanedLyrics = lyrics;
-        cleanedLyrics = lyrics.replace(/\b(\w+)\s*-\s*(\w+)\b/g, '$1$2');
+        let cleanedLyrics = lyrics.replace(/\b(\w+)\s*-\s*(\w+)\b/g, '$1$2');
         cleanedLyrics = cleanedLyrics.replace(/(?:\b(\w+)\s*-\s*$)|(?:-\s*$)|(?:\s+-\s+$)/g, '$1');
         if (/^\s*-\s*$/.test(cleanedLyrics)) return '';
         return cleanedLyrics;
@@ -36382,15 +36702,25 @@ var $6a0e1e68c51ef6cd$export$2e2bcd8739ae039 = $6a0e1e68c51ef6cd$var$PdfFormatte
 
 
 const $ecd3f348894bfbde$var$VERSE_LINE_REGEX = /^\[(Verse.*)]/i;
-const $ecd3f348894bfbde$var$CHORUS_LINE_REGEX = /^\[(Chorus)]/i;
+const $ecd3f348894bfbde$var$CHORUS_LINE_REGEX = /^\[(Chorus.*)]/i;
+const $ecd3f348894bfbde$var$BRIDGE_LINE_REGEX = /^\[(Bridge.*)]/i;
+const $ecd3f348894bfbde$var$PART_LINE_REGEX = /^\[(Intro|Outro|Instrumental|Interlude|Solo|Pre-Chorus)( \d+)?]/i;
+const $ecd3f348894bfbde$var$UG_METADATA_REGEX = /^(\w+):\s*(.+)$/;
 const $ecd3f348894bfbde$var$OTHER_METADATA_LINE_REGEX = /^\[([^\]]+)]/;
+const $ecd3f348894bfbde$var$REPEAT_NOTATION_REGEX = /\s+(x\d+)\s*$/i;
+// eslint-disable-next-line max-len
+const $ecd3f348894bfbde$var$CHORD_LINE_REGEX = /^\s*((([A-G|Do|Re|Mi|Fa|Sol|La|Si])(#|b)?([^/\s]*)(\/([A-G|Do|Re|Mi|Fa|Sol|La|Si])(#|b)?)?)(\s|$)+)+(\s|$)+/;
 const $ecd3f348894bfbde$var$startSectionTags = {
     [(0, $72b24102c7d826fd$export$4b194284baed1659)]: (0, $a41c1115e2898cb2$export$deca399f8cd9b7dc),
-    [(0, $72b24102c7d826fd$export$8db6c706fc9142b2)]: (0, $a41c1115e2898cb2$export$4f5168acae064e01)
+    [(0, $72b24102c7d826fd$export$8db6c706fc9142b2)]: (0, $a41c1115e2898cb2$export$4f5168acae064e01),
+    [(0, $72b24102c7d826fd$export$78d8c50e853acd10)]: (0, $a41c1115e2898cb2$export$3550cc87694d54e0),
+    [(0, $72b24102c7d826fd$export$609cc0ea1637d6a0)]: (0, $a41c1115e2898cb2$export$2b9510a208875fc9)
 };
 const $ecd3f348894bfbde$var$endSectionTags = {
     [(0, $72b24102c7d826fd$export$4b194284baed1659)]: (0, $a41c1115e2898cb2$export$640d294ab83f9040),
-    [(0, $72b24102c7d826fd$export$8db6c706fc9142b2)]: (0, $a41c1115e2898cb2$export$473c1a4819e5180b)
+    [(0, $72b24102c7d826fd$export$8db6c706fc9142b2)]: (0, $a41c1115e2898cb2$export$473c1a4819e5180b),
+    [(0, $72b24102c7d826fd$export$78d8c50e853acd10)]: (0, $a41c1115e2898cb2$export$1c874e9780385ecd),
+    [(0, $72b24102c7d826fd$export$609cc0ea1637d6a0)]: (0, $a41c1115e2898cb2$export$189f12065cceb96a)
 };
 /**
  * Parses an Ultimate Guitar chord sheet with metadata
@@ -36403,11 +36733,111 @@ const $ecd3f348894bfbde$var$endSectionTags = {
    */ constructor({ preserveWhitespace: preserveWhitespace = true } = {}){
         super({
             preserveWhitespace: preserveWhitespace
-        }, false), this.currentSectionType = null;
+        }, false), this.currentSectionType = null, this.pendingRepeatNotation = null;
     }
     parseLine(line) {
         if (this.isSectionEnd()) this.endSection();
-        if (!(this.parseVerseDirective(line) || this.parseChorusDirective(line) || this.parseMetadata(line))) super.parseLine(line);
+        const { cleanLine: cleanLine, repeatNotation: repeatNotation } = this.extractRepeatNotation(line);
+        this.pendingRepeatNotation = repeatNotation;
+        if (!(this.parseVerseDirective(cleanLine) || this.parseChorusDirective(cleanLine) || this.parseBridgeDirective(cleanLine) || this.parsePartDirective(cleanLine) || this.parseUGMetadata(cleanLine) || this.parseMetadata(cleanLine))) this.parseRegularLine(cleanLine);
+    }
+    parseRegularLine(line) {
+        this.songLine = this.songBuilder.addLine();
+        if (line.trim().length === 0) this.chordLyricsPair = null;
+        else this.parseNonEmptyLine(line);
+    }
+    parseNonEmptyLine(line) {
+        if (!this.songLine) throw new Error('Expected this.songLine to be present');
+        this.chordLyricsPair = this.songLine.addChordLyricsPair();
+        const isChordLine = $ecd3f348894bfbde$var$CHORD_LINE_REGEX.test(line);
+        if (isChordLine && this.hasNextLine()) this.parseChordLineWithNextLine(line);
+        else if (isChordLine) this.parseChordsOnly(line);
+        else this.chordLyricsPair.lyrics = `${line}`;
+    }
+    parseChordLineWithNextLine(chordsLine) {
+        const nextLine = this.readLine();
+        if (this.isNonLyricsLine(nextLine)) {
+            this.parseChordsOnly(chordsLine);
+            this.unreadLine();
+        } else this.parseLyricsWithChords(chordsLine, nextLine);
+    }
+    unreadLine() {
+        this.currentLine -= 1;
+    }
+    isNonLyricsLine(line) {
+        return $ecd3f348894bfbde$var$VERSE_LINE_REGEX.test(line) || $ecd3f348894bfbde$var$CHORUS_LINE_REGEX.test(line) || $ecd3f348894bfbde$var$BRIDGE_LINE_REGEX.test(line) || $ecd3f348894bfbde$var$PART_LINE_REGEX.test(line) || $ecd3f348894bfbde$var$OTHER_METADATA_LINE_REGEX.test(line) || $ecd3f348894bfbde$var$CHORD_LINE_REGEX.test(line) || line.trim().length === 0;
+    }
+    parseChordsOnly(chordsLine) {
+        this.parseLyricsWithChords(chordsLine, '');
+        this.applyRepeatNotation();
+    }
+    parseLyricsWithChords(chordsLine, lyricsLine) {
+        this.processCharacters(chordsLine, lyricsLine);
+        if (!this.chordLyricsPair) throw new Error('Expected this.chordLyricsPair to be present');
+        this.chordLyricsPair.lyrics += lyricsLine.substring(chordsLine.length);
+        this.chordLyricsPair.chords = this.chordLyricsPair.chords.trim();
+        if (this.chordLyricsPair.lyrics) this.chordLyricsPair.lyrics = this.chordLyricsPair.lyrics.trim();
+        this.applyRepeatNotation();
+    }
+    processCharacters(chordsLine, lyricsLine) {
+        for(let c = 0, charCount = chordsLine.length; c < charCount; c += 1){
+            const chr = chordsLine[c];
+            const nextChar = chordsLine[c + 1];
+            const isWhiteSpace = /\s/.test(chr);
+            this.addCharacter(chr, nextChar);
+            if (!this.chordLyricsPair) throw new Error('Expected this.chordLyricsPair to be present');
+            this.chordLyricsPair.lyrics += lyricsLine[c] || '';
+            this.processingText = !isWhiteSpace;
+        }
+    }
+    addCharacter(chr, nextChar) {
+        const isWhiteSpace = /\s/.test(chr);
+        if (!isWhiteSpace) this.ensureChordLyricsPairInitialized();
+        if (!isWhiteSpace || this.shouldAddCharacterToChords(nextChar)) {
+            if (!this.chordLyricsPair) throw new Error('Expected this.chordLyricsPair to be present');
+            this.chordLyricsPair.chords += chr;
+        }
+    }
+    shouldAddCharacterToChords(nextChar) {
+        return !!(nextChar && /\s/.test(nextChar) && this.preserveWhitespace);
+    }
+    ensureChordLyricsPairInitialized() {
+        if (!this.processingText) {
+            if (!this.songLine) throw new Error('Expected this.songLine to be present');
+            this.chordLyricsPair = this.songLine.addChordLyricsPair();
+            this.processingText = true;
+        }
+    }
+    extractRepeatNotation(line) {
+        const match = line.match($ecd3f348894bfbde$var$REPEAT_NOTATION_REGEX);
+        if (match) return {
+            cleanLine: line.replace($ecd3f348894bfbde$var$REPEAT_NOTATION_REGEX, ''),
+            repeatNotation: match[1]
+        };
+        return {
+            cleanLine: line,
+            repeatNotation: null
+        };
+    }
+    applyRepeatNotation() {
+        if (!this.pendingRepeatNotation || !this.songLine) return;
+        const lastItem = this.songLine.items[this.songLine.items.length - 1];
+        if (lastItem && 'lyrics' in lastItem) lastItem.lyrics = (lastItem.lyrics || '') + this.pendingRepeatNotation;
+        this.pendingRepeatNotation = null;
+    }
+    parseUGMetadata(line) {
+        const match = line.match($ecd3f348894bfbde$var$UG_METADATA_REGEX);
+        if (!match) return false;
+        const tagName = match[1].toLowerCase();
+        if (!(0, $b58c551853385714$export$57ecf0dc09effb3).includes(tagName)) return false;
+        const value = tagName === (0, $a41c1115e2898cb2$export$866f445d49bad88e) ? this.extractCapoValue(match[2]) : match[2].trim();
+        this.startNewLine();
+        this.songBuilder.addTag(new (0, $b58c551853385714$export$2e2bcd8739ae039)(tagName, value));
+        return true;
+    }
+    extractCapoValue(rawValue) {
+        const [, capoNumber] = rawValue.match(/^(\d+)/) || [];
+        return capoNumber || rawValue.trim();
     }
     parseVerseDirective(line) {
         const match = line.match($ecd3f348894bfbde$var$VERSE_LINE_REGEX);
@@ -36425,6 +36855,22 @@ const $ecd3f348894bfbde$var$endSectionTags = {
         this.startSection((0, $72b24102c7d826fd$export$8db6c706fc9142b2), label);
         return true;
     }
+    parseBridgeDirective(line) {
+        const match = line.match($ecd3f348894bfbde$var$BRIDGE_LINE_REGEX);
+        if (!match) return false;
+        this.startNewLine();
+        const label = match[1];
+        this.startSection((0, $72b24102c7d826fd$export$78d8c50e853acd10), label);
+        return true;
+    }
+    parsePartDirective(line) {
+        const match = line.match($ecd3f348894bfbde$var$PART_LINE_REGEX);
+        if (!match) return false;
+        this.startNewLine();
+        const label = match[1] + (match[2] || '');
+        this.startSection((0, $72b24102c7d826fd$export$609cc0ea1637d6a0), label);
+        return true;
+    }
     parseMetadata(line) {
         const match = line.match($ecd3f348894bfbde$var$OTHER_METADATA_LINE_REGEX);
         if (!match) return false;
@@ -36452,7 +36898,11 @@ const $ecd3f348894bfbde$var$endSectionTags = {
     }
     endSection({ addNewLine: addNewLine = true } = {}) {
         if (this.currentSectionType !== null && this.currentSectionType in $ecd3f348894bfbde$var$endSectionTags) {
-            this.songBuilder.addTag(new (0, $b58c551853385714$export$2e2bcd8739ae039)($ecd3f348894bfbde$var$endSectionTags[this.currentSectionType]));
+            if (this.songLine && this.songLine.isEmpty()) this.songLine.addTag(new (0, $b58c551853385714$export$2e2bcd8739ae039)($ecd3f348894bfbde$var$endSectionTags[this.currentSectionType]));
+            else {
+                const endTagLine = this.songBuilder.addLine();
+                endTagLine.addTag(new (0, $b58c551853385714$export$2e2bcd8739ae039)($ecd3f348894bfbde$var$endSectionTags[this.currentSectionType]));
+            }
             if (addNewLine) this.startNewLine();
         }
         this.songBuilder.setCurrentProperties((0, $72b24102c7d826fd$export$c53d0f541b41b88e));
@@ -36465,7 +36915,7 @@ const $ecd3f348894bfbde$var$endSectionTags = {
 var $ecd3f348894bfbde$export$2e2bcd8739ae039 = $ecd3f348894bfbde$var$UltimateGuitarParser;
 
 
-var $a91afe1497b28cb4$export$2e2bcd8739ae039 = '13.2.2';
+var $a91afe1497b28cb4$export$2e2bcd8739ae039 = '14.1.0';
 
 
 
@@ -36507,6 +36957,7 @@ var $c0b60add41284d2e$export$2e2bcd8739ae039 = {
     SoftLineBreak: $4c3a42e9543eea65$export$2e2bcd8739ae039,
     Song: $962eb86a322c5cfb$export$2e2bcd8739ae039,
     TAB: $72b24102c7d826fd$export$f1c9dd0f5207dd5e,
+    TEXTBLOCK: $72b24102c7d826fd$export$5a2cf64ea612936a,
     Tag: $b58c551853385714$export$2e2bcd8739ae039,
     Ternary: $4afcde69e7cb3e85$export$2e2bcd8739ae039,
     TextFormatter: $e2dfad8e72d5aab0$export$2e2bcd8739ae039,
@@ -36538,5 +36989,5 @@ var $c0b60add41284d2e$export$2e2bcd8739ae039 = {
 };
 
 
-export {$c0b60add41284d2e$export$2e2bcd8739ae039 as default, $f0449e2486cb2372$export$2e2bcd8739ae039 as Chord, $7494e305d9bdc641$export$2e2bcd8739ae039 as ChordDefinition, $0d04ced54ebef610$export$2e2bcd8739ae039 as ChordLyricsPair, $fe0c6f4316da78b0$export$2e2bcd8739ae039 as ChordProFormatter, $6a0e1e68c51ef6cd$export$2e2bcd8739ae039 as PdfFormatter, $cd5e49c3ccca2d1a$export$2e2bcd8739ae039 as MeasuredHtmlFormatter, $6ba1c85836253a53$export$2e2bcd8739ae039 as ChordProParser, $f46090a0372cd33a$export$2e2bcd8739ae039 as ChordSheetParser, $6f86ed99ed3b8cb9$export$2e2bcd8739ae039 as ChordSheetSerializer, $07208092bd922ab3$export$2e2bcd8739ae039 as ChordsOverWordsFormatter, $b58bece5a707e8d1$export$2e2bcd8739ae039 as ChordsOverWordsParser, $acbb1127ce68c11a$export$2e2bcd8739ae039 as Comment, $6191763894f0be63$export$2e2bcd8739ae039 as Composite, $750c574c15888689$export$2e2bcd8739ae039 as Formatter, $79e99f27b77a3c71$export$2e2bcd8739ae039 as HtmlDivFormatter, $24ff40cf6e6a7e2f$export$2e2bcd8739ae039 as HtmlFormatter, $caa8cd86020c188e$export$2e2bcd8739ae039 as HtmlTableFormatter, $4d72f408c2526a1c$export$2e2bcd8739ae039 as Key, $a449f9ee1c7acbe4$export$2e2bcd8739ae039 as Line, $34ab5875df061287$export$2e2bcd8739ae039 as Literal, $709af735c74ed550$export$2e2bcd8739ae039 as Metadata, $ca405333ab46d462$export$2e2bcd8739ae039 as Paragraph, $4c3a42e9543eea65$export$2e2bcd8739ae039 as SoftLineBreak, $962eb86a322c5cfb$export$2e2bcd8739ae039 as Song, $b58c551853385714$export$2e2bcd8739ae039 as Tag, $4afcde69e7cb3e85$export$2e2bcd8739ae039 as Ternary, $e2dfad8e72d5aab0$export$2e2bcd8739ae039 as TextFormatter, $ecd3f348894bfbde$export$2e2bcd8739ae039 as UltimateGuitarParser, $dfcb12f4c26c139d$export$2e2bcd8739ae039 as templateHelpers, $a91afe1497b28cb4$export$2e2bcd8739ae039 as version, $5eb183c94ebd1c6b$export$2027fef7414ae7df as BaseMeasurer, $fba2e39502aaf78d$export$341872369d2a416a as JsPdfMeasurer, $609cd478b8492b62$export$74d213ae39da8aef as DomMeasurer, $ebfdf39b2dab7f15$export$6d4390fed2af4771 as CanvasMeasurer, $a780d3a38b9ddb96$export$12b762d1038ddc6b as LayoutEngine, $72b24102c7d826fd$export$92249c36c213e508 as ABC, $72b24102c7d826fd$export$8db6c706fc9142b2 as CHORUS, $72b24102c7d826fd$export$c5a6fe907430212e as INDETERMINATE, $72b24102c7d826fd$export$6a5a2eab72b6e3d as LILYPOND, $72b24102c7d826fd$export$c53d0f541b41b88e as NONE, $72b24102c7d826fd$export$4d318981b5a83836 as NUMERIC, $72b24102c7d826fd$export$539a6499f4711c57 as SOLFEGE, $72b24102c7d826fd$export$27c95a7104c1f7aa as SYMBOL, $72b24102c7d826fd$export$f1c9dd0f5207dd5e as TAB, $72b24102c7d826fd$export$4b194284baed1659 as VERSE, $72b24102c7d826fd$export$609cc0ea1637d6a0 as PART, $72b24102c7d826fd$export$1321df9b16c30c6a as NUMERAL};
+export {$c0b60add41284d2e$export$2e2bcd8739ae039 as default, $f0449e2486cb2372$export$2e2bcd8739ae039 as Chord, $7494e305d9bdc641$export$2e2bcd8739ae039 as ChordDefinition, $0d04ced54ebef610$export$2e2bcd8739ae039 as ChordLyricsPair, $fe0c6f4316da78b0$export$2e2bcd8739ae039 as ChordProFormatter, $6a0e1e68c51ef6cd$export$2e2bcd8739ae039 as PdfFormatter, $cd5e49c3ccca2d1a$export$2e2bcd8739ae039 as MeasuredHtmlFormatter, $6ba1c85836253a53$export$2e2bcd8739ae039 as ChordProParser, $f46090a0372cd33a$export$2e2bcd8739ae039 as ChordSheetParser, $6f86ed99ed3b8cb9$export$2e2bcd8739ae039 as ChordSheetSerializer, $07208092bd922ab3$export$2e2bcd8739ae039 as ChordsOverWordsFormatter, $b58bece5a707e8d1$export$2e2bcd8739ae039 as ChordsOverWordsParser, $acbb1127ce68c11a$export$2e2bcd8739ae039 as Comment, $6191763894f0be63$export$2e2bcd8739ae039 as Composite, $750c574c15888689$export$2e2bcd8739ae039 as Formatter, $79e99f27b77a3c71$export$2e2bcd8739ae039 as HtmlDivFormatter, $24ff40cf6e6a7e2f$export$2e2bcd8739ae039 as HtmlFormatter, $caa8cd86020c188e$export$2e2bcd8739ae039 as HtmlTableFormatter, $4d72f408c2526a1c$export$2e2bcd8739ae039 as Key, $a449f9ee1c7acbe4$export$2e2bcd8739ae039 as Line, $34ab5875df061287$export$2e2bcd8739ae039 as Literal, $709af735c74ed550$export$2e2bcd8739ae039 as Metadata, $ca405333ab46d462$export$2e2bcd8739ae039 as Paragraph, $4c3a42e9543eea65$export$2e2bcd8739ae039 as SoftLineBreak, $962eb86a322c5cfb$export$2e2bcd8739ae039 as Song, $b58c551853385714$export$2e2bcd8739ae039 as Tag, $4afcde69e7cb3e85$export$2e2bcd8739ae039 as Ternary, $e2dfad8e72d5aab0$export$2e2bcd8739ae039 as TextFormatter, $ecd3f348894bfbde$export$2e2bcd8739ae039 as UltimateGuitarParser, $dfcb12f4c26c139d$export$2e2bcd8739ae039 as templateHelpers, $a91afe1497b28cb4$export$2e2bcd8739ae039 as version, $5eb183c94ebd1c6b$export$2027fef7414ae7df as BaseMeasurer, $fba2e39502aaf78d$export$341872369d2a416a as JsPdfMeasurer, $609cd478b8492b62$export$74d213ae39da8aef as DomMeasurer, $ebfdf39b2dab7f15$export$6d4390fed2af4771 as CanvasMeasurer, $a780d3a38b9ddb96$export$12b762d1038ddc6b as LayoutEngine, $72b24102c7d826fd$export$92249c36c213e508 as ABC, $72b24102c7d826fd$export$8db6c706fc9142b2 as CHORUS, $72b24102c7d826fd$export$c5a6fe907430212e as INDETERMINATE, $72b24102c7d826fd$export$6a5a2eab72b6e3d as LILYPOND, $72b24102c7d826fd$export$c53d0f541b41b88e as NONE, $72b24102c7d826fd$export$4d318981b5a83836 as NUMERIC, $72b24102c7d826fd$export$539a6499f4711c57 as SOLFEGE, $72b24102c7d826fd$export$27c95a7104c1f7aa as SYMBOL, $72b24102c7d826fd$export$f1c9dd0f5207dd5e as TAB, $72b24102c7d826fd$export$5a2cf64ea612936a as TEXTBLOCK, $72b24102c7d826fd$export$4b194284baed1659 as VERSE, $72b24102c7d826fd$export$609cc0ea1637d6a0 as PART, $72b24102c7d826fd$export$1321df9b16c30c6a as NUMERAL};
 //# sourceMappingURL=module.js.map