chordsheetjs 14.3.1 → 14.4.0

package/lib/bundle.js

@@ -45766,6 +45766,76 @@ Or set the song key before changing key:
         }
       };
       var $957f29f677b8d58d$export$2e2bcd8739ae039 = $957f29f677b8d58d$var$ChordProParser;
+      var $2da8d6b3c840ecd4$var$WIDE_RANGES = [
+        [
+          4352,
+          4607
+        ],
+        [
+          11904,
+          40959
+        ],
+        [
+          12288,
+          12351
+        ],
+        [
+          12352,
+          12447
+        ],
+        [
+          12448,
+          12543
+        ],
+        [
+          44032,
+          55215
+        ],
+        [
+          63744,
+          64255
+        ],
+        [
+          65072,
+          65103
+        ],
+        [
+          65281,
+          65519
+        ],
+        [
+          131072,
+          195103
+        ]
+      ];
+      function $2da8d6b3c840ecd4$export$e5cd96a5fcc7385e(ch) {
+        const code = ch.charCodeAt(0);
+        return $2da8d6b3c840ecd4$var$WIDE_RANGES.some(([lo, hi]) => code >= lo && code <= hi);
+      }
+      function $2da8d6b3c840ecd4$export$798c10ea30852970(lyricsLine) {
+        const map = [];
+        let visualColumn = 0;
+        for (let characterIndex = 0; characterIndex < lyricsLine.length; characterIndex += 1) {
+          const characterWidth = $2da8d6b3c840ecd4$export$e5cd96a5fcc7385e(lyricsLine[characterIndex]) ? 2 : 1;
+          for (let column = 0; column < characterWidth; column += 1) {
+            map[visualColumn] = characterIndex;
+            visualColumn += 1;
+          }
+        }
+        return map;
+      }
+      function $2da8d6b3c840ecd4$export$9f6ee93f4e2fb3d2(string) {
+        const result = /(\s+)(\S+)/.exec(string);
+        const secondWordPosition = result ? result.index + result[1].length : null;
+        if (secondWordPosition && secondWordPosition !== -1) return [
+          string.substring(0, secondWordPosition).trim(),
+          string.substring(secondWordPosition)
+        ];
+        return [
+          /.+\s+$/.test(string) ? `${string.trim()} ` : string,
+          null
+        ];
+      }
       var $e136d63bbe28a4e0$var$WHITE_SPACE = /\s/;
       var $e136d63bbe28a4e0$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|$)+/;
       var $e136d63bbe28a4e0$var$ChordSheetParser = class {
@@ -45840,9 +45910,9 @@ Or set the song key before changing key:
           return this.currentLine < this.lineCount;
         }
         parseLyricsWithChords(chordsLine, lyricsLine) {
-          this.processCharacters(chordsLine, lyricsLine);
+          const consumedLyrics = 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.lyrics += lyricsLine.substring(consumedLyrics);
           this.chordLyricsPair.chords = this.chordLyricsPair.chords.trim();
           if (this.chordLyricsPair.lyrics) this.chordLyricsPair.lyrics = this.chordLyricsPair.lyrics.trim();
           if (!lyricsLine.trim().length) {
@@ -45851,15 +45921,23 @@ Or set the song key before changing key:
           }
         }
         processCharacters(chordsLine, lyricsLine) {
+          const columnToLyricsIndex = (0, $2da8d6b3c840ecd4$export$798c10ea30852970)(lyricsLine);
+          let lastLyricsIndex = -1;
           for (let c4 = 0, charCount = chordsLine.length; c4 < charCount; c4 += 1) {
-            const chr = chordsLine[c4];
-            const nextChar = chordsLine[c4 + 1];
-            const isWhiteSpace = $e136d63bbe28a4e0$var$WHITE_SPACE.test(chr);
-            this.addCharacter(chr, nextChar);
-            if (!this.chordLyricsPair) throw new Error("Expected this.chordLyricsPair to be present");
-            this.chordLyricsPair.lyrics += lyricsLine[c4] || "";
-            this.processingText = !isWhiteSpace;
+            this.addCharacter(chordsLine[c4], chordsLine[c4 + 1]);
+            lastLyricsIndex = this.mapLyricsCharacter(columnToLyricsIndex, c4, lyricsLine, lastLyricsIndex);
+            this.processingText = !$e136d63bbe28a4e0$var$WHITE_SPACE.test(chordsLine[c4]);
           }
+          return lastLyricsIndex >= 0 ? lastLyricsIndex + 1 : 0;
+        }
+        mapLyricsCharacter(columnMap, column, lyricsLine, lastIndex) {
+          if (!this.chordLyricsPair) throw new Error("Expected this.chordLyricsPair to be present");
+          const lyricsIndex = columnMap[column];
+          if (lyricsIndex !== void 0 && lyricsIndex !== lastIndex) {
+            this.chordLyricsPair.lyrics += lyricsLine[lyricsIndex];
+            return lyricsIndex;
+          }
+          return lastIndex;
         }
         addCharacter(chr, nextChar) {
           const isWhiteSpace = $e136d63bbe28a4e0$var$WHITE_SPACE.test(chr);
@@ -46312,18 +46390,6 @@ Or set the song key before changing key:
         }
       };
       var $2d92af868d7c705a$export$2e2bcd8739ae039 = $2d92af868d7c705a$var$ChordsOverWordsFormatter;
