hacklab/strudel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #502 from tidalcycles/scale-space-alternative

Browse source 
can now use : as a replacement for space in scales
This commit is contained in:
Felix Roos 2023-03-03 12:40:23 +01:00 • committed by GitHub
commit 4bfeaa47bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packages/tonal/test/tonal.test.mjs
View file

@ -30,4 +30,11 @@ describe('tonal', () => {
.firstCycleValues.map((h) => h.note), .firstCycleValues.map((h) => h.note),
).toEqual(['C3', 'D3', 'E3']); ).toEqual(['C3', 'D3', 'E3']);
}); });
it('scale with colon', () => {
expect(
n(0, 1, 2)
.scale('C:major')
.firstCycleValues.map((h) => h.note),
).toEqual(['C3', 'D3', 'E3']);
});
}); });

1
packages/tonal/tonal.mjs
View file

@ -146,6 +146,7 @@ export const scale = register('scale', function (scale /* : string */, pat) {
let note = isObject ? hap.value.n : hap.value; let note = isObject ? hap.value.n : hap.value;
const asNumber = Number(note); const asNumber = Number(note);
if (!isNaN(asNumber)) { if (!isNaN(asNumber)) {
scale = scale.replaceAll(':', ' ');
let [tonic, scaleName] = Scale.tokenize(scale); let [tonic, scaleName] = Scale.tokenize(scale);
const { pc, oct = 3 } = Note.get(tonic); const { pc, oct = 3 } = Note.get(tonic);
note = scaleOffset(pc + ' ' + scaleName, asNumber, pc + oct); note = scaleOffset(pc + ' ' + scaleName, asNumber, pc + oct);