@ugfoundation/swaralipi-js 0.5.0 → 0.6.0

package/dist/viewer/index.cjs

@@ -72,7 +72,9 @@ var init_schema = __esm({
         sustain: zod.z.boolean().optional(),
         rest: zod.z.boolean().optional(),
         kan: svaraSchema.optional(),
+        resh: svaraSchema.optional(),
         meend: zod.z.enum(["start", "end"]).optional(),
+        halfMatra: zod.z.boolean().optional(),
         bar: barSchema.optional(),
         brackets: zod.z.array(bracketSchema).optional(),
         lyric: zod.z.string().optional(),
@@ -123,9 +125,9 @@ var init_schema = __esm({
       nltrId: zod.z.number().int().optional(),
       taal: taalSchema.optional(),
       /**
-       * The taal name exactly as printed in the source (e.g. `তালমুক্ত`,
-       * `ষষ্ঠী(২/৪)`). Always set by the NLTR converter; `taal` is set only
-       * when the name resolves to a known definition.
+       * The taal name as printed in the source (e.g. `ষষ্ঠী(২/৪)`), except
+       * free rhythm which is normalised to `মুক্তছন্দ`. Always set by the NLTR
+       * converter; `taal` is set only when the name resolves to a definition.
        */
       taalName: zod.z.string().optional(),
       /** Base pitch for playback, e.g. `C`, `C#`, or the player's `cs` form. */
@@ -183,10 +185,170 @@ var init_spec = __esm({
     init_schema();
     init_schema();
     init_taals();
-    SPEC_VERSION = "0.5.0";
+    SPEC_VERSION = "0.6.0";
   }
 });
 
+// src/player/pitch.ts
+var OCTAVE_OFFSET = {
+  "ati-mandra": -2,
+  mandra: -1,
+  madhyam: 0,
+  taar: 1,
+  "ati-taar": 2
+};
+var SHUDDHA = {
+  s: 0,
+  r: 2,
+  g: 4,
+  m: 5,
+  p: 7,
+  d: 9,
+  n: 11
+};
+var SHARP_NAMES = ["C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"];
+var PITCH_CLASS = {
+  c: 0,
+  "c#": 1,
+  db: 1,
+  d: 2,
+  "d#": 3,
+  eb: 3,
+  e: 4,
+  "e#": 5,
+  fb: 4,
+  f: 5,
+  "f#": 6,
+  gb: 6,
+  g: 7,
+  "g#": 8,
+  ab: 8,
+  a: 9,
+  "a#": 10,
+  bb: 10,
+  b: 11,
+  "b#": 0,
+  cb: 11
+};
+function parseTonic(tonic) {
+  if (!tonic) return 0;
+  const key = tonic.trim().toLowerCase().replace(/s/g, "#");
+  return PITCH_CLASS[key] ?? 0;
+}
+function svaraSemitone(note) {
+  if (note.svara === void 0) return null;
+  const [, letter] = note.svara;
+  let semi = SHUDDHA[letter];
+  if (note.komal === true || note.microtone !== void 0) semi -= 1;
+  if (note.tivra === true) semi += 1;
+  return semi;
+}
+function svaraToMidi(note, tonicPc, baseOctave = 4) {
+  const semi = svaraSemitone(note);
+  if (semi === null || note.svara === void 0) return null;
+  const [octave] = note.svara;
+  return (baseOctave + 1 + OCTAVE_OFFSET[octave]) * 12 + tonicPc + semi;
+}
+function kanToMidi(svara, tonicPc, baseOctave = 4) {
+  if (svara === void 0) return null;
+  const [octave, letter] = svara;
+  return (baseOctave + 1 + OCTAVE_OFFSET[octave]) * 12 + tonicPc + SHUDDHA[letter];
+}
+function midiToSampleName(midi) {
+  const pc = (midi % 12 + 12) % 12;
+  const octave = Math.floor(midi / 12) - 1;
+  return `${SHARP_NAMES[pc]}${octave}`;
+}
+function sampleFileName(midi) {
+  return midiToSampleName(midi).toLowerCase().replace("#", "s");
+}
+
+// src/player/schedule.ts
+var UNDECODED_CELL = /[srgmpqnvtduka]/i;
+var isSilent = (n) => n.svara === void 0 && n.rest !== true && n.sustain !== true && !(n.raw !== void 0 && UNDECODED_CELL.test(n.raw));
+var ARC_RAW_RE = /^[wWxXyYjJeEzZ$=_<>`\\]+$/;
+var isArcRaw = (raw) => raw !== void 0 && ARC_RAW_RE.test(raw);
+function meendContinuations(notes) {
+  const out = /* @__PURE__ */ new Set();
+  let pending;
+  notes.forEach((note, i) => {
+    let marks = note.meend === "start" ? "w" : note.meend === "end" ? "x" : "";
+    for (const b of note.below ?? []) if (isArcRaw(b.raw)) marks += b.raw;
+    let marked = false;
+    for (const ch of marks) {
+      if (ch === "x" || ch === "X") {
+        if (pending !== void 0) for (const k of [...pending, i]) out.add(k);
+        pending = void 0;
+        marked = true;
+      } else if (ch === "w" || ch === "W") {
+        pending = [];
+        marked = true;
+      }
+    }
+    if (!marked && pending !== void 0) pending.push(i);
+  });
+  return out;
+}
+function glideTargets(events, i) {
+  const out = [];
+  for (let j = i + 1; j < events.length; j++) {
+    const ev = events[j];
+    if (ev.kind === "rest") break;
+    if (ev.midi === null) continue;
+    if (ev.glide !== true) break;
+    out.push(ev);
+  }
+  return out;
+}
+var SAM_TICK = /^\d+[fF]$/;
+function buildSchedule(doc, opts = {}) {
+  const tonicPc = parseTonic(opts.tonic ?? doc.meta.tonic);
+  const baseOctave = opts.baseOctave ?? 4;
+  const events = [];
+  let cursor = 0;
+  let lastPitched = -1;
+  let samBeat;
+  doc.parts.forEach((part, p) => {
+    part.rows.forEach((row, r) => {
+      const glides = meendContinuations(row.notes);
+      row.notes.forEach((note, i) => {
+        if (samBeat === void 0 && note.above !== void 0) {
+          for (const a of note.above) {
+            if (a.raw !== void 0 && SAM_TICK.test(a.raw)) {
+              samBeat = cursor;
+              break;
+            }
+          }
+        }
+        if (note.bar !== void 0 || isSilent(note)) return;
+        const path = `${p}.${r}.${i}`;
+        const dur = note.durationMatra ?? 1;
+        if (note.svara !== void 0) {
+          events.push({
+            beat: cursor,
+            durationBeats: dur,
+            midi: svaraToMidi(note, tonicPc, baseOctave),
+            kan: kanToMidi(note.kan, tonicPc, baseOctave),
+            path,
+            kind: note.sustain === true ? "sustain" : "note",
+            ...glides.has(i) && lastPitched >= 0 ? { glide: true } : {}
+          });
+          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: null, path, kind: "sustain" });
+        } else {
+          events.push({ beat: cursor, durationBeats: dur, midi: null, kan: null, path, kind: "rest" });
+        }
+        cursor += dur;
+      });
+    });
+  });
+  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 };
+}
+
 // src/viewer/glyphs.ts
 var SWARABITAN_SHUDDHA = {
   s: "s",
@@ -253,7 +415,6 @@ function localizeDigits(s, lang) {
 }
 
 // src/viewer/render.ts
-var NBSP = "\xA0";
 var EPS = 1e-6;
 var isIntegral = (x) => Math.abs(x - Math.round(x)) < EPS;
 function escapeHtml(s) {
@@ -288,7 +449,7 @@ function groupRowIntoCells(notes) {
       return;
     }
     const d = note.durationMatra ?? 1;
-    if (isIntegral(d)) {
+    if (isIntegral(d) && note.halfMatra !== true) {
       close();
       cells.push({ kind: "group", start: i, notes: [note] });
       return;
@@ -296,13 +457,11 @@ function groupRowIntoCells(notes) {
     cur ??= { kind: "group", start: i, notes: [] };
     cur.notes.push(note);
     acc += d;
-    if (acc > EPS && isIntegral(acc)) close();
+    if (note.halfMatra === true || acc > EPS && isIntegral(acc)) close();
   });
   close();
   return cells;
 }
-var ARC_RAW_RE = /^[wWxXyYjJeEzZ$=_<>`\\]+$/;
-var isArcRaw = (raw) => raw !== void 0 && ARC_RAW_RE.test(raw);
 function resolveArcs(cells, noteCount) {
   const arcs = [];
   let openStart;
@@ -371,15 +530,21 @@ function bracketGlyphs(note, edge) {
 function matraGlyph(ctx) {
   return ctx.lang === "bn" ? '<span class="sw-cl">a</span>' : '<span class="sw-iso">\u2013</span>';
 }
-function renderKan(note, ctx) {
-  if (!note.kan) return "";
-  const [octave, letter] = note.kan;
+function renderGrace(svara, cls, ctx) {
+  if (svara === void 0) return "";
+  const [octave, letter] = svara;
   const c = composeCluster(letter, { octave, withMatra: false, lang: ctx.lang });
-  return `<span class="${["sw-kan", ...c.classes].join(" ")}">${c.text}</span>`;
+  return `<span class="${[cls, ...c.classes].join(" ")}">${c.text}</span>`;
+}
+function cellMatra(cell) {
+  const total = cell.notes.reduce((a, n) => a + (n.durationMatra ?? 1), 0);
+  const half = cell.notes.some((n) => n.halfMatra === true);
+  const whole = Math.floor(total + EPS);
+  return { matras: half ? whole : Math.max(1, whole), half };
 }
 function renderPitchedInner(note, opts, ctx) {
   let inner = bracketGlyphs(note, "open");
-  inner += renderKan(note, ctx);
+  inner += renderGrace(note.kan, "sw-kan", ctx);
   if (note.sustain === true) inner += `<span class="sw-hy">${ctx.marks.hyphen}</span>`;
   if (note.svara !== void 0) {
     const [octave, letter] = note.svara;
@@ -387,22 +552,27 @@ function renderPitchedInner(note, opts, ctx) {
       komal: note.komal,
       tivra: note.tivra,
       octave,
-      withMatra: opts.withMatra,
+      // The first matra is composed into the cluster itself (bn: the font's
+      // trailing `a`); any further ones are separate glyphs below.
+      withMatra: opts.matras >= 1,
       lang: ctx.lang
     });
     inner += `<span class="${["sw-cl", ...c.classes].join(" ")}">${c.text}</span>`;
   } else if (note.rest === true) {
-    inner += matraGlyph(ctx);
-  } else if (note.sustain === true && opts.withMatra) {
-    inner += matraGlyph(ctx);
+    inner += matraGlyph(ctx).repeat(Math.max(1, opts.matras));
+  } else if (note.sustain === true) {
+    inner += matraGlyph(ctx).repeat(opts.matras);
   }
   if (note.microtone !== void 0) {
     const mark = localizeDigits(note.microtone === "atikomal" ? "2" : "1", ctx.lang);
     inner += `<span class="sw-micro" title="${note.microtone}">${mark}</span>`;
   }
-  const d = note.durationMatra ?? 1;
-  if (isIntegral(d) && d > 1 + EPS) inner += matraGlyph(ctx).repeat(Math.round(d) - 1);
-  if (opts.cuts > 0) inner += `<span class="sw-cut">${NBSP}${ctx.marks.cut}</span>`.repeat(opts.cuts);
+  inner += renderGrace(note.resh, "sw-resh", ctx);
+  if (note.svara !== void 0 && opts.matras > 1) {
+    inner += matraGlyph(ctx).repeat(opts.matras - 1);
+  }
+  if (opts.half) inner += `<span class="sw-half" title="${ctx.marks.cut}"></span>`;
+  if (opts.cuts > 0) inner += `<span class="sw-cut" title="${ctx.marks.cut}"></span>`.repeat(opts.cuts);
   inner += bracketGlyphs(note, "close");
   return inner;
 }
@@ -419,12 +589,12 @@ function renderAnnotation(notes, ctx) {
       continue;
     }
     if (cell.kind === "group") {
-      const cuts = cutMarkCount(cell.notes[0].raw);
+      const { matras, half } = cellMatra(cell);
+      const cuts = half ? 0 : cutMarkCount(cell.notes[0].raw);
       cell.notes.forEach((note2, j) => {
         const last = j === cell.notes.length - 1;
-        parts.push(
-          `<span class="sw-n">${renderPitchedInner(note2, { withMatra: last, cuts: last ? cuts : 0 }, ctx)}</span>`
-        );
+        const opts = last ? { matras, half, cuts } : { matras: 0, half: false, cuts: 0 };
+        parts.push(`<span class="sw-n">${renderPitchedInner(note2, opts, ctx)}</span>`);
       });
       continue;
     }
@@ -462,7 +632,8 @@ function renderRow(row, partIdx, rowIdx, ctx) {
     const firstCol = cell.start + 1;
     const lastCol = cell.start + cell.notes.length;
     const cellSpan = lastCol > firstCol ? `grid-column:${firstCol} / ${lastCol + 1}` : `grid-column:${firstCol}`;
-    const cuts = cell.kind === "group" ? cutMarkCount(cell.notes[0].raw) : 0;
+    const { matras, half } = cellMatra(cell);
+    const cuts = cell.kind === "group" && !half ? cutMarkCount(cell.notes[0].raw) : 0;
     cell.notes.forEach((note, j) => {
       const col = cell.start + j + 1;
       const path = `${partIdx}.${rowIdx}.${cell.start + j}`;
@@ -473,8 +644,9 @@ function renderRow(row, partIdx, rowIdx, ctx) {
         );
       } else if (cell.kind === "group") {
         const last = j === cell.notes.length - 1;
+        const pOpts = last ? { matras, half, cuts } : { matras: 0, half: false, cuts: 0 };
         notation.push(
-          `<span class="sw-n${cellEdges}" data-note="${path}" style="grid-column:${col}">${renderPitchedInner(note, { withMatra: last, cuts: last ? cuts : 0 }, ctx)}</span>`
+          `<span class="sw-n${cellEdges}" data-note="${path}" style="grid-column:${col}">${renderPitchedInner(note, pOpts, ctx)}</span>`
         );
       } else {
         const raw = rawDisplay(note);
@@ -565,9 +737,9 @@ ${FONT_FACES}
 }
 
 /* ---- notation font, per language (the note clusters + grace notes) ---- */
-.sw-sheet[lang="bn"] .sw-cl, .sw-sheet[lang="bn"] .sw-kan { font-family: Swarabitan, var(--sw-font, sans-serif); }
-.sw-sheet[lang="hi"] .sw-cl, .sw-sheet[lang="hi"] .sw-kan { font-family: ome_bhatkhande_hindi, var(--sw-font, sans-serif); }
-.sw-sheet[lang="en"] .sw-cl, .sw-sheet[lang="en"] .sw-kan { font-family: ome_bhatkhande_english, var(--sw-font, sans-serif); }
+.sw-sheet[lang="bn"] :is(.sw-cl, .sw-kan, .sw-resh) { font-family: Swarabitan, var(--sw-font, sans-serif); }
+.sw-sheet[lang="hi"] :is(.sw-cl, .sw-kan, .sw-resh) { font-family: ome_bhatkhande_hindi, var(--sw-font, sans-serif); }
+.sw-sheet[lang="en"] :is(.sw-cl, .sw-kan, .sw-resh) { font-family: ome_bhatkhande_english, var(--sw-font, sans-serif); }
 
 /* ---- header ---- */
 .sw-header {
@@ -626,18 +798,44 @@ ${FONT_FACES}
 .sw-ati-taar::before { top: -0.3em; }
 .sw-ati-mandra::before { bottom: -0.35em; }
 
-/* kan grace: small raised cluster left of the main note */
-.sw-kan {
+/* grace notes: small raised clusters \u2014 \u0995\u09A3 before the note, \u09B0\u09C7\u09B6 after it */
+.sw-kan,
+.sw-resh {
   position: relative;
   display: inline-block;
   font-size: 0.58em;
   vertical-align: 0.75em;
-  margin-right: 0.08em;
 }
+.sw-kan { margin-right: 0.08em; }
+.sw-resh { margin-left: 0.08em; }
 
 .sw-hy { padding-right: 0.02em; }
 .sw-iso { display: inline-block; margin-left: -0.18em; }
-.sw-cut { font-size: 0.8em; display: inline-block; margin-left: -0.15em; }
+/* The \u0985\u09B0\u09CD\u09A7\u09AE\u09BE\u09A4\u09CD\u09B0\u09BE / \u099B\u09C7\u09A6 mark: two stacked rings (legend p. \u09E7\u09E9\u09EB), drawn rather
+ * than typed \u2014 an isolated \u0983 has no base, so every Bengali font shapes it with
+ * a dotted circle (an NBSP carrier does not help). sw-half = semantic
+ * (halfMatra), sw-cut = decoded from a source cell's raw: one look, two
+ * provenances. */
+.sw-cut,
+.sw-half {
+  position: relative;
+  display: inline-block;
+  width: 0.3em;
+  height: 1em;
+  vertical-align: baseline;
+}
+.sw-cut::before, .sw-cut::after,
+.sw-half::before, .sw-half::after {
+  content: '';
+  position: absolute;
+  left: 0.08em;
+  width: 0.15em;
+  height: 0.15em;
+  border-radius: 50%;
+  background: currentColor;
+}
+.sw-cut::before, .sw-half::before { top: 0.2em; }
+.sw-cut::after, .sw-half::after { top: 0.55em; }
 .sw-br { opacity: 0.8; padding: 0 0.06em; }
 .sw-micro { font-size: 0.6em; vertical-align: super; opacity: 0.8; }
 
@@ -748,129 +946,6 @@ var SWARALIPI_STAFF_CSS = `
 .sw-staff-subtitle { opacity: .8; font-size: .95em; margin-top: .15em; }
 `;
 
-// src/player/pitch.ts
-var OCTAVE_OFFSET = {
-  "ati-mandra": -2,
-  mandra: -1,
-  madhyam: 0,
-  taar: 1,
-  "ati-taar": 2
-};
-var SHUDDHA = {
-  s: 0,
-  r: 2,
-  g: 4,
-  m: 5,
-  p: 7,
-  d: 9,
-  n: 11
-};
-var SHARP_NAMES = ["C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"];
-var PITCH_CLASS = {
-  c: 0,
-  "c#": 1,
-  db: 1,
-  d: 2,
-  "d#": 3,
-  eb: 3,
-  e: 4,
-  "e#": 5,
-  fb: 4,
-  f: 5,
-  "f#": 6,
-  gb: 6,
-  g: 7,
-  "g#": 8,
-  ab: 8,
-  a: 9,
-  "a#": 10,
-  bb: 10,
-  b: 11,
-  "b#": 0,
-  cb: 11
-};
-function parseTonic(tonic) {
-  if (!tonic) return 0;
-  const key = tonic.trim().toLowerCase().replace(/s/g, "#");
-  return PITCH_CLASS[key] ?? 0;
-}
-function svaraSemitone(note) {
-  if (note.svara === void 0) return null;
-  const [, letter] = note.svara;
-  let semi = SHUDDHA[letter];
-  if (note.komal === true || note.microtone !== void 0) semi -= 1;
-  if (note.tivra === true) semi += 1;
-  return semi;
-}
-function svaraToMidi(note, tonicPc, baseOctave = 4) {
-  const semi = svaraSemitone(note);
-  if (semi === null || note.svara === void 0) return null;
-  const [octave] = note.svara;
-  return (baseOctave + 1 + OCTAVE_OFFSET[octave]) * 12 + tonicPc + semi;
-}
-function kanToMidi(svara, tonicPc, baseOctave = 4) {
-  if (svara === void 0) return null;
-  const [octave, letter] = svara;
-  return (baseOctave + 1 + OCTAVE_OFFSET[octave]) * 12 + tonicPc + SHUDDHA[letter];
-}
-function midiToSampleName(midi) {
-  const pc = (midi % 12 + 12) % 12;
-  const octave = Math.floor(midi / 12) - 1;
-  return `${SHARP_NAMES[pc]}${octave}`;
-}
-function sampleFileName(midi) {
-  return midiToSampleName(midi).toLowerCase().replace("#", "s");
-}
-
-// src/player/schedule.ts
-var isSilent = (n) => n.svara === void 0 && n.rest !== true && n.sustain !== true;
-var SAM_TICK = /^\d+[fF]$/;
-function buildSchedule(doc, opts = {}) {
-  const tonicPc = parseTonic(opts.tonic ?? doc.meta.tonic);
-  const baseOctave = opts.baseOctave ?? 4;
-  const events = [];
-  let cursor = 0;
-  let lastPitched = -1;
-  let samBeat;
-  doc.parts.forEach((part, p) => {
-    part.rows.forEach((row, r) => {
-      row.notes.forEach((note, i) => {
-        if (samBeat === void 0 && note.above !== void 0) {
-          for (const a of note.above) {
-            if (a.raw !== void 0 && SAM_TICK.test(a.raw)) {
-              samBeat = cursor;
-              break;
-            }
-          }
-        }
-        if (note.bar !== void 0 || isSilent(note)) return;
-        const path = `${p}.${r}.${i}`;
-        const dur = note.durationMatra ?? 1;
-        if (note.svara !== void 0) {
-          events.push({
-            beat: cursor,
-            durationBeats: dur,
-            midi: svaraToMidi(note, tonicPc, baseOctave),
-            kan: kanToMidi(note.kan, tonicPc, baseOctave),
-            path,
-            kind: note.sustain === true ? "sustain" : "note"
-          });
-          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: null, path, kind: "sustain" });
-        } else {
-          events.push({ beat: cursor, durationBeats: dur, midi: null, kan: null, path, kind: "rest" });
-        }
-        cursor += dur;
-      });
-    });
-  });
-  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 };
-}
-
 // src/viewer/staff.ts
 init_taals();
 
@@ -1036,20 +1111,23 @@ function buildAbc(schedule, lyricOf, opts) {
       barPos -= beatsPerBar;
     }
   };
-  for (const ev of schedule.events) {
+  schedule.events.forEach((ev, i) => {
     if (ev.midi === null) {
       if (ev.kind === "rest") {
         tokens.push(`z${abcDuration(ev.durationBeats)}`);
         words.push("*");
         advance(ev.durationBeats);
       }
-      continue;
+      return;
     }
-    tokens.push(abcNote(ev));
+    const more = glideTargets(schedule.events, i).length > 0;
+    const slurOpen = ev.glide !== true && more ? "(" : "";
+    const slurClose = ev.glide === true && !more ? ")" : "";
+    tokens.push(`${slurOpen}${abcNote(ev)}${slurClose}`);
     const lyr = lyricOf(ev);
     words.push(lyr ? abcText(lyr).replace(/\s+/g, "~") : "*");
     advance(ev.durationBeats);
-  }
+  });
   if (tokens.length && tokens[tokens.length - 1] !== "|") tokens.push("|]");
   else if (tokens.length) tokens[tokens.length - 1] = "|]";
   const meter = ratioMeter(beatsPerBar);
@@ -1518,6 +1596,7 @@ exports.abcDuration = abcDuration;
 exports.abcToSvg = abcToSvg;
 exports.buildAbc = buildAbc;
 exports.buildTaalAbc = buildTaalAbc;
+exports.cellMatra = cellMatra;
 exports.composeCluster = composeCluster;
 exports.defineSwaralipiSheet = defineSwaralipiSheet;
 exports.docToAbc = docToAbc;