Skip to content

Commit

Permalink
Partial merge of branch 'master' into setFont.
Browse files Browse the repository at this point in the history 
Includes relative path imports for test files from:
0xfe#1209
  • Loading branch information
@ronyeh
ronyeh committed Nov 3, 2021
1 parent bf45050 commit 0403e59
Show file tree
Hide file tree
Showing 65 changed files with 468 additions and 474 deletions.
7 changes: 7 additions & 0 deletions src/flow.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,13 @@ export const Flow = {
return Tables.MUSIC_FONT_STACK.slice();
},

/**
* @returns the `Font` object at the head of the music font stack.
*/
currentMusicFont(): Font {
return Tables.currentMusicFont();
},

get NOTATION_FONT_SCALE(): number {
return Tables.NOTATION_FONT_SCALE;
},
Expand Down
32 changes: 16 additions & 16 deletions tests/accidental_tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@

import { TestOptions, VexFlowTests } from './vexflow_test_helpers';

import { Accidental } from 'accidental';
import { Beam } from 'beam';
import { Factory } from 'factory';
import { Flow } from 'flow';
import { Formatter } from 'formatter';
import { Modifier } from 'modifier';
import { ModifierContext } from 'modifiercontext';
import { Note } from 'note';
import { RenderContext } from 'rendercontext';
import { Stave } from 'stave';
import { StaveNote, StaveNoteStruct } from 'stavenote';
import { Stem } from 'stem';
import { TickContext } from 'tickcontext';
import { TimeSigNote } from 'timesignote';
import { isCategory } from 'typeguard';
import { Voice } from 'voice';
import { Accidental } from '../src/accidental';
import { Beam } from '../src/beam';
import { Factory } from '../src/factory';
import { Flow } from '../src/flow';
import { Formatter } from '../src/formatter';
import { Modifier } from '../src/modifier';
import { ModifierContext } from '../src/modifiercontext';
import { Note } from '../src/note';
import { RenderContext } from '../src/rendercontext';
import { Stave } from '../src/stave';
import { StaveNote, StaveNoteStruct } from '../src/stavenote';
import { Stem } from '../src/stem';
import { TickContext } from '../src/tickcontext';
import { TimeSigNote } from '../src/timesignote';
import { isCategory } from '../src/typeguard';
import { Voice } from '../src/voice';

