@sudobility/music_types 0.13.18 → 0.13.20

package/dist/domain/generation/style-presets.js

@@ -0,0 +1,274 @@
+import { measuresForSeconds, SONG_SECONDS, } from "../notation/music-vocabulary.js";
+/**
+ * The keyword values the generation prompt parser branches on.
+ *
+ * These are shared product data: the app offers them, and the backend needs to
+ * know that every offered prompt phrase has genre mechanics.
+ */
+const GENERATE_SCORE_STYLE_KEYS = [
+    "waltz",
+    "jazz",
+    "pop",
+    "cinematic",
+    "ambient",
+    "battle",
+    "rock",
+    "punk",
+    "heavyMetal",
+    "blues",
+    "country",
+    "bluegrass",
+    "funk",
+    "soul",
+    "ragtime",
+    "swing",
+    "bossaNova",
+    "samba",
+    "salsa",
+    "tango",
+    "reggae",
+    "hipHop",
+    "trap",
+    "lofi",
+    "house",
+    "techno",
+    "trance",
+    "edm",
+    "electroSwing",
+    "disco",
+    "classical",
+    "baroque",
+    "march",
+];
+export const GENERATE_SCORE_STYLE_OPTIONS = GENERATE_SCORE_STYLE_KEYS;
+const KIT = "kit:0";
+const STYLE_PRESET_SOURCE = {
+    waltz: {
+        prompt: 'waltz — a lilting three-four with the weight on beat one and a light "oom-pah-pah" accompaniment',
+        instruments: ["0", "48", "43"],
+        tempo: 160,
+        timeSignature: "3/4",
+    },
+    jazz: {
+        prompt: "jazz — swung eighth notes, walking bass, extended chords, and a melody that phrases across the barline rather than sitting on the beat",
+        instruments: ["66", "0", "32", KIT],
+        tempo: 132,
+        timeSignature: "4/4",
+    },
+    pop: {
+        prompt: "pop — a clear singable hook, four-bar phrases, a backbeat on two and four, and space between the phrases",
+        instruments: ["0", "27", "33", KIT],
+        tempo: 120,
+        timeSignature: "4/4",
+    },
+    cinematic: {
+        prompt: "cinematic orchestral — long sustained lines that build, a rising dynamic arc, and rhythm that serves the swell rather than a groove",
+        instruments: ["48", "40", "42", "60", "47"],
+        tempo: 90,
+        timeSignature: "4/4",
+        mode: "minor",
+    },
+    ambient: {
+        prompt: "ambient — slow evolving pads, very long note values, no strong pulse, and silence used as a voice",
+        instruments: ["89", "0", "48"],
+        tempo: 70,
+        timeSignature: "4/4",
+    },
+    battle: {
+        prompt: "driving battle music — insistent ostinato, hard accents, brass stabs against a relentless low pulse",
+        instruments: ["61", "48", "47", KIT],
+        tempo: 150,
+        timeSignature: "4/4",
+        mode: "minor",
+    },
+    rock: {
+        prompt: "rock — a hard backbeat on two and four, power-chord riffing, and a bass locked to the kick",
+        instruments: ["29", "27", "33", KIT],
+        tempo: 128,
+        timeSignature: "4/4",
+    },
+    punk: {
+        prompt: "punk — fast straight eighths on downstrokes, three chords, no ornament, and a snare driving every backbeat. The guitar figure repeats unchanged through a section; the energy comes from the tempo and the drive, never from varying the part.",
+        instruments: ["30", "29", "34", KIT],
+        tempo: 180,
+        timeSignature: "4/4",
+    },
+    heavyMetal: {
+        prompt: "heavy metal — built on ONE palm-muted galloping low riff, repeated bar after bar through a section rather than rewritten each bar; minor and modal, double-kick drive underneath, and long held high notes over the top. The riff is the song: keep it the same and let the drums and the held lead supply the variation. ONE riff means one FIGURE, not one note - the riff moves between several pitches (root, flat-7, flat-6 and back is the classic shape), and a bar of the same pitch struck eight times is a pedal, not a riff.",
+        instruments: ["30", "29", "34", KIT],
+        tempo: 152,
+        timeSignature: "4/4",
+        mode: "minor",
+    },
+    blues: {
+        formBars: 12,
+        prompt: "twelve-bar blues — shuffle feel, blue notes and bends, call-and-response between a voice-like melody and answering fills, dominant seventh chords",
+        instruments: ["27", "22", "33", KIT],
+        tempo: 88,
+        timeSignature: "4/4",
+    },
+    country: {
+        prompt: 'country — a two-beat "boom-chick" bass and guitar, bright major harmony, fiddle and steel fills answering the melody',
+        instruments: ["25", "110", "27", "32", KIT],
+        tempo: 118,
+        timeSignature: "4/4",
+    },
+    bluegrass: {
+        prompt: "bluegrass — fast acoustic picking, banjo rolls in constant eighths under a syncopated fiddle melody, driving upright bass on one and three",
+        instruments: ["105", "110", "25", "32"],
+        tempo: 160,
+        timeSignature: "4/4",
+    },
+    funk: {
+        prompt: "funk — heavily syncopated sixteenth-note groove, everything locked to a hard downbeat on the one, staccato stabs and plenty of rests",
+        instruments: ["36", "28", "61", "4", KIT],
+        tempo: 104,
+        timeSignature: "4/4",
+    },
+    soul: {
+        prompt: "soul — a laid-back backbeat sitting slightly behind the beat, gospel-tinged chords, horn stabs answering a vocal-style melody",
+        instruments: ["16", "4", "33", "61", KIT],
+        tempo: 96,
+        timeSignature: "4/4",
+    },
+    ragtime: {
+        formBars: 16,
+        prompt: "ragtime — a syncopated right-hand melody against a steady striding left-hand bass in two, cheerful and precise",
+        instruments: ["0"],
+        tempo: 96,
+        timeSignature: "2/4",
+    },
+    swing: {
+        prompt: "big-band swing — swung eighth notes, brass and reed sections trading riffs, walking bass, ride-cymbal pulse with accents on two and four",
+        instruments: ["56", "66", "57", "0", "32", KIT],
+        tempo: 168,
+        timeSignature: "4/4",
+    },
+    bossaNova: {
+        prompt: "bossa nova — a gentle syncopated guitar pattern, soft brushed drums, a lyrical melody sitting behind the beat, rich seventh and ninth chords",
+        instruments: ["24", "0", "32", KIT],
+        tempo: 132,
+        timeSignature: "4/4",
+    },
+    samba: {
+        prompt: "samba — fast two-beat percussion-driven groove, heavy syncopation on the offbeats, surdo pulse landing on beat two",
+        instruments: ["24", "61", "32", KIT],
+        tempo: 100,
+        timeSignature: "2/4",
+    },
+    salsa: {
+        prompt: "salsa — clave-driven, a montuno piano ostinato, syncopated brass hits, busy percussion, bass playing the tumbao rather than the downbeat",
+        instruments: ["0", "56", "57", "32", KIT],
+        tempo: 190,
+        timeSignature: "4/4",
+    },
+    tango: {
+        prompt: "tango — sharp dotted rhythms and dramatic accents, minor key, sudden stops and rubato pulls against a strict pulse",
+        instruments: ["23", "40", "0", "43"],
+        tempo: 120,
+        timeSignature: "4/4",
+        mode: "minor",
+    },
+    reggae: {
+        prompt: "reggae — one-drop: the kick lands on beat three, not one; guitar and organ chop the offbeat eighths; bass plays a heavy melodic line, low and sparse",
+        instruments: ["28", "18", "33", KIT],
+        tempo: 78,
+        timeSignature: "4/4",
+    },
+    hipHop: {
+        prompt: "hip-hop — a hard boom-bap drum pattern with swung sixteenths, a deep sustained sub bass, sparse looping keys, and space left for a vocal",
+        instruments: ["39", "4", "48", KIT],
+        tempo: 90,
+        timeSignature: "4/4",
+        mode: "minor",
+    },
+    trap: {
+        prompt: "trap — half-time: the snare lands on beat three alone, an 808 sub bass slides between long tuned notes, and hi-hats roll in fast subdivisions over large gaps",
+        instruments: ["38", "11", "89", KIT],
+        tempo: 140,
+        timeSignature: "4/4",
+        mode: "minor",
+    },
+    lofi: {
+        prompt: "lo-fi hip-hop — slow swung drums slightly off the grid, warm jazzy minor seventh chords, a sparse melody, unhurried and repetitive",
+        instruments: ["4", "33", "89", KIT],
+        tempo: 74,
+        timeSignature: "4/4",
+        mode: "minor",
+    },
+    house: {
+        prompt: "house — four-on-the-floor kick, offbeat open hats, a repetitive synth riff, and a bassline locked to the eighths between the kicks",
+        instruments: ["81", "38", "89", KIT],
+        tempo: 126,
+        timeSignature: "4/4",
+    },
+    techno: {
+        prompt: "techno — machine-like and loop-based: four-on-the-floor kick, sixteenth-note hats, one short synth-bass cell repeated, and timbre rather than chord changes carrying the track",
+        instruments: ["38", "81", "89", KIT],
+        tempo: 132,
+        timeSignature: "4/4",
+        mode: "minor",
+    },
+    trance: {
+        prompt: "trance — four-on-the-floor with an offbeat synth bass after every kick, supersaw arpeggios, and long builds and releases in sixteen-bar blocks",
+        instruments: ["81", "38", "89", KIT],
+        tempo: 138,
+        timeSignature: "4/4",
+        mode: "minor",
+    },
+    edm: {
+        prompt: "edm — electronic dance built on a clear build, drop and breakdown in eight-bar blocks, four-on-the-floor underneath and a big repeated lead hook through the drop",
+        instruments: ["81", "38", "89", KIT],
+        tempo: 128,
+        timeSignature: "4/4",
+        mode: "minor",
+    },
+    electroSwing: {
+        prompt: "electro swing — vintage swing horns over a modern four-on-the-floor electronic beat, minor and bluesy in a gypsy-jazz vein; hard-swung eighths, syncopated and playful, with clarinet and trumpet riffs answering each other",
+        instruments: ["56", "71", "38", KIT],
+        tempo: 122,
+        timeSignature: "4/4",
+        mode: "minor",
+    },
+    disco: {
+        prompt: "disco — four-on-the-floor kick, offbeat hi-hats, an octave-jumping bassline, and string and guitar figures on the sixteenths",
+        instruments: ["48", "28", "33", KIT],
+        tempo: 120,
+        timeSignature: "4/4",
+    },
+    classical: {
+        prompt: "classical — balanced four-bar phrases answering each other, an Alberti or broken-chord accompaniment under a clear diatonic melody, and a cadence every four or eight bars",
+        instruments: ["0", "40", "42"],
+        tempo: 108,
+        timeSignature: "4/4",
+    },
+    baroque: {
+        prompt: "baroque — a steady walking bass, contrapuntal interweaving voices, sequences and ornamented melodic lines, terraced dynamics",
+        instruments: ["6", "40", "42"],
+        tempo: 100,
+        timeSignature: "4/4",
+    },
+    march: {
+        prompt: "march — a firm two-beat pulse, dotted fanfare rhythms, a brass melody over a low oom-pah, crisp snare figures",
+        instruments: ["56", "57", "58", KIT],
+        tempo: 116,
+        timeSignature: "2/4",
+    },
+};
+/**
+ * The styles, each with the bars its own tempo and meter need for a song.
+ */
+export const GENERATE_SCORE_STYLE_PRESETS = Object.fromEntries(Object.entries(STYLE_PRESET_SOURCE).map(([style, preset]) => [
+    style,
+    {
+        ...preset,
+        measures: measuresForSeconds(preset.seconds ?? SONG_SECONDS.typical, preset.tempo, beatsPerBarOf(preset.timeSignature), preset.formBars),
+    },
+]));
+/** Beats in a bar, from a picker value like "6/8". */
+function beatsPerBarOf(timeSignature) {
+    const [numerator] = timeSignature.split("/");
+    const beats = Number(numerator);
+    return Number.isFinite(beats) && beats > 0 ? beats : 4;
+}
+//# sourceMappingURL=style-presets.js.map

