notehead metrics

Author: rvilarl

src/annotation.ts

@@ -73,7 +73,7 @@ export class Annotation extends Modifier {
   // words don't run into each other.
   static get minAnnotationPadding(): number {
     const musicFont = Tables.currentMusicFont();
-    return musicFont.lookupMetric('glyphs.noteHead.minPadding');
+    return musicFont.lookupMetric('noteHead.minPadding');
   }
   /** Arrange annotations within a `ModifierContext` */
   static format(annotations: Annotation[], state: ModifierContextState): boolean {

src/chordsymbol.ts

@@ -270,7 +270,7 @@ export class ChordSymbol extends Modifier {
 
   static get minPadding(): number {
     const musicFont = Tables.currentMusicFont();
-    return musicFont.lookupMetric('glyphs.noteHead.minPadding');
+    return musicFont.lookupMetric('noteHead.minPadding');
   }
   /**
    * Estimate the width of the whole chord symbol, based on the sum of the widths of the individual blocks.

src/font.ts

@@ -1,4 +1,5 @@
 import { ChordSymbolMetrics } from './chordsymbol';
+import { NoteHeadMetrics } from './notehead';
 import { OrnamentMetrics } from './ornament';
 import { StringNumberMetrics } from './stringnumber';
 import { defined } from './util';
@@ -43,10 +44,9 @@ export interface FontMetrics extends Record<string, any> {
   // Not specified in gonville_metrics.ts.
   articulation?: Record<string, Record<string, number>>;
   tremolo?: Record<string, Record<string, number>>;
-  // Not specified in bravura_metrics.ts or gonville_metrics.ts.
-  noteHead?: Record<string, Record<string, number>>;
   chordSymbol?: ChordSymbolMetrics;
   ornament?: Record<string, OrnamentMetrics>;
+  noteHead?: NoteHeadMetrics;
   stringNumber?: StringNumberMetrics;
   // eslint-disable-next-line
   glyphs: Record<string, Record<string, any>>;

src/fonts/bravura_metrics.ts

@@ -308,8 +308,9 @@ export const BravuraMetrics = {
     },
   },
 
-  // noteHead: {
-  // },
+  noteHead: {
+    minPadding: 2,
+  },
 
   stem: {
     heightAdjustmentForFlag: -3,
@@ -493,14 +494,11 @@ export const BravuraMetrics = {
       },
     },
     noteHead: {
-      minPadding: 2,
-      standard: {
-        restQuarterStemUp: {
-          point: 35,
-        },
-        restQuarterStemDown: {
-          point: 35,
-        },
+      restQuarterStemUp: {
+        point: 35,
+      },
+      restQuarterStemDown: {
+        point: 35,
       },
     },
     chordSymbol: {

src/fonts/gonville_metrics.ts

@@ -299,8 +299,9 @@ export const GonvilleMetrics = {
     },
   },
 
-  // noteHead: {
-  // },
+  noteHead: {
+    minPadding: 2,
+  },
 
   stem: {
     heightAdjustmentForFlag: -3,
@@ -392,9 +393,6 @@ export const GonvilleMetrics = {
         shiftY: 4,
       },
     },
-    noteHead: {
-      minPadding: 2,
-    },
     chordSymbol: {
       csymDiminished: {
         scale: 0.8,

src/fonts/leland_metrics.ts

@@ -304,8 +304,9 @@ export const LelandMetrics = {
     },
   },
 
-  // noteHead: {
-  // },
+  noteHead: {
+    minPadding: 2,
+  },
 
   stem: {
     heightAdjustmentForFlag: -3,
@@ -489,14 +490,11 @@ export const LelandMetrics = {
       },
     },
     noteHead: {
-      minPadding: 2,
-      standard: {
-        restQuarterStemUp: {
-          point: 35,
-        },
-        restQuarterStemDown: {
-          point: 35,
-        },
+      restQuarterStemUp: {
+        point: 35,
+      },
+      restQuarterStemDown: {
+        point: 35,
       },
     },
     chordSymbol: {

src/fonts/petaluma_metrics.ts

@@ -308,9 +308,8 @@ export const PetalumaMetrics = {
   },
 
   noteHead: {
-    displaced: {
-      shiftX: -2,
-    },
+    minPadding: 2,
+    displacedShiftX: -2,
   },
 
   stem: {
@@ -513,17 +512,14 @@ export const PetalumaMetrics = {
       },
     },
     noteHead: {
-      minPadding: 2,
-      standard: {
-        noteheadBlackStemUp: {
-          shiftX: 0.5,
-        },
-        noteheadHalfStemUp: {
-          shiftX: 0.725,
-        },
-        noteheadWholeStemUp: {
-          shiftX: 1,
-        },
+      noteheadBlackStemUp: {
+        shiftX: 0.5,
+      },
+      noteheadHalfStemUp: {
+        shiftX: 0.725,
+      },
+      noteheadWholeStemUp: {
+        shiftX: 1,
       },
     },
     chordSymbol: {

src/notehead.ts

@@ -17,6 +17,10 @@ function L(...args: any[]) {
   if (NoteHead.DEBUG) log('Vex.Flow.NoteHead', args);
 }
 
+export interface NoteHeadMetrics {
+  minPadding?: number;
+  displacedShiftX?: number;
+}
 export interface NoteHeadStruct extends NoteStruct {
   line?: number;
   glyph_font_scale?: number;
@@ -217,7 +221,7 @@ export class NoteHead extends Note {
     const displacementStemAdjustment = Stem.WIDTH / 2;
     const musicFont = Tables.currentMusicFont();
     const fontShift = musicFont.lookupMetric('notehead.shiftX', 0) * this.stem_direction;
-    const displacedFontShift = musicFont.lookupMetric('noteHead.displaced.shiftX', 0) * this.stem_direction;
+    const displacedFontShift = musicFont.lookupMetric('noteHead.displacedShiftX', 0) * this.stem_direction;
 
     return (
       x +
@@ -290,7 +294,7 @@ export class NoteHead extends Note {
       drawSlashNoteHead(ctx, this.duration, head_x, y, stem_direction, staveSpace);
     } else {
       Glyph.renderGlyph(ctx, head_x, y, glyph_font_scale, this.glyph_code, {
-        category: `noteHead.standard.${categorySuffix}`,
+        category: `noteHead.${categorySuffix}`,
       });
     }
   }

src/ornament.ts

@@ -41,7 +41,7 @@ export class Ornament extends Modifier {
   }
   static get minPadding(): number {
     const musicFont = Tables.currentMusicFont();
-    return musicFont.lookupMetric('glyphs.noteHead.minPadding');
+    return musicFont.lookupMetric('noteHead.minPadding');
   }
 
   protected ornament: {

src/stavenote.ts

@@ -123,7 +123,7 @@ export class StaveNote extends StemmableNote {
 
   static get minNoteheadPadding(): number {
     const musicFont = Tables.currentMusicFont();
-    return musicFont.lookupMetric('glyphs.noteHead.minPadding');
+    return musicFont.lookupMetric('noteHead.minPadding');
   }
 
   /** Format notes inside a ModifierContext. */