linked-rolls 0.7.0 → 0.9.0

package/lib/systems/welteT100/system.js

@@ -1,5 +1,6 @@
 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";
+import { add, inCentimeters, mm, seconds, track } from "../../Quantity";
 /**
  * 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,
@@ -35,9 +36,9 @@ export const defaultWelteT100Options = {
     pedals: pedalPresets.damping,
     velocity: { piano: 35, mezzoforte: 60, forte: 90 },
     pedalMode: 'continuous',
-    trackerBore: TRACKER_BORE_MM,
-    punchDiameter: DEFAULT_PUNCH_MM,
-    division: 54
+    trackerBore: mm(TRACKER_BORE_MM),
+    punchDiameter: mm(DEFAULT_PUNCH_MM),
+    division: track(54)
 };
 /** What each expression code operates, in the emulator's terms. */
 const CODES = {
@@ -59,7 +60,7 @@ const CODES = {
 const isWelteT100ExpressionType = (type) => Object.hasOwn(CODES, type);
 const codeOf = (expressionType) => isWelteT100ExpressionType(expressionType) ? CODES[expressionType] : undefined;
 /** Paper the grid runs on past the last hole, so that a final pedal release completes. */
-const RUN_OUT_MM = 100;
+const RUN_OUT = mm(100);
 /**
  * Which stack of valves an expression perforation belongs to. The symbol
  * usually says so, having been read off the tracker bar already; where it
@@ -74,9 +75,11 @@ const scopeOf = (event) => {
 };
 const isNote = (event) => event.type === 'note';
 const isExpression = (event) => event.type === 'expression';
-const rowOf = (mm) => mm * ROWS_PER_MM;
-/** When the spool brings a place on the roll, in mm, to the tracker bar. */
-export const secondsAt = (spool, mm) => paperSeconds(spool, mm / 10);
+/** The row of the scan the constants were fitted on that a place on the roll falls in. */
+const rowOf = (place) => place * ROWS_PER_MM;
+const placeOfRow = (row) => mm(row / ROWS_PER_MM);
+/** When the spool brings a place on the roll to the tracker bar. */
+export const secondsAt = (spool, place) => seconds(paperSeconds(spool, inCentimeters(place)));
 const halfOf = (note, division) => note.vertical.from >= division ? 'treble' : 'bass';
 const readingOf = (event) => {
     const code = codeOf(event.expressionType);
@@ -108,10 +111,10 @@ const velocityOf = (travel, hook, map) => {
  * emulator expects.
  */
 const gridOver = (events, spool) => {
-    const lastMm = events.reduce((furthest, event) => Math.max(furthest, event.horizontal.to), 0);
-    const length = Math.ceil(rowOf(lastMm + RUN_OUT_MM)) + 1;
-    const seconds = Float64Array.from({ length }, (_, row) => secondsAt(spool, row / ROWS_PER_MM));
-    return new Grid(0, seconds);
+    const last = mm(events.reduce((furthest, event) => Math.max(furthest, event.horizontal.to), 0));
+    const length = Math.ceil(rowOf(add(last, RUN_OUT))) + 1;
+    const times = Float64Array.from({ length }, (_, row) => secondsAt(spool, placeOfRow(row)));
+    return new Grid(0, times);
 };
 const nuanceCurves = (grid, ports, samples, options) => {
     const curveOf = (half) => {
@@ -162,7 +165,7 @@ const performPedal = (type, curve, grid, readings, mode) => {
         type,
         performs: causeOf(grid.rowAt(change.index)),
         value: change.value,
-        at: curve.seconds[change.index]
+        at: seconds(curve.seconds[change.index])
     }));
 };
 /**
@@ -179,7 +182,7 @@ const perform = (events, options, roll) => {
     const geometry = geometryInMm(roll.punchDiameter ?? options.punchDiameter, options.trackerBore);
     const ports = aperturePorts(grid, readings.map(reading => reading.punch), geometry);
     const samples = {
-        place: Float64Array.from(grid.seconds, (_, row) => row / ROWS_PER_MM),
+        place: Float64Array.from(grid.seconds, (_, row) => placeOfRow(row)),
         seconds: grid.seconds
     };
     const nuance = nuanceCurves(grid, ports, samples, options);

package/package.json

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