const AccidentalTests = {
Start(): void {
Expand Down
29 changes: 14 additions & 15 deletions tests/annotation_tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,20 @@

import { TestOptions, VexFlowTests } from './vexflow_test_helpers';

import { Annotation } from 'annotation';
import { Beam } from 'beam';
import { Bend } from 'bend';
import { Flow } from 'flow';
// import { Font } from 'font'; // RONYEH
import { Formatter } from 'formatter';
import { Registry } from 'registry';
import { ContextBuilder } from 'renderer';
import { Stave } from 'stave';
import { StaveNote, StaveNoteStruct } from 'stavenote';
import { TabNote, TabNoteStruct } from 'tabnote';
import { TabStave } from 'tabstave';
import { Tickable } from 'tickable';
import { Vibrato } from 'vibrato';
import { Voice } from 'voice';
import { Annotation } from '../src/annotation';
import { Beam } from '../src/beam';
import { Bend } from '../src/bend';
import { Flow } from '../src/flow';
import { Formatter } from '../src/formatter';
import { Registry } from '../src/registry';
import { ContextBuilder } from '../src/renderer';
import { Stave } from '../src/stave';
import { StaveNote, StaveNoteStruct } from '../src/stavenote';
import { TabNote, TabNoteStruct } from '../src/tabnote';
import { TabStave } from '../src/tabstave';
import { Tickable } from '../src/tickable';
import { Vibrato } from '../src/vibrato';
import { Voice } from '../src/voice';

const AnnotationTests = {
Start(): void {
Expand Down
27 changes: 13 additions & 14 deletions tests/articulation_tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@

import { TestOptions, VexFlowTests } from './vexflow_test_helpers';

import { Articulation } from 'articulation';
import { Beam } from 'beam';
import { Flow } from 'flow';
// import { Font } from 'font'; // RONYEH
import { Formatter } from 'formatter';
import { ContextBuilder } from 'renderer';
import { Stave } from 'stave';
import { Barline } from 'stavebarline';
import { StaveNote } from 'stavenote';
import { TabNote } from 'tabnote';
import { TabStave } from 'tabstave';
import { Voice } from 'voice';
import { Articulation } from '../src/articulation';
import { Beam } from '../src/beam';
import { Flow } from '../src/flow';
import { Font } from '../src/font';
import { Formatter } from '../src/formatter';
import { ContextBuilder } from '../src/renderer';
import { Stave } from '../src/stave';
import { Barline } from '../src/stavebarline';
import { StaveNote } from '../src/stavenote';
import { TabNote } from '../src/tabnote';
import { TabStave } from '../src/tabstave';
import { Voice } from '../src/voice';

const ArticulationTests = {
Start(): void {
Expand Down Expand Up @@ -306,8 +306,7 @@ function drawArticulations2(options: TestOptions): void {

function tabNotes(options: TestOptions, contextBuilder: ContextBuilder): void {
const ctx = contextBuilder(options.elementId, 600, 200);
ctx.font = '10pt Arial';
// ctx.font = '10pt ' + Font.SANS_SERIF; // RONYEH
ctx.font = '10pt ' + Font.SANS_SERIF;
const stave = new TabStave(10, 10, 550);
stave.setContext(ctx);
stave.draw();
Expand Down
10 changes: 5 additions & 5 deletions tests/auto_beam_formatting_tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

import { concat, TestOptions, VexFlowTests } from './vexflow_test_helpers';

import { Beam } from 'beam';
import { EasyScore } from 'easyscore';
import { Fraction } from 'fraction';
import { Stem } from 'stem';
import { StemmableNote } from 'stemmablenote';
import { Beam } from '../src/beam';
import { EasyScore } from '../src/easyscore';
import { Fraction } from '../src/fraction';
import { Stem } from '../src/stem';
import { StemmableNote } from '../src/stemmablenote';

const AutoBeamFormattingTests = {
Start(): void {
Expand Down
8 changes: 4 additions & 4 deletions tests/bach_tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

import { concat, TestOptions, VexFlowTests } from './vexflow_test_helpers';

import { Factory } from 'factory';
import { Registry } from 'registry';
import { BarlineType } from 'stavebarline';
import { StaveNote } from 'stavenote';
import { Factory } from '../src/factory';
import { Registry } from '../src/registry';
import { BarlineType } from '../src/stavebarline';
import { StaveNote } from '../src/stavenote';

const BachDemoTests = {
Start(): void {
Expand Down
2 changes: 1 addition & 1 deletion tests/barline_tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import { TestOptions, VexFlowTests } from './vexflow_test_helpers';

import { Barline, BarlineType } from 'stavebarline';
import { Barline, BarlineType } from '../src/stavebarline';

const BarlineTests = {
Start(): void {
Expand Down
12 changes: 6 additions & 6 deletions tests/beam_tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

import { concat, TestOptions, VexFlowTests } from './vexflow_test_helpers';

import { Beam } from 'beam';
import { StaveNoteStruct } from 'stavenote';
import { Stem } from 'stem';
import { StemmableNote } from 'stemmablenote';
import { TabNoteStruct } from 'tabnote';
import { Voice } from 'voice';
import { Beam } from '../src/beam';
import { StaveNoteStruct } from '../src/stavenote';
import { Stem } from '../src/stem';
import { StemmableNote } from '../src/stemmablenote';
import { TabNoteStruct } from '../src/tabnote';
import { Voice } from '../src/voice';

const BeamTests = {
Start(): void {
Expand Down
17 changes: 8 additions & 9 deletions tests/bend_tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@

import { TestOptions, VexFlowTests } from './vexflow_test_helpers';

import { Bend, BendPhrase } from 'bend';
// import { Font } from 'font'; // RONYEH
import { Formatter } from 'formatter';
import { ModifierContext } from 'modifiercontext';
import { Note } from 'note';
import { ContextBuilder } from 'renderer';
import { TabNote, TabNoteStruct } from 'tabnote';
import { TabStave } from 'tabstave';
import { TickContext } from 'tickcontext';
import { Bend, BendPhrase } from '../src/bend';
import { Formatter } from '../src/formatter';
import { ModifierContext } from '../src/modifiercontext';
import { Note } from '../src/note';
import { ContextBuilder } from '../src/renderer';
import { TabNote, TabNoteStruct } from '../src/tabnote';
import { TabStave } from '../src/tabstave';
import { TickContext } from '../src/tickcontext';

const BendTests = {
Start(): void {
Expand Down
2 changes: 1 addition & 1 deletion tests/boundingbox_tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//
// Bounding Box Tests

import { BoundingBox } from 'boundingbox';
import { BoundingBox } from '../src/boundingbox';

const BoundingBoxTests = {
Start(): void {
Expand Down
6 changes: 3 additions & 3 deletions tests/boundingboxcomputation_tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

import { TestOptions, VexFlowTests } from './vexflow_test_helpers';

import { BoundingBoxComputation } from 'boundingboxcomputation';
import { Glyph, OutlineCode } from 'glyph';
import { RenderContext } from 'rendercontext';
import { BoundingBoxComputation } from '../src/boundingboxcomputation';
import { Glyph, OutlineCode } from '../src/glyph';
import { RenderContext } from '../src/rendercontext';

const BoundingBoxComputationTests = {
Start(): void {
Expand Down
12 changes: 6 additions & 6 deletions tests/chordsymbol_tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

import { TestOptions, VexFlowTests } from './vexflow_test_helpers';

import { Accidental } from 'accidental';
import { ChordSymbol } from 'chordsymbol';
import { Factory } from 'factory';
import { Formatter } from 'formatter';
import { Stave } from 'stave';
import { StaveNote } from 'stavenote';
import { Accidental } from '../src/accidental';
import { ChordSymbol } from '../src/chordsymbol';
import { Factory } from '../src/factory';
import { Formatter } from '../src/formatter';
import { Stave } from '../src/stave';
import { StaveNote } from '../src/stavenote';

const ChordSymbolTests = {
Start(): void {
Expand Down
8 changes: 4 additions & 4 deletions tests/curve_tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

import { concat, TestOptions, VexFlowTests } from './vexflow_test_helpers';

import { CurvePosition } from 'curve';
import { BuilderOptions } from 'easyscore';
import { Factory } from 'factory';
import { StaveNote } from 'stavenote';
import { CurvePosition } from '../src/curve';
import { BuilderOptions } from '../src/easyscore';
import { Factory } from '../src/factory';
import { StaveNote } from '../src/stavenote';

const CurveTests = {
Start(): void {
Expand Down
16 changes: 8 additions & 8 deletions tests/dot_tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

import { TestOptions, VexFlowTests } from './vexflow_test_helpers';

import { Beam } from 'beam';
import { ModifierContext } from 'modifiercontext';
import { Note } from 'note';
import { RenderContext } from 'rendercontext';
import { ContextBuilder } from 'renderer';
import { Stave } from 'stave';
import { StaveNote } from 'stavenote';
import { TickContext } from 'tickcontext';
import { Beam } from '../src/beam';
import { ModifierContext } from '../src/modifiercontext';
import { Note } from '../src/note';
import { RenderContext } from '../src/rendercontext';
import { ContextBuilder } from '../src/renderer';
import { Stave } from '../src/stave';
import { StaveNote } from '../src/stavenote';
import { TickContext } from '../src/tickcontext';

const DotTests = {
Start(): void {
Expand Down
14 changes: 7 additions & 7 deletions tests/easyscore_tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

import { TestOptions, VexFlowTests } from './vexflow_test_helpers';

import { Articulation } from 'articulation';
import { EasyScore } from 'easyscore';
import { FretHandFinger } from 'frethandfinger';
import { Modifier } from 'modifier';
import { StaveConnector } from 'staveconnector';
import { Stem } from 'stem';
import { Tuplet } from 'tuplet';
import { Articulation } from '../src/articulation';
import { EasyScore } from '../src/easyscore';
import { FretHandFinger } from '../src/frethandfinger';
import { Modifier } from '../src/modifier';
import { StaveConnector } from '../src/staveconnector';
import { Stem } from '../src/stem';
import { Tuplet } from '../src/tuplet';

const EasyScoreTests = {
Start(): void {
Expand Down
4 changes: 2 additions & 2 deletions tests/factory_tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import { TestOptions, VexFlowTests } from './vexflow_test_helpers';

import { Factory } from 'factory';
import { Barline } from 'stavebarline';
import { Factory } from '../src/factory';
import { Barline } from '../src/stavebarline';

const FactoryTests = {
Start(): void {
Expand Down
31 changes: 14 additions & 17 deletions tests/formatter_tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,18 @@

import { TestOptions, VexFlowTests } from './vexflow_test_helpers';

import { Annotation } from 'annotation';
import { Beam } from 'beam';
import { Bend } from 'bend';
import { Flow } from 'flow';
import { Font, FontGlyph } from 'font';
// import { FontGlyph, FontWeight } from 'font'; // RONYEH
import { Formatter } from 'formatter';
import { Note } from 'note';
import { Registry } from 'registry';
import { Stave } from 'stave';
import { StaveConnector } from 'staveconnector';
import { StaveNote } from 'stavenote';
import { Tables } from 'tables';
import { Voice, VoiceTime } from 'voice';

import { Annotation } from '../src/annotation';
import { Beam } from '../src/beam';
import { Bend } from '../src/bend';
import { Flow } from '../src/flow';
import { Font, FontGlyph } from '../src/font';
import { Formatter } from '../src/formatter';
import { Note } from '../src/note';
import { Registry } from '../src/registry';
import { Stave } from '../src/stave';
import { StaveConnector } from '../src/staveconnector';
import { StaveNote } from '../src/stavenote';
import { Voice, VoiceTime } from '../src/voice';
import { MockTickable } from './mocks';

const FormatterTests = {
Expand Down Expand Up @@ -59,8 +56,8 @@ function glyphWidth(glyphName: string): number {
// NOTATION_FONT_SCALE: 39,
// TABLATURE_FONT_SCALE: 39,

const glyph: FontGlyph = Tables.currentMusicFont().getGlyphs()[glyphName];
const widthInEm = (glyph.x_max - glyph.x_min) / Tables.currentMusicFont().getResolution();
const glyph: FontGlyph = Flow.currentMusicFont().getGlyphs()[glyphName];
const widthInEm = (glyph.x_max - glyph.x_min) / Flow.currentMusicFont().getResolution();
return widthInEm * 38 * Font.convertToPxFrom.pt;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/fraction_tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//
// Fraction Tests

import { Fraction } from 'fraction';
import { Fraction } from '../src/fraction';

const FractionTests = {
Start(): void {
Expand Down
8 changes: 4 additions & 4 deletions tests/ghostnote_tests.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

import { TestOptions, VexFlowTests } from './vexflow_test_helpers';

import { EasyScore } from 'easyscore';
import { Factory } from 'factory';
import { StaveNote } from 'stavenote';
import { StemmableNote } from 'stemmablenote';
import { EasyScore } from '../src/easyscore';
import { Factory } from '../src/factory';
import { StaveNote } from '../src/stavenote';
import { StemmableNote } from '../src/stemmablenote';

const GhostNoteTests = {
Start(): void {
Expand Down
Loading

0 comments on commit 0403e59

Please sign in to comment.