chordsheetjs 14.0.0 → 14.1.0

package/lib/index.js

@@ -77,6 +77,7 @@ $parcel$export(module.exports, "NUMERIC", () => $dce48cb70c4120bb$export$4d31898
 $parcel$export(module.exports, "SOLFEGE", () => $dce48cb70c4120bb$export$539a6499f4711c57);
 $parcel$export(module.exports, "SYMBOL", () => $dce48cb70c4120bb$export$27c95a7104c1f7aa);
 $parcel$export(module.exports, "TAB", () => $dce48cb70c4120bb$export$f1c9dd0f5207dd5e);
+$parcel$export(module.exports, "TEXTBLOCK", () => $dce48cb70c4120bb$export$5a2cf64ea612936a);
 $parcel$export(module.exports, "VERSE", () => $dce48cb70c4120bb$export$4b194284baed1659);
 $parcel$export(module.exports, "PART", () => $dce48cb70c4120bb$export$609cc0ea1637d6a0);
 $parcel$export(module.exports, "NUMERAL", () => $dce48cb70c4120bb$export$1321df9b16c30c6a);
@@ -380,6 +381,7 @@ const $dce48cb70c4120bb$export$4b194284baed1659 = 'verse';
 const $dce48cb70c4120bb$export$609cc0ea1637d6a0 = 'part';
 const $dce48cb70c4120bb$export$6a5a2eab72b6e3d = 'ly';
 const $dce48cb70c4120bb$export$92249c36c213e508 = 'abc';
+const $dce48cb70c4120bb$export$5a2cf64ea612936a = 'textblock';
 const $dce48cb70c4120bb$export$27c95a7104c1f7aa = 'symbol';
 const $dce48cb70c4120bb$export$4d318981b5a83836 = 'numeric';
 const $dce48cb70c4120bb$export$1321df9b16c30c6a = 'numeral';
@@ -2552,7 +2554,7 @@ const $c2d6ab25ad00308f$var$PREFERS_FLAT_NUMBERS = [
 var $c2d6ab25ad00308f$export$2e2bcd8739ae039 = $c2d6ab25ad00308f$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";
@@ -4211,7 +4213,7 @@ const $b0c0093f9a3a0967$export$98e6a39c04603d36 = $b0c0093f9a3a0967$var$peg$pars
 var $177a605b8569b31c$export$2e2bcd8739ae039 = $177a605b8569b31c$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";
@@ -5187,6 +5189,8 @@ const $d21c5c7a462f3c34$export$4f5168acae064e01 = 'start_of_chorus';
 const $d21c5c7a462f3c34$export$b7e6dcd848b88f43 = 'start_of_grid';
 const $d21c5c7a462f3c34$export$634ff7795b596e62 = 'start_of_ly';
 const $d21c5c7a462f3c34$export$8dd1111100e0e88d = 'start_of_tab';
+const $d21c5c7a462f3c34$export$4252eb8e075f7d7a = 'start_of_textblock';
+const $d21c5c7a462f3c34$export$f1e557abc415d751 = 'end_of_textblock';
 const $d21c5c7a462f3c34$export$deca399f8cd9b7dc = 'start_of_verse';
 const $d21c5c7a462f3c34$export$2b9510a208875fc9 = 'start_of_part';
 const $d21c5c7a462f3c34$export$5895c693c74b9cf4 = 'subtitle';
@@ -5216,6 +5220,7 @@ const $35ced0783ee29c4f$var$START_TAG_TO_SECTION_TYPE = {
     [(0, $d21c5c7a462f3c34$export$b7e6dcd848b88f43)]: (0, $dce48cb70c4120bb$export$e2b0b9a5e613f348),
     [(0, $d21c5c7a462f3c34$export$634ff7795b596e62)]: (0, $dce48cb70c4120bb$export$6a5a2eab72b6e3d),
     [(0, $d21c5c7a462f3c34$export$8dd1111100e0e88d)]: (0, $dce48cb70c4120bb$export$f1c9dd0f5207dd5e),
+    [(0, $d21c5c7a462f3c34$export$4252eb8e075f7d7a)]: (0, $dce48cb70c4120bb$export$5a2cf64ea612936a),
     [(0, $d21c5c7a462f3c34$export$deca399f8cd9b7dc)]: (0, $dce48cb70c4120bb$export$4b194284baed1659)
 };
 const $35ced0783ee29c4f$var$END_TAG_TO_SECTION_TYPE = {
@@ -5225,6 +5230,7 @@ const $35ced0783ee29c4f$var$END_TAG_TO_SECTION_TYPE = {
     [(0, $d21c5c7a462f3c34$export$4b28ac1ae75aff60)]: (0, $dce48cb70c4120bb$export$e2b0b9a5e613f348),
     [(0, $d21c5c7a462f3c34$export$e3f6cdbd95b1f8f)]: (0, $dce48cb70c4120bb$export$6a5a2eab72b6e3d),
     [(0, $d21c5c7a462f3c34$export$66a0ef3ffeab32b7)]: (0, $dce48cb70c4120bb$export$f1c9dd0f5207dd5e),
+    [(0, $d21c5c7a462f3c34$export$f1e557abc415d751)]: (0, $dce48cb70c4120bb$export$5a2cf64ea612936a),
     [(0, $d21c5c7a462f3c34$export$640d294ab83f9040)]: (0, $dce48cb70c4120bb$export$4b194284baed1659)
 };
 const $35ced0783ee29c4f$var$SECTION_START_REGEX = /^start_of_(.+)$/;
@@ -5355,6 +5361,7 @@ const $7251dad5f4a4c35f$var$DIRECTIVES_WITH_RENDERABLE_LABEL = [
     (0, $d21c5c7a462f3c34$export$b7e6dcd848b88f43),
     (0, $d21c5c7a462f3c34$export$634ff7795b596e62),
     (0, $d21c5c7a462f3c34$export$8dd1111100e0e88d),
+    (0, $d21c5c7a462f3c34$export$4252eb8e075f7d7a),
     (0, $d21c5c7a462f3c34$export$deca399f8cd9b7dc),
     (0, $d21c5c7a462f3c34$export$2b9510a208875fc9)
 ];
@@ -6317,7 +6324,8 @@ var $15f1d40e3d1ed3a0$export$2e2bcd8739ae039 = $15f1d40e3d1ed3a0$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);
@@ -6594,6 +6602,7 @@ var $3b7d86e1e1307736$export$2e2bcd8739ae039 = $3b7d86e1e1307736$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`
@@ -6842,7 +6851,7 @@ function $5c7afec93ec943b9$var$appendValue(array, value) {
  * See {@link Metadata#get}
  */ class $5c7afec93ec943b9$var$Metadata extends (0, $9047ab737bb447ce$export$2e2bcd8739ae039) {
     constructor(metadata = {}){
-        super(), this.metadata = {};
+        super(), this.metadata = {}, this.providers = new Map();
         if (metadata instanceof $5c7afec93ec943b9$var$Metadata) this.assign(metadata.metadata);
         else this.assign(metadata);
     }
@@ -6875,6 +6884,9 @@ function $5c7afec93ec943b9$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];
@@ -6909,12 +6921,25 @@ function $5c7afec93ec943b9$var$appendValue(array, value) {
    */ get(prop) {
         if (prop === (0, $d21c5c7a462f3c34$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, $d21c5c7a462f3c34$export$430b1920f5feeae] = key;
+        return all;
+    }
+    ownMetadata() {
         const all = {
             ...this.metadata
         };
@@ -6923,7 +6948,7 @@ function $5c7afec93ec943b9$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
@@ -6960,7 +6985,9 @@ function $5c7afec93ec943b9$var$appendValue(array, value) {
    * Returns a deep clone of this Metadata object
    * @returns {Metadata} the cloned Metadata object
    */ clone() {
-        return new $5c7afec93ec943b9$var$Metadata(this.metadata);
+        const cloned = new $5c7afec93ec943b9$var$Metadata(this.metadata);
+        this.providers.forEach((provider, key)=>cloned.setProvider(key, provider));
+        return cloned;
     }
     calculateKeyFromCapo() {
         const capoString = this.getSingle((0, $d21c5c7a462f3c34$export$866f445d49bad88e));
@@ -7048,6 +7075,9 @@ function $8906e348466806fd$var$getCommonValue(values, fallback) {
         const selectors = this.lines.map((line)=>line.selector).filter((selector)=>selector !== null);
         return $8906e348466806fd$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}
@@ -7223,6 +7253,7 @@ class $69c885ea9d252cfd$var$SongBuilder {
         this.metadata = new (0, $5c7afec93ec943b9$export$2e2bcd8739ae039)();
         this.sectionType = (0, $dce48cb70c4120bb$export$c53d0f541b41b88e);
         this.selector = null;
+        this.selectorIsNegated = false;
         this.transposeKey = null;
         this.warnings = [];
         this.song = song;
@@ -7240,16 +7271,17 @@ class $69c885ea9d252cfd$var$SongBuilder {
             this.currentLine = new (0, $76b2b227aa06e8bf$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, $d21c5c7a462f3c34$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();
     }
@@ -7299,14 +7331,16 @@ class $69c885ea9d252cfd$var$SongBuilder {
     startSection(sectionType, tag) {
         this.checkCurrentSectionType((0, $dce48cb70c4120bb$export$c53d0f541b41b88e), tag);
         this.selector = tag.selector;
+        this.selectorIsNegated = tag.isNegated;
         if (sectionType === (0, $dce48cb70c4120bb$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, $dce48cb70c4120bb$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);
@@ -7830,6 +7864,33 @@ function $2ce1086ce25c9ac0$export$efb38dd75b8e2957({ selector: selector, isNegat
 
 
 
+function $4903bcb4483a26e6$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 $4903bcb4483a26e6$export$12c349605689fe7a() {
+    const providers = new Map();
+    providers.set('chordpro', ()=>'ChordPro');
+    providers.set('chordpro.version', ()=>'14.0.0');
+    providers.set('today', ()=>$4903bcb4483a26e6$var$formatDate(new Date()));
+    return providers;
+}
+function $4903bcb4483a26e6$export$9b09a67f52000acf(configuration) {
+    const providers = $4903bcb4483a26e6$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.
@@ -7872,6 +7933,20 @@ function $2ce1086ce25c9ac0$export$efb38dd75b8e2957({ selector: selector, isNegat
         const expandedLines = this.lines.flatMap((line)=>(0, $cbaaf2a368d4190f$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, $2ce1086ce25c9ac0$export$efb38dd75b8e2957)({
+                selector: selector,
+                isNegated: selectorIsNegated
+            }, context);
+        });
+    }
     linesToParagraphs(lines) {
         let currentParagraph = new (0, $8906e348466806fd$export$2e2bcd8739ae039)();
         const paragraphs = [
@@ -8232,6 +8307,16 @@ Or set the song key before changing key:
     }
     getMetadata(configuration) {
         const metadata = new (0, $5c7afec93ec943b9$export$2e2bcd8739ae039)();
+        const providers = configuration ? (0, $4903bcb4483a26e6$export$9b09a67f52000acf)(configuration) : (0, $4903bcb4483a26e6$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, $7251dad5f4a4c35f$export$2e2bcd8739ae039))) return;
             const tag = item;
@@ -8615,7 +8700,7 @@ function $51ced2cf8b50f946$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";
@@ -9197,31 +9282,35 @@ function $223a4923d98e43eb$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 = [
@@ -11409,7 +11498,10 @@ function $223a4923d98e43eb$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;
@@ -12338,6 +12430,228 @@ function $223a4923d98e43eb$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) {
@@ -12345,7 +12659,7 @@ function $223a4923d98e43eb$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;
     }
@@ -12362,7 +12676,7 @@ function $223a4923d98e43eb$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;
     }
@@ -12378,18 +12692,18 @@ function $223a4923d98e43eb$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;
     }
@@ -12398,21 +12712,21 @@ function $223a4923d98e43eb$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;
@@ -12421,18 +12735,18 @@ function $223a4923d98e43eb$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;
@@ -12462,22 +12776,22 @@ function $223a4923d98e43eb$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;
     }
@@ -12932,7 +13246,8 @@ var $f9c5006b26957916$export$2e2bcd8739ae039 = {
     }
     formatHeader() {
         // Process metadata according to configuration
-        const orderedMetadata = (0, $f9c5006b26957916$export$5c964b66c4a8abfb)(this.song.metadata.all(), this.configuration.metadata);
+        const songMetadata = this.song.getMetadata(this.configuration);
+        const orderedMetadata = (0, $f9c5006b26957916$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}:`;
@@ -12941,8 +13256,10 @@ var $f9c5006b26957916$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;
@@ -13221,7 +13538,7 @@ function $7270482b3072811c$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";
@@ -25358,7 +25675,7 @@ var $df9247d334a0483e$export$2e2bcd8739ae039 = $df9247d334a0483e$var$ChordsOverW
 
 
 
-var $1408adfd7317f0b6$export$2e2bcd8739ae039 = ({ configuration: configuration, configuration: { key: key, cssClasses: c }, song: song, renderBlankLines: renderBlankLines = false, song: { title: title, subtitle: subtitle, metadata: metadata }, bodyParagraphs: bodyParagraphs })=>(0, $f9c5006b26957916$export$6ea1b0eb82ead3f)(`
+var $1408adfd7317f0b6$export$2e2bcd8739ae039 = ({ configuration: configuration, configuration: { key: key, cssClasses: c }, song: song, metadata: metadata, renderBlankLines: renderBlankLines = false, song: { title: title, subtitle: subtitle }, bodyParagraphs: bodyParagraphs })=>(0, $f9c5006b26957916$export$6ea1b0eb82ead3f)(`
   ${(0, $f9c5006b26957916$export$a55877ca9db47377)(title, ()=>`<h1 class="${c.title}">${title}</h1>`)}
   ${(0, $f9c5006b26957916$export$a55877ca9db47377)(subtitle, ()=>`<h2 class="${c.subtitle}">${subtitle}</h2>`)}
 
@@ -25459,10 +25776,12 @@ const $fb7c3e115538fcf2$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)
         });
     }
     /**
@@ -25533,7 +25852,7 @@ var $d9bea8c73e9a5034$export$2e2bcd8739ae039 = $d9bea8c73e9a5034$var$HtmlDivForm
 
 
 
-var $396f7048979e89c9$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, $f9c5006b26957916$export$6ea1b0eb82ead3f)(`
+var $396f7048979e89c9$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, $f9c5006b26957916$export$6ea1b0eb82ead3f)(`
   ${(0, $f9c5006b26957916$export$a55877ca9db47377)(title, ()=>`<h1 class="${c.title}">${title}</h1>`)}
   ${(0, $f9c5006b26957916$export$a55877ca9db47377)(subtitle, ()=>`<h2 class="${c.subtitle}">${subtitle}</h2>`)}
 
@@ -26422,7 +26741,7 @@ var $bdd8c6196670168a$export$2e2bcd8739ae039 = $bdd8c6196670168a$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()
@@ -26440,7 +26759,8 @@ var $bdd8c6196670168a$export$2e2bcd8739ae039 = $bdd8c6196670168a$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 [
@@ -26537,10 +26857,10 @@ class $2e404bc796b05dec$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, $bdd8c6196670168a$export$2e2bcd8739ae039)(contentItem.condition, metadata).evaluate();
     }
     /**
@@ -26617,7 +26937,9 @@ class $2e404bc796b05dec$export$f1e5feaa438be04f {
             const parsed = new (0, $957f29f677b8d58d$export$2e2bcd8739ae039)().parse(template);
             return new (0, $992b73e4d56a0aef$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
+            });
         }
     }
     /**
@@ -27669,8 +27991,7 @@ class $9c53a1d7fff20a4a$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;
@@ -36671,7 +36992,7 @@ const $a5a21ced491ea51f$var$endSectionTags = {
 var $a5a21ced491ea51f$export$2e2bcd8739ae039 = $a5a21ced491ea51f$var$UltimateGuitarParser;
 
 
-var $ae92e002ce14f11a$export$2e2bcd8739ae039 = '14.0.0';
+var $ae92e002ce14f11a$export$2e2bcd8739ae039 = '14.1.0';
 
 
 
@@ -36713,6 +37034,7 @@ var $892913528e7f60f9$export$2e2bcd8739ae039 = {
     SoftLineBreak: $4b6dd3e4b817bd81$export$2e2bcd8739ae039,
     Song: $c53141c05fae8382$export$2e2bcd8739ae039,
     TAB: $dce48cb70c4120bb$export$f1c9dd0f5207dd5e,
+    TEXTBLOCK: $dce48cb70c4120bb$export$5a2cf64ea612936a,
     Tag: $7251dad5f4a4c35f$export$2e2bcd8739ae039,
     Ternary: $15f1d40e3d1ed3a0$export$2e2bcd8739ae039,
     TextFormatter: $992b73e4d56a0aef$export$2e2bcd8739ae039,