@ugfoundation/swaralipi-js 0.7.7 → 0.8.0

package/dist/viewer/index.d.cts

@@ -1,8 +1,8 @@
-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 { O as Octave, a as SvaraLetter, N as Note, M as Meta, S as Swaralipi, T as Taal } from '../schema-DGA_bNVZ.cjs';
+import { L as Lay } from '../lay-Csa4CD46.cjs';
+import { D as DrumVoice, S as Schedule, P as PlayEvent } from '../schedule-B_UaluBi.cjs';
 import 'zod';
 import 'tone';
-import '../taals-CjzBuZ35.cjs';
 
 /** Akarmatrik/Bhatkhande grid languages, rendered synchronously by renderToHtml. */
 type GridLang = 'bn' | 'hi' | 'en';
@@ -27,6 +27,10 @@ declare const LABELS: Record<GridLang, {
     avartan: string;
     notationBy: string;
 }>;
+/** লয় tier names, printed where a row changes tempo. bn/hi keep the Indian
+ * term; en names the tempo first (a reader of the English sheet may not know
+ * the word — the same call `LABELS.en` makes with "Cycles" over "Avartan"). */
+declare const LAY_LABELS: Record<GridLang, Record<Lay, string>>;
 /** A composed notation cluster: the font's ASCII text plus any residual CSS
  * classes the font itself cannot express (only the bn ati-octave dot). */
 interface Cluster {
@@ -204,6 +208,7 @@ declare const ZOOM_STEP = 1.2;
  *   --sw-matra      minimum width of one matra column
  *   --sw-header-min floor for the নাম/তাল/আবর্তন header (it must stay legible
  *                   when the notation is scaled down to fit a phone)
+ *   --sw-lay-min    same floor for the লয় (tempo tier) marker band
  *   --sw-hl         player-highlight background (P2.3)
  *   --sw-rule       header rule / muted line color
  *
@@ -231,7 +236,7 @@ declare const SWARALIPI_CSS: string;
  *  - rows are un-clipped (no scrollbar on paper) and kept whole across page
  *    breaks; part headings stay with their first row.
  */
-declare const SWARALIPI_PRINT_CSS = "\n@page { margin: 16mm; }\n@media print {\n  .sw-sheet, .sw-staff { -webkit-print-color-adjust: exact; print-color-adjust: exact; color: #000; }\n  .sw-scroll { overflow: visible !important; }\n  .sw-row { break-inside: avoid; page-break-inside: avoid; }\n  .sw-part-name, .sw-header { break-after: avoid-page; page-break-after: avoid; }\n  .sw-hl { background: none !important; }\n  /* Keep each engraved staff system whole across a page break (the abcjs line\n     is a <div> wrapping the <svg>, so the break rule must sit on the div). */\n  .sw-staff-lines > div { break-inside: avoid; page-break-inside: avoid; }\n  .sw-staff-meta { break-after: avoid-page; page-break-after: avoid; }\n}\n";
+declare const SWARALIPI_PRINT_CSS = "\n@page { margin: 16mm; }\n@media print {\n  .sw-sheet, .sw-staff { -webkit-print-color-adjust: exact; print-color-adjust: exact; color: #000; }\n  .sw-scroll { overflow: visible !important; }\n  .sw-row { break-inside: avoid; page-break-inside: avoid; }\n  .sw-part-name, .sw-header, .sw-lay { break-after: avoid-page; page-break-after: avoid; }\n  .sw-hl { background: none !important; }\n  /* Keep each engraved staff system whole across a page break (the abcjs line\n     is a <div> wrapping the <svg>, so the break rule must sit on the div). */\n  .sw-staff-lines > div { break-inside: avoid; page-break-inside: avoid; }\n  .sw-staff-meta { break-after: avoid-page; page-break-after: avoid; }\n}\n";
 /** Staff-notation (abcjs) wrapper chrome: instrument/tempo header + a fluid
  * SVG. The engraving itself is drawn by abcjs; this only frames it. */
 declare const SWARALIPI_STAFF_CSS = "\n.sw-staff { color: currentColor; }\n.sw-staff-meta { display: flex; gap: 1.25em; align-items: baseline; margin: 0 0 .5em; font-size: .95em; opacity: .85; }\n.sw-staff-instrument { font-weight: 600; }\n.sw-staff-drums { opacity: .75; }\n.sw-staff-tempo { font-variant-numeric: tabular-nums; }\n/* abcjs (oneSvgPerLine) wraps the music into one <div><svg> per system; stack\n   them as short, swaralipi-style lines. abcjs sets a fixed pixel height +\n   overflow:hidden on each wrapper div \u2014 neutralise it so the viewBox'd SVG can\n   scale to the container (and to the print page) instead of being clipped. */\n.sw-staff-lines > div { margin: 0 0 .35em; height: auto !important; overflow: visible !important; }\n/* Fill up to the engraved (staffwidth) size \u2014 shrink to fit a narrow container,\n   but never stretch past natural width (abcToSvg pins per-SVG max-width in px),\n   else a short last system balloons. */\n.sw-staff-lines svg { display: block; width: 100%; height: auto; }\n.sw-staff-missing { padding: 1em; border: 1px dashed currentColor; border-radius: 6px; opacity: .8; font-size: .9em; }\n.sw-staff-title { font-size: 1.15em; font-weight: 700; }\n.sw-staff-subtitle { opacity: .8; font-size: .95em; margin-top: .15em; }\n";
@@ -522,4 +527,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, type Layout, MARKS, MAX_ZOOM, MIN_ZOOM, 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, ZOOM_STEP, abcDuration, abcToSvg, alignRows, buildAbc, buildTaalAbc, cellMatra, composeCluster, defineSwaralipiSheet, docToAbc, fitSwaralipi, 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, LAY_LABELS, type Layout, MARKS, MAX_ZOOM, MIN_ZOOM, 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, ZOOM_STEP, abcDuration, abcToSvg, alignRows, buildAbc, buildTaalAbc, cellMatra, composeCluster, defineSwaralipiSheet, docToAbc, fitSwaralipi, groupRowIntoCells, loadLyricTransliterator, localizeDigits, midiToAbc, printSwaralipi, renderMetaHeader, renderPrintDocument, renderStaffHtml, renderStaffPrintDocument, renderTaalStaffHtml, renderToHtml, resolveArcs };

