add link to example

remove footnote syntax
fixes https://github.com/tidalcycles/strudel/issues/439
2026-07-14 14:53:45 -04:00 · 2023-02-27 14:33:07 +01:00 · 2023-02-27 13:34:51 +01:00
225 changed files with 11191 additions and 24103 deletions
@@ -1,62 +0,0 @@
-name: Tauri Builder
-on:
-  push:
-    tags:
-      - "v*"
-  workflow_dispatch:
-
-jobs:
-  release:
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [macos-latest, ubuntu-latest, windows-latest]
-        include:
-          - os: ubuntu-latest
-            rust_target: x86_64-unknown-linux-gnu
-          - os: macos-latest
-            rust_target: x86_64-apple-darwin
-          - os: macos-latest
-            rust_target: aarch64-apple-darwin
-          - os: windows-latest
-            rust_target: x86_64-pc-windows-msvc
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 8.6.2
-
-      - name: Node.js setup
-        uses: actions/setup-node@v3
-        with:
-          node-version: latest
-          # node-version-file: '.nvmrc'
-
-      - name: Install Rust (Stable)
-        run:
-          curl https://sh.rustup.rs -sSf | sh -s -- -y
-
-      - name: Install dependencies (ubuntu only)
-        if: matrix.platform == 'ubuntu-latest'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
-
-      - name: Install app dependencies from lockfile and build web
-        run: pnpm install
-
-      - name: Build the app
-        uses: tauri-apps/tauri-action@v0
-
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          # tauri-action replaces \_\_VERSION\_\_ with the app version
-          tagName: ${{ github.ref_name }}
-          releaseName: "Strudel v__VERSION__"
-          releaseBody: |
-            See the assets to download this version and install.
-          releaseDraft: true
-          prerelease: false
@@ -39,8 +39,4 @@ server/samples/old
 repl/stats.html
 coverage
 public/icons/apple-splash-*
-dev-dist
-Dirt-Samples
-tidal-drum-machines
-webaudiofontdata
-src-tauri/target
+dev-dist
@@ -31,7 +31,7 @@ Use one of the Communication Channels listed above.

 ## Improve the Docs

-If you find some weak spots in the [docs](https://strudel.tidalcycles.org/workshop/getting-started/),
+If you find some weak spots in the [docs](https://strudel.tidalcycles.org/learn/getting-started),
 you can edit each file directly on github via the "Edit this page" link located in the right sidebar.

 ## Propose a Feature
@@ -123,14 +123,7 @@ To publish all packages that have been changed since the last release, run:

 ```sh
 npm login
-
-# this will increment all the versions in package.json files of non private packages to selected versions
-npx lerna version --no-private
-
-# publish all packages inside /packages using pnpm! don't use lerna to publish!!
-pnpm --filter "./packages/**" publish --dry-run
-
-# the last command was only a dry-run, make sure everything looks ok, if yes, run the same command without flag
+npx lerna publish
 ```

 To manually publish a single package, increase the version in the `package.json`, then run `pnpm publish`.
@@ -14,8 +14,8 @@ An experiment in making a [Tidal](https://github.com/tidalcycles/tidal/) using w
 After cloning the project, you can run the REPL locally:

 ```bash
-pnpm run setup
-pnpm run repl
+npm run setup
+npm run repl
 ```

 ## Using Strudel In Your Project
@@ -18,6 +18,7 @@
    "build": "npm run prebuild && cd website && npm run build",
    "preview": "cd website && npm run preview",
    "osc": "cd packages/osc && npm run server",
+    "deploy": "NODE_DEBUG=gh-pages gh-pages -d out",
    "jsdoc": "jsdoc packages/ -c jsdoc.config.json",
    "jsdoc-json": "jsdoc packages/ --template ./node_modules/jsdoc-json --destination doc.json -c jsdoc.config.json",
    "lint": "eslint . --ext mjs,js --quiet",
@@ -45,28 +46,28 @@
  },
  "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:*",
-    "acorn": "^8.8.1",
-    "dependency-tree": "^9.0.0"
+    "@strudel.cycles/xen": "workspace:*"
  },
  "devDependencies": {
-    "@tauri-apps/cli": "^1.4.0",
-    "@vitest/ui": "^0.28.0",
-    "canvas": "^2.11.2",
-    "eslint": "^8.39.0",
+    "@vitest/ui": "^0.25.7",
+    "c8": "^7.12.0",
+    "canvas": "^2.11.0",
+    "eslint": "^8.28.0",
    "eslint-plugin-import": "^2.27.5",
    "events": "^3.3.0",
-    "jsdoc": "^4.0.2",
+    "gh-pages": "^4.0.0",
+    "jsdoc": "^3.6.10",
    "jsdoc-json": "^2.0.2",
-    "jsdoc-to-markdown": "^8.0.0",
-    "lerna": "^6.6.1",
-    "prettier": "^2.8.8",
-    "rollup-plugin-visualizer": "^5.8.1",
-    "vitest": "^0.28.0"
+    "jsdoc-to-markdown": "^7.1.1",
+    "lerna": "^4.0.0",
+    "prettier": "^2.8.1",
+    "rollup-plugin-visualizer": "^5.8.1"
  }
 }
@@ -1,3 +0,0 @@
-# @strudel/codemirror
-
-This package contains helpers and extensions to use codemirror6. See [vite-vanilla-repl-cm6](../core/examples/vite-vanilla-repl-cm6/main.js) as an example of using it.
@@ -1,199 +0,0 @@
-import { EditorState } from '@codemirror/state';
-import { EditorView, keymap, Decoration, lineNumbers, highlightActiveLineGutter } from '@codemirror/view';
-import { defaultKeymap } from '@codemirror/commands';
-import { syntaxHighlighting, defaultHighlightStyle } from '@codemirror/language';
-import { javascript } from '@codemirror/lang-javascript';
-import { StateField, StateEffect } from '@codemirror/state';
-import { oneDark } from './themes/one-dark';
-import { repl, Drawer } from '@strudel.cycles/core';
-
-// https://codemirror.net/docs/guide/
-export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, theme = oneDark, root }) {
-  let state = EditorState.create({
-    doc: initialCode,
-    extensions: [
-      theme,
-      javascript(),
-      lineNumbers(),
-      highlightField,
-      highlightActiveLineGutter(),
-      syntaxHighlighting(defaultHighlightStyle),
-      keymap.of(defaultKeymap),
-      flashField,
-      EditorView.updateListener.of((v) => onChange(v)),
-      keymap.of([
-        {
-          key: 'Ctrl-Enter',
-          run: () => onEvaluate(),
-        },
-        {
-          key: 'Ctrl-.',
-          run: () => onStop(),
-        },
-      ]),
-    ],
-  });
-
-  return new EditorView({
-    state,
-    parent: root,
-  });
-}
-
-//
-//  highlighting
-//
-
-export const setHighlights = StateEffect.define();
-export const highlightField = StateField.define({
-  create() {
-    return Decoration.none;
-  },
-  update(highlights, tr) {
-    try {
-      for (let e of tr.effects) {
-        if (e.is(setHighlights)) {
-          const { haps } = e.value;
-          const marks =
-            haps
-              .map((hap) =>
-                (hap.context.locations || []).map(({ start, end }) => {
-                  // 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: 2px solid #FFCA28;` },
-                  });
-                  return mark.range(from, to);
-                }),
-              )
-              .flat()
-              .filter(Boolean) || [];
-          highlights = Decoration.set(marks, true);
-        }
-      }
-      return highlights;
-    } catch (err) {
-      // console.warn('highlighting error', err);
-      return Decoration.set([]);
-    }
-  },
-  provide: (f) => EditorView.decorations.from(f),
-});
-
-// helper to simply trigger highlighting for given haps
-export function highlightHaps(view, haps) {
-  view.dispatch({ effects: setHighlights.of({ haps }) });
-}
-
-//
-// flash
-//
-
-export const setFlash = StateEffect.define();
-const flashField = StateField.define({
-  create() {
-    return Decoration.none;
-  },
-  update(flash, tr) {
-    try {
-      for (let e of tr.effects) {
-        if (e.is(setFlash)) {
-          if (e.value) {
-            const mark = Decoration.mark({ attributes: { style: `background-color: #FFCA2880` } });
-            flash = Decoration.set([mark.range(0, tr.newDoc.length)]);
-          } else {
-            flash = Decoration.set([]);
-          }
-        }
-      }
-      return flash;
-    } catch (err) {
-      console.warn('flash error', err);
-      return flash;
-    }
-  },
-  provide: (f) => EditorView.decorations.from(f),
-});
-
-export const flash = (view, ms = 200) => {
-  view.dispatch({ effects: setFlash.of(true) });
-  setTimeout(() => {
-    view.dispatch({ effects: setFlash.of(false) });
-  }, ms);
-};
-
-export class StrudelMirror {
-  constructor(options) {
-    const { root, initialCode = '', onDraw, drawTime = [-2, 2], prebake, ...replOptions } = options;
-    this.code = initialCode;
-
-    this.drawer = new Drawer((haps, time) => {
-      const currentFrame = haps.filter((hap) => time >= hap.whole.begin && time <= hap.endClipped);
-      this.highlight(currentFrame);
-      onDraw?.(haps, time, currentFrame);
-    }, drawTime);
-
-    const prebaked = prebake();
-    prebaked.then(async () => {
-      if (!onDraw) {
-        return;
-      }
-      const { scheduler, evaluate } = await this.repl;
-      // draw first frame instantly
-      prebaked.then(async () => {
-        await evaluate(this.code, false);
-        this.drawer.invalidate(scheduler);
-        onDraw?.(this.drawer.visibleHaps, 0, []);
-      });
-    });
-
-    this.repl = repl({
-      ...replOptions,
-      onToggle: async (started) => {
-        replOptions?.onToggle?.(started);
-        const { scheduler } = await this.repl;
-        if (started) {
-          this.drawer.start(scheduler);
-        } else {
-          this.drawer.stop();
-        }
-      },
-      beforeEval: async () => {
-        await prebaked;
-      },
-      afterEval: (options) => {
-        replOptions?.afterEval?.(options);
-        this.drawer.invalidate();
-      },
-    });
-    this.editor = initEditor({
-      root,
-      initialCode,
-      onChange: (v) => {
-        this.code = v.state.doc.toString();
-      },
-      onEvaluate: () => this.evaluate(),
-      onStop: () => this.stop(),
-    });
-  }
-  async evaluate() {
-    const { evaluate } = await this.repl;
-    this.flash();
-    await evaluate(this.code);
-  }
-  async stop() {
-    const { scheduler } = await this.repl;
-    scheduler.stop();
-  }
-  flash(ms) {
-    flash(this.editor, ms);
-  }
-  highlight(haps) {
-    highlightHaps(this.editor, haps);
-  }
-}
@@ -1,47 +0,0 @@
-{
-  "name": "@strudel/codemirror",
-  "version": "0.8.4",
-  "description": "Codemirror Extensions for Strudel",
-  "main": "codemirror.mjs",
-  "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
-  },
-  "scripts": {
-    "build": "vite build",
-    "prepublishOnly": "npm run build"
-  },
-  "type": "module",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/tidalcycles/strudel.git"
-  },
-  "keywords": [
-    "tidalcycles",
-    "strudel",
-    "pattern",
-    "livecoding",
-    "algorave"
-  ],
-  "author": "Felix Roos <flix91@gmail.com>",
-  "contributors": [
-    "Alex McLean <alex@slab.org>"
-  ],
-  "license": "AGPL-3.0-or-later",
-  "bugs": {
-    "url": "https://github.com/tidalcycles/strudel/issues"
-  },
-  "homepage": "https://github.com/tidalcycles/strudel#readme",
-  "dependencies": {
-    "@codemirror/commands": "^6.2.4",
-    "@codemirror/lang-javascript": "^6.1.7",
-    "@codemirror/language": "^6.6.0",
-    "@codemirror/state": "^6.2.0",
-    "@codemirror/view": "^6.10.0",
-    "@lezer/highlight": "^1.1.4",
-    "@strudel.cycles/core": "workspace:*"
-  },
-  "devDependencies": {
-    "vite": "^4.3.3"
-  }
-}
@@ -1,139 +0,0 @@
-import { EditorView } from '@codemirror/view';
-import { HighlightStyle, syntaxHighlighting } from '@codemirror/language';
-import { tags as t } from '@lezer/highlight';
-
-// Using https://github.com/one-dark/vscode-one-dark-theme/ as reference for the colors
-
-const chalky = '#e5c07b',
-  coral = '#e06c75',
-  cyan = '#56b6c2',
-  invalid = '#ffffff',
-  ivory = '#abb2bf',
-  stone = '#7d8799', // Brightened compared to original to increase contrast
-  malibu = '#61afef',
-  sage = '#98c379',
-  whiskey = '#d19a66',
-  violet = '#c678dd',
-  darkBackground = '#21252b',
-  highlightBackground = '#2c313a',
-  background = '#282c34',
-  tooltipBackground = '#353a42',
-  selection = '#3E4451',
-  cursor = '#528bff';
-
-/// The colors used in the theme, as CSS color strings.
-export const color = {
-  chalky,
-  coral,
-  cyan,
-  invalid,
-  ivory,
-  stone,
-  malibu,
-  sage,
-  whiskey,
-  violet,
-  darkBackground,
-  highlightBackground,
-  background,
-  tooltipBackground,
-  selection,
-  cursor,
-};
-
-/// The editor theme styles for One Dark.
-export const oneDarkTheme = EditorView.theme(
-  {
-    '&': {
-      color: ivory,
-      backgroundColor: background,
-    },
-
-    '.cm-content': {
-      caretColor: cursor,
-    },
-
-    '.cm-cursor, .cm-dropCursor': { borderLeftColor: cursor },
-    '&.cm-focused > .cm-scroller > .cm-selectionLayer .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection':
-      { backgroundColor: selection },
-
-    '.cm-panels': { backgroundColor: darkBackground, color: ivory },
-    '.cm-panels.cm-panels-top': { borderBottom: '2px solid black' },
-    '.cm-panels.cm-panels-bottom': { borderTop: '2px solid black' },
-
-    '.cm-searchMatch': {
-      backgroundColor: '#72a1ff59',
-      outline: '1px solid #457dff',
-    },
-    '.cm-searchMatch.cm-searchMatch-selected': {
-      backgroundColor: '#6199ff2f',
-    },
-
-    '.cm-activeLine': { backgroundColor: '#6699ff0b' },
-    '.cm-selectionMatch': { backgroundColor: '#aafe661a' },
-
-    '&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket': {
-      backgroundColor: '#bad0f847',
-    },
-
-    '.cm-gutters': {
-      backgroundColor: background,
-      color: stone,
-      border: 'none',
-    },
-
-    '.cm-activeLineGutter': {
-      backgroundColor: highlightBackground,
-    },
-
-    '.cm-foldPlaceholder': {
-      backgroundColor: 'transparent',
-      border: 'none',
-      color: '#ddd',
-    },
-
-    '.cm-tooltip': {
-      border: 'none',
-      backgroundColor: tooltipBackground,
-    },
-    '.cm-tooltip .cm-tooltip-arrow:before': {
-      borderTopColor: 'transparent',
-      borderBottomColor: 'transparent',
-    },
-    '.cm-tooltip .cm-tooltip-arrow:after': {
-      borderTopColor: tooltipBackground,
-      borderBottomColor: tooltipBackground,
-    },
-    '.cm-tooltip-autocomplete': {
-      '& > ul > li[aria-selected]': {
-        backgroundColor: highlightBackground,
-        color: ivory,
-      },
-    },
-  },
-  { dark: true },
-);
-
-/// The highlighting style for code in the One Dark theme.
-export const oneDarkHighlightStyle = HighlightStyle.define([
-  { tag: t.keyword, color: violet },
-  { tag: [t.name, t.deleted, t.character, t.propertyName, t.macroName], color: coral },
-  { tag: [t.function(t.variableName), t.labelName], color: malibu },
-  { tag: [t.color, t.constant(t.name), t.standard(t.name)], color: whiskey },
-  { tag: [t.definition(t.name), t.separator], color: ivory },
-  { tag: [t.typeName, t.className, t.number, t.changed, t.annotation, t.modifier, t.self, t.namespace], color: chalky },
-  { tag: [t.operator, t.operatorKeyword, t.url, t.escape, t.regexp, t.link, t.special(t.string)], color: cyan },
-  { tag: [t.meta, t.comment], color: stone },
-  { tag: t.strong, fontWeight: 'bold' },
-  { tag: t.emphasis, fontStyle: 'italic' },
-  { tag: t.strikethrough, textDecoration: 'line-through' },
-  { tag: t.link, color: stone, textDecoration: 'underline' },
-  { tag: t.heading, fontWeight: 'bold', color: coral },
-  { tag: [t.atom, t.bool, t.special(t.variableName)], color: whiskey },
-  { tag: [t.processingInstruction, t.string, t.inserted], color: sage },
-  { tag: t.invalid, color: invalid },
-]);
-
-/// Extension to enable the One Dark theme (both the editor theme and
-/// the highlight style).
-export const oneDark = [oneDarkTheme, syntaxHighlighting(oneDarkHighlightStyle)];
@@ -1,19 +0,0 @@
-import { defineConfig } from 'vite';
-import { dependencies } from './package.json';
-import { resolve } from 'path';
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [],
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'codemirror.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' }[ext]),
-    },
-    rollupOptions: {
-      external: [...Object.keys(dependencies)],
-    },
-    target: 'esnext',
-  },
-});
@@ -1,5 +1,4 @@
-import { Pattern, getDrawContext, silence, register, pure } from './index.mjs';
-import controls from './controls.mjs'; // do not import from index.mjs as it breaks for some reason..
+import { controls, Pattern, getDrawContext, silence, register, pure } from './index.mjs';
 const { createParams } = controls;

 let clearColor = '#22222210';
