two algos

packages/core/controls.mjs

@@ -160,18 +160,6 @@ export const { velocity } = registerControl('velocity');
  *
  */
 export const { gain } = registerControl('gain');
-
-/**
- * Applies a linear gain adjustment
- *
- * @name gainlinear
- * @synonyms gainlin
- * @param {number | Pattern} amount gainlin
- * @example
- * s("hh*8").gainlin(".4!2 1 .4!2 1 .4 1").fast(2)
- *
- */
-export const { gainlinear, gainlin } = registerControl('gainlinear', 'gainlin');
 /**
  * Gain applied after all effects have been processed.
  *
@@ -264,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.
  *
@@ -552,42 +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
- * 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))
- *
- */
-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
  *
@@ -1547,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/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/repl.mjs

@@ -138,9 +138,9 @@ export function repl({
         // allows muting a pattern x with x_ or _x
         return silence;
       }
-      if (id.includes('$')) {
+      if (id === '$') {
         // allows adding anonymous patterns with $:
-        id = `${id}${anonymousIndex}`;
+        id = `$${anonymousIndex}`;
         anonymousIndex++;
       }
       pPatterns[id] = this;
@@ -201,13 +201,6 @@ export function repl({
       let { pattern, meta } = await _evaluate(code, transpiler, transpilerOptions);
       if (Object.keys(pPatterns).length) {
         let patterns = Object.values(pPatterns);
-
-        // if there are solo patterns, only use those
-        const soloPatterns = Object.entries(pPatterns).filter(([key]) => key.length > 1 && key.startsWith('S'));
-        if (soloPatterns.length) {
-          patterns = Object.values(Object.fromEntries(soloPatterns));
-        }
-
         if (eachTransform) {
           // Explicit lambda so only element (not index and array) are passed
           patterns = patterns.map((x) => eachTransform(x));

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();
@@ -219,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
@@ -288,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 } 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;
@@ -42,7 +42,7 @@ export function registerSound(key, onTrigger, data = {}) {
   soundMap.setKey(key, { onTrigger, data });
 }
 
-let gainCurveFunc = (val) => Math.pow(val, 2);
+let gainCurveFunc = (val) => val;
 
 export function applyGainCurve(val) {
   return gainCurveFunc(val);
@@ -135,7 +135,7 @@ export const getAudioDevices = async () => {
 
 let defaultDefaultValues = {
   s: 'triangle',
-  gain: 1,
+  gain: 0.8,
   postgain: 1,
   density: '.03',
   ftype: '12db',
@@ -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,67 +413,31 @@ function getFilterType(ftype) {
   return typeof ftype === 'number' ? filterTypes[Math.floor(_mod(ftype, filterTypes.length))] : ftype;
 }
 
-//type orbit {
-// gain: number,
-// reverbNode: reverbNode
-// 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(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;
-    }
-    orbits[target].gain.gain.cancelAndHoldAtTime(t);
-    const currVal = orbits[target].gain.gain.value;
-    orbits[target].gain.gain.setValueAtTime(currVal, t);
-    orbits[target].gain.gain.linearRampToValueAtTime(clamp(1 - Math.pow(duckdepth, 0.5), 0.01, currVal), t + 0.002);
-    orbits[target].gain.gain.exponentialRampToValueAtTime(1, t + Math.max(0.002, attacktime));
-  });
-}
-
+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 = {},
@@ -501,7 +480,8 @@ function effectSend(input, effect, wet) {
 }
 
 export function resetGlobalEffects() {
-  orbits = {};
+  delays = {};
+  reverbs = {};
   analysers = {};
   analysersData = {};
 }
@@ -552,12 +532,8 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     bank,
     source,
     gain = getDefaultValue('gain'),
-    gainlinear,
     postgain = getDefaultValue('postgain'),
     density = getDefaultValue('density'),
-    duckorbit,
-    duckattack,
-    duckdepth,
     // filters
     fanchor = getDefaultValue('fanchor'),
     drive = 0.69,
@@ -596,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,
@@ -630,14 +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(duckorbit, t, duckattack, duckdepth);
-  }
 
   gain = applyGainCurve(nanFallback(gain, 1));
   postgain = applyGainCurve(postgain);
@@ -647,9 +616,6 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   velocity = applyGainCurve(velocity);
   tremolodepth = applyGainCurve(tremolodepth);
   gain *= velocity; // velocity currently only multiplies with gain. it might do other things in the future
-  if (gainlinear != null) {
-    gain *= gainlinear;
-  }
 
   const end = t + hapDuration;
   const endWithRelease = end + release;
@@ -705,13 +671,21 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     logger('[webaudio] skip hap: still loading', ac.currentTime - t);
     return;
   }
-  let chain = []; // audio nodes that will be connected to each other sequentially
+  const chain = []; // audio nodes that will be connected to each other sequentially
   chain.push(sourceNode);
   stretch !== undefined && chain.push(getWorklet(ac, 'phase-vocoder-processor', { pitchFactor: stretch }));
 
   // 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) {
@@ -777,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) {
@@ -827,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;
@@ -861,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);
 

test/__snapshots__/examples.test.mjs.snap

@@ -3036,177 +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 ]",
-  "[ 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: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.2 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.2 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.2 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.2 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.2 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.2 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.2 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.2 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.2 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 "duration" example index 0 1`] = `
 [
   "[ 0/1 → 1/4 | note:c s:piano duration:0.5 ]",
@@ -3877,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 ]",
@@ -4274,75 +3965,6 @@ exports[`runs examples > example "gain" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "gainlinear" example index 0 1`] = `
-[
-  "[ 0/1 → 1/16 | s:hh gainlinear:0.4 ]",
-  "[ 1/16 → 1/8 | s:hh gainlinear:0.4 ]",
-  "[ 1/8 → 3/16 | s:hh gainlinear:1 ]",
-  "[ 3/16 → 1/4 | s:hh gainlinear:0.4 ]",
-  "[ 1/4 → 5/16 | s:hh gainlinear:0.4 ]",
-  "[ 5/16 → 3/8 | s:hh gainlinear:1 ]",
-  "[ 3/8 → 7/16 | s:hh gainlinear:0.4 ]",
-  "[ 7/16 → 1/2 | s:hh gainlinear:1 ]",
-  "[ 1/2 → 9/16 | s:hh gainlinear:0.4 ]",
-  "[ 9/16 → 5/8 | s:hh gainlinear:0.4 ]",
-  "[ 5/8 → 11/16 | s:hh gainlinear:1 ]",
-  "[ 11/16 → 3/4 | s:hh gainlinear:0.4 ]",
-  "[ 3/4 → 13/16 | s:hh gainlinear:0.4 ]",
-  "[ 13/16 → 7/8 | s:hh gainlinear:1 ]",
-  "[ 7/8 → 15/16 | s:hh gainlinear:0.4 ]",
-  "[ 15/16 → 1/1 | s:hh gainlinear:1 ]",
-  "[ 1/1 → 17/16 | s:hh gainlinear:0.4 ]",
-  "[ 17/16 → 9/8 | s:hh gainlinear:0.4 ]",
-  "[ 9/8 → 19/16 | s:hh gainlinear:1 ]",
-  "[ 19/16 → 5/4 | s:hh gainlinear:0.4 ]",
-  "[ 5/4 → 21/16 | s:hh gainlinear:0.4 ]",
-  "[ 21/16 → 11/8 | s:hh gainlinear:1 ]",
-  "[ 11/8 → 23/16 | s:hh gainlinear:0.4 ]",
-  "[ 23/16 → 3/2 | s:hh gainlinear:1 ]",
-  "[ 3/2 → 25/16 | s:hh gainlinear:0.4 ]",
-  "[ 25/16 → 13/8 | s:hh gainlinear:0.4 ]",
-  "[ 13/8 → 27/16 | s:hh gainlinear:1 ]",
-  "[ 27/16 → 7/4 | s:hh gainlinear:0.4 ]",
-  "[ 7/4 → 29/16 | s:hh gainlinear:0.4 ]",
-  "[ 29/16 → 15/8 | s:hh gainlinear:1 ]",
-  "[ 15/8 → 31/16 | s:hh gainlinear:0.4 ]",
-  "[ 31/16 → 2/1 | s:hh gainlinear:1 ]",
-  "[ 2/1 → 33/16 | s:hh gainlinear:0.4 ]",
-  "[ 33/16 → 17/8 | s:hh gainlinear:0.4 ]",
-  "[ 17/8 → 35/16 | s:hh gainlinear:1 ]",
-  "[ 35/16 → 9/4 | s:hh gainlinear:0.4 ]",
-  "[ 9/4 → 37/16 | s:hh gainlinear:0.4 ]",
-  "[ 37/16 → 19/8 | s:hh gainlinear:1 ]",
-  "[ 19/8 → 39/16 | s:hh gainlinear:0.4 ]",
-  "[ 39/16 → 5/2 | s:hh gainlinear:1 ]",
-  "[ 5/2 → 41/16 | s:hh gainlinear:0.4 ]",
-  "[ 41/16 → 21/8 | s:hh gainlinear:0.4 ]",
-  "[ 21/8 → 43/16 | s:hh gainlinear:1 ]",
-  "[ 43/16 → 11/4 | s:hh gainlinear:0.4 ]",
-  "[ 11/4 → 45/16 | s:hh gainlinear:0.4 ]",
-  "[ 45/16 → 23/8 | s:hh gainlinear:1 ]",
-  "[ 23/8 → 47/16 | s:hh gainlinear:0.4 ]",
-  "[ 47/16 → 3/1 | s:hh gainlinear:1 ]",
-  "[ 3/1 → 49/16 | s:hh gainlinear:0.4 ]",
-  "[ 49/16 → 25/8 | s:hh gainlinear:0.4 ]",
-  "[ 25/8 → 51/16 | s:hh gainlinear:1 ]",
-  "[ 51/16 → 13/4 | s:hh gainlinear:0.4 ]",
-  "[ 13/4 → 53/16 | s:hh gainlinear:0.4 ]",
-  "[ 53/16 → 27/8 | s:hh gainlinear:1 ]",
-  "[ 27/8 → 55/16 | s:hh gainlinear:0.4 ]",
-  "[ 55/16 → 7/2 | s:hh gainlinear:1 ]",
-  "[ 7/2 → 57/16 | s:hh gainlinear:0.4 ]",
-  "[ 57/16 → 29/8 | s:hh gainlinear:0.4 ]",
-  "[ 29/8 → 59/16 | s:hh gainlinear:1 ]",
-  "[ 59/16 → 15/4 | s:hh gainlinear:0.4 ]",
-  "[ 15/4 → 61/16 | s:hh gainlinear:0.4 ]",
-  "[ 61/16 → 31/8 | s:hh gainlinear:1 ]",
-  "[ 31/8 → 63/16 | s:hh gainlinear:0.4 ]",
-  "[ 63/16 → 4/1 | s:hh gainlinear:1 ]",
-]
-`;
-
 exports[`runs examples > example "gap" example index 0 1`] = `[]`;
 
 exports[`runs examples > example "grow" example index 0 1`] = `
@@ -8990,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/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/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 });
       }