@ugfoundation/swaralipi-js 0.14.1 → 0.15.0

package/dist/viewer/index.d.cts

@@ -1,6 +1,6 @@
 import { O as Octave, a as SvaraLetter, N as Note, M as Meta, S as Swaralipi, T as Taal } from '../schema-DZag9qkF.cjs';
 import { L as Lay } from '../lay-CXhC-HRO.cjs';
-import { D as DrumVoice, S as Schedule, P as PlayEvent } from '../instruments-DTIuTlda.cjs';
+import { D as DrumVoice, S as Schedule, P as PlayEvent } from '../instruments-C-KtHQiW.cjs';
 import 'zod';
 import 'tone';
 
@@ -341,7 +341,9 @@ interface AbcMeter {
  * Bar lines are inserted every `beatsPerBar` matra (= one তাল cycle, so an ABC
  * measure is one আবর্তন). This is what lets abcjs **wrap into short systems** —
  * it only breaks lines at bar lines. `M:` is set to match so the notes-per-bar
- * check-out. The tempo (`Q:`) rides the header.
+ * check-out. The tempo (`Q:`) rides the header. A pickup (the schedule's
+ * `samBeat`) is a short first bar, so every bar line after it is a সম — the
+ * anacrusis as ABC writes it: whatever stands before the first `|`.
  *
  * `drums`, if given, is the taal's per-beat `drumPattern()` — a second
  * `V:2 clef=perc` percussion staff is added below the melody, cycling that

package/dist/viewer/index.d.ts

@@ -1,6 +1,6 @@
 import { O as Octave, a as SvaraLetter, N as Note, M as Meta, S as Swaralipi, T as Taal } from '../schema-DZag9qkF.js';
 import { L as Lay } from '../lay-CWlEhImP.js';
-import { D as DrumVoice, S as Schedule, P as PlayEvent } from '../instruments-NcUb0ozc.js';
+import { D as DrumVoice, S as Schedule, P as PlayEvent } from '../instruments-SoUQBZNd.js';
 import 'zod';
 import 'tone';
 
@@ -341,7 +341,9 @@ interface AbcMeter {
  * Bar lines are inserted every `beatsPerBar` matra (= one তাল cycle, so an ABC
  * measure is one আবর্তন). This is what lets abcjs **wrap into short systems** —
  * it only breaks lines at bar lines. `M:` is set to match so the notes-per-bar
- * check-out. The tempo (`Q:`) rides the header.
+ * check-out. The tempo (`Q:`) rides the header. A pickup (the schedule's
+ * `samBeat`) is a short first bar, so every bar line after it is a সম — the
+ * anacrusis as ABC writes it: whatever stands before the first `|`.
  *
  * `drums`, if given, is the taal's per-beat `drumPattern()` — a second
  * `V:2 clef=perc` percussion staff is added below the melody, cycling that

package/dist/viewer/index.js

@@ -1,6 +1,6 @@
-import { isArcRaw, glideTargets, buildSchedule, drumPattern } from '../chunk-GIOGYJMM.js';
+import { isArcRaw, glideTargets, buildSchedule, drumPattern } from '../chunk-SPZO4573.js';
 import '../chunk-BSZ3WQUP.js';
-import { hasKomal, isTaalFerta, sameTaal, TAALS, graceNotes } from '../chunk-KOHSKHXI.js';
+import { hasKomal, isTaalFerta, sameTaal, TAALS, graceNotes } from '../chunk-K73Y46WU.js';
 
 // src/viewer/glyphs.ts
 var SWARABITAN_SHUDDHA = {
@@ -1003,8 +1003,8 @@ function buildAbc(schedule, lyricOf, opts) {
   let beatsPerBar = barLen(meters[0]);
   const tokens = [];
   const words = [];
-  let barPos = 0;
   const EPS2 = 1e-6;
+  let barPos = (beatsPerBar - schedule.samBeat % beatsPerBar) % beatsPerBar;
   const advance = (dur) => {
     barPos += dur;
     while (barPos >= beatsPerBar - EPS2) {
@@ -1052,7 +1052,7 @@ function buildAbc(schedule, lyricOf, opts) {
   if (withDrums) {
     lines.push("V:1", melodyBody);
     if (opts.lyrics && words.some((w) => w !== "*" && w !== "|")) lines.push(`w: ${words.join(" ")}`);
-    lines.push("V:2 clef=perc stem=up", buildDrumVoice(schedule.totalBeats, meters));
+    lines.push("V:2 clef=perc stem=up", buildDrumVoice(schedule.totalBeats, meters, schedule.samBeat));
   } else {
     lines.push(melodyBody);
     if (opts.lyrics && words.some((w) => w !== "*" && w !== "|")) lines.push(`w: ${words.join(" ")}`);
@@ -1081,7 +1081,7 @@ function percMapLines(voices) {
   }
   return lines;
 }
-function buildDrumVoice(totalBeats, meters) {
+function buildDrumVoice(totalBeats, meters, pickup = 0) {
   const tokens = [];
   meters.forEach((m, i) => {
     const bpb = barLen(m);
@@ -1090,7 +1090,12 @@ function buildDrumVoice(totalBeats, meters) {
       if (bpb !== barLen(meters[i - 1])) tokens.push(`[M:${ratioMeter(bpb)}]`);
     }
     const end = meters[i + 1]?.beat ?? Math.max(1, Math.ceil(totalBeats));
-    const n = Math.ceil(end - m.beat - 1e-6);
+    let from = m.beat;
+    if (i === 0 && pickup > 0 && pickup < end) {
+      tokens.push(`z${abcDuration(pickup)}`, "|");
+      from += pickup;
+    }
+    const n = Math.ceil(end - from - 1e-6);
     for (let beat = 0; beat < n; beat++) {
       tokens.push(m.drums?.length ? DRUM_ABC[m.drums[beat % m.drums.length]].note : "z");
       if ((beat + 1) % bpb === 0) tokens.push("|");