Merge pull request #1487 from rvilarl/refactor/metricsStep

Refactor FontMetrics: stringnumber

Author: rvilarl

src/font.ts

@@ -1,3 +1,4 @@
+import { StringNumberMetrics } from './stringnumber';
 import { defined } from './util';
 
 export interface FontInfo {
@@ -42,6 +43,7 @@ export interface FontMetrics extends Record<string, any> {
   tremolo?: Record<string, Record<string, number>>;
   // Not specified in bravura_metrics.ts or gonville_metrics.ts.
   noteHead?: Record<string, Record<string, number>>;
+  stringNumber?: StringNumberMetrics;
   // eslint-disable-next-line
   glyphs: Record<string, Record<string, any>>;
 }

src/fonts/bravura_metrics.ts

@@ -203,6 +203,13 @@ export const BravuraMetrics = {
     },
   },
 
+  stringNumber: {
+    verticalPadding: 8,
+    stemPadding: 2,
+    leftPadding: 5,
+    rightPadding: 6,
+  },
+
   // Values under here are used by the Glyph class to reposition and rescale
   // glyphs based on their category. This should be the first stop for
   // custom font glyph repositioning.
@@ -244,12 +251,6 @@ export const BravuraMetrics = {
         scale: 1.2,
       },
     },
-    stringNumber: {
-      verticalPadding: 8,
-      stemPadding: 2,
-      leftPadding: 5,
-      rightPadding: 6,
-    },
     stroke: {
       arrowheadBlackDown: {
         straight: {

src/fonts/gonville_metrics.ts

@@ -193,6 +193,13 @@ export const GonvilleMetrics = {
     },
   },
 
+  stringNumber: {
+    verticalPadding: 8,
+    stemPadding: 2,
+    leftPadding: 5,
+    rightPadding: 6,
+  },
+
   glyphs: {
     flag: {
       shiftX: -0.08,
@@ -224,12 +231,6 @@ export const GonvilleMetrics = {
         shiftY: -22,
       },
     },
-    stringNumber: {
-      verticalPadding: 8,
-      stemPadding: 2,
-      leftPadding: 5,
-      rightPadding: 6,
-    },
     textNote: {
       point: 40,
       default: {},

src/fonts/leland_metrics.ts

@@ -199,6 +199,13 @@ export const LelandMetrics = {
     },
   },
 
+  stringNumber: {
+    verticalPadding: 8,
+    stemPadding: 2,
+    leftPadding: 5,
+    rightPadding: 6,
+  },
+
   // Values under here are used by the Glyph class to reposition and rescale
   // glyphs based on their category. This should be the first stop for
   // custom font glyph repositioning.
@@ -240,12 +247,6 @@ export const LelandMetrics = {
         scale: 1.2,
       },
     },
-    stringNumber: {
-      verticalPadding: 8,
-      stemPadding: 2,
-      leftPadding: 5,
-      rightPadding: 6,
-    },
     stroke: {
       arrowheadBlackDown: {
         straight: {

src/fonts/petaluma_metrics.ts

@@ -207,6 +207,13 @@ export const PetalumaMetrics = {
     },
   },
 
+  stringNumber: {
+    verticalPadding: 8,
+    stemPadding: 2,
+    leftPadding: 5,
+    rightPadding: 6,
+  },
+
   // Values under here are used by the Glyph class to reposition and rescale
   // glyphs based on their category. This should be the first stop for
   // custom font glyph repositioning.
@@ -272,12 +279,6 @@ export const PetalumaMetrics = {
         scale: 1.2,
       },
     },
-    stringNumber: {
-      verticalPadding: 8,
-      stemPadding: 2,
-      leftPadding: 5,
-      rightPadding: 6,
-    },
     stroke: {
       arrowheadBlackDown: {
         straight: {

src/stringnumber.ts

@@ -15,6 +15,13 @@ import { Tables } from './tables';
 import { Category, isStaveNote, isStemmableNote } from './typeguard';
 import { RuntimeError } from './util';
 
+export interface StringNumberMetrics {
+  verticalPadding: number;
+  stemPadding: number;
+  leftPadding: number;
+  rightPadding: number;
+}
+
 export class StringNumber extends Modifier {
   static get CATEGORY(): string {
     return Category.StringNumber;
@@ -27,9 +34,15 @@ export class StringNumber extends Modifier {
     style: FontStyle.NORMAL,
   };
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  static get metrics(): any {
-    return Tables.currentMusicFont().getMetrics().glyphs.stringNumber;
+  static get metrics(): StringNumberMetrics {
+    return (
+      Tables.currentMusicFont().getMetrics().stringNumber ?? {
+        verticalPadding: 0,
+        stemPadding: 0,
+        leftPadding: 0,
+        rightPadding: 0,
+      }
+    );
   }
 
   // ## Static Methods