Merge pull request 0xfe#1540 from rvilarl/point/tremoloParenthesis

point fixed on tremolo and parenthesis
AaronDavidNewman · Apr 5, 2023 · adf7520 · adf7520
2 parents c7d7803 + dd9a7d9
commit adf7520
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/src/fonts/common_metrics.ts b/src/fonts/common_metrics.ts
@@ -217,11 +217,9 @@ export const CommonMetrics = {
 
   parenthesis: {
     default: {
-      point: 39,
       width: 7,
     },
     gracenote: {
-      point: (39 * 3) / 5,
       width: 3,
     },
   },
@@ -249,18 +247,16 @@ export const CommonMetrics = {
 
   tremolo: {
     default: {
-      point: 25,
-      spacing: 5,
-      offsetYStemUp: -5,
-      offsetYStemDown: 5,
+      spacing: 7,
+      offsetYStemUp: -8,
+      offsetYStemDown: 8,
       offsetXStemUp: 11,
       offsetXStemDown: 1,
     },
     grace: {
-      point: 18,
-      spacing: 4,
-      offsetYStemUp: -5,
-      offsetYStemDown: 5,
+      spacing: (7 * 3) / 5,
+      offsetYStemUp: -(8 * 3) / 5,
+      offsetYStemDown: (8 * 3) / 5,
       offsetXStemUp: 7,
       offsetXStemDown: 1,
     },

diff --git a/src/note.ts b/src/note.ts
@@ -636,6 +636,12 @@ export abstract class Note extends Tickable {
     return x;
   }
 
+  /** Get point for notes. */
+  static getPoint(size?: string): number {
+    // for sizes other than 'default', note is 2/3 of the default value
+    return size == 'default' ? Tables.NOTATION_FONT_SCALE : (Tables.NOTATION_FONT_SCALE / 5) * 3;
+  }
+
   /** Get the direction of the stem. */
   getStemDirection(): number {
     throw new RuntimeError('NoStem', 'No stem attached to this note.');

diff --git a/src/parenthesis.ts b/src/parenthesis.ts
@@ -68,17 +68,17 @@ export class Parenthesis extends Modifier {
 
     this.position = position ?? Modifier.Position.LEFT;
 
-    this.point = Tables.currentMusicFont().lookupMetric('parenthesis.default.point');
+    this.point = Tables.currentMusicFont().lookupMetric('parenthesis.default.point') ?? Note.getPoint('default');
     this.setWidth(Tables.currentMusicFont().lookupMetric('parenthesis.default.width'));
   }
 
   /** Set the associated note. */
   setNote(note: Note): this {
     this.note = note;
-    this.point = Tables.currentMusicFont().lookupMetric('parenthesis.default.point');
+    this.point = Tables.currentMusicFont().lookupMetric('parenthesis.default.point') ?? Note.getPoint('default');
     this.setWidth(Tables.currentMusicFont().lookupMetric('parenthesis.default.width'));
     if (isGraceNote(note)) {
-      this.point = Tables.currentMusicFont().lookupMetric('parenthesis.gracenote.point');
+      this.point = Tables.currentMusicFont().lookupMetric('parenthesis.gracenote.point') ?? Note.getPoint('gracenote');
       this.setWidth(Tables.currentMusicFont().lookupMetric('parenthesis.gracenote.width'));
     }
     return this;

diff --git a/src/tremolo.ts b/src/tremolo.ts
@@ -5,6 +5,7 @@
 import { Glyph } from './glyph';
 import { GraceNote } from './gracenote';
 import { Modifier } from './modifier';
+import { Note } from './note';
 import { Stem } from './stem';
 import { Tables } from './tables';
 import { Category, isGraceNote } from './typeguard';
@@ -64,7 +65,7 @@ export class Tremolo extends Modifier {
       y += musicFont.lookupMetric(`${category}.offsetYStemUp`) * scale;
     }
 
-    const fontScale = musicFont.lookupMetric(`${category}.point`);
+    const fontScale = musicFont.lookupMetric(`${category}.point`) ?? Note.getPoint(gn ? 'grace' : 'default');
 
     x += musicFont.lookupMetric(`${category}.offsetXStem${stemDirection === Stem.UP ? 'Up' : 'Down'}`);
     for (let i = 0; i < this.num; ++i) {

diff --git a/tests/percussion_tests.ts b/tests/percussion_tests.ts
@@ -218,7 +218,7 @@ const snare2 = createSingleMeasureTest((f) => {
     f.StaveNote({ keys: ['c/5'], duration: '4', stem_direction: -1 }).addModifier(new Tremolo(1), 0),
     f.GraceNote({ keys: ['c/5'], duration: '4', stem_direction: -1 }).addModifier(new Tremolo(1), 0),
     f.StaveNote({ keys: ['c/5'], duration: '4', stem_direction: -1 }).addModifier(new Tremolo(3), 0),
-    f.StaveNote({ keys: ['c/5'], duration: '4', stem_direction: -1 }).addModifier(new Tremolo(5), 0),
+    f.StaveNote({ keys: ['c/5'], duration: '4', stem_direction: -1 }).addModifier(new Tremolo(4), 0),
   ]);
 });
 
@@ -229,7 +229,7 @@ const snare3 = createSingleMeasureTest((factory) => {
       factory.StaveNote({ keys: ['c/5'], duration: '4', stem_direction: 1 }).addModifier(new Tremolo(2), 0),
       factory.GraceNote({ keys: ['c/5'], duration: '4', stem_direction: 1 }).addModifier(new Tremolo(2), 0),
       factory.GraceNote({ keys: ['c/5'], duration: '4', stem_direction: 1 }).addModifier(new Tremolo(3), 0),
-      factory.StaveNote({ keys: ['c/5'], duration: '4', stem_direction: 1 }).addModifier(new Tremolo(5), 0),
+      factory.StaveNote({ keys: ['c/5'], duration: '4', stem_direction: 1 }).addModifier(new Tremolo(4), 0),
     ]);
 });