fix first pattern muted case

CONTRIBUTING.md

@@ -52,17 +52,7 @@ Strudel is a project handmade by humans, with thought and nuance.
 
 If you have used LLMs (so called 'AI'), please detail that in the pull request. We are still developing our response to the onslaught of LLM technology, but for practical and legal reasons are currently not accepting wholly LLM-generated code. We are also not accepting PRs that add LLM features to strudel itself.
 
-There are #llm-chat and #llm-share channels on [our discord](https://discord.com/invite/HGEdXmRkzT). Please do not discuss or share LLM-related things outside of those channels.
-
-## Creating and sharing a new project using strudel
-
-Strudel is free/open source software, and we are also happy to see people making use of it within the following terms. 
-
-Please don't use 'strudel' in the name of your project, so people don't assume it's official strudel project. (If you'd like it to be an official strudel project, please check in with the community, e.g. on [the discord](https://discord.com/invite/HGEdXmRkzT).) 
-
-Please respect our AGPL license, which e.g. requires you to share/link to the source code of strudel, any modifications you've made to it, and the source code for the rest of your project if it integrates with strudel. You are also required to maintain Strudel's copyright notices in the source code, and include Strudel's copyright notice in your user interface. This is an ad-hoc summary - please [refer to the license](https://codeberg.org/uzu/strudel/src/branch/main/LICENSE) for full details.
-
-You are also encouraged to connect with the community and understand our aims and values.
+There are #llm-chat and #llm-share channels on our discord. Please do not discuss or share LLM-related things outside of those channels.
 
 ## Report a Bug
 

packages/core/pattern.mjs

@@ -1457,6 +1457,27 @@ export function stack(...pats) {
   return result;
 }
 
+
+/**
+ * The given items are played at the same time at the same length.
+ *
+ * @tags temporal
+ * @return {Pattern}
+ * @synonyms polyrhythm, pr
+ * @example
+ * mute_stack("g3", "b3", ["e4", "d4"]).note()
+ * // "g3,b3,[e4 d4]".note()
+ *
+ * @example
+ * // As a chained function:
+ * s("hh*4").mute_stack(
+ *   note("c4(5,8)")
+ * )
+ */
+export function mute_stack(...pats) {
+  return silence;
+}
+
 function _stackWith(func, pats) {
   pats = pats.map((pat) => (Array.isArray(pat) ? sequence(...pat) : reify(pat)));
   if (pats.length === 0) {

packages/midi/midi.mjs

@@ -171,21 +171,6 @@ function normalize(value = 0, min = 0, max = 1, exp = 1) {
   return Math.pow(normalized, exp);
 }
 
-const isFirefox = navigator?.userAgent?.includes('Firefox');
-// call fn either directly with given time (non-firefox) or after scheduleAtTime with undefined (firefox)
-// the scheduleAtTime approach is still jittery, but the best we can be on firefox
-// firefox bug: https://bugzilla.mozilla.org/show_bug.cgi?id=2062997
-function timedSend(timeMs, fn) {
-  if (isFirefox) {
-    const audioTime = getAudioContext().currentTime + (timeMs - performance.now()) / 1000;
-    scheduleAtTime(() => {
-      fn(undefined);
-    }, audioTime);
-  } else {
-    fn(timeMs);
-  }
-}
-
 function mapCC(mapping, value) {
   return Object.keys(value)
     .filter((key) => !!mapping[getControlName(key)])
@@ -197,7 +182,7 @@ function mapCC(mapping, value) {
 }
 
 // sends a cc message to the given device on the given channel
-function sendCC(ccn, ccv, device, midichan, timeMs) {
+function sendCC(ccn, ccv, device, midichan, targetTime) {
   if (typeof ccv !== 'number' || ccv < 0 || ccv > 1) {
     throw new Error('expected ccv to be a number between 0 and 1');
   }
@@ -205,19 +190,23 @@ function sendCC(ccn, ccv, device, midichan, timeMs) {
     throw new Error('expected ccn to be a number or a string');
   }
   const scaled = Math.round(ccv * 127);
-  timedSend(timeMs, (timeMs) => device.sendControlChange(ccn, scaled, { channels: midichan, time: timeMs }));
+  scheduleAtTime(() => {
+    device.sendControlChange(ccn, scaled, midichan);
+  }, targetTime);
 }
 
 // sends a program change message to the given device on the given channel
-function sendProgramChange(progNum, device, midichan, timeMs) {
+function sendProgramChange(progNum, device, midichan, targetTime) {
   if (typeof progNum !== 'number' || progNum < 0 || progNum > 127) {
     throw new Error('expected progNum (program change) to be a number between 0 and 127');
   }
-  timedSend(timeMs, (timeMs) => device.sendProgramChange(progNum, { channels: midichan, time: timeMs }));
+  scheduleAtTime(() => {
+    device.sendProgramChange(progNum, midichan);
+  }, targetTime);
 }
 
 // sends a sysex message to the given device on the given channel
-function sendSysex(sysexid, sysexdata, device, timeMs) {
+function sendSysex(sysexid, sysexdata, device, targetTime) {
   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');
@@ -232,11 +221,13 @@ function sendSysex(sysexid, sysexdata, device, timeMs) {
   if (!sysexdata.every((byte) => Number.isInteger(byte) && byte >= 0 && byte <= 255)) {
     throw new Error('all sysex bytes must be integers between 0 and 255');
   }
-  timedSend(timeMs, (timeMs) => device.sendSysex(sysexid, sysexdata, { time: timeMs }));
+  scheduleAtTime(() => {
+    device.sendSysex(sysexid, sysexdata);
+  }, targetTime);
 }
 
 // sends a NRPN message to the given device on the given channel
-function sendNRPN(nrpnn, nrpv, device, midichan, timeMs) {
+function sendNRPN(nrpnn, nrpv, device, midichan, targetTime) {
   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');
@@ -244,29 +235,34 @@ function sendNRPN(nrpnn, nrpv, device, midichan, timeMs) {
   } 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');
   }
-
-  timedSend(timeMs, (timeMs) => device.sendNrpnValue(nrpnn, nrpv, { channels: midichan, time: timeMs }));
+  scheduleAtTime(() => {
+    device.sendNRPN(nrpnn, nrpv, midichan);
+  }, targetTime);
 }
 
 // sends a pitch bend message to the given device on the given channel
-function sendPitchBend(midibend, device, midichan, timeMs) {
+function sendPitchBend(midibend, device, midichan, targetTime) {
   if (typeof midibend !== 'number' || midibend < -1 || midibend > 1) {
     throw new Error('expected midibend to be a number between -1 and 1');
   }
-  timedSend(timeMs, (timeMs) => device.sendPitchBend(midibend, { channels: midichan, time: timeMs }));
+  scheduleAtTime(() => {
+    device.sendPitchBend(midibend, midichan);
+  }, targetTime);
 }
 
 // sends a channel aftertouch message to the given device on the given channel
-function sendAftertouch(miditouch, device, midichan, timeMs) {
+function sendAftertouch(miditouch, device, midichan, targetTime) {
   if (typeof miditouch !== 'number' || miditouch < 0 || miditouch > 1) {
     throw new Error('expected miditouch to be a number between 0 and 1');
   }
 
-  timedSend(timeMs, (timeMs) => device.sendChannelAftertouch(miditouch, { channels: midichan, time: timeMs }));
+  scheduleAtTime(() => {
+    device.sendChannelAftertouch(miditouch, midichan);
+  }, targetTime);
 }
 
 // sends a note message to the given device on the given channel
-function sendNote(note, velocity, duration, device, midichan, timeMs) {
+function sendNote(note, velocity, duration, device, midichan, targetTime) {
   if (note == null || note === '') {
     throw new Error('note cannot be null or empty');
   }
@@ -277,10 +273,11 @@ function sendNote(note, velocity, duration, device, midichan, timeMs) {
     throw new Error('duration must be a positive number');
   }
   const midiNumber = typeof note === 'number' ? note : noteToMidi(note);
-  const midiNote = new Note(midiNumber, { attack: velocity });
+  const midiNote = new Note(midiNumber, { attack: velocity, duration });
 
-  timedSend(timeMs, (timeMs) => device.sendNoteOn(midiNote, { channels: midichan, time: timeMs }));
-  timedSend(timeMs + duration, (timeMs) => device.sendNoteOff(midiNote, { channels: midichan, time: timeMs }));
+  scheduleAtTime(() => {
+    device.playNote(midiNote, midichan);
+  }, targetTime);
 }
 
 /**
@@ -290,6 +287,8 @@ function sendNote(note, velocity, duration, device, midichan, timeMs) {
  * @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 = {}) {
@@ -338,28 +337,11 @@ Pattern.prototype.midi = function (midiport, options = {}) {
       logger(`Midi device disconnected! Available: ${getMidiDeviceNamesString(outputs)}`),
   });
 
-  let p; // filtered clock offset
-  let lastOffset;
-
-  return this.sortHapsByPart().onTrigger((hap, _currentTime, cps, targetTime) => {
+  return this.onTrigger((hap, _currentTime, cps, targetTime) => {
     if (!WebMidi.enabled) {
       logger('Midi not enabled');
       return;
     }
-    const { contextTime, performanceTime } = getAudioContext().getOutputTimestamp();
-    if (!contextTime || !performanceTime) {
-      logger('[midi] skip midi event: not ready yet?');
-      return;
-    }
-    const cutoff = 0.01;
-    const offset = performanceTime - contextTime * 1000;
-    p ??= offset; // first input is initial offset
-    if (offset !== lastOffset) {
-      // update filter only when offset changes
-      p = offset * cutoff + p * (1 - cutoff); // onepole iir filter to smooth drift :)
-    }
-    lastOffset = offset;
-    const timeMs = targetTime * 1000 + p; // this is now correct in performance time
     hap.ensureObjectValue();
 
     // midi event values from hap with configurable defaults
@@ -397,7 +379,7 @@ Pattern.prototype.midi = function (midiport, options = {}) {
     // 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, timeMs));
+      ccs.forEach(({ ccn, ccv }) => sendCC(ccn, ccv, device, midichan, targetTime));
     } else if (midimap !== 'default') {
       // Add warning when a non-existent midimap is specified
       logger(`[midi] midimap "${midimap}" not found! Available maps: ${[...midicontrolMap.keys()].join(', ')}`);
@@ -406,17 +388,15 @@ Pattern.prototype.midi = function (midiport, options = {}) {
     // Handle note
     if (note !== undefined && !midiConfig.isController) {
       // note off messages will often a few ms arrive late,
-      // try to prevent glitching by subtracting at max noteOffsetMs from the duration length
-      const hapDuration = (hap.duration.valueOf() / cps) * 1000;
-      const offset = Math.min(midiConfig.noteOffsetMs, hapDuration / 2);
-      const duration = hapDuration - offset;
+      // 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, timeMs);
+      sendNote(note, velocity, duration, device, midichan, targetTime);
     }
 
     // Handle program change
     if (progNum !== undefined) {
-      sendProgramChange(progNum, device, midichan, timeMs);
+      sendProgramChange(progNum, device, midichan, targetTime);
     }
 
     // Handle sysex
@@ -426,53 +406,63 @@ Pattern.prototype.midi = function (midiport, options = {}) {
     // if sysexid is an array the first byte is 0x00
 
     if (sysexid !== undefined && sysexdata !== undefined) {
-      sendSysex(sysexid, sysexdata, device, timeMs);
+      sendSysex(sysexid, sysexdata, device, targetTime);
     }
 
     // Handle control change
     if (ccv !== undefined && ccn !== undefined) {
-      sendCC(ccn, ccv, device, midichan, timeMs);
+      sendCC(ccn, ccv, device, midichan, targetTime);
     }
 
     // Handle NRPN non-registered parameter number
     if (nrpnn !== undefined && nrpv !== undefined) {
-      sendNRPN(nrpnn, nrpv, device, midichan, timeMs);
+      sendNRPN(nrpnn, nrpv, device, midichan, targetTime);
     }
 
     // Handle midibend
     if (midibend !== undefined) {
-      sendPitchBend(midibend, device, midichan, timeMs);
+      sendPitchBend(midibend, device, midichan, targetTime);
     }
 
     // Handle miditouch
     if (miditouch !== undefined) {
-      sendAftertouch(miditouch, device, midichan, timeMs);
+      sendAftertouch(miditouch, device, midichan, targetTime);
     }
 
     // Handle midicmd
     if (hap.whole.begin + 0 === 0) {
       // we need to start here because we have the timing info
-      timedSend(timeMs, (timeMs) => device.sendStart({ time: timeMs }));
+      scheduleAtTime(() => {
+        device.sendStart();
+      }, targetTime);
     }
     if (['clock', 'midiClock'].includes(midicmd)) {
-      timedSend(timeMs, (timeMs) => device.sendClock({ time: timeMs }));
+      scheduleAtTime(() => {
+        device.sendClock();
+      }, targetTime);
     } else if (['start'].includes(midicmd)) {
-      timedSend(timeMs, (timeMs) => device.sendStart({ time: timeMs }));
+      scheduleAtTime(() => {
+        device.sendStart();
+      }, targetTime);
     } else if (['stop'].includes(midicmd)) {
-      timedSend(timeMs, (timeMs) => device.sendStop({ time: timeMs }));
+      scheduleAtTime(() => {
+        device.sendStop();
+      }, targetTime);
     } else if (['continue'].includes(midicmd)) {
-      timedSend(timeMs, (timeMs) => device.sendContinue({ time: timeMs }));
+      scheduleAtTime(() => {
+        device.sendContinue();
+      }, targetTime);
     } else if (Array.isArray(midicmd)) {
       if (midicmd[0] === 'progNum') {
-        sendProgramChange(midicmd[1], device, midichan, timeMs);
+        sendProgramChange(midicmd[1], device, midichan, targetTime);
       } else if (midicmd[0] === 'cc') {
         if (midicmd.length === 2) {
-          sendCC(midicmd[0], midicmd[1] / 127, device, midichan, timeMs);
+          sendCC(midicmd[0], midicmd[1] / 127, device, midichan, targetTime);
         }
       } else if (midicmd[0] === 'sysex') {
         if (midicmd.length === 3) {
           const [_, id, data] = midicmd;
-          sendSysex(id, data, device, timeMs);
+          sendSysex(id, data, device, targetTime);
         }
       }
     }

packages/mondo/mondo.mjs

@@ -5,6 +5,12 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 // evolved from https://garten.salat.dev/lisp/parser.html
+
+let recurse = 0
+function lrec(...args) {
+  recurse += 1
+  console.info(recurse, ...args)
+}
 export class MondoParser {
   // these are the tokens we expect
   token_types = {
@@ -24,10 +30,17 @@ export class MondoParser {
     op: /^[*/:!@%?+\-&]|^\.{2}/, // * / : ! @ % ? ..
     // dollar: /^\$/,
     pipe: /^#/,
-    stack: /^[,$]/,
+    // Matches _$ or _$BASS
+    mute_stack: /^_\$([a-zA-Z0-9_]+)?/,
+    // Matches S$ or S$VOCALS
+    solo_stack: /^S\$([a-zA-Z0-9_]+)?/,
+    // stack: /^[,$]/,
+    stack: /^,|^\$([a-zA-Z0-9_]+)?/,
     or: /^[|]/,
     plain: /^[a-zA-Z0-9-~_^#]+/,
+
   };
+  solo_enabled = false;
   op_precedence = [['*', '/', ':', '!', '@', '%', '?', '+', '-', '..'], ['&']];
   // matches next token
   next_token(code, offset = 0) {
@@ -62,6 +75,7 @@ export class MondoParser {
       offset += token.value.length;
       tokens.push(token);
     }
+    lrec("TOKENS", tokens[0], tokens[1])
     return tokens;
   }
   // take code, return abstract syntax tree
@@ -73,19 +87,22 @@ export class MondoParser {
     while (this.tokens.length) {
       expressions.push(this.parse_expr());
     }
+    let parsed = expressions[0]
     if (expressions.length === 0) {
       // empty case
-      return { type: 'list', children: [] };
-    }
+      parsed = { type: 'list', children: [] };
+    } else if (expressions.length > 1 || expressions[0].type !== 'list')
     // do we have multiple top level expressions or a single non list?
-    if (expressions.length > 1 || expressions[0].type !== 'list') {
-      return {
+    {
+      parsed = {
         type: 'list',
         children: this.desugar(expressions),
       };
     }
+
+    lrec("PARSED", parsed)
     // we have a single list
-    return expressions[0];
+    return parsed;
   }
   // parses any valid expression
   parse_expr() {
@@ -120,8 +137,11 @@ export class MondoParser {
       children = children.slice(splitIndex + 1);
     }
     chunks.push(children);
+    lrec("chunks", chunks)
     return chunks;
   }
+
+  
   desugar_split(children, split_type, next) {
     const chunks = this.split_children(children, split_type);
     if (chunks.length === 1) {
@@ -253,12 +273,15 @@ export class MondoParser {
     }
     return node;
   }
+
   desugar(children, type) {
     // if type is given, the first element is expected to contain it as plain value
     // e.g. with (square a b, c), we want to split (a b, c) and ignore "square"
     children = type ? children.slice(1) : children;
-    children = this.desugar_split(children, 'stack', (children) =>
-      this.desugar_split(children, 'or', (children) => {
+
+    const desugar_split_children = (children) => {
+      return this.desugar_split(children, 'or', (children) => {
+        console.info("TYPE", type)
         // chunks of multiple args
         if (type) {
           // the type we've removed before splitting needs to be added back
@@ -269,14 +292,34 @@ export class MondoParser {
           children = this.desugar_ops(children, ops);
         });
         children = this.desugar_pipes(children);
+        lrec("STACK CHILDREN", children)
         return children;
-      }),
-    );
+      })
+
+    }
+
+    console.info("PRE_CHILDREN", children)
+    // children = this.desugar_split(children, 'mute_stack', (children) => {
+    //   const x = desugar_split_children(children)
+    //   // lrec({x})
+    //   return x
+    // })
+
+    lrec({ children })
+
+
+    children = this.desugar_split(children, 'stack', (children) => {
+      return desugar_split_children(children)
+    })
+
+
+    lrec("CHILDREN", children)
     return children;
   }
   parse_list() {
     let node = this.parse_pair('open_list', 'close_list');
     node.children = this.desugar(node.children);
+    lrec("node", node)
     return node;
   }
   parse_angle() {
@@ -325,9 +368,8 @@ export function printAst(ast, compact = false, lvl = 0) {
   const br = compact ? '' : '\n';
   const spaces = compact ? '' : Array(lvl).fill(' ').join('');
   if (ast.type === 'list') {
-    return `${lvl ? br : ''}${spaces}(${ast.children.map((child) => printAst(child, compact, lvl + 1)).join(' ')}${
-      ast.children.find((child) => child.type === 'list') ? `${br}${spaces})` : ')'
-    }`;
+    return `${lvl ? br : ''}${spaces}(${ast.children.map((child) => printAst(child, compact, lvl + 1)).join(' ')}${ast.children.find((child) => child.type === 'list') ? `${br}${spaces})` : ')'
+      }`;
   }
   return `${ast.value}`;
 }

packages/mondough/mondough.mjs

@@ -49,10 +49,11 @@ lib['or'] = (...children) => chooseIn(...children); // always has structure but
 //lib['or'] = (...children) => chooseOut(...children); // "s oh*8.dec[.04 | .5]" is better but "dec[.04 | .5].s oh*8" has no struct
 
 function evaluator(node, scope) {
-  const { type } = node;
-  // node is list
-  if (type === 'list') {
-    const { children } = node;
+  const { type,children } = node;
+  // node is list]
+  if (type === 'list' && children.length) {
+    // const { children } = node;
+   
     const [name, ...args] = children;
     // some functions wont be reified to make sure they work (e.g. see extend below)
     if (typeof name === 'function') {
@@ -65,6 +66,7 @@ function evaluator(node, scope) {
     const first = name.firstCycle(true)[0];
     const type = typeof first?.value;
     if (type !== 'function') {
+      console.error("first", first)
       throw new Error(`[mondough] expected function, got "${first?.value}"`);
     }
     return name
@@ -76,12 +78,16 @@ function evaluator(node, scope) {
       })
       .innerJoin();
   }
+
+  console.info("NODE", node)
   // node is leaf
   let { value } = node;
   if (type === 'plain' && scope[value]) {
     return reify(scope[value]); // -> local scope has no location
   }
   const variable = lib[value] ?? strudelScope[value];
+
+  console.info("VARIABLE", variable)
   // problem: collisions when we want a string that happens to also be a variable name
   // example: "s sine" -> sine is also a variable
   let pat;
@@ -107,6 +113,7 @@ export function mondo(code, offset = 0) {
     code = code.join('');
   }
   const pat = runner.run(code, undefined, offset);
+  console.info("MONDO_PAT", pat)
   return pat.markcss('color: var(--caret,--foreground);text-decoration:underline');
 }
 

website/src/pages/learn/faq.mdx

@@ -52,15 +52,6 @@ There are multiple ways to load your sample collection. Some methods are good fo
 - Serve a folder of samples locally using the [strudel 'sampler' commandline tool](https://strudel.cc/learn/samples/#from-disk-via-strudelsampler). This can be most reliable method, but requires [nodejs](https://nodejs.org) to be installed.
 - Host your sound library online on the web and [load them from an URL](/learn/samples/#loading-custom-samples)
 
-## Can I create a new project based on Strudel?
-
-Strudel is free/open source software, and we are always happy to see people making use of it within the following terms:
-
-- Please don't use 'strudel' in the name of your project (e.g. strudel2000, foo-strudel), so people don't assume it's official strudel project. (If you'd like it to be an official strudel project, please check in with the community, e.g. on the [discord chat](https://discord.com/invite/HGEdXmRkzT).)
-- Please respect our AGPL license, which e.g. requires you to share/link to the source code of strudel, any modifications you've made to it, and the source code for the rest of your project if it integrates with strudel. You are also required to maintain Strudel's copyright notices in the source code, and include Strudel's copyright notice in your user interface. This is an ad-hoc summary - please [refer to the license](https://codeberg.org/uzu/strudel/src/branch/main/LICENSE) for full details.
-
-You are also encouraged to connect with [the community](https://discord.com/invite/HGEdXmRkzT) to understand our aims and values.
-
 ## Can I use Strudel with AI/LLM tools?
 
 You are free to do what you like with Strudel, within the terms of the free/open source AGPLv3 license.

website/src/repl/components/panel/WelcomeTab.jsx

@@ -36,9 +36,8 @@ export function WelcomeTab({ context }) {
         <a href="https://tidalcycles.org/" target="_blank">
           tidalcycles
         </a>
-        , which is a popular live coding language for music, written in Haskell. Strudel is free/open source software,
-        with copyright owned by its [contributors](https://codeberg.org/uzu/strudel/activity/contributors). You can
-        redistribute and/or modify it under the terms of the{' '}
+        , which is a popular live coding language for music, written in Haskell. Strudel is free/open source software:
+        you can redistribute and/or modify it under the terms of the{' '}
         <a href="https://codeberg.org/uzu/strudel/src/branch/main/LICENSE" target="_blank">
           GNU Affero General Public License
         </a>