DefaultFontStack

0xfe · Jun 5, 2021 · 8460935 · 8460935
1 parent 6b7fe6b
commit 8460935
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/src/chordsymbol.js b/src/chordsymbol.js
@@ -8,8 +8,8 @@
 //
 // See `tests/chordsymbol_tests.js` for usage examples.
 
-import { Vex } from './vex';
 import { RuntimeError, log } from './util';
+import { DefaultFontStack } from './font';
 import { Flow } from './tables';
 import { Glyph } from './glyph';
 import { TextFont } from './textfont';
@@ -105,7 +105,7 @@ export class ChordSymbol extends Modifier {
   }
 
   static get engravingFontResolution() {
-    return Vex.Flow.DEFAULT_FONT_STACK[0].getResolution();
+    return DefaultFontStack[0].getResolution();
   }
 
   static get spacingBetweenBlocks() {
@@ -235,15 +235,15 @@ export class ChordSymbol extends Modifier {
   }
 
   static get chordSymbolMetrics() {
-    return Vex.Flow.DEFAULT_FONT_STACK[0].metrics.glyphs.chordSymbol;
+    return DefaultFontStack[0].metrics.glyphs.chordSymbol;
   }
 
   static get lowerKerningText() {
-    return Vex.Flow.DEFAULT_FONT_STACK[0].metrics.glyphs.chordSymbol.global.lowerKerningText;
+    return DefaultFontStack[0].metrics.glyphs.chordSymbol.global.lowerKerningText;
   }
 
   static get upperKerningText() {
-    return Vex.Flow.DEFAULT_FONT_STACK[0].metrics.glyphs.chordSymbol.global.upperKerningText;
+    return DefaultFontStack[0].metrics.glyphs.chordSymbol.global.upperKerningText;
   }
 
   // ### format

diff --git a/src/element.ts b/src/element.ts
@@ -8,7 +8,7 @@
 
 import { RuntimeError } from './util';
 import { Registry } from './registry';
-import { Flow } from './tables';
+import { DefaultFontStack } from './font';
 import { BoundingBox } from './boundingbox';
 import { Font } from './font';
 import { RenderContext } from './types/common';
@@ -62,8 +62,8 @@ export abstract class Element {
     };
 
     this.rendered = false;
-    this.fontStack = Flow.DEFAULT_FONT_STACK;
-    this.musicFont = Flow.DEFAULT_FONT_STACK[0];
+    this.fontStack = DefaultFontStack;
+    this.musicFont = DefaultFontStack[0];
 
     // If a default registry exist, then register with it right away.
     Registry.getDefaultRegistry()?.register(this);

diff --git a/src/formatter.ts b/src/formatter.ts
@@ -19,6 +19,7 @@
 
 import { Vex } from './vex';
 import { RuntimeError, log } from './util';
+import { DefaultFontStack } from './font';
 import { Beam } from './beam';
 import { Flow } from './tables';
 import { Fraction } from './fraction';
@@ -187,7 +188,7 @@ export class Formatter {
     options?: { stavePadding: number }
   ): void {
     options = {
-      stavePadding: Flow.DEFAULT_FONT_STACK[0].lookupMetric('stave.padding'),
+      stavePadding: DefaultFontStack[0].lookupMetric('stave.padding'),
       ...options,
     };
 

diff --git a/src/glyph.ts b/src/glyph.ts
@@ -1,7 +1,7 @@
 // [VexFlow](http://vexflow.com) - Copyright (c) Mohit Muthanna 2010.
 
 import { RuntimeError } from './util';
-import { Flow } from './tables';
+import { DefaultFontStack } from './font';
 import { Element } from './element';
 import { BoundingBoxComputation } from './boundingboxcomputation';
 import { BoundingBox } from './boundingbox';
@@ -236,7 +236,7 @@ export class Glyph extends Element {
     options?: { font?: Font; category: string }
   ): GlyphMetrics {
     const params = {
-      fontStack: Flow.DEFAULT_FONT_STACK,
+      fontStack: DefaultFontStack,
       ...options,
     };
     const metrics = Glyph.loadMetrics(params.fontStack, val, params.category);