Merge pull request #797 from AaronDavidNewman/master

Merge fixes from smoosic branch
0xfe · Jul 14, 2020 · c7ab29f · c7ab29f
2 parents 0c51ce4 + a6c4871
commit c7ab29f
Show file tree

Hide file tree

Showing 11 changed files with 2,204 additions and 186 deletions.
diff --git a/releases/fonts/petalumascript-webfont.woff b/releases/fonts/petalumascript-webfont.woff
diff --git a/releases/fonts/petalumascript-webfont.woff2 b/releases/fonts/petalumascript-webfont.woff2
diff --git a/src/chordsymbol.js b/src/chordsymbol.js
diff --git a/src/fonts/bravura_metrics.js b/src/fonts/bravura_metrics.js
@@ -308,59 +308,97 @@ export const BravuraMetrics = {
     },
     chordSymbol: {
       global: {
-        superscriptOffset: -8,
-        subscriptOffset: 4,
-        kerningOffset: -2
+        superscriptOffset: -400,
+        subscriptOffset: 300,
+        kerningOffset: -250,
+        lowerKerningText:  ['D', 'F', 'P', 'T', 'V', 'Y'],
+        upperKerningText:  ['A', 'L'],
+        spacing: 100,
+        superSubRatio: 0.66
+      },
+      csymDiminished: {
+        scale: 1,
+        leftSideBearing: -32,
+        advanceWidth: 506,
+        yOffset: 0
+      },
+      csymHalfDiminished: {
+        scale: 1,
+        leftSideBearing: -32,
+        advanceWidth: 506,
+        yOffset: 0
       },
       csymAugmented: {
         scale: 1,
-        shiftY: -2,
-        shiftX: 0
+        leftSideBearing: 0,
+        advanceWidth: 530,
+        yOffset: 0
       },
       csymParensLeftTall: {
         scale: 0.8,
-        shiftY: 1,
-        shiftX: 0
+        leftSideBearing: -20,
+        advanceWidth: 184,
+        yOffset: 250
       },
       csymParensRightTall: {
         scale: 0.8,
-        shiftY: 1,
-        shiftX: 0
+        leftSideBearing: 0,
+        advanceWidth: 189,
+        yOffset: 250
       },
       csymBracketLeftTall: {
         scale: 0.8,
-        shiftY: 1,
-        shiftX: 0
+        leftSideBearing: 0,
+        advanceWidth: 328,
+        yOffset: 0
       },
       csymBracketRightTall: {
         scale: 0.8,
-        shiftY: 1,
-        shiftX: 0
+        leftSideBearing: 1,
+        advanceWidth: 600,
+        yOffset: 0
       },
       csymParensLeftVeryTall: {
-        scale: 0.8,
-        shiftY: 0,
-        shiftX: 0
+        scale: 0.9,
+        leftSideBearing: 0,
+        advanceWidth: 101,
+        yOffset: 350
       },
       csymParensRightVeryTall: {
-        scale: 0.8,
-        shiftY: 0,
-        shiftX: 0
+        scale: 0.9,
+        leftSideBearing: 50,
+        advanceWidth: 111,
+        yOffset: 350
       },
       csymDiagonalArrangementSlash: {
         scale: 0.6,
-        shiftY: 0,
-        shiftX: -2
+        leftSideBearing: -1,
+        advanceWidth: 990,
+        yOffset: 0
       },
-      accidentalSharp: {
+      csymMinor: {
         scale: 1,
-        shiftY: -3,
-        shiftX: 0
+        leftSideBearing: 0,
+        advanceWidth: 482,
+        yOffset: 0
       },
-      accidentalFlat: {
+      csymMajorSeventh: {
         scale: 1,
-        shiftY: -2,
-        shiftX: 0
+        leftSideBearing: 0,
+        yOffset: 0,
+        advanceWidth: 600
+      },
+      accidentalSharp: {
+        scale: 0.75,
+        leftSideBearing: 20,
+        advanceWidth: 250,
+        yOffset: -302
+      },
+      accidentalFlat: {
+        scale: 0.9,
+        leftSideBearing: -20,
+        advanceWidth: 226,
+        yOffset: -184
       }
     }
   }

diff --git a/src/fonts/gonville_metrics.js b/src/fonts/gonville_metrics.js
@@ -170,59 +170,97 @@ export const GonvilleMetrics = {
     },
     chordSymbol: {
       global: {
-        superscriptOffset: -8,
-        subscriptOffset: 4,
-        kerningOffset: -2
+        superscriptOffset: -400,
+        subscriptOffset: 300,
+        kerningOffset: -250,
+        lowerKerningText:  ['D', 'F', 'P', 'T', 'V', 'Y'],
+        upperKerningText:  ['A', 'L'],
+        spacing: 100,
+        superSubRatio: 0.66
+      },
+      csymDiminished: {
+        scale: 1,
+        leftSideBearing: 0,
+        advanceWidth: 506,
+        yOffset: 0
+      },
+      csymHalfDiminished: {
+        scale: 1,
+        leftSideBearing: -32,
+        advanceWidth: 506,
+        yOffset: 0
       },
       csymAugmented: {
         scale: 1,
-        shiftY: -2,
-        shiftX: 0
+        leftSideBearing: 0,
+        advanceWidth: 530,
+        yOffset: 0
       },
       csymParensLeftTall: {
         scale: 0.8,
-        shiftY: 1,
-        shiftX: 0
+        leftSideBearing: 0,
+        advanceWidth: 155,
+        yOffset: 250
       },
       csymParensRightTall: {
         scale: 0.8,
-        shiftY: 1,
-        shiftX: 0
+        leftSideBearing: -40,
+        advanceWidth: 189,
+        yOffset: 250
       },
       csymBracketLeftTall: {
         scale: 0.8,
-        shiftY: 1,
-        shiftX: 0
+        leftSideBearing: 0,
+        advanceWidth: 328,
+        yOffset: 0
       },
       csymBracketRightTall: {
         scale: 0.8,
-        shiftY: 1,
-        shiftX: 0
+        leftSideBearing: 1,
+        advanceWidth: 600,
+        yOffset: 0
       },
       csymParensLeftVeryTall: {
-        scale: 0.8,
-        shiftY: 0,
-        shiftX: 0
+        scale: 0.9,
+        leftSideBearing: 0,
+        advanceWidth: 101,
+        yOffset: 350
       },
       csymParensRightVeryTall: {
-        scale: 0.8,
-        shiftY: 0,
-        shiftX: 0
+        scale: 0.9,
+        leftSideBearing: 50,
+        advanceWidth: 111,
+        yOffset: 350
       },
       csymDiagonalArrangementSlash: {
         scale: 0.6,
-        shiftY: 0,
-        shiftX: -2
+        leftSideBearing: -1,
+        advanceWidth: 990,
+        yOffset: 0
       },
-      accidentalSharp: {
+      csymMinor: {
         scale: 1,
-        shiftY: -3,
-        shiftX: 0
+        leftSideBearing: 0,
+        advanceWidth: 482,
+        yOffset: 0
       },
-      accidentalFlat: {
+      csymMajorSeventh: {
         scale: 1,
-        shiftY: -2,
-        shiftX: 0
+        leftSideBearing: 0,
+        yOffset: 0,
+        advanceWidth: 600
+      },
+      accidentalSharp: {
+        scale: 0.75,
+        leftSideBearing: 40,
+        advanceWidth: 250,
+        yOffset: -402
+      },
+      accidentalFlat: {
+        scale: 0.95,
+        leftSideBearing: -50,
+        advanceWidth: 208,
+        yOffset: -184
       }
     }
   }