ornament metrics

Author: rvilarl

src/font.ts

@@ -1,4 +1,5 @@
 import { ChordSymbolMetrics } from './chordsymbol';
+import { OrnamentMetrics } from './ornament';
 import { StringNumberMetrics } from './stringnumber';
 import { defined } from './util';
 
@@ -45,6 +46,7 @@ export interface FontMetrics extends Record<string, any> {
   // Not specified in bravura_metrics.ts or gonville_metrics.ts.
   noteHead?: Record<string, Record<string, number>>;
   chordSymbol?: ChordSymbolMetrics;
+  ornament?: Record<string, OrnamentMetrics>;
   stringNumber?: StringNumberMetrics;
   // eslint-disable-next-line
   glyphs: Record<string, Record<string, any>>;

src/fonts/bravura_metrics.ts

@@ -166,6 +166,75 @@ export const BravuraMetrics = {
     },
   },
 
+  ornament: {
+    brassScoop: {
+      xOffset: -12,
+      yOffset: 0,
+      stemUpYOffset: 0,
+      reportedWidth: 20,
+    },
+    brassDoitMedium: {
+      xOffset: 16,
+      yOffset: 0,
+      stemUpYOffset: 0,
+      reportedWidth: 22,
+    },
+    brassFallLipShort: {
+      xOffset: 16,
+      yOffset: 0,
+      stemUpYOffset: 0,
+      reportedWidth: 15,
+    },
+    brassLiftMedium: {
+      xOffset: 16,
+      yOffset: 5,
+      stemUpYOffset: 0,
+      reportedWidth: 5,
+    },
+    brassFallRoughMedium: {
+      xOffset: 16,
+      yOffset: 28,
+      stemUpYOffset: 0,
+      reportedWidth: 5,
+    },
+    brassBend: {
+      xOffset: 2,
+      yOffset: -8,
+      stemUpYOffset: 25,
+      reportedWidth: 5,
+    },
+    brassMuteClosed: {
+      xOffset: 3,
+      yOffset: -8,
+      stemUpYOffset: 25,
+      reportedWidth: 5,
+    },
+    brassMuteOpen: {
+      xOffset: 3,
+      yOffset: -7,
+      stemUpYOffset: 25,
+      reportedWidth: 5,
+    },
+    brassFlip: {
+      xOffset: 10,
+      yOffset: 0,
+      stemUpYOffset: 7,
+      reportedWidth: 10,
+    },
+    brassJazzTurn: {
+      xOffset: 0,
+      yOffset: 0,
+      stemUpYOffset: 8,
+      reportedWidth: 31,
+    },
+    brassSmear: {
+      xOffset: 10,
+      yOffset: 0,
+      stemUpYOffset: 8,
+      reportedWidth: 5,
+    },
+  },
+
   parenthesis: {
     default: {
       point: 39,
@@ -333,6 +402,39 @@ export const BravuraMetrics = {
       ornamentTurnSlash: {
         scale: 1.2,
       },
+      brassScoop: {
+        scale: 1.0,
+      },
+      brassDoitMedium: {
+        scale: 1.0,
+      },
+      brassFallLipShort: {
+        scale: 1.0,
+      },
+      brassLiftMedium: {
+        scale: 1.0,
+      },
+      brassFallRoughMedium: {
+        scale: 1.0,
+      },
+      brassBend: {
+        scale: 1.0,
+      },
+      brassMuteClosed: {
+        scale: 1.0,
+      },
+      brassMuteOpen: {
+        scale: 1.0,
+      },
+      brassFlip: {
+        scale: 1.0,
+      },
+      brassJazzTurn: {
+        scale: 1.0,
+      },
+      brassSmear: {
+        scale: 1.0,
+      },
     },
     stroke: {
       arrowheadBlackDown: {
@@ -445,85 +547,6 @@ export const BravuraMetrics = {
         scale: 0.9,
       },
     },
-    jazzOrnaments: {
-      brassScoop: {
-        scale: 1.0,
-        xOffset: -12,
-        yOffset: 0,
-        stemUpYOffset: 0,
-        reportedWidth: 20,
-      },
-      brassDoitMedium: {
-        scale: 1.0,
-        xOffset: 16,
-        yOffset: 0,
-        stemUpYOffset: 0,
-        reportedWidth: 22,
-      },
-      brassFallLipShort: {
-        scale: 1.0,
-        xOffset: 16,
-        yOffset: 0,
-        stemUpYOffset: 0,
-        reportedWidth: 15,
-      },
-      brassLiftMedium: {
-        scale: 1.0,
-        xOffset: 16,
-        yOffset: 5,
-        stemUpYOffset: 0,
-        reportedWidth: 5,
-      },
-      brassFallRoughMedium: {
-        scale: 1.0,
-        xOffset: 16,
-        yOffset: 28,
-        stemUpYOffset: 0,
-        reportedWidth: 5,
-      },
-      brassBend: {
-        scale: 1.0,
-        xOffset: 2,
-        yOffset: -8,
-        stemUpYOffset: 25,
-        reportedWidth: 5,
-      },
-      brassMuteClosed: {
-        scale: 1.0,
-        xOffset: 3,
-        yOffset: -8,
-        stemUpYOffset: 25,
-        reportedWidth: 5,
-      },
-      brassMuteOpen: {
-        scale: 1.0,
-        xOffset: 3,
-        yOffset: -7,
-        stemUpYOffset: 25,
-        reportedWidth: 5,
-      },
-      brassFlip: {
-        scale: 1.0,
-        xOffset: 10,
-        yOffset: 0,
-        stemUpYOffset: 7,
-        reportedWidth: 10,
-      },
-      brassJazzTurn: {
-        scale: 1.0,
-        xOffset: 0,
-        yOffset: 0,
-        stemUpYOffset: 8,
-        reportedWidth: 31,
-      },
-      brassSmear: {
-        scale: 1.0,
-        xOffset: 10,
-        yOffset: 0,
-        stemUpYOffset: 8,
-        reportedWidth: 5,
-      },
-    },
     tuplet: {
       noteHeadOffset: 20,
       stemOffset: 10,

src/fonts/gonville_metrics.ts

@@ -168,6 +168,75 @@ export const GonvilleMetrics = {
     },
   },
 
+  ornament: {
+    brassScoop: {
+      xOffset: -12,
+      yOffset: 0,
+      stemUpYOffset: 0,
+      reportedWidth: 15,
+    },
+    brassDoitMedium: {
+      xOffset: 16,
+      yOffset: 0,
+      stemUpYOffset: 0,
+      reportedWidth: 22,
+    },
+    brassFallLipShort: {
+      xOffset: 17,
+      yOffset: 0,
+      stemUpYOffset: 0,
+      reportedWidth: 15,
+    },
+    brassLiftMedium: {
+      xOffset: 16,
+      yOffset: 5,
+      stemUpYOffset: 0,
+      reportedWidth: 5,
+    },
+    brassFallRoughMedium: {
+      xOffset: 16,
+      yOffset: 28,
+      stemUpYOffset: 0,
+      reportedWidth: 5,
+    },
+    brassBend: {
+      xOffset: 2,
+      yOffset: -8,
+      stemUpYOffset: 24,
+      reportedWidth: 5,
+    },
+    brassMuteClosed: {
+      xOffset: 3,
+      yOffset: -9,
+      stemUpYOffset: 24,
+      reportedWidth: 5,
+    },
+    brassMuteOpen: {
+      xOffset: 3,
+      yOffset: -7,
+      stemUpYOffset: 25,
+      reportedWidth: 5,
+    },
+    brassFlip: {
+      xOffset: 10,
+      yOffset: -4,
+      stemUpYOffset: 7,
+      reportedWidth: 5,
+    },
+    brassJazzTurn: {
+      xOffset: 3,
+      yOffset: -4,
+      stemUpYOffset: 10,
+      reportedWidth: 28,
+    },
+    brassSmear: {
+      xOffset: 10,
+      yOffset: -4,
+      stemUpYOffset: 9,
+      reportedWidth: 5,
+    },
+  },
+
   parenthesis: {
     default: {
       point: 39,
@@ -370,83 +439,39 @@ export const GonvilleMetrics = {
         scale: 0.95,
       },
     },
-    jazzOrnaments: {
+    ornament: {
       brassScoop: {
         scale: 1.0,
-        xOffset: -12,
-        yOffset: 0,
-        stemUpYOffset: 0,
-        reportedWidth: 15,
       },
       brassDoitMedium: {
         scale: 1.0,
-        xOffset: 16,
-        yOffset: 0,
-        stemUpYOffset: 0,
-        reportedWidth: 22,
       },
       brassFallLipShort: {
         scale: 1.0,
-        xOffset: 17,
-        yOffset: 0,
-        stemUpYOffset: 0,
-        reportedWidth: 15,
       },
       brassLiftMedium: {
         scale: 1.0,
-        xOffset: 16,
-        yOffset: 5,
-        stemUpYOffset: 0,
-        reportedWidth: 5,
       },
       brassFallRoughMedium: {
         scale: 1.0,
-        xOffset: 16,
-        yOffset: 28,
-        stemUpYOffset: 0,
-        reportedWidth: 5,
       },
       brassBend: {
         scale: 1.0,
-        xOffset: 2,
-        yOffset: -8,
-        stemUpYOffset: 24,
-        reportedWidth: 5,
       },
       brassMuteClosed: {
         scale: 1.0,
-        xOffset: 3,
-        yOffset: -9,
-        stemUpYOffset: 24,
-        reportedWidth: 5,
       },
       brassMuteOpen: {
         scale: 1.0,
-        xOffset: 3,
-        yOffset: -7,
-        stemUpYOffset: 25,
-        reportedWidth: 5,
       },
       brassFlip: {
         scale: 1.0,
-        xOffset: 10,
-        yOffset: -4,
-        stemUpYOffset: 7,
-        reportedWidth: 5,
       },
       brassJazzTurn: {
         scale: 1.0,
-        xOffset: 3,
-        yOffset: -4,
-        stemUpYOffset: 10,
-        reportedWidth: 28,
       },
       brassSmear: {
         scale: 1.0,
-        xOffset: 10,
-        yOffset: -4,
-        stemUpYOffset: 9,
-        reportedWidth: 5,
       },
     },
     tremolo: {