relocate jazz ornaments to ornaments module

0xfe · Jul 20, 2020 · f11786b · f11786b
1 parent 65d7534
commit f11786b
Show file tree

Hide file tree

Showing 11 changed files with 328 additions and 248 deletions.
diff --git a/src/factory.js b/src/factory.js
@@ -13,7 +13,6 @@ import { Accidental } from './accidental';
 import { Articulation } from './articulation';
 import { Annotation } from './annotation';
 import { ChordSymbol } from './chordsymbol';
-import { JazzTechnique } from './jazztechnique';
 import { Formatter } from './formatter';
 import { FretHandFinger } from './frethandfinger';
 import { StringNumber } from './stringnumber';
@@ -335,11 +334,6 @@ export class Factory {
     return articulation;
   }
 
-  JazzTechnique(params) {
-    const jazz = new JazzTechnique(params.type);
-    return jazz;
-  }
-
   TextDynamics(params) {
     params = setDefaults(params, {
       text: 'p',

diff --git a/src/fonts/bravura_metrics.js b/src/fonts/bravura_metrics.js
@@ -401,71 +401,82 @@ export const BravuraMetrics = {
         yOffset: -184
       }
     },
-    jazztechnique: {
+    jazzOrnaments: {
       brassScoop: {
         scale: 1.0,
         xOffset: -12,
         yOffset: 0,
+        stemUpYOffset: 0,
         reportedWidth: 10
       },
       brassDoitMedium: {
         scale: 1.0,
         xOffset: 16,
         yOffset: 0,
+        stemUpYOffset: 0,
         reportedWidth:15
       },
       brassFallLipShort: {
         scale: 1.0,
         xOffset: 16,
         yOffset: 0,
+        stemUpYOffset: 0,
         reportedWidth: 5
       },
       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: 0,
+        xOffset: 2,
         yOffset: -8,
+        stemUpYOffset: 25,
         reportedWidth: 5
       },
       brassMuteClosed: {
         scale: 1.0,
-        xOffset: 5,
-        yOffset: -8,
+        xOffset: 3,
+        yOffset: -7,
+        stemUpYOffset: 23,
         reportedWidth: 5
       },
       brassMuteOpen: {
         scale: 1.0,
-        xOffset: 5,
-        yOffset: -8,
+        xOffset: 3,
+        yOffset: -7,
+        stemUpYOffset: 25,
         reportedWidth: 5
       },
       brassFlip: {
         scale: 1.0,
-        xOffset: 18,
+        xOffset: 10,
         yOffset: -4,
+        stemUpYOffset: 0,
         reportedWidth: 5
       },
       brassJazzTurn: {
         scale: 1.0,
-        xOffset: 18,
+        xOffset: 6,
         yOffset: -4,
+        stemUpYOffset: 0,
         reportedWidth: 5
       },
       brassSmear: {
         scale: 1.0,
-        xOffset: 18,
+        xOffset: 10,
         yOffset: -4,
+        stemUpYOffset: 0,
         reportedWidth: 5
       },
     }

diff --git a/src/fonts/gonville_metrics.js b/src/fonts/gonville_metrics.js
@@ -263,71 +263,82 @@ export const GonvilleMetrics = {
         yOffset: -184
       }
     },
-    jazztechnique: {
+    jazzOrnaments: {
       brassScoop: {
         scale: 1.0,
         xOffset: -12,
         yOffset: 0,
+        stemUpYOffset: 0,
         reportedWidth: 10
       },
       brassDoitMedium: {
         scale: 1.0,
         xOffset: 16,
         yOffset: 0,
+        stemUpYOffset: 0,
         reportedWidth: 5
       },
       brassFallLipShort: {
         scale: 1.0,
         xOffset: 17,
         yOffset: 0,
+        stemUpYOffset: 0,
         reportedWidth: 5
       },
       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: 0,
+        xOffset: 2,
         yOffset: -8,
+        stemUpYOffset: 24,
         reportedWidth: 5
       },
       brassMuteClosed: {
         scale: 1.0,
-        xOffset: 5,
+        xOffset: 3,
         yOffset: -8,
+        stemUpYOffset: 24,
         reportedWidth: 5
       },
       brassMuteOpen: {
         scale: 1.0,
-        xOffset: 5,
-        yOffset: -8,
+        xOffset: 3,
+        yOffset: -7,
+        stemUpYOffset: 25,
         reportedWidth: 5
       },
       brassFlip: {
         scale: 1.0,
-        xOffset: 18,
+        xOffset: 10,
         yOffset: -4,
+        stemUpYOffset: 0,
         reportedWidth: 5
       },
       brassJazzTurn: {
         scale: 1.0,
-        xOffset: 18,
+        xOffset: 6,
         yOffset: -4,
+        stemUpYOffset: 0,
         reportedWidth: 5
       },
       brassSmear: {
         scale: 1.0,
-        xOffset: 18,
+        xOffset: 10,
         yOffset: -4,
+        stemUpYOffset: 0,
         reportedWidth: 5
       },
     }

diff --git a/src/fonts/petaluma_metrics.js b/src/fonts/petaluma_metrics.js
@@ -428,71 +428,82 @@ export const PetalumaMetrics = {
         yOffset: -284
       }
     },
