@ugfoundation/swaralipi-js 0.8.2 → 0.9.1

package/dist/player/index.d.cts

@@ -1,8 +1,8 @@
-import { S as Swaralipi, T as Taal, O as Octave, a as SvaraLetter, N as Note } from '../schema-DGA_bNVZ.cjs';
-import { a as LaySpeeds, T as TaalId } from '../lay-Csa4CD46.cjs';
-export { b as LAYS, c as LAY_SPEEDS, L as Lay, p as printedLay, r as resolveLaySpeeds, d as rowLay } from '../lay-Csa4CD46.cjs';
-import { I as InstrumentId, a as InstrumentDef, S as Schedule, D as DrumVoice } from '../schedule-B_UaluBi.cjs';
-export { A as ARC_RAW_RE, b as DEFAULT_SOUNDS_BASE, c as DRUM_KIT_BASE, G as GlideLeg, d as INSTRUMENTS, M as MEEND_HOLD, P as PlayEvent, e as SALAMANDER_BASE, f as SAMPLED_TAALS, g as ScheduleOptions, T as TABLA_BPMS, h as TABLA_VARIATIONS, i as TONEJS_INSTRUMENTS_BASE, j as TempoSegment, k as ToneModule, l as buildSchedule, m as createBuffers, n as drumPattern, o as glideTargets, p as instrumentSampleUrl, q as isArcRaw, r as meendContinuations, s as nearestSampleKey, t as nearestTablaBpm, u as normalizeBase, v as probeUrl, w as quantizeLoopEnd, x as santoorUrls, y as subsetUrls, z as tablaBpms, B as tablaUrl, C as triggerGlide } from '../schedule-B_UaluBi.cjs';
+import { S as Swaralipi, T as Taal, O as Octave, a as SvaraLetter, N as Note } from '../schema-Cf_epUIC.cjs';
+import { a as LaySpeeds, T as TaalId } from '../lay-CfDlPhH2.cjs';
+export { b as LAYS, c as LAY_SPEEDS, L as Lay, p as printedLay, r as resolveLaySpeeds, d as rowLay } from '../lay-CfDlPhH2.cjs';
+import { I as InstrumentId, a as InstrumentDef, S as Schedule, D as DrumVoice, T as TempoSegment } from '../schedule-CU-VECDH.cjs';
+export { A as ARC_RAW_RE, b as DEFAULT_SOUNDS_BASE, c as DRUM_KIT_BASE, G as GRACE_STEP, d as GlideLeg, e as INSTRUMENTS, M as MEEND_HOLD, P as PlayEvent, f as SALAMANDER_BASE, g as SAMPLED_TAALS, h as ScheduleOptions, i as TABLA_BPMS, j as TABLA_VARIATIONS, k as TONEJS_INSTRUMENTS_BASE, l as ToneModule, m as buildSchedule, n as createBuffers, o as drumPattern, p as glideTargets, q as graceTouches, r as instrumentSampleUrl, s as isArcRaw, t as meendContinuations, u as nearestSampleKey, v as nearestTablaBpm, w as normalizeBase, x as probeUrl, y as quantizeLoopEnd, z as santoorUrls, B as subsetUrls, C as tablaBpms, E as tablaUrl, F as triggerGlide } from '../schedule-CU-VECDH.cjs';
 import 'zod';
 import 'tone';
 
@@ -280,13 +280,15 @@ interface MidiExportResult {
 }
 /**
  * Encode a schedule to a Standard MIDI File. Melody rides channel 0; when
- * `drums` is given, its per-beat voices ride a second GM channel-10 track
- * (the file becomes format 1). Pure — no Tone, no browser — directly testable.
+ * `drums` is given, its per-matra voices ride a second GM channel-10 track
+ * (the file becomes format 1). `drums` is one pattern for the whole song, or a
+ * function picking each লয় / তাল segment's own (তালফেরতা; `undefined` = rest).
+ * Pure — no Tone, no browser — directly testable.
  */
 declare function encodeMidi(schedule: Schedule, opts: {
     bpm: number;
     name?: string;
-    drums?: DrumVoice[];
+    drums?: DrumVoice[] | ((seg: TempoSegment) => DrumVoice[] | undefined);
 }): Uint8Array;
 /**
  * Export a swaralipi doc to a `.mid` Blob (melody voice only). No browser APIs
@@ -340,4 +342,4 @@ declare function sampleFileName(midi: number): string;
  */
 declare function sCurve(x: number, steepness?: number): number;
 
