chordsheetjs 15.5.2 → 15.5.3-canary.0

package/lib/bundle.js

@@ -8676,7 +8676,10 @@ Or set the song key before changing key:
           const eagerChord = this.notation && chordString ? (0, $177a605b8569b31c$export$2e2bcd8739ae039).parse(chordString, {
             notation: this.notation
           }) : null;
-          return new (0, $551a223fc13b5c10$export$2e2bcd8739ae039)(eagerChord ? eagerChord.toString() : chordString, lyrics, annotation, eagerChord, isRhythmSymbol || false);
+          return new (0, $551a223fc13b5c10$export$2e2bcd8739ae039)(eagerChord ? eagerChord.toString() : chordString, lyrics, annotation, eagerChord, isRhythmSymbol || this.isRhythmSymbol(chordString));
+        }
+        isRhythmSymbol(chordString) {
+          return chordString === "|" || chordString === "/";
         }
         parseTag(astComponent) {
           const { name, value, location: { offset = null, line = null, column = null } = {}, chordDefinition, attributes, selector, isNegated } = astComponent;
@@ -28448,7 +28451,7 @@ ${template}
           const renderedChords = this.renderChordText(chords, line);
           const measurements = this.calculateMeasurements(renderedChords, lyrics, nextItem, lyricsOnly);
           return {
-            item: new (0, $551a223fc13b5c10$export$2e2bcd8739ae039)(chords, lyrics),
+            item: new (0, $551a223fc13b5c10$export$2e2bcd8739ae039)(chords, lyrics, splitItem.annotation, null, splitItem.isRhythmSymbol),
             width: measurements.totalWidth,
             chordHeight: measurements.chordHeight
           };
@@ -28560,11 +28563,7 @@ ${template}
           const firstLyrics = splitLines[0];
           const secondLyrics = splitLines.slice(1).join(" ");
           return [
-            {
-              item: new (0, $551a223fc13b5c10$export$2e2bcd8739ae039)(item.item.chords, firstLyrics),
-              width: this.measurer.measureTextWidth(firstLyrics, lyricsFont),
-              chordHeight: item.chordHeight
-            },
+            this.createSplitMeasuredItem(item, firstLyrics, item.item.chords, item.item.isRhythmSymbol),
             {
               item: new (0, $551a223fc13b5c10$export$2e2bcd8739ae039)("", secondLyrics),
               width: this.measurer.measureTextWidth(secondLyrics, lyricsFont),
@@ -28572,6 +28571,14 @@ ${template}
             }
           ];
         }
+        createSplitMeasuredItem(originalItem, lyrics, chords, isRhythmSymbol) {
+          const annotation = originalItem.item instanceof (0, $551a223fc13b5c10$export$2e2bcd8739ae039) ? originalItem.item.annotation : null;
+          return {
+            item: new (0, $551a223fc13b5c10$export$2e2bcd8739ae039)(chords, lyrics, annotation, null, isRhythmSymbol),
+            width: this.measurer.measureTextWidth(lyrics, this.config.fonts.lyrics),
+            chordHeight: originalItem.chordHeight
+          };
+        }
         /**
         * Removes hyphens from lyrics for lyrics-only mode
         */
@@ -28599,11 +28606,11 @@ ${template}
                 items.push(new (0, $551a223fc13b5c10$export$2e2bcd8739ae039)("", adjustedFragment, ""));
               }
             }
-            if (index === 0 && lyricFragments.length === 1) items.push(new (0, $551a223fc13b5c10$export$2e2bcd8739ae039)(chords, fragment, annotation));
+            if (index === 0 && lyricFragments.length === 1) items.push(new (0, $551a223fc13b5c10$export$2e2bcd8739ae039)(chords, fragment, annotation, null, pair.isRhythmSymbol));
             else if (index === 0 && lyricFragments.length > 1) {
               let commaAdjustedFragment = fragment;
               commaAdjustedFragment += ",";
-              items.push(new (0, $551a223fc13b5c10$export$2e2bcd8739ae039)(chords, commaAdjustedFragment, annotation));
+              items.push(new (0, $551a223fc13b5c10$export$2e2bcd8739ae039)(chords, commaAdjustedFragment, annotation, null, pair.isRhythmSymbol));
             }
           });
           return items;
