two algos

eslint.config.mjs

@@ -83,14 +83,4 @@ export default [
       ],
     },
   },
-  {
-    // Properties provided by AudioWorkletGlobalScope
-    files: ['packages/superdough/worklets.mjs'],
-    languageOptions: {
-      globals: {
-        currentTime: 'readonly',
-        sampleRate: 'readonly',
-      },
-    },
-  },
 ];

packages/core/controls.mjs

@@ -252,20 +252,6 @@ export const { fmenv } = registerControl('fmenv');
  *
  */
 export const { fmattack } = registerControl('fmattack');
-
-/**
- * waveform of the fm modulator
- *
- * @name fmwave
- * @param {number | Pattern} wave waveform
- * @example
- * n("0 1 2 3".fast(4)).scale("d:minor").s("sine").fmwave("<sine square sawtooth crackle>").fm(4).fmh(2.01)
- * @example
- * n("0 1 2 3".fast(4)).chord("<Dm Am F G>").voicing().s("sawtooth").fmwave("brown").fm(.6)
- *
- */
-export const { fmwave } = registerControl('fmwave');
-
 /**
  * Decay time for the FM envelope: seconds until the sustain level is reached after the attack phase.
  *
@@ -320,7 +306,6 @@ export const { fft } = registerControl('fft');
  *
  * @name decay
  * @param {number | Pattern} time decay time in seconds
- * @synonyms dec
  * @example
  * note("c3 e3 f3 g3").decay("<.1 .2 .3 .4>").sustain(0)
  *
@@ -541,43 +526,53 @@ export const { tremoloshape } = registerControl('tremoloshape', 'tremshape');
  *
  */
 
-/**
- * modulate the amplitude of an orbit to create a "sidechain" like effect
- *
- * @name duckorbit
- * @param {number | Pattern} orbit target orbit
- * @example
- * $: n(run(16)).scale("c:minor:pentatonic").s("sawtooth").delay(.7).orbit(2)
- * $: s("bd:4!4").beat("0,4,8,11,14",16).duckorbit(2).duckattack(0.2).duckdepth(1)
- *
- */
-export const { duck } = registerControl('duckorbit', 'duck');
+// TODO: SUPRADOUGH implement post orbit "pump" sidechain effect
+// /**
+//  * modulate the amplitude of an orbit to create a "sidechain" like effect
+//  *
+//  * @name pump
+//  * @param {number | Pattern} speed modulation speed in cycles
+//  * @example
+//  * note("{f g c d}%16").s("sawtooth").pump(".25:.75")
+//  *
+//  */
+// export const { pump } = registerControl(['pump', 'pumpdepth']);
 
-/**
- *  the amount of ducking applied to target orbit
- *
- * @name duckdepth
- * @param {number | Pattern} depth depth of modulation from 0 to 1
- * @example
- * stack( n(run(8)).scale("c:minor").s("sawtooth").delay(.7).orbit(2), s("bd:4!4").beat("0,4,8,11,14",16).duckorbit(2).duckattack(0.2).duckdepth("<1 .9 .6 0>"))
- *
- */
-
-export const { duckdepth } = registerControl('duckdepth');
-
-/**
- *  the attack time of the duck effect
- *
- * @name duckattack
- * @param {number | Pattern} time
- * @example
- * stack( n(run(8)).scale("c:minor").s("sawtooth").delay(.7).orbit(2), s("bd:4!4").beat("0,4,8,11,14",16).duckorbit(2).duckattack("<0.2 0 0.4>").duckdepth(1))
- *
- */
-export const { duckattack } = registerControl('duckattack', 'duckatt');
+// /**
+//  * modulate the amplitude of an orbit to create a "sidechain" like effect
+//  *
+//  * @name pumpdepth
+//  * @param {number | Pattern} depth depth of modulation from 0 to 1
+//  * @example
+//  * note("{f g c d}%16").s("sawtooth").pump(".25").depth("<.25 .5 .75 1>")
+//  *
+//  */
+// export const { pumpdepth } = registerControl('pumpdepth');
 
 export const { drive } = registerControl('drive');
 
