smoosic 1.0.19 → 1.0.21

package/src/render/sui/scoreViewOperations.ts

@@ -454,6 +454,14 @@ export class SuiScoreViewOperations extends SuiScoreView {
     SmoOperation.setActiveVoice(this.score, index);
     this._renderChangedMeasures(measuresToAdd);
     await this.renderer.updatePromise();
+    this.tracker.selectActiveVoice();
+  }
+  async swapVoices(voice1: number, voice2: number): Promise<void> {
+    const selections = this.tracker.getSelectedMeasures();
+    const altSelections = this._getEquivalentSelections(selections);
+    SmoOperation.swapVoice(selections, voice1, voice2);
+    SmoOperation.swapVoice(altSelections, voice1, voice2);
+    this._renderChangedMeasures(selections);
   }
   /**
    * Assign an instrument to a set of measures

package/src/render/sui/svgPageMap.ts

@@ -496,7 +496,6 @@ export class SvgPageMap {
       const x = (box.x - this.containerOffset.x) / cof;
       const y = (box.y - this.containerOffset.y) / cof;
       const logicalBox = SvgHelpers.boxPoints(x, y, Math.max(box.width / cof, 1), Math.max(box.height / cof, 1));
-      logicalBox.y -= Math.round(logicalBox.y / this.layout.pageHeight) / this.layout.svgScale;
       if (layoutDebug.mask | layoutDebug.values['mouseDebug']) {
         layoutDebug.updateMouseDebug(box, logicalBox, this.containerOffset);
       }

package/src/render/sui/tracker.ts

@@ -666,6 +666,9 @@ export class SuiTracker extends SuiMapper implements TrackerKeyHandler {
         selection.box = JSON.parse(JSON.stringify(this.suggestion.box));
         selection.scrollBox = JSON.parse(JSON.stringify(this.suggestion.scrollBox));
         this.selections = [selection];
+        // There is a single selection, make sure the active voice is set to it.
+        selection.measure.setActiveVoice(selection.selector.voice);
+        this.selectActiveVoice();
       }
     }
     if (preselected && this.modifierSelections.length) {

package/src/render/vex/vxMeasure.ts

@@ -219,7 +219,8 @@ export class VxMeasure implements VxMeasureIf {
       if (smoNote.fillStyle && !this.printing) {
         vexNote.setStyle({ fillStyle: smoNote.fillStyle });
       } else if (voiceIx > 0 && !this.printing) {
-        vexNote.setStyle({ fillStyle: "#115511" });
+        const voiceFill = ['#115511','#555511','#883344']
+        vexNote.setStyle({ fillStyle: voiceFill[voiceIx - 1] });
       } else if (smoNote.isHidden() && this.printing) {
         vexNote.setStyle({ fillStyle: "#ffffff00" });
       }

package/src/smo/data/measure.ts

@@ -989,8 +989,16 @@ export class SmoMeasure implements SmoMeasureParams, TickMappable {
    */
   alignNotesWithTimeSignature() {
     const tsTicks = SmoMusic.timeSignatureToTicks(this.timeSignature.timeSignature);
-    if (tsTicks === this.getMaxTicksVoice()) {
-      return;
+    let aligned = true;
+    for (let i = 0; i < this.voices.length; ++i) {
+      const voice = this.voices[i];
+      if (this.getTicksFromVoice(i) !== tsTicks) {
+        aligned = false;
+        break;
+      }
+    }
+    if (aligned) {
+      return true;
     }
     const replaceNoteWithDuration = (target: number, ar: SmoNote[], note: SmoNote) => {
       const fitNote = new SmoNote(SmoNote.defaults);
@@ -1193,7 +1201,32 @@ export class SmoMeasure implements SmoMeasureParams, TickMappable {
       this.activeVoice = vix;
     }
   }
-
+  getSwapVoicePairs() {
+    const rv = [];
+    for (let i = 0; i < this.voices.length; ++i) {
+      for (let j = i + 1; j < this.voices.length; ++j) {
+        rv.push([i, j]);
+      }
+    }
+    return rv;
+  }
+  swapVoices(voice1: number, voice2: number) {
+    if (this.voices.length > voice1 && this.voices.length > voice2) {
+      const v1 = this.voices[voice1];
+      const v2 = this.voices[voice2];
+      const nvoices: SmoVoice[] = [];
+      for (let i = 0; i < this.voices.length; ++i) {
+        if (i === voice1) {
+          nvoices.push(v2);
+        } else if (i === voice2) {
+          nvoices.push(v1);
+        } else {
+          nvoices.push(this.voices[i]);
+        }
+      }
+      this.voices = nvoices;
+    }
+  }
   tickmapForVoice(voiceIx: number) {
     return new TickMap(this, voiceIx);
   }

package/src/smo/data/music.ts

@@ -1534,7 +1534,7 @@ export class SmoMusic {
     return SmoMusic._validDurations;
   }
   /**
-   * Get the closest duration from ticks
+   * Get the closest valid duration for this number of ticks, but not going over
    * @param ticks 
    * @returns 
    */
@@ -1549,6 +1549,15 @@ export class SmoMusic {
     }
     return null;
   }
+  static closestSimpleDurationFromTicks(ticks: number): number {
+    let closest = SmoMusic.durationsDescending[0];
+    for (let i = 0; i < SmoMusic.durationsDescending.length; ++i) {
+      if (Math.abs(SmoMusic.durationsDescending[i] - ticks) < closest) {
+        closest = i;
+      }
+    }
+    return closest;
+  }
   static _ticksToDuration: Record<string, string> = {};
 
   // ### ticksToDuration

package/src/smo/mxml/xmlState.ts

@@ -732,8 +732,11 @@ export class XmlState {
       smoTupletParams.startIndex = xmlTupletState.start!.tick;
       smoTupletParams.endIndex = xmlTupletState.end!.tick;
       for (let i = smoTupletParams.startIndex; i <= smoTupletParams.endIndex; i++) {
-        smoTupletParams.totalTicks += notes[i].tickCount;
+        smoTupletParams.totalTicks += Math.floor(notes[i].tickCount);
       }
+      // Normalize to an allowed note length, because MusicXML durations do not add up
+      smoTupletParams.totalTicks = SmoMusic.closestSimpleDurationFromTicks(smoTupletParams.totalTicks);
+      
       smoTupletParams.voice = xmlTupletState.start!.voice;
       const smoTuplet = new SmoTuplet(smoTupletParams);
       for (let i = 0; i < xmlTupletStateTreeNode.children.length; i++) {

package/src/smo/xform/operations.ts

@@ -124,6 +124,12 @@ export class SmoOperation {
   static populateVoice(selection: SmoSelection, voiceIx: number) {
     selection.measure.populateVoice(voiceIx);
   }
+  static swapVoice(selections: SmoSelection[], voice1: number, voice2: number) {
+    const measures = SmoSelection.getMeasureList(selections);
+    measures.forEach((ss) => {
+      ss.measure.swapVoices(voice1, voice2);
+    });
+  }
 
   static setTabStave(score: SmoScore, tabStave: SmoTabStave) {
     score.staves[tabStave.startSelector.staff].updateTabStave(tabStave);

package/src/ui/menus/voices.ts

@@ -1,5 +1,5 @@
 import { SuiMenuBase, SuiMenuParams, MenuDefinition, SuiMenuHandler, SuiMenuShowOption, 
-  SuiConfiguredMenuOption, SuiConfiguredMenu, customizeMenuOptionsFcn } from './menu';
+  SuiConfiguredMenuOption, SuiConfiguredMenu, MenuChoiceDefinition } from './menu';
 import { createAndDisplayDialog } from '../dialogs/dialog';
 
 declare var $: any;
@@ -10,15 +10,82 @@ declare var $: any;
 export class SuiVoiceMenu extends SuiConfiguredMenu {
   constructor(params: SuiMenuParams) {
     super(params, 'Voices', SuiVoiceMenuOptions);
-  }  
+  }
+}
+class voiceSwapperMenuOption implements SuiConfiguredMenuOption {
+  voice1: number;
+  voice2: number;
+  cmd: string;
+  label: string;
+  get menuChoice(): MenuChoiceDefinition  {
+    return {
+      icon: '',
+      text: this.label,
+      value: this.cmd
+    }
+  }
+  constructor(voice1: number, voice2: number) {
+    this.voice1 = voice1;
+    this.voice2 = voice2;
+    this.label = `Swap ${voice1 + 1} and ${voice2 + 1}`;
+    this.cmd = `${voice1}To${voice2}`;
+  }
+  async handler(menu: SuiMenuBase) {
+    menu.view.swapVoices(this.voice1, this.voice2);
+  }
+  display(menu: SuiMenuBase) {
+    const measures = menu.view.tracker.getSelectedMeasures();
+    if (measures.length > 0) {
+        const sel = measures[0];
+        const swaps = sel.measure.getSwapVoicePairs();
+        for (let i = 0; i < swaps.length; ++i) {
+          const pair = swaps[i];
+          if (this.voice1 == pair[0] && this.voice2 == pair[1]) {
+            return true;
+          }
+      }
+    }
+    return false;
+  }
+}
+class selectVoiceMenuOption implements SuiConfiguredMenuOption {
+  voice: number;
+  constructor(voice: number) {
+    this.voice = voice;
+  }
+  async handler (menu: SuiMenuBase)  {
+    await menu.view.populateVoice(this.voice);
+  }
+  display (menu: SuiMenuBase) {
+    for (let i = 0; i < menu.view.tracker.selections.length; ++i) {
+      const mm = menu.view.tracker.selections[i].measure;
+      if (mm.voices.length === 1) {
+        return this.voice === 1;
+      }
+      // If there are n voices, and I am n+1, show option
+      if (mm.voices.length === this.voice) {
+        return true;
+      }
+      if (mm.voices.length > this.voice && mm.getActiveVoice() !== this.voice) {
+        return true;
+      }
+    }
+    return false;
+  }
+  get menuChoice()  {
+    return {
+      icon: '',
+      text: `Voice ${this.voice + 1}`,
+      value: `voice${this.voice.toString()}`
+    };
+  }
 }
-
 /**
  * @category SuiMenu
  */
 const selectVoiceOneMenuOption: SuiConfiguredMenuOption = {
   handler: async (menu: SuiMenuBase) => {
-    menu.view.populateVoice(0);
+    await menu.view.populateVoice(0);
   }, display: (menu: SuiMenuBase) => {
     for (let i = 0; i < menu.view.tracker.selections.length; ++i) {
       const mm = menu.view.tracker.selections[i].measure;
@@ -39,11 +106,11 @@ const selectVoiceOneMenuOption: SuiConfiguredMenuOption = {
  */
 const selectVoiceTwoMenuOption: SuiConfiguredMenuOption = {
   handler: async (menu: SuiMenuBase) => {
-    menu.view.populateVoice(1);
+    await menu.view.populateVoice(1);
   }, display: (menu: SuiMenuBase) => {
     for (let i = 0; i < menu.view.tracker.selections.length; ++i) {
       const mm = menu.view.tracker.selections[i].measure;
-      if (mm.voices.length < 4) {
+      if (mm.voices.length <= 4 && mm.voices.length > 1) {
         return true;
       }
     }
@@ -60,7 +127,7 @@ const selectVoiceTwoMenuOption: SuiConfiguredMenuOption = {
  */
 const selectVoiceThreeMenuOption: SuiConfiguredMenuOption = {
   handler: async (menu: SuiMenuBase) => {
-    menu.view.populateVoice(2);
+    await menu.view.populateVoice(2);
   }, display: (menu: SuiMenuBase) => {
     for (let i = 0; i < menu.view.tracker.selections.length; ++i) {
       const mm = menu.view.tracker.selections[i].measure;
@@ -81,7 +148,7 @@ const selectVoiceThreeMenuOption: SuiConfiguredMenuOption = {
  */
 const selectVoiceFourMenuOption: SuiConfiguredMenuOption = {
   handler: async (menu: SuiMenuBase) => {
-    menu.view.populateVoice(3);
+    await menu.view.populateVoice(3);
   }, display: (menu: SuiMenuBase) => {
     for (let i = 0; i < menu.view.tracker.selections.length; ++i) {
       const mm = menu.view.tracker.selections[i].measure;
@@ -102,7 +169,7 @@ const selectVoiceFourMenuOption: SuiConfiguredMenuOption = {
  */
 const removeVoiceMenuOption: SuiConfiguredMenuOption = {
   handler: async (menu: SuiMenuBase) => {
-    menu.view.depopulateVoice();
+    await menu.view.depopulateVoice();
   }, display: (menu: SuiMenuBase) => {
     for (let i = 0; i < menu.view.tracker.selections.length; ++i) {
       const mm = menu.view.tracker.selections[i].measure;
@@ -123,6 +190,15 @@ const removeVoiceMenuOption: SuiConfiguredMenuOption = {
  * @category SuiMenu
  */
 const SuiVoiceMenuOptions: SuiConfiguredMenuOption[] = [
-  selectVoiceOneMenuOption, selectVoiceTwoMenuOption, selectVoiceThreeMenuOption, selectVoiceFourMenuOption,
+  new selectVoiceMenuOption(0),
+  new selectVoiceMenuOption(1),
+  new selectVoiceMenuOption(2),
+  new selectVoiceMenuOption(3),
+   new voiceSwapperMenuOption(0, 1),  
+   new voiceSwapperMenuOption(0, 2),
+   new voiceSwapperMenuOption(0, 3),
+   new voiceSwapperMenuOption(1, 2),
+   new voiceSwapperMenuOption(1, 3),
+   new voiceSwapperMenuOption(2, 3),
   removeVoiceMenuOption
 ];

package/build/html/loading-unittest.html

@@ -1,40 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-  <meta charset="utf-8">
-  <title>Smoosic Unit Tests</title>
-  <link href="../styles/fonts.css" rel="stylesheet">
-  <link href="../styles/media.css" rel="stylesheet">
-  <link href="../styles/ribbon.css" rel="stylesheet">
-  <link href="../styles/dialogs.css" rel="stylesheet">
-  <link href="../styles/menus.css" rel="stylesheet">
-  <link href="../styles/piano.css" rel="stylesheet">
-  <link href="../styles/tree.css" rel="stylesheet">
-  <link href="../qunit.css" rel="stylesheet">
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.6.0/jszip.min.js"
-    integrity="sha512-uVSVjE7zYsGz4ag0HEzfugJ78oHCI1KhdkivjQro8ABL/PRiEO4ROwvrolYAcZnky0Fl/baWKYilQfWvESliRA=="
-    crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-  <!-- script type="text/javascript" src="../../../vex_smoosic/vexflow_smoosic/build/vexflow-debug.js"></script  -->
-  <script type="text/javascript" src="https://code.jquery.com/jquery-3.3.1.slim.js"></script>
-  <script type="text/javascript" src="../smoosic.js"></script>
-  <script type="text/javascript">
-    document.addEventListener("DOMContentLoaded", function (event) {
-      Smo.createLoadTests();
-    });
-  </script>
-</head>
-
-<body>
-  <div id="qunit"></div>
-  <div id="qunit-fixture"></div>
-  <!-- audio crossOrigin="anonymous" id="sample" src="https://aarondavidnewman.github.io/Smoosic/build/sound/piano_middle_C.mp3" / -->
-  <div id="outer-container" style="overflow:auto">
-    <div id="container1">
-
-    </div>
-  </div>
-
-</body>
-
-</html>

package/build/html/translator.html

@@ -1,35 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
-<head>
-		<meta charset="utf-8">
-		<title>Smoosic Editor</title>
-		<link href="https://aarondavidnewman.github.io/Smoosic/build/styles/fonts.css" rel="stylesheet">
-        <link href="../styles/media.css" rel="stylesheet">
-        <link href="https://aarondavidnewman.github.io/Smoosic/build/styles/ribbon.css" rel="stylesheet">
-        <link href="https://aarondavidnewman.github.io/Smoosic/build/styles/dialogs.css" rel="stylesheet">
-        <link href="https://aarondavidnewman.github.io/Smoosic/build/styles/menus.css" rel="stylesheet">
-        <link href="https://aarondavidnewman.github.io/Smoosic/build/styles/piano.css" rel="stylesheet">
-        <link href="https://aarondavidnewman.github.io/Smoosic/build/styles/tree.css" rel="stylesheet">
-        <script type="text/javascript" src="https://aarondavidnewman.github.io/vexflow_smoosic/releases/vexflow-debug.js"></script>
-        <!-- script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.6.0/jszip.min.js" integrity="sha512-uVSVjE7zYsGz4ag0HEzfugJ78oHCI1KhdkivjQro8ABL/PRiEO4ROwvrolYAcZnky0Fl/baWKYilQfWvESliRA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script -->
-        <!-- script type="text/javascript" src="../../../vex_smoosic/vexflow_smoosic/build/vexflow-debug.js"></script -->
-        <script type="text/javascript" src="https://code.jquery.com/jquery-3.3.1.slim.js" ></script>
-        <script type="text/javascript" src="../jszip.js"></script>
-		<script type="text/javascript" src="../smoosic.js" ></script>
-    <script type="text/javascript">
-           document.addEventListener("DOMContentLoaded", function (event) {
-               var config = { smoPath: '..', mode: 'translate', language: 'de', scoreDomContainer: 'smoo' };
-               Smo.SuiApplication.configure(config);
-           });
-       </script>
-</head>
-<body>
-  <sub id="link-hdr"><a href="https://github.com/AaronDavidNewman/smoosic">Github site</a> | 
-    <a href="https://aarondavidnewman.github.io/Smoosic/release/docs/modules.html">source documentation</a> | 
-    <a href="https://aarondavidnewman.github.io/Smoosic/changes.html">change notes</a> |
-     <a href="https://aarondavidnewman.github.io/Smoosic/release/html/smoosic.html">application</a><button class="close-header"><span class="icon icon-cross"></span></button></sub>
-  <!-- audio crossOrigin="anonymous" id="sample" src="https://aarondavidnewman.github.io/Smoosic/build/sound/piano_middle_C.mp3" / -->
-<div id="smoo"> 
-</div>
-</body>
-</html>