@ugfoundation/swaralipi-js 0.7.1 → 0.7.3

package/dist/viewer/index.d.cts

@@ -1,5 +1,5 @@
-import { O as Octave, a as SvaraLetter, N as Note, M as Meta, S as Swaralipi, T as Taal } from '../schema-D_86x4oV.cjs';
-import { D as DrumVoice, S as Schedule, P as PlayEvent } from '../schedule-CjPcD-Hf.cjs';
+import { O as Octave, a as SvaraLetter, N as Note, M as Meta, S as Swaralipi, T as Taal } from '../schema-DqBXPGkL.cjs';
+import { D as DrumVoice, S as Schedule, P as PlayEvent } from '../schedule-BpBYGXPL.cjs';
 import 'zod';
 import 'tone';
 import '../taals-CjzBuZ35.cjs';
@@ -197,7 +197,9 @@ declare function renderToHtml(doc: Swaralipi, opts?: RenderOptions): string;
  *     `transform` would scale it too, but would also break print
  *     pagination). This is what actually makes the glyphs smaller, so it
  *     runs second and stops at `minSize` px — past that the block scrolls
- *     inside `.sw-scroll` rather than becoming unreadable.
+ *     inside `.sw-scroll` rather than becoming unreadable. It also runs the
+ *     other way: a sheet narrower than its container grows (to 2x) rather
+ *     than leaving dead space to the right of every row.
  *
  * `zoom` (default 1) multiplies the fit scale so callers can zoom in past
  * fit-to-width, or below the readability floor deliberately; past that point

package/dist/viewer/index.d.ts

@@ -1,5 +1,5 @@
-import { O as Octave, a as SvaraLetter, N as Note, M as Meta, S as Swaralipi, T as Taal } from '../schema-D_86x4oV.js';
-import { D as DrumVoice, S as Schedule, P as PlayEvent } from '../schedule-8WFUBJqB.js';
+import { O as Octave, a as SvaraLetter, N as Note, M as Meta, S as Swaralipi, T as Taal } from '../schema-DqBXPGkL.js';
+import { D as DrumVoice, S as Schedule, P as PlayEvent } from '../schedule-Tzk01FKj.js';
 import 'zod';
 import 'tone';
 import '../taals-CjzBuZ35.js';
@@ -197,7 +197,9 @@ declare function renderToHtml(doc: Swaralipi, opts?: RenderOptions): string;
  *     `transform` would scale it too, but would also break print
  *     pagination). This is what actually makes the glyphs smaller, so it
  *     runs second and stops at `minSize` px — past that the block scrolls
- *     inside `.sw-scroll` rather than becoming unreadable.
+ *     inside `.sw-scroll` rather than becoming unreadable. It also runs the
+ *     other way: a sheet narrower than its container grows (to 2x) rather
+ *     than leaving dead space to the right of every row.
  *
  * `zoom` (default 1) multiplies the fit scale so callers can zoom in past
  * fit-to-width, or below the readability floor deliberately; past that point

package/dist/viewer/index.js

@@ -1,5 +1,5 @@
-import { isArcRaw, glideTargets, buildSchedule, drumPattern } from '../chunk-GHWURC4U.js';
-import { TAALS } from '../chunk-6ETPFHZ6.js';
+import { isArcRaw, glideTargets, buildSchedule, drumPattern } from '../chunk-2SAZWTTK.js';
+import { TAALS, graceNotes } from '../chunk-UF5OSJRP.js';
 
 // src/viewer/glyphs.ts
 var SWARABITAN_SHUDDHA = {
@@ -266,11 +266,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 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="${[cls, ...c.classes].join(" ")}">${c.text}</span>`;
+function renderGrace(grace, cls, ctx) {
+  return graceNotes(grace).map((n) => {
+    if (n.svara === void 0) return "";
+    const [octave, letter] = n.svara;
+    const c = composeCluster(letter, {
+      komal: n.komal,
+      tivra: n.tivra,
+      octave,
+      withMatra: false,
+      lang: ctx.lang
+    });
+    const hy = n.sustain === true ? ctx.marks.hyphen : "";
+    const micro = n.microtone !== void 0 ? `<span class="sw-micro" title="${n.microtone}">${localizeDigits(n.microtone === "atikomal" ? "2" : "1", ctx.lang)}</span>` : "";
+    return `<span class="${[cls, ...c.classes].join(" ")}">${hy}${c.text}</span>${micro}`;
+  }).join("");
 }
 function cutGlyphs(marks, ctx) {
   if (marks === "") return "";
@@ -492,14 +502,22 @@ function fitSwaralipi(root, minScale = 0, zoom = 1, minSpacing = 0.35, minSize =
     const available = scroll.clientWidth;
     let natural = block.scrollWidth;
     if (available === 0 || natural === 0) continue;
-    for (const step of [0.75, 0.5, 0.25, 0]) {
-      if (natural <= available || minSpacing >= 1) break;
-      sheet.style.setProperty("--sw-tight", String(minSpacing + (1 - minSpacing) * step));
+    if (natural > available && minSpacing < 1) {
+      let loose = minSpacing;
+      let tight = 1;
+      for (let i = 0; i < 6; i++) {
+        const mid = (loose + tight) / 2;
+        sheet.style.setProperty("--sw-tight", String(mid));
+        if (block.scrollWidth <= available) loose = mid;
+        else tight = mid;
+      }
+      sheet.style.setProperty("--sw-tight", String(loose));
       natural = block.scrollWidth;
     }
     const base = parseFloat(getComputedStyle(sheet).fontSize);
-    let fit = natural > available ? Math.max(minScale, available / natural) : 1;
-    if (base > 0 && minSize > 0) fit = Math.max(fit, Math.min(1, minSize / base));
+    if (!(base > 0)) continue;
+    let fit = Math.max(minScale, Math.min((available - 1) / natural, 2));
+    if (minSize > 0) fit = Math.max(fit, Math.min(1, minSize / base));
     const scale = fit * zoom;
     if (scale === 1) continue;
     sheet.style.setProperty("--sw-size", `${(base * scale).toFixed(3)}px`);
@@ -780,7 +798,7 @@ function abcDuration(beats) {
   return `${sixteenths}/4`;
 }
 function abcNote(ev) {
-  const grace = ev.kan !== null ? `{${midiToAbc(ev.kan)}}` : "";
+  const grace = ev.kan.length > 0 ? `{${ev.kan.map(midiToAbc).join("")}}` : "";
   return `${grace}${midiToAbc(ev.midi)}${abcDuration(ev.durationBeats)}`;
 }
 function eventPaths(schedule) {
@@ -1308,6 +1326,9 @@ function createElementClass() {
       });
       this.#root.innerHTML = this.#styleFallback() + html;
       this.#fit();
+      void document.fonts?.ready.then(() => {
+        if (seq === this.#renderSeq) this.fit();
+      });
     }
     #renderError(message) {
       const div = document.createElement("div");