@ugfoundation/swaralipi-js 0.7.7 → 0.8.1

package/dist/viewer/index.cjs

@@ -12,6 +12,32 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
+// src/spec/lay.ts
+function resolveLaySpeeds(doc, opt) {
+  return { ...LAY_SPEEDS, ...doc, ...opt };
+}
+function printedLay(notes) {
+  const first = notes[0];
+  if (first === void 0 || first.lyric === void 0) return void 0;
+  for (const k of Object.keys(first)) if (k !== "lyric") return void 0;
+  return PRINTED[first.lyric.normalize("NFC")];
+}
+function rowLay(row) {
+  return row.lay ?? printedLay(row.notes);
+}
+var LAYS, LAY_SPEEDS, PRINTED;
+var init_lay = __esm({
+  "src/spec/lay.ts"() {
+    LAYS = ["drut", "madhya", "vilambit"];
+    LAY_SPEEDS = {
+      drut: 1,
+      madhya: 0.75,
+      vilambit: 0.5
+    };
+    PRINTED = { \u09A6\u09CD\u09B0\u09C1\u09A4: "drut", \u09AE\u09A7\u09CD\u09AF: "madhya", \u09AC\u09BF\u09B2\u09AE\u09CD\u09AC\u09BF\u09A4: "vilambit" };
+  }
+});
+
 // src/spec/grace.ts
 function graceNotes(grace) {
   if (grace === void 0) return [];
@@ -61,7 +87,7 @@ var init_taals = __esm({
     };
   }
 });