@@ -4,34 +4,20 @@ 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, register, sequence } from './pattern.mjs';
-import { zipWith } from './util.mjs';
+import { Pattern, sequence, registerControl } from './pattern.mjs';

 const controls = {};
 const generic_params = [
  /**
-   * Select a sound / sample by name. When using mininotation, you can also optionally supply 'n' and 'gain' parameters
-   * separated by ':'.
+   * Select a sound / sample by name.
   *
   * @name s
   * @param {string | Pattern} sound The sound / pattern of sounds to pick
-   * @synonyms sound
   * @example
   * s("bd hh")
-   * @example
-   * s("bd:0 bd:1 bd:0:0.3 bd:1:1.4")
   *
   */
-  [['s', 'n', 'gain'], 'sound'],
-  /**
-   * Define a custom webaudio node to use as a sound source.
-   *
-   * @name source
-   * @param {function} getSource
-   * @synonyms src
-   *
-   */
-  ['source', 'src'],
+  ['s', 's', 'sound'],
  /**
   * Selects the given index from the sample map.
   * Numbers too high will wrap around.
@@ -43,7 +29,7 @@ const generic_params = [
   * s("bd sd,hh*3").n("<0 1>")
   */
  // also see https://github.com/tidalcycles/strudel/pull/63
-  ['n'],
+  ['f', 'n', 'The sample number to choose for a synth or sampleset'],
  /**
   * Plays the given note name or midi number. A note name consists of
   *
@@ -63,8 +49,10 @@ const generic_params = [
   * @example
   * note("60 69 65 64")
   */
-  [['note', 'n']],
-
+  ['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'],
  /**
   * A pattern of numbers that speed up (or slow down) samples while they play. Currently only supported by osc / superdirt.
   *
@@ -75,7 +63,7 @@ const generic_params = [
   * s("sax").accelerate("<0 1 2 4 8 16>").slow(2).osc()
   *
   */
-  ['accelerate'],
+  ['f', 'accelerate', 'a pattern of numbers that speed up (or slow down) samples while they play.'],
  /**
   * Controls the gain by an exponential amount.
   *
@@ -85,7 +73,11 @@ const generic_params = [
   * s("hh*8").gain(".4!2 1 .4!2 1 .4 1")
   *
   */
-  ['gain'],
+  [
+    '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@.',
+  ],
  /**
   * Like {@link gain}, but linear.
   *
@@ -96,18 +88,17 @@ const generic_params = [
   * s("bd*8").amp(".1*2 .5 .1*2 .5 .1 .5").osc()
   *
   */
-  ['amp'],
+  ['f', 'amp', 'like @gain@, but linear.'],
  /**
   * 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>")
   *
   */
-  ['attack', 'att'],
+  ['f', 'attack'],

  /**
   * Select the sound bank to use. To be used together with `s`. The bank name (+ "_") will be prepended to the value of `s`.
@@ -118,7 +109,7 @@ const generic_params = [
   * s("bd sd").bank('RolandTR909') // = s("RolandTR909_bd RolandTR909_sd")
   *
   */
-  ['bank'],
+  ['f', 'bank', 'selects sound bank to use'],

  /**
   * Amplitude envelope decay time: the time it takes after the attack time to reach the sustain level.
@@ -130,46 +121,52 @@ const generic_params = [
   * note("c3 e3").decay("<.1 .2 .3 .4>").sustain(0)
   *
   */
-  ['decay'],
+  ['f', '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>")
   *
   */
-  ['sustain', 'sus'],
+  ['f', 'sustain', ''],
  /**
   * 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")
   *
   */
-  ['release', 'rel'],
-  ['hold'],
+  [
+    '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.',
+  ],
  // TODO: in tidal, it seems to be normalized
  /**
-   * Sets the center frequency of the **b**and-**p**ass **f**ilter. When using mininotation, you
-   * can also optionally supply the 'bpq' parameter separated by ':'.
+   * Sets the center frequency of the **b**and-**p**ass **f**ilter.
   *
   * @name bpf
   * @param {number | Pattern} frequency center frequency
-   * @synonyms bandf, bp
+   * @synonyms bandf
   * @example
   * s("bd sd,hh*3").bpf("<1000 2000 4000 8000>")
   *
   */
-  [['bandf', 'bandq'], 'bpf', 'bp'],
+  ['f', 'bpf', ''],
+  ['f', 'bandf', 'A pattern of numbers from 0 to 1. Sets the center frequency of the band-pass filter.'],
  // TODO: in tidal, it seems to be normalized
  /**
-   * Sets the **b**and-**p**ass **q**-factor (resonance).
+   * Sets the **b**and-**p**ass **q**-factor (resonance)
   *
   * @name bpq
   * @param {number | Pattern} q q factor
@@ -178,9 +175,8 @@ const generic_params = [
   * s("bd sd").bpf(500).bpq("<0 1 2 3>")
   *
   */
-  // currently an alias of 'bandq' https://github.com/tidalcycles/strudel/issues/496
-  // ['bpq'],
-  ['bandq', 'bpq'],
+  ['f', 'bpq', ''],
+  ['f', 'bandq', 'a pattern of anumbers from 0 to 1. Sets the q-factor of the band-pass filter.'],
  /**
   * 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.
   *
@@ -192,7 +188,11 @@ const generic_params = [
   * s("rave").begin("<0 .25 .5 .75>")
   *
   */
-  ['begin'],
+  [
+    '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.',
+  ],
  /**
   * The same as .begin, but cuts off the end off each sample.
   *
@@ -203,7 +203,11 @@ const generic_params = [
   * s("bd*2,oh*4").end("<.1 .2 .5 1>")
   *
   */
-  ['end'],
+  [
+    '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.',
+  ],
  /**
   * 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.
@@ -214,7 +218,7 @@ const generic_params = [
   * s("bd").loop("<1 2 3 4>").osc()
   *
   */
-  ['loop'],
+  ['f', 'loop', 'loops the sample (from `begin` to `end`) the specified number of times.'],
  // TODO: currently duplicated with "native" legato
  // TODO: superdirt legato will do more: https://youtu.be/dQPmE1WaD1k?t=419
  /**
@@ -222,13 +226,12 @@ const generic_params = [
   *
   * @name legato
   * @param {number | Pattern} duration between 0 and 1, where 1 is the length of the whole hap time
-   * @noAutocomplete
   * @example
   * "c4 eb4 g4 bb4".legato("<0.125 .25 .5 .75 1 2 4>")
   *
   */
-  // ['legato'],
-  // ['clhatdecay'],
+  // ['f', 'legato', 'controls the amount of overlap between two adjacent sounds'],
+  // ['f', 'clhatdecay', ''],
  /**
   * bit crusher effect.
   *
@@ -238,7 +241,11 @@ const generic_params = [
   * s("<bd sd>,hh*3").fast(2).crush("<16 8 7 6 5 4 3 2>")
   *
   */
-  ['crush'],
+  [
+    'f',
+    'crush',
+    'bit crushing, a pattern of numbers from 1 (for drastic reduction in bit-depth) to 16 (for barely no reduction).',
+  ],
  /**
   * fake-resampling for lowering the sample rate. Caution: This effect seems to only work in chromium based browsers
   *
@@ -248,7 +255,11 @@ const generic_params = [
   * s("bd sd,hh*4").coarse("<1 4 8 16 32>")
   *
   */
-  ['coarse'],
+  [
+    '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.',
+  ],

  /**
   * choose the channel the pattern is sent to in superdirt
@@ -257,7 +268,7 @@ const generic_params = [
   * @param {number | Pattern} channel channel number
   *
   */
-  ['channel'],
+  ['i', 'channel', 'choose the channel the pattern is sent to in superdirt'],
  /**
   * 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.
   *
@@ -267,39 +278,35 @@ const generic_params = [
   * s("rd*4").cut(1)
   *
   */
-  ['cut'],
+  [
+    '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.',
+  ],
  /**
   * Applies the cutoff frequency of the **l**ow-**p**ass **f**ilter.
   *
-   * When using mininotation, you can also optionally add the 'lpq' parameter, separated by ':'.
-   *
   * @name lpf
   * @param {number | Pattern} frequency audible between 0 and 20000
-   * @synonyms cutoff, ctf, lp
+   * @synonyms cutoff
   * @example
   * s("bd sd,hh*3").lpf("<4000 2000 1000 500 200 100>")
-   * @example
-   * s("bd*8").lpf("1000:0 1000:10 1000:20 1000:30")
   *
   */
-  [['cutoff', 'resonance'], 'ctf', 'lpf', 'lp'],
+  ['f', 'lpf'],
+  ['f', 'cutoff', 'a pattern of numbers from 0 to 1. Applies the cutoff frequency of the low-pass filter.'],
  /**
   * Applies the cutoff frequency of the **h**igh-**p**ass **f**ilter.
   *
-   * When using mininotation, you can also optionally add the 'hpq' parameter, separated by ':'.
-   *
   * @name hpf
   * @param {number | Pattern} frequency audible between 0 and 20000
-   * @synonyms hp, hcutoff
+   * @synonyms hcutoff
   * @example
   * s("bd sd,hh*4").hpf("<4000 2000 1000 500 200 100>")
-   * @example
-   * s("bd sd,hh*4").hpf("<2000 2000:25>")
   *
   */
-  // currently an alias of 'hcutoff' https://github.com/tidalcycles/strudel/issues/496
-  // ['hpf'],
-  [['hcutoff', 'hresonance'], 'hpf', 'hp'],
+  ['f', 'hpf', ''],
+  ['f', 'hcutoff', ''],
  /**
   * Controls the **h**igh-**p**ass **q**-value.
   *
@@ -310,7 +317,8 @@ const generic_params = [
   * s("bd sd,hh*4").hpf(2000).hpq("<0 10 20 30>")
   *
   */
-  ['hresonance', 'hpq'],
+  ['f', 'hresonance', ''],
+  ['f', 'hpq', ''],
  /**
   * Controls the **l**ow-**p**ass **q**-value.
   *
@@ -321,8 +329,8 @@ const generic_params = [
   * s("bd sd,hh*4").lpf(2000).lpq("<0 10 20 30>")
   *
   */
-  // currently an alias of 'resonance' https://github.com/tidalcycles/strudel/issues/496
-  ['resonance', 'lpq'],
+  ['f', 'lpq'],
+  ['f', 'resonance', ''],
  /**
   * DJ filter, below 0.5 is low pass filter, above is high pass filter.
   *
@@ -332,48 +340,40 @@ const generic_params = [
   * n("0 3 7 [10,24]").s('superzow').octave(3).djf("<.5 .25 .5 .75>").osc()
   *
   */
-  ['djf'],
-  // ['cutoffegint'],
+  ['f', 'djf', 'DJ filter, below 0.5 is low pass filter, above is high pass filter.'],
+  // ['f', 'cutoffegint', ''],
  // TODO: does not seem to work
  /**
   * Sets the level of the delay signal.
   *
-   * When using mininotation, you can also optionally add the 'delaytime' and 'delayfeedback' parameter,
-   * separated by ':'.
-   *
-   *
   * @name delay
   * @param {number | Pattern} level between 0 and 1
   * @example
   * s("bd").delay("<0 .25 .5 1>")
-   * @example
-   * s("bd bd").delay("0.65:0.25:0.9 0.65:0.125:0.7")
   *
   */
-  [['delay', 'delaytime', 'delayfeedback']],
+  ['f', 'delay', 'a pattern of numbers from 0 to 1. Sets the level of the delay signal.'],
  /**
   * 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)
   *
   */
-  ['delayfeedback', 'delayfb', 'dfb'],
+  ['f', 'delayfeedback', 'a pattern of numbers from 0 to 1. Sets the amount of delay feedback.'],
  /**
   * 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)
   *
   */
-  ['delaytime', 'delayt', 'dt'],
+  ['f', 'delaytime', 'a pattern of numbers from 0 to 1. Sets the length of the delay.'],
  /* // TODO: test
   * Specifies whether delaytime is calculated relative to cps.
   *
@@ -383,19 +383,22 @@ const generic_params = [
   * s("sd").delay().lock(1).osc()
   *
   */
-  ['lock'],
+  [
+    '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.',
+  ],
  /**
   * 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()
   *
   */
-  ['detune', 'det'],
+  ['f', 'detune', ''],
  /**
   * Set dryness of reverb. See {@link room} and {@link size} for more information about reverb.
   *
@@ -406,7 +409,11 @@ const generic_params = [
   * @superdirtOnly
   *
   */
-  ['dry'],
+  [
+    'f',
+    'dry',
+    'when set to `1` will disable all reverb for this pattern. See `room` and `size` for more information about reverb.',
+  ],
  // 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.
@@ -417,9 +424,17 @@ const generic_params = [
   * s("oh*4").end(.1).fadeTime("<0 .2 .4 .8>").osc()
   *
   */
-  ['fadeTime', 'fadeOutTime'],
+  [
+    'f',
+    'fadeTime',
+    "Used when using begin/end or chop/striate and friends, to change the fade out time of the 'grain' envelope.",
+  ],
  // TODO: see above
-  ['fadeInTime'],
+  [
+    '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.',
+  ],
  /**
   * Set frequency of sound.
   *
@@ -431,15 +446,15 @@ const generic_params = [
   * freq("110".mul.out(".5 1.5 .6 [2 3]")).s("superzow").osc()
   *
   */
-  ['freq'],
+  ['f', 'freq', ''],
  // TODO: https://tidalcycles.org/docs/configuration/MIDIOSC/control-voltage/#gate
-  ['gate', 'gat'],
-  // ['hatgrain'],
-  // ['lagogo'],
-  // ['lclap'],
-  // ['lclaves'],
-  // ['lclhat'],
-  // ['lcrash'],
+  ['f', 'gate', ''],
+  // ['f', 'hatgrain', ''],
+  // ['f', 'lagogo', ''],
+  // ['f', 'lclap', ''],
+  // ['f', 'lclaves', ''],
+  // ['f', 'lclhat', ''],
+  // ['f', 'lcrash', ''],
  // TODO:
  // https://tidalcycles.org/docs/reference/audio_effects/#leslie-1
  // https://tidalcycles.org/docs/reference/audio_effects/#leslie
@@ -453,7 +468,7 @@ const generic_params = [
   * @superdirtOnly
   *
   */
-  ['leslie'],
+  ['f', 'leslie', ''],
  /**
   * Rate of modulation / rotation for leslie effect
   *
@@ -465,7 +480,7 @@ const generic_params = [
   *
   */
  // TODO: the rate seems to "lag" (in the example, 1 will be fast)
-  ['lrate'],
+  ['f', 'lrate', ''],
  /**
   * Physical size of the cabinet in meters. Be careful, it might be slightly larger than your computer. Affects the Doppler amount (pitch warble)
   *
@@ -476,28 +491,31 @@ const generic_params = [
   * @superdirtOnly
   *
   */
-  ['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'],
+  ['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)',
+  ],
  // TODO: the following doc is just a guess, it's not documented in tidal doc.
  /**
   * Sets the default octave of a synth.
@@ -508,9 +526,9 @@ const generic_params = [
   * n("0,4,7").s('supersquare').octave("<3 4 5 6>").osc()
   * @superDirtOnly
   */
-  ['octave'],
-  ['offset'], // TODO: what is this? not found in tidal doc
-  // ['ophatdecay'],
+  ['i', 'octave', ''],
+  ['f', 'offset', ''], // TODO: what is this? not found in tidal doc
+  // ['f', 'ophatdecay', ''],
  // TODO: example
  /**
   * An `orbit` is a global parameter context for patterns. Patterns with the same orbit will share the same global effects.
@@ -523,9 +541,13 @@ const generic_params = [
   *   s("~ sd").delay(.5).delaytime(.125).orbit(2)
   * )
   */
-  ['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
+  [
+    '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
  /**
   * Sets position in stereo.
   *
@@ -535,7 +557,11 @@ const generic_params = [
   * s("[bd hh]*2").pan("<.5 1 .5 0>")
   *
   */
-  ['pan'],
+  [
+    'f',
+    'pan',
+    'a pattern of numbers between 0 and 1, from left to right (assuming stereo), once round a circle (assuming multichannel)',
+  ],
  // TODO: this has no effect (see example)
  /*
   * Controls how much multichannel output is fanned out
@@ -546,7 +572,11 @@ const generic_params = [
   * s("[bd hh]*2").pan("<.5 1 .5 0>").panspan("<0 .5 1>").osc()
   *
   */
-  ['panspan'],
+  [
+    'f',
+    'panspan',
+    'a pattern of numbers between -inf and inf, which controls how much multichannel output is fanned out (negative is backwards ordering)',
+  ],
  // TODO: this has no effect (see example)
  /*
   * Controls how much multichannel output is spread
@@ -557,42 +587,50 @@ const generic_params = [
   * s("[bd hh]*2").pan("<.5 1 .5 0>").pansplay("<0 .5 1>").osc()
   *
   */
-  ['pansplay'],
-  ['panwidth'],
-  ['panorient'],
-  // ['pitch1'],
-  // ['pitch2'],
-  // ['pitch3'],
-  // ['portamento'],
+  [
+    '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', ''],
  // TODO: LFO rate see https://tidalcycles.org/docs/patternlib/tutorials/synthesizers/#supersquare
-  ['rate'],
+  ['f', 'rate', "used in SuperDirt softsynths as a control rate or 'speed'"],
  // TODO: slide param for certain synths
-  ['slide'],
+  ['f', 'slide', ''],
  // TODO: detune? https://tidalcycles.org/docs/patternlib/tutorials/synthesizers/#supersquare
-  ['semitone'],
+  ['f', 'semitone', ''],
  // TODO: dedup with synth param, see https://tidalcycles.org/docs/reference/synthesizers/#superpiano
-  // ['velocity'],
-  ['voice'], // TODO: synth param
+  // ['f', 'velocity', ''],
+  ['f', 'voice', ''], // TODO: synth param
  /**
   * Sets the level of reverb.
   *
-   * When using mininotation, you can also optionally add the 'size' parameter, separated by ':'.
-   *
   * @name room
   * @param {number | Pattern} level between 0 and 1
   * @example
   * s("bd sd").room("<0 .2 .4 .6 .8 1>")
-   * @example
-   * s("bd sd").room("<0.9:1 0.9:4>")
   *
   */
-  [['room', 'size']],
+  ['f', 'room', 'a pattern of numbers from 0 to 1. Sets the level of reverb.'],
  /**
   * 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>")
   *
@@ -600,11 +638,20 @@ 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?
-  ['size', 'sz', 'roomsize'],
-  // ['sagogo'],
-  // ['sclap'],
-  // ['sclaves'],
-  // ['scrash'],
+  [
+    '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', ''],
  /**
   * Wave shaping distortion. CAUTION: it might get loud
   *
@@ -614,7 +661,11 @@ const generic_params = [
   * s("bd sd,hh*4").shape("<0 .2 .4 .6 .8>")
   *
   */
-  ['shape'],
+  [
+    'f',
+    'shape',
+    'wave shaping distortion, a pattern of numbers from 0 for no distortion up to 1 for loads of distortion.',
+  ],
  /**
   * Changes the speed of sample playback, i.e. a cheap way of changing pitch.
   *
@@ -626,7 +677,11 @@ const generic_params = [
   * speed("1 1.5*2 [2 1.1]").s("piano").clip(1)
   *
   */
-  ['speed'],
+  [
+    '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!',
+  ],
  /**
   * 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`.
   *
@@ -637,7 +692,11 @@ const generic_params = [
   * @superdirtOnly
   *
   */
-  ['unit'],
+  [
+    '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`.',
+  ],
  /**
   * Made by Calum Gunn. Reminiscent of some weird mixture of filter, ring-modulator and pitch-shifter. The SuperCollider manual defines Squiz as:
   *
@@ -650,14 +709,14 @@ const generic_params = [
   * @superdirtOnly
   *
   */
-  ['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'],
+  ['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', ''],
  // TODO: Use a rest (~) to override the effect <- vowel
  /**
   *
@@ -670,7 +729,11 @@ const generic_params = [
   * .vowel("<a e i <o u>>")
   *
   */
-  ['vowel'],
+  [
+    '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.',
+  ],
  /* // 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:
   *
@@ -681,12 +744,12 @@ const generic_params = [
   *
   * @name waveloss
   */
-  ['waveloss'],
+  ['f', 'waveloss', ''],
  // TODO: midi effects?
-  ['dur'],
-  // ['modwheel'],
-  ['expression'],
-  ['sustainpedal'],
+  ['f', 'dur', ''],
+  // ['f', 'modwheel', ''],
+  ['f', 'expression', ''],
+  ['f', 'sustainpedal', ''],
  /* // TODO: doesn't seem to do anything
   *
   * Tremolo Audio DSP effect
@@ -697,130 +760,97 @@ const generic_params = [
   * n("0,4,7").tremolodepth("<0 .3 .6 .9>").osc()
   *
   */
-  ['tremolodepth', 'tremdp'],
-  ['tremolorate', 'tremr'],
+  // 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'"],
  // TODO: doesn't seem to do anything
-  ['phaserdepth', 'phasdp'],
-  ['phaserrate', 'phasr'],
+  ['f', 'phaserdepth', "Phaser Audio DSP effect | params are 'phaserrate' and 'phaserdepth'"],
+  ['f', 'phaserrate', "Phaser Audio DSP effect | params are 'phaserrate' and 'phaserdepth'"],

-  ['fshift'],
-  ['fshiftnote'],
-  ['fshiftphase'],
+  ['f', 'fshift', 'frequency shifter'],
+  ['f', 'fshiftnote', 'frequency shifter'],
+  ['f', 'fshiftphase', 'frequency shifter'],

-  ['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'],
+  ['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', ''],
  /**
-   * Multiplies the duration with the given number. Also cuts samples off at the end if they exceed the duration.
-   * In tidal, this would be done with legato, [which has a complicated history in strudel](https://github.com/tidalcycles/strudel/issues/111).
-   * For now, if you're coming from tidal, just think clip = legato.
+   * 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)
   *
   * @name clip
-   * @param {number | Pattern} factor >= 0
+   * @param {number | Pattern} active 1 or 0
   * @example
-   * note("c a f e").s("piano").clip("<.5 1 2>")
+   * note("c a f e ~").s("piano").clip(1)
   *
   */
-  ['clip'],
+  ['f', 'clip', ''],
 ];

 // TODO: slice / splice https://www.youtube.com/watch?v=hKhPdO0RKDQ&list=PL2lW1zNIIwj3bDkh-Y3LUGDuRcoUigoDs&index=13

-controls.createParam = function (names) {
-  const name = Array.isArray(names) ? names[0] : names;
-
-  var withVal;
-  if (Array.isArray(names)) {
-    withVal = (xs) => {
-      if (Array.isArray(xs)) {
-        const result = {};
-        xs.forEach((x, i) => {
-          if (i < names.length) {
-            result[names[i]] = x;
-          }
-        });
-        return result;
-      } else {
-        return { [name]: xs };
-      }
-    };
-  } else {
-    withVal = (x) => ({ [name]: x });
-  }
-
-  const func = (...pats) => sequence(...pats).withValue(withVal);
-
+const makeControl = function (name) {
+  const func = (...pats) => sequence(...pats).withValue((x) => ({ [name]: x }));
  const setter = function (...pats) {
    if (!pats.length) {
-      return this.fmap(withVal);
+      return this.fmap((value) => ({ [name]: value }));
    }
    return this.set(func(...pats));
  };
  Pattern.prototype[name] = setter;
+  registerControl(name, func);
  return func;
 };

-generic_params.forEach(([names, ...aliases]) => {
-  const name = Array.isArray(names) ? names[0] : names;
-  controls[name] = controls.createParam(names);
-
-  aliases.forEach((alias) => {
-    controls[alias] = controls[name];
-    Pattern.prototype[alias] = Pattern.prototype[name];
-  });
+generic_params.forEach(([type, name, description]) => {
+  controls[name] = makeControl(name);
 });

+// create custom param
+controls.createParam = (name) => {
+  return makeControl(name);
+};
+
 controls.createParams = (...names) =>
  names.reduce((acc, name) => Object.assign(acc, { [name]: controls.createParam(name) }), {});

-controls.adsr = register('adsr', (adsr, pat) => {
-  adsr = !Array.isArray(adsr) ? [adsr] : adsr;
-  const [attack, decay, sustain, release] = adsr;
-  return pat.set({ attack, decay, sustain, release });
-});
-controls.ds = register('ds', (ds, pat) => {
-  ds = !Array.isArray(ds) ? [ds] : ds;
-  const [decay, sustain] = ds;
-  return pat.set({ decay, sustain });
-});
-
 export default controls;
@@ -10,49 +10,44 @@ import { logger } from './logger.mjs';
 export class Cyclist {
  constructor({ interval, onTrigger, onToggle, onError, getTime, latency = 0.1 }) {
    this.started = false;
-    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.cps = 1; // TODO
+    this.phase = 0;
+    this.getTime = getTime;
    this.onToggle = onToggle;
-    this.latency = latency; // fixed trigger time offset
+    this.latency = latency;
    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 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;
-
+          const haps = this.pattern.queryArc(begin, end); // get Haps
          haps.forEach((hap) => {
            if (hap.part.begin.equals(hap.whole.begin)) {
-              const deadline = (hap.whole.begin - begin) / this.cps + tickdeadline + latency;
-              const duration = hap.duration / this.cps;
-              onTrigger?.(hap, deadline, duration, this.cps);
+              const deadline = hap.whole.begin + this.origin - time + latency;
+              const duration = hap.duration * 1;
+              onTrigger?.(hap, deadline, duration);
            }
          });
        } 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() {
-    const secondsSinceLastTick = this.getTime() - this.lastTick - this.clock.duration;
-    return this.lastBegin + secondsSinceLastTick * this.cps; // + this.clock.minLatency;
+    return this.getTime() - this.origin + this.clock.minLatency;
  }
  setStarted(v) {
    this.started = v;
@@ -74,7 +69,6 @@ export class Cyclist {
  stop() {
    logger('[cyclist] stop');
    this.clock.stop();
-    this.lastEnd = 0;
    this.setStarted(false);
  }
  setPattern(pat, autostart = false) {
@@ -1,6 +1,6 @@
 /*
 draw.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/draw.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/tone/draw.mjs>
 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/>.
 */

@@ -13,7 +13,7 @@ export const getDrawContext = (id = 'test-canvas') => {
    canvas.id = id;
    canvas.width = window.innerWidth;
    canvas.height = window.innerHeight;
-    canvas.style = 'pointer-events:none;width:100%;height:100%;position:fixed;top:0;left:0';
+    canvas.style = 'pointer-events:none;width:100%;height:100%;position:fixed;top:0;left:0;z-index:5';
    document.body.prepend(canvas);
  }
  return canvas.getContext('2d');
@@ -65,97 +65,3 @@ Pattern.prototype.onPaint = function (onPaint) {
  this.context = { onPaint };
  return this;
 };
-
-// const round = (x) => Math.round(x * 1000) / 1000;
-
-// encapsulates starting and stopping animation frames
-export class Framer {
-  constructor(onFrame, onError) {
-    this.onFrame = onFrame;
-    this.onError = onError;
-  }
-  start() {
-    const self = this;
-    let frame = requestAnimationFrame(function updateHighlights(time) {
-      try {
-        self.onFrame(time);
-      } catch (err) {
-        self.onError(err);
-      }
-      frame = requestAnimationFrame(updateHighlights);
-    });
-    self.cancel = () => {
-      cancelAnimationFrame(frame);
-    };
-  }
-  stop() {
-    if (this.cancel) {
-      this.cancel();
-    }
-  }
-}
-
-// syncs animation frames to a cyclist scheduler
-// see vite-vanilla-repl-cm6 for an example
-export class Drawer {
-  constructor(onDraw, drawTime) {
-    let [lookbehind, lookahead] = drawTime; // e.g. [-2, 2]
-    lookbehind = Math.abs(lookbehind);
-    this.visibleHaps = [];
-    this.lastFrame = null;
-    this.drawTime = drawTime;
-    this.framer = new Framer(
-      () => {
-        if (!this.scheduler) {
-          console.warn('Drawer: no scheduler');
-          return;
-        }
-        // calculate current frame time (think right side of screen for pianoroll)
-        const phase = this.scheduler.now() + lookahead;
-        // first frame just captures the phase
-        if (this.lastFrame === null) {
-          this.lastFrame = phase;
-          return;
-        }
-        // query haps from last frame till now. take last 100ms max
-        const haps = this.scheduler.pattern.queryArc(Math.max(this.lastFrame, phase - 1 / 10), phase);
-        this.lastFrame = phase;
-        this.visibleHaps = (this.visibleHaps || [])
-          // filter out haps that are too far in the past (think left edge of screen for pianoroll)
-          .filter((h) => h.whole.end >= phase - lookbehind - lookahead)
-          // add new haps with onset (think right edge bars scrolling in)
-          .concat(haps.filter((h) => h.hasOnset()));
-        const time = phase - lookahead;
-        onDraw(this.visibleHaps, time, this);
-      },
-      (err) => {
-        console.warn('draw error', err);
-      },
-    );
-  }
-  invalidate(scheduler = this.scheduler) {
-    if (!scheduler) {
-      return;
-    }
-    this.scheduler = scheduler;
-    const t = scheduler.now();
-    let [_, lookahead] = this.drawTime;
-    const [begin, end] = [Math.max(t, 0), t + lookahead + 0.1];
-    // remove all future haps
-    this.visibleHaps = this.visibleHaps.filter((h) => h.whole.begin < t);
-    // query future haps
-    const futureHaps = scheduler.pattern.queryArc(begin, end); // +0.1 = workaround for weird holes in query..
-    // append future haps
-    this.visibleHaps = this.visibleHaps.concat(futureHaps);
-  }
-  start(scheduler) {
-    this.scheduler = scheduler;
-    this.invalidate();
-    this.framer.start();
-  }
-  stop() {
-    if (this.framer) {
-      this.framer.stop();
-    }
-  }
-}
@@ -11,9 +11,15 @@ 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, splitAt, zipWith } from './util.mjs';
+import { rotate, flatten } 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;
@@ -6,7 +6,12 @@ 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) => {
@@ -37,6 +42,9 @@ 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
  }
@@ -1,24 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-node_modules
-dist
-dist-ssr
-*.local
-
-# Editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea
-.DS_Store
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
@@ -1,8 +0,0 @@
-# vite-vanilla-repl-cm6
-
-This folder demonstrates how to set up a strudel repl using vite and vanilla JS + codemirror. Run it using:
-
-```sh
-npm i
-npm run dev
-```
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite Vanilla Strudel REPL</title>
-  </head>
-  <body>
-    <main>
-      <nav>
-        <button id="play">eval</button>
-        <button id="stop">stop</button>
-      </nav>
-      <div class="container">
-        <div id="editor"></div>
-        <div id="output"></div>
-      </div>
-      <canvas id="roll"></canvas>
-    </main>
-    <script type="module" src="./main.js"></script>
-  </body>
-</html>
@@ -1,39 +0,0 @@
-import { StrudelMirror } from '@strudel/codemirror';
-import { funk42 } from './tunes';
-import { drawPianoroll, evalScope, controls } from '@strudel.cycles/core';
-import './style.css';
-import { initAudioOnFirstClick } from '@strudel.cycles/webaudio';
-import { transpiler } from '@strudel.cycles/transpiler';
-import { getAudioContext, webaudioOutput, registerSynthSounds } from '@strudel.cycles/webaudio';
-import { registerSoundfonts } from '@strudel.cycles/soundfonts';
-
-// init canvas
-const canvas = document.getElementById('roll');
-canvas.width = canvas.width * 2;
-canvas.height = canvas.height * 2;
-const drawContext = canvas.getContext('2d');
-const drawTime = [-2, 2]; // time window of drawn haps
-
-const editor = new StrudelMirror({
-  defaultOutput: webaudioOutput,
-  getTime: () => getAudioContext().currentTime,
-  transpiler,
-  root: document.getElementById('editor'),
-  initialCode: funk42,
-  drawTime,
-  onDraw: (haps, time) => drawPianoroll({ haps, time, ctx: drawContext, drawTime, fold: 0 }),
-  prebake: async () => {
-    initAudioOnFirstClick(); // needed to make the browser happy (don't await this here..)
-    const loadModules = evalScope(
-      controls,
-      import('@strudel.cycles/core'),
-      import('@strudel.cycles/mini'),
-      import('@strudel.cycles/tonal'),
-      import('@strudel.cycles/webaudio'),
-    );
-    await Promise.all([loadModules, registerSynthSounds(), registerSoundfonts()]);
-  },
-});
-
-document.getElementById('play').addEventListener('click', () => editor.evaluate());
-document.getElementById('stop').addEventListener('click', () => editor.stop());
@@ -1,23 +0,0 @@
-{
-  "name": "vite-vanilla-repl-cm6",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "preview": "vite preview"
-  },
-  "devDependencies": {
-    "vite": "^4.3.2"
-  },
-  "dependencies": {
-    "@strudel/codemirror": "workspace:*",
-    "@strudel.cycles/core": "workspace:*",
-    "@strudel.cycles/mini": "workspace:*",
-    "@strudel.cycles/soundfonts": "workspace:*",
-    "@strudel.cycles/tonal": "workspace:*",
-    "@strudel.cycles/transpiler": "workspace:*",
-    "@strudel.cycles/webaudio": "workspace:*"
-  }
-}
@@ -1,31 +0,0 @@
-body,
-html {
-  margin: 0;
-  height: 100%;
-  background: #282c34;
-}
-
-main {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-}
-
-.container {
-  flex-grow: 1;
-  max-height: 100%;
-  position: relative;
-  overflow: auto;
-}
-
-#editor {
-  overflow: auto;
-}
-
-.cm-editor {
-  height: 100%;
-}
-
-#roll {
-  height: 300px;
-}
@@ -1,112 +0,0 @@
-export const bumpStreet = `// froos - "22 bump street", licensed with CC BY-NC-SA 4.0
-await samples('github:felixroos/samples/main')
-await samples('https://strudel.tidalcycles.org/tidal-drum-machines.json', 'github:ritchse/tidal-drum-machines/main/machines/')
-
-"<[0,<6 7 9>,13,<17 20 22 26>]!2>/2"
-  // make it 22 edo
-  .fmap(v => Math.pow(2,v/22))
-  // mess with the base frequency
-  .mul("<300 [300@3 200]>/8").freq()
-  .layer(
-    // chords
-    x=>x.div(freq(2)).s("flute").euclidLegato("<3 2>",8)
-      .shape(.4).lpf(sine.range(800,4000).slow(8)),
-    // adlibs
-    x=>x.arp("{0 3 2 [1 3]}%1.5")
-      .s('xylo').mul(freq(2))
-      .delay(.5).delayfeedback(.4).juxBy(.5, rev)
-      .hpf(sine.range(200,3000).slow(8)),
-    // bass
-    x=>x.arp("[0 [2 1?]](5,8)").s('sawtooth').div(freq(4))
-      .lpf(sine.range(400,2000).slow(8)).lpq(8).shape(.4)
-      .off(1/8, x=>x.mul(freq(2)).degradeBy(.5)).gain(.3)
-  ).clip(1).release(.2)
-.stack(
-  // drums
-  s("bd sd:<2 1>, [~ hh]*2, [~ rim]").bank('RolandTR909')
-  .off(1/8, x=>x.speed(2).gain(.4)).sometimes(ply(2)).gain(.8)
-  .mask("<0@4 1@12>/4")
-  .reset("<x@15 [x(3,8) x*[4 8]]>")
-  // wait for it...
-).fast(2/3)
-  //.crush(6) // remove "//" if you dare`;
-
-export const trafficFlam = `// froos - "traffic flam", licensed with CC BY-NC-SA 4.0
-
-await samples('github:felixroos/samples/main')
-await samples('https://strudel.tidalcycles.org/tidal-drum-machines.json', 'github:ritchse/tidal-drum-machines/main/machines/')
-
-addVoicings('hip', {
-  m11: ['2M 3m 4P 7m'],
-  '^7#11': ['3M 4A 5P 7M'],
-}, ['C4', 'C6'])
-
-stack(
-  stack(
-    "<Bbm11 A^7#11>/2".voicings('hip').note()
-    .s("gm_epiano1:2")
-    .arp("[<[0 1 2 3] [3 2 1 0]> ~@5]/2")
-    .release(2).late(.25).lpf(2000),
-    "<Bb1 A1>/2".note().s('gm_acoustic_bass'),
-    n("<0 2 3>(3,8)".off(1/8, add(4)))
-    .scale("<Bb4:minor A4:lydian>/2")
-    .s('gm_electric_guitar_jazz')
-    .decay(sine.range(.05, .2).slow(32)).sustain(0)
-    .delay(.5).lpf(sine.range(100,5000).slow(64))
-    .gain(.7).room(.5).pan(sine.range(0,1).slow(11))
-  ).add(perlin.range(0,.25).note()),
-  stack(
-    s("bd:1(3,8) rim").bank('RolandTR707').slow(2).room("<0 <.1 .6>>")
-    .when("<0@7 1>",x=>x.echoWith(3, .0625, (x,i) => x.speed(1+i*.24))),
-    s("rim*4").end(.05).bank('RolandTR808').speed(.8).room(.2)
-  )
-)
-  .late("[0 .05]*2").late(12)
-
-`;
-
-export const funk42 = `// froos - how to funk in 42 lines of code
-// adapted from "how to funk in two minutes" by marc rebillet https://www.youtube.com/watch?v=3vBwRfQbXkg
-// thanks to peach for the transcription: https://www.youtube.com/watch?v=8eiPXvIgda4
-
-await samples('github:felixroos/samples/main')
-await samples('https://strudel.tidalcycles.org/tidal-drum-machines.json', 'github:ritchse/tidal-drum-machines/main/machines/')
-
-setcps(.5)
-
-let drums = stack(
-  s("bd*2, ~ sd").bank('RolandTR707').room("0 .1"),
-  s("hh*4").begin(.2).release(.02).end(.25).release(.02)
-  .gain(.3).bank('RolandTR707').late(.02).room(.5),
-  //s("shaker_small").struct("[x x*2]*2").speed(".8,.9").release(.02)
-).fast(2)
-
-let wurli = note(\`<
-[[a2,g3,[b3 c4],e4] ~ [g3,c4,e4](3,8)@4 ~@2]!3 
-[[e2,e3,a3,b3,e4]@3 [e2,e3,ab3,b3,e4]@5]>\`)
-  .s("gm_epiano1:5").decay(.2).sustain("<[1 0@7]!3 1>")
-  .gain("<[.8@2 .4@14]!3 .7>").room(.3)
-
-let organ = note("<[~@3 [a3,d4,f#4]@2 [[a3,c4,e4]@2 ~] ~@2]!3 ~>".add(12))
-    .s("gm_percussive_organ:2").gain(.6).lpf(1800).pan(.2).room(.3);
-
-let clav = note(\`<
-[~@3 a2 [g3,[b3 c4],e4]@2 ~ a2 [g3,b3,e4] ~@2 [g3,c4,e4] ~@4]!3
-[~@3 e3 [[a3 b3],c3,e3]@2 ~ e2 [e3,a3]@3 [b3,e3] ~@2 [b3,e3]@2]>\`)
-  .s("gm_clavinet:1").decay("<.25!3 [.25 .4]>").sustain(0)
-  .gain(.7).pan(.8).room(.2);
-
-let bass = note(\`<
-[a1 [~ [g2 a2]] [g1 g#1] [a1 [g2 a2]]] 
-[a1 [~ [g2 a2]] [e3 d3] [c3 [g3 a3]]] 
-[a1 [~ [g2 a2]] [g1 g#1] [a1 [g2 a2]]] 
-[e2@6 e1@5 e1 [[d2 e3] g1]@4]
->\`).s("gm_electric_bass_pick:1").release(.1)
-
-stack(
-  drums
-  ,wurli
-  ,organ
-  ,clav
-  ,bass
-)`;
@@ -6,3 +6,5 @@ This folder demonstrates how to set up a strudel repl using vite and vanilla JS.
 npm i
 npm run dev
 ```
+
+or view it [live on githack](https://rawcdn.githack.com/tidalcycles/strudel/5fb36acb046ead7cd6ad3cd10f532e7f585f536a/packages/core/examples/vite-vanilla-repl/dist/index.html)
@@ -10,7 +10,7 @@
    "preview": "vite preview"
  },
  "devDependencies": {
-    "vite": "^4.3.3"
+    "vite": "^3.2.0"
  },
  "dependencies": {
    "@strudel.cycles/core": "workspace:*",
@@ -32,11 +32,7 @@ export class Hap {
  }

  get duration() {
-    return this.whole.end.sub(this.whole.begin).mul(typeof this.value?.clip === 'number' ? this.value?.clip : 1);
-  }
-
-  get endClipped() {
-    return this.whole.begin.add(this.duration);
+    return this.whole.end.sub(this.whole.begin);
  }

  wholeOrPart() {
@@ -130,19 +126,6 @@ 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;
@@ -18,13 +18,11 @@ export * from './util.mjs';
 export * from './speak.mjs';
 export * from './evaluate.mjs';
 export * from './repl.mjs';
-export * from './cyclist.mjs';
 export * from './logger.mjs';
 export * from './time.mjs';
 export * from './draw.mjs';
 export * from './animate.mjs';
 export * from './pianoroll.mjs';
-export * from './spiral.mjs';
 export * from './ui.mjs';
 export { default as drawLine } from './drawLine.mjs';
 export { default as gist } from './gist.js';
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/core",
-  "version": "0.8.2",
+  "version": "0.6.8",
  "description": "Port of Tidal Cycles to JavaScript",
  "main": "index.mjs",
  "type": "module",
@@ -35,7 +35,7 @@
  },
  "gitHead": "0e26d4e741500f5bae35b023608f062a794905c2",
  "devDependencies": {
-    "vite": "^4.3.3",
-    "vitest": "^0.28.0"
+    "vite": "^3.2.2",
+    "vitest": "^0.25.7"
  }
 }
@@ -21,6 +21,141 @@ 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 {
  /**
@@ -643,7 +778,9 @@ export class Pattern {
   * @noAutocomplete
   */
  get firstCycleValues() {
-    return this.firstCycle().map((hap) => hap.value);
+    return this.sortHapsByPart()
+      .firstCycle()
+      .map((hap) => hap.value);
  }

  /**
@@ -693,7 +830,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();
@@ -840,7 +977,7 @@ export class Pattern {
 }

 //////////////////////////////////////////////////////////////////////
-// functions relating to chords/patterns of lists/lists of patterns
+// functions relating to chords/patterns of lists

 // returns Array<Hap[]> where each list of haps satisfies eq
 function groupHapsBy(eq, haps) {
@@ -860,11 +997,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
-Pattern.prototype.collect = function () {
+addToPrototype('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.
@@ -872,12 +1009,12 @@ Pattern.prototype.collect = function () {
 * note("<[c,eb,g]!2 [c,f,ab] [d,f,ab]>")
 * .arpWith(haps => haps[2])
 * */
-Pattern.prototype.arpWith = function (func) {
+addToPrototype('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.
@@ -885,39 +1022,10 @@ Pattern.prototype.arpWith = function (func) {
 * note("<[c,eb,g]!2 [c,f,ab] [d,f,ab]>")
 * .arp("0 [0,2] 1 [0,2]").slow(2)
 * */
-Pattern.prototype.arp = function (pat) {
+addToPrototype('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

@@ -1014,15 +1122,15 @@ function _composeOp(a, b, func) {
    func: [(a, b) => b(a)],
  };

-  const hows = ['In', 'Out', 'Mix', 'Squeeze', 'SqueezeOut', 'Trig', 'Trigzero'];
+  const hows = alignments.map((x) => x.charAt(0).toUpperCase() + x.slice(1));

  // 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
-    Pattern.prototype['_' + what] = function (value) {
+    addToPrototype('_' + what, function (value) {
      return this.fmap((x) => op(x, value));
-    };
+    });

    // make patternified monster version
    Object.defineProperty(Pattern.prototype, what, {
@@ -1036,7 +1144,7 @@ function _composeOp(a, b, func) {

        // add methods to that function for each behaviour
        for (const how of hows) {
-          wrapper[how.toLowerCase()] = function (...other) {
+          const howfunc = function (...other) {
            var howpat = pat;
            other = sequence(other);
            if (preprocess) {
@@ -1054,19 +1162,41 @@ 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;
      },
    });

-    // 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);
-      };
-    }
+    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);
  }

  // binary composers
@@ -1078,36 +1208,36 @@ function _composeOp(a, b, func) {
   *   .struct("x ~ x ~ ~ x ~ x ~ ~ ~ x ~ x ~ ~")
   *   .slow(4)
   */
-  Pattern.prototype.struct = function (...args) {
+  addToPrototype('struct', function (...args) {
    return this.keepif.out(...args);
-  };
-  Pattern.prototype.structAll = function (...args) {
+  });
+  addToPrototype('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)
   */
-  Pattern.prototype.mask = function (...args) {
+  addToPrototype('mask', function (...args) {
    return this.keepif.in(...args);
-  };
-  Pattern.prototype.maskAll = function (...args) {
+  });
+  addToPrototype('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)>")
   */
-  Pattern.prototype.reset = function (...args) {
+  addToPrototype('reset', function (...args) {
    return this.keepif.trig(...args);
-  };
-  Pattern.prototype.resetAll = function (...args) {
+  });
+  addToPrototype('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.
@@ -1115,20 +1245,18 @@ function _composeOp(a, b, func) {
   * @example
   * s("<bd lt> sd, hh*4").restart("<x@3 x(3,8)>")
   */
-  Pattern.prototype.restart = function (...args) {
+  addToPrototype('restart', function (...args) {
    return this.keepif.trigzero(...args);
-  };
-  Pattern.prototype.restartAll = function (...args) {
+  });
+  addToPrototype('restartAll', function (...args) {
    return this.keep.trigzero(...args);
-  };
+  });
 })();

 // aliases
 export const polyrhythm = stack;
 export const pr = stack;

-export const pm = polymeter;
-
 // methods that create patterns, which are added to patternified Pattern methods
 // TODO: remove? this is only used in old transpiler (shapeshifter)
 Pattern.prototype.factories = {
@@ -1286,20 +1414,6 @@ export function timeCat(...timepats) {
  return stack(...pats);
 }

-/**
- * Allows to arrange multiple patterns together over multiple cycles.
- * Takes a variable number of arrays with two elements specifying the number of cycles and the pattern to use.
- *
- * @return {Pattern}
- * @example
- * arrange([4, "<c a f e>(3,8)"],[2, "<g a>(5,8)"]).note()
- */
-export function arrange(...sections) {
-  const total = sections.reduce((sum, [cycles]) => sum + cycles, 0);
-  sections = sections.map(([cycles, section]) => [cycles, section.fast(cycles)]);
-  return timeCat(...sections).slow(total);
-}
-
 export function fastcat(...pats) {
  return slowcat(...pats)._fast(pats.length);
 }
@@ -1376,36 +1490,73 @@ export function polymeter(...args) {
  return polymeterSteps(0, ...args);
 }

-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));
+// alias
+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;
+};

 // operators
-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));
+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');

 /**
 * Registers a new pattern method. The method is added to the Pattern class + the standalone function is returned from register.
@@ -1415,45 +1566,44 @@ export const func = curry((a, b) => reify(b).func(a));
 * @noAutocomplete
 *
 */
-export function register(name, func, patternify = true) {
+export function register(name, func) {
  if (Array.isArray(name)) {
    const result = {};
    for (const name_item of name) {
-      result[name_item] = register(name_item, func, patternify);
+      result[name_item] = register(name_item, func);
    }
    return result;
  }
  const arity = func.length;
-  var pfunc; // the patternified function

-  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();
+  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);
    };
-  } else {
-    pfunc = function (...args) {
-      args = args.map(reify);
-      return func(...args);
-    };
-  }
+    mapFn = curryPattern(mapFn, arity - 1);
+
+    const app = (acc, p) => acc.appLeft(p);
+    const start = left.fmap(mapFn);
+
+    return right.reduce(app, start).innerJoin();
+  };

  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) {
@@ -1461,7 +1611,6 @@ export function register(name, func, patternify = true) {
    } 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);
  };

@@ -1475,7 +1624,7 @@ export function register(name, func, patternify = true) {

  // toplevel functions get curried as well as patternified
  // because pfunc uses spread args, we need to state the arity explicitly!
-  return curry(pfunc, null, arity);
+  return curryPattern(pfunc, arity);
 }

 //////////////////////////////////////////////////////////////////////
@@ -1582,24 +1731,6 @@ export const range2 = register('range2', function (min, max, pat) {
  return pat.fromBipolar()._range(min, max);
 });

-/**
- * Allows dividing numbers via list notation using ":".
- * Returns a new pattern with just numbers.
- * @name ratio
- * @memberof Pattern
- * @returns Pattern
- * @example
- * ratio("1, 5:4, 3:2").mul(110).freq().s("piano").slow(2)
- */
-export const ratio = register('ratio', (pat) =>
-  pat.fmap((v) => {
-    if (!Array.isArray(v)) {
-      return v;
-    }
-    return v.slice(1).reduce((acc, n) => acc / n, v[0]);
-  }),
-);
-
 //////////////////////////////////////////////////////////////////////
 // Structural and temporal transformations

@@ -1695,9 +1826,6 @@ export const ply = register('ply', function (factor, pat) {
 * s("<bd sd> hh").fast(2) // s("[<bd sd> hh]*2")
 */
 export const { fast, density } = register(['fast', 'density'], function (factor, pat) {
-  if (factor === 0) {
-    return silence;
-  }
  factor = Fraction(factor);
  const fastQuery = pat.withQueryTime((t) => t.mul(factor));
  return fastQuery.withHapTime((t) => t.div(factor));
@@ -1724,9 +1852,6 @@ export const hurry = register('hurry', function (r, pat) {
 * s("<bd sd> hh").slow(2) // s("[<bd sd> hh]/2")
 */
 export const { slow, sparsity } = register(['slow', 'sparsity'], function (factor, pat) {
-  if (factor === 0) {
-    return silence;
-  }
  return pat._fast(Fraction(1).div(factor));
 });

@@ -2053,7 +2178,7 @@ export const jux = register('jux', function (func, pat) {
 * @example
 * "<0 [2 4]>"
 * .echoWith(4, 1/8, (p,n) => p.add(n*2))
- * .scale('C minor').note().clip(.2)
+ * .scale('C minor').note().legato(.2)
 */
 export const { echoWith, echowith, stutWith, stutwith } = register(
  ['echoWith', 'echowith', 'stutWith', 'stutwith'],
@@ -2203,7 +2328,6 @@ export const velocity = register('velocity', function (velocity, pat) {
 /**
 *
 * Multiplies the hap duration with the given factor.
- * With samples, `clip` might be a better function to use ([more info](https://github.com/tidalcycles/strudel/pull/598))
 * @name legato
 * @memberof Pattern
 * @example
@@ -2266,65 +2390,7 @@ 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)
- */
-
-export 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)
- */
-
-export 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
-);
-
-// this function will be redefined in repl.mjs to use the correct cps value.
-// It is still here to work in cases where repl.mjs is not used
-
-export const { loopAt, loopat } = register(['loopAt', 'loopat'], function (factor, pat) {
+const { loopAt, loopat } = register(['loopAt', 'loopat'], function (factor, pat) {
  return _loopAt(factor, pat, 1);
 });

@@ -2341,6 +2407,6 @@ export const { loopAt, loopat } = register(['loopAt', 'loopat'], function (facto
 * s("rhodes").loopAtCps(4,1.5).cps(1.5)
 */
 // TODO - global cps clock
-export const { loopAtCps, loopatcps } = register(['loopAtCps', 'loopatcps'], function (factor, cps, pat) {
+const { loopAtCps, loopatcps } = register(['loopAtCps', 'loopatcps'], function (factor, cps, pat) {
  return _loopAt(factor, pat, cps);
 });
@@ -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, noteToMidi, getDrawContext, freqToMidi, isNote } from './index.mjs';
+import { Pattern, toMidi, getDrawContext, freqToMidi, isNote } from './index.mjs';

 const scale = (normalized, min, max) => normalized * (max - min) + min;
 const getValue = (e) => {
@@ -18,7 +18,7 @@ const getValue = (e) => {
  }
  note = note ?? n;
  if (typeof note === 'string') {
-    return noteToMidi(note);
+    return toMidi(note);
  }
  if (typeof note === 'number') {
    return note;
@@ -50,7 +50,6 @@ Pattern.prototype.pianoroll = function ({
  timeframe: timeframeProp,
  fold = 0,
  vertical = 0,
-  labels = 0,
 } = {}) {
  const ctx = getDrawContext();
  const w = ctx.canvas.width;
@@ -83,12 +82,12 @@ Pattern.prototype.pianoroll = function ({
        ctx.fillRect(0, 0, w, h);
      }
      const inFrame = (event) =>
-        (!hideNegative || event.whole.begin >= 0) && event.whole.begin <= t + to && event.endClipped >= t + from;
+        (!hideNegative || event.whole.begin >= 0) && event.whole.begin <= t + to && event.whole.end >= t + from;
      events.filter(inFrame).forEach((event) => {
-        const isActive = event.whole.begin <= t && event.endClipped > t;
+        const isActive = event.whole.begin <= t && event.whole.end > t;
        ctx.fillStyle = event.context?.color || inactive;
        ctx.strokeStyle = event.context?.color || active;
-        ctx.globalAlpha = event.context.velocity ?? event.value?.gain ?? 1;
+        ctx.globalAlpha = event.context.velocity ?? 1;
        const timePx = scale((event.whole.begin - (flipTime ? to : from)) / timeExtent, ...timeRange);
        let durationPx = scale(event.duration / timeExtent, 0, timeAxis);
        const value = getValue(event);
@@ -115,14 +114,6 @@ Pattern.prototype.pianoroll = function ({
          ];
        }
        isActive ? ctx.strokeRect(...coords) : ctx.fillRect(...coords);
-        if (labels) {
-          const label = event.value.note ?? event.value.s + (event.value.n ? `:${event.value.n}` : '');
-          ctx.font = `${barThickness * 0.75}px monospace`;
-          ctx.strokeStyle = 'black';
-          ctx.fillStyle = isActive ? 'white' : 'black';
-          ctx.textBaseline = 'top';
-          ctx.fillText(label, ...coords);
-        }
      });
      ctx.globalAlpha = 1; // reset!
      const playheadPosition = scale(-from / timeExtent, ...timeRange);
@@ -190,7 +181,6 @@ export function pianoroll({
  timeframe: timeframeProp,
  fold = 0,
  vertical = 0,
-  labels = false,
  ctx,
 } = {}) {
  const w = ctx.canvas.width;
@@ -250,7 +240,7 @@ export function pianoroll({
      const color = event.value?.color || event.context?.color;
      ctx.fillStyle = color || inactive;
      ctx.strokeStyle = color || active;
-      ctx.globalAlpha = event.context.velocity ?? event.value?.gain ?? 1;
+      ctx.globalAlpha = event.context.velocity ?? 1;
      const timePx = scale((event.whole.begin - (flipTime ? to : from)) / timeExtent, ...timeRange);
      let durationPx = scale(event.duration / timeExtent, 0, timeAxis);
      const value = getValue(event);
@@ -277,14 +267,6 @@ export function pianoroll({
        ];
      }
      isActive ? ctx.strokeRect(...coords) : ctx.fillRect(...coords);
-      if (labels) {
-        const label = event.value.note ?? event.value.s + (event.value.n ? `:${event.value.n}` : '');
-        ctx.font = `${barThickness * 0.75}px monospace`;
-        ctx.strokeStyle = 'black';
-        ctx.fillStyle = isActive ? 'white' : 'black';
-        ctx.textBaseline = 'top';
-        ctx.fillText(label, ...coords);
-      }
    });
  ctx.globalAlpha = 1; // reset!
  const playheadPosition = scale(-from / timeExtent, ...timeRange);
@@ -302,7 +284,7 @@ export function pianoroll({
  return this;
 }

-export function getDrawOptions(drawTime, options = {}) {
+function getOptions(drawTime, options = {}) {
  let [lookbehind, lookahead] = drawTime;
  lookbehind = Math.abs(lookbehind);
  const cycles = lookahead + lookbehind;
@@ -311,18 +293,5 @@ export function getDrawOptions(drawTime, options = {}) {
 }

 Pattern.prototype.punchcard = function (options) {
-  return this.onPaint((ctx, time, haps, drawTime) =>
-    pianoroll({ ctx, time, haps, ...getDrawOptions(drawTime, options) }),
-  );
+  return this.onPaint((ctx, time, haps, drawTime) => pianoroll({ ctx, time, haps, ...getOptions(drawTime, options) }));
 };
-
-/* Pattern.prototype.pianoroll = function (options) {
-  return this.onPaint((ctx, time, haps, drawTime) =>
-    pianoroll({ ctx, time, haps, ...getDrawOptions(drawTime, { fold: 0, ...options }) }),
-  );
-}; */
-
-export function drawPianoroll(options) {
-  const { drawTime, ...rest } = options;
-  pianoroll({ ...getDrawOptions(drawTime), ...rest });
-}
@@ -2,8 +2,6 @@ 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';
-import { register } from './pattern.mjs';

 export function repl({
  interval,
@@ -19,26 +17,36 @@ export function repl({
 }) {
  const scheduler = new Cyclist({
    interval,
-    onTrigger: getTrigger({ defaultOutput, getTime }),
+    onTrigger: async (hap, deadline, duration) => {
+      try {
+        if (!hap.context.onTrigger || !hap.context.dominantTrigger) {
+          await defaultOutput(hap, deadline, duration);
+        }
+        if (hap.context.onTrigger) {
+          const cps = 1;
+          // call signature of output / onTrigger is different...
+          await hap.context.onTrigger(getTime() + deadline, hap, getTime(), cps);
+        }
+      } catch (err) {
+        logger(`[cyclist] error: ${err.message}`, 'error');
+      }
+    },
    onError: onSchedulerError,
    getTime,
    onToggle,
  });
-  const setPattern = (pattern, autostart = true) => {
-    pattern = editPattern?.(pattern) || pattern;
-    scheduler.setPattern(pattern, autostart);
-  };
  setTime(() => scheduler.now()); // TODO: refactor?
  const evaluate = async (code, autostart = true) => {
    if (!code) {
      throw new Error('no code to evaluate');
    }
    try {
-      await beforeEval?.({ code });
+      beforeEval?.({ code });
      let { pattern } = await _evaluate(code, transpiler);

      logger(`[eval] code updated`);
-      setPattern(pattern, autostart);
+      pattern = editPattern?.(pattern) || pattern;
+      scheduler.setPattern(pattern, autostart);
      afterEval?.({ code, pattern });
      return pattern;
    } catch (err) {
@@ -50,48 +58,5 @@ export function repl({
  const stop = () => scheduler.stop();
  const start = () => scheduler.start();
  const pause = () => scheduler.pause();
-  const setCps = (cps) => scheduler.setCps(cps);
-  const setCpm = (cpm) => scheduler.setCps(cpm / 60);
-
-  // the following functions use the cps value, which is why they are defined here..
-  const loopAt = register('loopAt', (cycles, pat) => {
-    return pat.loopAtCps(cycles, scheduler.cps);
-  });
-
-  const fit = register('fit', (pat) =>
-    pat.withHap((hap) =>
-      hap.withValue((v) => ({
-        ...v,
-        speed: scheduler.cps / hap.whole.duration, // overwrite speed completely?
-        unit: 'c',
-      })),
-    ),
-  );
-
-  evalScope({
-    loopAt,
-    fit,
-    setCps,
-    setcps: setCps,
-    setCpm,
-    setcpm: setCpm,
-  });
-
-  return { scheduler, evaluate, start, stop, pause, setCps, setPattern };
+  return { scheduler, evaluate, start, stop, pause };
 }
-
-export const getTrigger =
-  ({ getTime, defaultOutput }) =>
-  async (hap, deadline, duration, cps) => {
-    try {
-      if (!hap.context.onTrigger || !hap.context.dominantTrigger) {
-        await defaultOutput(hap, deadline, duration, cps);
-      }
-      if (hap.context.onTrigger) {
-        // call signature of output / onTrigger is different...
-        await hap.context.onTrigger(getTime() + deadline, hap, getTime(), cps);
-      }
-    } catch (err) {
-      logger(`[cyclist] error: ${err.message}`, 'error');
-    }
-  };
@@ -27,7 +27,7 @@ export const isaw2 = isaw.toBipolar();
 *
 * @return {Pattern}
 * @example
- * "c3 [eb3,g3] g2 [g3,bb3]".note().clip(saw.slow(4))
+ * "c3 [eb3,g3] g2 [g3,bb3]".legato(saw.slow(4)).note()
 * @example
 * saw.range(0,8).segment(8).scale('C major').slow(4).note()
 *
@@ -1,117 +0,0 @@
-import { Pattern } from './index.mjs';
-
-// polar coords -> xy
-function fromPolar(angle, radius, cx, cy) {
-  const radians = ((angle - 90) * Math.PI) / 180;
-  return [cx + Math.cos(radians) * radius, cy + Math.sin(radians) * radius];
-}
-
-const xyOnSpiral = (angle, margin, cx, cy, rotate = 0) => fromPolar((angle + rotate) * 360, margin * angle, cx, cy); // TODO: logSpiral
-
-// draw spiral / segment of spiral
-function spiralSegment(options) {
-  let {
-    ctx,
-    from = 0,
-    to = 3,
-    margin = 50,
-    cx = 100,
-    cy = 100,
-    rotate = 0,
-    thickness = margin / 2,
-    color = '#0000ff30',
-    cap = 'round',
-    stretch = 1,
-    fromOpacity = 1,
-    toOpacity = 1,
-  } = options;
-  from *= stretch;
-  to *= stretch;
-  rotate *= stretch;
-  ctx.lineWidth = thickness;
-  ctx.lineCap = cap;
-  ctx.strokeStyle = color;
-  ctx.globalAlpha = fromOpacity;
-
-  ctx.beginPath();
-  let [sx, sy] = xyOnSpiral(from, margin, cx, cy, rotate);
-  ctx.moveTo(sx, sy);
-
-  const increment = 1 / 60;
-  let angle = from;
-  while (angle <= to) {
-    const [x, y] = xyOnSpiral(angle, margin, cx, cy, rotate);
-    //ctx.lineWidth = angle*thickness;
-    ctx.globalAlpha = ((angle - from) / (to - from)) * toOpacity;
-    ctx.lineTo(x, y);
-    angle += increment;
-  }
-  ctx.stroke();
-}
-
-Pattern.prototype.spiral = function (options = {}) {
-  const {
-    stretch = 1,
-    size = 80,
-    thickness = size / 2,
-    cap = 'butt', // round butt squar,
-    inset = 3, // start angl,
-    playheadColor = '#ffffff90',
-    playheadLength = 0.02,
-    playheadThickness = thickness,
-    padding = 0,
-    steady = 1,
-    inactiveColor = '#ffffff20',
-    colorizeInactive = 0,
-    fade = true,
-    // logSpiral = true,
-  } = options;
-
-  function spiral({ ctx, time, haps, drawTime }) {
-    ctx.clearRect(0, 0, ctx.canvas.clientWidth, ctx.canvas.clientHeight);
-    const [cx, cy] = [ctx.canvas.width / 2, ctx.canvas.height / 2];
-    const settings = {
-      margin: size / stretch,
-      cx,
-      cy,
-      stretch,
-      cap,
-      thickness,
-    };
-
-    const playhead = {
-      ...settings,
-      thickness: playheadThickness,
-      from: inset - playheadLength,
-      to: inset,
-      color: playheadColor,
-    };
-
-    const [min] = drawTime;
-    const rotate = steady * time;
-    haps.forEach((hap) => {
-      const isActive = hap.whole.begin <= time && hap.endClipped > time;
-      const from = hap.whole.begin - time + inset;
-      const to = hap.endClipped - time + inset - padding;
-      const { color } = hap.context;
-      const opacity = fade ? 1 - Math.abs((hap.whole.begin - time) / min) : 1;
-      spiralSegment({
-        ctx,
-        ...settings,
-        from,
-        to,
-        rotate,
-        color: colorizeInactive || isActive ? color : inactiveColor,
-        fromOpacity: opacity,
-        toOpacity: opacity,
-      });
-    });
-    spiralSegment({
-      ctx,
-      ...playhead,
-      rotate,
-    });
-  }
-
-  return this.onPaint((ctx, time, haps, drawTime) => spiral({ ctx, time, haps, drawTime }));
-};
@@ -1,28 +0,0 @@
-/*
-controls.test.mjs - <short description TODO>
-Copyright (C) 2023 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/test/controls.test.mjs>
-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 controls from '../controls.mjs';
-import { mini } from '../../mini/mini.mjs';
-import { describe, it, expect } from 'vitest';
-
-describe('controls', () => {
-  it('should support controls', () => {
-    expect(controls.s('bd').firstCycleValues).toEqual([{ s: 'bd' }]);
-  });
-  it('should support compound controls', () => {
-    expect(controls.s(mini('bd:3')).firstCycleValues).toEqual([{ s: 'bd', n: 3 }]);
-    expect(controls.s(mini('bd:3 sd:4:1.4')).firstCycleValues).toEqual([
-      { s: 'bd', n: 3 },
-      { s: 'sd', n: 4, gain: 1.4 },
-    ]);
-  });
-  it('should support ignore extra elements in compound controls', () => {
-    expect(controls.s(mini('bd:3:0.4 sd:4:0.5:3:17')).firstCycleValues).toEqual([
-      { s: 'bd', n: 3, gain: 0.4 },
-      { s: 'sd', n: 4, gain: 0.5 },
-    ]);
-  });
-});
@@ -45,6 +45,8 @@ import {
  rev,
  time,
  run,
+  hitch,
+  set,
 } from '../index.mjs';

 import { steady } from '../signal.mjs';
@@ -204,7 +206,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]]),
@@ -252,7 +254,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]]));
    });
  });
@@ -294,7 +296,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));
    });
  });
@@ -929,6 +931,14 @@ 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());
    });
@@ -959,7 +969,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)));
    });
@@ -971,36 +981,4 @@ 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 },
-        ),
-      );
-    });
-  });
 });
@@ -1,40 +0,0 @@
-/*test for issue 302 support alternative solmization types */
-import { sol2note } from '../util.mjs';
-import { test } from 'vitest';
-import assert from 'assert';
-
-test('solmization - letters', () => {
-  const result = sol2note(60, 'letters');
-  const expected = 'C4';
-  assert.equal(result, expected);
-});
-
-test('solmization - solfeggio', () => {
-  const result = sol2note(60, 'solfeggio');
-  const expected = 'Do4';
-  assert.equal(result, expected);
-});
-
-test('solmization - indian', () => {
-  const result = sol2note(60, 'indian');
-  const expected = 'Sa4';
-  assert.equal(result, expected);
-});
-
-test('solmization - german', () => {
-  const result = sol2note(60, 'german');
-  const expected = 'C4';
-  assert.equal(result, expected);
-});
-
-test('solmization - byzantine', () => {
-  const result = sol2note(60, 'byzantine');
-  const expected = 'Ni4';
-  assert.equal(result, expected);
-});
-
-test('solmization - japanese', () => {
-  const result = sol2note(60, 'japanese');
-  const expected = 'I4';
-  assert.equal(result, expected);
-});
@@ -8,8 +8,8 @@ import { pure } from '../pattern.mjs';
 import {
  isNote,
  tokenizeNote,
-  noteToMidi,
-  midiToFreq,
+  toMidi,
+  fromMidi,
  freqToMidi,
  _mod,
  compose,
@@ -75,27 +75,27 @@ describe('isNote', () => {
    expect(tokenizeNote(123)).toStrictEqual([]);
  });
 });
-describe('noteToMidi', () => {
+describe('toMidi', () => {
  it('should turn notes into midi', () => {
-    expect(noteToMidi('A4')).toEqual(69);
-    expect(noteToMidi('C4')).toEqual(60);
-    expect(noteToMidi('Db4')).toEqual(61);
-    expect(noteToMidi('C3')).toEqual(48);
-    expect(noteToMidi('Cb3')).toEqual(47);
-    expect(noteToMidi('Cbb3')).toEqual(46);
-    expect(noteToMidi('C#3')).toEqual(49);
-    expect(noteToMidi('C#3')).toEqual(49);
-    expect(noteToMidi('C##3')).toEqual(50);
+    expect(toMidi('A4')).toEqual(69);
+    expect(toMidi('C4')).toEqual(60);
+    expect(toMidi('Db4')).toEqual(61);
+    expect(toMidi('C3')).toEqual(48);
+    expect(toMidi('Cb3')).toEqual(47);
+    expect(toMidi('Cbb3')).toEqual(46);
+    expect(toMidi('C#3')).toEqual(49);
+    expect(toMidi('C#3')).toEqual(49);
+    expect(toMidi('C##3')).toEqual(50);
  });
  it('should throw an error when given a non-note', () => {
-    expect(() => noteToMidi('Q')).toThrowError(`not a note: "Q"`);
-    expect(() => noteToMidi('Z')).toThrowError(`not a note: "Z"`);
+    expect(() => toMidi('Q')).toThrowError(`not a note: "Q"`);
+    expect(() => toMidi('Z')).toThrowError(`not a note: "Z"`);
  });
 });
-describe('midiToFreq', () => {
+describe('fromMidi', () => {
  it('should turn midi into frequency', () => {
-    expect(midiToFreq(69)).toEqual(440);
-    expect(midiToFreq(57)).toEqual(220);
+    expect(fromMidi(69)).toEqual(440);
+    expect(fromMidi(57)).toEqual(220);
  });
 });
 describe('freqToMidi', () => {
@@ -6,12 +6,12 @@ This program is free software: you can redistribute it and/or modify it under th

 // returns true if the given string is a note
 export const isNoteWithOctave = (name) => /^[a-gA-G][#bs]*[0-9]$/.test(name);
-export const isNote = (name) => /^[a-gA-G][#bsf]*[0-9]?$/.test(name);
+export const isNote = (name) => /^[a-gA-G][#bs]*[0-9]?$/.test(name);
 export const tokenizeNote = (note) => {
  if (typeof note !== 'string') {
    return [];
  }
-  const [pc, acc = '', oct] = note.match(/^([a-gA-G])([#bsf]*)([0-9])?$/)?.slice(1) || [];
+  const [pc, acc = '', oct] = note.match(/^([a-gA-G])([#bs]*)([0-9])?$/)?.slice(1) || [];
  if (!pc) {
    return [];
  }
@@ -19,16 +19,16 @@ export const tokenizeNote = (note) => {
 };

 // turns the given note into its midi number representation
-export const noteToMidi = (note) => {
+export const toMidi = (note) => {
  const [pc, acc, oct = 3] = tokenizeNote(note);
  if (!pc) {
    throw new Error('not a note: "' + note + '"');
  }
  const chroma = { c: 0, d: 2, e: 4, f: 5, g: 7, a: 9, b: 11 }[pc.toLowerCase()];
-  const offset = acc?.split('').reduce((o, char) => o + { '#': 1, b: -1, s: 1, f: -1 }[char], 0) || 0;
+  const offset = acc?.split('').reduce((o, char) => o + { '#': 1, b: -1, s: 1 }[char], 0) || 0;
  return (Number(oct) + 1) * 12 + chroma + offset;
 };
-export const midiToFreq = (n) => {
+export const fromMidi = (n) => {
  return Math.pow(2, (n - 69) / 12) * 440;
 };

@@ -45,7 +45,7 @@ export const valueToMidi = (value, fallbackValue) => {
    return freqToMidi(freq);
  }
  if (typeof note === 'string') {
-    return noteToMidi(note);
+    return toMidi(note);
  }
  if (typeof note === 'number') {
    return note;
@@ -62,19 +62,18 @@ export const valueToMidi = (value, fallbackValue) => {
 */
 export const getFreq = (noteOrMidi) => {
  if (typeof noteOrMidi === 'number') {
-    return midiToFreq(noteOrMidi);
+    return fromMidi(noteOrMidi);
  }
-  return midiToFreq(noteToMidi(noteOrMidi));
+  return fromMidi(toMidi(noteOrMidi));
 };

-const pcs = ['C', 'Db', 'D', 'Eb', 'E', 'F', 'Gb', 'G', 'Ab', 'A', 'Bb', 'B'];
 /**
- * @deprecated only used in workshop (first-notes)
+ * @deprecated does not appear to be referenced or invoked anywhere in the codebase
 * @noAutocomplete
 */
 export const midi2note = (n) => {
  const oct = Math.floor(n / 12) - 1;
-  const pc = pcs[n % 12];
+  const pc = ['C', 'Db', 'D', 'Eb', 'E', 'F', 'Gb', 'G', 'Ab', 'A', 'Bb', 'B'][n % 12];
  return pc + oct;
 };

@@ -92,7 +91,7 @@ export const getPlayableNoteValue = (hap) => {
  }
  // if value is number => interpret as midi number as long as its not marked as frequency
  if (typeof note === 'number' && context.type !== 'frequency') {
-    note = midiToFreq(hap.value);
+    note = fromMidi(hap.value);
  } else if (typeof note === 'number' && context.type === 'frequency') {
    note = hap.value; // legacy workaround.. will be removed in the future
  } else if (typeof note !== 'string' || !isNote(note)) {
@@ -111,9 +110,9 @@ export const getFrequency = (hap) => {
    return getFreq(value.note || value.n || value.value);
  }
  if (typeof value === 'number' && context.type !== 'frequency') {
-    value = midiToFreq(hap.value);
+    value = fromMidi(hap.value);
  } else if (typeof value === 'string' && isNote(value)) {
-    value = midiToFreq(noteToMidi(hap.value));
+    value = fromMidi(toMidi(hap.value));
  } else if (typeof value !== 'number') {
    throw new Error('not a note or frequency: ' + value);
  }
@@ -140,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 = (a, b) => a;
+export const constant = curry((a, b) => a);

 export const listRange = (min, max) => Array.from({ length: max - min + 1 }, (_, i) => i + min);

@@ -171,7 +170,7 @@ export function parseNumeral(numOrString) {
    return asNumber;
  }
  if (isNote(numOrString)) {
-    return noteToMidi(numOrString);
+    return toMidi(numOrString);
  }
  throw new Error(`cannot parse as numeral: "${numOrString}"`);
 }
@@ -207,67 +206,3 @@ 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]));
-
-export const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
-
-/* solmization, not used yet */
-const solfeggio = ['Do', 'Reb', 'Re', 'Mib', 'Mi', 'Fa', 'Solb', 'Sol', 'Lab', 'La', 'Sib', 'Si']; /*solffegio notes*/
-const indian = [
-  'Sa',
-  'Re',
-  'Ga',
-  'Ma',
-  'Pa',
-  'Dha',
-  'Ni',
-]; /*indian musical notes,  seems like they do not use flats or sharps*/
-const german = ['C', 'Db', 'D', 'Eb', 'E', 'F', 'Gb', 'G', 'Ab', 'A', 'Hb', 'H']; /*german & dutch musical notes*/
-const byzantine = [
-  'Ni',
-  'Pab',
-  'Pa',
-  'Voub',
-  'Vou',
-  'Ga',
-  'Dib',
-  'Di',
-  'Keb',
-  'Ke',
-  'Zob',
-  'Zo',
-]; /*byzantine musical notes*/
-const japanese = [
-  'I',
-  'Ro',
-  'Ha',
-  'Ni',
-  'Ho',
-  'He',
-  'To',
-]; /*traditional japanese musical notes, seems like they do not use falts or sharps*/
-
-const english = ['C', 'Db', 'D', 'Eb', 'E', 'F', 'Gb', 'G', 'Ab', 'A', 'Bb', 'B'];
-
-export const sol2note = (n, notation = 'letters') => {
-  const pc =
-    notation === 'solfeggio'
-      ? solfeggio /*check if its is any of the following*/
-      : notation === 'indian'
-      ? indian
-      : notation === 'german'
-      ? german
-      : notation === 'byzantine'
-      ? byzantine
-      : notation === 'japanese'
-      ? japanese
-      : english; /*if not use standard version*/
-  const note = pc[n % 12]; /*calculating the midi value to the note*/
-  const oct = Math.floor(n / 12) - 1;
-  return note + oct;
-};
@@ -44,6 +44,6 @@ function createClock(
  };
  const getPhase = () => phase;
  // setCallback
-  return { setDuration, start, stop, pause, duration, interval, getPhase, minLatency };
+  return { setDuration, start, stop, pause, duration, getPhase, minLatency };
 }
 export default createClock;
@@ -28,7 +28,9 @@ export const csound = register('csound', (instrument, pat) => {
      logger('[csound] not loaded yet', 'warning');
      return;
    }
-    hap.ensureObjectValue();
+    if (typeof hap.value !== 'object') {
+      throw new Error('csound only support objects as hap values');
+    }
    let { gain = 0.8 } = hap.value;
    gain *= 0.2;

@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/csound",
-  "version": "0.8.0",
+  "version": "0.6.2",
  "description": "csound bindings for strudel",
  "main": "index.mjs",
  "publishConfig": {
@@ -32,11 +32,11 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@csound/browser": "6.18.7",
+    "@csound/browser": "6.18.5",
    "@strudel.cycles/core": "workspace:*",
    "@strudel.cycles/webaudio": "workspace:*"
  },
  "devDependencies": {
-    "vite": "^4.3.3"
+    "vite": "^3.2.2"
  }
 }
@@ -30,4 +30,5 @@ note(`[[e5 [b4 c5] d5 [c5 b4]]
 </strudel-repl>
 ```

-Note that the Code is placed inside HTML comments to prevent the browser from treating it as HTML.
+- Note that the Code is placed inside HTML comments to prevent the browser from treating it as HTML.
+- [Play with this example on stackblitz](https://stackblitz.com/edit/js-75cvww?file=index.html)
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/eval",
-  "version": "0.8.0",
+  "version": "0.6.2",
  "description": "Code evaluator for strudel",
  "main": "index.mjs",
  "publishConfig": {
@@ -44,7 +44,7 @@
  },
  "devDependencies": {
    "@strudel.cycles/mini": "workspace:*",
-    "vite": "^4.3.3",
-    "vitest": "^0.28.0"
+    "vite": "^3.2.2",
+    "vitest": "^0.25.7"
  }
 }
@@ -5,9 +5,8 @@ This program is free software: you can redistribute it and/or modify it under th
 */

 import * as _WebMidi from 'webmidi';
-import { Pattern, isPattern, logger } from '@strudel.cycles/core';
+import { Pattern, isPattern, isNote, getPlayableNoteValue, logger } from '@strudel.cycles/core';
 import { getAudioContext } from '@strudel.cycles/webaudio';
-import { noteToMidi } from '@strudel.cycles/core';

 // if you use WebMidi from outside of this package, make sure to import that instance:
 export const { WebMidi } = _WebMidi;
@@ -64,7 +63,7 @@ function getDevice(output, outputs) {
 }

 // Pattern.prototype.midi = function (output: string | number, channel = 1) {
-Pattern.prototype.midi = function (output) {
+Pattern.prototype.midi = function (output, channel = 1) {
  if (!supportsMidi()) {
    throw new Error(`🎹 WebMidi is not enabled. Supported Browsers: https://caniuse.com/?search=webmidi`);
  }
@@ -91,6 +90,11 @@ Pattern.prototype.midi = function (output) {
    );
  }
  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;
    }
@@ -102,34 +106,15 @@ Pattern.prototype.midi = function (output) {
          .join(' | ')}`,
      );
    }
-    hap.ensureObjectValue();
-
-    // calculate time
-    const timingOffset = WebMidi.time - getAudioContext().getOutputTimestamp().contextTime * 1000;
+    // console.log('midi', value, output);
+    const timingOffset = WebMidi.time - getAudioContext().currentTime * 1000;
    time = time * 1000 + timingOffset;
-
-    // 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 = noteToMidi(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 });
-    }
+    // const inMs = '+' + (time - Tone.getContext().currentTime) * 1000;
+    // await enableWebMidi()
+    device.playNote(note, channel, {
+      time,
+      duration: hap.duration.valueOf() * 1000 - 5,
+      attack: velocity,
+    });
  });
 };
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/midi",
-  "version": "0.8.0",
+  "version": "0.6.0",
  "description": "Midi API for strudel",
  "main": "index.mjs",
  "publishConfig": {
@@ -31,9 +31,9 @@
  "dependencies": {
    "@strudel.cycles/core": "workspace:*",
    "@strudel.cycles/webaudio": "workspace:*",
-    "webmidi": "^3.1.5"
+    "webmidi": "^3.0.21"
  },
  "devDependencies": {
-    "vite": "^4.3.3"
+    "vite": "^3.2.2"
  }
 }
@@ -1,4 +1,4 @@
-// Generated by Peggy 3.0.2.
+// Generated by Peggy 2.0.1.
 //
 // https://peggyjs.org/

@@ -43,19 +43,16 @@ peg$SyntaxError.prototype.format = function(sources) {
      }
    }
    var s = this.location.start;
-    var offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
-      ? this.location.source.offset(s)
-      : s;
-    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+    var loc = this.location.source + ":" + s.line + ":" + s.column;
    if (src) {
      var e = this.location.end;
-      var filler = peg$padEnd("", offset_s.line.toString().length, ' ');
+      var filler = peg$padEnd("", s.line.toString().length, ' ');
      var line = src[s.line - 1];
      var last = s.line === e.line ? e.column : line.length + 1;
      var hatLen = (last - s.column) || 1;
      str += "\n --> " + loc + "\n"
          + filler + " |\n"
-          + offset_s.line + " | " + line + "\n"
+          + s.line + " | " + line + "\n"
          + filler + " | " + peg$padEnd("", s.column - 1, ' ')
          + peg$padEnd("", hatLen, "^");
    } else {
@@ -185,21 +182,21 @@ function peg$parse(input, options) {
  var peg$c8 = "#";
  var peg$c9 = "^";
  var peg$c10 = "_";
-  var peg$c11 = "[";
-  var peg$c12 = "]";
-  var peg$c13 = "{";
-  var peg$c14 = "}";
-  var peg$c15 = "%";
-  var peg$c16 = "<";
-  var peg$c17 = ">";
-  var peg$c18 = "@";
-  var peg$c19 = "!";
-  var peg$c20 = "(";
-  var peg$c21 = ")";
-  var peg$c22 = "/";
-  var peg$c23 = "*";
-  var peg$c24 = "?";
-  var peg$c25 = ":";
+  var peg$c11 = ":";
+  var peg$c12 = "[";
+  var peg$c13 = "]";
+  var peg$c14 = "{";
+  var peg$c15 = "}";
+  var peg$c16 = "%";
+  var peg$c17 = "<";
+  var peg$c18 = ">";
+  var peg$c19 = "@";
+  var peg$c20 = "!";
+  var peg$c21 = "(";
+  var peg$c22 = ")";
+  var peg$c23 = "/";
+  var peg$c24 = "*";
+  var peg$c25 = "?";
  var peg$c26 = "struct";
  var peg$c27 = "target";
  var peg$c28 = "euclid";
@@ -240,21 +237,21 @@ function peg$parse(input, options) {
  var peg$e15 = peg$literalExpectation("#", false);
  var peg$e16 = peg$literalExpectation("^", false);
  var peg$e17 = peg$literalExpectation("_", false);
-  var peg$e18 = peg$literalExpectation("[", false);
-  var peg$e19 = peg$literalExpectation("]", false);
-  var peg$e20 = peg$literalExpectation("{", false);
-  var peg$e21 = peg$literalExpectation("}", false);
-  var peg$e22 = peg$literalExpectation("%", false);
-  var peg$e23 = peg$literalExpectation("<", false);
-  var peg$e24 = peg$literalExpectation(">", false);
-  var peg$e25 = peg$literalExpectation("@", false);
-  var peg$e26 = peg$literalExpectation("!", false);
-  var peg$e27 = peg$literalExpectation("(", false);
-  var peg$e28 = peg$literalExpectation(")", false);
-  var peg$e29 = peg$literalExpectation("/", false);
-  var peg$e30 = peg$literalExpectation("*", false);
-  var peg$e31 = peg$literalExpectation("?", false);
-  var peg$e32 = peg$literalExpectation(":", false);
+  var peg$e18 = peg$literalExpectation(":", false);
+  var peg$e19 = peg$literalExpectation("[", false);
+  var peg$e20 = peg$literalExpectation("]", false);
+  var peg$e21 = peg$literalExpectation("{", false);
+  var peg$e22 = peg$literalExpectation("}", false);
+  var peg$e23 = peg$literalExpectation("%", false);
+  var peg$e24 = peg$literalExpectation("<", false);
+  var peg$e25 = peg$literalExpectation(">", false);
+  var peg$e26 = peg$literalExpectation("@", false);
+  var peg$e27 = peg$literalExpectation("!", false);
+  var peg$e28 = peg$literalExpectation("(", false);
+  var peg$e29 = peg$literalExpectation(")", false);
+  var peg$e30 = peg$literalExpectation("/", false);
+  var peg$e31 = peg$literalExpectation("*", false);
+  var peg$e32 = peg$literalExpectation("?", false);
  var peg$e33 = peg$literalExpectation("struct", false);
  var peg$e34 = peg$literalExpectation("target", false);
  var peg$e35 = peg$literalExpectation("euclid", false);
@@ -282,37 +279,36 @@ function peg$parse(input, options) {
  var peg$f8 = function(p, s, r) { return x => x.options_['ops'].push({ type_: "bjorklund", arguments_ :{ pulse: p, step:s, rotation:r }}) };
  var peg$f9 = function(a) { return x => x.options_['ops'].push({ type_: "stretch", arguments_ :{ amount:a, type: 'slow' }}) };
  var peg$f10 = function(a) { return x => x.options_['ops'].push({ type_: "stretch", arguments_ :{ amount:a, type: 'fast' }}) };
-  var peg$f11 = function(a) { return x => x.options_['ops'].push({ type_: "degradeBy", arguments_ :{ amount:a, seed: seed++ } }) };
-  var peg$f12 = function(s) { return x => x.options_['ops'].push({ type_: "tail", arguments_ :{ element:s } }) };
-  var peg$f13 = function(s, ops) { const result = new ElementStub(s, {ops: [], weight: 1, reps: 1});
+  var peg$f11 = function(a) { return x => x.options_['ops'].push({ type_: "degradeBy", arguments_ :{ amount:a } }) };
+  var peg$f12 = function(s, ops) { const result = new ElementStub(s, {ops: [], weight: 1, reps: 1});
    for (const op of ops) {
      op(result);
    }
    return result;
  };
-  var peg$f14 = function(s) { return new PatternStub(s, 'fastcat'); };
-  var peg$f15 = function(tail) { return { alignment: 'stack', list: tail }; };
-  var peg$f16 = function(tail) { return { alignment: 'rand', list: tail, seed: seed++ }; };
-  var peg$f17 = function(head, tail) { if (tail && tail.list.length > 0) { return new PatternStub([head, ...tail.list], tail.alignment, tail.seed); } else { return head; } };
-  var peg$f18 = function(head, tail) { return new PatternStub(tail ? [head, ...tail.list] : [head], 'polymeter'); };
-  var peg$f19 = function(sc) { return sc; };
-  var peg$f20 = function(s) { return { name: "struct", args: { mini:s }}};
-  var peg$f21 = function(s) { return { name: "target", args : { name:s}}};
-  var peg$f22 = function(p, s, r) { return { name: "bjorklund", args :{ pulse: p, step:parseInt(s) }}};
-  var peg$f23 = function(a) { return { name: "stretch", args :{ amount: a}}};
-  var peg$f24 = function(a) { return { name: "shift", args :{ amount: "-"+a}}};
-  var peg$f25 = function(a) { return { name: "shift", args :{ amount: a}}};
-  var peg$f26 = function(a) { return { name: "stretch", args :{ amount: "1/"+a}}};
-  var peg$f27 = function(s) { return { name: "scale", args :{ scale: s.join("")}}};
-  var peg$f28 = function(s, v) { return v};
-  var peg$f29 = function(s, ss) { ss.unshift(s); return new PatternStub(ss, 'slowcat'); };
-  var peg$f30 = function(sg) {return sg};
-  var peg$f31 = function(o, soc) { return new OperatorStub(o.name,o.args,soc)};
-  var peg$f32 = function(sc) { return sc };
-  var peg$f33 = function(c) { return c };
-  var peg$f34 = function(v) { return new CommandStub("setcps", { value: v})};
-  var peg$f35 = function(v) { return new CommandStub("setcps", { value: (v/120/2)})};
-  var peg$f36 = function() { return new CommandStub("hush")};
+  var peg$f13 = function(s) { return new PatternStub(s, 'fastcat'); };
+  var peg$f14 = function(tail) { return { alignment: 'stack', list: tail }; };
+  var peg$f15 = function(tail) { return { alignment: 'rand', list: tail }; };
+  var peg$f16 = function(head, tail) { if (tail && tail.list.length > 0) { return new PatternStub([head, ...tail.list], tail.alignment); } else { return head; } };
+  var peg$f17 = function(head, tail) { return new PatternStub(tail ? [head, ...tail.list] : [head], 'polymeter'); };
+  var peg$f18 = function(sc) { return sc; };
+  var peg$f19 = function(s) { return { name: "struct", args: { mini:s }}};
+  var peg$f20 = function(s) { return { name: "target", args : { name:s}}};
+  var peg$f21 = function(p, s, r) { return { name: "bjorklund", args :{ pulse: p, step:parseInt(s) }}};
+  var peg$f22 = function(a) { return { name: "stretch", args :{ amount: a}}};
+  var peg$f23 = function(a) { return { name: "shift", args :{ amount: "-"+a}}};
+  var peg$f24 = function(a) { return { name: "shift", args :{ amount: a}}};
+  var peg$f25 = function(a) { return { name: "stretch", args :{ amount: "1/"+a}}};
+  var peg$f26 = function(s) { return { name: "scale", args :{ scale: s.join("")}}};
+  var peg$f27 = function(s, v) { return v};
+  var peg$f28 = function(s, ss) { ss.unshift(s); return new PatternStub(ss, 'slowcat'); };
+  var peg$f29 = function(sg) {return sg};
+  var peg$f30 = function(o, soc) { return new OperatorStub(o.name,o.args,soc)};
+  var peg$f31 = function(sc) { return sc };
+  var peg$f32 = function(c) { return c };
+  var peg$f33 = function(v) { return new CommandStub("setcps", { value: v})};
+  var peg$f34 = function(v) { return new CommandStub("setcps", { value: (v/120/2)})};
+  var peg$f35 = function() { return new CommandStub("hush")};
  var peg$currPos = 0;
  var peg$savedPos = 0;
  var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -425,11 +421,11 @@ function peg$parse(input, options) {
    }
  }

-  function peg$computeLocation(startPos, endPos, offset) {
+  function peg$computeLocation(startPos, endPos) {
    var startPosDetails = peg$computePosDetails(startPos);
    var endPosDetails = peg$computePosDetails(endPos);

-    var res = {
+    return {
      source: peg$source,
      start: {
        offset: startPos,
@@ -442,11 +438,6 @@ function peg$parse(input, options) {
        column: endPosDetails.column
      }
    };
-    if (offset && peg$source && (typeof peg$source.offset === "function")) {
-      res.start = peg$source.offset(res.start);
-      res.end = peg$source.offset(res.end);
-    }
-    return res;
  }

  function peg$fail(expected) {
@@ -857,6 +848,15 @@ function peg$parse(input, options) {
                s0 = peg$FAILED;
                if (peg$silentFails === 0) { peg$fail(peg$e17); }
              }
+              if (s0 === peg$FAILED) {
+                if (input.charCodeAt(peg$currPos) === 58) {
+                  s0 = peg$c11;
+                  peg$currPos++;
+                } else {
+                  s0 = peg$FAILED;
+                  if (peg$silentFails === 0) { peg$fail(peg$e18); }
+                }
+              }
            }
          }
        }
@@ -899,11 +899,11 @@ function peg$parse(input, options) {
    s0 = peg$currPos;
    s1 = peg$parsews();
    if (input.charCodeAt(peg$currPos) === 91) {
-      s2 = peg$c11;
+      s2 = peg$c12;
      peg$currPos++;
    } else {
      s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e18); }
+      if (peg$silentFails === 0) { peg$fail(peg$e19); }
    }
    if (s2 !== peg$FAILED) {
      s3 = peg$parsews();
@@ -911,11 +911,11 @@ function peg$parse(input, options) {
      if (s4 !== peg$FAILED) {
        s5 = peg$parsews();
        if (input.charCodeAt(peg$currPos) === 93) {
-          s6 = peg$c12;
+          s6 = peg$c13;
          peg$currPos++;
        } else {
          s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e19); }
+          if (peg$silentFails === 0) { peg$fail(peg$e20); }
        }
        if (s6 !== peg$FAILED) {
          s7 = peg$parsews();
@@ -943,11 +943,11 @@ function peg$parse(input, options) {
    s0 = peg$currPos;
    s1 = peg$parsews();
    if (input.charCodeAt(peg$currPos) === 123) {
-      s2 = peg$c13;
+      s2 = peg$c14;
      peg$currPos++;
    } else {
      s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e20); }
+      if (peg$silentFails === 0) { peg$fail(peg$e21); }
    }
    if (s2 !== peg$FAILED) {
      s3 = peg$parsews();
@@ -955,11 +955,11 @@ function peg$parse(input, options) {
      if (s4 !== peg$FAILED) {
        s5 = peg$parsews();
        if (input.charCodeAt(peg$currPos) === 125) {
-          s6 = peg$c14;
+          s6 = peg$c15;
          peg$currPos++;
        } else {
          s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e21); }
+          if (peg$silentFails === 0) { peg$fail(peg$e22); }
        }
        if (s6 !== peg$FAILED) {
          s7 = peg$parsepolymeter_steps();
@@ -990,11 +990,11 @@ function peg$parse(input, options) {

    s0 = peg$currPos;
    if (input.charCodeAt(peg$currPos) === 37) {
-      s1 = peg$c15;
+      s1 = peg$c16;
      peg$currPos++;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e22); }
+      if (peg$silentFails === 0) { peg$fail(peg$e23); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parseslice();
@@ -1019,11 +1019,11 @@ function peg$parse(input, options) {
    s0 = peg$currPos;
    s1 = peg$parsews();
    if (input.charCodeAt(peg$currPos) === 60) {
-      s2 = peg$c16;
+      s2 = peg$c17;
      peg$currPos++;
    } else {
      s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e23); }
+      if (peg$silentFails === 0) { peg$fail(peg$e24); }
    }
    if (s2 !== peg$FAILED) {
      s3 = peg$parsews();
@@ -1031,11 +1031,11 @@ function peg$parse(input, options) {
      if (s4 !== peg$FAILED) {
        s5 = peg$parsews();
        if (input.charCodeAt(peg$currPos) === 62) {
-          s6 = peg$c17;
+          s6 = peg$c18;
          peg$currPos++;
        } else {
          s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e24); }
+          if (peg$silentFails === 0) { peg$fail(peg$e25); }
        }
        if (s6 !== peg$FAILED) {
          s7 = peg$parsews();
@@ -1088,9 +1088,6 @@ function peg$parse(input, options) {
            s0 = peg$parseop_replicate();
            if (s0 === peg$FAILED) {
              s0 = peg$parseop_degrade();
-              if (s0 === peg$FAILED) {
-                s0 = peg$parseop_tail();
-              }
            }
          }
        }
@@ -1105,11 +1102,11 @@ function peg$parse(input, options) {

    s0 = peg$currPos;
    if (input.charCodeAt(peg$currPos) === 64) {
-      s1 = peg$c18;
+      s1 = peg$c19;
      peg$currPos++;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e25); }
+      if (peg$silentFails === 0) { peg$fail(peg$e26); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsenumber();
@@ -1133,11 +1130,11 @@ function peg$parse(input, options) {

    s0 = peg$currPos;
    if (input.charCodeAt(peg$currPos) === 33) {
-      s1 = peg$c19;
+      s1 = peg$c20;
      peg$currPos++;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e26); }
+      if (peg$silentFails === 0) { peg$fail(peg$e27); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsenumber();
@@ -1161,11 +1158,11 @@ function peg$parse(input, options) {

    s0 = peg$currPos;
    if (input.charCodeAt(peg$currPos) === 40) {
-      s1 = peg$c20;
+      s1 = peg$c21;
      peg$currPos++;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e27); }
+      if (peg$silentFails === 0) { peg$fail(peg$e28); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsews();
@@ -1189,11 +1186,11 @@ function peg$parse(input, options) {
            }
            s12 = peg$parsews();
            if (input.charCodeAt(peg$currPos) === 41) {
-              s13 = peg$c21;
+              s13 = peg$c22;
              peg$currPos++;
            } else {
              s13 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e28); }
+              if (peg$silentFails === 0) { peg$fail(peg$e29); }
            }
            if (s13 !== peg$FAILED) {
              peg$savedPos = s0;
@@ -1227,11 +1224,11 @@ function peg$parse(input, options) {

    s0 = peg$currPos;
    if (input.charCodeAt(peg$currPos) === 47) {
-      s1 = peg$c22;
+      s1 = peg$c23;
      peg$currPos++;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e29); }
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parseslice();
@@ -1255,11 +1252,11 @@ function peg$parse(input, options) {

    s0 = peg$currPos;
    if (input.charCodeAt(peg$currPos) === 42) {
-      s1 = peg$c23;
+      s1 = peg$c24;
      peg$currPos++;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e30); }
+      if (peg$silentFails === 0) { peg$fail(peg$e31); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parseslice();
@@ -1283,11 +1280,11 @@ function peg$parse(input, options) {

    s0 = peg$currPos;
    if (input.charCodeAt(peg$currPos) === 63) {
-      s1 = peg$c24;
+      s1 = peg$c25;
      peg$currPos++;
    } else {
      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e31); }
+      if (peg$silentFails === 0) { peg$fail(peg$e32); }
    }
    if (s1 !== peg$FAILED) {
      s2 = peg$parsenumber();
@@ -1304,34 +1301,6 @@ function peg$parse(input, options) {
    return s0;
  }

-  function peg$parseop_tail() {
-    var s0, s1, s2;
-
-    s0 = peg$currPos;
-    if (input.charCodeAt(peg$currPos) === 58) {
-      s1 = peg$c25;
-      peg$currPos++;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e32); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parseslice();
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f12(s2);
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
  function peg$parseslice_with_ops() {
    var s0, s1, s2, s3;

@@ -1345,7 +1314,7 @@ function peg$parse(input, options) {
        s3 = peg$parseslice_op();
      }
      peg$savedPos = s0;
-      s0 = peg$f13(s1, s2);
+      s0 = peg$f12(s1, s2);
    } else {
      peg$currPos = s0;
      s0 = peg$FAILED;
@@ -1370,7 +1339,7 @@ function peg$parse(input, options) {
    }
    if (s1 !== peg$FAILED) {
      peg$savedPos = s0;
-      s1 = peg$f14(s1);
+      s1 = peg$f13(s1);
    }
    s0 = s1;

@@ -1419,7 +1388,7 @@ function peg$parse(input, options) {
    }
    if (s1 !== peg$FAILED) {
      peg$savedPos = s0;
-      s1 = peg$f15(s1);
+      s1 = peg$f14(s1);
    }
    s0 = s1;

@@ -1468,7 +1437,7 @@ function peg$parse(input, options) {
    }
    if (s1 !== peg$FAILED) {
      peg$savedPos = s0;
-      s1 = peg$f16(s1);
+      s1 = peg$f15(s1);
    }
    s0 = s1;

@@ -1489,7 +1458,7 @@ function peg$parse(input, options) {
        s2 = null;
      }
      peg$savedPos = s0;
-      s0 = peg$f17(s1, s2);
+      s0 = peg$f16(s1, s2);
    } else {
      peg$currPos = s0;
      s0 = peg$FAILED;
@@ -1509,7 +1478,7 @@ function peg$parse(input, options) {
        s2 = null;
      }
      peg$savedPos = s0;
-      s0 = peg$f18(s1, s2);
+      s0 = peg$f17(s1, s2);
    } else {
      peg$currPos = s0;
      s0 = peg$FAILED;
@@ -1519,20 +1488,18 @@ function peg$parse(input, options) {
  }

  function peg$parsemini() {
-    var s0, s1, s2, s3, s4, s5, s6;
+    var s0, s1, s2, s3, s4;

    s0 = peg$currPos;
    s1 = peg$parsews();
    s2 = peg$parsequote();
    if (s2 !== peg$FAILED) {
-      s3 = peg$parsews();
-      s4 = peg$parsestack_or_choose();
-      if (s4 !== peg$FAILED) {
-        s5 = peg$parsews();
-        s6 = peg$parsequote();
-        if (s6 !== peg$FAILED) {
+      s3 = peg$parsestack_or_choose();
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parsequote();
+        if (s4 !== peg$FAILED) {
          peg$savedPos = s0;
-          s0 = peg$f19(s4);
+          s0 = peg$f18(s3);
        } else {
          peg$currPos = s0;
          s0 = peg$FAILED;
@@ -1594,7 +1561,7 @@ function peg$parse(input, options) {
      s3 = peg$parsemini_or_operator();
      if (s3 !== peg$FAILED) {
        peg$savedPos = s0;
-        s0 = peg$f20(s3);
+        s0 = peg$f19(s3);
      } else {
        peg$currPos = s0;
        s0 = peg$FAILED;
@@ -1627,7 +1594,7 @@ function peg$parse(input, options) {
          s5 = peg$parsequote();
          if (s5 !== peg$FAILED) {
            peg$savedPos = s0;
-            s0 = peg$f21(s4);
+            s0 = peg$f20(s4);
          } else {
            peg$currPos = s0;
            s0 = peg$FAILED;
@@ -1672,7 +1639,7 @@ function peg$parse(input, options) {
            s7 = null;
          }
          peg$savedPos = s0;
-          s0 = peg$f22(s3, s5, s7);
+          s0 = peg$f21(s3, s5, s7);
        } else {
          peg$currPos = s0;
          s0 = peg$FAILED;
@@ -1705,7 +1672,7 @@ function peg$parse(input, options) {
      s3 = peg$parsenumber();
      if (s3 !== peg$FAILED) {
        peg$savedPos = s0;
-        s0 = peg$f23(s3);
+        s0 = peg$f22(s3);
      } else {
        peg$currPos = s0;
        s0 = peg$FAILED;
@@ -1734,7 +1701,7 @@ function peg$parse(input, options) {
      s3 = peg$parsenumber();
      if (s3 !== peg$FAILED) {
        peg$savedPos = s0;
-        s0 = peg$f24(s3);
+        s0 = peg$f23(s3);
      } else {
        peg$currPos = s0;
        s0 = peg$FAILED;
@@ -1763,7 +1730,7 @@ function peg$parse(input, options) {
      s3 = peg$parsenumber();
      if (s3 !== peg$FAILED) {
        peg$savedPos = s0;
-        s0 = peg$f25(s3);
+        s0 = peg$f24(s3);
      } else {
        peg$currPos = s0;
        s0 = peg$FAILED;
@@ -1792,7 +1759,7 @@ function peg$parse(input, options) {
      s3 = peg$parsenumber();
      if (s3 !== peg$FAILED) {
        peg$savedPos = s0;
-        s0 = peg$f26(s3);
+        s0 = peg$f25(s3);
      } else {
        peg$currPos = s0;
        s0 = peg$FAILED;
@@ -1834,7 +1801,7 @@ function peg$parse(input, options) {
          s5 = peg$parsequote();
          if (s5 !== peg$FAILED) {
            peg$savedPos = s0;
-            s0 = peg$f27(s4);
+            s0 = peg$f26(s4);
          } else {
            peg$currPos = s0;
            s0 = peg$FAILED;
@@ -1909,11 +1876,11 @@ function peg$parse(input, options) {
    if (s1 !== peg$FAILED) {
      s2 = peg$parsews();
      if (input.charCodeAt(peg$currPos) === 91) {
-        s3 = peg$c11;
+        s3 = peg$c12;
        peg$currPos++;
      } else {
        s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e18); }
+        if (peg$silentFails === 0) { peg$fail(peg$e19); }
      }
      if (s3 !== peg$FAILED) {
        s4 = peg$parsews();
@@ -1926,7 +1893,7 @@ function peg$parse(input, options) {
            s9 = peg$parsemini_or_operator();
            if (s9 !== peg$FAILED) {
              peg$savedPos = s7;
-              s7 = peg$f28(s5, s9);
+              s7 = peg$f27(s5, s9);
            } else {
              peg$currPos = s7;
              s7 = peg$FAILED;
@@ -1943,7 +1910,7 @@ function peg$parse(input, options) {
              s9 = peg$parsemini_or_operator();
              if (s9 !== peg$FAILED) {
                peg$savedPos = s7;
-                s7 = peg$f28(s5, s9);
+                s7 = peg$f27(s5, s9);
              } else {
                peg$currPos = s7;
                s7 = peg$FAILED;
@@ -1955,15 +1922,15 @@ function peg$parse(input, options) {
          }
          s7 = peg$parsews();
          if (input.charCodeAt(peg$currPos) === 93) {
-            s8 = peg$c12;
+            s8 = peg$c13;
            peg$currPos++;
          } else {
            s8 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e19); }
+            if (peg$silentFails === 0) { peg$fail(peg$e20); }
          }
          if (s8 !== peg$FAILED) {
            peg$savedPos = s0;
-            s0 = peg$f29(s5, s6);
+            s0 = peg$f28(s5, s6);
          } else {
            peg$currPos = s0;
            s0 = peg$FAILED;
@@ -2009,7 +1976,7 @@ function peg$parse(input, options) {
        s4 = peg$parsecomment();
      }
      peg$savedPos = s0;
-      s0 = peg$f30(s1);
+      s0 = peg$f29(s1);
    } else {
      peg$currPos = s0;
      s0 = peg$FAILED;
@@ -2031,7 +1998,7 @@ function peg$parse(input, options) {
          s5 = peg$parsemini_or_operator();
          if (s5 !== peg$FAILED) {
            peg$savedPos = s0;
-            s0 = peg$f31(s1, s5);
+            s0 = peg$f30(s1, s5);
          } else {
            peg$currPos = s0;
            s0 = peg$FAILED;
@@ -2056,7 +2023,7 @@ function peg$parse(input, options) {
    s1 = peg$parsemini_or_operator();
    if (s1 !== peg$FAILED) {
      peg$savedPos = s0;
-      s1 = peg$f32(s1);
+      s1 = peg$f31(s1);
    }
    s0 = s1;
    if (s0 === peg$FAILED) {
@@ -2089,7 +2056,7 @@ function peg$parse(input, options) {
    if (s2 !== peg$FAILED) {
      s3 = peg$parsews();
      peg$savedPos = s0;
-      s0 = peg$f33(s2);
+      s0 = peg$f32(s2);
    } else {
      peg$currPos = s0;
      s0 = peg$FAILED;
@@ -2114,7 +2081,7 @@ function peg$parse(input, options) {
      s3 = peg$parsenumber();
      if (s3 !== peg$FAILED) {
        peg$savedPos = s0;
-        s0 = peg$f34(s3);
+        s0 = peg$f33(s3);
      } else {
        peg$currPos = s0;
        s0 = peg$FAILED;
@@ -2143,7 +2110,7 @@ function peg$parse(input, options) {
      s3 = peg$parsenumber();
      if (s3 !== peg$FAILED) {
        peg$savedPos = s0;
-        s0 = peg$f35(s3);
+        s0 = peg$f34(s3);
      } else {
        peg$currPos = s0;
        s0 = peg$FAILED;
@@ -2169,7 +2136,7 @@ function peg$parse(input, options) {
    }
    if (s1 !== peg$FAILED) {
      peg$savedPos = s0;
-      s1 = peg$f36();
+      s1 = peg$f35();
    }
    s0 = s1;

@@ -2195,13 +2162,10 @@ function peg$parse(input, options) {
    this.location_ = location();
  }

-  var PatternStub = function(source, alignment, seed)
+  var PatternStub = function(source, alignment)
  {
    this.type_ = "pattern";
-    this.arguments_ = { alignment: alignment };
-    if (seed !== undefined) {
-      this.arguments_.seed = seed;
-    }
+    this.arguments_ = { alignment : alignment};
    this.source_ = source;
  }

@@ -2227,7 +2191,6 @@ function peg$parse(input, options) {
    this.options_ = options;
  }

-  var seed = 0;

  peg$result = peg$startRuleFunction();

@@ -19,13 +19,10 @@ This program is free software: you can redistribute it and/or modify it under th
    this.location_ = location();
  }

-  var PatternStub = function(source, alignment, seed)
+  var PatternStub = function(source, alignment)
  {
    this.type_ = "pattern";
-    this.arguments_ = { alignment: alignment };
-    if (seed !== undefined) {
-      this.arguments_.seed = seed;
-    }
+    this.arguments_ = { alignment : alignment};
    this.source_ = source;
  }

@@ -51,7 +48,6 @@ This program is free software: you can redistribute it and/or modify it under th
    this.options_ = options;
  }

-  var seed = 0;
 }

 start = statement
@@ -100,7 +96,7 @@ quote = '"' / "'"
 // ------------------ steps and cycles ---------------------------

 // single step definition (e.g bd)
-step_char =  [0-9a-zA-Z~] / "-" / "#" / "." / "^" / "_"
+step_char =  [0-9a-zA-Z~] / "-" / "#" / "." / "^" / "_" / ":"
 step = ws chars:step_char+ ws { return new AtomStub(chars.join("")) }

 // define a sub cycle e.g. [1 2, 3 [4]]
@@ -123,7 +119,7 @@ slice = step / sub_cycle / polymeter / slow_sequence

 // slice modifier affects the timing/size of a slice (e.g. [a b c]@3)
 // at this point, we assume we can represent them as regular sequence operators
-slice_op = op_weight / op_bjorklund / op_slow / op_fast / op_replicate / op_degrade / op_tail
+slice_op = op_weight / op_bjorklund / op_slow / op_fast / op_replicate / op_degrade

 op_weight =  "@" a:number
  { return x => x.options_['weight'] = a }
@@ -141,10 +137,7 @@ op_fast = "*"a:slice
  { return x => x.options_['ops'].push({ type_: "stretch", arguments_ :{ amount:a, type: 'fast' }}) }

 op_degrade = "?"a:number?
-  { return x => x.options_['ops'].push({ type_: "degradeBy", arguments_ :{ amount:a, seed: seed++ } }) }
-
-op_tail = ":" s:slice
-  { return x => x.options_['ops'].push({ type_: "tail", arguments_ :{ element:s } }) }
+  { return x => x.options_['ops'].push({ type_: "degradeBy", arguments_ :{ amount:a } }) }

 // a slice with an modifier applied i.e [bd@4 sd@3]@2 hh]
 slice_with_ops = s:slice ops:slice_op*
@@ -166,12 +159,12 @@ stack_tail = tail:(comma @sequence)+
 // a choose is a series of pipe-separated sequence, one of which is
 // chosen at random, each cycle
 choose_tail = tail:(pipe @sequence)+
-  { return { alignment: 'rand', list: tail, seed: seed++ }; }
+  { return { alignment: 'rand', list: tail }; }

 // if the stack contains only one element, we don't create a stack but return the
 // underlying element
 stack_or_choose = head:sequence tail:(stack_tail / choose_tail)?
-  { if (tail && tail.list.length > 0) { return new PatternStub([head, ...tail.list], tail.alignment, tail.seed); } else { return head; } }
+  { if (tail && tail.list.length > 0) { return new PatternStub([head, ...tail.list], tail.alignment); } else { return head; } }

 polymeter_stack = head:sequence tail:stack_tail?
  { return new PatternStub(tail ? [head, ...tail.list] : [head], 'polymeter'); }
@@ -182,7 +175,7 @@ polymeter_stack = head:sequence tail:stack_tail?
 // Experimental haskellish parser begins

 // mini-notation = a quoted stack
-mini = ws quote ws sc:stack_or_choose ws quote
+mini = ws quote sc:stack_or_choose quote
  { return sc; }

 // ------------------ operators ---------------------------
@@ -7,13 +7,17 @@ This program is free software: you can redistribute it and/or modify it under th
 import * as krill from './krill-parser.js';
 import * as strudel from '@strudel.cycles/core';

-const randOffset = 0.0003;
+/* var _seedState = 0;
+const randOffset = 0.0002;
+
+function _nextSeed() {
+  return _seedState++;
+} */

 const applyOptions = (parent, code) => (pat, i) => {
  const ast = parent.source_[i];
  const options = ast.options_;
  const ops = options?.ops;
-
  if (ops) {
    for (const op of ops) {
      switch (op.type_) {
@@ -39,14 +43,27 @@ const applyOptions = (parent, code) => (pat, i) => {
          break;
        }
        case 'degradeBy': {
-          pat = strudel
-            .reify(pat)
-            ._degradeByWith(strudel.rand.early(randOffset * op.arguments_.seed), op.arguments_.amount ?? 0.5);
-          break;
-        }
-        case 'tail': {
-          const friend = patternifyAST(op.arguments_.element, code);
-          pat = pat.fmap((a) => (b) => Array.isArray(a) ? [...a, b] : [a, b]).appLeft(friend);
+          // TODO: find out what is right here
+          // example:
+          /*
+           stack(
+             s("hh*8").degrade(),
+             s("[ht*8]?")
+           )
+        */
+          // above example will only be in sync when _degradeBy is used...
+          // it also seems that the nextSeed will create undeterministic behaviour
+          // as it uses a global _seedState. This is probably the reason for
+          // https://github.com/tidalcycles/strudel/issues/245
+
+          // this is how it was:
+          /* 
+        return strudel.reify(pat)._degradeByWith(
+          strudel.rand.early(randOffset * _nextSeed()).segment(1),
+          op.arguments_.amount ?? 0.5,
+        ); 
+        */
+          pat = strudel.reify(pat).degradeBy(op.arguments_.amount === null ? 0.5 : op.arguments_.amount);
          break;
        }
        default: {
@@ -91,7 +108,9 @@ export function patternifyAST(ast, code) {
        return strudel.stack(...aligned);
      }
      if (alignment === 'rand') {
-        return strudel.chooseInWith(strudel.rand.early(randOffset * ast.arguments_.seed).segment(1), children);
+        // https://github.com/tidalcycles/strudel/issues/245#issuecomment-1345406422
+        // return strudel.chooseInWith(strudel.rand.early(randOffset * _nextSeed()).segment(1), children);
+        return strudel.chooseCycles(...children);
      }
      const weightedChildren = ast.source_.some((child) => !!child.options_?.weight);
      if (!weightedChildren && alignment === 'slowcat') {
@@ -190,8 +209,3 @@ export function minify(thing) {
  }
  return strudel.reify(thing);
 }
-
-// calling this function will cause patterns to parse strings as mini notation by default
-export function miniAllStrings() {
-  strudel.setStringParser(mini);
-}
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/mini",
-  "version": "0.8.2",
+  "version": "0.6.0",
  "description": "Mini notation for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -35,8 +35,8 @@
    "@strudel.cycles/core": "workspace:*"
  },
  "devDependencies": {
-    "peggy": "^3.0.2",
-    "vite": "^4.3.3",
-    "vitest": "^0.28.0"
+    "peggy": "^2.0.1",
+    "vite": "^3.2.2",
+    "vitest": "^0.25.7"
  }
 }
@@ -140,22 +140,7 @@ describe('mini', () => {
    expect(haps.length < 230).toBe(true);
    // 'Had too many cycles remaining after degradeBy 0.8');
  });
-  it('supports multiple independent uses of the random choice operator ("|")', () => {
-    const numCycles = 1000;
-    const values = mini('[a|b] [a|b]')
-      .queryArc(0, numCycles)
-      .map((e) => e.value);
-    const observed = { aa: 0, ab: 0, ba: 0, bb: 0 };
-    for (let i = 0; i < values.length; i += 2) {
-      const chunk = values.slice(i, i + 2);
-      observed[chunk.join('')]++;
-    }
-    for (const count of Object.values(observed)) {
-      // Should fall within 99% confidence interval for binomial with p=0.25.
-      expect(215 <= count && count <= 286).toBe(true);
-    }
-  });
-  it('supports the random choice operator ("|") with nesting', () => {
+  /*it('supports the random choice operator ("|") with nesting', () => {
    const numCycles = 900;
    const haps = mini('a | [b | c] | [d | e | f]').queryArc(0, numCycles);
    // Should have about 1/3 a, 1/6 each of b | c, and 1/9 each of d | e | f.
@@ -180,8 +165,6 @@ describe('mini', () => {
    // 15.086 is the chisq for 5 degrees of freedom at 99%, so for 99% of uniformly-distributed
    //  PRNG, this test should succeed
    expect(chisq <= 15.086).toBe(true);
-  });
-  it('supports lists', () => {
-    expect(minV('a:b c:d:[e:f] g')).toEqual([['a', 'b'], ['c', 'd', ['e', 'f']], 'g']);
-  });
+    // assert(chisq <= 15.086, chisq + ' was expected to be less than 15.086 under chi-squared test');
+  });*/
 });
@@ -45,10 +45,9 @@ let startedAt = -1;
 * @memberof Pattern
 * @returns Pattern
 */
-Pattern.prototype.osc = function () {
-  return this.onTrigger(async (time, hap, currentTime, cps = 1) => {
-    hap.ensureObjectValue();
-    const osc = await connect();
+Pattern.prototype.osc = async function () {
+  const osc = await connect();
+  return this.onTrigger((time, hap, currentTime, cps = 1) => {
    const cycle = hap.wholeOrPart().begin.valueOf();
    const delta = hap.duration.valueOf();
    // time should be audio time of onset
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/osc",
-  "version": "0.8.0",
+  "version": "0.6.0",
  "description": "OSC messaging for strudel",
  "main": "osc.mjs",
  "publishConfig": {
@@ -40,7 +40,7 @@
    "osc-js": "^2.4.0"
  },
  "devDependencies": {
-    "pkg": "^5.8.1",
-    "vite": "^4.3.3"
+    "pkg": "^5.7.0",
+    "vite": "^3.2.2"
  }
 }
@@ -13,43 +13,24 @@ npm i @strudel.cycles/react
 Here is a minimal example of how to set up a MiniRepl:

 ```jsx
-import * as React from 'react';
-import '@strudel.cycles/react/dist/style.css';
-import { MiniRepl } from '@strudel.cycles/react';
 import { evalScope, controls } from '@strudel.cycles/core';
-import { samples, initAudioOnFirstClick } from '@strudel.cycles/webaudio';
+import { MiniRepl } from '@strudel.cycles/react';
+import { prebake } from '../repl/src/prebake.mjs';

-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/'
-  );
-}
+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 init() {
-  await evalScope(
-    controls,
-    import('@strudel.cycles/core'),
-    import('@strudel.cycles/mini'),
-    import('@strudel.cycles/webaudio'),
-    import('@strudel.cycles/tonal')
-  );
-  await prebake();
-  initAudioOnFirstClick();
-}
+prebake();

-if (typeof window !== 'undefined') {
-  init();
-}
-
-export default function App() {
-  return <MiniRepl tune={`s("bd sd,hh*4")`} />;
+export function Repl({ tune }) {
+  return <MiniRepl tune={tune} hideOutsideView={true} />;
 }
 ```

- 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
+For a more sophisticated example, check out the [nano-repl](./examples/nano-repl/)!
@@ -1,15 +0,0 @@
-# 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/`
@@ -15,18 +15,17 @@
    "@strudel.cycles/osc": "workspace:*",
    "@strudel.cycles/mini": "workspace:*",
    "@strudel.cycles/transpiler": "workspace:*",
-    "@strudel.cycles/soundfonts": "workspace:*",
    "@strudel.cycles/webaudio": "workspace:*",
    "@strudel.cycles/tonal": "workspace:*",
    "@strudel.cycles/react": "workspace:*"
  },
  "devDependencies": {
-    "@types/react": "^18.2.0",
-    "@types/react-dom": "^18.2.1",
-    "@vitejs/plugin-react": "^4.0.0",
-    "autoprefixer": "^10.4.14",
-    "postcss": "^8.4.23",
-    "tailwindcss": "^3.3.2",
-    "vite": "^4.3.3"
+    "@types/react": "^18.0.17",
+    "@types/react-dom": "^18.0.6",
+    "@vitejs/plugin-react": "^2.0.1",
+    "autoprefixer": "^10.4.8",
+    "postcss": "^8.4.16",
+    "tailwindcss": "^3.1.8",
+    "vite": "^3.0.7"
  }
 }
@@ -1,34 +1,22 @@
 import { controls, evalScope } from '@strudel.cycles/core';
 import { CodeMirror, useHighlighting, useKeydown, useStrudel, flash } from '@strudel.cycles/react';
-import {
-  getAudioContext,
-  initAudioOnFirstClick,
-  panic,
-  webaudioOutput,
-  registerSynthSounds,
-} from '@strudel.cycles/webaudio';
-import { registerSoundfonts } from '@strudel.cycles/soundfonts';
+import { getAudioContext, initAudioOnFirstClick, panic, webaudioOutput } from '@strudel.cycles/webaudio';
 import { useCallback, useState } from 'react';
 import './style.css';
 // import { prebake } from '../../../../../repl/src/prebake.mjs';

 initAudioOnFirstClick();

-async function init() {
-  // TODO: only import stuff when play is pressed?
-  const loadModules = evalScope(
-    controls,
-    import('@strudel.cycles/core'),
-    import('@strudel.cycles/tonal'),
-    import('@strudel.cycles/mini'),
-    import('@strudel.cycles/xen'),
-    import('@strudel.cycles/webaudio'),
-    import('@strudel.cycles/osc'),
-  );
-
-  await Promise.all([loadModules, registerSynthSounds(), registerSoundfonts()]);
-}
-init();
+// TODO: only import stuff when play is pressed?
+evalScope(
+  controls,
+  import('@strudel.cycles/core'),
+  import('@strudel.cycles/tonal'),
+  import('@strudel.cycles/mini'),
+  import('@strudel.cycles/xen'),
+  import('@strudel.cycles/webaudio'),
+  import('@strudel.cycles/osc'),
+);

 const defaultTune = `samples({
  bd: ['bd/BT0AADA.wav','bd/BT0AAD0.wav','bd/BT0A0DA.wav','bd/BT0A0D3.wav','bd/BT0A0D0.wav','bd/BT0A0A7.wav'],
@@ -43,7 +31,7 @@ stack(
  .off(1/8,x=>x.add(12).degradeBy(.5)) // random octave jumps
  .add(perlin.range(0,.5)) // random pitch variation
  .superimpose(add(.05)) // add second, slightly detuned voice
-  .note() // wrap in "note"
+  .n() // wrap in "n"
  .decay(.15).sustain(0) // make each note of equal length
  .s('sawtooth') // waveform
  .gain(.4) // turn down
@@ -52,7 +40,7 @@ stack(
  ,"<Am7!3 <Em7 E7b13 Em7 Ebm7b5>>".voicings('lefthand') // chords
  .superimpose(x=>x.add(.04)) // add second, slightly detuned voice
  .add(perlin.range(0,.5)) // random pitch variation
-  .note() // wrap in "n"
+  .n() // wrap in "n"
  .s('square') // waveform
  .gain(.16) // turn down
  .cutoff(500) // fixed cutoff
@@ -61,7 +49,7 @@ stack(
  ,"a4 c5 <e6 a6>".struct("x(5,8)")
  .superimpose(x=>x.add(.04)) // add second, slightly detuned voice
  .add(perlin.range(0,.5)) // random pitch variation
-  .note() // wrap in "note"
+  .n() // wrap in "n"
  .decay(.1).sustain(0) // make notes short
  .s('triangle') // waveform
  .degradeBy(perlin.range(0,.5)) // randomly controlled random removal :)
@@ -78,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, started } = useStrudel({
+  const { scheduler, evaluate, schedulerError, evalError, isDirty, activeCode, pattern } = useStrudel({
    code,
    defaultOutput: webaudioOutput,
    getTime,
@@ -87,8 +75,8 @@ function App() {
  useHighlighting({
    view,
    pattern,
-    active: started && !activeCode?.includes('strudel disable-highlighting'),
-    getTime: () => scheduler.now(),
+    active: !activeCode?.includes('strudel disable-highlighting'),
+    getTime: () => scheduler.getPhase(),
  });

  const error = evalError || schedulerError;
@@ -115,7 +103,7 @@ function App() {
          }
        }
      },
-      [scheduler, evaluate, view, code],
+      [scheduler, evaluate, view],
    ),
  );
  return (
@@ -2,18 +2,6 @@
@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;
 }
@@ -6,23 +6,9 @@ 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}', '../../src/**/*.{html,js,jsx,md,mdx,ts,tsx}'],
+  content: ['./src/**/*.{js,jsx,ts,tsx}'],
  theme: {
-    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)',
-      },
-    },
+    extend: {},
  },
  plugins: [],
 };
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/react",
-  "version": "0.8.0",
+  "version": "0.6.0",
  "description": "React components for strudel",
  "main": "src/index.js",
  "publishConfig": {
@@ -32,33 +32,31 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@codemirror/autocomplete": "^6.6.0",
-    "@codemirror/lang-javascript": "^6.1.7",
+    "@codemirror/autocomplete": "^6.4.0",
+    "@codemirror/lang-javascript": "^6.1.1",
    "@codemirror/state": "^6.2.0",
-    "@codemirror/view": "^6.10.0",
-    "@lezer/highlight": "^1.1.4",
-    "@replit/codemirror-emacs": "^6.0.1",
-    "@replit/codemirror-vim": "^6.0.14",
+    "@codemirror/view": "^6.7.3",
+    "@lezer/highlight": "^1.1.3",
    "@strudel.cycles/core": "workspace:*",
    "@strudel.cycles/transpiler": "workspace:*",
    "@strudel.cycles/webaudio": "workspace:*",
-    "@uiw/codemirror-themes": "^4.19.16",
-    "@uiw/react-codemirror": "^4.19.16",
+    "@uiw/codemirror-themes": "^4.12.4",
+    "@uiw/react-codemirror": "^4.12.4",
    "react-hook-inview": "^4.5.0"
  },
  "peerDependencies": {
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
  },
  "devDependencies": {
-    "@types/react": "^18.2.0",
-    "@types/react-dom": "^18.2.1",
-    "@vitejs/plugin-react": "^4.0.0",
-    "autoprefixer": "^10.4.14",
-    "postcss": "^8.4.23",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "tailwindcss": "^3.3.2",
-    "vite": "^4.3.3"
+    "@types/react": "^17.0.2",
+    "@types/react-dom": "^17.0.2",
+    "@vitejs/plugin-react": "^2.2.0",
+    "autoprefixer": "^10.4.7",
+    "postcss": "^8.4.18",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "tailwindcss": "^3.0.24",
+    "vite": "^3.2.2"
  }
 }
@@ -8,6 +8,8 @@ evalScope(
  import('@strudel.cycles/core'),
  import('@strudel.cycles/tonal'),
  import('@strudel.cycles/mini'),
+  import('@strudel.cycles/midi'),
+  import('@strudel.cycles/xen'),
  import('@strudel.cycles/webaudio'),
 );

@@ -1,15 +1,13 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import _CodeMirror from '@uiw/react-codemirror';
 import { EditorView, Decoration } from '@codemirror/view';
 import { StateField, StateEffect } from '@codemirror/state';
-import { javascript, javascriptLanguage } from '@codemirror/lang-javascript';
+import { javascript } from '@codemirror/lang-javascript';
 import strudelTheme from '../themes/strudel-theme';
 import './style.css';
 import { useCallback } from 'react';
 import { autocompletion } from '@codemirror/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({
@@ -58,19 +56,15 @@ const highlightField = StateField.define({
            haps
              .map((hap) =>
                (hap.context.locations || []).map(({ start, end }) => {
-                  const color = hap.context.color || e.value.color;
+                  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
                  }
-                  let mark;
-                  if (color) {
-                    mark = Decoration.mark({ attributes: { style: `outline: 2px solid ${color};` } });
-                  } else {
-                    mark = Decoration.mark({ attributes: { class: `outline outline-2 outline-foreground` } });
-                  }
+                  // const mark = Decoration.mark({ attributes: { style: `outline: 1px solid ${color}` } });
+                  const mark = Decoration.mark({ attributes: { style: `outline: 1.5px solid ${color};` } });
                  return mark.range(from, to);
                }),
              )
@@ -88,7 +82,14 @@ const highlightField = StateField.define({
  provide: (f) => EditorView.decorations.from(f),
 });

-const staticExtensions = [javascript(), highlightField, flashField];
+const extensions = [
+  javascript(),
+  highlightField,
+  flashField,
+  // javascriptLanguage.data.of({ autocomplete: strudelAutocomplete }),
+  // autocompletion({ override: [strudelAutocomplete] }),
+  autocompletion({ override: [] }), // wait for https://github.com/uiwjs/react-codemirror/pull/458
+];

 export default function CodeMirror({
  value,
@@ -96,12 +97,6 @@ export default function CodeMirror({
  onViewChanged,
  onSelectionChange,
  theme,
-  keybindings,
-  isLineNumbersDisplayed,
-  isAutoCompletionEnabled,
-  isLineWrappingEnabled,
-  fontSize = 18,
-  fontFamily = 'monospace',
  options,
  editorDidMount,
 }) {
@@ -111,14 +106,12 @@ export default function CodeMirror({
    },
    [onChange],
  );
-
  const handleOnCreateEditor = useCallback(
    (view) => {
      onViewChanged?.(view);
    },
    [onViewChanged],
  );
-
  const handleOnUpdate = useCallback(
    (viewUpdate) => {
      if (viewUpdate.selectionSet && onSelectionChange) {
@@ -127,33 +120,8 @@ export default function CodeMirror({
    },
    [onSelectionChange],
  );
-
-  const extensions = useMemo(() => {
-    let _extensions = [...staticExtensions];
-    let bindings = {
-      vim,
-      emacs,
-    };
-
-    if (bindings[keybindings]) {
-      _extensions.push(bindings[keybindings]());
-    }
-
-    if (isAutoCompletionEnabled) {
-      _extensions.push(javascriptLanguage.data.of({ autocomplete: strudelAutocomplete }));
-    } else {
-      _extensions.push(autocompletion({ override: [] }));
-    }
-
-    if (isLineWrappingEnabled) {
-      _extensions.push(EditorView.lineWrapping);
-    }
-
-    return _extensions;
-  }, [keybindings, isAutoCompletionEnabled, isLineWrappingEnabled]);
-
  return (
-    <div style={{ fontSize, fontFamily }} className="w-full">
+    <>
      <_CodeMirror
        value={value}
        theme={theme || strudelTheme}
@@ -161,9 +129,8 @@ export default function CodeMirror({
        onCreateEditor={handleOnCreateEditor}
        onUpdate={handleOnUpdate}
        extensions={extensions}
-        basicSetup={{ lineNumbers: isLineNumbersDisplayed }}
      />
-    </div>
+    </>
  );
 }

@@ -7,6 +7,7 @@ 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';
@@ -18,24 +19,17 @@ export function MiniRepl({
  tune,
  hideOutsideView = false,
  enableKeyboard,
-  onTrigger,
  drawTime,
  punchcard,
-  punchcardLabels,
-  onPaint,
  canvasHeight = 200,
-  fontSize = 18,
-  fontFamily,
-  hideHeader = false,
  theme,
-  keybindings,
-  isLineNumbersDisplayed,
+  highlightColor,
 }) {
  drawTime = drawTime || (punchcard ? [0, 4] : undefined);
  const evalOnMount = !!drawTime;
  const drawContext = useCallback(
-    punchcard ? (canvasId) => document.querySelector('#' + canvasId)?.getContext('2d') : null,
-    [punchcard],
+    !!drawTime ? (canvasId) => document.querySelector('#' + canvasId)?.getContext('2d') : null,
+    [drawTime],
  );
  const {
    code,
@@ -55,18 +49,7 @@ export function MiniRepl({
  } = useStrudel({
    initialCode: tune,
    defaultOutput: webaudioOutput,
-    editPattern: (pat, id) => {
-      //pat = pat.withContext((ctx) => ({ ...ctx, id }));
-      if (onTrigger) {
-        pat = pat.onTrigger(onTrigger, false);
-      }
-      if (onPaint) {
-        pat = pat.onPaint(onPaint);
-      } else if (punchcard) {
-        pat = pat.punchcard({ labels: punchcardLabels });
-      }
-      return pat;
-    },
+    editPattern: (pat) => (punchcard ? pat.punchcard() : pat),
    getTime,
    evalOnMount,
    drawContext,
@@ -89,6 +72,7 @@ export function MiniRepl({
    pattern,
    active: started && !activeCode?.includes('strudel disable-highlighting'),
    getTime: () => scheduler.now(),
+    color: highlightColor,
  });

  // keyboard shortcuts
@@ -101,7 +85,7 @@ export function MiniRepl({
              e.preventDefault();
              flash(view);
              await activateCode();
-            } else if (e.key === '.' || e.code === 'Period') {
+            } else if (e.code === 'Period') {
              stop();
              e.preventDefault();
            }
@@ -112,6 +96,26 @@ export function MiniRepl({
    ),
  );

+  // set active pattern on ctrl+enter
+  useLayoutEffect(() => {
+    if (enableKeyboard) {
+      const handleKeyPress = async (e) => {
+        if (e.ctrlKey || e.altKey) {
+          if (e.code === 'Enter') {
+            e.preventDefault();
+            flash(view);
+            await activateCode();
+          } else if (e.code === 'Period') {
+            stop();
+            e.preventDefault();
+          }
+        }
+      };
+      window.addEventListener('keydown', handleKeyPress, true);
+      return () => window.removeEventListener('keydown', handleKeyPress, true);
+    }
+  }, [enableKeyboard, pattern, code, evaluate, stop, view]);
+
  const [log, setLog] = useState([]);
  useLogger(
    useCallback((e) => {
@@ -120,54 +124,29 @@ export function MiniRepl({
      // const logId = data?.pattern?.meta?.id;
      if (logId === replId) {
        setLog((l) => {
-          return l.concat([e.detail]).slice(-8);
+          return l.concat([e.detail]).slice(-10);
        });
      }
    }, []),
  );

  return (
-    <div className="overflow-hidden rounded-t-md bg-background border border-lineHighlight" ref={ref}>
-      {!hideHeader && (
-        <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(
-                '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>
+    <div className={styles.container} ref={ref}>
+      <div className={styles.header}>
+        <div className={styles.buttons}>
+          <button className={cx(styles.button, started ? 'animate-pulse' : '')} onClick={() => togglePlay()}>
+            <Icon type={started ? 'stop' : 'play'} />
+          </button>
+          <button className={cx(isDirty ? styles.button : styles.buttonDisabled)} onClick={() => activateCode()}>
+            <Icon type="refresh" />
+          </button>
        </div>
-      )}
-      <div className="overflow-auto relative">
-        {show && (
-          <CodeMirror6
-            value={code}
-            onChange={setCode}
-            onViewChanged={setView}
-            theme={theme}
-            fontFamily={fontFamily}
-            fontSize={fontSize}
-            keybindings={keybindings}
-            isLineNumbersDisplayed={isLineNumbersDisplayed}
-          />
-        )}
-        {error && <div className="text-right p-1 text-md text-red-200">{error.message}</div>}
+        {error && <div className={styles.error}>{error.message}</div>}
      </div>
-      {punchcard && (
+      <div className={styles.body}>
+        {show && <CodeMirror6 value={code} onChange={setCode} onViewChanged={setView} theme={theme} />}
+      </div>
+      {drawTime && (
        <canvas
          id={canvasId}
          className="w-full pointer-events-none"
@@ -0,0 +1,27 @@
+.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;
+}
@@ -1,30 +1,14 @@
-:root {
-  --background: #222;
-  --lineBackground: #22222299;
-  --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 {
  width: 100%;
 }
-
-footer {
-  z-index: 0 !important;
-}
@@ -1,8 +1,7 @@
 import { useEffect, useRef } from 'react';
 import { setHighlights } from '../components/CodeMirror6';
-const round = (x) => Math.round(x * 1000) / 1000;

-function useHighlighting({ view, pattern, active, getTime }) {
+function useHighlighting({ view, pattern, active, getTime, color }) {
  const highlights = useRef([]);
  const lastEnd = useRef(0);
  useEffect(() => {
@@ -15,12 +14,12 @@ function useHighlighting({ view, pattern, active, getTime }) {
            // 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 = [round(begin), round(audioTime + 1 / 60)];
+            const span = [begin, audioTime + 1 / 60];
            lastEnd.current = span[1];
-            highlights.current = highlights.current.filter((hap) => hap.endClipped > audioTime); // keep only highlights that are still active
+            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 }) }); // highlight all still active + new active haps
+            view.dispatch({ effects: setHighlights.of({ haps: highlights.current, color }) }); // highlight all still active + new active haps
          } catch (err) {
            view.dispatch({ effects: setHighlights.of({ haps: [] }) });
          }
@@ -34,7 +33,7 @@ function useHighlighting({ view, pattern, active, getTime }) {
        view.dispatch({ effects: setHighlights.of({ haps: [] }) });
      }
    }
-  }, [pattern, active, view]);
+  }, [pattern, active, view, color]);
 }

 export default useHighlighting;
@@ -10,6 +10,7 @@ function useStrudel({
  getTime,
  evalOnMount = false,
  initialCode = '',
+  autolink = false,
  beforeEval,
  afterEval,
  editPattern,
@@ -29,11 +30,10 @@ function useStrudel({
  const [pattern, setPattern] = useState();
  const [started, setStarted] = useState(false);
  const isDirty = code !== activeCode;
-  //const shouldPaint = useCallback((pat) => !!(pat?.context?.onPaint && drawContext), [drawContext]);
-  const shouldPaint = useCallback((pat) => !!pat?.context?.onPaint, []);
+  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, setCps } = useMemo(
+  const { scheduler, evaluate, start, stop, pause } = useMemo(
    () =>
      repl({
        interval,
@@ -47,17 +47,19 @@ function useStrudel({
        drawContext,
        transpiler,
        editPattern,
-        beforeEval: async ({ code }) => {
+        beforeEval: ({ code }) => {
          setCode(code);
-          await beforeEval?.();
+          beforeEval?.();
        },
-        afterEval: (res) => {
-          const { pattern: _pattern, code } = res;
+        afterEval: ({ pattern: _pattern, code }) => {
          setActiveCode(code);
          setPattern(_pattern);
          setEvalError();
          setSchedulerError();
-          afterEval?.(res);
+          if (autolink) {
+            window.location.hash = '#' + encodeURIComponent(btoa(code));
+          }
+          afterEval?.();
        },
        onToggle: (v) => {
          setStarted(v);
@@ -154,7 +156,6 @@ function useStrudel({
    stop,
    pause,
    togglePlay,
-    setCps,
  };
 }

@@ -1,9 +1,10 @@
 import React from 'react';
+import ReactDOM from 'react-dom';
 import App from './App';
-import { createRoot } from 'react-dom/client';

-createRoot(document.getElementById('root')).render(
+ReactDOM.render(
  <React.StrictMode>
    <App />
  </React.StrictMode>,
+  document.getElementById('root'),
 );
@@ -1,39 +0,0 @@
-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' },
-  ],
-});
@@ -1,37 +0,0 @@
-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' },
-  ],
-});
@@ -1,40 +0,0 @@
-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' },
-  ],
-});
@@ -1,36 +0,0 @@
-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' },
-  ],
-});
@@ -1,38 +0,0 @@
-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' },
-  ],
-});
@@ -1,21 +1,7 @@
 module.exports = {
  content: ['./src/**/*.{js,jsx,ts,tsx}'],
  theme: {
-    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)',
-      },
-    },
+    extend: {},
  },
  plugins: [],
  corePlugins: {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/serial",
-  "version": "0.8.0",
+  "version": "0.6.0",
  "description": "Webserial API for strudel",
  "main": "serial.mjs",
  "publishConfig": {
@@ -32,6 +32,6 @@
    "@strudel.cycles/core": "workspace:*"
  },
  "devDependencies": {
-    "vite": "^4.3.3"
+    "vite": "^3.2.2"
  }
 }
@@ -1,6 +1,4 @@
-import { noteToMidi, freqToMidi } from '@strudel.cycles/core';
-import { getAudioContext, registerSound, getEnvelope } from '@strudel.cycles/webaudio';
-import gm from './gm.mjs';
+import { toMidi } from '@strudel.cycles/core';

 let loadCache = {};
 async function loadFont(name) {
@@ -10,6 +8,7 @@ async function loadFont(name) {
  const load = async () => {
    // TODO: make soundfont source configurable
    const url = `https://felixroos.github.io/webaudiofontdata/sound/${name}.js`;
+    console.log('load font', name, url);
    const preset = await fetch(url).then((res) => res.text());
    let [_, data] = preset.split('={');
    return eval('{' + data);
@@ -18,24 +17,15 @@ async function loadFont(name) {
  return loadCache[name];
 }

-export async function getFontBufferSource(name, value, ac) {
-  let { note = 'c3', freq } = value;
-  let midi;
-  if (freq) {
-    midi = freqToMidi(freq);
-  } else if (typeof note === 'string') {
-    midi = noteToMidi(note);
-  } else if (typeof note === 'number') {
-    midi = note;
-  } else {
-    throw new Error(`unexpected "note" type "${typeof note}"`);
+export async function getFontBufferSource(name, pitch, ac) {
+  if (typeof pitch === 'string') {
+    pitch = toMidi(pitch);
  }
-
-  const { buffer, zone } = await getFontPitch(name, midi, ac);
+  const { buffer, zone } = await getFontPitch(name, pitch, ac);
  const src = ac.createBufferSource();
  src.buffer = buffer;
  const baseDetune = zone.originalPitch - 100.0 * zone.coarseTune - zone.fineTune;
-  const playbackRate = 1.0 * Math.pow(2, (100.0 * midi - baseDetune) / 1200.0);
+  const playbackRate = 1.0 * Math.pow(2, (100.0 * pitch - baseDetune) / 1200.0);
  // src detune?
  src.playbackRate.value = playbackRate;
  const loop = zone.loopStart > 1 && zone.loopStart < zone.loopEnd;
@@ -124,32 +114,3 @@ async function getBuffer(zone, audioContext) {
    }
  }
 }
-
-export function registerSoundfonts() {
-  Object.entries(gm).forEach(([name, fonts]) => {
-    registerSound(
-      name,
-      async (time, value, onended) => {
-        const { n = 0 } = value;
-        const { attack = 0.001, decay = 0.001, sustain = 1, release = 0.001 } = value;
-        const font = fonts[n % fonts.length];
-        const ctx = getAudioContext();
-        const bufferSource = await getFontBufferSource(font, value, ctx);
-        bufferSource.start(time);
-        const { node: envelope, stop: releaseEnvelope } = getEnvelope(attack, decay, sustain, release, 0.3, time);
-        bufferSource.connect(envelope);
-        const stop = (releaseTime) => {
-          bufferSource.stop(releaseTime + release);
-          releaseEnvelope(releaseTime);
-        };
-        bufferSource.onended = () => {
-          bufferSource.disconnect();
-          envelope.disconnect();
-          onended();
-        };
-        return { node: envelope, stop };
-      },
-      { type: 'soundfont', prebake: true, fonts },
-    );
-  });
-}
@@ -1,6 +1,6 @@
-import { getFontBufferSource, registerSoundfonts } from './fontloader.mjs';
+import { getFontBufferSource } from './fontloader.mjs';
 import * as soundfontList from './list.mjs';
 import { startPresetNote } from 'sfumato';
 import { loadSoundfont } from './sfumato.mjs';

-export { loadSoundfont, startPresetNote, getFontBufferSource, soundfontList, registerSoundfonts };
+export { loadSoundfont, startPresetNote, getFontBufferSource, soundfontList };
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/soundfonts",
-  "version": "0.8.2",
+  "version": "0.6.0",
  "description": "Soundsfont support for strudel",
  "main": "index.mjs",
  "publishConfig": {
@@ -36,7 +36,7 @@
    "soundfont2": "^0.4.0"
  },
  "devDependencies": {
-    "node-fetch": "^3.3.1",
-    "vite": "^4.3.3"
+    "node-fetch": "^3.2.6",
+    "vite": "^3.2.2"
  }
 }
@@ -1,5 +1,5 @@
-import { Pattern, getPlayableNoteValue, noteToMidi } from '@strudel.cycles/core';
-import { getAudioContext, registerSound } from '@strudel.cycles/webaudio';
+import { Pattern, getPlayableNoteValue, toMidi } from '@strudel.cycles/core';
+import { getAudioContext } from '@strudel.cycles/webaudio';
 import { loadSoundfont as _loadSoundfont, startPresetNote } from 'sfumato';

 Pattern.prototype.soundfont = function (sf, n = 0) {
@@ -8,7 +8,7 @@ Pattern.prototype.soundfont = function (sf, n = 0) {
    const note = getPlayableNoteValue(h);
    const preset = sf.presets[n % sf.presets.length];
    const deadline = ctx.currentTime + t - ct;
-    const args = [ctx, preset, noteToMidi(note), deadline];
+    const args = [ctx, preset, toMidi(note), deadline];
    const stop = startPresetNote(...args);
    stop(deadline + h.duration);
  });
@@ -21,29 +21,5 @@ export function loadSoundfont(url) {
  }
  const sf = _loadSoundfont(url);
  soundfontCache.set(url, sf);
-  /*sf.then((font) => {
-    font.presets.forEach((preset) => {
-      console.log('preset', preset.header.name);
-      registerSound(
-        preset.header.name.replaceAll(' ', '_'),
-        (time, value, onended) => {
-          const ctx = getAudioContext();
-          let { note } = value; // freq ?
-
-          const p = font.presets.find((p) => p.header.name === preset.header.name);
-
-          if (!p) {
-            throw new Error('preset not found');
-          }
-          const deadline = time; // - ctx.currentTime;
-          const args = [ctx, p, noteToMidi(note), deadline];
-          const stop = startPresetNote(...args);
-          return { node: undefined, stop };
-        },
-        { type: 'soundfont' },
-      );
-    });
-    //console.log('f', f);
-  });*/
  return sf;
 }
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/tonal",
-  "version": "0.8.2",
+  "version": "0.6.0",
  "description": "Tonal functions for strudel",
  "main": "index.mjs",
  "publishConfig": {
@@ -34,10 +34,10 @@
    "@strudel.cycles/core": "workspace:*",
    "@tonaljs/tonal": "^4.7.2",
    "chord-voicings": "^0.0.1",
-    "webmidi": "^3.1.5"
+    "webmidi": "^3.0.21"
  },
  "devDependencies": {
-    "vite": "^4.3.3",
-    "vitest": "^0.28.0"
+    "vite": "^3.2.2",
+    "vitest": "^0.25.7"
  }
 }