-export { type AudioExportOptions, type AudioExportResult, type AudioFormat, type BindSheetOptions, DrumVoice, InstrumentDef, InstrumentId, LaySpeeds, type MidiExportOptions, type MidiExportResult, OCTAVE_OFFSET, type PlayerOptions, type PlayerState, type RhythmMode, SHUDDHA, Schedule, SwaralipiPlayer, encodeMidi, encodeMp3, encodeWav, exportAudio, exportMidi, midiToSampleName, parseTonic, sCurve, sampleFileName, svaraSemitone, svaraToMidi };
+export { type AudioExportOptions, type AudioExportResult, type AudioFormat, type BindSheetOptions, DrumVoice, InstrumentDef, InstrumentId, LaySpeeds, type MidiExportOptions, type MidiExportResult, OCTAVE_OFFSET, type PlayerOptions, type PlayerState, type RhythmMode, SHUDDHA, Schedule, SwaralipiPlayer, TempoSegment, encodeMidi, encodeMp3, encodeWav, exportAudio, exportMidi, midiToSampleName, parseTonic, sCurve, sampleFileName, svaraSemitone, svaraToMidi };

package/dist/player/index.d.ts

@@ -1,8 +1,8 @@
-import { S as Swaralipi, T as Taal, O as Octave, a as SvaraLetter, N as Note } from '../schema-DGA_bNVZ.js';
-import { a as LaySpeeds, T as TaalId } from '../lay-Ct9ky_EE.js';
-export { b as LAYS, c as LAY_SPEEDS, L as Lay, p as printedLay, r as resolveLaySpeeds, d as rowLay } from '../lay-Ct9ky_EE.js';
-import { I as InstrumentId, a as InstrumentDef, S as Schedule, D as DrumVoice } from '../schedule-CdILTNsk.js';
-export { A as ARC_RAW_RE, b as DEFAULT_SOUNDS_BASE, c as DRUM_KIT_BASE, G as GlideLeg, d as INSTRUMENTS, M as MEEND_HOLD, P as PlayEvent, e as SALAMANDER_BASE, f as SAMPLED_TAALS, g as ScheduleOptions, T as TABLA_BPMS, h as TABLA_VARIATIONS, i as TONEJS_INSTRUMENTS_BASE, j as TempoSegment, k as ToneModule, l as buildSchedule, m as createBuffers, n as drumPattern, o as glideTargets, p as instrumentSampleUrl, q as isArcRaw, r as meendContinuations, s as nearestSampleKey, t as nearestTablaBpm, u as normalizeBase, v as probeUrl, w as quantizeLoopEnd, x as santoorUrls, y as subsetUrls, z as tablaBpms, B as tablaUrl, C as triggerGlide } from '../schedule-CdILTNsk.js';
+import { S as Swaralipi, T as Taal, O as Octave, a as SvaraLetter, N as Note } from '../schema-Cf_epUIC.js';
+import { a as LaySpeeds, T as TaalId } from '../lay-CZIzR9cM.js';
+export { b as LAYS, c as LAY_SPEEDS, L as Lay, p as printedLay, r as resolveLaySpeeds, d as rowLay } from '../lay-CZIzR9cM.js';
+import { I as InstrumentId, a as InstrumentDef, S as Schedule, D as DrumVoice, T as TempoSegment } from '../schedule-BaovCtmf.js';
+export { A as ARC_RAW_RE, b as DEFAULT_SOUNDS_BASE, c as DRUM_KIT_BASE, G as GRACE_STEP, d as GlideLeg, e as INSTRUMENTS, M as MEEND_HOLD, P as PlayEvent, f as SALAMANDER_BASE, g as SAMPLED_TAALS, h as ScheduleOptions, i as TABLA_BPMS, j as TABLA_VARIATIONS, k as TONEJS_INSTRUMENTS_BASE, l as ToneModule, m as buildSchedule, n as createBuffers, o as drumPattern, p as glideTargets, q as graceTouches, r as instrumentSampleUrl, s as isArcRaw, t as meendContinuations, u as nearestSampleKey, v as nearestTablaBpm, w as normalizeBase, x as probeUrl, y as quantizeLoopEnd, z as santoorUrls, B as subsetUrls, C as tablaBpms, E as tablaUrl, F as triggerGlide } from '../schedule-BaovCtmf.js';
 import 'zod';
 import 'tone';
 
