diff --git a/repl/src/shapeshifter.js b/repl/src/shapeshifter.js index f4a6eb6e..3bd53a28 100644 --- a/repl/src/shapeshifter.js +++ b/repl/src/shapeshifter.js @@ -138,10 +138,10 @@ export default (code) => { return codegen(shifted); }; -function wrapFunction(name, ...arguments) { +function wrapFunction(name, ...args) { return new CallExpression({ callee: new IdentifierExpression({ name }), - arguments, + arguments: args, }); } diff --git a/repl/src/tunes.ts b/repl/src/tunes.ts index 5968dacf..39e4730a 100644 --- a/repl/src/tunes.ts +++ b/repl/src/tunes.ts @@ -1,7 +1,7 @@ export const timeCatMini = `stack( - 'c3@3 [eb3, g3, [c4 d4]/2]'.mini, - 'c2 g2'.mini, - '[eb4@5 [f4 eb4 d4]@3] [eb4 c4]/2'.mini.slow(8) + "c3@3 [eb3, g3, [c4 d4]/2]", + "c2 g2", + "[eb4@5 [f4 eb4 d4]@3] [eb4 c4]/2".slow(8) )`; export const timeCat = `stack( @@ -58,48 +58,48 @@ export const tetrisWithFunctions = `stack(sequence( ).slow(16)`; export const tetris = `stack( - mini( - 'e5 [b4 c5] d5 [c5 b4]', - 'a4 [a4 c5] e5 [d5 c5]', - 'b4 [~ c5] d5 e5', - 'c5 a4 a4 ~', - '[~ d5] [~ f5] a5 [g5 f5]', - 'e5 [~ c5] e5 [d5 c5]', - 'b4 [b4 c5] d5 e5', - 'c5 a4 a4 ~' + cat( + "e5 [b4 c5] d5 [c5 b4]", + "a4 [a4 c5] e5 [d5 c5]", + "b4 [~ c5] d5 e5", + "c5 a4 a4 ~", + "[~ d5] [~ f5] a5 [g5 f5]", + "e5 [~ c5] e5 [d5 c5]", + "b4 [b4 c5] d5 e5", + "c5 a4 a4 ~" ), - mini( - 'e2 e3 e2 e3 e2 e3 e2 e3', - 'a2 a3 a2 a3 a2 a3 a2 a3', - 'g#2 g#3 g#2 g#3 e2 e3 e2 e3', - 'a2 a3 a2 a3 a2 a3 b1 c2', - 'd2 d3 d2 d3 d2 d3 d2 d3', - 'c2 c3 c2 c3 c2 c3 c2 c3', - 'b1 b2 b1 b2 e2 e3 e2 e3', - 'a1 a2 a1 a2 a1 a2 a1 a2' + cat( + "e2 e3 e2 e3 e2 e3 e2 e3", + "a2 a3 a2 a3 a2 a3 a2 a3", + "g#2 g#3 g#2 g#3 e2 e3 e2 e3", + "a2 a3 a2 a3 a2 a3 b1 c2", + "d2 d3 d2 d3 d2 d3 d2 d3", + "c2 c3 c2 c3 c2 c3 c2 c3", + "b1 b2 b1 b2 e2 e3 e2 e3", + "a1 a2 a1 a2 a1 a2 a1 a2", ) ).slow(16)`; export const tetrisRev = `stack( - mini( - 'e5 [b4 c5] d5 [c5 b4]', - 'a4 [a4 c5] e5 [d5 c5]', - 'b4 [~ c5] d5 e5', - 'c5 a4 a4 ~', - '[~ d5] [~ f5] a5 [g5 f5]', - 'e5 [~ c5] e5 [d5 c5]', - 'b4 [b4 c5] d5 e5', - 'c5 a4 a4 ~' + cat( + "e5 [b4 c5] d5 [c5 b4]", + "a4 [a4 c5] e5 [d5 c5]", + "b4 [~ c5] d5 e5", + "c5 a4 a4 ~", + "[~ d5] [~ f5] a5 [g5 f5]", + "e5 [~ c5] e5 [d5 c5]", + "b4 [b4 c5] d5 e5", + "c5 a4 a4 ~", ).rev(), - mini( - 'e2 e3 e2 e3 e2 e3 e2 e3', - 'a2 a3 a2 a3 a2 a3 a2 a3', - 'g#2 g#3 g#2 g#3 e2 e3 e2 e3', - 'a2 a3 a2 a3 a2 a3 b1 c2', - 'd2 d3 d2 d3 d2 d3 d2 d3', - 'c2 c3 c2 c3 c2 c3 c2 c3', - 'b1 b2 b1 b2 e2 e3 e2 e3', - 'a1 a2 a1 a2 a1 a2 a1 a2' + cat( + "e2 e3 e2 e3 e2 e3 e2 e3", + "a2 a3 a2 a3 a2 a3 a2 a3", + "g#2 g#3 g#2 g#3 e2 e3 e2 e3", + "a2 a3 a2 a3 a2 a3 b1 c2", + "d2 d3 d2 d3 d2 d3 d2 d3", + "c2 c3 c2 c3 c2 c3 c2 c3", + "b1 b2 b1 b2 e2 e3 e2 e3", + "a1 a2 a1 a2 a1 a2 a1 a2", ).rev() ).slow(16)`; @@ -112,7 +112,7 @@ export const tetrisRev = `stack( */ /* export const tetrisMini1 = - "'[[e5 [b4 c5] d5 [c5 b4]] [a4 [a4 c5] e5 [d5 c5]] [b4 [~ c5] d5 e5] [c5 a4 a4 ~] [[~ d5] [~ f5] a5 [g5 f5]] [e5 [~ c5] e5 [d5 c5]] [b4 [b4 c5] d5 e5] [c5 a4 a4 ~]],[[e2 e3 e2 e3 e2 e3 e2 e3] [a2 a3 a2 a3 a2 a3 a2 a3] [g#2 g#3 g#2 g#3 e2 e3 e2 e3] [a2 a3 a2 a3 a2 a3 b1 c2] [d2 d3 d2 d3 d2 d3 d2 d3] [c2 c3 c2 c3 c2 c3 c2 c3] [b1 b2 b1 b2 e2 e3 e2 e3] [a1 a2 a1 a2 a1 a2 a1 a2]]'.mini.slow(16)"; + '"[[e5 [b4 c5] d5 [c5 b4]] [a4 [a4 c5] e5 [d5 c5]] [b4 [~ c5] d5 e5] [c5 a4 a4 ~] [[~ d5] [~ f5] a5 [g5 f5]] [e5 [~ c5] e5 [d5 c5]] [b4 [b4 c5] d5 e5] [c5 a4 a4 ~]],[[e2 e3 e2 e3 e2 e3 e2 e3] [a2 a3 a2 a3 a2 a3 a2 a3] [g#2 g#3 g#2 g#3 e2 e3 e2 e3] [a2 a3 a2 a3 a2 a3 b1 c2] [d2 d3 d2 d3 d2 d3 d2 d3] [c2 c3 c2 c3 c2 c3 c2 c3] [b1 b2 b1 b2 e2 e3 e2 e3] [a1 a2 a1 a2 a1 a2 a1 a2]]".slow(16)'; */ export const tetrisMini = `\`[[e5 [b4 c5] d5 [c5 b4]] [a4 [a4 c5] e5 [d5 c5]] @@ -129,7 +129,7 @@ export const tetrisMini = `\`[[e5 [b4 c5] d5 [c5 b4]] [[d2 d3]*4] [[c2 c3]*4] [[b1 b2]*2 [e2 e3]*2] -[[a1 a2]*4]\`.mini.slow(16) +[[a1 a2]*4]\`.slow(16) `; /* export const tetrisHaskellH = `h(\`slow 16 $ "[[e5 [b4 c5] d5 [c5 b4]] @@ -185,120 +185,120 @@ export const whirlyStrudel = `sequence(e4, [b2, b3], c4) .every(2, _ => sequence(e4, r, e3, d4, r))`; export const swimming = `stack( - mini( - '~', - '~', - '~', - 'A5 [F5@2 C5] [D5@2 F5] F5', - '[C5@2 F5] [F5@2 C6] A5 G5', - 'A5 [F5@2 C5] [D5@2 F5] F5', - '[C5@2 F5] [Bb5 A5 G5] F5@2', - 'A5 [F5@2 C5] [D5@2 F5] F5', - '[C5@2 F5] [F5@2 C6] A5 G5', - 'A5 [F5@2 C5] [D5@2 F5] F5', - '[C5@2 F5] [Bb5 A5 G5] F5@2', - 'A5 [F5@2 C5] A5 F5', - 'Ab5 [F5@2 Ab5] G5@2', - 'A5 [F5@2 C5] A5 F5', - 'Ab5 [F5@2 C5] C6@2', - 'A5 [F5@2 C5] [D5@2 F5] F5', - '[C5@2 F5] [Bb5 A5 G5] F5@2' + cat( + "~", + "~", + "~", + "A5 [F5@2 C5] [D5@2 F5] F5", + "[C5@2 F5] [F5@2 C6] A5 G5", + "A5 [F5@2 C5] [D5@2 F5] F5", + "[C5@2 F5] [Bb5 A5 G5] F5@2", + "A5 [F5@2 C5] [D5@2 F5] F5", + "[C5@2 F5] [F5@2 C6] A5 G5", + "A5 [F5@2 C5] [D5@2 F5] F5", + "[C5@2 F5] [Bb5 A5 G5] F5@2", + "A5 [F5@2 C5] A5 F5", + "Ab5 [F5@2 Ab5] G5@2", + "A5 [F5@2 C5] A5 F5", + "Ab5 [F5@2 C5] C6@2", + "A5 [F5@2 C5] [D5@2 F5] F5", + "[C5@2 F5] [Bb5 A5 G5] F5@2" ), - mini( - '[F4,Bb4,D5] [[D4,G4,Bb4]@2 [Bb3,D4,F4]] [[G3,C4,E4]@2 [[Ab3,F4] [A3,Gb4]]] [Bb3,E4,G4]', - '[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, Bb3, Db3] [F3, Bb3, Db3]]', - '[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]', - '[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]', - '[~ [A3, C4, E4] [A3, C4, E4]] [~ [Ab3, C4, Eb4] [Ab3, C4, Eb4]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [G3, C4, E4] [G3, C4, E4]]', - '[~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]', - '[~ [F3, Bb3, D4] [F3, Bb3, D4]] [~ [F3, Bb3, C4] [F3, Bb3, C4]] [~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, A3, C4] [F3, A3, C4]]', - '[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]', - '[~ [A3, C4, E4] [A3, C4, E4]] [~ [Ab3, C4, Eb4] [Ab3, C4, Eb4]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [G3, C4, E4] [G3, C4, E4]]', - '[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]', - '[~ [F3, Bb3, D4] [F3, Bb3, D4]] [~ [F3, Bb3, C4] [F3, Bb3, C4]] [~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, A3, C4] [F3, A3, C4]]', - '[~ [Bb3, D3, F4] [Bb3, D3, F4]] [~ [Bb3, D3, F4] [Bb3, D3, F4]] [~ [A3, C4, F4] [A3, C4, F4]] [~ [A3, C4, F4] [A3, C4, F4]]', - '[~ [Ab3, B3, F4] [Ab3, B3, F4]] [~ [Ab3, B3, F4] [Ab3, B3, F4]] [~ [G3, Bb3, F4] [G3, Bb3, F4]] [~ [G3, Bb3, E4] [G3, Bb3, E4]]', - '[~ [Bb3, D3, F4] [Bb3, D3, F4]] [~ [Bb3, D3, F4] [Bb3, D3, F4]] [~ [A3, C4, F4] [A3, C4, F4]] [~ [A3, C4, F4] [A3, C4, F4]]', - '[~ [Ab3, B3, F4] [Ab3, B3, F4]] [~ [Ab3, B3, F4] [Ab3, B3, F4]] [~ [G3, Bb3, F4] [G3, Bb3, F4]] [~ [G3, Bb3, E4] [G3, Bb3, E4]]', - '[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]', - '[~ [F3, Bb3, D4] [F3, Bb3, D4]] [~ [F3, Bb3, C4] [F3, Bb3, C4]] [~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, A3, C4] [F3, A3, C4]]' + cat( + "[F4,Bb4,D5] [[D4,G4,Bb4]@2 [Bb3,D4,F4]] [[G3,C4,E4]@2 [[Ab3,F4] [A3,Gb4]]] [Bb3,E4,G4]", + "[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, Bb3, Db3] [F3, Bb3, Db3]]", + "[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]", + "[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]", + "[~ [A3, C4, E4] [A3, C4, E4]] [~ [Ab3, C4, Eb4] [Ab3, C4, Eb4]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [G3, C4, E4] [G3, C4, E4]]", + "[~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]", + "[~ [F3, Bb3, D4] [F3, Bb3, D4]] [~ [F3, Bb3, C4] [F3, Bb3, C4]] [~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, A3, C4] [F3, A3, C4]]", + "[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]", + "[~ [A3, C4, E4] [A3, C4, E4]] [~ [Ab3, C4, Eb4] [Ab3, C4, Eb4]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [G3, C4, E4] [G3, C4, E4]]", + "[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]", + "[~ [F3, Bb3, D4] [F3, Bb3, D4]] [~ [F3, Bb3, C4] [F3, Bb3, C4]] [~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, A3, C4] [F3, A3, C4]]", + "[~ [Bb3, D3, F4] [Bb3, D3, F4]] [~ [Bb3, D3, F4] [Bb3, D3, F4]] [~ [A3, C4, F4] [A3, C4, F4]] [~ [A3, C4, F4] [A3, C4, F4]]", + "[~ [Ab3, B3, F4] [Ab3, B3, F4]] [~ [Ab3, B3, F4] [Ab3, B3, F4]] [~ [G3, Bb3, F4] [G3, Bb3, F4]] [~ [G3, Bb3, E4] [G3, Bb3, E4]]", + "[~ [Bb3, D3, F4] [Bb3, D3, F4]] [~ [Bb3, D3, F4] [Bb3, D3, F4]] [~ [A3, C4, F4] [A3, C4, F4]] [~ [A3, C4, F4] [A3, C4, F4]]", + "[~ [Ab3, B3, F4] [Ab3, B3, F4]] [~ [Ab3, B3, F4] [Ab3, B3, F4]] [~ [G3, Bb3, F4] [G3, Bb3, F4]] [~ [G3, Bb3, E4] [G3, Bb3, E4]]", + "[~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, A3, C3] [F3, A3, C3]] [~ [F3, Bb3, D3] [F3, Bb3, D3]] [~ [F3, B3, D3] [F3, B3, D3]]", + "[~ [F3, Bb3, D4] [F3, Bb3, D4]] [~ [F3, Bb3, C4] [F3, Bb3, C4]] [~ [F3, A3, C4] [F3, A3, C4]] [~ [F3, A3, C4] [F3, A3, C4]]" ), - mini( - '[G3 G3 C3 E3]', - '[F2 D2 G2 C2]', - '[F2 D2 G2 C2]', - '[F2 A2 Bb2 B2]', - '[A2 Ab2 G2 C2]', - '[F2 A2 Bb2 B2]', - '[G2 C2 F2 F2]', - '[F2 A2 Bb2 B2]', - '[A2 Ab2 G2 C2]', - '[F2 A2 Bb2 B2]', - '[G2 C2 F2 F2]', - '[Bb2 Bb2 A2 A2]', - '[Ab2 Ab2 G2 [C2 D2 E2]]', - '[Bb2 Bb2 A2 A2]', - '[Ab2 Ab2 G2 [C2 D2 E2]]', - '[F2 A2 Bb2 B2]', - '[G2 C2 F2 F2]' + cat( + "[G3 G3 C3 E3]", + "[F2 D2 G2 C2]", + "[F2 D2 G2 C2]", + "[F2 A2 Bb2 B2]", + "[A2 Ab2 G2 C2]", + "[F2 A2 Bb2 B2]", + "[G2 C2 F2 F2]", + "[F2 A2 Bb2 B2]", + "[A2 Ab2 G2 C2]", + "[F2 A2 Bb2 B2]", + "[G2 C2 F2 F2]", + "[Bb2 Bb2 A2 A2]", + "[Ab2 Ab2 G2 [C2 D2 E2]]", + "[Bb2 Bb2 A2 A2]", + "[Ab2 Ab2 G2 [C2 D2 E2]]", + "[F2 A2 Bb2 B2]", + "[G2 C2 F2 F2]" ) ).slow(51); `; export const giantSteps = `stack( // melody - mini( - '[F#5 D5] [B4 G4] Bb4 [B4 A4]', - '[D5 Bb4] [G4 Eb4] F#4 [G4 F4]', - 'Bb4 [B4 A4] D5 [D#5 C#5]', - 'F#5 [G5 F5] Bb5 [F#5 F#5]', + cat( + "[F#5 D5] [B4 G4] Bb4 [B4 A4]", + "[D5 Bb4] [G4 Eb4] F#4 [G4 F4]", + "Bb4 [B4 A4] D5 [D#5 C#5]", + "F#5 [G5 F5] Bb5 [F#5 F#5]", ), // chords - mini( - '[B^7 D7] [G^7 Bb7] Eb^7 [Am7 D7]', - '[G^7 Bb7] [Eb^7 F#7] B^7 [Fm7 Bb7]', - 'Eb^7 [Am7 D7] G^7 [C#m7 F#7]', - 'B^7 [Fm7 Bb7] Eb^7 [C#m7 F#7]' + cat( + "[B^7 D7] [G^7 Bb7] Eb^7 [Am7 D7]", + "[G^7 Bb7] [Eb^7 F#7] B^7 [Fm7 Bb7]", + "Eb^7 [Am7 D7] G^7 [C#m7 F#7]", + "B^7 [Fm7 Bb7] Eb^7 [C#m7 F#7]" ).voicings(['E3', 'G4']), // bass - mini( - '[B2 D2] [G2 Bb2] [Eb2 Bb3] [A2 D2]', - '[G2 Bb2] [Eb2 F#2] [B2 F#2] [F2 Bb2]', - '[Eb2 Bb2] [A2 D2] [G2 D2] [C#2 F#2]', - '[B2 F#2] [F2 Bb2] [Eb2 Bb3] [C#2 F#2]' + cat( + "[B2 D2] [G2 Bb2] [Eb2 Bb3] [A2 D2]", + "[G2 Bb2] [Eb2 F#2] [B2 F#2] [F2 Bb2]", + "[Eb2 Bb2] [A2 D2] [G2 D2] [C#2 F#2]", + "[B2 F#2] [F2 Bb2] [Eb2 Bb3] [C#2 F#2]" ) ).slow(20);`; export const giantStepsReggae = `stack( // melody - mini( - '[F#5 D5] [B4 G4] Bb4 [B4 A4]', - '[D5 Bb4] [G4 Eb4] F#4 [G4 F4]', - 'Bb4 [B4 A4] D5 [D#5 C#5]', - 'F#5 [G5 F5] Bb5 [F#5 [F#5 ~@3]]', + cat( + "[F#5 D5] [B4 G4] Bb4 [B4 A4]", + "[D5 Bb4] [G4 Eb4] F#4 [G4 F4]", + "Bb4 [B4 A4] D5 [D#5 C#5]", + "F#5 [G5 F5] Bb5 [F#5 [F#5 ~@3]]", ), // chords - mini( - '[B^7 D7] [G^7 Bb7] Eb^7 [Am7 D7]', - '[G^7 Bb7] [Eb^7 F#7] B^7 [Fm7 Bb7]', - 'Eb^7 [Am7 D7] G^7 [C#m7 F#7]', - 'B^7 [Fm7 Bb7] Eb^7 [C#m7 F#7]' + cat( + "[B^7 D7] [G^7 Bb7] Eb^7 [Am7 D7]", + "[G^7 Bb7] [Eb^7 F#7] B^7 [Fm7 Bb7]", + "Eb^7 [Am7 D7] G^7 [C#m7 F#7]", + "B^7 [Fm7 Bb7] Eb^7 [C#m7 F#7]" ) - .groove('~ [x ~]'.m.fast(4*8)) + .groove("~ [x ~]".fast(4*8)) .voicings(['E3', 'G4']), // bass - mini( - '[B2 D2] [G2 D2] [Eb2 Bb2] [A2 D2]', - '[G2 Bb2] [Eb2 F#2] [B2 F#2] [F2 Bb2]', - '[Eb2 Bb2] [A2 D2] [G2 D2] [C#2 F#2]', - '[B2 F#2] [F2 Bb2] [Eb2 Bb2] [C#2 F#2]' + cat( + "[B2 D2] [G2 D2] [Eb2 Bb2] [A2 D2]", + "[G2 Bb2] [Eb2 F#2] [B2 F#2] [F2 Bb2]", + "[Eb2 Bb2] [A2 D2] [G2 D2] [C#2 F#2]", + "[B2 F#2] [F2 Bb2] [Eb2 Bb2] [C#2 F#2]" ) - .groove('x ~'.m.fast(4*8)) + .groove("x ~".fast(4*8)) ).slow(25)`; export const transposedChordsHacked = `stack( - 'c2 eb2 g2'.mini, - 'Cm7'.pure.voicings(['g2','c4']).slow(2) + "c2 eb2 g2", + "Cm7".voicings(['g2','c4']).slow(2) ).transpose( slowcat(1, 2, 3, 2).slow(2) ).transpose(5)`; @@ -309,19 +309,19 @@ export const scaleTranspose = `stack(f2, f3, c4, ab4) .transpose(sequence(0, 1).slow(16))`; export const groove = `stack( - 'c2 g2 a2 [e2@2 eb2] d2 a2 g2 [d2 ~ db2]'.mini, - '[C^7 A7] [Dm7 G7]'.mini.groove('[x@2 x] [~@2 x] [~ x@2]@2 [x ~@2] ~ [~@2 x@4]@2'.mini) + "c2 g2 a2 [e2@2 eb2] d2 a2 g2 [d2 ~ db2]", + "[C^7 A7] [Dm7 G7]".groove("[x@2 x] [~@2 x] [~ x@2]@2 [x ~@2] ~ [~@2 x@4]@2") .voicings(['G3','A4']) ).slow(4)`; export const magicSofa = `stack( - ' '.m + " " .every(2, fast(2)) .voicings(), - ' '.m + " " ).slow(1).transpose.slowcat(0, 2, 3, 4)`; -/* export const confusedPhone = `stack('[g2 ~@1.3] [c3 ~@1.3]'.mini.slow(2)) +/* export const confusedPhone = `stack("[g2 ~@1.3] [c3 ~@1.3]".slow(2)) .superimpose( x => transpose(-12,x).late(0), x => transpose(7,x).late(0.2), @@ -333,7 +333,7 @@ export const magicSofa = `stack( .scaleTranspose(slowcat(0,1,2,1).slow(2)) .synth('triangle').gain(0.5).filter(1500)`; */ -export const confusedPhoneDynamic = `stack('[g2 ~@1.3] [c3 ~@1.3]'.mini.slow(2)) +export const confusedPhoneDynamic = `stack("[g2 ~@1.3] [c3 ~@1.3]".slow(2)) .superimpose( ...[-12,7,10,12,24].slice(0,5).map((t,i,{length}) => x => transpose(t,x).late(i/length)) ) @@ -341,7 +341,7 @@ export const confusedPhoneDynamic = `stack('[g2 ~@1.3] [c3 ~@1.3]'.mini.slow(2)) .scaleTranspose(slowcat(0,1,2,1).slow(2)) .synth('triangle').gain(0.5).filter(1500)`; -export const confusedPhone = `'[g2 ~@1.3] [c3 ~@1.3]'.mini +export const confusedPhone = `"[g2 ~@1.3] [c3 ~@1.3]" .superimpose( transpose(-12).late(0), transpose(7).late(0.1), @@ -360,14 +360,14 @@ export const zeldasRescue = `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]\`.mini, + [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] [[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] [[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]]\`.mini + [[F2 C3] E3@2] [[E2 B2] D3@2] [[Eb2 Bb2] Db3@2] [[D2 A2] C3 [F3,G2]]\` ).transpose(12).slow(48).tone( new PolySynth().chain( new Gain(0.3), @@ -377,9 +377,9 @@ export const zeldasRescue = `stack( )`; export const technoDrums = `stack( - 'c1*2'.m.tone(new Tone.MembraneSynth().toDestination()), - '~ x'.m.tone(new Tone.NoiseSynth().toDestination()), - '[~ c4]*2'.m.tone(new Tone.MetalSynth().set({envelope:{decay:0.06,sustain:0}}).chain(new Gain(0.5),Destination)) + "c1*2".tone(new Tone.MembraneSynth().toDestination()), + "~ x".tone(new Tone.NoiseSynth().toDestination()), + "[~ c4]*2".tone(new Tone.MetalSynth().set({envelope:{decay:0.06,sustain:0}}).chain(new Gain(0.5),Destination)) )`; export const loungerave = `() => { @@ -391,22 +391,22 @@ export const loungerave = `() => { const keys = new PolySynth().set({ ...osc('sawtooth'), ...adsr(0, .5, .2, .7) }).chain(lowpass(1200), vol(.5), out); const drums = stack( - 'c1*2'.m.tone(kick).bypass('<0@7 1>/8'.m), - '~ '.m.tone(snare).bypass('<0@7 1>/4'.m), - '[~ c4]*2'.m.tone(hihat) + "c1*2".tone(kick).bypass("<0@7 1>/8"), + "~ ".tone(snare).bypass("<0@7 1>/4"), + "[~ c4]*2".tone(hihat) ); - const thru = (x) => x.transpose('<0 1>/8'.m).transpose(1); + const thru = (x) => x.transpose("<0 1>/8").transpose(1); const synths = stack( - '/2'.m.groove('[x [~ x] <[~ [~ x]]!3 [x x]>@2]/2'.m).edit(thru).tone(bass), - '/2'.m.groove('~ [x@0.1 ~]'.m).voicings().edit(thru).every(2, early(1/4)).tone(keys).bypass('<0@7 1>/8'.m.early(1/4)) + "/2".groove("[x [~ x] <[~ [~ x]]!3 [x x]>@2]/2").edit(thru).tone(bass), + "/2".groove("~ [x@0.1 ~]").voicings().edit(thru).every(2, early(1/4)).tone(keys).bypass("<0@7 1>/8".early(1/4)) ) return stack( drums, synths ) - //.bypass('<0 1>*4'.m) - //.early('0.25 0'.m); + //.bypass("<0 1>*4") + //.early("0.25 0"); }`; export const caverave = `() => { @@ -418,22 +418,22 @@ export const caverave = `() => { const keys = new PolySynth().set({ ...osc('sawtooth'), ...adsr(0, .5, .2, .7) }).chain(lowpass(1200), vol(.5), out); const drums = stack( - 'c1*2'.m.tone(kick).bypass('<0@7 1>/8'.m), - '~ '.m.tone(snare).bypass('<0@7 1>/4'.m), - '[~ c4]*2'.m.tone(hihat) + "c1*2".tone(kick).bypass("<0@7 1>/8"), + "~ ".tone(snare).bypass("<0@7 1>/4"), + "[~ c4]*2".tone(hihat) ); - const thru = (x) => x.transpose('<0 1>/8'.m).transpose(-1); + const thru = (x) => x.transpose("<0 1>/8").transpose(-1); const synths = stack( - '/2'.m.scale(timeCat([3,'C minor'],[1,'C melodic minor']).slow(8)).groove('[~ x]*2'.m) + "/2".scale(timeCat([3,'C minor'],[1,'C melodic minor']).slow(8)).groove("[~ x]*2") .edit( scaleTranspose(0).early(0), scaleTranspose(2).early(1/8), scaleTranspose(7).early(1/4), scaleTranspose(8).early(3/8) - ).edit(thru).tone(keys).bypass('<1 0>/16'.m), - '/2'.m.groove('[x [~ x] <[~ [~ x]]!3 [x x]>@2]/2'.m.fast(2)).edit(thru).tone(bass), - '/2'.m.groove('~ [x@0.1 ~]'.m.fast(2)).voicings().edit(thru).every(2, early(1/8)).tone(keys).bypass('<0@7 1>/8'.m.early(1/4)) + ).edit(thru).tone(keys).bypass("<1 0>/16"), + "/2".groove("[x [~ x] <[~ [~ x]]!3 [x x]>@2]/2".fast(2)).edit(thru).tone(bass), + "/2".groove("~ [x@0.1 ~]".fast(2)).voicings().edit(thru).every(2, early(1/8)).tone(keys).bypass("<0@7 1>/8".early(1/4)) ) return stack( drums.fast(2), @@ -448,7 +448,7 @@ export const callcenterhero = `()=>{ const s = scale(slowcat('F3 minor', 'Ab3 major', 'Bb3 dorian', 'C4 phrygian dominant').slow(4)); return stack( "0 2".groove(" [x ~]").edit(s).scaleTranspose(stack(0,2)).tone(lead), - "<6 7 9 7>".groove("[~ [x ~]*2]*2").edit(s).scaleTranspose('[0,2] [2,4]'.m.fast(2).every(4,rev)).tone(lead), + "<6 7 9 7>".groove("[~ [x ~]*2]*2").edit(s).scaleTranspose("[0,2] [2,4]".fast(2).every(4,rev)).tone(lead), "-14".groove("[~ x@0.8]*2".early(0.01)).edit(s).tone(bass), "c2*2".tone(membrane().chain(vol(0.6), out)), "~ c2".tone(noise().chain(vol(0.2), out)),