@@ -28745,7 +28752,7 @@ ${template}
             this.layoutFactory.createLineLayout(items, line)
           ];
           if (softBreakIndices.length === 0) return this.handleNoSoftBreaks(items, availableWidth, line);
-          const { firstChunk, secondChunk } = this.splitAtBestSoftBreak(items, softBreakIndices, totalWidth);
+          const { firstChunk, secondChunk } = this.splitAtBestSoftBreak(items, softBreakIndices, totalWidth, availableWidth);
           if (firstChunk.length === 0) return this.breakContent(secondChunk, availableWidth, line);
           const firstLayout = this.layoutFactory.createLineLayout(firstChunk, line);
           return [
@@ -28762,8 +28769,9 @@ ${template}
             this.layoutFactory.createLineLayout(items, line)
           ];
           if (breakIndex === 0) return this.handleOversizedFirstItem(items, availableWidth, line);
-          const firstChunk = items.slice(0, breakIndex);
-          const secondChunk = items.slice(breakIndex);
+          let firstChunk = items.slice(0, breakIndex);
+          let secondChunk = items.slice(breakIndex);
+          ({ firstChunk, secondChunk } = this.avoidLeadingRhythmSymbol(firstChunk, secondChunk, availableWidth));
           this.removeTrailingComma(firstChunk);
           return [
             this.layoutFactory.createLineLayout(firstChunk, line),
@@ -28822,26 +28830,112 @@ ${template}
         shouldReturnSingleLayout(totalWidth, availableWidth) {
           return totalWidth <= availableWidth;
         }
-        splitAtBestSoftBreak(items, softBreakIndices, totalWidth) {
+        splitAtBestSoftBreak(items, softBreakIndices, totalWidth, availableWidth) {
+          const bestBreak = this.findBestSoftBreak(items, softBreakIndices, totalWidth);
+          let firstChunk = items.slice(0, bestBreak.index);
+          let secondChunk = items.slice(bestBreak.index + 1);
+          ({ firstChunk, secondChunk } = this.avoidLeadingRhythmSymbol(firstChunk, secondChunk, availableWidth));
+          this.removeTrailingComma(firstChunk);
+          this.capitalizeNextItem(secondChunk, secondChunk, 0);
+          return {
+            firstChunk,
+            secondChunk
+          };
+        }
+        findBestSoftBreak(items, softBreakIndices, totalWidth) {
           const targetWidth = totalWidth / 2;
           const breakOptions = softBreakIndices.map((idx) => ({
             index: idx,
             widthUpToBreak: this.getWidthUpToIndex(items, idx)
           }));
-          const bestBreak = breakOptions.reduce((best, current) => {
-            const currentDistance = Math.abs(current.widthUpToBreak - targetWidth);
-            const bestDistance = Math.abs(best.widthUpToBreak - targetWidth);
-            if (currentDistance === bestDistance) return current.index > best.index ? current : best;
-            return currentDistance < bestDistance ? current : best;
-          });
-          const firstChunk = items.slice(0, bestBreak.index);
-          const secondChunk = items.slice(bestBreak.index + 1);
-          this.removeTrailingComma(firstChunk);
-          this.capitalizeNextItem(secondChunk, secondChunk, 0);
-          return {
+          return breakOptions.reduce((best, current) => this.selectBetterSoftBreak(best, current, targetWidth));
+        }
+        selectBetterSoftBreak(best, current, targetWidth) {
+          const currentDistance = Math.abs(current.widthUpToBreak - targetWidth);
+          const bestDistance = Math.abs(best.widthUpToBreak - targetWidth);
+          if (currentDistance === bestDistance) return current.index > best.index ? current : best;
+          return currentDistance < bestDistance ? current : best;
+        }
+        /**
+        * Avoid wrapping a line so that the next visual line starts with a rhythm symbol.
+        *
+        * Prefer keeping the leading rhythm symbol(s) with the previous line, but only
+        * when the previous line still fits. If they do not fit, break earlier by
+        * moving the nearest preceding non-rhythm chord to the next line. Width checks
+        * are recalculated in the final line context so trailing chord-spacing is not
+        * counted for a line-ending rhythm symbol such as `|`.
+        */
+        avoidLeadingRhythmSymbol(firstChunk, secondChunk, availableWidth) {
+          if (!this.shouldAvoidLeadingRhythmSymbol(secondChunk)) return {
+            firstChunk,
+            secondChunk
+          };
+          return this.tryMoveLeadingRhythmSymbolsToFirstChunk(firstChunk, secondChunk, availableWidth) || this.movePrecedingChordToSecondChunk(firstChunk, secondChunk);
+        }
+        shouldAvoidLeadingRhythmSymbol(secondChunk) {
+          const leadingRhythmSymbolCount = this.countLeadingRhythmSymbols(secondChunk);
+          return this.startsWithRhythmSymbol(secondChunk) && this.hasChordAfterLeadingRhythmSymbols(secondChunk, leadingRhythmSymbolCount);
+        }
+        tryMoveLeadingRhythmSymbolsToFirstChunk(firstChunk, secondChunk, availableWidth) {
+          const leadingRhythmSymbolCount = this.countLeadingRhythmSymbols(secondChunk);
+          const laterFirstChunk = [
+            ...firstChunk,
+            ...secondChunk.slice(0, leadingRhythmSymbolCount)
+          ];
+          const laterSecondChunk = secondChunk.slice(leadingRhythmSymbolCount);
+          if (this.calculateLineContextWidth(laterFirstChunk) <= availableWidth) return {
+            firstChunk: laterFirstChunk,
+            secondChunk: laterSecondChunk
+          };
+          return null;
+        }
+        movePrecedingChordToSecondChunk(firstChunk, secondChunk) {
+          const precedingChordIndex = this.findLastNonRhythmChordIndex(firstChunk);
+          if (precedingChordIndex <= 0) return {
             firstChunk,
             secondChunk
           };
+          return {
+            firstChunk: firstChunk.slice(0, precedingChordIndex),
+            secondChunk: [
+              ...firstChunk.slice(precedingChordIndex),
+              ...secondChunk
+            ]
+          };
+        }
+        startsWithRhythmSymbol(items) {
+          return this.isRhythmSymbolItem(items[0]);
+        }
+        countLeadingRhythmSymbols(items) {
+          let count = 0;
+          while (count < items.length && this.isRhythmSymbolItem(items[count])) count += 1;
+          return count;
+        }
+        hasChordAfterLeadingRhythmSymbols(items, leadingRhythmSymbolCount) {
+          return this.isNonRhythmChordItem(items[leadingRhythmSymbolCount]);
+        }
+        findLastNonRhythmChordIndex(items) {
+          for (let index = items.length - 1; index >= 0; index -= 1) {
+            if (this.isNonRhythmChordItem(items[index])) return index;
+          }
+          return -1;
+        }
+        isRhythmSymbolItem(item) {
+          return item?.item instanceof (0, $551a223fc13b5c10$export$2e2bcd8739ae039) && item.item.isRhythmSymbol;
+        }
+        isNonRhythmChordItem(item) {
+          return item?.item instanceof (0, $551a223fc13b5c10$export$2e2bcd8739ae039) && !item.item.isRhythmSymbol && (item.item.chords || "").trim() !== "";
+        }
+        calculateLineContextWidth(items) {
+          return items.reduce((width, item, index) => {
+            const nextItem = items[index + 1] || null;
+            return width + this.recalculateWidthForLineContext(item, nextItem);
+          }, 0);
+        }
+        recalculateWidthForLineContext(item, nextItem) {
+          if (item.item instanceof (0, $551a223fc13b5c10$export$2e2bcd8739ae039)) return this.recalculateChordLyricWidth(item, nextItem);
+          if (!nextItem && item.item instanceof (0, $4b6dd3e4b817bd81$export$2e2bcd8739ae039)) return 0;
+          return item.width;
         }
         removeTrailingComma(items) {
           const lastItem = items[items.length - 1];
@@ -29716,7 +29810,7 @@ ${template}
         }
       };
       var $a5a21ced491ea51f$export$2e2bcd8739ae039 = $a5a21ced491ea51f$var$UltimateGuitarParser;
-      var $ae92e002ce14f11a$export$2e2bcd8739ae039 = "15.5.2";
+      var $ae92e002ce14f11a$export$2e2bcd8739ae039 = "15.5.3-canary.0";
       var $2a7926da41d163b3$export$191a710ad3c9a989 = {
         configure: $181068e44290b873$export$8d21e34596265fa2,
         getDefaultConfig: $fe1d3ba9df1ecad5$export$ed30944e0fe6ae5c,