Merge pull request #1212 from ronyeh/font/glyphs-and-metrics-files

Run prettier / eslint on the font data files, to improve consistency and editability of the files.
0xfe · Nov 3, 2021 · 5113a69 · 5113a69
2 parents 365e81e + f537711
commit 5113a69
Show file tree

Hide file tree

Showing 15 changed files with 10,781 additions and 9,040 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,3 +1 @@
-fonts
 tests/support/*
-node_modules/*
diff --git a/src/fonts/bravura.ts b/src/fonts/bravura.ts
@@ -1,7 +1,7 @@
-import { BravuraFont } from "./bravura_glyphs";
-import { BravuraMetrics } from "./bravura_metrics";
+import { BravuraFont } from './bravura_glyphs';
+import { BravuraMetrics } from './bravura_metrics';
 
-const Bravura = { 
+const Bravura = {
   fontData: BravuraFont,
   metrics: BravuraMetrics,
 };

diff --git a/src/fonts/bravura_glyphs.ts b/src/fonts/bravura_glyphs.ts
diff --git a/src/fonts/bravura_metrics.ts b/src/fonts/bravura_metrics.ts
@@ -10,13 +10,15 @@ export const BravuraMetrics = {
     padding: 12,
     endPaddingMax: 10,
     endPaddingMin: 5,
-    unalignedNotePadding: 10
+    unalignedNotePadding: 10,
   },
+
   accidental: {
     noteheadAccidentalPadding: 1,
     leftPadding: 2,
     accidentalSpacing: 3,
   },
+
   clef: {
     default: {
       point: 32,
@@ -80,6 +82,7 @@ export const BravuraMetrics = {
       '4': { point: 23, shiftY: -12 },
     },
   },
+
   pedalMarking: {
     up: {
       point: 40,
@@ -128,6 +131,9 @@ export const BravuraMetrics = {
     },
   },
 
+  // noteHead: {
+  // },
+
   stem: {
     heightAdjustmentForFlag: -3,
     // These are stem (Y) offsets to the note heads. To shift the

diff --git a/src/fonts/custom_glyphs.ts b/src/fonts/custom_glyphs.ts
diff --git a/src/fonts/custom_metrics.ts b/src/fonts/custom_metrics.ts
@@ -1,5 +1,5 @@
 export const CustomMetrics = {
-  name: 'Vexflow-Custom',
+  name: 'VexFlowCustom',
   smufl: false,
-  glyphs: {}
+  glyphs: {},
 };
diff --git a/src/fonts/gonville_glyphs.ts b/src/fonts/gonville_glyphs.ts
diff --git a/src/fonts/gonville_metrics.ts b/src/fonts/gonville_metrics.ts
@@ -5,17 +5,20 @@
 export const GonvilleMetrics = {
   name: 'Gonville',
   smufl: false,
+
   stave: {
     padding: 12,
     endPaddingMax: 10,
     endPaddingMin: 5,
-    unalignedNotePadding: 10
+    unalignedNotePadding: 10,
   },
+
   accidental: {
     noteheadAccidentalPadding: 1,
     leftPadding: 2,
     accidentalSpacing: 3,
   },
+
   clef: {
     default: {
       point: 40,
@@ -90,6 +93,9 @@ export const GonvilleMetrics = {
     },
   },
 
+  // articulation: {
+  // },
+
   tremolo: {
     default: {
       point: 25,
@@ -109,6 +115,9 @@ export const GonvilleMetrics = {
     },
   },
 
+  // noteHead: {
+  // },
+
   // These are for numeric digits, such as in time signatures
   digits: {
     point: 40,

diff --git a/src/fonts/petaluma_glyphs.ts b/src/fonts/petaluma_glyphs.ts
diff --git a/src/fonts/petaluma_metrics.ts b/src/fonts/petaluma_metrics.ts
@@ -10,13 +10,15 @@ export const PetalumaMetrics = {
     padding: 15,
     endPaddingMax: 15,
     endPaddingMin: 7,
-    unalignedNotePadding: 12
+    unalignedNotePadding: 12,
   },
+
   accidental: {
     noteheadAccidentalPadding: 1,
     leftPadding: 2,
     accidentalSpacing: 3,
   },
+
   clef: {
     default: {
       point: 32,
@@ -302,13 +304,13 @@ export const PetalumaMetrics = {
       minPadding: 2,
       standard: {
         noteheadBlackStemUp: {
-          shiftX: 0.5
+          shiftX: 0.5,
         },
         noteheadHalfStemUp: {
-          shiftX: 0.725
+          shiftX: 0.725,
         },
         noteheadWholeStemUp: {
-          shiftX: 1
+          shiftX: 1,
         },
       },
       custom: {