-var octaveSchema, svaraLetterSchema, svaraSchema, microtoneSchema, barSchema, bracketSchema, graceSchema, noteSchema, rowSchema, partSchema, taalSchema, metaSchema, swaralipiSchema;
+var octaveSchema, svaraLetterSchema, svaraSchema, microtoneSchema, barSchema, bracketSchema, graceSchema, noteSchema, laySchema, rowSchema, partSchema, taalSchema, metaSchema, swaralipiSchema;
 var init_schema = __esm({
   "src/spec/schema.ts"() {
     octaveSchema = zod.z.enum([
@@ -113,9 +139,17 @@ 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({
@@ -161,6 +195,9 @@ var init_schema = __esm({
        * The player adopts it on `load()` (precedence: constructor `bpm` → `setBpm`
        * tweak → this → 90). `null` is the converter's blank placeholder = unset. */
       bpm: zod.z.number().positive().nullable().optional(),
+      /** Per-document override of the লয় tempo factors (fractions of `bpm`).
+       * Defaults live in `LAY_SPEEDS`; a player/export option overrides both. */
+      laySpeeds: zod.z.object({ drut: zod.z.number().positive(), madhya: zod.z.number().positive(), vilambit: zod.z.number().positive() }).partial().optional(),
       raag: zod.z.string().optional(),
       /** আবর্তন: number of taal cycles, when the source states it. */
       avartan: zod.z.number().int().positive().optional(),
@@ -181,6 +218,8 @@ var init_schema = __esm({
 // src/spec/index.ts
 var spec_exports = {};
 __export(spec_exports, {
+  LAYS: () => LAYS,
+  LAY_SPEEDS: () => LAY_SPEEDS,
   SPEC_VERSION: () => SPEC_VERSION,
   TAALS: () => TAALS,
   barSchema: () => barSchema,
@@ -189,12 +228,16 @@ __export(spec_exports, {
   graceSchema: () => graceSchema,
   hasKomal: () => hasKomal,
   hasTivra: () => hasTivra,
+  laySchema: () => laySchema,
   metaSchema: () => metaSchema,
   microtoneSchema: () => microtoneSchema,
   noteSchema: () => noteSchema,
   octaveSchema: () => octaveSchema,
   parseSwaralipi: () => parseSwaralipi,
   partSchema: () => partSchema,
+  printedLay: () => printedLay,
+  resolveLaySpeeds: () => resolveLaySpeeds,
+  rowLay: () => rowLay,
   rowSchema: () => rowSchema,
   safeParseSwaralipi: () => safeParseSwaralipi,
   svaraLetterSchema: () => svaraLetterSchema,
@@ -215,11 +258,15 @@ var init_spec = __esm({
     init_schema();
     init_taals();
     init_grace();
+    init_lay();
     init_svara();
-    SPEC_VERSION = "0.7.7";
+    SPEC_VERSION = "0.8.1";
   }
 });
 
+// src/player/schedule.ts
+init_lay();
+
 // src/player/pitch.ts
 init_grace();
 init_svara();
@@ -338,22 +385,38 @@ function buildSchedule(doc, opts = {}) {
   const events = [];
   let cursor = 0;
   let lastPitched = -1;
-  let samBeat;
+  let samMatra;
+  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" }];
+  let scale = 1;
   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 last = tempo[tempo.length - 1];
+        if (last.beat === cursor) tempo[tempo.length - 1] = { beat: cursor, endBeat: cursor, scale, lay };
+        else {
+          last.endBeat = cursor;
+          tempo.push({ beat: cursor, endBeat: cursor, scale, lay });
+        }
+      }
       const glides = meendContinuations(row.notes);
       row.notes.forEach((note, i) => {
-        if (samBeat === void 0 && note.above !== void 0) {
+        if (samMatra === void 0 && note.above !== void 0) {
           for (const a of note.above) {
             if (a.raw !== void 0 && SAM_TICK.test(a.raw)) {
-              samBeat = cursor;
+              samMatra = matra;
               break;
             }
           }
         }
         if (note.bar !== void 0 || isSilent(note)) return;
         const path = `${p}.${r}.${i}`;
-        const dur = note.durationMatra ?? 1;
+        const written = note.durationMatra ?? 1;
+        const dur = written / scale;
         if (note.svara !== void 0) {
           events.push({
             beat: cursor,
@@ -372,12 +435,14 @@ function buildSchedule(doc, opts = {}) {
           events.push({ beat: cursor, durationBeats: dur, midi: null, kan: [], path, kind: "rest" });
         }
         cursor += dur;
+        matra += written;
       });
     });
   });
   const numBeats = doc.meta.taal?.numBeats;
-  const pickupBeats = samBeat !== void 0 && numBeats !== void 0 && numBeats > 0 ? (numBeats - samBeat % numBeats) % numBeats : 0;
-  return { events, totalBeats: cursor, pickupBeats };
+  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 };
 }
 
 // src/viewer/render.ts
@@ -427,6 +492,11 @@ var LABELS = {
   // one taal cycle is exactly what the number counts.
   en: { title: "Song", taal: "Taal", raag: "Raag", avartan: "Cycles", notationBy: "Notator" }
 };
+var LAY_LABELS = {
+  bn: { drut: "\u09A6\u09CD\u09B0\u09C1\u09A4 \u09B2\u09AF\u09BC", madhya: "\u09AE\u09A7\u09CD\u09AF \u09B2\u09AF\u09BC", vilambit: "\u09AC\u09BF\u09B2\u09AE\u09CD\u09AC\u09BF\u09A4 \u09B2\u09AF\u09BC" },
+  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)" }
+};
 function composeCluster(letter, opts) {
   const classes = [];
   if (opts.lang === "bn") {
@@ -792,16 +862,20 @@ function renderNote(note, kind, opts, ctx) {
 }
 function renderArc(arc, offset) {
   const open = arc.line === true;
-  const cls = [
-    "sw-arc",
-    arc.openLeft || open ? "sw-arc--openl" : "",
-    arc.openRight || open ? "sw-arc--openr" : ""
-  ].filter(Boolean).join(" ");
-  const left = open || arc.openLeft ? "" : '<i class="sw-arc-l">w</i>';
-  const right = open || arc.openRight ? "" : '<i class="sw-arc-r">x</i>';
-  const from = offset + arc.start + COL_BASE;
-  const to = offset + arc.end + COL_BASE + 1;
-  return `<span class="${cls}" style="grid-column:${from} / ${to}">${left}<i class="sw-arc-m"></i>${right}</span>`;
+  const openL = arc.openLeft || open;
+  const openR = arc.openRight || open;
+  const fill = '<i class="sw-arc-m"></i>';
+  const hookL = openL ? "" : '<i class="sw-arc-l">w</i>';
+  const hookR = openR ? "" : '<i class="sw-arc-r">x</i>';
+  const piece = (col, cls, inner) => `<span class="sw-arc${cls}" style="grid-column:${col}">${inner}</span>`;
+  const f = offset + arc.start + COL_BASE;
+  const t = offset + arc.end + COL_BASE;
+  const openCls = (openL ? " sw-arc--openl" : "") + (openR ? " sw-arc--openr" : "");
+  if (t === f) return piece(`${f}`, openCls, hookL + fill + hookR);
+  const head = piece(`${f}`, openL ? " sw-arc--openl" : " sw-arc--head", hookL + fill);
+  const tail = piece(`${t}`, openR ? " sw-arc--openr" : " sw-arc--tail", fill + hookR);
+  const mid = t > f + 1 ? piece(`${f + 1} / ${t}`, " sw-arc--mid", fill) : "";
+  return head + mid + tail;
 }
 function renderRow(row, partIdx, rowIdx, offset, ctx) {
   const cells = groupRowIntoCells(row.notes);
@@ -861,11 +935,18 @@ function renderToHtml(doc, opts = {}) {
   if (opts.showHeader !== false) out.push(renderHeader(doc.meta, ctx));
   out.push(`<div class="sw-scroll"><div class="sw-block" style="${tracks}">`);
   let n = 0;
+  let lay;
   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) => out.push(renderRow(row, p, r, layout.offsets[n++], ctx)));
+    part.rows.forEach((row, r) => {
+      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>`);
+      }
+      out.push(renderRow(row, p, r, layout.offsets[n++], ctx));
+    });
     out.push("</section>");
   });
   out.push("</div></div></div>");
@@ -957,6 +1038,30 @@ ${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 {
+  grid-column: 1 / -1;
+  display: flex;
+  align-items: center;
+  gap: 0.6em;
+  margin: 0.8em 0 0;
+  /* Floored like the header: fitSwaralipi shrinks the sheet to fit the
+     notation's columns, and this label has none to align. */
+  font-size: max(0.7em, var(--sw-lay-min, 0.72rem));
+  font-weight: 600;
+  letter-spacing: 0.09em;
+  opacity: 0.75;
+  break-after: avoid;
+}
+.sw-lay::after {
+  content: '';
+  flex: 1;
+  height: 1px;
+  background: var(--sw-rule, rgba(128, 128, 128, 0.35));
+}
+
 /* ---- block grid: ONE column set for the whole sheet ----
  * NLTR emits a song as a single html table, which is why its lines align
  * down the page. Same here: .sw-block owns the tracks, every .sw-row
@@ -1081,9 +1186,26 @@ ${FONT_FACES}
   align-items: baseline;
   line-height: 1;
   font-family: Swarabitan, var(--sw-font, sans-serif);
-  font-size: 0.9em;
+  /* The 0.9em sits on the children, not here: the end pieces below size
+     themselves off the block's own column-gap, which is in the block's em. */
 }
+.sw-arc > i, .sw-arc::before { font-size: 0.9em; }
 .sw-arc-l, .sw-arc-r { flex: none; font-style: normal; }
+/* Every piece needs the same baseline \u2014 the fill rides it, so a piece holding
+   only fill would otherwise drop to the bottom of the row. A zero-width copy
+   of the hook glyph is the strut (same font, same metrics). */
+.sw-arc::before { content: 'w'; flex: none; width: 0; overflow: hidden; }
+/* The ends hang from the two notes' CENTRES, as the print sets them, so the
+   arc is three grid items: each end piece takes half of its own column plus
+   the column-gap it has to bridge, and the negative margin on the same side
+   lets that bridge overhang the grid area instead of shifting the piece. */
+.sw-arc--head, .sw-arc--tail {
+  --sw-arc-gap: calc(var(--sw-cell-gap, 0.4em) * var(--sw-tight, 1));
+  width: calc(50% + var(--sw-arc-gap));
+}
+.sw-arc--head { justify-self: end;   margin-right: calc(var(--sw-arc-gap) * -1); }
+.sw-arc--tail { justify-self: start; margin-left:  calc(var(--sw-arc-gap) * -1);
+                justify-content: flex-end; }
 /* The fill's geometry is measured off the font's own 'y' glyph: ink 0.11em
    tall whose bottom sits 0.01em above the baseline. An empty inline-block
    takes its bottom margin edge as its baseline, so -0.01em lifts the bar to
@@ -1141,7 +1263,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 { break-after: avoid-page; page-break-after: avoid; }
+  .sw-part-name, .sw-header, .sw-lay { 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). */
@@ -1413,7 +1535,7 @@ function resolveDrumTaal(doc) {
   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 });
+  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;
@@ -1477,7 +1599,7 @@ async function abcToSvg(abc, opts = {}, notePaths) {
 async function renderStaffHtml(doc, opts = {}) {
   const bpm = opts.bpm ?? doc.meta.bpm ?? 90;
   const abc = docToAbc(doc, { ...opts, bpm });
-  const schedule = buildSchedule(doc, { tonic: opts.tonic, baseOctave: opts.baseOctave });
+  const schedule = buildSchedule(doc, { tonic: opts.tonic, baseOctave: opts.baseOctave, lay: false });
   const engraved = await abcToSvg(abc, opts, eventPaths(schedule));
   const lines = engraved.includes("sw-staff-missing") ? engraved : `<div class="sw-staff-lines">${engraved}</div>`;
   const header = opts.showHeader === false ? "" : renderMetaHeader(doc.meta, opts.headerLang ?? "en", opts.transliterate);
@@ -1888,6 +2010,7 @@ exports.DEFAULT_NOTATOR = DEFAULT_NOTATOR;
 exports.DEFAULT_WATERMARK = DEFAULT_WATERMARK;
 exports.DIGITS = DIGITS;
 exports.LABELS = LABELS;
+exports.LAY_LABELS = LAY_LABELS;
 exports.MARKS = MARKS;
 exports.MAX_ZOOM = MAX_ZOOM;
 exports.MIN_ZOOM = MIN_ZOOM;