@@ -9,7 +9,6 @@ This program is free software: you can redistribute it and/or modify it under th
 import '../tonal.mjs'; // need to import this to add prototypes
 import { pure, controls, seq } from '@strudel.cycles/core';
 import { describe, it, expect } from 'vitest';
-import { mini } from '../../mini/mini.mjs';
 const { n } = controls;

 describe('tonal', () => {
@@ -31,18 +30,4 @@ describe('tonal', () => {
        .firstCycleValues.map((h) => h.note),
    ).toEqual(['C3', 'D3', 'E3']);
  });
-  it('scale with colon', () => {
-    expect(
-      n(0, 1, 2)
-        .scale('C:major')
-        .firstCycleValues.map((h) => h.note),
-    ).toEqual(['C3', 'D3', 'E3']);
-  });
-  it('scale with mininotation colon', () => {
-    expect(
-      n(0, 1, 2)
-        .scale(mini('C:major'))
-        .firstCycleValues.map((h) => h.note),
-    ).toEqual(['C3', 'D3', 'E3']);
-  });
 });
@@ -123,37 +123,29 @@ export const scaleTranspose = register('scaleTranspose', function (offset /* : n
 /**
 * Turns numbers into notes in the scale (zero indexed). Also sets scale for other scale operations, like {@link Pattern#scaleTranspose}.
 *
- * A scale consists of a root note (e.g. `c4`, `c`, `f#`, `bb4`) followed by semicolon (':') and then a [scale type](https://github.com/tonaljs/tonal/blob/main/packages/scale-type/data.ts).
- *
+ * A scale consists of a root note (e.g. `c4`, `c`, `f#`, `bb4`) followed by a [scale type](https://github.com/tonaljs/tonal/blob/main/packages/scale-type/data.ts).
 * The root note defaults to octave 3, if no octave number is given.
+ * Note that you currently cannot pattern `scale` with the mini notation, because the scale name includes a space.
+ * This will be improved in the future. Until then, use a sequence function like `cat` or `seq`.
 *
 * @memberof Pattern
 * @name scale
 * @param {string} scale Name of scale
 * @returns Pattern
 * @example
- * "0 2 4 6 4 2".scale("C2:major").note()
+ * "0 2 4 6 4 2".scale('C2 major').note()
 * @example
 * "0 2 4 6 4 2"
- * .scale("C2:<major minor>")
+ * .scale(seq('C2 major', 'C2 minor').slow(2))
 * .note()
- * @example
- * "0 1 2 3 4 5 6 7".rev().scale("C2:<major minor>").note()
- * .s("folkharp")
 */

-export const scale = register('scale', function (scale, pat) {
-  // Supports ':' list syntax in mininotation
-  if (Array.isArray(scale)) {
-    scale = scale.flat().join(' ');
-  }
+export const scale = register('scale', function (scale /* : string */, pat) {
  return pat.withHap((hap) => {
    const isObject = typeof hap.value === 'object';
    let note = isObject ? hap.value.n : hap.value;
    const asNumber = Number(note);
    if (!isNaN(asNumber)) {
-      // TODO: worth keeping for supporting ':' in (non-mininotation) strings?
-      scale = scale.replaceAll(':', ' ');
      let [tonic, scaleName] = Scale.tokenize(scale);
      const { pc, oct = 3 } = Note.get(tonic);
      note = scaleOffset(pc + ' ' + scaleName, asNumber, pc + oct);
@@ -6,53 +6,10 @@ This program is free software: you can redistribute it and/or modify it under th

 import { stack, register } from '@strudel.cycles/core';
 import _voicings from 'chord-voicings';
-const { dictionaryVoicing, minTopNoteDiff } = _voicings.default || _voicings; // parcel module resolution fuckup
-
-const lefthand = {
-  m7: ['3m 5P 7m 9M', '7m 9M 10m 12P'],
-  7: ['3M 6M 7m 9M', '7m 9M 10M 13M'],
-  '^7': ['3M 5P 7M 9M', '7M 9M 10M 12P'],
-  69: ['3M 5P 6A 9M'],
-  m7b5: ['3m 5d 7m 8P', '7m 8P 10m 12d'],
-  '7b9': ['3M 6m 7m 9m', '7m 9m 10M 13m'],
-  '7b13': ['3M 6m 7m 9m', '7m 9m 10M 13m'],
-  o7: ['1P 3m 5d 6M', '5d 6M 8P 10m'],
-  '7#11': ['7m 9M 11A 13A'],
-  '7#9': ['3M 7m 9A'],
-  mM7: ['3m 5P 7M 9M', '7M 9M 10m 12P'],
-  m6: ['3m 5P 6M 9M', '6M 9M 10m 12P'],
-};
-
-const guidetones = {
-  m7: ['3m 7m', '7m 10m'],
-  m9: ['3m 7m', '7m 10m'],
-  7: ['3M 7m', '7m 10M'],
-  '^7': ['3M 7M', '7M 10M'],
-  '^9': ['3M 7M', '7M 10M'],
-  69: ['3M 6M'],
-  6: ['3M 6M', '6M 10M'],
-  m7b5: ['3m 7m', '7m 10m'],
-  '7b9': ['3M 7m', '7m 10M'],
-  '7b13': ['3M 7m', '7m 10M'],
-  o7: ['3m 6M', '6M 10m'],
-  '7#11': ['3M 7m', '7m 10M'],
-  '7#9': ['3M 7m', '7m 10M'],
-  mM7: ['3m 7M', '7M 10m'],
-  m6: ['3m 6M', '6M 10m'],
-};
-
-const triads = {
-  '': ['1P 3M 5P', '3M 5P 8P', '5P 8P 10M'],
-  M: ['1P 3M 5P', '3M 5P 8P', '5P 8P 10M'],
-  m: ['1P 3m 5P', '3m 5P 8P', '5P 8P 10m'],
-  o: ['1P 3m 5d', '3m 5d 8P', '5d 8P 10m'],
-  aug: ['1P 3m 5A', '3m 5A 8P', '5A 8P 10m'],
-};
+const { dictionaryVoicing, minTopNoteDiff, lefthand } = _voicings.default || _voicings; // parcel module resolution fuckup

 export const voicingRegistry = {
  lefthand: { dictionary: lefthand, range: ['F3', 'A4'] },
-  triads: { dictionary: triads },
-  guidetones: { dictionary: guidetones },
 };
 export const setVoicingRange = (name, range) => addVoicings(name, voicingRegistry[name].dictionary, range);

@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/tone",
-  "version": "0.8.0",
+  "version": "0.6.0",
  "description": "Tone.js API for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -34,7 +34,7 @@
    "tone": "^14.7.77"
  },
  "devDependencies": {
-    "vite": "^4.3.3",
-    "vitest": "^0.28.0"
+    "vite": "^3.2.2",
+    "vitest": "^0.25.7"
  }
 }
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/transpiler",
-  "version": "0.8.2",
+  "version": "0.6.0",
  "description": "Transpiler for strudel user code. Converts syntactically correct but semantically meaningless JS into evaluatable strudel code.",
  "main": "index.mjs",
  "publishConfig": {
@@ -36,7 +36,7 @@
    "estree-walker": "^3.0.1"
  },
  "devDependencies": {
-    "vite": "^4.3.3",
-    "vitest": "^0.28.0"
+    "vite": "^3.2.2",
+    "vitest": "^0.25.8"
  }
 }
@@ -1,82 +0,0 @@
-# @strudel/web
-
-This package provides an easy to use bundle of multiple strudel packages for the web.
-
-## Usage
-
-Save this code as a `.html` file and double click it:
-
-```html
-<!DOCTYPE html>
-<button id="play">play</button>
-<button id="stop">stop</button>
-<script type="module">
-  import { initStrudel } from 'https://cdn.skypack.dev/@strudel/web@0.8.2';
-
-  initStrudel();
-  document.getElementById('play').addEventListener('click', () => note('<c a f e>(3,8)').play());
-  document.getElementById('stop').addEventListener('click', () => hush());
-</script>
-```
-
-With the help of [skypack](https://www.skypack.dev/), you don't need a bundler nor a server.
-
-As soon as you call `initStrudel()`, all strudel functions are made available.
-In this case, we are using the `note` function to create a pattern.
-To actually play the pattern, you have to append `.play()` to the end.
-
-Note: Due to the [Autoplay policy](https://developer.mozilla.org/en-US/docs/Web/API/Web_Audio_API/Best_practices#autoplay_policy), you can only play audio in a browser after a click event.
-
-### Via npm
-
-If you're using a bundler, you can install the package via `npm i @strudel/web`, then just import it like:
-
-```js
-import { initStrudel } from '@strudel/web';
-```
-
-The rest of the code should be the same. Check out [vite](https://vitejs.dev/) for a good bundler / dev server.
-
-### Loading samples
-
-By default, no external samples are loaded, but you can add them like this:
-
-```js
-initStrudel({
-  prebake: () => samples('github:tidalcycles/Dirt-Samples/master'),
-});
-
-document.getElementById('play').addEventListener('click', 
-  () => s("bd sd").play()
-)
-```
-
-You can learn [more about the `samples` function here](https://strudel.tidalcycles.org/learn/samples#loading-custom-samples).
-
-### Evaluating Code
-
-Instead of creating patterns directly in JS, you might also want to take in user input and turn that into a pattern.
-This is called evaluation: Taking a piece of code and executing it on the fly.
-
-To do that, you can use the `evaluate` function:
-
-```js
-initStrudel();
-document.getElementById('play').addEventListener('click', 
-  () => evaluate('note("c a f e").jux(rev)')
-);
-document.getElementById('play').addEventListener('stop', 
-  () => hush()
-);
-```
-
-### Double vs Single Quotes
-
-There is a tiny difference between the [Strudel REPL](https://strudel.tidalcycles.org/) and `@strudel/web`.
-In the REPL you can use 'single quotes' for regular JS strings and "double quotes" for mini notation patterns.
-In `@strudel/web`, it does not matter which types of quotes you're using.
-There will probably be an escapte hatch for that in the future.
-
-## More Examples
-
-Check out the examples folder for more examples, both using plain html and vite!
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<button id="play">play</button>
-<button id="stop">stop</button>
-<script type="module">
-  import { initStrudel } from 'https://cdn.skypack.dev/@strudel/web@0.8.2';
-
-  initStrudel();
-  document.getElementById('play').addEventListener('click', () => evaluate('note("c a f e").jux(rev)'));
-  document.getElementById('play').addEventListener('stop', () => hush());
-</script>
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<button id="a">A</button>
-<button id="b">B</button>
-<button id="c">C</button>
-<button id="stop">stop</button>
-<script type="module">
-  import { initStrudel } from 'https://cdn.skypack.dev/@strudel/web@0.8.2';
-  initStrudel({
-    prebake: () => samples('github:tidalcycles/Dirt-Samples/master'),
-  });
-  const click = (id, action) => document.getElementById(id).addEventListener('click', action);
-  click('a', () => evaluate(`s('bd,jvbass(3,8)').jux(rev)`));
-  click('b', () => s('bd*2,hh(3,4),jvbass(5,8,1)').jux(rev).play());
-  click('c', () => s('bd*2,hh(3,4),jvbass:[0 4](5,8,1)').jux(rev).stack(s('~ sd')).play());
-  click('stop', () => hush());
-</script>
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<button id="play">play</button>
-<button id="stop">stop</button>
-<script type="module">
-  import { initStrudel } from 'https://cdn.skypack.dev/@strudel/web@0.8.2';
-
-  initStrudel();
-  document.getElementById('play').addEventListener('click', () => note('<c a f e>(3,8)').play());
-  document.getElementById('stop').addEventListener('click', () => hush());
-</script>
@@ -1,24 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-node_modules
-dist
-dist-ssr
-*.local
-
-# Editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea
-.DS_Store
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="https://strudel.tidalcycles.org/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@strudel/web REPL Example</title>
-  </head>
-  <body>
-    <div id="app"></div>
-    <button id="a">A</button>
-    <button id="b">B</button>
-    <button id="c">C</button>
-    <button id="stop">stop</button>
-    <script type="module">
-      import { initStrudel } from '@strudel/web';
-      initStrudel({
-        prebake: () => samples('github:tidalcycles/Dirt-Samples/master'),
-      });
-
-      const click = (id, action) => document.getElementById(id).addEventListener('click', action);
-      click('a', () => evaluate(`s('bd,jvbass(3,8)').jux(rev)`));
-      click('b', () => s('bd*2,hh(3,4),jvbass(5,8,1)').jux(rev).play());
-      click('c', () => s('bd*2,hh(3,4),jvbass:[0 4](5,8,1)').jux(rev).stack(s('~ sd')).play());
-      click('stop', () => hush());
-    </script>
-  </body>
-</html>
@@ -1,18 +0,0 @@
-{
-  "name": "repl-example",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "license": "AGPL-3.0-or-later",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "preview": "vite preview"
-  },
-  "devDependencies": {
-    "vite": "^4.3.2"
-  },
-  "dependencies": {
-    "@strudel/web": "workspace:*"
-  }
-}
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<button id="play">play</button>
-<button id="stop">stop</button>
-<script type="module">
-  import { initStrudel } from 'https://cdn.skypack.dev/@strudel/web@0.8.2';
-
-  initStrudel({
-    prebake: () => samples('github:tidalcycles/Dirt-Samples/master'),
-  });
-  document.getElementById('play').addEventListener('click', () => s('[bd sd](3,8)').play());
-  document.getElementById('stop').addEventListener('click', () => hush());
-</script>
@@ -1,45 +0,0 @@
-{
-  "name": "@strudel/web",
-  "version": "0.8.3",
-  "description": "Easy to setup, opiniated bundle of Strudel for the browser.",
-  "main": "web.mjs",
-  "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
-  },
-  "scripts": {
-    "build": "vite build",
-    "prepublishOnly": "npm run build"
-  },
-  "type": "module",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/tidalcycles/strudel.git"
-  },
-  "keywords": [
-    "tidalcycles",
-    "strudel",
-    "pattern",
-    "livecoding",
-    "algorave"
-  ],
-  "author": "Felix Roos <flix91@gmail.com>",
-  "contributors": [
-    "Alex McLean <alex@slab.org>"
-  ],
-  "license": "AGPL-3.0-or-later",
-  "bugs": {
-    "url": "https://github.com/tidalcycles/strudel/issues"
-  },
-  "homepage": "https://github.com/tidalcycles/strudel#readme",
-  "dependencies": {
-    "@strudel.cycles/core": "workspace:*",
-    "@strudel.cycles/mini": "workspace:*",
-    "@strudel.cycles/tonal": "workspace:*",
-    "@strudel.cycles/transpiler": "workspace:*",
-    "@strudel.cycles/webaudio": "workspace:*"
-  },
-  "devDependencies": {
-    "vite": "^4.3.3"
-  }
-}
@@ -1,19 +0,0 @@
-import { defineConfig } from 'vite';
-import { dependencies } from './package.json';
-import { resolve } from 'path';
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [],
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'web.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' }[ext]),
-    },
-    rollupOptions: {
-      external: [...Object.keys(dependencies)],
-    },
-    target: 'esnext',
-  },
-});
@@ -1,66 +0,0 @@
-export * from '@strudel.cycles/core';
-export * from '@strudel.cycles/webaudio';
-//export * from '@strudel.cycles/soundfonts';
-export * from '@strudel.cycles/transpiler';
-export * from '@strudel.cycles/mini';
-export * from '@strudel.cycles/tonal';
-export * from '@strudel.cycles/webaudio';
-import { Pattern, evalScope, controls } from '@strudel.cycles/core';
-import { initAudioOnFirstClick, registerSynthSounds, webaudioScheduler } from '@strudel.cycles/webaudio';
-// import { registerSoundfonts } from '@strudel.cycles/soundfonts';
-import { evaluate as _evaluate } from '@strudel.cycles/transpiler';
-import { miniAllStrings } from '@strudel.cycles/mini';
-
-// init logic
-export async function defaultPrebake() {
-  const loadModules = evalScope(
-    evalScope,
-    controls,
-    import('@strudel.cycles/core'),
-    import('@strudel.cycles/mini'),
-    import('@strudel.cycles/tonal'),
-    import('@strudel.cycles/webaudio'),
-    { hush, evaluate },
-  );
-  await Promise.all([loadModules, registerSynthSounds() /* , registerSoundfonts() */]);
-}
-
-// when this function finishes, everything is initialized
-let initDone;
-
-let scheduler;
-export function initStrudel(options = {}) {
-  initAudioOnFirstClick();
-  miniAllStrings();
-  const { prebake, ...schedulerOptions } = options;
-
-  initDone = (async () => {
-    await defaultPrebake();
-    await prebake?.();
-  })();
-  scheduler = webaudioScheduler(schedulerOptions);
-}
-
-window.initStrudel = initStrudel;
-
-// this method will play the pattern on the default scheduler
-Pattern.prototype.play = function () {
-  if (!scheduler) {
-    throw new Error('.play: no scheduler found. Have you called init?');
-  }
-  initDone.then(() => {
-    scheduler.setPattern(this, true);
-  });
-  return this;
-};
-
-// stop playback
-export function hush() {
-  scheduler.stop();
-}
-
-// evaluate and play the given code using the transpiler
-export async function evaluate(code, autoplay = true) {
-  const { pattern } = await _evaluate(code);
-  autoplay && pattern.play();
-}
@@ -1,70 +0,0 @@
-import { getAudioContext } from './webaudio.mjs';
-
-export function gainNode(value) {
-  const node = getAudioContext().createGain();
-  node.gain.value = value;
-  return node;
-}
-
-export const getOscillator = ({ s, freq, t }) => {
-  // make oscillator
-  const o = getAudioContext().createOscillator();
-  o.type = s || 'triangle';
-  o.frequency.value = Number(freq);
-  o.start(t);
-  //o.stop(t + duration + release);
-  const stop = (time) => o.stop(time);
-  return { node: o, stop };
-};
-
-// alternative to getADSR returning the gain node and a stop handle to trigger the release anytime in the future
-export const getEnvelope = (attack, decay, sustain, release, velocity, begin) => {
-  const gainNode = getAudioContext().createGain();
-  gainNode.gain.setValueAtTime(0, begin);
-  gainNode.gain.linearRampToValueAtTime(velocity, begin + attack); // attack
-  gainNode.gain.linearRampToValueAtTime(sustain * velocity, begin + attack + decay); // sustain start
-  // sustain end
-  return {
-    node: gainNode,
-    stop: (t) => {
-      //if (typeof gainNode.gain.cancelAndHoldAtTime === 'function') {
-      // gainNode.gain.cancelAndHoldAtTime(t); // this seems to release instantly....
-      // see https://discord.com/channels/779427371270275082/937365093082079272/1086053607360712735
-      //} else {
-      // firefox: this will glitch when the sustain has not been reached yet at the time of release
-      gainNode.gain.setValueAtTime(sustain * velocity, t);
-      //}
-      gainNode.gain.linearRampToValueAtTime(0, t + release);
-    },
-  };
-};
-
-export const getADSR = (attack, decay, sustain, release, velocity, begin, end) => {
-  const gainNode = getAudioContext().createGain();
-  gainNode.gain.setValueAtTime(0, begin);
-  gainNode.gain.linearRampToValueAtTime(velocity, begin + attack); // attack
-  gainNode.gain.linearRampToValueAtTime(sustain * velocity, begin + attack + decay); // sustain start
-  gainNode.gain.setValueAtTime(sustain * velocity, end); // sustain end
-  gainNode.gain.linearRampToValueAtTime(0, end + release); // release
-  // for some reason, using exponential ramping creates little cracklings
-  /* let t = begin;
-  gainNode.gain.setValueAtTime(0, t);
-  gainNode.gain.exponentialRampToValueAtTime(velocity, (t += attack));
-  const sustainGain = Math.max(sustain * velocity, 0.001);
-  gainNode.gain.exponentialRampToValueAtTime(sustainGain, (t += decay));
-  if (end - begin < attack + decay) {
-    gainNode.gain.cancelAndHoldAtTime(end);
-  } else {
-    gainNode.gain.setValueAtTime(sustainGain, end);
-  }
-  gainNode.gain.exponentialRampToValueAtTime(0.001, end + release); // release */
-  return gainNode;
-};
-
-export const getFilter = (type, frequency, Q) => {
-  const filter = getAudioContext().createBiquadFilter();
-  filter.type = type;
-  filter.frequency.value = frequency;
-  filter.Q.value = Q;
-  return filter;
-};
@@ -6,5 +6,3 @@ This program is free software: you can redistribute it and/or modify it under th

 export * from './webaudio.mjs';
 export * from './sampler.mjs';
-export * from './helpers.mjs';
-export * from './synth.mjs';
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/webaudio",
-  "version": "0.8.2",
+  "version": "0.6.1",
  "description": "Web Audio helpers for Strudel",
  "main": "index.mjs",
  "type": "module",
@@ -34,10 +34,9 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "workspace:*",
-    "nanostores": "^0.8.1"
+    "@strudel.cycles/core": "workspace:*"
  },
  "devDependencies": {
-    "vite": "^4.3.3"
+    "vite": "^3.2.2"
  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Felix Roos	193324b2b3	add link to example	2023-02-27 14:33:07 +01:00
Felix Roos	f3a2cff5db	remove footnote syntax fixes https://github.com/tidalcycles/strudel/issues/439	2023-02-27 13:34:51 +01:00