@ugfoundation/swaralipi-js 0.8.2 → 0.9.1

package/dist/viewer/index.cjs

@@ -38,30 +38,16 @@ var init_lay = __esm({
   }
 });
 
-// src/spec/grace.ts
-function graceNotes(grace) {
-  if (grace === void 0) return [];
-  return typeof grace[0] === "string" ? [{ svara: grace }] : grace;
-}
-var init_grace = __esm({
-  "src/spec/grace.ts"() {
-  }
-});
-
-// src/spec/svara.ts
-function hasKomal(letter) {
-  return letter === "r" || letter === "g" || letter === "d" || letter === "n";
+// src/spec/taals.ts
+function isTaalFerta(name) {
+  return name !== void 0 && name.normalize("NFC").replace(/[\s-]/g, "") === TAAL_FERTA;
 }
-function hasTivra(letter) {
-  return letter === "m";
+function sameTaal(a, b) {
+  if (a === b) return true;
+  if (!a || !b) return false;
+  return a.id === b.id && a.numBeats === b.numBeats && a.variation === b.variation && String(a.bhaags) === String(b.bhaags);
 }
-var init_svara = __esm({
-  "src/spec/svara.ts"() {
-  }
-});
-
-// src/spec/taals.ts
-var TAALS;
+var TAALS, TAAL_FERTA;
 var init_taals = __esm({
   "src/spec/taals.ts"() {
     TAALS = {
@@ -85,9 +71,32 @@ var init_taals = __esm({
       dhamaar: { id: "dhamaar", numBeats: 14, bhaags: [5, 2, 3, 4], sam: 0, khaali: [7] }
       // ধামার
     };
+    TAAL_FERTA = "\u09A4\u09BE\u09B2\u09AB\u09C7\u09B0\u09A4\u09BE";
   }
 });
-var octaveSchema, svaraLetterSchema, svaraSchema, microtoneSchema, barSchema, bracketSchema, graceSchema, noteSchema, laySchema, rowSchema, partSchema, taalSchema, metaSchema, swaralipiSchema;
+
+// src/spec/grace.ts
+function graceNotes(grace) {
+  if (grace === void 0) return [];
+  return typeof grace[0] === "string" ? [{ svara: grace }] : grace;
+}
+var init_grace = __esm({
+  "src/spec/grace.ts"() {
+  }
+});
+
+// src/spec/svara.ts
+function hasKomal(letter) {
+  return letter === "r" || letter === "g" || letter === "d" || letter === "n";
+}
+function hasTivra(letter) {
+  return letter === "m";
+}
+var init_svara = __esm({
+  "src/spec/svara.ts"() {
+  }
+});
+var octaveSchema, svaraLetterSchema, svaraSchema, microtoneSchema, barSchema, bracketSchema, graceSchema, noteSchema, laySchema, taalSchema, rowSchema, partSchema, metaSchema, swaralipiSchema;
 var init_schema = __esm({
   "src/spec/schema.ts"() {
     octaveSchema = zod.z.enum([
@@ -140,22 +149,6 @@ var init_schema = __esm({
       )
     );
     laySchema = zod.z.enum(["drut", "madhya", "vilambit"]);
-    rowSchema = zod.z.object({
-      /** Optional line label (e.g. a tuk/section marker). */
-      label: zod.z.string().optional(),
-      /**
-       * লয়: the tempo tier this row switches to, held until another row changes
-       * it (absent on every row = the whole song at `meta.bpm`, i.e. দ্রুত).
-       * Read it with `rowLay()`, which also picks up the mark NLTR *prints*
-       * ("বিলম্বিত লয়:") in already-converted documents.
-       */
-      lay: laySchema.optional(),
-      notes: zod.z.array(noteSchema)
-    });
-    partSchema = zod.z.object({
-      name: zod.z.string().optional(),
-      rows: zod.z.array(rowSchema)
-    });
     taalSchema = zod.z.object({
       /** Player sample key, e.g. `dadra`, `teentaal`. */
       id: zod.z.string(),
@@ -176,6 +169,31 @@ var init_schema = __esm({
     }).refine((t) => t.bhaags === void 0 || t.bhaags.reduce((a, b) => a + b, 0) === t.numBeats, {
       message: "bhaags must sum to numBeats"
     });
+    rowSchema = zod.z.object({
+      /** Optional line label (e.g. a tuk/section marker). */
+      label: zod.z.string().optional(),
+      /**
+       * লয়: the tempo tier this row switches to, held until another row changes
+       * it (absent on every row = the whole song at `meta.bpm`, i.e. দ্রুত).
+       * Read it with `rowLay()`, which also picks up the mark NLTR *prints*
+       * ("বিলম্বিত লয়:") in already-converted documents.
+       */
+      lay: laySchema.optional(),
+      /**
+       * তালফেরতা: the তাল this row switches to, held until another row changes it
+       * (absent on every row = the whole song in `meta.taal`). `null` = মুক্তছন্দ
+       * from here on: the accompaniment rests until a later row names a taal.
+       * Independent of `lay` — either, both or neither may change on one row.
+       */
+      taal: taalSchema.nullable().optional(),
+      /** That taal's name as printed (e.g. `ষষ্ঠী(২/৪)`) — `meta.taalName`'s twin. */
+      taalName: zod.z.string().optional(),
+      notes: zod.z.array(noteSchema)
+    });
+    partSchema = zod.z.object({
+      name: zod.z.string().optional(),
+      rows: zod.z.array(rowSchema)
+    });
     metaSchema = zod.z.object({
       title: zod.z.string(),
       /** Cross-reference to a gitabitan.io song content id (filename, immutable). */
@@ -222,12 +240,14 @@ __export(spec_exports, {
   LAY_SPEEDS: () => LAY_SPEEDS,
   SPEC_VERSION: () => SPEC_VERSION,
   TAALS: () => TAALS,
+  TAAL_FERTA: () => TAAL_FERTA,
   barSchema: () => barSchema,
   bracketSchema: () => bracketSchema,
   graceNotes: () => graceNotes,
   graceSchema: () => graceSchema,
   hasKomal: () => hasKomal,
   hasTivra: () => hasTivra,
+  isTaalFerta: () => isTaalFerta,
   laySchema: () => laySchema,
   metaSchema: () => metaSchema,
   microtoneSchema: () => microtoneSchema,
@@ -240,6 +260,7 @@ __export(spec_exports, {
   rowLay: () => rowLay,
   rowSchema: () => rowSchema,
   safeParseSwaralipi: () => safeParseSwaralipi,
+  sameTaal: () => sameTaal,
   svaraLetterSchema: () => svaraLetterSchema,
   svaraSchema: () => svaraSchema,
   swaralipiSchema: () => swaralipiSchema,
@@ -260,12 +281,13 @@ var init_spec = __esm({
     init_grace();
     init_lay();
     init_svara();
-    SPEC_VERSION = "0.8.2";
+    SPEC_VERSION = "0.9.1";
   }
 });
 
 // src/player/schedule.ts
 init_lay();
+init_taals();
 
 // src/player/pitch.ts
 init_grace();
@@ -389,18 +411,23 @@ function buildSchedule(doc, opts = {}) {
   let matra = 0;
   const speeds = resolveLaySpeeds(doc.meta.laySpeeds, opts.laySpeeds);
   const withLay = opts.lay !== false;
-  const tempo = [{ beat: 0, endBeat: 0, scale: 1, lay: "drut" }];
+  const tempo = [{ beat: 0, endBeat: 0, scale: 1, lay: "drut", taal: doc.meta.taal }];
   let scale = 1;
+  let taal = doc.meta.taal;
   doc.parts.forEach((part, p) => {
     part.rows.forEach((row, r) => {
       const lay = withLay ? rowLay(row) : void 0;
-      if (lay !== void 0 && speeds[lay] !== scale) {
-        scale = speeds[lay];
+      const layChanged = lay !== void 0 && speeds[lay] !== scale;
+      const nextTaal = row.taal !== void 0 ? row.taal : taal;
+      if (layChanged || !sameTaal(nextTaal, taal)) {
+        if (layChanged) scale = speeds[lay];
+        taal = nextTaal;
         const last = tempo[tempo.length - 1];
-        if (last.beat === cursor) tempo[tempo.length - 1] = { beat: cursor, endBeat: cursor, scale, lay };
+        const seg = { beat: cursor, endBeat: cursor, scale, lay: layChanged ? lay : last.lay, taal };
+        if (last.beat === cursor) tempo[tempo.length - 1] = seg;
         else {
           last.endBeat = cursor;
-          tempo.push({ beat: cursor, endBeat: cursor, scale, lay });
+          tempo.push(seg);
         }
       }
       const glides = meendContinuations(row.notes);
@@ -417,12 +444,15 @@ function buildSchedule(doc, opts = {}) {
         const path = `${p}.${r}.${i}`;
         const written = note.durationMatra ?? 1;
         const dur = written / scale;
+        const kan = graceMidis(note.kan, tonicPc, baseOctave);
+        const resh = graceMidis(note.resh, tonicPc, baseOctave);
         if (note.svara !== void 0) {
           events.push({
             beat: cursor,
             durationBeats: dur,
             midi: svaraToMidi(note, tonicPc, baseOctave),
-            kan: graceMidis(note.kan, tonicPc, baseOctave),
+            kan,
+            resh,
             path,
             kind: note.sustain === true ? "sustain" : "note",
             ...glides.has(i) && lastPitched >= 0 ? { glide: true } : {}
@@ -430,16 +460,16 @@ function buildSchedule(doc, opts = {}) {
           lastPitched = events.length - 1;
         } else if (note.sustain === true) {
           if (lastPitched >= 0) events[lastPitched].durationBeats += dur;
-          events.push({ beat: cursor, durationBeats: dur, midi: null, kan: [], path, kind: "sustain" });
+          events.push({ beat: cursor, durationBeats: dur, midi: null, kan, resh, path, kind: "sustain" });
         } else {
-          events.push({ beat: cursor, durationBeats: dur, midi: null, kan: [], path, kind: "rest" });
+          events.push({ beat: cursor, durationBeats: dur, midi: null, kan, resh, path, kind: "rest" });
         }
         cursor += dur;
         matra += written;
       });
     });
   });
-  const numBeats = doc.meta.taal?.numBeats;
+  const numBeats = tempo[0].taal?.numBeats;
   const pickupMatra = samMatra !== void 0 && numBeats !== void 0 && numBeats > 0 ? (numBeats - samMatra % numBeats) % numBeats : 0;
   tempo[tempo.length - 1].endBeat = cursor;
   return { events, totalBeats: cursor, pickupBeats: pickupMatra / tempo[0].scale, tempo };
@@ -447,6 +477,7 @@ function buildSchedule(doc, opts = {}) {
 
 // src/viewer/render.ts
 init_grace();
+init_taals();
 
 // src/viewer/glyphs.ts
 init_svara();
@@ -497,6 +528,11 @@ var LAY_LABELS = {
   hi: { drut: "\u0926\u094D\u0930\u0941\u0924 \u0932\u092F", madhya: "\u092E\u0927\u094D\u092F \u0932\u092F", vilambit: "\u0935\u093F\u0932\u0902\u092C\u093F\u0924 \u0932\u092F" },
   en: { drut: "Fast (drut)", madhya: "Medium (madhya)", vilambit: "Slow (vilambit)" }
 };
+var FREE_TAAL_LABELS = {
+  bn: "\u09AE\u09C1\u0995\u09CD\u09A4\u099B\u09A8\u09CD\u09A6",
+  hi: "\u092E\u0941\u0915\u094D\u0924\u091B\u0902\u0926",
+  en: "Free rhythm"
+};
 function composeCluster(letter, opts) {
   const classes = [];
   if (opts.lang === "bn") {
@@ -969,15 +1005,25 @@ function renderToHtml(doc, opts = {}) {
   out.push(`<div class="sw-scroll"><div class="sw-block" style="${tracks}">`);
   let n = 0;
   let lay;
+  let taal = doc.meta.taal;
+  let named = !isTaalFerta(doc.meta.taalName);
   doc.parts.forEach((part, p) => {
     out.push('<section class="sw-part">');
     if (part.name !== void 0)
       out.push(`<h3 class="sw-part-name">${escapeHtml(ctx.tr(part.name))}</h3>`);
     part.rows.forEach((row, r) => {
+      const marks = [];
+      if (row.taal !== void 0 && (!named || !sameTaal(row.taal, taal))) {
+        taal = row.taal;
+        named = true;
+        const name = row.taalName ?? (taal === null ? FREE_TAAL_LABELS[ctx.lang] : taal.id);
+        marks.push(`<span class="sw-taal" data-taal="${escapeHtml(taal?.id ?? "free")}">${escapeHtml(ctx.tr(name))}</span>`);
+      }
       if (row.lay !== void 0 && row.lay !== lay) {
         lay = row.lay;
-        out.push(`<div class="sw-lay" data-lay="${lay}">${escapeHtml(LAY_LABELS[ctx.lang][lay])}</div>`);
+        marks.push(`<span class="sw-lay" data-lay="${lay}">${escapeHtml(LAY_LABELS[ctx.lang][lay])}</span>`);
       }
+      if (marks.length > 0) out.push(`<div class="sw-change">${marks.join("")}</div>`);
       out.push(renderRow(row, p, r, layout.offsets[n++], ctx));
     });
     out.push("</section>");
@@ -1071,10 +1117,12 @@ ${FONT_FACES}
 
 .sw-part-name { font-size: 0.85em; font-weight: 600; margin: 1em 0 0.2em; opacity: 0.85; }
 
-/* \u09B2\u09AF\u09BC marker: the line where the tempo tier turns over. A full-width rule
-   rather than a row label \u2014 the label track is what the notation columns are
-   measured against, and a six-em word in it would shove the whole sheet right. */
-.sw-lay {
+/* \u09A4\u09BE\u09B2 / \u09B2\u09AF\u09BC change: the line where the \u09A4\u09BE\u09B2\u09AB\u09C7\u09B0\u09A4\u09BE or the tempo tier turns over,
+   centred between two systems the way \u09B8\u09CD\u09AC\u09B0\u09AC\u09BF\u09A4\u09BE\u09A8 prints "\u099D\u09BE\u0981\u09AA\u09A4\u09BE\u09B2" or
+   "\u09A6\u09CD\u09B0\u09C1\u09A4 \u09B2\u09AF\u09BC". A full-width band rather than a row label \u2014 the label track is
+   what the notation columns are measured against, and a six-em word in it
+   would shove the whole sheet right. */
+.sw-change {
   grid-column: 1 / -1;
   display: flex;
   align-items: center;
@@ -1088,12 +1136,14 @@ ${FONT_FACES}
   opacity: 0.75;
   break-after: avoid;
 }
-.sw-lay::after {
+.sw-change::before,
+.sw-change::after {
   content: '';
   flex: 1;
   height: 1px;
   background: var(--sw-rule, rgba(128, 128, 128, 0.35));
 }
+.sw-taal + .sw-lay::before { content: '\xB7'; margin-right: 0.6em; }
 
 /* ---- block grid: ONE column set for the whole sheet ----
  * NLTR emits a song as a single html table, which is why its lines align
@@ -1311,7 +1361,7 @@ var SWARALIPI_PRINT_CSS = `
   .sw-sheet, .sw-staff { -webkit-print-color-adjust: exact; print-color-adjust: exact; color: #000; }
   .sw-scroll { overflow: visible !important; }
   .sw-row { break-inside: avoid; page-break-inside: avoid; }
-  .sw-part-name, .sw-header, .sw-lay { break-after: avoid-page; page-break-after: avoid; }
+  .sw-part-name, .sw-header, .sw-change { break-after: avoid-page; page-break-after: avoid; }
   .sw-hl { background: none !important; }
   /* Keep each engraved staff system whole across a page break (the abcjs line
      is a <div> wrapping the <svg>, so the break rule must sit on the div). */
@@ -1487,11 +1537,15 @@ function eventPaths(schedule) {
   }
   return paths;
 }
+var barLen = (m) => m.beatsPerBar > 0 ? m.beatsPerBar : 4;
 function abcText(s) {
   return s.replace(/[\r\n]+/g, " ").trim();
 }
 function buildAbc(schedule, lyricOf, opts) {
-  const beatsPerBar = opts.beatsPerBar > 0 ? opts.beatsPerBar : 4;
+  const meters = opts.meters?.length ? opts.meters : [{ beat: 0, beatsPerBar: opts.beatsPerBar, drums: opts.drums }];
+  const withDrums = opts.drums !== void 0 || meters.some((m2) => m2.drums !== void 0);
+  let m = 0;
+  let beatsPerBar = barLen(meters[0]);
   const tokens = [];
   const words = [];
   let barPos = 0;
@@ -1505,6 +1559,17 @@ function buildAbc(schedule, lyricOf, opts) {
     }
   };
   schedule.events.forEach((ev, i) => {
+    while (m + 1 < meters.length && ev.beat >= meters[m + 1].beat - EPS2) {
+      m++;
+      if (barPos > EPS2) {
+        tokens.push("|");
+        words.push("|");
+      }
+      barPos = 0;
+      const next = barLen(meters[m]);
+      if (next !== beatsPerBar) tokens.push(`[M:${ratioMeter(next)}]`);
+      beatsPerBar = next;
+    }
     if (ev.midi === null) {
       if (ev.kind === "rest") {
         tokens.push(`z${abcDuration(ev.durationBeats)}`);
@@ -1523,16 +1588,16 @@ function buildAbc(schedule, lyricOf, opts) {
   });
   if (tokens.length && tokens[tokens.length - 1] !== "|") tokens.push("|]");
   else if (tokens.length) tokens[tokens.length - 1] = "|]";
-  const meter = ratioMeter(beatsPerBar);
+  const meter = ratioMeter(barLen(meters[0]));
   const head = ["X:1", `M:${meter}`, "L:1/4", `Q:1/4=${Math.round(opts.bpm)}`];
-  if (opts.drums) head.push(...percMapLines(opts.drums));
+  if (withDrums) head.push(...percMapLines(meters.flatMap((x) => x.drums ?? [])));
   head.push("K:C treble");
   const melodyBody = tokens.length ? tokens.join(" ") : "z |]";
   const lines = [...head];
-  if (opts.drums) {
+  if (withDrums) {
     lines.push("V:1", melodyBody);
     if (opts.lyrics && words.some((w) => w !== "*" && w !== "|")) lines.push(`w: ${words.join(" ")}`);
-    lines.push("V:2 clef=perc stem=up", buildDrumVoice(schedule.totalBeats, beatsPerBar, opts.drums));
+    lines.push("V:2 clef=perc stem=up", buildDrumVoice(schedule.totalBeats, meters));
   } else {
     lines.push(melodyBody);
     if (opts.lyrics && words.some((w) => w !== "*" && w !== "|")) lines.push(`w: ${words.join(" ")}`);
@@ -1561,13 +1626,21 @@ function percMapLines(voices) {
   }
   return lines;
 }
-function buildDrumVoice(totalBeats, beatsPerBar, pattern) {
-  const n = Math.max(1, Math.ceil(totalBeats));
+function buildDrumVoice(totalBeats, meters) {
   const tokens = [];
-  for (let beat = 0; beat < n; beat++) {
-    tokens.push(DRUM_ABC[pattern[beat % pattern.length]].note);
-    if ((beat + 1) % beatsPerBar === 0) tokens.push("|");
-  }
+  meters.forEach((m, i) => {
+    const bpb = barLen(m);
+    if (i > 0) {
+      if (tokens.length > 0 && tokens[tokens.length - 1] !== "|") tokens.push("|");
+      if (bpb !== barLen(meters[i - 1])) tokens.push(`[M:${ratioMeter(bpb)}]`);
+    }
+    const end = meters[i + 1]?.beat ?? Math.max(1, Math.ceil(totalBeats));
+    const n = Math.ceil(end - m.beat - 1e-6);
+    for (let beat = 0; beat < n; beat++) {
+      tokens.push(m.drums?.length ? DRUM_ABC[m.drums[beat % m.drums.length]].note : "z");
+      if ((beat + 1) % bpb === 0) tokens.push("|");
+    }
+  });
   if (tokens.length === 0 || tokens[tokens.length - 1] !== "|") tokens.push("|]");
   else tokens[tokens.length - 1] = "|]";
   return tokens.join(" ");
@@ -1578,16 +1651,25 @@ function lyricLookup(doc) {
     return doc.parts[p]?.rows[r]?.notes[i]?.lyric;
   };
 }
-function resolveDrumTaal(doc) {
-  const id = doc.meta.taal?.id;
+function resolveDrumTaal(taal) {
+  const id = taal?.id;
   return id !== void 0 && id in TAALS ? TAALS[id] : { numBeats: 4, sam: 0 };
 }
 function docToAbc(doc, opts = {}) {
   const schedule = buildSchedule(doc, { tonic: opts.tonic, baseOctave: opts.baseOctave, lay: false });
   const bpm = opts.bpm ?? doc.meta.bpm ?? 90;
-  const beatsPerBar = opts.beatsPerBar ?? doc.meta.taal?.numBeats ?? 4;
-  const drums = opts.drums ? drumPattern(resolveDrumTaal(doc)) : void 0;
-  return buildAbc(schedule, lyricLookup(doc), { bpm, lyrics: opts.lyrics !== false, beatsPerBar, drums });
+  const meters = schedule.tempo.map((seg) => ({
+    beat: seg.beat,
+    beatsPerBar: opts.beatsPerBar ?? seg.taal?.numBeats ?? 4,
+    drums: opts.drums && seg.taal !== null ? drumPattern(resolveDrumTaal(seg.taal)) : void 0
+  }));
+  return buildAbc(schedule, lyricLookup(doc), {
+    bpm,
+    lyrics: opts.lyrics !== false,
+    beatsPerBar: meters[0].beatsPerBar,
+    drums: opts.drums ? meters[0].drums ?? [] : void 0,
+    meters
+  });
 }
 async function abcToSvg(abc, opts = {}, notePaths) {
   if (typeof document === "undefined") {
@@ -1666,7 +1748,7 @@ function buildTaalAbc(taal, opts = {}) {
   const voices = Array.from({ length: n }, (_, i) => src[i % src.length]);
   const bpm = Math.round(opts.bpm ?? 90);
   const head = ["X:1", `M:${ratioMeter(n)}`, "L:1/4", `Q:1/4=${bpm}`, ...percMapLines(voices), "K:C"];
-  const lines = [...head, "V:1 clef=perc stem=up", buildDrumVoice(n, n, voices)];
+  const lines = [...head, "V:1 clef=perc stem=up", buildDrumVoice(n, [{ beat: 0, beatsPerBar: n, drums: voices }])];
   if (opts.bols?.length) {
     const w = opts.bols.slice(0, n).map((b) => b.trim() ? abcText(b).replace(/\s+/g, "~") : "*");
     while (w.length < n) w.push("*");
@@ -2057,6 +2139,7 @@ function defineSwaralipiSheet(tagName = "swaralipi-sheet") {
 exports.DEFAULT_NOTATOR = DEFAULT_NOTATOR;
 exports.DEFAULT_WATERMARK = DEFAULT_WATERMARK;
 exports.DIGITS = DIGITS;
+exports.FREE_TAAL_LABELS = FREE_TAAL_LABELS;
 exports.LABELS = LABELS;
 exports.LAY_LABELS = LAY_LABELS;
 exports.MARKS = MARKS;