smoosic 1.0.9 → 1.0.11

package/src/render/sui/scoreView.ts

@@ -723,6 +723,14 @@ 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;
+        }
         const selector: SmoSelector = { staff: staffId, measure: i, voice: 0, tick: 0, pitches: [] };
         this.score.replaceMeasure(selector, rmeasure);
       });

package/src/render/vex/vxMeasure.ts

@@ -378,7 +378,7 @@ export class VxMeasure implements VxMeasureIf {
         continue;
       }
       const traverseTupletTree = ( parentTuplet: SmoTuplet): void => {
-        const vexNotes = [];
+        const vexNotes: Note[] = [];
         for (let smoNote of this.smoMeasure.tupletNotes(parentTuplet)) {
           vexNotes.push(this.noteToVexMap[smoNote.attrs.id]);
         }

package/src/smo/data/measure.ts

@@ -667,7 +667,12 @@ export class SmoMeasure implements SmoMeasureParams, TickMappable {
         let startIndex: number | null = null;
         params.voices.forEach((voice) => {
           voice.notes.forEach((note, index) => {
-            if (note.isTuplet && note.tupletId === tupJson.attrs.id) {
+            // backwards-compatibiliity, some scores don't have attrs on tuplet
+            if (typeof(tupJson.id) === 'string') {
+              tupJson.attrs = { type: 'SmoTuplet', id: tupJson.id };
+            }
+            const id = tupJson.attrs.id;
+            if (note.isTuplet && note.tupletId === id) {
               tupletNotes.push(note);
               //we cannot trust startIndex coming from legacy json
               //we need to count index of the first note in the tuplet
@@ -1562,8 +1567,8 @@ export class SmoMeasure implements SmoMeasureParams, TickMappable {
   }
 
   addNthEnding(ending: SmoVolta) {
-    const mods = [];
-    this.modifiers.forEach((modifier) => {
+    const mods: SmoMeasureModifierBase[] = [];
+    this.modifiers.forEach((modifier: SmoMeasureModifierBase) => {
       if (modifier.ctor !== 'SmoVolta' || (modifier as SmoVolta).startBar !== ending.startBar ||
         (modifier as SmoVolta).endBar !== ending.endBar) {
         mods.push(modifier);

package/src/smo/data/noteModifiers.ts

@@ -973,9 +973,9 @@ export class SmoLyric extends SmoNoteModifierBase {
     // var str = this._text;
     const reg = /^([A-Z|a-z|0-9|]+)/g;
     let mmm = str.match(reg);
-    let tokeType = '';
-    let toke = '';
-    const tokens = [];
+    let tokeType: string = '';
+    let toke: string = '';
+    const tokens: string[] = [];
     while (str.length) {
       if (!mmm) {
         tokeType = str[0];

package/src/smo/data/score.ts

@@ -667,6 +667,11 @@ export class SmoScore {
       params.audioSettings = SmoScoreModifierBase.deserialize(jsonObj.audioSettings);
     }
     params.preferences.transposingScore = params.preferences.transposingScore ?? false;
+    if (jsonObj.staves && jsonObj.staves.length === 1) {
+      // Ignore serialized tranpose of score if there is only a single part.
+      params.preferences.transposingScore = false; 
+    }
+
     params.preferences.hideEmptyLines = params.preferences.hideEmptyLines ?? false;
     let renumberingMap: Record<number, number> = { 0: 0 };
     if (jsonObj.columnAttributeMap && jsonObj.columnAttributeMap.renumberingMap) {
@@ -1118,6 +1123,7 @@ export class SmoScore {
       // Need to do this since score serialization doesn't include TS in each measure
       jsonObj.timeSignature = measure.timeSignature.serialize();
       jsonObj.tempo = measure.tempo.serialize();
+      jsonObj.tupletTrees = []; // assume no tuplets in a prototype measure
       let newMeasure = SmoMeasure.deserialize(jsonObj);
       newMeasure.measureNumber = measure.measureNumber;
       newMeasure.clef = parameters.measureInstrumentMap[0].clef as Clef;

package/src/ui/dialogs/components/rocker.ts

@@ -126,7 +126,6 @@ export class SuiRockerComponent extends SuiComponentBase {
             val = this.max;
           }
           this.initialValue = val;
-          $(input).val(val);
           this.handleChanged();
         }
       }

package/src/ui/dialogs/preferences.ts

@@ -16,10 +16,12 @@ const deepCopy = (x: any) => JSON.parse(JSON.stringify(x));
 export class SuiScorePreferencesAdapter extends SuiComponentAdapter {
   preferences: SmoScorePreferences;
   backup: SmoScorePreferences;
+  originalTransposeScore: boolean;
   constructor(view: SuiScoreViewOperations) {
     super(view);
     this.preferences = new SmoScorePreferences(view.score.preferences);
     this.backup = JSON.parse(JSON.stringify(this.preferences));
+    this.originalTransposeScore = this.preferences.transposingScore;
   }
   get autoAdvance(): boolean {
     return this.preferences.autoAdvance;
@@ -77,8 +79,12 @@ export class SuiScorePreferencesAdapter extends SuiComponentAdapter {
       await this.view.updateScorePreferences(this.backup);
     }
   }
-  commit() {
-    return PromiseHelpers.emptyPromise();
+  async commit() {
+    if (this.originalTransposeScore !== this.preferences.transposingScore) {
+      await this.view.refreshViewport();
+      return;
+    }
+    return;
   }
 }
 /**