Merge branch 'develop'

package.json

@@ -70,7 +70,6 @@
     "eslint-plugin-node": "^8.0.0",
     "eslint-plugin-promise": "^4.0.1",
     "eslint-plugin-standard": "^4.0.0",
-    "file-loader": "^2.0.0",
     "html-webpack-plugin": "^3.2.0",
     "http-server": "^0.11.0",
     "jquery": "^3.2.1",
@@ -89,13 +88,13 @@
     "ts-loader": "^4.1.0",
     "tslint": "^5.8.0",
     "tslint-loader": "^3.5.3",
-    "typedoc": "^0.13.0",
+    "typedoc": "^0.14.2",
     "typescript": "^2.6.1",
-    "uglifyjs-webpack-plugin": "^2.0.0",
+    "uglifyjs-webpack-plugin": "^2.1.1",
     "underscore-template-loader": "^1.0.0",
     "webpack": "^4.25.0",
     "webpack-cli": "^3.0.8",
-    "webpack-dev-server": "3.1.10",
+    "webpack-dev-server": "3.1.14",
     "webpack-merge": "^4.1.2",
     "webpack-visualizer-plugin": "^0.1.11"
   },

src/MusicalScore/Graphical/VexFlow/VexFlowMeasure.ts

@@ -561,6 +561,18 @@ export class VexFlowMeasure extends GraphicalMeasure {
                     vfbeams = this.vfbeams[voiceID] = [];
                 }
                 for (const beam of this.beams[voiceID]) {
+                    let beamHasQuarterNoteOrLonger: boolean = false;
+                    for (const note of beam[0].Notes) {
+                        if (note.Length.RealValue >= new Fraction(1, 4).RealValue) {
+                            beamHasQuarterNoteOrLonger = true;
+                            break;
+                        }
+                    }
+                    if (beamHasQuarterNoteOrLonger) {
+                        log.debug("Beam between note >= quarter, likely tremolo, currently unsupported. continuing.");
+                        continue;
+                    }
+
                     const notes: Vex.Flow.StaveNote[] = [];
                     const psBeam: Beam = beam[0];
                     const voiceEntries: VexFlowVoiceEntry[] = beam[1];

src/MusicalScore/index.ts

@@ -9,3 +9,4 @@ export * from "./SubInstrument";
 export * from "./VoiceData";
 export * from "./MusicSource";
 export * from "./ScoreIO";
+export * from "./Graphical";

src/OpenSheetMusicDisplay/OpenSheetMusicDisplay.ts

@@ -24,6 +24,8 @@ import {AbstractExpression} from "../MusicalScore/VoiceData/Expressions/Abstract
  * After the constructor, use load() and render() to load and render a MusicXML file.
  */
 export class OpenSheetMusicDisplay {
+    private version: string = "0.6.6-dev"; // getter: this.Version
+
     /**
      * Creates and attaches an OpenSheetMusicDisplay object to an HTML element container.<br>
      * After the constructor, use load() and render() to load and render a MusicXML file.
@@ -503,5 +505,8 @@ export class OpenSheetMusicDisplay {
     public get DrawingParameters(): DrawingParameters {
         return this.drawingParameters;
     }
+    public get Version(): string {
+        return this.version;
+    }
     //#endregion
 }