update dough-synth

2026-10-15 12:33:14 -04:00 · 2025-12-28 22:34:54 +01:00
262 changed files with 3161 additions and 12986 deletions
@@ -1,5 +0,0 @@
-{
-	"devToolbar": {
-		"enabled": false
-	}
-}
@@ -1,11 +0,0 @@
-**/node_modules
-**/.angular
-**/dist
-.astro/
-.forgejo/
-.idea/
-.vscode/
-test/
-.gitignore
-Dockerfile
-.dockerignore
@@ -1,40 +0,0 @@
-name: Build and Deploy hot PRs
-
-on:
-  pull_request_target:
-    types: [labeled]
-
-# Allow one concurrent deployment
-concurrency:
-  group: "warm-pages"
-  cancel-in-progress: false
-
-jobs:
-  build:
-    if: ${{ github.event.label.name == 'serve-hot' }}
-    runs-on: docker
-    container: node:22-bookworm
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-      - uses: pnpm/action-setup@v4
-
-      - name: Install Dependencies
-        run: pnpm install
-
-      - name: Build
-        run: pnpm build
-
-      - name: Deploy
-        env:
-          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-        run: |
-          eval $(ssh-agent -s)
-          echo "$SSH_PRIVATE_KEY" | ssh-add -
-          apt update && apt install -y rsync
-          mkdir -p ~/.ssh
-          ssh-keyscan matrix.toplap.org > ~/.ssh/known_hosts
-          rsync -atv --delete --delete-after --progress \
-            ./website/dist/ \
-            strudel@matrix.toplap.org:/home/strudel/deploy/pr-${{ github.event.pull_request.number }}.hot.strudel.cc
@@ -1,4 +1,4 @@
-name: Build and Deploy to warm (strudel.cc)
+name: Build and Deploy to beta (warm.strudel.cc)

 on:
  push:
@@ -13,13 +13,17 @@ concurrency:
 jobs:
  build:
    runs-on: docker
-    container: node:22-bookworm
    env:
      SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
    steps:
      - uses: actions/checkout@v4
      - uses: pnpm/action-setup@v4
-
+        with:
+          version: 9.12.2
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          # cache: "pnpm"
      - name: Install Dependencies
        run: pnpm install

@@ -33,4 +37,4 @@ jobs:
          apt update && apt install -y rsync
          mkdir ~/.ssh
          ssh-keyscan matrix.toplap.org  > ~/.ssh/known_hosts
-          rsync -atv --delete --delete-after --progress ./website/dist/ strudel@matrix.toplap.org:/home/strudel/deploy/strudel.cc
+          rsync -atv --delete --delete-after --progress ./website/dist/ strudel@matrix.toplap.org:/home/strudel/deploy/warm.strudel.cc
@@ -1,4 +1,4 @@
-name: Build and Deploy to cold (cold.strudel.cc)
+name: Build and Deploy to live (strudel.cc)

 on: [workflow_dispatch]

@@ -10,13 +10,17 @@ concurrency:
 jobs:
  build:
    runs-on: docker
-    container: node:22-bookworm
    env:
      SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
    steps:
      - uses: actions/checkout@v4
      - uses: pnpm/action-setup@v4
-
+        with:
+          version: 9.12.2
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          # cache: "pnpm"
      - name: Install Dependencies
        run: pnpm install

@@ -30,4 +34,4 @@ jobs:
          apt update && apt install -y rsync
          mkdir ~/.ssh
          ssh-keyscan matrix.toplap.org  > ~/.ssh/known_hosts
-          rsync -atv --delete --delete-after --progress ./website/dist/ strudel@matrix.toplap.org:/home/strudel/deploy/cold.strudel.cc
+          rsync -atv --delete --delete-after --progress ./website/dist/ strudel@matrix.toplap.org:/home/strudel/deploy/strudel.cc
@@ -5,11 +5,21 @@ on: [push, pull_request]
 jobs:
  build:
    runs-on: docker
-    container: node:22-bookworm
+    strategy:
+      matrix:
+        node-version: [20]

    steps:
      - uses: actions/checkout@v4
+      - name: apt install ztd
+        run: apt update && apt install -y zstd
      - uses: pnpm/action-setup@v4
+        with:
+          version: 9.12.2
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: "pnpm"
      - run: pnpm install
      - run: pnpm run format-check
      - run: pnpm run lint
@@ -45,6 +45,20 @@ tidal-drum-machines
 webaudiofontdata
 src-tauri/target

+
+
+### BEGIN Visual Studio Code ###
+# Blanket, recursive exclude for .vscode directory and files
+.vscode/**/*
+# Unexclude specific files and directories within .vscode
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+### END Visual Studio Code ###
+
+
+
 # BEGIN JetBrains -> END JetBrains

 # for JetBrains IDE users, e.g. WebStorm. Source: https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
@@ -52,17 +52,7 @@ Strudel is a project handmade by humans, with thought and nuance.

 If you have used LLMs (so called 'AI'), please detail that in the pull request. We are still developing our response to the onslaught of LLM technology, but for practical and legal reasons are currently not accepting wholly LLM-generated code. We are also not accepting PRs that add LLM features to strudel itself.