@@ -280,13 +280,15 @@ interface MidiExportResult {
 }
 /**
  * Encode a schedule to a Standard MIDI File. Melody rides channel 0; when
- * `drums` is given, its per-beat voices ride a second GM channel-10 track
- * (the file becomes format 1). Pure — no Tone, no browser — directly testable.
+ * `drums` is given, its per-matra voices ride a second GM channel-10 track
+ * (the file becomes format 1). `drums` is one pattern for the whole song, or a
+ * function picking each লয় / তাল segment's own (তালফেরতা; `undefined` = rest).
+ * Pure — no Tone, no browser — directly testable.
  */
 declare function encodeMidi(schedule: Schedule, opts: {
     bpm: number;
     name?: string;
-    drums?: DrumVoice[];
+    drums?: DrumVoice[] | ((seg: TempoSegment) => DrumVoice[] | undefined);
 }): Uint8Array;
 /**
  * Export a swaralipi doc to a `.mid` Blob (melody voice only). No browser APIs
@@ -340,4 +342,4 @@ declare function sampleFileName(midi: number): string;
  */
 declare function sCurve(x: number, steepness?: number): number;
 
-export { type AudioExportOptions, type AudioExportResult, type AudioFormat, type BindSheetOptions, DrumVoice, InstrumentDef, InstrumentId, LaySpeeds, type MidiExportOptions, type MidiExportResult, OCTAVE_OFFSET, type PlayerOptions, type PlayerState, type RhythmMode, SHUDDHA, Schedule, SwaralipiPlayer, encodeMidi, encodeMp3, encodeWav, exportAudio, exportMidi, midiToSampleName, parseTonic, sCurve, sampleFileName, svaraSemitone, svaraToMidi };
+export { type AudioExportOptions, type AudioExportResult, type AudioFormat, type BindSheetOptions, DrumVoice, InstrumentDef, InstrumentId, LaySpeeds, type MidiExportOptions, type MidiExportResult, OCTAVE_OFFSET, type PlayerOptions, type PlayerState, type RhythmMode, SHUDDHA, Schedule, SwaralipiPlayer, TempoSegment, encodeMidi, encodeMp3, encodeWav, exportAudio, exportMidi, midiToSampleName, parseTonic, sCurve, sampleFileName, svaraSemitone, svaraToMidi };

package/dist/player/index.js