+/**
+ * waveshaping distortion with selectable algorithms
+ *
+ * @name shape
+ * @param {number | Pattern} amount
+ * @example
+ * $: s("909bd").beat("0,4,8,11,14",16).shape("<2 4 1>").shapetype("<0 1 2>*2")
+ *
+ */
+export const { shape } = registerControl(['shape', 'shapevol', 'shapetype']);
+
+/**
+ * filter overdrive for supported filter types
+ *
+ * @name shapetype
+ * @param {number | Pattern} type
+ * @example
+ * $: s("909bd").beat("0,4,8,11,14",16).shape("2").shapetype("<0 1 2>")
+ *
+ */
+export const { shapeType } = registerControl('shapetype');
+
 /**
  * Create byte beats with custom expressions
  *
@@ -1537,19 +1532,7 @@ export const { roomsize, size, sz, rsize } = registerControl('roomsize', 'size',
 // ['sclap'],
 // ['sclaves'],
 // ['scrash'],
-/**
- * (Deprecated) Wave shaping distortion. WARNING: can suddenly get unpredictably loud.
- * Please use distort instead, which has a more predictable response curve
- * second option in optional array syntax (ex: ".9:.5") applies a postgain to the output
- *
- *
- * @name shape
- * @param {number | Pattern} distortion between 0 and 1
- * @example
- * s("bd sd [~ bd] sd,hh*8").shape("<0 .2 .4 .6 .8>")
- *
- */
-export const { shape } = registerControl(['shape', 'shapevol']);
+
 /**
  * Wave shaping distortion. CAUTION: it can get loud.
  * Second option in optional array syntax (ex: ".9:.5") applies a postgain to the output.

packages/core/hap.mjs

@@ -4,7 +4,6 @@ Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 import Fraction from './fraction.mjs';
-import { stringifyValues } from './util.mjs';
 
 export class Hap {
   /*
@@ -149,7 +148,13 @@ export class Hap {
   }
 
   showWhole(compact = false) {
-    return `${this.whole == undefined ? '~' : this.whole.show()}: ${stringifyValues(this.value, compact)}`;
+    return `${this.whole == undefined ? '~' : this.whole.show()}: ${
+      typeof this.value === 'object'
+        ? compact
+          ? JSON.stringify(this.value).slice(1, -1).replaceAll('"', '').replaceAll(',', ' ')
+          : JSON.stringify(this.value)
+        : this.value
+    }`;
   }
 
   combineContext(b) {

packages/core/logger.mjs

@@ -6,7 +6,7 @@ let debounce = 1000,
 
 export function errorLogger(e, origin = 'cyclist') {
   //TODO: add some kind of debug flag that enables this  while in dev mode
-  // console.error(e);
+  // console.error(e)
   logger(`[${origin}] error: ${e.message}`);
 }
 

packages/core/pattern.mjs

@@ -21,7 +21,6 @@ import {
   numeralArgs,
   parseNumeral,
   pairs,
-  stringifyValues,
 } from './util.mjs';
 import drawLine from './drawLine.mjs';
 import { logger } from './logger.mjs';
@@ -853,29 +852,14 @@ export class Pattern {
     );
   }
 
-  /**
-   * Writes the content of the current event to the console (visible in the side menu).
-   * @name log
-   * @memberof Pattern
-   * @example
-   * s("bd sd").log()
-   */
-  log(func = (hap) => `[hap] ${hap.showWhole(true)}`, getData = (hap) => ({ hap })) {
+  log(func = (_, hap) => `[hap] ${hap.showWhole(true)}`, getData = (_, hap) => ({ hap })) {
     return this.onTrigger((...args) => {
       logger(func(...args), undefined, getData(...args));
     }, false);
   }
 
-  /**
-   * A simplified version of `log` which writes all "values" (various configurable parameters)
-   * within the event to the console (visible in the side menu).
-   * @name logValues
-   * @memberof Pattern
-   * @example
-   * s("bd sd").gain("0.25 0.5 1").n("2 1 0").logValues()
-   */
-  logValues(func = (value) => `[hap] ${stringifyValues(value, true)}`) {
-    return this.log((hap) => func(hap.value));
+  logValues(func = id) {
+    return this.log((_, hap) => func(hap.value));
   }
 
   //////////////////////////////////////////////////////////////////////
@@ -1304,7 +1288,7 @@ export function sequenceP(pats) {
  * @synonyms polyrhythm, pr
  * @example
  * stack("g3", "b3", ["e4", "d4"]).note()
- * // "g3,b3,[e4 d4]".note()
+ * // "g3,b3,[e4,d4]".note()
  *
  * @example
  * // As a chained function:
@@ -1585,7 +1569,7 @@ export const func = curry((a, b) => reify(b).func(a));
 /**
  * Registers a new pattern method. The method is added to the Pattern class + the standalone function is returned from register.
  *
- * @param {string | string[]} name name of the function, or an array of names to be used as synonyms
+ * @param {string} name name of the function
  * @param {function} func function with 1 or more params, where last is the current pattern
  * @noAutocomplete
  *

packages/core/test/pattern.test.mjs

@@ -6,7 +6,7 @@ This program is free software: you can redistribute it and/or modify it under th
 
 import Fraction from 'fraction.js';
 
-import { describe, it, expect, vi } from 'vitest';
+import { describe, it, expect } from 'vitest';
 
 import {
   TimeSpan,
@@ -55,8 +55,6 @@ import {
   expand,
 } from '../index.mjs';
 
-import { log, logValues } from '../pattern.mjs';
-
 import { steady } from '../signal.mjs';
 
 import { n, s } from '../controls.mjs';
@@ -1308,40 +1306,4 @@ describe('Pattern', () => {
       );
     });
   });
-  describe('log', () => {
-    it('logs to console', () => {
-      const mockConsoleLog = vi.spyOn(console, 'log').mockImplementation(() => {});
-      const pattern = pure('a').log();
-      const haps = pattern.queryArc(0, 1);
-
-      // Force a trigger
-      haps.forEach((hap) => {
-        hap.context?.onTrigger?.(hap);
-      });
-
-      expect(mockConsoleLog).toHaveBeenCalledWith(
-        '%c[hap] 0/1 → 1/1: a',
-        'background-color: black;color:white;border-radius:15px',
-      );
-      mockConsoleLog.mockRestore();
-    });
-  });
-  describe('logValues', () => {
-    it('logs values to console', () => {
-      const mockConsoleLog = vi.spyOn(console, 'log').mockImplementation(() => {});
-      const pattern = pure('a').note('c#').logValues();
-      const haps = pattern.queryArc(0, 1);
-
-      // Force a trigger
-      haps.forEach((hap) => {
-        hap.context?.onTrigger?.(hap);
-      });
-
-      expect(mockConsoleLog).toHaveBeenCalledWith(
-        '%c[hap] value:a note:c#',
-        'background-color: black;color:white;border-radius:15px',
-      );
-      mockConsoleLog.mockRestore();
-    });
-  });
 });

packages/core/util.mjs

@@ -487,13 +487,3 @@ export function getCurrentKeyboardState() {
 //   }
 //   return lcm((x * y) / gcd(x, y), ...z);
 // };
-
-// Takes values -- typically derived from events, i.e. `hap`s -- and renders them
-// into a readable format
-export function stringifyValues(value, compact = false) {
-  return typeof value === 'object'
-    ? compact
-      ? JSON.stringify(value).slice(1, -1).replaceAll('"', '').replaceAll(',', ' ')
-      : JSON.stringify(value)
-    : value;
-}

packages/repl/prebake.mjs

@@ -36,7 +36,7 @@ export async function prebake() {
     samples(`${ds}/tidal-drum-machines.json`),
     samples(`${ds}/piano.json`),
     samples(`${ds}/Dirt-Samples.json`),
-    samples(`${ds}/uzu-drumkit.json`),
+    samples(`https://raw.githubusercontent.com/tidalcycles/uzu-drumkit/main/strudel.json`),
     samples(`${ds}/vcsl.json`),
     samples(`${ds}/mridangam.json`),
   ]);

packages/superdough/helpers.mjs

@@ -1,8 +1,5 @@
 import { getAudioContext } from './superdough.mjs';
 import { clamp, nanFallback } from './util.mjs';
-import { getNoiseBuffer } from './noise.mjs';
-
-export const noises = ['pink', 'white', 'brown', 'crackle'];
 
 export function gainNode(value) {
   const node = getAudioContext().createGain();
@@ -209,8 +206,7 @@ export function getVibratoOscillator(param, value, t) {
 // ConstantSource inherits AudioScheduledSourceNode, which has scheduling abilities
 // a bit of a hack, but it works very well :)
 export function webAudioTimeout(audioContext, onComplete, startTime, stopTime) {
-  const constantNode = new ConstantSourceNode(audioContext);
-
+  const constantNode = audioContext.createConstantSource();
   constantNode.start(startTime);
   constantNode.stop(stopTime);
   constantNode.onended = () => {
@@ -220,17 +216,9 @@ export function webAudioTimeout(audioContext, onComplete, startTime, stopTime) {
 }
 const mod = (freq, range = 1, type = 'sine') => {
   const ctx = getAudioContext();
-  let osc;
-  if (noises.includes(type)) {
-    osc = ctx.createBufferSource();
-    osc.buffer = getNoiseBuffer(type, 2);
-    osc.loop = true;
-  } else {
-    osc = ctx.createOscillator();
-    osc.type = type;
-    osc.frequency.value = freq;
-  }
-
+  const osc = ctx.createOscillator();
+  osc.type = type;
+  osc.frequency.value = freq;
   osc.start();
   const g = new GainNode(ctx, { gain: range });
   osc.connect(g); // -range, range
@@ -265,7 +253,7 @@ export function applyFM(param, value, begin) {
 
     modulator = fmmod.node;
     stop = fmmod.stop;
-    if (![fmAttack, fmDecay, fmSustain, fmRelease, fmVelocity].some((v) => v !== undefined)) {
+    if (![fmAttack, fmDecay, fmSustain, fmRelease, fmVelocity].find((v) => v !== undefined)) {
       // no envelope by default
       modulator.connect(param);
     } else {
@@ -289,3 +277,18 @@ export function applyFM(param, value, begin) {
   }
   return { stop };
 }
+
+export const saturationAlgos = [
+  (x, k) => ((1 + k) * x) / (1 + k * Math.abs(x)), //S Curve sourced from: https://www.nickwritesablog.com/sound-design-in-web-audio-neurofunk-bass-part-1/
+  (x, k) => Math.tanh(x * k),
+];
+
+export function makeSaturationCurve(amount, n_samples, algo = 0) {
+  const k = typeof amount === 'number' ? amount : 50;
+  const curve = new Float32Array(n_samples);
+  for (let i = 0; i < n_samples; i++) {
+    const x = (i * 2) / n_samples - 1;
+    curve[i] = saturationAlgos[algo % saturationAlgos.length]?.(x, amount);
+  }
+  return curve;
+}

packages/superdough/logger.mjs

@@ -1,11 +1,5 @@
 let log = (msg) => console.log(msg);
 
-export function errorLogger(e, origin = 'cyclist') {
-  //TODO: add some kind of debug flag that enables this  while in dev mode
-  // console.error(e);
-  logger(`[${origin}] error: ${e.message}`);
-}
-
 export const logger = (...args) => log(...args);
 
 export const setLogger = (fn) => {

packages/superdough/noise.mjs

@@ -4,7 +4,7 @@ import { getAudioContext } from './superdough.mjs';
 let noiseCache = {};
 
 // lazy generates noise buffers and keeps them forever
-export function getNoiseBuffer(type, density) {
+function getNoiseBuffer(type, density) {
   const ac = getAudioContext();
   if (noiseCache[type]) {
     return noiseCache[type];

packages/superdough/superdough.mjs

@@ -9,9 +9,9 @@ import './reverb.mjs';
 import './vowel.mjs';
 import { clamp, nanFallback, _mod, cycleToSeconds, secondsToCycle } from './util.mjs';
 import workletsUrl from './worklets.mjs?audioworklet';
-import { createFilter, gainNode, getCompressor, getWorklet, webAudioTimeout } from './helpers.mjs';
+import { createFilter, gainNode, getCompressor, getWorklet, makeSaturationCurve } from './helpers.mjs';
 import { map } from 'nanostores';
-import { logger, errorLogger } from './logger.mjs';
+import { logger } from './logger.mjs';
 import { loadBuffer } from './sampler.mjs';
 
 export const DEFAULT_MAX_POLYPHONY = 128;
@@ -147,6 +147,7 @@ let defaultDefaultValues = {
   phaserdepth: 0.75,
   shapevol: 1,
   distortvol: 1,
+  saturatevol: 1,
   delay: 0,
   byteBeatExpression: '0',
   delayfeedback: 0.5,
@@ -331,18 +332,16 @@ function getDelay(orbit, delaytime, delayfeedback, t, channels) {
     //logger(`delayfeedback was clamped to ${maxfeedback} to save your ears`);
   }
   delayfeedback = clamp(delayfeedback, 0, 0.98);
-  if (!orbits[orbit].delayNode) {
+  if (!delays[orbit]) {
     const ac = getAudioContext();
     const dly = ac.createFeedbackDelay(1, delaytime, delayfeedback);
     dly.start?.(t); // for some reason, this throws when audion extension is installed..
-    connectToOrbit(dly, orbit);
-    orbits[orbit].delayNode = dly;
+    connectToDestination(dly, channels);
+    delays[orbit] = dly;
   }
-  orbits[orbit].delayNode.delayTime.value !== delaytime &&
-    orbits[orbit].delayNode.delayTime.setValueAtTime(delaytime, t);
-  orbits[orbit].delayNode.feedback.value !== delayfeedback &&
-    orbits[orbit].delayNode.feedback.setValueAtTime(delayfeedback, t);
-  return orbits[orbit].delayNode;
+  delays[orbit].delayTime.value !== delaytime && delays[orbit].delayTime.setValueAtTime(delaytime, t);
+  delays[orbit].feedback.value !== delayfeedback && delays[orbit].feedback.setValueAtTime(delayfeedback, t);
+  return delays[orbit];
 }
 
 export function getLfo(audioContext, begin, end, properties = {}) {
@@ -367,6 +366,22 @@ export function getLfo(audioContext, begin, end, properties = {}) {
   return getWorklet(audioContext, 'lfo-processor', lfoprops);
 }
 
+export function getSyncedLfo(audioContext, time, end, cps, cycle, properties = {}) {
+  const frequency = cycle / cps;
+
+  return getWorklet(audioContext, 'lfo-processor', {
+    frequency,
+    depth: 1,
+    skew: 0,
+    phaseoffset: 0,
+    time,
+    end,
+    shape: 1,
+    dcoffset: -0.5,
+    ...properties,
+  });
+}
+
 function getPhaser(time, end, frequency = 1, depth = 0.5, centerFrequency = 1000, sweep = 2000) {
   const ac = getAudioContext();
   const lfoGain = getLfo(ac, time, end, { frequency, depth: sweep * 2 });
@@ -398,73 +413,31 @@ function getFilterType(ftype) {
   return typeof ftype === 'number' ? filterTypes[Math.floor(_mod(ftype, filterTypes.length))] : ftype;
 }
 
-//type orbit {
-// gain: number,
-// reverbNode: reverbNode
-// delayNode: delayNode
-//}
-let orbits = {};
-function connectToOrbit(node, orbit) {
-  if (orbits[orbit] == null) {
-    errorLogger(new Error('target orbit does not exist'), 'superdough');
-  }
-  node.connect(orbits[orbit].gain);
-}
-
-function setOrbit(audioContext, orbit, channels) {
-  if (orbits[orbit] == null) {
-    orbits[orbit] = {
-      gain: new GainNode(audioContext, { gain: 1 }),
-    };
-    connectToDestination(orbits[orbit].gain, channels);
-  }
-}
-function duckOrbit(audioContext, targetOrbit, t, attacktime = 0.1, duckdepth = 1) {
-  const targetArr = [targetOrbit].flat();
-
-  targetArr.forEach((target) => {
-    if (orbits[target] == null) {
-      errorLogger(new Error(`duck target orbit ${target} does not exist`), 'superdough');
-      return;
-    }
-    webAudioTimeout(
-      audioContext,
-      () => {
-        orbits[target].gain.gain.cancelScheduledValues(t);
-        const currVal = orbits[target].gain.gain.value;
-        orbits[target].gain.gain.linearRampToValueAtTime(clamp(1 - Math.pow(duckdepth, 0.5), 0.01, currVal), t);
-        orbits[target].gain.gain.exponentialRampToValueAtTime(1, t + Math.max(0.002, attacktime));
-      },
-      0,
-      t - 0.01,
-    );
-  });
-}
-
+let reverbs = {};
 let hasChanged = (now, before) => now !== undefined && now !== before;
-function getReverb(orbit, duration, fade, lp, dim, ir) {
+function getReverb(orbit, duration, fade, lp, dim, ir, channels) {
   // If no reverb has been created for a given orbit, create one
-  if (!orbits[orbit].reverbNode) {
+  if (!reverbs[orbit]) {
     const ac = getAudioContext();
     const reverb = ac.createReverb(duration, fade, lp, dim, ir);
-    connectToOrbit(reverb, orbit);
-    orbits[orbit].reverbNode = reverb;
+    connectToDestination(reverb, channels);
+    reverbs[orbit] = reverb;
   }
   if (
-    hasChanged(duration, orbits[orbit].reverbNode.duration) ||
-    hasChanged(fade, orbits[orbit].reverbNode.fade) ||
-    hasChanged(lp, orbits[orbit].reverbNode.lp) ||
-    hasChanged(dim, orbits[orbit].reverbNode.dim) ||
-    orbits[orbit].reverbNode.ir !== ir
+    hasChanged(duration, reverbs[orbit].duration) ||
+    hasChanged(fade, reverbs[orbit].fade) ||
+    hasChanged(lp, reverbs[orbit].lp) ||
+    hasChanged(dim, reverbs[orbit].dim) ||
+    reverbs[orbit].ir !== ir
   ) {
     // only regenerate when something has changed
     // avoids endless regeneration on things like
     // stack(s("a"), s("b").rsize(8)).room(.5)
     // this only works when args may stay undefined until here
     // setting default values breaks this
-    orbits[orbit].reverbNode.generate(duration, fade, lp, dim, ir);
+    reverbs[orbit].generate(duration, fade, lp, dim, ir);
   }
-  return orbits[orbit].reverbNode;
+  return reverbs[orbit];
 }
 
 export let analysers = {},
@@ -507,7 +480,8 @@ function effectSend(input, effect, wet) {
 }
 
 export function resetGlobalEffects() {
-  orbits = {};
+  delays = {};
+  reverbs = {};
   analysers = {};
   analysersData = {};
 }
@@ -560,9 +534,6 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     gain = getDefaultValue('gain'),
     postgain = getDefaultValue('postgain'),
     density = getDefaultValue('density'),
-    duckorbit,
-    duckattack,
-    duckdepth,
     // filters
     fanchor = getDefaultValue('fanchor'),
     drive = 0.69,
@@ -601,9 +572,9 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     coarse,
 
     crush,
-    dry,
     shape,
     shapevol = getDefaultValue('shapevol'),
+    shapetype,
     distort,
     distortvol = getDefaultValue('distortvol'),
     pan,
@@ -635,13 +606,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   const orbitChannels = mapChannelNumbers(
     multiChannelOrbits && orbit > 0 ? [orbit * 2 - 1, orbit * 2] : getDefaultValue('channels'),
   );
-
   const channels = value.channels != null ? mapChannelNumbers(value.channels) : orbitChannels;
-  setOrbit(ac, orbit, channels, t, cycle, cps);
-
-  if (duckorbit != null) {
-    duckOrbit(ac, duckorbit, t, duckattack, duckdepth);
-  }
 
   gain = applyGainCurve(nanFallback(gain, 1));
   postgain = applyGainCurve(postgain);
@@ -713,6 +678,14 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   // gain stage
   chain.push(gainNode(gain));
 
+  if (shape != null) {
+    const shaper = new WaveShaperNode(ac);
+    shaper.curve = makeSaturationCurve(shape, ac.sampleRate, shapetype);
+    const shapeGain = new GainNode(ac, { gain: shapevol });
+    chain.push(shaper);
+    chain.push(shapeGain);
+  }
+
   //filter
   const ftype = getFilterType(value.ftype);
   if (cutoff !== undefined) {
@@ -778,7 +751,6 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   // effects
   coarse !== undefined && chain.push(getWorklet(ac, 'coarse-processor', { coarse }));
   crush !== undefined && chain.push(getWorklet(ac, 'crush-processor', { crush }));
-  shape !== undefined && chain.push(getWorklet(ac, 'shape-processor', { shape, postgain: shapevol }));
   distort !== undefined && chain.push(getWorklet(ac, 'distort-processor', { distort, postgain: distortvol }));
 
   if (tremolosync != null) {
@@ -828,6 +800,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   // last gain
   const post = new GainNode(ac, { gain: postgain });
   chain.push(post);
+  connectToDestination(post, channels);
 
   // delay
   let delaySend;
@@ -862,14 +835,6 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     analyserSend = effectSend(post, analyserNode, 1);
     audioNodes.push(analyserSend);
   }
-  if (dry != null) {
-    dry = applyGainCurve(dry);
-    const dryGain = new GainNode(ac, { gain: dry });
-    chain.push(dryGain);
-    connectToOrbit(dryGain, orbit);
-  } else {
-    connectToOrbit(post, orbit);
-  }
 
   // connect chain elements together
   chain.slice(1).reduce((last, current) => last.connect(current), chain[0]);

packages/superdough/synth.mjs

@@ -9,7 +9,7 @@ import {
   getVibratoOscillator,
   webAudioTimeout,
   getWorklet,
-  noises,
+  makeSaturationCurve,
 } from './helpers.mjs';
 import { getNoiseMix, getNoiseOscillator } from './noise.mjs';
 
@@ -41,17 +41,7 @@ const waveformAliases = [
   ['saw', 'sawtooth'],
   ['sin', 'sine'],
 ];
-
-function makeSaturationCurve(amount, n_samples) {
-  const k = typeof amount === 'number' ? amount : 50;
-  const curve = new Float32Array(n_samples);
-
-  for (let i = 0; i < n_samples; i++) {
-    const x = (i * 2) / n_samples - 1;
-    curve[i] = Math.tanh(x * k);
-  }
-  return curve;
-}
+const noises = ['pink', 'white', 'brown', 'crackle'];
 
 export function registerSynthSounds() {
   [...waveforms].forEach((s) => {
@@ -97,7 +87,7 @@ export function registerSynthSounds() {
   });
 
   registerSound(
-    'sbd',
+    '909bd',
     (t, value, onended) => {
       const { duration, decay = 0.5, pdecay = 0.5, penv = 36, clip } = value;
       const ctx = getAudioContext();
@@ -124,7 +114,7 @@ export function registerSynthSounds() {
 
       const sat = new WaveShaperNode(ctx);
       // tri to sine diode shaper emulation
-      sat.curve = makeSaturationCurve(2, ctx.sampleRate);
+      sat.curve = makeSaturationCurve(2, ctx.sampleRate, 1);
 
       const mix = gainNode(mixGain);
 
@@ -201,7 +191,10 @@ export function registerSynthSounds() {
       const gainAdjustment = 1 / Math.sqrt(voices);
       getPitchEnvelope(o.parameters.get('detune'), value, begin, holdend);
       const vibratoOscillator = getVibratoOscillator(o.parameters.get('detune'), value, begin);
-      const fm = applyFM(o.parameters.get('frequency'), value, begin);
+      // const fm = applyFM(o.parameters.get('frequency'), value, begin);
+      // https://codeberg.org/uzu/strudel/issues/1428
+      // if you think about re-enabling this, please test with fm > 1 first
+      // it's like 10x gain, so it's really dangerous
       let envGain = gainNode(1);
       envGain = o.connect(envGain);
 
@@ -213,7 +206,7 @@ export function registerSynthSounds() {
           destroyAudioWorkletNode(o);
           envGain.disconnect();
           onended();
-          fm?.stop();
+          // fm?.stop();
           vibratoOscillator?.stop();
         },
         begin,

packages/superdough/worklets.mjs

@@ -8,28 +8,18 @@ import FFT from './fft.js';
 const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
 const _mod = (n, m) => ((n % m) + m) % m;
 
-// Restrict phase to the range [0, maxPhase) via wrapping
-function wrapPhase(phase, maxPhase = 1) {
-  if (phase >= maxPhase) {
-    phase -= maxPhase;
-  } else if (phase < 0) {
-    phase += maxPhase;
-  }
-  return phase;
-}
 const blockSize = 128;
-// Smooth waveshape near discontinuities to remove frequencies above Nyquist and prevent aliasing
+// adjust waveshape to remove frequencies above nyquist to prevent aliasing
 // referenced from https://www.kvraudio.com/forum/viewtopic.php?t=375517
 function polyBlep(phase, dt) {
-  dt = Math.min(dt, 1 - dt);
-  // Start of cycle
+  // 0 <= phase < 1
   if (phase < dt) {
     phase /= dt;
     // 2 * (phase - phase^2/2 - 0.5)
     return phase + phase - phase * phase - 1;
   }
 
-  // End of cycle
+  // -1 < phase < 0
   else if (phase > 1 - dt) {
     phase = (phase - 1) / dt;
     // 2 * (phase^2/2 + phase + 0.5)
@@ -125,6 +115,7 @@ class LFOProcessor extends AudioWorkletProcessor {
 
   process(inputs, outputs, parameters) {
     const begin = parameters['begin'][0];
+    // eslint-disable-next-line no-undef
     if (currentTime >= parameters.end[0]) {
       return false;
     }
@@ -152,6 +143,7 @@ class LFOProcessor extends AudioWorkletProcessor {
     if (this.phase == null) {
       this.phase = _mod(time * frequency + phaseoffset, 1);
     }
+    // eslint-disable-next-line no-undef
     const dt = frequency / sampleRate;
     for (let n = 0; n < blockSize; n++) {
       for (let i = 0; i < output.length; i++) {
@@ -313,6 +305,7 @@ class LadderProcessor extends AudioWorkletProcessor {
     const drive = clamp(Math.exp(parameters.drive[0]), 0.1, 2000);
 
     let cutoff = parameters.frequency[0];
+    // eslint-disable-next-line no-undef
     cutoff = (cutoff * 2 * _PI) / sampleRate;
     cutoff = cutoff > 1 ? 1 : cutoff;
 
@@ -445,13 +438,18 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
     ];
   }
   process(input, outputs, params) {
+    // eslint-disable-next-line no-undef
     if (currentTime <= params.begin[0]) {
       return true;
     }
+    // eslint-disable-next-line no-undef
     if (currentTime >= params.end[0]) {
       // this.port.postMessage({ type: 'onended' });
       return false;
     }
+    let frequency = params.frequency[0];
+    //apply detune in cents
+    frequency = frequency * Math.pow(2, params.detune[0] / 1200);
 
     const output = outputs[0];
     const voices = params.voices[0];
@@ -462,6 +460,9 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
 
     for (let n = 0; n < voices; n++) {
       const isOdd = (n & 1) == 1;
+
+      //applies unison "spread" detune in semitones
+      const freq = applySemitoneDetuneToFrequency(frequency, getUnisonDetune(voices, freqspread, n));
       let gainL = gain1;
       let gainR = gain2;
       // invert right and left gain
@@ -469,21 +470,21 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
         gainL = gain2;
         gainR = gain1;
       }
+      // eslint-disable-next-line no-undef
+      const dt = freq / sampleRate;
+
       for (let i = 0; i < output[0].length; i++) {
-        // Main detuning
-        let freq = applySemitoneDetuneToFrequency(params.frequency[i] ?? params.frequency[0], params.detune[0] / 100);
-        // Individual voice detuning
-        freq = applySemitoneDetuneToFrequency(freq, getUnisonDetune(voices, freqspread, n));
-        // We must wrap this here because it is passed into sawblep below which
-        // has domain [0, 1]
-        const dt = _mod(freq / sampleRate, 1);
         this.phase[n] = this.phase[n] ?? Math.random();
         const v = waveshapes.sawblep(this.phase[n], dt);
 
         output[0][i] = output[0][i] + v * gainL;
         output[1][i] = output[1][i] + v * gainR;
 
-        this.phase[n] = wrapPhase(this.phase[n] + dt);
+        this.phase[n] += dt;
+
+        if (this.phase[n] > 1.0) {
+          this.phase[n] = this.phase[n] - 1;
+        }
       }
     }
     return true;
@@ -492,7 +493,7 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
 
 registerProcessor('supersaw-oscillator', SuperSawOscillatorProcessor);
 
-// Phase Vocoder sourced from https://github.com/olvb/phaze/tree/master?tab=readme-ov-file
+// Phase Vocoder sourced from // sourced from https://github.com/olvb/phaze/tree/master?tab=readme-ov-file
 const BUFFERED_BLOCK_SIZE = 2048;
 
 function genHannWindow(length) {

packages/tonal/tonal.mjs

@@ -88,14 +88,13 @@ function scaleOffset(scale, offset, note) {
  * @returns Pattern
  * @memberof Pattern
  * @name transpose
- * @synonyms trans
  * @example
  * "c2 c3".fast(2).transpose("<0 -2 5 3>".slow(2)).note()
  * @example
  * "c2 c3".fast(2).transpose("<1P -2M 4P 3m>".slow(2)).note()
  */
 
-export const { transpose, trans } = register(['transpose', 'trans'], function transposeFn(intervalOrSemitones, pat) {
+export const transpose = register('transpose', function (intervalOrSemitones, pat) {
   return pat.withHap((hap) => {
     const note = hap.value.note ?? hap.value;
     if (typeof note === 'number') {
@@ -143,7 +142,6 @@ export const { transpose, trans } = register(['transpose', 'trans'], function tr
  * @name scaleTranspose
  * @param {offset} offset number of steps inside the scale
  * @returns Pattern
- * @synonyms scaleTrans, strans
  * @example
  * "-8 [2,4,6]"
  * .scale('C4 bebop major')
@@ -151,25 +149,22 @@ export const { transpose, trans } = register(['transpose', 'trans'], function tr
  * .note()
  */
 
-export const { scaleTranspose, scaleTrans, strans } = register(
-  ['scaleTranspose', 'scaleTrans', 'strans'],
-  function (offset /* : number | string */, pat) {
-    return pat.withHap((hap) => {
-      if (!hap.context.scale) {
-        throw new Error('can only use scaleTranspose after .scale');
-      }
-      if (typeof hap.value === 'object')
-        return hap.withValue(() => ({
-          ...hap.value,
-          note: scaleOffset(hap.context.scale, Number(offset), hap.value.note),
-        }));
-      if (typeof hap.value !== 'string') {
-        throw new Error('can only use scaleTranspose with notes');
-      }
-      return hap.withValue(() => scaleOffset(hap.context.scale, Number(offset), hap.value));
-    });
-  },
-);
+export const scaleTranspose = register('scaleTranspose', function (offset /* : number | string */, pat) {
+  return pat.withHap((hap) => {
+    if (!hap.context.scale) {
+      throw new Error('can only use scaleTranspose after .scale');
+    }
+    if (typeof hap.value === 'object')
+      return hap.withValue(() => ({
+        ...hap.value,
+        note: scaleOffset(hap.context.scale, Number(offset), hap.value.note),
+      }));
+    if (typeof hap.value !== 'string') {
+      throw new Error('can only use scaleTranspose with notes');
+    }
+    return hap.withValue(() => scaleOffset(hap.context.scale, Number(offset), hap.value));
+  });
+});
 
 /**
  * Turns numbers into notes in the scale (zero indexed). Also sets scale for other scale operations, like {@link Pattern#scaleTranspose}.

test/__snapshots__/examples.test.mjs.snap

@@ -3036,145 +3036,6 @@ exports[`runs examples > example "dry" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "duckattack" example index 0 1`] = `
-[
-  "[ 0/1 → 1/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 0/1 → 1/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/8 → 1/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/4 → 5/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 1/4 → 3/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 3/8 → 1/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/2 → 9/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 1/2 → 5/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 5/8 → 3/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 11/16 → 3/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 3/4 → 7/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 7/8 → 15/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 7/8 → 1/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/1 → 17/16 | s:bd n:4 duckorbit:2 duckattack:0 duckdepth:1 ]",
-  "[ 1/1 → 9/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 9/8 → 5/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 5/4 → 21/16 | s:bd n:4 duckorbit:2 duckattack:0 duckdepth:1 ]",
-  "[ 5/4 → 11/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 11/8 → 3/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 3/2 → 25/16 | s:bd n:4 duckorbit:2 duckattack:0 duckdepth:1 ]",
-  "[ 3/2 → 13/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 13/8 → 7/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 27/16 → 7/4 | s:bd n:4 duckorbit:2 duckattack:0 duckdepth:1 ]",
-  "[ 7/4 → 15/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 15/8 → 31/16 | s:bd n:4 duckorbit:2 duckattack:0 duckdepth:1 ]",
-  "[ 15/8 → 2/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 2/1 → 33/16 | s:bd n:4 duckorbit:2 duckattack:0.4 duckdepth:1 ]",
-  "[ 2/1 → 17/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 17/8 → 9/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 9/4 → 37/16 | s:bd n:4 duckorbit:2 duckattack:0.4 duckdepth:1 ]",
-  "[ 9/4 → 19/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 19/8 → 5/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 5/2 → 41/16 | s:bd n:4 duckorbit:2 duckattack:0.4 duckdepth:1 ]",
-  "[ 5/2 → 21/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 21/8 → 11/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 43/16 → 11/4 | s:bd n:4 duckorbit:2 duckattack:0.4 duckdepth:1 ]",
-  "[ 11/4 → 23/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 23/8 → 47/16 | s:bd n:4 duckorbit:2 duckattack:0.4 duckdepth:1 ]",
-  "[ 23/8 → 3/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 3/1 → 49/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 3/1 → 25/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 25/8 → 13/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 13/4 → 53/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 13/4 → 27/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 27/8 → 7/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 7/2 → 57/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 7/2 → 29/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 29/8 → 15/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 59/16 → 15/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 15/4 → 31/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 31/8 → 63/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 31/8 → 4/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-]
-`;
-
-exports[`runs examples > example "duckdepth" example index 0 1`] = `
-[
-  "[ 0/1 → 1/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 0/1 → 1/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/8 → 1/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/4 → 5/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 1/4 → 3/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 3/8 → 1/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/2 → 9/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 1/2 → 5/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 5/8 → 3/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 11/16 → 3/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 3/4 → 7/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 7/8 → 15/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 7/8 → 1/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/1 → 17/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.9 ]",
-  "[ 1/1 → 9/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 9/8 → 5/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 5/4 → 21/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.9 ]",
-  "[ 5/4 → 11/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 11/8 → 3/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 3/2 → 25/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.9 ]",
-  "[ 3/2 → 13/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 13/8 → 7/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 27/16 → 7/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.9 ]",
-  "[ 7/4 → 15/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 15/8 → 31/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.9 ]",
-  "[ 15/8 → 2/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 2/1 → 33/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.6 ]",
-  "[ 2/1 → 17/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 17/8 → 9/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 9/4 → 37/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.6 ]",
-  "[ 9/4 → 19/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 19/8 → 5/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 5/2 → 41/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.6 ]",
-  "[ 5/2 → 21/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 21/8 → 11/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 43/16 → 11/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.6 ]",
-  "[ 11/4 → 23/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 23/8 → 47/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.6 ]",
-  "[ 23/8 → 3/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 3/1 → 49/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0 ]",
-  "[ 3/1 → 25/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 25/8 → 13/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 13/4 → 53/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0 ]",
-  "[ 13/4 → 27/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 27/8 → 7/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 7/2 → 57/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0 ]",
-  "[ 7/2 → 29/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 29/8 → 15/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 59/16 → 15/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0 ]",
-  "[ 15/4 → 31/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 31/8 → 63/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0 ]",
-  "[ 31/8 → 4/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-]
-`;
-
-exports[`runs examples > example "duckorbit" example index 0 1`] = `
-[
-  "[ 0/1 → 1/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 1/4 → 5/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 1/2 → 9/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 11/16 → 3/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 7/8 → 15/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 1/1 → 17/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 5/4 → 21/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 3/2 → 25/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 27/16 → 7/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 15/8 → 31/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 2/1 → 33/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 9/4 → 37/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 5/2 → 41/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 43/16 → 11/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 23/8 → 47/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 3/1 → 49/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 13/4 → 53/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 7/2 → 57/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 59/16 → 15/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 31/8 → 63/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-]
-`;
-
 exports[`runs examples > example "duration" example index 0 1`] = `
 [
   "[ 0/1 → 1/4 | note:c s:piano duration:0.5 ]",
@@ -3845,144 +3706,6 @@ exports[`runs examples > example "fmsustain" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "fmwave" example index 0 1`] = `
-[
-  "[ 0/1 → 1/16 | note:D3 s:sine fmwave:sine fmi:4 fmh:2.01 ]",
-  "[ 1/16 → 1/8 | note:E3 s:sine fmwave:sine fmi:4 fmh:2.01 ]",
-  "[ 1/8 → 3/16 | note:F3 s:sine fmwave:sine fmi:4 fmh:2.01 ]",
-  "[ 3/16 → 1/4 | note:G3 s:sine fmwave:sine fmi:4 fmh:2.01 ]",
-  "[ 1/4 → 5/16 | note:D3 s:sine fmwave:sine fmi:4 fmh:2.01 ]",
-  "[ 5/16 → 3/8 | note:E3 s:sine fmwave:sine fmi:4 fmh:2.01 ]",
-  "[ 3/8 → 7/16 | note:F3 s:sine fmwave:sine fmi:4 fmh:2.01 ]",
-  "[ 7/16 → 1/2 | note:G3 s:sine fmwave:sine fmi:4 fmh:2.01 ]",
-  "[ 1/2 → 9/16 | note:D3 s:sine fmwave:sine fmi:4 fmh:2.01 ]",
-  "[ 9/16 → 5/8 | note:E3 s:sine fmwave:sine fmi:4 fmh:2.01 ]",
-  "[ 5/8 → 11/16 | note:F3 s:sine fmwave:sine fmi:4 fmh:2.01 ]",
-  "[ 11/16 → 3/4 | note:G3 s:sine fmwave:sine fmi:4 fmh:2.01 ]",
-  "[ 3/4 → 13/16 | note:D3 s:sine fmwave:sine fmi:4 fmh:2.01 ]",
-  "[ 13/16 → 7/8 | note:E3 s:sine fmwave:sine fmi:4 fmh:2.01 ]",
-  "[ 7/8 → 15/16 | note:F3 s:sine fmwave:sine fmi:4 fmh:2.01 ]",
-  "[ 15/16 → 1/1 | note:G3 s:sine fmwave:sine fmi:4 fmh:2.01 ]",
-  "[ 1/1 → 17/16 | note:D3 s:sine fmwave:square fmi:4 fmh:2.01 ]",
-  "[ 17/16 → 9/8 | note:E3 s:sine fmwave:square fmi:4 fmh:2.01 ]",
-  "[ 9/8 → 19/16 | note:F3 s:sine fmwave:square fmi:4 fmh:2.01 ]",
-  "[ 19/16 → 5/4 | note:G3 s:sine fmwave:square fmi:4 fmh:2.01 ]",
-  "[ 5/4 → 21/16 | note:D3 s:sine fmwave:square fmi:4 fmh:2.01 ]",
-  "[ 21/16 → 11/8 | note:E3 s:sine fmwave:square fmi:4 fmh:2.01 ]",
-  "[ 11/8 → 23/16 | note:F3 s:sine fmwave:square fmi:4 fmh:2.01 ]",
-  "[ 23/16 → 3/2 | note:G3 s:sine fmwave:square fmi:4 fmh:2.01 ]",
-  "[ 3/2 → 25/16 | note:D3 s:sine fmwave:square fmi:4 fmh:2.01 ]",
-  "[ 25/16 → 13/8 | note:E3 s:sine fmwave:square fmi:4 fmh:2.01 ]",
-  "[ 13/8 → 27/16 | note:F3 s:sine fmwave:square fmi:4 fmh:2.01 ]",
-  "[ 27/16 → 7/4 | note:G3 s:sine fmwave:square fmi:4 fmh:2.01 ]",
-  "[ 7/4 → 29/16 | note:D3 s:sine fmwave:square fmi:4 fmh:2.01 ]",
-  "[ 29/16 → 15/8 | note:E3 s:sine fmwave:square fmi:4 fmh:2.01 ]",
-  "[ 15/8 → 31/16 | note:F3 s:sine fmwave:square fmi:4 fmh:2.01 ]",
-  "[ 31/16 → 2/1 | note:G3 s:sine fmwave:square fmi:4 fmh:2.01 ]",
-  "[ 2/1 → 33/16 | note:D3 s:sine fmwave:sawtooth fmi:4 fmh:2.01 ]",
-  "[ 33/16 → 17/8 | note:E3 s:sine fmwave:sawtooth fmi:4 fmh:2.01 ]",
-  "[ 17/8 → 35/16 | note:F3 s:sine fmwave:sawtooth fmi:4 fmh:2.01 ]",
-  "[ 35/16 → 9/4 | note:G3 s:sine fmwave:sawtooth fmi:4 fmh:2.01 ]",
-  "[ 9/4 → 37/16 | note:D3 s:sine fmwave:sawtooth fmi:4 fmh:2.01 ]",
-  "[ 37/16 → 19/8 | note:E3 s:sine fmwave:sawtooth fmi:4 fmh:2.01 ]",
-  "[ 19/8 → 39/16 | note:F3 s:sine fmwave:sawtooth fmi:4 fmh:2.01 ]",
-  "[ 39/16 → 5/2 | note:G3 s:sine fmwave:sawtooth fmi:4 fmh:2.01 ]",
-  "[ 5/2 → 41/16 | note:D3 s:sine fmwave:sawtooth fmi:4 fmh:2.01 ]",
-  "[ 41/16 → 21/8 | note:E3 s:sine fmwave:sawtooth fmi:4 fmh:2.01 ]",
-  "[ 21/8 → 43/16 | note:F3 s:sine fmwave:sawtooth fmi:4 fmh:2.01 ]",
-  "[ 43/16 → 11/4 | note:G3 s:sine fmwave:sawtooth fmi:4 fmh:2.01 ]",
-  "[ 11/4 → 45/16 | note:D3 s:sine fmwave:sawtooth fmi:4 fmh:2.01 ]",
-  "[ 45/16 → 23/8 | note:E3 s:sine fmwave:sawtooth fmi:4 fmh:2.01 ]",
-  "[ 23/8 → 47/16 | note:F3 s:sine fmwave:sawtooth fmi:4 fmh:2.01 ]",
-  "[ 47/16 → 3/1 | note:G3 s:sine fmwave:sawtooth fmi:4 fmh:2.01 ]",
-  "[ 3/1 → 49/16 | note:D3 s:sine fmwave:crackle fmi:4 fmh:2.01 ]",
-  "[ 49/16 → 25/8 | note:E3 s:sine fmwave:crackle fmi:4 fmh:2.01 ]",
-  "[ 25/8 → 51/16 | note:F3 s:sine fmwave:crackle fmi:4 fmh:2.01 ]",
-  "[ 51/16 → 13/4 | note:G3 s:sine fmwave:crackle fmi:4 fmh:2.01 ]",
-  "[ 13/4 → 53/16 | note:D3 s:sine fmwave:crackle fmi:4 fmh:2.01 ]",
-  "[ 53/16 → 27/8 | note:E3 s:sine fmwave:crackle fmi:4 fmh:2.01 ]",
-  "[ 27/8 → 55/16 | note:F3 s:sine fmwave:crackle fmi:4 fmh:2.01 ]",
-  "[ 55/16 → 7/2 | note:G3 s:sine fmwave:crackle fmi:4 fmh:2.01 ]",
-  "[ 7/2 → 57/16 | note:D3 s:sine fmwave:crackle fmi:4 fmh:2.01 ]",
-  "[ 57/16 → 29/8 | note:E3 s:sine fmwave:crackle fmi:4 fmh:2.01 ]",
-  "[ 29/8 → 59/16 | note:F3 s:sine fmwave:crackle fmi:4 fmh:2.01 ]",
-  "[ 59/16 → 15/4 | note:G3 s:sine fmwave:crackle fmi:4 fmh:2.01 ]",
-  "[ 15/4 → 61/16 | note:D3 s:sine fmwave:crackle fmi:4 fmh:2.01 ]",
-  "[ 61/16 → 31/8 | note:E3 s:sine fmwave:crackle fmi:4 fmh:2.01 ]",
-  "[ 31/8 → 63/16 | note:F3 s:sine fmwave:crackle fmi:4 fmh:2.01 ]",
-  "[ 63/16 → 4/1 | note:G3 s:sine fmwave:crackle fmi:4 fmh:2.01 ]",
-]
-`;
-
-exports[`runs examples > example "fmwave" example index 1 1`] = `
-[
-  "[ 0/1 → 1/16 | note:50 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 1/16 → 1/8 | note:57 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 1/8 → 3/16 | note:62 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 3/16 → 1/4 | note:65 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 1/4 → 5/16 | note:50 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 5/16 → 3/8 | note:57 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 3/8 → 7/16 | note:62 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 7/16 → 1/2 | note:65 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 1/2 → 9/16 | note:50 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 9/16 → 5/8 | note:57 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 5/8 → 11/16 | note:62 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 11/16 → 3/4 | note:65 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 3/4 → 13/16 | note:50 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 13/16 → 7/8 | note:57 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 7/8 → 15/16 | note:62 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 15/16 → 1/1 | note:65 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 1/1 → 17/16 | note:57 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 17/16 → 9/8 | note:60 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 9/8 → 19/16 | note:64 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 19/16 → 5/4 | note:69 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 5/4 → 21/16 | note:57 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 21/16 → 11/8 | note:60 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 11/8 → 23/16 | note:64 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 23/16 → 3/2 | note:69 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 3/2 → 25/16 | note:57 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 25/16 → 13/8 | note:60 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 13/8 → 27/16 | note:64 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 27/16 → 7/4 | note:69 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 7/4 → 29/16 | note:57 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 29/16 → 15/8 | note:60 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 15/8 → 31/16 | note:64 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 31/16 → 2/1 | note:69 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 2/1 → 33/16 | note:53 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 33/16 → 17/8 | note:60 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 17/8 → 35/16 | note:65 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 35/16 → 9/4 | note:69 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 9/4 → 37/16 | note:53 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 37/16 → 19/8 | note:60 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 19/8 → 39/16 | note:65 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 39/16 → 5/2 | note:69 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 5/2 → 41/16 | note:53 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 41/16 → 21/8 | note:60 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 21/8 → 43/16 | note:65 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 43/16 → 11/4 | note:69 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 11/4 → 45/16 | note:53 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 45/16 → 23/8 | note:60 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 23/8 → 47/16 | note:65 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 47/16 → 3/1 | note:69 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 3/1 → 49/16 | note:55 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 49/16 → 25/8 | note:62 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 25/8 → 51/16 | note:67 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 51/16 → 13/4 | note:71 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 13/4 → 53/16 | note:55 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 53/16 → 27/8 | note:62 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 27/8 → 55/16 | note:67 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 55/16 → 7/2 | note:71 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 7/2 → 57/16 | note:55 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 57/16 → 29/8 | note:62 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 29/8 → 59/16 | note:67 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 59/16 → 15/4 | note:71 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 15/4 → 61/16 | note:55 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 61/16 → 31/8 | note:62 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 31/8 → 63/16 | note:67 s:sawtooth fmwave:brown fmi:0.6 ]",
-  "[ 63/16 → 4/1 | note:71 s:sawtooth fmwave:brown fmi:0.6 ]",
-]
-`;
-
 exports[`runs examples > example "focus" example index 0 1`] = `
 [
   "[ 0/1 → 1/8 | s:sd ]",
@@ -5424,40 +5147,6 @@ exports[`runs examples > example "lock" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "log" example index 0 1`] = `
-[
-  "[ 0/1 → 1/2 | s:bd ]",
-  "[ 1/2 → 1/1 | s:sd ]",
-  "[ 1/1 → 3/2 | s:bd ]",
-  "[ 3/2 → 2/1 | s:sd ]",
-  "[ 2/1 → 5/2 | s:bd ]",
-  "[ 5/2 → 3/1 | s:sd ]",
-  "[ 3/1 → 7/2 | s:bd ]",
-  "[ 7/2 → 4/1 | s:sd ]",
-]
-`;
-
-exports[`runs examples > example "logValues" example index 0 1`] = `
-[
-  "[ (0/1 → 1/3) ⇝ 1/2 | s:bd gain:0.25 n:2 ]",
-  "[ 0/1 ⇜ (1/3 → 1/2) | s:bd gain:0.5 n:1 ]",
-  "[ (1/2 → 2/3) ⇝ 1/1 | s:sd gain:0.5 n:1 ]",
-  "[ 1/2 ⇜ (2/3 → 1/1) | s:sd gain:1 n:0 ]",
-  "[ (1/1 → 4/3) ⇝ 3/2 | s:bd gain:0.25 n:2 ]",
-  "[ 1/1 ⇜ (4/3 → 3/2) | s:bd gain:0.5 n:1 ]",
-  "[ (3/2 → 5/3) ⇝ 2/1 | s:sd gain:0.5 n:1 ]",
-  "[ 3/2 ⇜ (5/3 → 2/1) | s:sd gain:1 n:0 ]",
-  "[ (2/1 → 7/3) ⇝ 5/2 | s:bd gain:0.25 n:2 ]",
-  "[ 2/1 ⇜ (7/3 → 5/2) | s:bd gain:0.5 n:1 ]",
-  "[ (5/2 → 8/3) ⇝ 3/1 | s:sd gain:0.5 n:1 ]",
-  "[ 5/2 ⇜ (8/3 → 3/1) | s:sd gain:1 n:0 ]",
-  "[ (3/1 → 10/3) ⇝ 7/2 | s:bd gain:0.25 n:2 ]",
-  "[ 3/1 ⇜ (10/3 → 7/2) | s:bd gain:0.5 n:1 ]",
-  "[ (7/2 → 11/3) ⇝ 4/1 | s:sd gain:0.5 n:1 ]",
-  "[ 7/2 ⇜ (11/3 → 4/1) | s:sd gain:1 n:0 ]",
-]
-`;
-
 exports[`runs examples > example "loop" example index 0 1`] = `
 [
   "[ 0/1 → 1/1 | s:casio loop:1 ]",
@@ -8923,54 +8612,51 @@ exports[`runs examples > example "setcpm" example index 0 1`] = `
 
 exports[`runs examples > example "shape" example index 0 1`] = `
 [
-  "[ 0/1 → 1/8 | s:hh shape:0 ]",
-  "[ 0/1 → 1/4 | s:bd shape:0 ]",
-  "[ 1/8 → 1/4 | s:hh shape:0 ]",
-  "[ 1/4 → 3/8 | s:hh shape:0 ]",
-  "[ 1/4 → 1/2 | s:sd shape:0 ]",
-  "[ 3/8 → 1/2 | s:hh shape:0 ]",
-  "[ 1/2 → 5/8 | s:hh shape:0 ]",
-  "[ 5/8 → 3/4 | s:bd shape:0 ]",
-  "[ 5/8 → 3/4 | s:hh shape:0 ]",
-  "[ 3/4 → 7/8 | s:hh shape:0 ]",
-  "[ 3/4 → 1/1 | s:sd shape:0 ]",
-  "[ 7/8 → 1/1 | s:hh shape:0 ]",
-  "[ 1/1 → 9/8 | s:hh shape:0.2 ]",
-  "[ 1/1 → 5/4 | s:bd shape:0.2 ]",
-  "[ 9/8 → 5/4 | s:hh shape:0.2 ]",
-  "[ 5/4 → 11/8 | s:hh shape:0.2 ]",
-  "[ 5/4 → 3/2 | s:sd shape:0.2 ]",
-  "[ 11/8 → 3/2 | s:hh shape:0.2 ]",
-  "[ 3/2 → 13/8 | s:hh shape:0.2 ]",
-  "[ 13/8 → 7/4 | s:bd shape:0.2 ]",
-  "[ 13/8 → 7/4 | s:hh shape:0.2 ]",
-  "[ 7/4 → 15/8 | s:hh shape:0.2 ]",
-  "[ 7/4 → 2/1 | s:sd shape:0.2 ]",
-  "[ 15/8 → 2/1 | s:hh shape:0.2 ]",
-  "[ 2/1 → 17/8 | s:hh shape:0.4 ]",
-  "[ 2/1 → 9/4 | s:bd shape:0.4 ]",
-  "[ 17/8 → 9/4 | s:hh shape:0.4 ]",
-  "[ 9/4 → 19/8 | s:hh shape:0.4 ]",
-  "[ 9/4 → 5/2 | s:sd shape:0.4 ]",
-  "[ 19/8 → 5/2 | s:hh shape:0.4 ]",
-  "[ 5/2 → 21/8 | s:hh shape:0.4 ]",
-  "[ 21/8 → 11/4 | s:bd shape:0.4 ]",
-  "[ 21/8 → 11/4 | s:hh shape:0.4 ]",
-  "[ 11/4 → 23/8 | s:hh shape:0.4 ]",
-  "[ 11/4 → 3/1 | s:sd shape:0.4 ]",
-  "[ 23/8 → 3/1 | s:hh shape:0.4 ]",
-  "[ 3/1 → 25/8 | s:hh shape:0.6 ]",
-  "[ 3/1 → 13/4 | s:bd shape:0.6 ]",
-  "[ 25/8 → 13/4 | s:hh shape:0.6 ]",
-  "[ 13/4 → 27/8 | s:hh shape:0.6 ]",
-  "[ 13/4 → 7/2 | s:sd shape:0.6 ]",
-  "[ 27/8 → 7/2 | s:hh shape:0.6 ]",
-  "[ 7/2 → 29/8 | s:hh shape:0.6 ]",
-  "[ 29/8 → 15/4 | s:bd shape:0.6 ]",
-  "[ 29/8 → 15/4 | s:hh shape:0.6 ]",
-  "[ 15/4 → 31/8 | s:hh shape:0.6 ]",
-  "[ 15/4 → 4/1 | s:sd shape:0.6 ]",
-  "[ 31/8 → 4/1 | s:hh shape:0.6 ]",
+  "[ 0/1 → 1/16 | s:909bd shape:2 shapetype:0 ]",
+  "[ 1/4 → 5/16 | s:909bd shape:2 shapetype:0 ]",
+  "[ 1/2 → 9/16 | s:909bd shape:2 shapetype:1 ]",
+  "[ 11/16 → 3/4 | s:909bd shape:2 shapetype:1 ]",
+  "[ 7/8 → 15/16 | s:909bd shape:2 shapetype:1 ]",
+  "[ 1/1 → 17/16 | s:909bd shape:4 shapetype:2 ]",
+  "[ 5/4 → 21/16 | s:909bd shape:4 shapetype:2 ]",
+  "[ 3/2 → 25/16 | s:909bd shape:4 shapetype:0 ]",
+  "[ 27/16 → 7/4 | s:909bd shape:4 shapetype:0 ]",
+  "[ 15/8 → 31/16 | s:909bd shape:4 shapetype:0 ]",
+  "[ 2/1 → 33/16 | s:909bd shape:1 shapetype:1 ]",
+  "[ 9/4 → 37/16 | s:909bd shape:1 shapetype:1 ]",
+  "[ 5/2 → 41/16 | s:909bd shape:1 shapetype:2 ]",
+  "[ 43/16 → 11/4 | s:909bd shape:1 shapetype:2 ]",
+  "[ 23/8 → 47/16 | s:909bd shape:1 shapetype:2 ]",
+  "[ 3/1 → 49/16 | s:909bd shape:2 shapetype:0 ]",
+  "[ 13/4 → 53/16 | s:909bd shape:2 shapetype:0 ]",
+  "[ 7/2 → 57/16 | s:909bd shape:2 shapetype:1 ]",
+  "[ 59/16 → 15/4 | s:909bd shape:2 shapetype:1 ]",
+  "[ 31/8 → 63/16 | s:909bd shape:2 shapetype:1 ]",
+]
+`;
+
+exports[`runs examples > example "shapetype" example index 0 1`] = `
+[
+  "[ 0/1 → 1/16 | s:909bd shape:2 shapetype:0 ]",
+  "[ 1/4 → 5/16 | s:909bd shape:2 shapetype:0 ]",
+  "[ 1/2 → 9/16 | s:909bd shape:2 shapetype:0 ]",
+  "[ 11/16 → 3/4 | s:909bd shape:2 shapetype:0 ]",
+  "[ 7/8 → 15/16 | s:909bd shape:2 shapetype:0 ]",
+  "[ 1/1 → 17/16 | s:909bd shape:2 shapetype:1 ]",
+  "[ 5/4 → 21/16 | s:909bd shape:2 shapetype:1 ]",
+  "[ 3/2 → 25/16 | s:909bd shape:2 shapetype:1 ]",
+  "[ 27/16 → 7/4 | s:909bd shape:2 shapetype:1 ]",
+  "[ 15/8 → 31/16 | s:909bd shape:2 shapetype:1 ]",
+  "[ 2/1 → 33/16 | s:909bd shape:2 shapetype:2 ]",
+  "[ 9/4 → 37/16 | s:909bd shape:2 shapetype:2 ]",
+  "[ 5/2 → 41/16 | s:909bd shape:2 shapetype:2 ]",
+  "[ 43/16 → 11/4 | s:909bd shape:2 shapetype:2 ]",
+  "[ 23/8 → 47/16 | s:909bd shape:2 shapetype:2 ]",
+  "[ 3/1 → 49/16 | s:909bd shape:2 shapetype:0 ]",
+  "[ 13/4 → 53/16 | s:909bd shape:2 shapetype:0 ]",
+  "[ 7/2 → 57/16 | s:909bd shape:2 shapetype:0 ]",
+  "[ 59/16 → 15/4 | s:909bd shape:2 shapetype:0 ]",
+  "[ 31/8 → 63/16 | s:909bd shape:2 shapetype:0 ]",
 ]
 `;
 

website/public/uzu-drumkit.json

@@ -1,76 +0,0 @@
-{
-    "_base": "https://raw.githubusercontent.com/tidalcycles/uzu-drumkit/main/",
-    "bd": [
-      "bd/10_bd_switchangel.wav",
-      "bd/11_bd_mot4i.wav",
-      "bd/12_bd_mot4i.wav",
-      "bd/13_bd_mot4i.wav",
-      "bd/14_bd_switchangel.wav",
-      "bd/15_bd_switchangel.wav",
-      "bd/16_bd_switchangel.wav",
-      "bd/17_bd_switchangel.wav"
-    ],
-    "brk": [
-      "brk/10_break_amen_pprocessed.wav"
-    ],
-    "cb": [
-      "cb/10_perc_switchangel.wav"
-    ],
-    "cp": [
-      "cp/10_cp_switchangel.wav",
-      "cp/11_cp_mot4i.wav"
-    ],
-    "cr": [
-      "cr/10_cr_switchangel.wav",
-      "cr/11_cr_mot4i.wav"
-    ],
-    "hh": [
-      "hh/10_hh_switchangel.wav",
-      "hh/11_hh_mot4i.wav",
-      "hh/12_hh_switchangel.wav",
-      "hh/13_hh_switchangel.wav",
-      "hh/14_hh_mot4i.wav"
-    ],
-    "ht": [
-      "ht/10_ht_mot4i.wav"
-    ],
-    "lt": [
-      "lt/10_lt_mot4i.wav"
-    ],
-    "misc": [
-      "misc/10_misc_switchangel_ludens.wav",
-      "misc/11_misc_switchangel_ludens.wav",
-      "misc/12_misc_switchangel_ludens.wav",
-      "misc/13_misc_switchangel_ludens.wav",
-      "misc/14_misc_switchangel_ludens.wav"
-    ],
-    "mt": [
-      "mt/10_mt_mot4i.wav"
-    ],
-    "oh": [
-      "oh/10_oh_switchangel.wav",
-      "oh/11_oh_switchangel.wav",
-      "oh/12_oh_switchangel.wav",
-      "oh/13_oh_switchangel.wav"
-    ],
-    "rd": [
-      "rd/10_rd_switchangel.wav"
-    ],
-    "rim": [
-      "rim/10_rim_switchangel.wav",
-      "rim/11_rim_switch_angel.wav"
-    ],
-    "sd": [
-      "sd/10_sd_switchangel-bounce-2.wav",
-      "sd/11_sd_switchangel_3.wav",
-      "sd/12_sd_switchangel_2.wav",
-      "sd/13_sd_switchangel_2.wav",
-      "sd/14_sd.wav"
-    ],
-    "sh": [
-      "sh/10_sh_switchangel.wav"
-    ],
-    "tb": [
-      "tb/10_tb.wav"
-    ]
-  }

website/src/repl/components/panel/PatternsTab.jsx

@@ -125,7 +125,7 @@ function UserPatterns({ context }) {
             style={{ display: 'none' }}
             type="file"
             multiple
-            accept="text/plain,text/x-markdown,application/json"
+            accept="text/plain,application/json"
             onChange={(e) => importPatterns(e.target.files)}
           />
           import

website/src/repl/prebake.mjs

@@ -28,7 +28,7 @@ export async function prebake() {
       prebake: true,
       tag: 'drum-machines',
     }),
-    samples(`${baseNoTrailing}/uzu-drumkit.json`, undefined, {
+    samples(`https://raw.githubusercontent.com/tidalcycles/uzu-drumkit/main/strudel.json`, undefined, {
       prebake: true,
       tag: 'drum-machines',
     }),

website/src/user_pattern_utils.mjs

@@ -197,7 +197,7 @@ export async function importPatterns(fileList) {
       if (file.type === 'application/json') {
         const userPatterns = userPattern.getAll();
         setUserPatterns({ ...userPatterns, ...parseJSON(content) });
-      } else if (['text/x-markdown', 'text/plain'].includes(file.type)) {
+      } else if (file.type === 'text/plain') {
         const id = file.name.replace(/\.[^/.]+$/, '');
         userPattern.update(id, { code: content });
       }