Merge remote-tracking branch 'upstream/main' into start-and-loop-at-cycle

2026-07-22 05:05:26 -04:00 · 2025-02-07 17:40:01 +01:00 · 2025-02-07 17:38:17 +01:00 · 2024-10-21 17:45:38 +02:00 · 2024-07-31 11:40:24 +02:00 · 2024-07-03 11:21:04 +02:00
245 changed files with 1995 additions and 5940 deletions
@@ -2,6 +2,13 @@ name: Build and Deploy

 on: [workflow_dispatch]

+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+  deployments: write
+
 # Allow one concurrent deployment
 concurrency:
  group: "pages"
@@ -9,9 +16,10 @@ concurrency:

 jobs:
  build:
-    runs-on: docker
-    env:
-      SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
    steps:
      - uses: actions/checkout@v4
      - uses: pnpm/action-setup@v4
@@ -20,18 +28,22 @@ jobs:
      - uses: actions/setup-node@v4
        with:
          node-version: 20
-          # cache: "pnpm"
+          cache: "pnpm"
      - name: Install Dependencies
        run: pnpm install

      - name: Build
        run: pnpm build

-      - name: Deploy
-        run: |
-          eval $(ssh-agent -s)
-          echo "$SSH_PRIVATE_KEY" | ssh-add -
-          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
+      - name: Setup Pages
+        uses: actions/configure-pages@v2
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          # Upload entire repository
+          path: "./website/dist"
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
@@ -0,0 +1,62 @@
+name: Tauri Builder
+on:
+  push:
+    tags:
+      - "v*"
+  workflow_dispatch:
+
+jobs:
+  release:
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [macos-latest, ubuntu-latest, windows-latest]
+        include:
+          - os: ubuntu-latest
+            rust_target: x86_64-unknown-linux-gnu
+          - os: macos-latest
+            rust_target: x86_64-apple-darwin
+          - os: macos-latest
+            rust_target: aarch64-apple-darwin
+          - os: windows-latest
+            rust_target: x86_64-pc-windows-msvc
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8.6.2
+
+      - name: Node.js setup
+        uses: actions/setup-node@v3
+        with:
+          node-version: latest
+          # node-version-file: '.nvmrc'
+
+      - name: Install Rust (Stable)
+        run:
+          curl https://sh.rustup.rs -sSf | sh -s -- -y
+
+      - name: Install dependencies (ubuntu only)
+        if: matrix.platform == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf libasound2-dev
+
+      - name: Install app dependencies from lockfile and build web
+        run: pnpm install
+
+      - name: Build the app
+        uses: tauri-apps/tauri-action@v0
+
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          # tauri-action replaces \_\_VERSION\_\_ with the app version
+          tagName: ${{ github.ref_name }}
+          releaseName: "Strudel v__VERSION__"
+          releaseBody: |
+            See the assets to download this version and install.
+          releaseDraft: true
+          prerelease: false
@@ -4,7 +4,7 @@ on: [push, pull_request]

 jobs:
  build:
-    runs-on: docker
+    runs-on: ubuntu-latest
    strategy:
      matrix:
        node-version: [20]
@@ -17,7 +17,7 @@ jobs:
      - uses: actions/setup-node@v4
        with:
          node-version: ${{ matrix.node-version }}
-          # cache: 'pnpm'
+          cache: 'pnpm'
      - run: pnpm install
      - run: pnpm run format-check
      - run: pnpm run lint
@@ -130,4 +130,3 @@ fabric.properties

 samples/*
 !samples/README.md
-.idea/
@@ -13,4 +13,3 @@ pnpm-workspace.yaml
 website/.astro
 !tidal-drum-machines.json
 !tidal-drum-machines-alias.json
-.pnpm-store
@@ -2,21 +2,11 @@

 Thanks for wanting to contribute!!! There are many ways you can add value to this project

-## Move to codeberg
-
-We are currently in the process of moving from github to codeberg -- not everything is working, please bear with us.
-
-To update your local clone, you can run this command:
-
-```
-git remote set-url origin git@codeberg.org:uzu/strudel.git
-```
-
-
 ## Communication Channels

 To get in touch with the contributors, either

+- open a [github discussion](https://github.com/tidalcycles/strudel/discussions) or
 - [join the Tidal Discord Channel](https://discord.gg/remJ6gQA) and go to the #strudel channel
 - Find related discussions on the [tidal club forum](https://club.tidalcycles.org/)

@@ -42,7 +32,7 @@ Use one of the Communication Channels listed above.
 ## Improve the Docs

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

 ## Propose a Feature

@@ -51,7 +41,7 @@ Maybe you even want to help with the implementation of that feature!

 ## Report a Bug

-If you've found a bug, or some behaviour that does not seem right, you are welcome to file an [issue](https://codeberg.org/uzu/strudel/issues).
+If you've found a bug, or some behaviour that does not seem right, you are welcome to file an [issue](https://github.com/tidalcycles/strudel/issues).
 Please check that it has not been reported before.

 ## Fix a Bug
@@ -81,7 +71,7 @@ To get the project up and running for development, make sure you have installed:
 then, do the following:

 ```sh
-git clone https://codeberg.org/uzu/strudel.git && cd strudel
+git clone https://github.com/tidalcycles/strudel.git && cd strudel
 pnpm i # install at root to symlink packages
 pnpm start # start repl
 ```
@@ -123,7 +113,7 @@ You can run the same check with `pnpm check`

 ## Package Workflow

-The project is split into multiple [packages](https://codeberg.org/uzu/strudel/src/branch/main/packages) with independent versioning.
+The project is split into multiple [packages](https://github.com/tidalcycles/strudel/tree/main/packages) with independent versioning.
 When you run `pnpm i` on the root folder, [pnpm workspaces](https://pnpm.io/workspaces) will install all dependencies of all subpackages. This will allow any js file to import `@strudel/<package-name>` to get the local version,
 allowing to develop multiple packages at the same time.

@@ -1,9 +1,8 @@
 # strudel

-Live coding patterns on the web
-https://strudel.cc/
+[![Strudel test status](https://github.com/tidalcycles/strudel/actions/workflows/test.yml/badge.svg)](https://github.com/tidalcycles/strudel/actions) [![DOI](https://zenodo.org/badge/450927247.svg)](https://doi.org/10.5281/zenodo.6659278)

-Development is moving to https://codeberg.org/uzu/strudel
+An experiment in making a [Tidal](https://github.com/tidalcycles/tidal/) using web technologies. This software is a bit more stable now, but please continue to tread carefully.

 - Try it here: <https://strudel.cc>
 - Docs: <https://strudel.cc/learn>
@@ -32,15 +31,11 @@ This project is organized into many [packages](./packages), which are also avail

 Read more about how to use these in your own project [here](https://strudel.cc/technical-manual/project-start).

-You will need to abide by the terms of the [GNU Affero Public Licence v3](LICENSE.md). As such, Strudel code can only be shared within free/open source projects under the same license -- see the license for details.
-
-Licensing info for the default sound banks can be found over on the [dough-samples](https://github.com/felixroos/dough-samples/blob/main/README.md) repository.
-
 ## Contributing

 There are many ways to contribute to this project! See [contribution guide](./CONTRIBUTING.md).

-<a href="https://codeberg.org/uzu/strudel/activity/contributors">
+<a href="https://github.com/tidalcycles/strudel/graphs/contributors">
  <img src="https://contrib.rocks/image?repo=tidalcycles/strudel" />
 </a>

@@ -1,197 +0,0 @@
-This document introduces you to Strudel in a technical sense. 
-
-It is rather out of date, but there might still be useful info below.
-
-If you just want to *use* Strudel, have a look at the [Tutorial](https://strudel.tidalcycles.org/tutorial/).
-
-## Strudel Packages
-
-There are different packages for different purposes. They..
-
- split up the code into smaller chunks
- can be selectively used to implement some sort of time based system
-
-Please refer to the individual README files in the [packages folder](https://codeberg.org/uzu/strudel/src/branch/main/packages)
-
-## REPL
-
-The [REPL](https://strudel.tidalcycles.org/) is the place where all packages come together to form a live coding system. It can also be seen as a reference implementation for users of the library.
-
-More info in the [REPL README](https://codeberg.org/uzu/strudel/src/branch/main/packages/repl/README.md)
-
-# High Level Overview
-
-<img src="strudelflow.png" width="600" />
-
-## 1. End User Code
-
-The End User Code is written in JavaScript with added syntax sugar. The [eval package](https://github.com/tidalcycles/strudel/tree/main/packages/eval#strudelcycleseval) evaluates the user code
-after a transpilation step, which resolves the syntax sugar. If you don't want the syntax sugar, you can omit the eval package and call the native javascript `eval` instead.
-
-### 🍭 Syntax Sugar
-
-JavaScript Transpilation = converting valid JavaScript to valid JavaScript:
-
-```js
-"c3 [e3 g3]".fast(2)
-```
-
-becomes
-
-```js
-mini('c3 [e3 g3]')
-  .withMiniLocation([1, 0, 0], [1, 11, 11]) // source location
-  .fast(2);
-```
-
- double quoted strings and backtick strings are turned into `mini` calls (single quoted strings are left as is)
- The source location is added by chaining `withMiniLocation`, which enables the real time highlighting later
- (psuedo) variable names that look like notes (like `c4`, `bb2` or `fs3`) are turned into strings
- support for top level await
- operator overloading could be implemented in the future
-
-This is how it works:
-
-<img src="https://github.com/tidalcycles/strudel/blob/talk/talk/public/shiftflow.png?raw=true" width="800" />
-
- The user code is parsed with a [shift parser](https://github.com/shapesecurity/shift-parser-js), generating an AST
- The AST is transformed to resolve the syntax sugar
- The AST is used to generate code again (shift-codegen)
-
-Shift will most likely be replaced with acorn in the future, see https://github.com/tidalcycles/strudel/issues/174
-
-### Mini Notation
-
-Another important part of the user code is the mini notation, which allows to express rhythms in a short manner.
-
- the mini notation is [implemented as a PEG grammar](https://github.com/tidalcycles/strudel/blob/main/packages/mini/krill.pegjs), living in the [mini package](https://github.com/tidalcycles/strudel/tree/main/packages/mini)
- it is based on [krill](https://github.com/Mdashdotdashn/krill) by Mdashdotdashn
- the peg grammar is used to generate a parser with [peggyjs](https://peggyjs.org/)
- the generated parser takes a mini notation string and outputs an AST
- the AST can then be used to construct a pattern using the regular Strudel API
-
-Here's an example AST:
-
-```json
-{
-  "type_": "pattern",
-  "arguments_": { "alignment": "h" },
-  "source_": [
-    {
-      "type_": "element", "source_": "c3",
-      "location_": { "start": { "offset": 1, "line": 1, "column": 2 }, "end": { "offset": 4, "line": 1, "column": 5 } }
-    },
-    {
-      "type_": "element",
-      "location_": { "start": { "offset": 4, "line": 1, "column": 5 }, "end": { "offset": 11, "line": 1, "column": 12 } }
-      "source_": {
-        "type_": "pattern", "arguments_": { "alignment": "h" },
-        "source_": [
-          {
-            "type_": "element", "source_": "e3",
-            "location_": { "start": { "offset": 5, "line": 1, "column": 6 }, "end": { "offset": 8, "line": 1, "column": 9 } }
-          },
-          {
-            "type_": "element", "source_": "g3",
-            "location_": { "start": { "offset": 8, "line": 1, "column": 9 }, "end": { "offset": 10, "line": 1, "column": 11 } }
-          }
-        ]
-      },
-    }
-  ]
-}
-```
-
-which translates to `seq(c3, seq(e3, g3))`
-
-## 2. Querying & Scheduling
-
-When the user code has been evaluated, we hopefully get a Pattern instance, which we can use to query events from. 
-These events can then be used to trigger side effects in the real world. On that note, Events are mostly called Hap(s) in the codebase, because JS already has a built in `Event` class.
-
-### Querying
-
-> Querying = Asking a Pattern for Events within a certain time span
-
-```js
-seq('c3', ['e3', 'g3']) // <--- Pattern
-  .queryArc(0, 2) // query events within 0 and 2 cycles
-  .map((hap) => hap.showWhole()); // make readable
-```
-
-yields 
-
-```js
-[
-  '0/1 -> 1/2: c3', // cycle 0
-  '1/2 -> 3/4: e3',
-  '3/4 -> 1/1: g3',
-  '1/1 -> 3/2: c3', // cycle 1
-  '3/2 -> 7/4: e3',
-  '7/4 -> 2/1: g3',
-];
-```
-
-### 🗓️ Scheduling
-
-The scheduler will query events repeatedly, creating a possibly endless loop of time slices.
-Here is a simplified example of how it works 
-
-```js
-let step = 0.5; // query interval in seconds
-let tick = 0; // how many intervals have passed
-let pattern = seq('c3', ['e3', 'g3']); // pattern from user
-setInterval(() => {
-  const events = pattern.queryArc(tick * step, ++tick * step);
-  events.forEach((event) => {
-    console.log(event.showWhole());
-    const o = getAudioContext().createOscillator();
-    o.frequency.value = getFreq(event.value);
-    o.start(event.whole.begin);
-    o.stop(event.whole.begin + event.duration);
-    o.connect(getAudioContext().destination);
-  });
-}, step * 1000); // query each "step" seconds
-```
-
-## 3. Sound Output
-
-The third and last step is to use the scheduled events to make sound. 
-Patterns are wrapped with param functions to compose different properties of the sound.
-
-```js
-note("[c2(3,8) [<eb2 g1> bb1]]") // sets frequency
-  .s("<sawtooth square>") // sound source
-  .gain(.5) // turn down volume
-  .cutoff(sine.range(200,1000).slow(4)) // modulated cutoff
-  .slow(2)
-  .out().logValues()`,
-  ]}
-/>
-```
-
-Here is an example Hap value with different properties:
-
-```js
-{ note: 'a4', s: 'sawtooth', gain: 0.5, cutoff: 267 }
-```
-<img src="waa-nodes.png" width="600" />
-
-<div className="text-left">
-
- Patterns represent just values in time!
- Suitable for any time based output (music, visuals, movement, .. ?)
-
-### Supported Outputs
-
-At the time of writing this doc, the following outputs are supported:
-
- Web Audio API `.out()` see [/webaudio](https://github.com/tidalcycles/strudel/tree/main/packages/webaudio)
- MIDI `.midi()` see [/midi](https://github.com/tidalcycles/strudel/tree/main/packages/midi)
- OSC `.osc()` see [/osc](https://github.com/tidalcycles/strudel/tree/main/packages/osc)
- Serial `.serial()` see [/serial](https://github.com/tidalcycles/strudel/tree/main/packages/serial)
- Tone.js `.tone()` (deprecated?) [/tone](https://github.com/tidalcycles/strudel/tree/main/packages/tone)
- WebDirt `.webdirt()` (deprecated?) [/webdirt](https://github.com/tidalcycles/strudel/tree/main/packages/webdirt)
- Speech `.speak()` (experimental) part of [/core](https://github.com/tidalcycles/strudel/tree/main/packages/core)
-
-These could change, so make sure to check the [packages folder](https://github.com/tidalcycles/strudel/tree/main/packages).
@@ -11,7 +11,7 @@
  },
  "repository": {
    "type": "git",
-    "url": "git+https://codeberg.org/uzu/strudel.git"
+    "url": "git+https://github.com/tidalcycles/strudel.git"
  },
  "keywords": [
    "titdalcycles",
@@ -23,9 +23,9 @@
  "author": "Felix Roos <flix91@gmail.com>",
  "license": "AGPL-3.0-or-later",
  "bugs": {
-    "url": "https://codeberg.org/uzu/strudel/issues"
+    "url": "https://github.com/tidalcycles/strudel/issues"
  },
-  "homepage": "https://codeberg.org/uzu/strudel#readme",
+  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
    "@strudel/web": "workspace:*",
    "hs2js": "workspace:*"
@@ -1,6 +1,6 @@
 /*
 jsdoc-synonyms.js - Add support for @synonym tag
-Copyright (C) 2023 Strudel contributors - see <https://codeberg.org/uzu/strudel/activity/contributors>
+Copyright (C) 2023 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/midi/midi.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/>.
 */

@@ -5,24 +5,22 @@ made into a pattern swatch.

 Example: <https://felixroos.github.io/strudel/swatch/>

-Please note: These instructions have not been fully tested/adapted since strudel moved to codeberg from github. PRs welcome!
-
 ## deploy

-### 1. fork the [strudel repo on codeberg](https://codeberg.org/uzu/strudel.git)
+### 1. fork the [strudel repo on github](https://github.com/tidalcycles/strudel.git)

-### 2. clone your fork to your machine `git clone https://codeberg.org/<your-username>/strudel.git strudel && cd strudel`
+### 2. clone your fork to your machine `git clone https://github.com/<your-username>/strudel.git strudel && cd strudel`

 ### 3. create a separate branch like `git branch patternuary && git checkout patternuary`

 ### 4. save one or more .txt files in the my-patterns folder

-### 5. edit `website/public/CNAME` to contain `<your-username>.codeberg.page/strudel`
+### 5. edit `website/public/CNAME` to contain `<your-username>.github.io/strudel`

-### 6. edit `website/astro.config.mjs` to use site: `https://<your-username>.codeberg.page` and base `/strudel`, like this
+### 6. edit `website/astro.config.mjs` to use site: `https://<your-username>.github.io` and base `/strudel`, like this

 ```js
-const site = 'https://<your-username>.codeberg.page';
+const site = 'https://<your-username>.github.io';
 const base = '/strudel';
 ```

