@libraz/libcantus 1.2.0 → 1.4.0

package/dist/{chunk-M5RYMAFI.js → chunk-ZLNSH4UL.js}

@@ -1,8 +1,9 @@
 import {
-  appliedDominantTarget,
+  appliedChordTarget,
   assertChord,
   chordPitchClasses,
   chordQualities,
+  chordSpecForQuality,
   chordToneRole,
   classifySpelledInterval,
   createsBattuta,
@@ -12,7 +13,6 @@ import {
   createsVoiceOverlap,
   exceedsSpacing,
   formatChordSymbol,
-  hasDominantSonority,
   isAugmentedMelodicInterval,
   isDescendingStep,
   isForbiddenMelodicLeap,
@@ -22,6 +22,7 @@ import {
   isNeapolitanChordOf,
   leadingTonePcOf,
   makeChord,
+  makeSpelledChord,
   noteNames,
   resolveKey,
   scaleTonesInDegreeOrder,
@@ -33,7 +34,7 @@ import {
   spellScale,
   toChordData,
   toKeyScale
-} from "./chunk-RFIBF2RR.js";
+} from "./chunk-H7FVMBUC.js";
 import {
   BEAT_EPS,
   InvalidInputError,
@@ -42,6 +43,7 @@ import {
   assertFiniteNumber,
   assertGenerationBudget,
   assertInteger,
+  assertOneOf,
   assertOptions,
   assertPositiveInt,
   describeRejected,
@@ -55,7 +57,7 @@ import {
   toNoteData,
   toSpelledInterval,
   transposeByInterval
-} from "./chunk-AGOVW7U6.js";
+} from "./chunk-YYVXRV3V.js";
 
 // src/theory/transposition/index.ts
 var TRANSPOSING_INSTRUMENTS = Object.freeze({
@@ -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],
@@ -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(text[index] ?? "") && !MOTION_MARKS.has(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(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(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 chordQualities()) {
     const { intervals } = makeChord(0, quality);
     const template = intervals.join(",");
-    if (intervals.length >= 3 && intervals.length <= MAX_STACK_SIZE && !index.has(template)) {
+    const spec = chordSpecForQuality(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);
     }
   }
@@ -325,9 +354,11 @@ function realizeSonority(bass, resolved, text, alters) {
       `figured bass ${describeRejected(text)} sounds ${noteNames(tones).join(" ")}, which no chord quality names`
     );
   }
-  const chord = makeChord(rootPc, quality, noteToPitchClass(bass));
-  chord.rootSpelling = { letter: root.letter, alter: root.alter };
-  chord.bassSpelling = { letter: bass.letter, alter: bass.alter };
+  const chord = makeSpelledChord(rootPc, quality, {
+    bassPc: noteToPitchClass(bass),
+    rootSpelling: { letter: root.letter, alter: root.alter },
+    bassSpelling: { letter: bass.letter, alter: bass.alter }
+  });
   return { chord, notes };
 }
 function figuredBassRealization(bass, figures, key) {
@@ -416,11 +447,11 @@ function assertRealizesAs(bass, figures, key, tones) {
 }
 
 // src/theory/partwriting/cross-relation.ts
-function resolvesAsAppliedDominant(chord, next, key) {
-  if (next === void 0 || !hasDominantSonority(chord)) {
+function resolvesAsAppliedChord(chord, next, key) {
+  if (next === void 0) {
     return false;
   }
-  const target = appliedDominantTarget(chord.rootPc + 5, key);
+  const target = appliedChordTarget(chord, key);
   return target !== null && pitchClassOf(next.rootPc) === target.rootPc;
 }
 function soundsAugmentedSixth(moment, key) {
@@ -437,7 +468,7 @@ function soundsAugmentedSixth(moment, key) {
   });
 }
 function isChromaticHarmony(moment, next, key) {
-  return resolvesAsAppliedDominant(moment.chord, next, key) || isNeapolitanChordOf(moment.chord, key) || soundsAugmentedSixth(moment, key);
+  return resolvesAsAppliedChord(moment.chord, next, key) || isNeapolitanChordOf(moment.chord, key) || soundsAugmentedSixth(moment, key);
 }
 function approachedByStep(before, moment, voice) {
   const earlier = before?.[voice];
@@ -445,7 +476,8 @@ function approachedByStep(before, moment, voice) {
   if (earlier === void 0 || later === void 0) {
     return false;
   }
-  return spelledInterval(earlier, later).number === 2;
+  const interval = spelledInterval(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;
@@ -1116,7 +1148,11 @@ function nearestPc(target, pcs) {
 function voiceChordStyled(given, opts) {
   assertOptions(opts, "opts");
   const chord = toChordData(given);
-  const style = opts?.style ?? "close";
+  const style = assertOneOf(
+    opts?.style ?? "close",
+    ["close", "drop2", "drop3", "shell", "rootless"],
+    "styled voicing style"
+  );
   const octave = opts?.octave ?? DEFAULT_STYLE_OCTAVE;
   assertInteger(octave, "styled voicing octave", -10, 10);
   if (opts?.topNote !== void 0) {
@@ -1739,6 +1775,10 @@ function cadenceViolations(entries, mode, counterpointAbove) {
 function resolveDurations(counterpoint, measures, species, opts) {
   const given = opts?.durations;
   if (given !== void 0) {
+    assertArray(given, "durations");
+    given.forEach((duration, index) => {
+      assertFiniteNumber(duration, `durations[${index}]`);
+    });
     if (given.length !== counterpoint.length) {
       return {
         problem: `The exercise gives ${given.length} durations for ${counterpoint.length} notes`
@@ -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));
     }
@@ -1942,7 +1982,7 @@ function pairViolations(transition) {
         continue;
       }
       if (createsParallelPerfect(upperPrev, upperCur, lowerPrev, lowerCur)) {
-        const fifth = pitchClassOf(upperCur - lowerCur) === 7;
+        const fifth = pitchClassOf(Math.abs(upperCur - lowerCur)) === 7;
         found.push(
           violation(
             fifth ? "parallelFifth" : "parallelOctave",
@@ -2135,4 +2175,4 @@ export {
   spellVoicing,
   checkPartWriting
 };
-//# sourceMappingURL=chunk-M5RYMAFI.js.map
+//# sourceMappingURL=chunk-ZLNSH4UL.js.map