Merge pull request #1532 from rvilarl/fix/1527

point fixed on time signatures and clefs
0xfe · Mar 18, 2023 · 577939d · 577939d
2 parents f5af0b9 + 16c7d8f
commit 577939d
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 62 deletions.
diff --git a/src/accidental.ts b/src/accidental.ts
@@ -483,7 +483,7 @@ export class Accidental extends Modifier {
 
     this.render_options = {
       // Font size for glyphs
-      font_scale: 38,
+      font_scale: Tables.NOTATION_FONT_SCALE,
 
       // Padding between accidental and parentheses on each side
       parenLeftPadding: 2,

diff --git a/src/articulation.ts b/src/articulation.ts
@@ -307,7 +307,7 @@ export class Articulation extends Modifier {
     this.type = type;
     this.position = ABOVE;
     this.render_options = {
-      font_scale: 38,
+      font_scale: Tables.NOTATION_FONT_SCALE,
     };
 
     this.reset();

diff --git a/src/clef.ts b/src/clef.ts
@@ -10,15 +10,13 @@ import { Category } from './typeguard';
 import { defined, log } from './util';
 
 export interface ClefType {
-  point: number;
   code: string;
   line: number;
 }
 
 export interface ClefAnnotatiomType extends ClefType {
   x_shift: number;
-  code: string;
-  line: number;
+  point: number;
 }
 
 export interface ClefMetrics {
@@ -70,62 +68,50 @@ export class Clef extends StaveModifier {
       treble: {
         code: 'gClef',
         line: 3,
-        point: 0,
       },
       bass: {
         code: 'fClef',
         line: 1,
-        point: 0,
       },
       alto: {
         code: 'cClef',
         line: 2,
-        point: 0,
       },
       tenor: {
         code: 'cClef',
         line: 1,
-        point: 0,
       },
       percussion: {
         code: 'unpitchedPercussionClef1',
         line: 2,
-        point: 0,
       },
       soprano: {
         code: 'cClef',
         line: 4,
-        point: 0,
       },
       'mezzo-soprano': {
         code: 'cClef',
         line: 3,
-        point: 0,
       },
       'baritone-c': {
         code: 'cClef',
         line: 0,
-        point: 0,
       },
       'baritone-f': {
         code: 'fClef',
         line: 2,
-        point: 0,
       },
       subbass: {
         code: 'fClef',
         line: 0,
-        point: 0,
       },
       french: {
         code: 'gClef',
         line: 4,
-        point: 0,
       },
       tab: {
         code: '6stringTabClef',
-        line: 3,
-        point: 0,
+        line: 2.5,
       },
     };
   }
@@ -143,7 +129,7 @@ export class Clef extends StaveModifier {
 
     this.setPosition(StaveModifierPosition.BEGIN);
     this.setType(type, size, annotation);
-    this.setWidth(Glyph.getWidth(this.clef.code, this.clef.point, `clef_${this.size}`));
+    this.setWidth(Glyph.getWidth(this.clef.code, Clef.getPoint(this.size), `clef_${this.size}`));
     L('Creating clef:', type);
   }
 
@@ -186,6 +172,12 @@ export class Clef extends StaveModifier {
     return this.width;
   }
 
+  /** Get point for clefs. */
+  static getPoint(size?: string): number {
+    // for sizes other than 'default', clef is 2/3 of the default value
+    return size == 'default' ? Tables.NOTATION_FONT_SCALE : (Tables.NOTATION_FONT_SCALE / 3) * 2;
+  }
+
   /** Set associated stave. */
   setStave(stave: Stave): this {
     this.stave = stave;
@@ -200,7 +192,7 @@ export class Clef extends StaveModifier {
 
     this.applyStyle(ctx);
     ctx.openGroup('clef', this.getAttribute('id'));
-    Glyph.renderGlyph(ctx, this.x, stave.getYForLine(this.clef.line), this.clef.point, this.clef.code, {
+    Glyph.renderGlyph(ctx, this.x, stave.getYForLine(this.clef.line), Clef.getPoint(this.size), this.clef.code, {
       category: `clef_${this.size}`,
     });
     if (this.annotation !== undefined && this.attachment !== undefined) {

diff --git a/src/clefnote.ts b/src/clefnote.ts
@@ -5,6 +5,7 @@
 import { Clef, ClefAnnotatiomType, ClefType } from './clef';
 import { Glyph } from './glyph';
 import { Note } from './note';
+import { Tables } from './tables';
 import { Category } from './typeguard';
 
 /** ClefNote implements clef annotations in measures. */
@@ -25,7 +26,7 @@ export class ClefNote extends Note {
     this.clef = clef.clef;
     this.annotation = clef.annotation;
     this.size = size === undefined ? 'default' : size;
-    this.setWidth(Glyph.getWidth(this.clef.code, this.clef.point, `clefNote_${this.size}`));
+    this.setWidth(Glyph.getWidth(this.clef.code, Clef.getPoint(this.size), `clefNote_${this.size}`));
 
     // Note properties
     this.ignore_ticks = true;
@@ -38,7 +39,7 @@ export class ClefNote extends Note {
     const clef = new Clef(type, size, annotation);
     this.clef = clef.clef;
     this.annotation = clef.annotation;
-    this.setWidth(Glyph.getWidth(this.clef.code, this.clef.point, `clefNote_${this.size}`));
+    this.setWidth(Glyph.getWidth(this.clef.code, Clef.getPoint(this.size), `clefNote_${this.size}`));
     return this;
   }
 
@@ -60,7 +61,7 @@ export class ClefNote extends Note {
     this.setRendered();
     const abs_x = this.getAbsoluteX();
 
-    Glyph.renderGlyph(ctx, abs_x, stave.getYForLine(this.clef.line), this.clef.point, this.clef.code, {
+    Glyph.renderGlyph(ctx, abs_x, stave.getYForLine(this.clef.line), Clef.getPoint(this.size), this.clef.code, {
       category: `clefNote_${this.size}`,
     });
 

diff --git a/src/fonts/common_metrics.ts b/src/fonts/common_metrics.ts
@@ -104,18 +104,18 @@ export const CommonMetrics = {
       '8va': {
         point: 18,
         treble: {
-          line: -1.4,
+          line: -2,
           shiftX: 12,
         },
       },
       '8vb': {
         point: 18,
         treble: {
-          line: 6,
+          line: 6.5,
           shiftX: 10,
         },
         bass: {
-          line: 3.5,
+          line: 4,
           shiftX: 1,
         },
       },
@@ -239,7 +239,7 @@ export const CommonMetrics = {
   digits: {
     // used by TimeSignature objects
     shiftLine: -1,
-    point: 34,
+    point: 39,
 
     // used by tuplets
     tupletPoint: 22,
@@ -374,32 +374,14 @@ export const CommonMetrics = {
         shiftX: -1,
       },
     },
-    clef_default: {
-      point: 32,
-      gClef: {
-        scale: 1.1,
-        shiftY: 1,
-      },
-      fClef: {
-        shiftY: -0.5,
-      },
-      '6stringTabClef': {
-        point: 32,
-        shiftY: -5.5,
-      },
-    },
+    clef_default: {},
     clef_small: {
-      point: 26,
       gClef: {
         shiftY: 1.5,
       },
     },
-    clefNote_default: {
-      point: 32,
-    },
-    clefNote_small: {
-      point: 26,
-    },
+    clefNote_default: {},
+    clefNote_small: {},
     ornament: {
       ornamentTurn: {
         scale: 1.2,

diff --git a/src/fonts/gonville_metrics.ts b/src/fonts/gonville_metrics.ts
@@ -380,7 +380,6 @@ export const GonvilleMetrics = {
       point: 40,
       '6stringTabClef': {
         point: 40,
-        shiftY: -5.5,
       },
     },
     clef_small: {

diff --git a/src/keysignature.ts b/src/keysignature.ts
@@ -95,7 +95,7 @@ export class KeySignature extends StaveModifier {
 
     this.setKeySig(keySpec, cancelKeySpec, alterKeySpec);
     this.setPosition(StaveModifierPosition.BEGIN);
-    this.glyphFontScale = 38; // TODO(0xFE): Should this match StaveNote?
+    this.glyphFontScale = Tables.NOTATION_FONT_SCALE;
     this.glyphs = [];
     this.xPositions = []; // relative to this.x
     this.paddingForced = false;

diff --git a/src/ornament.ts b/src/ornament.ts
@@ -181,7 +181,7 @@ export class Ornament extends Modifier {
     this.delayed = false;
 
     this.render_options = {
-      font_scale: 38,
+      font_scale: Tables.NOTATION_FONT_SCALE,
       accidentalLowerPadding: 3,
       accidentalUpperPadding: 3,
     };

diff --git a/src/stavetempo.ts b/src/stavetempo.ts
@@ -65,9 +65,7 @@ export class StaveTempo extends StaveModifier {
     this.setRendered();
 
     const options = this.render_options;
-    // FIXME: What does the '38' mean? Why 38? Is that supposed to
-    // be the default font size for standard notation?
-    const scale = options.glyph_font_scale / 38;
+    const scale = options.glyph_font_scale / Tables.NOTATION_FONT_SCALE;
     const name = this.tempo.name;
     const duration = this.tempo.duration;
     const dots = this.tempo.dots || 0;

diff --git a/src/strokes.ts b/src/strokes.ts
@@ -9,6 +9,7 @@ import { Glyph } from './glyph';
 import { Modifier } from './modifier';
 import { ModifierContextState } from './modifiercontext';
 import { Note } from './note';
+import { Tables } from './tables';
 import { Category, isNote, isStaveNote, isTabNote } from './typeguard';
 import { RuntimeError } from './util';
 
@@ -92,7 +93,7 @@ export class Stroke extends Modifier {
     this.position = Modifier.Position.LEFT;
 
     this.render_options = {
-      font_scale: 38,
+      font_scale: Tables.NOTATION_FONT_SCALE,
     };
 
     this.resetFont();

diff --git a/src/timesigglyph.ts b/src/timesigglyph.ts
@@ -77,7 +77,7 @@ export class TimeSignatureGlyph extends Glyph {
 
     // If the height of the digits is more than two staff spaces (20), shift to the next line
     // in order to center the digits on lines 1 and 5 rather than 2 and 4.
-    this.lineShift = height > 20 ? 1 : 0;
+    this.lineShift = height > 22 ? 1 : 0;
 
     this.width = Math.max(topWidth, botWidth);
     this.xMin = this.getMetrics().x_min;

diff --git a/src/timesignature.ts b/src/timesignature.ts
@@ -46,16 +46,14 @@ export class TimeSignature extends StaveModifier {
     return Category.TimeSignature;
   }
 
-  static get glyphs(): Record<string, { code: string; point: number; line: number }> {
+  static get glyphs(): Record<string, { code: string; line: number }> {
     return {
       C: {
         code: 'timeSigCommon',
-        point: 40,
         line: 2,
       },
       'C|': {
         code: 'timeSigCutCommon',
-        point: 40,
         line: 2,
       },
     };
@@ -79,7 +77,7 @@ export class TimeSignature extends StaveModifier {
 
     // point must be defined before parsing spec.
     const musicFont = Tables.currentMusicFont();
-    this.point = musicFont.lookupMetric('digits.point');
+    this.point = musicFont.lookupMetric('digits.point') || Tables.NOTATION_FONT_SCALE;
 
     const fontLineShift = musicFont.lookupMetric('digits.shiftLine', 0);
     this.topLine = 2 + fontLineShift;
@@ -96,11 +94,11 @@ export class TimeSignature extends StaveModifier {
    */
   parseTimeSpec(timeSpec: string): TimeSignatureInfo {
     if (timeSpec === 'C' || timeSpec === 'C|') {
-      const { line, code, point } = TimeSignature.glyphs[timeSpec];
+      const { line, code } = TimeSignature.glyphs[timeSpec];
       return {
         line,
         num: false,
-        glyph: new Glyph(code, point),
+        glyph: new Glyph(code, Tables.NOTATION_FONT_SCALE),
       };
     }