vexflow 4.0.1-beta.1 → 4.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +48 -65
- package/build/cjs/vexflow-bravura.js +2 -2
- package/build/cjs/vexflow-bravura.js.map +1 -1
- package/build/cjs/vexflow-core.js +2 -2
- package/build/cjs/vexflow-core.js.map +1 -1
- package/build/cjs/vexflow-debug-with-tests.js +724 -697
- package/build/cjs/vexflow-debug-with-tests.js.map +1 -1
- package/build/cjs/vexflow-debug.js +550 -610
- package/build/cjs/vexflow-debug.js.map +1 -1
- package/build/cjs/vexflow-font-gonville.js +1 -1
- package/build/cjs/vexflow-font-gonville.js.map +1 -1
- package/build/cjs/vexflow-gonville.js +2 -2
- package/build/cjs/vexflow-gonville.js.map +1 -1
- package/build/cjs/vexflow-petaluma.js +2 -2
- package/build/cjs/vexflow-petaluma.js.map +1 -1
- package/build/cjs/vexflow.js +2 -2
- package/build/cjs/vexflow.js.map +1 -1
- package/build/esm/entry/vexflow-bravura.js +10 -0
- package/build/esm/entry/vexflow-core.js +53 -0
- package/build/esm/entry/vexflow-debug-with-tests.js +11 -0
- package/build/esm/entry/vexflow-debug.js +8 -0
- package/build/esm/entry/vexflow-font-bravura.js +7 -0
- package/build/esm/entry/vexflow-font-custom.js +7 -0
- package/build/esm/entry/vexflow-font-gonville.js +7 -0
- package/build/esm/entry/vexflow-font-petaluma.js +7 -0
- package/build/esm/entry/vexflow-gonville.js +10 -0
- package/build/esm/entry/vexflow-petaluma.js +10 -0
- package/build/esm/entry/vexflow.js +8 -0
- package/build/esm/src/accidental.js +348 -0
- package/build/esm/src/annotation.js +238 -0
- package/build/esm/src/articulation.js +267 -0
- package/build/esm/src/barnote.js +58 -0
- package/build/esm/src/beam.js +644 -0
- package/build/esm/src/bend.js +202 -0
- package/build/esm/src/boundingbox.js +59 -0
- package/build/esm/src/boundingboxcomputation.js +107 -0
- package/build/esm/src/canvascontext.js +202 -0
- package/build/esm/src/chordsymbol.js +578 -0
- package/build/esm/src/clef.js +153 -0
- package/build/esm/src/clefnote.js +65 -0
- package/build/esm/src/crescendo.js +77 -0
- package/build/esm/src/curve.js +118 -0
- package/build/esm/src/dot.js +137 -0
- package/build/esm/src/easyscore.js +374 -0
- package/build/esm/src/element.js +216 -0
- package/build/esm/src/factory.js +445 -0
- package/build/esm/src/flow.js +288 -0
- package/build/esm/src/font.js +262 -0
- package/build/esm/src/fonts/bravura_glyphs.js +3239 -0
- package/build/esm/src/fonts/bravura_metrics.js +507 -0
- package/build/esm/src/fonts/custom_glyphs.js +78 -0
- package/build/esm/src/fonts/custom_metrics.js +5 -0
- package/build/esm/src/fonts/gonville_glyphs.js +828 -0
- package/build/esm/src/fonts/gonville_metrics.js +421 -0
- package/build/esm/src/fonts/load_all.js +10 -0
- package/build/esm/src/fonts/load_bravura.js +6 -0
- package/build/esm/src/fonts/load_custom.js +6 -0
- package/build/esm/src/fonts/load_gonville.js +6 -0
- package/build/esm/src/fonts/load_petaluma.js +6 -0
- package/build/esm/src/fonts/petaluma_glyphs.js +1335 -0
- package/build/esm/src/fonts/petaluma_metrics.js +536 -0
- package/build/esm/src/fonts/petalumascript_glyphs.js +863 -0
- package/build/esm/src/fonts/robotoslab_glyphs.js +863 -0
- package/build/esm/src/fonts/textfonts.js +44 -0
- package/build/esm/src/formatter.js +585 -0
- package/build/esm/src/fraction.js +171 -0
- package/build/esm/src/frethandfinger.js +156 -0
- package/build/esm/src/ghostnote.js +50 -0
- package/build/esm/src/glyph.js +337 -0
- package/build/esm/src/glyphnote.js +55 -0
- package/build/esm/src/gracenote.js +133 -0
- package/build/esm/src/gracenotegroup.js +128 -0
- package/build/esm/src/gracetabnote.js +12 -0
- package/build/esm/src/index.js +89 -0
- package/build/esm/src/keymanager.js +99 -0
- package/build/esm/src/keysignature.js +250 -0
- package/build/esm/src/keysignote.js +28 -0
- package/build/esm/src/modifier.js +128 -0
- package/build/esm/src/modifiercontext.js +110 -0
- package/build/esm/src/multimeasurerest.js +173 -0
- package/build/esm/src/music.js +322 -0
- package/build/esm/src/note.js +371 -0
- package/build/esm/src/notehead.js +169 -0
- package/build/esm/src/notesubgroup.js +59 -0
- package/build/esm/src/ornament.js +206 -0
- package/build/esm/src/parenthesis.js +76 -0
- package/build/esm/src/parser.js +164 -0
- package/build/esm/src/pedalmarking.js +192 -0
- package/build/esm/src/registry.js +81 -0
- package/build/esm/src/rendercontext.js +24 -0
- package/build/esm/src/renderer.js +112 -0
- package/build/esm/src/repeatnote.js +22 -0
- package/build/esm/src/stave.js +547 -0
- package/build/esm/src/stavebarline.js +182 -0
- package/build/esm/src/staveconnector.js +196 -0
- package/build/esm/src/stavehairpin.js +120 -0
- package/build/esm/src/staveline.js +215 -0
- package/build/esm/src/stavemodifier.js +77 -0
- package/build/esm/src/stavenote.js +860 -0
- package/build/esm/src/staverepetition.js +155 -0
- package/build/esm/src/stavesection.js +58 -0
- package/build/esm/src/stavetempo.js +91 -0
- package/build/esm/src/stavetext.js +82 -0
- package/build/esm/src/stavetie.js +141 -0
- package/build/esm/src/stavevolta.js +67 -0
- package/build/esm/src/stem.js +131 -0
- package/build/esm/src/stemmablenote.js +193 -0
- package/build/esm/src/stringnumber.js +231 -0
- package/build/esm/src/strokes.js +200 -0
- package/build/esm/src/svgcontext.js +414 -0
- package/build/esm/src/system.js +109 -0
- package/build/esm/src/tables.js +1102 -0
- package/build/esm/src/tabnote.js +299 -0
- package/build/esm/src/tabslide.js +76 -0
- package/build/esm/src/tabstave.js +17 -0
- package/build/esm/src/tabtie.js +19 -0
- package/build/esm/src/textbracket.js +144 -0
- package/build/esm/src/textdynamics.js +81 -0
- package/build/esm/src/textformatter.js +177 -0
- package/build/esm/src/textnote.js +174 -0
- package/build/esm/src/tickable.js +214 -0
- package/build/esm/src/tickcontext.js +170 -0
- package/build/esm/src/timesigglyph.js +85 -0
- package/build/esm/src/timesignature.js +89 -0
- package/build/esm/src/timesignote.js +32 -0
- package/build/esm/src/tremolo.js +47 -0
- package/build/esm/src/tuning.js +54 -0
- package/build/esm/src/tuplet.js +240 -0
- package/build/esm/src/typeguard.js +30 -0
- package/build/esm/src/util.js +58 -0
- package/build/esm/src/version.js +3 -3
- package/build/esm/src/vex.js +51 -0
- package/build/esm/src/vibrato.js +100 -0
- package/build/esm/src/vibratobracket.js +50 -0
- package/build/esm/src/voice.js +187 -0
- package/build/esm/src/web.js +15 -0
- package/build/esm/tests/accidental_tests.js +974 -0
- package/build/esm/tests/annotation_tests.js +390 -0
- package/build/esm/tests/articulation_tests.js +365 -0
- package/build/esm/tests/auto_beam_formatting_tests.js +548 -0
- package/build/esm/tests/bach_tests.js +335 -0
- package/build/esm/tests/barline_tests.js +52 -0
- package/build/esm/tests/beam_tests.js +614 -0
- package/build/esm/tests/bend_tests.js +215 -0
- package/build/esm/tests/boundingbox_tests.js +53 -0
- package/build/esm/tests/boundingboxcomputation_tests.js +183 -0
- package/build/esm/tests/chordsymbol_tests.js +320 -0
- package/build/esm/tests/clef_tests.js +131 -0
- package/build/esm/tests/curve_tests.js +118 -0
- package/build/esm/tests/dot_tests.js +123 -0
- package/build/esm/tests/easyscore_tests.js +462 -0
- package/build/esm/tests/factory_tests.js +44 -0
- package/build/esm/tests/font_tests.js +135 -0
- package/build/esm/tests/formatter/framestack.js +61 -0
- package/build/esm/tests/formatter/tests.js +203 -0
- package/build/esm/tests/formatter_tests.js +670 -0
- package/build/esm/tests/fraction_tests.js +72 -0
- package/build/esm/tests/ghostnote_tests.js +77 -0
- package/build/esm/tests/glyphnote_tests.js +113 -0
- package/build/esm/tests/gracenote_tests.js +413 -0
- package/build/esm/tests/gracetabnote_tests.js +79 -0
- package/build/esm/tests/index.js +68 -0
- package/build/esm/tests/key_clef_tests.js +103 -0
- package/build/esm/tests/keymanager_tests.js +68 -0
- package/build/esm/tests/keysignature_tests.js +308 -0
- package/build/esm/tests/mocks.js +71 -0
- package/build/esm/tests/modifier_tests.js +24 -0
- package/build/esm/tests/multimeasurerest_tests.js +141 -0
- package/build/esm/tests/music_tests.js +161 -0
- package/build/esm/tests/notehead_tests.js +137 -0
- package/build/esm/tests/notesubgroup_tests.js +149 -0
- package/build/esm/tests/offscreencanvas_tests.js +47 -0
- package/build/esm/tests/ornament_tests.js +298 -0
- package/build/esm/tests/parser_tests.js +122 -0
- package/build/esm/tests/pedalmarking_tests.js +64 -0
- package/build/esm/tests/percussion_tests.js +180 -0
- package/build/esm/tests/registry_tests.js +64 -0
- package/build/esm/tests/renderer_tests.js +113 -0
- package/build/esm/tests/rests_tests.js +248 -0
- package/build/esm/tests/rhythm_tests.js +357 -0
- package/build/esm/tests/stave_tests.js +560 -0
- package/build/esm/tests/staveconnector_tests.js +402 -0
- package/build/esm/tests/stavehairpin_tests.js +90 -0
- package/build/esm/tests/staveline_tests.js +122 -0
- package/build/esm/tests/stavemodifier_tests.js +51 -0
- package/build/esm/tests/stavenote_tests.js +867 -0
- package/build/esm/tests/stavetie_tests.js +108 -0
- package/build/esm/tests/stringnumber_tests.js +259 -0
- package/build/esm/tests/strokes_tests.js +275 -0
- package/build/esm/tests/style_tests.js +98 -0
- package/build/esm/tests/support/qunit.js +2765 -0
- package/build/esm/tests/tabnote_tests.js +474 -0
- package/build/esm/tests/tabslide_tests.js +135 -0
- package/build/esm/tests/tabstave_tests.js +23 -0
- package/build/esm/tests/tabtie_tests.js +173 -0
- package/build/esm/tests/textbracket_tests.js +100 -0
- package/build/esm/tests/textformatter_tests.js +24 -0
- package/build/esm/tests/textnote_tests.js +215 -0
- package/build/esm/tests/threevoice_tests.js +132 -0
- package/build/esm/tests/tickcontext_tests.js +36 -0
- package/build/esm/tests/timesignature_tests.js +134 -0
- package/build/esm/tests/tremolo_tests.js +75 -0
- package/build/esm/tests/tuning_tests.js +56 -0
- package/build/esm/tests/tuplet_tests.js +450 -0
- package/build/esm/tests/typeguard_tests.js +82 -0
- package/build/esm/tests/vexflow_test_helpers.js +266 -0
- package/build/esm/tests/vf_prefix_tests.js +115 -0
- package/build/esm/tests/vibrato_tests.js +92 -0
- package/build/esm/tests/vibratobracket_tests.js +45 -0
- package/build/esm/tests/voice_tests.js +69 -0
- package/build/types/entry/vexflow-bravura.d.ts +2 -0
- package/build/types/entry/vexflow-core.d.ts +2 -0
- package/build/types/entry/vexflow-debug.d.ts +2 -0
- package/build/types/entry/vexflow-font-bravura.d.ts +3771 -0
- package/build/types/entry/vexflow-font-custom.d.ts +86 -0
- package/build/types/entry/vexflow-font-gonville.d.ts +1267 -0
- package/build/types/entry/vexflow-font-petaluma.d.ts +1896 -0
- package/build/types/entry/vexflow-gonville.d.ts +2 -0
- package/build/types/entry/vexflow-petaluma.d.ts +2 -0
- package/build/types/entry/vexflow.d.ts +2 -0
- package/build/types/src/accidental.d.ts +66 -0
- package/build/types/src/annotation.d.ts +61 -0
- package/build/types/src/articulation.d.ts +62 -0
- package/build/types/src/barnote.d.ts +29 -0
- package/build/types/src/beam.d.ts +153 -0
- package/build/types/src/bend.d.ts +73 -0
- package/build/types/src/boundingbox.d.ts +42 -0
- package/build/types/src/boundingboxcomputation.d.ts +33 -0
- package/build/types/src/canvascontext.d.ts +89 -0
- package/build/types/src/chordsymbol.d.ts +149 -0
- package/build/types/src/clef.d.ts +48 -0
- package/build/types/src/clefnote.d.ts +25 -0
- package/build/types/src/crescendo.d.ts +27 -0
- package/build/types/src/curve.d.ts +41 -0
- package/build/types/src/dot.d.ts +20 -0
- package/build/types/src/easyscore.d.ts +152 -0
- package/build/types/src/element.d.ts +202 -0
- package/build/types/src/factory.d.ts +274 -0
- package/build/types/src/flow.d.ts +260 -0
- package/build/types/src/font.d.ts +180 -0
- package/build/types/src/fonts/bravura_glyphs.d.ts +3239 -0
- package/build/types/src/fonts/bravura_metrics.d.ts +533 -0
- package/build/types/src/fonts/custom_glyphs.d.ts +78 -0
- package/build/types/src/fonts/custom_metrics.d.ts +5 -0
- package/build/types/src/fonts/gonville_glyphs.d.ts +828 -0
- package/build/types/src/fonts/gonville_metrics.d.ts +440 -0
- package/build/types/src/fonts/load_all.d.ts +1 -0
- package/build/types/src/fonts/load_bravura.d.ts +1 -0
- package/build/types/src/fonts/load_custom.d.ts +1 -0
- package/build/types/src/fonts/load_gonville.d.ts +1 -0
- package/build/types/src/fonts/load_petaluma.d.ts +1 -0
- package/build/types/src/fonts/petaluma_glyphs.d.ts +1335 -0
- package/build/types/src/fonts/petaluma_metrics.d.ts +562 -0
- package/build/types/src/fonts/petalumascript_glyphs.d.ts +863 -0
- package/build/types/src/fonts/robotoslab_glyphs.d.ts +863 -0
- package/build/types/src/fonts/textfonts.d.ts +1 -0
- package/build/types/src/formatter.d.ts +203 -0
- package/build/types/src/fraction.d.ts +62 -0
- package/build/types/src/frethandfinger.d.ts +22 -0
- package/build/types/src/ghostnote.d.ts +16 -0
- package/build/types/src/glyph.d.ts +141 -0
- package/build/types/src/glyphnote.d.ts +17 -0
- package/build/types/src/gracenote.d.ts +19 -0
- package/build/types/src/gracenotegroup.d.ts +33 -0
- package/build/types/src/gracetabnote.d.ts +5 -0
- package/build/types/src/index.d.ts +89 -0
- package/build/types/src/keymanager.d.ts +25 -0
- package/build/types/src/keysignature.d.ts +50 -0
- package/build/types/src/keysignote.d.ts +11 -0
- package/build/types/src/modifier.d.ts +97 -0
- package/build/types/src/modifiercontext.d.ts +45 -0
- package/build/types/src/multimeasurerest.d.ts +61 -0
- package/build/types/src/music.d.ts +91 -0
- package/build/types/src/note.d.ts +232 -0
- package/build/types/src/notehead.d.ts +70 -0
- package/build/types/src/notesubgroup.d.ts +18 -0
- package/build/types/src/ornament.d.ts +76 -0
- package/build/types/src/parenthesis.d.ts +22 -0
- package/build/types/src/parser.d.ts +45 -0
- package/build/types/src/pedalmarking.d.ts +69 -0
- package/build/types/src/registry.d.ts +40 -0
- package/build/types/src/rendercontext.d.ts +64 -0
- package/build/types/src/renderer.d.ts +35 -0
- package/build/types/src/repeatnote.d.ts +6 -0
- package/build/types/src/stave.d.ts +186 -0
- package/build/types/src/stavebarline.d.ts +28 -0
- package/build/types/src/staveconnector.d.ts +67 -0
- package/build/types/src/stavehairpin.d.ts +56 -0
- package/build/types/src/staveline.d.ts +54 -0
- package/build/types/src/stavemodifier.d.ts +44 -0
- package/build/types/src/stavenote.d.ts +154 -0
- package/build/types/src/staverepetition.d.ts +32 -0
- package/build/types/src/stavesection.d.ts +15 -0
- package/build/types/src/stavetempo.d.ts +25 -0
- package/build/types/src/stavetext.d.ts +25 -0
- package/build/types/src/stavetie.d.ts +59 -0
- package/build/types/src/stavevolta.d.ts +21 -0
- package/build/types/src/stem.d.ts +58 -0
- package/build/types/src/stemmablenote.d.ts +39 -0
- package/build/types/src/stringnumber.d.ts +27 -0
- package/build/types/src/strokes.d.ts +33 -0
- package/build/types/src/svgcontext.d.ts +131 -0
- package/build/types/src/system.d.ts +92 -0
- package/build/types/src/tables.d.ts +96 -0
- package/build/types/src/tabnote.d.ts +44 -0
- package/build/types/src/tabslide.d.ts +34 -0
- package/build/types/src/tabstave.d.ts +7 -0
- package/build/types/src/tabtie.d.ts +18 -0
- package/build/types/src/textbracket.d.ts +55 -0
- package/build/types/src/textdynamics.d.ts +39 -0
- package/build/types/src/textformatter.d.ts +109 -0
- package/build/types/src/textnote.d.ts +49 -0
- package/build/types/src/tickable.d.ts +140 -0
- package/build/types/src/tickcontext.d.ts +82 -0
- package/build/types/src/timesigglyph.d.ts +14 -0
- package/build/types/src/timesignature.d.ts +26 -0
- package/build/types/src/timesignote.d.ts +11 -0
- package/build/types/src/tremolo.d.ts +17 -0
- package/build/types/src/tuning.d.ts +23 -0
- package/build/types/src/tuplet.d.ts +105 -0
- package/build/types/src/typeguard.d.ts +99 -0
- package/build/types/src/util.d.ts +27 -0
- package/build/types/src/version.d.ts +3 -0
- package/build/types/src/vex.d.ts +18 -0
- package/build/types/src/vibrato.d.ts +29 -0
- package/build/types/src/vibratobracket.d.ts +33 -0
- package/build/types/src/voice.d.ts +108 -0
- package/build/types/src/web.d.ts +2 -0
- package/entry/vexflow-bravura.ts +3 -3
- package/entry/vexflow-core.ts +3 -3
- package/entry/vexflow-debug-with-tests.ts +16 -2
- package/entry/vexflow-debug.ts +11 -3
- package/entry/vexflow-gonville.ts +3 -3
- package/entry/vexflow-petaluma.ts +3 -3
- package/entry/vexflow.ts +3 -3
- package/package.json +1 -1
- package/src/annotation.ts +38 -6
- package/src/articulation.ts +8 -2
- package/src/beam.ts +53 -6
- package/src/easyscore.ts +11 -1
- package/src/factory.ts +16 -2
- package/src/flow.ts +35 -20
- package/src/font.ts +0 -4
- package/src/fonts/gonville_glyphs.ts +4 -4
- package/src/formatter.ts +24 -8
- package/src/glyph.ts +8 -0
- package/src/index.ts +2 -7
- package/src/note.ts +2 -1
- package/src/staveline.ts +2 -5
- package/src/stavenote.ts +13 -9
- package/src/stavetext.ts +3 -3
- package/src/system.ts +1 -7
- package/src/textnote.ts +9 -11
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
import { VexFlowTests } from './vexflow_test_helpers.js';
|
|
2
|
+
import { Beam } from '../src/beam.js';
|
|
3
|
+
import { Dot } from '../src/dot.js';
|
|
4
|
+
import { Formatter } from '../src/formatter.js';
|
|
5
|
+
import { ModifierContext } from '../src/modifiercontext.js';
|
|
6
|
+
import { Note } from '../src/note.js';
|
|
7
|
+
import { Stave } from '../src/stave.js';
|
|
8
|
+
import { StaveNote } from '../src/stavenote.js';
|
|
9
|
+
import { TickContext } from '../src/tickcontext.js';
|
|
10
|
+
import { Voice } from '../src/voice.js';
|
|
11
|
+
const DotTests = {
|
|
12
|
+
Start() {
|
|
13
|
+
QUnit.module('Dot');
|
|
14
|
+
const run = VexFlowTests.runTests;
|
|
15
|
+
run('Basic', basic);
|
|
16
|
+
run('Multi Voice', multiVoice);
|
|
17
|
+
},
|
|
18
|
+
};
|
|
19
|
+
function showOneNote(note1, stave, ctx, x) {
|
|
20
|
+
const modifierContext = new ModifierContext();
|
|
21
|
+
note1.setStave(stave).addToModifierContext(modifierContext);
|
|
22
|
+
new TickContext().addTickable(note1).preFormat().setX(x);
|
|
23
|
+
note1.setContext(ctx).draw();
|
|
24
|
+
Note.plotMetrics(ctx, note1, 140);
|
|
25
|
+
}
|
|
26
|
+
function basic(options, contextBuilder) {
|
|
27
|
+
const ctx = contextBuilder(options.elementId, 1000, 240);
|
|
28
|
+
ctx.setFillStyle('#221');
|
|
29
|
+
ctx.setStrokeStyle('#221');
|
|
30
|
+
const stave = new Stave(10, 10, 975);
|
|
31
|
+
stave.setContext(ctx);
|
|
32
|
+
stave.draw();
|
|
33
|
+
const notes = [
|
|
34
|
+
new StaveNote({ keys: ['c/4', 'e/4', 'a/4', 'b/4'], duration: 'w' }),
|
|
35
|
+
new StaveNote({ keys: ['a/4', 'b/4', 'c/5'], duration: '4', stem_direction: 1 }),
|
|
36
|
+
new StaveNote({ keys: ['g/4', 'a/4', 'b/4'], duration: '4', stem_direction: -1 }),
|
|
37
|
+
new StaveNote({ keys: ['e/4', 'f/4', 'b/4', 'c/5'], duration: '4' }),
|
|
38
|
+
new StaveNote({
|
|
39
|
+
keys: ['g/4', 'a/4', 'd/5', 'e/5', 'g/5'],
|
|
40
|
+
duration: '4',
|
|
41
|
+
stem_direction: -1,
|
|
42
|
+
}),
|
|
43
|
+
new StaveNote({ keys: ['g/4', 'b/4', 'd/5', 'e/5'], duration: '4', stem_direction: -1 }),
|
|
44
|
+
new StaveNote({ keys: ['e/4', 'g/4', 'b/4', 'c/5'], duration: '4', stem_direction: 1 }),
|
|
45
|
+
new StaveNote({ keys: ['d/4', 'e/4', 'f/4', 'a/4', 'c/5', 'e/5', 'g/5'], duration: '2' }),
|
|
46
|
+
new StaveNote({
|
|
47
|
+
keys: ['f/4', 'g/4', 'a/4', 'b/4', 'c/5', 'e/5', 'g/5'],
|
|
48
|
+
duration: '16',
|
|
49
|
+
stem_direction: -1,
|
|
50
|
+
}),
|
|
51
|
+
new StaveNote({ keys: ['f/4', 'g/4', 'a/4', 'b/4', 'c/5', 'e/5', 'g/5'], duration: '16', stem_direction: 1 }),
|
|
52
|
+
new StaveNote({
|
|
53
|
+
keys: ['e/4', 'g/4', 'a/4', 'b/4', 'c/5', 'e/5', 'f/5'],
|
|
54
|
+
duration: '16',
|
|
55
|
+
stem_direction: 1,
|
|
56
|
+
}),
|
|
57
|
+
new StaveNote({
|
|
58
|
+
keys: ['e/4', 'g/4', 'a/4', 'b/4', 'c/5'],
|
|
59
|
+
duration: '16',
|
|
60
|
+
stem_direction: 1,
|
|
61
|
+
}),
|
|
62
|
+
new StaveNote({ keys: ['e/4', 'a/4', 'b/4', 'c/5'], duration: '16', stem_direction: 1 }),
|
|
63
|
+
];
|
|
64
|
+
Dot.buildAndAttach(notes, { all: true });
|
|
65
|
+
Dot.buildAndAttach([notes[7], notes[8], notes[9]], { all: true });
|
|
66
|
+
Dot.buildAndAttach([notes[8], notes[9]], { all: true });
|
|
67
|
+
const beam = new Beam(notes.slice(notes.length - 2));
|
|
68
|
+
for (let i = 0; i < notes.length; i++) {
|
|
69
|
+
showOneNote(notes[i], stave, ctx, 30 + i * 65);
|
|
70
|
+
const dots = notes[i].getModifiersByType('Dot');
|
|
71
|
+
ok(dots.length > 0, 'Note ' + i + ' has dots');
|
|
72
|
+
for (let j = 0; j < dots.length; ++j) {
|
|
73
|
+
ok(dots[j].getWidth() > 0, 'Dot ' + j + ' has width set');
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
beam.setContext(ctx).draw();
|
|
77
|
+
VexFlowTests.plotLegendForNoteWidth(ctx, 890, 140);
|
|
78
|
+
ok(true, 'Full Dot');
|
|
79
|
+
}
|
|
80
|
+
function multiVoice(options, contextBuilder) {
|
|
81
|
+
const ctx = contextBuilder(options.elementId, 750, 300);
|
|
82
|
+
ctx.setFillStyle('#221');
|
|
83
|
+
ctx.setStrokeStyle('#221');
|
|
84
|
+
const stave = new Stave(30, 45, 700).setContext(ctx).draw();
|
|
85
|
+
const notes1 = [
|
|
86
|
+
new StaveNote({ keys: ['c/4', 'e/4', 'a/4'], duration: '2', stem_direction: -1 }),
|
|
87
|
+
new StaveNote({ keys: ['c/4', 'e/4', 'c/5'], duration: '2', stem_direction: -1 }),
|
|
88
|
+
new StaveNote({ keys: ['d/4', 'c/5', 'd/5'], duration: '2', stem_direction: -1 }),
|
|
89
|
+
new StaveNote({ keys: ['d/4', 'c/5', 'd/5'], duration: '8', stem_direction: -1 }),
|
|
90
|
+
new StaveNote({ keys: ['d/4', 'c/5', 'd/5'], duration: '8', stem_direction: -1 }),
|
|
91
|
+
];
|
|
92
|
+
Dot.buildAndAttach([notes1[0], notes1[2], notes1[3], notes1[4]], { all: true });
|
|
93
|
+
Dot.buildAndAttach([notes1[0], notes1[2], notes1[3], notes1[4]], { all: true });
|
|
94
|
+
Dot.buildAndAttach([notes1[1]], { index: 0 });
|
|
95
|
+
Dot.buildAndAttach([notes1[1]], { index: 0 });
|
|
96
|
+
Dot.buildAndAttach([notes1[1]], { index: 1 });
|
|
97
|
+
Dot.buildAndAttach([notes1[1]], { index: 1 });
|
|
98
|
+
Dot.buildAndAttach([notes1[1]], { index: 2 });
|
|
99
|
+
Dot.buildAndAttach([notes1[1]], { index: 2 });
|
|
100
|
+
Dot.buildAndAttach([notes1[1]], { index: 2 });
|
|
101
|
+
Dot.buildAndAttach([notes1[2], notes1[3], notes1[4]]);
|
|
102
|
+
const notes2 = [
|
|
103
|
+
new StaveNote({ keys: ['d/5', 'a/5', 'b/5'], duration: '2', stem_direction: 1 }),
|
|
104
|
+
new StaveNote({ keys: ['d/5', 'a/5', 'b/5'], duration: '4', stem_direction: 1 }),
|
|
105
|
+
new StaveNote({ keys: ['d/5', 'a/5', 'b/5'], duration: '4', stem_direction: 1 }),
|
|
106
|
+
new StaveNote({ keys: ['d/5', 'g/5', 'a/5', 'b/5'], duration: '8', stem_direction: 1 }),
|
|
107
|
+
new StaveNote({ keys: ['d/5', 'a/5', 'b/5'], duration: '8', stem_direction: 1 }),
|
|
108
|
+
];
|
|
109
|
+
Dot.buildAndAttach(notes2, { all: true });
|
|
110
|
+
Dot.buildAndAttach([notes2[1]], { all: true });
|
|
111
|
+
const voice1 = new Voice().setMode(Voice.Mode.SOFT).addTickables(notes1);
|
|
112
|
+
const voice2 = new Voice().setMode(Voice.Mode.SOFT).addTickables(notes2);
|
|
113
|
+
const formatter = new Formatter().joinVoices([voice1, voice2]);
|
|
114
|
+
formatter.format([voice1, voice2], 700);
|
|
115
|
+
voice1.draw(ctx, stave);
|
|
116
|
+
voice2.draw(ctx, stave);
|
|
117
|
+
notes1.forEach((note) => Note.plotMetrics(ctx, note, 190));
|
|
118
|
+
notes2.forEach((note) => Note.plotMetrics(ctx, note, 20));
|
|
119
|
+
VexFlowTests.plotLegendForNoteWidth(ctx, 620, 220);
|
|
120
|
+
ok(true, 'Full Dot');
|
|
121
|
+
}
|
|
122
|
+
VexFlowTests.register(DotTests);
|
|
123
|
+
export { DotTests };
|
|
@@ -0,0 +1,462 @@
|
|
|
1
|
+
import { VexFlowTests } from './vexflow_test_helpers.js';
|
|
2
|
+
import { Articulation } from '../src/articulation.js';
|
|
3
|
+
import { EasyScore } from '../src/easyscore.js';
|
|
4
|
+
import { FretHandFinger } from '../src/frethandfinger.js';
|
|
5
|
+
import { Modifier } from '../src/modifier.js';
|
|
6
|
+
import { Parenthesis } from '../src/parenthesis.js';
|
|
7
|
+
import { StaveConnector } from '../src/staveconnector.js';
|
|
8
|
+
import { Stem } from '../src/stem.js';
|
|
9
|
+
import { Tuplet } from '../src/tuplet.js';
|
|
10
|
+
const EasyScoreTests = {
|
|
11
|
+
Start() {
|
|
12
|
+
QUnit.module('EasyScore');
|
|
13
|
+
test('Basic', basic);
|
|
14
|
+
test('Accidentals', accidentals);
|
|
15
|
+
test('Durations', durations);
|
|
16
|
+
test('Chords', chords);
|
|
17
|
+
test('Dots', dots);
|
|
18
|
+
test('Types', types);
|
|
19
|
+
test('Options', options);
|
|
20
|
+
const run = VexFlowTests.runTests;
|
|
21
|
+
run('Draw Basic', drawBasicTest);
|
|
22
|
+
run('Draw Basic Muted', drawBasicMutedTest);
|
|
23
|
+
run('Draw Basic Harmonic', drawBasicHarmonicTest);
|
|
24
|
+
run('Draw Basic Slash', drawBasicSlashTest);
|
|
25
|
+
run('Draw Ghostnote Basic', drawGhostBasicTest);
|
|
26
|
+
run('Draw Ghostnote Dotted', drawGhostDottedTest);
|
|
27
|
+
run('Draw Parenthesised', drawParenthesisedTest);
|
|
28
|
+
run('Draw Accidentals', drawAccidentalsTest);
|
|
29
|
+
run('Draw Beams', drawBeamsTest);
|
|
30
|
+
run('Draw Tuplets', drawTupletsTest);
|
|
31
|
+
run('Draw Dots', drawDotsTest);
|
|
32
|
+
run('Draw Options', drawOptionsTest);
|
|
33
|
+
run('Draw Fingerings', drawFingeringsTest);
|
|
34
|
+
run('Keys', keys);
|
|
35
|
+
},
|
|
36
|
+
};
|
|
37
|
+
function createShortcuts(score) {
|
|
38
|
+
return {
|
|
39
|
+
voice: score.voice.bind(score),
|
|
40
|
+
notes: score.notes.bind(score),
|
|
41
|
+
beam: score.beam.bind(score),
|
|
42
|
+
tuplet: score.tuplet.bind(score),
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
function basic() {
|
|
46
|
+
const score = new EasyScore();
|
|
47
|
+
const mustPass = ['c4', 'c#4', 'c4/r', 'c#5', 'c3/m', 'c3//m', 'c3//h', 'c3/s', 'c3//s', 'c3/g', 'c3//g'];
|
|
48
|
+
const mustFail = ['', '()', '7', '(c#4 e5 g6'];
|
|
49
|
+
mustPass.forEach((line) => equal(score.parse(line).success, true, line));
|
|
50
|
+
mustFail.forEach((line) => equal(score.parse(line).success, false, line));
|
|
51
|
+
}
|
|
52
|
+
function accidentals() {
|
|
53
|
+
const score = new EasyScore();
|
|
54
|
+
const mustPass = [
|
|
55
|
+
'c3',
|
|
56
|
+
'c##3, cb3',
|
|
57
|
+
'Cn3',
|
|
58
|
+
'f3//m',
|
|
59
|
+
'(c##3 cbb3 cn3), cb3',
|
|
60
|
+
'cbbs7',
|
|
61
|
+
'cbb7',
|
|
62
|
+
'cbss7',
|
|
63
|
+
'cbs7',
|
|
64
|
+
'cb7',
|
|
65
|
+
'cdb7',
|
|
66
|
+
'cd7',
|
|
67
|
+
'c##7',
|
|
68
|
+
'c#7',
|
|
69
|
+
'cn7',
|
|
70
|
+
'c++-7',
|
|
71
|
+
'c++7',
|
|
72
|
+
'c+-7',
|
|
73
|
+
'c+7',
|
|
74
|
+
'(cbs3 bbs3 dbs3), ebs3',
|
|
75
|
+
'(cd7 cbb3 cn3), cb3',
|
|
76
|
+
'co7',
|
|
77
|
+
'ck7',
|
|
78
|
+
];
|
|
79
|
+
const mustFail = [
|
|
80
|
+
'ct3',
|
|
81
|
+
'cdbb7',
|
|
82
|
+
'(cq cbb3 cn3), cb3',
|
|
83
|
+
'(cdd7 cbb3 cn3), cb3',
|
|
84
|
+
'cbbbs7',
|
|
85
|
+
'cbbss7',
|
|
86
|
+
'cbsss7',
|
|
87
|
+
'csbs7',
|
|
88
|
+
'cddb7',
|
|
89
|
+
'cddbb7',
|
|
90
|
+
'cdd7',
|
|
91
|
+
'c##b7',
|
|
92
|
+
'c#bs7',
|
|
93
|
+
'cnb#7',
|
|
94
|
+
'c+#+b-d7',
|
|
95
|
+
'c+--7',
|
|
96
|
+
'c++--7',
|
|
97
|
+
'c+++7',
|
|
98
|
+
'cbk7',
|
|
99
|
+
'cok7',
|
|
100
|
+
'cko7',
|
|
101
|
+
'c#s7',
|
|
102
|
+
];
|
|
103
|
+
mustPass.forEach((line) => equal(score.parse(line).success, true, line));
|
|
104
|
+
mustFail.forEach((line) => equal(score.parse(line).success, false, line));
|
|
105
|
+
}
|
|
106
|
+
function durations() {
|
|
107
|
+
const score = new EasyScore();
|
|
108
|
+
const mustPass = ['c3/4', 'c##3/w, cb3', 'c##3/w, cb3/q', 'c##3/q, cb3/32', '(c##3 cbb3 cn3), cb3'];
|
|
109
|
+
const mustFail = ['Cn3/]', '/', '(cq cbb3 cn3), cb3', '(cdd7 cbb3 cn3), cb3'];
|
|
110
|
+
mustPass.forEach((line) => equal(score.parse(line).success, true, line));
|
|
111
|
+
mustFail.forEach((line) => equal(score.parse(line).success, false, line));
|
|
112
|
+
}
|
|
113
|
+
function chords() {
|
|
114
|
+
const score = new EasyScore();
|
|
115
|
+
const mustPass = [
|
|
116
|
+
'(c5)',
|
|
117
|
+
'(c3 e0 g9)',
|
|
118
|
+
'(c##4 cbb4 cn4)/w, (c#5 cb2 a3)/32',
|
|
119
|
+
'(d##4 cbb4 cn4)/w/r, (c#5 cb2 a3)',
|
|
120
|
+
'(c##4 cbb4 cn4)/4, (c#5 cb2 a3)',
|
|
121
|
+
'(c##4 cbb4 cn4)/m, (c#5 cb2 a3)',
|
|
122
|
+
];
|
|
123
|
+
const mustFail = ['(c)'];
|
|
124
|
+
mustPass.forEach((line) => equal(score.parse(line).success, true, line));
|
|
125
|
+
mustFail.forEach((line) => equal(score.parse(line).success, false, line));
|
|
126
|
+
}
|
|
127
|
+
function dots() {
|
|
128
|
+
const score = new EasyScore();
|
|
129
|
+
const mustPass = [
|
|
130
|
+
'c3/4.',
|
|
131
|
+
'c##3/w.., cb3',
|
|
132
|
+
'f##3/s, cb3/q...',
|
|
133
|
+
'c##3/q, cb3/32',
|
|
134
|
+
'(c##3 cbb3 cn3)., cb3',
|
|
135
|
+
'(c5).',
|
|
136
|
+
'(c##4 cbb4 cn4)/w.., (c#5 cb2 a3)/32',
|
|
137
|
+
];
|
|
138
|
+
const mustFail = ['.', 'c.#', 'c#4./4'];
|
|
139
|
+
mustPass.forEach((line) => equal(score.parse(line).success, true, line));
|
|
140
|
+
mustFail.forEach((line) => equal(score.parse(line).success, false, line));
|
|
141
|
+
}
|
|
142
|
+
function types() {
|
|
143
|
+
const score = new EasyScore();
|
|
144
|
+
const mustPass = ['c3/4/m.', 'c##3//r.., cb3', 'c##3/m.., cb3', 'c##3/r.., cb3', 'd##3/w/s, cb3/q...', 'Fb4'];
|
|
145
|
+
const mustFail = ['c4/q/U', '(c##4, cbb4 cn4)/w.., (c#5 cb2 a3)/32', 'z#3'];
|
|
146
|
+
mustPass.forEach((line) => equal(score.parse(line).success, true, line));
|
|
147
|
+
mustFail.forEach((line) => equal(score.parse(line).success, false, line));
|
|
148
|
+
}
|
|
149
|
+
function options() {
|
|
150
|
+
const score = new EasyScore();
|
|
151
|
+
const mustPass = [
|
|
152
|
+
'c3/4.[foo="bar"]',
|
|
153
|
+
'c##3/w.., cb3[id="blah"]',
|
|
154
|
+
'c##3/q, cb3/32',
|
|
155
|
+
'(c##3 cbb3 cn3).[blah="bod4o"], cb3',
|
|
156
|
+
'(c5)[fooooo="booo"]',
|
|
157
|
+
'c#5[id="foobar"]',
|
|
158
|
+
];
|
|
159
|
+
const mustFail = ['.[', 'f##3/w[], cb3/q...'];
|
|
160
|
+
mustPass.forEach((line) => equal(score.parse(line).success, true, line));
|
|
161
|
+
mustFail.forEach((line) => equal(score.parse(line).success, false, line));
|
|
162
|
+
}
|
|
163
|
+
function drawBasicTest(options) {
|
|
164
|
+
const f = VexFlowTests.makeFactory(options, 600, 350);
|
|
165
|
+
const score = f.EasyScore();
|
|
166
|
+
const system = f.System();
|
|
167
|
+
const { voice, notes } = createShortcuts(score);
|
|
168
|
+
system
|
|
169
|
+
.addStave({
|
|
170
|
+
voices: [
|
|
171
|
+
voice(notes('(d4 e4 g4)/q, c4/q, c4/q/r, c4/q', { stem: 'down' })),
|
|
172
|
+
voice(notes('c#5/h., c5/q', { stem: 'up' })),
|
|
173
|
+
],
|
|
174
|
+
})
|
|
175
|
+
.addClef('treble');
|
|
176
|
+
system
|
|
177
|
+
.addStave({
|
|
178
|
+
voices: [voice(notes('c#3/q, cn3/q, bb3/q, d##3/q', { clef: 'bass' }))],
|
|
179
|
+
})
|
|
180
|
+
.addClef('bass');
|
|
181
|
+
system.addConnector().setType(StaveConnector.type.BRACKET);
|
|
182
|
+
f.draw();
|
|
183
|
+
expect(0);
|
|
184
|
+
}
|
|
185
|
+
function drawBasicMutedTest(options) {
|
|
186
|
+
const f = VexFlowTests.makeFactory(options, 600, 350);
|
|
187
|
+
const score = f.EasyScore();
|
|
188
|
+
const system = f.System();
|
|
189
|
+
const { voice, notes } = createShortcuts(score);
|
|
190
|
+
system
|
|
191
|
+
.addStave({
|
|
192
|
+
voices: [
|
|
193
|
+
voice(notes('(d4 e4 g4)/q/m, c4/q/m, c4/q/r, c4/q/m', { stem: 'down' })),
|
|
194
|
+
voice(notes('c#5/h/m., c5/q/m', { stem: 'up' })),
|
|
195
|
+
],
|
|
196
|
+
})
|
|
197
|
+
.addClef('treble');
|
|
198
|
+
system
|
|
199
|
+
.addStave({
|
|
200
|
+
voices: [voice(notes('c#3/q/m, cn3/q/m, bb3/q/m, d##3/q/m', { clef: 'bass' }))],
|
|
201
|
+
})
|
|
202
|
+
.addClef('bass');
|
|
203
|
+
system.addConnector().setType(StaveConnector.type.BRACKET);
|
|
204
|
+
f.draw();
|
|
205
|
+
expect(0);
|
|
206
|
+
}
|
|
207
|
+
function drawBasicHarmonicTest(options) {
|
|
208
|
+
const f = VexFlowTests.makeFactory(options, 600, 350);
|
|
209
|
+
const score = f.EasyScore();
|
|
210
|
+
const system = f.System();
|
|
211
|
+
const { voice, notes } = createShortcuts(score);
|
|
212
|
+
system
|
|
213
|
+
.addStave({
|
|
214
|
+
voices: [
|
|
215
|
+
voice(notes('(d4 e4 g4)/q/h, c4/q/h, c4/q/r, c4/q/h', { stem: 'down' })),
|
|
216
|
+
voice(notes('c#5/h/h., c5/q/h', { stem: 'up' })),
|
|
217
|
+
],
|
|
218
|
+
})
|
|
219
|
+
.addClef('treble');
|
|
220
|
+
system
|
|
221
|
+
.addStave({
|
|
222
|
+
voices: [voice(notes('c#3/q/h, cn3/q/h, bb3/q/h, d##3/q/h', { clef: 'bass' }))],
|
|
223
|
+
})
|
|
224
|
+
.addClef('bass');
|
|
225
|
+
system.addConnector().setType(StaveConnector.type.BRACKET);
|
|
226
|
+
f.draw();
|
|
227
|
+
expect(0);
|
|
228
|
+
}
|
|
229
|
+
function drawBasicSlashTest(options) {
|
|
230
|
+
const f = VexFlowTests.makeFactory(options, 600, 350);
|
|
231
|
+
const score = f.EasyScore();
|
|
232
|
+
const system = f.System();
|
|
233
|
+
const { voice, notes } = createShortcuts(score);
|
|
234
|
+
system
|
|
235
|
+
.addStave({
|
|
236
|
+
voices: [
|
|
237
|
+
voice(notes('(d4 e4 g4)/q/s, c4/q/s, c4/q/r, c4/q/s', { stem: 'down' })),
|
|
238
|
+
voice(notes('c#5/h/s., c5/q/s', { stem: 'up' })),
|
|
239
|
+
],
|
|
240
|
+
})
|
|
241
|
+
.addClef('treble');
|
|
242
|
+
system
|
|
243
|
+
.addStave({
|
|
244
|
+
voices: [voice(notes('c#3/q/s, cn3/q/s, bb3/q/s, d##3/q/s', { clef: 'bass' }))],
|
|
245
|
+
})
|
|
246
|
+
.addClef('bass');
|
|
247
|
+
system.addConnector().setType(StaveConnector.type.BRACKET);
|
|
248
|
+
f.draw();
|
|
249
|
+
expect(0);
|
|
250
|
+
}
|
|
251
|
+
function drawGhostBasicTest(options) {
|
|
252
|
+
const f = VexFlowTests.makeFactory(options, 550);
|
|
253
|
+
const score = f.EasyScore();
|
|
254
|
+
const system = f.System();
|
|
255
|
+
system.addStave({
|
|
256
|
+
voices: [
|
|
257
|
+
score.voice([
|
|
258
|
+
...score.notes('f#5/4, f5, db5, c5', { stem: 'up' }),
|
|
259
|
+
...score.beam(score.notes('c5/8, d5, fn5, e5', { stem: 'up' })),
|
|
260
|
+
...score.beam(score.notes('d5, c5', { stem: 'up' })),
|
|
261
|
+
], { time: '7/4' }),
|
|
262
|
+
score.voice(score.notes('c4/h/g, f4/4, c4/4/g, e4/4, c4/8/g, d##4/8, c4/8, c4/8', { stem: 'down' }), {
|
|
263
|
+
time: '7/4',
|
|
264
|
+
}),
|
|
265
|
+
],
|
|
266
|
+
});
|
|
267
|
+
f.draw();
|
|
268
|
+
expect(0);
|
|
269
|
+
}
|
|
270
|
+
function drawGhostDottedTest(options) {
|
|
271
|
+
const f = VexFlowTests.makeFactory(options, 550);
|
|
272
|
+
const score = f.EasyScore();
|
|
273
|
+
const system = f.System();
|
|
274
|
+
system.addStave({
|
|
275
|
+
voices: [
|
|
276
|
+
score.voice([
|
|
277
|
+
...score.notes('c4/4/g., fbb5/8, d5/4', { stem: 'up' }),
|
|
278
|
+
...score.beam(score.notes('c5/8, c#5/16, d5/16', { stem: 'up' })),
|
|
279
|
+
...score.notes('c4/2/g.., fn5/8', { stem: 'up' }),
|
|
280
|
+
], { time: '8/4' }),
|
|
281
|
+
score.voice([
|
|
282
|
+
...score.notes('f#4/4', { stem: 'down' }),
|
|
283
|
+
...score.beam(score.notes('e4/8, d4/8', { stem: 'down' })),
|
|
284
|
+
...score.notes('c4/4/g.., cb4/16, c#4/h, d4/4', { stem: 'down' }),
|
|
285
|
+
...score.beam(score.notes('fn4/8, e4/8', { stem: 'down' })),
|
|
286
|
+
], { time: '8/4' }),
|
|
287
|
+
],
|
|
288
|
+
});
|
|
289
|
+
f.draw();
|
|
290
|
+
expect(0);
|
|
291
|
+
}
|
|
292
|
+
function drawParenthesisedTest(options) {
|
|
293
|
+
const f = VexFlowTests.makeFactory(options, 600, 350);
|
|
294
|
+
const score = f.EasyScore();
|
|
295
|
+
const system = f.System();
|
|
296
|
+
const { voice, notes } = createShortcuts(score);
|
|
297
|
+
const notes1 = notes('(d4 e4 g4)/q, c4/q, c4/q/r, c4/q', { stem: 'down' });
|
|
298
|
+
Parenthesis.buildAndAttach([notes1[0], notes1[3]]);
|
|
299
|
+
const notes2 = notes('c#5/h., c5/q', { stem: 'down' });
|
|
300
|
+
Parenthesis.buildAndAttach([notes2[0], notes2[1]]);
|
|
301
|
+
system
|
|
302
|
+
.addStave({
|
|
303
|
+
voices: [voice(notes1), voice(notes2)],
|
|
304
|
+
})
|
|
305
|
+
.addClef('treble');
|
|
306
|
+
const notes3 = notes('c#3/q, cn3/q, bb3/q, d##3/q', { stem: 'down' });
|
|
307
|
+
Parenthesis.buildAndAttach(notes3);
|
|
308
|
+
system
|
|
309
|
+
.addStave({
|
|
310
|
+
voices: [voice(notes3)],
|
|
311
|
+
})
|
|
312
|
+
.addClef('bass');
|
|
313
|
+
system.addConnector().setType(StaveConnector.type.BRACKET);
|
|
314
|
+
f.draw();
|
|
315
|
+
expect(0);
|
|
316
|
+
}
|
|
317
|
+
function drawAccidentalsTest(options) {
|
|
318
|
+
const f = VexFlowTests.makeFactory(options, 600, 350);
|
|
319
|
+
const score = f.EasyScore();
|
|
320
|
+
const system = f.System();
|
|
321
|
+
const { voice, notes } = createShortcuts(score);
|
|
322
|
+
system
|
|
323
|
+
.addStave({
|
|
324
|
+
voices: [
|
|
325
|
+
voice(notes('(cbbs4 ebb4 gbss4)/q, cbs4/q, cdb4/q/r, cd4/q', { stem: 'down' })),
|
|
326
|
+
voice(notes('c++-5/h., c++5/q', { stem: 'up' })),
|
|
327
|
+
],
|
|
328
|
+
})
|
|
329
|
+
.addClef('treble');
|
|
330
|
+
system
|
|
331
|
+
.addStave({
|
|
332
|
+
voices: [voice(notes('c+-3/q, c+3/q, bb3/q, d##3/q', { clef: 'bass' }))],
|
|
333
|
+
})
|
|
334
|
+
.addClef('bass');
|
|
335
|
+
system.addConnector().setType(StaveConnector.type.BRACKET);
|
|
336
|
+
f.draw();
|
|
337
|
+
expect(0);
|
|
338
|
+
}
|
|
339
|
+
function drawBeamsTest(options) {
|
|
340
|
+
const f = VexFlowTests.makeFactory(options, 600, 250);
|
|
341
|
+
const score = f.EasyScore();
|
|
342
|
+
const system = f.System();
|
|
343
|
+
const { voice, notes, beam } = createShortcuts(score);
|
|
344
|
+
system
|
|
345
|
+
.addStave({
|
|
346
|
+
voices: [
|
|
347
|
+
voice(notes('(c4 e4 g4)/q, c4/q, c4/q/r, c4/q', { stem: 'down' })),
|
|
348
|
+
voice([...notes('c#5/h.', { stem: 'up' }), ...beam(notes('c5/8, c5/8', { stem: 'up' }))]),
|
|
349
|
+
],
|
|
350
|
+
})
|
|
351
|
+
.addClef('treble');
|
|
352
|
+
f.draw();
|
|
353
|
+
expect(0);
|
|
354
|
+
}
|
|
355
|
+
function drawTupletsTest(options) {
|
|
356
|
+
const f = VexFlowTests.makeFactory(options, 600, 250);
|
|
357
|
+
const score = f.EasyScore();
|
|
358
|
+
const system = f.System();
|
|
359
|
+
const { voice, notes, tuplet, beam } = createShortcuts(score);
|
|
360
|
+
const v1_tuplet = tuplet(notes('(c4 e4 g4)/q, cbb4/q, c4/q', { stem: 'down' }), {
|
|
361
|
+
location: Tuplet.LOCATION_BOTTOM,
|
|
362
|
+
});
|
|
363
|
+
const v1_halfNote = notes('c4/h', { stem: 'down' });
|
|
364
|
+
const v1 = voice([...v1_tuplet, ...v1_halfNote]);
|
|
365
|
+
const v2_halfNote = notes('c#5/h.', { stem: 'up' });
|
|
366
|
+
const v2_tuplet = tuplet(beam(notes('cb5/8, cn5/8, c5/8', { stem: 'up' })));
|
|
367
|
+
const v2 = voice([...v2_halfNote, ...v2_tuplet]);
|
|
368
|
+
system.addStave({ voices: [v1, v2] }).addClef('treble');
|
|
369
|
+
f.draw();
|
|
370
|
+
expect(0);
|
|
371
|
+
}
|
|
372
|
+
function drawDotsTest(options) {
|
|
373
|
+
const f = VexFlowTests.makeFactory(options, 600, 250);
|
|
374
|
+
const score = f.EasyScore();
|
|
375
|
+
const system = f.System();
|
|
376
|
+
const { voice, notes } = createShortcuts(score);
|
|
377
|
+
system
|
|
378
|
+
.addStave({
|
|
379
|
+
voices: [voice(notes('(c4 e4 g4)/8., (c4 e4 g4)/8.., (c4 e4 g4)/8..., (c4 e4 g4)/8...., (c4 e4 g4)/16...'))],
|
|
380
|
+
})
|
|
381
|
+
.addClef('treble');
|
|
382
|
+
f.draw();
|
|
383
|
+
expect(0);
|
|
384
|
+
}
|
|
385
|
+
function drawOptionsTest(options) {
|
|
386
|
+
const f = VexFlowTests.makeFactory(options, 500, 200);
|
|
387
|
+
const score = f.EasyScore();
|
|
388
|
+
const system = f.System();
|
|
389
|
+
const notes = score.notes('B4/h[id="foobar", class="red,bold", stem="up", articulations="staccato.below,tenuto"], B4/q[articulations="accent.above"], B4/q[stem="down"]');
|
|
390
|
+
system.addStave({ voices: [score.voice(notes)] });
|
|
391
|
+
f.draw();
|
|
392
|
+
const note0 = notes[0];
|
|
393
|
+
const note1 = notes[1];
|
|
394
|
+
const note0_modifier0 = note0.getModifiers()[0];
|
|
395
|
+
const note0_modifier1 = note0.getModifiers()[1];
|
|
396
|
+
const note1_modifier0 = note1.getModifiers()[0];
|
|
397
|
+
equal(note0.getAttribute('id'), 'foobar');
|
|
398
|
+
ok(note0.hasClass('red'));
|
|
399
|
+
ok(note0.hasClass('bold'));
|
|
400
|
+
equal(note0_modifier0.getCategory(), Articulation.CATEGORY);
|
|
401
|
+
equal(note0_modifier0.type, 'a.');
|
|
402
|
+
equal(note0_modifier0.getPosition(), Modifier.Position.BELOW);
|
|
403
|
+
equal(note0_modifier1.getCategory(), Articulation.CATEGORY);
|
|
404
|
+
equal(note0_modifier1.type, 'a-');
|
|
405
|
+
equal(note0_modifier1.getPosition(), Modifier.Position.ABOVE);
|
|
406
|
+
equal(note0.getStemDirection(), Stem.UP);
|
|
407
|
+
equal(note1_modifier0.getCategory(), Articulation.CATEGORY);
|
|
408
|
+
equal(note1_modifier0.type, 'a>');
|
|
409
|
+
equal(note1_modifier0.getPosition(), Modifier.Position.ABOVE);
|
|
410
|
+
equal(notes[2].getStemDirection(), Stem.DOWN);
|
|
411
|
+
}
|
|
412
|
+
function drawFingeringsTest(options) {
|
|
413
|
+
const f = VexFlowTests.makeFactory(options, 500, 200);
|
|
414
|
+
const score = f.EasyScore();
|
|
415
|
+
const system = f.System();
|
|
416
|
+
const notes = score.notes('C4/q[fingerings="1"], E4[fingerings="3.above"], G4[fingerings="5.below"], (C4 E4 G4)[fingerings="1,3,5"]');
|
|
417
|
+
system.addStave({ voices: [score.voice(notes)] });
|
|
418
|
+
f.draw();
|
|
419
|
+
const note0_modifier0 = notes[0].getModifiers()[0];
|
|
420
|
+
equal(note0_modifier0.getCategory(), FretHandFinger.CATEGORY);
|
|
421
|
+
equal(note0_modifier0.getFretHandFinger(), '1');
|
|
422
|
+
equal(note0_modifier0.getPosition(), Modifier.Position.LEFT);
|
|
423
|
+
const note1_modifier0 = notes[1].getModifiers()[0];
|
|
424
|
+
equal(note1_modifier0.getCategory(), FretHandFinger.CATEGORY);
|
|
425
|
+
equal(note1_modifier0.getFretHandFinger(), '3');
|
|
426
|
+
equal(note1_modifier0.getPosition(), Modifier.Position.ABOVE);
|
|
427
|
+
const note2_modifier0 = notes[2].getModifiers()[0];
|
|
428
|
+
equal(note2_modifier0.getCategory(), FretHandFinger.CATEGORY);
|
|
429
|
+
equal(note2_modifier0.getFretHandFinger(), '5');
|
|
430
|
+
equal(note2_modifier0.getPosition(), Modifier.Position.BELOW);
|
|
431
|
+
const note3_modifiers = notes[3].getModifiers();
|
|
432
|
+
const note3_modifier0 = note3_modifiers[0];
|
|
433
|
+
const note3_modifier1 = note3_modifiers[1];
|
|
434
|
+
const note3_modifier2 = note3_modifiers[2];
|
|
435
|
+
equal(note3_modifier0.getCategory(), FretHandFinger.CATEGORY);
|
|
436
|
+
equal(note3_modifier0.getFretHandFinger(), '1');
|
|
437
|
+
equal(note3_modifier0.getPosition(), Modifier.Position.LEFT);
|
|
438
|
+
equal(note3_modifier1.getCategory(), FretHandFinger.CATEGORY);
|
|
439
|
+
equal(note3_modifier1.getFretHandFinger(), '3');
|
|
440
|
+
equal(note3_modifier1.getPosition(), Modifier.Position.LEFT);
|
|
441
|
+
equal(note3_modifier2.getCategory(), FretHandFinger.CATEGORY);
|
|
442
|
+
equal(note3_modifier2.getFretHandFinger(), '5');
|
|
443
|
+
equal(note3_modifier2.getPosition(), Modifier.Position.LEFT);
|
|
444
|
+
}
|
|
445
|
+
function keys(options) {
|
|
446
|
+
const f = VexFlowTests.makeFactory(options, 700, 200);
|
|
447
|
+
const score = f.EasyScore();
|
|
448
|
+
const system = f.System();
|
|
449
|
+
const notes = score.notes('c#3/q, c##3, cb3, cbb3, cn3, c3, cbbs3, cbss3, cbs3, cdb3, cd3, c++-3, c++3, c+-3, c+3, co3, ck3', { clef: 'bass' });
|
|
450
|
+
system.addStave({ voices: [f.Voice().setStrict(false).addTickables(notes)] }).addClef('bass');
|
|
451
|
+
f.draw();
|
|
452
|
+
equal(notes[0].keys, 'c#/3');
|
|
453
|
+
equal(notes[1].keys, 'c##/3');
|
|
454
|
+
equal(notes[2].keys, 'cb/3');
|
|
455
|
+
equal(notes[3].keys, 'cbb/3');
|
|
456
|
+
equal(notes[4].keys, 'cn/3');
|
|
457
|
+
for (let i = 5; i < notes.length; i++) {
|
|
458
|
+
equal(notes[i].keys, 'c/3');
|
|
459
|
+
}
|
|
460
|
+
}
|
|
461
|
+
VexFlowTests.register(EasyScoreTests);
|
|
462
|
+
export { EasyScoreTests };
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { VexFlowTests } from './vexflow_test_helpers.js';
|
|
2
|
+
import { Factory } from '../src/factory.js';
|
|
3
|
+
import { Barline } from '../src/stavebarline.js';
|
|
4
|
+
const FactoryTests = {
|
|
5
|
+
Start() {
|
|
6
|
+
QUnit.module('Factory');
|
|
7
|
+
test('Defaults', defaults);
|
|
8
|
+
const run = VexFlowTests.runTests;
|
|
9
|
+
run('Draw', draw);
|
|
10
|
+
run('Draw Tab (repeat barlines must be aligned)', drawTab);
|
|
11
|
+
},
|
|
12
|
+
};
|
|
13
|
+
function defaults() {
|
|
14
|
+
throws(() => new Factory({ renderer: { elementId: '', width: 700, height: 500 } }), 'Empty string for elementId throws an exception.');
|
|
15
|
+
const factory = new Factory({
|
|
16
|
+
renderer: { elementId: null, width: 700, height: 500 },
|
|
17
|
+
});
|
|
18
|
+
const options = factory.options;
|
|
19
|
+
equal(options.renderer.width, 700);
|
|
20
|
+
equal(options.renderer.height, 500);
|
|
21
|
+
equal(options.renderer.elementId, null);
|
|
22
|
+
equal(options.stave.space, 10);
|
|
23
|
+
}
|
|
24
|
+
function draw(options) {
|
|
25
|
+
const f = Factory.newFromElementId(options.elementId);
|
|
26
|
+
f.Stave().setClef('treble');
|
|
27
|
+
f.draw();
|
|
28
|
+
expect(0);
|
|
29
|
+
}
|
|
30
|
+
function drawTab(options) {
|
|
31
|
+
const factory = VexFlowTests.makeFactory(options, 500, 400);
|
|
32
|
+
const system = factory.System({ width: 500 });
|
|
33
|
+
const stave = factory.Stave().setClef('treble').setKeySignature('C#').setBegBarType(Barline.type.REPEAT_BEGIN);
|
|
34
|
+
const voices = [factory.Voice().addTickables([factory.GhostNote({ duration: 'w' })])];
|
|
35
|
+
system.addStave({ stave, voices });
|
|
36
|
+
const tabStave = factory.TabStave().setClef('tab').setBegBarType(Barline.type.REPEAT_BEGIN);
|
|
37
|
+
const tabVoices = [factory.Voice().addTickables([factory.GhostNote({ duration: 'w' })])];
|
|
38
|
+
system.addStave({ stave: tabStave, voices: tabVoices });
|
|
39
|
+
factory.draw();
|
|
40
|
+
equal(stave.getModifiers()[0].getX(), tabStave.getModifiers()[0].getX());
|
|
41
|
+
expect(1);
|
|
42
|
+
}
|
|
43
|
+
VexFlowTests.register(FactoryTests);
|
|
44
|
+
export { FactoryTests };
|