@ugfoundation/swaralipi-js 0.4.0 → 0.6.0

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-D3wyNRqM.cjs';
-import { D as DrumVoice, S as Schedule, P as PlayEvent } from '../schedule-D3JyEhuO.cjs';
+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 'zod';
 import 'tone';
 import '../taals-CjzBuZ35.cjs';
@@ -77,25 +77,6 @@ declare function composeCluster(letter: SvaraLetter, opts: ComposeOptions): Clus
 /** Map ASCII digits in `s` to the target script's digits. */
 declare function localizeDigits(s: string, lang: GridLang): string;
 
-/**
- * Pure spec-JSON → HTML renderer. No DOM, no side effects: usable for SSR
- * (Astro/static sites emit `renderToHtml(doc)` next to a
- * `<style>${SWARALIPI_CSS}</style>`) and unit-testable in plain Node.
- *
- * Layout model (mirrors NLTR's 4-row systems): each spec `Row` becomes one
- * CSS grid with **one column per top-level note** and four grid rows —
- * above-annotations / notation / below (slur arcs, marks) / lyric. Source
- * cells (groups of sub-notes sharing one matra) become column *spans*, so
- * per-sub-note lyric alignment and P2.3's per-note highlight targets fall
- * out of the column model for free.
- *
- * Rendering is spec-driven (semantics, not `raw`): grouping derives from
- * `durationMatra` accumulation so hand-authored documents without `raw`
- * render identically. `raw` is consulted only for (a) raw-only fallback
- * notes (never dropped — dimmed, in Swarabitan when loaded), (b) the ছেদ
- * cut mark and beat labels, whose grammar lives in raw (see codec.ts).
- */
-
 interface RenderOptions {
     /** Notation + UI language. Default `bn`. */
     lang?: ViewerLang;
@@ -119,7 +100,9 @@ interface Cell {
  *  - bar / raw-only / carrier notes force-close and form singleton cells;
  *  - full-matra notes are singleton groups;
  *  - fractional notes accumulate until the sum reaches an integer matra
- *    boundary (epsilon for 1/3, 0.2 chains), then the group closes.
+ *    boundary (epsilon for 1/3, 0.2 chains), then the group closes;
+ *  - `halfMatra` (the অর্ধমাত্রা ঃ) closes the cell on a half boundary — the
+ *    only case durations alone cannot resolve (`সঃ গঃ` vs `সরা`).
  * The converter emits k notes × 1/k per source cell, so groups coincide
  * with source cells; an incomplete trailing group still closes at row end
  * (the matra carrier lands on its last note).
@@ -147,6 +130,16 @@ interface Arc {
  * A row with fill segments but no ends at all renders one straight line.
  */
 declare function resolveArcs(cells: Cell[], noteCount: number): Arc[];
+/**
+ * The matra marks a cell's final note carries: its total duration as whole
+ * আ-কার matras plus an optional অর্ধমাত্রা ঃ (legend `রাঃ` = 1½, `সঃ` = ½).
+ * Only a `halfMatra` cell may show zero matras — every other cell keeps at
+ * least one, so an incomplete trailing group still gets its carrier.
+ */
+declare function cellMatra(cell: Cell): {
+    matras: number;
+    half: boolean;
+};
 /**
  * The নাম / তাল / রাগ / আবর্তন / স্বরলিপিকার header block, shared by the
  * akarmatrik grid and the staff view so both show the same metadata (localized
@@ -467,4 +460,4 @@ type Transliterator = (bengaliText: string) => string;
  */
 declare function loadLyricTransliterator(lang: ViewerLang): Promise<Transliterator | undefined>;
 
-export { type Arc, type Cell, type Cluster, type ComposeOptions, DEFAULT_NOTATOR, DEFAULT_WATERMARK, DIGITS, type GridLang, LABELS, MARKS, NOTATION_FONT_URLS, type PrintOptions, type RenderOptions, SWARALIPI_CSS, SWARALIPI_PRINT_CSS, SWARALIPI_STAFF_CSS, type StaffOptions, type SwaralipiSheetElement, type TaalStaffOptions, type Transliterator, type ViewerLang, abcDuration, abcToSvg, buildAbc, buildTaalAbc, composeCluster, defineSwaralipiSheet, docToAbc, groupRowIntoCells, loadLyricTransliterator, localizeDigits, midiToAbc, printSwaralipi, renderMetaHeader, renderPrintDocument, renderStaffHtml, renderStaffPrintDocument, renderTaalStaffHtml, renderToHtml, resolveArcs };
+export { type Arc, type Cell, type Cluster, type ComposeOptions, DEFAULT_NOTATOR, DEFAULT_WATERMARK, DIGITS, type GridLang, LABELS, MARKS, NOTATION_FONT_URLS, type PrintOptions, type RenderOptions, SWARALIPI_CSS, SWARALIPI_PRINT_CSS, SWARALIPI_STAFF_CSS, type StaffOptions, type SwaralipiSheetElement, type TaalStaffOptions, type Transliterator, type ViewerLang, abcDuration, abcToSvg, buildAbc, buildTaalAbc, cellMatra, composeCluster, defineSwaralipiSheet, docToAbc, groupRowIntoCells, loadLyricTransliterator, localizeDigits, midiToAbc, printSwaralipi, renderMetaHeader, renderPrintDocument, renderStaffHtml, renderStaffPrintDocument, renderTaalStaffHtml, renderToHtml, resolveArcs };

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-D3wyNRqM.js';
-import { D as DrumVoice, S as Schedule, P as PlayEvent } from '../schedule-CAns78TD.js';
+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 'zod';
 import 'tone';
 import '../taals-CjzBuZ35.js';
@@ -77,25 +77,6 @@ declare function composeCluster(letter: SvaraLetter, opts: ComposeOptions): Clus
 /** Map ASCII digits in `s` to the target script's digits. */
 declare function localizeDigits(s: string, lang: GridLang): string;
 
-/**
- * Pure spec-JSON → HTML renderer. No DOM, no side effects: usable for SSR
- * (Astro/static sites emit `renderToHtml(doc)` next to a
- * `<style>${SWARALIPI_CSS}</style>`) and unit-testable in plain Node.
- *
- * Layout model (mirrors NLTR's 4-row systems): each spec `Row` becomes one
- * CSS grid with **one column per top-level note** and four grid rows —
- * above-annotations / notation / below (slur arcs, marks) / lyric. Source
- * cells (groups of sub-notes sharing one matra) become column *spans*, so
- * per-sub-note lyric alignment and P2.3's per-note highlight targets fall
- * out of the column model for free.
- *
- * Rendering is spec-driven (semantics, not `raw`): grouping derives from
- * `durationMatra` accumulation so hand-authored documents without `raw`
- * render identically. `raw` is consulted only for (a) raw-only fallback
- * notes (never dropped — dimmed, in Swarabitan when loaded), (b) the ছেদ
- * cut mark and beat labels, whose grammar lives in raw (see codec.ts).
- */
-
 interface RenderOptions {
     /** Notation + UI language. Default `bn`. */
     lang?: ViewerLang;
@@ -119,7 +100,9 @@ interface Cell {
  *  - bar / raw-only / carrier notes force-close and form singleton cells;
  *  - full-matra notes are singleton groups;
  *  - fractional notes accumulate until the sum reaches an integer matra
- *    boundary (epsilon for 1/3, 0.2 chains), then the group closes.
+ *    boundary (epsilon for 1/3, 0.2 chains), then the group closes;
+ *  - `halfMatra` (the অর্ধমাত্রা ঃ) closes the cell on a half boundary — the
+ *    only case durations alone cannot resolve (`সঃ গঃ` vs `সরা`).
  * The converter emits k notes × 1/k per source cell, so groups coincide
  * with source cells; an incomplete trailing group still closes at row end
  * (the matra carrier lands on its last note).
@@ -147,6 +130,16 @@ interface Arc {
  * A row with fill segments but no ends at all renders one straight line.
  */
 declare function resolveArcs(cells: Cell[], noteCount: number): Arc[];
+/**
+ * The matra marks a cell's final note carries: its total duration as whole
+ * আ-কার matras plus an optional অর্ধমাত্রা ঃ (legend `রাঃ` = 1½, `সঃ` = ½).
+ * Only a `halfMatra` cell may show zero matras — every other cell keeps at
+ * least one, so an incomplete trailing group still gets its carrier.
+ */
+declare function cellMatra(cell: Cell): {
+    matras: number;
+    half: boolean;
+};
 /**
  * The নাম / তাল / রাগ / আবর্তন / স্বরলিপিকার header block, shared by the
  * akarmatrik grid and the staff view so both show the same metadata (localized
@@ -467,4 +460,4 @@ type Transliterator = (bengaliText: string) => string;
  */
 declare function loadLyricTransliterator(lang: ViewerLang): Promise<Transliterator | undefined>;
 
-export { type Arc, type Cell, type Cluster, type ComposeOptions, DEFAULT_NOTATOR, DEFAULT_WATERMARK, DIGITS, type GridLang, LABELS, MARKS, NOTATION_FONT_URLS, type PrintOptions, type RenderOptions, SWARALIPI_CSS, SWARALIPI_PRINT_CSS, SWARALIPI_STAFF_CSS, type StaffOptions, type SwaralipiSheetElement, type TaalStaffOptions, type Transliterator, type ViewerLang, abcDuration, abcToSvg, buildAbc, buildTaalAbc, composeCluster, defineSwaralipiSheet, docToAbc, groupRowIntoCells, loadLyricTransliterator, localizeDigits, midiToAbc, printSwaralipi, renderMetaHeader, renderPrintDocument, renderStaffHtml, renderStaffPrintDocument, renderTaalStaffHtml, renderToHtml, resolveArcs };
+export { type Arc, type Cell, type Cluster, type ComposeOptions, DEFAULT_NOTATOR, DEFAULT_WATERMARK, DIGITS, type GridLang, LABELS, MARKS, NOTATION_FONT_URLS, type PrintOptions, type RenderOptions, SWARALIPI_CSS, SWARALIPI_PRINT_CSS, SWARALIPI_STAFF_CSS, type StaffOptions, type SwaralipiSheetElement, type TaalStaffOptions, type Transliterator, type ViewerLang, abcDuration, abcToSvg, buildAbc, buildTaalAbc, cellMatra, composeCluster, defineSwaralipiSheet, docToAbc, groupRowIntoCells, loadLyricTransliterator, localizeDigits, midiToAbc, printSwaralipi, renderMetaHeader, renderPrintDocument, renderStaffHtml, renderStaffPrintDocument, renderTaalStaffHtml, renderToHtml, resolveArcs };

package/dist/viewer/index.js

@@ -1,4 +1,4 @@
-import { buildSchedule, drumPattern } from '../chunk-6QW7MSJO.js';
+import { isArcRaw, glideTargets, buildSchedule, drumPattern } from '../chunk-GHWURC4U.js';
 import { TAALS } from '../chunk-6ETPFHZ6.js';
 
 // src/viewer/glyphs.ts
@@ -41,7 +41,9 @@ var MARKS = {
 var LABELS = {
   bn: { title: "\u09A8\u09BE\u09AE", taal: "\u09A4\u09BE\u09B2", raag: "\u09B0\u09BE\u0997", avartan: "\u0986\u09AC\u09B0\u09CD\u09A4\u09A8", notationBy: "\u09B8\u09CD\u09AC\u09B0\u09B2\u09BF\u09AA\u09BF\u0995\u09BE\u09B0" },
   hi: { title: "\u0928\u093E\u092E", taal: "\u0924\u093E\u0932", raag: "\u0930\u093E\u0917", avartan: "\u0906\u0935\u0930\u094D\u0924\u0928", notationBy: "\u0938\u094D\u0935\u0930\u0932\u093F\u092A\u093F\u0915\u093E\u0930" },
-  en: { title: "Song", taal: "Taal", raag: "Raag", avartan: "Avartan", notationBy: "Notator" }
+  // "Cycle", not "Avartan": the English sheet is read by people who do not know the word, and
+  // one taal cycle is exactly what the number counts.
+  en: { title: "Song", taal: "Taal", raag: "Raag", avartan: "Cycles", notationBy: "Notator" }
 };
 function composeCluster(letter, opts) {
   const classes = [];
@@ -65,7 +67,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) {
@@ -100,7 +101,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;
@@ -108,13 +109,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;
@@ -183,15 +182,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;
@@ -199,22 +204,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;
 }
@@ -231,12 +241,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;
     }
@@ -274,7 +284,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}`;
@@ -285,8 +296,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);
@@ -359,9 +371,9 @@ function renderToHtml(doc, opts = {}) {
 
 // src/viewer/styles.ts
 var NOTATION_FONT_URLS = {
-  Swarabitan: "https://webfonts-4qq.pages.dev/swarabitan/Swarabitan.ttf",
-  ome_bhatkhande_hindi: "https://webfonts-4qq.pages.dev/ome-bhatkhande/OmeBhatkhandeHindi.ttf",
-  ome_bhatkhande_english: "https://webfonts-4qq.pages.dev/ome-bhatkhande/OmeBhatkhandeEnglish.ttf"
+  Swarabitan: "https://lipighor.pages.dev/swarabitan/Swarabitan.ttf",
+  ome_bhatkhande_hindi: "https://lipighor.pages.dev/ome-bhatkhande/OmeBhatkhandeHindi.ttf",
+  ome_bhatkhande_english: "https://lipighor.pages.dev/ome-bhatkhande/OmeBhatkhandeEnglish.ttf"
 };
 NOTATION_FONT_URLS.Swarabitan;
 var FONT_FACES = Object.entries(NOTATION_FONT_URLS).map(
@@ -377,9 +389,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 {
@@ -438,18 +450,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; }
 
@@ -606,20 +644,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);
@@ -790,26 +831,26 @@ function escapeHtml2(s) {
 }
 function watermarkCss(text) {
   if (!text) return "";
+  const span = 92;
+  const size = Math.min(18, span / (0.62 * text.length));
+  const len = Math.min(span, 0.62 * text.length * size);
+  const svg = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid meet"><text x="50" y="50" dy=".35em" text-anchor="middle" font-family="sans-serif" font-weight="700" fill="rgba(0,0,0,0.07)" font-size="${size.toFixed(2)}" textLength="${len.toFixed(2)}" lengthAdjust="spacingAndGlyphs" transform="rotate(-35 50 50)">${escapeHtml2(text)}</text></svg>`;
   return `
 .sw-watermark {
   position: fixed; inset: 0; z-index: 0; pointer-events: none;
-  display: flex; align-items: center; justify-content: center;
-  overflow: hidden;
+  background: url("data:image/svg+xml,${encodeURIComponent(svg)}") center / contain no-repeat;
   -webkit-print-color-adjust: exact; print-color-adjust: exact;
 }
-.sw-watermark span {
-  font-size: 11vw; font-weight: 700; letter-spacing: .08em;
-  color: rgba(0,0,0,0.07); transform: rotate(-35deg); white-space: nowrap;
-}
 body > .sw-sheet, body > .sw-footer { position: relative; z-index: 1; }
 `;
 }
 function chrome(text, notator) {
-  const top = text ? `<div class="sw-watermark" aria-hidden="true"><span>${escapeHtml2(text)}</span></div>` : "";
+  const top = text ? '<div class="sw-watermark" aria-hidden="true"></div>' : "";
   const bottom = notator ? `<footer class="sw-footer">${escapeHtml2(notator)}</footer>` : "";
   return { top, bottom };
 }
 function resolveNotator(doc, opts) {
+  if (opts.notator === "") return "";
   return doc.meta.notationBy ?? opts.notator ?? DEFAULT_NOTATOR;
 }
 function pageHtml(lang, title, bodyHtml, opts, doc) {
@@ -1075,6 +1116,6 @@ function defineSwaralipiSheet(tagName = "swaralipi-sheet") {
   return ctor;
 }
 
-export { DEFAULT_NOTATOR, DEFAULT_WATERMARK, DIGITS, LABELS, MARKS, NOTATION_FONT_URLS, SWARALIPI_CSS, SWARALIPI_PRINT_CSS, SWARALIPI_STAFF_CSS, abcDuration, abcToSvg, buildAbc, buildTaalAbc, composeCluster, defineSwaralipiSheet, docToAbc, groupRowIntoCells, loadLyricTransliterator, localizeDigits, midiToAbc, printSwaralipi, renderMetaHeader, renderPrintDocument, renderStaffHtml, renderStaffPrintDocument, renderTaalStaffHtml, renderToHtml, resolveArcs };
+export { DEFAULT_NOTATOR, DEFAULT_WATERMARK, DIGITS, LABELS, MARKS, NOTATION_FONT_URLS, SWARALIPI_CSS, SWARALIPI_PRINT_CSS, SWARALIPI_STAFF_CSS, abcDuration, abcToSvg, buildAbc, buildTaalAbc, cellMatra, composeCluster, defineSwaralipiSheet, docToAbc, groupRowIntoCells, loadLyricTransliterator, localizeDigits, midiToAbc, printSwaralipi, renderMetaHeader, renderPrintDocument, renderStaffHtml, renderStaffPrintDocument, renderTaalStaffHtml, renderToHtml, resolveArcs };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map