@@ -32,9 +30,15 @@ const base = '/strudel';
 git add . && git commit -m "site config" && git push --set-upstream origin
 ```

-### 8. deploy to codeberg pages
+### 8. deploy to github pages

-### 9. view your patterns at `<your-username>.codeberg.page/strudel/swatch/`
+- go to settings -> pages and select "Github Actions" as source
+- go to settings -> environments -> github-pages and press the edit button next to `main` and type in `patternuary` (under "Deployment branches")
+- go to Actions -> `Build and Deploy` and click `Run workflow` with branch `patternuary`
+
+### 9. view your patterns at `<your-username>.github.io/strudel/swatch/`
+
+Alternatively, github pages allows you to use a custom domain, like https://mycooldomain.org/swatch/. [See their documentation for details](https://docs.github.com/en/pages/configuring-a-custom-domain-for-your-github-pages-site).

 ### 10. optional: automatic deployment

@@ -31,7 +31,7 @@
  },
  "repository": {
    "type": "git",
-    "url": "git+https://codeberg.org/uzu/strudel.git"
+    "url": "git+https://github.com/tidalcycles/strudel.git"
  },
  "keywords": [
    "tidalcycles",
@@ -43,7 +43,7 @@
  "author": "Alex McLean <alex@slab.org> (https://slab.org)",
  "license": "AGPL-3.0-or-later",
  "bugs": {
-    "url": "https://codeberg.org/uzu/strudel/issues"
+    "url": "https://github.com/tidalcycles/strudel/issues"
  },
  "homepage": "https://strudel.cc",
  "dependencies": {
@@ -59,7 +59,6 @@
    "@eslint/eslintrc": "^3.2.0",
    "@eslint/js": "^9.19.0",
    "@tauri-apps/cli": "^2.2.7",
-    "@vitest/coverage-v8": "3.0.4",
    "@vitest/ui": "^3.0.4",
    "acorn": "^8.14.0",
    "dependency-tree": "^11.0.1",
@@ -71,7 +70,6 @@
    "jsdoc-json": "^2.0.2",
    "lerna": "^8.1.9",
    "prettier": "^3.4.2",
-    "vitest": "^3.0.4",
-    "vite-plugin-bundle-audioworklet": "workspace:*"
+    "vitest": "^3.0.4"
  }
-}
+}
@@ -2,4 +2,4 @@

 Each folder represents one of the @strudel/* packages [published to npm](https://www.npmjs.com/org/strudel).

-To understand how those pieces connect, refer to the [Technical Manual](https://codeberg.org/uzu/strudel/src/branch/main/technical-manual.md) or the individual READMEs.
+To understand how those pieces connect, refer to the [Technical Manual](https://github.com/tidalcycles/strudel/wiki/Technical-Manual) or the individual READMEs.
@@ -67,7 +67,6 @@ export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, roo
  const initialSettings = Object.keys(compartments).map((key) =>
    compartments[key].of(extensions[key](parseBooleans(settings[key]))),
  );
-
  initTheme(settings.theme);
  let state = EditorState.create({
    doc: initialCode,
@@ -11,9 +11,7 @@ export const flashField = StateField.define({
      for (let e of tr.effects) {
        if (e.is(setFlash)) {
          if (e.value && tr.newDoc.length > 0) {
-            const mark = Decoration.mark({
-              attributes: { style: `background-color: rgba(255,255,255, .4); filter: invert(10%)` },
-            });
+            const mark = Decoration.mark({ attributes: { style: `background-color: #FFCA2880` } });
            flash = Decoration.set([mark.range(0, tr.newDoc.length)]);
          } else {
            flash = Decoration.set([]);
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/codemirror",
-  "version": "1.2.2",
+  "version": "1.1.0",
  "description": "Codemirror Extensions for Strudel",
  "main": "index.mjs",
  "publishConfig": {
@@ -13,7 +13,7 @@
  "type": "module",
  "repository": {
    "type": "git",
-    "url": "git+https://codeberg.org/uzu/strudel.git"
+    "url": "git+https://github.com/tidalcycles/strudel.git"
  },
  "keywords": [
    "tidalcycles",
@@ -28,9 +28,9 @@
  ],
  "license": "AGPL-3.0-or-later",
  "bugs": {
-    "url": "https://codeberg.org/uzu/strudel/issues"
+    "url": "https://github.com/tidalcycles/strudel/issues"
  },
-  "homepage": "https://codeberg.org/uzu/strudel#readme",
+  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
    "@codemirror/autocomplete": "^6.18.4",
    "@codemirror/commands": "^6.8.0",
@@ -4,16 +4,16 @@ import blackscreen, { settings as blackscreenSettings } from './themes/blackscre
 import whitescreen, { settings as whitescreenSettings } from './themes/whitescreen.mjs';
 import teletext, { settings as teletextSettings } from './themes/teletext.mjs';
 import algoboy, { settings as algoboySettings } from './themes/algoboy.mjs';
-import CutiePi, { settings as CutiePiSettings } from './themes/CutiePi.mjs';
-import sonicPink, { settings as sonicPinkSettings } from './themes/sonic-pink.mjs';
-import redText, { settings as redTextSettings } from './themes/red-text.mjs';
-import greenText, { settings as greenTextSettings } from './themes/green-text.mjs';
+import terminal, { settings as terminalSettings } from './themes/terminal.mjs';
+import abcdef, { settings as abcdefSettings } from './themes/abcdef.mjs';
 import androidstudio, { settings as androidstudioSettings } from './themes/androidstudio.mjs';
 import atomone, { settings as atomOneSettings } from './themes/atomone.mjs';
 import aura, { settings as auraSettings } from './themes/aura.mjs';
+import bespin, { settings as bespinSettings } from './themes/bespin.mjs';
 import darcula, { settings as darculaSettings } from './themes/darcula.mjs';
 import dracula, { settings as draculaSettings } from './themes/dracula.mjs';
 import duotoneDark, { settings as duotoneDarkSettings } from './themes/duotoneDark.mjs';
+import duotoneLight, { settings as duotoneLightSettings } from './themes/duotoneLight.mjs';
 import eclipse, { settings as eclipseSettings } from './themes/eclipse.mjs';
 import githubDark, { settings as githubDarkSettings } from './themes/githubDark.mjs';
 import githubLight, { settings as githubLightSettings } from './themes/githubLight.mjs';
@@ -31,47 +31,51 @@ import tokyoNightStorm, { settings as tokyoNightStormSettings } from './themes/t
 import tokyoNightDay, { settings as tokyoNightDaySettings } from './themes/tokyoNightDay.mjs';
 import vscodeDark, { settings as vscodeDarkSettings } from './themes/vscodeDark.mjs';
 import vscodeLight, { settings as vscodeLightSettings } from './themes/vscodeLight.mjs';
+// import xcodeDark, { settings as xcodeDarkSettings } from './themes/xcodeDark.mjs';
 import xcodeLight, { settings as xcodeLightSettings } from './themes/xcodeLight.mjs';
 import bbedit, { settings as bbeditSettings } from './themes/bbedit.mjs';
 import noctisLilac, { settings as noctisLilacSettings } from './themes/noctisLilac.mjs';

 import { setTheme } from '@strudel/draw';
+
 export const themes = {
  strudelTheme,
+  bluescreen,
+  blackscreen,
+  whitescreen,
+  teletext,
  algoboy,
-  androidstudio,
  atomone,
  aura,
-  bbedit,
-  blackscreen,
-  bluescreen,
-  CutiePi,
  darcula,
  dracula,
+  // todo: optimize
+  // bespin,
+  //abcdef,
+  androidstudio,
  duotoneDark,
-  eclipse,
  githubDark,
-  githubLight,
-  greenText,
  gruvboxDark,
-  gruvboxLight,
-  sonicPink,
  materialDark,
-  materialLight,
-  monokai,
-  noctisLilac,
  nord,
-  redText,
+  monokai,
  solarizedDark,
-  solarizedLight,
  sublime,
-  teletext,
  tokyoNight,
-  tokyoNightDay,
  tokyoNightStorm,
  vscodeDark,
+  //xcodeDark,
+  // LIGHT
+  bbedit,
+  //duotoneLight,
+  eclipse,
+  githubLight,
+  gruvboxLight,
+  materialLight,
  vscodeLight,
-  whitescreen,
+  noctisLilac,
+  solarizedLight,
+  tokyoNightDay,
  xcodeLight,
 };

@@ -82,19 +86,20 @@ export const settings = {
  whitescreen: whitescreenSettings,
  teletext: teletextSettings,
  algoboy: algoboySettings,
+  terminal: terminalSettings,
+  abcdef: abcdefSettings,
  androidstudio: androidstudioSettings,
  atomone: atomOneSettings,
  aura: auraSettings,
  bbedit: bbeditSettings,
+  bespin: bespinSettings,
  darcula: darculaSettings,
  dracula: draculaSettings,
+  duotoneLight: duotoneLightSettings,
  duotoneDark: duotoneDarkSettings,
  eclipse: eclipseSettings,
-  CutiePi: CutiePiSettings,
-  sonicPink: sonicPinkSettings,
  githubLight: githubLightSettings,
  githubDark: githubDarkSettings,
-  greenText: greenTextSettings,
  gruvboxDark: gruvboxDarkSettings,
  gruvboxLight: gruvboxLightSettings,
  materialDark: materialDarkSettings,
@@ -102,7 +107,6 @@ export const settings = {
  noctisLilac: noctisLilacSettings,
  nord: nordSettings,
  monokai: monokaiSettings,
-  redText: redTextSettings,
  solarizedLight: solarizedLightSettings,
  solarizedDark: solarizedDarkSettings,
  sublime: sublimeSettings,
@@ -111,6 +115,7 @@ export const settings = {
  vscodeDark: vscodeDarkSettings,
  vscodeLight: vscodeLightSettings,
  xcodeLight: xcodeLightSettings,
+  //xcodeDark: xcodeDarkSettings,
  tokyoNightDay: tokyoNightDaySettings,
 };

@@ -1,45 +0,0 @@
-/*
- * Cutie Pi
- * by Switch Angel
- */
-import { tags as t } from '@lezer/highlight';
-import { createTheme } from './theme-helper.mjs';
-const deepPurple = '#5c019a';
-const yellowPink = '#fbeffc';
-const grey = '#272C35';
-const pinkAccent = '#fee1ff';
-const lightGrey = '#465063';
-const bratGreen = '#9acd3f';
-const lighterGrey = '#97a1b7';
-const pink = '#f6a6fd';
-
-export const settings = {
-  background: 'white',
-  lineBackground: 'transparent',
-  foreground: deepPurple,
-  caret: '#797977',
-  selection: yellowPink,
-  selectionMatch: '#2B323D',
-  gutterBackground: grey,
-  gutterForeground: lightGrey,
-  gutterBorder: 'transparent',
-  lineHighlight: pinkAccent,
-};
-
-export default createTheme({
-  theme: 'light',
-  settings,
-  styles: [
-    {
-      tag: [t.function(t.variableName), t.function(t.propertyName), t.url, t.processingInstruction],
-      color: deepPurple,
-    },
-    { tag: [t.tagName, t.heading], color: settings.foreground },
-    { tag: t.comment, color: lighterGrey },
-    { tag: [t.variableName, t.propertyName, t.labelName], color: pink },
-    { tag: [t.attributeName, t.number], color: '#d19a66' },
-    { tag: t.className, color: grey },
-    { tag: t.keyword, color: deepPurple },
-    { tag: [t.string, t.regexp, t.special(t.propertyName)], color: bratGreen },
-  ],
-});
@@ -0,0 +1,55 @@
+/**
+ * @name abcdef
+ * @author codemirror.net
+ * https://codemirror.net/5/theme/abcdef.css
+ */
+import { tags as t } from '@lezer/highlight';
+import { createTheme } from './theme-helper.mjs';
+
+export const settings = {
+  background: '#0f0f0f',
+  lineBackground: '#0f0f0f99',
+  foreground: '#defdef',
+  caret: '#00FF00',
+  selection: '#515151',
+  selectionMatch: '#515151',
+  gutterBackground: '#555',
+  gutterForeground: '#FFFFFF',
+  lineHighlight: '#314151',
+};
+
+export default createTheme({
+  theme: 'dark',
+  settings: {
+    background: '#0f0f0f',
+    foreground: '#defdef',
+    caret: '#00FF00',
+    selection: '#515151',
+    selectionMatch: '#515151',
+    // gutterBackground: '#555',
+    gutterBackground: 'transparent',
+    /* gutterForeground: '#FFFFFF', */
+    gutterForeground: '#7a7b7c',
+    lineHighlight: '#0a6bcb3d',
+  },
+  styles: [
+    { tag: t.labelName, color: 'inherit' },
+    { tag: t.keyword, color: 'darkgoldenrod', fontWeight: 'bold' },
+    { tag: t.atom, color: '#77F' },
+    { tag: t.comment, color: '#7a7b7c', fontStyle: 'italic' },
+    { tag: t.number, color: 'violet' },
+    { tag: t.definition(t.variableName), color: '#fffabc' },
+    { tag: t.variableName, color: '#abcdef' },
+    { tag: t.function(t.variableName), color: '#fffabc' },
+    { tag: t.typeName, color: '#FFDD44' },
+    { tag: t.tagName, color: '#def' },
+    { tag: t.string, color: '#2b4' },
+    { tag: t.meta, color: '#C9F' },
+    // { tag: t.qualifier, color: '#FFF700' },
+    // { tag: t.builtin, color: '#30aabc' },
+    { tag: t.bracket, color: '#8a8a8a' },
+    { tag: t.attributeName, color: '#DDFF00' },
+    { tag: t.heading, color: 'aquamarine', fontWeight: 'bold' },
+    { tag: t.link, color: 'blueviolet', fontWeight: 'bold' },
+  ],
+});
@@ -54,7 +54,6 @@ export default createTheme({
      tag: [t.keyword, t.tagName, t.arithmeticOperator],
      color: palette[1],
    },
-    { tag: [t.atom, t.bool, t.special(t.variableName)], color: palette[0] },
    { tag: [t.function(t.variableName), t.propertyName], color: palette[0] },
    { tag: t.atom, color: palette[1] },
  ],
@@ -1,5 +1,5 @@
-/*
- * androidstudio
+/**
+ * @name androidstudio
 */
 import { tags as t } from '@lezer/highlight';
 import { createTheme } from './theme-helper.mjs';
@@ -1,5 +1,5 @@
-/*
- * Atom One
+/**
+ * @name Atom One
 * Atom One dark syntax theme
 *
 * https://github.com/atom/one-dark-syntax
@@ -38,14 +38,12 @@ export default createTheme({
      tag: [t.function(t.variableName), t.function(t.propertyName), t.url, t.processingInstruction],
      color: 'hsl(207, 82%, 66%)',
    },
-    { tag: [t.atom, t.bool, t.special(t.variableName)], color: 'hsl( 29, 54%, 61%)' },
    { tag: [t.tagName, t.heading], color: '#e06c75' },
    { tag: t.comment, color: '#54636D' },
    { tag: [t.variableName, t.propertyName, t.labelName], color: 'hsl(220, 14%, 71%)' },
    { tag: [t.attributeName, t.number], color: 'hsl( 29, 54%, 61%)' },
    { tag: t.className, color: 'hsl( 39, 67%, 69%)' },
    { tag: t.keyword, color: 'hsl(286, 60%, 67%)' },
-
    { tag: [t.string, t.regexp, t.special(t.propertyName)], color: '#98c379' },
  ],
 });
@@ -0,0 +1,39 @@
+// this is different from https://thememirror.net/bespin
+import { tags as t } from '@lezer/highlight';
+import { createTheme } from './theme-helper.mjs';
+
+export const settings = {
+  background: '#28211c',
+  lineBackground: '#28211c99',
+  foreground: '#9d9b97',
+  caret: '#797977',
+  selection: '#36312e',
+  selectionMatch: '#4f382b',
+  gutterBackground: '#28211c',
+  gutterForeground: '#666666',
+  lineHighlight: 'rgba(255, 255, 255, 0.1)',
+};
+export default createTheme({
+  theme: 'dark',
+  settings: {
+    background: '#28211c',
+    foreground: '#9d9b97',
+    caret: '#797977',
+    selection: '#4f382b',
+    selectionMatch: '#4f382b',
+    gutterBackground: '#28211c',
+    gutterForeground: '#666666',
+    lineHighlight: '#ffffff1a',
+  },
+  styles: [
+    { tag: [t.atom, t.number, t.link, t.bool], color: '#9b859d' },
+    { tag: t.comment, color: '#937121' },
+    { tag: [t.keyword, t.tagName], color: '#cf6a4c' },
+    { tag: t.string, color: '#f9ee98' },
+    { tag: t.bracket, color: '#9d9b97' },
+    { tag: [t.variableName], color: '#5ea6ea' },
+    { tag: t.definition(t.variableName), color: '#cf7d34' },
+    { tag: [t.function(t.variableName), t.className], color: '#cf7d34' },
+    { tag: [t.propertyName, t.attributeName], color: '#54be0d' },
+  ],
+});
@@ -1,5 +1,6 @@
-/*
- * darcula
+/**
+ * @name darcula
+ * @author darcula
 * Name: IntelliJ IDEA darcula theme
 * From IntelliJ IDEA by JetBrains
 */
@@ -1,5 +1,6 @@
-/*
+/**
 * @name dracula
+ * @author dracula
 * Michael Kaminsky (http://github.com/mkaminsky11)
 * Original dracula color scheme by Zeno Rocha (https://github.com/zenorocha/dracula-theme)
 */
@@ -1,6 +1,6 @@
-/*
- * duotone
- * author Bram de Haan
+/**
+ * @name duotone
+ * @author Bram de Haan
 * by Bram de Haan, adapted from DuoTone themes by Simurai (http://simurai.com/projects/2016/01/01/duotone-themes)
 */
 import { tags as t } from '@lezer/highlight';
@@ -1,6 +1,6 @@
-/*
- * duotone
- * author Bram de Haan
+/**
+ * @name duotone
+ * @author Bram de Haan
 * by Bram de Haan, adapted from DuoTone themes by Simurai (http://simurai.com/projects/2016/01/01/duotone-themes)
 */
 import { tags as t } from '@lezer/highlight';
@@ -1,3 +1,6 @@
+/**
+ * @name github
+ */
 import { tags as t } from '@lezer/highlight';
 import { createTheme } from './theme-helper.mjs';

@@ -1,3 +1,6 @@
+/**
+ * @name github
+ */
 import { tags as t } from '@lezer/highlight';
 import { createTheme } from './theme-helper.mjs';

@@ -1,39 +0,0 @@
-/*
- * Atom One
- * Atom One dark syntax theme
- *
- * https://github.com/atom/one-dark-syntax
- */
-import { tags as t } from '@lezer/highlight';
-import { createTheme } from './theme-helper.mjs';
-
-const hex = ['#000000', '#8ed675', '#56bd2a', '#54636D', '#171717'];
-
-export const settings = {
-  background: hex[0],
-  lineBackground: 'transparent',
-  foreground: hex[2],
-  selection: hex[4],
-  selectionMatch: hex[0],
-  gutterBackground: hex[0],
-  gutterForeground: hex[3],
-  gutterBorder: 'transparent',
-  lineHighlight: hex[0],
-};
-
-export default createTheme({
-  theme: 'dark',
-  settings,
-  styles: [
-    {
-      tag: [t.function(t.variableName), t.function(t.propertyName), t.url, t.processingInstruction],
-      color: hex[2],
-    },
-    { tag: [t.atom, t.bool, t.special(t.variableName)], color: hex[1] },
-    { tag: t.comment, color: hex[3] },
-    { tag: [t.variableName, t.propertyName, t.labelName], color: hex[2] },
-    { tag: [t.attributeName, t.number], color: hex[1] },
-    { tag: t.keyword, color: hex[2] },
-    { tag: [t.string, t.regexp, t.special(t.propertyName)], color: hex[1] },
-  ],
-});
@@ -1,6 +1,7 @@
-/*
- * gruvbox-dark
- * author morhetz
+/**
+ * @name gruvbox-dark
+ * @author morhetz
+ * Name: Gruvbox
 * From github.com/codemirror/codemirror5/blob/master/theme/gruvbox-dark.css
 */
 import { tags as t } from '@lezer/highlight';
@@ -1,6 +1,7 @@
-/*
- * gruvbox-light
- * author morhetz
+/**
+ * @name gruvbox-light
+ * @author morhetz
+ * Name: Gruvbox
 * From github.com/codemirror/codemirror5/blob/master/theme/gruvbox-light.css
 */
 import { tags as t } from '@lezer/highlight';
@@ -1,39 +0,0 @@
-/*
- * Atom One
- * Atom One dark syntax theme
- *
- * https://github.com/atom/one-dark-syntax
- */
-import { tags as t } from '@lezer/highlight';
-import { createTheme } from './theme-helper.mjs';
-
-const hex = ['#000000', '#ff5356', '#bd312a', '#54636D', '#171717'];
-
-export const settings = {
-  background: hex[0],
-  lineBackground: 'transparent',
-  foreground: hex[2],
-  selection: hex[4],
-  selectionMatch: hex[0],
-  gutterBackground: hex[0],
-  gutterForeground: hex[3],
-  gutterBorder: 'transparent',
-  lineHighlight: hex[0],
-};
-
-export default createTheme({
-  theme: 'dark',
-  settings,
-  styles: [
-    {
-      tag: [t.function(t.variableName), t.function(t.propertyName), t.url, t.processingInstruction],
-      color: hex[2],
-    },
-    { tag: [t.atom, t.bool, t.special(t.variableName)], color: hex[1] },
-    { tag: t.comment, color: hex[3] },
-    { tag: [t.variableName, t.propertyName, t.labelName], color: hex[2] },
-    { tag: [t.attributeName, t.number], color: hex[1] },
-    { tag: t.keyword, color: hex[2] },
-    { tag: [t.string, t.regexp, t.special(t.propertyName)], color: hex[1] },
-  ],
-});
@@ -1,39 +0,0 @@
-/*
- * Atom One
- * Atom One dark syntax theme
- *
- * https://github.com/atom/one-dark-syntax
- */
-import { tags as t } from '@lezer/highlight';
-import { createTheme } from './theme-helper.mjs';
-
-const hex = ['#1e1e1e', '#fbde2d', '#ff1493', '#4c83ff', '#ededed', '#cccccc', '#ffffff30', '#dc2f8c'];
-
-export const settings = {
-  background: '#000000',
-  lineBackground: 'transparent',
-  foreground: hex[4],
-  selection: hex[6],
-  gutterBackground: hex[0],
-  gutterForeground: hex[5],
-  gutterBorder: 'transparent',
-  lineHighlight: hex[0],
-};
-
-export default createTheme({
-  theme: 'dark',
-  settings,
-  styles: [
-    {
-      tag: [t.function(t.variableName), t.function(t.propertyName), t.url, t.processingInstruction],
-      color: hex[4],
-    },
-    { tag: [t.atom, t.bool, t.special(t.variableName)], color: hex[3] },
-
-    { tag: t.comment, color: '#54636D' },
-    { tag: [t.variableName, t.propertyName, t.labelName], color: hex[4] },
-    { tag: [t.attributeName, t.number], color: hex[3] },
-    { tag: t.keyword, color: hex[1] },
-    { tag: [t.string, t.regexp, t.special(t.propertyName)], color: hex[2] },
-  ],
-});
@@ -5,11 +5,14 @@ export const settings = {
  background: '#222',
  lineBackground: '#22222299',
  foreground: '#fff',
+  // foreground: '#75baff',
  caret: '#ffcc00',
  selection: 'rgba(128, 203, 196, 0.5)',
  selectionMatch: '#036dd626',
+  // lineHighlight: '#8a91991a', // original
  lineHighlight: '#00000050',
  gutterBackground: 'transparent',
+  // gutterForeground: '#8a919966',
  gutterForeground: '#8a919966',
 };

@@ -17,7 +20,6 @@ export default createTheme({
  theme: 'dark',
  settings,
  styles: [
-    { tag: [t.atom, t.bool, t.special(t.variableName)], color: '#89ddff' },
    { tag: t.labelName, color: '#89ddff' },
    { tag: t.keyword, color: '#c792ea' },
    { tag: t.operator, color: '#89ddff' },
@@ -0,0 +1,34 @@
+import { tags as t } from '@lezer/highlight';
+import { createTheme } from './theme-helper.mjs';
+
+export const settings = {
+  background: '#292A30',
+  lineBackground: '#292A3099',
+  foreground: '#CECFD0',
+  caret: '#fff',
+  selection: '#727377',
+  selectionMatch: '#727377',
+  lineHighlight: '#2F3239',
+};
+
+export default createTheme({
+  theme: 'dark',
+  settings: {
+    background: '#292A30',
+    foreground: '#CECFD0',
+    caret: '#fff',
+    selection: '#727377',
+    selectionMatch: '#727377',
+    lineHighlight: '#ffffff0f',
+  },
+  styles: [
+    { tag: [t.comment, t.quote], color: '#7F8C98' },
+    { tag: [t.keyword], color: '#FF7AB2', fontWeight: 'bold' },
+    { tag: [t.string, t.meta], color: '#FF8170' },
+    { tag: [t.typeName], color: '#DABAFF' },
+    { tag: [t.definition(t.variableName)], color: '#6BDFFF' },
+    { tag: [t.name], color: '#6BAA9F' },
+    { tag: [t.variableName], color: '#ACF2E4' },
+    { tag: [t.regexp, t.link], color: '#FF8170' },
+  ],
+});
@@ -140,3 +140,8 @@ registerWidget('_spectrum', (id, options = {}, pat) => {
  const ctx = getCanvasWidget(id, options).getContext('2d');
  return pat.spectrum({ ...options, ctx, id });
 });
+
+registerWidget('_cyclecounter', (id, options = {}, pat) => {
+  const ctx = getCanvasWidget(id, options).getContext('2d');
+  return pat.cyclecounter({ ...options, ctx, id });
+});
@@ -113,7 +113,7 @@ self.onconnect = function (e) {
  port.start(); // Required when using addEventListener. Otherwise called implicitly by onmessage setter.
 };

-// used to consistently schedule events, for use in a service worker - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/clockworker.mjs>
+// used to consistently schedule events, for use in a service worker - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/clockworker.mjs>
 function createClock(
  getTime,
  callback, // called slightly before each cycle
@@ -1,6 +1,6 @@
 /*
-controls.mjs - Registers audio controls for pattern manipulation and effects.
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/controls.mjs>
+controls.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/controls.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/>.
 */

@@ -96,7 +96,7 @@ export const { source, src } = registerControl('source', 'src');
 * @example
 * s("bd sd [~ bd] sd,hh*6").n("<0 1>")
 */
-// also see https://codeberg.org/uzu/strudel/pulls/63
+// also see https://github.com/tidalcycles/strudel/pull/63
 export const { n } = registerControl('n');
 /**
 * Plays the given note name or midi number. A note name consists of
@@ -348,7 +348,7 @@ export const { bandf, bpf, bp } = registerControl(['bandf', 'bandq', 'bpenv'], '
 * s("bd sd [~ bd] sd").bpf(500).bpq("<0 1 2 3>")
 *
 */
-// currently an alias of 'bandq' https://codeberg.org/uzu/strudel/issues/496
+// currently an alias of 'bandq' https://github.com/tidalcycles/strudel/issues/496
 // ['bpq'],
 export const { bandq, bpq } = registerControl('bandq', 'bpq');
 /**
@@ -445,32 +445,6 @@ export const { coarse } = registerControl('coarse');
 */
 export const { drive } = registerControl('drive');

-/**
- * Create byte beats with custom expressions
- *
- * @name byteBeatExpression
- * @synonyms bbexpr
- *
- * @param {number | Pattern} byteBeatExpression bitwise expression for creating bytebeat
- * @example
- * s("bytebeat").bbexpr('t*(t>>15^t>>66)')
- *
- */
-export const { byteBeatExpression, bbexpr } = registerControl('byteBeatExpression', 'bbexpr');
-
-/**
- * Create byte beats with custom expressions
- *
- * @name byteBeatStartTime
- * @synonyms bbst
- *
- * @param {number | Pattern} byteBeatStartTime in samples (t)
- * @example
- * note("c3!8".add("{0 0 12 0 7 5 3}%8")).s("bytebeat:5").bbst("<3 1>".mul(10000))._scope()
- *
- */
-export const { byteBeatStartTime, bbst } = registerControl('byteBeatStartTime', 'bbst');
-
 /**
 * Allows you to set the output channels on the interface
 *
@@ -484,41 +458,6 @@ export const { byteBeatStartTime, bbst } = registerControl('byteBeatStartTime',
 */
 export const { channels, ch } = registerControl('channels', 'ch');

-/**
- * controls the pulsewidth of the pulse oscillator
- *
- * @name pw
- * @param {number | Pattern} pulsewidth
- * @example
- * note("{f a c e}%16").s("pulse").pw(".8:1:.2")
- * @example
- * n(run(8)).scale("D:pentatonic").s("pulse").pw("0 .75 .5 1")
- */
-export const { pw } = registerControl(['pw', 'pwrate', 'pwsweep']);
-
-/**
- * controls the lfo rate for the pulsewidth of the pulse oscillator
- *
- * @name pwrate
- * @param {number | Pattern} rate
- * @example
- * n(run(8)).scale("D:pentatonic").s("pulse").pw("0.5").pwrate("<5 .1 25>").pwsweep("<0.3 .8>")
-
- *
- */
-export const { pwrate } = registerControl('pwrate');
-
-/**
- * controls the lfo sweep for the pulsewidth of the pulse oscillator
- *
- * @name pwsweep
- * @param {number | Pattern} sweep
- * @example
- * n(run(8)).scale("D:pentatonic").s("pulse").pw("0.5").pwrate("<5 .1 25>").pwsweep("<0.3 .8>")
- *
- */
-export const { pwsweep } = registerControl('pwsweep');
-
 /**
 * Phaser audio effect that approximates popular guitar pedals.
 *
@@ -855,7 +794,7 @@ export const { fanchor } = registerControl('fanchor');
 * s("bd sd [~ bd] sd,hh*8").hpf("<2000 2000:25>")
 *
 */
-// currently an alias of 'hcutoff' https://codeberg.org/uzu/strudel/issues/496
+// currently an alias of 'hcutoff' https://github.com/tidalcycles/strudel/issues/496
 // ['hpf'],
 /**
 * Applies a vibrato to the frequency of the oscillator.
@@ -922,7 +861,7 @@ export const { hresonance, hpq } = registerControl('hresonance', 'hpq');
 * s("bd sd [~ bd] sd,hh*8").lpf(2000).lpq("<0 10 20 30>")
 *
 */
-// currently an alias of 'resonance' https://codeberg.org/uzu/strudel/issues/496
+// currently an alias of 'resonance' https://github.com/tidalcycles/strudel/issues/496
 export const { resonance, lpq } = registerControl('resonance', 'lpq');
 /**
 * DJ filter, below 0.5 is low pass filter, above is high pass filter.
@@ -1288,7 +1227,7 @@ export const { semitone } = registerControl('semitone');

 // TODO: synth param
 export const { voice } = registerControl('voice');
-// voicings // https://codeberg.org/uzu/strudel/issues/506
+// voicings // https://github.com/tidalcycles/strudel/issues/506
 // chord to voice, like C Eb Fm7 G7. the symbols can be defined via addVoicings
 export const { chord } = registerControl('chord');
 // which dictionary to use for the voicings
@@ -1522,7 +1461,7 @@ export const { vowel } = registerControl('vowel');
 * @name waveloss
 */
 export const { waveloss } = registerControl('waveloss');
-/**
+/*
 * Noise crackle density
 *
 * @name density
@@ -1574,11 +1513,22 @@ export const { scram } = registerControl('scram');
 export const { binshift } = registerControl('binshift');
 export const { hbrick } = registerControl('hbrick');
 export const { lbrick } = registerControl('lbrick');
-
+export const { midichan } = registerControl('midichan');
+export const { midimap } = registerControl('midimap');
+export const { midiport } = registerControl('midiport');
+export const { control } = registerControl('control');
+export const { ccn } = registerControl('ccn');
+export const { ccv } = registerControl('ccv');
+export const { polyTouch } = registerControl('polyTouch');
+export const { midibend } = registerControl('midibend');
+export const { miditouch } = registerControl('miditouch');
+export const { ctlNum } = registerControl('ctlNum');
 export const { frameRate } = registerControl('frameRate');
 export const { frames } = registerControl('frames');
 export const { hours } = registerControl('hours');
+export const { midicmd } = registerControl('midicmd');
 export const { minutes } = registerControl('minutes');
+export const { progNum } = registerControl('progNum');
 export const { seconds } = registerControl('seconds');
 export const { songPtr } = registerControl('songPtr');
 export const { uid } = registerControl('uid');
@@ -1671,151 +1621,6 @@ export const ar = register('ar', (t, pat) => {
  return pat.set({ attack, release });
 });

-//MIDI
-
-/**
- * MIDI channel: Sets the MIDI channel for the event.
- *
- * @name midichan
- * @param {number | Pattern} channel MIDI channel number (0-15)
- * @example
- * note("c4").midichan(1).midi()
- */
-export const { midichan } = registerControl('midichan');
-
-export const { midimap } = registerControl('midimap');
-
-/**
- * MIDI port: Sets the MIDI port for the event.
- *
- * @name midiport
- * @param {number | Pattern} port MIDI port
- * @example
- * note("c a f e").midiport("<0 1 2 3>").midi()
- */
-export const { midiport } = registerControl('midiport');
-
-/**
- * MIDI command: Sends a MIDI command message.
- *
- * @name midicmd
- * @param {number | Pattern} command MIDI command
- * @example
- * midicmd("clock*48,<start stop>/2").midi()
- */
-export const { midicmd } = registerControl('midicmd');
-
-/**
- * MIDI control: Sends a MIDI control change message.
- *
- * @name control
- * @param {number | Pattern}  MIDI control number (0-127)
- * @param {number | Pattern}  MIDI controller value (0-127)
- */
-export const control = register('control', (args, pat) => {
-  if (!Array.isArray(args)) {
-    throw new Error('control expects an array of [ccn, ccv]');
-  }
-  const [_ccn, _ccv] = args;
-  return pat.ccn(_ccn).ccv(_ccv);
-});
-
-/**
- * MIDI control number: Sends a MIDI control change message.
- *
- * @name ccn
- * @param {number | Pattern}  MIDI control number (0-127)
- */
-export const { ccn } = registerControl('ccn');
-/**
- * MIDI control value: Sends a MIDI control change message.
- *
- * @name ccv
- * @param {number | Pattern}  MIDI control value (0-127)
- */
-export const { ccv } = registerControl('ccv');
-export const { ctlNum } = registerControl('ctlNum');
-// TODO: ctlVal?
-
-/**
- * MIDI NRPN non-registered parameter number: Sends a MIDI NRPN non-registered parameter number message.
- * @name nrpnn
- * @param {number | Pattern} nrpnn MIDI NRPN non-registered parameter number (0-127)
- * @example
- * note("c4").nrpnn("1:8").nrpv("123").midichan(1).midi()
- */
-export const { nrpnn } = registerControl('nrpnn');
-/**
- * MIDI NRPN non-registered parameter value: Sends a MIDI NRPN non-registered parameter value message.
- * @name nrpv
- * @param {number | Pattern} nrpv MIDI NRPN non-registered parameter value (0-127)
- * @example
- * note("c4").nrpnn("1:8").nrpv("123").midichan(1).midi()
- */
-export const { nrpv } = registerControl('nrpv');
-
-/**
- * MIDI program number: Sends a MIDI program change message.
- *
- * @name progNum
- * @param {number | Pattern} program MIDI program number (0-127)
- * @example
- * note("c4").progNum(10).midichan(1).midi()
- */
-export const { progNum } = registerControl('progNum');
-
-/**
- * MIDI sysex: Sends a MIDI sysex message.
- * @name sysex
- * @param {number | Pattern} id Sysex ID
- * @param {number | Pattern} data Sysex data
- * @example
- * note("c4").sysex(["0x77", "0x01:0x02:0x03:0x04"]).midichan(1).midi()
- */
-export const sysex = register('sysex', (args, pat) => {
-  if (!Array.isArray(args)) {
-    throw new Error('sysex expects an array of [id, data]');
-  }
-  const [id, data] = args;
-  return pat.sysexid(id).sysexdata(data);
-});
-/**
- * MIDI sysex ID: Sends a MIDI sysex identifier message.
- * @name sysexid
- * @param {number | Pattern} id Sysex ID
- * @example
- * note("c4").sysexid("0x77").sysexdata("0x01:0x02:0x03:0x04").midichan(1).midi()
- */
-export const { sysexid } = registerControl('sysexid');
-/**
- * MIDI sysex data: Sends a MIDI sysex message.
- * @name sysexdata
- * @param {number | Pattern} data Sysex data
- * @example
- * note("c4").sysexid("0x77").sysexdata("0x01:0x02:0x03:0x04").midichan(1).midi()
- */
-export const { sysexdata } = registerControl('sysexdata');
-
-/**
- * MIDI pitch bend: Sends a MIDI pitch bend message.
- * @name midibend
- * @param {number | Pattern} midibend MIDI pitch bend (-1 - 1)
- * @example
- * note("c4").midibend(sine.slow(4).range(-0.4,0.4)).midi()
- */
-export const { midibend } = registerControl('midibend');
-/**
- * MIDI key after touch: Sends a MIDI key after touch message.
- * @name miditouch
- * @param {number | Pattern} miditouch MIDI key after touch (0-1)
- * @example
- * note("c4").miditouch(sine.slow(4).range(0,1)).midi()
- */
-export const { miditouch } = registerControl('miditouch');
-
-// TODO: what is this?
-export const { polyTouch } = registerControl('polyTouch');
-
 export const getControlName = (alias) => {
  if (controlAlias.has(alias)) {
    return controlAlias.get(alias);
@@ -1827,46 +1632,14 @@ export const getControlName = (alias) => {
 * Sets properties in a batch.
 *
 * @name as
- * @param {String | Array} mapping the control names that are set
+ * @param {Array} mapping the control names that are set
 * @example
 * "c:.5 a:1 f:.25 e:.8".as("note:clip")
- * @example
- * "{0@2 0.25 0 0.5 .3 .5}%8".as("begin").s("sax_vib").clip(1)
 */
 export const as = register('as', (mapping, pat) => {
-  mapping = Array.isArray(mapping) ? mapping : [mapping];
  return pat.fmap((v) => {
    v = Array.isArray(v) ? v : [v];
    v = Object.fromEntries(mapping.map((prop, i) => [getControlName(prop), v[i]]));
    return v;
  });
 });
-
-/**
- * Allows you to scrub an audio file like a tape loop by passing values that represents the position in the audio file
- * in the optional array syntax ex: "0.5:2", the second value controls the speed of playback
- * @name scrub
- * @memberof Pattern
- * @returns Pattern
- * @example
- * samples('github:switchangel/pad')
- * s("swpad:0").scrub("{0.1!2 .25@3 0.7!2 <0.8:1.5>}%8")
- * @example
- * samples('github:yaxu/clean-breaks/main');
- * s("amen/4").fit().scrub("{0@3 0@2 4@3}%8".div(16))
- */
-
-export const scrub = register(
-  'scrub',
-  (beginPat, pat) => {
-    return beginPat.outerBind((v) => {
-      if (!Array.isArray(v)) {
-        v = [v];
-      }
-      const [beginVal, speedMultiplier = 1] = v;
-
-      return pat.begin(beginVal).mul(speed(speedMultiplier)).clip(1);
-    });
-  },
-  false,
-);
@@ -1,6 +1,6 @@
 /*
-cyclist.mjs - event scheduler for a single strudel instance. for multi-instance scheduler, see - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/neocyclist.mjs>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/cyclist.mjs>
+cyclist.mjs - event scheduler for a single strudel instance. for multi-instance scheduler, see - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/neocyclist.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/cyclist.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/>.
 */

@@ -23,6 +23,8 @@ export class Cyclist {
    this.beforeStart = beforeStart;
    this.cps = 0.5;
    this.num_ticks_since_cps_change = 0;
+    this.loopStart = 0;
+    this.loopLength = 0;
    this.lastTick = 0; // absolute time when last tick (clock callback) happened
    this.lastBegin = 0; // query begin of last tick
    this.lastEnd = 0; // query end of last tick
@@ -48,6 +50,10 @@ export class Cyclist {
          this.lastBegin = begin;
          const end = this.num_cycles_at_cps_change + num_cycles_since_cps_change;
          this.lastEnd = end;
+          if (this.loopLength > 0 && this.lastEnd >= this.loopStart + this.loopLength) {
+            this.lastEnd = this.loopStart + (this.lastEnd % 1);
+            this.num_ticks_since_cps_change = 0;
+          }
          this.lastTick = phase;

          if (phase < t) {
@@ -65,7 +71,7 @@ export class Cyclist {
                (hap.whole.begin - this.num_cycles_at_cps_change) / this.cps + this.seconds_at_cps_change + latency;
              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
+              // see https://github.com/tidalcycles/strudel/pull/1004
              const deadline = targetTime - phase;
              onTrigger?.(hap, deadline, duration, this.cps, targetTime);
              if (hap.value.cps !== undefined && this.cps != hap.value.cps) {
@@ -116,7 +122,7 @@ export class Cyclist {
  stop() {
    logger('[cyclist] stop');
    this.clock.stop();
-    this.lastEnd = 0;
+    this.lastEnd = this.loopStart;
    this.setStarted(false);
  }
  async setPattern(pat, autostart = false) {
@@ -132,6 +138,19 @@ export class Cyclist {
    this.cps = cps;
    this.num_ticks_since_cps_change = 0;
  }
+  setLoop(start = 0, length = 0) {
+    if (start >= 0 && length >= 0) {
+      start = Math.floor(start);
+      length = Math.floor(length);
+
+      if (start != this.loopStart || length != this.loopLength) {
+        this.loopStart = Math.floor(start);
+        this.loopLength = Math.floor(length);
+        this.lastEnd = this.loopStart + (this.lastEnd % 1);
+        this.num_ticks_since_cps_change = 0;
+      }
+    }
+  }
  log(begin, end, haps) {
    const onsets = haps.filter((h) => h.hasOnset());
    console.log(`${begin.toFixed(4)} - ${end.toFixed(4)} ${Array(onsets.length).fill('I').join('')}`);
@@ -1,6 +1,6 @@
 /*
 drawLine.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/drawLine.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/drawLine.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/>.
 */

@@ -2,7 +2,7 @@
 euclid.mjs - Bjorklund/Euclidean/Diaspora rhythms
 Copyright (C) 2023 Rohan Drape and strudel contributors

-See <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/euclid.mjs> for authors of this file.
+See <https://github.com/tidalcycles/strudel/blob/main/packages/core/euclid.mjs> for authors of this file.

 The Bjorklund algorithm implementation is ported from the Haskell Music Theory Haskell module by Rohan Drape -
 https://rohandrape.net/?t=hmt
@@ -10,9 +10,9 @@ https://rohandrape.net/?t=hmt
 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 { timeCat, register, silence } from './pattern.mjs';
+import { Pattern, timeCat, register, silence } from './pattern.mjs';
 import { rotate, flatten, splitAt, zipWith } from './util.mjs';
-import Fraction, { lcm } from './fraction.mjs';
+import Fraction from './fraction.mjs';

 const left = function (n, x) {
  const [ons, offs] = n;
@@ -42,26 +42,29 @@ const _bjork = function (n, x) {

 export const bjork = function (ons, steps) {
  const inverted = ons < 0;
-  const absOns = Math.abs(ons);
-  const offs = steps - absOns;
-  const ones = Array(absOns).fill([1]);
-  const zeros = Array(offs).fill([0]);
-  const result = _bjork([absOns, offs], [ones, zeros]);
-  const pattern = flatten(result[1][0]).concat(flatten(result[1][1]));
-  return inverted ? pattern.map((x) => 1 - x) : pattern;
+  ons = Math.abs(ons);
+  const offs = steps - ons;
+  const x = Array(ons).fill([1]);
+  const y = Array(offs).fill([0]);
+  const result = _bjork([ons, offs], [x, y]);
+  const p = flatten(result[1][0]).concat(flatten(result[1][1]));
+  if (inverted) {
+    return p.map((x) => (x === 0 ? 1 : 0));
+  }
+  return p;
 };

 /**
- * Changes the structure of the pattern to form an Euclidean rhythm.
- * Euclidean rhythms are rhythms obtained using the greatest common
+ * Changes the structure of the pattern to form an euclidean rhythm.
+ * Euclidian rhythms are rhythms obtained using the greatest common
 * divisor of two numbers.  They were described in 2004 by Godfried
- * Toussaint, a Canadian computer scientist.  Euclidean rhythms are
+ * Toussaint, a canadian computer scientist.  Euclidian rhythms are
 * really useful for computer/algorithmic music because they can
 * describe a large number of rhythms with a couple of numbers.
 *
 * @memberof Pattern
 * @name euclid
- * @param {number} pulses the number of onsets/beats
+ * @param {number} pulses the number of onsets / beats
 * @param {number} steps the number of steps to fill
 * @returns Pattern
 * @example
@@ -73,7 +76,7 @@ export const bjork = function (ons, steps) {
 * Like `euclid`, but has an additional parameter for 'rotating' the resulting sequence.
 * @memberof Pattern
 * @name euclidRot
- * @param {number} pulses the number of onsets/beats
+ * @param {number} pulses the number of onsets / beats
 * @param {number} steps the number of steps to fill
 * @param {number} rotation offset in steps
 * @returns Pattern
@@ -83,13 +86,13 @@ export const bjork = function (ons, steps) {
 */

 /**
- * @example // A thirteenth-century Persian rhythm called Khafif-e-ramal.
+ * @example // A thirteenth century Persian rhythm called Khafif-e-ramal.
 * note("c3").euclid(2,5)
 * @example // The archetypal pattern of the Cumbia from Colombia, as well as a Calypso rhythm from Trinidad.
 * note("c3").euclid(3,4)
 * @example // Another thirteenth century Persian rhythm by the name of Khafif-e-ramal, as well as a Rumanian folk-dance rhythm.
 * note("c3").euclidRot(3,5,2)
- * @example // A Ruchenitza rhythm used in a Bulgarian folk dance.
+ * @example // A Ruchenitza rhythm used in a Bulgarian folk-dance.
 * note("c3").euclid(3,7)
 * @example // The Cuban tresillo pattern.
 * note("c3").euclid(3,8)
@@ -148,10 +151,8 @@ export const { euclidrot, euclidRot } = register(['euclidrot', 'euclidRot'], fun
 * so there will be no gaps.
 * @name euclidLegato
 * @memberof Pattern
- * @param {number} pulses the number of onsets/beats
+ * @param {number} pulses the number of onsets / beats
 * @param {number} steps the number of steps to fill
- * @param rotation offset in steps
- * @param pat
 * @example
 * note("c3").euclidLegato(3,8)
 */
@@ -160,13 +161,13 @@ const _euclidLegato = function (pulses, steps, rotation, pat) {
  if (pulses < 1) {
    return silence;
  }
-  const bin_pat = _euclidRot(pulses, steps, 0);
+  const bin_pat = _euclidRot(pulses, steps, rotation);
  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));
+  return pat.struct(timeCat(...gapless));
 };

 export const euclidLegato = register(['euclidLegato'], function (pulses, steps, pat) {
@@ -179,7 +180,7 @@ export const euclidLegato = register(['euclidLegato'], function (pulses, steps,
 * the resulting sequence
 * @name euclidLegatoRot
 * @memberof Pattern
- * @param {number} pulses the number of onsets/beats
+ * @param {number} pulses the number of onsets / beats
 * @param {number} steps the number of steps to fill
 * @param {number} rotation offset in steps
 * @example
@@ -1,6 +1,6 @@
 /*
 evaluate.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/evaluate.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/evaluate.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/>.
 */

@@ -1,6 +1,6 @@
 /*
 fraction.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/fraction.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/fraction.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/>.
 */

@@ -1,6 +1,6 @@
 /*
 hap.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/hap.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/hap.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 Fraction from './fraction.mjs';
@@ -1,6 +1,6 @@
 /*
 index.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/index.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/index.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/>.
 */

@@ -1,6 +1,6 @@
 /*
 neocyclist.mjs - event scheduler like cyclist, except recieves clock pulses from clockworker in order to sync across multiple instances.
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/neocyclist.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/neocyclist.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/>.
 */

@@ -1,6 +1,6 @@
 {
  "name": "@strudel/core",
-  "version": "1.2.2",
+  "version": "1.1.0",
  "description": "Port of Tidal Cycles to JavaScript",
  "main": "index.mjs",
  "type": "module",
@@ -15,7 +15,7 @@
  },
  "repository": {
    "type": "git",
-    "url": "git+https://codeberg.org/uzu/strudel.git"
+    "url": "git+https://github.com/tidalcycles/strudel.git"
  },
  "keywords": [
    "tidalcycles",
@@ -27,7 +27,7 @@
  "author": "Alex McLean <alex@slab.org> (https://slab.org)",
  "license": "AGPL-3.0-or-later",
  "bugs": {
-    "url": "https://codeberg.org/uzu/strudel/issues"
+    "url": "https://github.com/tidalcycles/strudel/issues"
  },
  "homepage": "https://strudel.cc",
  "dependencies": {
@@ -1,6 +1,6 @@
 /*
 pattern.mjs - Core pattern representation for strudel
-Copyright (C) 2025 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/pattern.mjs>
+Copyright (C) 2025 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/pattern.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/>.
 */

@@ -388,7 +388,7 @@ export class Pattern {

  polyJoin = function () {
    const pp = this;
-    return pp.fmap((p) => p.extend(pp._steps.div(p._steps))).outerJoin();
+    return pp.fmap((p) => p.repeat(pp._steps.div(p._steps))).outerJoin();
  };

  polyBind(func) {
@@ -1244,16 +1244,6 @@ export function reify(thing) {
  return pure(thing);
 }

-/** Takes a list of patterns, and returns a pattern of lists.
- */
-export function sequenceP(pats) {
-  let result = pure([]);
-  for (const pat of pats) {
-    result = result.bind((list) => pat.fmap((v) => list.concat([v])));
-  }
-  return result;
-}
-
 /** The given items are played at the same time at the same length.
 *
 * @return {Pattern}
@@ -1328,7 +1318,7 @@ export function stackBy(by, ...pats) {
    left: stackLeft,
    right: stackRight,
    expand: stack,
-    repeat: (...args) => polymeter(...args).steps(steps),
+    repeat: (...args) => polymeterSteps(steps, ...args),
  };
  return by
    .inhabit(lookup)
@@ -1830,10 +1820,7 @@ export const { fastGap, fastgap } = register(['fastGap', 'fastgap'], function (f
 export const focus = register('focus', function (b, e, pat) {
  b = Fraction(b);
  e = Fraction(e);
-  return pat
-    ._early(b.sam())
-    ._fast(Fraction(1).div(e.sub(b)))
-    ._late(b);
+  return pat._fast(Fraction(1).div(e.sub(b))).late(b.cyclePos());
 });

 export const { focusSpan, focusspan } = register(['focusSpan', 'focusspan'], function (span, pat) {
@@ -2043,7 +2030,7 @@ export const zoom = register('zoom', function (s, e, pat) {
    return nothing;
  }
  const d = e.sub(s);
-  const steps = __steps ? pat._steps?.mulmaybe(d) : undefined;
+  const steps = __steps ? pat._steps.mulmaybe(d) : undefined;
  return pat
    .withQuerySpan((span) => span.withCycle((t) => t.mul(d).add(s)))
    .withHapSpan((span) => span.withCycle((t) => t.sub(s).div(d)))
@@ -2105,13 +2092,11 @@ export const linger = register(

 /**
 * Samples the pattern at a rate of n events per cycle. Useful for turning a continuous pattern into a discrete one.
- * @name segment
- * @synonyms seg
 * @param {number} segments number of segments per cycle
 * @example
 * note(saw.range(40,52).segment(24))
 */
-export const { segment, seg } = register(['segment', 'seg'], function (rate, pat) {
+export const segment = register('segment', function (rate, pat) {
  return pat.struct(pure(true)._fast(rate)).setSteps(rate);
 });

@@ -2441,14 +2426,9 @@ const _chunk = function (n, func, pat, back = false, fast = false) {
  return pat.when(binary_pat, func);
 };

-export const { chunk, slowchunk, slowChunk } = register(
-  ['chunk', 'slowchunk', 'slowChunk'],
-  function (n, func, pat) {
-    return _chunk(n, func, pat, false, false);
-  },
-  true,
-  true,
-);
+export const { chunk, slowchunk, slowChunk } = register(['chunk', 'slowchunk', 'slowChunk'], function (n, func, pat) {
+  return _chunk(n, func, pat, false, false);
+});

 /**
 * Like `chunk`, but cycles through the parts in reverse order. Known as chunk' in tidalcycles
@@ -2460,14 +2440,9 @@ export const { chunk, slowchunk, slowChunk } = register(
 * "0 1 2 3".chunkBack(4, x=>x.add(7))
 * .scale("A:minor").note()
 */
-export const { chunkBack, chunkback } = register(
-  ['chunkBack', 'chunkback'],
-  function (n, func, pat) {
-    return _chunk(n, func, pat, true);
-  },
-  true,
-  true,
-);
+export const { chunkBack, chunkback } = register(['chunkBack', 'chunkback'], function (n, func, pat) {
+  return _chunk(n, func, pat, true);
+});

 /**
 * Like `chunk`, but the cycles of the source pattern aren't repeated
@@ -2481,14 +2456,9 @@ export const { chunkBack, chunkback } = register(
 * .fastChunk(4, x => x.color('red')).slow(2)
 * .scale("C2:major").note()
 */
-export const { fastchunk, fastChunk } = register(
-  ['fastchunk', 'fastChunk'],
-  function (n, func, pat) {
-    return _chunk(n, func, pat, false, true);
-  },
-  true,
-  true,
-);
+export const { fastchunk, fastChunk } = register(['fastchunk', 'fastChunk'], function (n, func, pat) {
+  return _chunk(n, func, pat, false, true);
+});

 // TODO - redefine elsewhere in terms of mask
 export const bypass = register(
@@ -2502,24 +2472,16 @@ export const bypass = register(
 );

 /**
- * Loops the pattern inside an `offset` for `cycles`.
- * If you think of the entire span of time in cycles as a ribbon, you can cut a single piece and loop it.
- * @name ribbon
- * @synonym rib
+ * Loops the pattern inside at `offset` for `cycles`.
 * @param {number} offset start point of loop in cycles
 * @param {number} cycles loop length in cycles
 * @example
- * note("<c d e f>").ribbon(1, 2)
+ * note("<c d e f>").ribbon(1, 2).fast(2)
 * @example
 * // Looping a portion of randomness
- * n(irand(8).segment(4)).scale("c:pentatonic").ribbon(1337, 2)
- * @example
- * // rhythm generator
- * s("bd!16?").ribbon(29,.5)
+ * note(irand(8).segment(4).scale('C3 minor')).ribbon(1337, 2)
 */
-export const { ribbon, rib } = register(['ribbon', 'rib'], (offset, cycles, pat) =>
-  pat.early(offset).restart(pure(1).slow(cycles)),
-);
+export const ribbon = register('ribbon', (offset, cycles, pat) => pat.early(offset).restart(pure(1).slow(cycles)));

 export const hsla = register('hsla', (h, s, l, a, pat) => {
  return pat.color(`hsla(${h}turn,${s * 100}%,${l * 100}%,${a})`);
@@ -2673,10 +2635,34 @@ export function _polymeterListSteps(steps, ...args) {
 /**
 * *Experimental*
 *
- * Aligns the steps of the patterns, creating polymeters. The patterns are repeated until they all fit the cycle. For example, in the below the first pattern is repeated twice, and the second is repeated three times, to fit the lowest common multiple of six steps.
+ * Aligns the steps of the patterns, to match the given number of steps per cycle, creating polymeters.
+ *
+ * @name polymeterSteps
+ * @param  {number} steps how many items are placed in one cycle
+ * @param  {any[]} patterns one or more patterns
+ * @example
+ * // the same as "{c d, e f g}%4"
+ * polymeterSteps(4, "c d", "e f g").note()
+ */
+export function polymeterSteps(steps, ...args) {
+  if (args.length == 0) {
+    return silence;
+  }
+  if (Array.isArray(args[0])) {
+    // Support old behaviour
+    return _polymeterListSteps(steps, ...args);
+  }
+
+  return polymeter(...args).pace(steps);
+}
+
+/**
+ * *Experimental*
+ *
+ * Aligns the steps of the patterns, to match the steps per cycle of the first pattern, creating polymeters. See `polymeterSteps` to set the target steps explicitly.
 * @synonyms pm
 * @example
- * // The same as note("{c eb g, c2 g2}%6")
+ * // The same as note("{c eb g, c2 g2}")
 * polymeter("c eb g", "c2 g2").note()
 *
 */
@@ -2692,12 +2678,13 @@ export function polymeter(...args) {
  if (args.length == 0) {
    return silence;
  }
-  const steps = lcm(...args.map((x) => x._steps));
+  const steps = args[0]._steps;
  if (steps.eq(Fraction(0))) {
    return nothing;
  }
+  const [head, ...tail] = args;

-  const result = stack(...args.map((x) => x.pace(steps)));
+  const result = stack(head, ...tail.map((pat) => pat._slow(pat._steps.div(steps))));
  result._steps = steps;
  return result;
 }
@@ -2858,16 +2845,16 @@ export const drop = stepRegister('drop', function (i, pat) {
 /**
 * *Experimental*
 *
- * `extend` is similar to `fast` in that it increases its density, but it also increases the step count
- * accordingly. So `stepcat("a b".extend(2), "c d")` would be the same as `"a b a b c d"`, whereas
+ * `repeat` is similar to `fast` in that it 'speeds up' the pattern, but it also increases the step count
+ * accordingly. So `stepcat("a b".repeat(2), "c d")` would be the same as `"a b a b c d"`, whereas
 * `stepcat("a b".fast(2), "c d")` would be the same as `"[a b] [a b] c d"`.
 * @example
 * stepcat(
- *   sound("bd bd - cp").extend(2),
+ *   sound("bd bd - cp").repeat(2),
 *   sound("bd - sd -")
 * ).pace(8)
 */
-export const extend = stepRegister('extend', function (factor, pat) {
+export const repeat = stepRegister('repeat', function (factor, pat) {
  return pat.fast(factor).expand(factor);
 });

@@ -3065,6 +3052,8 @@ export const timeCat = stepcat;
 // Deprecated stepwise aliases
 export const s_cat = stepcat;
 export const s_alt = stepalt;
+export const s_polymeterSteps = polymeterSteps;
+Pattern.prototype.s_polymeterSteps = Pattern.prototype.polymeterSteps;
 export const s_polymeter = polymeter;
 Pattern.prototype.s_polymeter = Pattern.prototype.polymeter;
 export const s_taper = shrink;
@@ -3077,8 +3066,8 @@ export const s_sub = drop;
 Pattern.prototype.s_sub = Pattern.prototype.drop;
 export const s_expand = expand;
 Pattern.prototype.s_expand = Pattern.prototype.expand;
-export const s_extend = extend;
-Pattern.prototype.s_extend = Pattern.prototype.extend;
+export const s_extend = repeat;
+Pattern.prototype.s_extend = Pattern.prototype.repeat;
 export const s_contract = contract;
 Pattern.prototype.s_contract = Pattern.prototype.contract;
 export const s_tour = tour;
@@ -3192,25 +3181,6 @@ export const slice = register(
  false, // turns off auto-patternification
 );

-/**
- *
- * make something happen on event time
- * uses browser timeout which is innacurate for audio tasks
- * @name onTriggerTime
- * @memberof Pattern
- *  @returns Pattern
- * @example
- * s("bd!8").onTriggerTime((hap) => {console.info(hap)})
- */
-Pattern.prototype.onTriggerTime = function (func) {
-  return this.onTrigger((t_deprecate, hap, currentTime, cps = 1, targetTime) => {
-    const diff = targetTime - currentTime;
-    window.setTimeout(() => {
-      func(hap);
-    }, diff * 1000);
-  }, false);
-};
-
 /**
 * Works the same as slice, but changes the playback speed of each slice to match the duration of its step.
 * @name splice
@@ -1,6 +1,6 @@
 /*
 pick.mjs - methods that use one pattern to pick events from other patterns.
-Copyright (C) 2024 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/signal.mjs>
+Copyright (C) 2024 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/signal.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/>.
 */

@@ -156,7 +156,8 @@ export const pickmodReset = register('pickmodReset', function (lookup, pat) {
  return _pick(lookup, pat, true).resetJoin();
 });

-/** Picks patterns (or plain values) either from a list (by index) or a lookup table (by name).
+/**
+  /** * 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
   * @synonyms pickSqueeze
@@ -86,6 +86,7 @@ export function repl({
  const toggle = () => scheduler.toggle();
  const setCps = (cps) => scheduler.setCps(cps);
  const setCpm = (cpm) => scheduler.setCps(cpm / 60);
+  const setLoop = (start, length) => scheduler.setLoop(start, length);

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

@@ -167,6 +168,8 @@ export function repl({
      setcps: setCps,
      setCpm,
      setcpm: setCpm,
+      setLoop,
+      setloop: setLoop,
    });
  };

@@ -225,7 +228,7 @@ export function repl({
 export const getTrigger =
  ({ getTime, defaultOutput }) =>
  async (hap, deadline, duration, cps, t) => {
-    // TODO: get rid of deadline after https://codeberg.org/uzu/strudel/pulls/1004
+    // TODO: get rid of deadline after https://github.com/tidalcycles/strudel/pull/1004
    try {
      if (!hap.context.onTrigger || !hap.context.dominantTrigger) {
        await defaultOutput(hap, deadline, duration, cps, t);
@@ -1,11 +1,11 @@
 /*
 signal.mjs - continuous patterns
-Copyright (C) 2024 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/signal.mjs>
+Copyright (C) 2024 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/signal.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 { Hap } from './hap.mjs';
-import { Pattern, fastcat, pure, register, reify, silence, stack, sequenceP } from './pattern.mjs';
+import { Pattern, fastcat, pure, register, reify, silence, stack } from './pattern.mjs';
 import Fraction from './fraction.mjs';

 import { id, keyAlias, getCurrentKeyboardState } from './util.mjs';
@@ -20,6 +20,9 @@ export const signal = (func) => {
  return new Pattern(query);
 };

+export const isaw = signal((t) => 1 - (t % 1));
+export const isaw2 = isaw.toBipolar();
+
 /**
 *  A sawtooth signal between 0 and 1.
 *
@@ -33,40 +36,8 @@ export const signal = (func) => {
 *
 */
 export const saw = signal((t) => t % 1);
-
-/**
- *  A sawtooth signal between -1 and 1 (like `saw`, but bipolar).
- *
- * @return {Pattern}
- */
 export const saw2 = saw.toBipolar();

-/**
- *  A sawtooth signal between 1 and 0 (like `saw`, but flipped).
- *
- * @return {Pattern}
- * @example
- * note("<c3 [eb3,g3] g2 [g3,bb3]>*8")
- * .clip(isaw.slow(2))
- * @example
- * n(isaw.range(0,8).segment(8))
- * .scale('C major')
- *
- */
-export const isaw = signal((t) => 1 - (t % 1));
-
-/**
- *  A sawtooth signal between 1 and -1 (like `saw2`, but flipped).
- *
- * @return {Pattern}
- */
-export const isaw2 = isaw.toBipolar();
-
-/**
- *  A sine signal between -1 and 1 (like `sine`, but bipolar).
- *
- * @return {Pattern}
- */
 export const sine2 = signal((t) => Math.sin(Math.PI * 2 * t));

 /**
@@ -90,12 +61,6 @@ export const sine = sine2.fromBipolar();
 *
 */
 export const cosine = sine._early(Fraction(1).div(4));
-
-/**
- *  A cosine signal between -1 and 1 (like `cosine`, but bipolar).
- *
- * @return {Pattern}
- */
 export const cosine2 = sine2._early(Fraction(1).div(4));

 /**
@@ -107,12 +72,6 @@ export const cosine2 = sine2._early(Fraction(1).div(4));
 *
 */
 export const square = signal((t) => Math.floor((t * 2) % 2));
-
-/**
- *  A square signal between -1 and 1 (like `square`, but bipolar).
- *
- * @return {Pattern}
- */
 export const square2 = square.toBipolar();

 /**
@@ -123,37 +82,9 @@ export const square2 = square.toBipolar();
 * n(tri.segment(8).range(0,7)).scale("C:minor")
 *
 */
-export const tri = fastcat(saw, isaw);
+export const tri = fastcat(isaw, saw);
+export const tri2 = fastcat(isaw2, saw2);

-/**
- *  A triangle signal between -1 and 1 (like `tri`, but bipolar).
- *
- * @return {Pattern}
- */
-export const tri2 = fastcat(saw2, isaw2);
-
-/**
- *  An inverted triangle signal between 1 and 0 (like `tri`, but flipped).
- *
- * @return {Pattern}
- * @example
- * n(itri.segment(8).range(0,7)).scale("C:minor")
- *
- */
-export const itri = fastcat(isaw, saw);
-
-/**
- *  An inverted triangle signal between -1 and 1 (like `itri`, but bipolar).
- *
- * @return {Pattern}
- */
-export const itri2 = fastcat(isaw2, saw2);
-
-/**
- *  A signal representing the cycle time.
- *
- * @return {Pattern}
- */
 export const time = signal(id);

 /**
@@ -279,9 +210,9 @@ const _rearrangeWith = (ipat, n, pat) => {
 };

 /**
+ * @name shuffle
 * 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
 * @example
 * note("c d e f").sound("piano").shuffle(4)
 * @example
@@ -292,9 +223,9 @@ export const shuffle = register('shuffle', (n, pat) => {
 });

 /**
+ * @name scramble
 * 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
 * @example
 * note("c d e f").sound("piano").scramble(4)
 * @example
@@ -433,30 +364,19 @@ export const chooseCycles = (...xs) => chooseInWith(rand.segment(1), xs);
 export const randcat = chooseCycles;

 const _wchooseWith = function (pat, ...pairs) {
-  // A list of patterns of values
  const values = pairs.map((pair) => reify(pair[0]));
-
-  // A list of weight patterns
  const weights = [];
-
-  let total = pure(0);
+  let accum = 0;
  for (const pair of pairs) {
-    // 'add' accepts either values or patterns of values here, so no need
-    // to explicitly reify
-    total = total.add(pair[1]);
-    // accumulate our list of weight patterns
-    weights.push(total);
+    accum += pair[1];
+    weights.push(accum);
  }
-  // a pattern of lists of weights
-  const weightspat = sequenceP(weights);
-
-  // Takes a number from 0-1, returns a pattern of patterns of values
+  const total = accum;
  const match = function (r) {
-    const findpat = total.mul(r);
-    return weightspat.fmap((weights) => (find) => values[weights.findIndex((x) => x > find, weights)]).appLeft(findpat);
+    const find = r * total;
+    return values[weights.findIndex((x) => x > find, weights)];
  };
-  // This returns a pattern of patterns.. The innerJoin is in wchooseCycles
-  return pat.bind(match);
+  return pat.fmap(match);
 };

 const wchooseWith = (...args) => _wchooseWith(...args).outerJoin();
@@ -478,42 +398,18 @@ export const wchoose = (...pairs) => wchooseWith(rand, ...pairs);
 * wchooseCycles(["bd",10], ["hh",1], ["sd",1]).s().fast(8)
 * @example
 * wchooseCycles(["bd bd bd",5], ["hh hh hh",3], ["sd sd sd",1]).fast(4).s()
- * @example
- * // The probability can itself be a pattern
- * wchooseCycles(["bd(3,8)","<5 0>"], ["hh hh hh",3]).fast(4).s()
 */
 export const wchooseCycles = (...pairs) => _wchooseWith(rand.segment(1), ...pairs).innerJoin();

 export const wrandcat = wchooseCycles;

-function _perlin(t) {
-  let ta = Math.floor(t);
-  let tb = ta + 1;
+// this function expects pat to be a pattern of floats...
+export const perlinWith = (pat) => {
+  const pata = pat.fmap(Math.floor);
+  const patb = pat.fmap((t) => Math.floor(t) + 1);
  const smootherStep = (x) => 6.0 * x ** 5 - 15.0 * x ** 4 + 10.0 * x ** 3;
  const interp = (x) => (a) => (b) => a + smootherStep(x) * (b - a);
-  const v = interp(t - ta)(timeToRand(ta))(timeToRand(tb));
-  return v;
-}
-export const perlinWith = (tpat) => {
-  return tpat.fmap(_perlin);
-};
-
-function _berlin(t) {
-  const prevRidgeStartIndex = Math.floor(t);
-  const nextRidgeStartIndex = prevRidgeStartIndex + 1;
-
-  const prevRidgeBottomPoint = timeToRand(prevRidgeStartIndex);
-  const nextRidgeTopPoint = timeToRand(nextRidgeStartIndex) + prevRidgeBottomPoint;
-
-  const currentPercent = (t - prevRidgeStartIndex) / (nextRidgeStartIndex - prevRidgeStartIndex);
-  const interp = (a, b, t) => {
-    return a + (b - a) * t;
-  };
-  return interp(prevRidgeBottomPoint, nextRidgeTopPoint, currentPercent) / 2;
-}
-
-export const berlinWith = (tpat) => {
-  return tpat.fmap(_berlin);
+  return pat.sub(pata).fmap(interp).appBoth(pata.fmap(timeToRand)).appBoth(patb.fmap(timeToRand));
 };

 /**
@@ -527,18 +423,6 @@ export const berlinWith = (tpat) => {
 */
 export const perlin = perlinWith(time.fmap((v) => Number(v)));

-/**
- * 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.
- *
- * @name berlin
- * @example
- * // ascending arpeggios
- * n("0!16".add(berlin.fast(4).mul(14))).scale("d:minor")
- *
- */
-export const berlin = berlinWith(time.fmap((v) => Number(v)));
-
 export const degradeByWith = register(
  'degradeByWith',
  (withPat, x, pat) => pat.fmap((a) => (_) => a).appLeft(withPat.filterValues((v) => v > x)),
@@ -559,9 +443,6 @@ export const degradeByWith = register(
 * s("hh*8").degradeBy(0.2)
 * @example
 * s("[hh?0.2]*8")
- * @example
- * //beat generator
- * s("bd").segment(16).degradeBy(.5).ribbon(16,1)
 */
 export const degradeBy = register(
  'degradeBy',
@@ -1,6 +1,6 @@
 /*
 speak.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/speak.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/speak.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/>.
 */

@@ -1,6 +1,6 @@
 /*
 state.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/state.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/state.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/>.
 */

@@ -1,6 +1,6 @@
 /*
 controls.test.mjs - <short description TODO>
-Copyright (C) 2023 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/test/controls.test.mjs>
+Copyright (C) 2023 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/test/controls.test.mjs>
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

@@ -1,6 +1,6 @@
 /*
 drawLine.test.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/test/drawLine.test.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/test/drawLine.test.mjs>
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

@@ -1,89 +0,0 @@
-import { bjork } from '../euclid.mjs';
-import { describe, expect, it } from 'vitest';
-import { fastcat } from '../pattern.mjs';
-
-describe('bjork', () => {
-  it('should apply bjorklund to ons and steps', () => {
-    expect(bjork(3, 8)).toStrictEqual([1, 0, 0, 1, 0, 0, 1, 0]);
-    expect(bjork(-3, 8)).toStrictEqual([0, 1, 1, 0, 1, 1, 0, 1]);
-    expect(bjork(8, 8)).toStrictEqual([1, 1, 1, 1, 1, 1, 1, 1]);
-    expect(bjork(-8, 8)).toStrictEqual([0, 0, 0, 0, 0, 0, 0, 0]);
-    expect(bjork(5, 8)).toStrictEqual([1, 0, 1, 1, 0, 1, 1, 0]);
-  });
-});
-
-describe('euclid', () => {
-  it('Can create euclid', () => {
-    expect(
-      fastcat('a')
-        .euclid(3, 8)
-        .firstCycle()
-        .sort((a, b) => a.part.begin.sub(b.part.begin))
-        .map((a) => a.showWhole(true)),
-    ).toStrictEqual(['0/1 → 1/8: a', '3/8 → 1/2: a', '3/4 → 7/8: a']);
-    expect(
-      fastcat('a')
-        .euclid(5, 8)
-        .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', () => {
-  it('Can create euclidRot', () => {
-    expect(
-      fastcat('a')
-        .euclidRot(3, 8, 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', '5/8 → 3/4: a']);
-    expect(
-      fastcat('a')
-        .euclidRot(5, 8, 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', '1/2 → 5/8: a', '5/8 → 3/4: a', '7/8 → 1/1: a']);
-  });
-});
-
-describe('euclidLegato', () => {
-  it('Can create euclidLegato', () => {
-    expect(
-      fastcat('a')
-        .euclidLegato(3, 8)
-        .firstCycle()
-        .sort((a, b) => a.part.begin.sub(b.part.begin))
-        .map((a) => a.showWhole(true)),
-    ).toStrictEqual(['0/1 → 3/8: a', '3/8 → 3/4: a', '3/4 → 1/1: a']);
-    expect(
-      fastcat('a')
-        .euclidLegato(5, 8)
-        .firstCycle()
-        .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', () => {
-  it('Can create euclidLegatoRot', () => {
-    expect(
-      fastcat('a')
-        .euclidLegatoRot(3, 8, 2)
-        .firstCycle()
-        .sort((a, b) => a.part.begin.sub(b.part.begin))
-        .map((a) => a.showWhole(true)),
-    ).toStrictEqual(['0/1 → 1/4: a', '1/4 → 5/8: a', '5/8 → 1/1: a']);
-    expect(
-      fastcat('a')
-        .euclidLegatoRot(5, 8, 2)
-        .firstCycle()
-        .sort((a, b) => a.part.begin.sub(b.part.begin))
-        .map((a) => a.showWhole(true)),
-    ).toStrictEqual(['0/1 → 1/4: a', '1/4 → 1/2: a', '1/2 → 5/8: a', '5/8 → 7/8: a', '7/8 → 1/1: a']);
-  });
-});
@@ -1,6 +1,6 @@
 /*
 fraction.test.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/test/fraction.test.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/test/fraction.test.mjs>
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

@@ -1,6 +1,6 @@
 /*
 pattern.test.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/test/pattern.test.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/test/pattern.test.mjs>
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

@@ -22,6 +22,7 @@ import {
  sequence,
  palindrome,
  polymeter,
+  polymeterSteps,
  polyrhythm,
  silence,
  fast,
@@ -610,10 +611,17 @@ describe('Pattern', () => {
  });
  describe('polymeter()', () => {
    it('Can layer up cycles, stepwise, with lists', () => {
+      expect(polymeterSteps(3, ['d', 'e']).firstCycle()).toStrictEqual(
+        fastcat(pure('d'), pure('e'), pure('d')).firstCycle(),
+      );
+
      expect(polymeter(['a', 'b', 'c'], ['d', 'e']).fast(2).firstCycle()).toStrictEqual(
        stack(sequence('a', 'b', 'c', 'a', 'b', 'c'), sequence('d', 'e', 'd', 'e', 'd', 'e')).firstCycle(),
      );
    });
+    it('Can layer up cycles, stepwise, with weighted patterns', () => {
+      sameFirst(polymeterSteps(3, sequence('a', 'b')).fast(2), sequence('a', 'b', 'a', 'b', 'a', 'b'));
+    });
  });

  describe('firstOf()', () => {
@@ -1257,14 +1265,4 @@ describe('Pattern', () => {
      expect(s('bev').chop(8).loopAt(2)._steps).toStrictEqual(Fraction(4));
    });
  });
-  describe('bite', () => {
-    it('works with uneven patterns', () => {
-      sameFirst(
-        fastcat(slowcat('a', 'b', 'c', 'd', 'e'), slowcat(1, 2, 3, 4, 5))
-          .bite(2, stepcat(pure(0), pure(1).expand(2)))
-          .fast(5),
-        stepcat(slowcat('a', 'b', 'c', 'd', 'e'), slowcat(1, 2, 3, 4, 5).expand(2)).fast(5),
-      );
-    });
-  });
 });
@@ -1,30 +1,26 @@
 /*
 util.test.mjs - Tests for the core 'util' module
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/test/util.test.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/test/util.test.mjs>
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 import { pure } from '../pattern.mjs';
 import {
+  isNote,
+  tokenizeNote,
+  noteToMidi,
+  midiToFreq,
+  freqToMidi,
  _mod,
  compose,
-  flatten,
-  fractionalArgs,
-  freqToMidi,
  getFrequency,
  getPlayableNoteValue,
-  isNote,
-  midiToFreq,
-  noteToMidi,
-  numeralArgs,
-  parseFractional,
  parseNumeral,
-  rotate,
-  splitAt,
-  tokenizeNote,
-  zipWith,
+  parseFractional,
+  numeralArgs,
+  fractionalArgs,
 } from '../util.mjs';
-import { describe, expect, it } from 'vitest';
+import { describe, it, expect } from 'vitest';

 describe('isNote', () => {
  it('should recognize notes without accidentals', () => {
@@ -237,46 +233,3 @@ describe('fractionalArgs', () => {
    expect(add('q', 2)).toBe(2.25);
  });
 });
-
-describe('rotate', () => {
-  it('should rotate array to the left', () => {
-    expect(rotate([0, 1, 2, 3], 2)).toStrictEqual([2, 3, 0, 1]);
-    expect(rotate([0, 1, 2, 3], 0)).toStrictEqual([0, 1, 2, 3]);
-    expect(rotate([0, 1, 2, 3], -3)).toStrictEqual([1, 2, 3, 0]);
-    expect(rotate([0, 1, 2, 3], 3)).toStrictEqual([3, 0, 1, 2]);
-    expect(rotate([0], 3)).toStrictEqual([0]);
-    expect(rotate([], 3)).toStrictEqual([]);
-  });
-});
-
-describe('flatten', () => {
-  it('should flatten array by one level', () => {
-    expect(flatten([0, 1, 2, 3])).toStrictEqual([0, 1, 2, 3]);
-    expect(flatten([0, 1, [2, 3]])).toStrictEqual([0, 1, 2, 3]);
-    expect(flatten([0, [1, [2, 3]]])).toStrictEqual([0, 1, [2, 3]]);
-    expect(flatten([0])).toStrictEqual([0]);
-    expect(flatten([])).toStrictEqual([]);
-  });
-});
-
-describe('splitAt', () => {
-  it('should split array into two', () => {
-    expect(splitAt(2, [0, 1, 2, 3])).toStrictEqual([
-      [0, 1],
-      [2, 3],
-    ]);
-    expect(splitAt(0, [0, 1, 2, 3])).toStrictEqual([[], [0, 1, 2, 3]]);
-    expect(splitAt(-3, [0, 1, 2, 3])).toStrictEqual([[0], [1, 2, 3]]);
-    expect(splitAt(3, [0, 1, 2, 3])).toStrictEqual([[0, 1, 2], [3]]);
-  });
-});
-
-describe('zipWith', () => {
-  it('should use the function to combine the two arrays element-wise', () => {
-    expect(zipWith((a, b) => a + b, [0, 1, 2, 3], [0, 1, 2, 3])).toStrictEqual([0, 2, 4, 6]);
-    expect(zipWith((a, b) => a + b, [0, 1, 2, 3], [0, 1, 2])).toStrictEqual([0, 2, 4, NaN]);
-    expect(zipWith((a, b) => a + b, [0, 1, 2], [0, 1, 2, 3])).toStrictEqual([0, 2, 4]);
-    expect(zipWith((a) => a, [0, 1, 2], [1, 2, 3, 0])).toStrictEqual([0, 1, 2]);
-    expect(zipWith((a, b) => b, [0, 1, 2], [1, 2, 3, 0])).toStrictEqual([1, 2, 3]);
-  });
-});
@@ -1,6 +1,6 @@
 /*
 value.test.mjs - <short description TODO>
-Copyright (C) 2025 Strudel contributors - see <https://codeberg.org/uzu/strudel/activity/contributors>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/test/value.test.mjs>
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

@@ -1,6 +1,6 @@
 /*
 timespan.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/timespan.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/timespan.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/>.
 */

@@ -1,6 +1,6 @@
 /*
 ui.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/ui.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/ui.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/>.
 */

@@ -1,6 +1,6 @@
 /*
 util.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/util.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/util.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/>.
 */

@@ -162,7 +162,6 @@ export const compose = (...funcs) => pipe(...funcs.reverse());
 // Removes 'None' values from given list
 export const removeUndefineds = (xs) => xs.filter((x) => x != undefined);

-// flattens by one level
 export const flatten = (arr) => [].concat(...arr);

 export const id = (a) => a;
@@ -238,7 +237,6 @@ export const splitAt = function (index, value) {
  return [value.slice(0, index), value.slice(index)];
 };

-// Uses the function f to combine the arrays xs, ys element-wise
 export const zipWith = (f, xs, ys) => xs.map((n, i) => f(n, ys[i]));

 export const pairs = function (xs) {
@@ -1,6 +1,6 @@
 /*
 value.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/value.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/value.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/>.
 */

@@ -9,7 +9,7 @@ import { logger } from './logger.mjs';

 export function unionWithObj(a, b, func) {
  if (b?.value !== undefined && Object.keys(b).length === 1) {
-    // https://codeberg.org/uzu/strudel/issues/1026
+    // https://github.com/tidalcycles/strudel/issues/1026
    logger(`[warn]: Can't do arithmetic on control pattern.`);
    return a;
  }
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/csound",
-  "version": "1.2.3",
+  "version": "1.1.0",
  "description": "csound bindings for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -13,7 +13,7 @@
  },
  "repository": {
    "type": "git",
-    "url": "git+https://codeberg.org/uzu/strudel.git"
+    "url": "git+https://github.com/tidalcycles/strudel.git"
  },
  "keywords": [
    "tidalcycles",
@@ -28,9 +28,9 @@
  ],
  "license": "AGPL-3.0-or-later",
  "bugs": {
-    "url": "https://codeberg.org/uzu/strudel/issues"
+    "url": "https://github.com/tidalcycles/strudel/issues"
  },
-  "homepage": "https://codeberg.org/uzu/strudel#readme",
+  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
    "@csound/browser": "6.18.7",
    "@strudel/core": "workspace:*",
@@ -1,6 +1,6 @@
 /*
 index.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/desktopbridge/index.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/desktopbridge/index.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/>.
 */

@@ -7,7 +7,7 @@
  "type": "module",
  "repository": {
    "type": "git",
-    "url": "git+https://codeberg.org/uzu/strudel.git"
+    "url": "git+https://github.com/tidalcycles/strudel.git"
  },
  "keywords": [
    "tidalcycles",
@@ -19,11 +19,11 @@
  "author": "Jade Rowland <jaderowlanddev@gmail.com>",
  "license": "AGPL-3.0-or-later",
  "bugs": {
-    "url": "https://codeberg.org/uzu/strudel/issues"
+    "url": "https://github.com/tidalcycles/strudel/issues"
  },
  "dependencies": {
    "@strudel/core": "workspace:*",
    "@tauri-apps/api": "^2.2.0"
  },
-  "homepage": "https://codeberg.org/uzu/strudel#readme"
-}
+  "homepage": "https://github.com/tidalcycles/strudel#readme"
+}
@@ -0,0 +1,16 @@
+import { Pattern } from '@strudel/core';
+
+Pattern.prototype.cyclecounter = function (options = {}) {
+  return this.onPaint((ctx, time, haps, drawTime) => {
+    ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
+
+    ctx.font = options.font || '2em monospace';
+    ctx.fillStyle = options.color || 'red';
+    ctx.textBaseline = 'bottom';
+    ctx.textAlign = 'right';
+
+    const div = options.div || 1;
+
+    ctx.fillText('Cycle' + (div > 1 ? '/' + div : '') + ' ' + ((time / div) >> 0), ctx.canvas.width, ctx.canvas.height);
+  });
+};
@@ -1,6 +1,6 @@
 /*
 draw.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/canvas/draw.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/canvas/draw.mjs>
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

@@ -4,3 +4,4 @@ export * from './draw.mjs';
 export * from './pianoroll.mjs';
 export * from './spiral.mjs';
 export * from './pitchwheel.mjs';
+export * from './cyclecounter.mjs';
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/draw",
-  "version": "1.2.2",
+  "version": "1.1.0",
  "description": "Helpers for drawing with Strudel",
  "main": "index.mjs",
  "type": "module",
@@ -13,7 +13,7 @@
  },
  "repository": {
    "type": "git",
-    "url": "git+https://codeberg.org/uzu/strudel.git"
+    "url": "git+https://github.com/tidalcycles/strudel.git"
  },
  "keywords": [
    "titdalcycles",
@@ -25,9 +25,9 @@
  "author": "Felix Roos <flix91@gmail.com>",
  "license": "AGPL-3.0-or-later",
  "bugs": {
-    "url": "https://codeberg.org/uzu/strudel/issues"
+    "url": "https://github.com/tidalcycles/strudel/issues"
  },
-  "homepage": "https://codeberg.org/uzu/strudel#readme",
+  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
    "@strudel/core": "workspace:*"
  },
@@ -1,6 +1,6 @@
 /*
 pianoroll.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/canvas/pianoroll.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/canvas/pianoroll.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/>.
 */

@@ -6,7 +6,7 @@
  "type": "module",
  "repository": {
    "type": "git",
-    "url": "git+https://codeberg.org/uzu/strudel.git"
+    "url": "git+https://github.com/tidalcycles/strudel.git"
  },
  "keywords": [
    "tidalcycles",
@@ -18,7 +18,7 @@
  "author": "Felix Roos <flix91@gmail.com>",
  "license": "AGPL-3.0-or-later",
  "bugs": {
-    "url": "https://codeberg.org/uzu/strudel/issues"
+    "url": "https://github.com/tidalcycles/strudel/issues"
  },
-  "homepage": "https://codeberg.org/uzu/strudel#readme"
+  "homepage": "https://github.com/tidalcycles/strudel#readme"
 }
@@ -1,93 +0,0 @@
-# @strudel/gamepad
-
-This package adds gamepad input functionality to strudel Patterns.
-
-## Install
-
-```sh
-npm i @strudel/gamepad --save
-```
-
-## Usage
-
-```javascript
-import { gamepad } from '@strudel/gamepad';
-
-// Initialize gamepad (optional index parameter, defaults to 0)
-const pad = gamepad(0);
-
-// Use gamepad inputs in patterns
-const pattern = sequence([
-  // Button inputs
-  pad.a,        // A button value (0-1)
-  pad.tglA,     // A button toggle (0 or 1)
-  
-  // Analog stick inputs
-  pad.x1,       // Left stick X (0-1)
-  pad.x1_2,     // Left stick X (-1 to 1)
-]);
-```
-
-## Available Controls
-
-### Buttons
- Face Buttons
-  - `a`, `b`, `x`, `y` (or uppercase `A`, `B`, `X`, `Y`)
-  - Toggle versions: `tglA`, `tglB`, `tglX`, `tglY`
- Shoulder Buttons
-  - `lb`, `rb`, `lt`, `rt` (or uppercase `LB`, `RB`, `LT`, `RT`)
-  - Toggle versions: `tglLB`, `tglRB`, `tglLT`, `tglRT`
- D-Pad
-  - `up`, `down`, `left`, `right` (or `u`, `d`, `l`, `r` or uppercase)
-  - Toggle versions: `tglUp`, `tglDown`, `tglLeft`, `tglRight`(or `tglU`, `tglD`, `tglL`, `tglR`)
-
-### Analog Sticks
- Left Stick
-  - `x1`, `y1` (0 to 1 range)
-  - `x1_2`, `y1_2` (-1 to 1 range)
- Right Stick
-  - `x2`, `y2` (0 to 1 range)
-  - `x2_2`, `y2_2` (-1 to 1 range)
-
-## Examples
-
-```javascript
-// Use button values to control amplitude
-$: sequence([
-  s("bd").gain(pad.X),    // X button controls gain
-  s("[hh oh]").gain(pad.tglY),    // Y button toggles gain
-]);
-
-// Use analog stick for continuous control
-$: note("c4*4".add(pad.y1_2.range(-24,24))) // Left stick Y controls pitch shift
-  .pan(pad.x1_2);          // Left stick X controls panning
-
-// Use toggle buttons to switch patterns on/off
-
-// Define button sequences
-const HADOKEN = [
-  'd',               // Down
-  'r',               // Right
-  'a',               // A
-];
-
-const KONAMI = 'uuddlrlrba' //Konami Code ↑↑↓↓←→←→BA
-
-// Add these lines to enable buttons(but why?)
-$:pad.D.segment(16).gain(0)
-$:pad.R.segment(16).gain(0)
-$:pad.A.segment(16).gain(0)
-
-// Check button sequence (returns 1 when detected, 0 when not within last 1 second)
-$: sound("hadoken").gain(pad.checkSequence(HADOKEN))
-
-```
-
-## Multiple Gamepads
-
-You can connect multiple gamepads by specifying the gamepad index:
-
-```javascript
-const pad1 = gamepad(0);  // First gamepad
-const pad2 = gamepad(1);  // Second gamepad
-```
@@ -1,117 +0,0 @@
-import { MiniRepl } from '../../../website/src/docs/MiniRepl';
-
-# Gamepad
-
-The Gamepad module allows you to integrate gamepad input functionality into your musical patterns. This can be particularly useful for live performances or interactive installations where you want to manipulate sounds using a game controller.
-
-## Getting Started
-
-Initialize a gamepad by calling the gamepad() function with an optional index parameter.
-
-<MiniRepl
-  client:idle
-  tune={`// Initialize gamepad (optional index parameter, defaults to 0)
-const gp = gamepad(0)
-note("c a f e").mask(gp.a)`}
-/>
-
-## Available Controls
-
-The gamepad module provides access to buttons and analog sticks as normalized signals (0-1) that can modulate your patterns.
-
-### Buttons
-
-| Type             | Controls                                                                                       |
-| ---------------- | ---------------------------------------------------------------------------------------------- |
-| Face Buttons     | `a`, `b`, `x`, `y` (or uppercase `A`, `B`, `X`, `Y`)                                           |
-|                  | Toggle versions: `tglA`, `tglB`, `tglX`, `tglY`                                                |
-| Shoulder Buttons | `lb`, `rb`, `lt`, `rt` (or uppercase `LB`, `RB`, `LT`, `RT`)                                   |
-|                  | Toggle versions: `tglLB`, `tglRB`, `tglLT`, `tglRT`                                            |
-| D-Pad            | `up`, `down`, `left`, `right` (or `u`, `d`, `l`, `r` or uppercase)                             |
-|                  | Toggle versions: `tglUp`, `tglDown`, `tglLeft`, `tglRight` (or `tglU`, `tglD`, `tglL`, `tglR`) |
-
-### Analog Sticks
-
-| Stick       | Controls                       |
-| ----------- | ------------------------------ |
-| Left Stick  | `x1`, `y1` (0 to 1 range)      |
-|             | `x1_2`, `y1_2` (-1 to 1 range) |
-| Right Stick | `x2`, `y2` (0 to 1 range)      |
-|             | `x2_2`, `y2_2` (-1 to 1 range) |
-
-### Button Sequence
-
-| Stick           | Controls                                |
-| --------------- | --------------------------------------- |
-| Button Sequence | `btnSequence()`, `btnSeq()`, `btnseq()` |
-
-## Using Gamepad Inputs
-
-Once initialized, you can use various gamepad inputs in your patterns. Here are some examples:
-
-### Button Inputs
-
-You can use button inputs to control different aspects of your music, such as gain or triggering events.
-
-<MiniRepl
-  client:idle
-  tune={`const gp = gamepad(0)
-  // Use button values to control amplitude
-$: stack(
-  s("[[hh hh] oh hh oh]/2").mask(gp.tglX).bank("RolandTR909"), // X btn for HH
-   s("cr*1").mask(gp.Y).bank("RolandTR909"), // LB btn for CR
-  s("bd").mask(gp.tglA).bank("RolandTR909"), // A btn for BD
-  s("[ht - - mt - - lt - ]/2").mask(gp.tglB).bank("RolandTR909"), // B btn for Toms
-  s("sd*4").mask(gp.RB).bank("RolandTR909"), // RB btn for SD
-).cpm(120)
-`}
-/>
-
-### Analog Stick Inputs
-
-Analog sticks can be used for continuous control, such as pitch shifting or panning.
-
-<MiniRepl
-  client:idle
-  tune={`const gp = gamepad(0)
-  // Use analog stick for continuous control
-$: note("c4 d3 a3 e3").sound("sawtooth") 
-  .lpf(gp.x1.range(100,4000)) 
-  .lpq(gp.y1.range(5,30))
-  .decay(gp.y2.range(0.1,2))
-  .lpenv(gp.x2.range(-5,5))
-  .cpm(120)
-  `}
-/>
-
-### Button Sequences
-
-You can define button sequences to trigger specific actions, like playing a sound when a sequence is detected.
-
-<MiniRepl client:idle tune={`const gp = gamepad(0)
-// Define button sequences
-const HADOUKEN = [
-  'd',               // Down
-  'r',               // Right
-  'a',               // A
-]
-const KONAMI = 'uuddlrlrba' //Konami Code ↑↑↓↓←→←→BA
-
-// Check butto-n sequence (returns 1 while detected, 0 when not within last 1 second)
-$: s("free_hadouken -").slow(2)
-.mask(gp.btnSequence(HADOUKEN)).room(1).cpm(120)
-
-// hadouken.wav by Syna-Max
-//https://freesound.org/people/Syna-Max/sounds/67674/
-samples({free_hadouken: 'https://cdn.freesound.org/previews/67/67674_111920-lq.mp3'})
-`} />
-
-## Multiple Gamepads
-
-Strudel supports multiple gamepads. You can specify the gamepad index to connect to different devices.
-
-<MiniRepl
-  client:idle
-  tune={`const pad1 = gamepad(0);  // First gamepad
-const pad2 = gamepad(1);  // Second gamepad`}
-/>
@@ -1,246 +0,0 @@
-// @strudel/gamepad/index.mjs
-
-import { signal } from '@strudel/core';
-
-// Button mapping for Logitech Dual Action (STANDARD GAMEPAD Vendor: 046d Product: c216)
-export const buttonMap = {
-  a: 0,
-  b: 1,
-  x: 2,
-  y: 3,
-  lb: 4,
-  rb: 5,
-  lt: 6,
-  rt: 7,
-  back: 8,
-  start: 9,
-  u: 12,
-  up: 12,
-  d: 13,
-  down: 13,
-  l: 14,
-  left: 14,
-  r: 15,
-  right: 15,
-};
-
-class ButtonSequenceDetector {
-  constructor(timeWindow = 1000) {
-    this.sequence = [];
-    this.timeWindow = timeWindow;
-    this.lastInputTime = 0;
-    this.buttonStates = Array(16).fill(0); // Track previous state of each button
-    // Button mapping for character inputs
-  }
-
-  addInput(buttonIndex, buttonValue) {
-    const currentTime = Date.now();
-
-    // Only add input on button press (rising edge)
-    if (buttonValue === 1 && this.buttonStates[buttonIndex] === 0) {
-      // Clear sequence if too much time has passed
-      if (currentTime - this.lastInputTime > this.timeWindow) {
-        this.sequence = [];
-      }
-
-      // Store the button name instead of index
-      const buttonName = Object.keys(buttonMap).find((key) => buttonMap[key] === buttonIndex) || buttonIndex.toString();
-
-      this.sequence.push({
-        input: buttonName,
-        timestamp: currentTime,
-      });
-
-      this.lastInputTime = currentTime;
-
-      //console.log(this.sequence);
-      // Keep only inputs within the time window
-      this.sequence = this.sequence.filter((entry) => currentTime - entry.timestamp <= this.timeWindow);
-    }
-
-    // Update button state
-    this.buttonStates[buttonIndex] = buttonValue;
-  }
-
-  checkSequence(targetSequence) {
-    if (!Array.isArray(targetSequence) && typeof targetSequence !== 'string') {
-      console.error('ButtonSequenceDetector: targetSequence must be an array or string');
-      return 0;
-    }
-
-    if (this.sequence.length < targetSequence.length) return 0;
-
-    // Convert string input to array if needed
-    const sequence =
-      typeof targetSequence === 'string'
-        ? targetSequence.toLowerCase().split('')
-        : targetSequence.map((s) => s.toString().toLowerCase());
-
-    //console.log(this.sequence);
-
-    // Get the last n inputs where n is the target sequence length
-    const lastInputs = this.sequence.slice(-targetSequence.length).map((entry) => entry.input);
-
-    // Compare sequences
-    return lastInputs.every((input, index) => {
-      const target = sequence[index];
-      // Check if either the input matches directly or they refer to the same button in the map
-      return (
-        input === target ||
-        buttonMap[input] === buttonMap[target] ||
-        // Also check if the numerical index matches
-        buttonMap[input] === parseInt(target)
-      );
-    })
-      ? 1
-      : 0;
-  }
-}
-
-class GamepadHandler {
-  constructor(index = 0) {
-    // Add index parameter
-    this._gamepads = {};
-    this._activeGamepad = index; // Use provided index
-    this._axes = [0, 0, 0, 0];
-    this._buttons = Array(16).fill(0);
-    this.setupEventListeners();
-  }
-
-  setupEventListeners() {
-    window.addEventListener('gamepadconnected', (e) => {
-      this._gamepads[e.gamepad.index] = e.gamepad;
-      if (!this._activeGamepad) {
-        this._activeGamepad = e.gamepad.index;
-      }
-    });
-
-    window.addEventListener('gamepaddisconnected', (e) => {
-      delete this._gamepads[e.gamepad.index];
-      if (this._activeGamepad === e.gamepad.index) {
-        this._activeGamepad = Object.keys(this._gamepads)[0] || null;
-      }
-    });
-  }
-
-  poll() {
-    if (this._activeGamepad !== null) {
-      const gamepad = navigator.getGamepads()[this._activeGamepad];
-      if (gamepad) {
-        // Update axes (normalized to 0-1 range)
-        this._axes = gamepad.axes.map((axis) => (axis + 1) / 2);
-        // Update buttons
-        this._buttons = gamepad.buttons.map((button) => button.value);
-      }
-    }
-  }
-
-  getAxes() {
-    return this._axes;
-  }
-  getButtons() {
-    return this._buttons;
-  }
-}
-
-// Module-level state store for toggle states
-const gamepadStates = new Map();
-
-export const gamepad = (index = 0) => {
-  const handler = new GamepadHandler(index);
-  const sequenceDetector = new ButtonSequenceDetector(2000);
-
-  // Base signal that polls gamepad state and handles sequence detection
-  const baseSignal = signal((t) => {
-    handler.poll();
-    const axes = handler.getAxes();
-    const buttons = handler.getButtons();
-
-    // Add all button inputs to sequence detector
-    buttons.forEach((value, i) => {
-      sequenceDetector.addInput(i, value);
-    });
-
-    return { axes, buttons, t };
-  });
-
-  // Create axes patterns
-  const axes = {
-    x1: baseSignal.fmap((state) => state.axes[0]),
-    y1: baseSignal.fmap((state) => state.axes[1]),
-    x2: baseSignal.fmap((state) => state.axes[2]),
-    y2: baseSignal.fmap((state) => state.axes[3]),
-  };
-
-  // Add bipolar versions
-  axes.x1_2 = axes.x1.toBipolar();
-  axes.y1_2 = axes.y1.toBipolar();
-  axes.x2_2 = axes.x2.toBipolar();
-  axes.y2_2 = axes.y2.toBipolar();
-
-  // Create button patterns
-  const buttons = Array(16)
-    .fill(null)
-    .map((_, i) => {
-      // Create unique key for this gamepad+button combination
-      const stateKey = `gamepad${index}_btn${i}`;
-
-      // Initialize toggle state if it doesn't exist
-      if (!gamepadStates.has(stateKey)) {
-        gamepadStates.set(stateKey, {
-          lastButtonState: 0,
-          toggleState: 0,
-        });
-      }
-
-      // Direct button value pattern (no longer needs to call addInput)
-      const btn = baseSignal.fmap((state) => state.buttons[i]);
-
-      // Button toggle pattern with persistent state
-      const toggle = baseSignal.fmap((state) => {
-        const currentState = state.buttons[i];
-        const buttonState = gamepadStates.get(stateKey);
-
-        if (currentState === 1 && buttonState.lastButtonState === 0) {
-          // Toggle the state on rising edge
-          buttonState.toggleState = buttonState.toggleState === 0 ? 1 : 0;
-        }
-
-        buttonState.lastButtonState = currentState;
-        return buttonState.toggleState;
-      });
-
-      return { value: btn, toggle };
-    });
-
-  // Create sequence checker pattern
-  const btnSequence = (sequence) => {
-    return baseSignal.fmap(() => sequenceDetector.checkSequence(sequence));
-  };
-  const checkSequence = btnSequence;
-  const btnSeq = btnSequence;
-  const btnseq = btnSeq;
-
-  // Return an object with all controls
-  return {
-    ...axes,
-    buttons,
-    ...Object.fromEntries(
-      Object.entries(buttonMap).flatMap(([key, index]) => [
-        [key.toLowerCase(), buttons[index].value],
-        [key.toUpperCase(), buttons[index].value],
-        [`tgl${key.toLowerCase()}`, buttons[index].toggle],
-        [`tgl${key.toUpperCase()}`, buttons[index].toggle],
-      ]),
-    ),
-    checkSequence,
-    btnSequence,
-    btnSeq,
-    btnseq,
-    raw: baseSignal,
-  };
-};
-
-// Optional: Export for debugging or state management
-export const getGamepadStates = () => Object.fromEntries(gamepadStates);
-export const clearGamepadStates = () => gamepadStates.clear();
@@ -1,3 +0,0 @@
-import './gamepad.mjs';
-
-export * from './gamepad.mjs';
@@ -1,37 +0,0 @@
-{
-  "name": "@strudel/gamepad",
-  "version": "1.2.2",
-  "description": "Gamepad Inputs for strudel",
-  "main": "index.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": [
-    "titdalcycles",
-    "strudel",
-    "pattern",
-    "livecoding",
-    "algorave"
-  ],
-  "author": "Yuta Nakayama <nkymut@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:*"
-  },
-  "devDependencies": {
-    "vite": "^6.0.11"
-  }
-}
@@ -1,19 +0,0 @@
-import { defineConfig } from 'vite';
-import { dependencies } from './package.json';
-import { resolve } from 'path';
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [],
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es'],
-      fileName: (ext) => ({ es: 'index.mjs' })[ext],
-    },
-    rollupOptions: {
-      external: [...Object.keys(dependencies)],
-    },
-    target: 'esnext',
-  },
-});
@@ -2,7 +2,7 @@

 Experimental haskell in javascript interpreter. Many haskell features are not implemented.
 This projects mainly exists to be able to write and interpret [Tidal Cycles](https://tidalcycles.org/) code in the browser,
-as part of [Strudel](https://codeberg.org/uzu/strudel). This project could only exist thanks to [tree-sitter-haskell](https://github.com/tree-sitter/tree-sitter-haskell).
+as part of [Strudel](https://github.com/tidalcycles/strudel). This project could only exist thanks to [tree-sitter-haskell](https://github.com/tree-sitter/tree-sitter-haskell).

 ## Installation

@@ -1,7 +1,6 @@
 {
  "name": "hs2js",
-  "version": "0.2.0",
-  "private": true,
+  "version": "0.1.0",
  "description": "Experimental Haskell in JavaScript interpreter",
  "main": "src/index.mjs",
  "type": "module",
@@ -16,7 +15,7 @@
  },
  "repository": {
    "type": "git",
-    "url": "git+https://codeberg.org/uzu/strudel.git"
+    "url": "git+https://github.com/tidalcycles/strudel.git"
  },
  "keywords": [
    "haskell",
@@ -25,9 +24,9 @@
  "author": "Felix Roos <flix91@gmail.com>",
  "license": "AGPL-3.0-or-later",
  "bugs": {
-    "url": "https://codeberg.org/uzu/strudel/issues"
+    "url": "https://github.com/tidalcycles/strudel/issues"
  },
-  "homepage": "https://codeberg.org/uzu/strudel/",
+  "homepage": "https://github.com/tidalcycles/strudel",
  "dependencies": {
    "web-tree-sitter": "^0.24.7"
  },
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/hydra",
-  "version": "1.2.2",
+  "version": "1.1.0",
  "description": "Hydra integration for strudel",
  "main": "hydra.mjs",
  "type": "module",
@@ -17,7 +17,7 @@
  },
  "repository": {
    "type": "git",
-    "url": "git+https://codeberg.org/uzu/strudel.git"
+    "url": "git+https://github.com/tidalcycles/strudel.git"
  },
  "keywords": [
    "tidalcycles",
@@ -29,9 +29,9 @@
  "author": "Felix Roos <flix91@gmail.com>",
  "license": "AGPL-3.0-or-later",
  "bugs": {
-    "url": "https://codeberg.org/uzu/strudel/issues"
+    "url": "https://github.com/tidalcycles/strudel/issues"
  },
-  "homepage": "https://codeberg.org/uzu/strudel#readme",
+  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
    "@strudel/core": "workspace:*",
    "@strudel/draw": "workspace:*",
@@ -7,187 +7,3 @@ This package adds midi functionality to strudel Patterns.
 ```sh
 npm i @strudel/midi --save
 ```
-
-## Available Controls
-
-The following MIDI controls are available:
-
-OUTPUT:
-
- `midi` - opens a midi output device.
- `note` - Sends MIDI note messages. Can accept note names (e.g. "c4") or MIDI note numbers (0-127)
- `midichan` - Sets the MIDI channel (1-16, defaults to 1)
- `velocity` - Sets note velocity (0-1, defaults to 0.9)
- `gain` - Modifies velocity by multiplying with it (0-1, defaults to 1)
- `control` - Sets MIDI control change messages
- `ccn` - Sets MIDI CC controller number (0-127)
- `ccv` - Sets MIDI CC value (0-1)
- `progNum` - Sends MIDI program change messages (0-127)
- `sysex` - Sends MIDI System Exclusive messages (id: number 0-127 or array of bytes 0-127, data: array of bytes 0-127)
- `sysexid` - Sets MIDI System Exclusive ID (number 0-127 or array of bytes 0-127)
- `sysexdata` - Sets MIDI System Exclusive data (array of bytes 0-127)
- `midibend` - Sets MIDI pitch bend (-1 - 1)
- `miditouch` - Sets MIDI key after touch (0-1)
- `midicmd` - Sends MIDI system real-time messages to control timing and transport on MIDI devices.
- `nrpnn` - Sets MIDI NRPN non-registered parameter number (array of bytes 0-127)
- `nrpv` - Sets MIDI NRPN non-registered parameter value (0-127)
-
-
-INPUT:
-
- `midin` - Opens a MIDI input port to receive MIDI control change messages.
-
-Additional controls can be mapped using the mapping object passed to `.midi()`:
-
-## Examples
-
-### midi(outputName?, options?)
-
-Either connect a midi device or use the IAC Driver (Mac) or Midi Through Port (Linux) for internal midi messages.
-If no outputName is given, it uses the first midi output it finds.
-
-```javascript
-$: chord("<C^7 A7 Dm7 G7>").voicing().midi('IAC Driver')
-```
-
-In the console, you will see a log of the available MIDI devices as soon as you run the code, e.g. `Midi connected! Using "Midi Through Port-0".`
-
-### Options
-
-The `.midi()` function accepts an options object with the following properties:
-
-```javascript
-$: note("c a f e").midi('IAC Driver', { isController: true, midimap: 'default'})
-```
-
-<details>
-<summary>Available Options</summary>
-
-| Option | Type | Default | Description |
-|--------|------|---------|-------------|
-| isController | boolean | false | When true, disables sending note messages. Useful for MIDI controllers |
-| latencyMs | number | 34 | Latency in milliseconds to align MIDI with audio engine |
-| noteOffsetMs | number | 10 | Offset in milliseconds for note-off messages to prevent glitching |
-| midichannel | number | 1 | Default MIDI channel (1-16) |
-| velocity | number | 0.9 | Default note velocity (0-1) |
-| gain | number | 1 | Default gain multiplier for velocity (0-1) |
-| midimap | string | 'default' | Name of MIDI mapping to use for control changes |
-| midiport | string/number | - | MIDI device name or index |
-
-</details>
-
-
-
-
-### midiport(outputName)
-
-Selects the MIDI output device to use, pattern can be used to switch between devices.
-
-```javascript
-$: midiport('IAC Driver')
-$: note("c a f e").midiport("<0 1 2 3>").midi()
-```
-
-### midichan(number)
-
-Selects the MIDI channel to use. If not used, `.midi` will use channel 1 by default.
-
-### control, ccn && ccv
-
-`control` sends MIDI control change messages to your MIDI device.
-
- `ccn` sets the cc number. Depends on your synths midi mapping
- `ccv` sets the cc value. normalized from 0 to 1.
-
-```javascript
-$: note("c a f e").control([74, sine.slow(4)]).midi()
-$: note("c a f e").ccn(74).ccv(sine.slow(4)).midi()
-```
-
-In the above snippet, `ccn` is set to 74, which is the filter cutoff for many synths. `ccv` is controlled by a saw pattern.
-Having everything in one pattern, the `ccv` pattern will be aligned to the note pattern, because the structure comes from the left by default.
-But you can also control cc messages separately like this:
-
-```javascript
-$: note("c a f e").midi()
-$: ccv(sine.segment(16).slow(4)).ccn(74).midi()
-```
-
-### progNum (Program Change)
-
-`progNum` control sends MIDI program change messages to switch between different presets/patches on your MIDI device.
-Program change values should be numbers between 0 and 127.
-
-```javascript
-// Play notes while changing programs
-note("c3 e3 g3").progNum("<0 1 2>").midi()
-```
-
-Program change messages are useful for switching between different instrument sounds or presets during a performance. 
-The exact sound that each program number maps to depends on your MIDI device's configuration.
-
-## sysex,  sysexid && sysexdata (System Exclusive Message)
-
-`sysex`, `sysexid` and `sysexdata` control sends MIDI System Exclusive (SysEx) messages to your MIDI device. 
-sysEx messages are device-specific commands that allow deeper control over synthesizer parameters. 
-The value should be an array of numbers between 0-255 representing the SysEx data bytes.
-
-```javascript
-// Send a simple SysEx message
-let id = 0x43; //Yamaha
-//let id = "0x00:0x20:0x32"; //Behringer ID can be an array of numbers
-let data = "0x79:0x09:0x11:0x0A:0x00:0x00"; // Set NSX-39 voice to say "Aa"
-$: note("c d e f e d c").sysex(id, data).midi();
-$: note("c d e f e d c").sysexid(id).sysexdata(data).midi();
-```
-
-The exact format of SysEx messages depends on your MIDI device's specification.
-Consult your device's MIDI implementation guide for details on supported SysEx messages.
-
-### midibend && miditouch
-
-`midibend` sets MIDI pitch bend (-1 - 1)
-`miditouch` sets MIDI key after touch (0-1)
-
-```javascript
-
-$: note("c d e f e d c").midibend(sine.slow(4).range(-0.4,0.4)).midi();
-$: note("c d e f e d c").miditouch(sine.slow(4).range(0,1)).midi();
-
-```
-
-### midicmd
-
-`midicmd` sends MIDI system real-time messages to control timing and transport on MIDI devices.
-
-It supports the following commands:
-
- `clock`/`midiClock` - Sends MIDI timing clock messages
- `start` - Sends MIDI start message
- `stop` - Sends MIDI stop message
- `continue` - Sends MIDI continue message
-
-```javascript
-// You can control the clock with a pattern and ensure it starts in sync when the repl begins.
-// Note: It might act unexpectedly if MIDI isn't set up initially.
-stack(
-  midicmd("clock*48,<start stop>/2").midi('IAC Driver') 
-)
-```
-
-`midicmd` also supports sending control change, program change and sysex messages.
-
- `cc` - sends MIDI control change messages.
- `progNum` - sends MIDI program change messages.
- `sysex` - sends MIDI system exclusive messages.
-
-```javascript
-stack(
-  // "cc:ccn:ccv"
-  midicmd("cc:74:1").midi('IAC Driver'),
-  // "progNum:progNum"
-  midicmd("progNum:1").midi('IAC Driver'),
-  // "sysex:[sysexid]:[sysexdata]"
-  midicmd("sysex:[0x43]:[0x79:0x09:0x11:0x0A:0x00:0x00]").midi('IAC Driver')
-)
-```
@@ -1,6 +1,6 @@
 /*
 midi.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/midi/midi.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/midi/midi.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/>.
 */

@@ -8,7 +8,6 @@ import * as _WebMidi from 'webmidi';
 import { Pattern, getEventOffsetMs, isPattern, logger, ref } from '@strudel/core';
 import { noteToMidi, getControlName } from '@strudel/core';
 import { Note } from 'webmidi';
-
 // if you use WebMidi from outside of this package, make sure to import that instance:
 export const { WebMidi } = _WebMidi;

@@ -44,16 +43,13 @@ export function enableWebMidi(options = {}) {
      resolve(WebMidi);
      return;
    }
-    WebMidi.enable(
-      (err) => {
-        if (err) {
-          reject(err);
-        }
-        onReady?.(WebMidi);
-        resolve(WebMidi);
-      },
-      { sysex: true },
-    );
+    WebMidi.enable((err) => {
+      if (err) {
+        reject(err);
+      }
+      onReady?.(WebMidi);
+      resolve(WebMidi);
+    });
  });
 }

@@ -178,7 +174,6 @@ function normalize(value = 0, min = 0, max = 1, exp = 1) {
  normalized = Math.min(1, Math.max(0, normalized));
  return Math.pow(normalized, exp);
 }
-
 function mapCC(mapping, value) {
  return Object.keys(value)
    .filter((key) => !!mapping[getControlName(key)])
@@ -201,127 +196,18 @@ function sendCC(ccn, ccv, device, midichan, timeOffsetString) {
  device.sendControlChange(ccn, scaled, midichan, { time: timeOffsetString });
 }

-// sends a program change message to the given device on the given channel
-function sendProgramChange(progNum, device, midichan, timeOffsetString) {
-  if (typeof progNum !== 'number' || progNum < 0 || progNum > 127) {
-    throw new Error('expected progNum (program change) to be a number between 0 and 127');
-  }
-  device.sendProgramChange(progNum, midichan, { time: timeOffsetString });
-}
-
-// sends a sysex message to the given device on the given channel
-function sendSysex(sysexid, sysexdata, device, timeOffsetString) {
-  if (Array.isArray(sysexid)) {
-    if (!sysexid.every((byte) => Number.isInteger(byte) && byte >= 0 && byte <= 255)) {
-      throw new Error('all sysexid bytes must be integers between 0 and 255');
-    }
-  } else if (!Number.isInteger(sysexid) || sysexid < 0 || sysexid > 255) {
-    throw new Error('A:sysexid must be an number between 0 and 255 or an array of such integers');
-  }
-
-  if (!Array.isArray(sysexdata)) {
-    throw new Error('expected sysex to be an array of numbers (0-255)');
-  }
-  if (!sysexdata.every((byte) => Number.isInteger(byte) && byte >= 0 && byte <= 255)) {
-    throw new Error('all sysex bytes must be integers between 0 and 255');
-  }
-  device.sendSysex(sysexid, sysexdata, { time: timeOffsetString });
-}
-
-// sends a NRPN message to the given device on the given channel
-function sendNRPN(nrpnn, nrpv, device, midichan, timeOffsetString) {
-  if (Array.isArray(nrpnn)) {
-    if (!nrpnn.every((byte) => Number.isInteger(byte) && byte >= 0 && byte <= 255)) {
-      throw new Error('all nrpnn bytes must be integers between 0 and 255');
-    }
-  } else if (!Number.isInteger(nrpv) || nrpv < 0 || nrpv > 255) {
-    throw new Error('A:sysexid must be an number between 0 and 255 or an array of such integers');
-  }
-
-  device.sendNRPN(nrpnn, nrpv, midichan, { time: timeOffsetString });
-}
-
-// sends a pitch bend message to the given device on the given channel
-function sendPitchBend(midibend, device, midichan, timeOffsetString) {
-  if (typeof midibend !== 'number' || midibend < -1 || midibend > 1) {
-    throw new Error('expected midibend to be a number between -1 and 1');
-  }
-  device.sendPitchBend(midibend, midichan, { time: timeOffsetString });
-}
-
-// sends a channel aftertouch message to the given device on the given channel
-function sendAftertouch(miditouch, device, midichan, timeOffsetString) {
-  if (typeof miditouch !== 'number' || miditouch < 0 || miditouch > 1) {
-    throw new Error('expected miditouch to be a number between 0 and 1');
-  }
-  device.sendChannelAftertouch(miditouch, midichan, { time: timeOffsetString });
-}
-
-// sends a note message to the given device on the given channel
-function sendNote(note, velocity, duration, device, midichan, timeOffsetString) {
-  if (note == null || note === '') {
-    throw new Error('note cannot be null or empty');
-  }
-  if (velocity != null && (typeof velocity !== 'number' || velocity < 0 || velocity > 1)) {
-    throw new Error('velocity must be a number between 0 and 1');
-  }
-  if (duration != null && (typeof duration !== 'number' || duration < 0)) {
-    throw new Error('duration must be a positive number');
-  }
-
-  const midiNumber = typeof note === 'number' ? note : noteToMidi(note);
-  const midiNote = new Note(midiNumber, { attack: velocity, duration });
-  device.playNote(midiNote, midichan, {
-    time: timeOffsetString,
-  });
-}
-
-/**
- * MIDI output: Opens a MIDI output port.
- * @param {string | number} midiport MIDI device name or index defaulting to 0
- * @param {object} options Additional MIDI configuration options
- * @example
- * note("c4").midichan(1).midi('IAC Driver Bus 1')
- * @example
- * note("c4").midichan(1).midi('IAC Driver Bus 1', { controller: true, latency: 50 })
- */
-
-Pattern.prototype.midi = function (midiport, options = {}) {
-  if (isPattern(midiport)) {
+Pattern.prototype.midi = function (output) {
+  if (isPattern(output)) {
    throw new Error(
-      `.midi does not accept Pattern input for midiport. Make sure to pass device name with single quotes. Example: .midi('${
+      `.midi does not accept Pattern input. Make sure to pass device name with single quotes. Example: .midi('${
        WebMidi.outputs?.[0]?.name || 'IAC Driver Bus 1'
      }')`,
    );
  }

-  // For backward compatibility
-  if (typeof midiport === 'object') {
-    const { port, isController = false, ...configOptions } = midiport;
-    options = {
-      isController,
-      ...configOptions,
-      ...options, // Keep any options passed separately
-    };
-    midiport = port;
-  }
-
-  let midiConfig = {
-    // Default configuration values
-    isController: false, // Disable sending notes for midi controllers
-    latencyMs: 34, // Default latency to get audio engine to line up in ms
-    noteOffsetMs: 10, // Default note-off offset to prevent glitching in ms
-    midichannel: 1, // Default MIDI channel
-    velocity: 0.9, // Default velocity
-    gain: 1, // Default gain
-    midimap: 'default', // Default MIDI map
-    midiport: midiport, // Store the port in the config
-    ...options, // Override defaults with provided options
-  };
-
  enableWebMidi({
    onEnabled: ({ outputs }) => {
-      const device = getDevice(midiConfig.midiport, outputs);
+      const device = getDevice(output, outputs);
      const otherOutputs = outputs.filter((o) => o.name !== device.name);
      logger(
        `Midi enabled! Using "${device.name}". ${
@@ -335,35 +221,26 @@ Pattern.prototype.midi = function (midiport, options = {}) {

  return this.onTrigger((time_deprecate, hap, currentTime, cps, targetTime) => {
    if (!WebMidi.enabled) {
-      logger('Midi not enabled');
+      console.log('not enabled');
      return;
    }
    hap.ensureObjectValue();
-
    //magic number to get audio engine to line up, can probably be calculated somehow
-    const latencyMs = midiConfig.latencyMs;
+    const latencyMs = 34;
    // passing a string with a +num into the webmidi api adds an offset to the current time https://webmidijs.org/api/classes/Output
    const timeOffsetString = `+${getEventOffsetMs(targetTime, currentTime) + latencyMs}`;

-    // midi event values from hap with configurable defaults
+    // destructure value
    let {
      note,
-      nrpnn,
-      nrpv,
      ccn,
      ccv,
-      midichan = midiConfig.midichannel,
+      midichan = 1,
      midicmd,
-      midibend,
-      miditouch,
-      polyTouch,
-      gain = midiConfig.gain,
-      velocity = midiConfig.velocity,
-      progNum,
-      sysexid,
-      sysexdata,
-      midimap = midiConfig.midimap,
-      midiport = midiConfig.midiport,
+      gain = 1,
+      velocity = 0.9,
+      midimap = 'default',
+      midiport = output,
    } = hap.value;

    const device = getDevice(midiport, WebMidi.outputs);
@@ -375,62 +252,24 @@ Pattern.prototype.midi = function (midiport, options = {}) {
    }

    velocity = gain * velocity;
-
-    // Handle midimap
    // if midimap is set, send a cc messages from defined controls
    if (midicontrolMap.has(midimap)) {
      const ccs = mapCC(midicontrolMap.get(midimap), hap.value);
      ccs.forEach(({ ccn, ccv }) => sendCC(ccn, ccv, device, midichan, timeOffsetString));
-    } else if (midimap !== 'default') {
-      // Add warning when a non-existent midimap is specified
-      logger(`[midi] midimap "${midimap}" not found! Available maps: ${[...midicontrolMap.keys()].join(', ')}`);
    }

-    // Handle note
-    if (note !== undefined && !midiConfig.isController) {
-      // note off messages will often a few ms arrive late,
-      // try to prevent glitching by subtracting noteOffsetMs from the duration length
-      const duration = (hap.duration.valueOf() / cps) * 1000 - midiConfig.noteOffsetMs;
-
-      sendNote(note, velocity, duration, device, midichan, timeOffsetString);
+    // note off messages will often a few ms arrive late, try to prevent glitching by subtracting from the duration length
+    const duration = (hap.duration.valueOf() / cps) * 1000 - 10;
+    if (note != null) {
+      const midiNumber = typeof note === 'number' ? note : noteToMidi(note);
+      const midiNote = new Note(midiNumber, { attack: velocity, duration });
+      device.playNote(midiNote, midichan, {
+        time: timeOffsetString,
+      });
    }
-
-    // Handle program change
-    if (progNum !== undefined) {
-      sendProgramChange(progNum, device, midichan, timeOffsetString);
-    }
-
-    // Handle sysex
-    // sysex data is consist of 2 arrays, first is sysexid, second is sysexdata
-    // sysexid is a manufacturer id it is either a number or an array of 3 numbers.
-    // list of manufacturer ids can be found here : https://midi.org/sysexidtable
-    // if sysexid is an array the first byte is 0x00
-
-    if (sysexid !== undefined && sysexdata !== undefined) {
-      sendSysex(sysexid, sysexdata, device, timeOffsetString);
-    }
-
-    // Handle control change
    if (ccv !== undefined && ccn !== undefined) {
      sendCC(ccn, ccv, device, midichan, timeOffsetString);
    }
-
-    // Handle NRPN non-registered parameter number
-    if (nrpnn !== undefined && nrpv !== undefined) {
-      sendNRPN(nrpnn, nrpv, device, midichan, timeOffsetString);
-    }
-
-    // Handle midibend
-    if (midibend !== undefined) {
-      sendPitchBend(midibend, device, midichan, timeOffsetString);
-    }
-
-    // Handle miditouch
-    if (miditouch !== undefined) {
-      sendAftertouch(miditouch, device, midichan, timeOffsetString);
-    }
-
-    // Handle midicmd
    if (hap.whole.begin + 0 === 0) {
      // we need to start here because we have the timing info
      device.sendStart({ time: timeOffsetString });
@@ -443,19 +282,6 @@ Pattern.prototype.midi = function (midiport, options = {}) {
      device.sendStop({ time: timeOffsetString });
    } else if (['continue'].includes(midicmd)) {
      device.sendContinue({ time: timeOffsetString });
-    } else if (Array.isArray(midicmd)) {
-      if (midicmd[0] === 'progNum') {
-        sendProgramChange(midicmd[1], device, midichan, timeOffsetString);
-      } else if (midicmd[0] === 'cc') {
-        if (midicmd.length === 2) {
-          sendCC(midicmd[0], midicmd[1] / 127, device, midichan, timeOffsetString);
-        }
-      } else if (midicmd[0] === 'sysex') {
-        if (midicmd.length === 3) {
-          const [_, id, data] = midicmd;
-          sendSysex(id, data, device, timeOffsetString);
-        }
-      }
    }
  });
 };
@@ -463,14 +289,6 @@ Pattern.prototype.midi = function (midiport, options = {}) {
 let listeners = {};
 const refs = {};

-/**
- * MIDI input: Opens a MIDI input port to receive MIDI control change messages.
- * @param {string | number} input MIDI device name or index defaulting to 0
- * @returns {Function}
- * @example
- * let cc = await midin('IAC Driver Bus 1')
- * note("c a f e").lpf(cc(0).range(0, 1000)).lpq(cc(1).range(0, 10)).sound("sawtooth")
- */
 export async function midin(input) {
  if (isPattern(input)) {
    throw new Error(
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/midi",
-  "version": "1.2.3",
+  "version": "1.1.0",
  "description": "Midi API for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -13,7 +13,7 @@
  },
  "repository": {
    "type": "git",
-    "url": "git+https://codeberg.org/uzu/strudel.git"
+    "url": "git+https://github.com/tidalcycles/strudel.git"
  },
  "keywords": [
    "titdalcycles",
@@ -25,9 +25,9 @@
  "author": "Felix Roos <flix91@gmail.com>",
  "license": "AGPL-3.0-or-later",
  "bugs": {
-    "url": "https://codeberg.org/uzu/strudel/issues"
+    "url": "https://github.com/tidalcycles/strudel/issues"
  },
-  "homepage": "https://codeberg.org/uzu/strudel#readme",
+  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
    "@strudel/core": "workspace:*",
    "@strudel/webaudio": "workspace:*",
@@ -1,6 +1,6 @@
 /*
 krill.pegjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/mini/krill.pegjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/mini/krill.pegjs>
 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/>.
 */

@@ -1,6 +1,6 @@
 /*
 mini.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/mini/mini.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/mini/mini.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/>.
 */

@@ -1,6 +1,6 @@
 {
  "name": "@strudel/mini",
-  "version": "1.2.2",
+  "version": "1.1.0",
  "description": "Mini notation for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -16,7 +16,7 @@
  },
  "repository": {
    "type": "git",
-    "url": "git+https://codeberg.org/uzu/strudel.git"
+    "url": "git+https://github.com/tidalcycles/strudel.git"
  },
  "keywords": [
    "tidalcycles",
@@ -28,9 +28,9 @@
  "author": "Felix Roos <flix91@gmail.com>",
  "license": "AGPL-3.0-or-later",
  "bugs": {
-    "url": "https://codeberg.org/uzu/strudel/issues"
+    "url": "https://github.com/tidalcycles/strudel/issues"
  },
-  "homepage": "https://codeberg.org/uzu/strudel#readme",
+  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
    "@strudel/core": "workspace:*"
  },
@@ -1,6 +1,6 @@
 /*
 mini.test.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/mini/test/mini.test.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/mini/test/mini.test.mjs>
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

@@ -1,37 +1,38 @@
 {
-  "name": "@strudel/motion",
-  "version": "1.2.2",
-  "description": "DeviceMotion API for strudel",
-  "main": "index.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": [
-    "titdalcycles",
-    "strudel",
-    "pattern",
-    "livecoding",
-    "algorave"
-  ],
-  "author": "Yuta Nakayama <nkymut@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:*"
-  },
-  "devDependencies": {
+    "name": "@strudel/motion",
+    "version": "1.1.0",
+    "description": "DeviceMotion API for strudel",
+    "main": "index.mjs",
+    "type": "module",
+    "publishConfig": {
+      "main": "dist/index.mjs"
+    },
+    "scripts": {
+      "build": "vite build",
+      "prepublishOnly": "npm run build"
+    },
+    "repository": {
+      "type": "git",
+      "url": "git+https://github.com/tidalcycles/strudel.git"
+    },
+    "keywords": [
+      "titdalcycles",
+      "strudel",
+      "pattern",
+      "livecoding",
+      "algorave"
+    ],
+    "author": "Yuta Nakayama <nkymut@gmail.com>",
+    "license": "AGPL-3.0-or-later",
+    "bugs": {
+      "url": "https://github.com/tidalcycles/strudel/issues"
+    },
+    "homepage": "https://github.com/tidalcycles/strudel#readme",
+    "dependencies": {
+      "@strudel/core": "workspace:*"
+    },
+    "devDependencies": {
    "vite": "^6.0.11"
-  }
+    }
 }
+  
@@ -1,6 +1,6 @@
 /*
 mqtt.mjs - for patterning the internet of things from strudel
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/serial/serial.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/serial/serial.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/>.
 */

@@ -38,10 +38,15 @@ Pattern.prototype.mqtt = function (
  add_meta = true,
 ) {
  const key = host + '-' + client;
+  let connected = false;
  let password_entered = false;

+  if (!client) {
+    client = 'strudel-' + String(Math.floor(Math.random() * 1000000));
+  }
  function onConnect() {
    console.log('Connected to mqtt broker');
+    connected = true;
    if (password_entered) {
      document.cookie = 'mqtt_pass=' + password;
    }
@@ -51,9 +56,6 @@ Pattern.prototype.mqtt = function (
  if (connections[key]) {
    cx = connections[key];
  } else {
-    if (!client) {
-      client = 'strudel-' + String(Math.floor(Math.random() * 1000000));
-    }
    cx = new Paho.Client(host, client);
    connections[key] = cx;
    cx.onConnectionLost = onConnectionLost;
@@ -84,7 +86,7 @@ Pattern.prototype.mqtt = function (
  return this.withHap((hap) => {
    const onTrigger = (t_deprecate, hap, currentTime, cps, targetTime) => {
      let msg_topic = topic;
-      if (!cx || !cx.isConnected()) {
+      if (!connected) {
        return;
      }
      let message = '';
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/mqtt",
-  "version": "1.2.2",
+  "version": "1.1.0",
  "description": "MQTT API for strudel",
  "main": "mqtt.mjs",
  "type": "module",
@@ -13,7 +13,7 @@
  },
  "repository": {
    "type": "git",
-    "url": "git+https://codeberg.org/uzu/strudel.git"
+    "url": "git+https://github.com/tidalcycles/strudel.git"
  },
  "keywords": [
    "titdalcycles",
@@ -25,9 +25,9 @@
  "author": "Alex McLean <alex@slab.org>",
  "license": "AGPL-3.0-or-later",
  "bugs": {
-    "url": "https://codeberg.org/uzu/strudel/issues"
+    "url": "https://github.com/tidalcycles/strudel/issues"
  },
-  "homepage": "https://codeberg.org/uzu/strudel#readme",
+  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
    "@strudel/core": "workspace:*",
    "paho-mqtt": "^1.1.0"
@@ -1,6 +1,6 @@
 /*
 osc.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/osc/osc.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/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/>.
 */

@@ -37,7 +37,7 @@ function connect() {
 export function parseControlsFromHap(hap, cps) {
  hap.ensureObjectValue();
  const cycle = hap.wholeOrPart().begin.valueOf();
-  const delta = hap.duration.valueOf() / cps;
+  const delta = hap.duration.valueOf();
  const controls = Object.assign({}, { cps, cycle, delta }, hap.value);
  // make sure n and note are numbers
  controls.n && (controls.n = parseNumeral(controls.n));
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/osc",
-  "version": "1.2.2",
+  "version": "1.1.0",
  "description": "OSC messaging for strudel",
  "main": "osc.mjs",
  "type": "module",
@@ -17,7 +17,7 @@
  },
  "repository": {
    "type": "git",
-    "url": "git+https://codeberg.org/uzu/strudel.git"
+    "url": "git+https://github.com/tidalcycles/strudel.git"
  },
  "keywords": [
    "tidalcycles",
@@ -32,9 +32,9 @@
  ],
  "license": "AGPL-3.0-or-later",
  "bugs": {
-    "url": "https://codeberg.org/uzu/strudel/issues"
+    "url": "https://github.com/tidalcycles/strudel/issues"
  },
-  "homepage": "https://codeberg.org/uzu/strudel#readme",
+  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
    "@strudel/core": "workspace:*",
    "osc-js": "^2.4.1"
@@ -1,6 +1,6 @@
 /*
 server.js - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/osc/server.js>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/osc/server.js>
 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/>.
 */

@@ -1,6 +1,6 @@
 /*
 tidal-sniffer.js - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/osc/tidal-sniffer.js>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/osc/tidal-sniffer.js>
 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/>.
 */

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
eefano	06463da7fb	Merge remote-tracking branch 'upstream/main' into start-and-loop-at-cycle	2025-02-07 17:40:01 +01:00
eefano	2a0e66a862	Merge remote-tracking branch 'upstream/main' into start-and-loop-at-cycle	2025-02-07 17:38:17 +01:00
eefano	9c37725436	Merge remote-tracking branch 'upstream/main' into start-and-loop-at-cycle	2024-10-21 17:45:38 +02:00
eefano	06f3696ab0	Merge remote-tracking branch 'upstream/main' into start-and-loop-at-cycle	2024-07-31 11:40:24 +02:00
eefano	a4c4c6025c	start-and-loop Adds setLoop(start, length) and cyclecounter() widget.	2024-07-03 11:21:04 +02:00