package/dist/viewer/index.d.ts

@@ -1,8 +1,8 @@
-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 { O as Octave, a as SvaraLetter, N as Note, M as Meta, S as Swaralipi, T as Taal } from '../schema-DGA_bNVZ.js';
+import { L as Lay } from '../lay-Ct9ky_EE.js';
+import { D as DrumVoice, S as Schedule, P as PlayEvent } from '../schedule-CdILTNsk.js';
 import 'zod';
 import 'tone';
-import '../taals-CjzBuZ35.js';
 
 /** Akarmatrik/Bhatkhande grid languages, rendered synchronously by renderToHtml. */
 type GridLang = 'bn' | 'hi' | 'en';
@@ -27,6 +27,10 @@ declare const LABELS: Record<GridLang, {
     avartan: string;
     notationBy: string;
 }>;
+/** লয় tier names, printed where a row changes tempo. bn/hi keep the Indian
+ * term; en names the tempo first (a reader of the English sheet may not know
+ * the word — the same call `LABELS.en` makes with "Cycles" over "Avartan"). */
+declare const LAY_LABELS: Record<GridLang, Record<Lay, string>>;
 /** A composed notation cluster: the font's ASCII text plus any residual CSS
  * classes the font itself cannot express (only the bn ati-octave dot). */
 interface Cluster {
@@ -204,6 +208,7 @@ declare const ZOOM_STEP = 1.2;
  *   --sw-matra      minimum width of one matra column
  *   --sw-header-min floor for the নাম/তাল/আবর্তন header (it must stay legible
  *                   when the notation is scaled down to fit a phone)
+ *   --sw-lay-min    same floor for the লয় (tempo tier) marker band
  *   --sw-hl         player-highlight background (P2.3)
  *   --sw-rule       header rule / muted line color
  *
@@ -231,7 +236,7 @@ declare const SWARALIPI_CSS: string;
  *  - rows are un-clipped (no scrollbar on paper) and kept whole across page
  *    breaks; part headings stay with their first row.
  */
-declare const SWARALIPI_PRINT_CSS = "\n@page { margin: 16mm; }\n@media print {\n  .sw-sheet, .sw-staff { -webkit-print-color-adjust: exact; print-color-adjust: exact; color: #000; }\n  .sw-scroll { overflow: visible !important; }\n  .sw-row { break-inside: avoid; page-break-inside: avoid; }\n  .sw-part-name, .sw-header { break-after: avoid-page; page-break-after: avoid; }\n  .sw-hl { background: none !important; }\n  /* Keep each engraved staff system whole across a page break (the abcjs line\n     is a <div> wrapping the <svg>, so the break rule must sit on the div). */\n  .sw-staff-lines > div { break-inside: avoid; page-break-inside: avoid; }\n  .sw-staff-meta { break-after: avoid-page; page-break-after: avoid; }\n}\n";
+declare const SWARALIPI_PRINT_CSS = "\n@page { margin: 16mm; }\n@media print {\n  .sw-sheet, .sw-staff { -webkit-print-color-adjust: exact; print-color-adjust: exact; color: #000; }\n  .sw-scroll { overflow: visible !important; }\n  .sw-row { break-inside: avoid; page-break-inside: avoid; }\n  .sw-part-name, .sw-header, .sw-lay { break-after: avoid-page; page-break-after: avoid; }\n  .sw-hl { background: none !important; }\n  /* Keep each engraved staff system whole across a page break (the abcjs line\n     is a <div> wrapping the <svg>, so the break rule must sit on the div). */\n  .sw-staff-lines > div { break-inside: avoid; page-break-inside: avoid; }\n  .sw-staff-meta { break-after: avoid-page; page-break-after: avoid; }\n}\n";
 /** Staff-notation (abcjs) wrapper chrome: instrument/tempo header + a fluid
  * SVG. The engraving itself is drawn by abcjs; this only frames it. */
 declare const SWARALIPI_STAFF_CSS = "\n.sw-staff { color: currentColor; }\n.sw-staff-meta { display: flex; gap: 1.25em; align-items: baseline; margin: 0 0 .5em; font-size: .95em; opacity: .85; }\n.sw-staff-instrument { font-weight: 600; }\n.sw-staff-drums { opacity: .75; }\n.sw-staff-tempo { font-variant-numeric: tabular-nums; }\n/* abcjs (oneSvgPerLine) wraps the music into one <div><svg> per system; stack\n   them as short, swaralipi-style lines. abcjs sets a fixed pixel height +\n   overflow:hidden on each wrapper div \u2014 neutralise it so the viewBox'd SVG can\n   scale to the container (and to the print page) instead of being clipped. */\n.sw-staff-lines > div { margin: 0 0 .35em; height: auto !important; overflow: visible !important; }\n/* Fill up to the engraved (staffwidth) size \u2014 shrink to fit a narrow container,\n   but never stretch past natural width (abcToSvg pins per-SVG max-width in px),\n   else a short last system balloons. */\n.sw-staff-lines svg { display: block; width: 100%; height: auto; }\n.sw-staff-missing { padding: 1em; border: 1px dashed currentColor; border-radius: 6px; opacity: .8; font-size: .9em; }\n.sw-staff-title { font-size: 1.15em; font-weight: 700; }\n.sw-staff-subtitle { opacity: .8; font-size: .95em; margin-top: .15em; }\n";
@@ -522,4 +527,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, type Layout, MARKS, MAX_ZOOM, MIN_ZOOM, 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, ZOOM_STEP, abcDuration, abcToSvg, alignRows, buildAbc, buildTaalAbc, cellMatra, composeCluster, defineSwaralipiSheet, docToAbc, fitSwaralipi, 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, LAY_LABELS, type Layout, MARKS, MAX_ZOOM, MIN_ZOOM, 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, ZOOM_STEP, abcDuration, abcToSvg, alignRows, buildAbc, buildTaalAbc, cellMatra, composeCluster, defineSwaralipiSheet, docToAbc, fitSwaralipi, groupRowIntoCells, loadLyricTransliterator, localizeDigits, midiToAbc, printSwaralipi, renderMetaHeader, renderPrintDocument, renderStaffHtml, renderStaffPrintDocument, renderTaalStaffHtml, renderToHtml, resolveArcs };

