FontStruct -> FontInfo

0xfe · Apr 18, 2021 · c533c8b · c533c8b
1 parent 714b1fe
commit c533c8b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/src/font.ts b/src/font.ts
@@ -7,15 +7,6 @@ import { PetalumaMetrics } from './fonts/petaluma_metrics';
 import { CustomFont } from './fonts/custom_glyphs';
 import { CustomMetrics } from './fonts/custom_metrics';
 
-export interface FontStruct {
-  size: number;
-  weight: string;
-  family: string;
-  style?: string;
-  font?: string;
-  face?: string;
-  point?: number;
-}
 export interface FontData {
   glyphs: Record<string, FontGlyph>;
   fontFamily?: string;

diff --git a/src/stave.ts b/src/stave.ts
@@ -14,8 +14,7 @@ import { Clef } from './clef';
 import { KeySignature } from './keysignature';
 import { TimeSignature } from './timesignature';
 import { Volta } from './stavevolta';
-import { FontStruct } from './font';
-import { Bounds, Tempo, FactoryRendererOptions, FactoryStaveOptions } from './types/common';
+import { Bounds, Tempo, FactoryRendererOptions, FactoryStaveOptions, FontInfo } from './types/common';
 export interface StaveLineConfig {
   visible: boolean;
 }
@@ -44,7 +43,7 @@ export interface StaveOptions {
   size?: string;
   renderer?: FactoryRendererOptions;
   stave?: FactoryStaveOptions;
-  font?: FontStruct;
+  font?: FontInfo;
   autoStem?: boolean;
   secondaryBeamBreaks?: never[];
   direction?: number;
@@ -73,7 +72,7 @@ export class Stave extends Element {
   protected formatted: boolean;
   protected end_x: number;
   protected measure: number;
-  protected font: FontStruct;
+  protected font: FontInfo;
   protected bounds: Bounds;
   protected readonly modifiers: StaveModifier[];
 

diff --git a/src/types/common.d.ts b/src/types/common.d.ts
@@ -1,3 +1,9 @@
+export interface FontInfo {
+  size: number;
+  weight: string;
+  family: string;
+}
+
 /** TODO: Move to Factory */
 export interface FactoryStaveOptions {
   space: number;