snapshot

Reinstate slice/splice, fixing up "unit" param using new global cps

package.json

@@ -46,14 +46,15 @@
   },
   "homepage": "https://strudel.tidalcycles.org",
   "dependencies": {
-    "dependency-tree": "^9.0.0",
-    "vitest": "^0.25.7",
     "@strudel.cycles/core": "workspace:*",
     "@strudel.cycles/mini": "workspace:*",
     "@strudel.cycles/tonal": "workspace:*",
     "@strudel.cycles/transpiler": "workspace:*",
     "@strudel.cycles/webaudio": "workspace:*",
-    "@strudel.cycles/xen": "workspace:*"
+    "@strudel.cycles/xen": "workspace:*",
+    "acorn": "^8.8.1",
+    "dependency-tree": "^9.0.0",
+    "vitest": "^0.25.7"
   },
   "devDependencies": {
     "@vitest/ui": "^0.25.7",

packages/core/controls.mjs

@@ -4,7 +4,7 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 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 { Pattern, sequence, registerControl } from './pattern.mjs';
+import { Pattern, sequence } from './pattern.mjs';
 
 const controls = {};
 const generic_params = [
@@ -13,11 +13,12 @@ const generic_params = [
    *
    * @name s
    * @param {string | Pattern} sound The sound / pattern of sounds to pick
+   * @synonyms sound
    * @example
    * s("bd hh")
    *
    */
-  ['s', 's', 'sound'],
+  ['s', 'sound'],
   /**
    * Selects the given index from the sample map.
    * Numbers too high will wrap around.
@@ -29,7 +30,7 @@ const generic_params = [
    * s("bd sd,hh*3").n("<0 1>")
    */
   // also see https://github.com/tidalcycles/strudel/pull/63
-  ['f', 'n', 'The sample number to choose for a synth or sampleset'],
+  ['n'],
   /**
    * Plays the given note name or midi number. A note name consists of
    *
@@ -49,10 +50,8 @@ const generic_params = [
    * @example
    * note("60 69 65 64")
    */
-  ['f', 'note', 'The note or pitch to play a sound or synth with'],
-  //['s', 'toArg', 'for internal sound routing'],
-  // ["f", "from", "for internal sound routing"),
-  //['f', 'to', 'for internal sound routing'],
+  ['note'],
+
   /**
    * A pattern of numbers that speed up (or slow down) samples while they play. Currently only supported by osc / superdirt.
    *
@@ -63,7 +62,7 @@ const generic_params = [
    * s("sax").accelerate("<0 1 2 4 8 16>").slow(2).osc()
    *
    */
-  ['f', 'accelerate', 'a pattern of numbers that speed up (or slow down) samples while they play.'],
+  ['accelerate'],
   /**
    * Controls the gain by an exponential amount.
    *
@@ -73,11 +72,7 @@ const generic_params = [
    * s("hh*8").gain(".4!2 1 .4!2 1 .4 1")
    *
    */
-  [
-    'f',
-    'gain',
-    'a pattern of numbers that specify volume. Values less than 1 make the sound quieter. Values greater than 1 make the sound louder. For the linear equivalent, see @amp@.',
-  ],
+  ['gain'],
   /**
    * Like {@link gain}, but linear.
    *
@@ -88,17 +83,18 @@ const generic_params = [
    * s("bd*8").amp(".1*2 .5 .1*2 .5 .1 .5").osc()
    *
    */
-  ['f', 'amp', 'like @gain@, but linear.'],
+  ['amp'],
   /**
    * Amplitude envelope attack time: Specifies how long it takes for the sound to reach its peak value, relative to the onset.
    *
    * @name attack
    * @param {number | Pattern} attack time in seconds.
+   * @synonyms att
    * @example
    * note("c3 e3").attack("<0 .1 .5>")
    *
    */
-  ['f', 'attack'],
+  ['attack', 'att'],
 
   /**
    * Select the sound bank to use. To be used together with `s`. The bank name (+ "_") will be prepended to the value of `s`.
@@ -109,7 +105,7 @@ const generic_params = [
    * s("bd sd").bank('RolandTR909') // = s("RolandTR909_bd RolandTR909_sd")
    *
    */
-  ['f', 'bank', 'selects sound bank to use'],
+  ['bank'],
 
   /**
    * Amplitude envelope decay time: the time it takes after the attack time to reach the sustain level.
@@ -121,36 +117,30 @@ const generic_params = [
    * note("c3 e3").decay("<.1 .2 .3 .4>").sustain(0)
    *
    */
-  ['f', 'decay', ''],
+  ['decay'],
   /**
    * Amplitude envelope sustain level: The level which is reached after attack / decay, being sustained until the offset.
    *
    * @name sustain
    * @param {number | Pattern} gain sustain level between 0 and 1
+   * @synonyms sus
    * @example
    * note("c3 e3").decay(.2).sustain("<0 .1 .4 .6 1>")
    *
    */
-  ['f', 'sustain', ''],
+  ['sustain', 'sus'],
   /**
    * Amplitude envelope release time: The time it takes after the offset to go from sustain level to zero.
    *
    * @name release
    * @param {number | Pattern} time release time in seconds
+   * @synonyms rel
    * @example
    * note("c3 e3 g3 c4").release("<0 .1 .4 .6 1>/2")
    *
    */
-  [
-    'f',
-    'release',
-    'a pattern of numbers to specify the release time (in seconds) of an envelope applied to each sample.',
-  ],
-  [
-    'f',
-    'hold',
-    'a pattern of numbers to specify the hold time (in seconds) of an envelope applied to each sample. Only takes effect if `attack` and `release` are also specified.',
-  ],
+  ['release', 'rel'],
+  ['hold'],
   // TODO: in tidal, it seems to be normalized
   /**
    * Sets the center frequency of the **b**and-**p**ass **f**ilter.
@@ -162,8 +152,9 @@ const generic_params = [
    * s("bd sd,hh*3").bpf("<1000 2000 4000 8000>")
    *
    */
-  ['f', 'bpf', ''],
-  ['f', 'bandf', 'A pattern of numbers from 0 to 1. Sets the center frequency of the band-pass filter.'],
+  // currently an alias of 'bandf' https://github.com/tidalcycles/strudel/issues/496
+  // ['bpf'],
+  ['bandf', 'bpf'],
   // TODO: in tidal, it seems to be normalized
   /**
    * Sets the **b**and-**p**ass **q**-factor (resonance)
@@ -175,8 +166,9 @@ const generic_params = [
    * s("bd sd").bpf(500).bpq("<0 1 2 3>")
    *
    */
-  ['f', 'bpq', ''],
-  ['f', 'bandq', 'a pattern of anumbers from 0 to 1. Sets the q-factor of the band-pass filter.'],
+  // currently an alias of 'bandq' https://github.com/tidalcycles/strudel/issues/496
+  // ['bpq'],
+  ['bandq', 'bpq'],
   /**
    * a pattern of numbers from 0 to 1. Skips the beginning of each sample, e.g. `0.25` to cut off the first quarter from each sample.
    *
@@ -188,11 +180,7 @@ const generic_params = [
    * s("rave").begin("<0 .25 .5 .75>")
    *
    */
-  [
-    'f',
-    'begin',
-    'a pattern of numbers from 0 to 1. Skips the beginning of each sample, e.g. `0.25` to cut off the first quarter from each sample.',
-  ],
+  ['begin'],
   /**
    * The same as .begin, but cuts off the end off each sample.
    *
@@ -203,22 +191,35 @@ const generic_params = [
    * s("bd*2,oh*4").end("<.1 .2 .5 1>")
    *
    */
-  [
-    'f',
-    'end',
-    'the same as `begin`, but cuts the end off samples, shortening them; e.g. `0.75` to cut off the last quarter of each sample.',
-  ],
+  ['end'],
   /**
-   * Loops the sample (from `begin` to `end`) the specified number of times.
-   * Note that the tempo of the loop is not synced with the cycle tempo.
+   * Loops the sample from `loopBegin` to `loopEnd`. If one or both of those are set,
+   * the sample is looped to fill the event duration, instead of playing the whole sample.
+   * If only `loopBegin` is set, `loopEnd` defaults to 1.
+   * If only `loopEnd` is set, `loopBegin` defaults to 0.
    *
-   * @name loop
-   * @param {number | Pattern} times How often the sample is looped
+   * @name loopBegin
+   * @param {number | Pattern} position position from 0 - 1 where the loop starts
    * @example
-   * s("bd").loop("<1 2 3 4>").osc()
+   * note("<c a f e>").s("piano")
+   * .loopBegin("<0 .24 .32>").loopEnd(.5)
    *
    */
-  ['f', 'loop', 'loops the sample (from `begin` to `end`) the specified number of times.'],
+  ['loopBegin'],
+  /**
+   * Loops the sample from `loopBegin` to `loopEnd`. If one or both of those are set,
+   * the sample is looped to fill the event duration, instead of playing the whole sample.
+   * If only `loopBegin` is set, `loopEnd` defaults to 1.
+   * If only `loopEnd` is set, `loopBegin` defaults to 0.
+   *
+   * @name loopEnd
+   * @param {number | Pattern} position position from 0 - 1 where the loop ends
+   * @example
+   * note("<c a f e>").s("piano")
+   * .loopBegin(.2).loopEnd("<.3 .4 .5 .6>")
+   *
+   */
+  ['loopEnd'],
   // TODO: currently duplicated with "native" legato
   // TODO: superdirt legato will do more: https://youtu.be/dQPmE1WaD1k?t=419
   /**
@@ -230,8 +231,8 @@ const generic_params = [
    * "c4 eb4 g4 bb4".legato("<0.125 .25 .5 .75 1 2 4>")
    *
    */
-  // ['f', 'legato', 'controls the amount of overlap between two adjacent sounds'],
-  // ['f', 'clhatdecay', ''],
+  // ['legato'],
+  // ['clhatdecay'],
   /**
    * bit crusher effect.
    *
@@ -241,11 +242,7 @@ const generic_params = [
    * s("<bd sd>,hh*3").fast(2).crush("<16 8 7 6 5 4 3 2>")
    *
    */
-  [
-    'f',
-    'crush',
-    'bit crushing, a pattern of numbers from 1 (for drastic reduction in bit-depth) to 16 (for barely no reduction).',
-  ],
+  ['crush'],
   /**
    * fake-resampling for lowering the sample rate. Caution: This effect seems to only work in chromium based browsers
    *
@@ -255,11 +252,7 @@ const generic_params = [
    * s("bd sd,hh*4").coarse("<1 4 8 16 32>")
    *
    */
-  [
-    'f',
-    'coarse',
-    'fake-resampling, a pattern of numbers for lowering the sample rate, i.e. 1 for original 2 for half, 3 for a third and so on.',
-  ],
+  ['coarse'],
 
   /**
    * choose the channel the pattern is sent to in superdirt
@@ -268,7 +261,7 @@ const generic_params = [
    * @param {number | Pattern} channel channel number
    *
    */
-  ['i', 'channel', 'choose the channel the pattern is sent to in superdirt'],
+  ['channel'],
   /**
    * In the style of classic drum-machines, `cut` will stop a playing sample as soon as another samples with in same cutgroup is to be played. An example would be an open hi-hat followed by a closed one, essentially muting the open.
    *
@@ -278,23 +271,18 @@ const generic_params = [
    * s("rd*4").cut(1)
    *
    */
-  [
-    'i',
-    'cut',
-    'In the style of classic drum-machines, `cut` will stop a playing sample as soon as another samples with in same cutgroup is to be played. An example would be an open hi-hat followed by a closed one, essentially muting the open.',
-  ],
+  ['cut'],
   /**
    * Applies the cutoff frequency of the **l**ow-**p**ass **f**ilter.
    *
    * @name lpf
    * @param {number | Pattern} frequency audible between 0 and 20000
-   * @synonyms cutoff
+   * @synonyms cutoff, ctf
    * @example
    * s("bd sd,hh*3").lpf("<4000 2000 1000 500 200 100>")
    *
    */
-  ['f', 'lpf'],
-  ['f', 'cutoff', 'a pattern of numbers from 0 to 1. Applies the cutoff frequency of the low-pass filter.'],
+  ['cutoff', 'ctf', 'lpf'],
   /**
    * Applies the cutoff frequency of the **h**igh-**p**ass **f**ilter.
    *
@@ -305,8 +293,9 @@ const generic_params = [
    * s("bd sd,hh*4").hpf("<4000 2000 1000 500 200 100>")
    *
    */
-  ['f', 'hpf', ''],
-  ['f', 'hcutoff', ''],
+  // currently an alias of 'hcutoff' https://github.com/tidalcycles/strudel/issues/496
+  // ['hpf'],
+  ['hcutoff', 'hpf'],
   /**
    * Controls the **h**igh-**p**ass **q**-value.
    *
@@ -317,8 +306,7 @@ const generic_params = [
    * s("bd sd,hh*4").hpf(2000).hpq("<0 10 20 30>")
    *
    */
-  ['f', 'hresonance', ''],
-  ['f', 'hpq', ''],
+  ['hresonance', 'hpq'],
   /**
    * Controls the **l**ow-**p**ass **q**-value.
    *
@@ -329,8 +317,8 @@ const generic_params = [
    * s("bd sd,hh*4").lpf(2000).lpq("<0 10 20 30>")
    *
    */
-  ['f', 'lpq'],
-  ['f', 'resonance', ''],
+  // currently an alias of 'resonance' https://github.com/tidalcycles/strudel/issues/496
+  ['resonance', 'lpq'],
   /**
    * DJ filter, below 0.5 is low pass filter, above is high pass filter.
    *
@@ -340,8 +328,8 @@ const generic_params = [
    * n("0 3 7 [10,24]").s('superzow').octave(3).djf("<.5 .25 .5 .75>").osc()
    *
    */
-  ['f', 'djf', 'DJ filter, below 0.5 is low pass filter, above is high pass filter.'],
-  // ['f', 'cutoffegint', ''],
+  ['djf'],
+  // ['cutoffegint'],
   // TODO: does not seem to work
   /**
    * Sets the level of the delay signal.
@@ -352,28 +340,30 @@ const generic_params = [
    * s("bd").delay("<0 .25 .5 1>")
    *
    */
-  ['f', 'delay', 'a pattern of numbers from 0 to 1. Sets the level of the delay signal.'],
+  ['delay'],
   /**
    * Sets the level of the signal that is fed back into the delay.
    * Caution: Values >= 1 will result in a signal that gets louder and louder! Don't do it
    *
    * @name delayfeedback
    * @param {number | Pattern} feedback between 0 and 1
+   * @synonyms delayfb, dfb
    * @example
    * s("bd").delay(.25).delayfeedback("<.25 .5 .75 1>").slow(2)
    *
    */
-  ['f', 'delayfeedback', 'a pattern of numbers from 0 to 1. Sets the amount of delay feedback.'],
+  ['delayfeedback', 'delayfb', 'dfb'],
   /**
    * Sets the time of the delay effect.
    *
    * @name delaytime
    * @param {number | Pattern} seconds between 0 and Infinity
+   * @synonyms delayt, dt
    * @example
    * s("bd").delay(.25).delaytime("<.125 .25 .5 1>").slow(2)
    *
    */
-  ['f', 'delaytime', 'a pattern of numbers from 0 to 1. Sets the length of the delay.'],
+  ['delaytime', 'delayt', 'dt'],
   /* // TODO: test
    * Specifies whether delaytime is calculated relative to cps.
    *
@@ -383,22 +373,19 @@ const generic_params = [
    * s("sd").delay().lock(1).osc()
    *
    */
-  [
-    'f',
-    'lock',
-    'A pattern of numbers. Specifies whether delaytime is calculated relative to cps. When set to 1, delaytime is a direct multiple of a cycle.',
-  ],
+  ['lock'],
   /**
    * Set detune of oscillators. Works only with some synths, see <a target="_blank" href="https://tidalcycles.org/docs/patternlib/tutorials/synthesizers">tidal doc</a>
    *
    * @name detune
    * @param {number | Pattern} amount between 0 and 1
+   * @synonyms det
    * @superdirtOnly
    * @example
    * n("0 3 7").s('superzow').octave(3).detune("<0 .25 .5 1 2>").osc()
    *
    */
-  ['f', 'detune', ''],
+  ['detune', 'det'],
   /**
    * Set dryness of reverb. See {@link room} and {@link size} for more information about reverb.
    *
@@ -409,11 +396,7 @@ const generic_params = [
    * @superdirtOnly
    *
    */
-  [
-    'f',
-    'dry',
-    'when set to `1` will disable all reverb for this pattern. See `room` and `size` for more information about reverb.',
-  ],
+  ['dry'],
   // TODO: does not seem to do anything
   /*
    * Used when using {@link begin}/{@link end} or {@link chop}/{@link striate} and friends, to change the fade out time of the 'grain' envelope.
@@ -424,17 +407,9 @@ const generic_params = [
    * s("oh*4").end(.1).fadeTime("<0 .2 .4 .8>").osc()
    *
    */
-  [
-    'f',
-    'fadeTime',
-    "Used when using begin/end or chop/striate and friends, to change the fade out time of the 'grain' envelope.",
-  ],
+  ['fadeTime', 'fadeOutTime'],
   // TODO: see above
-  [
-    'f',
-    'fadeInTime',
-    'As with fadeTime, but controls the fade in time of the grain envelope. Not used if the grain begins at position 0 in the sample.',
-  ],
+  ['fadeInTime'],
   /**
    * Set frequency of sound.
    *
@@ -446,15 +421,15 @@ const generic_params = [
    * freq("110".mul.out(".5 1.5 .6 [2 3]")).s("superzow").osc()
    *
    */
-  ['f', 'freq', ''],
+  ['freq'],
   // TODO: https://tidalcycles.org/docs/configuration/MIDIOSC/control-voltage/#gate
-  ['f', 'gate', ''],
-  // ['f', 'hatgrain', ''],
-  // ['f', 'lagogo', ''],
-  // ['f', 'lclap', ''],
-  // ['f', 'lclaves', ''],
-  // ['f', 'lclhat', ''],
-  // ['f', 'lcrash', ''],
+  ['gate', 'gat'],
+  // ['hatgrain'],
+  // ['lagogo'],
+  // ['lclap'],
+  // ['lclaves'],
+  // ['lclhat'],
+  // ['lcrash'],
   // TODO:
   // https://tidalcycles.org/docs/reference/audio_effects/#leslie-1
   // https://tidalcycles.org/docs/reference/audio_effects/#leslie
@@ -468,7 +443,7 @@ const generic_params = [
    * @superdirtOnly
    *
    */
-  ['f', 'leslie', ''],
+  ['leslie'],
   /**
    * Rate of modulation / rotation for leslie effect
    *
@@ -480,7 +455,7 @@ const generic_params = [
    *
    */
   // TODO: the rate seems to "lag" (in the example, 1 will be fast)
-  ['f', 'lrate', ''],
+  ['lrate'],
   /**
    * Physical size of the cabinet in meters. Be careful, it might be slightly larger than your computer. Affects the Doppler amount (pitch warble)
    *
@@ -491,31 +466,28 @@ const generic_params = [
    * @superdirtOnly
    *
    */
-  ['f', 'lsize', ''],
-  // ['f', 'lfo', ''],
-  // ['f', 'lfocutoffint', ''],
-  // ['f', 'lfodelay', ''],
-  // ['f', 'lfoint', ''],
-  // ['f', 'lfopitchint', ''],
-  // ['f', 'lfoshape', ''],
-  // ['f', 'lfosync', ''],
-  // ['f', 'lhitom', ''],
-  // ['f', 'lkick', ''],
-  // ['f', 'llotom', ''],
-  // ['f', 'lophat', ''],
-  // ['f', 'lsnare', ''],
-  ['f', 'degree', ''], // TODO: what is this? not found in tidal doc
-  ['f', 'mtranspose', ''], // TODO: what is this? not found in tidal doc
-  ['f', 'ctranspose', ''], // TODO: what is this? not found in tidal doc
-  ['f', 'harmonic', ''], // TODO: what is this? not found in tidal doc
-  ['f', 'stepsPerOctave', ''], // TODO: what is this? not found in tidal doc
-  ['f', 'octaveR', ''], // TODO: what is this? not found in tidal doc
-  // TODO: why is this needed? what's the difference to late / early?
-  [
-    'f',
-    'nudge',
-    'Nudges events into the future by the specified number of seconds. Negative numbers work up to a point as well (due to internal latency)',
-  ],
+  ['lsize'],
+  // ['lfo'],
+  // ['lfocutoffint'],
+  // ['lfodelay'],
+  // ['lfoint'],
+  // ['lfopitchint'],
+  // ['lfoshape'],
+  // ['lfosync'],
+  // ['lhitom'],
+  // ['lkick'],
+  // ['llotom'],
+  // ['lophat'],
+  // ['lsnare'],
+  ['degree'], // TODO: what is this? not found in tidal doc
+  ['mtranspose'], // TODO: what is this? not found in tidal doc
+  ['ctranspose'], // TODO: what is this? not found in tidal doc
+  ['harmonic'], // TODO: what is this? not found in tidal doc
+  ['stepsPerOctave'], // TODO: what is this? not found in tidal doc
+  ['octaveR'], // TODO: what is this? not found in tidal doc
+  // TODO: why is this needed? what's the difference to late / early? Answer: it's in seconds, and delays the message at
+  // OSC time (so can't be negative, at least not beyond the latency value)
+  ['nudge'],
   // TODO: the following doc is just a guess, it's not documented in tidal doc.
   /**
    * Sets the default octave of a synth.
@@ -526,9 +498,9 @@ const generic_params = [
    * n("0,4,7").s('supersquare').octave("<3 4 5 6>").osc()
    * @superDirtOnly
    */
-  ['i', 'octave', ''],
-  ['f', 'offset', ''], // TODO: what is this? not found in tidal doc
-  // ['f', 'ophatdecay', ''],
+  ['octave'],
+  ['offset'], // TODO: what is this? not found in tidal doc
+  // ['ophatdecay'],
   // TODO: example
   /**
    * An `orbit` is a global parameter context for patterns. Patterns with the same orbit will share the same global effects.
@@ -541,13 +513,9 @@ const generic_params = [
    *   s("~ sd").delay(.5).delaytime(.125).orbit(2)
    * )
    */
-  [
-    'i',
-    'orbit',
-    'a pattern of numbers. An `orbit` is a global parameter context for patterns. Patterns with the same orbit will share hardware output bus offset and global effects, e.g. reverb and delay. The maximum number of orbits is specified in the superdirt startup, numbers higher than maximum will wrap around.',
-  ],
-  ['f', 'overgain', ''], // TODO: what is this? not found in tidal doc
-  ['f', 'overshape', ''], // TODO: what is this? not found in tidal doc
+  ['orbit'],
+  ['overgain'], // TODO: what is this? not found in tidal doc Answer: gain is limited to maximum of 2. This allows you to go over that
+  ['overshape'], // TODO: what is this? not found in tidal doc. Similar to above, but limited to 1
   /**
    * Sets position in stereo.
    *
@@ -557,11 +525,7 @@ const generic_params = [
    * s("[bd hh]*2").pan("<.5 1 .5 0>")
    *
    */
-  [
-    'f',
-    'pan',
-    'a pattern of numbers between 0 and 1, from left to right (assuming stereo), once round a circle (assuming multichannel)',
-  ],
+  ['pan'],
   // TODO: this has no effect (see example)
   /*
    * Controls how much multichannel output is fanned out
@@ -572,11 +536,7 @@ const generic_params = [
    * s("[bd hh]*2").pan("<.5 1 .5 0>").panspan("<0 .5 1>").osc()
    *
    */
-  [
-    'f',
-    'panspan',
-    'a pattern of numbers between -inf and inf, which controls how much multichannel output is fanned out (negative is backwards ordering)',
-  ],
+  ['panspan'],
   // TODO: this has no effect (see example)
   /*
    * Controls how much multichannel output is spread
@@ -587,34 +547,22 @@ const generic_params = [
    * s("[bd hh]*2").pan("<.5 1 .5 0>").pansplay("<0 .5 1>").osc()
    *
    */
-  [
-    'f',
-    'pansplay',
-    'a pattern of numbers between 0.0 and 1.0, which controls the multichannel spread range (multichannel only)',
-  ],
-  [
-    'f',
-    'panwidth',
-    'a pattern of numbers between 0.0 and inf, which controls how much each channel is distributed over neighbours (multichannel only)',
-  ],
-  [
-    'f',
-    'panorient',
-    'a pattern of numbers between -1.0 and 1.0, which controls the relative position of the centre pan in a pair of adjacent speakers (multichannel only)',
-  ],
-  // ['f', 'pitch1', ''],
-  // ['f', 'pitch2', ''],
-  // ['f', 'pitch3', ''],
-  // ['f', 'portamento', ''],
+  ['pansplay'],
+  ['panwidth'],
+  ['panorient'],
+  // ['pitch1'],
+  // ['pitch2'],
+  // ['pitch3'],
+  // ['portamento'],
   // TODO: LFO rate see https://tidalcycles.org/docs/patternlib/tutorials/synthesizers/#supersquare
-  ['f', 'rate', "used in SuperDirt softsynths as a control rate or 'speed'"],
+  ['rate'],
   // TODO: slide param for certain synths
-  ['f', 'slide', ''],
+  ['slide'],
   // TODO: detune? https://tidalcycles.org/docs/patternlib/tutorials/synthesizers/#supersquare
-  ['f', 'semitone', ''],
+  ['semitone'],
   // TODO: dedup with synth param, see https://tidalcycles.org/docs/reference/synthesizers/#superpiano
-  // ['f', 'velocity', ''],
-  ['f', 'voice', ''], // TODO: synth param
+  // ['velocity'],
+  ['voice'], // TODO: synth param
   /**
    * Sets the level of reverb.
    *
@@ -624,13 +572,13 @@ const generic_params = [
    * s("bd sd").room("<0 .2 .4 .6 .8 1>")
    *
    */
-  ['f', 'room', 'a pattern of numbers from 0 to 1. Sets the level of reverb.'],
+  ['room'],
   /**
    * Sets the room size of the reverb, see {@link room}.
    *
    * @name roomsize
-   * @synonyms size
    * @param {number | Pattern} size between 0 and 10
+   * @synonyms size, sz
    * @example
    * s("bd sd").room(.8).roomsize("<0 1 2 4 8>")
    *
@@ -638,20 +586,11 @@ const generic_params = [
   // TODO: find out why :
   // s("bd sd").room(.8).roomsize("<0 .2 .4 .6 .8 [1,0]>").osc()
   // .. does not work. Is it because room is only one effect?
-  [
-    'f',
-    'size',
-    'a pattern of numbers from 0 to 1. Sets the perceptual size (reverb time) of the `room` to be used in reverb.',
-  ],
-  [
-    'f',
-    'roomsize',
-    'a pattern of numbers from 0 to 1. Sets the perceptual size (reverb time) of the `room` to be used in reverb.',
-  ],
-  // ['f', 'sagogo', ''],
-  // ['f', 'sclap', ''],
-  // ['f', 'sclaves', ''],
-  // ['f', 'scrash', ''],
+  ['size', 'sz', 'roomsize'],
+  // ['sagogo'],
+  // ['sclap'],
+  // ['sclaves'],
+  // ['scrash'],
   /**
    * Wave shaping distortion. CAUTION: it might get loud
    *
@@ -661,11 +600,7 @@ const generic_params = [
    * s("bd sd,hh*4").shape("<0 .2 .4 .6 .8>")
    *
    */
-  [
-    'f',
-    'shape',
-    'wave shaping distortion, a pattern of numbers from 0 for no distortion up to 1 for loads of distortion.',
-  ],
+  ['shape'],
   /**
    * Changes the speed of sample playback, i.e. a cheap way of changing pitch.
    *
@@ -677,11 +612,7 @@ const generic_params = [
    * speed("1 1.5*2 [2 1.1]").s("piano").clip(1)
    *
    */
-  [
-    'f',
-    'speed',
-    'a pattern of numbers which changes the speed of sample playback, i.e. a cheap way of changing pitch. Negative values will play the sample backwards!',
-  ],
+  ['speed'],
   /**
    * Used in conjunction with {@link speed}, accepts values of "r" (rate, default behavior), "c" (cycles), or "s" (seconds). Using `unit "c"` means `speed` will be interpreted in units of cycles, e.g. `speed "1"` means samples will be stretched to fill a cycle. Using `unit "s"` means the playback speed will be adjusted so that the duration is the number of seconds specified by `speed`.
    *
@@ -692,11 +623,7 @@ const generic_params = [
    * @superdirtOnly
    *
    */
-  [
-    's',
-    'unit',
-    'used in conjunction with `speed`, accepts values of "r" (rate, default behavior), "c" (cycles), or "s" (seconds). Using `unit "c"` means `speed` will be interpreted in units of cycles, e.g. `speed "1"` means samples will be stretched to fill a cycle. Using `unit "s"` means the playback speed will be adjusted so that the duration is the number of seconds specified by `speed`.',
-  ],
+  ['unit'],
   /**
    * Made by Calum Gunn. Reminiscent of some weird mixture of filter, ring-modulator and pitch-shifter. The SuperCollider manual defines Squiz as:
    *
@@ -709,14 +636,14 @@ const generic_params = [
    * @superdirtOnly
    *
    */
-  ['f', 'squiz', ''],
-  ['f', 'stutterdepth', ''], // TODO: what is this? not found in tidal doc
-  ['f', 'stuttertime', ''], // TODO: what is this? not found in tidal doc
-  ['f', 'timescale', ''], // TODO: what is this? not found in tidal doc
-  ['f', 'timescalewin', ''], // TODO: what is this? not found in tidal doc
-  // ['f', 'tomdecay', ''],
-  // ['f', 'vcfegint', ''],
-  // ['f', 'vcoegint', ''],
+  ['squiz'],
+  // ['stutterdepth'], // TODO: what is this? not found in tidal doc
+  // ['stuttertime'], // TODO: what is this? not found in tidal doc
+  // ['timescale'], // TODO: what is this? not found in tidal doc
+  // ['timescalewin'], // TODO: what is this? not found in tidal doc
+  // ['tomdecay'],
+  // ['vcfegint'],
+  // ['vcoegint'],
   // TODO: Use a rest (~) to override the effect <- vowel
   /**
    *
@@ -729,11 +656,7 @@ const generic_params = [
    * .vowel("<a e i <o u>>")
    *
    */
-  [
-    's',
-    'vowel',
-    'formant filter to make things sound like vowels, a pattern of either `a`, `e`, `i`, `o` or `u`. Use a rest (`~`) for no effect.',
-  ],
+  ['vowel'],
   /* // TODO: find out how it works
    * Made by Calum Gunn. Divides an audio stream into tiny segments, using the signal's zero-crossings as segment boundaries, and discards a fraction of them. Takes a number between 1 and 100, denoted the percentage of segments to drop. The SuperCollider manual describes the Waveloss effect this way:
    *
@@ -744,12 +667,12 @@ const generic_params = [
    *
    * @name waveloss
    */
-  ['f', 'waveloss', ''],
+  ['waveloss'],
   // TODO: midi effects?
-  ['f', 'dur', ''],
-  // ['f', 'modwheel', ''],
-  ['f', 'expression', ''],
-  ['f', 'sustainpedal', ''],
+  ['dur'],
+  // ['modwheel'],
+  ['expression'],
+  ['sustainpedal'],
   /* // TODO: doesn't seem to do anything
    *
    * Tremolo Audio DSP effect
@@ -760,59 +683,58 @@ const generic_params = [
    * n("0,4,7").tremolodepth("<0 .3 .6 .9>").osc()
    *
    */
-  // TODO: tremdp alias
-  ['f', 'tremolodepth', "Tremolo Audio DSP effect | params are 'tremolorate' and 'tremolodepth'"],
-  ['f', 'tremolorate', "Tremolo Audio DSP effect | params are 'tremolorate' and 'tremolodepth'"],
+  ['tremolodepth', 'tremdp'],
+  ['tremolorate', 'tremr'],
   // TODO: doesn't seem to do anything
-  ['f', 'phaserdepth', "Phaser Audio DSP effect | params are 'phaserrate' and 'phaserdepth'"],
-  ['f', 'phaserrate', "Phaser Audio DSP effect | params are 'phaserrate' and 'phaserdepth'"],
+  ['phaserdepth', 'phasdp'],
+  ['phaserrate', 'phasr'],
 
-  ['f', 'fshift', 'frequency shifter'],
-  ['f', 'fshiftnote', 'frequency shifter'],
-  ['f', 'fshiftphase', 'frequency shifter'],
+  ['fshift'],
+  ['fshiftnote'],
+  ['fshiftphase'],
 
-  ['f', 'triode', 'tube distortion'],
-  ['f', 'krush', 'shape/bass enhancer'],
-  ['f', 'kcutoff', ''],
-  ['f', 'octer', 'octaver effect'],
-  ['f', 'octersub', 'octaver effect'],
-  ['f', 'octersubsub', 'octaver effect'],
-  ['f', 'ring', 'ring modulation'],
-  ['f', 'ringf', 'ring modulation'],
-  ['f', 'ringdf', 'ring modulation'],
-  ['f', 'distort', 'noisy fuzzy distortion'],
-  ['f', 'freeze', 'Spectral freeze'],
-  ['f', 'xsdelay', ''],
-  ['f', 'tsdelay', ''],
-  ['f', 'real', 'Spectral conform'],
-  ['f', 'imag', ''],
-  ['f', 'enhance', 'Spectral enhance'],
-  ['f', 'partials', ''],
-  ['f', 'comb', 'Spectral comb'],
-  ['f', 'smear', 'Spectral smear'],
-  ['f', 'scram', 'Spectral scramble'],
-  ['f', 'binshift', 'Spectral binshift'],
-  ['f', 'hbrick', 'High pass sort of spectral filter'],
-  ['f', 'lbrick', 'Low pass sort of spectral filter'],
-  ['f', 'midichan', ''],
-  ['f', 'control', ''],
-  ['f', 'ccn', ''],
-  ['f', 'ccv', ''],
-  ['f', 'polyTouch', ''],
-  ['f', 'midibend', ''],
-  ['f', 'miditouch', ''],
-  ['f', 'ctlNum', ''],
-  ['f', 'frameRate', ''],
-  ['f', 'frames', ''],
-  ['f', 'hours', ''],
-  ['s', 'midicmd', ''],
-  ['f', 'minutes', ''],
-  ['f', 'progNum', ''],
-  ['f', 'seconds', ''],
-  ['f', 'songPtr', ''],
-  ['f', 'uid', ''],
-  ['f', 'val', ''],
-  ['f', 'cps', ''],
+  ['triode'],
+  ['krush'],
+  ['kcutoff'],
+  ['octer'],
+  ['octersub'],
+  ['octersubsub'],
+  ['ring'],
+  ['ringf'],
+  ['ringdf'],
+  ['distort'],
+  ['freeze'],
+  ['xsdelay'],
+  ['tsdelay'],
+  ['real'],
+  ['imag'],
+  ['enhance'],
+  ['partials'],
+  ['comb'],
+  ['smear'],
+  ['scram'],
+  ['binshift'],
+  ['hbrick'],
+  ['lbrick'],
+  ['midichan'],
+  ['control'],
+  ['ccn'],
+  ['ccv'],
+  ['polyTouch'],
+  ['midibend'],
+  ['miditouch'],
+  ['ctlNum'],
+  ['frameRate'],
+  ['frames'],
+  ['hours'],
+  ['midicmd'],
+  ['minutes'],
+  ['progNum'],
+  ['seconds'],
+  ['songPtr'],
+  ['uid'],
+  ['val'],
+  ['cps'],
   /**
    * If set to 1, samples will be cut to the duration of their event.
    * In tidal, this would be done with legato, which [is about to land in strudel too](https://github.com/tidalcycles/strudel/issues/111)
@@ -823,31 +745,35 @@ const generic_params = [
    * note("c a f e ~").s("piano").clip(1)
    *
    */
-  ['f', 'clip', ''],
+  ['clip'],
 ];
 
 // TODO: slice / splice https://www.youtube.com/watch?v=hKhPdO0RKDQ&list=PL2lW1zNIIwj3bDkh-Y3LUGDuRcoUigoDs&index=13
 
-const makeControl = function (name) {
-  const func = (...pats) => sequence(...pats).withValue((x) => ({ [name]: x }));
-  const setter = function (...pats) {
+const _name = (name, ...pats) => sequence(...pats).withValue((x) => ({ [name]: x }));
+
+const _setter = (func, name) =>
+  function (...pats) {
     if (!pats.length) {
       return this.fmap((value) => ({ [name]: value }));
     }
     return this.set(func(...pats));
   };
-  Pattern.prototype[name] = setter;
-  registerControl(name, func);
-  return func;
-};
 
-generic_params.forEach(([type, name, description]) => {
-  controls[name] = makeControl(name);
+generic_params.forEach(([name, ...aliases]) => {
+  controls[name] = (...pats) => _name(name, ...pats);
+  Pattern.prototype[name] = _setter(controls[name], name);
+  aliases.forEach((alias) => {
+    controls[alias] = controls[name];
+    Pattern.prototype[alias] = Pattern.prototype[name];
+  });
 });
 
 // create custom param
 controls.createParam = (name) => {
-  return makeControl(name);
+  const func = (...pats) => _name(name, ...pats);
+  Pattern.prototype[name] = _setter(func, name);
+  return (...pats) => _name(name, ...pats);
 };
 
 controls.createParams = (...names) =>

packages/core/cyclist.mjs

@@ -10,44 +10,49 @@ import { logger } from './logger.mjs';
 export class Cyclist {
   constructor({ interval, onTrigger, onToggle, onError, getTime, latency = 0.1 }) {
     this.started = false;
-    this.cps = 1; // TODO
-    this.phase = 0;
-    this.getTime = getTime;
+    this.cps = 1;
+    this.lastTick = 0; // absolute time when last tick (clock callback) happened
+    this.lastBegin = 0; // query begin of last tick
+    this.lastEnd = 0; // query end of last tick
+    this.getTime = getTime; // get absolute time
     this.onToggle = onToggle;
-    this.latency = latency;
+    this.latency = latency; // fixed trigger time offset
     const round = (x) => Math.round(x * 1000) / 1000;
     this.clock = createClock(
       getTime,
+      // called slightly before each cycle
       (phase, duration, tick) => {
         if (tick === 0) {
           this.origin = phase;
         }
-        const begin = round(phase - this.origin);
-        this.phase = begin - latency;
-        const end = round(begin + duration);
-        const time = getTime();
         try {
-          const haps = this.pattern.queryArc(begin, end); // get Haps
+          const time = getTime();
+          const begin = this.lastEnd;
+          this.lastBegin = begin;
+          const end = round(begin + duration * this.cps);
+          this.lastEnd = end;
+          const haps = this.pattern.queryArc(begin, end);
+          const tickdeadline = phase - time; // time left till phase begins
+          this.lastTick = time + tickdeadline;
+
           haps.forEach((hap) => {
             if (hap.part.begin.equals(hap.whole.begin)) {
-              const deadline = hap.whole.begin + this.origin - time + latency;
-              const duration = hap.duration * 1;
-              onTrigger?.(hap, deadline, duration);
+              const deadline = (hap.whole.begin - begin) / this.cps + tickdeadline + latency;
+              const duration = hap.duration / this.cps;
+              onTrigger?.(hap, deadline, duration, this.cps);
             }
           });
         } catch (e) {
           logger(`[cyclist] error: ${e.message}`);
           onError?.(e);
         }
-      }, // called slightly before each cycle
+      },
       interval, // duration of each cycle
     );
   }
-  getPhase() {
-    return this.getTime() - this.origin - this.latency;
-  }
   now() {
-    return this.getTime() - this.origin + this.clock.minLatency;
+    const secondsSinceLastTick = this.getTime() - this.lastTick - this.clock.duration;
+    return this.lastBegin + secondsSinceLastTick * this.cps; // + this.clock.minLatency;
   }
   setStarted(v) {
     this.started = v;

packages/core/euclid.mjs

@@ -11,15 +11,9 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import { Pattern, timeCat, register, silence } from './pattern.mjs';
-import { rotate, flatten } from './util.mjs';
+import { rotate, flatten, splitAt, zipWith } from './util.mjs';
 import Fraction from './fraction.mjs';
 
-const splitAt = function (index, value) {
-  return [value.slice(0, index), value.slice(index)];
-};
-
-const zipWith = (f, xs, ys) => xs.map((n, i) => f(n, ys[i]));
-
 const left = function (n, x) {
   const [ons, offs] = n;
   const [xs, ys] = x;

packages/core/evaluate.mjs

@@ -6,12 +6,7 @@ This program is free software: you can redistribute it and/or modify it under th
 
 import { isPattern } from './index.mjs';
 
-let scoped = false;
 export const evalScope = async (...args) => {
-  if (scoped) {
-    console.warn('evalScope was called more than once.');
-  }
-  scoped = true;
   const results = await Promise.allSettled(args);
   const modules = results.filter((result) => result.status === 'fulfilled').map((r) => r.value);
   results.forEach((result, i) => {
@@ -42,9 +37,6 @@ function safeEval(str, options = {}) {
 }
 
 export const evaluate = async (code, transpiler) => {
-  if (!scoped) {
-    await evalScope(); // at least scope Pattern.prototype.boostrap
-  }
   if (transpiler) {
     code = transpiler(code); // transform syntactically correct js code to semantically usable code
   }

packages/core/hap.mjs

@@ -126,6 +126,19 @@ export class Hap {
   setContext(context) {
     return new Hap(this.whole, this.part, this.value, context);
   }
+
+  ensureObjectValue() {
+    /* if (isNote(hap.value)) {
+      // supports primitive hap values that look like notes
+      hap.value = { note: hap.value };
+    } */
+    if (typeof this.value !== 'object') {
+      throw new Error(
+        `expected hap.value to be an object, but got "${this.value}". Hint: append .note() or .s() to the end`,
+        'error',
+      );
+    }
+  }
 }
 
 export default Hap;

packages/core/pattern.mjs

@@ -21,141 +21,6 @@ let stringParser;
 // intended to use with mini to automatically interpret all strings as mini notation
 export const setStringParser = (parser) => (stringParser = parser);
 
-const alignments = ['in', 'out', 'mix', 'squeeze', 'squeezeout', 'trig', 'trigzero'];
-
-const methodRegistry = [];
-const getterRegistry = [];
-const controlRegistry = [];
-const controlSubscribers = [];
-const composifiedRegistry = [];
-
-//////////////////////////////////////////////////////////////////////
-// Magic for supporting higher order composition of method chains
-
-// Dresses the given (unary) function with methods for composition chaining, so e.g.
-// `fast(2).iter(4)` composes to pattern functions into a new one.
-function composify(func) {
-  if (!func.__composified) {
-    for (const [name, method] of methodRegistry) {
-      func[name] = method;
-    }
-    for (const [name, getter] of getterRegistry) {
-      Object.defineProperty(func, name, getter);
-    }
-    func.__composified = true;
-    composifiedRegistry.push(func);
-  } else {
-    console.log('Warning: attempt at composifying a function more than once');
-  }
-  return func;
-}
-
-export function registerMethod(name, addAlignments = false, addControls = false) {
-  if (addAlignments || addControls) {
-    // This method needs to make its 'this' object available to chained alignments and/or
-    // control parameters, so it has to be implemented as a getter
-    const getter = {
-      get: function () {
-        const func = this;
-        const wrapped = function (...args) {
-          const composed = (pat) => func(pat)[name](...args);
-          return composify(composed);
-        };
-
-        if (addAlignments) {
-          for (const alignment of alignments) {
-            wrapped[alignment] = function (...args) {
-              const composed = (pat) => func(pat)[name][alignment](...args);
-              return composify(composed);
-            };
-            for (const [controlname, controlfunc] of controlRegistry) {
-              wrapped[alignment][controlname] = function (...args) {
-                const composed = (pat) => func(pat)[name][alignment](controlfunc(...args));
-                return composify(composed);
-              };
-            }
-          }
-        }
-        if (addControls) {
-          for (const [controlname, controlfunc] of controlRegistry) {
-            wrapped[controlname] = function (...args) {
-              const composed = (pat) => func(pat)[name](controlfunc(...args));
-              return composify(composed);
-            };
-          }
-        }
-        return wrapped;
-      },
-    };
-
-    getterRegistry.push([name, getter]);
-
-    // Add to functions already 'composified'
-    for (const composified of composifiedRegistry) {
-      Object.defineProperty(composified, name, getter);
-    }
-  } else {
-    // No chained alignments/controls needed, so we can just add as a plain method,
-    // probably more efficient this way?
-    const method = function (...args) {
-      const func = this;
-      const composed = (pat) => func(pat)[name](...args);
-      return composify(composed);
-    };
-
-    methodRegistry.push([name, method]);
-
-    // Add to functions already 'composified'
-    for (const composified of composifiedRegistry) {
-      composified[name] = method;
-    }
-  }
-}
-
-export function registerControl(controlname, controlfunc) {
-  registerMethod(controlname);
-  controlRegistry.push([controlname, controlfunc]);
-  for (const subscriber of controlSubscribers) {
-    subscriber(controlname, controlfunc);
-  }
-}
-
-export function withControls(func) {
-  for (const [controlname, controlfunc] of controlRegistry) {
-    func(controlname, controlfunc);
-  }
-  controlSubscribers.push(func);
-}
-
-export function addToPrototype(name, func) {
-  Pattern.prototype[name] = func;
-  registerMethod(name);
-}
-
-export function curryPattern(func, arity = func.length) {
-  const fn = function curried(...args) {
-    if (args.length >= arity) {
-      return func.apply(this, args);
-    }
-
-    const partial = function (...args2) {
-      return curried.apply(this, args.concat(args2));
-    };
-    if (args.length == arity - 1) {
-      return composify(partial);
-    }
-
-    return partial;
-  };
-  if (arity == 1) {
-    composify(fn);
-  }
-  return fn;
-}
-
-//////////////////////////////////////////////////////////////////////
-// The core Pattern class
-
 /** @class Class representing a pattern. */
 export class Pattern {
   /**
@@ -778,9 +643,7 @@ export class Pattern {
    * @noAutocomplete
    */
   get firstCycleValues() {
-    return this.sortHapsByPart()
-      .firstCycle()
-      .map((hap) => hap.value);
+    return this.firstCycle().map((hap) => hap.value);
   }
 
   /**
@@ -830,7 +693,7 @@ export class Pattern {
     const otherPat = reify(other);
     return this.fmap((a) => otherPat.fmap((b) => func(a)(b))).squeezeJoin();
   }
-  _opSqueezeout(other, func) {
+  _opSqueezeOut(other, func) {
     const thisPat = this;
     const otherPat = reify(other);
     return otherPat.fmap((a) => thisPat.fmap((b) => func(b)(a))).squeezeJoin();
@@ -977,7 +840,7 @@ export class Pattern {
 }
 
 //////////////////////////////////////////////////////////////////////
-// functions relating to chords/patterns of lists
+// functions relating to chords/patterns of lists/lists of patterns
 
 // returns Array<Hap[]> where each list of haps satisfies eq
 function groupHapsBy(eq, haps) {
@@ -997,11 +860,11 @@ function groupHapsBy(eq, haps) {
 const congruent = (a, b) => a.spanEquals(b);
 // Pattern<Hap<T>> -> Pattern<Hap<T[]>>
 // returned pattern contains arrays of congruent haps
-addToPrototype('collect', function () {
+Pattern.prototype.collect = function () {
   return this.withHaps((haps) =>
     groupHapsBy(congruent, haps).map((_haps) => new Hap(_haps[0].whole, _haps[0].part, _haps, {})),
   );
-});
+};
 
 /**
  * Selects indices in in stacked notes.
@@ -1009,12 +872,12 @@ addToPrototype('collect', function () {
  * note("<[c,eb,g]!2 [c,f,ab] [d,f,ab]>")
  * .arpWith(haps => haps[2])
  * */
-addToPrototype('arpWith', function (func) {
+Pattern.prototype.arpWith = function (func) {
   return this.collect()
     .fmap((v) => reify(func(v)))
     .innerJoin()
     .withHap((h) => new Hap(h.whole, h.part, h.value.value, h.combineContext(h.value)));
-});
+};
 
 /**
  * Selects indices in in stacked notes.
@@ -1022,10 +885,39 @@ addToPrototype('arpWith', function (func) {
  * note("<[c,eb,g]!2 [c,f,ab] [d,f,ab]>")
  * .arp("0 [0,2] 1 [0,2]").slow(2)
  * */
-addToPrototype('arp', function (pat) {
+Pattern.prototype.arp = function (pat) {
   return this.arpWith((haps) => pat.fmap((i) => haps[i % haps.length]));
+};
+
+/*
+ * Takes a time duration followed by one or more patterns, and shifts the given patterns in time, so they are
+ * distributed equally over the given time duration. They are then combined with the pattern 'weave' is called on, after it has been stretched out (i.e. slowed down by) the time duration.
+ * @name weave
+ * @memberof Pattern
+ * @example pan(saw).weave(4, s("bd(3,8)"), s("~ sd"))
+ * @example n("0 1 2 3 4 5 6 7").weave(8, s("bd(3,8)"), s("~ sd"))
+
+addToPrototype('weave', function (t, ...pats) {
+  return this.weaveWith(t, ...pats.map((x) => set.out(x)));
 });
 
+*/
+/*
+ * Like 'weave', but accepts functions rather than patterns, which are applied to the pattern.
+ * @name weaveWith
+ * @memberof Pattern
+
+addToPrototype('weaveWith', function (t, ...funcs) {
+  const pat = this;
+  const l = funcs.length;
+  t = Fraction(t);
+  if (l == 0) {
+    return silence;
+  }
+  return stack(...funcs.map((func, i) => pat.inside(t, func).early(Fraction(i).div(l))))._slow(t);
+});
+*/
+
 //////////////////////////////////////////////////////////////////////
 // compose matrix functions
 
@@ -1122,15 +1014,15 @@ function _composeOp(a, b, func) {
     func: [(a, b) => b(a)],
   };
 
-  const hows = alignments.map((x) => x.charAt(0).toUpperCase() + x.slice(1));
+  const hows = ['In', 'Out', 'Mix', 'Squeeze', 'SqueezeOut', 'Trig', 'Trigzero'];
 
   // generate methods to do what and how
   for (const [what, [op, preprocess]] of Object.entries(composers)) {
     // make plain version, e.g. pat._add(value) adds that plain value
     // to all the values in pat
-    addToPrototype('_' + what, function (value) {
+    Pattern.prototype['_' + what] = function (value) {
       return this.fmap((x) => op(x, value));
-    });
+    };
 
     // make patternified monster version
     Object.defineProperty(Pattern.prototype, what, {
@@ -1144,7 +1036,7 @@ function _composeOp(a, b, func) {
 
         // add methods to that function for each behaviour
         for (const how of hows) {
-          const howfunc = function (...other) {
+          wrapper[how.toLowerCase()] = function (...other) {
             var howpat = pat;
             other = sequence(other);
             if (preprocess) {
@@ -1162,41 +1054,19 @@ function _composeOp(a, b, func) {
             }
             return result;
           };
-
-          for (const [controlname, controlfunc] of controlRegistry) {
-            howfunc[controlname] = (...args) => howfunc(controlfunc(...args));
-          }
-          wrapper[how.toLowerCase()] = howfunc;
         }
         wrapper.squeezein = wrapper.squeeze;
 
-        for (const [controlname, controlfunc] of controlRegistry) {
-          wrapper[controlname] = (...args) => wrapper.in(controlfunc(...args));
-        }
-
         return wrapper;
       },
     });
 
-    registerMethod(what, true, true);
-  }
-
-  // Default op to 'set', e.g. pat.squeeze(pat2) = pat.set.squeeze(pat2)
-  for (const howLower of alignments) {
-    // Using a 'get'ted function so that all the controls are added
-    Object.defineProperty(Pattern.prototype, howLower, {
-      get: function () {
-        const pat = this;
-        const howfunc = function (...args) {
-          return pat.set[howLower](args);
-        };
-        for (const [controlname, controlfunc] of controlRegistry) {
-          howfunc[controlname] = (...args) => howfunc(controlfunc(...args));
-        }
-        return howfunc;
-      },
-    });
-    registerMethod(howLower, false, true);
+    // Default op to 'set', e.g. pat.squeeze(pat2) = pat.set.squeeze(pat2)
+    for (const how of hows) {
+      Pattern.prototype[how.toLowerCase()] = function (...args) {
+        return this.set[how.toLowerCase()](args);
+      };
+    }
   }
 
   // binary composers
@@ -1208,36 +1078,36 @@ function _composeOp(a, b, func) {
    *   .struct("x ~ x ~ ~ x ~ x ~ ~ ~ x ~ x ~ ~")
    *   .slow(4)
    */
-  addToPrototype('struct', function (...args) {
+  Pattern.prototype.struct = function (...args) {
     return this.keepif.out(...args);
-  });
-  addToPrototype('structAll', function (...args) {
+  };
+  Pattern.prototype.structAll = function (...args) {
     return this.keep.out(...args);
-  });
+  };
   /**
    * Returns silence when mask is 0 or "~"
    *
    * @example
    * note("c [eb,g] d [eb,g]").mask("<1 [0 1]>").slow(2)
    */
-  addToPrototype('mask', function (...args) {
+  Pattern.prototype.mask = function (...args) {
     return this.keepif.in(...args);
-  });
-  addToPrototype('maskAll', function (...args) {
+  };
+  Pattern.prototype.maskAll = function (...args) {
     return this.keep.in(...args);
-  });
+  };
   /**
    * Resets the pattern to the start of the cycle for each onset of the reset pattern.
    *
    * @example
    * s("<bd lt> sd, hh*4").reset("<x@3 x(3,8)>")
    */
-  addToPrototype('reset', function (...args) {
+  Pattern.prototype.reset = function (...args) {
     return this.keepif.trig(...args);
-  });
-  addToPrototype('resetAll', function (...args) {
+  };
+  Pattern.prototype.resetAll = function (...args) {
     return this.keep.trig(...args);
-  });
+  };
   /**
    * Restarts the pattern for each onset of the restart pattern.
    * While reset will only reset the current cycle, restart will start from cycle 0.
@@ -1245,12 +1115,12 @@ function _composeOp(a, b, func) {
    * @example
    * s("<bd lt> sd, hh*4").restart("<x@3 x(3,8)>")
    */
-  addToPrototype('restart', function (...args) {
+  Pattern.prototype.restart = function (...args) {
     return this.keepif.trigzero(...args);
-  });
-  addToPrototype('restartAll', function (...args) {
+  };
+  Pattern.prototype.restartAll = function (...args) {
     return this.keep.trigzero(...args);
-  });
+  };
 })();
 
 // aliases
@@ -1495,68 +1365,36 @@ export function pm(...args) {
   polymeter(...args);
 }
 
-export const mask = curryPattern((a, b) => reify(b).mask(a));
-export const struct = curryPattern((a, b) => reify(b).struct(a));
-export const superimpose = curryPattern((a, b) => reify(b).superimpose(...a));
-
-const methodToFunction = function (name, addAlignments = false) {
-  const func = curryPattern((a, b) => reify(b)[name](a));
-
-  withControls((controlname, controlfunc) => {
-    func[controlname] = function (...pats) {
-      return func(controlfunc(...pats));
-    };
-  });
-
-  if (addAlignments) {
-    for (const alignment of alignments) {
-      func[alignment] = curryPattern((a, b) => reify(b)[name][alignment](a));
-      withControls((controlname, controlfunc) => {
-        func[alignment][controlname] = function (...pats) {
-          return func[alignment](controlfunc(...pats));
-        };
-      });
-    }
-  }
-
-  return func;
-};
+export const mask = curry((a, b) => reify(b).mask(a));
+export const struct = curry((a, b) => reify(b).struct(a));
+export const superimpose = curry((a, b) => reify(b).superimpose(...a));
 
 // operators
-export const set = methodToFunction('set', true);
-export const keep = methodToFunction('keep', true);
-export const keepif = methodToFunction('keepif', true);
-export const add = methodToFunction('add', true);
-export const sub = methodToFunction('sub', true);
-export const mul = methodToFunction('mul', true);
-export const div = methodToFunction('div', true);
-export const mod = methodToFunction('mod', true);
-export const pow = methodToFunction('pow', true);
-export const band = methodToFunction('band', true);
-export const bor = methodToFunction('bor', true);
-export const bxor = methodToFunction('bxor', true);
-export const blshift = methodToFunction('blshift', true);
-export const brshift = methodToFunction('brshift', true);
-export const lt = methodToFunction('lt', true);
-export const gt = methodToFunction('gt', true);
-export const lte = methodToFunction('lte', true);
-export const gte = methodToFunction('gte', true);
-export const eq = methodToFunction('eq', true);
-export const eqt = methodToFunction('eqt', true);
-export const ne = methodToFunction('ne', true);
-export const net = methodToFunction('net', true);
-export const and = methodToFunction('and', true);
-export const or = methodToFunction('or', true);
-export const func = methodToFunction('func', true);
-
-// alignments
-// export const in = methodToFunction('in'); // reserved word :(
-export const out = methodToFunction('out');
-export const mix = methodToFunction('mix');
-export const squeeze = methodToFunction('squeeze');
-export const squeezeout = methodToFunction('squeezeout');
-export const trig = methodToFunction('trig');
-export const trigzero = methodToFunction('trigzero');
+export const set = curry((a, b) => reify(b).set(a));
+export const keep = curry((a, b) => reify(b).keep(a));
+export const keepif = curry((a, b) => reify(b).keepif(a));
+export const add = curry((a, b) => reify(b).add(a));
+export const sub = curry((a, b) => reify(b).sub(a));
+export const mul = curry((a, b) => reify(b).mul(a));
+export const div = curry((a, b) => reify(b).div(a));
+export const mod = curry((a, b) => reify(b).mod(a));
+export const pow = curry((a, b) => reify(b).pow(a));
+export const band = curry((a, b) => reify(b).band(a));
+export const bor = curry((a, b) => reify(b).bor(a));
+export const bxor = curry((a, b) => reify(b).bxor(a));
+export const blshift = curry((a, b) => reify(b).blshift(a));
+export const brshift = curry((a, b) => reify(b).brshift(a));
+export const lt = curry((a, b) => reify(b).lt(a));
+export const gt = curry((a, b) => reify(b).gt(a));
+export const lte = curry((a, b) => reify(b).lte(a));
+export const gte = curry((a, b) => reify(b).gte(a));
+export const eq = curry((a, b) => reify(b).eq(a));
+export const eqt = curry((a, b) => reify(b).eqt(a));
+export const ne = curry((a, b) => reify(b).ne(a));
+export const net = curry((a, b) => reify(b).net(a));
+export const and = curry((a, b) => reify(b).and(a));
+export const or = curry((a, b) => reify(b).or(a));
+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.
@@ -1566,44 +1404,45 @@ export const trigzero = methodToFunction('trigzero');
  * @noAutocomplete
  *
  */
-export function register(name, func) {
+export function register(name, func, patternify = true) {
   if (Array.isArray(name)) {
     const result = {};
     for (const name_item of name) {
-      result[name_item] = register(name_item, func);
+      result[name_item] = register(name_item, func, patternify);
     }
     return result;
   }
   const arity = func.length;
+  var pfunc; // the patternified function
 
-  registerMethod(name);
-
-  const pfunc = function (...args) {
-    args = args.map(reify);
-    const pat = args[args.length - 1];
-    if (arity === 1) {
-      return func(pat);
-    }
-    const [left, ...right] = args.slice(0, -1);
-    let mapFn = (...args) => {
-      // make sure to call func with the correct argument count
-      // args.length is expected to be <= arity-1
-      // so we set undefined args explicitly undefined
-      Array(arity - 1)
-        .fill()
-        .map((_, i) => args[i] ?? undefined);
-      return func(...args, pat);
+  if (patternify) {
+    pfunc = function (...args) {
+      args = args.map(reify);
+      const pat = args[args.length - 1];
+      if (arity === 1) {
+        return func(pat);
+      }
+      const [left, ...right] = args.slice(0, -1);
+      let mapFn = (...args) => {
+        // make sure to call func with the correct argument count
+        // args.length is expected to be <= arity-1
+        // so we set undefined args explicitly undefined
+        Array(arity - 1)
+          .fill()
+          .map((_, i) => args[i] ?? undefined);
+        return func(...args, pat);
+      };
+      mapFn = curry(mapFn, null, arity - 1);
+      return right.reduce((acc, p) => acc.appLeft(p), left.fmap(mapFn)).innerJoin();
     };
-    mapFn = curryPattern(mapFn, arity - 1);
-
-    const app = (acc, p) => acc.appLeft(p);
-    const start = left.fmap(mapFn);
-
-    return right.reduce(app, start).innerJoin();
-  };
+  } else {
+    pfunc = function (...args) {
+      args = args.map(reify);
+      return func(...args);
+    };
+  }
 
   Pattern.prototype[name] = function (...args) {
-    args = args.map(reify);
     // For methods that take a single argument (plus 'this'), allow
     // multiple arguments but sequence them
     if (arity === 2 && args.length !== 1) {
@@ -1611,6 +1450,7 @@ export function register(name, func) {
     } else if (arity !== args.length + 1) {
       throw new Error(`.${name}() expects ${arity - 1} inputs but got ${args.length}.`);
     }
+    args = args.map(reify);
     return pfunc(...args, this);
   };
 
@@ -1624,7 +1464,7 @@ export function register(name, func) {
 
   // toplevel functions get curried as well as patternified
   // because pfunc uses spread args, we need to state the arity explicitly!
-  return curryPattern(pfunc, arity);
+  return curry(pfunc, null, arity);
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -2390,6 +2230,61 @@ const _loopAt = function (factor, pat, cps = 1) {
     .slow(factor);
 };
 
+/*
+ * Chops samples into the given number of slices, triggering those slices with a given pattern of slice numbers.
+ * @name slice
+ * @memberof Pattern
+ * @returns Pattern
+ * @example
+ * await samples('github:tidalcycles/Dirt-Samples/master')
+ * s("breaks165").slice(8, "0 1 <2 2*2> 3 [4 0] 5 6 7".every(3, rev)).slow(1.5)
+ */
+
+const slice = register(
+  'slice',
+  function (npat, ipat, opat) {
+    return npat.innerBind((n) =>
+      ipat.outerBind((i) =>
+        opat.outerBind((o) => {
+          // If it's not an object, assume it's a string and make it a 's' control parameter
+          o = o instanceof Object ? o : { s: o };
+          // Remember we must stay pure and avoid editing the object directly
+          const toAdd = { begin: i / n, end: (i + 1) / n, _slices: n };
+          return pure({ ...toAdd, ...o });
+        }),
+      ),
+    );
+  },
+  false, // turns off auto-patternification
+);
+
+/*
+ * Works the same as slice, but changes the playback speed of each slice to match the duration of its step.
+ * @name splice
+ * @memberof Pattern
+ * @returns Pattern
+ * @example
+ * await samples('github:tidalcycles/Dirt-Samples/master')
+ * s("breaks165").splice(8,  "0 1 [2 3 0]@2 3 0@2 7").hurry(0.65)
+ */
+
+const splice = register(
+  'splice',
+  function (npat, ipat, opat) {
+    const sliced = slice(npat, ipat, opat);
+    return sliced.withHap(function (hap) {
+      return hap.withValue((v) => ({
+        ...{
+          speed: (1 / v._slices / hap.whole.duration) * (v.speed || 1),
+          unit: 'c',
+        },
+        ...v,
+      }));
+    });
+  },
+  false, // turns off auto-patternification
+);
+
 const { loopAt, loopat } = register(['loopAt', 'loopat'], function (factor, pat) {
   return _loopAt(factor, pat, 1);
 });

packages/core/repl.mjs

@@ -2,6 +2,7 @@ import { Cyclist } from './cyclist.mjs';
 import { evaluate as _evaluate } from './evaluate.mjs';
 import { logger } from './logger.mjs';
 import { setTime } from './time.mjs';
+import { evalScope } from './evaluate.mjs';
 
 export function repl({
   interval,
@@ -17,13 +18,12 @@ export function repl({
 }) {
   const scheduler = new Cyclist({
     interval,
-    onTrigger: async (hap, deadline, duration) => {
+    onTrigger: async (hap, deadline, duration, cps) => {
       try {
         if (!hap.context.onTrigger || !hap.context.dominantTrigger) {
-          await defaultOutput(hap, deadline, duration);
+          await defaultOutput(hap, deadline, duration, cps);
         }
         if (hap.context.onTrigger) {
-          const cps = 1;
           // call signature of output / onTrigger is different...
           await hap.context.onTrigger(getTime() + deadline, hap, getTime(), cps);
         }
@@ -42,6 +42,17 @@ export function repl({
     }
     try {
       beforeEval?.({ code });
+      scheduler.setCps(1); // reset cps in case the code does not contain a setCps call
+      // problem: when the code does contain a setCps after an awaited promise,
+      // the cps will be 1 until the promise resolves
+      // example:
+      /*
+      await new Promise(resolve => setTimeout(resolve,1000))
+      setCps(.5)
+      note("c a f e")
+      */
+      // to make sure the setCps inside the code is called immediately,
+      // it has to be placed first
       let { pattern } = await _evaluate(code, transpiler);
 
       logger(`[eval] code updated`);
@@ -58,5 +69,10 @@ export function repl({
   const stop = () => scheduler.stop();
   const start = () => scheduler.start();
   const pause = () => scheduler.pause();
-  return { scheduler, evaluate, start, stop, pause };
+  const setCps = (cps) => scheduler.setCps(cps);
+  evalScope({
+    setCps,
+    setcps: setCps,
+  });
+  return { scheduler, evaluate, start, stop, pause, setCps };
 }

packages/core/test/pattern.test.mjs

@@ -45,8 +45,6 @@ import {
   rev,
   time,
   run,
-  hitch,
-  set,
 } from '../index.mjs';
 
 import { steady } from '../signal.mjs';
@@ -206,7 +204,7 @@ describe('Pattern', () => {
         ),
       );
     });
-    it('can squeezeout() structure', () => {
+    it('can SqueezeOut() structure', () => {
       sameFirst(
         sequence(1, [2, 3]).add.squeezeout(10, 20, 30),
         sequence([11, [12, 13]], [21, [22, 23]], [31, [32, 33]]),
@@ -254,7 +252,7 @@ describe('Pattern', () => {
         ),
       );
     });
-    it('can squeezeout() structure', () => {
+    it('can SqueezeOut() structure', () => {
       sameFirst(sequence(1, [2, 3]).keep.squeezeout(10, 20, 30), sequence([1, [2, 3]], [1, [2, 3]], [1, [2, 3]]));
     });
   });
@@ -296,7 +294,7 @@ describe('Pattern', () => {
         ),
       );
     });
-    it('can squeezeout() structure', () => {
+    it('can SqueezeOut() structure', () => {
       sameFirst(sequence(1, [2, 3]).keepif.squeezeout(true, true, false), sequence([1, [2, 3]], [1, [2, 3]], silence));
     });
   });
@@ -931,14 +929,6 @@ describe('Pattern', () => {
     });
   });
   describe('alignments', () => {
-    it('Can combine controls', () => {
-      sameFirst(s('bd').set.in.n(3), s('bd').n(3));
-      sameFirst(s('bd').set.squeeze.n(3, 4), sequence(s('bd').n(3), s('bd').n(4)));
-    });
-    it('Can combine functions with alignmed controls', () => {
-      sameFirst(s('bd').apply(fast(2).set(n(3))), s('bd').fast(2).set.in.n(3));
-      sameFirst(s('bd').apply(fast(2).set.in.n(3)), s('bd').fast(2).set.in.n(3));
-    });
     it('Can squeeze arguments', () => {
       expect(sequence(1, 2).add.squeeze(4, 5).firstCycle()).toStrictEqual(sequence(5, 6, 6, 7).firstCycle());
     });
@@ -969,7 +959,7 @@ describe('Pattern', () => {
       sameFirst(s('a', 'b').hurry(2), s('a', 'b').fast(2).speed(2));
     });
   });
-  describe('composable functions', () => {
+  /*describe('composable functions', () => {
     it('Can compose functions', () => {
       sameFirst(sequence(3, 4).fast(2).rev().fast(2), fast(2).rev().fast(2)(sequence(3, 4)));
     });
@@ -981,4 +971,36 @@ describe('Pattern', () => {
       //      sameFirst(s('bd').apply(set.squeeze.n(3).fast(2)), s('bd').set.squeeze.n(3).fast(2));
     });
   });
+  describe('weave', () => {
+    it('Can distribute patterns along a pattern', () => {
+      sameFirst(n(0, 1).weave(2, s('bd', silence), s(silence, 'sd')), sequence(s('bd').n(0), s('sd').n(1)));
+    });
+  });
+  */
+  describe('slice', () => {
+    it('Can slice a sample', () => {
+      sameFirst(
+        s('break').slice(4, sequence(0, 1, 2, 3)),
+        sequence(
+          { begin: 0, end: 0.25, s: 'break', _slices: 4 },
+          { begin: 0.25, end: 0.5, s: 'break', _slices: 4 },
+          { begin: 0.5, end: 0.75, s: 'break', _slices: 4 },
+          { begin: 0.75, end: 1, s: 'break', _slices: 4 },
+        ),
+      );
+    });
+  });
+  describe('splice', () => {
+    it('Can splice a sample', () => {
+      sameFirst(
+        s('break').splice(4, sequence(0, 1, 2, 3)),
+        sequence(
+          { begin: 0, end: 0.25, s: 'break', _slices: 4, unit: 'c', speed: 1 },
+          { begin: 0.25, end: 0.5, s: 'break', _slices: 4, unit: 'c', speed: 1 },
+          { begin: 0.5, end: 0.75, s: 'break', _slices: 4, unit: 'c', speed: 1 },
+          { begin: 0.75, end: 1, s: 'break', _slices: 4, unit: 'c', speed: 1 },
+        ),
+      );
+    });
+  });
 });

packages/core/util.mjs

@@ -139,7 +139,7 @@ export const removeUndefineds = (xs) => xs.filter((x) => x != undefined);
 export const flatten = (arr) => [].concat(...arr);
 
 export const id = (a) => a;
-export const constant = curry((a, b) => a);
+export const constant = (a, b) => a;
 
 export const listRange = (min, max) => Array.from({ length: max - min + 1 }, (_, i) => i + min);
 
@@ -206,3 +206,9 @@ export function parseFractional(numOrString) {
 }
 
 export const fractionalArgs = (fn) => mapArgs(fn, parseFractional);
+
+export const splitAt = function (index, value) {
+  return [value.slice(0, index), value.slice(index)];
+};
+
+export const zipWith = (f, xs, ys) => xs.map((n, i) => f(n, ys[i]));

packages/core/zyklus.mjs

@@ -44,6 +44,6 @@ function createClock(
   };
   const getPhase = () => phase;
   // setCallback
-  return { setDuration, start, stop, pause, duration, getPhase, minLatency };
+  return { setDuration, start, stop, pause, duration, interval, getPhase, minLatency };
 }
 export default createClock;

packages/csound/index.mjs

@@ -28,9 +28,7 @@ export const csound = register('csound', (instrument, pat) => {
       logger('[csound] not loaded yet', 'warning');
       return;
     }
-    if (typeof hap.value !== 'object') {
-      throw new Error('csound only support objects as hap values');
-    }
+    hap.ensureObjectValue();
     let { gain = 0.8 } = hap.value;
     gain *= 0.2;
 

packages/midi/midi.mjs

@@ -5,8 +5,9 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import * as _WebMidi from 'webmidi';
-import { Pattern, isPattern, isNote, getPlayableNoteValue, logger } from '@strudel.cycles/core';
+import { Pattern, isPattern, logger } from '@strudel.cycles/core';
 import { getAudioContext } from '@strudel.cycles/webaudio';
+import { toMidi } from '@strudel.cycles/core';
 
 // if you use WebMidi from outside of this package, make sure to import that instance:
 export const { WebMidi } = _WebMidi;
@@ -63,7 +64,7 @@ function getDevice(output, outputs) {
 }
 
 // Pattern.prototype.midi = function (output: string | number, channel = 1) {
-Pattern.prototype.midi = function (output, channel = 1) {
+Pattern.prototype.midi = function (output) {
   if (!supportsMidi()) {
     throw new Error(`🎹 WebMidi is not enabled. Supported Browsers: https://caniuse.com/?search=webmidi`);
   }
@@ -90,11 +91,6 @@ Pattern.prototype.midi = function (output, channel = 1) {
     );
   }
   return this.onTrigger((time, hap) => {
-    let note = getPlayableNoteValue(hap);
-    const velocity = hap.context?.velocity ?? 0.9;
-    if (!isNote(note)) {
-      throw new Error('not a note: ' + note);
-    }
     if (!midiReady) {
       return;
     }
@@ -106,15 +102,34 @@ Pattern.prototype.midi = function (output, channel = 1) {
           .join(' | ')}`,
       );
     }
-    // console.log('midi', value, output);
+    hap.ensureObjectValue();
+
+    // calculate time
     const timingOffset = WebMidi.time - getAudioContext().currentTime * 1000;
     time = time * 1000 + timingOffset;
-    // const inMs = '+' + (time - Tone.getContext().currentTime) * 1000;
-    // await enableWebMidi()
-    device.playNote(note, channel, {
-      time,
-      duration: hap.duration.valueOf() * 1000 - 5,
-      attack: velocity,
-    });
+
+    // destructure value
+    const { note, nrpnn, nrpv, ccn, ccv, midichan = 1 } = hap.value;
+    const velocity = hap.context?.velocity ?? 0.9; // TODO: refactor velocity
+    const duration = hap.duration.valueOf() * 1000 - 5;
+
+    if (note) {
+      const midiNumber = toMidi(note);
+      device.playNote(midiNumber, midichan, {
+        time,
+        duration,
+        attack: velocity,
+      });
+    }
+    if (ccv && ccn) {
+      if (typeof ccv !== 'number' || ccv < 0 || ccv > 1) {
+        throw new Error('expected ccv to be a number between 0 and 1');
+      }
+      if (!['string', 'number'].includes(typeof ccn)) {
+        throw new Error('expected ccn to be a number or a string');
+      }
+      const scaled = Math.round(ccv * 127);
+      device.sendControlChange(ccn, scaled, midichan, { time });
+    }
   });
 };

packages/osc/osc.mjs

@@ -45,9 +45,10 @@ let startedAt = -1;
  * @memberof Pattern
  * @returns Pattern
  */
-Pattern.prototype.osc = async function () {
-  const osc = await connect();
-  return this.onTrigger((time, hap, currentTime, cps = 1) => {
+Pattern.prototype.osc = function () {
+  return this.onTrigger(async (time, hap, currentTime, cps = 1) => {
+    hap.ensureObjectValue();
+    const osc = await connect();
     const cycle = hap.wholeOrPart().begin.valueOf();
     const delta = hap.duration.valueOf();
     // time should be audio time of onset

packages/react/README.md

@@ -13,24 +13,43 @@ npm i @strudel.cycles/react
 Here is a minimal example of how to set up a MiniRepl:
 
 ```jsx
-import { evalScope, controls } from '@strudel.cycles/core';
+import * as React from 'react';
+import '@strudel.cycles/react/dist/style.css';
 import { MiniRepl } from '@strudel.cycles/react';
-import { prebake } from '../repl/src/prebake.mjs';
+import { evalScope, controls } from '@strudel.cycles/core';
+import { samples, initAudioOnFirstClick } from '@strudel.cycles/webaudio';
 
-evalScope(
-  controls,
-  import('@strudel.cycles/core'),
-  import('@strudel.cycles/tonal'),
-  import('@strudel.cycles/mini'),
-  import('@strudel.cycles/webaudio'),
-  /* probably import other strudel packages */
-);
+async function prebake() {
+  await samples(
+    'https://strudel.tidalcycles.org/tidal-drum-machines.json',
+    'github:ritchse/tidal-drum-machines/main/machines/'
+  );
+  await samples(
+    'https://strudel.tidalcycles.org/EmuSP12.json',
+    'https://strudel.tidalcycles.org/EmuSP12/'
+  );
+}
 
-prebake();
+async function init() {
+  await evalScope(
+    controls,
+    import('@strudel.cycles/core'),
+    import('@strudel.cycles/mini'),
+    import('@strudel.cycles/webaudio'),
+    import('@strudel.cycles/tonal')
+  );
+  await prebake();
+  initAudioOnFirstClick();
+}
 
-export function Repl({ tune }) {
-  return <MiniRepl tune={tune} hideOutsideView={true} />;
+if (typeof window !== 'undefined') {
+  init();
+}
+
+export default function App() {
+  return <MiniRepl tune={`s("bd sd,hh*4")`} />;
 }
 ```
 
-For a more sophisticated example, check out the [nano-repl](./examples/nano-repl/)!
+- Open [example on stackblitz](https://stackblitz.com/edit/react-ts-saaair?file=tune.tsx,App.tsx)
+- Also check out the [nano-repl](./examples/nano-repl/) for a more sophisticated example

packages/react/examples/nano-repl/README.md

@@ -0,0 +1,15 @@
+# nano-repl
+
+this is an example of how to create a repl with strudel and react.
+
+## Usage
+
+after cloning the strudel repo:
+
+```sh
+pnpm i
+cd packages/react/examples/nano-repl
+pnpm dev
+```
+
+you should now have a repl running at `http://localhost:5173/`

packages/react/examples/nano-repl/src/App.jsx

@@ -66,7 +66,7 @@ function App() {
   const [code, setCode] = useState(defaultTune);
   const [view, setView] = useState();
   // const [code, setCode] = useState(`"c3".note().slow(2)`);
-  const { scheduler, evaluate, schedulerError, evalError, isDirty, activeCode, pattern } = useStrudel({
+  const { scheduler, evaluate, schedulerError, evalError, isDirty, activeCode, pattern, started } = useStrudel({
     code,
     defaultOutput: webaudioOutput,
     getTime,
@@ -75,8 +75,8 @@ function App() {
   useHighlighting({
     view,
     pattern,
-    active: !activeCode?.includes('strudel disable-highlighting'),
-    getTime: () => scheduler.getPhase(),
+    active: started && !activeCode?.includes('strudel disable-highlighting'),
+    getTime: () => scheduler.now(),
   });
 
   const error = evalError || schedulerError;

packages/react/examples/nano-repl/src/style.css

@@ -2,6 +2,18 @@
 @tailwind components;
 @tailwind utilities;
 
+:root {
+  --background: #222;
+  --lineBackground: #22222250;
+  --foreground: #fff;
+  --caret: #ffcc00;
+  --selection: rgba(128, 203, 196, 0.5);
+  --selectionMatch: #036dd626;
+  --lineHighlight: #00000050;
+  --gutterBackground: transparent;
+  --gutterForeground: #8a919966;
+}
+
 body {
   background: #123;
 }

packages/react/examples/nano-repl/tailwind.config.cjs

@@ -6,9 +6,23 @@ This program is free software: you can redistribute it and/or modify it under th
 
 module.exports = {
   // TODO: find out if leaving out tutorial path works now
-  content: ['./src/**/*.{js,jsx,ts,tsx}'],
+  content: ['./src/**/*.{js,jsx,ts,tsx}', '../../src/**/*.{html,js,jsx,md,mdx,ts,tsx}'],
   theme: {
-    extend: {},
+    extend: {
+      colors: {
+        // codemirror-theme settings
+        background: 'var(--background)',
+        lineBackground: 'var(--lineBackground)',
+        foreground: 'var(--foreground)',
+        caret: 'var(--caret)',
+        selection: 'var(--selection)',
+        selectionMatch: 'var(--selectionMatch)',
+        gutterBackground: 'var(--gutterBackground)',
+        gutterForeground: 'var(--gutterForeground)',
+        gutterBorder: 'var(--gutterBorder)',
+        lineHighlight: 'var(--lineHighlight)',
+      },
+    },
   },
   plugins: [],
 };

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/react",
-  "version": "0.6.0",
+  "version": "0.6.4",
   "description": "React components for strudel",
   "main": "src/index.js",
   "publishConfig": {
@@ -37,6 +37,8 @@
     "@codemirror/state": "^6.2.0",
     "@codemirror/view": "^6.7.3",
     "@lezer/highlight": "^1.1.3",
+    "@replit/codemirror-emacs": "^6.0.0",
+    "@replit/codemirror-vim": "^6.0.6",
     "@strudel.cycles/core": "workspace:*",
     "@strudel.cycles/transpiler": "workspace:*",
     "@strudel.cycles/webaudio": "workspace:*",

packages/react/src/components/CodeMirror6.jsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import _CodeMirror from '@uiw/react-codemirror';
 import { EditorView, Decoration } from '@codemirror/view';
 import { StateField, StateEffect } from '@codemirror/state';
@@ -7,7 +7,9 @@ import strudelTheme from '../themes/strudel-theme';
 import './style.css';
 import { useCallback } from 'react';
 import { autocompletion } from '@codemirror/autocomplete';
-import { strudelAutocomplete } from './Autocomplete';
+//import { strudelAutocomplete } from './Autocomplete';
+import { vim } from '@replit/codemirror-vim';
+import { emacs } from '@replit/codemirror-emacs';
 
 export const setFlash = StateEffect.define();
 const flashField = StateField.define({
@@ -56,15 +58,15 @@ const highlightField = StateField.define({
             haps
               .map((hap) =>
                 (hap.context.locations || []).map(({ start, end }) => {
-                  const color = hap.context.color || e.value.color || '#FFCA28';
+                  // const color = hap.context.color || e.value.color || '#FFCA28';
                   let from = tr.newDoc.line(start.line).from + start.column;
                   let to = tr.newDoc.line(end.line).from + end.column;
                   const l = tr.newDoc.length;
                   if (from > l || to > l) {
                     return; // dont mark outside of range, as it will throw an error
                   }
-                  // const mark = Decoration.mark({ attributes: { style: `outline: 1px solid ${color}` } });
-                  const mark = Decoration.mark({ attributes: { style: `outline: 1.5px solid ${color};` } });
+                  //const mark = Decoration.mark({ attributes: { style: `outline: 2px solid ${color};` } });
+                  const mark = Decoration.mark({ attributes: { class: `outline outline-2 outline-foreground` } });
                   return mark.range(from, to);
                 }),
               )
@@ -82,7 +84,7 @@ const highlightField = StateField.define({
   provide: (f) => EditorView.decorations.from(f),
 });
 
-const extensions = [
+const staticExtensions = [
   javascript(),
   highlightField,
   flashField,
@@ -97,6 +99,9 @@ export default function CodeMirror({
   onViewChanged,
   onSelectionChange,
   theme,
+  keybindings,
+  fontSize = 18,
+  fontFamily = 'monospace',
   options,
   editorDidMount,
 }) {
@@ -120,8 +125,18 @@ export default function CodeMirror({
     },
     [onSelectionChange],
   );
+  const extensions = useMemo(() => {
+    let bindings = {
+      vim,
+      emacs,
+    };
+    if (bindings[keybindings]) {
+      return [...staticExtensions, bindings[keybindings]()];
+    }
+    return staticExtensions;
+  }, [keybindings]);
   return (
-    <>
+    <div style={{ fontSize, fontFamily }} className="w-full">
       <_CodeMirror
         value={value}
         theme={theme || strudelTheme}
@@ -130,7 +145,7 @@ export default function CodeMirror({
         onUpdate={handleOnUpdate}
         extensions={extensions}
       />
-    </>
+    </div>
   );
 }
 

packages/react/src/components/MiniRepl.jsx

@@ -7,7 +7,6 @@ import useHighlighting from '../hooks/useHighlighting.mjs';
 import useStrudel from '../hooks/useStrudel.mjs';
 import CodeMirror6, { flash } from './CodeMirror6';
 import { Icon } from './Icon';
-import styles from './MiniRepl.module.css';
 import './style.css';
 import { logger } from '@strudel.cycles/core';
 import useEvent from '../hooks/useEvent.mjs';
@@ -23,7 +22,6 @@ export function MiniRepl({
   punchcard,
   canvasHeight = 200,
   theme,
-  highlightColor,
 }) {
   drawTime = drawTime || (punchcard ? [0, 4] : undefined);
   const evalOnMount = !!drawTime;
@@ -72,7 +70,6 @@ export function MiniRepl({
     pattern,
     active: started && !activeCode?.includes('strudel disable-highlighting'),
     getTime: () => scheduler.now(),
-    color: highlightColor,
   });
 
   // keyboard shortcuts
@@ -131,19 +128,31 @@ export function MiniRepl({
   );
 
   return (
-    <div className={styles.container} ref={ref}>
-      <div className={styles.header}>
-        <div className={styles.buttons}>
-          <button className={cx(styles.button, started ? 'animate-pulse' : '')} onClick={() => togglePlay()}>
+    <div className="overflow-hidden rounded-t-md bg-background border border-lineHighlight" ref={ref}>
+      <div className="flex justify-between bg-lineHighlight">
+        <div className="flex">
+          <button
+            className={cx(
+              'cursor-pointer w-16 flex items-center justify-center p-1 border-r border-lineHighlight text-foreground bg-lineHighlight hover:bg-background',
+              started ? 'animate-pulse' : '',
+            )}
+            onClick={() => togglePlay()}
+          >
             <Icon type={started ? 'stop' : 'play'} />
           </button>
-          <button className={cx(isDirty ? styles.button : styles.buttonDisabled)} onClick={() => activateCode()}>
+          <button
+            className={cx(
+              'w-16 flex items-center justify-center p-1 text-foreground border-lineHighlight bg-lineHighlight',
+              isDirty ? 'text-foreground hover:bg-background cursor-pointer' : 'opacity-50 cursor-not-allowed',
+            )}
+            onClick={() => activateCode()}
+          >
             <Icon type="refresh" />
           </button>
         </div>
-        {error && <div className={styles.error}>{error.message}</div>}
+        {error && <div className="text-right p-1 text-sm text-red-200">{error.message}</div>}
       </div>
-      <div className={styles.body}>
+      <div className="overflow-auto relative">
         {show && <CodeMirror6 value={code} onChange={setCode} onViewChanged={setView} theme={theme} />}
       </div>
       {drawTime && (

packages/react/src/components/MiniRepl.module.css

@@ -1,27 +0,0 @@
-.container {
-  @apply overflow-hidden;
-}
-
-.header {
-  @apply flex justify-between bg-lineHighlight border-t border-l border-r border-lineHighlight rounded-t-md overflow-hidden;
-}
-
-.buttons {
-  @apply flex;
-}
-
-.button {
-  @apply cursor-pointer w-16 flex items-center justify-center p-1 border-r border-lineHighlight text-foreground hover:bg-background;
-}
-
-.buttonDisabled {
-  @apply w-16 flex items-center justify-center p-1 opacity-50 cursor-not-allowed border-r border-lineHighlight;
-}
-
-.error {
-  @apply text-right p-1 text-sm text-red-200;
-}
-
-.body {
-  @apply overflow-auto relative;
-}

packages/react/src/components/style.css

@@ -1,12 +1,24 @@
+:root {
+  --background: #222;
+  --lineBackground: #22222250;
+  --foreground: #fff;
+  --caret: #ffcc00;
+  --selection: rgba(128, 203, 196, 0.5);
+  --selectionMatch: #036dd626;
+  --lineHighlight: #00000050;
+  --gutterBackground: transparent;
+  --gutterForeground: #8a919966;
+}
+
 .cm-editor {
   background-color: transparent !important;
   height: 100%;
   z-index: 11;
-  font-size: 18px;
 }
 
 .cm-theme {
   width: 100%;
+  height: 100%;
 }
 
 .cm-theme-light {

packages/react/src/hooks/useHighlighting.mjs

@@ -1,7 +1,8 @@
 import { useEffect, useRef } from 'react';
 import { setHighlights } from '../components/CodeMirror6';
+const round = (x) => Math.round(x * 1000) / 1000;
 
-function useHighlighting({ view, pattern, active, getTime, color }) {
+function useHighlighting({ view, pattern, active, getTime }) {
   const highlights = useRef([]);
   const lastEnd = useRef(0);
   useEffect(() => {
@@ -14,12 +15,12 @@ function useHighlighting({ view, pattern, active, getTime, color }) {
             // force min framerate of 10 fps => fixes crash on tab refocus, where lastEnd could be far away
             // see https://github.com/tidalcycles/strudel/issues/108
             const begin = Math.max(lastEnd.current ?? audioTime, audioTime - 1 / 10, -0.01); // negative time seems buggy
-            const span = [begin, audioTime + 1 / 60];
+            const span = [round(begin), round(audioTime + 1 / 60)];
             lastEnd.current = span[1];
             highlights.current = highlights.current.filter((hap) => hap.whole.end > audioTime); // keep only highlights that are still active
             const haps = pattern.queryArc(...span).filter((hap) => hap.hasOnset());
             highlights.current = highlights.current.concat(haps); // add potential new onsets
-            view.dispatch({ effects: setHighlights.of({ haps: highlights.current, color }) }); // highlight all still active + new active haps
+            view.dispatch({ effects: setHighlights.of({ haps: highlights.current }) }); // highlight all still active + new active haps
           } catch (err) {
             view.dispatch({ effects: setHighlights.of({ haps: [] }) });
           }
@@ -33,7 +34,7 @@ function useHighlighting({ view, pattern, active, getTime, color }) {
         view.dispatch({ effects: setHighlights.of({ haps: [] }) });
       }
     }
-  }, [pattern, active, view, color]);
+  }, [pattern, active, view]);
 }
 
 export default useHighlighting;

packages/react/src/hooks/useStrudel.mjs

@@ -10,7 +10,6 @@ function useStrudel({
   getTime,
   evalOnMount = false,
   initialCode = '',
-  autolink = false,
   beforeEval,
   afterEval,
   editPattern,
@@ -33,7 +32,7 @@ function useStrudel({
   const shouldPaint = useCallback((pat) => !!(pat?.context?.onPaint && drawContext), [drawContext]);
 
   // TODO: make sure this hook reruns when scheduler.started changes
-  const { scheduler, evaluate, start, stop, pause } = useMemo(
+  const { scheduler, evaluate, start, stop, pause, setCps } = useMemo(
     () =>
       repl({
         interval,
@@ -51,15 +50,13 @@ function useStrudel({
           setCode(code);
           beforeEval?.();
         },
-        afterEval: ({ pattern: _pattern, code }) => {
+        afterEval: (res) => {
+          const { pattern: _pattern, code } = res;
           setActiveCode(code);
           setPattern(_pattern);
           setEvalError();
           setSchedulerError();
-          if (autolink) {
-            window.location.hash = '#' + encodeURIComponent(btoa(code));
-          }
-          afterEval?.();
+          afterEval?.(res);
         },
         onToggle: (v) => {
           setStarted(v);
@@ -156,6 +153,7 @@ function useStrudel({
     stop,
     pause,
     togglePlay,
+    setCps,
   };
 }
 

packages/react/src/themes/algoboy.js

@@ -0,0 +1,39 @@
+import { tags as t } from '@lezer/highlight';
+import { createTheme } from '@uiw/codemirror-themes';
+export const settings = {
+  background: '#9bbc0f',
+  foreground: '#0f380f', // whats that?
+  caret: '#0f380f',
+  selection: '#306230',
+  selectionMatch: '#ffffff26',
+  lineHighlight: '#8bac0f',
+  lineBackground: '#9bbc0f50',
+  //lineBackground: 'transparent',
+  gutterBackground: 'transparent',
+  gutterForeground: '#0f380f',
+  light: true,
+};
+export default createTheme({
+  theme: 'light',
+  settings,
+  styles: [
+    { tag: t.keyword, color: '#0f380f' },
+    { tag: t.operator, color: '#0f380f' },
+    { tag: t.special(t.variableName), color: '#0f380f' },
+    { tag: t.typeName, color: '#0f380f' },
+    { tag: t.atom, color: '#0f380f' },
+    { tag: t.number, color: '#0f380f' },
+    { tag: t.definition(t.variableName), color: '#0f380f' },
+    { tag: t.string, color: '#0f380f' },
+    { tag: t.special(t.string), color: '#0f380f' },
+    { tag: t.comment, color: '#0f380f' },
+    { tag: t.variableName, color: '#0f380f' },
+    { tag: t.tagName, color: '#0f380f' },
+    { tag: t.bracket, color: '#0f380f' },
+    { tag: t.meta, color: '#0f380f' },
+    { tag: t.attributeName, color: '#0f380f' },
+    { tag: t.propertyName, color: '#0f380f' },
+    { tag: t.className, color: '#0f380f' },
+    { tag: t.invalid, color: '#0f380f' },
+  ],
+});

packages/react/src/themes/blackscreen.js

@@ -0,0 +1,37 @@
+import { tags as t } from '@lezer/highlight';
+import { createTheme } from '@uiw/codemirror-themes';
+export const settings = {
+  background: 'black',
+  foreground: 'white', // whats that?
+  caret: 'white',
+  selection: '#ffffff20',
+  selectionMatch: '#036dd626',
+  lineHighlight: '#ffffff10',
+  lineBackground: '#00000050',
+  gutterBackground: 'transparent',
+  gutterForeground: '#8a919966',
+};
+export default createTheme({
+  theme: 'dark',
+  settings,
+  styles: [
+    { tag: t.keyword, color: 'white' },
+    { tag: t.operator, color: 'white' },
+    { tag: t.special(t.variableName), color: 'white' },
+    { tag: t.typeName, color: 'white' },
+    { tag: t.atom, color: 'white' },
+    { tag: t.number, color: 'white' },
+    { tag: t.definition(t.variableName), color: 'white' },
+    { tag: t.string, color: 'white' },
+    { tag: t.special(t.string), color: 'white' },
+    { tag: t.comment, color: 'white' },
+    { tag: t.variableName, color: 'white' },
+    { tag: t.tagName, color: 'white' },
+    { tag: t.bracket, color: 'white' },
+    { tag: t.meta, color: 'white' },
+    { tag: t.attributeName, color: 'white' },
+    { tag: t.propertyName, color: 'white' },
+    { tag: t.className, color: 'white' },
+    { tag: t.invalid, color: 'white' },
+  ],
+});

packages/react/src/themes/bluescreen.js

@@ -0,0 +1,40 @@
+import { tags as t } from '@lezer/highlight';
+import { createTheme } from '@uiw/codemirror-themes';
+export const settings = {
+  background: '#051DB5',
+  lineBackground: '#051DB550',
+  foreground: 'white', // whats that?
+  caret: 'white',
+  selection: 'rgba(128, 203, 196, 0.5)',
+  selectionMatch: '#036dd626',
+  // lineHighlight: '#8a91991a', // original
+  lineHighlight: '#00000050',
+  gutterBackground: 'transparent',
+  // gutterForeground: '#8a919966',
+  gutterForeground: '#8a919966',
+};
+
+export default createTheme({
+  theme: 'dark',
+  settings,
+  styles: [
+    { tag: t.keyword, color: 'white' },
+    { tag: t.operator, color: 'white' },
+    { tag: t.special(t.variableName), color: 'white' },
+    { tag: t.typeName, color: 'white' },
+    { tag: t.atom, color: 'white' },
+    { tag: t.number, color: 'white' },
+    { tag: t.definition(t.variableName), color: 'white' },
+    { tag: t.string, color: 'white' },
+    { tag: t.special(t.string), color: 'white' },
+    { tag: t.comment, color: 'white' },
+    { tag: t.variableName, color: 'white' },
+    { tag: t.tagName, color: 'white' },
+    { tag: t.bracket, color: 'white' },
+    { tag: t.meta, color: 'white' },
+    { tag: t.attributeName, color: 'white' },
+    { tag: t.propertyName, color: 'white' },
+    { tag: t.className, color: 'white' },
+    { tag: t.invalid, color: 'white' },
+  ],
+});

packages/react/src/themes/terminal.js

@@ -0,0 +1,36 @@
+import { tags as t } from '@lezer/highlight';
+import { createTheme } from '@uiw/codemirror-themes';
+export const settings = {
+  background: 'black',
+  foreground: '#41FF00', // whats that?
+  caret: '#41FF00',
+  selection: '#ffffff20',
+  selectionMatch: '#036dd626',
+  lineHighlight: '#ffffff10',
+  gutterBackground: 'transparent',
+  gutterForeground: '#8a919966',
+};
+export default createTheme({
+  theme: 'dark',
+  settings,
+  styles: [
+    { tag: t.keyword, color: '#41FF00' },
+    { tag: t.operator, color: '#41FF00' },
+    { tag: t.special(t.variableName), color: '#41FF00' },
+    { tag: t.typeName, color: '#41FF00' },
+    { tag: t.atom, color: '#41FF00' },
+    { tag: t.number, color: '#41FF00' },
+    { tag: t.definition(t.variableName), color: '#41FF00' },
+    { tag: t.string, color: '#41FF00' },
+    { tag: t.special(t.string), color: '#41FF00' },
+    { tag: t.comment, color: '#41FF00' },
+    { tag: t.variableName, color: '#41FF00' },
+    { tag: t.tagName, color: '#41FF00' },
+    { tag: t.bracket, color: '#41FF00' },
+    { tag: t.meta, color: '#41FF00' },
+    { tag: t.attributeName, color: '#41FF00' },
+    { tag: t.propertyName, color: '#41FF00' },
+    { tag: t.className, color: '#41FF00' },
+    { tag: t.invalid, color: '#41FF00' },
+  ],
+});

packages/react/src/themes/whitescreen.js

@@ -0,0 +1,38 @@
+import { tags as t } from '@lezer/highlight';
+import { createTheme } from '@uiw/codemirror-themes';
+export const settings = {
+  background: 'white',
+  foreground: 'black', // whats that?
+  caret: 'black',
+  selection: 'rgba(128, 203, 196, 0.5)',
+  selectionMatch: '#ffffff26',
+  lineHighlight: '#cccccc50',
+  lineBackground: '#ffffff50',
+  gutterBackground: 'transparent',
+  gutterForeground: 'black',
+  light: true,
+};
+export default createTheme({
+  theme: 'light',
+  settings,
+  styles: [
+    { tag: t.keyword, color: 'black' },
+    { tag: t.operator, color: 'black' },
+    { tag: t.special(t.variableName), color: 'black' },
+    { tag: t.typeName, color: 'black' },
+    { tag: t.atom, color: 'black' },
+    { tag: t.number, color: 'black' },
+    { tag: t.definition(t.variableName), color: 'black' },
+    { tag: t.string, color: 'black' },
+    { tag: t.special(t.string), color: 'black' },
+    { tag: t.comment, color: 'black' },
+    { tag: t.variableName, color: 'black' },
+    { tag: t.tagName, color: 'black' },
+    { tag: t.bracket, color: 'black' },
+    { tag: t.meta, color: 'black' },
+    { tag: t.attributeName, color: 'black' },
+    { tag: t.propertyName, color: 'black' },
+    { tag: t.className, color: 'black' },
+    { tag: t.invalid, color: 'black' },
+  ],
+});

packages/react/tailwind.config.js

@@ -1,7 +1,21 @@
 module.exports = {
   content: ['./src/**/*.{js,jsx,ts,tsx}'],
   theme: {
-    extend: {},
+    extend: {
+      colors: {
+        // codemirror-theme settings
+        background: 'var(--background)',
+        lineBackground: 'var(--lineBackground)',
+        foreground: 'var(--foreground)',
+        caret: 'var(--caret)',
+        selection: 'var(--selection)',
+        selectionMatch: 'var(--selectionMatch)',
+        gutterBackground: 'var(--gutterBackground)',
+        gutterForeground: 'var(--gutterForeground)',
+        gutterBorder: 'var(--gutterBorder)',
+        lineHighlight: 'var(--lineHighlight)',
+      },
+    },
   },
   plugins: [],
   corePlugins: {

packages/webaudio/webaudio.mjs

@@ -191,23 +191,11 @@ function effectSend(input, effect, wet) {
 }
 
 // export const webaudioOutput = async (t, hap, ct, cps) => {
-export const webaudioOutput = async (hap, deadline, hapDuration) => {
+export const webaudioOutput = async (hap, deadline, hapDuration, cps) => {
   const ac = getAudioContext();
-  /* if (isNote(hap.value)) {
-      // supports primitive hap values that look like notes
-      hap.value = { note: hap.value };
-    } */
-  if (typeof hap.value !== 'object') {
-    logger(
-      `hap.value "${hap.value}" is not supported by webaudio output. Hint: append .note() or .s() to the end`,
-      'error',
-    );
-    /*     throw new Error(
-      `hap.value "${hap.value}"" is not supported by webaudio output. Hint: append .note() or .s() to the end`,
-    ); */
-    return;
-  }
-  // calculate correct time (tone.js workaround)
+  hap.ensureObjectValue();
+
+  // calculate absolute time
   let t = ac.currentTime + deadline;
   // destructure value
   let {
@@ -220,20 +208,14 @@ export const webaudioOutput = async (hap, deadline, hapDuration) => {
     note,
     gain = 0.8,
     // low pass
-    lpf,
-    cutoff = lpf,
-    lpq = 1,
-    resonance = lpq,
+    cutoff,
+    resonance = 1,
     // high pass
-    hpf,
-    hcutoff = hpf,
-    hpq = 1,
-    hresonance = hpq,
+    hcutoff,
+    hresonance = 1,
     // band pass
-    bpf,
-    bandf = bpf,
-    bpq = 1,
-    bandq = bpq,
+    bandf,
+    bandq = 1,
     //
     coarse,
     crush,
@@ -249,11 +231,11 @@ export const webaudioOutput = async (hap, deadline, hapDuration) => {
     unit,
     nudge = 0, // TODO: is this in seconds?
     cut,
-    loop,
+    loopBegin,
+    loopEnd,
     orbit = 1,
     room,
     size = 2,
-    roomsize = size,
   } = hap.value;
   const { velocity = 1 } = hap.context;
   gain *= velocity; // legacy fix for velocity
@@ -324,19 +306,23 @@ export const webaudioOutput = async (hap, deadline, hapDuration) => {
     bufferSource.playbackRate.value = Math.abs(speed) * bufferSource.playbackRate.value;
     if (unit === 'c') {
       // are there other units?
-      bufferSource.playbackRate.value = bufferSource.playbackRate.value * bufferSource.buffer.duration;
+      bufferSource.playbackRate.value = bufferSource.playbackRate.value * bufferSource.buffer.duration * cps;
     }
-    let duration = soundfont || clip ? hapDuration : bufferSource.buffer.duration / bufferSource.playbackRate.value;
+    const loop = loopBegin !== undefined || loopEnd !== undefined;
+    let duration =
+      soundfont || clip || loop ? hapDuration : bufferSource.buffer.duration / bufferSource.playbackRate.value;
     // "The computation of the offset into the sound is performed using the sound buffer's natural sample rate,
     // rather than the current playback rate, so even if the sound is playing at twice its normal speed,
     // the midway point through a 10-second audio buffer is still 5."
     const offset = begin * duration * bufferSource.playbackRate.value;
     duration = (end - begin) * duration;
     if (loop) {
+      loopBegin = loopBegin ?? 0;
+      loopEnd = loopEnd ?? 1;
       bufferSource.loop = true;
-      bufferSource.loopStart = offset;
-      bufferSource.loopEnd = offset + duration;
-      duration = loop * duration;
+      bufferSource.loopStart = offset + loopBegin * duration;
+      bufferSource.loopEnd = offset + duration - (1 - loopEnd) * duration;
+      duration = hapDuration;
     }
     t += nudge;
 
@@ -385,8 +371,8 @@ export const webaudioOutput = async (hap, deadline, hapDuration) => {
   }
   // reverb
   let reverbSend;
-  if (room > 0 && roomsize > 0) {
-    const reverbNode = getReverb(orbit, roomsize);
+  if (room > 0 && size > 0) {
+    const reverbNode = getReverb(orbit, size);
     reverbSend = effectSend(post, reverbNode, room);
   }
 
@@ -397,7 +383,7 @@ export const webaudioOutput = async (hap, deadline, hapDuration) => {
   chain[0].onended = () => chain.concat([delaySend, reverbSend]).forEach((n) => n?.disconnect());
 };
 
-export const webaudioOutputTrigger = (t, hap, ct, cps) => webaudioOutput(hap, t - ct, hap.duration / cps);
+export const webaudioOutputTrigger = (t, hap, ct, cps) => webaudioOutput(hap, t - ct, hap.duration / cps, cps);
 
 Pattern.prototype.webaudio = function () {
   // TODO: refactor (t, hap, ct, cps) to (hap, deadline, duration) ?

pnpm-lock.yaml

@@ -11,6 +11,7 @@ importers:
       '@strudel.cycles/webaudio': workspace:*
       '@strudel.cycles/xen': workspace:*
       '@vitest/ui': ^0.25.7
+      acorn: ^8.8.1
       c8: ^7.12.0
       canvas: ^2.11.0
       dependency-tree: ^9.0.0
@@ -32,6 +33,7 @@ importers:
       '@strudel.cycles/transpiler': link:packages/transpiler
       '@strudel.cycles/webaudio': link:packages/webaudio
       '@strudel.cycles/xen': link:packages/xen
+      acorn: 8.8.2
       dependency-tree: 9.0.0
       vitest: 0.25.8_@vitest+ui@0.25.8
     devDependencies:
@@ -164,6 +166,8 @@ importers:
       '@codemirror/state': ^6.2.0
       '@codemirror/view': ^6.7.3
       '@lezer/highlight': ^1.1.3
+      '@replit/codemirror-emacs': ^6.0.0
+      '@replit/codemirror-vim': ^6.0.6
       '@strudel.cycles/core': workspace:*
       '@strudel.cycles/transpiler': workspace:*
       '@strudel.cycles/webaudio': workspace:*
@@ -185,6 +189,8 @@ importers:
       '@codemirror/state': 6.2.0
       '@codemirror/view': 6.7.3
       '@lezer/highlight': 1.1.3
+      '@replit/codemirror-emacs': 6.0.0_cgfc5aojxuwjajwhkrgidrzxoa
+      '@replit/codemirror-vim': 6.0.6_a4vbhepr4qhxm5cldqd4jpyase
       '@strudel.cycles/core': link:../core
       '@strudel.cycles/transpiler': link:../transpiler
       '@strudel.cycles/webaudio': link:../webaudio
@@ -358,6 +364,8 @@ importers:
       '@docsearch/react': ^3.1.0
       '@headlessui/react': ^1.7.7
       '@heroicons/react': ^2.0.13
+      '@nanostores/persistent': ^0.7.0
+      '@nanostores/react': ^0.4.1
       '@strudel.cycles/core': workspace:*
       '@strudel.cycles/csound': workspace:*
       '@strudel.cycles/midi': workspace:*
@@ -371,6 +379,7 @@ importers:
       '@strudel.cycles/webaudio': workspace:*
       '@strudel.cycles/xen': workspace:*
       '@supabase/supabase-js': ^1.35.3
+      '@tailwindcss/forms': ^0.5.3
       '@tailwindcss/typography': ^0.5.8
       '@types/node': ^18.0.0
       '@types/react': ^18.0.26
@@ -382,6 +391,7 @@ importers:
       fraction.js: ^4.2.0
       html-escaper: ^3.0.3
       nanoid: ^4.0.0
+      nanostores: ^0.7.4
       preact: ^10.7.3
       react: ^18.2.0
       react-dom: ^18.2.0
@@ -402,6 +412,8 @@ importers:
       '@docsearch/react': 3.3.2_y6lbs4o5th67cuzjdmtw5eqh7a
       '@headlessui/react': 1.7.8_biqbaboplfbrettd7655fr4n2y
       '@heroicons/react': 2.0.14_react@18.2.0
+      '@nanostores/persistent': 0.7.0_nanostores@0.7.4
+      '@nanostores/react': 0.4.1_nkfnbc2tpc77iht7asm3uqwau4
       '@strudel.cycles/core': link:../packages/core
       '@strudel.cycles/csound': link:../packages/csound
       '@strudel.cycles/midi': link:../packages/midi
@@ -415,6 +427,7 @@ importers:
       '@strudel.cycles/webaudio': link:../packages/webaudio
       '@strudel.cycles/xen': link:../packages/xen
       '@supabase/supabase-js': 1.35.7
+      '@tailwindcss/forms': 0.5.3_tailwindcss@3.2.4
       '@tailwindcss/typography': 0.5.9_tailwindcss@3.2.4
       '@types/node': 18.11.18
       '@types/react': 18.0.27
@@ -424,6 +437,7 @@ importers:
       canvas: 2.11.0
       fraction.js: 4.2.0
       nanoid: 4.0.0
+      nanostores: 0.7.4
       preact: 10.11.3
       react: 18.2.0
       react-dom: 18.2.0_react@18.2.0
@@ -3164,6 +3178,27 @@ packages:
       - supports-color
     dev: false
 
+  /@nanostores/persistent/0.7.0_nanostores@0.7.4:
+    resolution: {integrity: sha512-4PAInL/T1hbftZUJ0cmgdFHBMalUoq7BUXFBy7QfyMv/8X3LPTYNh/yxspL7+J+XM3UNvVI7IFRMMs6FBasjhQ==}
+    engines: {node: ^14.0.0 || ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      nanostores: ^0.7.0
+    dependencies:
+      nanostores: 0.7.4
+    dev: false
+
+  /@nanostores/react/0.4.1_nkfnbc2tpc77iht7asm3uqwau4:
+    resolution: {integrity: sha512-lsv0CYrMxczbXtoV/mxFVEoL/uVjEjseoP89srO/5yNAOkJka+dSFS7LYyWEbuvCPO7EgbtkvRpO5V+OztKQOw==}
+    engines: {node: ^14.0.0 || ^16.0.0 || >=18.0.0}
+    peerDependencies:
+      nanostores: ^0.7.0
+      react: '>=18.0.0'
+    dependencies:
+      nanostores: 0.7.4
+      react: 18.2.0
+      use-sync-external-store: 1.2.0_react@18.2.0
+    dev: false
+
   /@nodelib/fs.scandir/2.1.5:
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
@@ -3400,6 +3435,33 @@ packages:
       tsm: 2.3.0
     dev: false
 
+  /@replit/codemirror-emacs/6.0.0_cgfc5aojxuwjajwhkrgidrzxoa:
+    resolution: {integrity: sha512-zxSDg3UKm7811hjqNtgvK9G0IBtCWf82Idb9nZQo0ldmGl4d9SV7oCSuXQ58NmOG4AV7coD7kgFSZhEqHhyQhA==}
+    peerDependencies:
+      '@codemirror/autocomplete': ^6.0.2
+      '@codemirror/commands': ^6.0.0
+      '@codemirror/search': ^6.0.0
+      '@codemirror/state': ^6.0.1
+      '@codemirror/view': ^6.0.2
+    dependencies:
+      '@codemirror/autocomplete': 6.4.0_a4vbhepr4qhxm5cldqd4jpyase
+      '@codemirror/state': 6.2.0
+      '@codemirror/view': 6.7.3
+    dev: false
+
+  /@replit/codemirror-vim/6.0.6_a4vbhepr4qhxm5cldqd4jpyase:
+    resolution: {integrity: sha512-/Lc+5AmV+T5pTm5P+rWpL+gseNHNye7xaUWpULczHai5ZLVg/ZE3+MBwK3Ai+/SmZKR/mK2YuXgNKnTGToEGYg==}
+    peerDependencies:
+      '@codemirror/commands': ^6.0.0
+      '@codemirror/language': ^6.1.0
+      '@codemirror/search': ^6.2.0
+      '@codemirror/state': ^6.0.1
+      '@codemirror/view': ^6.0.3
+    dependencies:
+      '@codemirror/state': 6.2.0
+      '@codemirror/view': 6.7.3
+    dev: false
+
   /@rollup/plugin-babel/5.3.1_3dsfpkpoyvuuxyfgdbpn4j4uzm:
     resolution: {integrity: sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==}
     engines: {node: '>= 10.0.0'}
@@ -3560,6 +3622,15 @@ packages:
       string.prototype.matchall: 4.0.8
     dev: true
 
+  /@tailwindcss/forms/0.5.3_tailwindcss@3.2.4:
+    resolution: {integrity: sha512-y5mb86JUoiUgBjY/o6FJSFZSEttfb3Q5gllE4xoKjAAD+vBrnIhE4dViwUuow3va8mpH4s9jyUbUbrRGoRdc2Q==}
+    peerDependencies:
+      tailwindcss: '>=3.0.0 || >= 3.0.0-alpha.1'
+    dependencies:
+      mini-svg-data-uri: 1.4.4
+      tailwindcss: 3.2.4
+    dev: false
+
   /@tailwindcss/typography/0.5.9_tailwindcss@3.2.4:
     resolution: {integrity: sha512-t8Sg3DyynFysV9f4JDOVISGsjazNb48AeIYQwcL+Bsq5uf4RYL75C1giZ43KISjeDGBaTN3Kxh7Xj/vRSMJUUg==}
     peerDependencies:
@@ -9371,6 +9442,11 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
+  /mini-svg-data-uri/1.4.4:
+    resolution: {integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==}
+    hasBin: true
+    dev: false
+
   /minimatch/3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
     dependencies:
@@ -9599,6 +9675,11 @@ packages:
     hasBin: true
     dev: false
 
+  /nanostores/0.7.4:
+    resolution: {integrity: sha512-MBeUVt7NBcXqh7AGT+KSr3O0X/995CZsvcP2QEMP+PXFwb07qv3Vjyq+EX0yS8f12Vv3Tn2g/BvK/OZoMhJlOQ==}
+    engines: {node: ^14.0.0 || ^16.0.0 || >=18.0.0}
+    dev: false
+
   /napi-build-utils/1.0.2:
     resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==}
     dev: true
@@ -10413,17 +10494,6 @@ packages:
       - supports-color
     dev: true
 
-  /postcss-import/14.1.0:
-    resolution: {integrity: sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      postcss: ^8.0.0
-    dependencies:
-      postcss-value-parser: 4.2.0
-      read-cache: 1.0.0
-      resolve: 1.22.1
-    dev: false
-
   /postcss-import/14.1.0_postcss@8.4.21:
     resolution: {integrity: sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==}
     engines: {node: '>=10.0.0'}
@@ -10434,16 +10504,6 @@ packages:
       postcss-value-parser: 4.2.0
       read-cache: 1.0.0
       resolve: 1.22.1
-    dev: true
-
-  /postcss-js/4.0.0:
-    resolution: {integrity: sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==}
-    engines: {node: ^12 || ^14 || >= 16}
-    peerDependencies:
-      postcss: ^8.3.3
-    dependencies:
-      camelcase-css: 2.0.1
-    dev: false
 
   /postcss-js/4.0.0_postcss@8.4.21:
     resolution: {integrity: sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==}
@@ -10453,23 +10513,6 @@ packages:
     dependencies:
       camelcase-css: 2.0.1
       postcss: 8.4.21
-    dev: true
-
-  /postcss-load-config/3.1.4:
-    resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
-    engines: {node: '>= 10'}
-    peerDependencies:
-      postcss: '>=8.0.9'
-      ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      postcss:
-        optional: true
-      ts-node:
-        optional: true
-    dependencies:
-      lilconfig: 2.0.6
-      yaml: 1.10.2
-    dev: false
 
   /postcss-load-config/3.1.4_postcss@8.4.21:
     resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
@@ -10487,15 +10530,6 @@ packages:
       postcss: 8.4.21
       yaml: 1.10.2
 
-  /postcss-nested/6.0.0:
-    resolution: {integrity: sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==}
-    engines: {node: '>=12.0'}
-    peerDependencies:
-      postcss: ^8.2.14
-    dependencies:
-      postcss-selector-parser: 6.0.11
-    dev: false
-
   /postcss-nested/6.0.0_postcss@8.4.21:
     resolution: {integrity: sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==}
     engines: {node: '>=12.0'}
@@ -10504,7 +10538,6 @@ packages:
     dependencies:
       postcss: 8.4.21
       postcss-selector-parser: 6.0.11
-    dev: true
 
   /postcss-selector-parser/6.0.10:
     resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==}
@@ -12127,8 +12160,6 @@ packages:
     resolution: {integrity: sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==}
     engines: {node: '>=12.13.0'}
     hasBin: true
-    peerDependencies:
-      postcss: ^8.0.9
     dependencies:
       arg: 5.0.2
       chokidar: 3.5.3
@@ -12145,10 +12176,10 @@ packages:
       object-hash: 3.0.0
       picocolors: 1.0.0
       postcss: 8.4.21
-      postcss-import: 14.1.0
-      postcss-js: 4.0.0
-      postcss-load-config: 3.1.4
-      postcss-nested: 6.0.0
+      postcss-import: 14.1.0_postcss@8.4.21
+      postcss-js: 4.0.0_postcss@8.4.21
+      postcss-load-config: 3.1.4_postcss@8.4.21
+      postcss-nested: 6.0.0_postcss@8.4.21
       postcss-selector-parser: 6.0.11
       postcss-value-parser: 4.2.0
       quick-lru: 5.1.1
@@ -12854,6 +12885,14 @@ packages:
       punycode: 2.3.0
     dev: true
 
+  /use-sync-external-store/1.2.0_react@18.2.0:
+    resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    dependencies:
+      react: 18.2.0
+    dev: false
+
   /utf-8-validate/5.0.10:
     resolution: {integrity: sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==}
     engines: {node: '>=6.14.2'}

test/__snapshots__/examples.test.mjs.snap

@@ -885,39 +885,39 @@ exports[`runs examples > example "begin" example index 0 1`] = `
 
 exports[`runs examples > example "bpf" example index 0 1`] = `
 [
-  "[ 0/1 → 1/2 | s:bd bpf:1000 ]",
-  "[ 1/2 → 1/1 | s:sd bpf:1000 ]",
-  "[ 0/1 → 1/3 | s:hh bpf:1000 ]",
-  "[ 1/3 → 2/3 | s:hh bpf:1000 ]",
-  "[ 2/3 → 1/1 | s:hh bpf:1000 ]",
-  "[ 1/1 → 3/2 | s:bd bpf:2000 ]",
-  "[ 3/2 → 2/1 | s:sd bpf:2000 ]",
-  "[ 1/1 → 4/3 | s:hh bpf:2000 ]",
-  "[ 4/3 → 5/3 | s:hh bpf:2000 ]",
-  "[ 5/3 → 2/1 | s:hh bpf:2000 ]",
-  "[ 2/1 → 5/2 | s:bd bpf:4000 ]",
-  "[ 5/2 → 3/1 | s:sd bpf:4000 ]",
-  "[ 2/1 → 7/3 | s:hh bpf:4000 ]",
-  "[ 7/3 → 8/3 | s:hh bpf:4000 ]",
-  "[ 8/3 → 3/1 | s:hh bpf:4000 ]",
-  "[ 3/1 → 7/2 | s:bd bpf:8000 ]",
-  "[ 7/2 → 4/1 | s:sd bpf:8000 ]",
-  "[ 3/1 → 10/3 | s:hh bpf:8000 ]",
-  "[ 10/3 → 11/3 | s:hh bpf:8000 ]",
-  "[ 11/3 → 4/1 | s:hh bpf:8000 ]",
+  "[ 0/1 → 1/2 | s:bd bandf:1000 ]",
+  "[ 1/2 → 1/1 | s:sd bandf:1000 ]",
+  "[ 0/1 → 1/3 | s:hh bandf:1000 ]",
+  "[ 1/3 → 2/3 | s:hh bandf:1000 ]",
+  "[ 2/3 → 1/1 | s:hh bandf:1000 ]",
+  "[ 1/1 → 3/2 | s:bd bandf:2000 ]",
+  "[ 3/2 → 2/1 | s:sd bandf:2000 ]",
+  "[ 1/1 → 4/3 | s:hh bandf:2000 ]",
+  "[ 4/3 → 5/3 | s:hh bandf:2000 ]",
+  "[ 5/3 → 2/1 | s:hh bandf:2000 ]",
+  "[ 2/1 → 5/2 | s:bd bandf:4000 ]",
+  "[ 5/2 → 3/1 | s:sd bandf:4000 ]",
+  "[ 2/1 → 7/3 | s:hh bandf:4000 ]",
+  "[ 7/3 → 8/3 | s:hh bandf:4000 ]",
+  "[ 8/3 → 3/1 | s:hh bandf:4000 ]",
+  "[ 3/1 → 7/2 | s:bd bandf:8000 ]",
+  "[ 7/2 → 4/1 | s:sd bandf:8000 ]",
+  "[ 3/1 → 10/3 | s:hh bandf:8000 ]",
+  "[ 10/3 → 11/3 | s:hh bandf:8000 ]",
+  "[ 11/3 → 4/1 | s:hh bandf:8000 ]",
 ]
 `;
 
 exports[`runs examples > example "bpq" example index 0 1`] = `
 [
-  "[ 0/1 → 1/2 | s:bd bpf:500 bpq:0 ]",
-  "[ 1/2 → 1/1 | s:sd bpf:500 bpq:0 ]",
-  "[ 1/1 → 3/2 | s:bd bpf:500 bpq:1 ]",
-  "[ 3/2 → 2/1 | s:sd bpf:500 bpq:1 ]",
-  "[ 2/1 → 5/2 | s:bd bpf:500 bpq:2 ]",
-  "[ 5/2 → 3/1 | s:sd bpf:500 bpq:2 ]",
-  "[ 3/1 → 7/2 | s:bd bpf:500 bpq:3 ]",
-  "[ 7/2 → 4/1 | s:sd bpf:500 bpq:3 ]",
+  "[ 0/1 → 1/2 | s:bd bandf:500 bandq:0 ]",
+  "[ 1/2 → 1/1 | s:sd bandf:500 bandq:0 ]",
+  "[ 1/1 → 3/2 | s:bd bandf:500 bandq:1 ]",
+  "[ 3/2 → 2/1 | s:sd bandf:500 bandq:1 ]",
+  "[ 2/1 → 5/2 | s:bd bandf:500 bandq:2 ]",
+  "[ 5/2 → 3/1 | s:sd bandf:500 bandq:2 ]",
+  "[ 3/1 → 7/2 | s:bd bandf:500 bandq:3 ]",
+  "[ 7/2 → 4/1 | s:sd bandf:500 bandq:3 ]",
 ]
 `;
 
@@ -1896,59 +1896,59 @@ exports[`runs examples > example "gain" example index 0 1`] = `
 
 exports[`runs examples > example "hpf" example index 0 1`] = `
 [
-  "[ 0/1 → 1/2 | s:bd hpf:4000 ]",
-  "[ 1/2 → 1/1 | s:sd hpf:4000 ]",
-  "[ 0/1 → 1/4 | s:hh hpf:4000 ]",
-  "[ 1/4 → 1/2 | s:hh hpf:4000 ]",
-  "[ 1/2 → 3/4 | s:hh hpf:4000 ]",
-  "[ 3/4 → 1/1 | s:hh hpf:4000 ]",
-  "[ 1/1 → 3/2 | s:bd hpf:2000 ]",
-  "[ 3/2 → 2/1 | s:sd hpf:2000 ]",
-  "[ 1/1 → 5/4 | s:hh hpf:2000 ]",
-  "[ 5/4 → 3/2 | s:hh hpf:2000 ]",
-  "[ 3/2 → 7/4 | s:hh hpf:2000 ]",
-  "[ 7/4 → 2/1 | s:hh hpf:2000 ]",
-  "[ 2/1 → 5/2 | s:bd hpf:1000 ]",
-  "[ 5/2 → 3/1 | s:sd hpf:1000 ]",
-  "[ 2/1 → 9/4 | s:hh hpf:1000 ]",
-  "[ 9/4 → 5/2 | s:hh hpf:1000 ]",
-  "[ 5/2 → 11/4 | s:hh hpf:1000 ]",
-  "[ 11/4 → 3/1 | s:hh hpf:1000 ]",
-  "[ 3/1 → 7/2 | s:bd hpf:500 ]",
-  "[ 7/2 → 4/1 | s:sd hpf:500 ]",
-  "[ 3/1 → 13/4 | s:hh hpf:500 ]",
-  "[ 13/4 → 7/2 | s:hh hpf:500 ]",
-  "[ 7/2 → 15/4 | s:hh hpf:500 ]",
-  "[ 15/4 → 4/1 | s:hh hpf:500 ]",
+  "[ 0/1 → 1/2 | s:bd hcutoff:4000 ]",
+  "[ 1/2 → 1/1 | s:sd hcutoff:4000 ]",
+  "[ 0/1 → 1/4 | s:hh hcutoff:4000 ]",
+  "[ 1/4 → 1/2 | s:hh hcutoff:4000 ]",
+  "[ 1/2 → 3/4 | s:hh hcutoff:4000 ]",
+  "[ 3/4 → 1/1 | s:hh hcutoff:4000 ]",
+  "[ 1/1 → 3/2 | s:bd hcutoff:2000 ]",
+  "[ 3/2 → 2/1 | s:sd hcutoff:2000 ]",
+  "[ 1/1 → 5/4 | s:hh hcutoff:2000 ]",
+  "[ 5/4 → 3/2 | s:hh hcutoff:2000 ]",
+  "[ 3/2 → 7/4 | s:hh hcutoff:2000 ]",
+  "[ 7/4 → 2/1 | s:hh hcutoff:2000 ]",
+  "[ 2/1 → 5/2 | s:bd hcutoff:1000 ]",
+  "[ 5/2 → 3/1 | s:sd hcutoff:1000 ]",
+  "[ 2/1 → 9/4 | s:hh hcutoff:1000 ]",
+  "[ 9/4 → 5/2 | s:hh hcutoff:1000 ]",
+  "[ 5/2 → 11/4 | s:hh hcutoff:1000 ]",
+  "[ 11/4 → 3/1 | s:hh hcutoff:1000 ]",
+  "[ 3/1 → 7/2 | s:bd hcutoff:500 ]",
+  "[ 7/2 → 4/1 | s:sd hcutoff:500 ]",
+  "[ 3/1 → 13/4 | s:hh hcutoff:500 ]",
+  "[ 13/4 → 7/2 | s:hh hcutoff:500 ]",
+  "[ 7/2 → 15/4 | s:hh hcutoff:500 ]",
+  "[ 15/4 → 4/1 | s:hh hcutoff:500 ]",
 ]
 `;
 
 exports[`runs examples > example "hpq" example index 0 1`] = `
 [
-  "[ 0/1 → 1/2 | s:bd hpf:2000 hpq:0 ]",
-  "[ 1/2 → 1/1 | s:sd hpf:2000 hpq:0 ]",
-  "[ 0/1 → 1/4 | s:hh hpf:2000 hpq:0 ]",
-  "[ 1/4 → 1/2 | s:hh hpf:2000 hpq:0 ]",
-  "[ 1/2 → 3/4 | s:hh hpf:2000 hpq:0 ]",
-  "[ 3/4 → 1/1 | s:hh hpf:2000 hpq:0 ]",
-  "[ 1/1 → 3/2 | s:bd hpf:2000 hpq:10 ]",
-  "[ 3/2 → 2/1 | s:sd hpf:2000 hpq:10 ]",
-  "[ 1/1 → 5/4 | s:hh hpf:2000 hpq:10 ]",
-  "[ 5/4 → 3/2 | s:hh hpf:2000 hpq:10 ]",
-  "[ 3/2 → 7/4 | s:hh hpf:2000 hpq:10 ]",
-  "[ 7/4 → 2/1 | s:hh hpf:2000 hpq:10 ]",
-  "[ 2/1 → 5/2 | s:bd hpf:2000 hpq:20 ]",
-  "[ 5/2 → 3/1 | s:sd hpf:2000 hpq:20 ]",
-  "[ 2/1 → 9/4 | s:hh hpf:2000 hpq:20 ]",
-  "[ 9/4 → 5/2 | s:hh hpf:2000 hpq:20 ]",
-  "[ 5/2 → 11/4 | s:hh hpf:2000 hpq:20 ]",
-  "[ 11/4 → 3/1 | s:hh hpf:2000 hpq:20 ]",
-  "[ 3/1 → 7/2 | s:bd hpf:2000 hpq:30 ]",
-  "[ 7/2 → 4/1 | s:sd hpf:2000 hpq:30 ]",
-  "[ 3/1 → 13/4 | s:hh hpf:2000 hpq:30 ]",
-  "[ 13/4 → 7/2 | s:hh hpf:2000 hpq:30 ]",
-  "[ 7/2 → 15/4 | s:hh hpf:2000 hpq:30 ]",
-  "[ 15/4 → 4/1 | s:hh hpf:2000 hpq:30 ]",
+  "[ 0/1 → 1/2 | s:bd hcutoff:2000 hresonance:0 ]",
+  "[ 1/2 → 1/1 | s:sd hcutoff:2000 hresonance:0 ]",
+  "[ 0/1 → 1/4 | s:hh hcutoff:2000 hresonance:0 ]",
+  "[ 1/4 → 1/2 | s:hh hcutoff:2000 hresonance:0 ]",
+  "[ 1/2 → 3/4 | s:hh hcutoff:2000 hresonance:0 ]",
+  "[ 3/4 → 1/1 | s:hh hcutoff:2000 hresonance:0 ]",
+  "[ 1/1 → 3/2 | s:bd hcutoff:2000 hresonance:10 ]",
+  "[ 3/2 → 2/1 | s:sd hcutoff:2000 hresonance:10 ]",
+  "[ 1/1 → 5/4 | s:hh hcutoff:2000 hresonance:10 ]",
+  "[ 5/4 → 3/2 | s:hh hcutoff:2000 hresonance:10 ]",
+  "[ 3/2 → 7/4 | s:hh hcutoff:2000 hresonance:10 ]",
+  "[ 7/4 → 2/1 | s:hh hcutoff:2000 hresonance:10 ]",
+  "[ 2/1 → 5/2 | s:bd hcutoff:2000 hresonance:20 ]",
+  "[ 5/2 → 3/1 | s:sd hcutoff:2000 hresonance:20 ]",
+  "[ 2/1 → 9/4 | s:hh hcutoff:2000 hresonance:20 ]",
+  "[ 9/4 → 5/2 | s:hh hcutoff:2000 hresonance:20 ]",
+  "[ 5/2 → 11/4 | s:hh hcutoff:2000 hresonance:20 ]",
+  "[ 11/4 → 3/1 | s:hh hcutoff:2000 hresonance:20 ]",
+  "[ 3/1 → 7/2 | s:bd hcutoff:2000 hresonance:30 ]",
+  "[ 7/2 → 4/1 | s:sd hcutoff:2000 hresonance:30 ]",
+  "[ 3/1 → 13/4 | s:hh hcutoff:2000 hresonance:30 ]",
+  "[ 13/4 → 7/2 | s:hh hcutoff:2000 hresonance:30 ]",
+  "[ 7/2 → 15/4 | s:hh hcutoff:2000 hresonance:30 ]",
+  "[ 15/4 → 4/1 | s:hh hcutoff:2000 hresonance:30 ]",
 ]
 `;
 
@@ -2354,15 +2354,6 @@ exports[`runs examples > example "linger" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "loop" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | s:bd loop:1 ]",
-  "[ 1/1 → 2/1 | s:bd loop:2 ]",
-  "[ 2/1 → 3/1 | s:bd loop:3 ]",
-  "[ 3/1 → 4/1 | s:bd loop:4 ]",
-]
-`;
-
 exports[`runs examples > example "loopAt" example index 0 1`] = `
 [
   "[ (0/1 → 1/1) ⇝ 4/1 | s:rhodes speed:0.25 unit:c ]",
@@ -2381,57 +2372,75 @@ exports[`runs examples > example "loopAtCps" example index 0 1`] = `
 ]
 `;
 
+exports[`runs examples > example "loopBegin" example index 0 1`] = `
+[
+  "[ 0/1 → 1/1 | note:c s:piano loopBegin:0 loopEnd:0.5 ]",
+  "[ 1/1 → 2/1 | note:a s:piano loopBegin:0.24 loopEnd:0.5 ]",
+  "[ 2/1 → 3/1 | note:f s:piano loopBegin:0.32 loopEnd:0.5 ]",
+  "[ 3/1 → 4/1 | note:e s:piano loopBegin:0 loopEnd:0.5 ]",
+]
+`;
+
+exports[`runs examples > example "loopEnd" example index 0 1`] = `
+[
+  "[ 0/1 → 1/1 | note:c s:piano loopBegin:0.2 loopEnd:0.3 ]",
+  "[ 1/1 → 2/1 | note:a s:piano loopBegin:0.2 loopEnd:0.4 ]",
+  "[ 2/1 → 3/1 | note:f s:piano loopBegin:0.2 loopEnd:0.5 ]",
+  "[ 3/1 → 4/1 | note:e s:piano loopBegin:0.2 loopEnd:0.6 ]",
+]
+`;
+
 exports[`runs examples > example "lpf" example index 0 1`] = `
 [
-  "[ 0/1 → 1/2 | s:bd lpf:4000 ]",
-  "[ 1/2 → 1/1 | s:sd lpf:4000 ]",
-  "[ 0/1 → 1/3 | s:hh lpf:4000 ]",
-  "[ 1/3 → 2/3 | s:hh lpf:4000 ]",
-  "[ 2/3 → 1/1 | s:hh lpf:4000 ]",
-  "[ 1/1 → 3/2 | s:bd lpf:2000 ]",
-  "[ 3/2 → 2/1 | s:sd lpf:2000 ]",
-  "[ 1/1 → 4/3 | s:hh lpf:2000 ]",
-  "[ 4/3 → 5/3 | s:hh lpf:2000 ]",
-  "[ 5/3 → 2/1 | s:hh lpf:2000 ]",
-  "[ 2/1 → 5/2 | s:bd lpf:1000 ]",
-  "[ 5/2 → 3/1 | s:sd lpf:1000 ]",
-  "[ 2/1 → 7/3 | s:hh lpf:1000 ]",
-  "[ 7/3 → 8/3 | s:hh lpf:1000 ]",
-  "[ 8/3 → 3/1 | s:hh lpf:1000 ]",
-  "[ 3/1 → 7/2 | s:bd lpf:500 ]",
-  "[ 7/2 → 4/1 | s:sd lpf:500 ]",
-  "[ 3/1 → 10/3 | s:hh lpf:500 ]",
-  "[ 10/3 → 11/3 | s:hh lpf:500 ]",
-  "[ 11/3 → 4/1 | s:hh lpf:500 ]",
+  "[ 0/1 → 1/2 | s:bd cutoff:4000 ]",
+  "[ 1/2 → 1/1 | s:sd cutoff:4000 ]",
+  "[ 0/1 → 1/3 | s:hh cutoff:4000 ]",
+  "[ 1/3 → 2/3 | s:hh cutoff:4000 ]",
+  "[ 2/3 → 1/1 | s:hh cutoff:4000 ]",
+  "[ 1/1 → 3/2 | s:bd cutoff:2000 ]",
+  "[ 3/2 → 2/1 | s:sd cutoff:2000 ]",
+  "[ 1/1 → 4/3 | s:hh cutoff:2000 ]",
+  "[ 4/3 → 5/3 | s:hh cutoff:2000 ]",
+  "[ 5/3 → 2/1 | s:hh cutoff:2000 ]",
+  "[ 2/1 → 5/2 | s:bd cutoff:1000 ]",
+  "[ 5/2 → 3/1 | s:sd cutoff:1000 ]",
+  "[ 2/1 → 7/3 | s:hh cutoff:1000 ]",
+  "[ 7/3 → 8/3 | s:hh cutoff:1000 ]",
+  "[ 8/3 → 3/1 | s:hh cutoff:1000 ]",
+  "[ 3/1 → 7/2 | s:bd cutoff:500 ]",
+  "[ 7/2 → 4/1 | s:sd cutoff:500 ]",
+  "[ 3/1 → 10/3 | s:hh cutoff:500 ]",
+  "[ 10/3 → 11/3 | s:hh cutoff:500 ]",
+  "[ 11/3 → 4/1 | s:hh cutoff:500 ]",
 ]
 `;
 
 exports[`runs examples > example "lpq" example index 0 1`] = `
 [
-  "[ 0/1 → 1/2 | s:bd lpf:2000 lpq:0 ]",
-  "[ 1/2 → 1/1 | s:sd lpf:2000 lpq:0 ]",
-  "[ 0/1 → 1/4 | s:hh lpf:2000 lpq:0 ]",
-  "[ 1/4 → 1/2 | s:hh lpf:2000 lpq:0 ]",
-  "[ 1/2 → 3/4 | s:hh lpf:2000 lpq:0 ]",
-  "[ 3/4 → 1/1 | s:hh lpf:2000 lpq:0 ]",
-  "[ 1/1 → 3/2 | s:bd lpf:2000 lpq:10 ]",
-  "[ 3/2 → 2/1 | s:sd lpf:2000 lpq:10 ]",
-  "[ 1/1 → 5/4 | s:hh lpf:2000 lpq:10 ]",
-  "[ 5/4 → 3/2 | s:hh lpf:2000 lpq:10 ]",
-  "[ 3/2 → 7/4 | s:hh lpf:2000 lpq:10 ]",
-  "[ 7/4 → 2/1 | s:hh lpf:2000 lpq:10 ]",
-  "[ 2/1 → 5/2 | s:bd lpf:2000 lpq:20 ]",
-  "[ 5/2 → 3/1 | s:sd lpf:2000 lpq:20 ]",
-  "[ 2/1 → 9/4 | s:hh lpf:2000 lpq:20 ]",
-  "[ 9/4 → 5/2 | s:hh lpf:2000 lpq:20 ]",
-  "[ 5/2 → 11/4 | s:hh lpf:2000 lpq:20 ]",
-  "[ 11/4 → 3/1 | s:hh lpf:2000 lpq:20 ]",
-  "[ 3/1 → 7/2 | s:bd lpf:2000 lpq:30 ]",
-  "[ 7/2 → 4/1 | s:sd lpf:2000 lpq:30 ]",
-  "[ 3/1 → 13/4 | s:hh lpf:2000 lpq:30 ]",
-  "[ 13/4 → 7/2 | s:hh lpf:2000 lpq:30 ]",
-  "[ 7/2 → 15/4 | s:hh lpf:2000 lpq:30 ]",
-  "[ 15/4 → 4/1 | s:hh lpf:2000 lpq:30 ]",
+  "[ 0/1 → 1/2 | s:bd cutoff:2000 resonance:0 ]",
+  "[ 1/2 → 1/1 | s:sd cutoff:2000 resonance:0 ]",
+  "[ 0/1 → 1/4 | s:hh cutoff:2000 resonance:0 ]",
+  "[ 1/4 → 1/2 | s:hh cutoff:2000 resonance:0 ]",
+  "[ 1/2 → 3/4 | s:hh cutoff:2000 resonance:0 ]",
+  "[ 3/4 → 1/1 | s:hh cutoff:2000 resonance:0 ]",
+  "[ 1/1 → 3/2 | s:bd cutoff:2000 resonance:10 ]",
+  "[ 3/2 → 2/1 | s:sd cutoff:2000 resonance:10 ]",
+  "[ 1/1 → 5/4 | s:hh cutoff:2000 resonance:10 ]",
+  "[ 5/4 → 3/2 | s:hh cutoff:2000 resonance:10 ]",
+  "[ 3/2 → 7/4 | s:hh cutoff:2000 resonance:10 ]",
+  "[ 7/4 → 2/1 | s:hh cutoff:2000 resonance:10 ]",
+  "[ 2/1 → 5/2 | s:bd cutoff:2000 resonance:20 ]",
+  "[ 5/2 → 3/1 | s:sd cutoff:2000 resonance:20 ]",
+  "[ 2/1 → 9/4 | s:hh cutoff:2000 resonance:20 ]",
+  "[ 9/4 → 5/2 | s:hh cutoff:2000 resonance:20 ]",
+  "[ 5/2 → 11/4 | s:hh cutoff:2000 resonance:20 ]",
+  "[ 11/4 → 3/1 | s:hh cutoff:2000 resonance:20 ]",
+  "[ 3/1 → 7/2 | s:bd cutoff:2000 resonance:30 ]",
+  "[ 7/2 → 4/1 | s:sd cutoff:2000 resonance:30 ]",
+  "[ 3/1 → 13/4 | s:hh cutoff:2000 resonance:30 ]",
+  "[ 13/4 → 7/2 | s:hh cutoff:2000 resonance:30 ]",
+  "[ 7/2 → 15/4 | s:hh cutoff:2000 resonance:30 ]",
+  "[ 15/4 → 4/1 | s:hh cutoff:2000 resonance:30 ]",
 ]
 `;
 
@@ -3233,14 +3242,14 @@ exports[`runs examples > example "room" example index 0 1`] = `
 
 exports[`runs examples > example "roomsize" example index 0 1`] = `
 [
-  "[ 0/1 → 1/2 | s:bd room:0.8 roomsize:0 ]",
-  "[ 1/2 → 1/1 | s:sd room:0.8 roomsize:0 ]",
-  "[ 1/1 → 3/2 | s:bd room:0.8 roomsize:1 ]",
-  "[ 3/2 → 2/1 | s:sd room:0.8 roomsize:1 ]",
-  "[ 2/1 → 5/2 | s:bd room:0.8 roomsize:2 ]",
-  "[ 5/2 → 3/1 | s:sd room:0.8 roomsize:2 ]",
-  "[ 3/1 → 7/2 | s:bd room:0.8 roomsize:4 ]",
-  "[ 7/2 → 4/1 | s:sd room:0.8 roomsize:4 ]",
+  "[ 0/1 → 1/2 | s:bd room:0.8 size:0 ]",
+  "[ 1/2 → 1/1 | s:sd room:0.8 size:0 ]",
+  "[ 1/1 → 3/2 | s:bd room:0.8 size:1 ]",
+  "[ 3/2 → 2/1 | s:sd room:0.8 size:1 ]",
+  "[ 2/1 → 5/2 | s:bd room:0.8 size:2 ]",
+  "[ 5/2 → 3/1 | s:sd room:0.8 size:2 ]",
+  "[ 3/1 → 7/2 | s:bd room:0.8 size:4 ]",
+  "[ 7/2 → 4/1 | s:sd room:0.8 size:4 ]",
 ]
 `;
 

website/package.json

@@ -21,6 +21,8 @@
     "@docsearch/react": "^3.1.0",
     "@headlessui/react": "^1.7.7",
     "@heroicons/react": "^2.0.13",
+    "@nanostores/persistent": "^0.7.0",
+    "@nanostores/react": "^0.4.1",
     "@strudel.cycles/core": "workspace:*",
     "@strudel.cycles/csound": "workspace:*",
     "@strudel.cycles/midi": "workspace:*",
@@ -34,6 +36,7 @@
     "@strudel.cycles/webaudio": "workspace:*",
     "@strudel.cycles/xen": "workspace:*",
     "@supabase/supabase-js": "^1.35.3",
+    "@tailwindcss/forms": "^0.5.3",
     "@tailwindcss/typography": "^0.5.8",
     "@types/node": "^18.0.0",
     "@types/react": "^18.0.26",
@@ -43,6 +46,7 @@
     "canvas": "^2.11.0",
     "fraction.js": "^4.2.0",
     "nanoid": "^4.0.0",
+    "nanostores": "^0.7.4",
     "preact": "^10.7.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

website/public/fonts/3270/LICENSE.txt

@@ -0,0 +1,51 @@
+Copyright 2022 The 3270font Authors (https://github.com/rbanffy/3270font)
+
+Copyright (c) 2011-2022, Ricardo Banffy.
+Copyright (c) 1993-2011, Paul Mattes.
+Copyright (c) 2004-2005, Don Russell.
+Copyright (c) 2004, Dick Altenbern.
+Copyright (c) 1990, Jeff Sparkes.
+Copyright (c) 1989, Georgia Tech Research Corporation (GTRC), Atlanta, GA 30332.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+    * Neither the name of Ricardo Banffy, Paul Mattes, Don Russell,
+      Dick Altenbern, Jeff Sparkes, GTRC nor the names of their contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL RICARDO BANFFY, PAUL MATTES, DON RUSSELL, DICK ALTENBERN, JEFF
+SPARKES OR GTRC BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The Debian Logo glyph is based on the Debian Open Use Logo and is
+Copyright (c) 1999 Software in the Public Interest, Inc., and it is
+incorporated here under the terms of the Creative Commons
+Attribution-ShareAlike 3.0 Unported License. The logo is released
+under the terms of the GNU Lesser General Public License, version 3 or
+any later version, or, at your option, of the Creative Commons
+Attribution-ShareAlike 3.0 Unported License.
+
+Ubuntu, the Ubuntu logo and the Circle of Friends symbol are
+registered trademarks of Canonical Ltd.
+
+The Fontforge SFD font description file is optionally licensed under
+the SIL Open Font License v1.1 with no Reserved Font Name. This
+license is available with a FAQ at http://scripts.sil.org/OFL.

website/public/fonts/BigBlueTerminal/LICENSE.txt

@@ -0,0 +1,428 @@
+Attribution-ShareAlike 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+	wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More_considerations
+     for the public: 
+	wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution-ShareAlike 4.0 International Public
+License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution-ShareAlike 4.0 International Public License ("Public
+License"). To the extent this Public License may be interpreted as a
+contract, You are granted the Licensed Rights in consideration of Your
+acceptance of these terms and conditions, and the Licensor grants You
+such rights in consideration of benefits the Licensor receives from
+making the Licensed Material available under these terms and
+conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. BY-SA Compatible License means a license listed at
+     creativecommons.org/compatiblelicenses, approved by Creative
+     Commons as essentially the equivalent of this Public License.
+
+  d. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  e. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  f. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  g. License Elements means the license attributes listed in the name
+     of a Creative Commons Public License. The License Elements of this
+     Public License are Attribution and ShareAlike.
+
+  h. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  i. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  j. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  k. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  l. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  m. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. Additional offer from the Licensor -- Adapted Material.
+               Every recipient of Adapted Material from You
+               automatically receives an offer from the Licensor to
+               exercise the Licensed Rights in the Adapted Material
+               under the conditions of the Adapter's License You apply.
+
+            c. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+  b. ShareAlike.
+
+     In addition to the conditions in Section 3(a), if You Share
+     Adapted Material You produce, the following conditions also apply.
+
+       1. The Adapter's License You apply must be a Creative Commons
+          license with the same License Elements, this version or
+          later, or a BY-SA Compatible License.
+
+       2. You must include the text of, or the URI or hyperlink to, the
+          Adapter's License You apply. You may satisfy this condition
+          in any reasonable manner based on the medium, means, and
+          context in which You Share Adapted Material.
+
+       3. You may not offer or impose any additional or different terms
+          or conditions on, or apply any Effective Technological
+          Measures to, Adapted Material that restrict exercise of the
+          rights granted under the Adapter's License You apply.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material,
+
+     including for purposes of Section 3(b); and
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
+

website/public/fonts/PressStart2P/OFL.txt

@@ -0,0 +1,92 @@
+Copyright (c) 2012, Cody "CodeMan38" Boisclair (cody@zone38.net), with Reserved Font Name "Press Start 2P"
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

website/src/components/Footer/AvatarList.astro

@@ -1,66 +1,64 @@
 ---
 // fetch all commits for just this page's path
 type Props = {
-	path: string;
+  path: string;
 };
 const { path } = Astro.props as Props;
-const resolvedPath = `examples/docs/${path}`;
-const url = `https://api.github.com/repos/withastro/astro/commits?path=${resolvedPath}`;
-const commitsURL = `https://github.com/withastro/astro/commits/main/${resolvedPath}`;
+const resolvedPath = `website/src/pages${path}.mdx`;
+const url = `https://api.github.com/repos/tidalcycles/strudel/commits?path=${resolvedPath}`;
+const commitsURL = `https://github.com/tidalcycles/strudel/commits/main/${resolvedPath}`;
 
 type Commit = {
-	author: {
-		id: string;
-		login: string;
-	};
+  author: {
+    id: string;
+    login: string;
+  };
 };
 
 async function getCommits(url: string) {
-	try {
-		const token = import.meta.env.SNOWPACK_PUBLIC_GITHUB_TOKEN ?? 'hello';
-		if (!token) {
-			throw new Error(
-				'Cannot find "SNOWPACK_PUBLIC_GITHUB_TOKEN" used for escaping rate-limiting.'
-			);
-		}
+  try {
+    const token = import.meta.env.SNOWPACK_PUBLIC_GITHUB_TOKEN ?? 'hello';
+    if (!token) {
+      throw new Error('Cannot find "SNOWPACK_PUBLIC_GITHUB_TOKEN" used for escaping rate-limiting.');
+    }
 
-		const auth = `Basic ${Buffer.from(token, 'binary').toString('base64')}`;
+    const auth = `Basic ${Buffer.from(token, 'binary').toString('base64')}`;
 
-		const res = await fetch(url, {
-			method: 'GET',
-			headers: {
-				Authorization: auth,
-				'User-Agent': 'astro-docs/1.0',
-			},
-		});
+    const res = await fetch(url, {
+      method: 'GET',
+      headers: {
+        Authorization: auth,
+        'User-Agent': 'astro-docs/1.0',
+      },
+    });
 
-		const data = await res.json();
+    const data = await res.json();
 
-		if (!res.ok) {
-			throw new Error(
-				`Request to fetch commits failed. Reason: ${res.statusText}
-       Message: ${data.message}`
-			);
-		}
+    if (!res.ok) {
+      throw new Error(
+        `Request to fetch commits failed. Reason: ${res.statusText}
+       Message: ${data.message}`,
+      );
+    }
 
-		return data as Commit[];
-	} catch (e) {
-		console.warn(`[error]  /src/components/AvatarList.astro 
+    return data as Commit[];
+  } catch (e) {
+    console.warn(`[error]  /src/components/AvatarList.astro 
     ${(e as any)?.message ?? e}`);
-		return [] as Commit[];
-	}
+    return [] as Commit[];
+  }
 }
 
 function removeDups(arr: Commit[]) {
-	const map = new Map<string, Commit['author']>();
+  const map = new Map<string, Commit['author']>();
+  for (let item of arr) {
+    const author = item.author;
+    // Deduplicate based on author.id
+    //map.set(author.id, { login: author.login, id: author.id });
+    author && map.set(author.id, { login: author.login, id: author.id });
+  }
 
-	for (let item of arr) {
-		const author = item.author;
-		// Deduplicate based on author.id
-		map.set(author.id, { login: author.login, id: author.id });
-	}
-
-	return [...map.values()];
+  return [...map.values()];
 }
 
 const data = await getCommits(url);
@@ -70,102 +68,102 @@ const additionalContributors = unique.length - recentContributors.length; // lis
 ---
 
 <!-- Thanks to @5t3ph for https://smolcss.dev/#smol-avatar-list! -->
-<div class="contributors">
-	<ul class="avatar-list" style={`--avatar-count: ${recentContributors.length}`}>
-		{
-			recentContributors.map((item) => (
-				<li>
-					<a href={`https://github.com/${item.login}`}>
-						<img
-							alt={`Contributor ${item.login}`}
-							title={`Contributor ${item.login}`}
-							width="64"
-							height="64"
-							src={`https://avatars.githubusercontent.com/u/${item.id}`}
-						/>
-					</a>
-				</li>
-			))
-		}
-	</ul>
-	{
-		additionalContributors > 0 && (
-			<span>
-				<a href={commitsURL}>{`and ${additionalContributors} additional contributor${
-					additionalContributors > 1 ? 's' : ''
-				}.`}</a>
-			</span>
-		)
-	}
-	{unique.length === 0 && <a href={commitsURL}>Contributors</a>}
+<div class="contributors px-4 mb-8">
+  <ul class="avatar-list" style={`--avatar-count: ${recentContributors.length}`}>
+    {
+      recentContributors.map((item) => (
+        <li>
+          <a href={`https://github.com/${item.login}`}>
+            <img
+              alt={`Contributor ${item.login}`}
+              title={`Contributor ${item.login}`}
+              width="64"
+              height="64"
+              src={`https://avatars.githubusercontent.com/u/${item.id}`}
+            />
+          </a>
+        </li>
+      ))
+    }
+  </ul>
+  {
+    additionalContributors > 0 && (
+      <span>
+        <a href={commitsURL}>{`and ${additionalContributors} additional contributor${
+          additionalContributors > 1 ? 's' : ''
+        }.`}</a>
+      </span>
+    )
+  }
+  {unique.length === 0 && <a href={commitsURL}>Contributors</a>}
 </div>
 
 <style>
-	.avatar-list {
-		--avatar-size: 2.5rem;
-		--avatar-count: 3;
+  .avatar-list {
+    --avatar-size: 2.5rem;
+    --avatar-count: 3;
 
-		display: grid;
-		list-style: none;
-		/* Default to displaying most of the avatar to
+    display: grid;
+    list-style: none;
+    /* Default to displaying most of the avatar to
   enable easier access on touch devices, ensuring
   the WCAG touch target size is met or exceeded */
-		grid-template-columns: repeat(var(--avatar-count), max(44px, calc(var(--avatar-size) / 1.15)));
-		/* `padding` matches added visual dimensions of
+    grid-template-columns: repeat(var(--avatar-count), max(44px, calc(var(--avatar-size) / 1.15)));
+    /* `padding` matches added visual dimensions of
   the `box-shadow` to help create a more accurate
   computed component size */
-		padding: 0.08em;
-		font-size: var(--avatar-size);
-	}
+    padding: 0.08em;
+    font-size: var(--avatar-size);
+  }
 
-	@media (any-hover: hover) and (any-pointer: fine) {
-		.avatar-list {
-			/* We create 1 extra cell to enable the computed 
+  @media (any-hover: hover) and (any-pointer: fine) {
+    .avatar-list {
+      /* We create 1 extra cell to enable the computed 
     width to match the final visual width */
-			grid-template-columns: repeat(calc(var(--avatar-count) + 1), calc(var(--avatar-size) / 1.75));
-		}
-	}
+      grid-template-columns: repeat(calc(var(--avatar-count) + 1), calc(var(--avatar-size) / 1.75));
+    }
+  }
 
-	.avatar-list li {
-		width: var(--avatar-size);
-		height: var(--avatar-size);
-	}
+  .avatar-list li {
+    width: var(--avatar-size);
+    height: var(--avatar-size);
+  }
 
-	.avatar-list li:hover ~ li a,
-	.avatar-list li:focus-within ~ li a {
-		transform: translateX(33%);
-	}
+  .avatar-list li:hover ~ li a,
+  .avatar-list li:focus-within ~ li a {
+    transform: translateX(33%);
+  }
 
-	.avatar-list img,
-	.avatar-list a {
-		display: block;
-		border-radius: 50%;
-	}
+  .avatar-list img,
+  .avatar-list a {
+    display: block;
+    border-radius: 50%;
+  }
 
-	.avatar-list a {
-		transition: transform 180ms ease-in-out;
-	}
+  .avatar-list a {
+    transition: transform 180ms ease-in-out;
+  }
 
-	.avatar-list img {
-		width: 100%;
-		height: 100%;
-		object-fit: cover;
-		background-color: #fff;
-		box-shadow: 0 0 0 0.05em #fff, 0 0 0 0.08em rgba(0, 0, 0, 0.15);
-	}
+  .avatar-list img {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    background-color: #fff;
+    box-shadow: 0 0 0 0.05em #fff, 0 0 0 0.08em rgba(0, 0, 0, 0.15);
+  }
 
-	.avatar-list a:focus {
-		outline: 2px solid transparent;
-		/* Double-layer trick to work for dark and light backgrounds */
-		box-shadow: 0 0 0 0.08em var(--theme-accent), 0 0 0 0.12em white;
-	}
+  .avatar-list a:focus {
+    outline: 2px solid transparent;
+    /* Double-layer trick to work for dark and light backgrounds */
+    box-shadow: 0 0 0 0.08em var(--theme-accent), 0 0 0 0.12em white;
+  }
 
-	.contributors {
-		display: flex;
-		align-items: center;
-	}
+  .contributors {
+    display: flex;
+    align-items: center;
+  }
 
-	.contributors > * + * {
-		margin-left: 0.75rem;
-	}
+  .contributors > * + * {
+    margin-left: 0.75rem;
+  }
 </style>

website/src/components/Footer/Footer.astro

@@ -1,19 +0,0 @@
----
-import AvatarList from './AvatarList.astro';
-type Props = {
-	path: string;
-};
-const { path } = Astro.props as Props;
----
-
-<footer>
-	<AvatarList path={path} />
-</footer>
-
-<style>
-	footer {
-		margin-top: auto;
-		padding: 2rem;
-		border-top: 3px solid var(--theme-divider);
-	}
-</style>

website/src/components/HeadCommon.astro

@@ -1,12 +1,9 @@
 ---
 import { pwaInfo } from 'virtual:pwa-info';
 import '../styles/index.css';
-import { settings } from '../repl/themes.mjs';
 
 const { BASE_URL } = import.meta.env;
 const base = BASE_URL;
-
-const { strudelTheme } = settings;
 ---
 
 <!-- Global Metadata -->
@@ -48,37 +45,43 @@ const { strudelTheme } = settings;
 </style>
 {pwaInfo && <Fragment set:html={pwaInfo.webManifest.linkTag} />}
 
-<script define:vars={{ settings, strudelTheme }} is:inline>
+<script>
+  import { settings } from '../repl/themes.mjs';
+  import { settingsMap } from '../settings.mjs';
+  import { listenKeys } from 'nanostores';
   const themeStyle = document.createElement('style');
   themeStyle.id = 'strudel-theme';
   document.head.append(themeStyle);
-  function getTheme(name) {
+  function activateTheme(name) {
     if (!settings[name]) {
-      console.warn('theme', name, 'has no settings');
+      console.warn('theme', name, 'has no settings.. defaulting to strudelTheme settings');
     }
-    return {
-      name,
-      settings: settings[name] || settings.strudelTheme,
-    };
-  }
-  function setTheme(name) {
-    const { settings } = getTheme(name);
+    const themeSettings = settings[name] || settings.strudelTheme;
     // set css variables
     themeStyle.innerHTML = `:root {
-      ${Object.entries(settings)
+      ${Object.entries(themeSettings)
         // important to override fallback
         .map(([key, value]) => `--${key}: ${value} !important;`)
         .join('\n')}
     }`;
     // tailwind dark mode
-    if (settings.light) {
+    if (themeSettings.light) {
       document.documentElement.classList.remove('dark');
     } else {
       document.documentElement.classList.add('dark');
     }
-    // persist theme name
-    localStorage.setItem('strudel-theme', name || 'strudelTheme');
   }
-  setTheme(localStorage.getItem('strudel-theme'));
-  document.addEventListener('strudel-theme', (e) => setTheme(e.detail));
+
+  activateTheme(settingsMap.get().theme);
+  listenKeys(settingsMap, ['theme'], ({ theme }) => activateTheme(theme));
+
+  // https://medium.com/quick-code/100vh-problem-with-ios-safari-92ab23c852a8
+  const appHeight = () => {
+    const doc = document.documentElement;
+    doc.style.setProperty('--app-height', `${window.innerHeight - 1}px`);
+  };
+  if (typeof window !== 'undefined') {
+    window.addEventListener('resize', appHeight);
+    appHeight();
+  }
 </script>

website/src/components/Header/Header.astro

@@ -19,7 +19,10 @@ const langCode = 'en'; // getLanguageFromURL(currentPage);
 const sidebar = SIDEBAR[langCode];
 ---
 
-<nav class="flex justify-between py-2 px-4 items-center h-14 max-h-14 bg-lineHighlight text-foreground" title="Top Navigation">
+<nav
+  class="flex justify-between py-2 px-4 items-center h-14 max-h-14 bg-lineHighlight text-foreground"
+  title="Top Navigation"
+>
   <!--     <div class="menu-toggle">
       <SidebarToggle client:idle />
     </div> -->
@@ -36,7 +39,7 @@ const sidebar = SIDEBAR[langCode];
   </div>
   {/* KNOWN_LANGUAGE_CODES.length > 1 && <LanguageSelect lang={lang} client:idle /> */}
   <div class="search-item h-10">
-    <!--     <Search client:idle /> -->
+    <!-- <Search client:idle /> -->
   </div>
   <a href="./" class="hidden md:flex cursor-pointer items-center space-x-1"
     ><CommandLineIcon className="w-5 h-5" /><span>go to REPL</span>

website/src/components/LeftSidebar/LeftSidebar.astro

@@ -23,7 +23,7 @@ const sidebar = SIDEBAR[langCode];
             <h2>{header}</h2>
             <ul>
               {children.map((child) => {
-                const url = '.' + Astro.site?.pathname + child.link;
+                const url = Astro.site?.pathname + child.link;
                 return (
                   <li class="">
                     <a

website/src/components/RightSidebar/RightSidebar.astro

@@ -2,6 +2,7 @@
 import TableOfContents from './TableOfContents';
 import MoreMenu from './MoreMenu.astro';
 import type { MarkdownHeading } from 'astro';
+import AvatarList from '../Footer/AvatarList.astro';
 
 type Props = {
   headings: MarkdownHeading[];
@@ -17,4 +18,5 @@ currentPage = currentPage.endsWith('/') ? currentPage.slice(0, -1) : currentPage
 <nav aria-labelledby="grid-right" class="w-64 text-foreground">
   <TableOfContents client:media="(min-width: 50em)" headings={headings} currentPage={currentPage} />
   <MoreMenu editHref={githubEditUrl} />
+  <!-- <AvatarList path={currentPage} /> -->
 </nav>

website/src/config.ts

@@ -33,9 +33,9 @@ export const COMMUNITY_INVITE_URL = `https://discord.com/invite/HGEdXmRkzT`;
 
 // See "Algolia" section of the README for more information.
 export const ALGOLIA = {
-  indexName: 'XXXXXXXXXX',
-  appId: 'XXXXXXXXXX',
-  apiKey: 'XXXXXXXXXX',
+  indexName: 'strudel-tidalcycles',
+  appId: 'SAZ71S8CLS',
+  apiKey: 'd5044f9d21b80e7721e5b0067a8730b1',
 };
 
 export type Sidebar = Record<(typeof KNOWN_LANGUAGE_CODES)[number], Record<string, { text: string; link: string }[]>>;

website/src/docs/MiniRepl.jsx

@@ -4,8 +4,7 @@ import { useEffect, useState } from 'react';
 import { prebake } from '../repl/prebake';
 import { themes, settings } from '../repl/themes.mjs';
 import './MiniRepl.css';
-
-const theme = localStorage.getItem('strudel-theme') || 'strudelTheme';
+import { useSettings } from '../settings.mjs';
 
 let modules;
 if (typeof window !== 'undefined') {
@@ -29,6 +28,7 @@ if (typeof window !== 'undefined') {
 
 export function MiniRepl({ tune, drawTime, punchcard, canvasHeight = 100 }) {
   const [Repl, setRepl] = useState();
+  const { theme } = useSettings();
   useEffect(() => {
     // we have to load this package on the client
     // because codemirror throws an error on the server
@@ -36,7 +36,6 @@ export function MiniRepl({ tune, drawTime, punchcard, canvasHeight = 100 }) {
       .then(([res]) => setRepl(() => res.MiniRepl))
       .catch((err) => console.error(err));
   }, []);
-  // const { settings } = useTheme();
   return Repl ? (
     <div className="mb-4">
       <Repl
@@ -46,7 +45,6 @@ export function MiniRepl({ tune, drawTime, punchcard, canvasHeight = 100 }) {
         punchcard={punchcard}
         canvasHeight={canvasHeight}
         theme={themes[theme]}
-        highlightColor={settings[theme]?.foreground}
       />
     </div>
   ) : (

website/src/layouts/MainLayout.astro

@@ -7,7 +7,6 @@ import LeftSidebar from '../components/LeftSidebar/LeftSidebar.astro';
 import RightSidebar from '../components/RightSidebar/RightSidebar.astro';
 import * as CONFIG from '../config';
 import type { MarkdownHeading } from 'astro';
-import Footer from '../components/Footer/Footer.astro';
 import '../docs/docs.css';
 
 type Props = {
@@ -31,7 +30,7 @@ const githubEditUrl = `${CONFIG.GITHUB_EDIT_URL}/${currentFile}`;
     </title>
   </head>
 
-  <body class="h-screen text-gray-50 bg-background">
+  <body class="h-app-height text-gray-50 bg-background">
     <div class="w-full h-full space-y-4 flex flex-col">
       <header class="max-w-full fixed top-0 w-full z-[100]">
         <Header currentPage={currentPage} />
@@ -49,7 +48,6 @@ const githubEditUrl = `${CONFIG.GITHUB_EDIT_URL}/${currentFile}`;
           </aside>
         </div>
       </main>
-      <!--     <Footer path={currentFile} /> -->
     </div>
   </body>
 </html>

website/src/pages/index.astro

@@ -8,7 +8,7 @@ import { Repl } from '../repl/Repl.jsx';
     <HeadCommon />
     <title>Strudel REPL</title>
   </head>
-  <body class="bg-background">
+  <body class="h-app-height bg-background">
     <Repl client:only="react" />
   </body>
 </html>

website/src/pages/learn/code.mdx

@@ -14,7 +14,7 @@ Let's look at this simple example again. What do we notice?
 
 <MiniRepl client:idle tune={`freq("220 275 330 440").s("sine")`} />
 
-- We have a word `freq` which is followed by some brackets `()` with some words/letters/numbers inside, surrounded by quotes `"a3 c#4 e4 a4"`.
+- We have a word `freq` which is followed by some brackets `()` with some words/letters/numbers inside, surrounded by quotes `"220 275 330 440"` (corresponding to the pitches a3, c#4, e4, a4).
 - Then we have a dot `.` followed by another similar piece of code `s("sine")`.
 - We can also see these texts are _highlighted_ using colours: word `freq` is purple, the brackets `()` are grey, and the content inside the `""` are green.
 

website/src/pages/learn/input-output.mdx

@@ -22,12 +22,35 @@ If no outputName is given, it uses the first midi output it finds.
 
 <MiniRepl
   client:idle
-  tune={`stack("<C^7 A7 Dm7 G7>".voicings('lefthand'), "<C3 A2 D3 G2>")
+  tune={`stack("<C^7 A7 Dm7 G7>".voicings('lefthand'), "<C3 A2 D3 G2>").note()
   .midi()`}
 />
 
 In the console, you will see a log of the available MIDI devices as soon as you run the code, e.g. `Midi connected! Using "Midi Through Port-0".`
 
+## midichan(number)
+
+Selects the MIDI channel to use. If not used, `.midi` will use channel 1 by default.
+
+## ccn && ccv
+
+- `ccn` sets the cc number. Depends on your synths midi mapping
+- `ccv` sets the cc value. normalized from 0 to 1.
+
+<MiniRepl client:idle tune={`note("c a f e").ccn(74).ccv(sine.slow(4)).midi()`} />
+
+In the above snippet, `ccn` is set to 74, which is the filter cutoff for many synths. `ccv` is controlled by a saw pattern.
+Having everything in one pattern, the `ccv` pattern will be aligned to the note pattern, because the structure comes from the left by default.
+But you can also control cc messages separately like this:
+
+<MiniRepl
+  client:idle
+  tune={`stack(
+  note("c a f e"),
+  ccv(sine.segment(16).slow(4)).ccn(74)
+).midi()`}
+/>
+
 # SuperDirt API
 
 In mainline tidal, the actual sound is generated via [SuperDirt](https://github.com/musikinformatik/SuperDirt/), which runs inside SuperCollider.
@@ -40,8 +63,8 @@ Getting [SuperDirt](https://github.com/musikinformatik/SuperDirt/) to work with
 1. install SuperCollider + sc3 plugins, see [Tidal Docs](https://tidalcycles.org/docs/) (Install Tidal) for more info.
 2. install [node.js](https://nodejs.org/en/)
 3. download [Strudel Repo](https://github.com/tidalcycles/strudel/) (or git clone, if you have git installed)
-4. run `npm i` in the strudel directory
-5. run `npm run osc` to start the osc server, which forwards OSC messages from Strudel REPL to SuperCollider
+4. run `pnpm i` in the strudel directory
+5. run `pnpm run osc` to start the osc server, which forwards OSC messages from Strudel REPL to SuperCollider
 
 Now you're all set!
 

website/src/pages/learn/mini-notation.mdx

@@ -159,8 +159,6 @@ Using "!" we can repeat without speeding up:
 
 <MiniRepl client:idle tune={`note("<[g3,b3,e4]!2 [a3,c3,e4] [b3,d3,f#4]>")`} punchcard />
 
-In essence, the `x!n` is like a shortcut for `[x*n]@n`.
-
 ## Mini-notation review
 
 To recap what we've learned so far, compare the following patterns:

website/src/repl/Footer.jsx

@@ -6,14 +6,13 @@ import { nanoid } from 'nanoid';
 import React, { useCallback, useLayoutEffect, useRef, useState } from 'react';
 import { loadedSamples } from './Repl';
 import { Reference } from './Reference';
-import { themes, themeColors } from './themes.mjs';
+import { themes } from './themes.mjs';
+import { useSettings, settingsMap, setActiveFooter, defaultSettings } from '../settings.mjs';
 
 export function Footer({ context }) {
-  // const [activeFooter, setActiveFooter] = useState('console');
-  // const { activeFooter, setActiveFooter, isZen } = useContext?.(ReplContext);
-  const { activeFooter, setActiveFooter, isZen, theme, setTheme } = context;
   const footerContent = useRef();
   const [log, setLog] = useState([]);
+  const { activeFooter, isZen } = useSettings();
 
   useLayoutEffect(() => {
     if (footerContent.current && activeFooter === 'console') {
@@ -56,8 +55,8 @@ export function Footer({ context }) {
       <div
         onClick={() => setActiveFooter(name)}
         className={cx(
-          'h-8 px-2 text-foreground cursor-pointer hover:text-tertiary flex items-center space-x-1 border-b',
-          activeFooter === name ? 'border-foreground hover:border-tertiary' : 'border-transparent',
+          'h-8 px-2 text-foreground cursor-pointer hover:opacity-50 flex items-center space-x-1 border-b',
+          activeFooter === name ? 'border-foreground' : 'border-transparent',
         )}
       >
         {label || name}
@@ -76,7 +75,7 @@ export function Footer({ context }) {
           <FooterTab name="samples" />
           <FooterTab name="console" />
           <FooterTab name="reference" />
-          <FooterTab name="theme" />
+          <FooterTab name="settings" />
         </div>
         {activeFooter !== '' && (
           <button onClick={() => setActiveFooter('')} className="text-foreground" aria-label="Close Panel">
@@ -89,113 +88,11 @@ export function Footer({ context }) {
           className="text-white font-mono text-sm h-[360px] flex-none overflow-auto max-w-full relative"
           ref={footerContent}
         >
-          {activeFooter === 'intro' && (
-            <div className="prose dark:prose-invert max-w-[600px] pt-2 font-sans pb-8 px-4">
-              <h3>
-                <span className={cx('animate-spin inline-block select-none')}>🌀</span> welcome
-              </h3>
-              <p>
-                You have found <span className="underline">strudel</span>, a new live coding platform to write dynamic
-                music pieces in the browser! It is free and open-source and made for beginners and experts alike. To get
-                started:
-                <br />
-                <br />
-                <span className="underline">1. hit play</span> - <span className="underline">2. change something</span>{' '}
-                - <span className="underline">3. hit update</span>
-                <br />
-                If you don't like what you hear, try <span className="underline">shuffle</span>!
-              </p>
-              <p>
-                To learn more about what this all means, check out the{' '}
-                <a href="./learn/getting-started" target="_blank">
-                  interactive tutorial
-                </a>
-                . Also feel free to join the{' '}
-                <a href="https://discord.com/invite/HGEdXmRkzT" target="_blank">
-                  tidalcycles discord channel
-                </a>{' '}
-                to ask any questions, give feedback or just say hello.
-              </p>
-              <h3>about</h3>
-              <p>
-                strudel is a JavaScript version of{' '}
-                <a href="tidalcycles.org/" target="_blank">
-                  tidalcycles
-                </a>
-                , which is a popular live coding language for music, written in Haskell. You can find the source code at{' '}
-                <a href="https://github.com/tidalcycles/strudel" target="_blank">
-                  github
-                </a>
-                . Please consider to{' '}
-                <a href="https://opencollective.com/tidalcycles" target="_blank">
-                  support this project
-                </a>{' '}
-                to ensure ongoing development 💖
-              </p>
-            </div>
-          )}
-          {activeFooter === 'console' && (
-            <div className="break-all px-4 dark:text-white text-stone-900">
-              {log.map((l, i) => {
-                const message = linkify(l.message);
-                return (
-                  <div
-                    key={l.id}
-                    className={cx(l.type === 'error' && 'text-red-500', l.type === 'highlight' && 'text-highlight')}
-                  >
-                    <span dangerouslySetInnerHTML={{ __html: message }} />
-                    {l.count ? ` (${l.count})` : ''}
-                  </div>
-                );
-              })}
-            </div>
-          )}
-          {activeFooter === 'samples' && (
-            <div className="break-normal w-full px-4 dark:text-white text-stone-900">
-              <span>{loadedSamples.length} banks loaded:</span>
-              {loadedSamples.map(([name, samples]) => (
-                <span key={name} className="cursor-pointer hover:text-tertiary" onClick={() => {}}>
-                  {' '}
-                  {name}(
-                  {Array.isArray(samples)
-                    ? samples.length
-                    : typeof samples === 'object'
-                    ? Object.values(samples).length
-                    : 1}
-                  ){' '}
-                </span>
-              ))}
-            </div>
-          )}
+          {activeFooter === 'intro' && <WelcomeTab />}
+          {activeFooter === 'console' && <ConsoleTab log={log} />}
+          {activeFooter === 'samples' && <SamplesTab />}
           {activeFooter === 'reference' && <Reference />}
-          {activeFooter === 'theme' && (
-            <div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 lg:grid-cols-6 xl:grid-cols-8 gap-2 p-2">
-              {Object.entries(themes).map(([k, t]) => (
-                <div
-                  key={k}
-                  className={cx(
-                    'border-2 border-transparent cursor-pointer p-4 bg-background bg-opacity-25 rounded-md',
-                    theme === k ? '!border-foreground' : '',
-                  )}
-                  onClick={() => {
-                    setTheme(k);
-                    document.dispatchEvent(
-                      new CustomEvent('strudel-theme', {
-                        detail: k,
-                      }),
-                    );
-                  }}
-                >
-                  <div className="mb-2 w-full text-center text-foreground">{k}</div>
-                  <div className="flex justify-stretch overflow-hidden rounded-md">
-                    {themeColors(t).map((c, i) => (
-                      <div key={i} className="grow h-6" style={{ background: c }} />
-                    ))}
-                  </div>
-                </div>
-              ))}
-            </div>
-          )}
+          {activeFooter === 'settings' && <SettingsTab scheduler={context.scheduler} />}
         </div>
       )}
     </footer>
@@ -226,3 +123,229 @@ function linkify(inputText) {
 
   return replacedText;
 }
+
+function WelcomeTab() {
+  return (
+    <div className="prose dark:prose-invert max-w-[600px] pt-2 font-sans pb-8 px-4">
+      <h3>
+        <span className={cx('animate-spin inline-block select-none')}>🌀</span> welcome
+      </h3>
+      <p>
+        You have found <span className="underline">strudel</span>, a new live coding platform to write dynamic music
+        pieces in the browser! It is free and open-source and made for beginners and experts alike. To get started:
+        <br />
+        <br />
+        <span className="underline">1. hit play</span> - <span className="underline">2. change something</span> -{' '}
+        <span className="underline">3. hit update</span>
+        <br />
+        If you don't like what you hear, try <span className="underline">shuffle</span>!
+      </p>
+      <p>
+        To learn more about what this all means, check out the{' '}
+        <a href="./learn/getting-started" target="_blank">
+          interactive tutorial
+        </a>
+        . Also feel free to join the{' '}
+        <a href="https://discord.com/invite/HGEdXmRkzT" target="_blank">
+          tidalcycles discord channel
+        </a>{' '}
+        to ask any questions, give feedback or just say hello.
+      </p>
+      <h3>about</h3>
+      <p>
+        strudel is a JavaScript version of{' '}
+        <a href="tidalcycles.org/" target="_blank">
+          tidalcycles
+        </a>
+        , which is a popular live coding language for music, written in Haskell. You can find the source code at{' '}
+        <a href="https://github.com/tidalcycles/strudel" target="_blank">
+          github
+        </a>
+        . Please consider to{' '}
+        <a href="https://opencollective.com/tidalcycles" target="_blank">
+          support this project
+        </a>{' '}
+        to ensure ongoing development 💖
+      </p>
+    </div>
+  );
+}
+
+function ConsoleTab({ log }) {
+  return (
+    <div id="console-tab" className="break-all px-4 dark:text-white text-stone-900">
+      <pre>{`███████╗████████╗██████╗ ██╗   ██╗██████╗ ███████╗██╗     
+██╔════╝╚══██╔══╝██╔══██╗██║   ██║██╔══██╗██╔════╝██║     
+███████╗   ██║   ██████╔╝██║   ██║██║  ██║█████╗  ██║     
+╚════██║   ██║   ██╔══██╗██║   ██║██║  ██║██╔══╝  ██║     
+███████║   ██║   ██║  ██║╚██████╔╝██████╔╝███████╗███████╗
+╚══════╝   ╚═╝   ╚═╝  ╚═╝ ╚═════╝ ╚═════╝ ╚══════╝╚══════╝`}</pre>
+      {log.map((l, i) => {
+        const message = linkify(l.message);
+        return (
+          <div key={l.id} className={cx(l.type === 'error' && 'text-red-500', l.type === 'highlight' && 'underline')}>
+            <span dangerouslySetInnerHTML={{ __html: message }} />
+            {l.count ? ` (${l.count})` : ''}
+          </div>
+        );
+      })}
+    </div>
+  );
+}
+
+function SamplesTab() {
+  return (
+    <div id="samples-tab" className="break-normal w-full px-4 dark:text-white text-stone-900">
+      <span>{loadedSamples.length} banks loaded:</span>
+      {loadedSamples.map(([name, samples]) => (
+        <span key={name} className="cursor-pointer hover:opacity-50" onClick={() => {}}>
+          {' '}
+          {name}(
+          {Array.isArray(samples) ? samples.length : typeof samples === 'object' ? Object.values(samples).length : 1}){' '}
+        </span>
+      ))}
+    </div>
+  );
+}
+
+function ButtonGroup({ value, onChange, items }) {
+  return (
+    <div className="flex grow border border-foreground rounded-md">
+      {Object.entries(items).map(([key, label], i, arr) => (
+        <button
+          key={key}
+          onClick={() => onChange(key)}
+          className={cx(
+            'p-2 grow',
+            i === 0 && 'rounded-l-md',
+            i === arr.length - 1 && 'rounded-r-md',
+            value === key ? 'bg-background' : 'bg-lineHighlight',
+          )}
+        >
+          {label}
+        </button>
+      ))}
+    </div>
+  );
+}
+
+function SelectInput({ value, options, onChange }) {
+  return (
+    <select
+      className="p-2 bg-background rounded-md text-foreground"
+      value={value}
+      onChange={(e) => onChange(e.target.value)}
+    >
+      {Object.entries(options).map(([k, label]) => (
+        <option key={k} className="bg-background" value={k}>
+          {label}
+        </option>
+      ))}
+    </select>
+  );
+}
+
+function NumberSlider({ value, onChange, step = 1, ...rest }) {
+  return (
+    <div className="flex space-x-2 gap-1">
+      <input
+        className="p-2 grow"
+        type="range"
+        value={value}
+        step={step}
+        onChange={(e) => onChange(Number(e.target.value))}
+        {...rest}
+      />
+      <input
+        type="number"
+        value={value}
+        step={step}
+        className="w-16 bg-background rounded-md"
+        onChange={(e) => onChange(Number(e.target.value))}
+      />
+    </div>
+  );
+}
+
+function FormItem({ label, children }) {
+  return (
+    <div className="grid gap-2">
+      <label>{label}</label>
+      {children}
+    </div>
+  );
+}
+
+const themeOptions = Object.fromEntries(Object.keys(themes).map((k) => [k, k]));
+const fontFamilyOptions = {
+  monospace: 'monospace',
+  BigBlueTerminal: 'BigBlueTerminal',
+  x3270: 'x3270',
+  PressStart: 'PressStart2P',
+};
+
+function SettingsTab({ scheduler }) {
+  const { theme, keybindings, fontSize, fontFamily } = useSettings();
+  return (
+    <div className="text-foreground p-4 space-y-4">
+      {/* <FormItem label="Tempo">
+        <div className="space-x-4">
+          <button
+            onClick={() => {
+              scheduler.setCps(scheduler.cps - 0.1);
+            }}
+          >
+            slower
+          </button>
+          <button
+            onClick={() => {
+              scheduler.setCps(scheduler.cps + 0.1);
+            }}
+          >
+            faster
+          </button>
+        </div>
+      </FormItem> */}
+      <FormItem label="Theme">
+        <SelectInput options={themeOptions} value={theme} onChange={(theme) => settingsMap.setKey('theme', theme)} />
+      </FormItem>
+      <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+        <FormItem label="Font Family">
+          <SelectInput
+            options={fontFamilyOptions}
+            value={fontFamily}
+            onChange={(fontFamily) => settingsMap.setKey('fontFamily', fontFamily)}
+          />
+        </FormItem>
+        <FormItem label="Font Size">
+          <NumberSlider
+            value={fontSize}
+            onChange={(fontSize) => settingsMap.setKey('fontSize', fontSize)}
+            min={10}
+            max={40}
+            step={2}
+          />
+        </FormItem>
+      </div>
+      <FormItem label="Keybindings">
+        <ButtonGroup
+          value={keybindings}
+          onChange={(keybindings) => settingsMap.setKey('keybindings', keybindings)}
+          items={{ codemirror: 'Codemirror', vim: 'Vim', emacs: 'Emacs' }}
+        ></ButtonGroup>
+      </FormItem>
+      <FormItem label="Reset Settings">
+        <button
+          className="bg-background p-2 max-w-[300px] rounded-md hover:opacity-50"
+          onClick={() => {
+            if (confirm('Sure?')) {
+              settingsMap.set(defaultSettings);
+            }
+          }}
+        >
+          restore default settings
+        </button>
+      </FormItem>
+    </div>
+  );
+}

website/src/repl/Header.jsx

@@ -6,6 +6,7 @@ import SparklesIcon from '@heroicons/react/20/solid/SparklesIcon';
 import StopCircleIcon from '@heroicons/react/20/solid/StopCircleIcon';
 import { cx } from '@strudel.cycles/react';
 import React, { useContext } from 'react';
+import { useSettings, setIsZen } from '../settings.mjs';
 // import { ReplContext } from './Repl';
 import './Repl.css';
 
@@ -21,11 +22,9 @@ export function Header({ context }) {
     handleUpdate,
     handleShuffle,
     handleShare,
-    isZen,
-    setIsZen,
   } = context;
   const isEmbedded = embedded || window.location !== window.parent.location;
-  // useContext(ReplContext)
+  const { isZen } = useSettings();
 
   return (
     <header
@@ -53,7 +52,11 @@ export function Header({ context }) {
         >
           <div
             className={cx('mt-[1px]', started && 'animate-spin', 'cursor-pointer')}
-            onClick={() => !isEmbedded && setIsZen((z) => !z)}
+            onClick={() => {
+              if (!isEmbedded) {
+                setIsZen(!isZen);
+              }
+            }}
           >
             🌀
           </div>
@@ -69,7 +72,7 @@ export function Header({ context }) {
           <button
             onClick={handleTogglePlay}
             title={started ? 'stop' : 'play'}
-            className={cx(!isEmbedded ? 'p-2' : 'px-2', 'hover:text-tertiary', !started && 'animate-pulse')}
+            className={cx(!isEmbedded ? 'p-2' : 'px-2', 'hover:opacity-50', !started && 'animate-pulse')}
           >
             {!pending ? (
               <span className={cx('flex items-center space-x-1', isEmbedded ? '' : 'w-16')}>
@@ -86,7 +89,7 @@ export function Header({ context }) {
             className={cx(
               'flex items-center space-x-1',
               !isEmbedded ? 'p-2' : 'px-2',
-              !isDirty || !activeCode ? 'opacity-50' : 'hover:text-tertiary',
+              !isDirty || !activeCode ? 'opacity-50' : 'hover:opacity-50',
             )}
           >
             {/*             <CommandLineIcon className="w-6 h-6" /> */}
@@ -96,7 +99,7 @@ export function Header({ context }) {
           {!isEmbedded && (
             <button
               title="shuffle"
-              className="hover:text-tertiary p-2 flex items-center space-x-1"
+              className="hover:opacity-50 p-2 flex items-center space-x-1"
               onClick={handleShuffle}
             >
               <SparklesIcon className="w-6 h-6" />
@@ -107,7 +110,7 @@ export function Header({ context }) {
             <button
               title="share"
               className={cx(
-                'cursor-pointer hover:text-tertiary flex items-center space-x-1',
+                'cursor-pointer hover:opacity-50 flex items-center space-x-1',
                 !isEmbedded ? 'p-2' : 'px-2',
               )}
               onClick={handleShare}
@@ -120,21 +123,21 @@ export function Header({ context }) {
             <a
               title="learn"
               href="./learn/getting-started"
-              className={cx('hover:text-tertiary flex items-center space-x-1', !isEmbedded ? 'p-2' : 'px-2')}
+              className={cx('hover:opacity-50 flex items-center space-x-1', !isEmbedded ? 'p-2' : 'px-2')}
             >
               <AcademicCapIcon className="w-6 h-6" />
               <span>learn</span>
             </a>
           )}
           {/* {isEmbedded && (
-            <button className={cx('hover:text-tertiary px-2')}>
+            <button className={cx('hover:opacity-50 px-2')}>
               <a href={window.location.href} target="_blank" rel="noopener noreferrer" title="Open in REPL">
                 🚀
               </a>
             </button>
           )}
           {isEmbedded && (
-            <button className={cx('hover:text-tertiary px-2')}>
+            <button className={cx('hover:opacity-50 px-2')}>
               <a
                 onClick={() => {
                   window.location.href = initialUrl;

website/src/repl/Repl.css

@@ -17,6 +17,7 @@
 
 #code .cm-scroller {
   padding-bottom: 50vh;
+  font-family: inherit;
 }
 #code .cm-line > * {
   background: var(--lineBackground);

website/src/repl/Repl.jsx

@@ -23,9 +23,9 @@ import { prebake } from './prebake.mjs';
 import * as tunes from './tunes.mjs';
 import PlayCircleIcon from '@heroicons/react/20/solid/PlayCircleIcon';
 import { themes } from './themes.mjs';
-import useTheme from '../useTheme';
+import { settingsMap, useSettings, setLatestCode } from '../settings.mjs';
 
-const initialTheme = localStorage.getItem('strudel-theme') || 'strudelTheme';
+const { latestCode } = settingsMap.get();
 
 initAudioOnFirstClick();
 
@@ -113,25 +113,25 @@ export const ReplContext = createContext(null);
 export function Repl({ embedded = false }) {
   const isEmbedded = embedded || window.location !== window.parent.location;
   const [view, setView] = useState(); // codemirror view
-  const [theme, setTheme] = useState(initialTheme);
   const [lastShared, setLastShared] = useState();
-  const [activeFooter, setActiveFooter] = useState('');
-  const [isZen, setIsZen] = useState(false);
   const [pending, setPending] = useState(false);
 
+  const { theme, keybindings, fontSize, fontFamily } = useSettings();
+
   const { code, setCode, scheduler, evaluate, activateCode, isDirty, activeCode, pattern, started, stop, error } =
     useStrudel({
       initialCode: '// LOADING',
       defaultOutput: webaudioOutput,
       getTime,
-      autolink: true,
       beforeEval: () => {
         cleanupUi();
         cleanupDraw();
         setPending(true);
       },
-      afterEval: () => {
+      afterEval: ({ code }) => {
         setPending(false);
+        setLatestCode(code);
+        window.location.hash = '#' + encodeURIComponent(btoa(code));
       },
       onToggle: (play) => !play && cleanupDraw(false),
       drawContext,
@@ -140,16 +140,13 @@ export function Repl({ embedded = false }) {
   // init code
   useEffect(() => {
     initCode().then((decoded) => {
-      if (!decoded) {
-        setActiveFooter('intro'); // TODO: get rid
-      }
       logger(
         `Welcome to Strudel! ${
           decoded ? `I have loaded the code from the URL.` : `A random code snippet named "${name}" has been loaded!`
         } Press play or hit ctrl+enter to run it!`,
         'highlight',
       );
-      setCode(decoded || randomTune);
+      setCode(decoded || latestCode || randomTune);
     });
   }, []);
 
@@ -172,15 +169,12 @@ export function Repl({ embedded = false }) {
     ),
   );
 
-  const { settings } = useTheme();
-
   // highlighting
   useHighlighting({
     view,
     pattern,
     active: started && !activeCode?.includes('strudel disable-highlighting'),
     getTime: () => scheduler.now(),
-    color: settings?.foreground,
   });
 
   //
@@ -248,23 +242,18 @@ export function Repl({ embedded = false }) {
     }
   };
   const context = {
+    scheduler,
     embedded,
     started,
     pending,
     isDirty,
     lastShared,
     activeCode,
-    activeFooter,
-    setActiveFooter,
     handleChangeCode,
     handleTogglePlay,
     handleUpdate,
     handleShuffle,
     handleShare,
-    isZen,
-    setIsZen,
-    theme,
-    setTheme,
   };
   return (
     // bg-gradient-to-t from-blue-900 to-slate-900
@@ -272,7 +261,7 @@ export function Repl({ embedded = false }) {
     <ReplContext.Provider value={context}>
       <div
         className={cx(
-          'h-screen flex flex-col',
+          'h-full flex flex-col',
           //        'bg-gradient-to-t from-green-900 to-slate-900', //
         )}
       >
@@ -281,8 +270,14 @@ export function Repl({ embedded = false }) {
           <CodeMirror
             theme={themes[theme] || themes.strudelTheme}
             value={code}
+            keybindings={keybindings}
+            fontSize={fontSize}
+            fontFamily={fontFamily}
             onChange={handleChangeCode}
-            onViewChanged={setView}
+            onViewChanged={(v) => {
+              setView(v);
+              // window.editorView = v;
+            }}
             onSelectionChange={handleSelectionChange}
           />
         </section>

website/src/repl/themes.mjs

@@ -31,9 +31,19 @@ import {
 } from '@uiw/codemirror-themes-all';
 
 import strudelTheme from '@strudel.cycles/react/src/themes/strudel-theme';
+import bluescreen, { settings as bluescreenSettings } from '@strudel.cycles/react/src/themes/bluescreen';
+import blackscreen, { settings as blackscreenSettings } from '@strudel.cycles/react/src/themes/blackscreen';
+import whitescreen, { settings as whitescreenSettings } from '@strudel.cycles/react/src/themes/whitescreen';
+import algoboy, { settings as algoboySettings } from '@strudel.cycles/react/src/themes/algoboy';
+import terminal, { settings as terminalSettings } from '@strudel.cycles/react/src/themes/terminal';
 
 export const themes = {
   strudelTheme,
+  bluescreen,
+  blackscreen,
+  whitescreen,
+  algoboy,
+  terminal,
   abcdef,
   androidstudio,
   atomone,
@@ -82,6 +92,11 @@ export const settings = {
     // gutterForeground: '#8a919966',
     gutterForeground: '#8a919966',
   },
+  bluescreen: bluescreenSettings,
+  blackscreen: blackscreenSettings,
+  whitescreen: whitescreenSettings,
+  algoboy: algoboySettings,
+  terminal: terminalSettings,
   abcdef: {
     background: '#0f0f0f',
     lineBackground: '#0f0f0f50',
@@ -395,7 +410,6 @@ export const settings = {
     gutterBackground: '#1e1e1e',
     gutterForeground: '#838383',
     gutterActiveForeground: '#fff',
-    fontFamily: 'Menlo, Monaco, Consolas, "Andale Mono", "Ubuntu Mono", "Courier New", monospace',
   },
   xcodeLight: {
     light: true,

website/src/settings.mjs

@@ -0,0 +1,28 @@
+import { persistentMap } from '@nanostores/persistent';
+import { useStore } from '@nanostores/react';
+
+export const defaultSettings = {
+  activeFooter: 'intro',
+  keybindings: 'codemirror',
+  theme: 'strudelTheme',
+  fontFamily: 'monospace',
+  fontSize: 18,
+  latestCode: '',
+  isZen: false,
+};
+
+export const settingsMap = persistentMap('strudel-settings', defaultSettings);
+
+export function useSettings() {
+  const state = useStore(settingsMap);
+  return {
+    ...state,
+    isZen: [true, 'true'].includes(state.isZen) ? true : false,
+    fontSize: Number(state.fontSize),
+  };
+}
+
+export const setActiveFooter = (tab) => settingsMap.setKey('activeFooter', tab);
+
+export const setLatestCode = (code) => settingsMap.setKey('latestCode', code);
+export const setIsZen = (active) => settingsMap.setKey('isZen', !!active);

website/src/styles/index.css

@@ -1,3 +1,16 @@
+@font-face {
+  font-family: 'PressStart';
+  src: url('/fonts/PressStart2P/PressStart2P-Regular.ttf');
+}
+@font-face {
+  font-family: 'BigBlueTerminal';
+  src: url('/fonts/BigBlueTerminal/BigBlue_TerminalPlus.TTF');
+}
+@font-face {
+  font-family: 'x3270';
+  src: url('/fonts/3270/3270-Regular.ttf');
+}
+
 .cm-gutters {
   display: none !important;
 }
@@ -5,3 +18,11 @@
 .prose > h1:not(:first-child) {
   margin-top: 30px;
 }
+:root {
+  --app-height: 100vh;
+}
+
+#console-tab,
+#samples-tab {
+  font-family: BigBlueTerminal, monospace;
+}

website/src/useTheme.jsx

@@ -1,27 +0,0 @@
-import { useState } from 'react';
-import { settings } from './repl/themes.mjs';
-import { useEffect } from 'react';
-
-function useTheme() {
-  const [theme, setTheme] = useState(localStorage.getItem('strudel-theme'));
-  useEvent('strudel-theme', (e) => setTheme(e.detail));
-  const themeSettings = settings[theme || 'strudelTheme'];
-  return {
-    theme,
-    setTheme,
-    settings: themeSettings,
-    isDark: !themeSettings.light,
-    isLight: !!themeSettings.light,
-  };
-}
-// TODO: dedupe
-function useEvent(name, onTrigger, useCapture = false) {
-  useEffect(() => {
-    document.addEventListener(name, onTrigger, useCapture);
-    return () => {
-      document.removeEventListener(name, onTrigger, useCapture);
-    };
-  }, [onTrigger]);
-}
-
-export default useTheme;

website/tailwind.config.cjs

@@ -11,8 +11,6 @@ module.exports = {
   theme: {
     extend: {
       colors: {
-        tertiary: '#82aaff',
-        highlight: '#bb8800',
         // codemirror-theme settings
         background: 'var(--background)',
         lineBackground: 'var(--lineBackground)',
@@ -25,6 +23,9 @@ module.exports = {
         gutterBorder: 'var(--gutterBorder)',
         lineHighlight: 'var(--lineHighlight)',
       },
+      spacing: {
+        'app-height': 'var(--app-height)',
+      },
       typography(theme) {
         return {
           DEFAULT: {
@@ -41,5 +42,5 @@ module.exports = {
       },
     },
   },
-  plugins: [require('@tailwindcss/typography')],
+  plugins: [require('@tailwindcss/typography'), require('@tailwindcss/forms')],
 };