linked-rolls 0.64.0 → 0.66.0

package/lib/systems/welte.js

@@ -1,10 +1,26 @@
-import { clamp, geometryInMm, Grid, levelChanges, mezzoforteTravel, paperSeconds, ROWS_PER_MM, travelBetweenRails, } from "welte-mignon-emulator";
+import { clamp, geometryInMm, Grid, levelChanges, mezzoforteTravel, paperSeconds, pedalBrushing, pedalDefaults, ROWS_PER_MM, travelBetweenRails, } from "welte-mignon-emulator";
 import { inCentimeters, mm, seconds } from "../model/Quantity.js";
 import { partitionPoint } from "../shared/sorted.js";
 import { velocityOf } from "./velocity.js";
 /** Whether two sets of constants are the same, value for value. */
 export const sameParameters = (a, b) => Object.keys(a).length === Object.keys(b).length
     && Object.entries(a).every(([name, value]) => b[name] === value);
+/**
+ * The two readings of the pedal mechanism the emulator offers, by name,
+ * which the systems share: Hagmann has the valves and bellows that carry
+ * out the movements "in beiden Systemen dieselbe" (p. 106), and only the
+ * Vorpneumatik differs. Under `damping` the dampers reach the strings
+ * within the shortest lift the rolls punch, so every lift damps. Under
+ * `brushing` their fall is slowed until the quick runs of latch changes
+ * in the SUPRA corpus dip without damping, at the price that lifts
+ * shorter than about 265 ms brush as well.
+ */
+export const pedalPresets = {
+    damping: pedalDefaults,
+    brushing: pedalBrushing
+};
+/** 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));
 /** Paper the grid runs on past the last hole, so that a final pedal release completes. */
 const RUN_OUT = mm(100);
 const isNote = (event) => event.type === 'note';
@@ -12,7 +28,8 @@ const isExpression = (event) => event.type === 'expression';
 const paperOf = (toOwnPaper) => ({
     rowOf: place => place * toOwnPaper * ROWS_PER_MM,
     placeOfRow: row => mm(row / (toOwnPaper * ROWS_PER_MM)),
-    paperOfRow: row => mm(row / ROWS_PER_MM)
+    paperOfRow: row => mm(row / ROWS_PER_MM),
+    paperOfPlace: place => mm(place * toOwnPaper)
 });
 /** When the spool brings a place on the roll to the tracker bar. */
 export const secondsAt = (spool, place) => seconds(paperSeconds(spool, inCentimeters(place)));
@@ -51,9 +68,10 @@ const performNotes = (events, grid, nuance, options, paper) => events
     .flatMap((note) => {
     const curve = nuance[halfOf(note, options.division)];
     const velocity = curve.velocity[grid.indexOfRow(paper.rowOf(note.horizontal.from))];
+    const at = (place) => secondsAt(options.spool, paper.paperOfPlace(place));
     return [
-        { type: 'noteOn', performs: note, pitch: note.pitch, velocity, at: secondsAt(options.spool, note.horizontal.from) },
-        { type: 'noteOff', performs: note, pitch: note.pitch, velocity: 127, at: secondsAt(options.spool, note.horizontal.to) }
+        { type: 'noteOn', performs: note, pitch: note.pitch, velocity, at: at(note.horizontal.from) },
+        { type: 'noteOff', performs: note, pitch: note.pitch, velocity: 127, at: at(note.horizontal.to) }
     ];
 });
 /**

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

@@ -3,7 +3,7 @@ import { Instrument, RollNumber } from "welte-mignon-emulator/t100";
 import { NegotiatedEvent, Performance, ReproducingSystem, RollProperties } from "../ReproducingSystem.js";
 import { type WelteOptions } from "../welte.js";
 export type { VelocityMap } from "../velocity.js";
-export { secondsAt } from "../welte.js";
+export { pedalPresetOf, pedalPresets, secondsAt, type PedalPreset } from "../welte.js";
 export type { Instrument } from "welte-mignon-emulator/t100";
 export type InstrumentName = 'consensus' | RollNumber;
 /**
@@ -19,21 +19,6 @@ export declare const instrumentNames: readonly InstrumentName[];
 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
- * the rolls punch, so every lift damps. Under `brushing` their fall is
- * slowed until the quick runs of latch changes in the SUPRA corpus dip
- * without damping, at the price that lifts shorter than about 265 ms brush
- * as well.
- */
-export declare const pedalPresets: {
-    damping: Readonly<Record<string, number>>;
-    brushing: Readonly<Record<string, number>>;
-};
-export type PedalPreset = keyof typeof pedalPresets;
-/** The preset a set of pedal constants is, if it is one. */
-export declare const pedalPresetOf: (pedals: Parameters) => PedalPreset | undefined;
 /** The T-100 takes the options every Welte system does; see `WelteOptions`. */
 export type WelteT100Options = WelteOptions;
 export declare const defaultWelteT100Options: WelteT100Options;

package/lib/systems/welteT100/system.js

