From c79b2653e72e5685c2b415d0b4214ac8175b3b8a Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Fri, 3 Feb 2023 19:42:35 +0100 Subject: [PATCH] revert change for now (because tonal degree does not support floats) --- packages/tonal/tonal.mjs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/tonal/tonal.mjs b/packages/tonal/tonal.mjs index fece0d344..1370f3266 100644 --- a/packages/tonal/tonal.mjs +++ b/packages/tonal/tonal.mjs @@ -147,9 +147,10 @@ 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); - const scaleWIthOctave = `${pc + oct} ${scaleName}`; + note = scaleOffset(pc + ' ' + scaleName, asNumber, pc + oct); + /* const scaleWIthOctave = `${pc + oct} ${scaleName}`; const degree = Scale.degrees(scaleWIthOctave); - note = degree(asNumber + (asNumber >= 0 ? 1 : 0)); + note = degree(asNumber + (asNumber >= 0 ? 1 : 0)); */ } return hap.withValue(() => (isObject ? { ...hap.value, note } : note)).setContext({ ...hap.context, scale }); });