fix bugs with text brackets

AaronDavidNewman · Dec 16, 2023 · ef6860f · ef6860f
1 parent 3435bdc
commit ef6860f
Show file tree

Hide file tree

Showing 13 changed files with 22,920 additions and 16,497 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "typeDocServer.definitionFiles": []
+}
diff --git a/build/html/smoosic.html b/build/html/smoosic.html
@@ -46,6 +46,14 @@
     <audio crossOrigin="anonymous" id="samplebb4" data-pitch="bb/4" data-patch="piano"
       src="https://aarondavidnewman.github.io/SmoSounds/piano/piano-bb4-iowa.mp3"> </audio>
   </div>
+  <div>
+    <audio crossOrigin="anonymous" id="sample-piano-a2" data-pitch="a/2" data-patch="piano"
+      src="https://aarondavidnewman.github.io/SmoSounds/piano/piano-a2.mp3"> </audio>
+  </div>
+  <div>
+    <audio crossOrigin="anonymous" id="sample-piano-fs2" data-pitch="fs/2" data-patch="piano"
+      src="https://aarondavidnewman.github.io/SmoSounds/piano/piano-fs2.mp3"> </audio>
+  </div>
   <div>
     <audio crossOrigin="anonymous" id="sample-cello-bb3" data-pitch="bb/3" data-patch="cello"
       src="https://aarondavidnewman.github.io/SmoSounds/strings/cello-bb3-iowa.mp3">

diff --git a/release/html/smoosic.html b/release/html/smoosic.html
@@ -46,6 +46,14 @@
     <audio crossOrigin="anonymous" id="samplebb4" data-pitch="bb/4" data-patch="piano"
       src="https://aarondavidnewman.github.io/SmoSounds/piano/piano-bb4-iowa.mp3"> </audio>
   </div>
+  <div>
+    <audio crossOrigin="anonymous" id="sample-piano-a2" data-pitch="a/2" data-patch="piano"
+      src="https://aarondavidnewman.github.io/SmoSounds/piano/piano-a2.mp3"> </audio>
+  </div>
+  <div>
+    <audio crossOrigin="anonymous" id="sample-piano-fs2" data-pitch="fs/2" data-patch="piano"
+      src="https://aarondavidnewman.github.io/SmoSounds/piano/piano-fs2.mp3"> </audio>
+  </div>
   <div>
     <audio crossOrigin="anonymous" id="sample-cello-bb3" data-pitch="bb/3" data-patch="cello"
       src="https://aarondavidnewman.github.io/SmoSounds/strings/cello-bb3-iowa.mp3">

