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,413 @@
|
|
|
1
|
+
import { VexFlowTests } from './vexflow_test_helpers.js';
|
|
2
|
+
import { Accidental } from '../src/accidental.js';
|
|
3
|
+
import { Annotation } from '../src/annotation.js';
|
|
4
|
+
import { Articulation } from '../src/articulation.js';
|
|
5
|
+
import { Dot } from '../src/dot.js';
|
|
6
|
+
import { Formatter } from '../src/formatter.js';
|
|
7
|
+
const GraceNoteTests = {
|
|
8
|
+
Start() {
|
|
9
|
+
QUnit.module('Grace Notes');
|
|
10
|
+
const run = VexFlowTests.runTests;
|
|
11
|
+
run('Grace Note Basic', basic);
|
|
12
|
+
run('With Articulation and Annotation on Parent Note', graceNoteModifiers);
|
|
13
|
+
run('Grace Note Basic with Slurs', basicSlurred);
|
|
14
|
+
run('Grace Note Stem', stem);
|
|
15
|
+
run('Grace Note Stem with Beams 1', stemWithBeamed, {
|
|
16
|
+
keys1: ['g/4'],
|
|
17
|
+
stemDirection1: 1,
|
|
18
|
+
keys2: ['d/5'],
|
|
19
|
+
stemDirection2: -1,
|
|
20
|
+
});
|
|
21
|
+
run('Grace Note Stem with Beams 2', stemWithBeamed, {
|
|
22
|
+
keys1: ['a/3'],
|
|
23
|
+
stemDirection1: 1,
|
|
24
|
+
keys2: ['a/5'],
|
|
25
|
+
stemDirection2: -1,
|
|
26
|
+
});
|
|
27
|
+
run('Grace Note Stem with Beams 3', stemWithBeamed, {
|
|
28
|
+
keys1: ['c/4'],
|
|
29
|
+
stemDirection1: 1,
|
|
30
|
+
keys2: ['c/6'],
|
|
31
|
+
stemDirection2: -1,
|
|
32
|
+
});
|
|
33
|
+
run('Grace Note Slash', slash);
|
|
34
|
+
run('Grace Note Slash with Beams', slashWithBeams);
|
|
35
|
+
run('Grace Notes Multiple Voices', multipleVoices);
|
|
36
|
+
run('Grace Notes Multiple Voices Multiple Draws', multipleVoicesMultipleDraws);
|
|
37
|
+
},
|
|
38
|
+
};
|
|
39
|
+
function basic(options) {
|
|
40
|
+
const f = VexFlowTests.makeFactory(options, 700, 130);
|
|
41
|
+
const stave = f.Stave({ x: 10, y: 10, width: 650 });
|
|
42
|
+
const gracenotes = [
|
|
43
|
+
{ keys: ['e/4'], duration: '32' },
|
|
44
|
+
{ keys: ['f/4'], duration: '32' },
|
|
45
|
+
{ keys: ['g/4'], duration: '32' },
|
|
46
|
+
{ keys: ['a/4'], duration: '32' },
|
|
47
|
+
].map(f.GraceNote.bind(f));
|
|
48
|
+
const gracenotes1 = [{ keys: ['b/4'], duration: '8', slash: false }].map(f.GraceNote.bind(f));
|
|
49
|
+
const gracenotes2 = [{ keys: ['b/4'], duration: '8', slash: true }].map(f.GraceNote.bind(f));
|
|
50
|
+
const gracenotes3 = [
|
|
51
|
+
{ keys: ['e/4'], duration: '8' },
|
|
52
|
+
{ keys: ['f/4'], duration: '16' },
|
|
53
|
+
{ keys: ['e/4', 'g/4'], duration: '8' },
|
|
54
|
+
{ keys: ['a/4'], duration: '32' },
|
|
55
|
+
{ keys: ['b/4'], duration: '32' },
|
|
56
|
+
].map(f.GraceNote.bind(f));
|
|
57
|
+
const gracenotes4 = [
|
|
58
|
+
{ keys: ['g/4'], duration: '8' },
|
|
59
|
+
{ keys: ['g/4'], duration: '16' },
|
|
60
|
+
{ keys: ['g/4'], duration: '16' },
|
|
61
|
+
].map(f.GraceNote.bind(f));
|
|
62
|
+
gracenotes[1].addModifier(f.Accidental({ type: '##' }), 0);
|
|
63
|
+
gracenotes3[3].addModifier(f.Accidental({ type: 'bb' }), 0);
|
|
64
|
+
Dot.buildAndAttach([gracenotes4[0]], { all: true });
|
|
65
|
+
const notes = [
|
|
66
|
+
f
|
|
67
|
+
.StaveNote({ keys: ['b/4'], duration: '4', auto_stem: true })
|
|
68
|
+
.addModifier(f.GraceNoteGroup({ notes: gracenotes }).beamNotes(), 0),
|
|
69
|
+
f
|
|
70
|
+
.StaveNote({ keys: ['c/5'], duration: '4', auto_stem: true })
|
|
71
|
+
.addModifier(f.Accidental({ type: '#' }), 0)
|
|
72
|
+
.addModifier(f.GraceNoteGroup({ notes: gracenotes1 }).beamNotes(), 0),
|
|
73
|
+
f
|
|
74
|
+
.StaveNote({ keys: ['c/5', 'd/5'], duration: '4', auto_stem: true })
|
|
75
|
+
.addModifier(f.GraceNoteGroup({ notes: gracenotes2 }).beamNotes(), 0),
|
|
76
|
+
f
|
|
77
|
+
.StaveNote({ keys: ['a/4'], duration: '4', auto_stem: true })
|
|
78
|
+
.addModifier(f.GraceNoteGroup({ notes: gracenotes3 }).beamNotes(), 0),
|
|
79
|
+
f
|
|
80
|
+
.StaveNote({ keys: ['a/4'], duration: '4', auto_stem: true })
|
|
81
|
+
.addModifier(f.GraceNoteGroup({ notes: gracenotes4 }).beamNotes(), 0),
|
|
82
|
+
];
|
|
83
|
+
const voice = f.Voice().setStrict(false).addTickables(notes);
|
|
84
|
+
new Formatter().joinVoices([voice]).formatToStave([voice], stave);
|
|
85
|
+
f.draw();
|
|
86
|
+
ok(true, 'GraceNoteBasic');
|
|
87
|
+
}
|
|
88
|
+
function graceNoteModifiers(options) {
|
|
89
|
+
const f = VexFlowTests.makeFactory(options, 700, 130);
|
|
90
|
+
const stave = f.Stave({ x: 10, y: 10, width: 650 });
|
|
91
|
+
const gracenotes = [{ keys: ['b/4'], duration: '8', slash: false }].map(f.GraceNote.bind(f));
|
|
92
|
+
const notes = [
|
|
93
|
+
f
|
|
94
|
+
.StaveNote({ keys: ['c/5'], duration: '4', auto_stem: true })
|
|
95
|
+
.addModifier(f.GraceNoteGroup({ notes: gracenotes }), 0),
|
|
96
|
+
f
|
|
97
|
+
.StaveNote({ keys: ['c/5'], duration: '4', auto_stem: true })
|
|
98
|
+
.addModifier(f.GraceNoteGroup({ notes: gracenotes }), 0)
|
|
99
|
+
.addModifier(new Articulation('a-').setPosition(3), 0),
|
|
100
|
+
f
|
|
101
|
+
.StaveNote({ keys: ['c/5'], duration: '4', auto_stem: true })
|
|
102
|
+
.addModifier(f.GraceNoteGroup({ notes: gracenotes }), 0)
|
|
103
|
+
.addModifier(new Articulation('a-').setPosition(3), 0)
|
|
104
|
+
.addModifier(new Accidental('#')),
|
|
105
|
+
f
|
|
106
|
+
.StaveNote({ keys: ['c/5'], duration: '4', auto_stem: true })
|
|
107
|
+
.addModifier(f.GraceNoteGroup({ notes: gracenotes }), 0)
|
|
108
|
+
.addModifier(new Articulation('a-').setPosition(3), 0)
|
|
109
|
+
.addModifier(new Annotation('words')),
|
|
110
|
+
f
|
|
111
|
+
.StaveNote({ keys: ['c/5'], duration: '4', auto_stem: true })
|
|
112
|
+
.addModifier(f.GraceNoteGroup({ notes: gracenotes }), 0)
|
|
113
|
+
.addModifier(new Articulation('a-').setPosition(3), 0)
|
|
114
|
+
.addModifier(new Articulation('a>').setPosition(3), 0),
|
|
115
|
+
f
|
|
116
|
+
.StaveNote({ keys: ['c/5'], duration: '4', auto_stem: true })
|
|
117
|
+
.addModifier(f.GraceNoteGroup({ notes: gracenotes }), 0)
|
|
118
|
+
.addModifier(new Articulation('a-').setPosition(3), 0)
|
|
119
|
+
.addModifier(new Articulation('a>').setPosition(3), 0)
|
|
120
|
+
.addModifier(new Articulation('a@a').setPosition(3), 0),
|
|
121
|
+
];
|
|
122
|
+
const voice = f.Voice().setStrict(false).addTickables(notes);
|
|
123
|
+
new Formatter().joinVoices([voice]).formatToStave([voice], stave);
|
|
124
|
+
f.draw();
|
|
125
|
+
ok(true, 'GraceNoteModifiers');
|
|
126
|
+
}
|
|
127
|
+
function basicSlurred(options) {
|
|
128
|
+
const f = VexFlowTests.makeFactory(options, 700, 130);
|
|
129
|
+
const stave = f.Stave({ x: 10, y: 10, width: 650 });
|
|
130
|
+
const gracenotes0 = [
|
|
131
|
+
{ keys: ['e/4'], duration: '32' },
|
|
132
|
+
{ keys: ['f/4'], duration: '32' },
|
|
133
|
+
{ keys: ['g/4'], duration: '32' },
|
|
134
|
+
{ keys: ['a/4'], duration: '32' },
|
|
135
|
+
].map(f.GraceNote.bind(f));
|
|
136
|
+
const gracenotes1 = [{ keys: ['b/4'], duration: '8', slash: false }].map(f.GraceNote.bind(f));
|
|
137
|
+
const gracenotes2 = [{ keys: ['b/4'], duration: '8', slash: true }].map(f.GraceNote.bind(f));
|
|
138
|
+
const gracenotes3 = [
|
|
139
|
+
{ keys: ['e/4'], duration: '8' },
|
|
140
|
+
{ keys: ['f/4'], duration: '16' },
|
|
141
|
+
{ keys: ['e/4', 'g/4'], duration: '8' },
|
|
142
|
+
{ keys: ['a/4'], duration: '32' },
|
|
143
|
+
{ keys: ['b/4'], duration: '32' },
|
|
144
|
+
].map(f.GraceNote.bind(f));
|
|
145
|
+
const gracenotes4 = [
|
|
146
|
+
{ keys: ['a/4'], duration: '8' },
|
|
147
|
+
{ keys: ['a/4'], duration: '16' },
|
|
148
|
+
{ keys: ['a/4'], duration: '16' },
|
|
149
|
+
].map(f.GraceNote.bind(f));
|
|
150
|
+
gracenotes0[1].addModifier(f.Accidental({ type: '#' }), 0);
|
|
151
|
+
gracenotes3[3].addModifier(f.Accidental({ type: 'b' }), 0);
|
|
152
|
+
gracenotes3[2].addModifier(f.Accidental({ type: 'n' }), 0);
|
|
153
|
+
Dot.buildAndAttach([gracenotes4[0]], { all: true });
|
|
154
|
+
const notes = [
|
|
155
|
+
f
|
|
156
|
+
.StaveNote({ keys: ['b/4'], duration: '4', auto_stem: true })
|
|
157
|
+
.addModifier(f.GraceNoteGroup({ notes: gracenotes0, slur: true }).beamNotes(), 0),
|
|
158
|
+
f
|
|
159
|
+
.StaveNote({ keys: ['c/5'], duration: '4', auto_stem: true })
|
|
160
|
+
.addModifier(f.Accidental({ type: '#' }), 0)
|
|
161
|
+
.addModifier(f.GraceNoteGroup({ notes: gracenotes1, slur: true }).beamNotes(), 0),
|
|
162
|
+
f
|
|
163
|
+
.StaveNote({ keys: ['c/5', 'd/5'], duration: '4', auto_stem: true })
|
|
164
|
+
.addModifier(f.GraceNoteGroup({ notes: gracenotes2, slur: true }).beamNotes(), 0),
|
|
165
|
+
f
|
|
166
|
+
.StaveNote({ keys: ['a/4'], duration: '4', auto_stem: true })
|
|
167
|
+
.addModifier(f.GraceNoteGroup({ notes: gracenotes3, slur: true }).beamNotes(), 0),
|
|
168
|
+
f
|
|
169
|
+
.StaveNote({ keys: ['a/4'], duration: '4', auto_stem: true })
|
|
170
|
+
.addModifier(f.GraceNoteGroup({ notes: gracenotes4, slur: true }).beamNotes(), 0),
|
|
171
|
+
f.StaveNote({ keys: ['a/4'], duration: '4', auto_stem: true }),
|
|
172
|
+
];
|
|
173
|
+
const voice = f.Voice().setStrict(false).addTickables(notes);
|
|
174
|
+
new Formatter().joinVoices([voice]).formatToStave([voice], stave);
|
|
175
|
+
f.draw();
|
|
176
|
+
ok(true, 'GraceNoteBasic');
|
|
177
|
+
}
|
|
178
|
+
const createNoteForStemTest = (duration, noteBuilder, keys, stem_direction, slash = false) => {
|
|
179
|
+
const struct = { duration, slash };
|
|
180
|
+
struct.stem_direction = stem_direction;
|
|
181
|
+
struct.keys = keys;
|
|
182
|
+
return noteBuilder(struct);
|
|
183
|
+
};
|
|
184
|
+
const durationsForStemTest = ['8', '16', '32', '64', '128'];
|
|
185
|
+
function stem(options) {
|
|
186
|
+
const f = VexFlowTests.makeFactory(options, 700, 130);
|
|
187
|
+
const stave = f.Stave({ x: 10, y: 10, width: 650 });
|
|
188
|
+
function createNotes(noteBuilder, keys, stem_direction) {
|
|
189
|
+
return durationsForStemTest.map((duration) => createNoteForStemTest(duration, noteBuilder, keys, stem_direction));
|
|
190
|
+
}
|
|
191
|
+
function createNoteBlock(keys, stem_direction) {
|
|
192
|
+
const staveNotes = createNotes(f.StaveNote.bind(f), keys, stem_direction);
|
|
193
|
+
const gracenotes = createNotes(f.GraceNote.bind(f), keys, stem_direction);
|
|
194
|
+
staveNotes[0].addModifier(f.GraceNoteGroup({ notes: gracenotes }), 0);
|
|
195
|
+
return staveNotes;
|
|
196
|
+
}
|
|
197
|
+
const voice = f.Voice().setStrict(false);
|
|
198
|
+
voice.addTickables(createNoteBlock(['g/4'], 1));
|
|
199
|
+
voice.addTickables(createNoteBlock(['d/5'], -1));
|
|
200
|
+
f.Formatter().joinVoices([voice]).formatToStave([voice], stave);
|
|
201
|
+
f.draw();
|
|
202
|
+
ok(true, 'GraceNoteStem');
|
|
203
|
+
}
|
|
204
|
+
function stemWithBeamed(options) {
|
|
205
|
+
const f = VexFlowTests.makeFactory(options, 700, 130);
|
|
206
|
+
const stave = f.Stave({ x: 10, y: 10, width: 650 });
|
|
207
|
+
function createBeamedNotes(noteBuilder, keys, stem_direction, beams, isGrace = false, notesToBeam) {
|
|
208
|
+
const ret = [];
|
|
209
|
+
durationsForStemTest.map((duration) => {
|
|
210
|
+
const n0 = createNoteForStemTest(duration, noteBuilder, keys, stem_direction);
|
|
211
|
+
const n1 = createNoteForStemTest(duration, noteBuilder, keys, stem_direction);
|
|
212
|
+
ret.push(n0);
|
|
213
|
+
ret.push(n1);
|
|
214
|
+
if (notesToBeam) {
|
|
215
|
+
notesToBeam.push([n0, n1]);
|
|
216
|
+
}
|
|
217
|
+
if (!isGrace) {
|
|
218
|
+
beams.push(f.Beam({ notes: [n0, n1] }));
|
|
219
|
+
}
|
|
220
|
+
});
|
|
221
|
+
return ret;
|
|
222
|
+
}
|
|
223
|
+
function createBeamedNoteBlock(keys, stem_direction, beams) {
|
|
224
|
+
const bnotes = createBeamedNotes(f.StaveNote.bind(f), keys, stem_direction, beams);
|
|
225
|
+
const notesToBeam = [];
|
|
226
|
+
const gracenotes = createBeamedNotes(f.GraceNote.bind(f), keys, stem_direction, beams, true, notesToBeam);
|
|
227
|
+
const graceNoteGroup = f.GraceNoteGroup({ notes: gracenotes });
|
|
228
|
+
notesToBeam.map(graceNoteGroup.beamNotes.bind(graceNoteGroup));
|
|
229
|
+
bnotes[0].addModifier(graceNoteGroup, 0);
|
|
230
|
+
return bnotes;
|
|
231
|
+
}
|
|
232
|
+
const beams = [];
|
|
233
|
+
const voice = f.Voice().setStrict(false);
|
|
234
|
+
voice.addTickables(createBeamedNoteBlock(options.params.keys1, options.params.stemDirection1, beams));
|
|
235
|
+
voice.addTickables(createBeamedNoteBlock(options.params.keys2, options.params.stemDirection2, beams));
|
|
236
|
+
f.Formatter().joinVoices([voice]).formatToStave([voice], stave);
|
|
237
|
+
f.draw();
|
|
238
|
+
ok(true, 'GraceNoteStem');
|
|
239
|
+
}
|
|
240
|
+
function slash(options) {
|
|
241
|
+
const f = VexFlowTests.makeFactory(options, 700, 130);
|
|
242
|
+
const stave = f.Stave({ x: 10, y: 10, width: 650 });
|
|
243
|
+
function createNotes(noteT, keys, stem_direction, slash) {
|
|
244
|
+
return durationsForStemTest.map((d) => createNoteForStemTest(d, noteT, keys, stem_direction, slash));
|
|
245
|
+
}
|
|
246
|
+
function createNoteBlock(keys, stem_direction) {
|
|
247
|
+
const notes = [f.StaveNote({ keys: ['f/4'], stem_direction, duration: '16' })];
|
|
248
|
+
let graceNotes = createNotes(f.GraceNote.bind(f), keys, stem_direction, true);
|
|
249
|
+
const duration = '8';
|
|
250
|
+
const gns = [
|
|
251
|
+
{ keys: ['d/4', 'a/4'], stem_direction, duration, slash: true },
|
|
252
|
+
{ keys: ['d/4', 'a/4'], stem_direction, duration, slash: true },
|
|
253
|
+
{ keys: ['d/4', 'a/4'], stem_direction, duration, slash: true },
|
|
254
|
+
{ keys: ['e/4', 'a/4'], stem_direction, duration, slash: true },
|
|
255
|
+
{ keys: ['e/4', 'a/4'], stem_direction, duration, slash: true },
|
|
256
|
+
{ keys: ['b/4', 'f/5'], stem_direction, duration, slash: true },
|
|
257
|
+
{ keys: ['b/4', 'f/5'], stem_direction, duration, slash: true },
|
|
258
|
+
{ keys: ['b/4', 'f/5'], stem_direction, duration, slash: true },
|
|
259
|
+
{ keys: ['e/4', 'a/4'], stem_direction, duration, slash: true },
|
|
260
|
+
].map(f.GraceNote.bind(f));
|
|
261
|
+
const notesToBeam = [];
|
|
262
|
+
notesToBeam.push([gns[0], gns[1], gns[2]]);
|
|
263
|
+
notesToBeam.push([gns[3], gns[4], gns[5]]);
|
|
264
|
+
notesToBeam.push([gns[6], gns[7], gns[8]]);
|
|
265
|
+
graceNotes = graceNotes.concat(gns);
|
|
266
|
+
const graceNoteGroup = f.GraceNoteGroup({ notes: graceNotes });
|
|
267
|
+
notesToBeam.forEach((notes) => graceNoteGroup.beamNotes(notes));
|
|
268
|
+
notes[0].addModifier(graceNoteGroup, 0);
|
|
269
|
+
return notes;
|
|
270
|
+
}
|
|
271
|
+
const voice = f.Voice().setStrict(false);
|
|
272
|
+
voice.addTickables(createNoteBlock(['d/4', 'a/4'], 1));
|
|
273
|
+
voice.addTickables(createNoteBlock(['d/4', 'a/4'], -1));
|
|
274
|
+
f.Formatter().joinVoices([voice]).formatToStave([voice], stave);
|
|
275
|
+
f.draw();
|
|
276
|
+
ok(true, 'GraceNoteSlash');
|
|
277
|
+
}
|
|
278
|
+
function slashWithBeams(options) {
|
|
279
|
+
const f = VexFlowTests.makeFactory(options, 800, 130);
|
|
280
|
+
const stave = f.Stave({ x: 10, y: 10, width: 750 });
|
|
281
|
+
function createNoteBlock(keys, stem_direction) {
|
|
282
|
+
const notes = [f.StaveNote({ keys: ['f/4'], stem_direction, duration: '16' })];
|
|
283
|
+
let allGraceNotes = [];
|
|
284
|
+
const graceNotesToBeam = [];
|
|
285
|
+
['8', '16', '32', '64'].forEach(function (duration) {
|
|
286
|
+
const graceNotes = [
|
|
287
|
+
{ keys: ['d/4', 'a/4'], stem_direction, duration, slash: true },
|
|
288
|
+
{ keys: ['d/4', 'a/4'], stem_direction, duration, slash: false },
|
|
289
|
+
{ keys: ['e/4', 'a/4'], stem_direction, duration, slash: true },
|
|
290
|
+
{ keys: ['b/4', 'f/5'], stem_direction, duration, slash: false },
|
|
291
|
+
{ keys: ['b/4', 'f/5'], stem_direction, duration, slash: true },
|
|
292
|
+
{ keys: ['e/4', 'a/4'], stem_direction, duration, slash: false },
|
|
293
|
+
].map(f.GraceNote.bind(f));
|
|
294
|
+
graceNotesToBeam.push([graceNotes[0], graceNotes[1]]);
|
|
295
|
+
graceNotesToBeam.push([graceNotes[2], graceNotes[3]]);
|
|
296
|
+
graceNotesToBeam.push([graceNotes[4], graceNotes[5]]);
|
|
297
|
+
allGraceNotes = allGraceNotes.concat(graceNotes);
|
|
298
|
+
});
|
|
299
|
+
const graceNoteGroup = f.GraceNoteGroup({ notes: allGraceNotes });
|
|
300
|
+
graceNotesToBeam.forEach((g) => graceNoteGroup.beamNotes(g));
|
|
301
|
+
notes[0].addModifier(graceNoteGroup, 0);
|
|
302
|
+
return notes;
|
|
303
|
+
}
|
|
304
|
+
const voice = f.Voice().setStrict(false);
|
|
305
|
+
voice.addTickables(createNoteBlock(['d/4', 'a/4'], 1));
|
|
306
|
+
voice.addTickables(createNoteBlock(['d/4', 'a/4'], -1));
|
|
307
|
+
f.Formatter().joinVoices([voice]).formatToStave([voice], stave);
|
|
308
|
+
f.draw();
|
|
309
|
+
ok(true, 'GraceNoteSlashWithBeams');
|
|
310
|
+
}
|
|
311
|
+
function multipleVoices(options) {
|
|
312
|
+
const f = VexFlowTests.makeFactory(options, 450, 140);
|
|
313
|
+
const stave = f.Stave({ x: 10, y: 10, width: 450 });
|
|
314
|
+
const notes = [
|
|
315
|
+
{ keys: ['f/5'], stem_direction: 1, duration: '16' },
|
|
316
|
+
{ keys: ['f/5'], stem_direction: 1, duration: '16' },
|
|
317
|
+
{ keys: ['d/5'], stem_direction: 1, duration: '16' },
|
|
318
|
+
{ keys: ['c/5'], stem_direction: 1, duration: '16' },
|
|
319
|
+
{ keys: ['c/5'], stem_direction: 1, duration: '16' },
|
|
320
|
+
{ keys: ['d/5'], stem_direction: 1, duration: '16' },
|
|
321
|
+
{ keys: ['f/5'], stem_direction: 1, duration: '16' },
|
|
322
|
+
{ keys: ['e/5'], stem_direction: 1, duration: '16' },
|
|
323
|
+
].map(f.StaveNote.bind(f));
|
|
324
|
+
const notes2 = [
|
|
325
|
+
{ keys: ['f/4'], stem_direction: -1, duration: '16' },
|
|
326
|
+
{ keys: ['e/4'], stem_direction: -1, duration: '16' },
|
|
327
|
+
{ keys: ['d/4'], stem_direction: -1, duration: '16' },
|
|
328
|
+
{ keys: ['c/4'], stem_direction: -1, duration: '16' },
|
|
329
|
+
{ keys: ['c/4'], stem_direction: -1, duration: '16' },
|
|
330
|
+
{ keys: ['d/4'], stem_direction: -1, duration: '16' },
|
|
331
|
+
{ keys: ['f/4'], stem_direction: -1, duration: '16' },
|
|
332
|
+
{ keys: ['e/4'], stem_direction: -1, duration: '16' },
|
|
333
|
+
].map(f.StaveNote.bind(f));
|
|
334
|
+
const gracenotes1 = [{ keys: ['b/4'], stem_direction: 1, duration: '8', slash: true }].map(f.GraceNote.bind(f));
|
|
335
|
+
const gracenotes2 = [{ keys: ['f/4'], stem_direction: -1, duration: '8', slash: true }].map(f.GraceNote.bind(f));
|
|
336
|
+
const gracenotes3 = [
|
|
337
|
+
{ keys: ['f/4'], duration: '32', stem_direction: -1 },
|
|
338
|
+
{ keys: ['e/4'], duration: '32', stem_direction: -1 },
|
|
339
|
+
].map(f.GraceNote.bind(f));
|
|
340
|
+
const gracenotes4 = [
|
|
341
|
+
{ keys: ['f/5'], duration: '32', stem_direction: 1 },
|
|
342
|
+
{ keys: ['e/5'], duration: '32', stem_direction: 1 },
|
|
343
|
+
{ keys: ['e/5'], duration: '8', stem_direction: 1 },
|
|
344
|
+
].map(f.GraceNote.bind(f));
|
|
345
|
+
gracenotes2[0].setStemDirection(-1);
|
|
346
|
+
gracenotes2[0].addModifier(f.Accidental({ type: '#' }), 0);
|
|
347
|
+
notes[1].addModifier(f.GraceNoteGroup({ notes: gracenotes4 }).beamNotes(), 0);
|
|
348
|
+
notes[3].addModifier(f.GraceNoteGroup({ notes: gracenotes1 }), 0);
|
|
349
|
+
notes2[1].addModifier(f.GraceNoteGroup({ notes: gracenotes2 }).beamNotes(), 0);
|
|
350
|
+
notes2[5].addModifier(f.GraceNoteGroup({ notes: gracenotes3 }).beamNotes(), 0);
|
|
351
|
+
const voice = f.Voice().setStrict(false).addTickables(notes);
|
|
352
|
+
const voice2 = f.Voice().setStrict(false).addTickables(notes2);
|
|
353
|
+
f.Beam({ notes: notes.slice(0, 4) });
|
|
354
|
+
f.Beam({ notes: notes.slice(4, 8) });
|
|
355
|
+
f.Beam({ notes: notes2.slice(0, 4) });
|
|
356
|
+
f.Beam({ notes: notes2.slice(4, 8) });
|
|
357
|
+
f.Formatter().joinVoices([voice, voice2]).formatToStave([voice, voice2], stave);
|
|
358
|
+
f.draw();
|
|
359
|
+
ok(true, 'Sixteenth Test');
|
|
360
|
+
}
|
|
361
|
+
function multipleVoicesMultipleDraws(options) {
|
|
362
|
+
const f = VexFlowTests.makeFactory(options, 450, 140);
|
|
363
|
+
const stave = f.Stave({ x: 10, y: 10, width: 450 });
|
|
364
|
+
const notes = [
|
|
365
|
+
{ keys: ['f/5'], stem_direction: 1, duration: '16' },
|
|
366
|
+
{ keys: ['f/5'], stem_direction: 1, duration: '16' },
|
|
367
|
+
{ keys: ['d/5'], stem_direction: 1, duration: '16' },
|
|
368
|
+
{ keys: ['c/5'], stem_direction: 1, duration: '16' },
|
|
369
|
+
{ keys: ['c/5'], stem_direction: 1, duration: '16' },
|
|
370
|
+
{ keys: ['d/5'], stem_direction: 1, duration: '16' },
|
|
371
|
+
{ keys: ['f/5'], stem_direction: 1, duration: '16' },
|
|
372
|
+
{ keys: ['e/5'], stem_direction: 1, duration: '16' },
|
|
373
|
+
].map(f.StaveNote.bind(f));
|
|
374
|
+
const notes2 = [
|
|
375
|
+
{ keys: ['f/4'], stem_direction: -1, duration: '16' },
|
|
376
|
+
{ keys: ['e/4'], stem_direction: -1, duration: '16' },
|
|
377
|
+
{ keys: ['d/4'], stem_direction: -1, duration: '16' },
|
|
378
|
+
{ keys: ['c/4'], stem_direction: -1, duration: '16' },
|
|
379
|
+
{ keys: ['c/4'], stem_direction: -1, duration: '16' },
|
|
380
|
+
{ keys: ['d/4'], stem_direction: -1, duration: '16' },
|
|
381
|
+
{ keys: ['f/4'], stem_direction: -1, duration: '16' },
|
|
382
|
+
{ keys: ['e/4'], stem_direction: -1, duration: '16' },
|
|
383
|
+
].map(f.StaveNote.bind(f));
|
|
384
|
+
const gracenotes1 = [{ keys: ['b/4'], stem_direction: 1, duration: '8', slash: true }].map(f.GraceNote.bind(f));
|
|
385
|
+
const gracenotes2 = [{ keys: ['f/4'], stem_direction: -1, duration: '8', slash: true }].map(f.GraceNote.bind(f));
|
|
386
|
+
const gracenotes3 = [
|
|
387
|
+
{ keys: ['f/4'], duration: '32', stem_direction: -1 },
|
|
388
|
+
{ keys: ['e/4'], duration: '32', stem_direction: -1 },
|
|
389
|
+
].map(f.GraceNote.bind(f));
|
|
390
|
+
const gracenotes4 = [
|
|
391
|
+
{ keys: ['f/5'], duration: '32', stem_direction: 1 },
|
|
392
|
+
{ keys: ['e/5'], duration: '32', stem_direction: 1 },
|
|
393
|
+
{ keys: ['e/5'], duration: '8', stem_direction: 1 },
|
|
394
|
+
].map(f.GraceNote.bind(f));
|
|
395
|
+
gracenotes2[0].setStemDirection(-1);
|
|
396
|
+
gracenotes2[0].addModifier(f.Accidental({ type: '#' }), 0);
|
|
397
|
+
notes[1].addModifier(f.GraceNoteGroup({ notes: gracenotes4 }).beamNotes(), 0);
|
|
398
|
+
notes[3].addModifier(f.GraceNoteGroup({ notes: gracenotes1 }), 0);
|
|
399
|
+
notes2[1].addModifier(f.GraceNoteGroup({ notes: gracenotes2 }).beamNotes(), 0);
|
|
400
|
+
notes2[5].addModifier(f.GraceNoteGroup({ notes: gracenotes3 }).beamNotes(), 0);
|
|
401
|
+
const voice = f.Voice().setStrict(false).addTickables(notes);
|
|
402
|
+
const voice2 = f.Voice().setStrict(false).addTickables(notes2);
|
|
403
|
+
f.Beam({ notes: notes.slice(0, 4) });
|
|
404
|
+
f.Beam({ notes: notes.slice(4, 8) });
|
|
405
|
+
f.Beam({ notes: notes2.slice(0, 4) });
|
|
406
|
+
f.Beam({ notes: notes2.slice(4, 8) });
|
|
407
|
+
f.Formatter().joinVoices([voice, voice2]).formatToStave([voice, voice2], stave);
|
|
408
|
+
f.draw();
|
|
409
|
+
f.draw();
|
|
410
|
+
ok(true, 'Seventeenth Test');
|
|
411
|
+
}
|
|
412
|
+
VexFlowTests.register(GraceNoteTests);
|
|
413
|
+
export { GraceNoteTests };
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import { VexFlowTests } from './vexflow_test_helpers.js';
|
|
2
|
+
import { Flow } from '../src/flow.js';
|
|
3
|
+
import { Formatter } from '../src/formatter.js';
|
|
4
|
+
import { GraceNoteGroup } from '../src/gracenotegroup.js';
|
|
5
|
+
import { GraceTabNote } from '../src/gracetabnote.js';
|
|
6
|
+
import { TabNote } from '../src/tabnote.js';
|
|
7
|
+
import { TabStave } from '../src/tabstave.js';
|
|
8
|
+
import { Voice } from '../src/voice.js';
|
|
9
|
+
const GraceTabNoteTests = {
|
|
10
|
+
Start() {
|
|
11
|
+
QUnit.module('Grace Tab Notes');
|
|
12
|
+
const run = VexFlowTests.runTests;
|
|
13
|
+
run('Grace Tab Note Simple', simple);
|
|
14
|
+
run('Grace Tab Note Slurred', slurred);
|
|
15
|
+
},
|
|
16
|
+
};
|
|
17
|
+
const tabNote = (noteStruct) => new TabNote(noteStruct);
|
|
18
|
+
const graceTabNote = (noteStruct) => new GraceTabNote(noteStruct);
|
|
19
|
+
function setupContext(opts, ctxBuilder) {
|
|
20
|
+
const context = ctxBuilder(opts.elementId, 350, 140);
|
|
21
|
+
const stave = new TabStave(10, 10, 350).addTabGlyph().setContext(context).draw();
|
|
22
|
+
return { context, stave };
|
|
23
|
+
}
|
|
24
|
+
function simple(options, contextBuilder) {
|
|
25
|
+
const { context, stave } = setupContext(options, contextBuilder);
|
|
26
|
+
const note0 = tabNote({ positions: [{ str: 4, fret: 6 }], duration: '4' });
|
|
27
|
+
const note1 = tabNote({ positions: [{ str: 4, fret: 12 }], duration: '4' });
|
|
28
|
+
const note2 = tabNote({ positions: [{ str: 4, fret: 10 }], duration: '4' });
|
|
29
|
+
const note3 = tabNote({ positions: [{ str: 4, fret: 10 }], duration: '4' });
|
|
30
|
+
const gracenote_group0 = [{ positions: [{ str: 4, fret: 'x' }], duration: '8' }];
|
|
31
|
+
const gracenote_group1 = [
|
|
32
|
+
{ positions: [{ str: 4, fret: 9 }], duration: '16' },
|
|
33
|
+
{ positions: [{ str: 4, fret: 10 }], duration: '16' },
|
|
34
|
+
];
|
|
35
|
+
const gracenote_group2 = [{ positions: [{ str: 4, fret: 9 }], duration: '8' }];
|
|
36
|
+
const gracenote_group3 = [
|
|
37
|
+
{ positions: [{ str: 5, fret: 10 }], duration: '8' },
|
|
38
|
+
{ positions: [{ str: 4, fret: 9 }], duration: '8' },
|
|
39
|
+
];
|
|
40
|
+
const gracenotes0 = gracenote_group0.map(graceTabNote);
|
|
41
|
+
const gracenotes1 = gracenote_group1.map(graceTabNote);
|
|
42
|
+
const gracenotes2 = gracenote_group2.map(graceTabNote);
|
|
43
|
+
gracenotes2[0].setGhost(true);
|
|
44
|
+
const gracenotes3 = gracenote_group3.map(graceTabNote);
|
|
45
|
+
note0.addModifier(new GraceNoteGroup(gracenotes0), 0);
|
|
46
|
+
note1.addModifier(new GraceNoteGroup(gracenotes1), 0);
|
|
47
|
+
note2.addModifier(new GraceNoteGroup(gracenotes2), 0);
|
|
48
|
+
note3.addModifier(new GraceNoteGroup(gracenotes3), 0);
|
|
49
|
+
const voice = new Voice(Flow.TIME4_4);
|
|
50
|
+
voice.addTickables([note0, note1, note2, note3]);
|
|
51
|
+
new Formatter().joinVoices([voice]).format([voice], 250);
|
|
52
|
+
voice.draw(context, stave);
|
|
53
|
+
ok(true, 'Simple Test');
|
|
54
|
+
}
|
|
55
|
+
function slurred(options, contextBuilder) {
|
|
56
|
+
const { context, stave } = setupContext(options, contextBuilder);
|
|
57
|
+
const note0 = tabNote({ positions: [{ str: 4, fret: 12 }], duration: 'h' });
|
|
58
|
+
const note1 = tabNote({ positions: [{ str: 4, fret: 10 }], duration: 'h' });
|
|
59
|
+
const gracenote_group0 = [
|
|
60
|
+
{ positions: [{ str: 4, fret: 9 }], duration: '8' },
|
|
61
|
+
{ positions: [{ str: 4, fret: 10 }], duration: '8' },
|
|
62
|
+
];
|
|
63
|
+
const gracenote_group1 = [
|
|
64
|
+
{ positions: [{ str: 4, fret: 7 }], duration: '16' },
|
|
65
|
+
{ positions: [{ str: 4, fret: 8 }], duration: '16' },
|
|
66
|
+
{ positions: [{ str: 4, fret: 9 }], duration: '16' },
|
|
67
|
+
];
|
|
68
|
+
const gracenotes0 = gracenote_group0.map(graceTabNote);
|
|
69
|
+
const gracenotes1 = gracenote_group1.map(graceTabNote);
|
|
70
|
+
note0.addModifier(new GraceNoteGroup(gracenotes0, true), 0);
|
|
71
|
+
note1.addModifier(new GraceNoteGroup(gracenotes1, true), 0);
|
|
72
|
+
const voice = new Voice(Flow.TIME4_4);
|
|
73
|
+
voice.addTickables([note0, note1]);
|
|
74
|
+
new Formatter().joinVoices([voice]).format([voice], 200);
|
|
75
|
+
voice.draw(context, stave);
|
|
76
|
+
ok(true, 'Slurred Test');
|
|
77
|
+
}
|
|
78
|
+
VexFlowTests.register(GraceTabNoteTests);
|
|
79
|
+
export { GraceTabNoteTests };
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
export * from './accidental_tests.js';
|
|
2
|
+
export * from './annotation_tests.js';
|
|
3
|
+
export * from './articulation_tests.js';
|
|
4
|
+
export * from './auto_beam_formatting_tests.js';
|
|
5
|
+
export * from './bach_tests.js';
|
|
6
|
+
export * from './barline_tests.js';
|
|
7
|
+
export * from './beam_tests.js';
|
|
8
|
+
export * from './bend_tests.js';
|
|
9
|
+
export * from './boundingbox_tests.js';
|
|
10
|
+
export * from './boundingboxcomputation_tests.js';
|
|
11
|
+
export * from './chordsymbol_tests.js';
|
|
12
|
+
export * from './clef_tests.js';
|
|
13
|
+
export * from './curve_tests.js';
|
|
14
|
+
export * from './dot_tests.js';
|
|
15
|
+
export * from './easyscore_tests.js';
|
|
16
|
+
export * from './factory_tests.js';
|
|
17
|
+
export * from './font_tests.js';
|
|
18
|
+
export * from './formatter_tests.js';
|
|
19
|
+
export * from './fraction_tests.js';
|
|
20
|
+
export * from './ghostnote_tests.js';
|
|
21
|
+
export * from './glyphnote_tests.js';
|
|
22
|
+
export * from './gracenote_tests.js';
|
|
23
|
+
export * from './gracetabnote_tests.js';
|
|
24
|
+
export * from './key_clef_tests.js';
|
|
25
|
+
export * from './keymanager_tests.js';
|
|
26
|
+
export * from './keysignature_tests.js';
|
|
27
|
+
export * from './modifier_tests.js';
|
|
28
|
+
export * from './multimeasurerest_tests.js';
|
|
29
|
+
export * from './music_tests.js';
|
|
30
|
+
export * from './notehead_tests.js';
|
|
31
|
+
export * from './notesubgroup_tests.js';
|
|
32
|
+
export * from './offscreencanvas_tests.js';
|
|
33
|
+
export * from './ornament_tests.js';
|
|
34
|
+
export * from './parser_tests.js';
|
|
35
|
+
export * from './pedalmarking_tests.js';
|
|
36
|
+
export * from './percussion_tests.js';
|
|
37
|
+
export * from './registry_tests.js';
|
|
38
|
+
export * from './renderer_tests.js';
|
|
39
|
+
export * from './rests_tests.js';
|
|
40
|
+
export * from './rhythm_tests.js';
|
|
41
|
+
export * from './stave_tests.js';
|
|
42
|
+
export * from './staveconnector_tests.js';
|
|
43
|
+
export * from './stavehairpin_tests.js';
|
|
44
|
+
export * from './staveline_tests.js';
|
|
45
|
+
export * from './stavemodifier_tests.js';
|
|
46
|
+
export * from './stavenote_tests.js';
|
|
47
|
+
export * from './stavetie_tests.js';
|
|
48
|
+
export * from './stringnumber_tests.js';
|
|
49
|
+
export * from './strokes_tests.js';
|
|
50
|
+
export * from './style_tests.js';
|
|
51
|
+
export * from './tabnote_tests.js';
|
|
52
|
+
export * from './tabslide_tests.js';
|
|
53
|
+
export * from './tabstave_tests.js';
|
|
54
|
+
export * from './tabtie_tests.js';
|
|
55
|
+
export * from './textbracket_tests.js';
|
|
56
|
+
export * from './textformatter_tests.js';
|
|
57
|
+
export * from './textnote_tests.js';
|
|
58
|
+
export * from './threevoice_tests.js';
|
|
59
|
+
export * from './tickcontext_tests.js';
|
|
60
|
+
export * from './timesignature_tests.js';
|
|
61
|
+
export * from './tremolo_tests.js';
|
|
62
|
+
export * from './tuning_tests.js';
|
|
63
|
+
export * from './tuplet_tests.js';
|
|
64
|
+
export * from './typeguard_tests.js';
|
|
65
|
+
export * from './vf_prefix_tests.js';
|
|
66
|
+
export * from './vibrato_tests.js';
|
|
67
|
+
export * from './vibratobracket_tests.js';
|
|
68
|
+
export * from './voice_tests.js';
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
import { MAJOR_KEYS, MINOR_KEYS, VexFlowTests } from './vexflow_test_helpers.js';
|
|
2
|
+
import { Glyph } from '../src/glyph.js';
|
|
3
|
+
import { KeySignature } from '../src/keysignature.js';
|
|
4
|
+
import { Stave } from '../src/stave.js';
|
|
5
|
+
const ClefKeySignatureTests = {
|
|
6
|
+
Start() {
|
|
7
|
+
QUnit.module('Clef Keys');
|
|
8
|
+
const run = VexFlowTests.runTests;
|
|
9
|
+
run('Major Key Clef Test', keys, { majorKeys: true });
|
|
10
|
+
run('Minor Key Clef Test', keys, { majorKeys: false });
|
|
11
|
+
run('Stave Helper', staveHelper);
|
|
12
|
+
},
|
|
13
|
+
};
|
|
14
|
+
const fontWidths = () => {
|
|
15
|
+
const glyphScale = 39;
|
|
16
|
+
const sharpWidth = Glyph.getWidth('accidentalSharp', glyphScale) + 1;
|
|
17
|
+
const flatWidth = Glyph.getWidth('accidentalFlat', glyphScale) + 1;
|
|
18
|
+
const ksPadding = 10;
|
|
19
|
+
const naturalWidth = Glyph.getWidth('accidentalNatural', glyphScale) + 2;
|
|
20
|
+
const clefWidth = Glyph.getWidth('gClef', glyphScale);
|
|
21
|
+
return { sharpWidth, flatWidth, naturalWidth, clefWidth, ksPadding };
|
|
22
|
+
};
|
|
23
|
+
function keys(options, contextBuilder) {
|
|
24
|
+
const w = fontWidths();
|
|
25
|
+
const accidentalCount = 28;
|
|
26
|
+
const sharpTestWidth = accidentalCount * w.sharpWidth + w.clefWidth + Stave.defaultPadding + 6 * w.ksPadding;
|
|
27
|
+
const flatTestWidth = accidentalCount * w.flatWidth + w.clefWidth + Stave.defaultPadding + 6 * w.ksPadding;
|
|
28
|
+
const clefs = [
|
|
29
|
+
'treble',
|
|
30
|
+
'soprano',
|
|
31
|
+
'mezzo-soprano',
|
|
32
|
+
'alto',
|
|
33
|
+
'tenor',
|
|
34
|
+
'baritone-f',
|
|
35
|
+
'baritone-c',
|
|
36
|
+
'bass',
|
|
37
|
+
'french',
|
|
38
|
+
'subbass',
|
|
39
|
+
'percussion',
|
|
40
|
+
];
|
|
41
|
+
const ctx = contextBuilder(options.elementId, Math.max(sharpTestWidth, flatTestWidth) + 100, 20 + 80 * 2 * clefs.length);
|
|
42
|
+
const staves = [];
|
|
43
|
+
const keys = options.params.majorKeys ? MAJOR_KEYS : MINOR_KEYS;
|
|
44
|
+
let i;
|
|
45
|
+
let flat;
|
|
46
|
+
let sharp;
|
|
47
|
+
let keySig;
|
|
48
|
+
const yOffsetForFlatStaves = 10 + 80 * clefs.length;
|
|
49
|
+
for (i = 0; i < clefs.length; i++) {
|
|
50
|
+
staves[i] = new Stave(10, 10 + 80 * i, flatTestWidth);
|
|
51
|
+
staves[i].addClef(clefs[i]);
|
|
52
|
+
staves[i + clefs.length] = new Stave(10, yOffsetForFlatStaves + 10 + 80 * i, sharpTestWidth);
|
|
53
|
+
staves[i + clefs.length].addClef(clefs[i]);
|
|
54
|
+
for (flat = 0; flat < 8; flat++) {
|
|
55
|
+
keySig = new KeySignature(keys[flat]);
|
|
56
|
+
keySig.addToStave(staves[i]);
|
|
57
|
+
}
|
|
58
|
+
for (sharp = 8; sharp < keys.length; sharp++) {
|
|
59
|
+
keySig = new KeySignature(keys[sharp]);
|
|
60
|
+
keySig.addToStave(staves[i + clefs.length]);
|
|
61
|
+
}
|
|
62
|
+
staves[i].setContext(ctx);
|
|
63
|
+
staves[i].draw();
|
|
64
|
+
staves[i + clefs.length].setContext(ctx);
|
|
65
|
+
staves[i + clefs.length].draw();
|
|
66
|
+
}
|
|
67
|
+
ok(true, 'all pass');
|
|
68
|
+
}
|
|
69
|
+
function staveHelper(options, contextBuilder) {
|
|
70
|
+
const w = fontWidths();
|
|
71
|
+
const accidentalCount = 28;
|
|
72
|
+
const sharpTestWidth = accidentalCount * w.sharpWidth + w.clefWidth + Stave.defaultPadding + 7 * w.ksPadding;
|
|
73
|
+
const flatTestWidth = accidentalCount * w.flatWidth + w.clefWidth + Stave.defaultPadding + 7 * w.ksPadding;
|
|
74
|
+
const ctx = contextBuilder(options.elementId, Math.max(sharpTestWidth, flatTestWidth) + 100, 400);
|
|
75
|
+
const stave1 = new Stave(10, 10, flatTestWidth);
|
|
76
|
+
const stave2 = new Stave(10, 90, flatTestWidth);
|
|
77
|
+
const stave3 = new Stave(10, 170, sharpTestWidth);
|
|
78
|
+
const stave4 = new Stave(10, 260, sharpTestWidth);
|
|
79
|
+
const keys = MAJOR_KEYS;
|
|
80
|
+
stave1.addClef('treble');
|
|
81
|
+
stave2.addClef('bass');
|
|
82
|
+
stave3.addClef('alto');
|
|
83
|
+
stave4.addClef('tenor');
|
|
84
|
+
for (let n = 0; n < 8; ++n) {
|
|
85
|
+
stave1.addKeySignature(keys[n]);
|
|
86
|
+
stave2.addKeySignature(keys[n]);
|
|
87
|
+
}
|
|
88
|
+
for (let i = 8; i < keys.length; ++i) {
|
|
89
|
+
stave3.addKeySignature(keys[i]);
|
|
90
|
+
stave4.addKeySignature(keys[i]);
|
|
91
|
+
}
|
|
92
|
+
stave1.setContext(ctx);
|
|
93
|
+
stave1.draw();
|
|
94
|
+
stave2.setContext(ctx);
|
|
95
|
+
stave2.draw();
|
|
96
|
+
stave3.setContext(ctx);
|
|
97
|
+
stave3.draw();
|
|
98
|
+
stave4.setContext(ctx);
|
|
99
|
+
stave4.draw();
|
|
100
|
+
ok(true, 'all pass');
|
|
101
|
+
}
|
|
102
|
+
VexFlowTests.register(ClefKeySignatureTests);
|
|
103
|
+
export { ClefKeySignatureTests };
|