linked-rolls 0.18.0 → 0.19.1

package/lib/TrackerBar.d.ts

@@ -83,6 +83,13 @@ export interface TrackerBarSpec {
     };
     /** Every position outside the note block, keyed by track. */
     expressions: ReadonlyMap<number, string>;
+    /**
+     * The position the rewind runs on, where the system gives it no
+     * valve of its own to be named after. The T-98 drives its rewind
+     * with a long perforation on the bass sforzando-piano position.
+     * Left out, it is the position typed `Rewind`.
+     */
+    rewindTrack?: number;
     /** The speed the system runs its rolls at, where the literature states one. */
     paperSpeed?: SpeedMeasure;
 }

package/lib/TrackerBar.js

@@ -28,8 +28,8 @@ export const describeTrackerBar = (spec) => {
             return undefined;
         return { type: 'expression', expressionType, scope: scopeOf(role) };
     };
-    const rewind = [...spec.expressions]
-        .find(([, type]) => type === 'Rewind')?.[0];
+    const rewind = spec.rewindTrack
+        ?? [...spec.expressions].find(([, type]) => type === 'Rewind')?.[0];
     if (rewind === undefined) {
         throw new Error(`${spec.name} declares no rewind track`);
     }

package/lib/alignment.d.ts

@@ -24,12 +24,18 @@ export interface AlignmentResult {
 }
 /**
  * Finds the shift and scale that carry the places of `rollA` onto those
- * of `rollB`, reading both through the bar. Runs of pitches that occur
- * once on each roll anchor a first line; then every note is paired with
- * its nearest counterpart of the same pitch and the line refitted, the
- * window closing each time. A copy cut for another paper speed, a scan
- * with a calibration pattern, and holes the other copy lacks are all
- * within reach of that. Nothing is found where the rolls share no run of
- * pitches, as between two different pieces.
+ * of `rollB`, reading each through its own bar. Runs of pitches that
+ * occur once on each roll anchor a first line; then every note is paired
+ * with its nearest counterpart of the same pitch and the line refitted,
+ * the window closing each time. A copy cut for another paper speed, a
+ * scan with a calibration pattern, and holes the other copy lacks are
+ * all within reach of that. Nothing is found where the rolls share no
+ * run of pitches, as between two different pieces.
+ *
+ * Two bars are what lets a copy cut for one system be aligned against a
+ * copy cut for another, a T-98 against a T-100: the bars put the note
+ * positions on different tracks, but they agree on the pitch each track
+ * sounds, and it is the pitches that are matched. Where a copy's holes
+ * have already been put onto the edition's bar, that bar reads it.
  */
-export declare function alignFeatures(rollA: readonly AnyFeature[], rollB: readonly AnyFeature[], bar?: TrackerBar): AlignmentResult | undefined;
+export declare function alignFeatures(rollA: readonly AnyFeature[], rollB: readonly AnyFeature[], barA?: TrackerBar, barB?: TrackerBar): AlignmentResult | undefined;

package/lib/alignment.js

@@ -159,17 +159,23 @@ const resultOf = ({ line, matches }) => {
 };
 /**
  * Finds the shift and scale that carry the places of `rollA` onto those
- * of `rollB`, reading both through the bar. Runs of pitches that occur
- * once on each roll anchor a first line; then every note is paired with
- * its nearest counterpart of the same pitch and the line refitted, the
- * window closing each time. A copy cut for another paper speed, a scan
- * with a calibration pattern, and holes the other copy lacks are all
- * within reach of that. Nothing is found where the rolls share no run of
- * pitches, as between two different pieces.
+ * of `rollB`, reading each through its own bar. Runs of pitches that
+ * occur once on each roll anchor a first line; then every note is paired
+ * with its nearest counterpart of the same pitch and the line refitted,
+ * the window closing each time. A copy cut for another paper speed, a
+ * scan with a calibration pattern, and holes the other copy lacks are
+ * all within reach of that. Nothing is found where the rolls share no
+ * run of pitches, as between two different pieces.
+ *
+ * Two bars are what lets a copy cut for one system be aligned against a
+ * copy cut for another, a T-98 against a T-100: the bars put the note
+ * positions on different tracks, but they agree on the pitch each track
+ * sounds, and it is the pitches that are matched. Where a copy's holes
+ * have already been put onto the edition's bar, that bar reads it.
  */