diff --git a/release/smoosic.js b/release/smoosic.js
diff --git a/release/smoosic.js.map b/release/smoosic.js.map
diff --git a/src/common/vex.ts b/src/common/vex.ts
@@ -385,8 +385,8 @@ export function getChordSymbolMetricsForGlyph(code: string) {
   if (code === '#') {
     code = 'accidentalSharp';
   }
-  const glyphMetrics = VexChordSymbol.metrics;
-  return (glyphMetrics as any)[code];
+  const glyphMetrics = VexChordSymbol.metrics.glyphs;
+  return glyphMetrics[code];
 }
 /**
  * Vex 5 compatibility.  yShift

diff --git a/src/render/audio/oscillator.ts b/src/render/audio/oscillator.ts
@@ -435,6 +435,7 @@ export class SuiSampler extends SuiOscillator {
     if (!sample) {
       return node;
     }
+
     const cents = 1200 * (Math.log(this.frequency / sample!.frequency))
       / Math.log(2);
 

diff --git a/src/render/audio/samples.ts b/src/render/audio/samples.ts
@@ -145,6 +145,26 @@ export class SuiSampleMedia {
       instrument: 'piano',
       nativeFrequency: SmoAudioPitch.smoPitchToFrequency({ letter: 'b', accidental: 'b', octave: 4 }, 0, null),
     });
+    SuiSampleMedia.insertIntoMap({
+      sustain: 'percussive',
+      realOvertones: [],
+      imaginaryOvertones: [],
+      sample: 'sample-piano-a2',
+      family: 'keyboard',
+      instrument: 'piano',
+      dynamic: 50,
+      nativeFrequency: SmoAudioPitch.smoPitchToFrequency({ letter: 'a', accidental: 'n', octave: 2 }, 0, null),
+    });
+    SuiSampleMedia.insertIntoMap({
+      sustain: 'percussive',
+      realOvertones: [],
+      imaginaryOvertones: [],
+      sample: 'sample-piano-fs2',
+      family: 'keyboard',
+      instrument: 'piano',
+      dynamic: 50,
+      nativeFrequency: SmoAudioPitch.smoPitchToFrequency({ letter: 'f', accidental: '#', octave: 2 }, 0, null),
+    });
     SuiSampleMedia.insertIntoMap({
       sustain: 'percussive',
       sample: 'basspizz-c2-sso',

diff --git a/src/render/sui/mapper.ts b/src/render/sui/mapper.ts
@@ -133,7 +133,7 @@ export abstract class SuiMapper {
         this.localModifiers.push({ index, selection: sel, modifier: tempo, box: tempo.logicalBox ?? SvgBox.default });
         index += 1;
       });
-      sel.staff.getModifiers().forEach((mod) => {
+      sel.staff.renderableModifiers.forEach((mod) => {
         if (SmoSelector.gteq(sel.selector, mod.startSelector) &&
           SmoSelector.lteq(sel.selector, mod.endSelector) && mod.logicalBox)  {
           const exists = this.localModifiers.find((mm) => mm.modifier.ctor === mod.ctor);

diff --git a/src/render/sui/scoreRender.ts b/src/render/sui/scoreRender.ts
@@ -160,7 +160,7 @@ export class SuiScoreRender {
     staff.measures.forEach((measure) => {
       this.unrenderMeasure(measure);
     });
-    staff.modifiers.forEach((modifier) => {
+    staff.renderableModifiers.forEach((modifier) => {
       if (modifier.element) {
         modifier.element.remove();
         modifier.element = null;

diff --git a/src/render/sui/scoreViewOperations.ts b/src/render/sui/scoreViewOperations.ts
@@ -1461,7 +1461,7 @@ export class SuiScoreViewOperations extends SuiScoreView {
         this.renderer.unrenderMeasure(staff.measures[staff.measures.length - 1]);
         // A little hacky - delete the modifiers if they start or end on
         // the measure
-        staff.modifiers.forEach((modifier) => {
+        staff.renderableModifiers.forEach((modifier) => {
           if (modifier.startSelector.measure === index || modifier.endSelector.measure === index) {
             if (modifier.logicalBox) {
               const context = this.renderer.renderer.getRenderer(modifier.logicalBox);

diff --git a/src/smo/data/staffModifiers.ts b/src/smo/data/staffModifiers.ts
@@ -494,9 +494,9 @@ export interface SmoStaffTextBracketParamsSer extends StaffModifierBaseSer{
 function isSmoStaffTextBracketParamsSer(params: Partial<SmoStaffTextBracketParamsSer>):
   params is SmoStaffTextBracketParamsSer {
     if (params.ctor && params.ctor === 'SmoStaffTextBracket') {
-      return false;
+      return true;
     }
-    return true;
+    return false;
 }
 export type SmoTextBracketStringType = 'text' | 'superscript';
 export const SmoTextBracketStringTypes: SmoTextBracketStringType[] = ['text', 'superscript'];

diff --git a/src/smo/data/systemStaff.ts b/src/smo/data/systemStaff.ts
@@ -455,7 +455,7 @@ export class SmoSystemStaff implements SmoObjectParams {
     return rv;
   }
   getModifier(modData: any) {
-    return this.getModifiers().find((mod) =>
+    return this.renderableModifiers.find((mod) =>
       SmoSelector.eq(mod.startSelector, modData.startSelector) && mod.attrs.type === modData.attrs.type);
   }
   setLyricFont(fontInfo: FontInfo) {