@ugfoundation/swaralipi-js 0.7.1 → 0.7.2

package/dist/viewer/index.d.cts

@@ -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

@@ -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

@@ -492,14 +492,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`);
@@ -1308,6 +1316,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");