package/dist/domain/generation/style-presets.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"style-presets.js","sourceRoot":"","sources":["../../../src/domain/generation/style-presets.ts"],"names":[],"mappings":"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"}

package/dist/domain/instruments/arrangement-order.d.ts

@@ -5,6 +5,23 @@ export type RankableTrack = {
     midiProgram: number;
     clef?: string | undefined;
 };
+/**
+ * The three General MIDI programs that are a human voice.
+ *
+ * GM files them under `ensemble`, beside String Ensemble and Orchestra Hit --
+ * which is a fair description of Choir Aahs used as a wash, and the wrong one
+ * for the part carrying the song. Named here rather than moved to another
+ * family because the family is GM's and is right about everything else in it.
+ *
+ * Exported because the instrument picker offers these three as a group of
+ * their own, and a picker that restated the numbers would be a second list to
+ * keep in step with this one.
+ *
+ * `Pad 4 (choir)` (91) is deliberately absent: it says pad in its name and is
+ * one. `Lead 6 (voice)` (85) is absent too, already reaching `lead` through
+ * `synth-lead`.
+ */
+export declare const VOICE_PROGRAMS: ReadonlySet<number>;
 /** Whether this program is a sung part rather than an instrument. */
 export declare function isVocalProgram(midiProgram: number): boolean;
 /**

package/dist/domain/instruments/arrangement-order.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arrangement-order.d.ts","sourceRoot":"","sources":["../../../src/domain/instruments/arrangement-order.ts"],"names":[],"mappings":"AA2BA,oFAAoF;AACpF,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;AAEpE,qFAAqF;AACrF,MAAM,MAAM,aAAa,GAAG;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC;AAiCF,qEAAqE;AACrE,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAE3D;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,aAAa,GAAG,eAAe,CAO5D;AAqDD,gDAAgD;AAChD,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,SAAS,eAAe,EAAE,CAO5B;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,SAAS,aAAa,EAAE,EAChC,KAAK,CAAC,EAAE,MAAM,GACb,MAAM,EAAE,CAwBV"}
+{"version":3,"file":"arrangement-order.d.ts","sourceRoot":"","sources":["../../../src/domain/instruments/arrangement-order.ts"],"names":[],"mappings":"AA2BA,oFAAoF;AACpF,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;AAEpE,qFAAqF;AACrF,MAAM,MAAM,aAAa,GAAG;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B,CAAC;AAeF;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,cAAc,EAAE,WAAW,CAAC,MAAM,CAI7C,CAAC;AAEH,qEAAqE;AACrE,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAE3D;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,aAAa,GAAG,eAAe,CAO5D;AAqDD,gDAAgD;AAChD,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,SAAS,eAAe,EAAE,CAO5B;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,SAAS,aAAa,EAAE,EAChC,KAAK,CAAC,EAAE,MAAM,GACb,MAAM,EAAE,CAoCV"}

package/dist/domain/instruments/arrangement-order.js

@@ -43,11 +43,15 @@ const HARMONY_FAMILIES = new Set([
  * for the part carrying the song. Named here rather than moved to another
  * family because the family is GM's and is right about everything else in it.
  *
+ * Exported because the instrument picker offers these three as a group of
+ * their own, and a picker that restated the numbers would be a second list to
+ * keep in step with this one.
+ *
  * `Pad 4 (choir)` (91) is deliberately absent: it says pad in its name and is
  * one. `Lead 6 (voice)` (85) is absent too, already reaching `lead` through
  * `synth-lead`.
  */
