chordsheetjs 15.2.1 → 15.3.1

package/lib/pdf/index.js

@@ -746,6 +746,7 @@ const $8c370f6299188657$export$82f9bd327a40ea54 = {
     key: null,
     metadata: $8c370f6299188657$export$a014e67b549cbef4,
     normalizeChords: true,
+    normalizeChordSuffix: true,
     useUnicodeModifiers: false,
     user: null
 };
@@ -13942,6 +13943,7 @@ const $c2be399211dfbcbd$var$defaultConstructorOptions = {
     contextKey: null,
     decapo: false,
     normalizeChords: true,
+    normalizeChordSuffix: true,
     renderKey: null,
     songKey: null,
     style: null,
@@ -13957,6 +13959,7 @@ class $c2be399211dfbcbd$var$ChordRenderer {
         this.capo = config.decapo ? config.capo : 0;
         this.contextKey = config.contextKey;
         this.normalizeChords = config.normalizeChords;
+        this.normalizeChordSuffix = config.normalizeChordSuffix;
         this.renderKey = config.renderKey;
         this.songKey = config.songKey;
         this.style = config.style;
@@ -13969,7 +13972,9 @@ class $c2be399211dfbcbd$var$ChordRenderer {
         return (0, $21a34a464e7bc609$export$79570e60478bce41)(chord, [
             (c)=>c.transpose(this.effectiveTransposeDistance),
             (c)=>this.accidental ? c.useAccidental(this.accidental) : c,
-            (c)=>this.normalizeChords ? c.normalize(this.effectiveKey) : c,
+            (c)=>this.normalizeChords ? c.normalize(this.effectiveKey, {
+                    normalizeSuffix: this.normalizeChordSuffix
+                }) : c,
             (c)=>this.changeChordType(c)
         ]).toString({
             useUnicodeModifier: this.useUnicodeModifier
@@ -14369,13 +14374,38 @@ function $dfecd32049fa58e9$export$fd31a53e6281557e(transposeKey, songKey) {
     if (/^\d+$/.test(transposeKey)) return parseInt(transposeKey, 10);
     return (0, $bff5407e03fdc8ee$export$2e2bcd8739ae039).distance(songKey, transposeKey);
 }
-function $dfecd32049fa58e9$export$596ec52955da9472(chordString, line, song, { renderKey: renderKey = null, useUnicodeModifier: useUnicodeModifier = false, normalizeChords: normalizeChords = true, decapo: decapo = false } = {}) {
+/**
+ * Renders a chord in the context of a line and song and taking into account some options
+ * @param chordString The chord to render
+ * @param line The line the chord is in
+ * @param song The song the line is in
+ * @param renderKey The key to render the chord in. If not provided, the line key will be used,
+ * or the song key if the line key is not provided.
+ * @param useUnicodeModifier Whether to use unicode modifiers ('\u266f'/'\u266d') or plain text ('#'/'b').
+ * Default `false`.
+ * @param normalizeChords Whether to normalize the chord to the key (default `true`)
+ * @param normalizeChordSuffix Whether to normalize the chord suffix (e.g. `sus2` to `2`, `maj7` to `ma7`).
+ * Only takes effect when `normalizeChords` is `true`. Default `true`.
+ * @param decapo Whether to transpose all chords to eliminate the capo (default `false`)
+ */ const $dfecd32049fa58e9$var$renderChordDefaults = {
+    renderKey: null,
+    useUnicodeModifier: false,
+    normalizeChords: true,
+    normalizeChordSuffix: true,
+    decapo: false
+};
+function $dfecd32049fa58e9$export$596ec52955da9472(chordString, line, song, options = {}) {
+    const { renderKey: renderKey, useUnicodeModifier: useUnicodeModifier, normalizeChords: normalizeChords, normalizeChordSuffix: normalizeChordSuffix, decapo: decapo } = {
+        ...$dfecd32049fa58e9$var$renderChordDefaults,
+        ...options
+    };
     const capoString = song.metadata.getSingle((0, $b8d0f3e3723cd084$export$866f445d49bad88e));
     return new (0, $c2be399211dfbcbd$export$2e2bcd8739ae039)({
         capo: capoString ? parseInt(capoString, 10) : 0,
         contextKey: (0, $bff5407e03fdc8ee$export$2e2bcd8739ae039).wrap(line.key || song.key),
         decapo: decapo,
         normalizeChords: normalizeChords,
+        normalizeChordSuffix: normalizeChordSuffix,
         renderKey: renderKey,
         songKey: (0, $bff5407e03fdc8ee$export$2e2bcd8739ae039).wrap(song.key),
         style: song.metadata.getSingle((0, $b8d0f3e3723cd084$export$d8cbdf44b1f66df1)),
@@ -20877,6 +20907,9 @@ var $f3be006db03d6687$export$2e2bcd8739ae039 = $f3be006db03d6687$var$Condition;
    * @param {boolean} [configuration.useUnicodeModifiers=false] Whether or not to use unicode flat and sharp
    * symbols.
    * @param {boolean} [configuration.normalizeChords=true] Whether or not to automatically normalize chords
+   * @param {boolean} [configuration.normalizeChordSuffix=true] Whether to normalize chord suffixes (e.g.
+   * `sus2` to `2`, `maj7` to `ma7`). Only takes effect when `normalizeChords` is `true`. Defaults to `false`
+   * for {@link ChordProFormatter} so ChordPro round-trips preserve the user's suffix variant.
    */ constructor(configuration = {}){
         const defaultConfig = this.getDefaultConfiguration();
         this.configuration = (0, $21a34a464e7bc609$export$5d86b86a654a7039)(defaultConfig, configuration);
@@ -21151,9 +21184,16 @@ var $5dfeb7121ee98007$export$2e2bcd8739ae039 = $5dfeb7121ee98007$var$When;
 
 
 
+
 /**
  * Formats a song into a ChordPro chord sheet
  */ class $b601b9602157ea5f$var$ChordProFormatter extends (0, $0055ecb09272ba2d$export$2e2bcd8739ae039) {
+    getDefaultConfiguration() {
+        return {
+            ...(0, $34c988d232665944$export$cb4529290f33d264)(),
+            normalizeChordSuffix: false
+        };
+    }
     /**
    * Formats a song into a ChordPro chord sheet.
    * @param {Song} song The song to be formatted
@@ -21279,7 +21319,9 @@ var $5dfeb7121ee98007$export$2e2bcd8739ae039 = $5dfeb7121ee98007$var$When;
         if (chordLyricsPair.chords) {
             const chordObj = chordLyricsPair.chord;
             if (!chordObj) return `[${chordLyricsPair.chords}]`;
-            const finalChord = this.configuration.normalizeChords ? chordObj.normalize() : chordObj;
+            const finalChord = this.configuration.normalizeChords ? chordObj.normalize(null, {
+                normalizeSuffix: this.configuration.normalizeChordSuffix
+            }) : chordObj;
             return `[${finalChord}]`;
         }
         if (chordLyricsPair.annotation) return `[*${chordLyricsPair.annotation}]`;
@@ -21596,6 +21638,7 @@ var $c049675f48c823b2$export$2e2bcd8739ae039 = $c049675f48c823b2$var$ChordSheetP
         return (0, $dfecd32049fa58e9$export$596ec52955da9472)(item.chords, line, this.song, {
             renderKey: this.configuration.key,
             normalizeChords: this.configuration.normalizeChords,
+            normalizeChordSuffix: this.configuration.normalizeChordSuffix,
             decapo: this.configuration.decapo
         });
     }
@@ -34141,6 +34184,7 @@ var $93f055b77b2d269f$export$2e2bcd8739ae039 = ({ configuration: configuration,
                                     renderKey: key,
                                     useUnicodeModifier: configuration.useUnicodeModifiers,
                                     normalizeChords: configuration.normalizeChords,
+                                    normalizeChordSuffix: configuration.normalizeChordSuffix,
                                     decapo: configuration.decapo
                                 })}
                         </div>
@@ -34340,6 +34384,7 @@ var $5381a6b1b90601c7$export$2e2bcd8739ae039 = ({ configuration: configuration,
                                             renderKey: key,
                                             useUnicodeModifier: configuration.useUnicodeModifiers,
                                             normalizeChords: configuration.normalizeChords,
+                                            normalizeChordSuffix: configuration.normalizeChordSuffix,
                                             decapo: configuration.decapo
                                         })}</td>
                           `;
@@ -35800,6 +35845,7 @@ class $2f9d0306025b5d6b$export$e6ce86b8bc39728b {
             renderKey: null,
             useUnicodeModifier: this.config.useUnicodeModifiers,
             normalizeChords: this.config.normalizeChords,
+            normalizeChordSuffix: this.config.normalizeChordSuffix,
             decapo: this.config.decapo
         });
     }
@@ -36876,6 +36922,7 @@ class $b507f24a204c2802$export$12b762d1038ddc6b {
             linePadding: this.configuration.layout.sections.global.linePadding,
             useUnicodeModifiers: this.configuration.useUnicodeModifiers,
             normalizeChords: this.configuration.normalizeChords,
+            normalizeChordSuffix: this.configuration.normalizeChordSuffix,
             // Column and page layout information
             minY: dimensions.minY,
             columnWidth: dimensions.columnWidth,
@@ -37141,7 +37188,7 @@ const $db9c80925e255cd2$var$endSectionTags = {
 var $db9c80925e255cd2$export$2e2bcd8739ae039 = $db9c80925e255cd2$var$UltimateGuitarParser;
 
 
-var $7491059d3a8d9eaa$export$2e2bcd8739ae039 = '15.2.1';
+var $7491059d3a8d9eaa$export$2e2bcd8739ae039 = '15.3.1';
 
 
 
@@ -37417,6 +37464,7 @@ var $376e205ced98486b$export$2e2bcd8739ae039 = {
             renderKey: this.configuration.key,
             useUnicodeModifier: this.configuration.useUnicodeModifiers,
             normalizeChords: this.configuration.normalizeChords,
+            normalizeChordSuffix: this.configuration.normalizeChordSuffix,
             decapo: this.configuration.decapo
         });
         return chords;
@@ -37878,6 +37926,7 @@ var $5751ce07ce8c1517$export$2e2bcd8739ae039 = $5751ce07ce8c1517$var$JsPdfRender
             linePadding: this.configuration.layout.sections.global.linePadding,
             useUnicodeModifiers: this.configuration.useUnicodeModifiers,
             normalizeChords: this.configuration.normalizeChords,
+            normalizeChordSuffix: this.configuration.normalizeChordSuffix,
             // Column and page layout information
             minY: dimensions.minY,
             columnWidth: dimensions.columnWidth,