diff --git a/package-lock.json b/package-lock.json index 55c11c94..f77c8c77 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,28 +1,28 @@ { "name": "scale-workshop", - "version": "3.0.0-beta.44", + "version": "3.0.0-beta.45", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "scale-workshop", - "version": "3.0.0-beta.44", + "version": "3.0.0-beta.45", "dependencies": { "harmonic-entropy": "^0.2.0", "isomorphic-qwerty": "^0.0.2", "ji-lattice": "^0.2.0", "jszip": "^3.10.1", - "moment-of-symmetry": "^0.8.1", + "moment-of-symmetry": "^0.8.2", "pinia": "^2.1.7", "qs": "^6.12.0", - "sonic-weave": "0.5.0", + "sonic-weave": "0.5.1", "sw-synth": "^0.1.0", "temperaments": "^0.5.3", "values.js": "^2.1.1", "vue": "^3.3.4", "vue-router": "^4.3.0", "webmidi": "^3.1.8", - "xen-dev-utils": "^0.9.0", + "xen-dev-utils": "^0.9.2", "xen-midi": "^0.2.0" }, "devDependencies": { @@ -4416,11 +4416,11 @@ } }, "node_modules/moment-of-symmetry": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/moment-of-symmetry/-/moment-of-symmetry-0.8.1.tgz", - "integrity": "sha512-t8nR6DL4dpjv247WI7dIDbwmFrUhJZZHOguRNab1lw1TGWht0gEqNi1ux/uDxxCLAZRTivDUfM4MvXXmJUMb3A==", + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/moment-of-symmetry/-/moment-of-symmetry-0.8.2.tgz", + "integrity": "sha512-Ez+CsTACcJHgUIg0Dl+TMKSAfx68KlJloMWqz8KCGU880xGGZXkG62OYLglpGHt3ajtwFePpyW4N7aOFku5ZmA==", "dependencies": { - "xen-dev-utils": "^0.9.0" + "xen-dev-utils": "^0.9.2" }, "funding": { "type": "github", @@ -5490,12 +5490,12 @@ } }, "node_modules/sonic-weave": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/sonic-weave/-/sonic-weave-0.5.0.tgz", - "integrity": "sha512-TE15FPmz4hf/iYiePo+AYp2IM5zzMx0DQ/kGByezJo1oEVSSnq19crSEdebcJPWJluZsYKKUhTja4ll539sPhQ==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/sonic-weave/-/sonic-weave-0.5.1.tgz", + "integrity": "sha512-PC6v4X0PAqOl5s5bi/hJ7SYiEW5jTOmWem7oQLSFVG0VGBk5NztpjjittVN21BoL8rmH/tE5ceGZee43pv4qbQ==", "dependencies": { - "moment-of-symmetry": "^0.8.1", - "xen-dev-utils": "^0.9.0" + "moment-of-symmetry": "^0.8.2", + "xen-dev-utils": "^0.9.2" }, "bin": { "sonic-weave": "bin/sonic-weave.js" @@ -6639,9 +6639,9 @@ } }, "node_modules/xen-dev-utils": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/xen-dev-utils/-/xen-dev-utils-0.9.0.tgz", - "integrity": "sha512-JsbXSg1zXaBoiKI19p2jC8Ka22YADQsTBD7fc2FkVxLWSdCO5BCS5KcRquDP5vP6J9v8t3B14G/7GZ5DC73rzg==", + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/xen-dev-utils/-/xen-dev-utils-0.9.2.tgz", + "integrity": "sha512-1yC1TuCQT/pLOT4zwiRnqty7nvG6PU+ssDTjkGEEBwjOQlL3ZmoloBioAMC1Cj2GZed3kvZm9btSdh2DPbl2SQ==", "engines": { "node": ">=10.6.0" }, diff --git a/package.json b/package.json index 04010c72..cb5af1aa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "scale-workshop", - "version": "3.0.0-beta.44", + "version": "3.0.0-beta.45", "scripts": { "dev": "vite", "build": "run-p type-check \"build-only {@}\" --", @@ -19,17 +19,17 @@ "isomorphic-qwerty": "^0.0.2", "ji-lattice": "^0.2.0", "jszip": "^3.10.1", - "moment-of-symmetry": "^0.8.1", + "moment-of-symmetry": "^0.8.2", "pinia": "^2.1.7", "qs": "^6.12.0", - "sonic-weave": "0.5.0", + "sonic-weave": "0.5.1", "sw-synth": "^0.1.0", "temperaments": "^0.5.3", "values.js": "^2.1.1", "vue": "^3.3.4", "vue-router": "^4.3.0", "webmidi": "^3.1.8", - "xen-dev-utils": "^0.9.0", + "xen-dev-utils": "^0.9.2", "xen-midi": "^0.2.0" }, "devDependencies": { diff --git a/src/components/modals/modification/TemperScale.vue b/src/components/modals/modification/TemperScale.vue index b0770a92..7bef62b7 100644 --- a/src/components/modals/modification/TemperScale.vue +++ b/src/components/modals/modification/TemperScale.vue @@ -5,7 +5,7 @@ import { Temperament, tenneyVals, vanishCommas } from 'temperaments' import { useTemperStore } from '@/stores/tempering' import { useScaleStore } from '@/stores/scale' import { useStateStore } from '@/stores/state' -import { setAndReportValidity } from '@/utils' +import { setAndReportValidity, centString } from '@/utils' defineProps<{ show: boolean @@ -48,6 +48,7 @@ function modify(expand = true) { tenneyVals(temper.vals, temper.subgroup, temper.weights, 'cents') ) } + scale.sourceText += `\n(* Vals = ${temper.valsString} *)` } } else if (temper.method === 'commas') { if (temper.constraintsAvailable) { @@ -65,11 +66,12 @@ function modify(expand = true) { ) ) } + scale.sourceText += `\n(* Commas = ${temper.commasString} *)` } if (temper.method === 'mapping') { scale.sourceText += `\nPrimeMapping(${temper.mappingString})` } else if (mapping) { - scale.sourceText += `\nPrimeMapping(${mapping.map((c) => c.toFixed(state.centsFractionDigits)).join(', ')})` + scale.sourceText += `\nPrimeMapping(${mapping.map((c) => centString(c)).join(', ')})\ncents(£, ${state.centsFractionDigits})` } if (expand) { const { visitor, defaults } = scale.getUserScopeVisitor()