-const VOICE_PROGRAMS = new Set([
+export const VOICE_PROGRAMS = new Set([
     52, // Choir Aahs
     53, // Voice Oohs
     54, // Synth Voice
@@ -101,9 +105,9 @@ const DEFAULT_ORDER = [
  *
  * In reggae the bassline *is* the tune — the "riddim" is named and reused
  * across songs while melodies come and go — and the same is true of funk, hip
- * hop, house and disco, where the groove is the material and the melody
- * decorates it. Writing a melody first in those styles produces a bass that is
- * following a tune instead of stating the hook.
+ * hop, trap, house, techno, trance, EDM and disco, where the groove is the
+ * material and the melody decorates it. Writing a melody first in those styles
+ * produces a bass that is following a tune instead of stating the hook.
  */
 const GROOVE_FIRST = [
     "bass",
@@ -111,7 +115,7 @@ const GROOVE_FIRST = [
     "harmony",
     "lead",
 ];
-const GROOVE_LED = /\b(reggae|ska|dub|funk|disco|house|hip hop|hip-hop|lofi|lo-fi|soul|samba|salsa|bossa|tango|afrobeat)\b/i;
+const GROOVE_LED = /\b(reggae|ska|dub|funk|disco|house|techno|trance|edm|electronic dance|hip hop|hip-hop|trap|lofi|lo-fi|soul|samba|salsa|bossa|tango|afrobeat)\b/i;
 /**
  * Genres built on a riff, where the riff is a lead part and goes first anyway —
  * but the kit is promoted above the harmony, because in these styles the drums
@@ -153,7 +157,7 @@ export function rankTracksForGeneration(tracks, style) {
         return index === -1 ? order.length : index;
     };
     /*
-      Among leads, the singer goes first.
+      The singer goes first, ahead of the role order rather than inside it.
   
       Two parts can both be leads — a vocal and a guitar — and then role alone
       leaves the order to however the roster happened to be typed. In a song the
@@ -161,11 +165,23 @@ export function rankTracksForGeneration(tracks, style) {
       behind them are written to fit. Ranked by index instead, a guitar listed
       first got composed with no melody to sit under, and the singer then had to
       bend around it.
+  
+      This outranks the genre order, and that is the correction rather than an
+      oversight. `GROOVE_FIRST` writes the lead LAST — in reggae the bassline is
+      the material and the melody decorates it, which is true of an instrumental
+      and inverts the moment somebody is singing over it. In those eleven genres
+      every backing part was composed before the voice existed, so the rule that
+      tells a part to accompany the singer (`vocalSupportRule` in music_api) had
+      no singer to point at and never fired: the arrangement was finished and the
+      vocal was bent to fit it, which is exactly backwards.
+  
+      A percussion track is never promoted, whatever its program addresses: on
+      the drum channel program 53 is a kit, not a voice.
     */
     const voiceFirst = (track) => isVocalProgram(track.midiProgram) && track.clef !== "percussion" ? 0 : 1;
     return tracks
         .map((track, index) => ({ index, rank: rankOf(track), voice: voiceFirst(track) }))
-        .sort((a, b) => a.rank - b.rank || a.voice - b.voice || a.index - b.index)
+        .sort((a, b) => a.voice - b.voice || a.rank - b.rank || a.index - b.index)
         .map((entry) => entry.index);
 }
 //# sourceMappingURL=arrangement-order.js.map

package/dist/domain/instruments/arrangement-order.js.map

@@ -1 +1 @@
-{"version":3,"file":"arrangement-order.js","sourceRoot":"","sources":["../../../src/domain/instruments/arrangement-order.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"arrangement-order.js","sourceRoot":"","sources":["../../../src/domain/instruments/arrangement-order.ts"],"names":[],"mappings":"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"}

package/dist/domain/instruments/instrument-options.d.ts

@@ -33,6 +33,15 @@ export type InstrumentOption = {
 };
 /** The default selection: Piano, which is also the melody-carrying lead. */
 export declare const DEFAULT_INSTRUMENT_VALUE = "0";
+/**
+ * The voice a song is carried by, when one is added for the reader.
+ *
+ * `Voice Oohs` rather than `Choir Aahs`: a lead vocal is one person, and the
+ * choir patch is what a *backing* line sounds like. This is the only place the
+ * distinction between the three voice programs is stated — everywhere else
+ * they are simply "a voice" — so it is stated once, here.
+ */
+export declare const DEFAULT_VOCAL_INSTRUMENT_VALUE = "53";
 /**
  * The `KIT_OPTIONS` value for a program.
  *
@@ -42,6 +51,29 @@ export declare const DEFAULT_INSTRUMENT_VALUE = "0";
 export declare function kitOptionValue(program: number): string;
 /** The eight GM drum kits, for a percussion track. */
 export declare const KIT_OPTIONS: InstrumentOption[];
+/**
+ * The three programs that are a human voice, as a group of their own.
+ *
+ * GM files them under `ensemble`, between String Ensemble and Orchestra Hit,
+ * which is where nobody setting out to write a song looks for a singer — so in
+ * practice a generated score never had one. The group is *derived* from the set
+ * the arranger reads (`VOICE_PROGRAMS`) rather than restating three numbers,
+ * because a picker offering a voice the arranger does not recognise as one is
+ * exactly the drift that costs a vocal-led arrangement.
+ *
+ * The default lead goes first and the rest follow in catalogue order: the first
+ * entry of a group is the one a reader takes as its ordinary answer, and here
+ * that answer is the solo voice.
+ */
+export declare const VOICE_OPTIONS: InstrumentOption[];
+/**
+ * Whether a picker value is a sung part.
+ *
+ * Through the value rather than the program, because `kit:52` addresses a drum
+ * kit and a bare number check would read it as a choir — the same confusion
+ * `KIT_PREFIX` exists to prevent everywhere else.
+ */
+export declare function isVocalInstrumentValue(value: string): boolean;
 /**
  * Every melodic program, grouped by GM family.
  *
@@ -50,10 +82,19 @@ export declare const KIT_OPTIONS: InstrumentOption[];
  */
 export declare const INSTRUMENT_OPTIONS: InstrumentOption[];
 /** The same catalogue as nested groups, for a picker that draws its own headings. */
+/**
+ * The same catalogue as nested groups, for a picker that draws its own headings.
+ *
+ * **The voices are not in it**: they are offered as `VOICE_OPTIONS` above, and
+ * a program appearing in two groups of one menu is an entry whose selection is
+ * ambiguous — the control shows whichever heading it matched first and the
+ * reader cannot tell the two apart. `INSTRUMENT_OPTIONS` keeps all 128, because
+ * that one is the catalogue rather than a menu.
+ */
 export declare const FAMILY_GROUPS: {
     key: "bass" | "pipe" | "piano" | "chromatic-percussion" | "organ" | "guitar" | "strings" | "ensemble" | "brass" | "reed" | "synth-lead" | "synth-pad" | "synth-effects" | "ethnic" | "percussive" | "sound-effects";
     label: string;
-    instruments: readonly import("./gm.js").GmInstrument[];
+    instruments: import("./gm.js").GmInstrument[];
 }[];
 /** Turns a picker value — from either list — back into track fields. */
 export declare function instrumentChoiceFor(value: string): InstrumentChoice;

package/dist/domain/instruments/instrument-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instrument-options.d.ts","sourceRoot":"","sources":["../../../src/domain/instruments/instrument-options.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAS3C,+EAA+E;AAC/E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,IAAI,CAAC;CACZ,CAAC;AAEF,yFAAyF;AACzF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAIF,4EAA4E;AAC5E,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAE5C;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,sDAAsD;AACtD,eAAO,MAAM,WAAW,EAAE,gBAAgB,EAGvC,CAAC;AAEJ;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,EAAE,gBAAgB,EAOhD,CAAC;AAEF,qFAAqF;AACrF,eAAO,MAAM,aAAa;;;;GAIvB,CAAC;AAYJ,wEAAwE;AACxE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAiBnE;AAED,6CAA6C;AAC7C,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAExD"}
+{"version":3,"file":"instrument-options.d.ts","sourceRoot":"","sources":["../../../src/domain/instruments/instrument-options.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAU3C,+EAA+E;AAC/E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,IAAI,CAAC;CACZ,CAAC;AAEF,yFAAyF;AACzF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAIF,4EAA4E;AAC5E,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAE5C;;;;;;;GAOG;AACH,eAAO,MAAM,8BAA8B,OAAO,CAAC;AAEnD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,sDAAsD;AACtD,eAAO,MAAM,WAAW,EAAE,gBAAgB,EAGvC,CAAC;AAEJ;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,aAAa,EAAE,gBAAgB,EAQzC,CAAC;AAEJ;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAG7D;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,EAAE,gBAAgB,EAOhD,CAAC;AAEF,qFAAqF;AACrF;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa;;;;GAMyB,CAAC;AAYpD,wEAAwE;AACxE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAiBnE;AAED,6CAA6C;AAC7C,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAExD"}

package/dist/domain/instruments/instrument-options.js

@@ -1,8 +1,18 @@
 import { GM_FAMILIES, GM_FAMILY_LABELS, gmInstrument, gmInstrumentsByFamily, } from "./gm.js";
 import { GM_KITS, gmKit, gmKitAt } from "./gm-kit.js";
+import { VOICE_PROGRAMS, isVocalProgram } from "./arrangement-order.js";
 const KIT_PREFIX = "kit:";
 /** The default selection: Piano, which is also the melody-carrying lead. */
 export const DEFAULT_INSTRUMENT_VALUE = "0";
+/**
+ * The voice a song is carried by, when one is added for the reader.
+ *
+ * `Voice Oohs` rather than `Choir Aahs`: a lead vocal is one person, and the
+ * choir patch is what a *backing* line sounds like. This is the only place the
+ * distinction between the three voice programs is stated — everywhere else
+ * they are simply "a voice" — so it is stated once, here.
+ */
+export const DEFAULT_VOCAL_INSTRUMENT_VALUE = "53";
 /**
  * The `KIT_OPTIONS` value for a program.
  *
@@ -17,6 +27,39 @@ export const KIT_OPTIONS = GM_KITS.map((kit) => ({
     value: `${KIT_PREFIX}${kit.program}`,
     label: kit.name,
 }));
+/**
+ * The three programs that are a human voice, as a group of their own.
+ *
+ * GM files them under `ensemble`, between String Ensemble and Orchestra Hit,
+ * which is where nobody setting out to write a song looks for a singer — so in
+ * practice a generated score never had one. The group is *derived* from the set
+ * the arranger reads (`VOICE_PROGRAMS`) rather than restating three numbers,
+ * because a picker offering a voice the arranger does not recognise as one is
+ * exactly the drift that costs a vocal-led arrangement.
+ *
+ * The default lead goes first and the rest follow in catalogue order: the first
+ * entry of a group is the one a reader takes as its ordinary answer, and here
+ * that answer is the solo voice.
+ */
+export const VOICE_OPTIONS = [
+    Number(DEFAULT_VOCAL_INSTRUMENT_VALUE),
+    ...[...VOICE_PROGRAMS].filter((program) => program !== Number(DEFAULT_VOCAL_INSTRUMENT_VALUE)),
+].map((program) => ({
+    value: String(program),
+    label: gmInstrument(program)?.name ?? "Voice",
+}));
+/**
+ * Whether a picker value is a sung part.
+ *
+ * Through the value rather than the program, because `kit:52` addresses a drum
+ * kit and a bare number check would read it as a choir — the same confusion
+ * `KIT_PREFIX` exists to prevent everywhere else.
+ */
+export function isVocalInstrumentValue(value) {
+    if (value.startsWith(KIT_PREFIX))
+        return false;
+    return isVocalProgram(Number(value));
+}
 /**
  * Every melodic program, grouped by GM family.
  *
@@ -29,11 +72,20 @@ export const INSTRUMENT_OPTIONS = GM_FAMILIES.flatMap((family) => gmInstrumentsB
     group: GM_FAMILY_LABELS[family],
 })));
 /** The same catalogue as nested groups, for a picker that draws its own headings. */
+/**
+ * The same catalogue as nested groups, for a picker that draws its own headings.
+ *
+ * **The voices are not in it**: they are offered as `VOICE_OPTIONS` above, and
+ * a program appearing in two groups of one menu is an entry whose selection is
+ * ambiguous — the control shows whichever heading it matched first and the
+ * reader cannot tell the two apart. `INSTRUMENT_OPTIONS` keeps all 128, because
+ * that one is the catalogue rather than a menu.
+ */
 export const FAMILY_GROUPS = GM_FAMILIES.map((family) => ({
     key: family,
     label: GM_FAMILY_LABELS[family],
-    instruments: gmInstrumentsByFamily(family),
-}));
+    instruments: gmInstrumentsByFamily(family).filter((instrument) => !isVocalProgram(instrument.program)),
+})).filter((group) => group.instruments.length > 0);
 /**
  * The clef a melodic program is written on.
  *

package/dist/domain/instruments/instrument-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrument-options.js","sourceRoot":"","sources":["../../../src/domain/instruments/instrument-options.ts"],"names":[],"mappings":"AAqBA,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,YAAY,EACZ,qBAAqB,GACtB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAgBtD,MAAM,UAAU,GAAG,MAAM,CAAC;AAE1B,4EAA4E;AAC5E,MAAM,CAAC,MAAM,wBAAwB,GAAG,GAAG,CAAC;AAE5C;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,OAAe;IAC5C,OAAO,GAAG,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;AACpD,CAAC;AAED,sDAAsD;AACtD,MAAM,CAAC,MAAM,WAAW,GAAuB,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACnE,KAAK,EAAE,GAAG,UAAU,GAAG,GAAG,CAAC,OAAO,EAAE;IACpC,KAAK,EAAE,GAAG,CAAC,IAAI;CAChB,CAAC,CAAC,CAAC;AAEJ;;;;;GAKG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAuB,WAAW,CAAC,OAAO,CACvE,CAAC,MAAM,EAAE,EAAE,CACT,qBAAqB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACjD,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC;IACjC,KAAK,EAAE,UAAU,CAAC,IAAI;IACtB,KAAK,EAAE,gBAAgB,CAAC,MAAM,CAAC;CAChC,CAAC,CAAC,CACN,CAAC;AAEF,qFAAqF;AACrF,MAAM,CAAC,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACxD,GAAG,EAAE,MAAM;IACX,KAAK,EAAE,gBAAgB,CAAC,MAAM,CAAC;IAC/B,WAAW,EAAE,qBAAqB,CAAC,MAAM,CAAC;CAC3C,CAAC,CAAC,CAAC;AAEJ;;;;;GAKG;AACH,SAAS,cAAc,CAAC,OAAe;IACrC,OAAO,OAAO,IAAI,EAAE,IAAI,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC5D,CAAC;AAED,wEAAwE;AACxE,MAAM,UAAU,mBAAmB,CAAC,KAAa;IAC/C,IAAI,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QACjC,2EAA2E;QAC3E,6DAA6D;QAC7D,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;QACxE,OAAO;YACL,WAAW,EAAE,GAAG,CAAC,OAAO;YACxB,cAAc,EAAE,GAAG,CAAC,IAAI;YACxB,IAAI,EAAE,YAAY;SACnB,CAAC;IACJ,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,OAAO;QACL,WAAW,EAAE,OAAO;QACpB,cAAc,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE,IAAI,IAAI,OAAO;QACtD,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC;KAC9B,CAAC;AACJ,CAAC;AAED,6CAA6C;AAC7C,MAAM,UAAU,kBAAkB,CAAC,KAAa;IAC9C,OAAO,mBAAmB,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC;AACnD,CAAC"}
+{"version":3,"file":"instrument-options.js","sourceRoot":"","sources":["../../../src/domain/instruments/instrument-options.ts"],"names":[],"mappings":"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"}

package/dist/domain/notation/notation-icon-art.d.ts

@@ -19,8 +19,8 @@
 /** Every glyph is authored in a 24×24 box. */
 export declare const NOTATION_ICON_VIEWBOX = 24;
 /** A stroke cap/join, spelled as SVG spells it. */
-export type NotationLineCap = "butt" | "round" | "square";
-export type NotationLineJoin = "miter" | "round" | "bevel";
+export type NotationLineCap = 'butt' | 'round' | 'square';
+export type NotationLineJoin = 'miter' | 'round' | 'bevel';
 type Paint = {
     readonly fill?: string;
     readonly stroke?: string;
@@ -32,29 +32,29 @@ type Paint = {
     readonly transform?: string;
 };
 export type NotationIconShape = (Paint & {
-    readonly kind: "path";
+    readonly kind: 'path';
     readonly d: string;
-    readonly fillRule?: "evenodd" | "nonzero";
+    readonly fillRule?: 'evenodd' | 'nonzero';
 }) | (Paint & {
-    readonly kind: "rect";
+    readonly kind: 'rect';
     readonly x: number;
     readonly y: number;
     readonly width: number;
     readonly height: number;
     readonly rx?: number;
 }) | (Paint & {
-    readonly kind: "ellipse";
+    readonly kind: 'ellipse';
     readonly cx: number;
     readonly cy: number;
     readonly rx: number;
     readonly ry: number;
 }) | (Paint & {
-    readonly kind: "circle";
+    readonly kind: 'circle';
     readonly cx: number;
     readonly cy: number;
     readonly r: number;
 }) | (Paint & {
-    readonly kind: "text";
+    readonly kind: 'text';
     readonly x: number;
     readonly y: number;
     readonly content: string;
@@ -62,7 +62,7 @@ export type NotationIconShape = (Paint & {
     readonly fontStyle?: string;
     readonly textAnchor?: string;
 }) | (Paint & {
-    readonly kind: "group";
+    readonly kind: 'group';
     readonly shapes: readonly NotationIconShape[];
 });
 /**
@@ -71,7 +71,7 @@ export type NotationIconShape = (Paint & {
  * A union has no runtime form, so anything that must *validate* a name would
  * otherwise write the list out again.
  */
-export declare const NOTATION_ICON_NAMES: readonly ["AddMeasureIcon", "ArpeggioIcon", "ArticulationIcon", "BeamBreakIcon", "BeamNoneIcon", "ChordIcon", "ContinuousLayoutIcon", "CrescendoIcon", "DeleteMeasureIcon", "DiminuendoIcon", "DottedIcon", "DoubleFlatIcon", "DoubleSharpIcon", "EighthNoteIcon", "FermataIcon", "FlatIcon", "GoToStartIcon", "HalfNoteIcon", "InsertModeIcon", "InsertNoteIcon", "InsertRestIcon", "MetronomeIcon", "NaturalIcon", "NextMeasureIcon", "OrnamentIcon", "PageLayoutIcon", "PreviousMeasureIcon", "QuantizeIcon", "QuarterNoteIcon", "ReplaceModeIcon", "SelectAllIcon", "SharpIcon", "SixteenthNoteIcon", "SlurIcon", "SoloIcon", "SunMoonIcon", "ThirtySecondNoteIcon", "TieIcon", "TripletIcon", "WholeNoteIcon"];
+export declare const NOTATION_ICON_NAMES: readonly ["AddMeasureIcon", "ArpeggioIcon", "ArticulationIcon", "BeamBreakIcon", "BeamNoneIcon", "ChordIcon", "ContinuousLayoutIcon", "CrescendoIcon", "DeleteMeasureIcon", "DiminuendoIcon", "DottedIcon", "DoubleFlatIcon", "DoubleSharpIcon", "EighthNoteIcon", "FermataIcon", "FlatIcon", "GoToStartIcon", "HalfNoteIcon", "InsertModeIcon", "InsertNoteIcon", "InsertRestIcon", "MetronomeIcon", "NaturalIcon", "NextMeasureIcon", "OrnamentIcon", "PageLayoutIcon", "PianoKeysIcon", "PreviousMeasureIcon", "QuantizeIcon", "QuarterNoteIcon", "ReplaceModeIcon", "SelectAllIcon", "SharpIcon", "SixteenthNoteIcon", "SlurIcon", "SoloIcon", "SunMoonIcon", "ThirtySecondNoteIcon", "TieIcon", "TripletIcon", "WholeNoteIcon"];
 export type NotationIconName = (typeof NOTATION_ICON_NAMES)[number];
 /**
  * A record, never a parallel array: adding a name above fails to compile until