From ce79a44848562974d2debda42ab914a614a3c7b1 Mon Sep 17 00:00:00 2001 From: "Jade (Rose) Rowland" Date: Sun, 28 Apr 2024 14:36:52 -0400 Subject: [PATCH 1/2] fix failing format test --- website/src/pages/workshop/first-effects.mdx | 60 ++++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/website/src/pages/workshop/first-effects.mdx b/website/src/pages/workshop/first-effects.mdx index e7251624..d3dd80ba 100644 --- a/website/src/pages/workshop/first-effects.mdx +++ b/website/src/pages/workshop/first-effects.mdx @@ -83,15 +83,15 @@ Let's combine all of the above into a little tune: ") - .sound("sawtooth").lpf("200 1000 200 1000"), - note("<[c3,g3,e4] [bb2,f3,d4] [a2,f3,c4] [bb2,g3,eb4]>") - .sound("sawtooth").vowel("") -) `} +stack( +sound("hh*8").gain("[.25 1]*4"), +sound("bd*4,[~ sd:1]*2") +), +note("<[c2 c3]*4 [bb1 bb2]*4 [f2 f3]*4 [eb2 eb3]*4>") +.sound("sawtooth").lpf("200 1000 200 1000"), +note("<[c3,g3,e4] [bb2,f3,d4] [a2,f3,c4] [bb2,g3,eb4]>") +.sound("sawtooth").vowel("") +)`} /> @@ -152,9 +152,9 @@ Can you guess what they do? ~]]*2") - .sound("gm_electric_guitar_muted"), - sound("").bank("RolandTR707") +note("[~ [<[d3,a3,f4]!2 [d3,bb3,g4]!2> ~]]*2") +.sound("gm_electric_guitar_muted"), +sound("").bank("RolandTR707") ).delay(".5")`} /> @@ -200,12 +200,12 @@ Add a delay too! ~]]*2") - .sound("gm_electric_guitar_muted").delay(.5), - sound("").bank("RolandTR707").delay(.5), - n("<4 [3@3 4] [<2 0> ~@16] ~>") - .scale("D4:minor").sound("gm_accordion:2") - .room(2).gain(.5) +note("[~ [<[d3,a3,f4]!2 [d3,bb3,g4]!2> ~]]*2") +.sound("gm_electric_guitar_muted").delay(.5), +sound("").bank("RolandTR707").delay(.5), +n("<4 [3@3 4] [<2 0> ~@16] ~>") +.scale("D4:minor").sound("gm_accordion:2") +room(2).gain(.5) )`} /> @@ -214,15 +214,15 @@ Let's add a bass to make this complete: ~]]*2") - .sound("gm_electric_guitar_muted").delay(.5), - sound("").bank("RolandTR707").delay(.5), - n("<4 [3@3 4] [<2 0> ~@16] ~>") - .scale("D4:minor").sound("gm_accordion:2") - .room(2).gain(.4), - n("[0 [~ 0] 4 [3 2] [0 ~] [0 ~] <0 2> ~]/2") - .scale("D2:minor") - .sound("sawtooth,triangle").lpf(800) +note("[~ [<[d3,a3,f4]!2 [d3,bb3,g4]!2> ~]]*2") +.sound("gm_electric_guitar_muted").delay(.5), +sound("").bank("RolandTR707").delay(.5), +n("<4 [3@3 4] [<2 0> ~@16] ~>") +.scale("D4:minor").sound("gm_accordion:2") +.room(2).gain(.4), +n("[0 [~ 0] 4 [3 2] [0 ~] [0 ~] <0 2> ~]/2") +.scale("D2:minor") +.sound("sawtooth,triangle").lpf(800) )`} /> @@ -237,7 +237,7 @@ Try adding `.hush()` at the end of one of the patterns in the stack... **speed** @@ -295,8 +295,8 @@ We can change the automation speed with slow / fast: ") -.sound("sawtooth") -.lpf(sine.range(100, 2000).slow(4))`} + .sound("sawtooth") + .lpf(sine.range(100, 2000).slow(4))`} /> From 15f16006d012c6d68a688e4903533b639c7915ad Mon Sep 17 00:00:00 2001 From: "Jade (Rose) Rowland" Date: Sun, 28 Apr 2024 14:43:35 -0400 Subject: [PATCH 2/2] ran prettier again? --- website/src/pages/workshop/first-sounds.mdx | 20 +++++++++---------- .../src/pages/workshop/pattern-effects.mdx | 1 - 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/website/src/pages/workshop/first-sounds.mdx b/website/src/pages/workshop/first-sounds.mdx index 4e374001..9c33cdc3 100644 --- a/website/src/pages/workshop/first-sounds.mdx +++ b/website/src/pages/workshop/first-sounds.mdx @@ -270,16 +270,16 @@ This is shorter and more readable than: Now we've learned the basics of the so called Mini-Notation, the rhythm language of Tidal. This is what we've learned so far: -| Concept | Syntax | Example | -| ------------------- | -------- | ----------------------------------------------------------------------- | -| Sequence | space | | -| Sample Number | :x | | -| Rests | - or ~ | | -| Alternate | \<\> | ")`} /> | -| Sub-Sequences | \[\] | | -| Sub-Sub-Sequences | \[\[\]\] | | -| Speed up | \* | | -| Parallel | , | | +| Concept | Syntax | Example | +| ----------------- | -------- | ----------------------------------------------------------------------- | +| Sequence | space | | +| Sample Number | :x | | +| Rests | - or ~ | | +| Alternate | \<\> | ")`} /> | +| Sub-Sequences | \[\] | | +| Sub-Sub-Sequences | \[\[\]\] | | +| Speed up | \* | | +| Parallel | , | | The Mini-Notation is usually used inside some function. These are the functions we've seen so far: diff --git a/website/src/pages/workshop/pattern-effects.mdx b/website/src/pages/workshop/pattern-effects.mdx index e9587d73..5afe862c 100644 --- a/website/src/pages/workshop/pattern-effects.mdx +++ b/website/src/pages/workshop/pattern-effects.mdx @@ -164,7 +164,6 @@ off is also useful for modifying other sounds, and can even be nested: .off(3/16, y=>y.vowel("*8")))`} /> - | name | description | example | | ---- | ------------------------------ | ------------------------------------------------------------------------------------------- | | rev | reverse | |