build to single file

forgot tonal pkg import
add workshop seed project
2026-07-13 22:35:15 -04:00 · 2022-11-23 14:00:31 +01:00 · 2022-11-22 21:43:30 +01:00 · 2022-11-22 21:33:47 +01:00
102 changed files with 27244 additions and 20858 deletions
@@ -1,14 +0,0 @@
-krill-parser.js
-krill.pegjs
-.eslintrc.json
-server.js
-tidal-sniffer.js
-*.jsx
-tunejs.js
-out/**
-postcss.config.js
-postcss.config.cjs
-tailwind.config.js
-vite.config.js
-/**/dist/**/*
-!**/*.mjs
@@ -1,16 +0,0 @@
-{
-  "env": {
-    "browser": true,
-    "es2021": true
-  },
-  "extends": ["eslint:recommended"],
-  "overrides": [],
-  "parserOptions": {
-    "ecmaVersion": "latest",
-    "sourceType": "module"
-  },
-  "plugins": [],
-  "rules": {
-    "no-unused-vars": ["warn", { "destructuredArrayIgnorePattern": ".", "ignoreRestSiblings": false }]
-  }
-}
@@ -10,12 +10,10 @@ jobs:
        node-version: [18]

    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: "npm"
-      - run: npm install
-      - run: npm run format-check
-      - run: npm run lint
-      - run: npm test
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+    - run: npm install
+    - run: npm test
@@ -1,8 +0,0 @@
-*.md
-*.json
-*.yml
-*.
-**/out
-**/dist
-packages/mini/krill-parser.js
-packages/xen/tunejs.js
@@ -1,15 +1,16 @@
 {
-  "printWidth": 120,
-  "useTabs": false,
-  "tabWidth": 2,
-  "semi": true,
-  "singleQuote": true,
-  "jsxSingleQuote": false,
-  "trailingComma": "all",
-  "bracketSpacing": true,
-  "jsxBracketSameLine": false,
-  "arrowParens": "always",
-  "proseWrap": "preserve",
-  "htmlWhitespaceSensitivity": "css",
-  "endOfLine": "lf"
-}
+    "printWidth": 120,
+    "useTabs": false,
+    "tabWidth": 2,
+    "semi": true,
+    "singleQuote": true,
+    "jsxSingleQuote": false,
+    "trailingComma": "all",
+    "bracketSpacing": true,
+    "jsxBracketSameLine": false,
+    "arrowParens": "always",
+    "proseWrap": "preserve",
+    "htmlWhitespaceSensitivity": "css",
+    "endOfLine": "lf"
+  }
+  
@@ -17,11 +17,7 @@
    "preview": "npx serve ./out",
    "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",
-    "codeformat": "prettier --write .",
-    "format-check": "prettier --check .",
-    "check": "npm run format-check && npm run lint && npm run test"
+    "jsdoc-json": "jsdoc packages/ --template ./node_modules/jsdoc-json --destination doc.json -c jsdoc.config.json"
  },
  "workspaces": [
    "packages/*"
@@ -44,17 +40,15 @@
  },
  "homepage": "https://strudel.tidalcycles.org",
  "devDependencies": {
-    "@vitest/ui": "^0.25.7",
+    "@vitest/ui": "^0.21.1",
    "c8": "^7.12.0",
-    "eslint": "^8.28.0",
    "events": "^3.3.0",
    "gh-pages": "^4.0.0",
    "jsdoc": "^3.6.10",
    "jsdoc-json": "^2.0.2",
    "jsdoc-to-markdown": "^7.1.1",
    "lerna": "^4.0.0",
-    "prettier": "^2.8.1",
    "rollup-plugin-visualizer": "^5.8.1",
-    "vitest": "^0.25.7"
+    "vitest": "^0.21.1"
  }
 }
