songsheet 7.1.0 → 7.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "songsheet",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "description": "A songsheet interpreter",
   "type": "module",
   "exports": "./index.js",

package/src/playback.js

@@ -63,6 +63,43 @@ function detectInterBarlines(markers) {
   return false
 }
 
+/**
+ * Detect consecutive barlines (e.g., C || D), which usually indicate
+ * repeated held measures rather than explicit bar-delimited grouping.
+ */
+function hasConsecutiveBars(markers) {
+  let prevWasBar = false
+  for (const m of markers) {
+    if (m.type === 'bar') {
+      if (prevWasBar) return true
+      prevWasBar = true
+    } else {
+      prevWasBar = false
+    }
+  }
+  return false
+}
+
+/**
+ * Decide whether a line should be grouped by explicit barline boundaries.
+ *
+ * Heuristic:
+ * - require at least one barline between chords
+ * - require barline density to be at least chord density
+ * - reject consecutive barlines (treated as hold repeats)
+ *
+ * Sparse barlines like "C C/B Am G F | Fsus4 F" stay in chord-per-measure mode.
+ */
+function shouldGroupByBarlines(markers) {
+  const chordCount = markers.filter(m => m.type === 'chord').length
+  const barCount = markers.length - chordCount
+  if (chordCount === 0 || barCount === 0) return false
+  if (!detectInterBarlines(markers)) return false
+  if (barCount < chordCount) return false
+  if (hasConsecutiveBars(markers)) return false
+  return true
+}
+
 /**
  * Build the playback timeline from the song's structure array.
  *
@@ -94,12 +131,7 @@ export function buildPlaybackTimeline(structure, timeSignature) {
         }
         markers.sort((a, b) => a.col - b.col)
 
-        // Detect whether barlines actually separate chords on this line.
-        // Pattern: chord...bar...chord means barlines are measure separators.
-        // Pattern: chord chord... bar (trailing only) means barlines are phrase markers.
-        const hasInterBarlines = detectInterBarlines(markers)
-
-        if (hasInterBarlines) {
+        if (shouldGroupByBarlines(markers)) {
           // Group chords by barline boundaries
           let currentChords = []
           for (const m of markers) {

package/test/playback.test.js

@@ -61,6 +61,20 @@ describe('buildPlaybackTimeline', () => {
       expect(playback[1].chords[0].root).toBe('G')
     })
 
+    it('sparse inter-barline usage stays chord-per-measure with bar repeat', () => {
+      const song = parse('TITLE\n(3/4 time)\n\nC C/B Am G F | Fsus4 F\n Lyrics')
+      const playback = song.playback
+      expect(playback.length).toBe(8)
+      const roots = playback.map(m => m.chords[0].root + (m.chords[0].bass ? '/' + m.chords[0].bass : ''))
+      expect(roots).toEqual(['C', 'C/B', 'A', 'G', 'F', 'F', 'F', 'F'])
+      for (const m of playback) {
+        expect(m.chords.length).toBe(1)
+        expect(m.chords[0].durationInBeats).toBe(3)
+      }
+      expect(playback[6].chords[0].type).toBe('sus4')
+      expect(playback[7].chords[0].type).toBe('')
+    })
+
     it('D | creates 2 measures: D then barline repeats D', () => {
       const song = parse('TITLE\n\nD |\n Lyrics')
       const playback = song.playback