linked-rolls 0.19.0 → 0.19.1

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linked-rolls",
-  "version": "0.19.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": {