@@ -204,7 +204,7 @@ const generic_params = [
   * "c4 eb4 g4 bb4".legato("<0.125 .25 .5 .75 1 2 4>")
   *
   */
-  // ['f', 'legato', 'controls the amount of overlap between two adjacent sounds'],
+  ['f', 'legato', 'controls the amount of overlap between two adjacent sounds'],
  // ['f', 'clhatdecay', ''],
  /**
   * bit crusher effect.
@@ -400,7 +400,7 @@ const generic_params = [
   * @example
   * freq("220 110 440 110").s("superzow").osc()
   * @example
-   * freq("110".mul.out(".5 1.5 .6 [2 3]")).s("superzow").osc()
+   * freq("110".mulOut(".5 1.5 .6 [2 3]")).s("superzow").osc()
   *
   */
  ['f', 'freq', ''],
@@ -562,7 +562,7 @@ const generic_params = [
  // TODO: detune? https://tidalcycles.org/docs/patternlib/tutorials/synthesizers/#supersquare
  ['f', 'semitone', ''],
  // TODO: dedup with synth param, see https://tidalcycles.org/docs/reference/synthesizers/#superpiano
-  // ['f', 'velocity', ''],
+  ['f', 'velocity', ''],
  ['f', 'voice', ''], // TODO: synth param
  /**
   * Sets the level of reverb.
@@ -787,6 +787,6 @@ controls.createParam = (name) => {
 };

 controls.createParams = (...names) =>
-  names.reduce((acc, name) => Object.assign(acc, { [name]: controls.createParam(name) }), {});
+  names.reduce((acc, name) => Object.assign(acc, { [name]: createParam(name) }), {});

 export default controls;
@@ -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, getTime, State, TimeSpan } from './index.mjs';
+import { Pattern, getTime } from './index.mjs';

 export const getDrawContext = (id = 'test-canvas') => {
  let canvas = document.querySelector('#' + id);
@@ -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 { isPattern } from './index.mjs';
+import { isPattern, Pattern } from './index.mjs';

 let scoped = false;
 export const evalScope = async (...args) => {
@@ -19,7 +19,7 @@ export const evalScope = async (...args) => {
      console.warn(`evalScope: module with index ${i} could not be loaded:`, result.reason);
    }
  });
-  Object.assign(globalThis, ...modules);
+  Object.assign(globalThis, ...modules, Pattern.prototype.bootstrap());
 };

 function safeEval(str, options = {}) {
@@ -16,7 +16,7 @@ evalScope(
  import('@strudel.cycles/tonal'),
 );

-setStringParser(mini);
+setStringParser(mini)

 const { evaluate } = repl({
  defaultOutput: webaudioOutput,
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Buildless Vanilla Strudel REPL</title>
-  </head>
-  <body style="margin: 0; background: #222">
-    <div style="display: grid; height: 100vh">
-      <textarea
-        id="text"
-        style="font-size: 2em; border: 0; color: white; background: transparent; outline: none; padding: 20px"
-        spellcheck="false"
-      >
-// LOADING</textarea
-      >
-    </div>
-    <button
-      id="start"
-      style="
-        position: absolute;
-        border-radius: 10px;
-        top: 20px;
-        right: 20px;
-        padding: 20px;
-        border: 2px solid white;
-        background: transparent;
-        color: white;
-        cursor: pointer;
-      "
-    >
-      evaluate
-    </button>
-    <div id="output"></div>
-    <script type="module">
-      import { controls, repl, evalScope } from 'https://cdn.skypack.dev/@strudel.cycles/core@0.4.1';
-      import { transpiler } from 'https://cdn.skypack.dev/@strudel.cycles/transpiler@0.4.1';
-
-      const modules = [
-        import('https://cdn.skypack.dev/@strudel.cycles/core@0.4.1'),
-        import('https://cdn.skypack.dev/@strudel.cycles/mini@0.4.1'),
-      ];
-
-      const input = document.getElementById('text');
-
-      Promise.all(modules).then(() => {
-        input.innerHTML = `note("<c3 [d3 e3]>").cutoff(1000)`;
-        document.getElementById('start').addEventListener('click', () => {
-          evaluate(input.value);
-        });
-      });
-      evalScope(controls, ...modules);
-
-      const { evaluate } = repl({
-        defaultOutput: (hap, deadline, duration) => {
-          console.log(deadline, duration, hap.value);
-        },
-        getTime: () => Date.now() / 1000,
-        transpiler,
-        beforeEval: (code) => console.log('evaluate', code),
-        afterEval: (code) => {},
-      });
-    </script>
-  </body>
-</html>
@@ -79,33 +79,10 @@ export class Hap {
    );
  }

-  show(compact = false) {
-    const value =
-      typeof this.value === 'object'
-        ? compact
-          ? JSON.stringify(this.value).slice(1, -1).replaceAll('"', '').replaceAll(',', ' ')
-          : JSON.stringify(this.value)
-        : this.value;
-    var spans = '';
-    if (this.whole == undefined) {
-      spans = '~' + this.part.show;
-    } else {
-      var is_whole = this.whole.begin.equals(this.part.begin) && this.whole.end.equals(this.part.end);
-      if (!this.whole.begin.equals(this.part.begin)) {
-        spans = this.whole.begin.show() + ' ⇜ ';
-      }
-      if (!is_whole) {
-        spans += '(';
-      }
-      spans += this.part.show();
-      if (!is_whole) {
-        spans += ')';
-      }
-      if (!this.whole.end.equals(this.part.end)) {
-        spans += ' ⇝ ' + this.whole.end.show();
-      }
-    }
-    return '[ ' + spans + ' | ' + value + ' ]';
+  show() {
+    return (
+      '(' + (this.whole == undefined ? '~' : this.whole.show()) + ', ' + this.part.show() + ', ' + this.value + ')'
+    );
  }

  showWhole(compact = false) {
@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/core",
-	"version": "0.5.0",
+	"version": "0.4.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/core",
-  "version": "0.5.0",
+  "version": "0.4.0",
  "description": "Port of Tidal Cycles to JavaScript",
  "main": "index.mjs",
  "type": "module",
@@ -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, toMidi, getDrawContext } from './index.mjs';
+import { Pattern } from './index.mjs';

 const scale = (normalized, min, max) => normalized * (max - min) + min;
 const getValue = (e) => {
@@ -40,11 +40,11 @@ export function repl({
      throw new Error('no code to evaluate');
    }
    try {
-      beforeEval?.({ code });
+      beforeEval({ code });
      const { pattern } = await _evaluate(code, transpiler);
      logger(`[eval] code updated`);
      scheduler.setPattern(pattern, autostart);
-      afterEval?.({ code, pattern });
+      afterEval({ code, pattern });
      return pattern;
    } catch (err) {
      // console.warn(`[repl] eval error: ${err.message}`);
@@ -5,7 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
 */

 import { Hap } from './hap.mjs';
-import { Pattern, fastcat, reify, silence, stack, register } from './pattern.mjs';
+import { Pattern, fastcat, reify, silence, stack, isPattern } from './pattern.mjs';
 import Fraction from './fraction.mjs';
 import { id } from './util.mjs';

@@ -258,9 +258,9 @@ export const perlinWith = (pat) => {
 */
 export const perlin = perlinWith(time.fmap((v) => Number(v)));

-export const degradeByWith = register('degradeByWith', (withPat, x, pat) =>
-  pat.fmap((a) => (_) => a).appLeft(withPat.filterValues((v) => v > x)),
-);
+Pattern.prototype._degradeByWith = function (withPat, x) {
+  return this.fmap((a) => (_) => a).appLeft(withPat.filterValues((v) => v > x));
+};

 /**
 * Randomly removes events from the pattern by a given amount.
@@ -276,9 +276,9 @@ export const degradeByWith = register('degradeByWith', (withPat, x, pat) =>
 * @example
 * s("[hh?0.2]*8")
 */
-export const degradeBy = register('degradeBy', function (x, pat) {
-  return pat._degradeByWith(rand, x);
-});
+Pattern.prototype._degradeBy = function (x) {
+  return this._degradeByWith(rand, x);
+};

 /**
 *
@@ -292,7 +292,9 @@ export const degradeBy = register('degradeBy', function (x, pat) {
 * @example
 * s("[hh?]*8")
 */
-export const degrade = register('degrade', (pat) => pat._degradeBy(0.5));
+Pattern.prototype.degrade = function () {
+  return this._degradeBy(0.5);
+};

 /**
 * Inverse of {@link Pattern#degradeBy}: Randomly removes events from the pattern by a given amount.
@@ -307,14 +309,26 @@ export const degrade = register('degrade', (pat) => pat._degradeBy(0.5));
 * @example
 * s("hh*8").undegradeBy(0.2)
 */
-export const undegradeBy = register('undegradeBy', function (x, pat) {
-  return pat._degradeByWith(
+Pattern.prototype._undegradeBy = function (x) {
+  return this._degradeByWith(
    rand.fmap((r) => 1 - r),
    x,
  );
-});
+};

-export const undegrade = register('undegrade', (pat) => pat._undegradeBy(0.5));
+Pattern.prototype.undegrade = function () {
+  return this._undegradeBy(0.5);
+};
+
+Pattern.prototype._sometimesBy = function (x, func) {
+  return stack(this._degradeBy(x), func(this._undegradeBy(1 - x)));
+};
+
+// https://github.com/tidalcycles/strudel/discussions/198
+/* Pattern.prototype._sometimesBy = function (x, other) {
+  other = typeof other === 'function' ? other(this._undegradeBy(1 - x)) : reify(other)._undegradeBy(1 - x);
+  return stack(this._degradeBy(x), other);
+}; */

 /**
 *
@@ -329,12 +343,24 @@ export const undegrade = register('undegrade', (pat) => pat._undegradeBy(0.5));
 * @example
 * s("hh(3,8)").sometimesBy(.4, x=>x.speed("0.5"))
 */
-
-export const sometimesBy = register('sometimesBy', function (patx, func, pat) {
+Pattern.prototype.sometimesBy = function (patx, func) {
+  const pat = this;
  return reify(patx)
-    .fmap((x) => stack(pat._degradeBy(x), func(pat._undegradeBy(1 - x))))
+    .fmap((x) => pat._sometimesBy(x, func))
    .innerJoin();
-});
+};
+
+// why does this exist? it is identical to sometimesBy
+Pattern.prototype._sometimesByPre = function (x, func) {
+  return stack(this._degradeBy(x), func(this).undegradeBy(1 - x));
+};
+
+Pattern.prototype.sometimesByPre = function (patx, func) {
+  const pat = this;
+  return reify(patx)
+    .fmap((x) => pat._sometimesByPre(x, func))
+    .innerJoin();
+};

 /**
 *
@@ -347,9 +373,20 @@ export const sometimesBy = register('sometimesBy', function (patx, func, pat) {
 * @example
 * s("hh*4").sometimes(x=>x.speed("0.5"))
 */
-export const sometimes = register('sometimes', function (func, pat) {
-  return pat._sometimesBy(0.5, func);
-});
+Pattern.prototype.sometimes = function (func) {
+  return this._sometimesBy(0.5, func);
+};
+
+Pattern.prototype.sometimesPre = function (func) {
+  return this._sometimesByPre(0.5, func);
+};
+
+Pattern.prototype._someCyclesBy = function (x, func) {
+  return stack(
+    this._degradeByWith(rand._segment(1), x),
+    func(this._degradeByWith(rand.fmap((r) => 1 - r)._segment(1), 1 - x)),
+  );
+};

 /**
 *
@@ -364,17 +401,12 @@ export const sometimes = register('sometimes', function (func, pat) {
 * @example
 * s("hh(3,8)").someCyclesBy(.3, x=>x.speed("0.5"))
 */
-
-export const someCyclesBy = register('someCyclesBy', function (patx, func, pat) {
+Pattern.prototype.someCyclesBy = function (patx, func) {
+  const pat = this;
  return reify(patx)
-    .fmap((x) =>
-      stack(
-        pat._degradeByWith(rand._segment(1), x),
-        func(pat._degradeByWith(rand.fmap((r) => 1 - r)._segment(1), 1 - x)),
-      ),
-    )
+    .fmap((x) => pat._someCyclesBy(x, func))
    .innerJoin();
-});
+};

 /**
 *
@@ -386,9 +418,9 @@ export const someCyclesBy = register('someCyclesBy', function (patx, func, pat)
 * @example
 * s("hh(3,8)").someCycles(x=>x.speed("0.5"))
 */
-export const someCycles = register('someCycles', function (func, pat) {
-  return pat._someCyclesBy(0.5, func);
-});
+Pattern.prototype.someCycles = function (func) {
+  return this._someCyclesBy(0.5, func);
+};

 /**
 *
@@ -400,9 +432,9 @@ export const someCycles = register('someCycles', function (func, pat) {
 * @example
 * s("hh*8").often(x=>x.speed("0.5"))
 */
-export const often = register('often', function (func, pat) {
-  return pat.sometimesBy(0.75, func);
-});
+Pattern.prototype.often = function (func) {
+  return this.sometimesBy(0.75, func);
+};

 /**
 *
@@ -414,9 +446,9 @@ export const often = register('often', function (func, pat) {
 * @example
 * s("hh*8").rarely(x=>x.speed("0.5"))
 */
-export const rarely = register('rarely', function (func, pat) {
-  return pat.sometimesBy(0.25, func);
-});
+Pattern.prototype.rarely = function (func) {
+  return this.sometimesBy(0.25, func);
+};

 /**
 *
@@ -428,9 +460,9 @@ export const rarely = register('rarely', function (func, pat) {
 * @example
 * s("hh*8").almostNever(x=>x.speed("0.5"))
 */
-export const almostNever = register('almostNever', function (func, pat) {
-  return pat.sometimesBy(0.1, func);
-});
+Pattern.prototype.almostNever = function (func) {
+  return this.sometimesBy(0.1, func);
+};

 /**
 *
@@ -442,9 +474,9 @@ export const almostNever = register('almostNever', function (func, pat) {
 * @example
 * s("hh*8").almostAlways(x=>x.speed("0.5"))
 */
-export const almostAlways = register('almostAlways', function (func, pat) {
-  return pat.sometimesBy(0.9, func);
-});
+Pattern.prototype.almostAlways = function (func) {
+  return this.sometimesBy(0.9, func);
+};

 /**
 *
@@ -456,9 +488,9 @@ export const almostAlways = register('almostAlways', function (func, pat) {
 * @example
 * s("hh*8").never(x=>x.speed("0.5"))
 */
-export const never = register('never', function (_, pat) {
-  return pat;
-});
+Pattern.prototype.never = function (func) {
+  return this;
+};

 /**
 *
@@ -470,6 +502,8 @@ export const never = register('never', function (_, pat) {
 * @example
 * s("hh*8").always(x=>x.speed("0.5"))
 */
-export const always = register('always', function (func, pat) {
-  return func(pat);
-});
+Pattern.prototype.always = function (func) {
+  return func(this);
+};
+
+Pattern.prototype.patternified.push('degradeBy', 'undegradeBy');
@@ -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 { register } from './index.mjs';
+import { Pattern, patternify2 } from './index.mjs';

 let synth;
 try {
@@ -16,7 +16,7 @@ try {
 let allVoices = synth?.getVoices();
 // console.log('voices', allVoices);

-function triggerSpeech(words, lang, voice) {
+function speak(words, lang, voice) {
  synth.cancel();
  const utterance = new SpeechSynthesisUtterance(words);
  utterance.lang = lang;
@@ -31,8 +31,12 @@ function triggerSpeech(words, lang, voice) {
  speechSynthesis.speak(utterance);
 }

-export const speak = register('speak', function (lang, voice, pat) {
-  return pat.onTrigger((_, hap) => {
-    triggerSpeech(hap.value, lang, voice);
+Pattern.prototype._speak = function (lang, voice) {
+  return this.onTrigger((_, hap) => {
+    speak(hap.value, lang, voice);
  });
-});
+};
+
+Pattern.prototype.speak = function (lang, voice) {
+  return patternify2(Pattern.prototype._speak)(reify(lang), reify(voice), this);
+};
@@ -16,7 +16,6 @@ import {
  pure,
  stack,
  fastcat,
-  firstOf,
  slowcat,
  cat,
  sequence,
@@ -155,40 +154,34 @@ describe('Pattern', () => {
    });
  });
  describe('add()', () => {
-    it('works as toplevel function', () => {
-      expect(add(pure(4), pure(5)).query(st(0, 1))[0].value).toBe(9);
-    });
-    it('works as toplevel function, with bare values for arguments', () => {
-      expect(add(4, 5).query(st(0, 1))[0].value).toBe(9);
-    });
    it('can structure In()', () => {
      expect(pure(3).add(pure(4)).query(st(0, 1))[0].value).toBe(7);
-      expect(pure(3).add.in(pure(4)).query(st(0, 1))[0].value).toBe(7);
+      expect(pure(3).addIn(pure(4)).query(st(0, 1))[0].value).toBe(7);
    });
    it('can structure Out()', () => {
-      sameFirst(sequence(1, 2).add.out(4), sequence(5, 6).struct(true));
+      sameFirst(sequence(1, 2).addOut(4), sequence(5, 6).struct(true));
    });
    it('can Mix() structure', () => {
-      expect(sequence(1, 2).add.mix(silence, 5, silence).firstCycle()).toStrictEqual([
+      expect(sequence(1, 2).addMix(silence, 5, silence).firstCycle()).toStrictEqual([
        new Hap(ts(1 / 3, 1 / 2), ts(1 / 3, 1 / 2), 6),
        new Hap(ts(1 / 2, 2 / 3), ts(1 / 2, 2 / 3), 7),
      ]);
    });
    it('can Trig() structure', () => {
      sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).add.trig(20, 30).early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).addTrig(20, 30).early(2),
        sequence(26, 27, 36, 37),
      );
    });
    it('can Trigzero() structure', () => {
      sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).add.trigzero(20, 30).early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).addTrigzero(20, 30).early(2),
        sequence(21, 22, 31, 32),
      );
    });
    it('can Squeeze() structure', () => {
      sameFirst(
-        sequence(1, [2, 3]).add.squeeze(sequence(10, 20, 30)),
+        sequence(1, [2, 3]).addSqueeze(sequence(10, 20, 30)),
        sequence(
          [11, 21, 31],
          [
@@ -200,7 +193,7 @@ describe('Pattern', () => {
    });
    it('can SqueezeOut() structure', () => {
      sameFirst(
-        sequence(1, [2, 3]).add.squeezeout(10, 20, 30),
+        sequence(1, [2, 3]).addSqueezeOut(10, 20, 30),
        sequence([11, [12, 13]], [21, [22, 23]], [31, [32, 33]]),
      );
    });
@@ -211,32 +204,32 @@ describe('Pattern', () => {
  describe('keep()', () => {
    it('can structure In()', () => {
      expect(pure(3).keep(pure(4)).query(st(0, 1))[0].value).toBe(3);
-      expect(pure(3).keep.in(pure(4)).query(st(0, 1))[0].value).toBe(3);
+      expect(pure(3).keepIn(pure(4)).query(st(0, 1))[0].value).toBe(3);
    });
    it('can structure Out()', () => {
-      sameFirst(sequence(1, 2).keep.out(4), sequence(1, 2).struct(true));
+      sameFirst(sequence(1, 2).keepOut(4), sequence(1, 2).struct(true));
    });
    it('can Mix() structure', () => {
-      expect(sequence(1, 2).keep.mix(silence, 5, silence).firstCycle()).toStrictEqual([
+      expect(sequence(1, 2).keepMix(silence, 5, silence).firstCycle()).toStrictEqual([
        new Hap(ts(1 / 3, 1 / 2), ts(1 / 3, 1 / 2), 1),
        new Hap(ts(1 / 2, 2 / 3), ts(1 / 2, 2 / 3), 2),
      ]);
    });
    it('can Trig() structure', () => {
      sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keep.trig(20, 30).early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepTrig(20, 30).early(2),
        sequence(6, 7, 6, 7),
      );
    });
    it('can Trigzero() structure', () => {
      sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keep.trigzero(20, 30).early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepTrigzero(20, 30).early(2),
        sequence(1, 2, 1, 2),
      );
    });
    it('can Squeeze() structure', () => {
      sameFirst(
-        sequence(1, [2, 3]).keep.squeeze(sequence(10, 20, 30)),
+        sequence(1, [2, 3]).keepSqueeze(sequence(10, 20, 30)),
        sequence(
          [1, 1, 1],
          [
@@ -247,38 +240,38 @@ describe('Pattern', () => {
      );
    });
    it('can SqueezeOut() structure', () => {
-      sameFirst(sequence(1, [2, 3]).keep.squeezeout(10, 20, 30), sequence([1, [2, 3]], [1, [2, 3]], [1, [2, 3]]));
+      sameFirst(sequence(1, [2, 3]).keepSqueezeOut(10, 20, 30), sequence([1, [2, 3]], [1, [2, 3]], [1, [2, 3]]));
    });
  });
  describe('keepif()', () => {
    it('can structure In()', () => {
      sameFirst(sequence(3, 4).keepif(true, false), sequence(3, silence));
-      sameFirst(sequence(3, 4).keepif.in(true, false), sequence(3, silence));
+      sameFirst(sequence(3, 4).keepifIn(true, false), sequence(3, silence));
    });
    it('can structure Out()', () => {
-      sameFirst(pure(1).keepif.out(true, false), sequence(1, silence));
+      sameFirst(pure(1).keepifOut(true, false), sequence(1, silence));
    });
    it('can Mix() structure', () => {
-      expect(sequence(1, 2).keepif.mix(false, true, false).firstCycle()).toStrictEqual([
+      expect(sequence(1, 2).keepifMix(false, true, false).firstCycle()).toStrictEqual([
        new Hap(ts(1 / 3, 1 / 2), ts(1 / 3, 1 / 2), 1),
        new Hap(ts(1 / 2, 2 / 3), ts(1 / 2, 2 / 3), 2),
      ]);
    });
    it('can Trig() structure', () => {
      sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepif.trig(false, true).early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepifTrig(false, true).early(2),
        sequence(silence, silence, 6, 7),
      );
    });
    it('can Trigzero() structure', () => {
      sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepif.trigzero(false, true).early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepifTrigzero(false, true).early(2),
        sequence(silence, silence, 1, 2),
      );
    });
    it('can Squeeze() structure', () => {
      sameFirst(
-        sequence(1, [2, 3]).keepif.squeeze(sequence(true, true, false)),
+        sequence(1, [2, 3]).keepifSqueeze(sequence(true, true, false)),
        sequence(
          [1, 1, silence],
          [
@@ -289,7 +282,7 @@ describe('Pattern', () => {
      );
    });
    it('can SqueezeOut() structure', () => {
-      sameFirst(sequence(1, [2, 3]).keepif.squeezeout(true, true, false), sequence([1, [2, 3]], [1, [2, 3]], silence));
+      sameFirst(sequence(1, [2, 3]).keepifSqueezeOut(true, true, false), sequence([1, [2, 3]], [1, [2, 3]], silence));
    });
  });
  describe('sub()', () => {
@@ -329,13 +322,13 @@ describe('Pattern', () => {
    });
    describe('setOut()', () => {
      it('Can set things with structure from second pattern', () => {
-        sameFirst(sequence(1, 2).set.out(4), pure(4).mask(true, true));
+        sameFirst(sequence(1, 2).setOut(4), pure(4).mask(true, true));
      });
    });
    describe('setSqueeze()', () => {
      it('Can squeeze one pattern inside the haps of another', () => {
        sameFirst(
-          sequence(1, [2, 3]).set.squeeze(sequence('a', 'b', 'c')),
+          sequence(1, [2, 3]).setSqueeze(sequence('a', 'b', 'c')),
          sequence(
            ['a', 'b', 'c'],
            [
@@ -345,7 +338,7 @@ describe('Pattern', () => {
          ),
        );
        sameFirst(
-          sequence(1, [2, 3]).set.squeeze('a', 'b', 'c'),
+          sequence(1, [2, 3]).setSqueeze('a', 'b', 'c'),
          sequence(
            ['a', 'b', 'c'],
            [
@@ -413,8 +406,8 @@ describe('Pattern', () => {
      );
    });
    it('defaults to accepting sequences', () => {
-      expect(sequence('a', 'b', 'c').fast(sequence(1.5, 2)).sortHapsByPart().firstCycle()).toStrictEqual(
-        sequence('a', 'b', 'c').fast(1.5, 2).sortHapsByPart().firstCycle(),
+      expect(sequence(1, 2, 3).fast(sequence(1.5, 2)).firstCycle()).toStrictEqual(
+        sequence(1, 2, 3).fast(1.5, 2).firstCycle(),
      );
    });
    it('works as a static function', () => {
@@ -593,16 +586,6 @@ describe('Pattern', () => {
          .firstCycle(),
      ).toStrictEqual(sequence(sequence('a', 'a'), 'a', 'a').firstCycle());
    });
-    it('Works as a toplevel function', () => {
-      expect(firstOf(3, fast(2), pure('a'))._fast(3).firstCycle()).toStrictEqual(
-        sequence(sequence('a', 'a'), 'a', 'a').firstCycle(),
-      );
-    });
-    it('Works as a toplevel function, with a patterned first argument', () => {
-      expect(firstOf(pure(3), fast(2), pure('a'))._fast(3).firstCycle()).toStrictEqual(
-        sequence(sequence('a', 'a'), 'a', 'a').firstCycle(),
-      );
-    });
    it('works with currying', () => {
      expect(pure('a').firstOf(3, fast(2))._fast(3).firstCycle()).toStrictEqual(
        sequence(sequence('a', 'a'), 'a', 'a').firstCycle(),
@@ -912,23 +895,9 @@ describe('Pattern', () => {
  });
  describe('alignments', () => {
    it('Can squeeze arguments', () => {
-      expect(sequence(1, 2).add.squeeze(4, 5).firstCycle()).toStrictEqual(sequence(5, 6, 6, 7).firstCycle());
-    });
-  });
-  describe('defragmentHaps', () => {
-    it('Can merge two touching haps with same whole and value', () => {
-      expect(stack(pure('a').mask(1, 0), pure('a').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(1);
-    });
-    it('Doesnt merge two overlapping haps', () => {
-      expect(stack(pure('a').mask(1, 1, 0), pure('a').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(
-        2,
+      expect(sequence(1, 2).add.squeeze(4, 5).firstCycle()).toStrictEqual(
+	sequence(5, 6, 6, 7).firstCycle()
      );
    });
-    it('Doesnt merge two touching haps with different values', () => {
-      expect(stack(pure('a').mask(1, 0), pure('b').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(2);
-    });
-    it('Doesnt merge two touching haps with different wholes', () => {
-      expect(stack(sequence('a', silence), pure('a').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(2);
-    });
  });
 });
@@ -10,8 +10,7 @@ import {
  tokenizeNote,
  toMidi,
  fromMidi,
-  freqToMidi,
-  _mod,
+  mod,
  compose,
  getFrequency,
  getPlayableNoteValue,
@@ -95,12 +94,6 @@ describe('fromMidi', () => {
    expect(fromMidi(57)).toEqual(220);
  });
 });
-describe('freqToMidi', () => {
-  it('should turn frequency into midi', () => {
-    expect(freqToMidi(440)).toEqual(69);
-    expect(freqToMidi(220)).toEqual(57);
-  });
-});
 describe('getFrequency', () => {
  const happify = (val, context = {}) => pure(val).firstCycle()[0].setContext(context);
  it('should turn note into frequency', () => {
@@ -125,22 +118,22 @@ describe('getFrequency', () => {
  });
 });

-describe('_mod', () => {
+describe('mod', () => {
  it('should work like regular modulo with positive numbers', () => {
-    expect(_mod(0, 3)).toEqual(0);
-    expect(_mod(1, 3)).toEqual(1);
-    expect(_mod(2, 3)).toEqual(2);
-    expect(_mod(3, 3)).toEqual(0);
-    expect(_mod(4, 3)).toEqual(1);
-    expect(_mod(4, 2)).toEqual(0);
+    expect(mod(0, 3)).toEqual(0);
+    expect(mod(1, 3)).toEqual(1);
+    expect(mod(2, 3)).toEqual(2);
+    expect(mod(3, 3)).toEqual(0);
+    expect(mod(4, 3)).toEqual(1);
+    expect(mod(4, 2)).toEqual(0);
  });
  it('should work with negative numbers', () => {
-    expect(_mod(-1, 3)).toEqual(2);
-    expect(_mod(-2, 3)).toEqual(1);
-    expect(_mod(-3, 3)).toEqual(0);
-    expect(_mod(-4, 3)).toEqual(2);
-    expect(_mod(-5, 3)).toEqual(1);
-    expect(_mod(-3, 2)).toEqual(1);
+    expect(mod(-1, 3)).toEqual(2);
+    expect(mod(-2, 3)).toEqual(1);
+    expect(mod(-3, 3)).toEqual(0);
+    expect(mod(-4, 3)).toEqual(2);
+    expect(mod(-5, 3)).toEqual(1);
+    expect(mod(-3, 2)).toEqual(1);
  });
 });

@@ -6,8 +6,6 @@ This program is free software: you can redistribute it and/or modify it under th

 import { describe, it, expect } from 'vitest';
 import { map, valued, mul } from '../value.mjs';
-import controls from '../controls.mjs';
-const { n } = controls;

 describe('Value', () => {
  it('unionWith', () => {
@@ -23,8 +21,4 @@ describe('Value', () => {
    expect(valued(mul).ap(3).ap(3).value).toEqual(9);
    expect(valued(3).mul(3).value).toEqual(9);
  });
-  it('union bare numbers for numeral props', () => {
-    expect(n(3).cutoff(500).add(10).firstCycleValues).toEqual([{ n: 13, cutoff: 510 }]);
-    expect(n(3).cutoff(500).mul(2).firstCycleValues).toEqual([{ n: 6, cutoff: 1000 }]);
-  });
 });
@@ -20,9 +20,9 @@ export class TimeSpan {

    // Support zero-width timespans
    if (begin.equals(end)) {
-      return [new TimeSpan(begin, end)];
+      return([new TimeSpan(begin, end)]);
    }
-
+    
    while (end.gt(begin)) {
      // If begin and end are in the same cycle, we're done.
      if (begin.sam().equals(end_sam)) {
@@ -110,7 +110,7 @@ export class TimeSpan {
  }

  show() {
-    return this.begin.show() + ' → ' + this.end.show();
+    return this.begin.show() + ' -> ' + this.end.show();
  }
 }

@@ -31,30 +31,6 @@ export const fromMidi = (n) => {
  return Math.pow(2, (n - 69) / 12) * 440;
 };

-export const freqToMidi = (freq) => {
-  return (12 * Math.log(freq / 440)) / Math.LN2 + 69;
-};
-
-export const valueToMidi = (value, fallbackValue) => {
-  if (typeof value !== 'object') {
-    throw new Error('valueToMidi: expected object value');
-  }
-  let { freq, note } = value;
-  if (typeof freq === 'number') {
-    return freqToMidi(freq);
-  }
-  if (typeof note === 'string') {
-    return toMidi(note);
-  }
-  if (typeof note === 'number') {
-    return note;
-  }
-  if (!fallbackValue) {
-    throw new Error('valueToMidi: expected freq or note to be set');
-  }
-  return fallbackValue;
-};
-
 /**
 * @deprecated does not appear to be referenced or invoked anywhere in the codebase
 */
@@ -74,8 +50,9 @@ export const midi2note = (n) => {
  return pc + oct;
 };

-// modulo that works with negative numbers e.g. _mod(-1, 3) = 2. Works on numbers (rather than patterns of numbers, as @mod@ from pattern.mjs does)
-export const _mod = (n, m) => ((n % m) + m) % m;
+// modulo that works with negative numbers e.g. mod(-1, 3) = 2
+// const mod = (n: number, m: number): number => (n < 0 ? mod(n + m, m) : n % m);
+export const mod = (n, m) => ((n % m) + m) % m;

 export const getPlayableNoteValue = (hap) => {
  let { value, context } = hap;
@@ -140,9 +117,9 @@ export const constant = (a, b) => a;

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

-export function curry(func, overload, arity = func.length) {
+export function curry(func, overload) {
  const fn = function curried(...args) {
-    if (args.length >= arity) {
+    if (args.length >= func.length) {
      return func.apply(this, args);
    } else {
      const partial = function (...args2) {
@@ -7,13 +7,6 @@ This program is free software: you can redistribute it and/or modify it under th
 import { curry } from './util.mjs';

 export function unionWithObj(a, b, func) {
-  if (typeof b?.value === 'number') {
-    // https://github.com/tidalcycles/strudel/issues/262
-    const numKeys = Object.keys(a).filter((k) => typeof a[k] === 'number');
-    const numerals = Object.fromEntries(numKeys.map((k) => [k, b.value]));
-    b = Object.assign(b, numerals);
-    delete b.value;
-  }
  const common = Object.keys(a).filter((k) => Object.keys(b).includes(k));
  return Object.assign({}, a, b, Object.fromEntries(common.map((k) => [k, func(a[k], b[k])])));
 }
@@ -1,170 +0,0 @@
-import { getFrequency, logger, register } from '@strudel.cycles/core';
-import { getAudioContext } from '@strudel.cycles/webaudio';
-import csd from './project.csd?raw';
-// import livecodeOrc from './livecode.orc?raw';
-import presetsOrc from './presets.orc?raw';
-
-let csoundLoader, _csound;
-
-// initializes csound + can be used to reevaluate given instrument code
-export async function loadCSound(code = '') {
-  await init();
-  if (code) {
-    code = `${code}`;
-    //     ^       ^
-    // wrapping in backticks makes sure it works when calling as templated function
-    await _csound?.evalCode(code);
-  }
-}
-export const loadcsound = loadCSound;
-export const loadCsound = loadCSound;
-
-export const csound = register('csound', (instrument, pat) => {
-  instrument = instrument || 'triangle';
-  init(); // not async to support csound inside other patterns + to be able to call pattern methods after it
-  // TODO: find a alternative way to wait for csound to load (to wait with first time playback)
-  return pat.onTrigger((time, hap) => {
-    if (!_csound) {
-      logger('[csound] not loaded yet', 'warning');
-      return;
-    }
-    if (typeof hap.value !== 'object') {
-      throw new Error('csound only support objects as hap values');
-    }
-    let { gain = 0.8 } = hap.value;
-    gain *= 0.2;
-
-    const freq = Math.round(getFrequency(hap));
-    const controls = Object.entries({ ...hap.value, freq })
-      .flat()
-      .join('/');
-    // TODO: find out how to send a precise ctx based time
-    // http://www.csounds.com/manual/html/i.html
-    const params = [
-      `"${instrument}"`, // p1: instrument name
-      time - getAudioContext().currentTime, //.toFixed(precision), // p2: starting time in arbitrary unit called beats
-      hap.duration + 0, // p3: duration in beats
-      // instrument specific params:
-      freq, //.toFixed(precision), // p4: frequency
-      gain, // p5: gain
-      `"${controls}"`, // p6 controls as string (like superdirt osc message)
-    ];
-    const msg = `i ${params.join(' ')}`;
-    _csound.inputMessage(msg);
-  });
-});
-
-function eventLogger(type, args) {
-  const [msg] = args;
-  if (
-    type === 'message' &&
-    (['[commit: HEAD]'].includes(msg) ||
-      msg.startsWith('--Csound version') ||
-      msg.startsWith('libsndfile') ||
-      msg.startsWith('sr =') ||
-      msg.startsWith('0dBFS') ||
-      msg.startsWith('audio buffered') ||
-      msg.startsWith('writing') ||
-      msg.startsWith('SECTION 1:'))
-  ) {
-    // ignore
-    return;
-  }
-  let logType = 'info';
-  if (msg.startsWith('error:')) {
-    logType = 'error';
-  }
-  logger(`[csound] ${msg || ''}`, logType);
-}
-
-async function load() {
-  if (window.__csound__) {
-    // Allows using some other csound instance.
-    // In that case, the external Csound is responsible
-    // for compiling an orchestra and starting to perform.
-    logger('[load] Using external Csound', 'warning');
-    _csound = window.__csound__;
-    return _csound;
-  } else {
-    const { Csound } = await import('@csound/browser');
-    _csound = await Csound({ audioContext: getAudioContext() });
-    _csound.removeAllListeners('message');
-    ['message'].forEach((k) => _csound.on(k, (...args) => eventLogger(k, args)));
-    await _csound.setOption('-m0d'); // see -m flag https://csound.com/docs/manual/CommandFlags.html
-    await _csound.setOption('--sample-accurate');
-    await _csound.compileCsdText(csd);
-    // await _csound.compileOrc(livecodeOrc);
-    await _csound.compileOrc(presetsOrc);
-    await _csound.start();
-    return _csound;
-  }
-}
-
-async function init() {
-  csoundLoader = csoundLoader || load();
-  return csoundLoader;
-}
-
-let orcCache = {};
-export async function loadOrc(url) {
-  await init();
-  if (typeof url !== 'string') {
-    throw new Error('loadOrc: expected url string');
-  }
-  if (url.startsWith('github:')) {
-    const [_, path] = url.split('github:');
-    url = `https://raw.githubusercontent.com/${path}`;
-  }
-  if (!orcCache[url]) {
-    orcCache[url] = fetch(url)
-      .then((res) => res.text())
-      .then((code) => _csound.compileOrc(code));
-  }
-  await orcCache[url];
-}
-
-/**
- * Sends notes to Csound for rendering with MIDI semantics. The hap value is
- * translated to these Csound pfields:
- *
- *  p1 -- Csound instrument either as a number (1-based, can be a fraction),
- *        or as a string name.
- *  p2 -- time in beats (usually seconds) from start of performance.
- *  p3 -- duration in beats (usually seconds).
- *  p4 -- MIDI key number (as a real number, not an integer but in [0, 127].
- *  p5 -- MIDI velocity (as a real number, not an integer but in [0, 127].
- *  p6 -- Strudel controls, as a string.
- */
-export const csoundm = register('csoundm', (instrument, pat) => {
-  let p1 = instrument;
-  if (typeof instrument === 'string') {
-    p1 = `"{instrument}"`;
-  }
-  init(); // not async to support csound inside other patterns + to be able to call pattern methods after it
-  return pat.onTrigger((tidal_time, hap) => {
-    if (!_csound) {
-      logger('[csound] not loaded yet', 'warning');
-      return;
-    }
-    if (typeof hap.value !== 'object') {
-      throw new Error('csound only support objects as hap values');
-    }
-    // Time in seconds counting from now.
-    const p2 = tidal_time - getAudioContext().currentTime;
-    const p3 = hap.duration.valueOf() + 0;
-    const frequency = getFrequency(hap);
-    // Translate frequency to MIDI key number _without_ rounding.
-    const C4 = 261.62558;
-    let octave = Math.log(frequency / C4) / Math.log(2.0) + 8.0;
-    const p4 = octave * 12.0 - 36.0;
-    // We prefer floating point precision, but over the MIDI range [0, 127].
-    const p5 = 127 * (hap.context?.velocity ?? 0.9);
-    // The Strudel controls as a string.
-    const p6 = Object.entries({ ...hap.value, frequency })
-      .flat()
-      .join('/');
-    const i_statement = `i ${p1} ${p2} ${p3} ${p4} ${p5} "${p6}"`;
-    console.log('[csoundm]:', i_statement);
-    _csound.inputMessage(i_statement);
-  });
-});
@@ -1,32 +0,0 @@
-{
-  "name": "@strudel.cycles/csound",
-  "version": "0.5.1",
-  "description": "csound bindings for strudel",
-  "main": "csound.mjs",
-  "scripts": {
-    "test": "echo \"No tests present.\" && exit 0"
-  },
-  "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": {
-    "@csound/browser": "^6.18.3"
-  }
-}
@@ -1,96 +0,0 @@
-; returns value of given key in given "string map"
-; keymap("freq", "note/c3/freq/220/gain/0.5")
-; yields "220"
-opcode keymap, S, SS
-  Skey, Smap xin
-  idelimiter = strindex(Smap, strcat(Skey, "/"))
-  ifrom = idelimiter + strlen(Skey) + 1
-  Svalue = strsub(Smap, ifrom, strlen(Smap))
-  Svalue = strsub(Svalue, 0, strindex(Svalue, "/"))
-  xout Svalue
-endop
-
-; TODO add incredibly dope synths
-instr organ
-    iduration = p3
-    ifreq = p4
-    igain = p5
-    ioct = octcps(ifreq)
-
-    asig = vco2(igain, ifreq, 12, .5) ; my edit
-    kpwm = oscili(.1, 5)
-    asig = vco2(igain, ifreq, 4, .5 + kpwm)
-    asig += vco2(igain/4, ifreq * 2)
-
-    ; filter
-    ; idepth = 2
-    ; acut = transegr:a(0, .005, 0, idepth, .06, -4.2, 0.001, .01, -4.2, 0) ; filter envelope
-    ; asig = zdf_2pole(asig, cpsoct(ioct + acut), 0.5)
-
-    ; amp envelope
-    iattack = .001
-    irelease = .05
-    asig *= linsegr:a(0, iattack, 1, iduration, 1, irelease, 0)
-
-    out(asig, asig)
-
-endin
-
-instr triangle
-  iduration = p3
-  ifreq = p4
-  igain = p5
-  ioct = octcps(ifreq)
-  
-  asig = vco2(igain, ifreq, 12, .5)
-  
-  ; amp envelope
-  iattack = .001
-  irelease = .05
-  asig *= linsegr:a(0, iattack, 1, iduration, 1, irelease, 0)
-  
-  out(asig, asig)
-endin
-
-instr pad
-    iduration = p3
-    ifreq = p4
-    igain = p5
-    ioct = octcps(ifreq)
-
-    asig = vco2(igain, ifreq, 0)
-
-    ; amp envelope
-    iattack = .5
-    irelease = .1
-    asig *= linsegr:a(0, iattack, 1, iduration, 1, irelease, 0)
-    
-    idepth = 2
-    acut = transegr:a(0, .005, 0, idepth, .06, -4.2, 0.001, .01, -4.2, 0)
-    asig = zdf_2pole(asig, 1000, 2)
-
-    out(asig, asig)
-endin
-
-
-gisine	ftgen	0, 0, 4096, 10, 1
-
-instr bow
-    kpres = 2
-    krat = 0.16
-    kvibf = 6.12723
-    
-    kvib  linseg 0, 0.5, 0, 1, 1, p3-0.5, 1	
-    kvamp = kvib * 0.01
-    asig  wgbow .7, p4, kpres, krat, kvibf, kvamp, gisine
-    asig = asig*p5
-    outs asig, asig
-endin
-
-
-instr Meta
-    Smap = strget(p6)
-    Sinstrument = keymap("s", Smap)
-    schedule(Sinstrument, 0, p3, p4, p5)
-    ; TODO find a way to pipe Sinstrument through effects
-endin
@@ -1,10 +0,0 @@
-<CsoundSynthesizer>
-<CsInstruments>
-
-sr=48000
-ksmps=64
-nchnls=2
-0dbfs=1
-
-</CsInstruments>
-</CsoundSynthesizer>
@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/eval",
-	"version": "0.5.0",
+	"version": "0.4.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/eval",
-  "version": "0.5.0",
+  "version": "0.4.0",
  "description": "Code evaluator for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -28,7 +28,7 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.4.1",
+    "@strudel.cycles/core": "^0.4.0",
    "estraverse": "^5.3.0",
    "shift-ast": "^7.0.0",
    "shift-codegen": "^8.1.0",
@@ -225,8 +225,9 @@ function isPatternArg(parents) {
 function hasModifierCall(parent) {
  // TODO: modifiers are more than composables, for example every is not composable but should be seen as modifier..
  // need all prototypes of Pattern
-  return parent?.type === 'StaticMemberExpression';
-  // && Object.keys(Pattern.prototype.composable).includes(parent.property)
+  return (
+    parent?.type === 'StaticMemberExpression' && Object.keys(Pattern.prototype.composable).includes(parent.property)
+  );
 }
 const factories = Object.keys(Pattern.prototype.factories).concat(['mini']);

@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/midi",
-	"version": "0.5.0",
+	"version": "0.4.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/midi",
-  "version": "0.5.0",
+  "version": "0.4.0",
  "description": "Midi API for strudel",
  "main": "index.mjs",
  "repository": {
@@ -21,7 +21,7 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/tone": "^0.5.0",
+    "@strudel.cycles/tone": "^0.4.0",
    "tone": "^14.7.77",
    "webmidi": "^3.0.21"
  }
@@ -6,15 +6,16 @@ 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';
+// import { addMiniLocations } from '@strudel.cycles/eval/shapeshifter.mjs';

-const { pure, Fraction, stack, slowcat, sequence, timeCat, silence, reify } = strudel;
+const { pure, Pattern, Fraction, stack, slowcat, sequence, timeCat, silence, reify } = strudel;

-/* var _seedState = 0;
+var _seedState = 0;
 const randOffset = 0.0002;

 function _nextSeed() {
  return _seedState++;
-} */
+}

 const applyOptions = (parent) => (pat, i) => {
  const ast = parent.source_[i];
@@ -22,35 +23,16 @@ const applyOptions = (parent) => (pat, i) => {
  const operator = options?.operator;
  if (operator) {
    switch (operator.type_) {
-      case 'stretch': {
+      case 'stretch':
        const speed = Fraction(operator.arguments_.amount).inverse();
        return reify(pat).fast(speed);
-      }
      case 'bjorklund':
        return pat.euclid(operator.arguments_.pulse, operator.arguments_.step, operator.arguments_.rotation);
      case 'degradeBy':
-        // 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 reify(pat)._degradeByWith(
          strudel.rand.early(randOffset * _nextSeed()).segment(1),
-          operator.arguments_.amount ?? 0.5,
-        ); 
-        */
-        return reify(pat)._degradeBy(operator.arguments_.amount ?? 0.5);
-
+          operator.arguments_.amount,
+        );
      // TODO: case 'fixed-step': "%"
    }
    console.warn(`operator "${operator.type_}" not implemented`);
@@ -103,19 +85,17 @@ function resolveReplications(ast) {
  });
 }

-export function patternifyAST(ast, code) {
+export function patternifyAST(ast) {
  switch (ast.type_) {
-    case 'pattern': {
+    case 'pattern':
      resolveReplications(ast);
-      const children = ast.source_.map((child) => patternifyAST(child, code)).map(applyOptions(ast));
+      const children = ast.source_.map(patternifyAST).map(applyOptions(ast));
      const alignment = ast.arguments_.alignment;
      if (alignment === 'v') {
        return stack(...children);
      }
      if (alignment === 'r') {
-        // https://github.com/tidalcycles/strudel/issues/245#issuecomment-1345406422
-        // return strudel.chooseInWith(strudel.rand.early(randOffset * _nextSeed()).segment(1), children);
-        return strudel.chooseCycles(...children);
+        return strudel.chooseInWith(strudel.rand.early(randOffset * _nextSeed()).segment(1), children);
      }
      const weightedChildren = ast.source_.some((child) => !!child.options_?.weight);
      if (!weightedChildren && alignment === 't') {
@@ -130,12 +110,14 @@ export function patternifyAST(ast, code) {
        return pat;
      }
      return sequence(...children);
-    }
-    case 'element': {
+    case 'element':
      if (ast.source_ === '~') {
        return silence;
      }
      if (typeof ast.source_ !== 'object') {
+        /* if (!addMiniLocations) {
+          return ast.source_;
+        } */
        if (!ast.location_) {
          console.warn('no location for', ast);
          return ast.source_;
@@ -144,20 +126,11 @@ export function patternifyAST(ast, code) {
        const value = !isNaN(Number(ast.source_)) ? Number(ast.source_) : ast.source_;
        // the following line expects the shapeshifter append .withMiniLocation
        // because location_ is only relative to the mini string, but we need it relative to whole code
-        // make sure whitespaces are not part of the highlight:
-        const actual = code?.split('').slice(start.offset, end.offset).join('');
-        const [offsetStart = 0, offsetEnd = 0] = actual
-          ? actual.split(ast.source_).map((p) => p.split('').filter((c) => c === ' ').length)
-          : [];
-        return pure(value).withLocation(
-          [start.line, start.column + offsetStart, start.offset + offsetStart],
-          [start.line, end.column - offsetEnd, end.offset - offsetEnd],
-        );
+        return pure(value).withLocation([start.line, start.column, start.offset], [end.line, end.column, end.offset]);
      }
-      return patternifyAST(ast.source_, code);
-    }
+      return patternifyAST(ast.source_);
    case 'stretch':
-      return patternifyAST(ast.source_, code).slow(ast.arguments_.amount);
+      return patternifyAST(ast.source_).slow(ast.arguments_.amount);
    /* case 'scale':
      let [tonic, scale] = Scale.tokenize(ast.arguments_.scale);
      const intervals = Scale.get(scale).intervals;
@@ -189,9 +162,8 @@ export function patternifyAST(ast, code) {
 // mini notation only (wraps in "")
 export const mini = (...strings) => {
  const pats = strings.map((str) => {
-    const code = `"${str}"`;
-    const ast = krill.parse(code);
-    return patternifyAST(ast, code);
+    const ast = krill.parse(`"${str}"`);
+    return patternifyAST(ast);
  });
  return sequence(...pats);
 };
@@ -200,9 +172,14 @@ export const mini = (...strings) => {
 export const h = (string) => {
  const ast = krill.parse(string);
  // console.log('ast', ast);
-  return patternifyAST(ast, string);
+  return patternifyAST(ast);
 };

+// shorthand for mini
+Pattern.prototype.define('mini', mini, { composable: true });
+Pattern.prototype.define('m', mini, { composable: true });
+Pattern.prototype.define('h', h, { composable: true });
+
 export function minify(thing) {
  if (typeof thing === 'string') {
    return mini(thing);
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/mini",
-  "version": "0.5.0",
+  "version": "0.4.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/mini",
-  "version": "0.5.0",
+  "version": "0.4.0",
  "description": "Mini notation for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -26,9 +26,9 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.4.1",
-    "@strudel.cycles/eval": "^0.5.0",
-    "@strudel.cycles/tone": "^0.5.0"
+    "@strudel.cycles/core": "^0.4.0",
+    "@strudel.cycles/eval": "^0.4.0",
+    "@strudel.cycles/tone": "^0.4.0"
  },
  "devDependencies": {
    "peggy": "^2.0.1"
@@ -77,7 +77,7 @@ describe('mini', () => {
    expect(haps.length < 230).toBe(true);
    // 'Had too many cycles remaining after degradeBy 0.8');
  });
-  /*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.
@@ -103,5 +103,5 @@ describe('mini', () => {
    //  PRNG, this test should succeed
    expect(chisq <= 15.086).toBe(true);
    // assert(chisq <= 15.086, chisq + ' was expected to be less than 15.086 under chi-squared test');
-  });*/
+  });
 });
@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/osc",
-	"version": "0.4.0",
+	"version": "0.3.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/osc",
-  "version": "0.4.0",
+  "version": "0.3.0",
  "description": "OSC messaging for strudel",
  "main": "osc.mjs",
  "scripts": {
@@ -25,6 +25,8 @@ const config = {
  },
 };

+
+
 const osc = new OSC({ plugin: new OSC.BridgePlugin(config) });

 osc.open(); // start a WebSocket server on port 8080
@@ -74,11 +74,11 @@ const B = $.define(), se = G.define({
      for (let o of t.effects)
        if (o.is(z)) {
          const a = o.value.map(
-            (s) => (s.context.locations || []).map(({ start: u, end: d }) => {
-              const f = s.context.color || "#FFCA28";
-              let c = t.newDoc.line(u.line).from + u.column, i = t.newDoc.line(d.line).from + d.column;
+            (s) => (s.context.locations || []).map(({ start: f, end: d }) => {
+              const u = s.context.color || "#FFCA28";
+              let c = t.newDoc.line(f.line).from + f.column, i = t.newDoc.line(d.line).from + d.column;
              const m = t.newDoc.length;
-              return c > m || i > m ? void 0 : E.mark({ attributes: { style: `outline: 1.5px solid ${f};` } }).range(c, i);
+              return c > m || i > m ? void 0 : E.mark({ attributes: { style: `outline: 1.5px solid ${u};` } }).range(c, i);
            })
          ).flat().filter(Boolean) || [];
          e = E.set(a, !0);
@@ -90,13 +90,13 @@ const B = $.define(), se = G.define({
  },
  provide: (e) => U.decorations.from(e)
 }), le = [Y(), ae, ie, se];
-function de({ value: e, onChange: t, onViewChanged: o, onSelectionChange: a, options: s, editorDidMount: u }) {
+function de({ value: e, onChange: t, onViewChanged: o, onSelectionChange: a, options: s, editorDidMount: f }) {
  const d = _(
    (i) => {
      t?.(i);
    },
    [t]
-  ), f = _(
+  ), u = _(
    (i) => {
      o?.(i);
    },
@@ -110,7 +110,7 @@ function de({ value: e, onChange: t, onViewChanged: o, onSelectionChange: a, opt
  return /* @__PURE__ */ n.createElement(n.Fragment, null, /* @__PURE__ */ n.createElement(X, {
    value: e,
    onChange: d,
-    onCreateEditor: f,
+    onCreateEditor: u,
    onUpdate: c,
    extensions: le
  }));
@@ -119,21 +119,21 @@ function K(...e) {
  return e.filter(Boolean).join(" ");
 }
 function ue({ view: e, pattern: t, active: o, getTime: a }) {
-  const s = H([]), u = H();
+  const s = H([]), f = H();
  L(() => {
    if (e)
      if (t && o) {
-        let d = requestAnimationFrame(function f() {
+        let u = function() {
          try {
-            const c = a(), m = [Math.max(u.current || c, c - 1 / 10, 0), c + 1 / 60];
-            u.current = m[1], s.current = s.current.filter((g) => g.whole.end > c);
+            const c = a(), m = [Math.max(f.current || c, c - 1 / 10, 0), c + 1 / 60];
+            f.current = m[1], s.current = s.current.filter((g) => g.whole.end > c);
            const h = t.queryArc(...m).filter((g) => g.hasOnset());
            s.current = s.current.concat(h), e.dispatch({ effects: z.of(s.current) });
          } catch {
            e.dispatch({ effects: z.of([]) });
          }
-          d = requestAnimationFrame(f);
-        });
+          d = requestAnimationFrame(u);
+        }, d = requestAnimationFrame(u);
        return () => {
          cancelAnimationFrame(d);
        };
@@ -183,9 +183,9 @@ function we({
  getTime: o,
  evalOnMount: a = !1,
  initialCode: s = "",
-  autolink: u = !1,
+  autolink: f = !1,
  beforeEval: d,
-  afterEval: f,
+  afterEval: u,
  onEvalError: c,
  onToggle: i
 }) {
@@ -203,7 +203,7 @@ function we({
        y(l), d?.();
      },
      afterEval: ({ pattern: l, code: P }) => {
-        S(P), D(l), N(), g(), u && (window.location.hash = "#" + encodeURIComponent(btoa(P))), f?.();
+        S(P), D(l), N(), g(), f && (window.location.hash = "#" + encodeURIComponent(btoa(P))), u?.();
      },
      onToggle: (l) => {
        x(l), i?.(l);
@@ -250,9 +250,9 @@ const ke = () => re().currentTime;
 function Se({ tune: e, hideOutsideView: t = !1, init: o, enableKeyboard: a }) {
  const {
    code: s,
-    setCode: u,
+    setCode: f,
    evaluate: d,
-    activateCode: f,
+    activateCode: u,
    error: c,
    isDirty: i,
    activeCode: m,
@@ -276,7 +276,7 @@ function Se({ tune: e, hideOutsideView: t = !1, init: o, enableKeyboard: a }) {
  }), j(() => {
    if (a) {
      const x = async (b) => {
-        (b.ctrlKey || b.altKey) && (b.code === "Enter" ? (b.preventDefault(), ce(y), await f()) : b.code === "Period" && (p(), b.preventDefault()));
+        (b.ctrlKey || b.altKey) && (b.code === "Enter" ? (b.preventDefault(), ce(y), await u()) : b.code === "Period" && (p(), b.preventDefault()));
      };
      return window.addEventListener("keydown", x, !0), () => window.removeEventListener("keydown", x, !0);
    }
@@ -294,7 +294,7 @@ function Se({ tune: e, hideOutsideView: t = !1, init: o, enableKeyboard: a }) {
    type: g ? "pause" : "play"
  })), /* @__PURE__ */ n.createElement("button", {
    className: K(i ? v.button : v.buttonDisabled),
-    onClick: () => f()
+    onClick: () => u()
  }, /* @__PURE__ */ n.createElement(O, {
    type: "refresh"
  }))), c && /* @__PURE__ */ n.createElement("div", {
@@ -303,7 +303,7 @@ function Se({ tune: e, hideOutsideView: t = !1, init: o, enableKeyboard: a }) {
    className: v.body
  }, F && /* @__PURE__ */ n.createElement(de, {
    value: s,
-    onChange: u,
+    onChange: f,
    onViewChanged: M
  })));
 }
@@ -1,7 +1,7 @@
-import { defineConfig } from 'vite';
-import react from '@vitejs/plugin-react';
+import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react'

 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [react()],
-});
+  plugins: [react()]
+})
@@ -2,7 +2,7 @@
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
-    <!--     <link rel="icon" type="image/svg+xml" href="/src/favicon.svg" /> -->
+<!--     <link rel="icon" type="image/svg+xml" href="/src/favicon.svg" /> -->
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>Strudel React Components</title>
  </head>
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/react",
-  "version": "0.5.0",
+  "version": "0.4.1",
  "description": "React components for strudel",
  "main": "dist/index.cjs.js",
  "module": "dist/index.es.js",
@@ -39,10 +39,10 @@
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
    "@codemirror/lang-javascript": "^6.1.1",
-    "@strudel.cycles/core": "^0.4.1",
-    "@strudel.cycles/tone": "^0.5.0",
-    "@strudel.cycles/transpiler": "^0.5.0",
-    "@strudel.cycles/webaudio": "^0.5.0",
+    "@strudel.cycles/core": "^0.4.0",
+    "@strudel.cycles/tone": "^0.4.0",
+    "@strudel.cycles/transpiler": "^0.4.0",
+    "@strudel.cycles/webaudio": "^0.4.1",
    "@uiw/codemirror-themes": "^4.12.4",
    "@uiw/react-codemirror": "^4.12.4",
    "react-hook-inview": "^4.5.0"
@@ -9,4 +9,4 @@ module.exports = {
    tailwindcss: {},
    autoprefixer: {},
  },
-};
+}
@@ -7,7 +7,9 @@ function useHighlighting({ view, pattern, active, getTime }) {
  useEffect(() => {
    if (view) {
      if (pattern && active) {
-        let frame = requestAnimationFrame(function updateHighlights() {
+        let frame = requestAnimationFrame(updateHighlights);
+
+        function updateHighlights() {
          try {
            const audioTime = getTime();
            // force min framerate of 10 fps => fixes crash on tab refocus, where lastEnd could be far away
@@ -23,7 +25,8 @@ function useHighlighting({ view, pattern, active, getTime }) {
            view.dispatch({ effects: setHighlights.of([]) });
          }
          frame = requestAnimationFrame(updateHighlights);
-        });
+        }
+
        return () => {
          cancelAnimationFrame(frame);
        };
@@ -1,10 +1,5 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import App from './App';
+import React from 'react'
+import ReactDOM from 'react-dom'
+import App from './App'

-ReactDOM.render(
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>,
-  document.getElementById('root'),
-);
+ReactDOM.render(<React.StrictMode><App /></React.StrictMode>,document.getElementById('root'))
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/serial",
-  "version": "0.3.0",
+  "version": "0.2.0",
  "description": "Webserial API for strudel",
  "main": "serial.mjs",
  "repository": {
@@ -6,7 +6,7 @@ This program is free software: you can redistribute it and/or modify it under th

 import { Pattern, isPattern } from '@strudel.cycles/core';

-var writeMessage;
+var serialWriter;
 var choosing = false;

 export async function getWriter(br = 38400) {
@@ -14,29 +14,17 @@ export async function getWriter(br = 38400) {
    return;
  }
  choosing = true;
-  if (writeMessage) {
-    return writeMessage;
+  if (serialWriter) {
+    return serialWriter;
  }
  if ('serial' in navigator) {
    const port = await navigator.serial.requestPort();
    await port.open({ baudRate: br });
-    const encoder = new TextEncoder();
-    const writer = port.writable.getWriter();
-    writeMessage = function (message, chk) {
-      const encoded = encoder.encode(message);
-      if (!chk) {
-        writer.write(encoded);
-      } else {
-        const bytes = new Uint8Array(4);
-        bytes[0] = 124; // | symbol
-        bytes[1] = (chk >> 8) & 0xff;
-        bytes[2] = chk & 0xff;
-        bytes[3] = 59; // semicolon
-        const withchk = new Uint8Array(encoded.length + 4);
-        withchk.set(encoded);
-        withchk.set(bytes, encoded.length);
-        writer.write(withchk);
-      }
+    const textEncoder = new TextEncoderStream();
+    const writableStreamClosed = textEncoder.readable.pipeTo(port.writable);
+    const writer = textEncoder.writable.getWriter();
+    serialWriter = function (message) {
+      writer.write(message);
    };
  } else {
    throw 'Webserial is not available in this browser.';
@@ -45,41 +33,18 @@ export async function getWriter(br = 38400) {

 const latency = 0.1;

-// crc16 (CCITT-FALSE) https://gist.github.com/tijnkooijmans/10981093
-function crc16(data) {
-  const length = data.length;
-  if (length == 0) {
-    return 0;
-  }
-
-  var crc = 0xffff;
-  for (var i = 0; i < length; ++i) {
-    crc ^= data.charCodeAt(i) << 8;
-    for (var j = 0; j < 8; ++j) {
-      crc = (crc & 0x8000) > 0 ? (crc << 1) ^ 0x1021 : crc << 1;
-    }
-  }
-
-  return crc & 0xffff;
-}
-
-Pattern.prototype.serial = function (br = 38400, sendcrc = false, singlecharids = false) {
-  return this.withHap((hap) => {
-    if (!writeMessage) {
-      getWriter(br);
+Pattern.prototype.serial = function (...args) {
+  return this._withHap((hap) => {
+    if (!serialWriter) {
+      getWriter(...args);
    }
    const onTrigger = (time, hap, currentTime) => {
      var message = '';
-      var chk = 0;
      if (typeof hap.value === 'object') {
        if ('action' in hap.value) {
-          var action = hap.value['action'];
-          if (singlecharids) {
-            action = action.charAt(0);
-          }
-          message += action + '(';
+          message += hap.value['action'] + '(';
          var first = true;
-          for (var [key, val] of Object.entries(hap.value)) {
+          for (const [key, val] of Object.entries(hap.value)) {
            if (key === 'action') {
              continue;
            }
@@ -88,28 +53,19 @@ Pattern.prototype.serial = function (br = 38400, sendcrc = false, singlecharids
            } else {
              message += ',';
            }
-            if (singlecharids) {
-              key = key.charAt(0);
-            }
-            message += key + ':' + val;
+            message += `${key}:${val}`;
          }
          message += ')';
-          if (sendcrc) {
-            chk = crc16(message);
-          }
        } else {
          for (const [key, val] of Object.entries(hap.value)) {
-            message += `${key}:${val}`;
+            message += `${key}:${val};`;
          }
        }
      } else {
        message = hap.value;
      }
      const offset = (time - currentTime + latency) * 1000;
-
-      window.setTimeout(function () {
-        writeMessage(message, chk);
-      }, offset);
+      window.setTimeout(serialWriter, offset, message);
    };
    return hap.setContext({ ...hap.context, onTrigger, dominantTrigger: true });
  });
@@ -1,5 +1,3 @@
-import { toMidi } from '@strudel.cycles/core';
-
 let loadCache = {};
 async function loadFont(name) {
  if (loadCache[name]) {
@@ -42,7 +42,7 @@ export const instruments = [
  '0031_FluidR3_GM_sf2_file',
  '0031_GeneralUserGS_sf2_file',
  '0031_SoundBlasterOld_sf2', // pianos until here
-  '0040_Aspirin_sf2_file',
+  '0040_Aspirin_sf2_file', 
  '0040_Chaos_sf2_file',
  '0040_FluidR3_GM_sf2_file', // rhodes
  '0040_GeneralUserGS_sf2_file', // staccato rhodes
@@ -59,7 +59,7 @@ export const instruments = [
  '0046_GeneralUserGS_sf2_file', // ?
  '0050_Aspirin_sf2_file', // glass organ
  '0050_Chaos_sf2_file', // short glass organ
-  '0050_FluidR3_GM_sf2_file', // long glass organ !
+  '0050_FluidR3_GM_sf2_file',// long glass organ !
  '0050_GeneralUserGS_sf2_file', // short glass organ
  '0050_JCLive_sf2_file', // glass organ
  '0050_SBLive_sf2', // ?
@@ -1635,7 +1635,7 @@ export const drums = [
  '81_4_Chaos_sf2_file',
 ];

-// see https://www.midi.org/specifications-old/item/gm-level-1-sound-set
+// see https://www.midi.org/specifications-old/item/gm-level-1-sound-set 
 export const instrumentNames = [];
 instrumentNames[0] = 'Acoustic Grand Piano: Piano';
 instrumentNames[1] = 'Bright Acoustic Piano: Piano';
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/soundfonts",
-  "version": "0.5.0",
+  "version": "0.4.1",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/soundfonts",
-  "version": "0.5.0",
+  "version": "0.4.1",
  "description": "Soundsfont support for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -22,8 +22,8 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.4.1",
-    "@strudel.cycles/webaudio": "^0.5.0",
+    "@strudel.cycles/core": "^0.4.0",
+    "@strudel.cycles/webaudio": "^0.4.1",
    "sfumato": "^0.1.2",
    "soundfont2": "^0.4.0"
  },
@@ -1,5 +1,4 @@
-import { Pattern, getPlayableNoteValue, toMidi } from '@strudel.cycles/core';
-import { getAudioContext } from '@strudel.cycles/webaudio';
+import { Pattern } from '@strudel.cycles/core';
 import { loadSoundfont as _loadSoundfont, startPresetNote } from 'sfumato';

 Pattern.prototype.soundfont = function (sf, n = 0) {
@@ -1,5 +1,2 @@
 import './tonal.mjs';
 import './voicings.mjs';
-
-export * from './tonal.mjs';
-export * from './voicings.mjs';
@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/tonal",
-	"version": "0.5.0",
+	"version": "0.4.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/tonal",
-  "version": "0.5.0",
+  "version": "0.4.0",
  "description": "Tonal functions for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -25,8 +25,8 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.4.1",
-    "@tonaljs/tonal": "^4.7.2",
+    "@strudel.cycles/core": "^0.4.0",
+    "@tonaljs/tonal": "^4.6.5",
    "chord-voicings": "^0.0.1",
    "webmidi": "^3.0.21"
  }
@@ -5,7 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
 */

 import { Note, Interval, Scale } from '@tonaljs/tonal';
-import { register, _mod } from '@strudel.cycles/core';
+import { Pattern, mod } from '@strudel.cycles/core';

 // transpose note inside scale by offset steps
 // function scaleOffset(scale: string, offset: number, note: string) {
@@ -29,7 +29,7 @@ function scaleOffset(scale, offset, note) {
  // TODO: find way to do this smarter
  while (Math.abs(i - noteIndex) < Math.abs(offset)) {
    i += direction;
-    const index = _mod(i, notes.length);
+    const index = mod(i, notes.length);
    if (direction < 0 && n[0] === 'C') {
      o += direction;
    }
@@ -74,8 +74,8 @@ function scaleOffset(scale, offset, note) {
 * "c2 c3".fast(2).transpose("<1P -2M 4P 3m>".slow(2)).note()
 */

-export const transpose = register('transpose', function (intervalOrSemitones, pat) {
-  return pat.withHap((hap) => {
+Pattern.prototype._transpose = function (intervalOrSemitones) {
+  return this.withHap((hap) => {
    const interval = !isNaN(Number(intervalOrSemitones))
      ? Interval.fromSemitones(intervalOrSemitones /*  as number */)
      : String(intervalOrSemitones);
@@ -87,9 +87,11 @@ export const transpose = register('transpose', function (intervalOrSemitones, pa
    // tone.js doesn't understand multiple sharps flats e.g. F##3 has to be turned into G3
    return hap.withValue(() => Note.simplify(Note.transpose(hap.value, interval)));
  });
-});
+};

 // example: transpose(3).late(0.2) will be equivalent to compose(transpose(3), late(0.2))
+// TODO: add Pattern.define(name, function, options) that handles all the meta programming stuff
+// TODO: find out how to patternify this function when it's standalone
 // e.g. `stack(c3).superimpose(transpose(slowcat(7, 5)))` or
 // or even `stack(c3).superimpose(transpose.slowcat(7, 5))` or

@@ -108,8 +110,8 @@ export const transpose = register('transpose', function (intervalOrSemitones, pa
 * .note()
 */

-export const scaleTranspose = register('scaleTranspose', function (offset /* : number | string */, pat) {
-  return pat.withHap((hap) => {
+Pattern.prototype._scaleTranspose = function (offset /* : number | string */) {
+  return this.withHap((hap) => {
    if (!hap.context.scale) {
      throw new Error('can only use scaleTranspose after .scale');
    }
@@ -118,7 +120,7 @@ export const scaleTranspose = register('scaleTranspose', function (offset /* : n
    }
    return hap.withValue(() => scaleOffset(hap.context.scale, Number(offset), hap.value));
  });
-});
+};

 /**
 * Turns numbers into notes in the scale (zero indexed). Also sets scale for other scale operations, like {@link Pattern#scaleTranspose}.
@@ -139,8 +141,8 @@ export const scaleTranspose = register('scaleTranspose', function (offset /* : n
 * .note()
 */

-export const scale = register('scale', function (scale /* : string */, pat) {
-  return pat.withHap((hap) => {
+Pattern.prototype._scale = function (scale /* : string */) {
+  return this.withHap((hap) => {
    let note = hap.value;
    const asNumber = Number(note);
    if (!isNaN(asNumber)) {
@@ -150,4 +152,8 @@ export const scale = register('scale', function (scale /* : string */, pat) {
    }
    return hap.withValue(() => note).setContext({ ...hap.context, scale });
  });
-});
+};
+
+Pattern.prototype.define('transpose', (a, pat) => pat.transpose(a), { composable: true, patternified: true });
+Pattern.prototype.define('scale', (a, pat) => pat.scale(a), { composable: true, patternified: true });
+Pattern.prototype.define('scaleTranspose', (a, pat) => pat.scaleTranspose(a), { composable: true, patternified: true });
@@ -4,49 +4,31 @@ 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 { stack, register } from '@strudel.cycles/core';
+import { Pattern as _Pattern, stack, Hap, reify } from '@strudel.cycles/core';
 import _voicings from 'chord-voicings';
 const { dictionaryVoicing, minTopNoteDiff, lefthand } = _voicings.default || _voicings; // parcel module resolution fuckup

-export const voicingRegistry = {
-  lefthand: { dictionary: lefthand, range: ['F3', 'A4'] },
-};
-export const setVoicingRange = (name, range) => addVoicings(name, voicingRegistry[name].dictionary, range);
-
-/**
- * Adds a new custom voicing dictionary.
- *
- * @name addVoicings
- * @memberof Pattern
- * @param {string} name identifier for the voicing dictionary
- * @param {Object} dictionary maps chord symbol to possible voicings
- * @param {Array} range min, max note
- * @returns Pattern
- * @example
- * addVoicings('cookie', {
- *   7: ['3M 7m 9M 12P 15P', '7m 10M 13M 16M 19P'],
- *   '^7': ['3M 6M 9M 12P 14M', '7M 10M 13M 16M 19P'],
- *   m7: ['8P 11P 14m 17m 19P', '5P 8P 11P 14m 17m'],
- *   m7b5: ['3m 5d 8P 11P 14m', '5d 8P 11P 14m 17m'],
- *   o7: ['3m 6M 9M 11A 15P'],
- *   '7alt': ['3M 7m 10m 13m 15P'],
- *   '7#11': ['7m 10m 13m 15P 17m'],
- * }, ['C3', 'C6'])
- * "<C^7 A7 Dm7 G7>".voicings('cookie').note()
- */
-export const addVoicings = (name, dictionary, range = ['F3', 'A4']) => {
-  Object.assign(voicingRegistry, { [name]: { dictionary, range } });
-};
-
-const getVoicing = (chord, dictionaryName, lastVoicing) => {
-  const { dictionary, range } = voicingRegistry[dictionaryName];
-  return dictionaryVoicing({
+const getVoicing = (chord, lastVoicing, range = ['F3', 'A4']) =>
+  dictionaryVoicing({
    chord,
-    dictionary,
+    dictionary: lefthand,
    range,
    picker: minTopNoteDiff,
    lastVoicing,
  });
+
+const Pattern = _Pattern;
+
+Pattern.prototype.fmapNested = function (func) {
+  return new Pattern((span) =>
+    this.query(span)
+      .map((event) =>
+        reify(func(event))
+          .query(span)
+          .map((hap) => new Hap(event.whole, event.part, hap.value, hap.context)),
+      )
+      .flat(),
+  );
 };

 /**
@@ -55,38 +37,32 @@ const getVoicing = (chord, dictionaryName, lastVoicing) => {
 *
 * @name voicings
 * @memberof Pattern
- * @param {string} dictionary which voicing dictionary to use.
+ * @param {range} range note range for possible voicings (optional, defaults to `['F3', 'A4']`)
 * @returns Pattern
 * @example
- * stack("<C^7 A7 Dm7 G7>".voicings('lefthand'), "<C3 A2 D3 G2>").note()
+ * stack("<C^7 A7 Dm7 G7>".voicings(), "<C3 A2 D3 G2>").note()
 */

-let lastVoicing; // this now has to be global until another solution is found :-/
-// it used to be local to the voicings function at evaluation time
-// but since register will patternify by default, means that
-// the function is called over and over again, resetting the lastVoicing variables
-export const voicings = register('voicings', function (dictionary, pat) {
-  return pat
-    .fmap((value) => {
-      lastVoicing = getVoicing(value, dictionary, lastVoicing);
-      return stack(...lastVoicing);
-    })
-    .outerJoin();
-});
+Pattern.prototype.voicings = function (range) {
+  let lastVoicing;
+  if (!range?.length) {
+    // allows to pass empty array, if too lazy to specify range
+    range = ['F3', 'A4'];
+  }
+  return this.fmapNested((event) => {
+    lastVoicing = getVoicing(event.value, lastVoicing, range);
+    return stack(...lastVoicing).withContext(() => ({
+      locations: event.context.locations || [],
+    }));
+  });
+};

-/**
- * Maps the chords of the incoming pattern to root notes in the given octave.
- *
- * @name rootNotes
- * @memberof Pattern
- * @param {octave} octave octave to use
- * @returns Pattern
- * @example
- * "<C^7 A7 Dm7 G7>".rootNotes(2).note()
- */
-export const rootNotes = register('rootNotes', function (octave, pat) {
-  return pat.fmap((value) => {
-    const root = value.match(/^([a-gA-G][b#]?).*$/)[1];
+Pattern.prototype._rootNotes = function (octave = 2) {
+  return this.fmap((value) => {
+    const [_, root] = value.match(/^([a-gA-G][b#]?).*$/);
    return root + octave;
  });
-});
+};
+
+Pattern.prototype.define('voicings', (range, pat) => pat.voicings(range), { composable: true });
+Pattern.prototype.define('rootNotes', (oct, pat) => pat.rootNotes(oct), { composable: true, patternified: true });
@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/tone",
-	"version": "0.5.0",
+	"version": "0.4.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/tone",
-  "version": "0.5.0",
+  "version": "0.4.0",
  "description": "Tone.js API for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -22,7 +22,7 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.4.1",
+    "@strudel.cycles/core": "^0.4.0",
    "tone": "^14.7.77"
  }
 }
@@ -4,15 +4,18 @@ 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 { register } from '@strudel.cycles/core';
+import { Pattern } from '@strudel.cycles/core';
 import * as _Tone from 'tone';

 // import Tone from here, to make sure to get the same AudioContext
 export const Tone = _Tone;

 const {
+  AutoFilter,
+  Destination,
  Filter,
  Gain,
+  isNote,
  Synth,
  PolySynth,
  MembraneSynth,
@@ -46,8 +49,8 @@ export const getDefaultSynth = () => {
 // https://www.charlie-roberts.com/gibberish/playground/

 // with this function, you can play the pattern with any tone synth
-export const tone = register('tone', function (instrument, pat) {
-  return pat.onTrigger((time, hap) => {
+Pattern.prototype.tone = function (instrument) {
+  return this.onTrigger((time, hap) => {
    let note;
    let velocity = hap.context?.velocity ?? 0.75;
    if (instrument instanceof PluckSynth) {
@@ -71,7 +74,9 @@ export const tone = register('tone', function (instrument, pat) {
      instrument.triggerAttackRelease(note, hap.duration.valueOf(), time, velocity);
    }
  });
-});
+};
+
+Pattern.prototype.define('tone', (type, pat) => pat.tone(type), { composable: true, patternified: false });

 // synth helpers
 export const amsynth = (options) => new AMSynth(options);
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/transpiler",
-  "version": "0.5.0",
+  "version": "0.4.0",
  "description": "Transpiler for strudel user code. Converts syntactically correct but semantically meaningless JS into evaluatable strudel code.",
  "main": "index.mjs",
  "scripts": {
@@ -24,7 +24,7 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.4.1",
+    "@strudel.cycles/core": "^0.4.0",
    "acorn": "^8.8.1",
    "escodegen": "^2.0.0",
    "estree-walker": "^3.0.1"
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/webaudio",
-  "version": "0.5.0",
+  "version": "0.4.1",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/webaudio",
-  "version": "0.5.0",
+  "version": "0.4.1",
  "description": "Web Audio helpers for Strudel",
  "main": "index.mjs",
  "type": "module",
@@ -30,6 +30,6 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.4.1"
+    "@strudel.cycles/core": "^0.4.0"
  }
 }
@@ -1,5 +1,4 @@
-import { logger, toMidi, valueToMidi } from '@strudel.cycles/core';
-import { getAudioContext } from './index.mjs';
+import { logger } from '@strudel.cycles/core';

 const bufferCache = {}; // string: Promise<ArrayBuffer>
 const loadCache = {}; // string: Promise<ArrayBuffer>
@@ -20,12 +19,9 @@ function humanFileSize(bytes, si) {
  return bytes.toFixed(1) + ' ' + units[u];
 }

-export const getSampleBufferSource = async (s, n, note, speed, freq) => {
+export const getSampleBufferSource = async (s, n, note, speed) => {
  let transpose = 0;
-  if (freq !== undefined && note !== undefined) {
-    logger('[sampler] hap has note and freq. ignoring note', 'warning');
-  }
-  let midi = valueToMidi({ freq, note }, 36);
+  let midi = typeof note === 'string' ? toMidi(note) : note || 36;
  transpose = midi - 36; // C3 is middle C

  const ac = getAudioContext();
@@ -4,6 +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, getFrequency, patternify2 } from '@strudel.cycles/core';
 import * as strudel from '@strudel.cycles/core';
 import { fromMidi, logger, toMidi } from '@strudel.cycles/core';
 import './feedbackdelay.mjs';
@@ -288,10 +289,10 @@ export const webaudioOutput = async (hap, deadline, hapDuration) => {

    if (soundfont) {
      // is soundfont
-      bufferSource = await globalThis.getFontBufferSource(soundfont, note || n, ac, freq);
+      bufferSource = await globalThis.getFontBufferSource(soundfont, note || n, ac);
    } else {
      // is sample from loaded samples(..)
-      bufferSource = await getSampleBufferSource(s, n, note, speed, freq);
+      bufferSource = await getSampleBufferSource(s, n, note, speed);
    }
    // asny stuff above took too long?
    if (ac.currentTime > t) {
@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/webdirt",
-	"version": "0.5.0",
+	"version": "0.4.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/webdirt",
-  "version": "0.5.0",
+  "version": "0.4.0",
  "description": "WebDirt integration for Strudel",
  "main": "index.mjs",
  "type": "module",
@@ -22,7 +22,7 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.4.1",
+    "@strudel.cycles/core": "^0.4.0",
    "WebDirt": "github:dktr0/WebDirt"
  }
 }
@@ -1,4 +1,2 @@
 import './xen.mjs';
 import './tune.mjs';
-
-export * from './xen.mjs';
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/xen",
-  "version": "0.5.0",
+  "version": "0.4.0",
  "description": "Xenharmonic API for strudel",
  "main": "index.mjs",
  "scripts": {
@@ -24,6 +24,6 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.4.1"
+    "@strudel.cycles/core": "^0.4.0"
  }
 }
@@ -5,16 +5,18 @@ This program is free software: you can redistribute it and/or modify it under th
 */

 import Tune from './tunejs.js';
-import { register } from '@strudel.cycles/core';
+import { Pattern } from '@strudel.cycles/core';

-export const tune = register('tune', (scale, pat) => {
+Pattern.prototype._tune = function (scale, tonic = 220) {
  const tune = new Tune();
  if (!tune.isValidScale(scale)) {
    throw new Error('not a valid tune.js scale name: "' + scale + '". See http://abbernie.github.io/tune/scales.html');
  }
  tune.loadScale(scale);
-  tune.tonicize(1);
-  return pat.withHap((hap) => {
-    return hap.withValue(() => tune.note(hap.value));
+  tune.tonicize(tonic);
+  return this._asNumber()._withHap((hap) => {
+    return hap.withValue(() => tune.note(hap.value)).setContext({ ...hap.context, type: 'frequency' });
  });
-});
+};
+
+Pattern.prototype.define('tune', (scale, pat) => pat.tune(scale), { composable: true, patternified: true });
@@ -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 { register, _mod, parseNumeral } from '@strudel.cycles/core';
+import { Pattern, mod } from '@strudel.cycles/core';

 export function edo(name) {
  if (!/^[1-9]+[0-9]*edo$/.test(name)) {
@@ -42,23 +42,26 @@ function getXenScale(scale, indices) {
 }

 function xenOffset(xenScale, offset, index = 0) {
-  const i = _mod(index + offset, xenScale.length);
+  const i = mod(index + offset, xenScale.length);
  const oct = Math.floor(offset / xenScale.length);
  return xenScale[i] * Math.pow(2, oct);
 }

 // scaleNameOrRatios: string || number[], steps?: number
-export const xen = register('xen', function (scaleNameOrRatios, pat) {
-  return pat.withHap((hap) => {
+Pattern.prototype._xen = function (scaleNameOrRatios, steps) {
+  return this._asNumber()._withHap((hap) => {
    const scale = getXenScale(scaleNameOrRatios);
-    const frequency = xenOffset(scale, parseNumeral(hap.value));
-    return hap.withValue(() => frequency);
+    steps = steps || scale.length;
+    const frequency = xenOffset(scale, hap.value);
+    return hap.withValue(() => frequency).setContext({ ...hap.context, type: 'frequency' });
  });
-});
+};

-export const tuning = register('tuning', function (ratios, pat) {
-  return pat.withHap((hap) => {
-    const frequency = xenOffset(ratios, parseNumeral(hap.value));
-    return hap.withValue(() => frequency);
+Pattern.prototype.tuning = function (steps) {
+  return this._asNumber()._withHap((hap) => {
+    const frequency = xenOffset(steps, hap.value);
+    return hap.withValue(() => frequency).setContext({ ...hap.context, type: 'frequency' });
  });
-});
+};
+Pattern.prototype.define('xen', (scale, pat) => pat.xen(scale), { composable: true, patternified: true });
+// Pattern.prototype.define('tuning', (scale, pat) => pat.xen(scale), { composable: true, patternified: false });
@@ -9,4 +9,4 @@ module.exports = {
    tailwindcss: {},
    autoprefixer: {},
  },
-};
+}
@@ -33,6 +33,7 @@ const supabase = createClient(

 const modules = [
  import('@strudel.cycles/core'),
+  // import('@strudel.cycles/tone'),
  import('@strudel.cycles/tonal'),
  import('@strudel.cycles/mini'),
  import('@strudel.cycles/midi'),
@@ -41,10 +42,10 @@ const modules = [
  import('@strudel.cycles/osc'),
  import('@strudel.cycles/serial'),
  import('@strudel.cycles/soundfonts'),
-  import('@strudel.cycles/csound'),
 ];

 evalScope(
+  // Tone,
  controls, // sadly, this cannot be exported from core direclty
  { WebDirt },
  ...modules,
@@ -1,11 +1,13 @@
 body {
  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans',
-    'Droid Sans', 'Helvetica Neue', sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
+    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
+    sans-serif;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
 }

 code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
+  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
+    monospace;
 }
@@ -1,4 +1,4 @@
-import { Pattern, toMidi, valueToMidi } from '@strudel.cycles/core';
+import { Pattern, toMidi } from '@strudel.cycles/core';
 import { samples } from '@strudel.cycles/webaudio';

 export async function prebake({ isMock = false, baseDir = '.' } = {}) {
@@ -25,9 +25,9 @@ Pattern.prototype.piano = function () {
    .s('piano')
    .release(0.1)
    .fmap((value) => {
-      const midi = valueToMidi(value);
+      const midi = typeof value.note === 'string' ? toMidi(value.note) : value.note;
      // pan by pitch
-      const pan = panwidth(Math.min(Math.round(midi) / maxPan, 1), 0.5);
+      const pan = panwidth(Math.min(midi / maxPan, 1), 0.5);
      return { ...value, pan: (value.pan || 1) * pan };
    });
 };
@@ -19,7 +19,8 @@ import { mini } from '@strudel.cycles/mini/mini.mjs';
 // import euclid from '@strudel.cycles/core/euclid.mjs';
 // import '@strudel.cycles/tone/tone.mjs';
 // import '@strudel.cycles/midi/midi.mjs';
-import * as tonalHelpers from '@strudel.cycles/tonal';
+import '@strudel.cycles/tonal/voicings.mjs';
+import '@strudel.cycles/tonal/tonal.mjs';
 import '@strudel.cycles/xen/xen.mjs';
 // import '@strudel.cycles/xen/tune.mjs';
 // import '@strudel.cycles/core/euclid.mjs';
@@ -87,9 +88,6 @@ const toneHelpersMocked = {
 strudel.Pattern.prototype.osc = function () {
  return this;
 };
-strudel.Pattern.prototype.csound = function () {
-  return this;
-};
 strudel.Pattern.prototype.tone = function () {
  return this;
 };
@@ -153,19 +151,16 @@ const audioCtx = {
 const getDrawContext = () => canvasCtx;
 const getAudioContext = () => audioCtx;
 const loadSoundfont = () => {};
-const loadCsound = () => {};
-const loadCSound = () => {};
-const loadcsound = () => {};

 // TODO: refactor to evalScope
 evalScope(
  // Tone,
  strudel,
+  strudel.Pattern.prototype.bootstrap(),
  toneHelpersMocked,
  uiHelpersMocked,
  controls,
  webaudio,
-  tonalHelpers,
  /* controls,
  toneHelpers,
  voicingHelpers,
@@ -175,15 +170,10 @@ evalScope(
  {
    // gist,
    // euclid,
-    csound: id,
-    loadOrc: id,
    mini,
    getDrawContext,
    getAudioContext,
    loadSoundfont,
-    loadCSound,
-    loadCsound,
-    loadcsound,
    Clock: {}, // whatever
    // Tone,
  },
@@ -192,7 +182,7 @@ evalScope(
 export const queryCode = async (code, cycles = 1) => {
  const { pattern } = await evaluate(code);
  const haps = pattern.queryArc(0, cycles);
-  return haps.map((h) => h.show(true));
+  return haps.map((h) => h.showWhole());
 };

 export const testCycles = {
@@ -89,11 +89,10 @@ export const whirlyStrudel = `seq(e4, [b2,  b3], c4)

 export const transposedChordsHacked = `stack(
  "c2 eb2 g2",
-  "Cm7".voicings('lefthand').slow(2)
+  "Cm7".voicings(['g2','c4']).slow(2)
 ).transpose(
  "<1 2 3 2>".slow(2)
 ).transpose(5)`;
-// range ['g2','c4']

 export const scaleTranspose = `"f2,f3,c4,ab4"
 .scale(seq('F minor', 'F harmonic minor').slow(4))
@@ -103,14 +102,13 @@ export const scaleTranspose = `"f2,f3,c4,ab4"
 export const struct = `stack(
  "c2 g2 a2 [e2@2 eb2] d2 a2 g2 [d2 ~ db2]",
  "[C^7 A7] [Dm7 G7]".struct("[x@2 x] [~@2 x] [~ x@2]@2 [x ~@2] ~ [~@2 x@4]@2")
-  .voicings('lefthand')
+  .voicings(['G3','A4'])
 ).slow(4)`;
-// range ['G3','A4']

 export const magicSofa = `stack(
  "<C^7 F^7 ~> <Dm7 G7 A7 ~>"
   .every(2, fast(2))
-   .voicings('lefthand'),
+   .voicings(),
  "<c2 f2 g2> <d2 g2 a2 e2>"
 ).transpose("<0 2 3 4>")`;
 // below doesn't work anymore due to constructor cleanup
@@ -158,300 +156,9 @@ const synths = stack(
    scaleTranspose(8).early(3/8)
  ).apply(thru).tone(keys).mask("<~ x>/16"),
  "<C2 Bb1 Ab1 [G1 [G2 G1]]>/2".struct("[x [~ x] <[~ [~ x]]!3 [x x]>@2]/2".fast(2)).apply(thru).tone(bass),
-  "<Cm7 Bb7 Fm7 G7b13>/2".struct("~ [x@0.1 ~]".fast(2)).voicings('lefthand').apply(thru).every(2, early(1/8)).tone(keys).mask("<x@7 ~>/8".early(1/4))
+  "<Cm7 Bb7 Fm7 G7b13>/2".struct("~ [x@0.1 ~]".fast(2)).voicings().apply(thru).every(2, early(1/8)).tone(keys).mask("<x@7 ~>/8".early(1/4))
 )
 stack(
  drums.fast(2), 
  synths
 ).slow(2)`; */
-
-export const tetrisMini = `note(\`[[e5 [b4 c5] d5 [c5 b4]]
-[a4 [a4 c5] e5 [d5 c5]]
-[b4 [~ c5] d5 e5]
-[c5 a4 a4 ~]
-[[~ d5] [~ f5] a5 [g5 f5]]
-[e5 [~ c5] e5 [d5 c5]]
-[b4 [b4 c5] d5 e5]
-[c5 a4 a4 ~]],
-[[e2 e3]*4]
-[[a2 a3]*4]
-[[g#2 g#3]*2 [e2 e3]*2]
-[a2 a3 a2 a3 a2 a3 b1 c2]
-[[d2 d3]*4]
-[[c2 c3]*4]
-[[b1 b2]*2 [e2 e3]*2]
-[[a1 a2]*4]\`).slow(16)
-`;
-
-export const giantStepsReggae = `stack(
-  // melody
-  seq(
-    "[F#5 D5] [B4 G4] Bb4 [B4 A4]",
-    "[D5 Bb4] [G4 Eb4] F#4 [G4 F4]",
-    "Bb4 [B4 A4] D5 [D#5 C#5]",
-    "F#5 [G5 F5] Bb5 [F#5 [F#5 ~@3]]",
-  ),
-  // chords
-  seq(
-    "[B^7 D7] [G^7 Bb7] Eb^7 [Am7 D7]",
-    "[G^7 Bb7] [Eb^7 F#7] B^7 [Fm7 Bb7]",
-    "Eb^7 [Am7 D7] G^7 [C#m7 F#7]",
-    "B^7 [Fm7 Bb7] Eb^7 [C#m7 F#7]"
-  )
-  .struct("~ [x ~]".fast(4*8))
-  .voicings('lefthand'),
-  // bass
-  seq(
-    "[B2 D2] [G2 D2] [Eb2 Bb2] [A2 D2]",
-    "[G2 Bb2] [Eb2 F#2] [B2 F#2] [F2 Bb2]",
-    "[Eb2 Bb2] [A2 D2] [G2 D2] [C#2 F#2]",
-    "[B2 F#2] [F2 Bb2] [Eb2 Bb2] [C#2 F#2]"
-  )
-  .struct("x ~".fast(4*8))
-).slow(25).note()`;
-
-// range ['E3', 'G4']
-
-// TODO:
-/*
-export const xylophoneCalling = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-const t = x => x.scaleTranspose("<0 2 4 3>/4").transpose(-2)
-const s = x => x.scale(cat('C3 minor pentatonic','G3 minor pentatonic').slow(4))
-const delay = new FeedbackDelay(1/8, .6).chain(vol(0.1), out());
-const chorus = new Chorus(1,2.5,0.5).start();
-stack(
-  // melody
-  "<<10 7> <8 3>>/4".struct("x*3").apply(s)
-  .scaleTranspose("<0 3 2> <1 4 3>")
-  .superimpose(scaleTranspose(2).early(1/8))
-  .apply(t).tone(polysynth().set({
-    ...osc('triangle4'),
-    ...adsr(0,.08,0)
-  }).chain(vol(0.2).connect(delay),chorus,out())).mask("<~@3 x>/16".early(1/8)),
-  // pad
-  "[1,3]/4".scale('G3 minor pentatonic').apply(t).tone(polysynth().set({
-    ...osc('square2'),
-    ...adsr(0.1,.4,0.8)
-  }).chain(vol(0.2),chorus,out())).mask("<~ x>/32"),
-  // xylophone
-  "c3,g3,c4".struct("<x*2 x>").fast("<1 <2!3 [4 8]>>").apply(s).scaleTranspose("<0 <1 [2 [3 <4 5>]]>>").apply(t).tone(polysynth().set({
-    ...osc('sawtooth4'),
-    ...adsr(0,.1,0)
-  }).chain(vol(0.4).connect(delay),out())).mask("<x@3 ~>/16".early(1/8)),
-  // bass
-  "c2 [c2 ~]*2".scale('C hirajoshi').apply(t).tone(synth({
-    ...osc('sawtooth6'),
-    ...adsr(0,.03,.4,.1)
-  }).chain(vol(0.4),out())),
-  // kick
-  "<c1!3 [c1 ~]*2>*2".tone(membrane().chain(vol(0.8),out())),
-  // snare
-  "~ <c3!7 [c3 c3*2]>".tone(noise().chain(vol(0.8),out())),
-  // hihat
-  "c3*4".transpose("[-24 0]*2").tone(metal(adsr(0,.02)).chain(vol(0.5).connect(delay),out()))
-).slow(1)
-// strudel disable-highlighting`;
-*/
-
-// TODO:
-/*
-export const sowhatelse = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-// mixer
-const mix = (key) => vol({
-  chords: .2,
-  lead: 0.8,
-  bass:  .4,
-  snare: .95, 
-  kick:  .9,
-  hihat: .35,
-}[key]||0);
-const delay = new FeedbackDelay(1/6, .3).chain(vol(.7), out());
-const delay2 = new FeedbackDelay(1/6, .2).chain(vol(.15), out());
-const chorus = new Chorus(1,2.5,0.5).start();
-// instruments
-const instr = (instrument) => ({
-  organ: polysynth().set({...osc('sawtooth4'), ...adsr(.01,.2,0)}).chain(mix('chords').connect(delay),out()),
-  lead: polysynth().set({...osc('triangle4'),...adsr(0.01,.05,0)}).chain(mix('lead').connect(delay2), out()),
-  bass: polysynth().set({...osc('sawtooth8'),...adsr(.02,.05,.3,.2)}).chain(mix('bass'),lowpass(3000), out()),
-  pad: polysynth().set({...osc('square2'),...adsr(0.1,.4,0.8)}).chain(vol(0.15),chorus,out()),
-  hihat: metal(adsr(0, .02, 0)).chain(mix('hihat'), out()),
-  snare: noise(adsr(0, .15,  0.01)).chain(mix('snare'), lowpass(5000), out()),
-  kick: membrane().chain(mix('kick'), out())
-}[instrument]);
-// harmony
-const t = transpose("<0 0 1 0>/8");
-const sowhat = scaleTranspose("0,3,6,9,11");
-// track
-stack(
-  "[<0 4 [3 [2 1]]>]/4".struct("[x]*3").mask("[~ x ~]").scale('D5 dorian').off(1/6, scaleTranspose(-7)).off(1/3, scaleTranspose(-5)).apply(t).tone(instr('lead')).mask("<~ ~ x x>/8"),
-  "<<e3 [~@2 a3]> <[d3 ~] [c3 f3] g3>>".scale('D dorian').apply(sowhat).apply(t).tone(instr('organ')).mask("<x x x ~>/8"),
-  "<[d2 [d2 ~]*3]!3 <a1*2 c2*3 [a1 e2]>>".apply(t).tone(instr('bass')),
-  "c1*6".tone(instr('hihat')),
-  "~ c3".tone(instr('snare')),
-  "<[c1@5 c1] <c1 [[c1@2 c1] ~] [c1 ~ c1] [c1!2 ~ c1!3]>>".tone(instr('kick')),
-  "[2,4]/4".scale('D dorian').apply(t).tone(instr('pad')).mask("<x x x ~>/8")
-).fast(6/8)
-// strudel disable-highlighting`;
-*/
-
-// TODO: rework tune to use freq
-/*
-export const jemblung = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-const delay = new FeedbackDelay(1/8, .6).chain(vol(0.15), out());
-const snare = noise({type:'white',...adsr(0,0.2,0)}).chain(lowpass(5000),vol(1.8),out());
-const s = polysynth().set({...osc('sawtooth4'),...adsr(0.01,.2,.6,0.2)}).chain(vol(.23).connect(delay),out());
-stack(
-  stack(
-    "0 1 4 [3!2 5]".layer(
-      // chords
-      x=>x.add("0,3").duration("0.05!3 0.02"),
-      // bass
-      x=>x.add("-8").struct("x*8").duration(0.1) 
-    ),
-    // melody
-    "12 11*3 12 ~".duration(0.005) 
-  )
-  .add("<0 1>")
-  .tune("jemblung2")
-  //.mul(22/5).round().xen("22edo")
-  //.mul(12/5).round().xen("12edo")
-  .tone(s),
-  // kick
-  "[c2 ~]*2".duration(0.05).tone(membrane().chain(out())), 
-  // snare
-  "[~ c1]*2".early(0.001).tone(snare),
-  // hihat
-  "c2*8".tone(noise().chain(highpass(6000),vol(0.5).connect(delay),out())),
-).slow(3)`;
-*/
-
-/*
-// TODO: does not work on linux (at least for me..)
-export const speakerman = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-backgroundImage('https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Fi.ytimg.com%2Fvi%2FXR0rKqW3VwY%2Fmaxresdefault.jpg&f=1&nofb=1', 
-{ className:'darken', style:'background-size:cover'})
-stack(
-  "[g3,bb3,d4] [f3,a3,c4] [c3,e3,g3]@2".slow(2).late(.1),
-  cat(
-  'Baker man',
-  'is baking bread',
-  'Baker man',
-  'is baking bread',
-  'Sagabona',
-  'kunjani wena',
-  'Sagabona',
-  'kunjani wena',
-  'The night train, is coming',
-  'got to keep on running',
-  'The night train, is coming',
-  'got to keep on running',
-  ).speak("en zu en".slow(12), "<0 2 3 4 5 6>".slow(2)),
-).slow(4)`;
-*/
-
-export const bossa = `const scales = sequence('C minor', ['D locrian', 'G phrygian'], 'Bb2 minor', ['C locrian','F phrygian']).slow(4)
-stack(
-  "<Cm7 [Dm7b5 G7b9] Bbm7 [Cm7b5 F7b9]>".fast(2).struct("x ~ x@3 x ~ x ~ ~ ~ x ~ x@3".late(1/8)).early(1/8).slow(2).voicings('lefthand'),
-  "[~ [0 ~]] 0 [~ [4 ~]] 4".sub(7).restart(scales).scale(scales).early(.25)
-).note().piano().slow(2)`;
-
-/* 
-export const customTrigger = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-stack(
-  freq("55 [110,165] 110 [220,275]".mul("<1 <3/4 2/3>>").struct("x(3,8)").layer(x=>x.mul("1.006,.995"))),
-  freq("440(5,8)".legato(.18).mul("<1 3/4 2 2/3>")).gain(perlin.range(.2,.8))
-).s("<sawtooth square>/2")
-  .onTrigger((t,hap,ct)=>{
-  const ac = Tone.getContext().rawContext;
-  t = ac.currentTime + t - ct;
-  const { freq, s, gain = 1 } = hap.value;
-  const master = ac.createGain();
-  master.gain.value = 0.1 * gain;
-  master.connect(ac.destination);
-  const o = ac.createOscillator();
-  o.type = s || 'triangle';
-  o.frequency.value = Number(freq);
-  o.connect(master);
-  o.start(t);
-  o.stop(t + hap.duration);
-}).stack(s("bd(3,8),hh*4,~ sd").webdirt())`; */
-
-export const swimmingWithSoundfonts = `// Koji Kondo - Swimming (Super Mario World)
-stack(
-    n(
-      "~",
-      "~",
-      "~",
-      "A5 [F5@2 C5] [D5@2 F5] F5",
-      "[C5@2 F5] [F5@2 C6] A5 G5",
-      "A5 [F5@2 C5] [D5@2 F5] F5",
-      "[C5@2 F5] [Bb5 A5 G5] F5@2",
-      "A5 [F5@2 C5] [D5@2 F5] F5",
-      "[C5@2 F5] [F5@2 C6] A5 G5",
-      "A5 [F5@2 C5] [D5@2 F5] F5",
-      "[C5@2 F5] [Bb5 A5 G5] F5@2",
-      "A5 [F5@2 C5] A5 F5",
-      "Ab5 [F5@2 Ab5] G5@2",
-      "A5 [F5@2 C5] A5 F5",
-      "Ab5 [F5@2 C5] C6@2",
-      "A5 [F5@2 C5] [D5@2 F5] F5",
-      "[C5@2 F5] [Bb5 A5 G5] F5@2"
-    ).s('Sitar: Ethnic'),
-    n(
-      "[F4,Bb4,D5] [[D4,G4,Bb4]@2 [Bb3,D4,F4]] [[G3,C4,E4]@2 [[Ab3,F4] [A3,Gb4]]] [Bb3,E4,G4]",
-      "[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, Bb3, Db3] [F3, Bb3, Db3]]",
-      "[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]",
-      "[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]",
-      "[~ [A3, C4, E4] [A3, C4, E4]] [~ [Ab3, C4, Eb4] [Ab3, C4, Eb4]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [G3, C4, E4] [G3, C4, E4]]",
-      "[~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]",
-      "[~ [F3, Bb3, D4] [F3, Bb3, D4]] [~ [F3, Bb3, C4] [F3, Bb3, C4]] [~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, A3, C4] [F3, A3, C4]]",
-      "[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]",
-      "[~ [A3, C4, E4] [A3, C4, E4]] [~ [Ab3, C4, Eb4] [Ab3, C4, Eb4]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [G3, C4, E4] [G3, C4, E4]]",
-      "[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]",
-      "[~ [F3, Bb3, D4] [F3, Bb3, D4]] [~ [F3, Bb3, C4] [F3, Bb3, C4]] [~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, A3, C4] [F3, A3, C4]]",
-      "[~ [Bb3, D3, F4] [Bb3, D3, F4]] [~ [Bb3, D3, F4] [Bb3, D3, F4]] [~ [A3, C4, F4] [A3, C4, F4]] [~ [A3, C4, F4] [A3, C4, F4]]",
-      "[~ [Ab3, B3, F4] [Ab3, B3, F4]] [~ [Ab3, B3, F4] [Ab3, B3, F4]] [~ [G3, Bb3, F4] [G3, Bb3, F4]] [~ [G3, Bb3, E4] [G3, Bb3, E4]]",
-      "[~ [Bb3, D3, F4] [Bb3, D3, F4]] [~ [Bb3, D3, F4] [Bb3, D3, F4]] [~ [A3, C4, F4] [A3, C4, F4]] [~ [A3, C4, F4] [A3, C4, F4]]",
-      "[~ [Ab3, B3, F4] [Ab3, B3, F4]] [~ [Ab3, B3, F4] [Ab3, B3, F4]] [~ [G3, Bb3, F4] [G3, Bb3, F4]] [~ [G3, Bb3, E4] [G3, Bb3, E4]]",
-      "[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]",
-      "[~ [F3, Bb3, D4] [F3, Bb3, D4]] [~ [F3, Bb3, C4] [F3, Bb3, C4]] [~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, A3, C4] [F3, A3, C4]]"
-    ).s('Kalimba: Ethnic'),
-    n(
-      "[G3 G3 C3 E3]",
-      "[F2 D2 G2 C2]",
-      "[F2 D2 G2 C2]",
-      "[F2 A2 Bb2 B2]",
-      "[A2 Ab2 G2 C2]",
-      "[F2 A2 Bb2 B2]",
-      "[G2 C2 F2 F2]",
-      "[F2 A2 Bb2 B2]",
-      "[A2 Ab2 G2 C2]",
-      "[F2 A2 Bb2 B2]",
-      "[G2 C2 F2 F2]",
-      "[Bb2 Bb2 A2 A2]",
-      "[Ab2 Ab2 G2 [C2 D2 E2]]",
-      "[Bb2 Bb2 A2 A2]",
-      "[Ab2 Ab2 G2 [C2 D2 E2]]",
-      "[F2 A2 Bb2 B2]",
-      "[G2 C2 F2 F2]"
-    ).s('Acoustic Bass: Bass')
-  ).slow(51)
-    `;
-
-export const bossaRandom = `const chords = "<Am7 Am7 Dm7 E7>"
-const roots = chords.rootNotes(2)
-
-stack(
-  chords.voicings('lefthand').struct(
-  \` x@2   ~ x ~ ~ ~ x |
-    x?  ~ ~ x@3   ~ x |
-    x?  ~ ~ x ~ x@3\`),
-  roots.struct("x [~ x?0.2] x [~ x?] | x!4 | x@2 ~ ~ ~ x x x").transpose("0 7")
-).slow(2).pianoroll().note().piano()`;
-
-// range ['F4', 'A5']
@@ -4,8 +4,25 @@ 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/>.
 */

-export const swimming = `// Koji Kondo - Swimming (Super Mario World)
-stack(
+export const tetrisMini = `note(\`[[e5 [b4 c5] d5 [c5 b4]]
+[a4 [a4 c5] e5 [d5 c5]]
+[b4 [~ c5] d5 e5]
+[c5 a4 a4 ~]
+[[~ d5] [~ f5] a5 [g5 f5]]
+[e5 [~ c5] e5 [d5 c5]]
+[b4 [b4 c5] d5 e5]
+[c5 a4 a4 ~]],
+[[e2 e3]*4]
+[[a2 a3]*4]
+[[g#2 g#3]*2 [e2 e3]*2]
+[a2 a3 a2 a3 a2 a3 b1 c2]
+[[d2 d3]*4]
+[[c2 c3]*4]
+[[b1 b2]*2 [e2 e3]*2]
+[[a1 a2]*4]\`).slow(16)
+`;
+
+export const swimming = `stack(
  seq(
    "~",
    "~",
@@ -66,10 +83,7 @@ stack(
 ).note().slow(51);
 `;

-export const giantSteps = `// John Coltrane - Giant Steps
-setVoicingRange('lefthand', ['E3', 'G4']);
-
-stack(
+export const giantSteps = `stack(
  // melody
  seq(
    "[F#5 D5] [B4 G4] Bb4 [B4 A4]",
@@ -83,7 +97,7 @@ stack(
    "[G^7 Bb7] [Eb^7 F#7] B^7 [Fm7 Bb7]",
    "Eb^7 [Am7 D7] G^7 [C#m7 F#7]",
    "B^7 [Fm7 Bb7] Eb^7 [C#m7 F#7]"
-  ).voicings('lefthand'),
+  ).voicings(['E3', 'G4']),
  // bass
  seq(
    "[B2 D2] [G2 Bb2] [Eb2 Bb3] [A2 D2]",
@@ -93,8 +107,34 @@ stack(
  )
 ).slow(20).note()`;

-export const zeldasRescue = `// Koji Kondo - Princess Zelda's Rescue
-stack(
+export const giantStepsReggae = `stack(
+  // melody
+  seq(
+    "[F#5 D5] [B4 G4] Bb4 [B4 A4]",
+    "[D5 Bb4] [G4 Eb4] F#4 [G4 F4]",
+    "Bb4 [B4 A4] D5 [D#5 C#5]",
+    "F#5 [G5 F5] Bb5 [F#5 [F#5 ~@3]]",
+  ),
+  // chords
+  seq(
+    "[B^7 D7] [G^7 Bb7] Eb^7 [Am7 D7]",
+    "[G^7 Bb7] [Eb^7 F#7] B^7 [Fm7 Bb7]",
+    "Eb^7 [Am7 D7] G^7 [C#m7 F#7]",
+    "B^7 [Fm7 Bb7] Eb^7 [C#m7 F#7]"
+  )
+  .struct("~ [x ~]".fast(4*8))
+  .voicings(['E3', 'G4']),
+  // bass
+  seq(
+    "[B2 D2] [G2 D2] [Eb2 Bb2] [A2 D2]",
+    "[G2 Bb2] [Eb2 F#2] [B2 F#2] [F2 Bb2]",
+    "[Eb2 Bb2] [A2 D2] [G2 D2] [C#2 F#2]",
+    "[B2 F#2] [F2 Bb2] [Eb2 Bb2] [C#2 F#2]"
+  )
+  .struct("x ~".fast(4*8))
+).slow(25).note()`;
+
+export const zeldasRescue = `stack(
  // melody
  \`[B3@2 D4] [A3@2 [G3 A3]] [B3@2 D4] [A3] 
  [B3@2 D4] [A4@2 G4] [D4@2 [C4 B3]] [A3]
@@ -117,9 +157,7 @@ stack(
  .room(1)
  `;

-export const caverave = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-const keys = x => x.s('sawtooth').cutoff(1200).gain(.5).attack(0).decay(.16).sustain(.3).release(.1);
+export const caverave = `const keys = x => x.s('sawtooth').cutoff(1200).gain(.5).attack(0).decay(.16).sustain(.3).release(.1);

 const drums = stack(
  s("bd*2").mask("<x@7 ~>/8").gain(.8),
@@ -132,15 +170,15 @@ const synths = stack(
  "<eb4 d4 c4 b3>/2".scale(timeCat([3,'C minor'],[1,'C melodic minor'])
  .slow(8)).struct("[~ x]*2")
  .layer(
-    x=>x.scaleTranspose(0).early(0),
-    x=>x.scaleTranspose(2).early(1/8),
-    x=>x.scaleTranspose(7).early(1/4),
-    x=>x.scaleTranspose(8).early(3/8)
+    scaleTranspose(0).early(0),
+    scaleTranspose(2).early(1/8),
+    scaleTranspose(7).early(1/4),
+    scaleTranspose(8).early(3/8)
  ).apply(thru).note().apply(keys).mask("<~ x>/16"),
  note("<C2 Bb1 Ab1 [G1 [G2 G1]]>/2".apply(thru))
  .struct("[x [~ x] <[~ [~ x]]!3 [x x]>@2]/2".fast(2))
  .s('sawtooth').attack(0.001).decay(0.2).sustain(1).cutoff(500),
-  "<Cm7 Bb7 Fm7 G7b13>/2".struct("~ [x@0.2 ~]".fast(2)).voicings('lefthand')
+  "<Cm7 Bb7 Fm7 G7b13>/2".struct("~ [x@0.2 ~]".fast(2)).voicings()
  .apply(thru).every(2, early(1/8)).note().apply(keys).sustain(0)
  .delay(.4).delaytime(.12)
  .mask("<x@7 ~>/8".early(1/4))
@@ -163,7 +201,90 @@ stack(
 ).s()
 `;

-export const barryHarris = `// adapted from a Barry Harris excercise
+// TODO:
+/*
+export const xylophoneCalling = `const t = x => x.scaleTranspose("<0 2 4 3>/4").transpose(-2)
+const s = x => x.scale(cat('C3 minor pentatonic','G3 minor pentatonic').slow(4))
+const delay = new FeedbackDelay(1/8, .6).chain(vol(0.1), out());
+const chorus = new Chorus(1,2.5,0.5).start();
+stack(
+  // melody
+  "<<10 7> <8 3>>/4".struct("x*3").apply(s)
+  .scaleTranspose("<0 3 2> <1 4 3>")
+  .superimpose(scaleTranspose(2).early(1/8))
+  .apply(t).tone(polysynth().set({
+    ...osc('triangle4'),
+    ...adsr(0,.08,0)
+  }).chain(vol(0.2).connect(delay),chorus,out())).mask("<~@3 x>/16".early(1/8)),
+  // pad
+  "[1,3]/4".scale('G3 minor pentatonic').apply(t).tone(polysynth().set({
+    ...osc('square2'),
+    ...adsr(0.1,.4,0.8)
+  }).chain(vol(0.2),chorus,out())).mask("<~ x>/32"),
+  // xylophone
+  "c3,g3,c4".struct("<x*2 x>").fast("<1 <2!3 [4 8]>>").apply(s).scaleTranspose("<0 <1 [2 [3 <4 5>]]>>").apply(t).tone(polysynth().set({
+    ...osc('sawtooth4'),
+    ...adsr(0,.1,0)
+  }).chain(vol(0.4).connect(delay),out())).mask("<x@3 ~>/16".early(1/8)),
+  // bass
+  "c2 [c2 ~]*2".scale('C hirajoshi').apply(t).tone(synth({
+    ...osc('sawtooth6'),
+    ...adsr(0,.03,.4,.1)
+  }).chain(vol(0.4),out())),
+  // kick
+  "<c1!3 [c1 ~]*2>*2".tone(membrane().chain(vol(0.8),out())),
+  // snare
+  "~ <c3!7 [c3 c3*2]>".tone(noise().chain(vol(0.8),out())),
+  // hihat
+  "c3*4".transpose("[-24 0]*2").tone(metal(adsr(0,.02)).chain(vol(0.5).connect(delay),out()))
+).slow(1)
+// strudel disable-highlighting`;
+*/
+
+// TODO:
+/*
+export const sowhatelse = `// mixer
+const mix = (key) => vol({
+  chords: .2,
+  lead: 0.8,
+  bass:  .4,
+  snare: .95, 
+  kick:  .9,
+  hihat: .35,
+}[key]||0);
+const delay = new FeedbackDelay(1/6, .3).chain(vol(.7), out());
+const delay2 = new FeedbackDelay(1/6, .2).chain(vol(.15), out());
+const chorus = new Chorus(1,2.5,0.5).start();
+// instruments
+const instr = (instrument) => ({
+  organ: polysynth().set({...osc('sawtooth4'), ...adsr(.01,.2,0)}).chain(mix('chords').connect(delay),out()),
+  lead: polysynth().set({...osc('triangle4'),...adsr(0.01,.05,0)}).chain(mix('lead').connect(delay2), out()),
+  bass: polysynth().set({...osc('sawtooth8'),...adsr(.02,.05,.3,.2)}).chain(mix('bass'),lowpass(3000), out()),
+  pad: polysynth().set({...osc('square2'),...adsr(0.1,.4,0.8)}).chain(vol(0.15),chorus,out()),
+  hihat: metal(adsr(0, .02, 0)).chain(mix('hihat'), out()),
+  snare: noise(adsr(0, .15,  0.01)).chain(mix('snare'), lowpass(5000), out()),
+  kick: membrane().chain(mix('kick'), out())
+}[instrument]);
+// harmony
+const t = transpose("<0 0 1 0>/8");
+const sowhat = scaleTranspose("0,3,6,9,11");
+// track
+stack(
+  "[<0 4 [3 [2 1]]>]/4".struct("[x]*3").mask("[~ x ~]").scale('D5 dorian').off(1/6, scaleTranspose(-7)).off(1/3, scaleTranspose(-5)).apply(t).tone(instr('lead')).mask("<~ ~ x x>/8"),
+  "<<e3 [~@2 a3]> <[d3 ~] [c3 f3] g3>>".scale('D dorian').apply(sowhat).apply(t).tone(instr('organ')).mask("<x x x ~>/8"),
+  "<[d2 [d2 ~]*3]!3 <a1*2 c2*3 [a1 e2]>>".apply(t).tone(instr('bass')),
+  "c1*6".tone(instr('hihat')),
+  "~ c3".tone(instr('snare')),
+  "<[c1@5 c1] <c1 [[c1@2 c1] ~] [c1 ~ c1] [c1!2 ~ c1!3]>>".tone(instr('kick')),
+  "[2,4]/4".scale('D dorian').apply(t).tone(instr('pad')).mask("<x x x ~>/8")
+).fast(6/8)
+// strudel disable-highlighting`;
+*/
+
+export const barryHarris = `backgroundImage(
+  'https://media.npr.org/assets/img/2017/02/03/barryharris_600dpi_wide-7eb49998aa1af377d62bb098041624c0a0d1a454.jpg',
+  {style:'background-size:cover'})
+  
 "0,2,[7 6]"
  .add("<0 1 2 3 4 5 7 8>")
  .scale('C bebop major')
@@ -172,9 +293,7 @@ export const barryHarris = `// adapted from a Barry Harris excercise
  .note().piano()
 `;

-export const blippyRhodes = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-samples({
+export const blippyRhodes = `samples({
  bd: 'samples/tidal/bd/BT0A0D0.wav',
  sn: 'samples/tidal/sn/ST0T0S3.wav',
  hh: 'samples/tidal/hh/000_hh3closedhh.wav',
@@ -213,9 +332,7 @@ stack(
  .s('sawtooth').cutoff(600),
 ).fast(3/2)`;

-export const wavyKalimba = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-samples({
+export const wavyKalimba = `samples({
  'kalimba': { c5:'https://freesound.org/data/previews/536/536549_11935698-lq.mp3' }
 })
 const scales = cat('C major', 'C mixolydian', 'F lydian', ['F minor', 'Db major'])
@@ -243,11 +360,39 @@ stack(
  .delay(.2)
  `;

-export const festivalOfFingers = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-const chords = "<Cm7 Fm7 G7 F#7>";
+// TODO: rework tune to use freq
+/*
+export const jemblung = `const delay = new FeedbackDelay(1/8, .6).chain(vol(0.15), out());
+const snare = noise({type:'white',...adsr(0,0.2,0)}).chain(lowpass(5000),vol(1.8),out());
+const s = polysynth().set({...osc('sawtooth4'),...adsr(0.01,.2,.6,0.2)}).chain(vol(.23).connect(delay),out());
 stack(
-  chords.voicings('lefthand').struct("x(3,8,-1)").velocity(.5).off(1/7,x=>x.transpose(12).velocity(.2)),
+  stack(
+    "0 1 4 [3!2 5]".layer(
+      // chords
+      x=>x.add("0,3").duration("0.05!3 0.02"),
+      // bass
+      x=>x.add("-8").struct("x*8").duration(0.1) 
+    ),
+    // melody
+    "12 11*3 12 ~".duration(0.005) 
+  )
+  .add("<0 1>")
+  .tune("jemblung2")
+  //.mul(22/5).round().xen("22edo")
+  //.mul(12/5).round().xen("12edo")
+  .tone(s),
+  // kick
+  "[c2 ~]*2".duration(0.05).tone(membrane().chain(out())), 
+  // snare
+  "[~ c1]*2".early(0.001).tone(snare),
+  // hihat
+  "c2*8".tone(noise().chain(highpass(6000),vol(0.5).connect(delay),out())),
+).slow(3)`;
+*/
+
+export const festivalOfFingers = `const chords = "<Cm7 Fm7 G7 F#7>";
+stack(
+  chords.voicings().struct("x(3,8,-1)").velocity(.5).off(1/7,x=>x.transpose(12).velocity(.2)),
  chords.rootNotes(2).struct("x(4,8,-2)"),
  chords.rootNotes(4)
  .scale(cat('C minor','F dorian','G dorian','F# mixolydian'))
@@ -258,8 +403,7 @@ stack(
 .note().piano()`;

 // iter, echo, echoWith
-export const undergroundPlumber = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos, inspired by Friendship - Let's not talk about it (1979) :)
+export const undergroundPlumber = `backgroundImage('https://images.nintendolife.com/news/2016/08/video_exploring_the_funky_inspiration_for_the_super_mario_bros_underground_theme/large.jpg',{ className:'darken' })

 samples({ bd: 'bd/BT0A0D0.wav', sn: 'sn/ST0T0S3.wav', hh: 'hh/000_hh3closedhh.wav', cp: 'cp/HANDCLP0.wav',
 }, 'https://loophole-letters.vercel.app/samples/tidal/')
@@ -284,9 +428,7 @@ stack(
  .fast(2/3)
  .pianoroll({})`;

-export const bridgeIsOver = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos, bassline by BDP - The Bridge Is Over
-samples({mad:'https://freesound.org/data/previews/22/22274_109943-lq.mp3'})
+export const bridgeIsOver = `samples({mad:'https://freesound.org/data/previews/22/22274_109943-lq.mp3'})
 stack(
  stack(
  "c3*2 [[c3@1.4 bb2] ab2] gb2*2 <[[gb2@1.4 ab2] bb2] gb2>".legato(".5 1".fast(2)).velocity(.8),
@@ -305,9 +447,7 @@ stack(
  .pianoroll()
 `;

-export const goodTimes = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-const scale = cat('C3 dorian','Bb2 major').slow(4);
+export const goodTimes = `const scale = cat('C3 dorian','Bb2 major').slow(4);
 stack(
  "2*4".add(12).scale(scale)
  .off(1/8,x=>x.scaleTranspose("2")).fast(2)
@@ -327,9 +467,7 @@ stack(
 .slow(2)
 .pianoroll({maxMidi:100,minMidi:20})`;

-export const echoPiano = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-"<0 2 [4 6](3,4,1) 3*2>"
+export const echoPiano = `"<0 2 [4 6](3,4,1) 3*2>"
 .scale('D minor')
 .color('salmon')
 .off(1/4, x=>x.scaleTranspose(2).color('green'))
@@ -339,7 +477,7 @@ export const echoPiano = `// licensed with CC BY-NC-SA 4.0 https://creativecommo
 .note().piano()
 .pianoroll()`;

-export const sml1 = `// Hirokazu Tanaka - World 1-1
+export const sml1 = `
 stack(
  // melody
  \`<
@@ -374,9 +512,30 @@ stack(
  .legato(.5)
 ).fast(2).note()`;

-export const randomBells = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-samples({
+/*
+// TODO: does not work on linux (at least for me..)
+export const speakerman = `backgroundImage('https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Fi.ytimg.com%2Fvi%2FXR0rKqW3VwY%2Fmaxresdefault.jpg&f=1&nofb=1', 
+{ className:'darken', style:'background-size:cover'})
+stack(
+  "[g3,bb3,d4] [f3,a3,c4] [c3,e3,g3]@2".slow(2).late(.1),
+  cat(
+  'Baker man',
+  'is baking bread',
+  'Baker man',
+  'is baking bread',
+  'Sagabona',
+  'kunjani wena',
+  'Sagabona',
+  'kunjani wena',
+  'The night train, is coming',
+  'got to keep on running',
+  'The night train, is coming',
+  'got to keep on running',
+  ).speak("en zu en".slow(12), "<0 2 3 4 5 6>".slow(2)),
+).slow(4)`;
+*/
+
+export const randomBells = `samples({
  bell: { c6: 'https://freesound.org/data/previews/411/411089_5121236-lq.mp3' },
  bass: { d2: 'https://freesound.org/data/previews/608/608286_13074022-lq.mp3' }
 })
@@ -397,9 +556,7 @@ stack(
  .pianoroll({minMidi:20,maxMidi:120,background:'transparent'})
  `;

-export const waa2 = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-n(
+export const waa2 = `n(
  "a4 [a3 c3] a3 c3"
  .sub("<7 12 5 12>".slow(2))
  .off(1/4,x=>x.add(7))
@@ -413,9 +570,7 @@ n(
  .room(.5)
  `;

-export const hyperpop = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-const lfo = cosine.slow(15);
+export const hyperpop = `const lfo = cosine.slow(15);
 const lfo2 = sine.slow(16);
 const filter1 = x=>x.cutoff(lfo2.range(300,3000));
 const filter2 = x=>x.hcutoff(lfo.range(1000,6000)).cutoff(4000)
@@ -464,9 +619,7 @@ stack(
 ).slow(2)
 // strudel disable-highlighting`;

-export const festivalOfFingers3 = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-"[-7*3],0,2,6,[8 7]"
+export const festivalOfFingers3 = `"[-7*3],0,2,6,[8 7]"
 .echoWith(4,1/4, (x,n)=>x
          .add(n*7)
          .velocity(1/(n+1))
@@ -482,9 +635,33 @@ export const festivalOfFingers3 = `// licensed with CC BY-NC-SA 4.0 https://crea
 .note().piano()
 //.pianoroll({maxMidi:160})`;

-export const meltingsubmarine = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-samples({
+export const bossa = `
+const scales = sequence('C minor', ['D locrian', 'G phrygian'], 'Bb2 minor', ['C locrian','F phrygian']).slow(4)
+stack(
+  "<Cm7 [Dm7b5 G7b9] Bbm7 [Cm7b5 F7b9]>".fast(2).struct("x ~ x@3 x ~ x ~ ~ ~ x ~ x@3".late(1/8)).early(1/8).slow(2).voicings(),
+  "[~ [0 ~]] 0 [~ [4 ~]] 4".sub(7).restart(scales).scale(scales).early(.25)
+).note().piano().slow(2)`;
+/* 
+export const customTrigger = `stack(
+  freq("55 [110,165] 110 [220,275]".mul("<1 <3/4 2/3>>").struct("x(3,8)").layer(x=>x.mul("1.006,.995"))),
+  freq("440(5,8)".legato(.18).mul("<1 3/4 2 2/3>")).gain(perlin.range(.2,.8))
+).s("<sawtooth square>/2")
+  .onTrigger((t,hap,ct)=>{
+  const ac = Tone.getContext().rawContext;
+  t = ac.currentTime + t - ct;
+  const { freq, s, gain = 1 } = hap.value;
+  const master = ac.createGain();
+  master.gain.value = 0.1 * gain;
+  master.connect(ac.destination);
+  const o = ac.createOscillator();
+  o.type = s || 'triangle';
+  o.frequency.value = Number(freq);
+  o.connect(master);
+  o.start(t);
+  o.stop(t + hap.duration);
+}).stack(s("bd(3,8),hh*4,~ sd").webdirt())`; */
+
+export const meltingsubmarine = `samples({
  bd: ['bd/BT0AADA.wav','bd/BT0AAD0.wav','bd/BT0A0DA.wav','bd/BT0A0D3.wav','bd/BT0A0D0.wav','bd/BT0A0A7.wav'],
  sd: ['sd/rytm-01-classic.wav','sd/rytm-00-hard.wav'],
  hh: ['hh27/000_hh27closedhh.wav','hh/000_hh3closedhh.wav'],
@@ -503,7 +680,7 @@ stack(
  .gain(.4) // turn down
  .cutoff(sine.slow(7).range(300,5000)) // automate cutoff
  //.hush()
-  ,"<Am7!3 <Em7 E7b13 Em7 Ebm7b5>>".voicings('lefthand') // chords
+  ,"<Am7!3 <Em7 E7b13 Em7 Ebm7b5>>".voicings() // chords
  .superimpose(x=>x.add(.04)) // add second, slightly detuned voice
  .add(perlin.range(0,.5)) // random pitch variation
  .n() // wrap in "n"
@@ -524,16 +701,75 @@ stack(
 )
  .slow(3/2)`;

-export const outroMusic = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-samples({
+export const swimmingWithSoundfonts = `stack(
+    n(
+      "~",
+      "~",
+      "~",
+      "A5 [F5@2 C5] [D5@2 F5] F5",
+      "[C5@2 F5] [F5@2 C6] A5 G5",
+      "A5 [F5@2 C5] [D5@2 F5] F5",
+      "[C5@2 F5] [Bb5 A5 G5] F5@2",
+      "A5 [F5@2 C5] [D5@2 F5] F5",
+      "[C5@2 F5] [F5@2 C6] A5 G5",
+      "A5 [F5@2 C5] [D5@2 F5] F5",
+      "[C5@2 F5] [Bb5 A5 G5] F5@2",
+      "A5 [F5@2 C5] A5 F5",
+      "Ab5 [F5@2 Ab5] G5@2",
+      "A5 [F5@2 C5] A5 F5",
+      "Ab5 [F5@2 C5] C6@2",
+      "A5 [F5@2 C5] [D5@2 F5] F5",
+      "[C5@2 F5] [Bb5 A5 G5] F5@2"
+    ).s('Sitar: Ethnic'),
+    n(
+      "[F4,Bb4,D5] [[D4,G4,Bb4]@2 [Bb3,D4,F4]] [[G3,C4,E4]@2 [[Ab3,F4] [A3,Gb4]]] [Bb3,E4,G4]",
+      "[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, Bb3, Db3] [F3, Bb3, Db3]]",
+      "[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]",
+      "[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]",
+      "[~ [A3, C4, E4] [A3, C4, E4]] [~ [Ab3, C4, Eb4] [Ab3, C4, Eb4]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [G3, C4, E4] [G3, C4, E4]]",
+      "[~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]",
+      "[~ [F3, Bb3, D4] [F3, Bb3, D4]] [~ [F3, Bb3, C4] [F3, Bb3, C4]] [~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, A3, C4] [F3, A3, C4]]",
+      "[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]",
+      "[~ [A3, C4, E4] [A3, C4, E4]] [~ [Ab3, C4, Eb4] [Ab3, C4, Eb4]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [G3, C4, E4] [G3, C4, E4]]",
+      "[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]",
+      "[~ [F3, Bb3, D4] [F3, Bb3, D4]] [~ [F3, Bb3, C4] [F3, Bb3, C4]] [~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, A3, C4] [F3, A3, C4]]",
+      "[~ [Bb3, D3, F4] [Bb3, D3, F4]] [~ [Bb3, D3, F4] [Bb3, D3, F4]] [~ [A3, C4, F4] [A3, C4, F4]] [~ [A3, C4, F4] [A3, C4, F4]]",
+      "[~ [Ab3, B3, F4] [Ab3, B3, F4]] [~ [Ab3, B3, F4] [Ab3, B3, F4]] [~ [G3, Bb3, F4] [G3, Bb3, F4]] [~ [G3, Bb3, E4] [G3, Bb3, E4]]",
+      "[~ [Bb3, D3, F4] [Bb3, D3, F4]] [~ [Bb3, D3, F4] [Bb3, D3, F4]] [~ [A3, C4, F4] [A3, C4, F4]] [~ [A3, C4, F4] [A3, C4, F4]]",
+      "[~ [Ab3, B3, F4] [Ab3, B3, F4]] [~ [Ab3, B3, F4] [Ab3, B3, F4]] [~ [G3, Bb3, F4] [G3, Bb3, F4]] [~ [G3, Bb3, E4] [G3, Bb3, E4]]",
+      "[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]",
+      "[~ [F3, Bb3, D4] [F3, Bb3, D4]] [~ [F3, Bb3, C4] [F3, Bb3, C4]] [~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, A3, C4] [F3, A3, C4]]"
+    ).s('Kalimba: Ethnic'),
+    n(
+      "[G3 G3 C3 E3]",
+      "[F2 D2 G2 C2]",
+      "[F2 D2 G2 C2]",
+      "[F2 A2 Bb2 B2]",
+      "[A2 Ab2 G2 C2]",
+      "[F2 A2 Bb2 B2]",
+      "[G2 C2 F2 F2]",
+      "[F2 A2 Bb2 B2]",
+      "[A2 Ab2 G2 C2]",
+      "[F2 A2 Bb2 B2]",
+      "[G2 C2 F2 F2]",
+      "[Bb2 Bb2 A2 A2]",
+      "[Ab2 Ab2 G2 [C2 D2 E2]]",
+      "[Bb2 Bb2 A2 A2]",
+      "[Ab2 Ab2 G2 [C2 D2 E2]]",
+      "[F2 A2 Bb2 B2]",
+      "[G2 C2 F2 F2]"
+    ).s('Acoustic Bass: Bass')
+  ).slow(51)
+    `;
+
+export const outroMusic = `samples({
  bd: ['bd/BT0AADA.wav','bd/BT0AAD0.wav','bd/BT0A0DA.wav','bd/BT0A0D3.wav','bd/BT0A0D0.wav','bd/BT0A0A7.wav'],
  sd: ['sd/rytm-01-classic.wav','sd/rytm-00-hard.wav'],
  hh: ['hh27/000_hh27closedhh.wav','hh/000_hh3closedhh.wav'],
  perc: ['perc/002_perc2.wav'],
 }, 'github:tidalcycles/Dirt-Samples/master/');

-"C^7 Am7 Dm7 G7".slow(2).voicings('lefthand')
+"C^7 Am7 Dm7 G7".slow(2).voicings()
  .stack("0@6 [<1 2> <2 0> 1]@2".scale('C5 major'))
  .n().slow(4)
  .s('0040_FluidR3_GM_sf2_file')
@@ -553,9 +789,7 @@ samples({
  //.pianoroll({autorange:1,vertical:1,fold:0})
  `;

-export const bassFuge = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-samples({ flbass: ['00_c2_finger_long_neck.wav','01_c2_finger_short_neck.wav','02_c2_finger_long_bridge.wav','03_c2_finger_short_bridge.wav','04_c2_pick_long.wav','05_c2_pick_short.wav','06_c2_palm_mute.wav'] }, 
+export const bassFuge = `samples({ flbass: ['00_c2_finger_long_neck.wav','01_c2_finger_short_neck.wav','02_c2_finger_long_bridge.wav','03_c2_finger_short_bridge.wav','04_c2_pick_long.wav','05_c2_pick_short.wav','06_c2_palm_mute.wav'] }, 
  'github:cleary/samples-flbass/main/')
 samples({
 bd: ['bd/BT0AADA.wav','bd/BT0AAD0.wav','bd/BT0A0DA.wav','bd/BT0A0D3.wav','bd/BT0A0D0.wav','bd/BT0A0A7.wav'],
@@ -579,12 +813,21 @@ x=>x.add(7).color('steelblue')
 .stack(s("bd:1*2,~ sd:0,[~ hh:0]*2"))
 .pianoroll({vertical:1})`;

-export const chop = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-samples({ p: 'https://cdn.freesound.org/previews/648/648433_11943129-lq.mp3' })
+export const bossaRandom = `const chords = "<Am7 Am7 Dm7 E7>"
+const roots = chords.rootNotes(2)
+
+stack(
+  chords.voicings(['F4', 'A5']).struct(
+  \` x@2   ~ x ~ ~ ~ x |
+    x?  ~ ~ x@3   ~ x |
+    x?  ~ ~ x ~ x@3\`),
+  roots.struct("x [~ x?0.2] x [~ x?] | x!4 | x@2 ~ ~ ~ x x x").transpose("0 7")
+).slow(2).pianoroll().note().piano()`;
+
+export const chop = `samples({ p: 'https://cdn.freesound.org/previews/648/648433_11943129-lq.mp3' })

 s("p")
-  .loopAt(32)
+  .loopAt(32,1)
  .chop(128)
  .jux(rev)
  .shape(.4)
@@ -592,18 +835,14 @@ s("p")
  .sustain(.6)
  `;

-export const delay = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-stack(
+export const delay = `stack(
    s("bd <sd cp>")
    .delay("<0 .5>")
    .delaytime(".16 | .33")
    .delayfeedback(".6 | .8")
  ).sometimes(x=>x.speed("-1"))`;

-export const orbit = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-stack(
+export const orbit = `stack(
    s("bd <sd cp>")
    .delay(.5)
    .delaytime(.33)
@@ -615,9 +854,7 @@ stack(
    .orbit(2)
  ).sometimes(x=>x.speed("-1"))`;

-export const belldub = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-samples({ bell: {b4:'https://cdn.freesound.org/previews/339/339809_5121236-lq.mp3'}})
+export const belldub = `samples({ bell: {b4:'https://cdn.freesound.org/previews/339/339809_5121236-lq.mp3'}})
 // "Hand Bells, B, Single.wav" by InspectorJ (www.jshaw.co.uk) of Freesound.org
 stack(
  // bass
@@ -628,7 +865,7 @@ stack(
  s("mt lt ht").struct("x(3,8)").fast(2).gain(.5).room(.5).sometimes(x=>x.speed(".5")),
  s("misc:2").speed(1).delay(.5).delaytime(1/3).gain(.4),
  // chords
-  note("[~ Gm7] ~ [~ Dm7] ~".voicings('lefthand').superimpose(x=>x.add(.1)))
+  note("[~ Gm7] ~ [~ Dm7] ~".voicings().superimpose(x=>x.add(.1)))
  .s('sawtooth').gain(.5)
  .cutoff(perlin.range(400,3000).slow(8))
  .decay(perlin.range(0.05,.2)).sustain(0)
@@ -648,16 +885,13 @@ stack(
  .mask("<1 0>/8")
 ).slow(5)`;

-export const dinofunk = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-samples({bass:'https://cdn.freesound.org/previews/614/614637_2434927-hq.mp3',
+export const dinofunk = `samples({bass:'https://cdn.freesound.org/previews/614/614637_2434927-hq.mp3',
 dino:{b4:'https://cdn.freesound.org/previews/316/316403_5123851-hq.mp3'}})
-setVoicingRange('lefthand', ['c3','a4'])

 stack(
-s('bass').loopAt(8).clip(1),
+s('bass').loopAt(8,1).clip(1),
 s("bd*2, ~ sd,hh*4"),
-note("Abm7".voicings('lefthand').struct("x(3,8,1)".slow(2))),
+note("Abm7".voicings(['c3','a4']).struct("x(3,8,1)".slow(2))),
 "0 1 2 3".scale('ab4 minor pentatonic')
 .superimpose(x=>x.add(.1))
 .sometimes(x=>x.add(12))
@@ -669,9 +903,7 @@ note("Abm7".voicings('lefthand').struct("x(3,8,1)".slow(2))),
 note("<b4 eb4>").s('dino').delay(.8).slow(8).room(.5)
 )`;

-export const sampleDemo = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-stack(
+export const sampleDemo = `stack(
  // percussion
  s("[woodblock:1 woodblock:2*2] snare_rim:0,gong/8,brakedrum:1(3,8),~@3 cowbell:3")
  .sometimes(x=>x.speed(2)),
@@ -685,9 +917,7 @@ stack(
  .release(.1).room(.5)
 )`;

-export const holyflute = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-"c3 eb3(3,8) c4/2 g3*2"
+export const holyflute = `"c3 eb3(3,8) c4/2 g3*2"
 .superimpose(
  x=>x.slow(2).add(12),
  x=>x.slow(4).sub(5)
@@ -698,9 +928,7 @@ export const holyflute = `// licensed with CC BY-NC-SA 4.0 https://creativecommo
 .pianoroll({fold:0,autorange:0,vertical:0,cycles:12,smear:0,minMidi:40})
 `;

-export const flatrave = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-stack(
+export const flatrave = `stack(
  s("bd*2,~ [cp,sd]").bank('RolandTR909'),
  
  s("hh:1*4").sometimes(fast("2"))
@@ -721,9 +949,7 @@ stack(
  .decay(.05).sustain(0).delay(.2).degradeBy(.5).mask("<0 1>/16")
 )`;

-export const amensister = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-await samples('github:tidalcycles/Dirt-Samples/master')
+export const amensister = `await samples('github:tidalcycles/Dirt-Samples/master')

 stack(
  // amen
@@ -755,9 +981,7 @@ stack(
  n("0 1").s("east").delay(.5).degradeBy(.8).speed(rand.range(.5,1.5))
 ).reset("<x@7 x(5,8)>")`;

-export const juxUndTollerei = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-note("c3 eb3 g3 bb3").palindrome()
+export const juxUndTollerei = `note("c3 eb3 g3 bb3").palindrome()
 .s('sawtooth')
 .jux(x=>x.rev().color('green').s('sawtooth'))
 .off(1/4, x=>x.add(note("<7 12>/2")).slow(2).late(.005).s('triangle'))
@@ -767,75 +991,3 @@ note("c3 eb3 g3 bb3").palindrome()
 .room(.6)
 .delay(.5).delaytime(.1).delayfeedback(.4)
 .pianoroll()`;
-
-export const csoundDemo = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-await loadCsound\`
-instr CoolSynth
-    iduration = p3
-    ifreq = p4
-    igain = p5
-    ioct = octcps(ifreq)
-
-    kpwm = oscili(.05, 8)
-    asig = vco2(igain, ifreq, 4, .5 + kpwm)
-    asig += vco2(igain, ifreq * 2)
-
-    idepth = 2
-    acut = transegr:a(0, .005, 0, idepth, .06, -4.2, 0.001, .01, -4.2, 0) ; filter envelope
-    asig = zdf_2pole(asig, cpsoct(ioct + acut + 2), 0.5)
-
-    iattack = .01
-    isustain = .5
-    idecay = .1
-    irelease = .1
-    asig *= linsegr:a(0, iattack, 1, idecay, isustain, iduration, isustain, irelease, 0)
-    
-    out(asig, asig)
-endin\`
-
-"<0 2 [4 6](3,4,1) 3*2>"
-.off(1/4, add(2))
-.off(1/2, add(6))
-.scale('D minor')
-.note()
-//.pianoroll()
-.csound('CoolSynth')`;
-
-export const loungeSponge = `
-// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// by Felix Roos
-// livecode.orc by Steven Yi
-await loadOrc('github:kunstmusik/csound-live-code/master/livecode.orc')
-
-stack(
-  note("<C^7 A7 Dm7 Fm7>/2".voicings('lefthand'))
-  .cutoff(sine.range(500,2000).round().slow(16))
-  .euclidLegato(3,8).csound('FM1')
-  ,
-  note("<C2 A1 D2 F2>/2").ply(8).csound('Bass').gain("1 4 1 4")
-  ,
-  note("0 7 [4 3] 2".fast(2/3).off(".25 .125",add("<2 4 -3 -1>"))
-  .slow(2).scale('A4 minor'))
-  .legato(.25).csound('SynHarp')
-  ,
-  s("bd*2,[~ hh]*2,~ cp").bank('RolandTR909')
-)`;
-
-export const arpoon = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
-// "Arpoon" by Felix Roos
-await samples('github:tidalcycles/Dirt-Samples/master')
-
-"<<Am7 C^7> C7 F^7 [Fm7 E7b9]>".voicings('lefthand')
-  .arp("[0,3] 2 [1,3] 2".fast(3)).legato(2)
-  .add(perlin.range(0,0.2)).sub("<0 -12>/8")
-  .note().cutoff(perlin.range(500,4000)).resonance(12)
-  .gain("<.5 .8>*16")
-  .decay(.16).sustain(0.5)
-  .delay(.2)
-  .room(.5).pan(sine.range(.3,.6))
-  .s('piano').clip(1)
-  .stack("<<A1 C2>!2 F2 [F2 E2]>".add.out("0 -5".fast(2)).add("0,.12").note().s('sawtooth').clip(1).cutoff(300))
-  .slow(4)
-  .stack(s("bd*4, [~ [hh hh? hh?]]*2,~ [sd ~ [sd:2? bd?]]").arp("0|1").bank('RolandTR909').gain(.5).slow(2))
-`;
@@ -9,4 +9,4 @@ module.exports = {
    tailwindcss: {},
    autoprefixer: {},
  },
-};
+}
@@ -18,7 +18,7 @@ function renderAsMDX(name) {
  }
  return `### ${item.longname}

-${item.description.replaceAll(/\{@link ([a-zA-Z]+)?#?([a-zA-Z]*)\}/g, (_, a, b) => {
+${item.description.replaceAll(/\{\@link ([a-zA-Z]+)?\#?([a-zA-Z]*)\}/g, (_, a, b) => {
  // console.log(_, 'a', a, 'b', b);
  return `<a href="#${a}${b ? `-${b}` : ''}">${a}${b ? `#${b}` : ''}</a>`;
 })}
@@ -35,7 +35,7 @@ s("bd,[~ <sd!3 sd(3,4,2)>],hh(3,4)") // drums
 .s('sawtooth') // waveform
 .gain(.4) // turn down
 .cutoff(sine.slow(7).range(300,5000)) // automate cutoff
-,"<Am7!3 <Em7 E7b13 Em7 Ebm7b5>>".voicings('lefthand') // chords
+,"<Am7!3 <Em7 E7b13 Em7 Ebm7b5>>".voicings() // chords
 .superimpose(x=>x.add(.04)) // add second, slightly detuned voice
 .add(perlin.range(0,.5)) // random pitch variation
 .n() // wrap in "n"
@@ -755,7 +755,9 @@ Transposes notes inside the scale by the number of steps:

 Turns chord symbols into voicings, using the smoothest voice leading possible:

-<MiniRepl tune={`stack("<C^7 A7 Dm7 G7>".voicings('lefthand'), "<C3 A2 D3 G2>").note()`} />
+<MiniRepl tune={`stack("<C^7 A7 Dm7 G7>".voicings(), "<C3 A2 D3 G2>").note()`} />
+
+<!-- TODO: use voicing collection as first param + patternify. -->

 ### rootNotes(octave = 2)

@@ -767,7 +769,7 @@ Together with layer, struct and voicings, this can be used to create a basic bac

 <MiniRepl
  tune={`"<C^7 A7b13 Dm7 G7>".layer(
-  x => x.voicings('lefthand').struct("~ x").note(),
+  x => x.voicings(['d3','g4']).struct("~ x").note(),
  x => x.rootNotes(2).note().s('sawtooth').cutoff(800)
 )`}
 />
@@ -788,7 +790,7 @@ Either connect a midi device or use the IAC Driver (Mac) or Midi Through Port (L
 If no outputName is given, it uses the first midi output it finds.

 <MiniRepl
-  tune={`stack("<C^7 A7 Dm7 G7>".voicings('lefthand'), "<C3 A2 D3 G2>")
+  tune={`stack("<C^7 A7 Dm7 G7>".voicings(), "<C3 A2 D3 G2>")
  .midi()`}
 />

@@ -0,0 +1,24 @@
+# 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?
@@ -0,0 +1,33 @@
+# Strudel Workshop
+
+This may become a resource to teach strudel in workshop format.
+
+## Install
+
+From the root of the strudel repo:
+
+```sh
+npm i # install strudel project dependencies
+cd workshop && npm i # install workshop dependencies
+npm run dev # run dev server
+```
+
+This assumes you have node 16+ installed.
+
+## How to write
+
+While running the dev server, go to `workshop.mdx` to write!
+When the file is saved, the browser will hot reload the file and reveal the changes instantly.
+
+You can use normal markdown + JSX, which enables using the MiniRepl component.
+You could also add any react component and import it to the mdx file.
+
+## Build
+
+Running
+
+```sh
+npm run build
+```
+
+..will output a single `index.html` file to `dist`. This file can either be opened directly in the browser (locally) or uploaded to some server.
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Strudel Workshop</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.jsx"></script>
+  </body>
+</html>
@@ -0,0 +1,29 @@
+{
+  "name": "workshop",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite --open",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
+  },
+  "devDependencies": {
+    "@mdx-js/mdx": "^1.6.22",
+    "@mdx-js/react": "^1.6.22",
+    "@tailwindcss/typography": "^0.5.8",
+    "@types/react": "^18.0.24",
+    "@types/react-dom": "^18.0.8",
+    "@vitejs/plugin-react": "^2.2.0",
+    "autoprefixer": "^10.4.13",
+    "postcss": "^8.4.19",
+    "tailwindcss": "^3.2.4",
+    "vite": "^3.2.3",
+    "vite-plugin-mdx": "^3.5.11",
+    "vite-plugin-singlefile": "^0.13.1"
+  }
+}
@@ -0,0 +1,6 @@
+module.exports = {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+}
@@ -0,0 +1,16 @@
+import { initAudioOnFirstClick } from '@strudel.cycles/webaudio';
+import Workshop from './workshop.mdx';
+
+initAudioOnFirstClick();
+
+function App() {
+  return (
+    <div className="bg-slate-900 w-screen h-screen overflow-auto">
+      <main className="p-4 pl-6 max-w-3xl prose prose-invert">
+        <Workshop />
+      </main>
+    </div>
+  );
+}
+
+export default App;
@@ -0,0 +1,22 @@
+import { evalScope, controls } from '@strudel.cycles/core';
+import { MiniRepl as _MiniRepl } from '@strudel.cycles/react';
+import { samples } from '@strudel.cycles/webaudio';
+import '@strudel.cycles/react/dist/style.css';
+
+samples('github:tidalcycles/Dirt-Samples/master')
+
+evalScope(
+  controls,
+  import('@strudel.cycles/core'),
+  // import('@strudel.cycles/tone'),
+  import('@strudel.cycles/tonal'),
+  import('@strudel.cycles/mini'),
+  import('@strudel.cycles/midi'),
+  // import('@strudel.cycles/xen'),
+  import('@strudel.cycles/webaudio'),
+  import('@strudel.cycles/osc'),
+);
+
+export function MiniRepl({ tune }) {
+  return <_MiniRepl tune={tune} hideOutsideView={true} />;
+}
@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
@@ -0,0 +1,11 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import App from './App';
+import './index.css';
+
+ReactDOM.render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>,
+  document.getElementById('root'),
+);
@@ -0,0 +1,49 @@
+import { MiniRepl } from './MiniRepl';
+
+# Workshop
+
+> This is a starter project for any type of teaching material using strudel!
+
+## What is Strudel?
+
+1. A pastry made with fruit or cheese rolled up in layers of thin sheets of dough and then baked.
+2. a pastry made from multiple, thin layers of dough rolled up and filled with fruit, etc.
+3. thin sheet of filled dough rolled and baked
+
+## Some REPLs:
+
+Small REPL:
+
+<MiniRepl tune={`s("bd sd,hh*8")`} />
+
+Big REPL:
+
+<MiniRepl
+  tune={`await samples({
+  bd: ['bd/BT0AADA.wav','bd/BT0AAD0.wav','bd/BT0A0DA.wav','bd/BT0A0D3.wav','bd/BT0A0D0.wav','bd/BT0A0A7.wav'],
+  sd: ['sd/rytm-01-classic.wav','sd/rytm-00-hard.wav'],
+  hh: ['hh27/000_hh27closedhh.wav','hh/000_hh3closedhh.wav'],
+}, 'github:tidalcycles/Dirt-Samples/master/');
+stack(
+s("bd,[~ <sd!3 sd(3,4,2)>],hh(3,4)") // drums
+.speed(perlin.range(.7,.9)) // random sample speed variation
+,"<a1 b1\*2 a1(3,8) e2>" // bassline
+.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
+.n() // wrap in "n"
+.decay(.15).sustain(0) // make each note of equal length
+.s('sawtooth') // waveform
+.gain(.4) // turn down
+.cutoff(sine.slow(7).range(300,5000)) // automate cutoff
+,"<Am7!3 <Em7 E7b13 Em7 Ebm7b5>>".voicings() // chords
+.superimpose(x=>x.add(.04)) // add second, slightly detuned voice
+.add(perlin.range(0,.5)) // random pitch variation
+.n() // wrap in "n"
+.s('sawtooth') // waveform
+.gain(.16) // turn down
+.cutoff(500) // fixed cutoff
+.attack(1) // slowly fade in
+)
+.slow(3/2)`}
+/>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Felix Roos	cd1c4632d7	build to single file	2022-11-23 14:00:31 +01:00
Felix Roos	f1a850e133	forgot tonal pkg import	2022-11-22 21:43:30 +01:00
Felix Roos	53b61b8d85	add workshop seed project	2022-11-22 21:33:47 +01:00