Merge branch 'color-in-hap-value' into inline-punchcard

packages/codemirror/highlight.mjs

@@ -92,7 +92,7 @@ const miniLocationHighlights = EditorView.decorations.compute([miniLocations, vi
 
     if (haps.has(id)) {
       const hap = haps.get(id);
-      const color = hap.context.color ?? 'var(--foreground)';
+      const color = hap.value?.color ?? 'var(--foreground)';
       // Get explicit channels for color values
       /* 
       const swatch = document.createElement('div');

packages/core/controls.mjs

@@ -1532,6 +1532,14 @@ export const { zdelay } = registerControl('zdelay');
 export const { tremolo } = registerControl('tremolo');
 export const { zzfx } = registerControl('zzfx');
 
+/**
+ * Sets the color of the hap in visualizations like pianoroll or highlighting.
+ * @name color
+ * @synonyms colour
+ * @param {string} color Hexadecimal or CSS color name
+ */
+export const { color, colour } = registerControl(['color', 'colour']);
+
 // TODO: slice / splice https://www.youtube.com/watch?v=hKhPdO0RKDQ&list=PL2lW1zNIIwj3bDkh-Y3LUGDuRcoUigoDs&index=13
 
 export let createParams = (...names) =>

packages/core/pattern.mjs

@@ -2476,17 +2476,6 @@ export const hsl = register('hsl', (h, s, l, pat) => {
   return pat.color(`hsl(${h}turn,${s * 100}%,${l * 100}%)`);
 });
 
-/**
- * Sets the color of the hap in visualizations like pianoroll or highlighting.
- * @name color
- * @synonyms colour
- * @param {string} color Hexadecimal or CSS color name
- */
-// TODO: move this to controls https://github.com/tidalcycles/strudel/issues/288
-export const { color, colour } = register(['color', 'colour'], function (color, pat) {
-  return pat.withContext((context) => ({ ...context, color }));
-});
-
 /**
  * Sets the id of the hap in, for filtering in the future.
  * @name id
@@ -2496,6 +2485,7 @@ export const { color, colour } = register(['color', 'colour'], function (color,
 Pattern.prototype.id = function (id) {
   return this.withContext((ctx) => ({ ...ctx, id }));
 };
+
 //////////////////////////////////////////////////////////////////////
 // Control-related functions, i.e. ones that manipulate patterns of
 // objects

packages/draw/pianoroll.mjs

@@ -194,7 +194,7 @@ export function pianoroll({
     if (hideInactive && !isActive) {
       return;
     }
-    let color = event.value?.color || event.context?.color;
+    let color = event.value?.color;
     active = color || active;
     inactive = colorizeInactive ? color || inactive : inactive;
     color = isActive ? active : inactive;

test/__snapshots__/examples.test.mjs.snap

@@ -2442,8 +2442,6 @@ exports[`runs examples > example "fast" example index 0 1`] = `
 
 exports[`runs examples > example "fastChunk" example index 0 1`] = `
 [
-  "[ 0/1 → 1/4 | note:C2 ]",
-  "[ 1/4 → 1/2 | note:D2 ]",
   "[ 1/2 → 3/4 | note:E2 ]",
   "[ 3/4 → 1/1 | note:F2 ]",
   "[ 1/1 → 5/4 | note:G2 ]",
@@ -2452,8 +2450,6 @@ exports[`runs examples > example "fastChunk" example index 0 1`] = `
   "[ 7/4 → 2/1 | note:C3 ]",
   "[ 2/1 → 9/4 | note:D3 ]",
   "[ 9/4 → 5/2 | note:D2 ]",
-  "[ 5/2 → 11/4 | note:E2 ]",
-  "[ 11/4 → 3/1 | note:F2 ]",
   "[ 3/1 → 13/4 | note:G2 ]",
   "[ 13/4 → 7/2 | note:A2 ]",
   "[ 7/2 → 15/4 | note:B2 ]",
@@ -4774,34 +4770,34 @@ exports[`runs examples > example "phasersweep" example index 0 1`] = `
 
 exports[`runs examples > example "pianoroll" example index 0 1`] = `
 [
-  "[ 0/1 → 1/8 | note:C2 s:piano clip:1 ]",
-  "[ (1/4 → 1/3) ⇝ 3/8 | note:C2 s:piano clip:1 ]",
-  "[ 1/4 ⇜ (1/3 → 3/8) | note:A2 s:piano clip:1 ]",
-  "[ 3/8 → 1/2 | note:A2 s:piano clip:1 ]",
-  "[ (5/8 → 2/3) ⇝ 3/4 | note:A2 s:piano clip:1 ]",
-  "[ 5/8 ⇜ (2/3 → 3/4) | note:G2 s:piano clip:1 ]",
-  "[ 3/4 → 7/8 | note:G2 s:piano clip:1 ]",
-  "[ 1/1 → 9/8 | note:C2 s:piano clip:1 ]",
-  "[ (5/4 → 4/3) ⇝ 11/8 | note:C2 s:piano clip:1 ]",
-  "[ 5/4 ⇜ (4/3 → 11/8) | note:A2 s:piano clip:1 ]",
-  "[ 11/8 → 3/2 | note:A2 s:piano clip:1 ]",
-  "[ (13/8 → 5/3) ⇝ 7/4 | note:A2 s:piano clip:1 ]",
-  "[ 13/8 ⇜ (5/3 → 7/4) | note:G2 s:piano clip:1 ]",
-  "[ 7/4 → 15/8 | note:G2 s:piano clip:1 ]",
-  "[ 2/1 → 17/8 | note:C2 s:piano clip:1 ]",
-  "[ (9/4 → 7/3) ⇝ 19/8 | note:C2 s:piano clip:1 ]",
-  "[ 9/4 ⇜ (7/3 → 19/8) | note:A2 s:piano clip:1 ]",
-  "[ 19/8 → 5/2 | note:A2 s:piano clip:1 ]",
-  "[ (21/8 → 8/3) ⇝ 11/4 | note:A2 s:piano clip:1 ]",
-  "[ 21/8 ⇜ (8/3 → 11/4) | note:G2 s:piano clip:1 ]",
-  "[ 11/4 → 23/8 | note:G2 s:piano clip:1 ]",
-  "[ 3/1 → 25/8 | note:C2 s:piano clip:1 ]",
-  "[ (13/4 → 10/3) ⇝ 27/8 | note:C2 s:piano clip:1 ]",
-  "[ 13/4 ⇜ (10/3 → 27/8) | note:A2 s:piano clip:1 ]",
-  "[ 27/8 → 7/2 | note:A2 s:piano clip:1 ]",
-  "[ (29/8 → 11/3) ⇝ 15/4 | note:A2 s:piano clip:1 ]",
-  "[ 29/8 ⇜ (11/3 → 15/4) | note:G2 s:piano clip:1 ]",
-  "[ 15/4 → 31/8 | note:G2 s:piano clip:1 ]",
+  "[ 0/1 → 1/8 | note:C2 s:piano clip:1 color:salmon ]",
+  "[ (1/4 → 1/3) ⇝ 3/8 | note:C2 s:piano clip:1 color:salmon ]",
+  "[ 1/4 ⇜ (1/3 → 3/8) | note:A2 s:piano clip:1 color:salmon ]",
+  "[ 3/8 → 1/2 | note:A2 s:piano clip:1 color:salmon ]",
+  "[ (5/8 → 2/3) ⇝ 3/4 | note:A2 s:piano clip:1 color:salmon ]",
+  "[ 5/8 ⇜ (2/3 → 3/4) | note:G2 s:piano clip:1 color:salmon ]",
+  "[ 3/4 → 7/8 | note:G2 s:piano clip:1 color:salmon ]",
+  "[ 1/1 → 9/8 | note:C2 s:piano clip:1 color:salmon ]",
+  "[ (5/4 → 4/3) ⇝ 11/8 | note:C2 s:piano clip:1 color:salmon ]",
+  "[ 5/4 ⇜ (4/3 → 11/8) | note:A2 s:piano clip:1 color:salmon ]",
+  "[ 11/8 → 3/2 | note:A2 s:piano clip:1 color:salmon ]",
+  "[ (13/8 → 5/3) ⇝ 7/4 | note:A2 s:piano clip:1 color:salmon ]",
+  "[ 13/8 ⇜ (5/3 → 7/4) | note:G2 s:piano clip:1 color:salmon ]",
+  "[ 7/4 → 15/8 | note:G2 s:piano clip:1 color:salmon ]",
+  "[ 2/1 → 17/8 | note:C2 s:piano clip:1 color:salmon ]",
+  "[ (9/4 → 7/3) ⇝ 19/8 | note:C2 s:piano clip:1 color:salmon ]",
+  "[ 9/4 ⇜ (7/3 → 19/8) | note:A2 s:piano clip:1 color:salmon ]",
+  "[ 19/8 → 5/2 | note:A2 s:piano clip:1 color:salmon ]",
+  "[ (21/8 → 8/3) ⇝ 11/4 | note:A2 s:piano clip:1 color:salmon ]",
+  "[ 21/8 ⇜ (8/3 → 11/4) | note:G2 s:piano clip:1 color:salmon ]",
+  "[ 11/4 → 23/8 | note:G2 s:piano clip:1 color:salmon ]",
+  "[ 3/1 → 25/8 | note:C2 s:piano clip:1 color:salmon ]",
+  "[ (13/4 → 10/3) ⇝ 27/8 | note:C2 s:piano clip:1 color:salmon ]",
+  "[ 13/4 ⇜ (10/3 → 27/8) | note:A2 s:piano clip:1 color:salmon ]",
+  "[ 27/8 → 7/2 | note:A2 s:piano clip:1 color:salmon ]",
+  "[ (29/8 → 11/3) ⇝ 15/4 | note:A2 s:piano clip:1 color:salmon ]",
+  "[ 29/8 ⇜ (11/3 → 15/4) | note:G2 s:piano clip:1 color:salmon ]",
+  "[ 15/4 → 31/8 | note:G2 s:piano clip:1 color:salmon ]",
 ]
 `;
 

website/src/repl/tunes.mjs

@@ -106,8 +106,7 @@ stack(
   [B3@2 D4] [A3@2 [G3 A3]] [B3@2 D4] [A3]
   [B3@2 D4] [A4@2 G4] D5@2 
   [D5@2 [C5 B4]] [[C5 B4] G4@2] [C5@2 [B4 A4]] [[B4 A4] E4@2]
-  [D5@2 [C5 B4]] [[C5 B4] G4 C5] [G5] [~ ~ B3]\`
-  .color('#9C7C38'),
+  [D5@2 [C5 B4]] [[C5 B4] G4 C5] [G5] [~ ~ B3]\`,
   // bass
   \`[[C2 G2] E3@2] [[C2 G2] F#3@2] [[C2 G2] E3@2] [[C2 G2] F#3@2]
   [[B1 D3] G3@2] [[Bb1 Db3] G3@2] [[A1 C3] G3@2] [[D2 C3] F#3@2]
@@ -115,7 +114,6 @@ stack(
   [[B1 D3] G3@2] [[Bb1 Db3] G3@2] [[A1 C3] G3@2] [[D2 C3] F#3@2]
   [[F2 C3] E3@2] [[E2 B2] D3@2] [[D2 A2] C3@2] [[C2 G2] B2@2]
   [[F2 C3] E3@2] [[E2 B2] D3@2] [[Eb2 Bb2] Db3@2] [[D2 A2] C3 [F3,G2]]\`
-  .color('#4C4646')
 ).transpose(12).slow(48)
   .superimpose(x=>x.add(0.06)) // add slightly detuned voice
   .note()
@@ -563,7 +561,7 @@ setcps(1)
 "<8(3,8) <7 7*2> [4 5@3] 8>".sub(1) // sub 1 -> 1-indexed
 .layer(
 x=>x,
-x=>x.add(7).color('steelblue')
+x=>x.add(7)
 .off(1/8,x=>x.add("2,4").off(1/8,x=>x.add(5).echo(4,.125,.5)))
 .slow(2),
 ).n().scale('A1 minor')