vexflow 4.0.1-beta.1 → 4.0.1-beta.2
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/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 +92 -24
- package/build/cjs/vexflow-debug-with-tests.js.map +1 -1
- package/build/cjs/vexflow-debug.js +38 -16
- 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 +11 -0
- package/build/esm/entry/vexflow-core.js +54 -0
- package/build/esm/entry/vexflow-debug-with-tests.js +4 -0
- package/build/esm/entry/vexflow-debug.js +3 -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 +11 -0
- package/build/esm/entry/vexflow-petaluma.js +11 -0
- package/build/esm/entry/vexflow.js +9 -0
- package/build/esm/src/accidental.js +348 -0
- package/build/esm/src/annotation.js +232 -0
- package/build/esm/src/articulation.js +267 -0
- package/build/esm/src/barnote.js +58 -0
- package/build/esm/src/beam.js +632 -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 +440 -0
- package/build/esm/src/flow.js +275 -0
- package/build/esm/src/font.js +264 -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 +568 -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 +331 -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 +91 -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 +218 -0
- package/build/esm/src/stavemodifier.js +77 -0
- package/build/esm/src/stavenote.js +855 -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 +116 -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 +176 -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 +377 -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 +595 -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 +459 -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 +669 -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 +3 -0
- package/build/types/entry/vexflow-core.d.ts +3 -0
- package/build/types/entry/vexflow-debug.d.ts +3 -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 +3 -0
- package/build/types/entry/vexflow-petaluma.d.ts +3 -0
- package/build/types/entry/vexflow.d.ts +3 -0
- package/build/types/src/accidental.d.ts +66 -0
- package/build/types/src/annotation.d.ts +60 -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 +124 -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 +148 -0
- package/build/types/src/element.d.ts +202 -0
- package/build/types/src/factory.d.ts +271 -0
- package/build/types/src/flow.d.ts +245 -0
- package/build/types/src/font.d.ts +181 -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 +139 -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 +91 -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 +231 -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 +57 -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/package.json +1 -1
- package/src/annotation.ts +27 -6
- package/src/articulation.ts +8 -2
- package/src/fonts/gonville_glyphs.ts +4 -4
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import { VexFlowTests } from './vexflow_test_helpers.js';
|
|
2
|
+
import { KeyManager } from '../src/index.js';
|
|
3
|
+
const KeyManagerTests = {
|
|
4
|
+
Start() {
|
|
5
|
+
QUnit.module('KeyManager');
|
|
6
|
+
test('Valid Notes', works);
|
|
7
|
+
test('Select Notes', selectNotes);
|
|
8
|
+
},
|
|
9
|
+
};
|
|
10
|
+
function works() {
|
|
11
|
+
const manager = new KeyManager('g');
|
|
12
|
+
equal(manager.getAccidental('f').accidental, '#');
|
|
13
|
+
manager.setKey('a');
|
|
14
|
+
equal(manager.getAccidental('c').accidental, '#');
|
|
15
|
+
equal(manager.getAccidental('a').accidental, null);
|
|
16
|
+
equal(manager.getAccidental('f').accidental, '#');
|
|
17
|
+
manager.setKey('A');
|
|
18
|
+
equal(manager.getAccidental('c').accidental, '#');
|
|
19
|
+
equal(manager.getAccidental('a').accidental, null);
|
|
20
|
+
equal(manager.getAccidental('f').accidental, '#');
|
|
21
|
+
}
|
|
22
|
+
function selectNotes() {
|
|
23
|
+
const manager = new KeyManager('f');
|
|
24
|
+
equal(manager.selectNote('bb').note, 'bb');
|
|
25
|
+
equal(manager.selectNote('bb').accidental, 'b');
|
|
26
|
+
equal(manager.selectNote('g').note, 'g');
|
|
27
|
+
equal(manager.selectNote('g').accidental, null);
|
|
28
|
+
equal(manager.selectNote('b').note, 'b');
|
|
29
|
+
equal(manager.selectNote('b').accidental, null);
|
|
30
|
+
equal(manager.selectNote('a#').note, 'bb');
|
|
31
|
+
equal(manager.selectNote('g#').note, 'g#');
|
|
32
|
+
equal(manager.selectNote('g#').note, 'g#');
|
|
33
|
+
equal(manager.selectNote('bb').note, 'bb');
|
|
34
|
+
equal(manager.selectNote('bb').accidental, 'b');
|
|
35
|
+
equal(manager.selectNote('g').note, 'g');
|
|
36
|
+
equal(manager.selectNote('g').accidental, null);
|
|
37
|
+
equal(manager.selectNote('b').note, 'b');
|
|
38
|
+
equal(manager.selectNote('b').accidental, null);
|
|
39
|
+
equal(manager.selectNote('a#').note, 'bb');
|
|
40
|
+
equal(manager.selectNote('g#').note, 'g#');
|
|
41
|
+
manager.reset();
|
|
42
|
+
equal(manager.selectNote('g#').change, true);
|
|
43
|
+
equal(manager.selectNote('g#').change, false);
|
|
44
|
+
equal(manager.selectNote('g').change, true);
|
|
45
|
+
equal(manager.selectNote('g').change, false);
|
|
46
|
+
equal(manager.selectNote('g#').change, true);
|
|
47
|
+
manager.reset();
|
|
48
|
+
let note = manager.selectNote('bb');
|
|
49
|
+
equal(note.change, false);
|
|
50
|
+
equal(note.accidental, 'b');
|
|
51
|
+
note = manager.selectNote('g');
|
|
52
|
+
equal(note.change, false);
|
|
53
|
+
equal(note.accidental, null);
|
|
54
|
+
note = manager.selectNote('g#');
|
|
55
|
+
equal(note.change, true);
|
|
56
|
+
equal(note.accidental, '#');
|
|
57
|
+
note = manager.selectNote('g');
|
|
58
|
+
equal(note.change, true);
|
|
59
|
+
equal(note.accidental, null);
|
|
60
|
+
note = manager.selectNote('g');
|
|
61
|
+
equal(note.change, false);
|
|
62
|
+
equal(note.accidental, null);
|
|
63
|
+
note = manager.selectNote('g#');
|
|
64
|
+
equal(note.change, true);
|
|
65
|
+
equal(note.accidental, '#');
|
|
66
|
+
}
|
|
67
|
+
VexFlowTests.register(KeyManagerTests);
|
|
68
|
+
export { KeyManagerTests };
|
|
@@ -0,0 +1,308 @@
|
|
|
1
|
+
import { MAJOR_KEYS, MINOR_KEYS, VexFlowTests } from './vexflow_test_helpers.js';
|
|
2
|
+
import { Flow } from '../src/flow.js';
|
|
3
|
+
import { Glyph } from '../src/glyph.js';
|
|
4
|
+
import { KeySignature } from '../src/keysignature.js';
|
|
5
|
+
import { Stave } from '../src/stave.js';
|
|
6
|
+
import { BarlineType } from '../src/stavebarline.js';
|
|
7
|
+
const KeySignatureTests = {
|
|
8
|
+
Start() {
|
|
9
|
+
QUnit.module('KeySignature');
|
|
10
|
+
test('Key Parser Test', parser);
|
|
11
|
+
const run = VexFlowTests.runTests;
|
|
12
|
+
run('Major Key Test', majorKeys);
|
|
13
|
+
run('Minor Key Test', minorKeys);
|
|
14
|
+
run('Stave Helper', staveHelper);
|
|
15
|
+
run('Cancelled key test', majorKeysCanceled);
|
|
16
|
+
run('Cancelled key (for each clef) test', keysCanceledForEachClef);
|
|
17
|
+
run('Altered key test', majorKeysAltered);
|
|
18
|
+
run('End key with clef test', endKeyWithClef);
|
|
19
|
+
run('Key Signature Change test', changeKey);
|
|
20
|
+
},
|
|
21
|
+
};
|
|
22
|
+
const fontWidths = () => {
|
|
23
|
+
const glyphScale = 39;
|
|
24
|
+
const sharpWidth = Glyph.getWidth('accidentalSharp', glyphScale) + 1;
|
|
25
|
+
const flatWidth = Glyph.getWidth('accidentalFlat', glyphScale) + 1;
|
|
26
|
+
const naturalWidth = Glyph.getWidth('accidentalNatural', glyphScale) + 2;
|
|
27
|
+
const clefWidth = Glyph.getWidth('gClef', glyphScale) * 2;
|
|
28
|
+
return { sharpWidth, flatWidth, naturalWidth, clefWidth };
|
|
29
|
+
};
|
|
30
|
+
function parser() {
|
|
31
|
+
expect(11);
|
|
32
|
+
function catchError(spec) {
|
|
33
|
+
throws(() => Flow.keySignature(spec), /BadKeySignature/);
|
|
34
|
+
}
|
|
35
|
+
catchError('asdf');
|
|
36
|
+
catchError('D!');
|
|
37
|
+
catchError('E#');
|
|
38
|
+
catchError('D#');
|
|
39
|
+
catchError('#');
|
|
40
|
+
catchError('b');
|
|
41
|
+
catchError('Kb');
|
|
42
|
+
catchError('Fb');
|
|
43
|
+
catchError('Dbm');
|
|
44
|
+
catchError('B#m');
|
|
45
|
+
Flow.keySignature('B');
|
|
46
|
+
Flow.keySignature('C');
|
|
47
|
+
Flow.keySignature('Fm');
|
|
48
|
+
Flow.keySignature('Ab');
|
|
49
|
+
Flow.keySignature('Abm');
|
|
50
|
+
Flow.keySignature('F#');
|
|
51
|
+
Flow.keySignature('G#m');
|
|
52
|
+
ok(true, 'all pass');
|
|
53
|
+
}
|
|
54
|
+
function majorKeys(options, contextBuilder) {
|
|
55
|
+
const w = fontWidths();
|
|
56
|
+
const accidentalCount = 28;
|
|
57
|
+
const casePadding = 10;
|
|
58
|
+
const testCases = 7;
|
|
59
|
+
const sharpTestWidth = accidentalCount * w.sharpWidth + casePadding * testCases + Stave.defaultPadding;
|
|
60
|
+
const flatTestWidth = accidentalCount * w.flatWidth + casePadding * testCases + Stave.defaultPadding;
|
|
61
|
+
const ctx = contextBuilder(options.elementId, Math.max(sharpTestWidth, flatTestWidth) + 100, 240);
|
|
62
|
+
const stave1 = new Stave(10, 10, flatTestWidth);
|
|
63
|
+
const stave2 = new Stave(10, 90, sharpTestWidth);
|
|
64
|
+
const keys = MAJOR_KEYS;
|
|
65
|
+
let keySig = null;
|
|
66
|
+
for (let i = 0; i < 8; ++i) {
|
|
67
|
+
keySig = new KeySignature(keys[i]);
|
|
68
|
+
keySig.addToStave(stave1);
|
|
69
|
+
}
|
|
70
|
+
for (let n = 8; n < keys.length; ++n) {
|
|
71
|
+
keySig = new KeySignature(keys[n]);
|
|
72
|
+
keySig.addToStave(stave2);
|
|
73
|
+
}
|
|
74
|
+
stave1.setContext(ctx);
|
|
75
|
+
stave1.draw();
|
|
76
|
+
stave2.setContext(ctx);
|
|
77
|
+
stave2.draw();
|
|
78
|
+
ok(true, 'all pass');
|
|
79
|
+
}
|
|
80
|
+
function majorKeysCanceled(options, contextBuilder) {
|
|
81
|
+
const scale = 0.9;
|
|
82
|
+
const w = fontWidths();
|
|
83
|
+
const flatPadding = 18;
|
|
84
|
+
const sharpPadding = 20;
|
|
85
|
+
const flatTestCases = 8;
|
|
86
|
+
const sharpTestCases = 7;
|
|
87
|
+
const sharpTestWidth = 28 * w.sharpWidth + 21 * w.naturalWidth + sharpPadding * sharpTestCases + Stave.defaultPadding + w.clefWidth;
|
|
88
|
+
const flatTestWidth = 28 * w.flatWidth + 28 * w.naturalWidth + flatPadding * flatTestCases + Stave.defaultPadding + w.clefWidth;
|
|
89
|
+
const eFlatTestWidth = 28 * w.flatWidth + 32 * w.naturalWidth + flatPadding * flatTestCases + Stave.defaultPadding + w.clefWidth;
|
|
90
|
+
const eSharpTestWidth = 28 * w.sharpWidth + 28 * w.naturalWidth + sharpPadding * sharpTestCases + Stave.defaultPadding + w.clefWidth;
|
|
91
|
+
const maxWidth = Math.max(Math.max(sharpTestWidth, flatTestWidth, Math.max(eSharpTestWidth, eFlatTestWidth)));
|
|
92
|
+
const ctx = contextBuilder(options.elementId, maxWidth + 100, 500);
|
|
93
|
+
ctx.scale(scale, scale);
|
|
94
|
+
const stave1 = new Stave(10, 10, flatTestWidth).addClef('treble');
|
|
95
|
+
const stave2 = new Stave(10, 90, sharpTestWidth).addClef('treble');
|
|
96
|
+
const stave3 = new Stave(10, 170, eFlatTestWidth).addClef('treble');
|
|
97
|
+
const stave4 = new Stave(10, 250, eSharpTestWidth).addClef('treble');
|
|
98
|
+
const keys = MAJOR_KEYS;
|
|
99
|
+
let keySig = null;
|
|
100
|
+
let i;
|
|
101
|
+
let n;
|
|
102
|
+
for (i = 0; i < 8; ++i) {
|
|
103
|
+
keySig = new KeySignature(keys[i]);
|
|
104
|
+
keySig.cancelKey('Cb');
|
|
105
|
+
keySig.setPadding(flatPadding);
|
|
106
|
+
keySig.addToStave(stave1);
|
|
107
|
+
}
|
|
108
|
+
for (n = 8; n < keys.length; ++n) {
|
|
109
|
+
keySig = new KeySignature(keys[n]);
|
|
110
|
+
keySig.cancelKey('C#');
|
|
111
|
+
keySig.setPadding(sharpPadding);
|
|
112
|
+
keySig.addToStave(stave2);
|
|
113
|
+
}
|
|
114
|
+
for (i = 0; i < 8; ++i) {
|
|
115
|
+
keySig = new KeySignature(keys[i]);
|
|
116
|
+
keySig.cancelKey('E');
|
|
117
|
+
keySig.setPadding(flatPadding);
|
|
118
|
+
keySig.addToStave(stave3);
|
|
119
|
+
}
|
|
120
|
+
for (n = 8; n < keys.length; ++n) {
|
|
121
|
+
keySig = new KeySignature(keys[n]);
|
|
122
|
+
keySig.cancelKey('Ab');
|
|
123
|
+
keySig.setPadding(sharpPadding);
|
|
124
|
+
keySig.addToStave(stave4);
|
|
125
|
+
}
|
|
126
|
+
stave1.setContext(ctx);
|
|
127
|
+
stave1.draw();
|
|
128
|
+
stave2.setContext(ctx);
|
|
129
|
+
stave2.draw();
|
|
130
|
+
stave3.setContext(ctx);
|
|
131
|
+
stave3.draw();
|
|
132
|
+
stave4.setContext(ctx);
|
|
133
|
+
stave4.draw();
|
|
134
|
+
ok(true, 'all pass');
|
|
135
|
+
}
|
|
136
|
+
function keysCanceledForEachClef(options, contextBuilder) {
|
|
137
|
+
const scale = 0.8;
|
|
138
|
+
const w = fontWidths();
|
|
139
|
+
const keyPadding = 10;
|
|
140
|
+
const keys = ['C#', 'Cb'];
|
|
141
|
+
const flatsKey = [7, 14];
|
|
142
|
+
const sharpsKey = [14, 7];
|
|
143
|
+
const natsKey = [7, 7];
|
|
144
|
+
const max = 21 * Math.max(w.sharpWidth, w.flatWidth) * 2 + keyPadding * 6 + Stave.defaultPadding + w.clefWidth;
|
|
145
|
+
const ctx = contextBuilder(options.elementId, max + 100, 380);
|
|
146
|
+
ctx.scale(scale, scale);
|
|
147
|
+
const x = 20;
|
|
148
|
+
let y = 20;
|
|
149
|
+
let tx = x;
|
|
150
|
+
['bass', 'tenor', 'soprano', 'mezzo-soprano', 'baritone-f'].forEach(function (clef) {
|
|
151
|
+
keys.forEach((key, keyIx) => {
|
|
152
|
+
const cancelKey = keys[(keyIx + 1) % 2];
|
|
153
|
+
const width = flatsKey[keyIx] * w.flatWidth +
|
|
154
|
+
natsKey[keyIx] * w.naturalWidth +
|
|
155
|
+
sharpsKey[keyIx] * w.sharpWidth +
|
|
156
|
+
keyPadding * 3 +
|
|
157
|
+
w.clefWidth +
|
|
158
|
+
Stave.defaultPadding;
|
|
159
|
+
const stave = new Stave(tx, y, width);
|
|
160
|
+
stave.setClef(clef);
|
|
161
|
+
stave.addKeySignature(cancelKey);
|
|
162
|
+
stave.addKeySignature(key, cancelKey);
|
|
163
|
+
stave.addKeySignature(key);
|
|
164
|
+
stave.setContext(ctx).draw();
|
|
165
|
+
tx += width;
|
|
166
|
+
});
|
|
167
|
+
tx = x;
|
|
168
|
+
y += 80;
|
|
169
|
+
});
|
|
170
|
+
ok(true, 'all pass');
|
|
171
|
+
}
|
|
172
|
+
function majorKeysAltered(options, contextBuilder) {
|
|
173
|
+
const ctx = contextBuilder(options.elementId, 780, 500);
|
|
174
|
+
ctx.scale(0.9, 0.9);
|
|
175
|
+
const stave1 = new Stave(10, 10, 750).addClef('treble');
|
|
176
|
+
const stave2 = new Stave(10, 90, 750).addClef('treble');
|
|
177
|
+
const stave3 = new Stave(10, 170, 750).addClef('treble');
|
|
178
|
+
const stave4 = new Stave(10, 250, 750).addClef('treble');
|
|
179
|
+
const keys = MAJOR_KEYS;
|
|
180
|
+
let keySig = null;
|
|
181
|
+
let i;
|
|
182
|
+
let n;
|
|
183
|
+
for (i = 0; i < 8; ++i) {
|
|
184
|
+
keySig = new KeySignature(keys[i]);
|
|
185
|
+
keySig.alterKey(['bs', 'bs']);
|
|
186
|
+
keySig.setPadding(18);
|
|
187
|
+
keySig.addToStave(stave1);
|
|
188
|
+
}
|
|
189
|
+
for (n = 8; n < keys.length; ++n) {
|
|
190
|
+
keySig = new KeySignature(keys[n]);
|
|
191
|
+
keySig.alterKey(['+', '+', '+']);
|
|
192
|
+
keySig.setPadding(20);
|
|
193
|
+
keySig.addToStave(stave2);
|
|
194
|
+
}
|
|
195
|
+
for (i = 0; i < 8; ++i) {
|
|
196
|
+
keySig = new KeySignature(keys[i]);
|
|
197
|
+
keySig.alterKey(['n', 'bs', 'bb']);
|
|
198
|
+
keySig.setPadding(18);
|
|
199
|
+
keySig.addToStave(stave3);
|
|
200
|
+
}
|
|
201
|
+
for (n = 8; n < keys.length; ++n) {
|
|
202
|
+
keySig = new KeySignature(keys[n]);
|
|
203
|
+
keySig.alterKey(['++', '+', 'n', '+']);
|
|
204
|
+
keySig.setPadding(20);
|
|
205
|
+
keySig.addToStave(stave4);
|
|
206
|
+
}
|
|
207
|
+
stave1.setContext(ctx);
|
|
208
|
+
stave1.draw();
|
|
209
|
+
stave2.setContext(ctx);
|
|
210
|
+
stave2.draw();
|
|
211
|
+
stave3.setContext(ctx);
|
|
212
|
+
stave3.draw();
|
|
213
|
+
stave4.setContext(ctx);
|
|
214
|
+
stave4.draw();
|
|
215
|
+
ok(true, 'all pass');
|
|
216
|
+
}
|
|
217
|
+
function minorKeys(options, contextBuilder) {
|
|
218
|
+
const accidentalCount = 28;
|
|
219
|
+
const w = fontWidths();
|
|
220
|
+
const casePadding = 10;
|
|
221
|
+
const testCases = 7;
|
|
222
|
+
const sharpTestWidth = accidentalCount * w.sharpWidth + casePadding * testCases + Stave.defaultPadding;
|
|
223
|
+
const flatTestWidth = accidentalCount * w.flatWidth + casePadding * testCases + Stave.defaultPadding;
|
|
224
|
+
const ctx = contextBuilder(options.elementId, Math.max(sharpTestWidth, flatTestWidth) + 100, 240);
|
|
225
|
+
const stave1 = new Stave(10, 10, flatTestWidth);
|
|
226
|
+
const stave2 = new Stave(10, 90, sharpTestWidth);
|
|
227
|
+
const keys = MINOR_KEYS;
|
|
228
|
+
let keySig = null;
|
|
229
|
+
for (let i = 0; i < 8; ++i) {
|
|
230
|
+
keySig = new KeySignature(keys[i]);
|
|
231
|
+
keySig.addToStave(stave1);
|
|
232
|
+
}
|
|
233
|
+
for (let n = 8; n < keys.length; ++n) {
|
|
234
|
+
keySig = new KeySignature(keys[n]);
|
|
235
|
+
keySig.addToStave(stave2);
|
|
236
|
+
}
|
|
237
|
+
stave1.setContext(ctx);
|
|
238
|
+
stave1.draw();
|
|
239
|
+
stave2.setContext(ctx);
|
|
240
|
+
stave2.draw();
|
|
241
|
+
ok(true, 'all pass');
|
|
242
|
+
}
|
|
243
|
+
function endKeyWithClef(options, contextBuilder) {
|
|
244
|
+
const ctx = contextBuilder(options.elementId, 400, 200);
|
|
245
|
+
ctx.scale(0.9, 0.9);
|
|
246
|
+
const stave1 = new Stave(10, 10, 350);
|
|
247
|
+
stave1
|
|
248
|
+
.setKeySignature('G')
|
|
249
|
+
.setBegBarType(BarlineType.REPEAT_BEGIN)
|
|
250
|
+
.setEndBarType(BarlineType.REPEAT_END)
|
|
251
|
+
.setClef('treble')
|
|
252
|
+
.addTimeSignature('4/4')
|
|
253
|
+
.setEndClef('bass')
|
|
254
|
+
.setEndKeySignature('Cb');
|
|
255
|
+
const stave2 = new Stave(10, 90, 350);
|
|
256
|
+
stave2.setKeySignature('Cb').setClef('bass').setEndClef('treble').setEndKeySignature('G');
|
|
257
|
+
stave1.setContext(ctx).draw();
|
|
258
|
+
stave2.setContext(ctx).draw();
|
|
259
|
+
ok(true, 'all pass');
|
|
260
|
+
}
|
|
261
|
+
function staveHelper(options, contextBuilder) {
|
|
262
|
+
const w = fontWidths();
|
|
263
|
+
const accidentalCount = 28;
|
|
264
|
+
const casePadding = 10;
|
|
265
|
+
const testCases = 7;
|
|
266
|
+
const sharpTestWidth = accidentalCount * w.sharpWidth + casePadding * testCases + Stave.defaultPadding;
|
|
267
|
+
const flatTestWidth = accidentalCount * w.flatWidth + casePadding * testCases + Stave.defaultPadding;
|
|
268
|
+
const ctx = contextBuilder(options.elementId, Math.max(sharpTestWidth, flatTestWidth) + 100, 240);
|
|
269
|
+
const stave1 = new Stave(10, 10, flatTestWidth);
|
|
270
|
+
const stave2 = new Stave(10, 90, sharpTestWidth);
|
|
271
|
+
const keys = MAJOR_KEYS;
|
|
272
|
+
for (let i = 0; i < 8; ++i) {
|
|
273
|
+
stave1.addKeySignature(keys[i]);
|
|
274
|
+
}
|
|
275
|
+
for (let n = 8; n < keys.length; ++n) {
|
|
276
|
+
stave2.addKeySignature(keys[n]);
|
|
277
|
+
}
|
|
278
|
+
stave1.setContext(ctx);
|
|
279
|
+
stave1.draw();
|
|
280
|
+
stave2.setContext(ctx);
|
|
281
|
+
stave2.draw();
|
|
282
|
+
ok(true, 'all pass');
|
|
283
|
+
}
|
|
284
|
+
function changeKey(options) {
|
|
285
|
+
const f = VexFlowTests.makeFactory(options, 900);
|
|
286
|
+
const stave = f.Stave({ x: 10, y: 10, width: 800 }).addClef('treble').addTimeSignature('C|');
|
|
287
|
+
const voice = f
|
|
288
|
+
.Voice()
|
|
289
|
+
.setStrict(false)
|
|
290
|
+
.addTickables([
|
|
291
|
+
f.KeySigNote({ key: 'Bb' }),
|
|
292
|
+
f.StaveNote({ keys: ['c/4'], duration: '1' }),
|
|
293
|
+
f.BarNote(),
|
|
294
|
+
f.KeySigNote({ key: 'D', cancelKey: 'Bb' }),
|
|
295
|
+
f.StaveNote({ keys: ['c/4'], duration: '1' }),
|
|
296
|
+
f.BarNote(),
|
|
297
|
+
f.KeySigNote({ key: 'Bb' }),
|
|
298
|
+
f.StaveNote({ keys: ['c/4'], duration: '1' }),
|
|
299
|
+
f.BarNote(),
|
|
300
|
+
f.KeySigNote({ key: 'D', alterKey: ['b', 'n'] }),
|
|
301
|
+
f.StaveNote({ keys: ['c/4'], duration: '1' }),
|
|
302
|
+
]);
|
|
303
|
+
f.Formatter().joinVoices([voice]).formatToStave([voice], stave);
|
|
304
|
+
f.draw();
|
|
305
|
+
ok(true, 'all pass');
|
|
306
|
+
}
|
|
307
|
+
VexFlowTests.register(KeySignatureTests);
|
|
308
|
+
export { KeySignatureTests };
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import { Fraction } from '../src/fraction.js';
|
|
2
|
+
import { Tickable } from '../src/tickable.js';
|
|
3
|
+
class MockTickable extends Tickable {
|
|
4
|
+
constructor() {
|
|
5
|
+
super(...arguments);
|
|
6
|
+
this.ticks = new Fraction(1, 1);
|
|
7
|
+
this.width = 0;
|
|
8
|
+
this.ignore_ticks = false;
|
|
9
|
+
}
|
|
10
|
+
init() {
|
|
11
|
+
}
|
|
12
|
+
getX() {
|
|
13
|
+
return this.tickContext.getX();
|
|
14
|
+
}
|
|
15
|
+
getIntrinsicTicks() {
|
|
16
|
+
return this.ticks.value();
|
|
17
|
+
}
|
|
18
|
+
getTicks() {
|
|
19
|
+
return this.ticks;
|
|
20
|
+
}
|
|
21
|
+
setTicks(t) {
|
|
22
|
+
this.ticks = new Fraction(t, 1);
|
|
23
|
+
return this;
|
|
24
|
+
}
|
|
25
|
+
getMetrics() {
|
|
26
|
+
return {
|
|
27
|
+
width: 0,
|
|
28
|
+
glyphWidth: 0,
|
|
29
|
+
notePx: this.width,
|
|
30
|
+
modLeftPx: 0,
|
|
31
|
+
modRightPx: 0,
|
|
32
|
+
leftDisplacedHeadPx: 0,
|
|
33
|
+
rightDisplacedHeadPx: 0,
|
|
34
|
+
glyphPx: 0,
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
getWidth() {
|
|
38
|
+
return this.width;
|
|
39
|
+
}
|
|
40
|
+
setWidth(w) {
|
|
41
|
+
this.width = w;
|
|
42
|
+
return this;
|
|
43
|
+
}
|
|
44
|
+
setVoice(v) {
|
|
45
|
+
this.voice = v;
|
|
46
|
+
return this;
|
|
47
|
+
}
|
|
48
|
+
setStave(stave) {
|
|
49
|
+
this.stave = stave;
|
|
50
|
+
return this;
|
|
51
|
+
}
|
|
52
|
+
getStave() {
|
|
53
|
+
return this.stave;
|
|
54
|
+
}
|
|
55
|
+
setTickContext(tc) {
|
|
56
|
+
this.tickContext = tc;
|
|
57
|
+
return this;
|
|
58
|
+
}
|
|
59
|
+
setIgnoreTicks(flag) {
|
|
60
|
+
this.ignore_ticks = flag;
|
|
61
|
+
return this;
|
|
62
|
+
}
|
|
63
|
+
shouldIgnoreTicks() {
|
|
64
|
+
return this.ignore_ticks;
|
|
65
|
+
}
|
|
66
|
+
preFormat() {
|
|
67
|
+
}
|
|
68
|
+
draw(...args) {
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
export { MockTickable };
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { VexFlowTests } from './vexflow_test_helpers.js';
|
|
2
|
+
import { Modifier, ModifierContext } from '../src/index.js';
|
|
3
|
+
const ModifierContextTests = {
|
|
4
|
+
Start() {
|
|
5
|
+
QUnit.module('ModifierContext');
|
|
6
|
+
test('Modifier Width Test', width);
|
|
7
|
+
test('Modifier Management', management);
|
|
8
|
+
},
|
|
9
|
+
};
|
|
10
|
+
function width() {
|
|
11
|
+
const mc = new ModifierContext();
|
|
12
|
+
equal(mc.getWidth(), 0, 'New modifier context has no width');
|
|
13
|
+
}
|
|
14
|
+
function management() {
|
|
15
|
+
const mc = new ModifierContext();
|
|
16
|
+
const modifier1 = new Modifier();
|
|
17
|
+
const modifier2 = new Modifier();
|
|
18
|
+
mc.addMember(modifier1);
|
|
19
|
+
mc.addMember(modifier2);
|
|
20
|
+
const modifiers = mc.getMembers(Modifier.CATEGORY);
|
|
21
|
+
equal(modifiers.length, 2, 'Added two modifiers');
|
|
22
|
+
}
|
|
23
|
+
VexFlowTests.register(ModifierContextTests);
|
|
24
|
+
export { ModifierContextTests };
|
|
@@ -0,0 +1,141 @@
|
|
|
1
|
+
import { VexFlowTests } from './vexflow_test_helpers.js';
|
|
2
|
+
import { Flow } from '../src/flow.js';
|
|
3
|
+
import { Font } from '../src/font.js';
|
|
4
|
+
const MultiMeasureRestTests = {
|
|
5
|
+
Start() {
|
|
6
|
+
QUnit.module('MultiMeasureRest');
|
|
7
|
+
const run = VexFlowTests.runTests;
|
|
8
|
+
run('Simple Test', simple);
|
|
9
|
+
run('Stave with modifiers Test', staveWithModifiers);
|
|
10
|
+
},
|
|
11
|
+
};
|
|
12
|
+
function simple(options) {
|
|
13
|
+
const width = 910;
|
|
14
|
+
const f = VexFlowTests.makeFactory(options, width, 300);
|
|
15
|
+
const line_spacing_15px = { options: { spacing_between_lines_px: 15 } };
|
|
16
|
+
const params = [
|
|
17
|
+
[{}, { number_of_measures: 2, show_number: false }],
|
|
18
|
+
[{}, { number_of_measures: 2 }],
|
|
19
|
+
[{}, { number_of_measures: 2, line_thickness: 8, serif_thickness: 3 }],
|
|
20
|
+
[{}, { number_of_measures: 1, use_symbols: true }],
|
|
21
|
+
[{}, { number_of_measures: 2, use_symbols: true }],
|
|
22
|
+
[{}, { number_of_measures: 3, use_symbols: true }],
|
|
23
|
+
[{}, { number_of_measures: 4, use_symbols: true }],
|
|
24
|
+
[{}, { number_of_measures: 5, use_symbols: true }],
|
|
25
|
+
[{}, { number_of_measures: 6, use_symbols: true }],
|
|
26
|
+
[{}, { number_of_measures: 7, use_symbols: true }],
|
|
27
|
+
[{}, { number_of_measures: 8, use_symbols: true }],
|
|
28
|
+
[{}, { number_of_measures: 9, use_symbols: true }],
|
|
29
|
+
[{}, { number_of_measures: 10, use_symbols: true }],
|
|
30
|
+
[{}, { number_of_measures: 11, use_symbols: true }],
|
|
31
|
+
[{}, { number_of_measures: 11, use_symbols: false, padding_left: 20, padding_right: 20 }],
|
|
32
|
+
[{}, { number_of_measures: 11, use_symbols: true, symbol_spacing: 5 }],
|
|
33
|
+
[{}, { number_of_measures: 11, use_symbols: false, line: 3, number_line: 2 }],
|
|
34
|
+
[{}, { number_of_measures: 11, use_symbols: true, line: 3, number_line: 2 }],
|
|
35
|
+
[line_spacing_15px, { number_of_measures: 12 }],
|
|
36
|
+
[line_spacing_15px, { number_of_measures: 9, use_symbols: true }],
|
|
37
|
+
[line_spacing_15px, { number_of_measures: 12, spacing_between_lines_px: 15, number_glyph_point: 40 * 1.5 }],
|
|
38
|
+
[
|
|
39
|
+
line_spacing_15px,
|
|
40
|
+
{
|
|
41
|
+
number_of_measures: 9,
|
|
42
|
+
spacing_between_lines_px: 15,
|
|
43
|
+
use_symbols: true,
|
|
44
|
+
number_glyph_point: 40 * 1.5,
|
|
45
|
+
},
|
|
46
|
+
],
|
|
47
|
+
[
|
|
48
|
+
line_spacing_15px,
|
|
49
|
+
{
|
|
50
|
+
number_of_measures: 9,
|
|
51
|
+
spacing_between_lines_px: 15,
|
|
52
|
+
use_symbols: true,
|
|
53
|
+
number_glyph_point: 40 * 1.5,
|
|
54
|
+
semibreve_rest_glyph_scale: Flow.NOTATION_FONT_SCALE * 1.5,
|
|
55
|
+
},
|
|
56
|
+
],
|
|
57
|
+
];
|
|
58
|
+
const staveWidth = 100;
|
|
59
|
+
let x = 0;
|
|
60
|
+
let y = 0;
|
|
61
|
+
const mmRests = params.map((param) => {
|
|
62
|
+
if (x + staveWidth * 2 > width) {
|
|
63
|
+
x = 0;
|
|
64
|
+
y += 80;
|
|
65
|
+
}
|
|
66
|
+
const staveParams = param[0];
|
|
67
|
+
const mmRestParams = param[1];
|
|
68
|
+
staveParams.x = x;
|
|
69
|
+
staveParams.y = y;
|
|
70
|
+
staveParams.width = staveWidth;
|
|
71
|
+
x += staveWidth;
|
|
72
|
+
const stave = f.Stave(staveParams);
|
|
73
|
+
return f.MultiMeasureRest(mmRestParams).setStave(stave);
|
|
74
|
+
});
|
|
75
|
+
f.draw();
|
|
76
|
+
const xs = mmRests[0].getXs();
|
|
77
|
+
const strY = mmRests[0].getStave().getYForLine(-0.5);
|
|
78
|
+
const str = 'TACET';
|
|
79
|
+
const context = f.getContext();
|
|
80
|
+
context.save();
|
|
81
|
+
context.setFont(Font.SERIF, 16, 'bold');
|
|
82
|
+
const metrics = context.measureText(str);
|
|
83
|
+
context.fillText(str, xs.left + (xs.right - xs.left) * 0.5 - metrics.width * 0.5, strY);
|
|
84
|
+
context.restore();
|
|
85
|
+
ok(true, 'Simple Test');
|
|
86
|
+
}
|
|
87
|
+
function staveWithModifiers(options) {
|
|
88
|
+
const width = 910;
|
|
89
|
+
const f = VexFlowTests.makeFactory(options, width, 200);
|
|
90
|
+
let x = 0;
|
|
91
|
+
let y = 0;
|
|
92
|
+
const params = [
|
|
93
|
+
[{ clef: 'treble', params: { width: 150 } }, { number_of_measures: 5 }],
|
|
94
|
+
[{ clef: 'treble', keySig: 'G', params: { width: 150 } }, { number_of_measures: 5 }],
|
|
95
|
+
[{ clef: 'treble', timeSig: '4/4', keySig: 'G', params: { width: 150 } }, { number_of_measures: 5 }],
|
|
96
|
+
[{ clef: 'treble', endClef: 'bass', params: { width: 150 } }, { number_of_measures: 5 }],
|
|
97
|
+
[{ clef: 'treble', endKeySig: 'F', params: { width: 150 } }, { number_of_measures: 5 }],
|
|
98
|
+
[{ clef: 'treble', endTimeSig: '2/4', params: { width: 150 } }, { number_of_measures: 5 }],
|
|
99
|
+
[{ clef: 'treble', endClef: 'bass', endTimeSig: '2/4', params: { width: 150 } }, { number_of_measures: 5 }],
|
|
100
|
+
[
|
|
101
|
+
{ clef: 'treble', endClef: 'bass', endTimeSig: '2/4', params: { width: 150 } },
|
|
102
|
+
{ number_of_measures: 5, use_symbols: true },
|
|
103
|
+
],
|
|
104
|
+
];
|
|
105
|
+
params.forEach((param) => {
|
|
106
|
+
const staveOptions = param[0];
|
|
107
|
+
const staveParams = staveOptions.params;
|
|
108
|
+
const mmrestParams = param[1];
|
|
109
|
+
if (x + staveParams.width > width) {
|
|
110
|
+
x = 0;
|
|
111
|
+
y += 80;
|
|
112
|
+
}
|
|
113
|
+
staveParams.x = x;
|
|
114
|
+
x += staveParams.width;
|
|
115
|
+
staveParams.y = y;
|
|
116
|
+
const stave = f.Stave(staveParams);
|
|
117
|
+
if (staveOptions.clef) {
|
|
118
|
+
stave.addClef(staveOptions.clef);
|
|
119
|
+
}
|
|
120
|
+
if (staveOptions.timeSig) {
|
|
121
|
+
stave.addTimeSignature(staveOptions.timeSig);
|
|
122
|
+
}
|
|
123
|
+
if (staveOptions.keySig) {
|
|
124
|
+
stave.addKeySignature(staveOptions.keySig);
|
|
125
|
+
}
|
|
126
|
+
if (staveOptions.endClef) {
|
|
127
|
+
stave.addEndClef(staveOptions.endClef);
|
|
128
|
+
}
|
|
129
|
+
if (staveOptions.endKeySig) {
|
|
130
|
+
stave.setEndKeySignature(staveOptions.endKeySig);
|
|
131
|
+
}
|
|
132
|
+
if (staveOptions.endTimeSig) {
|
|
133
|
+
stave.setEndTimeSignature(staveOptions.endTimeSig);
|
|
134
|
+
}
|
|
135
|
+
return f.MultiMeasureRest(mmrestParams).setStave(stave);
|
|
136
|
+
});
|
|
137
|
+
f.draw();
|
|
138
|
+
ok(true, 'Stave with modifiers Test');
|
|
139
|
+
}
|
|
140
|
+
VexFlowTests.register(MultiMeasureRestTests);
|
|
141
|
+
export { MultiMeasureRestTests };
|