@@ -1,7 +1,7 @@
-import { DEFAULT_SOUNDS_BASE, INSTRUMENTS, SAMPLED_TAALS, buildSchedule, quantizeLoopEnd, instrumentSampleUrl, probeUrl, normalizeBase, nearestTablaBpm, tablaBpms, midiToSampleName, glideTargets, triggerGlide, createSampler, createBuffers, drumPattern, tablaShiftSemitones, tablaUrl, TABLA_GRAIN_OVERLAP_SEC, TABLA_GRAIN_SEC, createDrumKit, createMetronome, TANPURA_PCS, createTanpura, parseTonic, MEEND_HOLD, sCurve } from '../chunk-4IVUPMRK.js';
-export { ARC_RAW_RE, DEFAULT_SOUNDS_BASE, DRUM_KIT_BASE, INSTRUMENTS, MEEND_HOLD, OCTAVE_OFFSET, SALAMANDER_BASE, SAMPLED_TAALS, SHUDDHA, TABLA_BPMS, TABLA_VARIATIONS, TONEJS_INSTRUMENTS_BASE, buildSchedule, createBuffers, drumPattern, glideTargets, instrumentSampleUrl, isArcRaw, meendContinuations, midiToSampleName, nearestSampleKey, nearestTablaBpm, normalizeBase, parseTonic, probeUrl, quantizeLoopEnd, sCurve, sampleFileName, santoorUrls, subsetUrls, svaraSemitone, svaraToMidi, tablaBpms, tablaUrl, triggerGlide } from '../chunk-4IVUPMRK.js';
-import { TAALS } from '../chunk-4HNT6OAT.js';
-export { LAYS, LAY_SPEEDS, printedLay, resolveLaySpeeds, rowLay } from '../chunk-4HNT6OAT.js';
+import { DEFAULT_SOUNDS_BASE, INSTRUMENTS, SAMPLED_TAALS, buildSchedule, quantizeLoopEnd, instrumentSampleUrl, probeUrl, normalizeBase, nearestTablaBpm, tablaBpms, graceTouches, midiToSampleName, glideTargets, triggerGlide, createSampler, createBuffers, tablaShiftSemitones, tablaUrl, TABLA_GRAIN_OVERLAP_SEC, TABLA_GRAIN_SEC, createDrumKit, drumPattern, createMetronome, TANPURA_PCS, createTanpura, parseTonic, GRACE_STEP, MEEND_HOLD, sCurve } from '../chunk-SEN266BY.js';
+export { ARC_RAW_RE, DEFAULT_SOUNDS_BASE, DRUM_KIT_BASE, GRACE_STEP, INSTRUMENTS, MEEND_HOLD, OCTAVE_OFFSET, SALAMANDER_BASE, SAMPLED_TAALS, SHUDDHA, TABLA_BPMS, TABLA_VARIATIONS, TONEJS_INSTRUMENTS_BASE, buildSchedule, createBuffers, drumPattern, glideTargets, graceTouches, instrumentSampleUrl, isArcRaw, meendContinuations, midiToSampleName, nearestSampleKey, nearestTablaBpm, normalizeBase, parseTonic, probeUrl, quantizeLoopEnd, sCurve, sampleFileName, santoorUrls, subsetUrls, svaraSemitone, svaraToMidi, tablaBpms, tablaUrl, triggerGlide } from '../chunk-SEN266BY.js';
+import { TAALS } from '../chunk-MYVIQU4O.js';
+export { LAYS, LAY_SPEEDS, printedLay, resolveLaySpeeds, rowLay } from '../chunk-MYVIQU4O.js';
 
 // src/player/player.ts
 var STOP_FADE_SEC = 0.5;