@@ -1,10 +1,10 @@
-import { DEFAULT_PUNCH_MM, pedalBrushing, pedalDefaults, TRACKER_BORE_MM, WELTE_SPOOL, } from "welte-mignon-emulator";
+import { DEFAULT_PUNCH_MM, TRACKER_BORE_MM, WELTE_SPOOL, } from "welte-mignon-emulator";
 import { aperturePorts, CONSENSUS, pneumaticModel, PRESETS, runPedals, } from "welte-mignon-emulator/t100";
 import { welteT100 } from "./bar.js";
 import { mm, track } from "../../model/Quantity.js";
 import { defaultVelocityMap } from "../velocity.js";
-import { performWelte, sameParameters } from "../welte.js";
-export { secondsAt } from "../welte.js";
+import { pedalPresets, performWelte, sameParameters } from "../welte.js";
+export { pedalPresetOf, pedalPresets, secondsAt } from "../welte.js";
 /**
  * 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,
@@ -18,20 +18,6 @@ export const instrumentNames = ['consensus', ...Object.keys(PRESETS)];
 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
- * the rolls punch, so every lift damps. Under `brushing` their fall is
- * slowed until the quick runs of latch changes in the SUPRA corpus dip
- * without damping, at the price that lifts shorter than about 265 ms brush
- * as well.
- */
-export const pedalPresets = {
-    damping: pedalDefaults,
-    brushing: pedalBrushing
-};
-/** 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: nuanceOf(instruments.consensus),

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

@@ -4,7 +4,7 @@ import { ReproducingSystem } from "../ReproducingSystem.js";
 import { Millimeters } from "../../model/Quantity.js";
 import { type WelteOptions } from "../welte.js";
 export type { VelocityMap } from "../velocity.js";
-export { secondsAt } from "../welte.js";
+export { pedalPresetOf, pedalPresets, secondsAt, type PedalPreset } from "../welte.js";
 export type { WelteT98Instrument, WelteT98InstrumentName } from "welte-mignon-emulator/t98";
 /**
  * The instruments the emulator offers for the green Welte, in three groups that
@@ -44,17 +44,6 @@ export declare const instrumentNames: readonly WelteT98InstrumentName[];
 /** The instrument a pair of nuancing constants belongs to, if it is one. */
 export declare const instrumentNameOf: (nuance: Record<Half, Parameters>) => WelteT98InstrumentName | undefined;
 export { instrumentT98Of, labelOf, nuanceOf };
-/**
- * The two readings of the pedal mechanism, which is the T-100's below the
- * command: Hagmann has the valves and bellows that carry out the movements "in
- * beiden Systemen dieselbe" (p. 106), and only the Vorpneumatik differs.
- */
-export declare const pedalPresets: {
-    damping: Readonly<Record<string, number>>;
-    brushing: Readonly<Record<string, number>>;
-};
-export type PedalPreset = keyof typeof pedalPresets;
-export declare const pedalPresetOf: (pedals: Parameters) => PedalPreset | undefined;
 /**
  * The options every Welte system takes (see `WelteOptions`), with what the
  * T-98 adds. No source states a T-98 spool geometry, so the default keeps the

package/lib/systems/welteT98/system.js

@@ -1,10 +1,10 @@
-import { pedalBrushing, pedalDefaults, ROWS_PER_MM, WELTE_T98_SPOOL, } from "welte-mignon-emulator";
+import { ROWS_PER_MM, WELTE_T98_SPOOL, } from "welte-mignon-emulator";
 import { aperturePorts, CHAIN_GAP_MM, DERIVED, GENUINE, instrumentT98Of, labelOf, nuanceOf, PUNCH_T98_MM, pneumaticT98Model, rewindAt, runPedals, sforzandoPianoLift, STARTING_VALUES, TRACKER_BORE_T98_MM, } from "welte-mignon-emulator/t98";
 import { welteT98 } from "./bar.js";
 import { mm, seconds, track } from "../../model/Quantity.js";
 import { defaultVelocityMap } from "../velocity.js";
-import { performWelte, sameParameters } from "../welte.js";
-export { secondsAt } from "../welte.js";
+import { pedalPresets, performWelte, sameParameters } from "../welte.js";
+export { pedalPresetOf, pedalPresets, secondsAt } from "../welte.js";
 /**
  * The instruments the emulator offers for the green Welte, in three groups that
  * answer three different questions and must not be listed as one.
@@ -46,16 +46,6 @@ export const instrumentNameOf = (nuance) => instrumentNames.find(name => {
         && sameParameters(instrument.treble, nuance.treble);
 });
 export { instrumentT98Of, labelOf, nuanceOf };
-/**
- * The two readings of the pedal mechanism, which is the T-100's below the
- * command: Hagmann has the valves and bellows that carry out the movements "in
- * beiden Systemen dieselbe" (p. 106), and only the Vorpneumatik differs.
- */
-export const pedalPresets = {
-    damping: pedalDefaults,
-    brushing: pedalBrushing
-};
-export const pedalPresetOf = (pedals) => Object.keys(pedalPresets).find(name => sameParameters(pedalPresets[name], pedals));
 export const defaultWelteT98Options = {
     spool: WELTE_T98_SPOOL,
     nuance: nuanceOf(GENUINE.consensus),

package/package.json

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