mirror/strudel
1
0
Fork 0
mirror of https://codeberg.org/uzu/strudel synced 2026-10-20 21:59:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

complete parity with current implementation

Browse Source
This commit is contained in:
tyow
2026-03-10 19:02:25 -04:00
parent fa4d060ed2
commit c0a43a20dc
2 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/xen/xen.mjs
+12 -27
View File
@@ -69,14 +69,6 @@ const trimFreq = (freq) => parseFloat(freq.toPrecision(10));
// old, currently unsupported
// TODO support
// * @example
// * // You can also use xen with frequency ratios.
// * // This is equivalent to the above:
// * i("0 1 2").xen([
// * Math.pow(2, 0/31),
// * Math.pow(2, 8/31),
// * Math.pow(2, 18/31),
// * ]).piano()
/**
* Assumes a numerical pattern of scale steps, and a scale. Scales accepted are all preset scale names of `tune`, arbitrary edos such as 31edo, or an array of frequency ratios. Assumes scales repeat at octave (2/1). Returns a new pattern with all values mapped to their associated frequency, assuming a base frequency of 220hz.
@@ -90,6 +82,14 @@ const trimFreq = (freq) => parseFloat(freq.toPrecision(10));
* // A minor triad in 31edo:
* i("0 8 18").xen("31edo").piano()
* @example
* // You can also use xen with frequency ratios.
* // This is equivalent to the above:
* i("0 1 2").xen([
* Math.pow(2, 0/31),
* Math.pow(2, 8/31),
* Math.pow(2, 18/31),
* ]).piano()
* @example
* // xen also supports all scale names that
* // tune does:
* i("0 1 2 3 4 5").xen("hexany15")
@@ -102,23 +102,6 @@ const trimFreq = (freq) => parseFloat(freq.toPrecision(10));
export const xen = register(
'xen',
function (scaleNameOrRatios, pat) {
const JIsc3 = (input) => {
let k = input;
return new Pattern((state) => {
let res = k.query(state);
res = parray(
k.query(state).map((x) => {
let c = x.context;
x = eval(x.value.join('/'));
let r = reify(x).setContext(c);
return r;
}),
).query(state);
return res;
});
};
const JIsc2 = (input) => {
let k = parray(input);
@@ -137,6 +120,8 @@ export const xen = register(
let scs;
if (typeof scPat == 'string') {
scs = input.map((x) => x.value);
} else if (scPat.every((x) => typeof x == 'number')) {
scs = [scPat];
} else {
scs = JIsc2(scPat).query(state);
}
@@ -154,13 +139,14 @@ export const xen = register(
const { i, ...otherValues } = hVal;
let scale;
let edo = false;
let st = new State(state.span.intersection(hap.part));
if (typeof sc == 'string') {
scale = getXenScale(sc);
if (isEdo(sc)) {
edo = sc.match(/^([1-9]+[0-9]*)edo$/)[1];
}
hap = hap.setContext(hap.combineContext(input[ith]));
} else if (sc.every((x) => typeof x == 'number')) {
scale = getXenScale(sc);
} else {
scale = getXenScale(sc.value);
for (let h of scPat[i].query(state)) {
@@ -175,7 +161,6 @@ export const xen = register(
})
.query(state);
return removeUndefineds(haps);
// return haps
});
return flatten(k);
};
test/__snapshots__/examples.test.mjs.snap
+18 -1
View File
@@ -14713,6 +14713,23 @@ exports[`runs examples > example "xen" example index 0 1`] = `
`;
exports[`runs examples > example "xen" example index 1 1`] = `
[
"[ 0/1 → 1/3 | freq:220 clip:1 s:piano release:0.1 pan:0.5138888888888888 ]",
"[ 1/3 → 2/3 | freq:263.0921203 clip:1 s:piano release:0.1 pan:0.5277777777777778 ]",
"[ 2/3 → 1/1 | freq:329.0139341 clip:1 s:piano release:0.1 pan:0.5462962962962963 ]",
"[ 1/1 → 4/3 | freq:220 clip:1 s:piano release:0.1 pan:0.5138888888888888 ]",
"[ 4/3 → 5/3 | freq:263.0921203 clip:1 s:piano release:0.1 pan:0.5277777777777778 ]",
"[ 5/3 → 2/1 | freq:329.0139341 clip:1 s:piano release:0.1 pan:0.5462962962962963 ]",
"[ 2/1 → 7/3 | freq:220 clip:1 s:piano release:0.1 pan:0.5138888888888888 ]",
"[ 7/3 → 8/3 | freq:263.0921203 clip:1 s:piano release:0.1 pan:0.5277777777777778 ]",
"[ 8/3 → 3/1 | freq:329.0139341 clip:1 s:piano release:0.1 pan:0.5462962962962963 ]",
"[ 3/1 → 10/3 | freq:220 clip:1 s:piano release:0.1 pan:0.5138888888888888 ]",
"[ 10/3 → 11/3 | freq:263.0921203 clip:1 s:piano release:0.1 pan:0.5277777777777778 ]",
"[ 11/3 → 4/1 | freq:329.0139341 clip:1 s:piano release:0.1 pan:0.5462962962962963 ]",
]
`;
exports[`runs examples > example "xen" example index 2 1`] = `
[
"[ 0/1 → 1/6 | freq:220 ]",
"[ 0/1 → 1/6 | freq:220 ]",
@@ -14813,7 +14830,7 @@ exports[`runs examples > example "xen" example index 1 1`] = `
]
`;
exports[`runs examples > example "xen" example index 2 1`] = `
exports[`runs examples > example "xen" example index 3 1`] = `
[
"[ 0/1 → 1/8 | freq:220 ]",
"[ 0/1 → 1/8 | freq:220 ]",