-There are #llm-chat and #llm-share channels on [our discord](https://discord.com/invite/HGEdXmRkzT). Please do not discuss or share LLM-related things outside of those channels.
-
-## Creating and sharing a new project using strudel
-
-Strudel is free/open source software, and we are also happy to see people making use of it within the following terms. 
-
-Please don't use 'strudel' in the name of your project, so people don't assume it's official strudel project. (If you'd like it to be an official strudel project, please check in with the community, e.g. on [the discord](https://discord.com/invite/HGEdXmRkzT).) 
-
-Please respect our AGPL license, which e.g. requires you to share/link to the source code of strudel, any modifications you've made to it, and the source code for the rest of your project if it integrates with strudel. You are also required to maintain Strudel's copyright notices in the source code, and include Strudel's copyright notice in your user interface. This is an ad-hoc summary - please [refer to the license](https://codeberg.org/uzu/strudel/src/branch/main/LICENSE) for full details.
-
-You are also encouraged to connect with the community and understand our aims and values.
+There are #llm-chat and #llm-share channels on our discord. Please do not discuss or share LLM-related things outside of those channels.

 ## Report a Bug

@@ -1,17 +1,14 @@
 # strudel

 Live coding patterns on the web
-
+https://strudel.cc/

 - Try it here: <https://strudel.cc>
 - Docs: <https://strudel.cc/learn>
- Source: https://codeberg.org/uzu/strudel/
-  * Along with many other live coding projects, we have moved from Microsoft's Github platform to Codeberg for ethical reasons. **Please don't fork the project back to github**.
 - Technical Blog Post: <https://loophole-letters.vercel.app/strudel>
 - 1 Year of Strudel Blog Post: <https://loophole-letters.vercel.app/strudel1year>
 - 2 Years of Strudel Blog Post: <https://strudel.cc/blog/#year-2>

-
 ## Running Locally

 After cloning the project, you can run the REPL locally:
@@ -1,5 +1,4 @@
-<script src="https://unpkg.com/@strudel/repl@1.2.7"></script>
-<!-- <script src="../../packages/repl/dist/index.js"></script> -->
+<script src="https://unpkg.com/@strudel/repl@1.0.2"></script>
 <strudel-editor>
  <!--
 // @date 23-08-15
@@ -16,7 +16,7 @@ const drawContext = canvas.getContext('2d');
 const drawTime = [-2, 2]; // time window of drawn haps

 const editor = new StrudelMirror({
-  onSchedule: webaudioOutput,
+  defaultOutput: webaudioOutput,
  getTime: () => getAudioContext().currentTime,
  transpiler,
  root: document.getElementById('editor'),
@@ -29,7 +29,6 @@ const editor = new StrudelMirror({
      import('@strudel/core'),
      import('@strudel/draw'),
      import('@strudel/mini'),
-      import('@strudel/edo'),
      import('@strudel/tonal'),
      import('@strudel/webaudio'),
    );
@@ -15,7 +15,6 @@
    "@strudel/codemirror": "workspace:*",
    "@strudel/core": "workspace:*",
    "@strudel/draw": "workspace:*",
-    "@strudel/edo": "workspace:*",
    "@strudel/mini": "workspace:*",
    "@strudel/soundfonts": "workspace:*",
    "@strudel/tonal": "workspace:*",
@@ -12,7 +12,7 @@ registerSynthSounds();
 evalScope(import('@strudel/core'), import('@strudel/mini'), import('@strudel/webaudio'), import('@strudel/tonal'));

 const { evaluate } = repl({
-  onSchedule: webaudioOutput,
+  defaultOutput: webaudioOutput,
  getTime: () => ctx.currentTime,
  transpiler,
 });
@@ -4,7 +4,6 @@ export * from './packages/core/index.mjs';
 export * from './packages/csound/index.mjs';
 export * from './packages/desktopbridge/index.mjs';
 export * from './packages/draw/index.mjs';
-export * from './packages/edo/index.mjs';
 export * from './packages/embed/index.mjs';
 export * from './packages/hydra/index.mjs';
 export * from './packages/midi/index.mjs';
@@ -12,13 +12,6 @@ function defineTags(dictionary) {
      doclet.synonyms = doclet.synonyms_text.split(/[ ,]+/);
    },
  });
-
-  dictionary.defineTag('tags', {
-    mustHaveValue: true,
-    onTagged: function (doclet, tag) {
-      doclet.tags = tag.value.split(/[ ,]+/);
-    },
-  });
 }

 module.exports = { defineTags: defineTags };
@@ -1,211 +0,0 @@
-0 silly argv {
-0 silly argv   _: [ 'version' ],
-0 silly argv   private: false,
-0 silly argv   lernaVersion: '8.1.9',
-0 silly argv   '$0': 'node_modules/lerna/dist/cli.js'
-0 silly argv }
-1 notice cli v8.1.9
-2 verbose packageConfigs Explicit "packages" configuration found in lerna.json. Resolving packages using the configured glob(s): ["packages/*"]
-3 verbose rootPath /Users/jaderose/Documents/Github/cstrudel/strudel
-4 info versioning independent
-5 silly isAnythingCommitted
-6 verbose isAnythingCommitted 1
-7 silly getCurrentBranch
-8 verbose currentBranch main
-9 silly remoteBranchExists
-10 silly isBehindUpstream
-11 silly isBehindUpstream main is behind origin/main by 0 commit(s) and ahead by 4
-12 silly hasTags
-13 verbose hasTags true
-14 silly git-describe.sync "@strudel/codemirror@1.2.7-4-ga3ac9646" => {"lastTagName":"@strudel/codemirror@1.2.7","lastVersion":"1.2.7","refCount":"4","sha":"a3ac9646","isDirty":false}
-15 info Looking for changed packages since @strudel/codemirror@1.2.7
-16 silly checking diff packages/codemirror
-17 silly no diff found in @strudel/codemirror
-18 silly checking diff packages/core
-19 silly no diff found in @strudel/core
-20 silly checking diff packages/csound
-21 silly no diff found in @strudel/csound
-22 silly checking diff packages/desktopbridge
-23 silly no diff found in @strudel/desktopbridge
-24 silly checking diff packages/draw
-25 silly no diff found in @strudel/draw
-26 silly checking diff packages/embed
-27 silly no diff found in @strudel/embed
-28 silly checking diff packages/gamepad
-29 silly no diff found in @strudel/gamepad
-30 silly checking diff packages/hs2js
-31 silly no diff found in hs2js
-32 silly checking diff packages/hydra
-33 silly no diff found in @strudel/hydra
-34 silly checking diff packages/midi
-35 silly no diff found in @strudel/midi
-36 silly checking diff packages/mini
-37 silly no diff found in @strudel/mini
-38 silly checking diff packages/mondo
-39 silly no diff found in mondolang
-40 silly checking diff packages/mondough
-41 silly no diff found in @strudel/mondo
-42 silly checking diff packages/motion
-43 silly no diff found in @strudel/motion
-44 silly checking diff packages/mqtt
-45 silly no diff found in @strudel/mqtt
-46 silly checking diff packages/osc
-47 silly found diff in packages/osc/server.js
-48 verbose filtered diff [ 'packages/osc/server.js' ]
-49 silly checking diff packages/reference
-50 silly no diff found in @strudel/reference
-51 silly checking diff packages/repl
-52 silly no diff found in @strudel/repl
-53 silly checking diff packages/sampler
-54 silly no diff found in @strudel/sampler
-55 silly checking diff packages/serial
-56 silly no diff found in @strudel/serial
-57 silly checking diff packages/soundfonts
-58 silly no diff found in @strudel/soundfonts
-59 silly checking diff packages/superdough
-60 silly found diff in packages/superdough/package.json
-61 verbose filtered diff [ 'packages/superdough/package.json' ]
-62 silly checking diff packages/supradough
-63 silly found diff in packages/supradough/package.json
-64 verbose filtered diff [ 'packages/supradough/package.json' ]
-65 silly checking diff packages/tidal
-66 silly no diff found in @strudel/tidal
-67 silly checking diff packages/tonal
-68 silly no diff found in @strudel/tonal
-69 silly checking diff packages/transpiler
-70 silly no diff found in @strudel/transpiler
-71 silly checking diff packages/vite-plugin-bundle-audioworklet
-72 silly no diff found in vite-plugin-bundle-audioworklet
-73 silly checking diff packages/web
-74 silly no diff found in @strudel/web
-75 silly checking diff packages/webaudio
-76 silly found diff in packages/webaudio/package.json
-77 verbose filtered diff [ 'packages/webaudio/package.json' ]
-78 silly checking diff packages/xen
-79 silly no diff found in @strudel/xen
-80 verbose updated @strudel/codemirror
-81 verbose updated @strudel/csound
-82 verbose updated @strudel/midi
-83 verbose updated @strudel/osc
-84 verbose updated @strudel/repl
-85 verbose updated @strudel/soundfonts
-86 verbose updated superdough
-87 verbose updated supradough
-88 verbose updated @strudel/web
-89 verbose updated @strudel/webaudio
-90 verbose git-describe undefined => "@strudel/codemirror@1.2.7-4-ga3ac9646"
-91 silly git-describe parsed => {"lastTagName":"@strudel/codemirror@1.2.7","lastVersion":"1.2.7","refCount":"4","sha":"a3ac9646","isDirty":false}
-92 info execute Skipping releases
-93 silly lifecycle No script for "preversion" in "@strudel/monorepo", continuing
-94 silly lifecycle No script for "preversion" in "@strudel/osc", continuing
-95 silly lifecycle No script for "preversion" in "superdough", continuing
-96 silly lifecycle No script for "preversion" in "supradough", continuing
-97 verbose version supradough has no lockfile. Skipping lockfile update.
-98 verbose version @strudel/osc has no lockfile. Skipping lockfile update.
-99 verbose version superdough has no lockfile. Skipping lockfile update.
-100 silly lifecycle No script for "version" in "supradough", continuing
-101 silly lifecycle No script for "version" in "superdough", continuing
-102 silly lifecycle No script for "preversion" in "@strudel/codemirror", continuing
-103 silly lifecycle No script for "preversion" in "@strudel/webaudio", continuing
-104 silly lifecycle No script for "version" in "@strudel/osc", continuing
-105 verbose version @strudel/webaudio has no lockfile. Skipping lockfile update.
-106 verbose version @strudel/codemirror has no lockfile. Skipping lockfile update.
-107 silly lifecycle No script for "version" in "@strudel/codemirror", continuing
-108 silly lifecycle No script for "version" in "@strudel/webaudio", continuing
-109 silly lifecycle No script for "preversion" in "@strudel/csound", continuing
-110 silly lifecycle No script for "preversion" in "@strudel/midi", continuing
-111 silly lifecycle No script for "preversion" in "@strudel/soundfonts", continuing
-112 silly lifecycle No script for "preversion" in "@strudel/web", continuing
-113 verbose version @strudel/csound has no lockfile. Skipping lockfile update.
-114 verbose version @strudel/midi has no lockfile. Skipping lockfile update.
-115 verbose version @strudel/soundfonts has no lockfile. Skipping lockfile update.
-116 verbose version @strudel/web has no lockfile. Skipping lockfile update.
-117 silly lifecycle No script for "version" in "@strudel/midi", continuing
-118 silly lifecycle No script for "version" in "@strudel/csound", continuing
-119 silly lifecycle No script for "version" in "@strudel/soundfonts", continuing
-120 silly lifecycle No script for "preversion" in "@strudel/repl", continuing
-121 verbose version @strudel/repl has no lockfile. Skipping lockfile update.
-122 silly lifecycle No script for "version" in "@strudel/web", continuing
-123 silly lifecycle No script for "version" in "@strudel/repl", continuing
-124 silly lifecycle No script for "version" in "@strudel/monorepo", continuing
-125 verbose version Updating root pnpm-lock.yaml
-126 silly version Skipped applying prettier to ignored file: packages/supradough/package.json
-127 silly version Skipped applying prettier to ignored file: packages/superdough/package.json
-128 silly version Skipped applying prettier to ignored file: packages/osc/package.json
-129 silly version Skipped applying prettier to ignored file: packages/codemirror/package.json
-130 silly version Skipped applying prettier to ignored file: packages/webaudio/package.json
-131 silly version Skipped applying prettier to ignored file: packages/midi/package.json
-132 silly version Skipped applying prettier to ignored file: packages/csound/package.json
-133 silly version Skipped applying prettier to ignored file: packages/soundfonts/package.json
-134 silly version Skipped applying prettier to ignored file: packages/web/package.json
-135 silly version Skipped applying prettier to ignored file: packages/repl/package.json
-136 silly version Skipped applying prettier to ignored file: pnpm-lock.yaml
-137 silly gitAdd [
-137 silly gitAdd   'packages/supradough/package.json',
-137 silly gitAdd   'packages/superdough/package.json',
-137 silly gitAdd   'packages/osc/package.json',
-137 silly gitAdd   'packages/codemirror/package.json',
-137 silly gitAdd   'packages/webaudio/package.json',
-137 silly gitAdd   'packages/midi/package.json',
-137 silly gitAdd   'packages/csound/package.json',
-137 silly gitAdd   'packages/soundfonts/package.json',
-137 silly gitAdd   'packages/web/package.json',
-137 silly gitAdd   'packages/repl/package.json',
-137 silly gitAdd   'pnpm-lock.yaml'
-137 silly gitAdd ]
-138 silly gitCommit Publish
-138 silly gitCommit
-138 silly gitCommit  - @strudel/codemirror@1.2.8
-138 silly gitCommit  - @strudel/csound@1.2.8
-138 silly gitCommit  - @strudel/midi@1.2.8
-138 silly gitCommit  - @strudel/osc@1.3.2
-138 silly gitCommit  - @strudel/repl@1.2.9
-138 silly gitCommit  - @strudel/soundfonts@1.2.8
-138 silly gitCommit  - superdough@1.2.5
-138 silly gitCommit  - supradough@1.2.4
-138 silly gitCommit  - @strudel/web@1.2.8
-138 silly gitCommit  - @strudel/webaudio@1.2.9
-139 verbose git [
-139 verbose git   'commit',
-139 verbose git   '-F',
-139 verbose git   '/private/var/folders/hc/yf_zr55547sbcpz5rj7q85sc0000gn/T/3c85b5d4-56ae-40e9-8df7-db2bc1048402/lerna-commit.txt'
-139 verbose git ]
-140 silly gitTag @strudel/codemirror@1.2.8 git tag %s -m %s
-141 verbose git [
-141 verbose git   'tag',
-141 verbose git   '@strudel/codemirror@1.2.8',
-141 verbose git   '-m',
-141 verbose git   '@strudel/codemirror@1.2.8'
-141 verbose git ]
-142 silly gitTag @strudel/csound@1.2.8 git tag %s -m %s
-143 verbose git [ 'tag', '@strudel/csound@1.2.8', '-m', '@strudel/csound@1.2.8' ]
-144 silly gitTag @strudel/midi@1.2.8 git tag %s -m %s
-145 verbose git [ 'tag', '@strudel/midi@1.2.8', '-m', '@strudel/midi@1.2.8' ]
-146 silly gitTag @strudel/osc@1.3.2 git tag %s -m %s
-147 verbose git [ 'tag', '@strudel/osc@1.3.2', '-m', '@strudel/osc@1.3.2' ]
-148 silly gitTag @strudel/repl@1.2.9 git tag %s -m %s
-149 verbose git [ 'tag', '@strudel/repl@1.2.9', '-m', '@strudel/repl@1.2.9' ]
-150 silly gitTag @strudel/soundfonts@1.2.8 git tag %s -m %s
-151 verbose git [
-151 verbose git   'tag',
-151 verbose git   '@strudel/soundfonts@1.2.8',
-151 verbose git   '-m',
-151 verbose git   '@strudel/soundfonts@1.2.8'
-151 verbose git ]
-152 silly gitTag superdough@1.2.5 git tag %s -m %s
-153 verbose git [ 'tag', 'superdough@1.2.5', '-m', 'superdough@1.2.5' ]
-154 silly gitTag supradough@1.2.4 git tag %s -m %s
-155 verbose git [ 'tag', 'supradough@1.2.4', '-m', 'supradough@1.2.4' ]
-156 silly gitTag @strudel/web@1.2.8 git tag %s -m %s
-157 verbose git [ 'tag', '@strudel/web@1.2.8', '-m', '@strudel/web@1.2.8' ]
-158 silly gitTag @strudel/webaudio@1.2.9 git tag %s -m %s
-159 verbose git [ 'tag', '@strudel/webaudio@1.2.9', '-m', '@strudel/webaudio@1.2.9' ]
-160 error Error: Command failed with exit code 128: git tag superdough@1.2.5 -m superdough@1.2.5
-160 error fatal: tag 'superdough@1.2.5' already exists
-160 error     at makeError (/Users/jaderose/Documents/Github/cstrudel/strudel/node_modules/.pnpm/execa@5.0.0/node_modules/execa/lib/error.js:59:11)
-160 error     at handlePromise (/Users/jaderose/Documents/Github/cstrudel/strudel/node_modules/.pnpm/execa@5.0.0/node_modules/execa/index.js:114:26)
-160 error     at process.processTicksAndRejections (node:internal/process/task_queues:105:5)
-160 error     at async Promise.all (index 6)
-160 error     at async VersionCommand.gitCommitAndTagVersionForUpdates (/Users/jaderose/Documents/Github/cstrudel/strudel/node_modules/.pnpm/lerna@8.1.9_encoding@0.1.13/node_modules/lerna/dist/index.js:9957:11)
-160 error     at async VersionCommand.commitAndTagUpdates (/Users/jaderose/Documents/Github/cstrudel/strudel/node_modules/.pnpm/lerna@8.1.9_encoding@0.1.13/node_modules/lerna/dist/index.js:9933:18)
-160 error     at async Promise.all (index 0)
@@ -3,7 +3,6 @@
  "version": "0.5.0",
  "private": true,
  "description": "Port of tidalcycles to javascript",
-  "packageManager": "pnpm@10.15.0",
  "scripts": {
    "setup": "pnpm i",
    "pretest": "npm run jsdoc-json",
@@ -49,7 +48,6 @@
  "homepage": "https://strudel.cc",
  "dependencies": {
    "@strudel/core": "workspace:*",
-    "@strudel/edo": "workspace:*",
    "@strudel/mini": "workspace:*",
    "@strudel/tonal": "workspace:*",
    "@strudel/transpiler": "workspace:*",
@@ -1,6 +1,11 @@
 import jsdoc from '../../doc.json';
 import { autocompletion } from '@codemirror/autocomplete';
 import { h } from './html';
+//TODO: fix tonal scale import
+// import { Scale } from '@tonaljs/tonal';
+// import { soundMap } from '@strudel/webaudio';
+let soundMap = undefined;
+import { complex } from '@strudel/tonal';

 const escapeHtml = (str) => {
  const div = document.createElement('div');
@@ -75,6 +80,53 @@ const isValidDoc = (doc) => {
 const hasExcludedTags = (doc) =>
  ['superdirtOnly', 'noAutocomplete'].some((tag) => doc.tags?.find((t) => t.originalTitle === tag));

+export function bankCompletions() {
+  // TODO: FIX IMPORT
+  const soundDict = soundMap?.get() ?? {};
+
+  const banks = new Set();
+  for (const key of Object.keys(soundDict)) {
+    const [bank, suffix] = key.split('_');
+    if (suffix && bank) banks.add(bank);
+  }
+  return Array.from(banks)
+    .sort()
+    .map((name) => ({ label: name, type: 'bank' }));
+}
+
+// Attempt to get all scale names from Tonal TODO: FIX IMPORT
+let scaleCompletions = [];
+// try {
+//   scaleCompletions = (Scale.names ? Scale.names() : []).map((name) => ({ label: name, type: 'scale' }));
+// } catch (e) {
+//   console.warn('[autocomplete] Could not load scale names from Tonal:', e);
+// }
+
+// Valid mode values for voicing
+const modeCompletions = [
+  { label: 'below', type: 'mode' },
+  { label: 'above', type: 'mode' },
+  { label: 'duck', type: 'mode' },
+  { label: 'root', type: 'mode' },
+];
+
+// Valid chord symbols from ireal dictionary plus empty string for major triads
+const chordSymbols = ['', ...Object.keys(complex)].sort();
+const chordSymbolCompletions = chordSymbols.map((symbol) => {
+  if (symbol === '') {
+    return {
+      label: 'major',
+      apply: '',
+      type: 'chord-symbol',
+    };
+  }
+  return {
+    label: symbol,
+    apply: symbol,
+    type: 'chord-symbol',
+  };
+});
+
 export const getSynonymDoc = (doc, synonym) => {
  const synonyms = doc.synonyms || [];
  const docLabel = getDocLabel(doc);
@@ -113,19 +165,299 @@ const jsdocCompletions = (() => {
  return completions;
 })();

-export const strudelAutocomplete = (context) => {
-  const word = context.matchBefore(/\w*/);
-  if (word.from === word.to && !context.explicit) return null;
+// --- Handler functions for each context ---
+const pitchNames = [
+  'C',
+  'C#',
+  'Db',
+  'D',
+  'D#',
+  'Eb',
+  'E',
+  'E#',
+  'Fb',
+  'F',
+  'F#',
+  'Gb',
+  'G',
+  'G#',
+  'Ab',
+  'A',
+  'A#',
+  'Bb',
+  'B',
+  'B#',
+  'Cb',
+];

+// Cached regex patterns for scaleHandler
+const SCALE_NO_QUOTES_REGEX = /scale\(\s*$/;
+const SCALE_AFTER_COLON_REGEX = /scale\(\s*['"][^'"]*:[^'"]*$/;
+const SCALE_PRE_COLON_REGEX = /scale\(\s*['"][^'"]*$/;
+const SCALE_PITCH_MATCH_REGEX = /([A-Ga-g][#b]*)?$/;
+const SCALE_SPACES_TO_COLON_REGEX = /\s+/g;
+
+function scaleHandler(context) {
+  // First check for scale context without quotes - block with empty completions
+  let scaleNoQuotesContext = context.matchBefore(SCALE_NO_QUOTES_REGEX);
+  if (scaleNoQuotesContext) {
+    return {
+      from: scaleNoQuotesContext.to,
+      options: [],
+    };
+  }
+
+  // Check for after-colon context first (more specific)
+  let scaleAfterColonContext = context.matchBefore(SCALE_AFTER_COLON_REGEX);
+  if (scaleAfterColonContext) {
+    const text = scaleAfterColonContext.text;
+    const colonIdx = text.lastIndexOf(':');
+    if (colonIdx !== -1) {
+      const fragment = text.slice(colonIdx + 1);
+      const filteredScales = scaleCompletions.filter((s) => s.label.startsWith(fragment));
+      const options = filteredScales.map((s) => ({
+        ...s,
+        apply: s.label.replace(SCALE_SPACES_TO_COLON_REGEX, ':'),
+      }));
+      const from = scaleAfterColonContext.from + colonIdx + 1;
+      return {
+        from,
+        options,
+      };
+    }
+  }
+
+  // Then check for pre-colon context
+  let scalePreColonContext = context.matchBefore(SCALE_PRE_COLON_REGEX);
+  if (scalePreColonContext) {
+    if (!scalePreColonContext.text.includes(':')) {
+      if (context.explicit) {
+        const text = scalePreColonContext.text;
+        const match = text.match(SCALE_PITCH_MATCH_REGEX);
+        const fragment = match ? match[0] : '';
+        const filtered = pitchNames.filter((p) => p.toLowerCase().startsWith(fragment.toLowerCase()));
+        const from = scalePreColonContext.to - fragment.length;
+        const options = filtered.map((p) => ({ label: p, type: 'pitch' }));
+        return { from, options };
+      } else {
+        return { from: scalePreColonContext.to, options: [] };
+      }
+    }
+  }
+  return null;
+}
+
+// Cached regex patterns for soundHandler
+const SOUND_NO_QUOTES_REGEX = /(s|sound)\(\s*$/;
+const SOUND_WITH_QUOTES_REGEX = /(s|sound)\(\s*['"][^'"]*$/;
+const SOUND_FRAGMENT_MATCH_REGEX = /(?:[\s[{(<])([\w]*)$/;
+
+function soundHandler(context) {
+  // First check for sound context without quotes - block with empty completions
+  let soundNoQuotesContext = context.matchBefore(SOUND_NO_QUOTES_REGEX);
+  if (soundNoQuotesContext) {
+    return {
+      from: soundNoQuotesContext.to,
+      options: [],
+    };
+  }
+
+  // Then check for sound context with quotes - provide completions
+  let soundContext = context.matchBefore(SOUND_WITH_QUOTES_REGEX);
+  if (!soundContext) return null;
+
+  const text = soundContext.text;
+  const quoteIdx = Math.max(text.lastIndexOf('"'), text.lastIndexOf("'"));
+  if (quoteIdx === -1) return null;
+  const inside = text.slice(quoteIdx + 1);
+  const fragMatch = inside.match(SOUND_FRAGMENT_MATCH_REGEX);
+  const fragment = fragMatch ? fragMatch[1] : inside;
+  const soundNames = Object.keys(soundMap?.get() ?? {}).sort();
+  const filteredSounds = soundNames.filter((name) => name.includes(fragment));
+  let options = filteredSounds.map((name) => ({ label: name, type: 'sound' }));
+  const from = soundContext.to - fragment.length;
  return {
-    from: word.from,
-    options: jsdocCompletions,
-    /*     options: [
-      { label: 'match', type: 'keyword' },
-      { label: 'hello', type: 'variable', info: '(World)' },
-      { label: 'magic', type: 'text', apply: '⠁⭒*.✩.*⭒⠁', detail: 'macro' },
-    ], */
+    from,
+    options,
  };
+}
+
+// Cached regex patterns for bankHandler
+const BANK_NO_QUOTES_REGEX = /bank\(\s*$/;
+const BANK_WITH_QUOTES_REGEX = /bank\(\s*['"][^'"]*$/;
+
+function bankHandler(context) {
+  // First check for bank context without quotes - block with empty completions
+  let bankNoQuotesContext = context.matchBefore(BANK_NO_QUOTES_REGEX);
+  if (bankNoQuotesContext) {
+    return {
+      from: bankNoQuotesContext.to,
+      options: [],
+    };
+  }
+
+  // Then check for bank context with quotes - provide completions
+  let bankMatch = context.matchBefore(BANK_WITH_QUOTES_REGEX);
+  if (!bankMatch) return null;
+
+  const text = bankMatch.text;
+  const quoteIdx = Math.max(text.lastIndexOf('"'), text.lastIndexOf("'"));
+  if (quoteIdx === -1) return null;
+  const inside = text.slice(quoteIdx + 1);
+  const fragment = inside;
+  let banks = bankCompletions();
+  const filteredBanks = banks.filter((b) => b.label.startsWith(fragment));
+  const from = bankMatch.to - fragment.length;
+  return {
+    from,
+    options: filteredBanks,
+  };
+}
+
+// Cached regex patterns for modeHandler
+const MODE_NO_QUOTES_REGEX = /mode\(\s*$/;
+const MODE_AFTER_COLON_REGEX = /mode\(\s*['"][^'"]*:[^'"]*$/;
+const MODE_PRE_COLON_REGEX = /mode\(\s*['"][^'"]*$/;
+const MODE_FRAGMENT_MATCH_REGEX = /(?:[\s[{(<])([\w:]*)$/;
+
+function modeHandler(context) {
+  // First check for mode context without quotes - block with empty completions
+  let modeNoQuotesContext = context.matchBefore(MODE_NO_QUOTES_REGEX);
+  if (modeNoQuotesContext) {
+    return {
+      from: modeNoQuotesContext.to,
+      options: [],
+    };
+  }
+
+  // Check for after-colon context first (more specific)
+  let modeAfterColonContext = context.matchBefore(MODE_AFTER_COLON_REGEX);
+  if (modeAfterColonContext) {
+    const text = modeAfterColonContext.text;
+    const colonIdx = text.lastIndexOf(':');
+    if (colonIdx !== -1) {
+      const fragment = text.slice(colonIdx + 1);
+      // For anchor after colon, we can suggest pitch names
+      const filtered = pitchNames.filter((p) => p.toLowerCase().startsWith(fragment.toLowerCase()));
+      const options = filtered.map((p) => ({ label: p, type: 'pitch' }));
+      const from = modeAfterColonContext.from + colonIdx + 1;
+      return {
+        from,
+        options,
+      };
+    }
+  }
+
+  // Then check for pre-colon context
+  let modeContext = context.matchBefore(MODE_PRE_COLON_REGEX);
+  if (!modeContext) return null;
+
+  const text = modeContext.text;
+  const quoteIdx = Math.max(text.lastIndexOf('"'), text.lastIndexOf("'"));
+  if (quoteIdx === -1) return null;
+  const inside = text.slice(quoteIdx + 1);
+  const fragMatch = inside.match(MODE_FRAGMENT_MATCH_REGEX);
+  const fragment = fragMatch ? fragMatch[1] : inside;
+  const filteredModes = modeCompletions.filter((m) => m.label.startsWith(fragment));
+  const from = modeContext.to - fragment.length;
+  return {
+    from,
+    options: filteredModes,
+  };
+}
+
+// Cached regex patterns for chordHandler
+const CHORD_NO_QUOTES_REGEX = /chord\(\s*$/;
+const CHORD_WITH_QUOTES_REGEX = /chord\(\s*['"][^'"]*$/;
+const CHORD_FRAGMENT_MATCH_REGEX = /(?:[\s[{(<])([\w#b+^:-]*)$/;
+
+function chordHandler(context) {
+  // First check for chord context without quotes - block with empty completions
+  let chordNoQuotesContext = context.matchBefore(CHORD_NO_QUOTES_REGEX);
+  if (chordNoQuotesContext) {
+    return {
+      from: chordNoQuotesContext.to,
+      options: [],
+    };
+  }
+
+  // Then check for chord context with quotes - provide completions
+  let chordContext = context.matchBefore(CHORD_WITH_QUOTES_REGEX);
+  if (!chordContext) return null;
+
+  const text = chordContext.text;
+  const quoteIdx = Math.max(text.lastIndexOf('"'), text.lastIndexOf("'"));
+  if (quoteIdx === -1) return null;
+  const inside = text.slice(quoteIdx + 1);
+
+  // Use same fragment matching as sound/mode for expressions like "<G Am>"
+  const fragMatch = inside.match(CHORD_FRAGMENT_MATCH_REGEX);
+  const fragment = fragMatch ? fragMatch[1] : inside;
+
+  // Check if fragment contains any pitch name at start (for root + symbol)
+  let rootMatch = null;
+  let symbolFragment = fragment;
+  for (const pitch of pitchNames) {
+    if (fragment.toLowerCase().startsWith(pitch.toLowerCase())) {
+      rootMatch = pitch;
+      symbolFragment = fragment.slice(pitch.length);
+      break;
+    }
+  }
+
+  if (rootMatch) {
+    // We have a root, now complete chord symbols
+    const filteredSymbols = chordSymbolCompletions.filter((s) =>
+      s.label.toLowerCase().startsWith(symbolFragment.toLowerCase()),
+    );
+
+    // Create completions that replace the entire chord, not just the symbol part
+    const options = filteredSymbols;
+
+    const from = chordContext.to - symbolFragment.length;
+    return { from, options };
+  } else {
+    // No root yet, complete with pitch names
+    const filteredPitches = pitchNames.filter((p) => p.toLowerCase().startsWith(fragment.toLowerCase()));
+    const options = filteredPitches.map((p) => ({ label: p, type: 'pitch' }));
+    const from = chordContext.to - fragment.length;
+    return { from, options };
+  }
+}
+
+// Cached regex patterns for fallbackHandler
+const FALLBACK_WORD_REGEX = /\w*/;
+
+function fallbackHandler(context) {
+  const word = context.matchBefore(FALLBACK_WORD_REGEX);
+  if (word && word.from === word.to && !context.explicit) return null;
+  if (word) {
+    return {
+      from: word.from,
+      options: jsdocCompletions,
+    };
+  }
+  return null;
+}
+
+const handlers = [
+  soundHandler,
+  bankHandler,
+  chordHandler,
+  scaleHandler,
+  modeHandler,
+  // this handler *must* be last
+  fallbackHandler,
+];
+
+export const strudelAutocomplete = (context) => {
+  for (const handler of handlers) {
+    const result = handler(context);
+    if (result) {
+      return result;
+    }
+  }
+  return null;
 };

 export const isAutoCompletionEnabled = (enabled) =>
@@ -2,13 +2,23 @@ import {
  keymap,
  highlightSpecialChars,
  drawSelection,
+  highlightActiveLine,
  dropCursor,
  rectangularSelection,
  crosshairCursor,
+  lineNumbers,
+  highlightActiveLineGutter,
 } from '@codemirror/view';
-import { defaultHighlightStyle, syntaxHighlighting } from '@codemirror/language';
+import {
+  defaultHighlightStyle,
+  syntaxHighlighting,
+  bracketMatching,
+  foldGutter,
+  foldKeymap,
+} from '@codemirror/language';
 import { defaultKeymap, history, historyKeymap } from '@codemirror/commands';
-import { closeBracketsKeymap } from '@codemirror/autocomplete';
+import { searchKeymap, highlightSelectionMatches } from '@codemirror/search';
+import { completionKeymap, closeBracketsKeymap } from '@codemirror/autocomplete';

 // Taken + slightly modified from https://github.com/codemirror/basic-setup/blob/main/src/codemirror.ts

@@ -1,5 +1,5 @@
 import { closeBrackets } from '@codemirror/autocomplete';
-import { indentWithTab } from '@codemirror/commands';
+import { indentWithTab, toggleLineComment } from '@codemirror/commands';
 import { javascript, javascriptLanguage } from '@codemirror/lang-javascript';
 import { bracketMatching, defaultHighlightStyle, syntaxHighlighting } from '@codemirror/language';
 import { Compartment, EditorState, Prec } from '@codemirror/state';
@@ -12,7 +12,7 @@ import {
  lineNumbers,
 } from '@codemirror/view';
 import { persistentAtom } from '@nanostores/persistent';
-import { registerControl, repl } from '@strudel/core';
+import { logger, registerControl, repl } from '@strudel/core';
 import { cleanupDraw, Drawer } from '@strudel/draw';

 import { isAutoCompletionEnabled } from './autocomplete.mjs';
@@ -24,7 +24,6 @@ import { sliderPlugin, updateSliderWidgets } from './slider.mjs';
 import { activateTheme, initTheme, theme } from './themes.mjs';
 import { isTooltipEnabled } from './tooltip.mjs';
 import { updateWidgets, widgetPlugin } from './widget.mjs';
-import { jumpToCharacter } from './labelJump.mjs';

 export { toggleBlockComment, toggleBlockCommentByLine, toggleComment, toggleLineComment } from '@codemirror/commands';

@@ -120,14 +119,6 @@ export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, roo
            preventDefault: true,
            run: () => onStop?.(),
          },
-          {
-            key: 'Alt-w',
-            run: (view) => jumpToCharacter(view, '$', 1),
-          },
-          {
-            key: 'Alt-q',
-            run: (view) => jumpToCharacter(view, '$', -1),
-          },
          /* {
            key: 'Ctrl-Shift-.',
            run: () => (onPanic ? onPanic() : onStop?.()),
@@ -208,9 +199,8 @@ export class StrudelMirror {
      },
      afterEval: (options) => {
        // remember for when highlighting is toggled on
-        this.miniLocations = options.meta?.miniLocations || [];
-        this.widgets = options.meta?.widgets || [];
-
+        this.miniLocations = options.meta?.miniLocations;
+        this.widgets = options.meta?.widgets;
        const sliders = this.widgets.filter((w) => w.type === 'slider');
        updateSliderWidgets(this.editor, sliders);
        const widgets = this.widgets.filter((w) => w.type !== 'slider');
@@ -257,6 +247,33 @@ export class StrudelMirror {
      }
    };
    document.addEventListener('start-repl', this.onStartRepl);
+
+    // Handle global evaluation requests (e.g., from Vim :w)
+    this.onEvaluateRequest = (e) => {
+      try {
+        // Evaluate current editor on repl-evaluate
+        logger('[repl] evaluate via event');
+        this.evaluate();
+        e?.cancelable && e.preventDefault?.();
+      } catch (err) {
+        console.error('Error handling repl-evaluate event', err);
+      }
+    };
+    document.addEventListener('repl-evaluate', this.onEvaluateRequest);
+    document.addEventListener('repl-stop', this.onStopRequest);
+
+    // Toggle comments requested from Vim (gc)
+    this.onToggleComment = (e) => {
+      try {
+        // Honor selections; toggleLineComment handles both selections and
+        // single line
+        toggleLineComment(this.editor);
+        e?.cancelable && e.preventDefault?.();
+      } catch (err) {
+        console.error('Error handling repl-toggle-comment event', err);
+      }
+    };
+    document.addEventListener('repl-toggle-comment', this.onToggleComment);
  }
  draw(haps, time, painters) {
    painters?.forEach((painter) => painter(this.drawContext, time, haps, this.drawTime));
@@ -284,6 +301,15 @@ export class StrudelMirror {
    this.repl.scheduler.stop();
  }

+  // Listen for global stop requests (e.g., from Vim :q)
+  onStopRequest = (e) => {
+    try {
+      this.stop();
+      e?.cancelable && e.preventDefault?.();
+    } catch (err) {
+      console.error('Error handling repl-stop event', err);
+    }
+  };
  async toggle() {
    if (this.repl.scheduler.started) {
      this.repl.stop();
@@ -358,18 +384,19 @@ export class StrudelMirror {
      this.setFontSize(value);
    }
  }
-  replaceCode(code, from, to) {
-    const changes = { from, to, insert: code };
-    this.editor.dispatch({ changes });
-  }
-  insertCode(code, position) {
-    this.replaceCode(code, position, position);
-  }
  setCode(code) {
-    this.replaceCode(code, 0, this.editor.state.doc.length);
+    const changes = {
+      from: 0,
+      to: this.editor.state.doc.length,
+      insert: code,
+    };
+    this.editor.dispatch({ changes });
  }
  clear() {
    this.onStartRepl && document.removeEventListener('start-repl', this.onStartRepl);
+    this.onEvaluateRequest && document.removeEventListener('repl-evaluate', this.onEvaluateRequest);
+    this.onStopRequest && document.removeEventListener('repl-stop', this.onStopRequest);
+    this.onToggleComment && document.removeEventListener('repl-toggle-comment', this.onToggleComment);
  }
  getCursorLocation() {
    return this.editor.state.selection.main.head;
@@ -398,7 +425,6 @@ function s4() {
 /**
 * Overrides the css of highlighted events. Make sure to use single quotes!
 * @name markcss
- * @tag visualization
 * @example
 * note("c a f e")
 * .markcss('text-decoration:underline')
@@ -4,5 +4,3 @@ export * from './flash.mjs';
 export * from './slider.mjs';
 export * from './themes.mjs';
 export * from './widget.mjs';
-export { Vim } from './keybindings.mjs';
-export * from './basicSetup.mjs';
@@ -3,9 +3,10 @@ import { Prec, EditorState } from '@codemirror/state';
 import { keymap, ViewPlugin } from '@codemirror/view';
 // import { searchKeymap } from '@codemirror/search';
 import { emacs } from '@replit/codemirror-emacs';
-import { vim } from '@replit/codemirror-vim';
+import { vim, Vim } from '@replit/codemirror-vim';
 // import { vim } from './vim_test.mjs';
 import { vscodeKeymap } from '@replit/codemirror-vscode-keymap';
+import { logger } from '@strudel/core';

 const vscodePlugin = ViewPlugin.fromClass(
  class {
@@ -19,6 +20,110 @@ const vscodePlugin = ViewPlugin.fromClass(
 );
 const vscodeExtension = (options) => [vscodePlugin].concat(options ?? []);

+// Map Vim :w to trigger the same action as evaluation. We dispatch a custom
+// event 'repl-evaluate' that the editor listens for, and also simulate
+// Ctrl+Enter/Alt+Enter as a fallback. We log to the Strudel logger so it
+// appears in the Console panel.
+try {
+  if (Vim && typeof Vim.defineEx === 'function') {
+    // Map gc to toggle line comments by dispatching a custom event that our
+    // CodeMirror integration listens to. This avoids depending on Vim's
+    // internal actions and works with current selections/visual mode.
+    try {
+      Vim.defineAction('strudelToggleComment', (cm) => {
+        const view = cm?.view || cm;
+        try {
+          const ev = new CustomEvent('repl-toggle-comment', { detail: { source: 'vim', view }, cancelable: true });
+          document.dispatchEvent(ev);
+        } catch (e) {
+          console.error('strudelToggleComment dispatch failed', e);
+        }
+      });
+      Vim.mapCommand('gc', 'action', 'strudelToggleComment', {}, { context: 'normal' });
+      Vim.mapCommand('gc', 'action', 'strudelToggleComment', {}, { context: 'visual' });
+    } catch (e) {
+      console.error('Vim gc mapping failed', e);
+    }
+
+    // :q to pause/stop
+    Vim.defineEx('quit', 'q', (cm) => {
+      try {
+        const view = cm?.view || cm;
+        // First try dispatching our custom stop event, then fallback to Alt+.
+        let handled = false;
+        try {
+          const ev = new CustomEvent('repl-stop', { detail: { source: 'vim', view }, cancelable: true });
+          handled = document.dispatchEvent(ev) === false;
+        } catch (e) {
+          console.error('Error dispatching repl-stop event', e);
+        }
+        if (!handled) {
+          const altDot = new KeyboardEvent('keydown', {
+            key: '.',
+            code: 'Period',
+            altKey: true,
+            bubbles: true,
+            cancelable: true,
+          });
+          view?.dom?.dispatchEvent?.(altDot);
+        }
+      } catch (e) {
+        console.error('Error dispatching :q stop event', e);
+      }
+    });
+
+    // :w to evaluate
+    Vim.defineEx('write', 'w', (cm) => {
+      const view = cm?.view || cm; // CM6 Vim passes either an object with view or the view itself
+      try {
+        view?.focus?.();
+        // Let the app know this came from Vim :w
+        try {
+          logger('[vim] :w — evaluating code');
+        } catch (e) {
+          console.error('Error logging Vim :w evaluation', e);
+        }
+        // Dispatch a dedicated evaluate event first
+        let handled = false;
+        try {
+          const ev = new CustomEvent('repl-evaluate', { detail: { source: 'vim', view }, cancelable: true });
+          handled = document.dispatchEvent(ev) === false; // false means preventDefault was called
+        } catch (e) {
+          console.error('Error dispatching repl-evaluate event', e);
+        }
+        if (handled) {
+          return;
+        }
+        // Try Ctrl+Enter first if not handled by custom event
+        const ctrlEnter = new KeyboardEvent('keydown', {
+          key: 'Enter',
+          code: 'Enter',
+          ctrlKey: true,
+          bubbles: true,
+          cancelable: true,
+        });
+        view?.dom?.dispatchEvent?.(ctrlEnter);
+        // If not handled (no handler called preventDefault), try Alt+Enter as
+        // fallback
+        if (!ctrlEnter.defaultPrevented) {
+          const altEnter = new KeyboardEvent('keydown', {
+            key: 'Enter',
+            code: 'Enter',
+            altKey: true,
+            bubbles: true,
+            cancelable: true,
+          });
+          view?.dom?.dispatchEvent?.(altEnter);
+        }
+      } catch (e) {
+        console.error('Error dispatching :w evaluation event', e);
+      }
+    });
+  }
+} catch (e) {
+  console.error('Vim ex command setup failed (defineEx missing or Vim unavailable)', e);
+}
+
 const keymaps = {
  vim,
  emacs,
@@ -26,8 +131,6 @@ const keymaps = {
  vscode: vscodeExtension,
 };

-export { Vim } from '@replit/codemirror-vim';
-
 export function keybindings(name) {
  const active = keymaps[name];
  const extensions = active ? [Prec.high(active())] : [];
@@ -1,31 +0,0 @@
-import { EditorSelection } from '@codemirror/state';
-import { SearchCursor } from '@codemirror/search';
-
-export function jumpToCharacter(view, character, direction = 1) {
-  const { state, dispatch } = view;
-  const pos = state.selection.main.head;
-  const cursor = new SearchCursor(state.doc, character);
-
-  let characterPositions = [];
-  let jumpPos;
-  while (!cursor.next().done) {
-    characterPositions.push(cursor.value.to);
-  }
-  if (!characterPositions.length) {
-    return false;
-  }
-  if (direction > 0) {
-    jumpPos = characterPositions.find((x) => x > pos + 1) ?? characterPositions.at(0); // Loop back around for convenience
-  } else {
-    jumpPos = characterPositions.reverse().find((x) => x < pos + 1) ?? characterPositions.at(0);
-  }
-
-  if (jumpPos == null) {
-    return false;
-  }
-  dispatch({
-    selection: EditorSelection.cursor(jumpPos - 1),
-    scrollIntoView: true,
-  });
-  return true;
-}
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/codemirror",
-  "version": "1.3.0",
+  "version": "1.2.6",
  "description": "Codemirror Extensions for Strudel",
  "main": "index.mjs",
  "publishConfig": {
@@ -32,13 +32,13 @@
  },
  "homepage": "https://codeberg.org/uzu/strudel#readme",
  "dependencies": {
-    "@codemirror/autocomplete": "catalog:",
-    "@codemirror/commands": "catalog:",
-    "@codemirror/lang-javascript": "catalog:",
-    "@codemirror/language": "catalog:",
-    "@codemirror/search": "catalog:",
-    "@codemirror/state": "catalog:",
-    "@codemirror/view": "catalog:",
+    "@codemirror/autocomplete": "^6.18.4",
+    "@codemirror/commands": "^6.8.0",
+    "@codemirror/lang-javascript": "^6.2.2",
+    "@codemirror/language": "^6.10.8",
+    "@codemirror/search": "^6.5.8",
+    "@codemirror/state": "^6.5.1",
+    "@codemirror/view": "^6.36.2",
    "@lezer/highlight": "^1.2.1",
    "@nanostores/persistent": "^0.10.2",
    "@replit/codemirror-emacs": "^6.1.0",
@@ -46,8 +46,11 @@
    "@replit/codemirror-vscode-keymap": "^6.0.2",
    "@strudel/core": "workspace:*",
    "@strudel/draw": "workspace:*",
+    "@strudel/tonal": "workspace:*",
    "@strudel/transpiler": "workspace:*",
-    "nanostores": "^0.11.3"
+    "@tonaljs/tonal": "^4.10.0",
+    "nanostores": "^0.11.3",
+    "superdough": "workspace:*"
  },
  "devDependencies": {
    "vite": "^6.0.11"
@@ -117,7 +117,6 @@ export const sliderPlugin = ViewPlugin.fromClass(
 * Displays a slider widget to allow the user manipulate a value
 *
 * @name slider
- * @tags external_io, visualization
 * @param {number} value Initial value
 * @param {number} min Minimum value - optional, defaults to 0
 * @param {number} max Maximum value - optional, defaults to 1
@@ -198,7 +198,6 @@ export function activateTheme(name) {
  const themeSettings = settings[name] || settings.strudelTheme;
  // set css variables
  themeStyle.innerHTML = `:root {
-      color-scheme: ${themeSettings.light ? 'light' : 'dark'};
      ${Object.entries(themeSettings)
        // important to override fallback
        .map(([key, value]) => `--${key}: ${value} !important;`)
@@ -17,15 +17,13 @@ export const settings = {
  background: 'white',
  lineBackground: 'transparent',
  foreground: deepPurple,
-  muted: deepPurple + '50',
  caret: '#797977',
  selection: yellowPink,
  selectionMatch: '#2B323D',
-  gutterBackground: pinkAccent,
+  gutterBackground: grey,
  gutterForeground: lightGrey,
  gutterBorder: 'transparent',
  lineHighlight: pinkAccent,
-  light: true,
 };

 export default createTheme({
@@ -31,7 +31,6 @@ const palette = palettes['Sour Watermelon B'];
 export const settings = {
  background: palette[3],
  foreground: palette[1],
-  muted: palette[1] + '50',
  caret: palette[0],
  selection: palette[0],
  selectionMatch: palette[1],
@@ -8,7 +8,6 @@ export const settings = {
  background: '#282b2e',
  lineBackground: '#282b2e99',
  foreground: '#a9b7c6',
-  muted: '#a9b7c650',
  caret: '#00FF00',
  selection: '#343739',
  selectionMatch: '#343739',
@@ -20,7 +19,6 @@ export default createTheme({
  settings: {
    background: '#282b2e',
    foreground: '#a9b7c6',
-    muted: '#a9b7c650',
    caret: '#00FF00',
    selection: '#4e5254',
    selectionMatch: '#4e5254',
@@ -12,7 +12,6 @@ export const settings = {
  background: hex[0],
  lineBackground: 'transparent',
  foreground: hex[1],
-  muted: hex[2],
  selection: hex[2],
  selectionMatch: hex[0],
  gutterBackground: hex[0],
@@ -11,7 +11,6 @@ export const settings = {
  background: '#272C35',
  lineBackground: '#272C3599',
  foreground: 'hsl(220, 14%, 71%)',
-  muted: 'hsl(220, 14%, 41%)',
  caret: '#797977',
  selection: '#ffffff30',
  selectionMatch: '#2B323D',
@@ -26,7 +25,6 @@ export default createTheme({
  settings: {
    background: '#272C35',
    foreground: '#9d9b97',
-    muted: 'hsl(220, 14%, 41%)',
    caret: '#797977',
    selection: '#3d4c64',
    selectionMatch: '#3d4c64',
@@ -5,7 +5,6 @@ export const settings = {
  background: '#21202e',
  lineBackground: '#21202e99',
  foreground: '#edecee',
-  muted: '#edecee50',
  caret: '#a277ff',
  selection: '#3d375e7f',
  selectionMatch: '#3d375e7f',
@@ -19,7 +18,6 @@ export default createTheme({
  settings: {
    background: '#21202e',
    foreground: '#edecee',
-    muted: '#edecee50',
    caret: '#a277ff',
    selection: '#5a51898f',
    selectionMatch: '#5a51898f',
@@ -6,7 +6,6 @@ export const settings = {
  background: '#FFFFFF',
  lineBackground: '#FFFFFF99',
  foreground: '#000000',
-  muted: '#00000050',
  caret: '#FBAC52',
  selection: '#FFD420',
  selectionMatch: '#FFD420',
@@ -21,7 +20,6 @@ export default createTheme({
  settings: {
    background: '#FFFFFF',
    foreground: '#000000',
-    muted: '#00000050',
    caret: '#FBAC52',
    selection: '#FFD420',
    selectionMatch: '#FFD420',
@@ -2,8 +2,7 @@ import { tags as t } from '@lezer/highlight';
 import { createTheme } from './theme-helper.mjs';
 export const settings = {
  background: 'black',
-  foreground: 'white',
-  muted: '#ffffff50',
+  foreground: 'white', // whats that?
  caret: 'white',
  selection: '#ffffff20',
  selectionMatch: '#036dd626',
@@ -3,8 +3,7 @@ import { createTheme } from './theme-helper.mjs';
 export const settings = {
  background: '#051DB5',
  lineBackground: '#051DB550',
-  foreground: 'white',
-  muted: '#ffffff50',
+  foreground: 'white', // whats that?
  caret: 'white',
  selection: 'rgba(128, 203, 196, 0.5)',
  selectionMatch: '#036dd626',
@@ -11,7 +11,6 @@ export const settings = {
  background: hex[0],
  lineBackground: 'transparent',
  foreground: hex[2],
-  muted: hex[3],
  selection: hex[3],
  selectionMatch: hex[0],
  gutterBackground: hex[0],
@@ -9,7 +9,6 @@ export const settings = {
  background: '#242424',
  lineBackground: '#24242499',
  foreground: '#f8f8f2',
-  muted: '#f8f8f250',
  caret: '#FFFFFF',
  selection: 'rgba(255, 255, 255, 0.1)',
  selectionMatch: 'rgba(255, 255, 255, 0.2)',
@@ -24,7 +23,6 @@ export default createTheme({
  settings: {
    background: '#242424',
    foreground: '#f8f8f2',
-    muted: '#f8f8f250',
    caret: '#FFFFFF',
    selection: 'rgba(255, 255, 255, 0.1)',
    selectionMatch: 'rgba(255, 255, 255, 0.2)',
@@ -11,7 +11,6 @@ export const settings = {
  background: '#282a36',
  lineBackground: '#282a3699',
  foreground: '#f8f8f2',
-  muted: '#f8f8f250',
  caret: '#f8f8f0',
  selection: 'rgba(255, 255, 255, 0.1)',
  selectionMatch: 'rgba(255, 255, 255, 0.2)',
@@ -28,7 +27,6 @@ export default createTheme({
  settings: {
    background: '#282a36',
    foreground: '#f8f8f2',
-    muted: '#f8f8f250',
    caret: '#f8f8f0',
    selection: 'rgba(255, 255, 255, 0.1)',
    selectionMatch: 'rgba(255, 255, 255, 0.2)',
@@ -10,7 +10,6 @@ export const settings = {
  background: '#2a2734',
  lineBackground: '#2a273499',
  foreground: '#eeebff',
-  muted: '#eeebff50',
  caret: '#ffad5c',
  selection: 'rgba(255, 255, 255, 0.1)',
  gutterBackground: '#2a2734',
@@ -23,7 +22,6 @@ export default createTheme({
  settings: {
    background: '#2a2734',
    foreground: '#6c6783',
-    muted: '#eeebff50',
    caret: '#ffad5c',
    selection: '#9a86fd',
    selectionMatch: '#9a86fd',
@@ -6,7 +6,6 @@ export const settings = {
  background: '#fff',
  lineBackground: '#ffffff99',
  foreground: '#000',
-  muted: '#00000050',
  caret: '#FFFFFF',
  selection: '#d7d4f0',
  selectionMatch: '#d7d4f0',
@@ -21,7 +20,6 @@ export default createTheme({
  settings: {
    background: '#fff',
    foreground: '#000',
-    muted: '#00000050',
    caret: '#FFFFFF',
    selection: '#d7d4f0',
    selectionMatch: '#d7d4f0',
@@ -23,7 +23,6 @@ export const settings = {
  background: hex[0],
  lineBackground: 'transparent',
  foreground: hex[10],
-  muted: hex[7],
  selection: hex[8],
  selectionMatch: hex[0],
  gutterBackground: hex[3],
@@ -5,7 +5,6 @@ export const settings = {
  background: '#0d1117',
  lineBackground: '#0d111799',
  foreground: '#c9d1d9',
-  muted: '#c9d1d950',
  caret: '#c9d1d9',
  selection: '#003d73',
  selectionMatch: '#003d73',
@@ -17,7 +16,6 @@ export default createTheme({
  settings: {
    background: '#0d1117',
    foreground: '#c9d1d9',
-    muted: '#c9d1d950',
    caret: '#c9d1d9',
    selection: '#003d73',
    selectionMatch: '#003d73',
@@ -6,7 +6,6 @@ export const settings = {
  background: '#fff',
  lineBackground: '#ffffff99',
  foreground: '#24292e',
-  muted: '#24292e50',
  selection: '#BBDFFF',
  selectionMatch: '#BBDFFF',
  gutterBackground: '#fff',
@@ -18,7 +17,6 @@ export default createTheme({
  settings: {
    background: '#fff',
    foreground: '#24292e',
-    muted: '#24292e50',
    selection: '#BBDFFF',
    selectionMatch: '#BBDFFF',
    gutterBackground: '#fff',
@@ -13,7 +13,6 @@ export const settings = {
  background: hex[0],
  lineBackground: 'transparent',
  foreground: hex[2],
-  muted: hex[2] + '50',
  selection: hex[4],
  selectionMatch: hex[0],
  gutterBackground: hex[0],
@@ -10,7 +10,6 @@ export const settings = {
  background: '#282828',
  lineBackground: '#28282899',
  foreground: '#ebdbb2',
-  muted: '#ebdbb250',
  caret: '#ebdbb2',
  selection: '#bdae93',
  selectionMatch: '#bdae93',
@@ -24,7 +23,6 @@ export default createTheme({
  settings: {
    background: '#282828',
    foreground: '#ebdbb2',
-    muted: '#ebdbb250',
    caret: '#ebdbb2',
    selection: '#b99d555c',
    selectionMatch: '#b99d555c',
@@ -11,7 +11,6 @@ export const settings = {
  background: '#fbf1c7',
  lineBackground: '#fbf1c799',
  foreground: '#3c3836',
-  muted: '#3c383650',
  caret: '#af3a03',
  selection: '#ebdbb2',
  selectionMatch: '#bdae93',
@@ -26,7 +25,6 @@ export default createTheme({
  settings: {
    background: '#fbf1c7',
    foreground: '#3c3836',
-    muted: '#3c383650',
    caret: '#af3a03',
    selection: '#bdae9391',
    selectionMatch: '#bdae9391',
@@ -5,7 +5,6 @@ export const settings = {
  background: '#212121',
  lineBackground: '#21212199',
  foreground: '#bdbdbd',
-  muted: '#bdbdbd50',
  caret: '#a0a4ae',
  selection: '#d7d4f0',
  selectionMatch: '#d7d4f0',
@@ -20,7 +19,6 @@ export default createTheme({
  settings: {
    background: '#212121',
    foreground: '#bdbdbd',
-    muted: '#bdbdbd50',
    caret: '#a0a4ae',
    selection: '#d7d4f063',
    selectionMatch: '#d7d4f063',
@@ -5,8 +5,7 @@ export const settings = {
  light: true,
  background: '#FAFAFA',
  lineBackground: '#FAFAFA99',
-  foreground: '#6182B8',
-  muted: '#6182B850',
+  foreground: '#90A4AE',
  caret: '#272727',
  selection: '#80CBC440',
  selectionMatch: '#FAFAFA',
@@ -20,7 +19,6 @@ export default createTheme({
  settings: {
    background: '#FAFAFA',
    foreground: '#90A4AE',
-    muted: '#6182B850',
    caret: '#272727',
    selection: '#80CBC440',
    selectionMatch: '#80CBC440',
@@ -5,7 +5,6 @@ export const settings = {
  background: '#272822',
  lineBackground: '#27282299',
  foreground: '#FFFFFF',
-  muted: '#FFFFFF50',
  caret: '#FFFFFF',
  selection: '#49483E',
  selectionMatch: '#49483E',
@@ -19,7 +18,6 @@ export default createTheme({
  settings: {
    background: '#272822',
    foreground: '#FFFFFF',
-    muted: '#FFFFFF50',
    caret: '#FFFFFF',
    selection: '#49483E',
    selectionMatch: '#49483E',
@@ -6,7 +6,6 @@ export const settings = {
  background: '#f2f1f8',
  lineBackground: '#f2f1f899',
  foreground: '#0c006b',
-  muted: '#0c006b50',
  caret: '#5c49e9',
  selection: '#d5d1f2',
  selectionMatch: '#d5d1f2',
@@ -20,7 +19,6 @@ export default createTheme({
  settings: {
    background: '#f2f1f8',
    foreground: '#0c006b',
-    muted: '#0c006b50',
    caret: '#5c49e9',
    selection: '#d5d1f2',
    selectionMatch: '#d5d1f2',
@@ -5,7 +5,6 @@ export const settings = {
  background: '#2e3440',
  lineBackground: '#2e344099',
  foreground: '#FFFFFF',
-  muted: '#FFFFFF50',
  caret: '#FFFFFF',
  selection: '#3b4252',
  selectionMatch: '#e5e9f0',
@@ -21,7 +20,6 @@ export default createTheme({
  settings: {
    background: '#2e3440',
    foreground: '#FFFFFF',
-    muted: '#FFFFFF50',
    caret: '#FFFFFF',
    selection: '#00000073',
    selectionMatch: '#00000073',
@@ -13,7 +13,6 @@ export const settings = {
  background: hex[0],
  lineBackground: 'transparent',
  foreground: hex[2],
-  muted: hex[2] + '50',
  selection: hex[4],
  selectionMatch: hex[0],
  gutterBackground: hex[0],
@@ -5,7 +5,6 @@ export const settings = {
  background: '#002b36',
  lineBackground: '#002b3699',
  foreground: '#93a1a1',
-  muted: '#93a1a150',
  caret: '#839496',
  selection: '#173541',
  selectionMatch: '#aafe661a',
@@ -46,7 +45,6 @@ export default createTheme({
  settings: {
    background: c.background,
    foreground: c.foreground,
-    muted: c.muted,
    caret: c.cursor,
    selection: c.selection,
    selectionMatch: c.selection,
@@ -8,7 +8,6 @@ export const settings = {
  background: '#fdf6e3',
  lineBackground: '#fdf6e399',
  foreground: '#657b83',
-  muted: '#657b8350',
  caret: '#586e75',
  selection: '#dfd9c8',
  selectionMatch: '#dfd9c8',
@@ -20,7 +19,6 @@ export const settings = {
 const c = {
  background: '#FDF6E3',
  foreground: '#657B83',
-  muted: '#657b8350',
  selection: '#EEE8D5',
  selectionMatch: '#EEE8D5',
  cursor: '#657B83',
@@ -13,7 +13,6 @@ export const settings = {
  background: '#000000',
  lineBackground: 'transparent',
  foreground: hex[4],
-  muted: hex[6],
  selection: hex[6],
  gutterBackground: hex[0],
  gutterForeground: hex[5],
@@ -5,7 +5,6 @@ export const settings = {
  background: '#222',
  lineBackground: '#22222299',
  foreground: '#fff',
-  muted: '#8a919966',
  caret: '#ffcc00',
  selection: 'rgba(128, 203, 196, 0.5)',
  selectionMatch: '#036dd626',
@@ -5,7 +5,6 @@ export const settings = {
  background: '#303841',
  lineBackground: '#30384199',
  foreground: '#FFFFFF',
-  muted: '#FFFFFF50',
  caret: '#FBAC52',
  selection: '#4C5964',
  selectionMatch: '#3A546E',
@@ -19,7 +18,6 @@ export default createTheme({
  settings: {
    background: '#303841',
    foreground: '#FFFFFF',
-    muted: '#FFFFFF50',
    caret: '#FBAC52',
    selection: '#4C5964',
    selectionMatch: '#3A546E',
@@ -9,8 +9,7 @@ let colorD = '#f8fc55';

 export const settings = {
  background: '#000000',
-  foreground: colorA,
-  muted: colorA + '50',
+  foreground: colorA, // whats that?
  caret: colorC,
  selection: colorD,
  selectionMatch: colorA,
@@ -4,8 +4,7 @@ import { createTheme } from './theme-helper.mjs';
 export const settings = {
  background: '#24283b',
  lineBackground: '#24283b99',
-  foreground: '#f9f2f9',
-  muted: '#f9f2f950',
+  foreground: '#7982a9',
  caret: '#c0caf5',
  selection: '#6f7bb630',
  selectionMatch: '#1f2335',
@@ -19,8 +18,7 @@ export default createTheme({
  theme: 'dark',
  settings: {
    background: '#24283b',
-    foreground: '#f9f2f9',
-    muted: '#f9f2f950',
+    foreground: '#7982a9',
    caret: '#c0caf5',
    selection: '#6f7bb630',
    selectionMatch: '#343b5f',
@@ -4,8 +4,7 @@ import { createTheme } from './theme-helper.mjs';
 export const settings = {
  background: '#1a1b26',
  lineBackground: '#1a1b2699',
-  foreground: '#f8fcf9',
-  muted: '#f8fcf950',
+  foreground: '#787c99',
  caret: '#c0caf5',
  selection: '#515c7e40',
  selectionMatch: '#16161e',
@@ -19,8 +18,7 @@ export default createTheme({
  theme: 'dark',
  settings: {
    background: '#1a1b26',
-    foreground: '#f8fcf9',
-    muted: '#f8fcf950',
+    foreground: '#787c99',
    caret: '#c0caf5',
    selection: '#515c7e40',
    selectionMatch: '#16161e',
@@ -6,7 +6,6 @@ export const settings = {
  background: '#e1e2e7',
  lineBackground: '#e1e2e799',
  foreground: '#3760bf',
-  muted: '#3760bf50',
  caret: '#3760bf',
  selection: '#99a7df',
  selectionMatch: '#99a7df',
@@ -21,7 +20,6 @@ export default createTheme({
  settings: {
    background: '#e1e2e7',
    foreground: '#3760bf',
-    muted: '#3760bf50',
    caret: '#3760bf',
    selection: '#99a7df',
    selectionMatch: '#99a7df',
@@ -5,7 +5,6 @@ export const settings = {
  background: '#1e1e1e',
  lineBackground: '#1e1e1e99',
  foreground: '#fff',
-  muted: '#ffffff50',
  caret: '#c6c6c6',
  selection: '#6199ff2f',
  selectionMatch: '#72a1ff59',
@@ -20,7 +19,6 @@ export default createTheme({
  settings: {
    background: '#1e1e1e',
    foreground: '#fff',
-    muted: '#ffffff50',
    caret: '#c6c6c6',
    selection: '#6199ff2f',
    selectionMatch: '#72a1ff59',
@@ -5,7 +5,6 @@ export const settings = {
  background: '#ffffff',
  lineBackground: '#ffffff50',
  foreground: '#383a42',
-  muted: '#383a4250',
  caret: '#000',
  selection: '#add6ff',
  selectionMatch: '#a8ac94',
@@ -21,7 +20,6 @@ export default createTheme({
  settings: {
    background: '#ffffff',
    foreground: '#383a42',
-    muted: '#383a4250',
    caret: '#000',
    selection: '#add6ff',
    selectionMatch: '#a8ac94',
@@ -2,8 +2,7 @@ import { tags as t } from '@lezer/highlight';
 import { createTheme } from './theme-helper.mjs';
 export const settings = {
  background: 'white',
-  foreground: 'black',
-  muted: '#00000050',
+  foreground: 'black', // whats that?
  caret: 'black',
  selection: 'rgba(128, 203, 196, 0.5)',
  selectionMatch: '#ffffff26',
@@ -6,7 +6,6 @@ export const settings = {
  background: '#fff',
  lineBackground: '#ffffff99',
  foreground: '#3D3D3D',
-  muted: '#3D3D3D50',
  selection: '#BBDFFF',
  selectionMatch: '#BBDFFF',
  gutterBackground: '#fff',
@@ -19,7 +18,6 @@ export default createTheme({
  settings: {
    background: '#fff',
    foreground: '#3D3D3D',
-    muted: '#3D3D3D50',
    selection: '#BBDFFF',
    selectionMatch: '#BBDFFF',
    gutterBackground: '#fff',
@@ -10,7 +10,6 @@ import { errorLogger, logger } from './logger.mjs';
 export class Cyclist {
  constructor({
    interval,
-    onSchedule,
    onTrigger,
    onToggle,
    onError,
@@ -20,11 +19,6 @@ export class Cyclist {
    clearInterval,
    beforeStart,
  }) {
-    if (onTrigger) {
-      throw new Error(
-        'onTrigger has been dropped. use onSchedule(hap, time, cps) instead, see https://codeberg.org/uzu/strudel/pulls/2138',
-      );
-    }
    this.started = false;
    this.beforeStart = beforeStart;
    this.cps = 0.5;
@@ -69,7 +63,12 @@ export class Cyclist {
            if (hap.hasOnset()) {
              const targetTime =
                (hap.whole.begin - this.num_cycles_at_cps_change) / this.cps + this.seconds_at_cps_change + latency;
-              onSchedule?.(hap, targetTime, this.cps);
+              const duration = hap.duration / this.cps;
+              // the following line is dumb and only here for backwards compatibility
+              // see https://codeberg.org/uzu/strudel/pulls/1004
+              const deadline = targetTime - phase;
+              // this onTrigger has another signature
+              onTrigger?.(hap, deadline, duration, this.cps, targetTime);
              if (hap.value.cps !== undefined && this.cps != hap.value.cps) {
                this.cps = hap.value.cps;
                this.num_ticks_since_cps_change = 0;
@@ -15,7 +15,6 @@ import Fraction, { gcd } from './fraction.mjs';
 * - "-" hold previous value
 * - "." silence
 *
- * @tags visualization
 * @param {Pattern} pattern the pattern to use
 * @param {number} chars max number of characters (approximately)
 * @returns string
@@ -59,14 +59,8 @@ export const bjorklund = function (ons, steps) {
 * really useful for computer/algorithmic music because they can
 * describe a large number of rhythms with a couple of numbers.
 *
- * A negative number of pulses inverts the pattern
- * so pulses happen in the gaps of the normal euclidean rhythm.
- *
- * A negative number of steps changes it into `euclidLegato`.
- *
 * @memberof Pattern
 * @name euclid
- * @tags temporal
 * @param {number} pulses the number of onsets/beats
 * @param {number} steps the number of steps to fill
 * @returns Pattern
@@ -79,7 +73,6 @@ export const bjorklund = function (ons, steps) {
 * Like `euclid`, but has an additional parameter for 'rotating' the resulting sequence.
 * @memberof Pattern
 * @name euclidRot
- * @tags temporal
 * @param {number} pulses the number of onsets/beats
 * @param {number} steps the number of steps to fill
 * @param {number} rotation offset in steps
@@ -142,38 +135,8 @@ const _euclidRot = function (pulses, steps, rotation) {
  return b;
 };

-const _euclidLegato = function (pulses, steps, rotation, pat) {
-  var bin_pat = _euclidRot(pulses, steps, 0);
-  // Because the `gapless` algorithm logic assumes the first entry in bin_pat is a 1,
-  // we rotate the pattern so the first onset is at the start.
-  const firstOnset = bin_pat.indexOf(1);
-  bin_pat = rotate(bin_pat, firstOnset);
-  steps = Math.abs(steps);
-  const gapless = bin_pat
-    .join('')
-    .split('1')
-    .slice(1)
-    .map((s) => [s.length + 1, true]);
-  return pat.struct(timeCat(...gapless).late(Fraction(rotation + firstOnset).div(steps)));
-};
-
-const _euclid = function (pulses, steps, rotation, pat) {
-  if (steps === 0 || pulses === 0) {
-    return silence;
-  }
-  const cycles = Math.ceil(Math.abs(pulses) / Math.abs(steps));
-  const totalSteps = cycles * steps;
-  if (totalSteps < 0) {
-    return _euclidLegato(pulses, -totalSteps, rotation, pat.fast(cycles)).slow(cycles);
-  }
-  return pat
-    .fast(cycles)
-    .struct(_euclidRot(pulses, totalSteps, rotation))
-    .slow(cycles);
-};
-
 export const euclid = register('euclid', function (pulses, steps, pat) {
-  return _euclid(pulses, steps, 0, pat);
+  return pat.struct(_euclidRot(pulses, steps, 0));
 });

 export const bjork = register('bjork', function (euc, pat) {
@@ -181,21 +144,18 @@ export const bjork = register('bjork', function (euc, pat) {
    euc = [euc];
  }
  const [pulses, steps = pulses, rot = 0] = euc;
-  return _euclid(pulses, steps, rot, pat);
+  return pat.struct(_euclidRot(pulses, steps, rot));
 });

 export const { euclidrot, euclidRot } = register(['euclidrot', 'euclidRot'], function (pulses, steps, rotation, pat) {
-  return _euclid(pulses, steps, rotation, pat);
+  return pat.struct(_euclidRot(pulses, steps, rotation));
 });

 /**
 * Similar to `euclid`, but each pulse is held until the next pulse,
 * so there will be no gaps.
- *
- * A negative number of steps changes it into `euclid`.
 * @name euclidLegato
 * @memberof Pattern
- * @tags temporal
 * @param {number} pulses the number of onsets/beats
 * @param {number} steps the number of steps to fill
 * @param rotation offset in steps
@@ -204,19 +164,29 @@ export const { euclidrot, euclidRot } = register(['euclidrot', 'euclidRot'], fun
 * note("c3").euclidLegato(3,8)
 */

+const _euclidLegato = function (pulses, steps, rotation, pat) {
+  if (pulses < 1) {
+    return silence;
+  }
+  const bin_pat = _euclidRot(pulses, steps, 0);
+  const gapless = bin_pat
+    .join('')
+    .split('1')
+    .slice(1)
+    .map((s) => [s.length + 1, true]);
+  return pat.struct(timeCat(...gapless)).late(Fraction(rotation).div(steps));
+};
+
 export const euclidLegato = register(['euclidLegato'], function (pulses, steps, pat) {
-  return _euclid(pulses, -steps, 0, pat);
+  return _euclidLegato(pulses, steps, 0, pat);
 });

 /**
 * Similar to `euclid`, but each pulse is held until the next pulse,
 * so there will be no gaps, and has an additional parameter for 'rotating'
- * the resulting sequence.
- *
- * A negative number of steps changes it into `euclidRot`.
+ * the resulting sequence
 * @name euclidLegatoRot
 * @memberof Pattern
- * @tags temporal
 * @param {number} pulses the number of onsets/beats
 * @param {number} steps the number of steps to fill
 * @param {number} rotation offset in steps
@@ -224,7 +194,7 @@ export const euclidLegato = register(['euclidLegato'], function (pulses, steps,
 * note("c3").euclidLegatoRot(3,5,2)
 */
 export const euclidLegatoRot = register(['euclidLegatoRot'], function (pulses, steps, rotation, pat) {
-  return _euclid(pulses, -steps, rotation, pat);
+  return _euclidLegato(pulses, steps, rotation, pat);
 });

 /**
@@ -238,7 +208,6 @@ export const euclidLegatoRot = register(['euclidLegatoRot'], function (pulses, s
 * @name euclidish
 * @synonyms eish
 * @memberof Pattern
- * @tags temporal
 * @param {number} pulses the number of onsets
 * @param {number} steps the number of steps to fill
 * @param {number} groove exists between the extremes of 0 (straight euclidian) and 1 (straight pulse)
@@ -22,7 +22,7 @@ export * from './repl.mjs';
 export * from './signal.mjs';
 export * from './speak.mjs';
 export * from './state.mjs';
-export * from './schedulerState.mjs';
+export * from './time.mjs';
 export * from './timespan.mjs';
 export * from './ui.mjs';
 export * from './util.mjs';
@@ -8,12 +8,7 @@ import { logger } from './logger.mjs';
 import { ClockCollator, cycleToSeconds } from './util.mjs';

 export class NeoCyclist {
-  constructor({ onSchedule, onToggle, getTime, onTrigger }) {
-    if (onTrigger) {
-      throw new Error(
-        'onTrigger has been dropped. use onSchedule(hap, time, cps) instead, see https://codeberg.org/uzu/strudel/pulls/2138',
-      );
-    }
+  constructor({ onTrigger, onToggle, getTime }) {
    this.started = false;
    this.cps = 0.5;
    this.getTime = getTime; // get absolute time
@@ -48,7 +43,8 @@ export class NeoCyclist {
        if (hap.hasOnset()) {
          const timeUntilTrigger = cycleToSeconds(hap.whole.begin - this.cycle, this.cps);
          const targetTime = timeUntilTrigger + currentTime + this.latency;
-          onSchedule?.(hap, targetTime, this.cps);
+          const duration = cycleToSeconds(hap.duration, this.cps);
+          onTrigger?.(hap, 0, duration, this.cps, targetTime);
        }
      });
    };
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/core",
-  "version": "1.2.6",
+  "version": "1.2.5",
  "description": "Port of Tidal Cycles to JavaScript",
  "main": "index.mjs",
  "type": "module",
@@ -28,7 +28,6 @@ const _pick = function (lookup, pat, modulo = true) {

 /** * Picks patterns (or plain values) either from a list (by index) or a lookup table (by name).
 * Similar to `inhabit`, but maintains the structure of the original patterns.
- * @tags combiners
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -58,7 +57,6 @@ const __pick = register('pick', function (lookup, pat) {
 * it wraps around, rather than sticking at the maximum value.
 * For example, if you pick the fifth pattern of a list of three, you'll get the
 * second one.
- * @tags combiners
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -69,43 +67,35 @@ export const pickmod = register('pickmod', function (lookup, pat) {
 });

 /** * pickF lets you use a pattern of numbers to pick which function to apply to another pattern.
- * @tags combiners, functional
 * @param {Pattern} pat
- * @param {Pattern} lookup a pattern of indices or names
- * @param {function[] | object} lookup the array or lookup object of functions from which to pull
+ * @param {Pattern} lookup a pattern of indices
+ * @param {function[]} funcs the array of functions from which to pull
 * @returns {Pattern}
 * @example
 * s("bd [rim hh]").pickF("<0 1 2>", [rev,jux(rev),fast(2)])
 * @example
 * note("<c2 d2>(3,8)").s("square")
- * .pickF("<0 2> 1", [jux(rev), fast(2), x=>x.lpf(800)])
- * @example
- * note("<c2 d2>(3,8)").s("square")
- * .pickF("<jr l> f", { jr:jux(rev), f:fast(2), l:x=>x.lpf(800) })
+ *     .pickF("<0 2> 1", [jux(rev),fast(2),x=>x.lpf(800)])
 */
-export const pickF = register('pickF', function (pickPattern, lookup, pat) {
-  return pat.apply(pick(lookup, pickPattern));
+export const pickF = register('pickF', function (lookup, funcs, pat) {
+  return pat.apply(pick(lookup, funcs));
 });

 /** * The same as `pickF`, but if you pick a number greater than the size of the functions list,
 * it wraps around, rather than sticking at the maximum value.
- * @tags combiners
 * @param {Pattern} pat
- * @param {Pattern} lookup a pattern of indices or names
- * @param {function[] | object} lookup the array or lookup object of functions from which to pull
+ * @param {Pattern} lookup a pattern of indices
+ * @param {function[]} funcs the array of functions from which to pull
 * @returns {Pattern}
 */
-export const pickmodF = register('pickmodF', function (pickPattern, lookup, pat) {
-  return pat.apply(pickmod(lookup, pickPattern));
+export const pickmodF = register('pickmodF', function (lookup, funcs, pat) {
+  return pat.apply(pickmod(lookup, funcs));
 });

 /** * Similar to `pick`, but it applies an outerJoin instead of an innerJoin.
- * @tags combiners
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
- * @example
- * note("<0*4 1 2*2 3*3>".pickOut(["g a", "e f", "f g f g" , "g c d"]))
 */
 export const pickOut = register('pickOut', function (lookup, pat) {
  return _pick(lookup, pat, false).outerJoin();
@@ -113,7 +103,6 @@ export const pickOut = register('pickOut', function (lookup, pat) {

 /** * The same as `pickOut`, but if you pick a number greater than the size of the list,
 * it wraps around, rather than sticking at the maximum value.
- * @tags combiners
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -123,7 +112,6 @@ export const pickmodOut = register('pickmodOut', function (lookup, pat) {
 });

 /** * Similar to `pick`, but the choosen pattern is restarted when its index is triggered.
- * @tags combiners
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -134,7 +122,6 @@ export const pickRestart = register('pickRestart', function (lookup, pat) {

 /** * The same as `pickRestart`, but if you pick a number greater than the size of the list,
   * it wraps around, rather than sticking at the maximum value.
-   * @tags combiners
   * @param {Pattern} pat
   * @param {*} xs
   * @returns {Pattern}
@@ -151,7 +138,6 @@ export const pickmodRestart = register('pickmodRestart', function (lookup, pat)
 });

 /** * Similar to `pick`, but the choosen pattern is reset when its index is triggered.
- * @tags combiners
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -162,7 +148,6 @@ export const pickReset = register('pickReset', function (lookup, pat) {

 /** * The same as `pickReset`, but if you pick a number greater than the size of the list,
 * it wraps around, rather than sticking at the maximum value.
- * @tags combiners
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -172,22 +157,19 @@ export const pickmodReset = register('pickmodReset', function (lookup, pat) {
 });

 /** Picks patterns (or plain values) either from a list (by index) or a lookup table (by name).
- * Similar to `pick`, but cycles are squeezed into the target ('inhabited') pattern.
- * @name inhabit
- * @tags combiners
- * @synonyms pickSqueeze
- * @param {Pattern} pat
- * @param {*} xs
- * @returns {Pattern}
- * @example
- * let a = s("bd(3,8)")
- * let b = s("cp sd")
- * "<a b [a,b]>".inhabit({ a, b })
- * @example
- * s("a@2 [a b] a"
- * .inhabit({a: "bd(3,8)", b: "sd sd"}))
- * .slow(4)
- */
+   * Similar to `pick`, but cycles are squeezed into the target ('inhabited') pattern.
+   * @name inhabit
+   * @synonyms pickSqueeze
+   * @param {Pattern} pat
+   * @param {*} xs
+   * @returns {Pattern}
+   * @example
+   * "<a b [a,b]>".inhabit({a: s("bd(3,8)"),
+                            b: s("cp sd")
+                           })
+   * @example
+   * s("a@2 [a b] a".inhabit({a: "bd(3,8)", b: "sd sd"})).slow(4)
+   */
 export const { inhabit, pickSqueeze } = register(['inhabit', 'pickSqueeze'], function (lookup, pat) {
  return _pick(lookup, pat, false).squeezeJoin();
 });
@@ -198,7 +180,6 @@ export const { inhabit, pickSqueeze } = register(['inhabit', 'pickSqueeze'], fun
 * second one.
 * @name inhabitmod
 * @synonyms pickmodSqueeze
- * @tags combiners
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -211,7 +192,6 @@ export const { inhabitmod, pickmodSqueeze } = register(['inhabitmod', 'pickmodSq
 /**
 * Pick from the list of values (or patterns of values) via the index using the given
 * pattern of integers. The selected pattern will be compressed to fit the duration of the selecting event
- * @tags combiners
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
@@ -2,20 +2,12 @@ import { NeoCyclist } from './neocyclist.mjs';
 import { Cyclist } from './cyclist.mjs';
 import { evaluate as _evaluate } from './evaluate.mjs';
 import { errorLogger, logger } from './logger.mjs';
-import {
-  setCpsFunc,
-  setIsStarted,
-  setPattern as exposeSchedulerPattern,
-  setTime,
-  setScheduleFunc,
-  setClockTime,
-} from './schedulerState.mjs';
+import { setTime } from './time.mjs';
 import { evalScope } from './evaluate.mjs';
 import { register, Pattern, isPattern, silence, stack } from './pattern.mjs';
 import { reset_state } from './impure.mjs';

 export function repl({
-  onSchedule,
  defaultOutput,
  onEvalError,
  beforeEval,
@@ -32,11 +24,6 @@ export function repl({
  id,
  mondo = false,
 }) {
-  if (defaultOutput) {
-    throw new Error(
-      'defaultOutput has been removed. use onSchedule(hap, time, cps) instead. see https://codeberg.org/uzu/strudel/pulls/2138/',
-    );
-  }
  const state = {
    schedulerError: undefined,
    evalError: undefined,
@@ -61,11 +48,10 @@ export function repl({
  };

  const schedulerOptions = {
-    onSchedule: getSchedule({ onSchedule }),
+    onTrigger: getTrigger({ defaultOutput, getTime }),
    getTime,
    onToggle: (started) => {
      updateState({ started });
-      setIsStarted(started);
      onToggle?.(started);
      if (!started) {
        reset_state();
@@ -79,8 +65,6 @@ export function repl({
  // NeoCyclist uses a shared worker to communicate between instances, which is not supported on mobile chrome
  const scheduler =
    sync && typeof SharedWorker != 'undefined' ? new NeoCyclist(schedulerOptions) : new Cyclist(schedulerOptions);
-  setScheduleFunc(schedulerOptions.onSchedule);
-  setCpsFunc(() => scheduler.cps);
  let pPatterns = {};
  let anonymousIndex = 0;
  let allTransform;
@@ -105,11 +89,9 @@ export function repl({
  const setPattern = async (pattern, autostart = true) => {
    pattern = editPattern?.(pattern) || pattern;
    await scheduler.setPattern(pattern, autostart);
-    exposeSchedulerPattern(pattern);
    return pattern;
  };
  setTime(() => scheduler.now()); // TODO: refactor?
-  setClockTime(() => scheduler.getTime()); // TODO: refactor?

  const stop = () => scheduler.stop();
  const start = () => scheduler.start();
@@ -124,7 +106,6 @@ export function repl({
   * Changes the global tempo to the given cycles per minute
   *
   * @name setcpm
-   * @tags temporal
   * @alias setCpm
   * @param {number} cpm cycles per minute
   * @example
@@ -138,14 +119,8 @@ export function repl({

  // TODO - not documented as jsdoc examples as the test framework doesn't simulate enough context for `each` and `all`..

-  let allTransforms = [];
-  /**
-   * Applies a function to all the running patterns. Note that the patterns are grouped together into a single `stack` before the function is applied. This is probably what you want, but see `each` for
+  /** Applies a function to all the running patterns. Note that the patterns are groups together into a single `stack` before the function is applied. This is probably what you want, but see `each` for
   * a version that applies the function to each pattern separately.
-   *
-   * **Note:** Patterns must be labeled (e.g. with `$:`) to be picked up by `all`. An unlabeled
-   * pattern such as `note("c4")` is not registered and will produce no audio when `all` is present.
-   * Use `$: note("c4")` instead.
   * ```
   * $: sound("bd - cp sd")
   * $: sound("hh*8")
@@ -156,24 +131,18 @@ export function repl({
   * $: sound("hh*8")
   * all(x => x.pianoroll())
   * ```
-   *
-   * @tags combiners
   */
+  let allTransforms = [];
  const all = function (transform) {
    allTransforms.push(transform);
    return silence;
  };
  /** Applies a function to each of the running patterns separately. This is intended for future use with upcoming 'stepwise' features. See `all` for a version that applies the function to all the patterns stacked together into a single pattern.
-   *
-   * **Note:** Patterns must be labeled (e.g. with `$:`) to be picked up by `each`. An unlabeled
-   * pattern such as `note("c4")` is not registered and will produce no audio when `each` is present.
-   * Use `$: note("c4")` instead.
   * ```
   * $: sound("bd - cp sd")
   * $: sound("hh*8")
   * each(fast("<2 3>"))
   * ```
-   * @tags combiners
   */
  const each = function (transform) {
    eachTransform = transform;
@@ -240,7 +209,6 @@ export function repl({
      updateState({ code, pending: true });
      await injectPatternMethods();
      setTime(() => scheduler.now()); // TODO: refactor?
-      setClockTime(() => scheduler.getTime()); // TODO: refactor?
      await beforeEval?.({ code });
      allTransforms = []; // reset all transforms
      shouldHush && hush();
@@ -282,20 +250,17 @@ export function repl({
      if (!isPattern(pattern)) {
        pattern = silence;
      }
-
      logger(`[eval] code updated`);
      pattern = await setPattern(pattern, autostart);
      updateState({
        miniLocations: meta?.miniLocations || [],
        widgets: meta?.widgets || [],
-        sliders: meta?.sliders || [],
        activeCode: code,
        pattern,
        evalError: undefined,
        schedulerError: undefined,
        pending: false,
      });
-
      afterEval?.({ code, pattern, meta });
      return pattern;
    } catch (err) {
@@ -305,22 +270,24 @@ export function repl({
      onEvalError?.(err);
    }
  };
-
  const setCode = (code) => updateState({ code });
  return { scheduler, evaluate, start, stop, pause, setCps, setPattern, setCode, toggle, state };
 }

-export const getSchedule =
-  ({ onSchedule }) =>
-  async (hap, t, cps) => {
+export const getTrigger =
+  ({ getTime, defaultOutput }) =>
+  async (hap, deadline, duration, cps, t) => {
+    //   ^ this signature is different from hap.context.onTrigger, as set by Pattern.onTrigger(onTrigger)
+    // TODO: get rid of deadline after https://codeberg.org/uzu/strudel/pulls/1004
    try {
-      if (!hap.context.onSchedule || !hap.context.dominantSchedule) {
-        await onSchedule(hap, t, cps);
+      if (!hap.context.onTrigger || !hap.context.dominantTrigger) {
+        await defaultOutput(hap, deadline, duration, cps, t);
      }
-      if (hap.context.onSchedule) {
-        await hap.context.onSchedule(hap, t, cps);
+      if (hap.context.onTrigger) {
+        // call signature of output / onTrigger is different...
+        await hap.context.onTrigger(hap, getTime(), cps, t);
      }
    } catch (err) {
-      errorLogger(err, 'getSchedule');
+      errorLogger(err, 'getTrigger');
    }
  };
@@ -1,81 +0,0 @@
-/*
-schedulerState.mjs - Module to pipe out various parameters from the scheduler for global consumption
-Copyright (C) 2026 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/schedulerState.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-let time;
-let cpsFunc;
-let pattern;
-let scheduleFunc;
-let isStarted;
-
-/**
- * @name getTime
- * @tags internals
- * @returns {Number} the current cycle time as a number
- */
-export function getTime() {
-  if (!time) {
-    throw new Error('no time set! use setTime to define a time source');
-  }
-  return time();
-}
-
-export function setTime(func) {
-  time = func;
-}
-
-let clockTime;
-/**
- * @name getClockTime
- * @tags internals
- * @returns {Number} the current clock time in seconds (onSchedule time)
- */
-export function getClockTime() {
-  if (!clockTime) {
-    throw new Error('no clockTime set! use setClockTime to define a time source');
-  }
-  return clockTime();
-}
-
-export function setClockTime(func) {
-  clockTime = func;
-}
-
-export function setCpsFunc(func) {
-  cpsFunc = func;
-}
-
-/**
- * @name getCps
- * @tags internals
- * @returns {Number} the current cycles per second
- */
-export function getCps() {
-  return cpsFunc?.();
-}
-
-export function setPattern(pat) {
-  pattern = pat;
-}
-
-export function getPattern() {
-  return pattern;
-}
-
-export function setScheduleFunc(func) {
-  scheduleFunc = func;
-}
-
-export function getScheduleFunc() {
-  return scheduleFunc;
-}
-
-export function setIsStarted(val) {
-  isStarted = !!val;
-}
-
-export function getIsStarted() {
-  return isStarted;
-}
@@ -5,8 +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, pure, register, reify, silence, stack, sequenceP, isPattern } from './pattern.mjs';
-import { _mod } from './util.mjs';
+import { Pattern, fastcat, pure, register, reify, silence, stack, sequenceP } from './pattern.mjs';
 import Fraction from './fraction.mjs';

 import { id, keyAlias, getCurrentKeyboardState } from './util.mjs';
@@ -16,24 +15,6 @@ export function steady(value) {
  return new Pattern((state) => [new Hap(undefined, state.span, value)]);
 }

-/**
- * Creates a signal given by the input function
- *
- * @name signal
- * @param {*} func
- * @returns {Pattern} signal
- * @tags generators
- * @example
- * // sawtooth signal definition
- * signal(t=>t%1).segment(16).range(30,40).note()
- * @example
- * signal(t=>Math.pow(t,2)%1).range(40, 60).add(5).segment(16)
- * .off(0, x=>x.add(7))
- * .note()
- * .s("gm_electric_guitar_jazz,gm_epiano")
- *   .gain(1.7)
- * .pianoroll()
- */
 export const signal = (func) => {
  const query = (state) => [new Hap(undefined, state.span, func(state.span.begin, state.controls))];
  return new Pattern(query);
@@ -43,7 +24,6 @@ export const signal = (func) => {
 *  A sawtooth signal between 0 and 1.
 *
 * @return {Pattern}
- * @tags generators
 * @example
 * note("<c3 [eb3,g3] g2 [g3,bb3]>*8")
 * .clip(saw.slow(2))
@@ -52,13 +32,12 @@ export const signal = (func) => {
 * .scale('C major')
 *
 */
-export const saw = signal((t) => _mod(t, 1));
+export const saw = signal((t) => t % 1);

 /**
 *  A sawtooth signal between -1 and 1 (like `saw`, but bipolar).
 *
 * @return {Pattern}
- * @tags generators
 */
 export const saw2 = saw.toBipolar();

@@ -66,7 +45,6 @@ export const saw2 = saw.toBipolar();
 *  A sawtooth signal between 1 and 0 (like `saw`, but flipped).
 *
 * @return {Pattern}
- * @tags generators
 * @example
 * note("<c3 [eb3,g3] g2 [g3,bb3]>*8")
 * .clip(isaw.slow(2))
@@ -75,13 +53,12 @@ export const saw2 = saw.toBipolar();
 * .scale('C major')
 *
 */
-export const isaw = signal((t) => 1 - _mod(t, 1));
+export const isaw = signal((t) => 1 - (t % 1));

 /**
 *  A sawtooth signal between 1 and -1 (like `saw2`, but flipped).
 *
 * @return {Pattern}
- * @tags generators
 */
 export const isaw2 = isaw.toBipolar();

@@ -89,14 +66,12 @@ export const isaw2 = isaw.toBipolar();
 *  A sine signal between -1 and 1 (like `sine`, but bipolar).
 *
 * @return {Pattern}
- * @tags generators
 */
 export const sine2 = signal((t) => Math.sin(Math.PI * 2 * t));

 /**
 *  A sine signal between 0 and 1.
 * @return {Pattern}
- * @tags generators
 * @example
 * n(sine.segment(16).range(0,15))
 * .scale("C:minor")
@@ -108,7 +83,6 @@ export const sine = sine2.fromBipolar();
 *  A cosine signal between 0 and 1.
 *
 * @return {Pattern}
- * @tags generators
 * @example
 * n(stack(sine,cosine).segment(16).range(0,15))
 * .scale("C:minor")
@@ -120,49 +94,29 @@ export const cosine = sine._early(Fraction(1).div(4));
 *  A cosine signal between -1 and 1 (like `cosine`, but bipolar).
 *
 * @return {Pattern}
- * @tags generators
 */
 export const cosine2 = sine2._early(Fraction(1).div(4));

 /**
 *  A square signal between 0 and 1.
 * @return {Pattern}
- * @tags generators
 * @example
 * n(square.segment(4).range(0,7)).scale("C:minor")
 *
 */
-export const square = signal((t) => Math.floor(_mod(t * 2, 2)));
+export const square = signal((t) => Math.floor((t * 2) % 2));

 /**
 *  A square signal between -1 and 1 (like `square`, but bipolar).
 *
 * @return {Pattern}
- * @tags generators
 */
 export const square2 = square.toBipolar();

-/**
- *  A square signal between 1 and 0 (like `square` but flipped).
- *
- * @return {Pattern}
- * @tags generators
- */
-export const isquare = signal((t) => 1 - Math.floor(_mod(t * 2, 2)));
-
-/**
- *  A square signal between 1 and -1 (like `isquare`, but bipolar).
- *
- * @return {Pattern}
- * @tags generators
- */
-export const isquare2 = isquare.toBipolar();
-
 /**
 *  A triangle signal between 0 and 1.
 *
 * @return {Pattern}
- * @tags generators
 * @example
 * n(tri.segment(8).range(0,7)).scale("C:minor")
 *
@@ -173,7 +127,6 @@ export const tri = fastcat(saw, isaw);
 *  A triangle signal between -1 and 1 (like `tri`, but bipolar).
 *
 * @return {Pattern}
- * @tags generators
 */
 export const tri2 = fastcat(saw2, isaw2);

@@ -181,7 +134,6 @@ export const tri2 = fastcat(saw2, isaw2);
 *  An inverted triangle signal between 1 and 0 (like `tri`, but flipped).
 *
 * @return {Pattern}
- * @tags generators
 * @example
 * n(itri.segment(8).range(0,7)).scale("C:minor")
 *
@@ -192,7 +144,6 @@ export const itri = fastcat(isaw, saw);
 *  An inverted triangle signal between -1 and 1 (like `itri`, but bipolar).
 *
 * @return {Pattern}
- * @tags generators
 */
 export const itri2 = fastcat(isaw2, saw2);

@@ -200,16 +151,13 @@ export const itri2 = fastcat(isaw2, saw2);
 *  A signal representing the cycle time.
 *
 * @return {Pattern}
- * @tags generators
 */
 export const time = signal(id);

 /**
 *  The mouse's x position value ranges from 0 to 1.
 * @name mousex
- * @synonyms mouseX
 * @return {Pattern}
- * @tags external_io
 * @example
 * n(mousex.segment(4).range(0,7)).scale("C:minor")
 *
@@ -218,9 +166,7 @@ export const time = signal(id);
 /**
 *  The mouse's y position value ranges from 0 to 1.
 * @name mousey
- * @synonyms mouseY
 * @return {Pattern}
- * @tags external_io
 * @example
 * n(mousey.segment(4).range(0,7)).scale("C:minor")
 *
@@ -323,7 +269,6 @@ export const getRandsAtTime = (t, n = 1, seed = 0) => {
 * precise RNG, try `useRNG('precise')`.
 *
 * @name useRNG
- * @tags generators, math
 * @param {string} mod - Mode. One of 'legacy', 'precise'
 * @example
 * useRNG('legacy')
@@ -335,7 +280,6 @@ export const useRNG = (mode = 'legacy') => (RNG_MODE = mode);

 /**
 * A discrete pattern of numbers from 0 to n-1
- * @tags generators
 * @example
 * n(run(4)).scale("C4:pentatonic")
 * // n("0 1 2 3").scale("C4:pentatonic")
@@ -346,14 +290,13 @@ export const run = (n) => saw.range(0, n).round().segment(n);
 * Creates a binary pattern from a number.
 *
 * @name binary
- * @tags generators
 * @param {number} n - input number to convert to binary
 * @example
 * "hh".s().struct(binary(5))
 * // "hh".s().struct("1 0 1")
 */
 export const binary = (n) => {
-  const nBits = reify(n).log2().floor().add(1);
+  const nBits = reify(n).log2(0).floor().add(1);
  return binaryN(n, nBits);
 };

@@ -361,7 +304,6 @@ export const binary = (n) => {
 * Creates a binary pattern from a number, padded to n bits long.
 *
 * @name binaryN
- * @tags generators
 * @param {number} n - input number to convert to binary
 * @param {number} nBits - pattern length, defaults to 16
 * @example
@@ -379,13 +321,12 @@ export const binaryN = (n, nBits = 16) => {
 * Creates a binary list pattern from a number.
 *
 * @name binaryL
- * @tags generators
 * @param {number} n - input number to convert to binary
 * s("saw").seg(8)
 *   .partials(binaryL(irand(4096).add(1)))
 */
 export const binaryL = (n) => {
-  const nBits = reify(n).log2().floor().add(1);
+  const nBits = reify(n).log2(0).floor().add(1);
  return binaryNL(n, nBits);
 };

@@ -393,7 +334,6 @@ export const binaryL = (n) => {
 * Creates a binary list pattern from a number, padded to n bits long.
 *
 * @name binaryNL
- * @tags generators
 * @param {number} n - input number to convert to binary
 * @param {number} nBits - pattern length, defaults to 16
 */
@@ -413,7 +353,6 @@ export const binaryNL = (n, nBits = 16) => {
 * Creates a list of random numbers of the given length
 *
 * @name randL
- * @tags generators
 * @param {number} n Number of random numbers to sample
 * @example
 * s("saw").seg(16).n(irand(12)).scale("F1:minor")
@@ -426,14 +365,12 @@ export const randL = (n) => {
 export const randrun = (n) => {
  return signal((t, controls) => {
    // Without adding 0.5, the first cycle is always 0,1,2,3,...
-    let rands = getRandsAtTime(t.floor().add(0.5), n, controls.randSeed);
-    // Support n = 1
-    if (!Array.isArray(rands)) rands = [rands];
+    const rands = getRandsAtTime(t.floor().add(0.5), n, controls.randSeed);
    const nums = rands
      .map((n, i) => [n, i])
      .sort((a, b) => (a[0] > b[0]) - (a[0] < b[0]))
      .map((x) => x[1]);
-    const i = _mod(t.cyclePos().mul(n).floor(), n);
+    const i = t.cyclePos().mul(n).floor() % n;
    return nums[i];
  })._segment(n);
 };
@@ -447,7 +384,6 @@ const _rearrangeWith = (ipat, n, pat) => {
 * Slices a pattern into the given number of parts, then plays those parts in random order.
 * Each part will be played exactly once per cycle.
 * @name shuffle
- * @tags temporal
 * @example
 * note("c d e f").sound("piano").shuffle(4)
 * @example
@@ -461,7 +397,6 @@ export const shuffle = register('shuffle', (n, pat) => {
 * Slices a pattern into the given number of parts, then plays those parts at random. Similar to `shuffle`,
 * but parts might be played more than once, or not at all, per cycle.
 * @name scramble
- * @tags temporal
 * @example
 * note("c d e f").sound("piano").scramble(4)
 * @example
@@ -474,7 +409,6 @@ export const scramble = register('scramble', (n, pat) => {
 /**
 * Modify a pattern by applying a function to the `randomSeed` control if present
 *
- * @tags math
 * @param {Function} func Function from seed (or undefined) to seed (or undefined)
 * @param {Pattern} pat Pattern to update
 * @returns Pattern
@@ -494,7 +428,6 @@ export const withSeed = (func, pat) => {
 * that use randomness, like `shuffle` and `sometimes`.
 *
 * @name seed
- * @tags math
 * @param {number} n A new seed. Can be any number.
 * @example
 * $: s("hh*4").degrade();
@@ -508,7 +441,6 @@ export const seed = register('seed', (n, pat) => {
 * A continuous pattern of random numbers, between 0 and 1.
 *
 * @name rand
- * @tags generators
 * @example
 * // randomly change the cutoff
 * s("bd*4,hh*8").cutoff(rand.range(500,8000))
@@ -517,7 +449,6 @@ export const seed = register('seed', (n, pat) => {
 export const rand = signal((t, controls) => getRandsAtTime(t, 1, controls.randSeed));
 /**
 * A continuous pattern of random numbers, between -1 and 1
- * @tags generators
 */
 export const rand2 = rand.toBipolar();

@@ -527,7 +458,6 @@ export const _brandBy = (p) => rand.fmap((x) => x < p);
 * A continuous pattern of 0 or 1 (binary random), with a probability for the value being 1
 *
 * @name brandBy
- * @tags generators
 * @param {number} probability - a number between 0 and 1
 * @example
 * s("hh*10").pan(brandBy(0.2))
@@ -538,7 +468,6 @@ export const brandBy = (pPat) => reify(pPat).fmap(_brandBy).innerJoin();
 * A continuous pattern of 0 or 1 (binary random)
 *
 * @name brand
- * @tags generators
 * @example
 * s("hh*10").pan(brand)
 */
@@ -550,7 +479,6 @@ export const _irand = (i) => rand.fmap((x) => Math.trunc(x * i));
 * A continuous pattern of random integers, between 0 and n-1.
 *
 * @name irand
- * @tags generators
 * @param {number} n max value (exclusive)
 * @example
 * // randomly select scale notes from 0 - 7 (= C to C)
@@ -573,15 +501,11 @@ export const __chooseWith = (pat, xs) => {
 /**
 * Choose from the list of values (or patterns of values) using the given
 * pattern of numbers, which should be in the range of 0..1
- * @tags temporal
 * @param {Pattern} pat
 * @param {*} xs
 * @returns {Pattern}
 * @example
 * note("c2 g2!2 d2 f1").s(chooseWith(sine.fast(2), ["sawtooth", "triangle", "bd:6"]))
- * @example
- * // Compare with chooseInWith
- * note(chooseWith("<0 0.5 1>*3", ["c3", "b3", "d3"]))
 */
 export const chooseWith = (pat, xs) => {
  return __chooseWith(pat, xs).outerJoin();
@@ -590,16 +514,8 @@ export const chooseWith = (pat, xs) => {
 /**
 * As with {chooseWith}, but the structure comes from the chosen values, rather
 * than the pattern you're using to choose with.
- * @tags temporal
 * @param {Pattern} pat
 * @param {*} xs
- * @example
- * // Because the structure comes from the chosen values (the notes, here)
- * // The choosing pattern will only advance once per cycle (not 3 times per cycle)
- * note(chooseInWith("<0 0.5 1>*3", ["c3", "b3", "d3"]))
- * @example
- * // Here, the chosen values have a structure such that the choosing pattern will advance 3 times per cycle
- * note(chooseInWith("<0 0.5 1>*3", ["c3*3", "b3*3", "d3*3"]))
 * @returns {Pattern}
 */
 export const chooseInWith = (pat, xs) => {
@@ -608,7 +524,6 @@ export const chooseInWith = (pat, xs) => {

 /**
 * Chooses randomly from the given list of elements.
- * @tags temporal
 * @param  {...any} xs values / patterns to choose from.
 * @returns {Pattern} - a continuous pattern.
 * @example
@@ -616,13 +531,14 @@ export const chooseInWith = (pat, xs) => {
 */
 export const choose = (...xs) => chooseWith(rand, xs);

+// todo: doc
 export const chooseIn = (...xs) => chooseInWith(rand, xs);
+export const chooseOut = choose;

 /**
 * Chooses from the given list of values (or patterns of values), according
 * to the pattern that the method is called on. The pattern should be in
 * the range 0 .. 1.
- * @tags temporal
 * @param  {...any} xs
 * @returns {Pattern}
 */
@@ -633,7 +549,6 @@ Pattern.prototype.choose = function (...xs) {
 /**
 * As with choose, but the pattern that this method is called on should be
 * in the range -1 .. 1
- * @tags temporal
 * @param  {...any} xs
 * @returns {Pattern}
 */
@@ -643,7 +558,6 @@ Pattern.prototype.choose2 = function (...xs) {

 /**
 * Picks one of the elements at random each cycle.
- * @tags temporal
 * @synonyms randcat
 * @returns {Pattern}
 * @example
@@ -686,7 +600,6 @@ const wchooseWith = (...args) => _wchooseWith(...args).outerJoin();

 /**
 * Chooses randomly from the given list of elements by giving a probability to each element
- * @tags temporal
 * @param {...any} pairs arrays of value and weight
 * @returns {Pattern} - a continuous pattern.
 * @example
@@ -696,7 +609,6 @@ export const wchoose = (...pairs) => wchooseWith(rand, ...pairs);

 /**
 * Picks one of the elements at random each cycle by giving a probability to each element
- * @tags temporal
 * @synonyms wrandcat
 * @returns {Pattern}
 * @example
@@ -740,7 +652,6 @@ function _berlin(t, seed = 0) {
 /**
 * Generates a continuous pattern of [perlin noise](https://en.wikipedia.org/wiki/Perlin_noise), in the range 0..1.
 *
- * @tags generators
 * @name perlin
 * @example
 * // randomly change the cutoff
@@ -753,7 +664,6 @@ export const perlin = signal((t, controls) => _perlin(t, controls.randSeed));
 * Generates a continuous pattern of [berlin noise](conceived by Jame Coyne and Jade Rowland as a joke but turned out to be surprisingly cool and useful,
 * like perlin noise but with sawtooth waves), in the range 0..1.
 *
- * @tags generators
 * @name berlin
 * @example
 * // ascending arpeggios
@@ -762,37 +672,18 @@ export const perlin = signal((t, controls) => _perlin(t, controls.randSeed));
 */
 export const berlin = signal((t, controls) => _berlin(t, controls.randSeed));

-/**
- * `degradeByWith` is like `degradeBy`, but with control over the random or other signal used to filter out the events.
- *
- * `degradeBy(x)` is essentially `degradeByWith(rand, x)`
- *
- * This allows you to do things other than with `rand`, see examples below
- *
- * @name degradeByWith
- * @param {Pattern|number} test
- * @param {Pattern|number} testAgainst
- * @memberof Pattern
- * @tags temporal
- * @returns {Pattern}
- * @example
- * note("c a f e").degradeByWith(sine, .1)
- * @example
- * note("c a f e").degradeByWith(perlin, .5)
- * @example
- * note("c a f e").degradeByWith(sine, cosine)
- */
-export const degradeByWith = register('degradeByWith', (withPat, x, pat) => {
-  if (!isPattern(withPat)) withPat = pure(withPat);
-  return pat.fmap((a) => (_) => a).appLeft(withPat.filterValues((v) => v > x));
-});
+export const degradeByWith = register(
+  'degradeByWith',
+  (withPat, x, pat) => pat.fmap((a) => (_) => a).appLeft(withPat.filterValues((v) => v > x)),
+  true,
+  true,
+);

 /**
 * Randomly removes events from the pattern by a given amount.
 * 0 = 0% chance of removal
 * 1 = 100% chance of removal
 *
- * @tags temporal
 * @name degradeBy
 * @memberof Pattern
 * @param {number} amount - a number between 0 and 1
@@ -818,7 +709,6 @@ export const degradeBy = register(
 *
 * Randomly removes 50% of events from the pattern. Shorthand for `.degradeBy(0.5)`
 *
- * @tags temporal
 * @name degrade
 * @memberof Pattern
 * @returns Pattern
@@ -835,7 +725,6 @@ export const degrade = register('degrade', (pat) => pat._degradeBy(0.5), true, t
 * 1 = 0% chance of removal
 * Events that would be removed by degradeBy are let through by undegradeBy and vice versa (see second example).
 *
- * @tags temporal
 * @name undegradeBy
 * @memberof Pattern
 * @param {number} amount - a number between 0 and 1
@@ -864,7 +753,6 @@ export const undegradeBy = register(
 * Inverse of `degrade`: Randomly removes 50% of events from the pattern. Shorthand for `.undegradeBy(0.5)`
 * Events that would be removed by degrade are let through by undegrade and vice versa (see second example).
 *
- * @tags temporal
 * @name undegrade
 * @memberof Pattern
 * @returns Pattern
@@ -883,7 +771,6 @@ export const undegrade = register('undegrade', (pat) => pat._undegradeBy(0.5), t
 * Randomly applies the given function by the given probability.
 * Similar to `someCyclesBy`
 *
- * @tags temporal
 * @name sometimesBy
 * @memberof Pattern
 * @param {number | Pattern} probability - a number between 0 and 1
@@ -903,7 +790,6 @@ export const sometimesBy = register('sometimesBy', function (patx, func, pat) {
 *
 * Applies the given function with a 50% chance
 *
- * @tags temporal
 * @name sometimes
 * @memberof Pattern
 * @param {function} function - the transformation to apply
@@ -925,7 +811,6 @@ export const sometimes = register('sometimes', function (func, pat) {
 * @param {number | Pattern} probability - a number between 0 and 1
 * @param {function} function - the transformation to apply
 * @returns Pattern
- * @tags temporal
 * @example
 * s("bd,hh*8").someCyclesBy(.3, x=>x.speed("0.5"))
 */
@@ -948,7 +833,6 @@ export const someCyclesBy = register('someCyclesBy', function (patx, func, pat)
 * @name someCycles
 * @memberof Pattern
 * @returns Pattern
- * @tags temporal
 * @example
 * s("bd,hh*8").someCycles(x=>x.speed("0.5"))
 */
@@ -963,7 +847,6 @@ export const someCycles = register('someCycles', function (func, pat) {
 * @name often
 * @memberof Pattern
 * @returns Pattern
- * @tags temporal
 * @example
 * s("hh*8").often(x=>x.speed("0.5"))
 */
@@ -978,7 +861,6 @@ export const often = register('often', function (func, pat) {
 * @name rarely
 * @memberof Pattern
 * @returns Pattern
- * @tags temporal
 * @example
 * s("hh*8").rarely(x=>x.speed("0.5"))
 */
@@ -990,7 +872,6 @@ export const rarely = register('rarely', function (func, pat) {
 *
 * Shorthand for `.sometimesBy(0.1, fn)`
 *
- * @tags temporal
 * @name almostNever
 * @memberof Pattern
 * @returns Pattern
@@ -1005,7 +886,6 @@ export const almostNever = register('almostNever', function (func, pat) {
 *
 * Shorthand for `.sometimesBy(0.9, fn)`
 *
- * @tags temporal
 * @name almostAlways
 * @memberof Pattern
 * @returns Pattern
@@ -1020,7 +900,6 @@ export const almostAlways = register('almostAlways', function (func, pat) {
 *
 * Shorthand for `.sometimesBy(0, fn)` (never calls fn)
 *
- * @tags temporal
 * @name never
 * @memberof Pattern
 * @returns Pattern
@@ -1035,7 +914,6 @@ export const never = register('never', function (_, pat) {
 *
 * Shorthand for `.sometimesBy(1, fn)` (always calls fn)
 *
- * @tags temporal
 * @name always
 * @memberof Pattern
 * @returns Pattern
@@ -1064,7 +942,6 @@ export function _keyDown(keyname) {
 * Do something on a keypress, or array of keypresses
 * [Key name reference](https://developer.mozilla.org/en-US/docs/Web/API/UI_Events/Keyboard_event_key_values)
 *
- * @tags external_io
 * @name whenKey
 * @memberof Pattern
 * @returns Pattern
@@ -1081,7 +958,6 @@ export const whenKey = register('whenKey', function (input, func, pat) {
 * returns true when a key or array of keys is held
 * [Key name reference](https://developer.mozilla.org/en-US/docs/Web/API/UI_Events/Keyboard_event_key_values)
 *
- * @tags external_io
 * @name keyDown
 * @memberof Pattern
 * @returns Pattern
@@ -1099,8 +975,6 @@ export const keyDown = register('keyDown', function (pat) {
 * event durations, from the pattern that it is combined with.
 * For example `cyclesPer.struct("1 1 [1 1] 1")` would give the same as `"0.25 0.25 [0.125 0.125] 0.25"`.
 * See also its reciprocal, `per`, also known as `perCycle`.
- *
- * @tags temporal
 * @example
 * // Shorter events are lower in pitch
 * sound("saw saw [saw saw] saw")
@@ -1119,7 +993,6 @@ export const cyclesPer = new Pattern(function (state) {
 * event durations, from the pattern that it is combined with.
 * For example `per.struct("1 1 [1 1] 1")` would give the same as `"4 4 [8 8] 4"`.
 * See also its reciprocal, `cyclesPer`.
- * @tags temporal
 * @synonyms perCycle
 * @example
 * // Shorter events are more distorted
@@ -1137,32 +1010,8 @@ export const perCycle = per;
 * particular, where the event duration halves, the
 * returned value increases by one. `perx.struct("1 1 [1 [1 1]] 1")` would therefore be
 * the same as `"3 3 [4 [5 5]] 3"`.
- * @tags temporal
 */
 export const perx = new Pattern(function (state) {
  const n = Fraction(1).div(state.span.duration);
  return [new Hap(undefined, state.span, Math.log(n) / Math.log(2) + 1)];
 });
-
-/**
- * A signal that goes from `0` to `1` over one cycle, and then stays at `1` forever.
- * Mainly useful in combination with other functions that reset the cycle. See also
- * `close`.
- * @tags temporal
- * @example
- * sound("bd sd [- bd] sd".fast(2))
- *   .lpf(open.slow(4).range(300,3000)) // close envelope over 4 cycles
- *   .restart("x/4") // restart every 4 cycles
- */
-export const open = signal((t) => t.min(1));
-
-/**
- * The same as `open`, but goes from `1` to `0` over one cycle, and then
- * stays on `0` forever.
- * @tags temporal
- * @example
- * sound("bd sd [- bd] sd".fast(2))
- *   .lpf(close.slow(4).range(300,3000)) // close envelope over 4 cycles
- *   .restart("x/4") // restart every 4 cycles
- */
-export const close = signal((t) => Fraction(1).sub(t).max(0));
@@ -32,7 +32,7 @@ function triggerSpeech(words, lang, voice) {
 }

 export const speak = register('speak', function (lang, voice, pat) {
-  return pat.onSchedule((hap) => {
+  return pat.onTrigger((hap) => {
    triggerSpeech(hap.value, lang, voice);
  });
 });
@@ -29,44 +29,6 @@ describe('euclid', () => {
        .map((a) => a.showWhole(true)),
    ).toStrictEqual(['0/1 → 1/8: a', '1/4 → 3/8: a', '3/8 → 1/2: a', '5/8 → 3/4: a', '3/4 → 7/8: a']);
  });
-  it('Can create euclidLegato using negative steps', () => {
-    expect(
-      fastcat('a')
-        .euclid(3, -8)
-        .firstCycle()
-        .sort((a, b) => a.part.begin.sub(b.part.begin))
-        .map((a) => a.showWhole(true)),
-    ).toStrictEqual(
-      fastcat('a')
-        .euclidLegato(3, 8)
-        .firstCycle()
-        .sort((a, b) => a.part.begin.sub(b.part.begin))
-        .map((a) => a.showWhole(true)),
-    );
-    expect(
-      fastcat('a')
-        .euclid(5, -8)
-        .firstCycle()
-        .sort((a, b) => a.part.begin.sub(b.part.begin))
-        .map((a) => a.showWhole(true)),
-    ).toStrictEqual(
-      fastcat('a')
-        .euclidLegato(5, 8)
-        .firstCycle()
-        .sort((a, b) => a.part.begin.sub(b.part.begin))
-        .map((a) => a.showWhole(true)),
-    );
-  });
-  it('stretches over multiple cycles if pulses is greater than steps', () => {
-    expect(
-      fastcat('a')
-        .euclid(5, 4)
-        .fast(2)
-        .firstCycle()
-        .sort((a, b) => a.part.begin.sub(b.part.begin))
-        .map((a) => a.showWhole(true)),
-    ).toStrictEqual(['0/1 → 1/8: a', '1/4 → 3/8: a', '3/8 → 1/2: a', '5/8 → 3/4: a', '3/4 → 7/8: a']);
-  });
 });

 describe('euclidRot', () => {
@@ -105,45 +67,6 @@ describe('euclidLegato', () => {
        .map((a) => a.showWhole(true)),
    ).toStrictEqual(['0/1 → 1/4: a', '1/4 → 3/8: a', '3/8 → 5/8: a', '5/8 → 3/4: a', '3/4 → 1/1: a']);
  });
-  it('Can create euclid using negative steps', () => {
-    expect(
-      fastcat('a')
-        .euclidLegato(3, -8)
-        .firstCycle()
-        .sort((a, b) => a.part.begin.sub(b.part.begin))
-        .map((a) => a.showWhole(true)),
-    ).toStrictEqual(
-      fastcat('a')
-        .euclid(3, 8)
-        .firstCycle()
-        .sort((a, b) => a.part.begin.sub(b.part.begin))
-        .map((a) => a.showWhole(true)),
-    );
-    expect(
-      fastcat('a')
-        .euclidLegato(5, -8)
-        .firstCycle()
-        .sort((a, b) => a.part.begin.sub(b.part.begin))
-        .map((a) => a.showWhole(true)),
-    ).toStrictEqual(
-      fastcat('a')
-        .euclid(5, 8)
-        .firstCycle()
-        .sort((a, b) => a.part.begin.sub(b.part.begin))
-        .map((a) => a.showWhole(true)),
-    );
-  });
-  it('stretches over multiple cycles if pulses is greater than steps', () => {
-    expect(
-      fastcat('a')
-        .euclidLegato(5, 4)
-        .fast(2)
-        .firstCycle()
-        .filter((hap) => hap.hasOnset())
-        .sort((a, b) => a.part.begin.sub(b.part.begin))
-        .map((a) => a.showWhole(true)),
-    ).toStrictEqual(['0/1 → 1/4: a', '1/4 → 3/8: a', '3/8 → 5/8: a', '5/8 → 3/4: a', '3/4 → 1/1: a']);
-  });
 });

 describe('euclidLegatoRot', () => {
@@ -18,7 +18,6 @@ import {
  fastcat,
  firstOf,
  slowcat,
-  slowcatPrime,
  cat,
  sequence,
  palindrome,
@@ -46,7 +45,6 @@ import {
  rev,
  time,
  run,
-  randrun,
  binaryN,
  pick,
  stackLeft,
@@ -55,10 +53,9 @@ import {
  stepcat,
  sometimes,
  expand,
-  arp,
 } from '../index.mjs';

-import { log, logValues, stackCenter } from '../pattern.mjs';
+import { log, logValues } from '../pattern.mjs';

 import { steady } from '../signal.mjs';

@@ -75,10 +72,6 @@ const sameFirst = (a, b) => {
  return expect(a.sortHapsByPart().firstCycle()).toStrictEqual(b.sortHapsByPart().firstCycle());
 };

-const sameFirstX = (x, a, b) => {
-  return expect(a.fast(x).sortHapsByPart().firstCycle()).toStrictEqual(b.fast(x).sortHapsByPart().firstCycle());
-};
-
 describe('TimeSpan', () => {
  describe('equals()', () => {
    it('Should be equal to the same value', () => {
@@ -551,9 +544,6 @@ describe('Pattern', () => {
    });
  });
  describe('slowcat()', () => {
-    it('Can be empty', () => {
-      expect(slowcat().firstCycle()).toStrictEqual([]);
-    });
    it('Can concatenate things slowly', () => {
      expect(
        slowcat('a', 'b')
@@ -586,38 +576,6 @@ describe('Pattern', () => {
      sameFirst(slowcat('a', ['b', 'c']).fast(4), sequence('a', ['b', 'c']).fast(2));
    });
  });
-  describe('slowcatPrime()', () => {
-    it('Can be empty', () => {
-      expect(slowcatPrime().firstCycle()).toStrictEqual([]);
-    });
-    it('Can slowcat patterns swapping back and forth skipping the expected notes', () => {
-      expect(
-        slowcatPrime(fastcat(0, 1, 2, 3).slow(2), fastcat(4, 5, 6, 7).slow(2))
-          .fast(4)
-          .firstCycle()
-          .map((a) => a.value),
-      ).toStrictEqual([0, 1, 6, 7, 0, 1, 6, 7]);
-    });
-    it('Can go into negative time', () => {
-      expect(
-        slowcatPrime(fastcat(0, 1, 2, 3).slow(2), fastcat(4, 5, 6, 7).slow(2))
-          .fast(4)
-          .late(8)
-          .firstCycle()
-          .map((a) => a.value),
-      ).toStrictEqual([0, 1, 6, 7, 0, 1, 6, 7]);
-    });
-  });
-  describe('arp()', () => {
-    it('It wraps around with both positive and negative indices', () => {
-      expect(
-        stack('a', 'b', 'c')
-          .arp(fastcat(-3, -2, -1, 0, 1, 2, 3, 4))
-          .firstCycle()
-          .map((a) => a.value),
-      ).toStrictEqual(['a', 'b', 'c', 'a', 'b', 'c', 'a', 'b']);
-    });
-  });
  describe('rev()', () => {
    it('Can reverse things', () => {
      expect(
@@ -987,17 +945,6 @@ describe('Pattern', () => {
    it('Can run', () => {
      expect(run(4).firstCycle()).toStrictEqual(sequence(0, 1, 2, 3).firstCycle());
    });
-    it('Can go into negative time', () => {
-      expect(run(4).late(1).firstCycle()).toStrictEqual(sequence(0, 1, 2, 3).firstCycle());
-    });
-  });
-  describe('randrun', () => {
-    it('Can randrun', () => {
-      expect(randrun(4).firstCycle()).toStrictEqual(sequence(2, 1, 3, 0).firstCycle());
-    });
-    it('Can go into negative time', () => {
-      expect(randrun(4).late(1).firstCycle()).toStrictEqual(sequence(1, 2, 0, 3).firstCycle());
-    });
  });
  describe('binaryN', () => {
    it('Can make a binary pattern from a decimal', () => {
@@ -1219,7 +1166,6 @@ describe('Pattern', () => {
      expect(stackRight(fastcat(0, 1, 2), fastcat(3, 4))._steps).toStrictEqual(Fraction(3));
      // maybe this should double when they are either all even or all odd
      expect(stackCentre(fastcat(0, 1, 2), fastcat(3, 4))._steps).toStrictEqual(Fraction(3));
-      expect(stackCenter(fastcat(0, 1, 2), fastcat(3, 4))._steps).toStrictEqual(Fraction(3));
      expect(fastcat(0, 1).ply(3)._steps).toStrictEqual(Fraction(6));
      expect(fastcat(0, 1).setSteps(undefined).ply(3)._steps).toStrictEqual(undefined);
      expect(fastcat(0, 1).fast(3)._steps).toStrictEqual(Fraction(2));
@@ -1325,21 +1271,6 @@ describe('Pattern', () => {
      );
    });
  });
-  describe('isobite', () => {
-    it('can play a melody with a structure', () => {
-      sameFirst(
-        slowcat(0, 1, 2, 3, 4, 5).isobite(fastcat(true, silence, [true, true]).fast(2)),
-        fastcat(0, silence, [1, 2], 3, silence, [4, 5]),
-      );
-    });
-    it('syncopates over multiple cycles if the number of haps in the patterns differ', () => {
-      sameFirstX(
-        4,
-        slowcat(0, 1, 2, 3).isobite(fastcat(true, [true, true])),
-        slowcat(0, [1, 2], 3, [0, 1], 2, [3, 0], 1, [2, 3]).fast(2),
-      );
-    });
-  });
  describe('unjoin', () => {
    it('destructures a pattern into subcycles', () => {
      sameFirst(
@@ -1383,7 +1314,7 @@ describe('Pattern', () => {

      // Force a trigger
      haps.forEach((hap) => {
-        hap.context?.onSchedule?.(hap);
+        hap.context?.onTrigger?.(hap);
      });

      expect(mockConsoleLog).toHaveBeenCalledWith(
@@ -1401,7 +1332,7 @@ describe('Pattern', () => {

      // Force a trigger
      haps.forEach((hap) => {
-        hap.context?.onSchedule?.(hap);
+        hap.context?.onTrigger?.(hap);
      });

      expect(mockConsoleLog).toHaveBeenCalledWith(
@@ -8,24 +8,8 @@ import Fraction from 'fraction.js';

 import { describe, it, expect, vi } from 'vitest';

-import {
-  saw,
-  saw2,
-  isaw,
-  isaw2,
-  tri,
-  tri2,
-  itri,
-  itri2,
-  square,
-  square2,
-  isquare,
-  isquare2,
-  per,
-  perx,
-  cyclesPer,
-} from '../signal.mjs';
-import { fastcat, sequence, State, TimeSpan, Hap, note } from '../index.mjs';
+import { saw, saw2, isaw, isaw2, per, perx, cyclesPer } from '../signal.mjs';
+import { fastcat, sequence, State, TimeSpan, Hap } from '../index.mjs';

 const st = (begin, end) => new State(ts(begin, end));
 const ts = (begin, end) => new TimeSpan(Fraction(begin), Fraction(end));
@@ -40,61 +24,17 @@ const sameFirst = (a, b) => {

 describe('signal()', () => {
  it('Can make saw/saw2', () => {
-    expect(saw.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(0, 0.25, 0.5, 0.75).firstCycle());
+    expect(saw.struct(true, true, true, true).firstCycle()).toStrictEqual(
+      sequence(0, 1 / 4, 1 / 2, 3 / 4).firstCycle(),
+    );
+
    expect(saw2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(-1, -0.5, 0, 0.5).firstCycle());
  });
  it('Can make isaw/isaw2', () => {
    expect(isaw.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 0.75, 0.5, 0.25).firstCycle());
+
    expect(isaw2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 0.5, 0, -0.5).firstCycle());
  });
-  it('Can make tri/tri2', () => {
-    expect(tri.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(0, 0.5, 1, 0.5).firstCycle());
-    expect(tri2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(-1, 0, 1, 0).firstCycle());
-  });
-  it('Can make itri/itri2', () => {
-    expect(itri.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 0.5, 0, 0.5).firstCycle());
-    expect(itri2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 0, -1, 0).firstCycle());
-  });
-  it('Can make square/square2', () => {
-    expect(square.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(0, 0, 1, 1).firstCycle());
-    expect(square2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(-1, -1, 1, 1).firstCycle());
-  });
-  it('Can make isquare/isquare2', () => {
-    expect(isquare.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 1, 0, 0).firstCycle());
-    expect(isquare2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 1, -1, -1).firstCycle());
-  });
-  it('Can go into negative time', () => {
-    expect(saw.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(0, 0.25, 0.5, 0.75).firstCycle(),
-    );
-    expect(saw2.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(-1, -0.5, 0, 0.5).firstCycle(),
-    );
-    expect(isaw.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(1, 0.75, 0.5, 0.25).firstCycle(),
-    );
-    expect(isaw2.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(1, 0.5, 0, -0.5).firstCycle(),
-    );
-    expect(tri.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(0, 0.5, 1, 0.5).firstCycle(),
-    );
-    expect(tri2.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(-1, 0, 1, 0).firstCycle());
-    expect(itri.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(1, 0.5, 0, 0.5).firstCycle(),
-    );
-    expect(itri2.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 0, -1, 0).firstCycle());
-    expect(square.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(0, 0, 1, 1).firstCycle());
-    expect(square2.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(-1, -1, 1, 1).firstCycle(),
-    );
-    expect(isquare.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(1, 1, 0, 0).firstCycle(),
-    );
-    expect(isquare2.late(1).struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(1, 1, -1, -1).firstCycle(),
-    );
-  });
 });

 describe('cyclesPer', () => {
@@ -119,9 +59,3 @@ describe('perx', () => {
    );
  });
 });
-
-describe('shuffle', () => {
-  it('returns original pattern if input is 1', () => {
-    expect(note('c d e f').sound('piano').shuffle(1).firstCycle()).toEqual(note('c d e f').sound('piano').firstCycle());
-  });
-});
@@ -0,0 +1,11 @@
+let time;
+export function getTime() {
+  if (!time) {
+    throw new Error('no time set! use setTime to define a time source');
+  }
+  return time();
+}
+
+export function setTime(func) {
+  time = func;
+}
@@ -70,6 +70,17 @@ export const getEventOffsetMs = (targetTimeSeconds, currentTimeSeconds) => {
  return (targetTimeSeconds - currentTimeSeconds) * 1000;
 };

+/**
+ * @deprecated does not appear to be referenced or invoked anywhere in the codebase
+ * @noAutocomplete
+ */
+export const getFreq = (noteOrMidi) => {
+  if (typeof noteOrMidi === 'number') {
+    return midiToFreq(noteOrMidi);
+  }
+  return midiToFreq(noteToMidi(noteOrMidi));
+};
+
 const pcs = ['C', 'Db', 'D', 'Eb', 'E', 'F', 'Gb', 'G', 'Ab', 'A', 'Bb', 'B'];
 /**
 * @deprecated only used in workshop (first-notes)
@@ -119,50 +130,25 @@ export const getPlayableNoteValue = (hap) => {
  return note;
 };

-/**
- * Given a hap, returns the frequency of the note or freq, if defined
- *
- * Given a note, returns the frequency of that note
- * `getFreq('c3')`
- *
- * Given a midi note number, returns the frequency of that midi note
- * `getFreq('c3')`
- *
- * @name getFrequency
- * @tags pitch
- * @synonyms getFreq
- * @param {Hap | note | number} input
- * @returns {Number}
- * @example
- * i("4 8 9 10 - - 5 7 9 11 - -").tune("tranh3")
- * .mul(getFreq('c3'))
- * .freq().clip(.5).room(1)
- */
 export const getFrequency = (hap) => {
-  let { value, context } =
-    typeof hap == 'object'
-      ? hap
-      : // default: interpret value as midi note.
-        { value: hap, context: { type: 'note' } };
+  let { value, context } = hap;
  // if value is number => interpret as midi number as long as its not marked as frequency
  if (typeof value === 'object') {
    if (value.freq) {
      return value.freq;
    }
-    return getFreq(value.note ?? value.n ?? value.value);
+    return getFreq(value.note || value.n || value.value);
  }
  if (typeof value === 'number' && context.type !== 'frequency') {
-    value = midiToFreq(value);
+    value = midiToFreq(hap.value);
  } else if (typeof value === 'string' && isNote(value)) {
-    value = midiToFreq(noteToMidi(value));
+    value = midiToFreq(noteToMidi(hap.value));
  } else if (typeof value !== 'number') {
    throw new Error('not a note or frequency: ' + value);
  }
  return value;
 };

-export const getFreq = (hap) => getFrequency(hap);
-
 // rotate array by n steps (to the left)
 export const rotate = (arr, n) => arr.slice(n).concat(arr.slice(0, n));

@@ -353,13 +339,8 @@ export function uniqsortr(a) {

 export function unicodeToBase64(text) {
  const utf8Bytes = new TextEncoder().encode(text);
-  let binaryString = '';
-  const chunkSize = 0x8000;
-  for (let i = 0; i < utf8Bytes.length; i += chunkSize) {
-    const chunk = utf8Bytes.subarray(i, i + chunkSize);
-    binaryString += String.fromCharCode.apply(null, chunk);
-  }
-  return btoa(binaryString);
+  const base64String = btoa(String.fromCharCode(...utf8Bytes));
+  return base64String;
 }

 export function base64ToUnicode(base64String) {
@@ -23,7 +23,7 @@ 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.onSchedule((hap, targetTime) => {
+  return pat.onTrigger((hap, currentTime, _cps, targetTime) => {
    if (!_csound) {
      logger('[csound] not loaded yet', 'warning');
      return;
@@ -36,10 +36,9 @@ export const csound = register('csound', (instrument, pat) => {
    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 timeOffset = targetTime - getAudioContext().currentTime; // latency ?
+    const timeOffset = targetTime - currentTime; // latency ?
    //const timeOffset = time_deprecate - getAudioContext().currentTime
    const params = [
      `"${instrument}"`, // p1: instrument name
@@ -136,8 +135,6 @@ export async function loadOrc(url) {
 *  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.
- *
- * @tags external_io
 */
 export const csoundm = register('csoundm', (instrument, pat) => {
  let p1 = instrument;
@@ -145,7 +142,7 @@ export const csoundm = register('csoundm', (instrument, pat) => {
    p1 = `"${instrument}"`;
  }
  init(); // not async to support csound inside other patterns + to be able to call pattern methods after it
-  return pat.onSchedule((hap, targetTime) => {
+  return pat.onTrigger((hap, currentTime, _cps, targetTime) => {
    if (!_csound) {
      logger('[csound] not loaded yet', 'warning');
      return;
@@ -153,7 +150,6 @@ export const csoundm = register('csoundm', (instrument, pat) => {
    if (typeof hap.value !== 'object') {
      throw new Error('csound only support objects as hap values');
    }
-    const currentTime = getAudioContext().currentTime;
    // Time in seconds counting from now.
    const p2 = targetTime - currentTime;
    const p3 = hap.duration.valueOf() + 0;
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/csound",
-  "version": "1.3.0",
+  "version": "1.2.6",
  "description": "csound bindings for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -1,4 +1,3 @@
-import { getAudioContext } from '@strudel/webaudio/index.mjs';
 import { Invoke } from './utils.mjs';
 import { Pattern, getEventOffsetMs, noteToMidi } from '@strudel/core';

@@ -7,8 +6,7 @@ const OFF_MESSAGE = 0x80;
 const CC_MESSAGE = 0xb0;

 Pattern.prototype.midi = function (output) {
-  return this.onSchedule((hap, targetTime, cps) => {
-    const currentTime = getAudioContext().currentTime;
+  return this.onTrigger((hap, currentTime, cps, targetTime) => {
    let { note, nrpnn, nrpv, ccn, ccv, velocity = 0.9, gain = 1 } = hap.value;
    //magic number to get audio engine to line up, can probably be calculated somehow
    const latencyMs = 34;
@@ -1,14 +1,12 @@
 import { Pattern, ClockCollator } from '@strudel/core';
-import { parseControlsFromHap } from '@strudel/osc/osc.mjs';
+import { parseControlsFromHap } from 'node_modules/@strudel/osc/osc.mjs';
 import { Invoke } from './utils.mjs';
-import { getAudioContext } from '@strudel/webaudio/index.mjs';

 const collator = new ClockCollator({});

-export async function tauriOscOutput(hap, targetTime, cps = 1) {
+export async function oscTriggerTauri(hap, currentTime, cps = 1, targetTime) {
  const controls = parseControlsFromHap(hap, cps);
  const params = [];
-  const currentTime = getAudioContext().currentTime;
  const timestamp = collator.calculateTimestamp(currentTime, targetTime);

  Object.keys(controls).forEach((key) => {
@@ -34,5 +32,5 @@ export async function tauriOscOutput(hap, targetTime, cps = 1) {
  });
 }
 Pattern.prototype.osc = function () {
-  return this.onSchedule(tauriOscOutput);
+  return this.onTrigger(oscTriggerTauri);
 };
@@ -23,8 +23,6 @@
  },
  "dependencies": {
    "@strudel/core": "workspace:*",
-    "@strudel/osc": "workspace:*",
-    "@strudel/webaudio": "workspace:*",
    "@tauri-apps/api": "^2.2.0"
  },
  "homepage": "https://codeberg.org/uzu/strudel#readme",
@@ -1,69 +0,0 @@
-/*
-dough.mjs
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/osc/osc.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { register } from '@strudel/core';
-import { Dough, doughsamples } from 'dough-synth';
-import { getAudioContext, ensureMinimalOutput } from '@strudel/webaudio';
-import wasm from 'dough-synth/dough.wasm?url';
-import workletCode from 'dough-synth/dough.js?raw';
-import { hap2dough } from './lib.mjs';
-export * from './lib.mjs';
-
-Object.assign(globalThis, { doughsamples });
-
-let D;
-/**
- *
- * initializes dough ahead of time. you don't need to use this, but if you do, you can await it, so dough is ready before the pattern starts.
- *
- * @name initDough
- * @tags external_io
- * @memberof Pattern
- * @example
- * await initDough()
- * $: chord("<Dm9 Dm11 Dm7>").offset("<-1 0 1 0>").voicing()
- * .phaser(3).fm(1.4).fmh(1.01)
- * .dough()
- */
-export function initDough() {
-  if (!D || D.audioContext !== getAudioContext()) {
-    D = new Dough({
-      wasm,
-      workletCode,
-      audioContext: getAudioContext(),
-    });
-  }
-  return D.ready;
-}
-
-export async function doughOutput(hap, targetTime, cps = 1) {
-  const offset = D.context_offset?.[0];
-  if (!offset) {
-    return; // not ready
-  }
-  const t = targetTime - offset;
-  const event = hap2dough(hap, t, cps);
-  D.evaluate(event);
-}
-
-/**
- *
- * Uses dough as the audio engine. more info at https://dough.strudel.cc
- *
- * @name dough
- * @tags external_io
- * @memberof Pattern
- * @returns Pattern
- * @example
- * $: chord("<Dm9 Dm11 Dm7>").offset("<-1 0 1 0>").voicing()
- * .phaser(3).fm(1.4).fmh(1.01)
- * .dough()
- */
-export const dough = register('dough', (pat) => {
-  initDough();
-  ensureMinimalOutput();
-  return pat.onSchedule(doughOutput);
-});
@@ -1,28 +0,0 @@
-import { register, registerControl, stack, Pattern, noteToMidi } from '@strudel/core';
-
-export const { group } = registerControl('group');
-export const { voices } = registerControl('voices');
-export const { glide } = registerControl('glide');
-
-export const groupmod = register('groupmod', function (modulator, pat) {
-  const modpat = modulator
-    .withValue((vm) => pat.withValue(({ group }) => ({ ...vm, group })))
-    .outerJoin()
-    .set({ dough: 'update_group' });
-  return stack(pat.set(modulator), modpat);
-});
-Pattern.prototype.gmod = Pattern.prototype.groupmod;
-
-export function hap2dough(hap, time, cps) {
-  hap.ensureObjectValue();
-  const event = {
-    dough: 'play',
-    ...hap.value,
-    time,
-    duration: hap.duration / cps,
-  };
-  if (typeof event.note === 'string') {
-    event.note = noteToMidi(event.note);
-  }
-  return event;
-}
@@ -1,42 +0,0 @@
-{
-  "name": "@strudel/dough",
-  "version": "1.3.2",
-  "description": "dough synth integration for strudel",
-  "main": "dough.mjs",
-  "type": "module",
-  "publishConfig": {
-    "main": "dist/index.mjs"
-  },
-  "scripts": {
-    "build": "vite build",
-    "prepublishOnly": "npm run build"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://codeberg.org/uzu/strudel.git"
-  },
-  "keywords": [
-    "tidalcycles",
-    "strudel",
-    "pattern",
-    "livecoding",
-    "algorave"
-  ],
-  "author": "Felix Roos <flix91@gmail.com>",
-  "license": "AGPL-3.0-or-later",
-  "bugs": {
-    "url": "https://codeberg.org/uzu/strudel/issues"
-  },
-  "homepage": "https://codeberg.org/uzu/strudel#readme",
-  "dependencies": {
-    "@strudel/core": "workspace:*",
-    "@strudel/webaudio": "workspace:*",
-    "dough-synth": "0.4.1"
-  },
-  "devDependencies": {
-    "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
-  }
-}
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/draw",
-  "version": "1.2.6",
+  "version": "1.2.5",
  "description": "Helpers for drawing with Strudel",
  "main": "index.mjs",
  "type": "module",
@@ -42,7 +42,6 @@ const getValue = (e) => {
 *
 * @name pianoroll
 * @synonyms punchcard
- * @tags visualization
 * @param {Object} options Object containing all the optional following parameters as key value pairs:
 * @param {integer} cycles number of cycles to be displayed at the same time - defaults to 4
 * @param {number} playhead location of the active notes on the time axis - 0 to 1, defaults to 0.5
@@ -300,7 +299,6 @@ Pattern.prototype.punchcard = function (options) {
 * Supports all the same options as pianoroll.
 *
 * @name wordfall
- * @tags visualization
 */
 Pattern.prototype.wordfall = function (options) {
  return this.punchcard({ vertical: 1, labels: 1, stroke: 0, fillActive: 1, active: 'white', ...options });
@@ -54,42 +54,11 @@ export function pitchwheel({
  }

  if (edo) {
-    edo = haps.length >= 1 && haps[0].value && haps[0].value.edo ? haps[0].value.edo : edo;
-    root = haps.length >= 1 && haps[0].value && haps[0].value.root ? haps[0].value.root : root;
-    const degreeIndexes =
-      haps.length >= 1 && haps[0].value && haps[0].value.degreeIndexes ? haps[0].value.degreeIndexes : null;
-    const intLabels = haps.length >= 1 && haps[0].value && haps[0].value.intLabels ? haps[0].value.intLabels : null;
-    ctx.font = '20px sans-serif';
-    const label = `${edo} EDO`;
-    // Draw EDO label:
-    ctx.fillText(label, centerX + radius - ctx.measureText(label).width + 15, centerY + radius);
    Array.from({ length: edo }, (_, i) => {
      const angle = freq2angle(root * Math.pow(2, i / edo), root);
-
      const [x, y] = circlePos(centerX, centerY, radius, angle);
      ctx.beginPath();
-      // Draw interval label for degree i when it exists:
-      if (degreeIndexes === null || degreeIndexes.includes(i)) {
-        ctx.globalAlpha = 1;
-        ctx.arc(x, y, hapRadius, 0, 2 * Math.PI);
-        if (intLabels !== null) {
-          const degree = degreeIndexes.indexOf(i);
-          if (intLabels[degree]) {
-            if (angle < 0.32 && angle > 0.125) {
-              ctx.fillText(intLabels[degree], x - 34, y);
-            } else {
-              if (angle < 0.1 && angle > -1.125) {
-                ctx.fillText(intLabels[degree], x - 7, y - 12);
-              } else {
-                ctx.fillText(intLabels[degree], x + 9, y);
-              }
-            }
-          }
-        }
-      } else {
-        ctx.globalAlpha = 0.15;
-        ctx.arc(x, y, hapRadius, 0, 2 * Math.PI);
-      }
+      ctx.arc(x, y, hapRadius, 0, 2 * Math.PI);
      ctx.fill();
    });
    ctx.stroke();
@@ -147,7 +116,6 @@ export function pitchwheel({
 /**
 * Renders a pitch circle to visualize frequencies within one octave
 * @name pitchwheel
- * @tags visualization
 * @param {number} hapcircles
 * @param {number} circle
 * @param {number} edo
@@ -129,7 +129,6 @@ function drawSpiral(options) {
 * Displays a spiral visual.
 *
 * @name spiral
- * @tags visualization
 * @param {Object} options Object containing all the optional following parameters as key value pairs:
 * @param {number} stretch controls the rotations per cycle ratio, where 1 = 1 cycle / 360 degrees
 * @param {number} size the diameter of the spiral
@@ -1,41 +0,0 @@
-# @strudel/edo
-
-This package adds EDO scale functions to strudel Patterns.
-
-## Install
-
-```sh
-npm i @strudel/edo --save
-```
-
-## Example
-
-```js
-import { n } from '@strudel/core';
-import '@strudel/edo';
-
-// E.g. edoScale for Gorgo-6 scale, 16 EDO, LLsLLLs
-// base note C3, large step size 3, small step size 1:
-// C3:LLsLLL:3:1
-const [baseNote, sequence, largeStep, smallStep] = ['C3', 'LLsLLL', 3, 1]
-const pattern = n("0 2 4 6 4 2").edoScale([baseNote, sequence, largeStep, smallStep]);
-
-const events = pattern.firstCycle().map((e) => e.show());
-console.log(events);
-```
-
-yields:
-```
-[
-    "[ 0/1 → 1/1 |
-      {
-        \"degree\":1,
-        \"degreeIndexes\":[0,3,6,7,10,13],
-        \"intLabels\":[null,\"S2\",\"d4\",\"N4\",\"s6\",\"s7\",\"P8\"],
-        \"root\":\"130.8128\",
-        \"freq\":130.813,
-        \"edo\":16
-      }
-    ]"
-]
-```
@@ -1,114 +0,0 @@
-/*
-edo.mjs - Equal division of the octave (EDO) scale functions for strudel
-Copyright (C) 2025 Rob McKinnon and Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/edo/edo.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { register, pure, noteToMidi, isNote, tokenizeNote } from '@strudel/core';
-import { EdoScale } from './edoscale.mjs';
-import { Intervals } from './intervals.mjs';
-import { Pitches } from './pitches.mjs';
-
-const pitchesCache = new Map();
-
-/**
- * Turns numbers into notes in the given EDO scale (zero indexed).
- *
- * An EDO scale definition looks like this:
- *
- * e.g. C:LLsLLLs:2:1 <- this is the C major scale, 12 EDO
- *
- * e.g. C:LLsLLL:3:1 <- this is the Gorgo 6 note scale, 16 EDO
- *
- * An EDO scale, e.g. C:LLsLLLs:2:1, consists of a root note (e.g. C)
- * followed by semicolon (':')
- * and then a [Large/small step notation sequence](https://en.xen.wiki/w/MOS_scale)
- * (e.g. LLsLLLs)
- * followed by semicolon, then the large step size (e.g. 2)
- * followed by semicolon, then the small step size (e.g. 1).
- *
- * The number of divisions of the octave is calculated as the sum
- * of the steps in the EDO scale definition.
- *
- * e.g. C:LLsLLLs:2:1 is 2+2+1+2+2+2+1 = 12 EDO, 7 note scale
- *
- * e.g. C:LLsLLL:3:1 is 3+3+1+3+3+3 = 16 EDO, 6 note scale
- *
- * The root note defaults to octave 3, if no octave number is given.
- *
- * @name edoScale
- * @param {string} scale Definition of EDO scale.
- * @returns Pattern
- * @example
- * n("0 2 4 6 4 2").edoScale("C:LLsLLLs:2:1")
- * @example
- * n("[0,7] 4 [2,7] 4")
- * .edoScale("G2:<LLsLLL LLLLsL>:3:1")
- * .s("piano")._pitchwheel()
- * @example
- * n(rand.range(0,5).segment(6))
- * .edoScale("<G2 C3>:LLsLL:3:1")
- * .s("piano")._pitchwheel()
- */
-export const edoScale = register(
-  'edoScale',
-  function (scaleDefinition, pat) {
-    // console.log(scaleDefinition);
-
-    // if (Array.isArray(scale)) {
-    const key = scaleDefinition.flat().join(':');
-    // }
-    // console.log(scaleDefinition);
-    let pitches;
-    if (pitchesCache.has(key)) {
-      pitches = pitchesCache.get(key);
-    } else {
-      // console.log({ key });
-      const [base_note, sequence, large, small] = scaleDefinition;
-      const root_octave = tokenizeNote(base_note)[2] || 3;
-      // console.log({ root_octave });
-      const scale = new EdoScale(large, small, sequence);
-      const intervals = new Intervals(scale);
-      // console.log({ intervals });
-      pitches = new Pitches(scale, intervals, 440, noteToMidi(base_note), root_octave);
-      pitchesCache.set(key, pitches);
-      // console.log({ base_note: noteToMidi(base_note) });
-      // console.log({ sequence });
-      // console.log({ edivisions: scale.edivisions });
-      // console.log({ intervals });
-      // console.log({ pat });
-      // console.log({ pitches: pitches });
-    }
-    return pat
-      .fmap((value) => {
-        const isObject = typeof value === 'object';
-        const n = isObject ? value.n : value;
-        if (isObject) {
-          delete value.n; // remove n so it won't cause trouble
-        }
-        if (isNote(n)) {
-          // legacy..
-          return pure(n);
-        }
-        const deg = (typeof n === 'string' ? parseInt(n, 10) : Number.isInteger(n) ? n : Math.round(n)) + 1;
-
-        const [oct, degree] = pitches.octdeg(deg);
-        const freq = pitches.octdegfreq(oct, degree);
-        const note = pitches.octdegmidi(oct, degree);
-        const edo = pitches.scale.edivisions;
-        const root = pitches.base_freq;
-        const degreeIndexes = pitches.scale.divisions;
-        const intLabels = pitches.intervals.intLabels;
-        // const color = 'red';
-        value = pure(isObject ? { ...value, degree, degreeIndexes, intLabels, root, freq, edo } : note);
-        // value = pure(isObject ? { ...value, key } : note);
-        // value = pure(isObject ? { ...value, edo } : note);
-        // console.log({ value });
-        return value;
-      })
-      .outerJoin()
-      .withHap((hap) => hap.setContext({ ...hap.context, scaleDefinition }));
-  },
-  true,
-  true, // preserve tactus
-);
@@ -1,213 +0,0 @@
-/*
-edoscale.mjs - EdoScale defines equal division of the octave (EDO) scale in Ls notation
-             - Port of pitfalls/lib/Scale.lua - see <https://github.com/robmckinnon/pitfalls/blob/main/lib/Scale.lua>
-Copyright (C) 2025 Rob McKinnon and Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/edo/edoscale.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-const M = 2;
-const L = 1;
-const S = 0;
-const LABELS = ['s', 'L', 'M'];
-
-export class EdoScale {
-  constructor(large, small, sequence, medium) {
-    this.stepbackup = [L, L, S, L, L, L, S, L, L, L, S, L, L, L, S, L];
-    this.large = large;
-    this.medium = medium || large;
-    this.small = small;
-    this.divisions = [];
-    this.edivisions = null;
-    this.sequence = null;
-    this.tonic = 1;
-    this.mode = 1;
-    this.max_steps = 12;
-    this.min_steps = 3;
-    this.setSequence(sequence);
-  }
-
-  hasMedium() {
-    return this.step.some((_, i) => this.step[this.offset(i)] === M);
-  }
-
-  stepSize(i) {
-    return LABELS[this.step[this.offset(i)]];
-  }
-
-  sequence() {
-    return this.step.map((_, i) => this.stepSize(i)).join('');
-  }
-
-  stepValue(i) {
-    const step = this.step[this.offset(i)];
-    return step === L ? this.large : step === M ? this.medium : this.small;
-  }
-
-  offset(i) {
-    if (this.mode === 1) {
-      return i;
-    } else {
-      const offset = (this.mode - 1 + i) % this.length;
-      return offset === 0 ? this.length : offset;
-    }
-  }
-
-  static setMaxSteps(max) {
-    this.max_steps = max;
-  }
-
-  static setMinSteps(min) {
-    this.min_steps = min;
-  }
-
-  setSequence(sequence) {
-    if (this.sequence !== sequence) {
-      this.sequence = sequence;
-      this.length = sequence.length;
-      this.step = [];
-      for (let i = 0; i < sequence.length; i++) {
-        const char = sequence[i];
-        this.step[i] = char === 'L' ? L : char === 'M' ? M : S;
-      }
-      this.updateEdo();
-    } else {
-      return false;
-    }
-  }
-
-  setLarge(l) {
-    if (this.large !== l) {
-      this.large = l;
-      this.updateEdo();
-    } else {
-      return false;
-    }
-  }
-
-  setMedium(m) {
-    if (this.medium !== m) {
-      this.medium = m;
-      this.updateEdo();
-    } else {
-      return false;
-    }
-  }
-
-  setSmall(s) {
-    if (this.small !== s) {
-      this.small = s;
-      this.updateEdo();
-    } else {
-      return false;
-    }
-  }
-
-  setMode(mode) {
-    this.mode = mode;
-  }
-
-  setTonic(tonic) {
-    this.tonic = tonic;
-  }
-
-  changeMode(d) {
-    const orig = this.mode;
-    this.mode = Math.max(1, Math.min(this.mode + d, this.length));
-    return orig !== this.mode;
-  }
-
-  changeTonic(d) {
-    const orig = this.tonic;
-    this.tonic = Math.max(1, Math.min(this.tonic + d, this.edivisions));
-    return orig !== this.tonic;
-  }
-
-  updateEdo() {
-    const orig = this.edivisions;
-    this.edivisions = this.step.reduce((sum, _, i) => {
-      this.divisions[i] = sum;
-      return sum + this.stepValue(i);
-    }, 0);
-    // console.log(this.divisions);
-    const changed = orig !== this.edivisions;
-    if (changed) {
-      this.tonic = Math.max(1, Math.min(this.tonic, this.edivisions));
-    }
-    return changed;
-  }
-
-  changeStep(d, i) {
-    const index = this.offset(i);
-    const orig = this.step[index];
-    this.step[index] = Math.max(S, Math.min(this.step[index] + d, M));
-    this.stepbackup[index] = this.step[index];
-    const changed = orig !== this.step[index];
-    if (changed) {
-      this.updateEdo();
-    }
-    return changed;
-  }
-
-  changeLarge(d) {
-    const orig = this.large;
-    this.setLarge(Math.max(this.small + 1, Math.min(this.large + d, this.large + 1)));
-    const changed = this.large !== orig;
-    if (changed) {
-      if (this.large <= this.medium) {
-        this.setMedium(Math.max(this.small + 1, Math.min(this.large - 1, this.large)));
-      }
-      this.updateEdo();
-    }
-    return changed;
-  }
-
-  changeMedium(d) {
-    const orig = this.medium;
-    this.setMedium(Math.max(this.small + 1, Math.min(this.medium + d, this.large - 1)));
-    const changed = this.medium !== orig;
-    if (changed) {
-      this.updateEdo();
-    }
-    return changed;
-  }
-
-  changeSmall(d) {
-    const orig = this.small;
-    const value = this.small + d;
-
-    if (this.hasMedium()) {
-      this.setSmall(Math.max(1, Math.min(value, this.medium - 1)));
-    } else {
-      this.setSmall(Math.max(1, Math.min(value, this.large - 1)));
-    }
-
-    const changed = this.small !== orig;
-    if (changed) {
-      if (this.small >= this.medium) {
-        this.setMedium(Math.max(this.small + 1, Math.min(this.large)));
-      }
-      this.updateEdo();
-    }
-    return changed;
-  }
-
-  changeLength(d) {
-    const orig = this.length;
-    if (d === 1) {
-      this.length = Math.min(this.length + 1, this.max_steps);
-    } else if (d === -1) {
-      this.length = Math.max(this.length - 1, this.min_steps);
-    }
-
-    const changed = this.length !== orig;
-    if (changed) {
-      this.mode = 1;
-      if (d === 1) {
-        this.step[this.length] = this.stepbackup[this.length] || L;
-      } else if (d === -1 && this.length >= this.min_steps) {
-        this.step.pop();
-      }
-      this.updateEdo();
-    }
-    return changed;
-  }
-}
@@ -1,5 +0,0 @@
-import './edo.mjs';
-
-export * from './edo.mjs';
-
-export const packageName = '@strudel/edo';
--- a/Show More
+++ b/Show More