@ugfoundation/swaralipi-js 0.6.0 → 0.6.1

package/dist/viewer/index.js

@@ -162,9 +162,22 @@ function resolveArcs(cells, noteCount) {
   }
   return arcs;
 }
-function cutMarkCount(raw) {
-  if (raw === void 0) return 0;
-  return (raw.match(/[i:]/g) ?? []).length;
+var SVARA_CHAR = /[srgmpqndtkuv]/;
+function rawMarks(raw, count) {
+  if (raw === void 0) return void 0;
+  const marks = { aakar: false, pre: "", post: new Array(count).fill("") };
+  const leads = SVARA_CHAR.test(raw);
+  let seen = 0;
+  for (const ch of raw) {
+    if (SVARA_CHAR.test(ch)) seen = Math.min(seen + 1, count);
+    else if (ch === "a") marks.aakar = true;
+    else if (ch === "i" || ch === ":") {
+      if (seen > 0) marks.post[seen - 1] += ch;
+      else if (leads) marks.pre += ch;
+      else marks.post[0] += ch;
+    }
+  }
+  return marks;
 }
 function parseBeatLabel(raw) {
   const m = raw.match(/^([0-9]{1,2})([fF])?:?$/);
@@ -188,16 +201,31 @@ function renderGrace(svara, cls, ctx) {
   const c = composeCluster(letter, { octave, withMatra: false, lang: ctx.lang });
   return `<span class="${[cls, ...c.classes].join(" ")}">${c.text}</span>`;
 }
+function cutGlyphs(marks, ctx) {
+  if (marks === "") return "";
+  return ctx.lang === "bn" ? `<span class="sw-cl" title="${ctx.marks.cut}">${marks}</span>` : `<span class="sw-cut" title="${ctx.marks.cut}"></span>`.repeat(marks.length);
+}
 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 cellPitchedOpts(cell) {
+  const { matras, half } = cellMatra(cell);
+  const marks = rawMarks(cell.notes[0].raw, cell.notes.length);
+  const aakars = marks !== void 0 && !marks.aakar ? 0 : matras;
+  return cell.notes.map((_, j) => ({
+    matras: j === cell.notes.length - 1 ? aakars : 0,
+    pre: j === 0 ? marks?.pre ?? "" : "",
+    post: marks !== void 0 ? marks.post[j] : half && j === cell.notes.length - 1 ? "i" : ""
+  }));
+}
 function renderPitchedInner(note, opts, ctx) {
   let inner = bracketGlyphs(note, "open");
   inner += renderGrace(note.kan, "sw-kan", ctx);
   if (note.sustain === true) inner += `<span class="sw-hy">${ctx.marks.hyphen}</span>`;
+  inner += cutGlyphs(opts.pre, ctx);
   if (note.svara !== void 0) {
     const [octave, letter] = note.svara;
     const c = composeCluster(letter, {
@@ -223,8 +251,7 @@ function renderPitchedInner(note, opts, 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 += cutGlyphs(opts.post, ctx);
   inner += bracketGlyphs(note, "close");
   return inner;
 }
@@ -241,12 +268,9 @@ function renderAnnotation(notes, ctx) {
       continue;
     }
     if (cell.kind === "group") {
-      const { matras, half } = cellMatra(cell);
-      const cuts = half ? 0 : cutMarkCount(cell.notes[0].raw);
+      const opts = cellPitchedOpts(cell);
       cell.notes.forEach((note2, j) => {
-        const last = j === cell.notes.length - 1;
-        const opts = last ? { matras, half, cuts } : { matras: 0, half: false, cuts: 0 };
-        parts.push(`<span class="sw-n">${renderPitchedInner(note2, opts, ctx)}</span>`);
+        parts.push(`<span class="sw-n">${renderPitchedInner(note2, opts[j], ctx)}</span>`);
       });
       continue;
     }
@@ -284,8 +308,7 @@ 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 { matras, half } = cellMatra(cell);
-    const cuts = cell.kind === "group" && !half ? cutMarkCount(cell.notes[0].raw) : 0;
+    const opts = cell.kind === "group" ? cellPitchedOpts(cell) : [];
     cell.notes.forEach((note, j) => {
       const col = cell.start + j + 1;
       const path = `${partIdx}.${rowIdx}.${cell.start + j}`;
@@ -295,10 +318,8 @@ function renderRow(row, partIdx, rowIdx, ctx) {
           `<span class="sw-bar sw-bar--${note.bar}${cellEdges}" data-note="${path}" style="grid-column:${col}">${renderBarInner(note)}</span>`
         );
       } 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, pOpts, ctx)}</span>`
+          `<span class="sw-n${cellEdges}" data-note="${path}" style="grid-column:${col}">${renderPitchedInner(note, opts[j], ctx)}</span>`
         );
       } else {
         const raw = rawDisplay(note);
@@ -463,21 +484,19 @@ ${FONT_FACES}
 
 .sw-hy { padding-right: 0.02em; }
 .sw-iso { display: inline-block; margin-left: -0.18em; }
-/* 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 {
+/* The \u0985\u09B0\u09CD\u09A7\u09AE\u09BE\u09A4\u09CD\u09B0\u09BE / \u099B\u09C7\u09A6 mark: two stacked rings (legend p. \u09E7\u09E9\u09EB). bn types
+ * Swarabitan's own glyph (the ASCII i key) \u2014 an isolated Unicode \u0983 has no base and
+ * every Bengali text font shapes it with a dotted circle (an NBSP carrier
+ * does not help), but the notation font has the mark itself. hi/en fall back
+ * to these drawn rings: Bhatkhande has no such sign. */
+.sw-cut {
   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 {
+.sw-cut::before, .sw-cut::after {
   content: '';
   position: absolute;
   left: 0.08em;
@@ -486,8 +505,8 @@ ${FONT_FACES}
   border-radius: 50%;
   background: currentColor;
 }
-.sw-cut::before, .sw-half::before { top: 0.2em; }
-.sw-cut::after, .sw-half::after { top: 0.55em; }
+.sw-cut::before { top: 0.2em; }
+.sw-cut::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; }