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,320 @@
|
|
|
1
|
+
import { VexFlowTests } from './vexflow_test_helpers.js';
|
|
2
|
+
import { Accidental } from '../src/accidental.js';
|
|
3
|
+
import { ChordSymbol } from '../src/chordsymbol.js';
|
|
4
|
+
import { Formatter } from '../src/formatter.js';
|
|
5
|
+
import { Stave } from '../src/stave.js';
|
|
6
|
+
import { StaveNote } from '../src/stavenote.js';
|
|
7
|
+
const ChordSymbolTests = {
|
|
8
|
+
Start() {
|
|
9
|
+
QUnit.module('ChordSymbol');
|
|
10
|
+
const run = VexFlowTests.runTests;
|
|
11
|
+
run('Chord Symbol Font Size Tests', fontSize);
|
|
12
|
+
run('Chord Symbol Kerning Tests', kern);
|
|
13
|
+
run('Top Chord Symbols', top);
|
|
14
|
+
run('Top Chord Symbols Justified', topJustify);
|
|
15
|
+
run('Bottom Chord Symbols', bottom);
|
|
16
|
+
run('Bottom Stem Down Chord Symbols', bottomStemDown);
|
|
17
|
+
run('Double Bottom Chord Symbols', doubleBottom);
|
|
18
|
+
},
|
|
19
|
+
};
|
|
20
|
+
const superscript = { symbolModifier: ChordSymbol.symbolModifiers.SUPERSCRIPT };
|
|
21
|
+
const subscript = { symbolModifier: ChordSymbol.symbolModifiers.SUBSCRIPT };
|
|
22
|
+
const note = (factory, keys, duration, chordSymbol) => factory.StaveNote({ keys, duration }).addModifier(chordSymbol, 0);
|
|
23
|
+
function fontSize(options) {
|
|
24
|
+
const f = VexFlowTests.makeFactory(options, 750, 580);
|
|
25
|
+
const ctx = f.getContext();
|
|
26
|
+
ctx.scale(1.5, 1.5);
|
|
27
|
+
ctx.fillStyle = '#221';
|
|
28
|
+
ctx.strokeStyle = '#221';
|
|
29
|
+
function draw(chords, y) {
|
|
30
|
+
const stave = f.Stave({ x: 10, y, width: 450 }).addClef('treble');
|
|
31
|
+
const notes = [
|
|
32
|
+
note(f, ['c/4'], 'q', chords[0]),
|
|
33
|
+
note(f, ['c/4'], 'q', chords[1]),
|
|
34
|
+
note(f, ['c/4'], 'q', chords[2]),
|
|
35
|
+
note(f, ['c/4'], 'q', chords[3]),
|
|
36
|
+
];
|
|
37
|
+
const score = f.EasyScore();
|
|
38
|
+
const voice = score.voice(notes, { time: '4/4' });
|
|
39
|
+
f.Formatter().joinVoices([voice]).formatToStave([voice], stave);
|
|
40
|
+
f.draw();
|
|
41
|
+
}
|
|
42
|
+
let chords = [];
|
|
43
|
+
chords.push(f
|
|
44
|
+
.ChordSymbol({ fontSize: 10 })
|
|
45
|
+
.addText('F7')
|
|
46
|
+
.addGlyph('leftParenTall')
|
|
47
|
+
.addGlyphOrText('b9', superscript)
|
|
48
|
+
.addGlyphOrText('#11', subscript)
|
|
49
|
+
.addGlyph('rightParenTall')
|
|
50
|
+
.setReportWidth(false));
|
|
51
|
+
chords.push(f
|
|
52
|
+
.ChordSymbol({ fontSize: 12 })
|
|
53
|
+
.addText('F7')
|
|
54
|
+
.addGlyphOrText('b9', superscript)
|
|
55
|
+
.addGlyphOrText('#11', subscript)
|
|
56
|
+
.setReportWidth(false));
|
|
57
|
+
chords.push(f
|
|
58
|
+
.ChordSymbol({ fontSize: 14 })
|
|
59
|
+
.addText('F7')
|
|
60
|
+
.addGlyph('leftParenTall')
|
|
61
|
+
.addGlyphOrText('add 3', superscript)
|
|
62
|
+
.addGlyphOrText('omit 9', subscript)
|
|
63
|
+
.addGlyph('rightParenTall')
|
|
64
|
+
.setReportWidth(false));
|
|
65
|
+
chords.push(f
|
|
66
|
+
.ChordSymbol({ fontSize: 16 })
|
|
67
|
+
.addText('F7')
|
|
68
|
+
.addGlyph('leftParenTall')
|
|
69
|
+
.addGlyphOrText('b9', superscript)
|
|
70
|
+
.addGlyphOrText('#11', subscript)
|
|
71
|
+
.addGlyph('rightParenTall')
|
|
72
|
+
.setReportWidth(false));
|
|
73
|
+
draw(chords, 40);
|
|
74
|
+
chords = [];
|
|
75
|
+
chords.push(f
|
|
76
|
+
.ChordSymbol({ fontSize: 10 })
|
|
77
|
+
.setFontSize(10)
|
|
78
|
+
.addText('F7')
|
|
79
|
+
.addGlyphOrText('#11', superscript)
|
|
80
|
+
.addGlyphOrText('b9', subscript));
|
|
81
|
+
chords.push(f.ChordSymbol({ fontSize: 12 }).addText('F7').addGlyphOrText('#11', superscript).addGlyphOrText('b9', subscript));
|
|
82
|
+
chords.push(f.ChordSymbol({ fontSize: 14 }).addText('F7').addGlyphOrText('#11', superscript).addGlyphOrText('b9', subscript));
|
|
83
|
+
chords.push(f
|
|
84
|
+
.ChordSymbol({ fontSize: 16 })
|
|
85
|
+
.setFontSize(16)
|
|
86
|
+
.addText('F7')
|
|
87
|
+
.addGlyphOrText('#11', superscript)
|
|
88
|
+
.addGlyphOrText('b9', subscript));
|
|
89
|
+
draw(chords, 140);
|
|
90
|
+
chords = [
|
|
91
|
+
f.ChordSymbol({ fontSize: 10 }).addGlyphOrText('Ab').addGlyphOrText('7(#11b9)', superscript),
|
|
92
|
+
f.ChordSymbol({ fontSize: 14 }).addGlyphOrText('C#').addGlyphOrText('7(#11b9)', superscript),
|
|
93
|
+
f.ChordSymbol({ fontSize: 16 }).addGlyphOrText('Ab').addGlyphOrText('7(#11b9)', superscript),
|
|
94
|
+
f.ChordSymbol({ fontSize: 18 }).addGlyphOrText('C#').addGlyphOrText('7(#11b9)', superscript),
|
|
95
|
+
];
|
|
96
|
+
draw(chords, 240);
|
|
97
|
+
ok(true, 'Font Size Chord Symbol');
|
|
98
|
+
}
|
|
99
|
+
function kern(options) {
|
|
100
|
+
const f = VexFlowTests.makeFactory(options, 650, 650);
|
|
101
|
+
const ctx = f.getContext();
|
|
102
|
+
ctx.scale(1.5, 1.5);
|
|
103
|
+
ctx.fillStyle = '#221';
|
|
104
|
+
ctx.strokeStyle = '#221';
|
|
105
|
+
function draw(chords, y) {
|
|
106
|
+
const stave = f.Stave({ x: 10, y, width: 450 }).addClef('treble').setContext(ctx).draw();
|
|
107
|
+
const notes = [
|
|
108
|
+
note(f, ['C/4'], 'q', chords[0]),
|
|
109
|
+
note(f, ['C/4'], 'q', chords[1]),
|
|
110
|
+
note(f, ['C/4'], 'q', chords[2]),
|
|
111
|
+
note(f, ['C/4'], 'q', chords[3]),
|
|
112
|
+
];
|
|
113
|
+
const score = f.EasyScore();
|
|
114
|
+
const voice = score.voice(notes, { time: '4/4' });
|
|
115
|
+
f.Formatter().joinVoices([voice]).formatToStave([voice], stave);
|
|
116
|
+
f.draw();
|
|
117
|
+
}
|
|
118
|
+
let chords = [
|
|
119
|
+
f.ChordSymbol().addText('A').addGlyphSuperscript('dim').setReportWidth(false),
|
|
120
|
+
f.ChordSymbol({ kerning: false, reportWidth: false }).addText('A').addGlyphSuperscript('dim'),
|
|
121
|
+
f.ChordSymbol({ hJustify: 'left', reportWidth: false }).addText('C').addGlyph('halfDiminished', superscript),
|
|
122
|
+
f.ChordSymbol({ reportWidth: false }).addText('D').addGlyph('halfDiminished', superscript),
|
|
123
|
+
];
|
|
124
|
+
draw(chords, 10);
|
|
125
|
+
chords = [
|
|
126
|
+
f.ChordSymbol().addText('A').addGlyphSuperscript('dim'),
|
|
127
|
+
f.ChordSymbol({ kerning: false }).addText('A').addGlyphSuperscript('dim'),
|
|
128
|
+
f.ChordSymbol().addText('A').addGlyphSuperscript('+').addTextSuperscript('5'),
|
|
129
|
+
f.ChordSymbol().addText('G').addGlyphSuperscript('+').addTextSuperscript('5'),
|
|
130
|
+
];
|
|
131
|
+
draw(chords, 110);
|
|
132
|
+
chords = [
|
|
133
|
+
f.ChordSymbol().addText('A').addGlyph('-'),
|
|
134
|
+
f.ChordSymbol().addText('E').addGlyph('-'),
|
|
135
|
+
f.ChordSymbol().addText('A').addGlyphOrText('(#11)', superscript),
|
|
136
|
+
f.ChordSymbol().addText('E').addGlyphOrText('(#9)', superscript),
|
|
137
|
+
];
|
|
138
|
+
draw(chords, 210);
|
|
139
|
+
chords = [
|
|
140
|
+
f.ChordSymbol().addGlyphOrText('F/B').addGlyphOrText('b', superscript),
|
|
141
|
+
f.ChordSymbol().addText('E').addGlyphOrText('V/V'),
|
|
142
|
+
f.ChordSymbol().addText('A').addGlyphOrText('(#11)', superscript),
|
|
143
|
+
f.ChordSymbol().addText('E').addGlyphOrText('(#9)', superscript),
|
|
144
|
+
];
|
|
145
|
+
draw(chords, 310);
|
|
146
|
+
ok(true, 'Chord Symbol Kerning Tests');
|
|
147
|
+
}
|
|
148
|
+
function top(options) {
|
|
149
|
+
const f = VexFlowTests.makeFactory(options, 650, 650);
|
|
150
|
+
const ctx = f.getContext();
|
|
151
|
+
ctx.scale(1.5, 1.5);
|
|
152
|
+
ctx.fillStyle = '#221';
|
|
153
|
+
ctx.strokeStyle = '#221';
|
|
154
|
+
function draw(c1, c2, y) {
|
|
155
|
+
const stave = f.Stave({ x: 10, y, width: 450 }).addClef('treble').setContext(ctx).draw();
|
|
156
|
+
const notes = [
|
|
157
|
+
note(f, ['e/4', 'a/4', 'd/5'], 'h', c1).addModifier(new Accidental('b'), 0),
|
|
158
|
+
note(f, ['c/4', 'e/4', 'b/4'], 'h', c2),
|
|
159
|
+
];
|
|
160
|
+
const score = f.EasyScore();
|
|
161
|
+
const voice = score.voice(notes, { time: '4/4' });
|
|
162
|
+
f.Formatter().joinVoices([voice]).formatToStave([voice], stave);
|
|
163
|
+
f.draw();
|
|
164
|
+
}
|
|
165
|
+
let chord1 = f
|
|
166
|
+
.ChordSymbol({ reportWidth: false })
|
|
167
|
+
.addText('F7')
|
|
168
|
+
.setHorizontal('left')
|
|
169
|
+
.addGlyphOrText('(#11b9)', superscript);
|
|
170
|
+
let chord2 = f
|
|
171
|
+
.ChordSymbol({ reportWidth: false })
|
|
172
|
+
.addText('C')
|
|
173
|
+
.setHorizontal('left')
|
|
174
|
+
.addGlyphSuperscript('majorSeventh');
|
|
175
|
+
draw(chord1, chord2, 40);
|
|
176
|
+
chord1 = f
|
|
177
|
+
.ChordSymbol()
|
|
178
|
+
.addText('F7')
|
|
179
|
+
.addTextSuperscript('(')
|
|
180
|
+
.addGlyphOrText('#11b9', superscript)
|
|
181
|
+
.addTextSuperscript(')');
|
|
182
|
+
chord2 = f.ChordSymbol().addText('C').setHorizontal('left').addTextSuperscript('Maj.');
|
|
183
|
+
draw(chord1, chord2, 140);
|
|
184
|
+
chord1 = f
|
|
185
|
+
.ChordSymbol()
|
|
186
|
+
.addText('F7')
|
|
187
|
+
.setHorizontal('left')
|
|
188
|
+
.addGlyphOrText('#11', superscript)
|
|
189
|
+
.addGlyphOrText('b9', subscript);
|
|
190
|
+
chord2 = f.ChordSymbol().addText('C').addTextSuperscript('sus4');
|
|
191
|
+
draw(chord1, chord2, 240);
|
|
192
|
+
ok(true, 'Top Chord Symbol');
|
|
193
|
+
}
|
|
194
|
+
function topJustify(options) {
|
|
195
|
+
const f = VexFlowTests.makeFactory(options, 500, 680);
|
|
196
|
+
const ctx = f.getContext();
|
|
197
|
+
ctx.scale(1.5, 1.5);
|
|
198
|
+
ctx.fillStyle = '#221';
|
|
199
|
+
ctx.strokeStyle = '#221';
|
|
200
|
+
function draw(chord1, chord2, y) {
|
|
201
|
+
const stave = new Stave(10, y, 450).addClef('treble').setContext(ctx).draw();
|
|
202
|
+
const notes = [
|
|
203
|
+
note(f, ['e/4', 'a/4', 'd/5'], 'h', chord1).addModifier(new Accidental('b'), 0),
|
|
204
|
+
note(f, ['c/4', 'e/4', 'B/4'], 'h', chord2),
|
|
205
|
+
];
|
|
206
|
+
Formatter.FormatAndDraw(ctx, stave, notes);
|
|
207
|
+
}
|
|
208
|
+
let chord1 = f.ChordSymbol().addText('F7').setHorizontal('left').addGlyphOrText('(#11b9)', superscript);
|
|
209
|
+
let chord2 = f.ChordSymbol({ hJustify: 'left' }).addText('C').addGlyphSuperscript('majorSeventh');
|
|
210
|
+
draw(chord1, chord2, 40);
|
|
211
|
+
chord1 = f
|
|
212
|
+
.ChordSymbol({ hJustify: 'center' })
|
|
213
|
+
.addText('F7')
|
|
214
|
+
.setHorizontal('left')
|
|
215
|
+
.addGlyphOrText('(#11b9)', superscript);
|
|
216
|
+
chord2 = f.ChordSymbol({ hJustify: 'center' }).addText('C').addTextSuperscript('Maj.');
|
|
217
|
+
draw(chord1, chord2, 140);
|
|
218
|
+
chord1 = f
|
|
219
|
+
.ChordSymbol({ hJustify: 'right' })
|
|
220
|
+
.addText('F7')
|
|
221
|
+
.setHorizontal('left')
|
|
222
|
+
.addGlyphOrText('#11', superscript)
|
|
223
|
+
.addGlyphOrText('b9', subscript);
|
|
224
|
+
chord2 = f.ChordSymbol({ hJustify: 'right' }).addText('C').addTextSuperscript('Maj.');
|
|
225
|
+
draw(chord1, chord2, 240);
|
|
226
|
+
chord1 = f
|
|
227
|
+
.ChordSymbol({ hJustify: 'left' })
|
|
228
|
+
.addText('F7')
|
|
229
|
+
.setHorizontal('left')
|
|
230
|
+
.addGlyphOrText('#11', superscript)
|
|
231
|
+
.addGlyphOrText('b9', subscript);
|
|
232
|
+
chord2 = f.ChordSymbol({ hJustify: 'centerStem' }).addText('C').addTextSuperscript('Maj.');
|
|
233
|
+
draw(chord1, chord2, 340);
|
|
234
|
+
ok(true, 'Top Chord Justified');
|
|
235
|
+
}
|
|
236
|
+
function bottom(options) {
|
|
237
|
+
const f = VexFlowTests.makeFactory(options, 600, 230);
|
|
238
|
+
const ctx = f.getContext();
|
|
239
|
+
ctx.scale(1.5, 1.5);
|
|
240
|
+
ctx.fillStyle = '#221';
|
|
241
|
+
ctx.strokeStyle = '#221';
|
|
242
|
+
function draw(chords, y) {
|
|
243
|
+
const stave = new Stave(10, y, 400).addClef('treble').setContext(ctx).draw();
|
|
244
|
+
const notes = [
|
|
245
|
+
note(f, ['c/4', 'f/4', 'a/4'], 'q', chords[0]),
|
|
246
|
+
note(f, ['c/4', 'e/4', 'b/4'], 'q', chords[1]).addModifier(new Accidental('b'), 2),
|
|
247
|
+
note(f, ['c/4', 'e/4', 'g/4'], 'q', chords[2]),
|
|
248
|
+
note(f, ['c/4', 'f/4', 'a/4'], 'q', chords[3]).addModifier(new Accidental('#'), 1),
|
|
249
|
+
];
|
|
250
|
+
Formatter.FormatAndDraw(ctx, stave, notes);
|
|
251
|
+
}
|
|
252
|
+
const chords = [
|
|
253
|
+
f.ChordSymbol({ vJustify: 'bottom' }).addText('I').addTextSuperscript('6').addTextSubscript('4'),
|
|
254
|
+
f.ChordSymbol({ vJustify: 'bottom' }).addGlyphOrText('V'),
|
|
255
|
+
f.ChordSymbol({ vJustify: 'bottom' }).addLine(12),
|
|
256
|
+
f.ChordSymbol({ vJustify: 'bottom' }).addGlyphOrText('V/V'),
|
|
257
|
+
];
|
|
258
|
+
draw(chords, 10);
|
|
259
|
+
ok(true, 'Bottom Chord Symbol');
|
|
260
|
+
}
|
|
261
|
+
function bottomStemDown(options) {
|
|
262
|
+
const f = VexFlowTests.makeFactory(options, 600, 330);
|
|
263
|
+
const ctx = f.getContext();
|
|
264
|
+
ctx.scale(1.5, 1.5);
|
|
265
|
+
ctx.fillStyle = '#221';
|
|
266
|
+
ctx.strokeStyle = '#221';
|
|
267
|
+
function draw(chords, y) {
|
|
268
|
+
const note = (keys, duration, chordSymbol) => new StaveNote({ keys, duration, stem_direction: -1 }).addModifier(chordSymbol, 0);
|
|
269
|
+
const stave = new Stave(10, y, 400).addClef('treble').setContext(ctx).draw();
|
|
270
|
+
const notes = [
|
|
271
|
+
note(['c/4', 'f/4', 'a/4'], 'q', chords[0]),
|
|
272
|
+
note(['c/4', 'e/4', 'b/4'], 'q', chords[1]).addModifier(new Accidental('b'), 2),
|
|
273
|
+
note(['c/4', 'e/4', 'g/4'], 'q', chords[2]),
|
|
274
|
+
note(['c/4', 'f/4', 'a/4'], 'q', chords[3]).addModifier(new Accidental('#'), 1),
|
|
275
|
+
];
|
|
276
|
+
Formatter.FormatAndDraw(ctx, stave, notes);
|
|
277
|
+
}
|
|
278
|
+
const chords = [
|
|
279
|
+
f.ChordSymbol({ vJustify: 'bottom' }).addGlyphOrText('F'),
|
|
280
|
+
f.ChordSymbol({ vJustify: 'bottom' }).addGlyphOrText('C7'),
|
|
281
|
+
f.ChordSymbol({ vJustify: 'bottom' }).addLine(12),
|
|
282
|
+
f.ChordSymbol({ vJustify: 'bottom' }).addText('A').addGlyphSuperscript('dim'),
|
|
283
|
+
];
|
|
284
|
+
draw(chords, 10);
|
|
285
|
+
ok(true, 'Bottom Stem Down Chord Symbol');
|
|
286
|
+
}
|
|
287
|
+
function doubleBottom(options) {
|
|
288
|
+
const f = VexFlowTests.makeFactory(options, 600, 260);
|
|
289
|
+
const ctx = f.getContext();
|
|
290
|
+
ctx.scale(1.5, 1.5);
|
|
291
|
+
ctx.fillStyle = '#221';
|
|
292
|
+
ctx.strokeStyle = '#221';
|
|
293
|
+
function draw(chords, chords2, y) {
|
|
294
|
+
const note = (keys, duration, chordSymbol1, chordSymbol2) => new StaveNote({ keys, duration }).addModifier(chordSymbol1, 0).addModifier(chordSymbol2, 0);
|
|
295
|
+
const stave = new Stave(10, y, 450).addClef('treble').setContext(ctx).draw();
|
|
296
|
+
const notes = [
|
|
297
|
+
note(['c/4', 'f/4', 'a/4'], 'q', chords[0], chords2[0]),
|
|
298
|
+
note(['c/4', 'e/4', 'b/4'], 'q', chords[1], chords2[1]).addModifier(new Accidental('b'), 2),
|
|
299
|
+
note(['c/4', 'e/4', 'g/4'], 'q', chords[2], chords2[2]),
|
|
300
|
+
note(['c/4', 'f/4', 'a/4'], 'q', chords[3], chords2[3]).addModifier(new Accidental('#'), 1),
|
|
301
|
+
];
|
|
302
|
+
Formatter.FormatAndDraw(ctx, stave, notes);
|
|
303
|
+
}
|
|
304
|
+
const chords1 = [
|
|
305
|
+
f.ChordSymbol({ vJustify: 'bottom' }).addText('I').addTextSuperscript('6').addTextSubscript('4'),
|
|
306
|
+
f.ChordSymbol({ vJustify: 'bottom' }).addGlyphOrText('V'),
|
|
307
|
+
f.ChordSymbol({ vJustify: 'bottom' }).addLine(12),
|
|
308
|
+
f.ChordSymbol({ vJustify: 'bottom' }).addGlyphOrText('V/V'),
|
|
309
|
+
];
|
|
310
|
+
const chords2 = [
|
|
311
|
+
f.ChordSymbol({ vJustify: 'bottom' }).addText('T'),
|
|
312
|
+
f.ChordSymbol({ vJustify: 'bottom' }).addText('D'),
|
|
313
|
+
f.ChordSymbol({ vJustify: 'bottom' }).addText('D'),
|
|
314
|
+
f.ChordSymbol({ vJustify: 'bottom' }).addText('SD'),
|
|
315
|
+
];
|
|
316
|
+
draw(chords1, chords2, 10);
|
|
317
|
+
ok(true, '2 Bottom Chord Symbol');
|
|
318
|
+
}
|
|
319
|
+
VexFlowTests.register(ChordSymbolTests);
|
|
320
|
+
export { ChordSymbolTests };
|
|
@@ -0,0 +1,131 @@
|
|
|
1
|
+
import { VexFlowTests } from './vexflow_test_helpers.js';
|
|
2
|
+
const ClefTests = {
|
|
3
|
+
Start() {
|
|
4
|
+
QUnit.module('Clef');
|
|
5
|
+
const run = VexFlowTests.runTests;
|
|
6
|
+
run('Clef Test', draw);
|
|
7
|
+
run('Clef End Test', drawEnd);
|
|
8
|
+
run('Small Clef Test', drawSmall);
|
|
9
|
+
run('Small Clef End Test', drawSmallEnd);
|
|
10
|
+
run('Clef Change Test', drawClefChange);
|
|
11
|
+
},
|
|
12
|
+
};
|
|
13
|
+
function draw(options) {
|
|
14
|
+
const f = VexFlowTests.makeFactory(options, 800, 120);
|
|
15
|
+
f.Stave()
|
|
16
|
+
.addClef('treble')
|
|
17
|
+
.addClef('treble', 'default', '8va')
|
|
18
|
+
.addClef('treble', 'default', '8vb')
|
|
19
|
+
.addClef('alto')
|
|
20
|
+
.addClef('tenor')
|
|
21
|
+
.addClef('soprano')
|
|
22
|
+
.addClef('bass')
|
|
23
|
+
.addClef('bass', 'default', '8vb')
|
|
24
|
+
.addClef('mezzo-soprano')
|
|
25
|
+
.addClef('baritone-c')
|
|
26
|
+
.addClef('baritone-f')
|
|
27
|
+
.addClef('subbass')
|
|
28
|
+
.addClef('percussion')
|
|
29
|
+
.addClef('french')
|
|
30
|
+
.addEndClef('treble');
|
|
31
|
+
f.draw();
|
|
32
|
+
ok(true, 'all pass');
|
|
33
|
+
}
|
|
34
|
+
function drawEnd(options) {
|
|
35
|
+
const f = VexFlowTests.makeFactory(options, 800, 120);
|
|
36
|
+
f.Stave()
|
|
37
|
+
.addClef('bass')
|
|
38
|
+
.addEndClef('treble')
|
|
39
|
+
.addEndClef('treble', 'default', '8va')
|
|
40
|
+
.addEndClef('treble', 'default', '8vb')
|
|
41
|
+
.addEndClef('alto')
|
|
42
|
+
.addEndClef('tenor')
|
|
43
|
+
.addEndClef('soprano')
|
|
44
|
+
.addEndClef('bass')
|
|
45
|
+
.addEndClef('bass', 'default', '8vb')
|
|
46
|
+
.addEndClef('mezzo-soprano')
|
|
47
|
+
.addEndClef('baritone-c')
|
|
48
|
+
.addEndClef('baritone-f')
|
|
49
|
+
.addEndClef('subbass')
|
|
50
|
+
.addEndClef('percussion')
|
|
51
|
+
.addEndClef('french');
|
|
52
|
+
f.draw();
|
|
53
|
+
ok(true, 'all pass');
|
|
54
|
+
}
|
|
55
|
+
function drawSmall(options) {
|
|
56
|
+
const f = VexFlowTests.makeFactory(options, 800, 120);
|
|
57
|
+
f.Stave()
|
|
58
|
+
.addClef('treble', 'small')
|
|
59
|
+
.addClef('treble', 'small', '8va')
|
|
60
|
+
.addClef('treble', 'small', '8vb')
|
|
61
|
+
.addClef('alto', 'small')
|
|
62
|
+
.addClef('tenor', 'small')
|
|
63
|
+
.addClef('soprano', 'small')
|
|
64
|
+
.addClef('bass', 'small')
|
|
65
|
+
.addClef('bass', 'small', '8vb')
|
|
66
|
+
.addClef('mezzo-soprano', 'small')
|
|
67
|
+
.addClef('baritone-c', 'small')
|
|
68
|
+
.addClef('baritone-f', 'small')
|
|
69
|
+
.addClef('subbass', 'small')
|
|
70
|
+
.addClef('percussion', 'small')
|
|
71
|
+
.addClef('french', 'small')
|
|
72
|
+
.addEndClef('treble', 'small');
|
|
73
|
+
f.draw();
|
|
74
|
+
ok(true, 'all pass');
|
|
75
|
+
}
|
|
76
|
+
function drawSmallEnd(options) {
|
|
77
|
+
const f = VexFlowTests.makeFactory(options, 800, 120);
|
|
78
|
+
f.Stave()
|
|
79
|
+
.addClef('bass', 'small')
|
|
80
|
+
.addEndClef('treble', 'small')
|
|
81
|
+
.addEndClef('treble', 'small', '8va')
|
|
82
|
+
.addEndClef('treble', 'small', '8vb')
|
|
83
|
+
.addEndClef('alto', 'small')
|
|
84
|
+
.addEndClef('tenor', 'small')
|
|
85
|
+
.addEndClef('soprano', 'small')
|
|
86
|
+
.addEndClef('bass', 'small')
|
|
87
|
+
.addEndClef('bass', 'small', '8vb')
|
|
88
|
+
.addEndClef('mezzo-soprano', 'small')
|
|
89
|
+
.addEndClef('baritone-c', 'small')
|
|
90
|
+
.addEndClef('baritone-f', 'small')
|
|
91
|
+
.addEndClef('subbass', 'small')
|
|
92
|
+
.addEndClef('percussion', 'small')
|
|
93
|
+
.addEndClef('french', 'small');
|
|
94
|
+
f.draw();
|
|
95
|
+
ok(true, 'all pass');
|
|
96
|
+
}
|
|
97
|
+
function drawClefChange(options) {
|
|
98
|
+
const f = VexFlowTests.makeFactory(options, 800, 180);
|
|
99
|
+
const stave = f.Stave().addClef('treble');
|
|
100
|
+
const notes = [
|
|
101
|
+
f.StaveNote({ keys: ['c/4'], duration: '4', clef: 'treble' }),
|
|
102
|
+
f.ClefNote({ type: 'alto', options: { size: 'small' } }),
|
|
103
|
+
f.StaveNote({ keys: ['c/4'], duration: '4', clef: 'alto' }),
|
|
104
|
+
f.ClefNote({ type: 'tenor', options: { size: 'small' } }),
|
|
105
|
+
f.StaveNote({ keys: ['c/4'], duration: '4', clef: 'tenor' }),
|
|
106
|
+
f.ClefNote({ type: 'soprano', options: { size: 'small' } }),
|
|
107
|
+
f.StaveNote({ keys: ['c/4'], duration: '4', clef: 'soprano' }),
|
|
108
|
+
f.ClefNote({ type: 'bass', options: { size: 'small' } }),
|
|
109
|
+
f.StaveNote({ keys: ['c/4'], duration: '4', clef: 'bass' }),
|
|
110
|
+
f.ClefNote({ type: 'mezzo-soprano', options: { size: 'small' } }),
|
|
111
|
+
f.StaveNote({ keys: ['c/4'], duration: '4', clef: 'mezzo-soprano' }),
|
|
112
|
+
f.ClefNote({ type: 'baritone-c', options: { size: 'small' } }),
|
|
113
|
+
f.StaveNote({ keys: ['c/4'], duration: '4', clef: 'baritone-c' }),
|
|
114
|
+
f.ClefNote({ type: 'baritone-f', options: { size: 'small' } }),
|
|
115
|
+
f.StaveNote({ keys: ['c/4'], duration: '4', clef: 'baritone-f' }),
|
|
116
|
+
f.ClefNote({ type: 'subbass', options: { size: 'small' } }),
|
|
117
|
+
f.StaveNote({ keys: ['c/4'], duration: '4', clef: 'subbass' }),
|
|
118
|
+
f.ClefNote({ type: 'french', options: { size: 'small' } }),
|
|
119
|
+
f.StaveNote({ keys: ['c/4'], duration: '4', clef: 'french' }),
|
|
120
|
+
f.ClefNote({ type: 'treble', options: { size: 'small', annotation: '8vb' } }),
|
|
121
|
+
f.StaveNote({ keys: ['c/4'], duration: '4', clef: 'treble', octave_shift: -1 }),
|
|
122
|
+
f.ClefNote({ type: 'treble', options: { size: 'small', annotation: '8va' } }),
|
|
123
|
+
f.StaveNote({ keys: ['c/4'], duration: '4', clef: 'treble', octave_shift: 1 }),
|
|
124
|
+
];
|
|
125
|
+
const voice = f.Voice({ time: '12/4' }).addTickables(notes);
|
|
126
|
+
f.Formatter().joinVoices([voice]).formatToStave([voice], stave);
|
|
127
|
+
f.draw();
|
|
128
|
+
ok(true, 'all pass');
|
|
129
|
+
}
|
|
130
|
+
VexFlowTests.register(ClefTests);
|
|
131
|
+
export { ClefTests };
|
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
import { concat, VexFlowTests } from './vexflow_test_helpers.js';
|
|
2
|
+
import { CurvePosition } from '../src/curve.js';
|
|
3
|
+
const CurveTests = {
|
|
4
|
+
Start() {
|
|
5
|
+
QUnit.module('Curve');
|
|
6
|
+
const run = VexFlowTests.runTests;
|
|
7
|
+
run('Simple Curve', simple);
|
|
8
|
+
run('Rounded Curve', rounded);
|
|
9
|
+
run('Thick Thin Curves', thickThin);
|
|
10
|
+
run('Top Curve', top);
|
|
11
|
+
},
|
|
12
|
+
};
|
|
13
|
+
function createTest(noteGroup1, noteGroup2, setupCurves) {
|
|
14
|
+
return (options) => {
|
|
15
|
+
const factory = VexFlowTests.makeFactory(options, 350, 200);
|
|
16
|
+
const stave = factory.Stave({ y: 50 });
|
|
17
|
+
const score = factory.EasyScore();
|
|
18
|
+
const staveNotes = [
|
|
19
|
+
score.beam(score.notes(...noteGroup1)),
|
|
20
|
+
score.beam(score.notes(...noteGroup2)),
|
|
21
|
+
].reduce(concat);
|
|
22
|
+
setupCurves(factory, staveNotes);
|
|
23
|
+
const voices = [score.voice(staveNotes, { time: '4/4' })];
|
|
24
|
+
factory.Formatter().joinVoices(voices).formatToStave(voices, stave);
|
|
25
|
+
factory.draw();
|
|
26
|
+
ok('Simple Curve');
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
const simple = createTest(['c4/8, f5, d5, g5', { stem: 'up' }], ['d6/8, f5, d5, g5', { stem: 'down' }], (f, notes) => {
|
|
30
|
+
f.Curve({
|
|
31
|
+
from: notes[0],
|
|
32
|
+
to: notes[3],
|
|
33
|
+
options: {
|
|
34
|
+
cps: [
|
|
35
|
+
{ x: 0, y: 10 },
|
|
36
|
+
{ x: 0, y: 50 },
|
|
37
|
+
],
|
|
38
|
+
},
|
|
39
|
+
});
|
|
40
|
+
f.Curve({
|
|
41
|
+
from: notes[4],
|
|
42
|
+
to: notes[7],
|
|
43
|
+
options: {
|
|
44
|
+
cps: [
|
|
45
|
+
{ x: 0, y: 10 },
|
|
46
|
+
{ x: 0, y: 20 },
|
|
47
|
+
],
|
|
48
|
+
},
|
|
49
|
+
});
|
|
50
|
+
});
|
|
51
|
+
const rounded = createTest(['c5/8, f4, d4, g5', { stem: 'up' }], ['d5/8, d6, d6, g5', { stem: 'down' }], (f, notes) => {
|
|
52
|
+
f.Curve({
|
|
53
|
+
from: notes[0],
|
|
54
|
+
to: notes[3],
|
|
55
|
+
options: {
|
|
56
|
+
x_shift: -10,
|
|
57
|
+
y_shift: 30,
|
|
58
|
+
cps: [
|
|
59
|
+
{ x: 0, y: 20 },
|
|
60
|
+
{ x: 0, y: 50 },
|
|
61
|
+
],
|
|
62
|
+
},
|
|
63
|
+
});
|
|
64
|
+
f.Curve({
|
|
65
|
+
from: notes[4],
|
|
66
|
+
to: notes[7],
|
|
67
|
+
options: {
|
|
68
|
+
cps: [
|
|
69
|
+
{ x: 0, y: 50 },
|
|
70
|
+
{ x: 0, y: 50 },
|
|
71
|
+
],
|
|
72
|
+
},
|
|
73
|
+
});
|
|
74
|
+
});
|
|
75
|
+
const thickThin = createTest(['c5/8, f4, d4, g5', { stem: 'up' }], ['d5/8, d6, d6, g5', { stem: 'down' }], (f, notes) => {
|
|
76
|
+
f.Curve({
|
|
77
|
+
from: notes[0],
|
|
78
|
+
to: notes[3],
|
|
79
|
+
options: {
|
|
80
|
+
thickness: 10,
|
|
81
|
+
x_shift: -10,
|
|
82
|
+
y_shift: 30,
|
|
83
|
+
cps: [
|
|
84
|
+
{ x: 0, y: 20 },
|
|
85
|
+
{ x: 0, y: 50 },
|
|
86
|
+
],
|
|
87
|
+
},
|
|
88
|
+
});
|
|
89
|
+
f.Curve({
|
|
90
|
+
from: notes[4],
|
|
91
|
+
to: notes[7],
|
|
92
|
+
options: {
|
|
93
|
+
thickness: 0,
|
|
94
|
+
cps: [
|
|
95
|
+
{ x: 0, y: 50 },
|
|
96
|
+
{ x: 0, y: 50 },
|
|
97
|
+
],
|
|
98
|
+
},
|
|
99
|
+
});
|
|
100
|
+
});
|
|
101
|
+
const top = createTest(['c5/8, f4, d4, g5', { stem: 'up' }], ['d5/8, d6, d6, g5', { stem: 'down' }], (f, notes) => {
|
|
102
|
+
f.Curve({
|
|
103
|
+
from: notes[0],
|
|
104
|
+
to: notes[7],
|
|
105
|
+
options: {
|
|
106
|
+
x_shift: -3,
|
|
107
|
+
y_shift: 10,
|
|
108
|
+
position: CurvePosition.NEAR_TOP,
|
|
109
|
+
position_end: CurvePosition.NEAR_HEAD,
|
|
110
|
+
cps: [
|
|
111
|
+
{ x: 0, y: 20 },
|
|
112
|
+
{ x: 40, y: 80 },
|
|
113
|
+
],
|
|
114
|
+
},
|
|
115
|
+
});
|
|
116
|
+
});
|
|
117
|
+
VexFlowTests.register(CurveTests);
|
|
118
|
+
export { CurveTests };
|