chordsheetjs 15.2.0 → 15.3.0

package/lib/pdf/module.js

@@ -739,6 +739,7 @@ const $663e568e94e22dc9$export$82f9bd327a40ea54 = {
     key: null,
     metadata: $663e568e94e22dc9$export$a014e67b549cbef4,
     normalizeChords: true,
+    normalizeChordSuffix: true,
     useUnicodeModifiers: false,
     user: null
 };
@@ -13935,6 +13936,7 @@ const $f5e27e8faa22bf25$var$defaultConstructorOptions = {
     contextKey: null,
     decapo: false,
     normalizeChords: true,
+    normalizeChordSuffix: true,
     renderKey: null,
     songKey: null,
     style: null,
@@ -13950,6 +13952,7 @@ class $f5e27e8faa22bf25$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;
@@ -13962,7 +13965,9 @@ class $f5e27e8faa22bf25$var$ChordRenderer {
         return (0, $974bd1d260bb1d53$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
@@ -14362,13 +14367,38 @@ function $e2e1ea6dd3b7d2e1$export$fd31a53e6281557e(transposeKey, songKey) {
     if (/^\d+$/.test(transposeKey)) return parseInt(transposeKey, 10);
     return (0, $918eb2016ac61e41$export$2e2bcd8739ae039).distance(songKey, transposeKey);
 }
-function $e2e1ea6dd3b7d2e1$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 $e2e1ea6dd3b7d2e1$var$renderChordDefaults = {
+    renderKey: null,
+    useUnicodeModifier: false,
+    normalizeChords: true,
+    normalizeChordSuffix: true,
+    decapo: false
+};
+function $e2e1ea6dd3b7d2e1$export$596ec52955da9472(chordString, line, song, options = {}) {
+    const { renderKey: renderKey, useUnicodeModifier: useUnicodeModifier, normalizeChords: normalizeChords, normalizeChordSuffix: normalizeChordSuffix, decapo: decapo } = {
+        ...$e2e1ea6dd3b7d2e1$var$renderChordDefaults,
+        ...options
+    };
     const capoString = song.metadata.getSingle((0, $fc279350ee3ca664$export$866f445d49bad88e));
     return new (0, $f5e27e8faa22bf25$export$2e2bcd8739ae039)({
         capo: capoString ? parseInt(capoString, 10) : 0,
         contextKey: (0, $918eb2016ac61e41$export$2e2bcd8739ae039).wrap(line.key || song.key),
         decapo: decapo,
         normalizeChords: normalizeChords,
+        normalizeChordSuffix: normalizeChordSuffix,
         renderKey: renderKey,
         songKey: (0, $918eb2016ac61e41$export$2e2bcd8739ae039).wrap(song.key),
         style: song.metadata.getSingle((0, $fc279350ee3ca664$export$d8cbdf44b1f66df1)),
@@ -21144,9 +21174,16 @@ var $c1baef5f0178006c$export$2e2bcd8739ae039 = $c1baef5f0178006c$var$When;
 
 
 
+
 /**
  * Formats a song into a ChordPro chord sheet
  */ class $feb758e68dd351a4$var$ChordProFormatter extends (0, $2dfa852662754780$export$2e2bcd8739ae039) {
+    getDefaultConfiguration() {
+        return {
+            ...(0, $a4496115a7f17554$export$cb4529290f33d264)(),
+            normalizeChordSuffix: false
+        };
+    }
     /**
    * Formats a song into a ChordPro chord sheet.
    * @param {Song} song The song to be formatted
@@ -21272,7 +21309,9 @@ var $c1baef5f0178006c$export$2e2bcd8739ae039 = $c1baef5f0178006c$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}]`;
@@ -21366,7 +21405,7 @@ function $559e0277f2c887f5$export$9f6ee93f4e2fb3d2(string) {
 
 
 const $9c17b505581d81bb$var$WHITE_SPACE = /\s/;
-const $9c17b505581d81bb$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 $9c17b505581d81bb$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|$)+/;
 /**
  * Parses a normal chord sheet
  *
@@ -21589,6 +21628,7 @@ var $9c17b505581d81bb$export$2e2bcd8739ae039 = $9c17b505581d81bb$var$ChordSheetP
         return (0, $e2e1ea6dd3b7d2e1$export$596ec52955da9472)(item.chords, line, this.song, {
             renderKey: this.configuration.key,
             normalizeChords: this.configuration.normalizeChords,
+            normalizeChordSuffix: this.configuration.normalizeChordSuffix,
             decapo: this.configuration.decapo
         });
     }
@@ -34134,6 +34174,7 @@ var $d6c38f6287712fb1$export$2e2bcd8739ae039 = ({ configuration: configuration,
                                     renderKey: key,
                                     useUnicodeModifier: configuration.useUnicodeModifiers,
                                     normalizeChords: configuration.normalizeChords,
+                                    normalizeChordSuffix: configuration.normalizeChordSuffix,
                                     decapo: configuration.decapo
                                 })}
                         </div>
@@ -34333,6 +34374,7 @@ var $9940e2d1d4d0b0b9$export$2e2bcd8739ae039 = ({ configuration: configuration,
                                             renderKey: key,
                                             useUnicodeModifier: configuration.useUnicodeModifiers,
                                             normalizeChords: configuration.normalizeChords,
+                                            normalizeChordSuffix: configuration.normalizeChordSuffix,
                                             decapo: configuration.decapo
                                         })}</td>
                           `;
@@ -35793,6 +35835,7 @@ class $b5b6826de720b411$export$e6ce86b8bc39728b {
             renderKey: null,
             useUnicodeModifier: this.config.useUnicodeModifiers,
             normalizeChords: this.config.normalizeChords,
+            normalizeChordSuffix: this.config.normalizeChordSuffix,
             decapo: this.config.decapo
         });
     }
@@ -36869,6 +36912,7 @@ class $850a89b14e4b94eb$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,
@@ -36929,7 +36973,7 @@ const $7c59209366f6488e$var$UG_METADATA_REGEX = /^(\w+):\s*(.+)$/;
 const $7c59209366f6488e$var$OTHER_METADATA_LINE_REGEX = /^\[([^\]]+)]/;
 const $7c59209366f6488e$var$REPEAT_NOTATION_REGEX = /\s+(x\d+)\s*$/i;
 // eslint-disable-next-line max-len
-const $7c59209366f6488e$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 $7c59209366f6488e$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 $7c59209366f6488e$var$startSectionTags = {
     [(0, $234747a9630b4642$export$4b194284baed1659)]: (0, $fc279350ee3ca664$export$deca399f8cd9b7dc),
     [(0, $234747a9630b4642$export$8db6c706fc9142b2)]: (0, $fc279350ee3ca664$export$4f5168acae064e01),
@@ -37134,7 +37178,7 @@ const $7c59209366f6488e$var$endSectionTags = {
 var $7c59209366f6488e$export$2e2bcd8739ae039 = $7c59209366f6488e$var$UltimateGuitarParser;
 
 
-var $3e7872a494b653a9$export$2e2bcd8739ae039 = '15.2.0';
+var $3e7872a494b653a9$export$2e2bcd8739ae039 = '15.3.0';
 
 
 
@@ -37410,6 +37454,7 @@ var $a2a605be2775ff64$export$2e2bcd8739ae039 = {
             renderKey: this.configuration.key,
             useUnicodeModifier: this.configuration.useUnicodeModifiers,
             normalizeChords: this.configuration.normalizeChords,
+            normalizeChordSuffix: this.configuration.normalizeChordSuffix,
             decapo: this.configuration.decapo
         });
         return chords;
@@ -37871,6 +37916,7 @@ var $5ad5f749425e7fe5$export$2e2bcd8739ae039 = $5ad5f749425e7fe5$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,