linked-rolls 0.6.0 → 0.7.0

package/README.md

@@ -47,9 +47,11 @@ The first system is the red Welte, `linked-rolls/welte-t100`, built on
 [welte-t100-emulator](https://github.com/pfefferniels/welte-t100): the
 take-up spool sets the time axis, the Nuancierbälge fill through their
 conduits and are arrested by the Mezzoforte pin, and the two pedals travel
-rather than switch. The constants are those fitted against the hand-drawn
-nuance lines of roll 3309, with the terms that describe the drawing
-apparatus switched off. The pedals leave no drawn line, so their constants
+rather than switch. The nuancing constants come as `instruments`: the
+consensus fitted across the hand-drawn nuance lines of six rolls, which
+is the default, and the setting that drew each of those rolls, named by
+its Welte number, all with the terms that describe the drawing apparatus
+switched off. The pedals leave no drawn line, so their constants
 come as two readings, `pedalPresets.damping`, under which every lift the
 rolls punch damps, and `pedalPresets.brushing`, under which the quick runs
 of latch changes brush the strings without damping. What the emulator does

package/lib/systems/welteT100/system.d.ts

@@ -1,4 +1,4 @@
-import { Half, Parameters, PedalMode, Spool } from "welte-t100-emulator";
+import { Half, Instrument, Parameters, PedalMode, RollNumber, Spool } from "welte-t100-emulator";
 import { ReproducingSystem } from "../../ReproducingSystem";
 /**
  * MIDI velocity at the open rail of the Nuancierbalg, at the Mezzoforte pin,
@@ -12,6 +12,21 @@ export type VelocityMap = {
     mezzoforte: number;
     forte: number;
 };
+export type { Instrument } from "welte-t100-emulator";
+export type InstrumentName = 'consensus' | RollNumber;
+/**
+ * The instruments the emulator was fitted as: the consensus over the six
+ * rolls with drawn nuance lines, and the setting that drew each of them,
+ * named by the roll's Welte number. The provenance beside each says what
+ * it was fitted to and how well.
+ */
+export declare const instruments: Readonly<Record<InstrumentName, Instrument>>;
+/** The instruments by name, the consensus first. */
+export declare const instrumentNames: readonly InstrumentName[];
+/** The nuancing constants of an instrument, one set for each half of the keyboard. */
+export declare const nuanceOf: (instrument: Instrument) => Record<Half, Parameters>;
+/** The instrument a pair of nuancing constants belongs to, if it is one. */
+export declare const instrumentNameOf: (nuance: Record<Half, Parameters>) => InstrumentName | undefined;
 /**
  * The two readings of the pedal mechanism the emulator offers, by name.
  * Under `damping` the dampers reach the strings within the shortest lift
@@ -33,7 +48,7 @@ export type WelteT100Options = {
      * rate of revolution, so the paper runs faster as the spool fills.
      */
     spool: Spool;
-    /** Constants of the nuancing mechanism, one set for each half of the keyboard. */
+    /** Constants of the nuancing mechanism, one set for each half of the keyboard: `nuanceOf` an instrument, or a set of one's own. */
     nuance: Record<Half, Parameters>;
     /** Constants of the two pedal actions, one of `pedalPresets` or a set of one's own. */
     pedals: Parameters;
@@ -63,8 +78,8 @@ export declare const secondsAt: (spool: Spool, mm: number) => number;
  * The red Welte, as welte-t100-emulator models it: the take-up spool sets
  * the time axis, the Nuancierbälge fill through their conduits and are
  * arrested by the Mezzoforte pin, and the two pedals travel rather than
- * switch. The constants are those fitted against the hand-drawn nuance
- * lines of roll 3309, with the terms that describe the drawing apparatus
- * switched off.
+ * switch. The constants are the consensus fitted across the hand-drawn
+ * nuance lines of six rolls, with the terms that describe the drawing
+ * apparatus switched off; `instruments` offers each roll's own setting.
  */
 export declare const welteT100System: ReproducingSystem<WelteT100Options>;

package/lib/systems/welteT100/system.js

@@ -1,5 +1,20 @@
-import { aperturePorts, DEFAULT_PUNCH_MM, geometryInMm, Grid, levelChanges, mezzoforteTravel, paperSeconds, pedalBrushing, pedalDefaults, playbackParameters, pneumaticModel, ROWS_PER_MM, runPedals, TRACKER_BORE_MM, travelBetweenRails, WELTE_SPOOL, } from "welte-t100-emulator";
+import { aperturePorts, CONSENSUS, DEFAULT_PUNCH_MM, geometryInMm, Grid, levelChanges, mezzoforteTravel, paperSeconds, pedalBrushing, pedalDefaults, pneumaticModel, PRESETS, ROWS_PER_MM, runPedals, TRACKER_BORE_MM, travelBetweenRails, WELTE_SPOOL, } from "welte-t100-emulator";
 import { welteT100 } from "./bar";
+/**
+ * The instruments the emulator was fitted as: the consensus over the six
+ * rolls with drawn nuance lines, and the setting that drew each of them,
+ * named by the roll's Welte number. The provenance beside each says what
+ * it was fitted to and how well.
+ */
+export const instruments = { consensus: CONSENSUS, ...PRESETS };
+/** The instruments by name, the consensus first. */
+export const instrumentNames = ['consensus', ...Object.keys(PRESETS)];
+const sameParameters = (a, b) => Object.keys(a).length === Object.keys(b).length
+    && Object.entries(a).every(([name, value]) => b[name] === value);
+/** The nuancing constants of an instrument, one set for each half of the keyboard. */
+export const nuanceOf = (instrument) => ({ bass: instrument.bass, treble: instrument.treble });
+/** The instrument a pair of nuancing constants belongs to, if it is one. */
+export const instrumentNameOf = (nuance) => instrumentNames.find(name => sameParameters(instruments[name].bass, nuance.bass) && sameParameters(instruments[name].treble, nuance.treble));
 /**
  * The two readings of the pedal mechanism the emulator offers, by name.
  * Under `damping` the dampers reach the strings within the shortest lift
@@ -12,16 +27,11 @@ export const pedalPresets = {
     damping: pedalDefaults,
     brushing: pedalBrushing
 };
-const sameParameters = (a, b) => Object.keys(a).length === Object.keys(b).length
-    && Object.entries(a).every(([name, value]) => b[name] === value);
 /** The preset a set of pedal constants is, if it is one. */
 export const pedalPresetOf = (pedals) => Object.keys(pedalPresets).find(name => sameParameters(pedalPresets[name], pedals));
 export const defaultWelteT100Options = {
     spool: WELTE_SPOOL,
-    nuance: {
-        bass: playbackParameters('bass'),
-        treble: playbackParameters('treble')
-    },
+    nuance: nuanceOf(instruments.consensus),
     pedals: pedalPresets.damping,
     velocity: { piano: 35, mezzoforte: 60, forte: 90 },
     pedalMode: 'continuous',
@@ -188,9 +198,9 @@ const perform = (events, options, roll) => {
  * The red Welte, as welte-t100-emulator models it: the take-up spool sets
  * the time axis, the Nuancierbälge fill through their conduits and are
  * arrested by the Mezzoforte pin, and the two pedals travel rather than
- * switch. The constants are those fitted against the hand-drawn nuance
- * lines of roll 3309, with the terms that describe the drawing apparatus
- * switched off.
+ * switch. The constants are the consensus fitted across the hand-drawn
+ * nuance lines of six rolls, with the terms that describe the drawing
+ * apparatus switched off; `instruments` offers each roll's own setting.
  */
 export const welteT100System = {
     name: 'Welte-Mignon T100',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linked-rolls",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Digital editions of piano rolls: import, collation, editorial assumptions, JSON-LD export, and emulation through a reproducing system",
   "license": "MIT",
   "repository": {