@libraz/libcantus 1.2.0 → 1.4.0

package/dist/{chunk-76ZBTRG2.cjs → chunk-U4EQTDGN.cjs}

@@ -33,8 +33,8 @@
 
 
 
-var _chunk3R3QVKY5cjs = require('./chunk-3R3QVKY5.cjs');
 
+var _chunkYDGMWH43cjs = require('./chunk-YDGMWH43.cjs');
 
 
 
@@ -55,7 +55,9 @@ var _chunk3R3QVKY5cjs = require('./chunk-3R3QVKY5.cjs');
 
 
 
-var _chunkS5BKZZGMcjs = require('./chunk-S5BKZZGM.cjs');
+
+
+var _chunkS3QELJUEcjs = require('./chunk-S3QELJUE.cjs');
 
 // src/theory/transposition/index.ts
 var TRANSPOSING_INSTRUMENTS = Object.freeze({
@@ -90,17 +92,17 @@ var PROFILE_NAME_ALIASES = Object.freeze({
 });
 function instrumentTransposition(instrument) {
   if (typeof instrument !== "string") {
-    return _chunkS5BKZZGMcjs.toSpelledInterval.call(void 0, instrument);
+    return _chunkS3QELJUEcjs.toSpelledInterval.call(void 0, instrument);
   }
   const name = Object.hasOwn(PROFILE_NAME_ALIASES, instrument) ? PROFILE_NAME_ALIASES[instrument] : instrument;
   if (Object.hasOwn(TRANSPOSING_INSTRUMENTS, name)) {
-    return _chunkS5BKZZGMcjs.parseInterval.call(void 0, TRANSPOSING_INSTRUMENTS[name]);
+    return _chunkS3QELJUEcjs.parseInterval.call(void 0, TRANSPOSING_INSTRUMENTS[name]);
   }
   try {
-    return _chunkS5BKZZGMcjs.parseInterval.call(void 0, instrument);
+    return _chunkS3QELJUEcjs.parseInterval.call(void 0, instrument);
   } catch (error) {
-    if (error instanceof _chunkS5BKZZGMcjs.InvalidInputError) {
-      throw new (0, _chunkS5BKZZGMcjs.InvalidInputError)(
+    if (error instanceof _chunkS3QELJUEcjs.InvalidInputError) {
+      throw new (0, _chunkS3QELJUEcjs.InvalidInputError)(
         `unknown transposing instrument ${JSON.stringify(instrument)}; pass a name from TRANSPOSING_INSTRUMENTS or an interval such as '-M2'`
       );
     }
@@ -117,11 +119,11 @@ function reversedInterval(step) {
   };
 }
 function toSoundingPitch(note, instrument) {
-  return _chunkS5BKZZGMcjs.transposeByInterval.call(void 0, _chunkS5BKZZGMcjs.toNoteData.call(void 0, note), instrumentTransposition(instrument));
+  return _chunkS3QELJUEcjs.transposeByInterval.call(void 0, _chunkS3QELJUEcjs.toNoteData.call(void 0, note), instrumentTransposition(instrument));
 }
 function toWrittenPitch(note, instrument) {
-  return _chunkS5BKZZGMcjs.transposeByInterval.call(void 0, 
-    _chunkS5BKZZGMcjs.toNoteData.call(void 0, note),
+  return _chunkS3QELJUEcjs.transposeByInterval.call(void 0, 
+    _chunkS3QELJUEcjs.toNoteData.call(void 0, note),
     reversedInterval(instrumentTransposition(instrument))
   );
 }
@@ -146,8 +148,10 @@ var SINGLE_ACCIDENTALS = {
   n: "natural",
   "\u266E": "natural"
 };
-var FIGURE_SEPARATORS = /* @__PURE__ */ new Set([" ", "	", ",", "/"]);
-var MOTION_MARKS = /* @__PURE__ */ new Set(["-", "\u2013"]);
+var FIGURE_SEPARATOR_LIST = [" ", "	", ",", "/"];
+var FIGURE_SEPARATORS = new Set(FIGURE_SEPARATOR_LIST);
+var MOTION_MARK_LIST = ["-", "\u2013"];
+var MOTION_MARKS = new Set(MOTION_MARK_LIST);
 var PRINTED_ACCIDENTALS = [
   ["natural", "n", 0],
   ["sharp", "#", 1],
@@ -162,7 +166,7 @@ var ACCIDENTAL_GLYPHS = new Map(
   PRINTED_ACCIDENTALS.map(([, glyph, alter]) => [alter, glyph])
 );
 function invalidFigures(figures, detail) {
-  return new (0, _chunkS5BKZZGMcjs.InvalidInputError)(`figured bass ${_chunkS5BKZZGMcjs.describeRejected.call(void 0, figures)} ${detail}`);
+  return new (0, _chunkS3QELJUEcjs.InvalidInputError)(`figured bass ${_chunkS3QELJUEcjs.describeRejected.call(void 0, figures)} ${detail}`);
 }
 function alteredBy(diatonicAlter, accidental) {
   const printed = PRINTED_ALTERS.get(accidental);
@@ -203,6 +207,16 @@ function readFigure(text, start) {
   }
   return { figure: { number: 3, accidental }, index };
 }
+function readStack(text, start) {
+  const figures = [];
+  let index = start;
+  do {
+    const read = readFigure(text, index);
+    figures.push(read.figure);
+    index = read.index;
+  } while (index < text.length && !FIGURE_SEPARATORS.has(_nullishCoalesce(text[index], () => ( ""))) && !MOTION_MARKS.has(_nullishCoalesce(text[index], () => ( ""))));
+  return { figures, index };
+}
 function parseFigures(text) {
   const figures = [];
   const motions = [];
@@ -212,21 +226,30 @@ function parseFigures(text) {
       index += 1;
       continue;
     }
-    const first = readFigure(text, index);
+    const first = readStack(text, index);
     index = first.index;
     if (!MOTION_MARKS.has(_nullishCoalesce(text[index], () => ( "")))) {
-      figures.push(first.figure);
+      figures.push(...first.figures);
       continue;
     }
-    const second = readFigure(text, index + 1);
+    const second = readStack(text, index + 1);
     index = second.index;
     if (MOTION_MARKS.has(_nullishCoalesce(text[index], () => ( "")))) {
       throw invalidFigures(text, "chains more than one motion onto a single figure");
     }
-    if (first.figure.number === second.figure.number) {
-      throw invalidFigures(text, `moves the interval ${first.figure.number} onto itself`);
+    if (first.figures.length !== second.figures.length) {
+      throw invalidFigures(
+        text,
+        `moves ${first.figures.length} run-together figures onto ${second.figures.length}`
+      );
     }
-    motions.push({ from: first.figure, to: second.figure });
+    first.figures.forEach((from, column) => {
+      const to = second.figures[column];
+      if (from.number === to.number) {
+        throw invalidFigures(text, `moves the interval ${from.number} onto itself`);
+      }
+      motions.push({ from, to });
+    });
   }
   return { figures, motions };
 }
@@ -237,7 +260,7 @@ var SEVENTH = { intervals: [3, 5, 7], rootInterval: 1 };
 var SEVENTH_FIRST = { intervals: [3, 5, 6], rootInterval: 6 };
 var SEVENTH_SECOND = { intervals: [3, 4, 6], rootInterval: 4 };
 var SEVENTH_THIRD = { intervals: [2, 4, 6], rootInterval: 2 };
-var FIGURE_SETS = /* @__PURE__ */ new Map([
+var FIGURE_SET_ENTRIES = [
   ["", TRIAD],
   ["3", TRIAD],
   ["5", TRIAD],
@@ -256,8 +279,9 @@ var FIGURE_SETS = /* @__PURE__ */ new Map([
   ["2", SEVENTH_THIRD],
   ["2,4", SEVENTH_THIRD],
   ["2,4,6", SEVENTH_THIRD]
-]);
-var FIGURE_ABBREVIATIONS = /* @__PURE__ */ new Map([
+];
+var FIGURE_SETS = new Map(FIGURE_SET_ENTRIES);
+var FIGURE_ABBREVIATION_ENTRIES = [
   [TRIAD.intervals.join(","), []],
   [TRIAD_FIRST.intervals.join(","), [6]],
   [TRIAD_SECOND.intervals.join(","), [6, 4]],
@@ -265,13 +289,18 @@ var FIGURE_ABBREVIATIONS = /* @__PURE__ */ new Map([
   [SEVENTH_FIRST.intervals.join(","), [6, 5]],
   [SEVENTH_SECOND.intervals.join(","), [4, 3]],
   [SEVENTH_THIRD.intervals.join(","), [4, 2]]
-]);
+];
+var FIGURE_ABBREVIATIONS = new Map(
+  FIGURE_ABBREVIATION_ENTRIES
+);
+var TERTIAN_BASES = /* @__PURE__ */ new Set(["maj", "min", "dim", "aug"]);
 function tertianQualityIndex() {
   const index = /* @__PURE__ */ new Map();
-  for (const quality of _chunk3R3QVKY5cjs.chordQualities.call(void 0, )) {
-    const { intervals } = _chunk3R3QVKY5cjs.makeChord.call(void 0, 0, quality);
+  for (const quality of _chunkYDGMWH43cjs.chordQualities.call(void 0, )) {
+    const { intervals } = _chunkYDGMWH43cjs.makeChord.call(void 0, 0, quality);
     const template = intervals.join(",");
-    if (intervals.length >= 3 && intervals.length <= MAX_STACK_SIZE && !index.has(template)) {
+    const spec = _chunkYDGMWH43cjs.chordSpecForQuality.call(void 0, quality, 0);
+    if (intervals.length >= 3 && intervals.length <= MAX_STACK_SIZE && TERTIAN_BASES.has(spec.base) && spec.additions.length === 0 && !index.has(template)) {
       index.set(template, quality);
     }
   }
@@ -279,22 +308,22 @@ function tertianQualityIndex() {
 }
 var TERTIAN_QUALITIES = tertianQualityIndex();
 function keyLetterAlters(key) {
-  const size = _chunk3R3QVKY5cjs.scaleTonesInDegreeOrder.call(void 0, key.scale).length;
+  const size = _chunkYDGMWH43cjs.scaleTonesInDegreeOrder.call(void 0, key.scale).length;
   if (size !== 7) {
-    throw new (0, _chunkS5BKZZGMcjs.InvalidInputError)(`figured bass requires a heptatonic key (received ${size} tones)`);
+    throw new (0, _chunkS3QELJUEcjs.InvalidInputError)(`figured bass requires a heptatonic key (received ${size} tones)`);
   }
   const alters = [];
-  for (const note of _chunk3R3QVKY5cjs.spellScale.call(void 0, key.tonic, key.scale)) {
-    alters[_chunkS5BKZZGMcjs.diatonicLetterOf.call(void 0, note.letter)] = note.alter;
+  for (const note of _chunkYDGMWH43cjs.spellScale.call(void 0, key.tonic, key.scale)) {
+    alters[_chunkS3QELJUEcjs.diatonicLetterOf.call(void 0, note.letter)] = note.alter;
   }
   return alters;
 }
 function noteAbove(bass, figure, alters) {
-  const letter = _chunkS5BKZZGMcjs.diatonicLetterOf.call(void 0, bass.letter + figure.number - 1);
+  const letter = _chunkS3QELJUEcjs.diatonicLetterOf.call(void 0, bass.letter + figure.number - 1);
   return { letter, alter: alteredBy(_nullishCoalesce(alters[letter], () => ( 0)), figure.accidental) };
 }
 function bareNote(note) {
-  return { letter: _chunkS5BKZZGMcjs.diatonicLetterOf.call(void 0, note.letter), alter: note.alter };
+  return { letter: _chunkS3QELJUEcjs.diatonicLetterOf.call(void 0, note.letter), alter: note.alter };
 }
 function realizeSonority(bass, resolved, text, alters) {
   const numbers = [...new Set(resolved.map((figure) => figure.number))].sort((a, b) => a - b);
@@ -308,35 +337,37 @@ function realizeSonority(bass, resolved, text, alters) {
   );
   const tones = [bass, ...notes];
   const root = _nullishCoalesce(tones[[1, ...sonority.intervals].indexOf(sonority.rootInterval)], () => ( bass));
-  const rootPc = _chunkS5BKZZGMcjs.noteToPitchClass.call(void 0, root);
+  const rootPc = _chunkS3QELJUEcjs.noteToPitchClass.call(void 0, root);
   const stack = [];
   for (let step = 0; step < tones.length; step += 1) {
-    const tone = tones.find((candidate) => _chunkS5BKZZGMcjs.diatonicLetterOf.call(void 0, candidate.letter - root.letter) === step * 2);
+    const tone = tones.find((candidate) => _chunkS3QELJUEcjs.diatonicLetterOf.call(void 0, candidate.letter - root.letter) === step * 2);
     if (tone === void 0) {
-      throw new (0, _chunkS5BKZZGMcjs.NoSolutionError)(
-        `figured bass ${_chunkS5BKZZGMcjs.describeRejected.call(void 0, text)} sounds ${_chunk3R3QVKY5cjs.noteNames.call(void 0, tones).join(" ")}, which does not stack in thirds`
+      throw new (0, _chunkS3QELJUEcjs.NoSolutionError)(
+        `figured bass ${_chunkS3QELJUEcjs.describeRejected.call(void 0, text)} sounds ${_chunkYDGMWH43cjs.noteNames.call(void 0, tones).join(" ")}, which does not stack in thirds`
       );
     }
-    stack.push(_chunkS5BKZZGMcjs.pitchClassOf.call(void 0, _chunkS5BKZZGMcjs.noteToPitchClass.call(void 0, tone) - rootPc));
+    stack.push(_chunkS3QELJUEcjs.pitchClassOf.call(void 0, _chunkS3QELJUEcjs.noteToPitchClass.call(void 0, tone) - rootPc));
   }
   const quality = TERTIAN_QUALITIES.get(stack.join(","));
   if (quality === void 0) {
-    throw new (0, _chunkS5BKZZGMcjs.NoSolutionError)(
-      `figured bass ${_chunkS5BKZZGMcjs.describeRejected.call(void 0, text)} sounds ${_chunk3R3QVKY5cjs.noteNames.call(void 0, tones).join(" ")}, which no chord quality names`
+    throw new (0, _chunkS3QELJUEcjs.NoSolutionError)(
+      `figured bass ${_chunkS3QELJUEcjs.describeRejected.call(void 0, text)} sounds ${_chunkYDGMWH43cjs.noteNames.call(void 0, tones).join(" ")}, which no chord quality names`
     );
   }
-  const chord = _chunk3R3QVKY5cjs.makeChord.call(void 0, rootPc, quality, _chunkS5BKZZGMcjs.noteToPitchClass.call(void 0, bass));
-  chord.rootSpelling = { letter: root.letter, alter: root.alter };
-  chord.bassSpelling = { letter: bass.letter, alter: bass.alter };
+  const chord = _chunkYDGMWH43cjs.makeSpelledChord.call(void 0, rootPc, quality, {
+    bassPc: _chunkS3QELJUEcjs.noteToPitchClass.call(void 0, bass),
+    rootSpelling: { letter: root.letter, alter: root.alter },
+    bassSpelling: { letter: bass.letter, alter: bass.alter }
+  });
   return { chord, notes };
 }
 function figuredBassRealization(bass, figures, key) {
   if (typeof figures !== "string") {
-    throw new (0, _chunkS5BKZZGMcjs.InvalidInputError)(`figured bass must be a string; received ${typeof figures}`);
+    throw new (0, _chunkS3QELJUEcjs.InvalidInputError)(`figured bass must be a string; received ${typeof figures}`);
   }
-  const bassData = _chunkS5BKZZGMcjs.toNoteData.call(void 0, bass);
-  const alters = keyLetterAlters(_chunk3R3QVKY5cjs.resolveKey.call(void 0, key));
-  _chunkS5BKZZGMcjs.noteToPitchClass.call(void 0, bassData);
+  const bassData = _chunkS3QELJUEcjs.toNoteData.call(void 0, bass);
+  const alters = keyLetterAlters(_chunkYDGMWH43cjs.resolveKey.call(void 0, key));
+  _chunkS3QELJUEcjs.noteToPitchClass.call(void 0, bassData);
   const bassNote = bareNote(bassData);
   const text = figures.trim();
   const { figures: written, motions } = parseFigures(text);
@@ -357,37 +388,37 @@ function realizeFiguredBass(bass, figures, key) {
   return figuredBassRealization(bass, figures, key).chord;
 }
 function figuredBassOf(chord, key) {
-  const data = _chunk3R3QVKY5cjs.toChordData.call(void 0, chord);
-  const resolved = _chunk3R3QVKY5cjs.resolveKey.call(void 0, key);
+  const data = _chunkYDGMWH43cjs.toChordData.call(void 0, chord);
+  const resolved = _chunkYDGMWH43cjs.resolveKey.call(void 0, key);
   const alters = keyLetterAlters(resolved);
-  const tones = _chunk3R3QVKY5cjs.spellChord.call(void 0, data, resolved.tonic, resolved.scale);
-  const bassPc = _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, _nullishCoalesce(data.bassPc, () => ( data.rootPc)));
-  const bass = tones.find((tone) => _chunkS5BKZZGMcjs.noteToPitchClass.call(void 0, tone) === bassPc);
+  const tones = _chunkYDGMWH43cjs.spellChord.call(void 0, data, resolved.tonic, resolved.scale);
+  const bassPc = _chunkS3QELJUEcjs.pitchClassOf.call(void 0, _nullishCoalesce(data.bassPc, () => ( data.rootPc)));
+  const bass = tones.find((tone) => _chunkS3QELJUEcjs.noteToPitchClass.call(void 0, tone) === bassPc);
   if (bass === void 0) {
-    throw new (0, _chunkS5BKZZGMcjs.NoSolutionError)(
+    throw new (0, _chunkS3QELJUEcjs.NoSolutionError)(
       "figured bass measures intervals above a chord tone, and this chord's bass is not one of its tones"
     );
   }
   const written = /* @__PURE__ */ new Map();
   for (const tone of tones) {
     if (tone !== bass) {
-      written.set(_chunkS5BKZZGMcjs.diatonicLetterOf.call(void 0, tone.letter - bass.letter) + 1, tone);
+      written.set(_chunkS3QELJUEcjs.diatonicLetterOf.call(void 0, tone.letter - bass.letter) + 1, tone);
     }
   }
   const digits = FIGURE_ABBREVIATIONS.get([...written.keys()].sort((a, b) => a - b).join(","));
   if (digits === void 0) {
-    throw new (0, _chunkS5BKZZGMcjs.NoSolutionError)(
-      `no figured bass names ${_chunk3R3QVKY5cjs.noteNames.call(void 0, tones).join(" ")} over ${_chunk3R3QVKY5cjs.noteNames.call(void 0, [bass])[0]}`
+    throw new (0, _chunkS3QELJUEcjs.NoSolutionError)(
+      `no figured bass names ${_chunkYDGMWH43cjs.noteNames.call(void 0, tones).join(" ")} over ${_chunkYDGMWH43cjs.noteNames.call(void 0, [bass])[0]}`
     );
   }
   const accidentals = /* @__PURE__ */ new Map();
   for (const [number, tone] of written) {
-    if (tone.alter === (_nullishCoalesce(alters[_chunkS5BKZZGMcjs.diatonicLetterOf.call(void 0, tone.letter)], () => ( 0)))) {
+    if (tone.alter === (_nullishCoalesce(alters[_chunkS3QELJUEcjs.diatonicLetterOf.call(void 0, tone.letter)], () => ( 0)))) {
       continue;
     }
     const glyph = ACCIDENTAL_GLYPHS.get(tone.alter);
     if (glyph === void 0) {
-      throw new (0, _chunkS5BKZZGMcjs.NoSolutionError)(`no accidental writes a note altered by ${tone.alter} semitones`);
+      throw new (0, _chunkS3QELJUEcjs.NoSolutionError)(`no accidental writes a note altered by ${tone.alter} semitones`);
     }
     accidentals.set(number, glyph);
   }
@@ -396,48 +427,48 @@ function figuredBassOf(chord, key) {
   return figures;
 }
 function pitchClassesOf(notes) {
-  return [...new Set(notes.map(_chunkS5BKZZGMcjs.noteToPitchClass))].sort((a, b) => a - b);
+  return [...new Set(notes.map(_chunkS3QELJUEcjs.noteToPitchClass))].sort((a, b) => a - b);
 }
 function assertRealizesAs(bass, figures, key, tones) {
-  const noFigures = (detail) => new (0, _chunkS5BKZZGMcjs.NoSolutionError)(
-    `no figured bass names ${_chunk3R3QVKY5cjs.noteNames.call(void 0, tones).join(" ")} over ${_chunk3R3QVKY5cjs.noteNames.call(void 0, [bass])[0]}: the figures ${_chunkS5BKZZGMcjs.describeRejected.call(void 0, figures)} ${detail}`
+  const noFigures = (detail) => new (0, _chunkS3QELJUEcjs.NoSolutionError)(
+    `no figured bass names ${_chunkYDGMWH43cjs.noteNames.call(void 0, tones).join(" ")} over ${_chunkYDGMWH43cjs.noteNames.call(void 0, [bass])[0]}: the figures ${_chunkS3QELJUEcjs.describeRejected.call(void 0, figures)} ${detail}`
   );
   let realized;
   try {
     realized = figuredBassRealization(bass, figures, key);
   } catch (error) {
-    throw error instanceof _chunkS5BKZZGMcjs.NoSolutionError ? noFigures("read back as no chord at all") : error;
+    throw error instanceof _chunkS3QELJUEcjs.NoSolutionError ? noFigures("read back as no chord at all") : error;
   }
   const written = pitchClassesOf(realized.notes);
   const expected = pitchClassesOf(tones);
   if (written.length !== expected.length || written.some((pc, index) => pc !== expected[index])) {
-    throw noFigures(`sound ${_chunk3R3QVKY5cjs.noteNames.call(void 0, realized.notes).join(" ")} instead`);
+    throw noFigures(`sound ${_chunkYDGMWH43cjs.noteNames.call(void 0, realized.notes).join(" ")} instead`);
   }
 }
 
 // src/theory/partwriting/cross-relation.ts
-function resolvesAsAppliedDominant(chord, next, key) {
-  if (next === void 0 || !_chunk3R3QVKY5cjs.hasDominantSonority.call(void 0, chord)) {
+function resolvesAsAppliedChord(chord, next, key) {
+  if (next === void 0) {
     return false;
   }
-  const target = _chunk3R3QVKY5cjs.appliedDominantTarget.call(void 0, chord.rootPc + 5, key);
-  return target !== null && _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, next.rootPc) === target.rootPc;
+  const target = _chunkYDGMWH43cjs.appliedChordTarget.call(void 0, chord, key);
+  return target !== null && _chunkS3QELJUEcjs.pitchClassOf.call(void 0, next.rootPc) === target.rootPc;
 }
 function soundsAugmentedSixth(moment, key) {
   const bass = moment.notes[0];
-  if (bass === void 0 || _chunkS5BKZZGMcjs.noteToPitchClass.call(void 0, bass) !== _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, key.rootPc + 8)) {
+  if (bass === void 0 || _chunkS3QELJUEcjs.noteToPitchClass.call(void 0, bass) !== _chunkS3QELJUEcjs.pitchClassOf.call(void 0, key.rootPc + 8)) {
     return false;
   }
   return moment.notes.some((note, voice) => {
     if (voice === 0) {
       return false;
     }
-    const interval = _chunkS5BKZZGMcjs.spelledInterval.call(void 0, bass, note);
-    return (interval.number - 1) % 7 + 1 === 6 && _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, interval.semitones) === 10;
+    const interval = _chunkS3QELJUEcjs.spelledInterval.call(void 0, bass, note);
+    return (interval.number - 1) % 7 + 1 === 6 && _chunkS3QELJUEcjs.pitchClassOf.call(void 0, interval.semitones) === 10;
   });
 }
 function isChromaticHarmony(moment, next, key) {
-  return resolvesAsAppliedDominant(moment.chord, next, key) || _chunk3R3QVKY5cjs.isNeapolitanChordOf.call(void 0, moment.chord, key) || soundsAugmentedSixth(moment, key);
+  return resolvesAsAppliedChord(moment.chord, next, key) || _chunkYDGMWH43cjs.isNeapolitanChordOf.call(void 0, moment.chord, key) || soundsAugmentedSixth(moment, key);
 }
 function approachedByStep(before, moment, voice) {
   const earlier = _optionalChain([before, 'optionalAccess', _2 => _2[voice]]);
@@ -445,7 +476,8 @@ function approachedByStep(before, moment, voice) {
   if (earlier === void 0 || later === void 0) {
     return false;
   }
-  return _chunkS5BKZZGMcjs.spelledInterval.call(void 0, earlier, later).number === 2;
+  const interval = _chunkS3QELJUEcjs.spelledInterval.call(void 0, earlier, later);
+  return interval.number === 2 || interval.number === 1 && Math.abs(interval.semitones) === 1;
 }
 function isOuterVoice(voice, notes) {
   return voice === 0 || voice === notes.length - 1;
@@ -467,8 +499,8 @@ function crossRelations(from, to, key, context = {}) {
       if (earlier === void 0 || later === void 0) {
         continue;
       }
-      const letter = _chunkS5BKZZGMcjs.diatonicLetterOf.call(void 0, earlier.letter);
-      if (letter !== _chunkS5BKZZGMcjs.diatonicLetterOf.call(void 0, later.letter) || earlier.alter === later.alter) {
+      const letter = _chunkS3QELJUEcjs.diatonicLetterOf.call(void 0, earlier.letter);
+      if (letter !== _chunkS3QELJUEcjs.diatonicLetterOf.call(void 0, later.letter) || earlier.alter === later.alter) {
         continue;
       }
       if (approachedByStep(context.before, from.notes, first) || approachedByStep(from.notes, to.notes, second) || !isOuterVoice(first, from.notes) && !isOuterVoice(second, to.notes)) {
@@ -487,18 +519,18 @@ function crossRelations(from, to, key, context = {}) {
 
 // src/theory/voicing/tendency.ts
 function spellingTable(keyLike, chord) {
-  const { tonic, scale: key } = _chunk3R3QVKY5cjs.resolveKey.call(void 0, keyLike);
+  const { tonic, scale: key } = _chunkYDGMWH43cjs.resolveKey.call(void 0, keyLike);
   const notes = [];
   const bases = [];
   for (let pc = 0; pc < 12; pc += 1) {
-    const note = chord === void 0 ? _chunk3R3QVKY5cjs.spellPitchClass.call(void 0, pc, tonic, key) : _chunk3R3QVKY5cjs.spellPitchClass.call(void 0, pc, tonic, key, { chord });
+    const note = chord === void 0 ? _chunkYDGMWH43cjs.spellPitchClass.call(void 0, pc, tonic, key) : _chunkYDGMWH43cjs.spellPitchClass.call(void 0, pc, tonic, key, { chord });
     notes.push(note);
-    bases.push(_chunkS5BKZZGMcjs.noteToMidi.call(void 0, { letter: note.letter, alter: note.alter, octave: 0 }));
+    bases.push(_chunkS3QELJUEcjs.noteToMidi.call(void 0, { letter: note.letter, alter: note.alter, octave: 0 }));
   }
   return { notes, bases };
 }
 function spelledAt(table, pitch) {
-  const pc = _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, pitch);
+  const pc = _chunkS3QELJUEcjs.pitchClassOf.call(void 0, pitch);
   const note = table.notes[pc];
   const base = table.bases[pc];
   if (note === void 0 || base === void 0) {
@@ -512,7 +544,7 @@ function movesByAugmentedInterval(from, fromPitch, to, toPitch) {
   if (earlier === void 0 || later === void 0) {
     return false;
   }
-  return _chunk3R3QVKY5cjs.isAugmentedMelodicInterval.call(void 0, earlier, later);
+  return _chunkYDGMWH43cjs.isAugmentedMelodicInterval.call(void 0, earlier, later);
 }
 function movesByDescendingStep(from, fromPitch, to, toPitch) {
   const earlier = spelledAt(from, fromPitch);
@@ -520,7 +552,7 @@ function movesByDescendingStep(from, fromPitch, to, toPitch) {
   if (earlier === void 0 || later === void 0) {
     return false;
   }
-  return _chunk3R3QVKY5cjs.isDescendingStep.call(void 0, _chunkS5BKZZGMcjs.spelledInterval.call(void 0, earlier, later));
+  return _chunkYDGMWH43cjs.isDescendingStep.call(void 0, _chunkS3QELJUEcjs.spelledInterval.call(void 0, earlier, later));
 }
 
 // src/theory/voicing/internal.ts
@@ -545,7 +577,7 @@ function createCandidateBuffer() {
 function pitchesForPc(pc, range) {
   const result = [];
   for (let midi = Math.ceil(range.min); midi <= range.max; midi += 1) {
-    if (_chunkS5BKZZGMcjs.pitchClassOf.call(void 0, midi) === pc) {
+    if (_chunkS3QELJUEcjs.pitchClassOf.call(void 0, midi) === pc) {
       result.push(midi);
     }
   }
@@ -557,14 +589,14 @@ function pitchesForPc(pc, range) {
   });
 }
 function enumerateVoicings(chord, ranges, maxSpacing, maxCandidates = DEFAULT_MAX_CANDIDATES, into = createCandidateBuffer()) {
-  const chordPcs = _chunk3R3QVKY5cjs.chordPitchClasses.call(void 0, chord);
-  const bassPc = _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, _nullishCoalesce(chord.bassPc, () => ( chord.rootPc)));
+  const chordPcs = _chunkYDGMWH43cjs.chordPitchClasses.call(void 0, chord);
+  const bassPc = _chunkS3QELJUEcjs.pitchClassOf.call(void 0, _nullishCoalesce(chord.bassPc, () => ( chord.rootPc)));
   const byVoice = ranges.map(
     (range, voice) => (voice === 0 ? [bassPc] : chordPcs).flatMap((pc) => pitchesForPc(pc, range))
   );
   for (let voice = 0; voice < byVoice.length; voice += 1) {
     if ((_nullishCoalesce(byVoice[voice], () => ( []))).length === 0) {
-      throw new (0, _chunkS5BKZZGMcjs.NoSolutionError)("no voicing satisfies the given ranges");
+      throw new (0, _chunkS3QELJUEcjs.NoSolutionError)("no voicing satisfies the given ranges");
     }
   }
   const voices = ranges.length;
@@ -613,17 +645,17 @@ function enumerateVoicings(chord, ranges, maxSpacing, maxCandidates = DEFAULT_MA
   return into;
 }
 function structuralTables(chord, key) {
-  const tones = _chunk3R3QVKY5cjs.chordPitchClasses.call(void 0, chord);
+  const tones = _chunkYDGMWH43cjs.chordPitchClasses.call(void 0, chord);
   const missing = tones.map(
-    (pc) => _chunk3R3QVKY5cjs.chordToneRole.call(void 0, pc, chord) === "fifth" ? MISSING_FIFTH_PENALTY : MISSING_TONE_PENALTY
+    (pc) => _chunkYDGMWH43cjs.chordToneRole.call(void 0, pc, chord) === "fifth" ? MISSING_FIFTH_PENALTY : MISSING_TONE_PENALTY
   );
-  const rootPc = _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, chord.rootPc);
-  const leadingTonePc = key !== void 0 && _chunk3R3QVKY5cjs.isFunctioningLeadingTone.call(void 0, chord, key) ? _chunk3R3QVKY5cjs.leadingTonePcOf.call(void 0, key) : -1;
+  const rootPc = _chunkS3QELJUEcjs.pitchClassOf.call(void 0, chord.rootPc);
+  const leadingTonePc = key !== void 0 && _chunkYDGMWH43cjs.isFunctioningLeadingTone.call(void 0, chord, key) ? _chunkYDGMWH43cjs.leadingTonePcOf.call(void 0, key) : -1;
   const doubling = new Float64Array(12);
   for (let pc = 0; pc < 12; pc += 1) {
     if (pc === leadingTonePc) {
       doubling[pc] = LEADING_TONE_DOUBLING_PENALTY;
-    } else if (pc !== rootPc && _chunk3R3QVKY5cjs.chordToneRole.call(void 0, pc, chord) !== "fifth") {
+    } else if (pc !== rootPc && _chunkYDGMWH43cjs.chordToneRole.call(void 0, pc, chord) !== "fifth") {
       doubling[pc] = POOR_DOUBLING_PENALTY;
     }
   }
@@ -638,7 +670,7 @@ function structuralPenalty(tables, pitches, offset, voices) {
     if (pitch === void 0) {
       continue;
     }
-    const pc = _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, pitch);
+    const pc = _chunkS3QELJUEcjs.pitchClassOf.call(void 0, pitch);
     PITCH_CLASS_COUNTS[pc] = (_nullishCoalesce(PITCH_CLASS_COUNTS[pc], () => ( 0))) + 1;
     if (index > 0 && pitch === pitches[offset + index - 1]) {
       penalty += UNISON_PENALTY;
@@ -660,13 +692,13 @@ function structuralPenalty(tables, pitches, offset, voices) {
 }
 function resolutionTables(prevChord, nextChord, key) {
   const nextHas = new Uint8Array(12);
-  for (const pc of _chunk3R3QVKY5cjs.chordPitchClasses.call(void 0, nextChord)) {
+  for (const pc of _chunkYDGMWH43cjs.chordPitchClasses.call(void 0, nextChord)) {
     nextHas[pc] = 1;
   }
   return {
-    seventhPc: _nullishCoalesce(_chunk3R3QVKY5cjs.seventhPcOf.call(void 0, prevChord), () => ( -1)),
-    leadingTonePc: key !== void 0 && _chunk3R3QVKY5cjs.isFunctioningLeadingTone.call(void 0, prevChord, key) ? _chunk3R3QVKY5cjs.leadingTonePcOf.call(void 0, key) : -1,
-    tonicPc: key === void 0 ? -1 : _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, key.rootPc),
+    seventhPc: _nullishCoalesce(_chunkYDGMWH43cjs.seventhPcOf.call(void 0, prevChord), () => ( -1)),
+    leadingTonePc: key !== void 0 && _chunkYDGMWH43cjs.isFunctioningLeadingTone.call(void 0, prevChord, key) ? _chunkYDGMWH43cjs.leadingTonePcOf.call(void 0, key) : -1,
+    tonicPc: key === void 0 ? -1 : _chunkS3QELJUEcjs.pitchClassOf.call(void 0, key.rootPc),
     nextHas,
     nextChord
   };
@@ -680,14 +712,14 @@ function resolutionViolations(tables, spelling, prev, prevOffset, cur, curOffset
     if (from === void 0 || to === void 0) {
       continue;
     }
-    const fromPc = _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, from);
+    const fromPc = _chunkS3QELJUEcjs.pitchClassOf.call(void 0, from);
     const motion = to - from;
     const resolved = spelling === void 0 ? motion === -1 || motion === -2 : movesByDescendingStep(spelling.from, from, spelling.to, to);
     if (fromPc === seventhPc && nextHas[fromPc] === 0 && !resolved) {
       count += 1;
     }
     const inner = voice > 0 && voice < voices - 1;
-    if (fromPc === leadingTonePc && tonicPc >= 0 && nextHas[tonicPc] === 1 && nextHas[fromPc] === 0 && motion !== 1 && !(inner && _chunk3R3QVKY5cjs.isFrustratedLeadingTone.call(void 0, from, to, nextChord))) {
+    if (fromPc === leadingTonePc && tonicPc >= 0 && nextHas[tonicPc] === 1 && nextHas[fromPc] === 0 && motion !== 1 && !(inner && _chunkYDGMWH43cjs.isFrustratedLeadingTone.call(void 0, from, to, nextChord))) {
       count += 1;
     }
   }
@@ -716,7 +748,7 @@ function createsOuterHiddenPerfect(prev, prevOffset, cur, curOffset, voices) {
   if (bassPrev === void 0 || bassCur === void 0 || sopPrev === void 0 || sopCur === void 0) {
     return false;
   }
-  return _chunk3R3QVKY5cjs.createsHiddenParallelPerfect.call(void 0, sopPrev, sopCur, bassPrev, bassCur);
+  return _chunkYDGMWH43cjs.createsHiddenParallelPerfect.call(void 0, sopPrev, sopCur, bassPrev, bassCur);
 }
 function augmentedMelodicCount(spelling, prev, prevOffset, cur, curOffset, voices) {
   let count = 0;
@@ -746,7 +778,7 @@ function spellRow(table, pitches, offset, voices) {
 function contradictsALetter(spelling, prev, prevOffset, cur, curOffset, voices) {
   for (let voice = 0; voice < voices; voice += 1) {
     const from = prev[prevOffset + voice];
-    const earlier = from === void 0 ? void 0 : spelling.from.notes[_chunkS5BKZZGMcjs.pitchClassOf.call(void 0, from)];
+    const earlier = from === void 0 ? void 0 : spelling.from.notes[_chunkS3QELJUEcjs.pitchClassOf.call(void 0, from)];
     if (earlier === void 0) {
       continue;
     }
@@ -755,8 +787,8 @@ function contradictsALetter(spelling, prev, prevOffset, cur, curOffset, voices)
         continue;
       }
       const to = cur[curOffset + other];
-      const later = to === void 0 ? void 0 : spelling.to.notes[_chunkS5BKZZGMcjs.pitchClassOf.call(void 0, to)];
-      if (later !== void 0 && earlier.alter !== later.alter && _chunkS5BKZZGMcjs.diatonicLetterOf.call(void 0, earlier.letter) === _chunkS5BKZZGMcjs.diatonicLetterOf.call(void 0, later.letter)) {
+      const later = to === void 0 ? void 0 : spelling.to.notes[_chunkS3QELJUEcjs.pitchClassOf.call(void 0, to)];
+      if (later !== void 0 && earlier.alter !== later.alter && _chunkS3QELJUEcjs.diatonicLetterOf.call(void 0, earlier.letter) === _chunkS3QELJUEcjs.diatonicLetterOf.call(void 0, later.letter)) {
         return true;
       }
     }
@@ -785,11 +817,11 @@ function violationCount(prev, prevOffset, cur, curOffset, voices) {
       if (prevLower === void 0 || prevUpper === void 0 || curLower === void 0 || curUpper === void 0) {
         continue;
       }
-      if (_chunk3R3QVKY5cjs.createsParallelPerfect.call(void 0, prevUpper, curUpper, prevLower, curLower)) {
+      if (_chunkYDGMWH43cjs.createsParallelPerfect.call(void 0, prevUpper, curUpper, prevLower, curLower)) {
         count += 1;
       }
       if (upper === lower + 1) {
-        if (_chunk3R3QVKY5cjs.createsVoiceOverlap.call(void 0, prevUpper, curUpper, prevLower, curLower)) {
+        if (_chunkYDGMWH43cjs.createsVoiceOverlap.call(void 0, prevUpper, curUpper, prevLower, curLower)) {
           count += 1;
         }
       }
@@ -827,19 +859,19 @@ var DERIVED_LOW = 40;
 var DERIVED_HIGH = 79;
 var DERIVED_SPAN = 19;
 function resolveRanges(opts) {
-  _chunkS5BKZZGMcjs.assertOptions.call(void 0, opts, "opts");
+  _chunkS3QELJUEcjs.assertOptions.call(void 0, opts, "opts");
   if (_optionalChain([opts, 'optionalAccess', _5 => _5.ranges]) !== void 0) {
     if (opts.ranges.length === 0) {
-      throw new (0, _chunkS5BKZZGMcjs.InvalidInputError)("ranges must contain at least one voice range");
+      throw new (0, _chunkS3QELJUEcjs.InvalidInputError)("ranges must contain at least one voice range");
     }
-    _chunkS5BKZZGMcjs.assertGenerationBudget.call(void 0, opts.ranges.length, "voice ranges", 128);
+    _chunkS3QELJUEcjs.assertGenerationBudget.call(void 0, opts.ranges.length, "voice ranges", 128);
     return opts.ranges.map((range, index) => {
-      _chunkS5BKZZGMcjs.assertFiniteNumber.call(void 0, range.min, `ranges[${index}].min`);
-      _chunkS5BKZZGMcjs.assertFiniteNumber.call(void 0, range.max, `ranges[${index}].max`);
+      _chunkS3QELJUEcjs.assertFiniteNumber.call(void 0, range.min, `ranges[${index}].min`);
+      _chunkS3QELJUEcjs.assertFiniteNumber.call(void 0, range.max, `ranges[${index}].max`);
       if (range.min > range.max) {
-        throw new (0, _chunkS5BKZZGMcjs.InvalidInputError)(`ranges[${index}].min must not exceed max`);
+        throw new (0, _chunkS3QELJUEcjs.InvalidInputError)(`ranges[${index}].min must not exceed max`);
       }
-      _chunkS5BKZZGMcjs.assertGenerationBudget.call(void 0, 
+      _chunkS3QELJUEcjs.assertGenerationBudget.call(void 0, 
         Math.floor(range.max) - Math.ceil(range.min) + 1,
         `ranges[${index}] span`,
         4096
@@ -848,7 +880,7 @@ function resolveRanges(opts) {
     });
   }
   const voices = _nullishCoalesce(_optionalChain([opts, 'optionalAccess', _6 => _6.voices]), () => ( 4));
-  _chunkS5BKZZGMcjs.assertPositiveInt.call(void 0, voices, "voices", 128);
+  _chunkS3QELJUEcjs.assertPositiveInt.call(void 0, voices, "voices", 128);
   if (voices === 4) {
     return SATB_RANGES.map((range) => ({ ...range }));
   }
@@ -866,21 +898,21 @@ function resolveRanges(opts) {
 }
 function resolveMaxSpacing(opts) {
   const maxSpacing = _nullishCoalesce(_optionalChain([opts, 'optionalAccess', _7 => _7.maxSpacing]), () => ( DEFAULT_MAX_SPACING));
-  _chunkS5BKZZGMcjs.assertFiniteNumber.call(void 0, maxSpacing, "maxSpacing");
+  _chunkS3QELJUEcjs.assertFiniteNumber.call(void 0, maxSpacing, "maxSpacing");
   if (maxSpacing < 0) {
-    throw new (0, _chunkS5BKZZGMcjs.InvalidInputError)("maxSpacing must be non-negative");
+    throw new (0, _chunkS3QELJUEcjs.InvalidInputError)("maxSpacing must be non-negative");
   }
   return maxSpacing;
 }
 function resolvedKeyOf(opts) {
-  return _optionalChain([opts, 'optionalAccess', _8 => _8.key]) === void 0 ? void 0 : _chunk3R3QVKY5cjs.resolveKey.call(void 0, opts.key);
+  return _optionalChain([opts, 'optionalAccess', _8 => _8.key]) === void 0 ? void 0 : _chunkYDGMWH43cjs.resolveKey.call(void 0, opts.key);
 }
 function resolvePreviousChord(opts) {
-  return _optionalChain([opts, 'optionalAccess', _9 => _9.previousChord]) === void 0 ? void 0 : _chunk3R3QVKY5cjs.toChordData.call(void 0, opts.previousChord);
+  return _optionalChain([opts, 'optionalAccess', _9 => _9.previousChord]) === void 0 ? void 0 : _chunkYDGMWH43cjs.toChordData.call(void 0, opts.previousChord);
 }
 function resolveMaxCandidates(opts) {
   if (_optionalChain([opts, 'optionalAccess', _10 => _10.maxCandidates]) === void 0) return void 0;
-  _chunkS5BKZZGMcjs.assertPositiveInt.call(void 0, opts.maxCandidates, "maxCandidates", 1e6);
+  _chunkS3QELJUEcjs.assertPositiveInt.call(void 0, opts.maxCandidates, "maxCandidates", 1e6);
   return opts.maxCandidates;
 }
 function centeringPenalty(ranges, pitches, offset, voices) {
@@ -896,7 +928,7 @@ function centeringPenalty(ranges, pitches, offset, voices) {
   return penalty;
 }
 function voiceChord(chord, opts) {
-  const data = _chunk3R3QVKY5cjs.toChordData.call(void 0, chord);
+  const data = _chunkYDGMWH43cjs.toChordData.call(void 0, chord);
   const ranges = resolveRanges(opts);
   const maxSpacing = resolveMaxSpacing(opts);
   const candidates = enumerateVoicings(data, ranges, maxSpacing, resolveMaxCandidates(opts));
@@ -913,15 +945,15 @@ function voiceChord(chord, opts) {
     }
   }
   if (bestOffset < 0) {
-    throw new (0, _chunkS5BKZZGMcjs.NoSolutionError)(
-      `no voicing satisfies the given ranges for ${_chunk3R3QVKY5cjs.formatChordSymbol.call(void 0, chord)}`
+    throw new (0, _chunkS3QELJUEcjs.NoSolutionError)(
+      `no voicing satisfies the given ranges for ${_chunkYDGMWH43cjs.formatChordSymbol.call(void 0, chord)}`
     );
   }
   return [...pitches.subarray(bestOffset, bestOffset + voices)];
 }
 function noSolutionAt(index, chord) {
-  return new (0, _chunkS5BKZZGMcjs.NoSolutionError)(
-    `no voicing satisfies the given ranges for ${_chunk3R3QVKY5cjs.formatChordSymbol.call(void 0, chord)} at index ${index}`,
+  return new (0, _chunkS3QELJUEcjs.NoSolutionError)(
+    `no voicing satisfies the given ranges for ${_chunkYDGMWH43cjs.formatChordSymbol.call(void 0, chord)} at index ${index}`,
     { at: index }
   );
 }
@@ -929,7 +961,7 @@ function locate(index, chord, work) {
   try {
     return work();
   } catch (error) {
-    if (error instanceof _chunkS5BKZZGMcjs.NoSolutionError) {
+    if (error instanceof _chunkS3QELJUEcjs.NoSolutionError) {
       throw noSolutionAt(index, chord);
     }
     throw error;
@@ -952,9 +984,9 @@ function successorWeight(next, cur, curOffset, voices) {
   return bestWeight;
 }
 function voiceProgression(chords, opts) {
-  const progression = _chunkS5BKZZGMcjs.assertArray.call(void 0, chords, "chords");
-  _chunkS5BKZZGMcjs.assertGenerationBudget.call(void 0, progression.length, "voiced progression chords", _optionalChain([opts, 'optionalAccess', _11 => _11.budget]));
-  const data = progression.map((chord) => _chunk3R3QVKY5cjs.toChordData.call(void 0, chord));
+  const progression = _chunkS3QELJUEcjs.assertArray.call(void 0, chords, "chords");
+  _chunkS3QELJUEcjs.assertGenerationBudget.call(void 0, progression.length, "voiced progression chords", _optionalChain([opts, 'optionalAccess', _11 => _11.budget]));
+  const data = progression.map((chord) => _chunkYDGMWH43cjs.toChordData.call(void 0, chord));
   const key = resolvedKeyOf(opts);
   const ranges = resolveRanges(opts);
   const maxSpacing = resolveMaxSpacing(opts);
@@ -1017,9 +1049,9 @@ function voiceProgression(chords, opts) {
 
 // src/theory/voicing/leading.ts
 function assertVoicing(pitches, name) {
-  const voices = _chunkS5BKZZGMcjs.assertArray.call(void 0, pitches, name);
+  const voices = _chunkS3QELJUEcjs.assertArray.call(void 0, pitches, name);
   for (let index = 0; index < voices.length; index += 1) {
-    _chunkS5BKZZGMcjs.assertFiniteNumber.call(void 0, _nullishCoalesce(voices[index], () => ( Number.NaN)), `${name}[${index}]`);
+    _chunkS3QELJUEcjs.assertFiniteNumber.call(void 0, _nullishCoalesce(voices[index], () => ( Number.NaN)), `${name}[${index}]`);
   }
   return voices;
 }
@@ -1032,13 +1064,13 @@ function voiceLeadingCost(from, to) {
   return leadingCost(previous, 0, next, 0, previous.length);
 }
 function nextVoicing(current, chord, opts) {
-  _chunkS5BKZZGMcjs.assertOptions.call(void 0, opts, "opts");
+  _chunkS3QELJUEcjs.assertOptions.call(void 0, opts, "opts");
   assertVoicing(current, "current");
-  const data = _chunk3R3QVKY5cjs.toChordData.call(void 0, chord);
+  const data = _chunkYDGMWH43cjs.toChordData.call(void 0, chord);
   const derived = _optionalChain([opts, 'optionalAccess', _12 => _12.ranges]) === void 0 && _optionalChain([opts, 'optionalAccess', _13 => _13.voices]) === void 0;
   if (derived) {
     if (current.length === 0) {
-      throw new (0, _chunkS5BKZZGMcjs.InvalidInputError)("current must contain at least one pitch");
+      throw new (0, _chunkS3QELJUEcjs.InvalidInputError)("current must contain at least one pitch");
     }
     assertVoicing(current, "current");
   }
@@ -1050,7 +1082,7 @@ function nextVoicing(current, chord, opts) {
   }) : resolveRanges(opts);
   assertVoicing(current, "current");
   if (current.length < ranges.length) {
-    throw new (0, _chunkS5BKZZGMcjs.InvalidInputError)(
+    throw new (0, _chunkS3QELJUEcjs.InvalidInputError)(
       `current has ${current.length} voices but the requested ranges require ${ranges.length}`
     );
   }
@@ -1074,7 +1106,7 @@ function nextVoicing(current, chord, opts) {
     }
   }
   if (bestOffset < 0) {
-    throw new (0, _chunkS5BKZZGMcjs.NoSolutionError)("no voicing satisfies the given ranges");
+    throw new (0, _chunkS3QELJUEcjs.NoSolutionError)("no voicing satisfies the given ranges");
   }
   return [...pitches.subarray(bestOffset, bestOffset + voices)];
 }
@@ -1099,7 +1131,7 @@ function dedupePcs(pcs) {
   return result;
 }
 function lowestPitchAtOrAbove(pc, floor) {
-  return floor + ((pc - _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, floor)) % 12 + 12) % 12;
+  return floor + ((pc - _chunkS3QELJUEcjs.pitchClassOf.call(void 0, floor)) % 12 + 12) % 12;
 }
 function nearestPc(target, pcs) {
   let best = _nullishCoalesce(pcs[0], () => ( target));
@@ -1114,19 +1146,23 @@ function nearestPc(target, pcs) {
   return best;
 }
 function voiceChordStyled(given, opts) {
-  _chunkS5BKZZGMcjs.assertOptions.call(void 0, opts, "opts");
-  const chord = _chunk3R3QVKY5cjs.toChordData.call(void 0, given);
-  const style = _nullishCoalesce(_optionalChain([opts, 'optionalAccess', _14 => _14.style]), () => ( "close"));
+  _chunkS3QELJUEcjs.assertOptions.call(void 0, opts, "opts");
+  const chord = _chunkYDGMWH43cjs.toChordData.call(void 0, given);
+  const style = _chunkS3QELJUEcjs.assertOneOf.call(void 0, 
+    _nullishCoalesce(_optionalChain([opts, 'optionalAccess', _14 => _14.style]), () => ( "close")),
+    ["close", "drop2", "drop3", "shell", "rootless"],
+    "styled voicing style"
+  );
   const octave = _nullishCoalesce(_optionalChain([opts, 'optionalAccess', _15 => _15.octave]), () => ( DEFAULT_STYLE_OCTAVE));
-  _chunkS5BKZZGMcjs.assertInteger.call(void 0, octave, "styled voicing octave", -10, 10);
+  _chunkS3QELJUEcjs.assertInteger.call(void 0, octave, "styled voicing octave", -10, 10);
   if (_optionalChain([opts, 'optionalAccess', _16 => _16.topNote]) !== void 0) {
-    _chunkS5BKZZGMcjs.assertFiniteNumber.call(void 0, opts.topNote, "styled voicing topNote");
+    _chunkS3QELJUEcjs.assertFiniteNumber.call(void 0, opts.topNote, "styled voicing topNote");
   }
   const base = 12 * (octave + 1);
-  const rootPc = _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, chord.rootPc);
-  const bassPc = _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, _nullishCoalesce(chord.bassPc, () => ( chord.rootPc)));
+  const rootPc = _chunkS3QELJUEcjs.pitchClassOf.call(void 0, chord.rootPc);
+  const bassPc = _chunkS3QELJUEcjs.pitchClassOf.call(void 0, _nullishCoalesce(chord.bassPc, () => ( chord.rootPc)));
   const omitRoot = style === "rootless" || _optionalChain([opts, 'optionalAccess', _17 => _17.rootless]) === true;
-  let order = dedupePcs(chord.intervals.map((interval) => _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, chord.rootPc + interval)));
+  let order = dedupePcs(chord.intervals.map((interval) => _chunkS3QELJUEcjs.pitchClassOf.call(void 0, chord.rootPc + interval)));
   const bassIndex = order.indexOf(bassPc);
   const bassIsChordTone = bassIndex >= 0;
   if (bassIndex > 0) {
@@ -1135,7 +1171,7 @@ function voiceChordStyled(given, opts) {
     order = [bassPc, ...order];
   }
   if (style === "shell") {
-    const roles = order.map((pc) => _chunk3R3QVKY5cjs.chordToneRole.call(void 0, pc, chord));
+    const roles = order.map((pc) => _chunkYDGMWH43cjs.chordToneRole.call(void 0, pc, chord));
     const guide = roles.includes("seventh") ? "seventh" : roles.includes("sixth") ? "sixth" : "fifth";
     order = order.filter((_pc, i) => {
       const role = roles[i];
@@ -1149,7 +1185,7 @@ function voiceChordStyled(given, opts) {
     return [];
   }
   if (_optionalChain([opts, 'optionalAccess', _18 => _18.topNote]) !== void 0) {
-    const target = order.includes(_chunkS5BKZZGMcjs.pitchClassOf.call(void 0, opts.topNote)) ? _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, opts.topNote) : nearestPc(_chunkS5BKZZGMcjs.pitchClassOf.call(void 0, opts.topNote), order);
+    const target = order.includes(_chunkS3QELJUEcjs.pitchClassOf.call(void 0, opts.topNote)) ? _chunkS3QELJUEcjs.pitchClassOf.call(void 0, opts.topNote) : nearestPc(_chunkS3QELJUEcjs.pitchClassOf.call(void 0, opts.topNote), order);
     const targetIndex = order.indexOf(target);
     order = [...order.slice(targetIndex + 1), ...order.slice(0, targetIndex + 1)];
   }
@@ -1168,7 +1204,7 @@ function voiceChordStyled(given, opts) {
     if (prev === void 0) {
       prev = lowestPitchAtOrAbove(pc, base);
     } else {
-      let delta = ((pc - _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, prev)) % 12 + 12) % 12;
+      let delta = ((pc - _chunkS3QELJUEcjs.pitchClassOf.call(void 0, prev)) % 12 + 12) % 12;
       if (delta === 0) {
         delta = 12;
       }
@@ -1182,7 +1218,7 @@ function voiceChordStyled(given, opts) {
     stack[dropIndex] = (_nullishCoalesce(stack[dropIndex], () => ( 0))) - 12;
   }
   if (chord.bassPc !== void 0) {
-    const bassIndexInStack = stack.findIndex((pitch) => _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, pitch) === bassPc);
+    const bassIndexInStack = stack.findIndex((pitch) => _chunkS3QELJUEcjs.pitchClassOf.call(void 0, pitch) === bassPc);
     if (bassIndexInStack >= 0) {
       const otherLowest = Math.min(
         ...stack.filter((_pitch, index) => index !== bassIndexInStack),
@@ -1197,7 +1233,7 @@ function voiceChordStyled(given, opts) {
   const lowest = _nullishCoalesce(voicing[0], () => ( 0));
   const highest = _nullishCoalesce(voicing[voicing.length - 1], () => ( 0));
   if (lowest < 0 || highest > 127) {
-    throw new (0, _chunkS5BKZZGMcjs.InvalidInputError)(
+    throw new (0, _chunkS3QELJUEcjs.InvalidInputError)(
       `styled voicing at octave ${octave} spans MIDI ${lowest}..${highest}, outside 0..127`
     );
   }
@@ -1240,7 +1276,7 @@ function meanPitch(notes) {
   if (notes.length === 0) {
     return 0;
   }
-  return notes.reduce((sum, note) => sum + _chunkS5BKZZGMcjs.noteToMidi.call(void 0, note), 0) / notes.length;
+  return notes.reduce((sum, note) => sum + _chunkS3QELJUEcjs.noteToMidi.call(void 0, note), 0) / notes.length;
 }
 function impliedDurations(count, measures, ratio) {
   const full = ratio * Math.max(measures - 1, 0);
@@ -1263,8 +1299,8 @@ function isPassedThrough(entries, position, species) {
   if (previous === void 0 || current === void 0 || next === void 0) {
     return false;
   }
-  const incoming = _chunkS5BKZZGMcjs.spelledInterval.call(void 0, previous.note, current.note);
-  const outgoing = _chunkS5BKZZGMcjs.spelledInterval.call(void 0, current.note, next.note);
+  const incoming = _chunkS3QELJUEcjs.spelledInterval.call(void 0, previous.note, current.note);
+  const outgoing = _chunkS3QELJUEcjs.spelledInterval.call(void 0, current.note, next.note);
   if (!isStep(incoming) || !isStep(outgoing)) {
     return false;
   }
@@ -1295,9 +1331,9 @@ function isCambiata(entries, start) {
   if (first.consonance === 2 /* Dissonance */ || third.consonance === 2 /* Dissonance */) {
     return false;
   }
-  const approach = _chunkS5BKZZGMcjs.spelledInterval.call(void 0, first.note, second.note);
-  const leap = _chunkS5BKZZGMcjs.spelledInterval.call(void 0, second.note, third.note);
-  const answer = _chunkS5BKZZGMcjs.spelledInterval.call(void 0, third.note, fourth.note);
+  const approach = _chunkS3QELJUEcjs.spelledInterval.call(void 0, first.note, second.note);
+  const leap = _chunkS3QELJUEcjs.spelledInterval.call(void 0, second.note, third.note);
+  const answer = _chunkS3QELJUEcjs.spelledInterval.call(void 0, third.note, fourth.note);
   return isStep(approach) && direction(approach) < 0 && isThird(leap) && direction(leap) < 0 && isStep(answer) && direction(answer) > 0;
 }
 function isDoubleNeighbour(entries, start) {
@@ -1309,9 +1345,9 @@ function isDoubleNeighbour(entries, start) {
   if (first.consonance === 2 /* Dissonance */ || !sameNote(first.note, fourth.note)) {
     return false;
   }
-  const away = _chunkS5BKZZGMcjs.spelledInterval.call(void 0, first.note, second.note);
-  const across = _chunkS5BKZZGMcjs.spelledInterval.call(void 0, second.note, third.note);
-  const back = _chunkS5BKZZGMcjs.spelledInterval.call(void 0, third.note, fourth.note);
+  const away = _chunkS3QELJUEcjs.spelledInterval.call(void 0, first.note, second.note);
+  const across = _chunkS3QELJUEcjs.spelledInterval.call(void 0, second.note, third.note);
+  const back = _chunkS3QELJUEcjs.spelledInterval.call(void 0, third.note, fourth.note);
   return isStep(away) && isThird(across) && isStep(back) && direction(away) !== 0 && direction(across) === -direction(away);
 }
 function isFiguredDissonance(entries, position, species) {
@@ -1340,7 +1376,7 @@ function verticalViolations(entries, position, species, counterpointAbove, cross
   const found = [];
   const upper = counterpointAbove ? entry.note : entry.against;
   const lower = counterpointAbove ? entry.against : entry.note;
-  if (!crossed.has(entry.index) && _chunk3R3QVKY5cjs.createsVoiceCrossing.call(void 0, upper, lower)) {
+  if (!crossed.has(entry.index) && _chunkYDGMWH43cjs.createsVoiceCrossing.call(void 0, upper, lower)) {
     crossed.add(entry.index);
     found.push(
       violation(
@@ -1393,7 +1429,7 @@ function suspensionViolations(entries, position) {
       )
     ];
   }
-  const resolution = next === void 0 ? void 0 : _chunkS5BKZZGMcjs.spelledInterval.call(void 0, entry.note, next.note);
+  const resolution = next === void 0 ? void 0 : _chunkS3QELJUEcjs.spelledInterval.call(void 0, entry.note, next.note);
   if (next === void 0 || resolution === void 0 || !isStep(resolution) || direction(resolution) >= 0) {
     return [
       violation(
@@ -1419,8 +1455,8 @@ function suspensionViolations(entries, position) {
   return [];
 }
 function melodicViolations(from, to) {
-  const interval = _chunkS5BKZZGMcjs.spelledInterval.call(void 0, from.note, to.note);
-  if (_chunk3R3QVKY5cjs.isAugmentedMelodicInterval.call(void 0, from.note, to.note)) {
+  const interval = _chunkS3QELJUEcjs.spelledInterval.call(void 0, from.note, to.note);
+  if (_chunkYDGMWH43cjs.isAugmentedMelodicInterval.call(void 0, from.note, to.note)) {
     return [
       violation(
         "augmentedMelodicInterval",
@@ -1431,7 +1467,7 @@ function melodicViolations(from, to) {
       )
     ];
   }
-  if (_chunk3R3QVKY5cjs.isForbiddenMelodicLeap.call(void 0, from.note, to.note)) {
+  if (_chunkYDGMWH43cjs.isForbiddenMelodicLeap.call(void 0, from.note, to.note)) {
     return [
       violation(
         "illegalLeap",
@@ -1459,19 +1495,19 @@ function melodicMoves(entries) {
     if (from === void 0 || to === void 0) {
       continue;
     }
-    moves.push({ from, to, interval: _chunkS5BKZZGMcjs.spelledInterval.call(void 0, from.note, to.note) });
+    moves.push({ from, to, interval: _chunkS3QELJUEcjs.spelledInterval.call(void 0, from.note, to.note) });
   }
   return moves;
 }
 function climaxViolations(entries) {
   const body = entries.slice(0, -1);
   const peak = body.reduce(
-    (high, entry) => Math.max(high, _chunkS5BKZZGMcjs.noteToMidi.call(void 0, entry.note)),
+    (high, entry) => Math.max(high, _chunkS3QELJUEcjs.noteToMidi.call(void 0, entry.note)),
     Number.NEGATIVE_INFINITY
   );
   const arrivals = body.filter((entry, position) => {
     const previous = body[position - 1];
-    return _chunkS5BKZZGMcjs.noteToMidi.call(void 0, entry.note) === peak && (previous === void 0 || _chunkS5BKZZGMcjs.noteToMidi.call(void 0, previous.note) !== peak);
+    return _chunkS3QELJUEcjs.noteToMidi.call(void 0, entry.note) === peak && (previous === void 0 || _chunkS3QELJUEcjs.noteToMidi.call(void 0, previous.note) !== peak);
   });
   const first = arrivals[0];
   const second = arrivals[1];
@@ -1565,7 +1601,7 @@ function tritoneOutlineViolations(entries) {
     const first = run[0];
     const last = run[run.length - 1];
     if (first !== void 0 && last !== void 0 && run.length > 1) {
-      const outline = _chunkS5BKZZGMcjs.spelledInterval.call(void 0, first.from.note, last.to.note);
+      const outline = _chunkS3QELJUEcjs.spelledInterval.call(void 0, first.from.note, last.to.note);
       if (Math.abs(outline.semitones) === TRITONE_SEMITONES) {
         found.push(
           violation(
@@ -1629,8 +1665,8 @@ function motionViolations(from, to, counterpointAbove) {
   const upperCur = counterpointAbove ? to.note : to.against;
   const lowerPrev = counterpointAbove ? from.against : from.note;
   const lowerCur = counterpointAbove ? to.against : to.note;
-  if (_chunk3R3QVKY5cjs.createsParallelPerfect.call(void 0, upperPrev, upperCur, lowerPrev, lowerCur)) {
-    const fifth = _chunk3R3QVKY5cjs.simpleIntervalNumber.call(void 0, to.interval.number) === 5;
+  if (_chunkYDGMWH43cjs.createsParallelPerfect.call(void 0, upperPrev, upperCur, lowerPrev, lowerCur)) {
+    const fifth = _chunkYDGMWH43cjs.simpleIntervalNumber.call(void 0, to.interval.number) === 5;
     found.push(
       violation(
         fifth ? "parallelFifth" : "parallelOctave",
@@ -1641,7 +1677,7 @@ function motionViolations(from, to, counterpointAbove) {
       )
     );
   }
-  if (_chunk3R3QVKY5cjs.createsHiddenParallelPerfect.call(void 0, upperPrev, upperCur, lowerPrev, lowerCur, "twoVoice")) {
+  if (_chunkYDGMWH43cjs.createsHiddenParallelPerfect.call(void 0, upperPrev, upperCur, lowerPrev, lowerCur, "twoVoice")) {
     found.push(
       violation(
         "hiddenPerfect",
@@ -1652,7 +1688,7 @@ function motionViolations(from, to, counterpointAbove) {
       )
     );
   }
-  if (_chunk3R3QVKY5cjs.createsBattuta.call(void 0, upperPrev, upperCur, lowerPrev, lowerCur)) {
+  if (_chunkYDGMWH43cjs.createsBattuta.call(void 0, upperPrev, upperCur, lowerPrev, lowerCur)) {
     found.push(
       violation(
         "battuta",
@@ -1681,7 +1717,7 @@ function cadenceViolations(entries, mode, counterpointAbove) {
   if (first === void 0 || last === void 0) {
     return found;
   }
-  if (_chunk3R3QVKY5cjs.classifySpelledInterval.call(void 0, first.interval) !== 0 /* PerfectConsonance */) {
+  if (_chunkYDGMWH43cjs.classifySpelledInterval.call(void 0, first.interval) !== 0 /* PerfectConsonance */) {
     found.push(
       violation(
         "missingCadence",
@@ -1692,7 +1728,7 @@ function cadenceViolations(entries, mode, counterpointAbove) {
       )
     );
   }
-  if (_chunkS5BKZZGMcjs.noteToPitchClass.call(void 0, last.note) !== _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, mode.rootPc)) {
+  if (_chunkS3QELJUEcjs.noteToPitchClass.call(void 0, last.note) !== _chunkS3QELJUEcjs.pitchClassOf.call(void 0, mode.rootPc)) {
     found.push(
       violation(
         "missingCadence",
@@ -1704,7 +1740,7 @@ function cadenceViolations(entries, mode, counterpointAbove) {
     );
   }
   const closing = last.interval;
-  if (closing.quality !== "P" || _chunk3R3QVKY5cjs.simpleIntervalNumber.call(void 0, closing.number) !== 1) {
+  if (closing.quality !== "P" || _chunkYDGMWH43cjs.simpleIntervalNumber.call(void 0, closing.number) !== 1) {
     found.push(
       violation(
         "missingCadence",
@@ -1721,9 +1757,9 @@ function cadenceViolations(entries, mode, counterpointAbove) {
     return found;
   }
   const arrival = _nullishCoalesce(entries.find((entry) => entry.againstIndex === last.againstIndex), () => ( last));
-  const approach = _chunkS5BKZZGMcjs.spelledInterval.call(void 0, penultimate.note, arrival.note);
+  const approach = _chunkS3QELJUEcjs.spelledInterval.call(void 0, penultimate.note, arrival.note);
   const expected = counterpointAbove ? { quality: "M", number: 6 } : { quality: "m", number: 3 };
-  if (penultimate.interval.quality !== expected.quality || _chunk3R3QVKY5cjs.simpleIntervalNumber.call(void 0, penultimate.interval.number) !== expected.number || !isStep(approach)) {
+  if (penultimate.interval.quality !== expected.quality || _chunkYDGMWH43cjs.simpleIntervalNumber.call(void 0, penultimate.interval.number) !== expected.number || !isStep(approach)) {
     found.push(
       violation(
         "missingCadence",
@@ -1739,6 +1775,10 @@ function cadenceViolations(entries, mode, counterpointAbove) {
 function resolveDurations(counterpoint, measures, species, opts) {
   const given = _optionalChain([opts, 'optionalAccess', _21 => _21.durations]);
   if (given !== void 0) {
+    _chunkS3QELJUEcjs.assertArray.call(void 0, given, "durations");
+    given.forEach((duration, index) => {
+      _chunkS3QELJUEcjs.assertFiniteNumber.call(void 0, duration, `durations[${index}]`);
+    });
     if (given.length !== counterpoint.length) {
       return {
         problem: `The exercise gives ${given.length} durations for ${counterpoint.length} notes`
@@ -1746,20 +1786,20 @@ function resolveDurations(counterpoint, measures, species, opts) {
     }
     for (const duration of given) {
       const units = duration / MIN_FLORID_VALUE;
-      if (!(duration > 0) || duration > 1 || Math.abs(units - Math.round(units)) > _chunkS5BKZZGMcjs.BEAT_EPS) {
+      if (!(duration > 0) || duration > 1 || Math.abs(units - Math.round(units)) > _chunkS3QELJUEcjs.BEAT_EPS) {
         return {
           problem: `A note lasts ${duration} of a measure, which this style does not write`
         };
       }
     }
     const total = given.reduce((sum, duration) => sum + duration, 0);
-    if (Math.abs(total - measures) > _chunkS5BKZZGMcjs.BEAT_EPS) {
+    if (Math.abs(total - measures) > _chunkS3QELJUEcjs.BEAT_EPS) {
       return { problem: `The counterpoint fills ${total} of the ${measures} measures` };
     }
     return { durations: [...given] };
   }
   if (species === 5) {
-    throw new (0, _chunkS5BKZZGMcjs.InvalidInputError)(
+    throw new (0, _chunkS3QELJUEcjs.InvalidInputError)(
       "checkSpecies needs durations for the fifth species, whose note values are not fixed"
     );
   }
@@ -1781,9 +1821,9 @@ function buildEntries(cantusFirmus, counterpoint, durations, counterpointAbove)
     if (note === void 0) {
       continue;
     }
-    const struckOver = Math.min(Math.floor(onset + _chunkS5BKZZGMcjs.BEAT_EPS), cantusFirmus.length - 1);
+    const struckOver = Math.min(Math.floor(onset + _chunkS3QELJUEcjs.BEAT_EPS), cantusFirmus.length - 1);
     const lastOver = Math.min(
-      Math.max(Math.ceil(onset + duration - _chunkS5BKZZGMcjs.BEAT_EPS) - 1, struckOver),
+      Math.max(Math.ceil(onset + duration - _chunkS3QELJUEcjs.BEAT_EPS) - 1, struckOver),
       cantusFirmus.length - 1
     );
     for (let againstIndex = struckOver; againstIndex <= lastOver; againstIndex += 1) {
@@ -1793,7 +1833,7 @@ function buildEntries(cantusFirmus, counterpoint, durations, counterpointAbove)
       }
       const held = againstIndex > struckOver;
       const begins = held ? againstIndex : onset;
-      const interval = counterpointAbove ? _chunkS5BKZZGMcjs.spelledInterval.call(void 0, against, note) : _chunkS5BKZZGMcjs.spelledInterval.call(void 0, note, against);
+      const interval = counterpointAbove ? _chunkS3QELJUEcjs.spelledInterval.call(void 0, against, note) : _chunkS3QELJUEcjs.spelledInterval.call(void 0, note, against);
       entries.push({
         note,
         index,
@@ -1802,9 +1842,9 @@ function buildEntries(cantusFirmus, counterpoint, durations, counterpointAbove)
         held,
         against,
         againstIndex,
-        downbeat: Math.abs(begins - Math.round(begins)) < _chunkS5BKZZGMcjs.BEAT_EPS,
+        downbeat: Math.abs(begins - Math.round(begins)) < _chunkS3QELJUEcjs.BEAT_EPS,
         interval,
-        consonance: _chunk3R3QVKY5cjs.classifySpelledInterval.call(void 0, interval)
+        consonance: _chunkYDGMWH43cjs.classifySpelledInterval.call(void 0, interval)
       });
     }
     onset += duration;
@@ -1826,17 +1866,17 @@ function motionPairs(entries) {
   return pairs;
 }
 function checkSpecies(cantusFirmus, counterpoint, species, modeLike, opts) {
-  _chunkS5BKZZGMcjs.assertArray.call(void 0, cantusFirmus, "cantus firmus");
-  _chunkS5BKZZGMcjs.assertArray.call(void 0, counterpoint, "counterpoint");
-  const asked = _chunkS5BKZZGMcjs.assertOptions.call(void 0, opts, "opts");
-  const mode = _chunk3R3QVKY5cjs.toKeyScale.call(void 0, modeLike);
+  _chunkS3QELJUEcjs.assertArray.call(void 0, cantusFirmus, "cantus firmus");
+  _chunkS3QELJUEcjs.assertArray.call(void 0, counterpoint, "counterpoint");
+  const asked = _chunkS3QELJUEcjs.assertOptions.call(void 0, opts, "opts");
+  const mode = _chunkYDGMWH43cjs.toKeyScale.call(void 0, modeLike);
   if (!SPECIES_NUMBERS.includes(species)) {
-    throw new (0, _chunkS5BKZZGMcjs.InvalidInputError)(
-      `species must be one of ${SPECIES_NUMBERS.join(", ")}; received ${_chunkS5BKZZGMcjs.describeRejected.call(void 0, species)}`
+    throw new (0, _chunkS3QELJUEcjs.InvalidInputError)(
+      `species must be one of ${SPECIES_NUMBERS.join(", ")}; received ${_chunkS3QELJUEcjs.describeRejected.call(void 0, species)}`
     );
   }
   if (cantusFirmus.length === 0 || counterpoint.length === 0) {
-    throw new (0, _chunkS5BKZZGMcjs.InvalidInputError)("checkSpecies needs both a cantus firmus and a counterpoint");
+    throw new (0, _chunkS3QELJUEcjs.InvalidInputError)("checkSpecies needs both a cantus firmus and a counterpoint");
   }
   const resolved = resolveDurations(counterpoint, cantusFirmus.length, species, asked);
   if ("problem" in resolved) {
@@ -1860,9 +1900,9 @@ function checkSpecies(cantusFirmus, counterpoint, species, modeLike, opts) {
     }
   }
   violations.push(...melodicShapeViolations(struck, species));
-  for (const [from, to] of motionPairs(struck)) {
-    const previous = struck[from];
-    const current = struck[to];
+  for (const [from, to] of motionPairs(entries)) {
+    const previous = entries[from];
+    const current = entries[to];
     if (previous !== void 0 && current !== void 0) {
       violations.push(...motionViolations(previous, current, counterpointAbove));
     }
@@ -1877,9 +1917,9 @@ function bare(note) {
 }
 function midiOf(note, index, voice) {
   if (note.octave === void 0) {
-    throw new (0, _chunkS5BKZZGMcjs.InvalidInputError)(`voicings[${index}][${voice}] must carry an octave`);
+    throw new (0, _chunkS3QELJUEcjs.InvalidInputError)(`voicings[${index}][${voice}] must carry an octave`);
   }
-  return _chunkS5BKZZGMcjs.noteToMidi.call(void 0, note);
+  return _chunkS3QELJUEcjs.noteToMidi.call(void 0, note);
 }
 function verticalViolations2(moment, ranges, maxSpacing) {
   const found = [];
@@ -1890,7 +1930,7 @@ function verticalViolations2(moment, ranges, maxSpacing) {
     if (upper === void 0 || lower === void 0) {
       continue;
     }
-    if (_chunk3R3QVKY5cjs.createsVoiceCrossing.call(void 0, upper, lower)) {
+    if (_chunkYDGMWH43cjs.createsVoiceCrossing.call(void 0, upper, lower)) {
       found.push(
         violation(
           "voiceCrossing",
@@ -1901,7 +1941,7 @@ function verticalViolations2(moment, ranges, maxSpacing) {
         )
       );
     }
-    if (voice >= 2 && _chunk3R3QVKY5cjs.exceedsSpacing.call(void 0, upper, lower, maxSpacing)) {
+    if (voice >= 2 && _chunkYDGMWH43cjs.exceedsSpacing.call(void 0, upper, lower, maxSpacing)) {
       found.push(
         violation(
           "spacing",
@@ -1941,8 +1981,8 @@ function pairViolations(transition) {
       if (upperPrev === void 0 || upperCur === void 0 || lowerPrev === void 0 || lowerCur === void 0) {
         continue;
       }
-      if (_chunk3R3QVKY5cjs.createsParallelPerfect.call(void 0, upperPrev, upperCur, lowerPrev, lowerCur)) {
-        const fifth = _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, upperCur - lowerCur) === 7;
+      if (_chunkYDGMWH43cjs.createsParallelPerfect.call(void 0, upperPrev, upperCur, lowerPrev, lowerCur)) {
+        const fifth = _chunkS3QELJUEcjs.pitchClassOf.call(void 0, Math.abs(upperCur - lowerCur)) === 7;
         found.push(
           violation(
             fifth ? "parallelFifth" : "parallelOctave",
@@ -1953,7 +1993,7 @@ function pairViolations(transition) {
           )
         );
       }
-      if (upper === lower + 1 && _chunk3R3QVKY5cjs.createsVoiceOverlap.call(void 0, upperPrev, upperCur, lowerPrev, lowerCur)) {
+      if (upper === lower + 1 && _chunkYDGMWH43cjs.createsVoiceOverlap.call(void 0, upperPrev, upperCur, lowerPrev, lowerCur)) {
         found.push(
           violation(
             "overlap",
@@ -1970,7 +2010,7 @@ function pairViolations(transition) {
   const bassCur = to.pitches[0];
   const topPrev = from.pitches[voices - 1];
   const topCur = to.pitches[voices - 1];
-  if (voices >= 2 && bassPrev !== void 0 && bassCur !== void 0 && topPrev !== void 0 && topCur !== void 0 && _chunk3R3QVKY5cjs.createsHiddenParallelPerfect.call(void 0, topPrev, topCur, bassPrev, bassCur)) {
+  if (voices >= 2 && bassPrev !== void 0 && bassCur !== void 0 && topPrev !== void 0 && topCur !== void 0 && _chunkYDGMWH43cjs.createsHiddenParallelPerfect.call(void 0, topPrev, topCur, bassPrev, bassCur)) {
     found.push(
       violation(
         "hiddenPerfect",
@@ -1991,17 +2031,17 @@ function crossRelationViolations(transition) {
       [clash.earlierVoice, clash.laterVoice],
       from.index,
       to.index,
-      `${_chunkS5BKZZGMcjs.formatNote.call(void 0, bare(clash.earlier))} is contradicted by ${_chunkS5BKZZGMcjs.formatNote.call(void 0, bare(clash.later))} in another voice`
+      `${_chunkS3QELJUEcjs.formatNote.call(void 0, bare(clash.earlier))} is contradicted by ${_chunkS3QELJUEcjs.formatNote.call(void 0, bare(clash.later))} in another voice`
     )
   );
 }
 function melodicViolations2(transition) {
   const found = [];
   const { from, to, key } = transition;
-  const seventhPc = _chunk3R3QVKY5cjs.seventhPcOf.call(void 0, from.chord);
-  const nextPcs = new Set(_chunk3R3QVKY5cjs.chordPitchClasses.call(void 0, to.chord));
-  const leadingTonePc = _chunk3R3QVKY5cjs.leadingTonePcOf.call(void 0, key);
-  const tonicPc = _chunkS5BKZZGMcjs.pitchClassOf.call(void 0, key.rootPc);
+  const seventhPc = _chunkYDGMWH43cjs.seventhPcOf.call(void 0, from.chord);
+  const nextPcs = new Set(_chunkYDGMWH43cjs.chordPitchClasses.call(void 0, to.chord));
+  const leadingTonePc = _chunkYDGMWH43cjs.leadingTonePcOf.call(void 0, key);
+  const tonicPc = _chunkS3QELJUEcjs.pitchClassOf.call(void 0, key.rootPc);
   const voices = Math.min(from.notes.length, to.notes.length);
   for (let voice = 0; voice < voices; voice += 1) {
     const earlier = from.notes[voice];
@@ -2011,8 +2051,8 @@ function melodicViolations2(transition) {
     if (earlier === void 0 || later === void 0 || earlierPitch === void 0 || laterPitch === void 0) {
       continue;
     }
-    const interval = _chunkS5BKZZGMcjs.spelledInterval.call(void 0, earlier, later);
-    if (_chunk3R3QVKY5cjs.isAugmentedMelodicInterval.call(void 0, earlier, later)) {
+    const interval = _chunkS3QELJUEcjs.spelledInterval.call(void 0, earlier, later);
+    if (_chunkYDGMWH43cjs.isAugmentedMelodicInterval.call(void 0, earlier, later)) {
       found.push(
         violation(
           "augmentedMelodicInterval",
@@ -2023,8 +2063,8 @@ function melodicViolations2(transition) {
         )
       );
     }
-    const earlierPc = _chunkS5BKZZGMcjs.noteToPitchClass.call(void 0, earlier);
-    if (earlierPc === seventhPc && !nextPcs.has(earlierPc) && !_chunk3R3QVKY5cjs.isDescendingStep.call(void 0, interval)) {
+    const earlierPc = _chunkS3QELJUEcjs.noteToPitchClass.call(void 0, earlier);
+    if (earlierPc === seventhPc && !nextPcs.has(earlierPc) && !_chunkYDGMWH43cjs.isDescendingStep.call(void 0, interval)) {
       found.push(
         violation(
           "unresolvedSeventh",
@@ -2036,7 +2076,7 @@ function melodicViolations2(transition) {
       );
     }
     const inner = !isOuterVoice(voice, from.notes) && !isOuterVoice(voice, to.notes);
-    if (earlierPc === leadingTonePc && _chunk3R3QVKY5cjs.isFunctioningLeadingTone.call(void 0, from.chord, key) && nextPcs.has(tonicPc) && !nextPcs.has(earlierPc) && !_chunk3R3QVKY5cjs.isLeadingToneResolution.call(void 0, earlierPitch, laterPitch, key) && !(inner && _chunk3R3QVKY5cjs.isFrustratedLeadingTone.call(void 0, earlierPitch, laterPitch, to.chord))) {
+    if (earlierPc === leadingTonePc && _chunkYDGMWH43cjs.isFunctioningLeadingTone.call(void 0, from.chord, key) && nextPcs.has(tonicPc) && !nextPcs.has(earlierPc) && !_chunkYDGMWH43cjs.isLeadingToneResolution.call(void 0, earlierPitch, laterPitch, key) && !(inner && _chunkYDGMWH43cjs.isFrustratedLeadingTone.call(void 0, earlierPitch, laterPitch, to.chord))) {
       found.push(
         violation(
           "unresolvedLeadingTone",
@@ -2051,18 +2091,18 @@ function melodicViolations2(transition) {
   return found;
 }
 function spellVoicing(voicing, chord, key) {
-  _chunkS5BKZZGMcjs.assertArray.call(void 0, voicing, "voicing");
-  _chunk3R3QVKY5cjs.assertChord.call(void 0, chord);
-  const { tonic, scale } = _chunk3R3QVKY5cjs.resolveKey.call(void 0, key);
-  return voicing.map((pitch) => _chunk3R3QVKY5cjs.spellPitch.call(void 0, pitch, tonic, scale, { chord }));
+  _chunkS3QELJUEcjs.assertArray.call(void 0, voicing, "voicing");
+  _chunkYDGMWH43cjs.assertChord.call(void 0, chord);
+  const { tonic, scale } = _chunkYDGMWH43cjs.resolveKey.call(void 0, key);
+  return voicing.map((pitch) => _chunkYDGMWH43cjs.spellPitch.call(void 0, pitch, tonic, scale, { chord }));
 }
 function checkPartWriting(voicings, chords, keyLike, opts) {
-  _chunkS5BKZZGMcjs.assertArray.call(void 0, voicings, "voicings");
-  _chunkS5BKZZGMcjs.assertArray.call(void 0, chords, "chords");
-  const asked = _chunkS5BKZZGMcjs.assertOptions.call(void 0, opts, "opts");
-  const key = _chunk3R3QVKY5cjs.toKeyScale.call(void 0, keyLike);
+  _chunkS3QELJUEcjs.assertArray.call(void 0, voicings, "voicings");
+  _chunkS3QELJUEcjs.assertArray.call(void 0, chords, "chords");
+  const asked = _chunkS3QELJUEcjs.assertOptions.call(void 0, opts, "opts");
+  const key = _chunkYDGMWH43cjs.toKeyScale.call(void 0, keyLike);
   if (voicings.length !== chords.length) {
-    throw new (0, _chunkS5BKZZGMcjs.InvalidInputError)(
+    throw new (0, _chunkS3QELJUEcjs.InvalidInputError)(
       `checkPartWriting needs one chord per voicing; received ${voicings.length} voicings and ${chords.length} chords`
     );
   }
@@ -2074,7 +2114,7 @@ function checkPartWriting(voicings, chords, keyLike, opts) {
   } else {
     ranges = resolveRanges(asked);
     if (ranges.length < voiceCount) {
-      throw new (0, _chunkS5BKZZGMcjs.InvalidInputError)(
+      throw new (0, _chunkS3QELJUEcjs.InvalidInputError)(
         `checkPartWriting needs one range per voice; received ${ranges.length} ranges for ${voiceCount} voices`
       );
     }
@@ -2135,4 +2175,4 @@ function checkPartWriting(voicings, chords, keyLike, opts) {
 
 
 exports.TRANSPOSING_INSTRUMENTS = TRANSPOSING_INSTRUMENTS; exports.instrumentTransposition = instrumentTransposition; exports.toSoundingPitch = toSoundingPitch; exports.toWrittenPitch = toWrittenPitch; exports.figuredBassRealization = figuredBassRealization; exports.realizeFiguredBass = realizeFiguredBass; exports.figuredBassOf = figuredBassOf; exports.SATB_RANGES = SATB_RANGES; exports.voiceChord = voiceChord; exports.voiceProgression = voiceProgression; exports.voiceLeadingCost = voiceLeadingCost; exports.nextVoicing = nextVoicing; exports.voiceChordStyled = voiceChordStyled; exports.checkSpecies = checkSpecies; exports.spellVoicing = spellVoicing; exports.checkPartWriting = checkPartWriting;
-//# sourceMappingURL=chunk-76ZBTRG2.cjs.map
+//# sourceMappingURL=chunk-U4EQTDGN.cjs.map