smoosic 1.0.21 → 1.0.22

package/src/render/sui/formatter.ts

@@ -745,7 +745,8 @@ export class SuiLayoutFormatter {
     clefLast: string, keySigLast: string, timeSigLast: TimeSignature, tempoLast: SmoTempoText) {
     // The key signature is set based on the transpose index already, i.e. an Eb part in concert C already has 3 sharps.
     const xposeScore = this.score?.preferences?.transposingScore && (this.score?.isPartExposed() === false);
-    const xposeOffset = xposeScore ? measure.transposeIndex : 0;
+    // const xposeOffset = xposeScore ? measure.transposeIndex : 0;
+    const xposeOffset = 0;
     const measureKeySig = SmoMusic.vexKeySignatureTranspose(measure.keySignature, xposeOffset);
     measure.svg.forceClef = (systemIndex === 0 || measure.clef !== clefLast);
     measure.svg.forceTimeSignature = (measure.measureNumber.measureIndex === 0 || 

package/src/render/sui/scoreRender.ts

@@ -610,6 +610,22 @@ export class SuiScoreRender {
 
     measures.forEach((measure) => {
       const context = this.vexContainers.getRenderer(measure.svg.logicalBox);
+      // For scores with more than one part, put a helper part number on there.
+      if (this.score?.preferences.showPartNames && !printing && !this.score?.isPartExposed()) {
+        this.score?.staves.forEach((curStaff) => {
+          if (curStaff.partInfo.partAbbreviation.length > 0) {
+            const numAr: any[] = [];
+            const mm = curStaff.measures[measure.measureNumber.localIndex];
+            const modBox = context.offsetSvgPoint(mm.svg.logicalBox);
+            numAr.push({ y: modBox.y + mm.svg.logicalBox.height / 2 });
+            numAr.push({ x: modBox.x - (20 +  curStaff.partInfo.partAbbreviation.length) });
+            numAr.push({ 'font-family': SourceSansProFont.fontFamily });
+            numAr.push({ 'font-size': '10pt' });
+            SvgHelpers.placeSvgText(context.svg, numAr, 'measure-number', 
+              curStaff.partInfo.partAbbreviation);
+          }
+        });
+      }
       if (measure.measureNumber.localIndex > 0 && measure.measureNumber.systemIndex === 0 && measure.svg.logicalBox && context) {
         const numAr: any[] = [];
         const modBox = context.offsetSvgPoint(measure.svg.logicalBox);

package/src/render/sui/scoreView.ts

@@ -617,9 +617,11 @@ export abstract class SuiScoreView {
       const row = rows[i];
       if (row.show) {
         const srcStave = this.storeScore.staves[i];
-        const jsonObj = srcStave.serialize({ skipMaps: false, preserveIds: true });
+        const jsonObj = srcStave.serialize({ skipMaps: false, preserveIds: true,
+          transposeInstruments: !this.storeScore.preferences.transposingScore
+         });
         jsonObj.staffId = staffMap.length;
-        const nStave = SmoSystemStaff.deserialize(jsonObj);
+        const nStave = SmoSystemStaff.deserialize(jsonObj, !this.storeScore.preferences.transposingScore);
         nStave.mapStaffFromTo(i, nscore.staves.length);
         nscore.staves.push(nStave);
         if (srcStave.keySignatureMap) {
@@ -673,13 +675,14 @@ export abstract class SuiScoreView {
     this.renderer.setViewport();
   }
   /**
-   * Update score based on transposing flag.
+   * If the score is non-transposed, transpose the part so it is in the 
+   * correct key.
    */
   _setTransposing() {
-    if (!this.isPartExposed()) {
+    if (this.isPartExposed()) {
       const xpose = this.score.preferences?.transposingScore;
       if (xpose) {
-        this.score.setTransposing();
+        this.score.setNonTransposing();
       }
     }
   }
@@ -727,14 +730,9 @@ export abstract class SuiScoreView {
         serialized.keySignature = concertKey;
         const rmeasure = SmoMeasure.deserialize(serialized);
         rmeasure.svg = svg;
-        // If this is a tranposed score, the displayed score needs to be in 'C'.
-        // We do this step last since serialize/unserialize work in a pitch transposed
-        // for the instrument
-        if (this.score.preferences.transposingScore && !this.score.isPartExposed()) {
-          rmeasure.transposeToOffset(-1 * xpose, 'c');
-          rmeasure.keySignature = 'c';
-          rmeasure.transposeIndex = 0;
-        }
+        // We used to force a tranposing score stff into  'c' but now we keep the 
+        // measures in the concert key, and the transpose offset to 0, so no need to do anything
+        // special here.
         const selector: SmoSelector = { staff: staffId, measure: i, voice: 0, tick: 0, pitches: [] };
         this.score.replaceMeasure(selector, rmeasure);
       });

package/src/render/sui/scoreViewOperations.ts

@@ -224,8 +224,10 @@ export class SuiScoreViewOperations extends SuiScoreView {
     this.storeScore.updateScorePreferences(new SmoScorePreferences(pref));
     if (curXpose === false && oldXpose === true) {
       this.score.setNonTransposing();
+      this.storeScore.setNonTransposing();
     } else if (curXpose === true && oldXpose === false) {
       this.score.setTransposing();
+      this.storeScore.setTransposing();
     }
     this.renderer.setDirty();
     return this.renderer.updatePromise();

package/src/render/sui/tracker.ts

@@ -579,35 +579,40 @@ export class SuiTracker extends SuiMapper implements TrackerKeyHandler {
     this.selections = ar;
   }
 
-  _selectFromToInStaff(score: SmoScore, sel1: SmoSelection, sel2: SmoSelection) {
-    const selections = SmoSelection.innerSelections(score, sel1.selector, sel2.selector);
-    /* .filter((ff) => 
-      ff.selector.voice === sel1.measure.activeVoice
-    ); */
-    this.selections = [];
-    // Get the actual selections from our map, since the client bounding boxes are already computed
-    selections.forEach((sel) => {
-      const key = SmoSelector.getNoteKey(sel.selector);
-      sel.measure.setActiveVoice(sel.selector.voice);
-      // Skip measures that are not rendered because they are part of a multi-rest
-      if (this.measureNoteMap && this.measureNoteMap[key]) {
-        this.selections.push(this.measureNoteMap[key]);
-      }
-    });
-
-    if (this.selections.length === 0) {
-      this.selections = [sel1];
-    }
-    this.idleTimer = Date.now();
-  }
-  _selectBetweenSelections(s1: SmoSelection, s2: SmoSelection) {
+  _selectBetweenSelections(s1o: SmoSelection, s2o: SmoSelection) {
     const score = this.renderer.score ?? null;
     if (!score) {
       return;
     }
-    const min = SmoSelector.gt(s1.selector, s2.selector) ? s2 : s1;
-    const max = SmoSelector.lt(min.selector, s2.selector) ? s2 : s1;
-    this._selectFromToInStaff(score, min, max);
+    const staffMin = Math.min(s1o.selector.staff, s2o.selector.staff);
+    const staffMax = Math.max(s1o.selector.staff, s2o.selector.staff);
+    this.selections = [];
+    for (let i = staffMin; i <= staffMax; ++i) {
+      const s1 = JSON.parse(JSON.stringify(s1o.selector));
+      s1.staff = i;
+      const s2 = JSON.parse(JSON.stringify(s2o.selector));
+      s2.staff = i;
+      const s1s = SmoSelection.selectionFromSelector(this.score!, s1);
+      const s2s = SmoSelection.selectionFromSelector(this.score!, s2);
+      if (s1s && s2s) {
+        const min = SmoSelector.gt(s1s.selector, s2s.selector) ? s2s : s1s;
+        const max = SmoSelector.lt(min.selector, s2s.selector) ? s2s : s1s;
+        const selections = SmoSelection.innerSelections(score, min.selector, max.selector);
+        // Get the actual selections from our map, since the client bounding boxes are already computed
+        selections.forEach((sel) => {
+          const key = SmoSelector.getNoteKey(sel.selector);
+          sel.measure.setActiveVoice(sel.selector.voice);
+          // Skip measures that are not rendered because they are part of a multi-rest
+          if (this.measureNoteMap && this.measureNoteMap[key]) {
+            this.selections.push(this.measureNoteMap[key]);
+          }
+        });
+
+        if (this.selections.length === 0) {
+          this.selections = [min];
+        }        
+      }
+    }
     this._createLocalModifiersList();
     this.highlightQueue.selectionCount = this.selections.length;
     this.deferHighlight();
@@ -634,10 +639,10 @@ export class SuiTracker extends SuiMapper implements TrackerKeyHandler {
 
     if (ev.shiftKey) {
       const sel1 = this.getExtremeSelection(-1);
-      if (sel1.selector.staff === this.suggestion.selector.staff) {
-        this._selectBetweenSelections(sel1, this.suggestion);
-        return;
-      }
+      //if (sel1.selector.staff === this.suggestion.selector.staff) {
+      this._selectBetweenSelections(sel1, this.suggestion);
+      return;
+      //}
     }
 
     if (ev.ctrlKey) {

package/src/render/vex/vxMeasure.ts

@@ -15,7 +15,7 @@ import { SmoOrnament, SmoDynamicText,
 import { SmoSelection } from '../../smo/xform/selections';
 import { SmoMeasure, MeasureTickmaps } from '../../smo/data/measure';
 import { SvgHelpers } from '../sui/svgHelpers';
-import { Clef, IsClef, ElementLike } from '../../smo/data/common';
+import { Clef, IsClef, ElementLike, Pitch } from '../../smo/data/common';
 import { SvgPage } from '../sui/svgPageMap';
 import { SmoTabStave } from '../../smo/data/staffModifiers';
 import { toVexBarlineType, vexBarlineType, vexBarlinePosition, toVexBarlinePosition, toVexSymbol,
@@ -70,8 +70,10 @@ export class VxMeasure implements VxMeasureIf {
   collisionMap: Record<number, SmoNote[]> = {};
   dbgLeftX: number = 0;
   dbgWidth: number = 0;
+  tiedOverPitches: Pitch[] = [];
 
-  constructor(context: SvgPage, selection: SmoSelection, printing: boolean, softmax: number) {
+  constructor(context: SvgPage, selection: SmoSelection, 
+    printing: boolean, softmax: number, tiedOverPitches: Pitch[]) {
     this.context = context;
     this.rendered = false;
     this.selection = selection;
@@ -85,6 +87,7 @@ export class VxMeasure implements VxMeasureIf {
     this.beamToVexMap = {};
     this.softmax = softmax;
     this.smoTabStave = selection.staff.getTabStaveForMeasure(selection.selector);
+    this.tiedOverPitches = tiedOverPitches;
   }
 
   static get fillStyle() {
@@ -229,12 +232,14 @@ export class VxMeasure implements VxMeasureIf {
         vexNote.setStave(this.stave);
       }
     }
+    const tiedOverPitches = tickIndex === 0 ? this.tiedOverPitches : [];
     const noteData: VexNoteModifierIf = {
       smoMeasure: this.smoMeasure,
       vxMeasure: this,
       smoNote: smoNote,
       staveNote: vexNote,
       voiceIndex: voiceIx,
+      tiedOverPitches,
       tickIndex: tickIndex
     }
     if (tabNote) {

package/src/render/vex/vxNote.ts

@@ -9,7 +9,7 @@ import { SmoOrnament, SmoArticulation, SmoDynamicText, SmoLyric,
 import { SmoSelection } from '../../smo/xform/selections';
 import { SmoMeasure, MeasureTickmaps } from '../../smo/data/measure';
 import { SvgHelpers } from '../sui/svgHelpers';
-import { Clef, IsClef } from '../../smo/data/common';
+import { Clef, IsClef, Pitch } from '../../smo/data/common';
 import { SvgPage } from '../sui/svgPageMap';
 import { toVexBarlineType, vexBarlineType, vexBarlinePosition, toVexBarlinePosition, toVexSymbol,
   toVexTextJustification, toVexTextPosition, getVexChordBlocks, toVexStemDirection } from './smoAdapter';
@@ -42,6 +42,7 @@ export interface VexNoteModifierIf {
   staveNote: Note,
   voiceIndex: number,
   tickIndex: number,
+  tiedOverPitches: Pitch[],
   tabNote?: StemmableNote | TabNote,
 }
 /**
@@ -96,6 +97,20 @@ export class VxNote {
     this.noteData.smoNote.accidentalsRendered = [];
     for (i = 0; i < this.noteData.smoNote.pitches.length && this.noteData.vxMeasure.tickmapObject !== null; ++i) {
       const pitch = this.noteData.smoNote.pitches[i];
+      const tiedOver = this.noteData.tiedOverPitches.find((pp) => pp.letter === pitch.letter && pp.octave === pitch.octave);
+      if (tiedOver) {
+        if (tiedOver.accidental === pitch.accidental) {
+          // Why do we do this?
+          this.noteData.smoNote.accidentalsRendered.push('');
+          continue;
+        }
+        else {
+          const acc = new VF.Accidental(pitch.accidental);
+          this.noteData.smoNote.accidentalsRendered.push(pitch.accidental);
+          this.noteData.staveNote.addModifier(acc, i);
+          continue;
+        }
+      }
       const zz = SmoMusic.accidentalDisplay(pitch, this.noteData.smoMeasure.keySignature,
         this.noteData.vxMeasure.tickmapObject.tickmaps[this.noteData.voiceIndex].durationMap[this.noteData.tickIndex], 
         this.noteData.vxMeasure.tickmapObject.accidentalArray);

package/src/render/vex/vxSystem.ts

@@ -621,7 +621,8 @@ export class VxSystem {
     if (softmax === SmoMeasureFormat.defaultProportionality) {
       softmax = this.score.layoutManager?.getGlobalLayout().proportionality ?? 0;
     }
-    const vxMeasure: VxMeasure = new VxMeasure(this.context, selection, printing, softmax);
+    const tiedOverPitches = selection.staff.getTiedPitchesForNextMeasure(smoMeasure.measureNumber.measureIndex - 1);
+    const vxMeasure: VxMeasure = new VxMeasure(this.context, selection, printing, softmax, tiedOverPitches);
 
     // create the vex notes, beam groups etc. for the measure
     vxMeasure.preFormat();

package/src/smo/data/music.ts

@@ -592,7 +592,7 @@ export class SmoMusic {
         { letter: 'b', accidental: 'bb', role: 'b5'},
         { letter: 'b', accidental: 'b', role: '5'},
         { letter: 'b', accidental: 'n', role: '7/6'},
-        { letter: 'c', accidental: 'b', role: '6'},
+        { letter: 'c', accidental: 'b', role: 'b6'},
         { letter: 'c', accidental: 'n', role: '6'},
         { letter: 'c', accidental: '#', role: '7/7'},
         { letter: 'd', accidental: 'b', role: 'b7'},

package/src/smo/data/score.ts

@@ -366,7 +366,10 @@ export class SmoScore {
       const current = func(measure);
       const ix = measure.measureNumber.measureIndex;
       const currentInstrument = this.staves[0].getStaffInstrument(ix);
-      current.keySignature = SmoMusic.vexKeySigWithOffset(current.keySignature, -1 * currentInstrument.keyOffset);
+      // If this is a non-transposing score, adjust the key signature
+      if (!this.preferences.transposingScore) {
+        current.keySignature = SmoMusic.vexKeySigWithOffset(current.keySignature, -1 * currentInstrument.keyOffset);
+      }
       if (ix === 0) {
         keySignature[0] = current.keySignature;
         tempo[0] = current.tempo;
@@ -483,7 +486,9 @@ export class SmoScore {
     obj.audioSettings = this.audioSettings.serialize();
     if (!skipStaves) {
       this.staves.forEach((staff: SmoSystemStaff) => {
-        obj.staves!.push(staff.serialize({ skipMaps: true, preserveIds: preserveIds }));
+        obj.staves!.push(staff.serialize({ skipMaps: true, preserveIds: preserveIds, 
+          transposeInstruments: !this.preferences.transposingScore
+         }));
       });
     } else {
       obj.staves = [];
@@ -687,7 +692,7 @@ export class SmoScore {
     jsonObj.staves.forEach((staffObj: any, staffIx: number) => {
       staffObj.staffId = staffIx;
       staffObj.renumberingMap = renumberingMap;
-      const staff = SmoSystemStaff.deserialize(staffObj);
+      const staff = SmoSystemStaff.deserialize(staffObj, !params.preferences?.transposingScore);
       staves.push(staff);
     });
 

package/src/smo/data/scoreModifiers.ts

@@ -124,10 +124,11 @@ export interface SmoScoreInfo {
 }
 
 
-export type SmoScorePreferenceBool = 'autoPlay' | 'autoAdvance' | 'showPiano' | 'hideEmptyLines' | 'transposingScore' | 'autoScrollPlayback';
+export type SmoScorePreferenceBool = 'autoPlay' | 'autoAdvance' | 'showPiano' | 'hideEmptyLines' 
+  | 'transposingScore' | 'autoScrollPlayback' | 'showPartNames';
 export type SmoScorePreferenceNumber = 'defaultDupleDuration' | 'defaultTripleDuration';
 export const SmoScorePreferenceBools: SmoScorePreferenceBool[] = ['autoPlay', 'autoAdvance', 'showPiano', 'hideEmptyLines', 
-  'transposingScore', 'autoScrollPlayback'];
+  'transposingScore', 'autoScrollPlayback', 'showPartNames'];
 export const SmoScorePreferenceNumbers: SmoScorePreferenceNumber[] = ['defaultDupleDuration', 'defaultTripleDuration'];
 /**
  * Global score/program behavior preferences, see below for parameters
@@ -142,6 +143,7 @@ export interface SmoScorePreferencesParams {
   showPiano: boolean;
   hideEmptyLines: boolean;
   transposingScore: boolean;
+  showPartNames: boolean;
 }
 /**
  * Some default SMO behavior
@@ -163,6 +165,7 @@ export class SmoScorePreferences {
   hideEmptyLines: boolean = false;
   autoScrollPlayback: boolean = true;
   transposingScore: boolean = false;
+  showPartNames: boolean = false;
   static get defaults(): SmoScorePreferencesParams {
     return {
       autoPlay: true,
@@ -172,7 +175,8 @@ export class SmoScorePreferences {
       autoScrollPlayback: true,
       showPiano: false,
       hideEmptyLines: false,
-      transposingScore: false
+      transposingScore: false,
+      showPartNames: false
     };
   }
   constructor(params: SmoScorePreferencesParams) {
@@ -184,9 +188,12 @@ export class SmoScorePreferences {
         this[nn] = params[nn];
       });
       // legacy, added later
-      if (typeof(params.autoScrollPlayback) === 'undefined') {
+      if (typeof(params.autoScrollPlayback) === 'undefined') {        
         this.autoScrollPlayback = true;
       }
+      if (typeof(params.showPartNames) === 'undefined') {
+        this.showPartNames = false;
+      }
     }
   }
   serialize(): SmoScorePreferencesParams {

package/src/smo/data/systemStaff.ts

@@ -6,13 +6,13 @@
  * @module /smo/data/systemStaff
  * **/
 import { SmoObjectParams, SmoAttrs, MeasureNumber, getId, 
-   ElementLike } from './common';
+   Pitch, ElementLike } from './common';
 import { SmoMusic } from './music';
 import { SmoMeasure, SmoMeasureParamsSer } from './measure';
 import { SmoMeasureFormat, SmoRehearsalMark, SmoRehearsalMarkParams, SmoTempoTextParams, SmoVolta, SmoBarline } from './measureModifiers';
 import { SmoInstrumentParams, StaffModifierBase, SmoInstrument, SmoInstrumentMeasure, SmoInstrumentStringParams, SmoInstrumentNumParams, 
   SmoTie, SmoStaffTextBracket, SmoStaffTextBracketParamsSer, 
-  StaffModifierBaseSer, SmoTabStave, SmoTabStaveParamsSer } from './staffModifiers';
+  StaffModifierBaseSer, SmoTabStave, SmoTabStaveParamsSer, TieLine } from './staffModifiers';
 import { SmoPartInfo, SmoPartInfoParamsSer } from './partInfo';
 import { SmoTextGroup } from './scoreText';
 import { SmoSelector } from '../xform/selections';
@@ -26,7 +26,8 @@ import { FontInfo } from '../../common/vex';
  */
 export interface SmoStaffSerializationOptions {
   skipMaps: boolean,
-  preserveIds: boolean
+  preserveIds: boolean,
+  transposeInstruments: boolean
 }
 /**
  * Constructor parameters for {@link SmoSystemStaff}.
@@ -295,7 +296,11 @@ export class SmoSystemStaff implements SmoObjectParams {
       params.measureInstrumentMap![parseInt(ikey, 10)] = this.measureInstrumentMap[parseInt(ikey, 10)].serialize();
     });
     this.measures.forEach((measure) => {
-      params.measures!.push(measure.serialize());
+      const mp = measure.serialize();
+      if (!options.transposeInstruments) {
+        mp.transposeIndex = 0;
+      }
+      params.measures!.push(mp);
     });
     params.modifiers = [];
     this.modifiers.forEach((modifier) => {
@@ -314,7 +319,7 @@ export class SmoSystemStaff implements SmoObjectParams {
   }
   // ### deserialize
   // parse formerly serialized staff.
-  static deserialize(jsonObj: SmoSystemStaffParamsSer): SmoSystemStaff {
+  static deserialize(jsonObj: SmoSystemStaffParamsSer, transposeInstruments: boolean): SmoSystemStaff {
     const params: SmoSystemStaffParams = SmoSystemStaff.defaults;
     params.staffId = jsonObj.staffId ?? 0;
     params.measures = [];
@@ -386,7 +391,9 @@ export class SmoSystemStaff implements SmoObjectParams {
         instrumentAr[curInstrumentIndex + 1].measureIndex) {
         curInstrumentIndex += 1;
       }
-      measure.transposeIndex = instrumentAr[curInstrumentIndex].instrument.keyOffset;
+      if (transposeInstruments) {
+        measure.transposeIndex = instrumentAr[curInstrumentIndex].instrument.keyOffset;
+      }
       measure.lines = instrumentAr[curInstrumentIndex].instrument.lines;
       params.measures.push(measure);
     });
@@ -581,6 +588,32 @@ export class SmoSystemStaff implements SmoObjectParams {
     this.removeTabStaves(toRemove);
     this.tabStaves.push(ts);
   }
+  /**
+   * Get all the pitches that start ties to the next measure, so that their
+   * accidentals may be preserved
+   * @param selector 
+   * @returns 
+   */
+  getTiedPitchesForNextMeasure(measureIndex: number) {
+    const rv: Pitch[] = [];
+    if (measureIndex <= 0) {
+      return rv;
+    }
+    for (let i = 0; i < this.measures[measureIndex].voices.length; ++i) {
+      const voice = this.measures[measureIndex].voices[i];
+      const lastNote = voice.notes[voice.notes.length - 1];
+      const sel = SmoSelector.fromMeasure(this.measures[measureIndex]);
+      sel.voice = i;
+      sel.tick = voice.notes.length - 1;
+      const ties = this.getTiesStartingAt(sel);
+      if (ties.length) {
+        ties[0].lines.forEach((ll:TieLine ) => {
+            rv.push(lastNote.pitches[ll.from]);
+        });
+      }
+     }
+     return rv;
+  }
   getTabStaveForMeasure(selector: SmoSelector): SmoTabStave | undefined {
     return this.tabStaves.find((ts) => 
       SmoSelector.sameStaff(ts.startSelector, selector) && ts.startSelector.measure <= selector.measure