package/dist/viewer/index.js

@@ -1,5 +1,5 @@
-import { isArcRaw, glideTargets, buildSchedule, drumPattern } from '../chunk-TKTQCUKD.js';
-import { hasKomal, TAALS, graceNotes } from '../chunk-QM4CXKW2.js';
+import { isArcRaw, glideTargets, buildSchedule, drumPattern } from '../chunk-4IVUPMRK.js';
+import { hasKomal, TAALS, graceNotes } from '../chunk-4HNT6OAT.js';
 
 // src/viewer/glyphs.ts
 var SWARABITAN_SHUDDHA = {
@@ -44,6 +44,11 @@ var LABELS = {
   // one taal cycle is exactly what the number counts.
   en: { title: "Song", taal: "Taal", raag: "Raag", avartan: "Cycles", notationBy: "Notator" }
 };
+var LAY_LABELS = {
+  bn: { drut: "\u09A6\u09CD\u09B0\u09C1\u09A4 \u09B2\u09AF\u09BC", madhya: "\u09AE\u09A7\u09CD\u09AF \u09B2\u09AF\u09BC", vilambit: "\u09AC\u09BF\u09B2\u09AE\u09CD\u09AC\u09BF\u09A4 \u09B2\u09AF\u09BC" },
+  hi: { drut: "\u0926\u094D\u0930\u0941\u0924 \u0932\u092F", madhya: "\u092E\u0927\u094D\u092F \u0932\u092F", vilambit: "\u0935\u093F\u0932\u0902\u092C\u093F\u0924 \u0932\u092F" },
+  en: { drut: "Fast (drut)", madhya: "Medium (madhya)", vilambit: "Slow (vilambit)" }
+};
 function composeCluster(letter, opts) {
   const classes = [];
   if (opts.lang === "bn") {
@@ -478,11 +483,18 @@ function renderToHtml(doc, opts = {}) {
   if (opts.showHeader !== false) out.push(renderHeader(doc.meta, ctx));
   out.push(`<div class="sw-scroll"><div class="sw-block" style="${tracks}">`);
   let n = 0;
+  let lay;
   doc.parts.forEach((part, p) => {
     out.push('<section class="sw-part">');
     if (part.name !== void 0)
       out.push(`<h3 class="sw-part-name">${escapeHtml(ctx.tr(part.name))}</h3>`);
-    part.rows.forEach((row, r) => out.push(renderRow(row, p, r, layout.offsets[n++], ctx)));
+    part.rows.forEach((row, r) => {
+      if (row.lay !== void 0 && row.lay !== lay) {
+        lay = row.lay;
+        out.push(`<div class="sw-lay" data-lay="${lay}">${escapeHtml(LAY_LABELS[ctx.lang][lay])}</div>`);
+      }
+      out.push(renderRow(row, p, r, layout.offsets[n++], ctx));
+    });
     out.push("</section>");
   });
   out.push("</div></div></div>");
@@ -574,6 +586,30 @@ ${FONT_FACES}
 
 .sw-part-name { font-size: 0.85em; font-weight: 600; margin: 1em 0 0.2em; opacity: 0.85; }
 
+/* \u09B2\u09AF\u09BC marker: the line where the tempo tier turns over. A full-width rule
+   rather than a row label \u2014 the label track is what the notation columns are
+   measured against, and a six-em word in it would shove the whole sheet right. */
+.sw-lay {
+  grid-column: 1 / -1;
+  display: flex;
+  align-items: center;
+  gap: 0.6em;
+  margin: 0.8em 0 0;
+  /* Floored like the header: fitSwaralipi shrinks the sheet to fit the
+     notation's columns, and this label has none to align. */
+  font-size: max(0.7em, var(--sw-lay-min, 0.72rem));
+  font-weight: 600;
+  letter-spacing: 0.09em;
+  opacity: 0.75;
+  break-after: avoid;
+}
+.sw-lay::after {
+  content: '';
+  flex: 1;
+  height: 1px;
+  background: var(--sw-rule, rgba(128, 128, 128, 0.35));
+}
+
 /* ---- block grid: ONE column set for the whole sheet ----
  * NLTR emits a song as a single html table, which is why its lines align
  * down the page. Same here: .sw-block owns the tracks, every .sw-row
@@ -758,7 +794,7 @@ var SWARALIPI_PRINT_CSS = `
   .sw-sheet, .sw-staff { -webkit-print-color-adjust: exact; print-color-adjust: exact; color: #000; }
   .sw-scroll { overflow: visible !important; }
   .sw-row { break-inside: avoid; page-break-inside: avoid; }
-  .sw-part-name, .sw-header { break-after: avoid-page; page-break-after: avoid; }
+  .sw-part-name, .sw-header, .sw-lay { break-after: avoid-page; page-break-after: avoid; }
   .sw-hl { background: none !important; }
   /* Keep each engraved staff system whole across a page break (the abcjs line
      is a <div> wrapping the <svg>, so the break rule must sit on the div). */
@@ -911,7 +947,7 @@ function resolveDrumTaal(doc) {
   return id !== void 0 && id in TAALS ? TAALS[id] : { numBeats: 4, sam: 0 };
 }
 function docToAbc(doc, opts = {}) {
-  const schedule = buildSchedule(doc, { tonic: opts.tonic, baseOctave: opts.baseOctave });
+  const schedule = buildSchedule(doc, { tonic: opts.tonic, baseOctave: opts.baseOctave, lay: false });
   const bpm = opts.bpm ?? doc.meta.bpm ?? 90;
   const beatsPerBar = opts.beatsPerBar ?? doc.meta.taal?.numBeats ?? 4;
   const drums = opts.drums ? drumPattern(resolveDrumTaal(doc)) : void 0;
@@ -975,7 +1011,7 @@ async function abcToSvg(abc, opts = {}, notePaths) {
 async function renderStaffHtml(doc, opts = {}) {
   const bpm = opts.bpm ?? doc.meta.bpm ?? 90;
   const abc = docToAbc(doc, { ...opts, bpm });
-  const schedule = buildSchedule(doc, { tonic: opts.tonic, baseOctave: opts.baseOctave });
+  const schedule = buildSchedule(doc, { tonic: opts.tonic, baseOctave: opts.baseOctave, lay: false });
   const engraved = await abcToSvg(abc, opts, eventPaths(schedule));
   const lines = engraved.includes("sw-staff-missing") ? engraved : `<div class="sw-staff-lines">${engraved}</div>`;
   const header = opts.showHeader === false ? "" : renderMetaHeader(doc.meta, opts.headerLang ?? "en", opts.transliterate);
@@ -1382,6 +1418,6 @@ function defineSwaralipiSheet(tagName = "swaralipi-sheet") {
   return ctor;
 }
 
-export { DEFAULT_NOTATOR, DEFAULT_WATERMARK, DIGITS, LABELS, MARKS, MAX_ZOOM, MIN_ZOOM, NOTATION_FONT_URLS, SWARALIPI_CSS, SWARALIPI_PRINT_CSS, SWARALIPI_STAFF_CSS, ZOOM_STEP, abcDuration, abcToSvg, alignRows, buildAbc, buildTaalAbc, cellMatra, composeCluster, defineSwaralipiSheet, docToAbc, fitSwaralipi, groupRowIntoCells, loadLyricTransliterator, localizeDigits, midiToAbc, printSwaralipi, renderMetaHeader, renderPrintDocument, renderStaffHtml, renderStaffPrintDocument, renderTaalStaffHtml, renderToHtml, resolveArcs };
+export { DEFAULT_NOTATOR, DEFAULT_WATERMARK, DIGITS, LABELS, LAY_LABELS, MARKS, MAX_ZOOM, MIN_ZOOM, NOTATION_FONT_URLS, SWARALIPI_CSS, SWARALIPI_PRINT_CSS, SWARALIPI_STAFF_CSS, ZOOM_STEP, abcDuration, abcToSvg, alignRows, buildAbc, buildTaalAbc, cellMatra, composeCluster, defineSwaralipiSheet, docToAbc, fitSwaralipi, groupRowIntoCells, loadLyricTransliterator, localizeDigits, midiToAbc, printSwaralipi, renderMetaHeader, renderPrintDocument, renderStaffHtml, renderStaffPrintDocument, renderTaalStaffHtml, renderToHtml, resolveArcs };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map