null test 0.15.6

cuthbertLab · Mar 8, 2024 · 99c3a42 · 99c3a42
1 parent 01505e4
commit 99c3a42
Showing 62 changed files with 22 additions and 149 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "music21j",
-  "version": "0.15.5",
+  "version": "0.15.6",
   "description": "A toolkit for computer-aided musicology, Javascript version",
   "main": "releases/music21.debug.js",
   "typings": "releases/src/main.d.ts",

diff --git a/releases/music21.debug.js b/releases/music21.debug.js
@@ -13687,6 +13687,9 @@ class Lyric extends _prebase__WEBPACK_IMPORTED_MODULE_3__.ProtoM21Object {
       lyric_line = -3
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var _a, _b;
+    if (!this.text) {
+      return null;
+    }
     const font = _extends({}, default_vf_lyric_style);
     const style = this.style;
     if (style.fontFamily) {
@@ -13842,9 +13845,13 @@ class GeneralNote extends _base__WEBPACK_IMPORTED_MODULE_4__.Music21Object {
     var _a, _b;
     const lyric_line = (_b = (_a = this.activeSite) === null || _a === void 0 ? void 0 : _a.renderOptions.lyricsLine) !== null && _b !== void 0 ? _b : -3;
     for (const l of this.lyrics) {
-      vfn.addModifier(l.vexflowLyric({
+      const vf_lyric = l.vexflowLyric({
         lyric_line
-      }), 0);
+      });
+      if (!vf_lyric) {
+        continue;
+      }
+      vfn.addModifier(vf_lyric, 0);
     }
   }
   /**

diff --git a/releases/music21.debug.js.map b/releases/music21.debug.js.map
diff --git a/releases/src/note.d.ts b/releases/src/note.d.ts
@@ -80,7 +80,7 @@ export declare class Lyric extends prebase.ProtoM21Object {
      * set applyRaw = false if hyphens should not be applied
      */
     setTextAndSyllabic(rawText: string, applyRaw?: boolean): this;
-    vexflowLyric({ lyric_line }?: VexflowLyricOptions): VFLyricAnnotation;
+    vexflowLyric({ lyric_line }?: VexflowLyricOptions): VFLyricAnnotation | null;
 }
 /**
  * Superclass for all Note values

diff --git a/releases/src/note.d.ts.map b/releases/src/note.d.ts.map
diff --git a/releases/tests/loadAll.d.ts b/releases/tests/loadAll.d.ts
diff --git a/releases/tests/loadAll.d.ts.map b/releases/tests/loadAll.d.ts.map
diff --git a/releases/tests/moduleTests/articulations.d.ts b/releases/tests/moduleTests/articulations.d.ts
diff --git a/releases/tests/moduleTests/articulations.d.ts.map b/releases/tests/moduleTests/articulations.d.ts.map
diff --git a/releases/tests/moduleTests/base.d.ts b/releases/tests/moduleTests/base.d.ts
diff --git a/releases/tests/moduleTests/base.d.ts.map b/releases/tests/moduleTests/base.d.ts.map
diff --git a/releases/tests/moduleTests/beam.d.ts b/releases/tests/moduleTests/beam.d.ts
diff --git a/releases/tests/moduleTests/beam.d.ts.map b/releases/tests/moduleTests/beam.d.ts.map
diff --git a/releases/tests/moduleTests/chord.d.ts b/releases/tests/moduleTests/chord.d.ts
diff --git a/releases/tests/moduleTests/chord.d.ts.map b/releases/tests/moduleTests/chord.d.ts.map
diff --git a/releases/tests/moduleTests/clef.d.ts b/releases/tests/moduleTests/clef.d.ts
diff --git a/releases/tests/moduleTests/clef.d.ts.map b/releases/tests/moduleTests/clef.d.ts.map
diff --git a/releases/tests/moduleTests/common.d.ts b/releases/tests/moduleTests/common.d.ts
diff --git a/releases/tests/moduleTests/common.d.ts.map b/releases/tests/moduleTests/common.d.ts.map
diff --git a/releases/tests/moduleTests/duration.d.ts b/releases/tests/moduleTests/duration.d.ts
diff --git a/releases/tests/moduleTests/duration.d.ts.map b/releases/tests/moduleTests/duration.d.ts.map
diff --git a/releases/tests/moduleTests/dynamics.d.ts b/releases/tests/moduleTests/dynamics.d.ts
diff --git a/releases/tests/moduleTests/dynamics.d.ts.map b/releases/tests/moduleTests/dynamics.d.ts.map
diff --git a/releases/tests/moduleTests/editorial.d.ts b/releases/tests/moduleTests/editorial.d.ts
diff --git a/releases/tests/moduleTests/editorial.d.ts.map b/releases/tests/moduleTests/editorial.d.ts.map
diff --git a/releases/tests/moduleTests/figuredBass.d.ts b/releases/tests/moduleTests/figuredBass.d.ts
diff --git a/releases/tests/moduleTests/figuredBass.d.ts.map b/releases/tests/moduleTests/figuredBass.d.ts.map
diff --git a/releases/tests/moduleTests/interval.d.ts b/releases/tests/moduleTests/interval.d.ts
diff --git a/releases/tests/moduleTests/interval.d.ts.map b/releases/tests/moduleTests/interval.d.ts.map
diff --git a/releases/tests/moduleTests/key.d.ts b/releases/tests/moduleTests/key.d.ts
diff --git a/releases/tests/moduleTests/key.d.ts.map b/releases/tests/moduleTests/key.d.ts.map
diff --git a/releases/tests/moduleTests/meter.d.ts b/releases/tests/moduleTests/meter.d.ts
diff --git a/releases/tests/moduleTests/meter.d.ts.map b/releases/tests/moduleTests/meter.d.ts.map
diff --git a/releases/tests/moduleTests/note.d.ts b/releases/tests/moduleTests/note.d.ts
diff --git a/releases/tests/moduleTests/note.d.ts.map b/releases/tests/moduleTests/note.d.ts.map
diff --git a/releases/tests/moduleTests/pitch.d.ts b/releases/tests/moduleTests/pitch.d.ts
diff --git a/releases/tests/moduleTests/pitch.d.ts.map b/releases/tests/moduleTests/pitch.d.ts.map
diff --git a/releases/tests/moduleTests/prebase.d.ts b/releases/tests/moduleTests/prebase.d.ts
diff --git a/releases/tests/moduleTests/prebase.d.ts.map b/releases/tests/moduleTests/prebase.d.ts.map
diff --git a/releases/tests/moduleTests/roman.d.ts b/releases/tests/moduleTests/roman.d.ts