@@ -14,7 +14,7 @@ function midiRange(schedule) {
   let lo = Infinity;
   let hi = -Infinity;
   for (const ev of schedule.events) {
-    for (const m of [ev.midi, ...ev.kan]) {
+    for (const m of [ev.midi, ...ev.kan, ...ev.resh]) {
       if (m !== null) {
         if (m < lo) lo = m;
         if (m > hi) hi = m;
@@ -357,16 +357,26 @@ var SwaralipiPlayer = class {
   #emitHighlight(path) {
     this.#opts.onHighlight?.(path);
   }
-  /** The tabla variation to play: taal-mode taal's, the doc's own (auto mode),
-   * else none — an explicit setTaal override plays the taal's default variation. */
-  #variation() {
+  /** The taal one accompaniment segment plays: taal mode's, an explicit
+   * setTaal override (pinned across the whole song, তালফেরতা included), else
+   * the segment's own. `null` = a মুক্তছন্দ passage. */
+  #segmentTaal(seg) {
+    if (this.#taal !== void 0) return this.#taal;
+    if (!this.#taalAuto && this.#taalOverride !== void 0) return TAALS[this.#taalOverride];
+    return seg.taal;
+  }
+  /** The tabla variation to play: taal-mode taal's, the segment's own (auto
+   * mode), else none — an explicit setTaal override plays the default variation. */
+  #variation(taal) {
     if (this.#taal !== void 0) return this.#taal.variation;
-    return this.#taalAuto ? this.#doc?.meta.taal?.variation : void 0;
+    return this.#taalAuto ? taal?.variation : void 0;
   }
   /** Resolve the active taal id: taal mode's taal, an explicit override, else
-   * the doc's — but only when it names a sampled taal. */
+   * the doc's opening one (a তালফেরতা doc may carry it on its first row) — but
+   * only when it names a sampled taal. */
   #taalId() {
-    const id = this.#taal?.id ?? (!this.#taalAuto && this.#taalOverride !== void 0 ? this.#taalOverride : this.#doc?.meta.taal?.id);
+    const opening = this.#doc?.parts[0]?.rows[0]?.taal || this.#doc?.meta.taal;
+    const id = this.#taal?.id ?? (!this.#taalAuto && this.#taalOverride !== void 0 ? this.#taalOverride : opening?.id);
     return id !== void 0 && id in TAALS ? id : void 0;
   }
   /** Resolve an instrument id to its def (custom overrides built-ins; the
@@ -457,14 +467,15 @@ var SwaralipiPlayer = class {
     const mediaLead = Math.min(MEDIA_LEAD_SEC, spb);
     schedule.events.forEach((ev, i) => {
       const at = ev.beat * spb + shift;
+      if (ev.glide !== true) {
+        for (const g of graceTouches(ev)) {
+          const graceName = midiToSampleName(g.midi);
+          transport.scheduleOnce((time) => melody.triggerAttackRelease(graceName, spb * 0.4, time), Math.max(g.beat * spb + shift, 0));
+        }
+      }
       if (ev.midi !== null && ev.glide !== true) {
         const name = midiToSampleName(ev.midi);
         const dur = Math.max(ev.durationBeats * spb, 0.05);
-        ev.kan.forEach((k, gi) => {
-          const kanName = midiToSampleName(k);
-          const lead = spb * 0.12 * (ev.kan.length - gi);
-          transport.scheduleOnce((time) => melody.triggerAttackRelease(kanName, spb * 0.4, time), Math.max(at - lead, 0));
-        });
         const targets = glide !== void 0 ? glideTargets(schedule.events, i) : [];
         if (targets.length > 0 && glide !== void 0) {
           const last = targets[targets.length - 1];
@@ -561,34 +572,35 @@ var SwaralipiPlayer = class {
     return entry;
   }
   /**
-   * Accompaniment, one লয় segment at a time. A tempo change under the melody
-   * is a real tempo change under the drum: the tabla loop is rebuilt at the
-   * segment's own bpm — its own recorded file when the set has one at that
+   * Accompaniment, one লয় / তাল segment at a time. A tempo change under the
+   * melody is a real tempo change under the drum: the tabla loop is rebuilt at
+   * the segment's own bpm — its own recorded file when the set has one at that
    * tempo, else the nearest file time-stretched by `GrainPlayer` (which
    * stretches *without* transposing, unlike a plain playbackRate) — and the
-   * click / drum / drone patterns re-space their interval. A document with no
-   * লয় marks has exactly one segment, so this is the old single-loop path.
+   * click / drum / drone patterns re-space their interval. A তালফেরতা swaps the
+   * theka the same way: each segment loops its own taal's file (or pattern, or
+   * click cycle), and a মুক্তছন্দ segment rests. A document with neither mark
+   * has exactly one segment, so this is the old single-loop path.
    */
   #buildRhythm(Tone, transport, base, spb, segments, shift) {
     this.#disposeTabla();
     const master = this.#ensureMaster(Tone);
-    const taalId = this.#taalId();
-    const wantsTabla = this.#opts.rhythm === "tabla" && taalId !== void 0 && SAMPLED_TAALS.has(taalId) && base !== void 0;
-    if (!wantsTabla && this.#opts.rhythm !== "drums" && (this.#opts.rhythm === "none" || base === void 0)) return;
-    const taal = this.#taal ?? (taalId !== void 0 ? TAALS[taalId] : this.#doc?.meta.taal) ?? { numBeats: 4, sam: 0 };
-    const pattern = this.#opts.rhythm === "drums" ? drumPattern(taal) : [];
-    const cycle = this.#taal?.numBeats ?? this.#doc?.meta.taal?.numBeats ?? 4;
+    const rhythm = this.#opts.rhythm;
+    if (rhythm === "none" || base === void 0 && rhythm !== "drums") return;
     segments.forEach((seg, i) => {
+      const own = this.#segmentTaal(seg);
+      if (own === null) return;
+      const taalId = own !== void 0 && own.id in TAALS ? own.id : void 0;
       const from = i === 0 ? 0 : seg.beat * spb + shift;
       const to = i === segments.length - 1 ? Infinity : seg.endBeat * spb + shift;
       const beatSec = spb / seg.scale;
       const span = to === Infinity ? void 0 : to - from;
-      if (wantsTabla) {
+      if (rhythm === "tabla" && taalId !== void 0 && SAMPLED_TAALS.has(taalId) && base !== void 0) {
         const bpm = 60 / beatSec;
         const fileBpm = nearestTablaBpm(bpm, tablaBpms(taalId));
         const rate = bpm / fileBpm;
         const semis = tablaShiftSemitones(this.#tonicSemitone());
-        const url = tablaUrl(base, taalId, fileBpm, this.#variation());
+        const url = tablaUrl(base, taalId, fileBpm, this.#variation(own));
         const loop = (rate === 1 && semis === 0 ? new Tone.Player({ url, loop: true }) : new Tone.GrainPlayer({
           url,
           loop: true,
@@ -610,9 +622,10 @@ var SwaralipiPlayer = class {
         this.#tabla.push({ loop, fileSpb: 60 / fileBpm });
         return;
       }
-      if (this.#opts.rhythm === "drums") {
+      if (rhythm === "drums") {
         this.#drums ??= createDrumKit(Tone).connect(master);
         const drums = this.#drums;
+        const pattern = drumPattern(this.#taal ?? (taalId !== void 0 ? TAALS[taalId] : own) ?? { numBeats: 4, sam: 0 });
         let beat2 = 0;
         this.#scheduleIds.push(
           transport.scheduleRepeat(
@@ -630,6 +643,7 @@ var SwaralipiPlayer = class {
       }
       this.#metronome ??= createMetronome(Tone, base).connect(master);
       const metro = this.#metronome;
+      const cycle = (this.#taal ?? seg.taal)?.numBeats ?? 4;
       let beat = 0;
       this.#scheduleIds.push(
         transport.scheduleRepeat(
@@ -688,7 +702,7 @@ function midiRange2(schedule) {
   let lo = Infinity;
   let hi = -Infinity;
   for (const ev of schedule.events) {
-    for (const m of [ev.midi, ...ev.kan]) {
+    for (const m of [ev.midi, ...ev.kan, ...ev.resh]) {
       if (m !== null) {
         if (m < lo) lo = m;
         if (m > hi) hi = m;
@@ -705,7 +719,7 @@ function pickDef(id, o) {
   return def;
 }
 function resolveTaal(doc, taal) {
-  const id = taal !== void 0 && taal !== "auto" ? taal : doc.meta.taal?.id;
+  const id = taal !== void 0 && taal !== "auto" ? taal : (doc.parts[0]?.rows[0]?.taal || doc.meta.taal)?.id;
   return id !== void 0 && id in TAALS ? id : void 0;
 }
 function safeName(title) {
@@ -728,7 +742,7 @@ async function exportAudio(doc, options = {}) {
   });
   const range = midiRange2(schedule);
   const taalId = resolveTaal(doc, options.taal);
-  const variation = options.taal === void 0 || options.taal === "auto" ? doc.meta.taal?.variation : void 0;
+  const pinned = options.taal !== void 0 && options.taal !== "auto" && taalId !== void 0 ? TAALS[taalId] : void 0;
   const usesTabla = rhythm === "tabla" && taalId !== void 0 && SAMPLED_TAALS.has(taalId) && !!base;
   const reqBpm = options.bpm ?? doc.meta.bpm ?? 90;
   const bpm = usesTabla && taalId ? nearestTablaBpm(reqBpm, tablaBpms(taalId)) : reqBpm;
@@ -745,14 +759,14 @@ async function exportAudio(doc, options = {}) {
         const sampler = createSampler(Tone, def, base, range).connect(master);
         const glide = schedule.events.some((ev) => ev.glide === true) ? createBuffers(Tone, def, base, range) : void 0;
         schedule.events.forEach((ev, i) => {
-          if (ev.midi === null || ev.glide === true) return;
+          if (ev.glide === true) return;
+          for (const g of graceTouches(ev)) {
+            const name = midiToSampleName(g.midi);
+            transport.scheduleOnce((t) => sampler.triggerAttackRelease(name, spb * 0.4, t), Math.max(g.beat * spb + shift, 0));
+          }
+          if (ev.midi === null) return;
           const at = ev.beat * spb + shift;
           const dur = Math.max(ev.durationBeats * spb, 0.05);
-          ev.kan.forEach((k, gi) => {
-            const name = midiToSampleName(k);
-            const lead = spb * 0.12 * (ev.kan.length - gi);
-            transport.scheduleOnce((t) => sampler.triggerAttackRelease(name, spb * 0.4, t), Math.max(at - lead, 0));
-          });
           const targets = glide !== void 0 ? glideTargets(schedule.events, i) : [];
           if (targets.length > 0 && glide !== void 0) {
             const last = targets[targets.length - 1];
@@ -780,22 +794,22 @@ async function exportAudio(doc, options = {}) {
       }
       const tablas = [];
       if (rhythm !== "none" && base) {
-        const taal = taalId !== void 0 ? TAALS[taalId] : doc.meta.taal ?? { numBeats: 4, sam: 0 };
-        const pattern = rhythm === "drums" ? drumPattern(taal) : [];
         const drums = rhythm === "drums" ? createDrumKit(Tone).connect(master) : void 0;
-        const metro = rhythm !== "drums" && !usesTabla ? createMetronome(Tone, base).connect(master) : void 0;
-        const cycle = taalId !== void 0 ? TAALS[taalId].numBeats : doc.meta.taal?.numBeats ?? 4;
+        let metro;
         const semis = tablaShiftSemitones(parseTonic(options.tonic ?? doc.meta.tonic));
         schedule.tempo.forEach((seg, i) => {
+          const own = pinned ?? seg.taal;
+          if (own === null) return;
+          const segId = own !== void 0 && own.id in TAALS ? own.id : void 0;
           const from = i === 0 ? 0 : seg.beat * spb + shift;
           const to = i === schedule.tempo.length - 1 ? Infinity : seg.endBeat * spb + shift;
           const beatSec = spb / seg.scale;
           const span = to === Infinity ? void 0 : to - from;
-          if (usesTabla && taalId) {
+          if (rhythm === "tabla" && segId !== void 0 && SAMPLED_TAALS.has(segId)) {
             const segBpm = 60 / beatSec;
-            const fileBpm = nearestTablaBpm(segBpm, tablaBpms(taalId));
+            const fileBpm = nearestTablaBpm(segBpm, tablaBpms(segId));
             const rate = segBpm / fileBpm;
-            const url = tablaUrl(base, taalId, fileBpm, variation);
+            const url = tablaUrl(base, segId, fileBpm, pinned === void 0 ? own?.variation : void 0);
             const loop = (rate === 1 && semis === 0 ? new Tone.Player({ url, loop: true }) : new Tone.GrainPlayer({
               url,
               loop: true,
@@ -814,6 +828,7 @@ async function exportAudio(doc, options = {}) {
             }
             tablas.push({ loop, fileSpb: 60 / fileBpm });
           } else if (drums !== void 0) {
+            const pattern = drumPattern(segId !== void 0 ? TAALS[segId] : own ?? { numBeats: 4, sam: 0 });
             let beat = 0;
             transport.scheduleRepeat(
               (time) => {
@@ -825,12 +840,14 @@ async function exportAudio(doc, options = {}) {
               from,
               span
             );
-          } else if (metro !== void 0) {
+          } else {
+            const click = metro ??= createMetronome(Tone, base).connect(master);
+            const cycle = own?.numBeats ?? 4;
             let beat = 0;
             transport.scheduleRepeat(
               (time) => {
-                metro.volume.setValueAtTime(beat % cycle === 0 ? 0 : -8, time);
-                metro.start(time);
+                click.volume.setValueAtTime(beat % cycle === 0 ? 0 : -8, time);
+                click.start(time);
                 beat += 1;
               },
               beatSec,
@@ -1025,17 +1042,17 @@ function encodeMidi(schedule, opts) {
   const hasGlide = schedule.events.some((ev) => ev.glide === true);
   if (hasGlide) melody.push(...bendRangeSetup());
   schedule.events.forEach((ev, i) => {
-    if (ev.midi === null || ev.glide === true) return;
+    if (ev.glide === true) return;
+    for (const g of graceTouches(ev)) {
+      const on = Math.max(Math.round(g.beat * PPQ), 0);
+      melody.push({ tick: on, on: true, note: g.midi, vel: 70, ch: 0 });
+      melody.push({ tick: Math.max(on + 1, Math.round((g.beat + GRACE_STEP) * PPQ)), on: false, note: g.midi, vel: 0, ch: 0 });
+    }
+    if (ev.midi === null) return;
     const start = Math.round(ev.beat * PPQ);
     const targets = glideTargets(schedule.events, i);
     const last = targets[targets.length - 1] ?? ev;
     const end = Math.max(Math.round((last.beat + last.durationBeats) * PPQ), start + 1);
-    ev.kan.forEach((k, gi) => {
-      const gap = Math.round(0.12 * PPQ);
-      const kOn = Math.max(start - gap * (ev.kan.length - gi), 0);
-      melody.push({ tick: kOn, on: true, note: k, vel: 70, ch: 0 });
-      melody.push({ tick: Math.max(kOn + 1, start - gap * (ev.kan.length - gi - 1)), on: false, note: k, vel: 0, ch: 0 });
-    });
     melody.push({ tick: start, on: true, note: ev.midi, vel: 100, ch: 0 });
     melody.push({ tick: end, on: false, note: ev.midi, vel: 0, ch: 0 });
     let from = ev;
@@ -1056,14 +1073,18 @@ function encodeMidi(schedule, opts) {
   if (opts.name) head.push(...vlq(0), 255, 3, ...vlq(utf8(opts.name).length), ...utf8(opts.name));
   head.push(...vlq(0), 255, 81, 3, usPerBeat >> 16 & 255, usPerBeat >> 8 & 255, usPerBeat & 255);
   const chunks = [trackChunk(melody, head)];
-  if (opts.drums && opts.drums.length > 0) {
+  if (typeof opts.drums === "function" || opts.drums && opts.drums.length > 0) {
     const drum = [];
-    const totalBeats = Math.ceil(schedule.totalBeats);
-    for (let beat = 0; beat < totalBeats; beat++) {
-      const note = DRUM_NOTE[opts.drums[beat % opts.drums.length]];
-      const t = beat * PPQ;
-      drum.push({ tick: t, on: true, note, vel: 100, ch: 9 });
-      drum.push({ tick: t + Math.round(PPQ / 4), on: false, note, vel: 0, ch: 9 });
+    for (const seg of schedule.tempo) {
+      const pattern = typeof opts.drums === "function" ? opts.drums(seg) : opts.drums;
+      if (!pattern?.length) continue;
+      const end = seg === schedule.tempo[schedule.tempo.length - 1] ? Math.ceil(schedule.totalBeats) : seg.endBeat;
+      for (let k = 0; seg.beat + k / seg.scale < end - 1e-6; k++) {
+        const note = DRUM_NOTE[pattern[k % pattern.length]];
+        const t = Math.round((seg.beat + k / seg.scale) * PPQ);
+        drum.push({ tick: t, on: true, note, vel: 100, ch: 9 });
+        drum.push({ tick: t + Math.round(PPQ / 4), on: false, note, vel: 0, ch: 9 });
+      }
     }
     chunks.push(trackChunk(drum, [...vlq(0), 255, 3, ...vlq(5), 68, 114, 117, 109, 115]));
   }
@@ -1093,9 +1114,11 @@ function exportMidi(doc, options = {}) {
     laySpeeds: options.laySpeeds
   });
   const bpm = options.bpm ?? doc.meta.bpm ?? 90;
-  const taalId = doc.meta.taal?.id;
-  const taal = taalId !== void 0 && taalId in TAALS ? TAALS[taalId] : { numBeats: 4, sam: 0 };
-  const drums = options.drums ? drumPattern(taal) : void 0;
+  const drums = options.drums ? (seg) => {
+    const id = seg.taal?.id;
+    if (seg.taal === null) return void 0;
+    return drumPattern(id !== void 0 && id in TAALS ? TAALS[id] : { numBeats: 4, sam: 0 });
+  } : void 0;
   const bytes = encodeMidi(schedule, { bpm, name: options.name ?? doc.meta.title, drums });
   return {
     blob: new Blob([bytes], { type: "audio/midi" }),