-export function alignFeatures(rollA, rollB, bar = welteT100) {
-    const a = noteOnsets(rollA, bar);
-    const b = noteOnsets(rollB, bar);
+export function alignFeatures(rollA, rollB, barA = welteT100, barB = barA) {
+    const a = noteOnsets(rollA, barA);
+    const b = noteOnsets(rollB, barB);
     const coarse = robustLine(anchors(a, b));
     if (!coarse)
         return undefined;

package/lib/index.d.ts

@@ -12,6 +12,7 @@ export * from './TrackCalibration';
 export * from './TrackerBar';
 export * from './systems/welteT100/bar';
 export * from './systems/welteLicensee/bar';
+export * from './systems/welteT98/bar';
 export * from './systems';
 export * from './ReproducingSystem';
 export * from './FeatureSource';

package/lib/index.js

@@ -12,6 +12,7 @@ export * from './TrackCalibration';
 export * from './TrackerBar';
 export * from './systems/welteT100/bar';
 export * from './systems/welteLicensee/bar';
+export * from './systems/welteT98/bar';
 export * from './systems';
 export * from './ReproducingSystem';
 export * from './FeatureSource';

package/lib/readers/stanfordAton.js

@@ -41,6 +41,33 @@ const rewindTrackIn = (holes) => {
     const trailing = holes.slice(lastMusical + 1).map(hole => +hole.TRACKER_HOLE);
     return mostFrequent(trailing);
 };
+/**
+ * The columns themselves, for a roll that punches its outermost
+ * positions. A hole can only sit on a position the bar reads, so
+ * columns spanning exactly as many positions as the bar has must run
+ * from its first to its last, and the lowest column is position one.
+ * Fewer columns leave the phase open and more mean something outside
+ * the bar was measured, and neither settles anything.
+ */
+const spannedShiftIn = (holes, bar) => {
+    const columns = holes.map(hole => +hole.TRACKER_HOLE).filter(Number.isFinite);
+    if (columns.length === 0)
+        return undefined;
+    const lowest = Math.min(...columns);
+    return Math.max(...columns) - lowest + 1 === bar.trackCount ? track(1 - lowest) : undefined;
+};
+/**
+ * How far the scanner's own hole numbering has to move to reach the
+ * bar. The rewind perforation is the usual landmark; where the roll
+ * carries punches past it, as Dyer's T-98 scans do, the span of the
+ * columns settles it instead.
+ */
+const calibrationShiftIn = (holes, bar) => {
+    const rewind = rewindTrackIn(holes);
+    if (rewind !== undefined)
+        return track(bar.rewindTrack - rewind);
+    return spannedShiftIn(holes, bar) ?? track(0);
+};
 /**
  * The phase of the tracker grid within the image. The analysis file
  * usually states it; where it does not, the holes themselves give it away,
@@ -92,9 +119,7 @@ export function readFromStanfordAton(atonString, { trackShift, bar = welteT100,
     const separation = readPx(json.ROLLINFO.HOLE_SEPARATION);
     const dpi = parseFloat(json.ROLLINFO.LENGTH_DPI);
     const measuredBy = measuredByOf(json.ROLLINFO);
-    const rewindTrack = rewindTrackIn(holes);
-    const shift = trackShift
-        ?? (rewindTrack === undefined ? track(0) : track(system.rewindTrack - rewindTrack));
+    const shift = trackShift ?? calibrationShiftIn(holes, system);
     const calibration = {
         unit: 'px',
         offset: gridOffsetOf(holes, separation, json.ROLLINFO.HOLE_OFFSET),

package/lib/systems/index.js

@@ -1,8 +1,9 @@
 import { systemIdOf } from "../TrackerBar";
 import { welteT100 } from "./welteT100/bar";
 import { welteLicensee } from "./welteLicensee/bar";
+import { welteT98 } from "./welteT98/bar";
 /** The tracker bars the library knows, the T-100 first as the usual one. */
-export const trackerBars = [welteT100, welteLicensee];
+export const trackerBars = [welteT100, welteLicensee, welteT98];
 /** The bar of a system the type vocabulary knows, from its concept. */
 export const trackerBarOf = (system) => {
     const id = systemIdOf(system);

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

@@ -0,0 +1,31 @@
+import { TrackerBar } from "../../TrackerBar";
+/**
+ * The commands of the Welte-Mignon T-98, as its tracker bar reads them.
+ *
+ * They are not the T-100's. Where the T-100 latches a function on with
+ * one perforation and cancels it with a second, the T-98 holds it for
+ * as long as one continuous perforation lasts (Hagmann, pp. 89 f. and
+ * 100–103; Phillips, p. 121), so none of these is an On or an Off. The
+ * two sforzando valves name the end of the range they pull towards.
+ */
+export declare const welteT98ExpressionTypes: readonly ['SforzandoPiano', 'SforzandoForte', 'Mezzoforte', 'Crescendo', 'SustainPedal', 'SoftPedal'];
+export type WelteT98ExpressionType = typeof welteT98ExpressionTypes[number];
+/**
+ * Welte-Mignon T-98 ("green Welte"), cf. Hagmann, Anhang 11 (p. 179)
+ * and Phillips, p. 121.
+ *
+ * 98 positions at nine to the inch on paper 286 mm wide, five expression
+ * valves on each side and 88 note positions between them, A0 to c⁵ (MIDI
+ * 21 to 108). A roll re-cut from a Mignon master uses only the middle 80
+ * of those, C1 to g⁴, which is the T-100's compass.
+ *
+ * The rewind is not a valve of its own: a long perforation on the bass
+ * sforzando-piano position drives it, which is why that position is
+ * named for the valve and the rewind stated separately.
+ *
+ * Measured against Julian Dyer's scan of the T-98 copy of roll 225
+ * (Grünfeld, Träumerei): 98 columns 2.818 mm apart on paper 285.6 mm
+ * wide, notes on the middle 80 columns, the sustain valve punched 53
+ * times where the T-100 copy latches its sustain on 53 times.
+ */
+export declare const welteT98: TrackerBar;

package/lib/systems/welteT98/bar.js

@@ -0,0 +1,57 @@
+import { describeTrackerBar } from "../../TrackerBar";
+import { mm } from "../../Quantity";
+/**
+ * The commands of the Welte-Mignon T-98, as its tracker bar reads them.
+ *
+ * They are not the T-100's. Where the T-100 latches a function on with
+ * one perforation and cancels it with a second, the T-98 holds it for
+ * as long as one continuous perforation lasts (Hagmann, pp. 89 f. and
+ * 100–103; Phillips, p. 121), so none of these is an On or an Off. The
+ * two sforzando valves name the end of the range they pull towards.
+ */
+export const welteT98ExpressionTypes = [
+    'SforzandoPiano',
+    'SforzandoForte',
+    'Mezzoforte',
+    'Crescendo',
+    'SustainPedal',
+    'SoftPedal'
+];
+/**
+ * Welte-Mignon T-98 ("green Welte"), cf. Hagmann, Anhang 11 (p. 179)
+ * and Phillips, p. 121.
+ *
+ * 98 positions at nine to the inch on paper 286 mm wide, five expression
+ * valves on each side and 88 note positions between them, A0 to c⁵ (MIDI
+ * 21 to 108). A roll re-cut from a Mignon master uses only the middle 80
+ * of those, C1 to g⁴, which is the T-100's compass.
+ *
+ * The rewind is not a valve of its own: a long perforation on the bass
+ * sforzando-piano position drives it, which is why that position is
+ * named for the valve and the rewind stated separately.
+ *
+ * Measured against Julian Dyer's scan of the T-98 copy of roll 225
+ * (Grünfeld, Träumerei): 98 columns 2.818 mm apart on paper 285.6 mm
+ * wide, notes on the middle 80 columns, the sustain valve punched 53
+ * times where the T-100 copy latches its sustain on 53 times.
+ */
+export const welteT98 = describeTrackerBar({
+    id: 'welte-green',
+    name: 'Welte-Mignon T98',
+    width: mm(286),
+    trackCount: 98,
+    notes: { from: 6, to: 93, lowestPitch: 21 },
+    rewindTrack: 1,
+    expressions: new Map([
+        [1, 'SforzandoPiano'],
+        [2, 'Mezzoforte'],
+        [3, 'SustainPedal'],
+        [4, 'Crescendo'],
+        [5, 'SforzandoForte'],
+        [94, 'SforzandoForte'],
+        [95, 'Crescendo'],
+        [96, 'SoftPedal'],
+        [97, 'Mezzoforte'],
+        [98, 'SforzandoPiano']
+    ])
+});

package/package.json

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