Merge pull request #1531 from rvilarl/fix/1523/bravuraLelandPetaluma

Fix/1523/bravura leland petaluma

Author: ronyeh

entry/vexflow-font-bravura.ts

@@ -9,11 +9,11 @@
 // Then you will need to import the xxx_glyphs.ts and xxx_metrics.ts files.
 
 import { BravuraFont } from '../src/fonts/bravura_glyphs';
-import { BravuraMetrics } from '../src/fonts/bravura_metrics';
+import { CommonMetrics } from '../src/fonts/common_metrics';
 
 export const Font = {
   data: BravuraFont,
-  metrics: BravuraMetrics,
+  metrics: CommonMetrics,
 };
 
 export default Font;

entry/vexflow-font-leland.ts

@@ -1,11 +1,11 @@
 // [VexFlow](https://vexflow.com) - Copyright (c) Mohit Muthanna 2010.
 // MIT License
 
+import { CommonMetrics } from '../src/fonts/common_metrics';
 import { LelandFont } from '../src/fonts/leland_glyphs';
-import { LelandMetrics } from '../src/fonts/leland_metrics';
 
 export const Font = {
   data: LelandFont,
-  metrics: LelandMetrics,
+  metrics: CommonMetrics,
 };
 export default Font;

entry/vexflow-font-petaluma.ts

@@ -1,11 +1,11 @@
 // [VexFlow](https://vexflow.com) - Copyright (c) Mohit Muthanna 2010.
 // MIT License
 
+import { CommonMetrics } from '../src/fonts/common_metrics';
 import { PetalumaFont } from '../src/fonts/petaluma_glyphs';
-import { PetalumaMetrics } from '../src/fonts/petaluma_metrics';
 
 export const Font = {
   data: PetalumaFont,
-  metrics: PetalumaMetrics,
+  metrics: CommonMetrics,
 };
 export default Font;

src/font.ts

@@ -35,7 +35,6 @@ export interface FontData {
 /** Specified in the `xxx_metrics.ts` files. */
 // eslint-disable-next-line
 export interface FontMetrics extends Record<string, any> {
-  name: string;
   smufl: boolean;
   stave?: Record<string, number>;
   accidental?: Record<string, number>;