-    jazztechnique: {
+    jazzOrnaments: {
       brassScoop: {
         scale: 1.0,
         xOffset: -12,
         yOffset: 0,
+        stemUpYOffset: 0,
         reportedWidth: 10
       },
       brassDoitMedium: {
         scale: 1.0,
         xOffset: 16,
         yOffset: 0,
+        stemUpYOffset: 0,
         reportedWidth: 5
       },
       brassFallLipShort: {
         scale: 1.0,
         xOffset: 16,
         yOffset: 0,
+        stemUpYOffset: 0,
         reportedWidth: 5
       },
       brassLiftMedium: {
         scale: 1.0,
         xOffset: 16,
         yOffset: 5,
+        stemUpYOffset: 0,
         reportedWidth: 5
       },
       brassFallRoughMedium: {
         scale: 1.0,
         xOffset: 16,
         yOffset: 26,
+        stemUpYOffset: 0,
         reportedWidth: 5
       },
       brassBend: {
         scale: 1.0,
-        xOffset: 0,
-        yOffset: -3,
+        xOffset: 3,
+        yOffset: -8,
+        stemUpYOffset: 28,
         reportedWidth: 5
       },
       brassMuteClosed: {
         scale: 1.0,
-        xOffset: 5,
+        xOffset: 3,
         yOffset: -8,
+        stemUpYOffset: 26,
         reportedWidth: 5
       },
       brassMuteOpen: {
         scale: 1.0,
-        xOffset: 5,
+        xOffset: 4,
         yOffset: -8,
+        stemUpYOffset: 27,
         reportedWidth: 5
       },
       brassFlip: {
         scale: 1.0,
-        xOffset: 18,
+        xOffset: 10,
         yOffset: -4,
+        stemUpYOffset: 0,
         reportedWidth: 5
       },
       brassJazzTurn: {
         scale: 1.0,
-        xOffset: 18,
+        xOffset: 6,
         yOffset: -4,
+        stemUpYOffset: 0,
         reportedWidth: 5
       },
       brassSmear: {
-        scale: 1.2,
-        xOffset: 18,
+        scale: 1.0,
+        xOffset: 10,
         yOffset: -4,
+        stemUpYOffset: 0,
         reportedWidth: 5
       },
     }

diff --git a/src/index.js b/src/index.js
@@ -28,7 +28,6 @@ import { TickContext } from './tickcontext';
 import { Articulation } from './articulation';
 import { Annotation } from './annotation';
 import { ChordSymbol } from './chordsymbol';
-import { JazzTechnique } from './jazztechnique';
 import { Barline } from './stavebarline';
 import { NoteHead } from './notehead';
 import { StaveConnector } from './staveconnector';
@@ -106,7 +105,6 @@ Vex.Flow.TickContext = TickContext;
 Vex.Flow.Articulation = Articulation;
 Vex.Flow.Annotation = Annotation;
 Vex.Flow.ChordSymbol = ChordSymbol;
-Vex.Flow.JazzTechnique = JazzTechnique;
 Vex.Flow.Barline = Barline;
 Vex.Flow.NoteHead = NoteHead;
 Vex.Flow.StaveConnector = StaveConnector;