-      function $2da8d6b3c840ecd4$export$9f6ee93f4e2fb3d2(string) {
-        const result = /(\s+)(\S+)/.exec(string);
-        const secondWordPosition = result ? result.index + result[1].length : null;
-        if (secondWordPosition && secondWordPosition !== -1) return [
-          string.substring(0, secondWordPosition).trim(),
-          string.substring(secondWordPosition)
-        ];
-        return [
-          /.+\s+$/.test(string) ? `${string.trim()} ` : string,
-          null
-        ];
-      }
       function $7270482b3072811c$var$combineChordSheetLines(newLine, lines, trailingLine) {
         const hasEmptyLine = newLine && newLine.length > 0;
         const emptyLines = hasEmptyLine ? [
@@ -69746,23 +69812,22 @@ AjwCRQJ5AAAAAAABAAAAANpTmfAAAAAA0e+yRgAAAADR77JG
           this.applyRepeatNotation();
         }
         parseLyricsWithChords(chordsLine, lyricsLine) {
-          this.processCharacters(chordsLine, lyricsLine);
+          const consumedLyrics = 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.lyrics += lyricsLine.substring(consumedLyrics);
           this.chordLyricsPair.chords = this.chordLyricsPair.chords.trim();
           if (this.chordLyricsPair.lyrics) this.chordLyricsPair.lyrics = this.chordLyricsPair.lyrics.trim();
           this.applyRepeatNotation();
         }
         processCharacters(chordsLine, lyricsLine) {
+          const columnToLyricsIndex = (0, $2da8d6b3c840ecd4$export$798c10ea30852970)(lyricsLine);
+          let lastLyricsIndex = -1;
           for (let c4 = 0, charCount = chordsLine.length; c4 < charCount; c4 += 1) {
-            const chr = chordsLine[c4];
-            const nextChar = chordsLine[c4 + 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[c4] || "";
-            this.processingText = !isWhiteSpace;
+            this.addCharacter(chordsLine[c4], chordsLine[c4 + 1]);
+            lastLyricsIndex = this.mapLyricsCharacter(columnToLyricsIndex, c4, lyricsLine, lastLyricsIndex);
+            this.processingText = !/\s/.test(chordsLine[c4]);
           }
+          return lastLyricsIndex >= 0 ? lastLyricsIndex + 1 : 0;
         }
         addCharacter(chr, nextChar) {
           const isWhiteSpace = /\s/.test(chr);
@@ -69887,7 +69952,7 @@ AjwCRQJ5AAAAAAABAAAAANpTmfAAAAAA0e+yRgAAAADR77JG
         }
       };
       var $a5a21ced491ea51f$export$2e2bcd8739ae039 = $a5a21ced491ea51f$var$UltimateGuitarParser;
-      var $ae92e002ce14f11a$export$2e2bcd8739ae039 = "14.3.1";
+      var $ae92e002ce14f11a$export$2e2bcd8739ae039 = "14.4.0";
       var $a3816b486f741c00$exports = {};
       var $892913528e7f60f9$export$2e2bcd8739ae039 = {
         CHORUS: $dce48cb70c4120bb$export$8db6c706fc9142b2,