From 554b72c916678994b5af68ab789b951eb370f72c Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Thu, 2 Feb 2023 22:11:56 +0100 Subject: [PATCH] fix scale degrees fixes https://github.com/tidalcycles/strudel/issues/378 --- packages/tonal/tonal.mjs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/tonal/tonal.mjs b/packages/tonal/tonal.mjs index 9e47d4a2f..fece0d344 100644 --- a/packages/tonal/tonal.mjs +++ b/packages/tonal/tonal.mjs @@ -147,7 +147,9 @@ export const scale = register('scale', function (scale /* : string */, pat) { if (!isNaN(asNumber)) { let [tonic, scaleName] = Scale.tokenize(scale); const { pc, oct = 3 } = Note.get(tonic); - note = scaleOffset(pc + ' ' + scaleName, asNumber, pc + oct); + const scaleWIthOctave = `${pc + oct} ${scaleName}`; + const degree = Scale.degrees(scaleWIthOctave); + note = degree(asNumber + (asNumber >= 0 ? 1 : 0)); } return hap.withValue(() => (isObject ? { ...hap.value, note } : note)).setContext({ ...hap.context, scale }); });