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,215 @@
|
|
|
1
|
+
import { VexFlowTests } from './vexflow_test_helpers.js';
|
|
2
|
+
import { Bend } from '../src/bend.js';
|
|
3
|
+
import { Font } from '../src/font.js';
|
|
4
|
+
import { Formatter } from '../src/formatter.js';
|
|
5
|
+
import { ModifierContext } from '../src/modifiercontext.js';
|
|
6
|
+
import { Note } from '../src/note.js';
|
|
7
|
+
import { TabNote } from '../src/tabnote.js';
|
|
8
|
+
import { TabStave } from '../src/tabstave.js';
|
|
9
|
+
import { TickContext } from '../src/tickcontext.js';
|
|
10
|
+
const BendTests = {
|
|
11
|
+
Start() {
|
|
12
|
+
QUnit.module('Bend');
|
|
13
|
+
const run = VexFlowTests.runTests;
|
|
14
|
+
run('Double Bends', doubleBends);
|
|
15
|
+
run('Reverse Bends', reverseBends);
|
|
16
|
+
run('Bend Phrase', bendPhrase);
|
|
17
|
+
run('Double Bends With Release', doubleBendsWithRelease);
|
|
18
|
+
run('Whako Bend', whackoBends);
|
|
19
|
+
},
|
|
20
|
+
};
|
|
21
|
+
const note = (noteStruct) => new TabNote(noteStruct);
|
|
22
|
+
const bendWithText = (text, release = false) => new Bend(text, release);
|
|
23
|
+
const bendWithPhrase = (phrase) => new Bend('', false, phrase);
|
|
24
|
+
function doubleBends(options, contextBuilder) {
|
|
25
|
+
const ctx = contextBuilder(options.elementId, 500, 240);
|
|
26
|
+
ctx.scale(1.5, 1.5);
|
|
27
|
+
ctx.fillStyle = '#221';
|
|
28
|
+
ctx.strokeStyle = '#221';
|
|
29
|
+
ctx.font = '10pt Arial';
|
|
30
|
+
const stave = new TabStave(10, 10, 450).addTabGlyph().setContext(ctx).draw();
|
|
31
|
+
const notes = [
|
|
32
|
+
note({
|
|
33
|
+
positions: [
|
|
34
|
+
{ str: 2, fret: 10 },
|
|
35
|
+
{ str: 4, fret: 9 },
|
|
36
|
+
],
|
|
37
|
+
duration: 'q',
|
|
38
|
+
})
|
|
39
|
+
.addModifier(bendWithText('Full'), 0)
|
|
40
|
+
.addModifier(bendWithText('1/2'), 1),
|
|
41
|
+
note({
|
|
42
|
+
positions: [
|
|
43
|
+
{ str: 2, fret: 5 },
|
|
44
|
+
{ str: 3, fret: 5 },
|
|
45
|
+
],
|
|
46
|
+
duration: 'q',
|
|
47
|
+
})
|
|
48
|
+
.addModifier(bendWithText('1/4'), 0)
|
|
49
|
+
.addModifier(bendWithText('1/4'), 1),
|
|
50
|
+
note({
|
|
51
|
+
positions: [{ str: 4, fret: 7 }],
|
|
52
|
+
duration: 'h',
|
|
53
|
+
}),
|
|
54
|
+
];
|
|
55
|
+
Formatter.FormatAndDraw(ctx, stave, notes);
|
|
56
|
+
notes.forEach((note) => Note.plotMetrics(ctx, note, 140));
|
|
57
|
+
ok(true, 'Double Bends');
|
|
58
|
+
}
|
|
59
|
+
function doubleBendsWithRelease(options, contextBuilder) {
|
|
60
|
+
const ctx = contextBuilder(options.elementId, 550, 240);
|
|
61
|
+
ctx.scale(1.0, 1.0);
|
|
62
|
+
ctx.setBackgroundFillStyle('#FFF');
|
|
63
|
+
ctx.setFont('Arial', VexFlowTests.Font.size);
|
|
64
|
+
const stave = new TabStave(10, 10, 550).addTabGlyph().setContext(ctx).draw();
|
|
65
|
+
const notes = [
|
|
66
|
+
note({
|
|
67
|
+
positions: [
|
|
68
|
+
{ str: 1, fret: 10 },
|
|
69
|
+
{ str: 4, fret: 9 },
|
|
70
|
+
],
|
|
71
|
+
duration: 'q',
|
|
72
|
+
})
|
|
73
|
+
.addModifier(bendWithText('1/2', true), 0)
|
|
74
|
+
.addModifier(bendWithText('Full', true), 1),
|
|
75
|
+
note({
|
|
76
|
+
positions: [
|
|
77
|
+
{ str: 2, fret: 5 },
|
|
78
|
+
{ str: 3, fret: 5 },
|
|
79
|
+
{ str: 4, fret: 5 },
|
|
80
|
+
],
|
|
81
|
+
duration: 'q',
|
|
82
|
+
})
|
|
83
|
+
.addModifier(bendWithText('1/4', true), 0)
|
|
84
|
+
.addModifier(bendWithText('Monstrous', true), 1)
|
|
85
|
+
.addModifier(bendWithText('1/4', true), 2),
|
|
86
|
+
note({
|
|
87
|
+
positions: [{ str: 4, fret: 7 }],
|
|
88
|
+
duration: 'q',
|
|
89
|
+
}),
|
|
90
|
+
note({
|
|
91
|
+
positions: [{ str: 4, fret: 7 }],
|
|
92
|
+
duration: 'q',
|
|
93
|
+
}),
|
|
94
|
+
];
|
|
95
|
+
Formatter.FormatAndDraw(ctx, stave, notes);
|
|
96
|
+
notes.forEach((note) => Note.plotMetrics(ctx, note, 140));
|
|
97
|
+
ok(true, 'Bend Release');
|
|
98
|
+
}
|
|
99
|
+
function reverseBends(options, contextBuilder) {
|
|
100
|
+
const ctx = contextBuilder(options.elementId, 500, 240);
|
|
101
|
+
ctx.scale(1.5, 1.5);
|
|
102
|
+
ctx.fillStyle = '#221';
|
|
103
|
+
ctx.strokeStyle = '#221';
|
|
104
|
+
ctx.setFont('10pt Arial');
|
|
105
|
+
const stave = new TabStave(10, 10, 450).addTabGlyph().setContext(ctx).draw();
|
|
106
|
+
const notes = [
|
|
107
|
+
note({
|
|
108
|
+
positions: [
|
|
109
|
+
{ str: 2, fret: 10 },
|
|
110
|
+
{ str: 4, fret: 9 },
|
|
111
|
+
],
|
|
112
|
+
duration: 'w',
|
|
113
|
+
})
|
|
114
|
+
.addModifier(bendWithText('Full'), 1)
|
|
115
|
+
.addModifier(bendWithText('1/2'), 0),
|
|
116
|
+
note({
|
|
117
|
+
positions: [
|
|
118
|
+
{ str: 2, fret: 5 },
|
|
119
|
+
{ str: 3, fret: 5 },
|
|
120
|
+
],
|
|
121
|
+
duration: 'w',
|
|
122
|
+
})
|
|
123
|
+
.addModifier(bendWithText('1/4'), 1)
|
|
124
|
+
.addModifier(bendWithText('1/4'), 0),
|
|
125
|
+
note({
|
|
126
|
+
positions: [{ str: 4, fret: 7 }],
|
|
127
|
+
duration: 'w',
|
|
128
|
+
}),
|
|
129
|
+
];
|
|
130
|
+
for (let i = 0; i < notes.length; ++i) {
|
|
131
|
+
const note = notes[i];
|
|
132
|
+
const mc = new ModifierContext();
|
|
133
|
+
note.addToModifierContext(mc);
|
|
134
|
+
const tickContext = new TickContext();
|
|
135
|
+
tickContext
|
|
136
|
+
.addTickable(note)
|
|
137
|
+
.preFormat()
|
|
138
|
+
.setX(75 * i);
|
|
139
|
+
note.setStave(stave).setContext(ctx).draw();
|
|
140
|
+
Note.plotMetrics(ctx, note, 140);
|
|
141
|
+
ok(true, 'Bend ' + i);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
function bendPhrase(options, contextBuilder) {
|
|
145
|
+
const ctx = contextBuilder(options.elementId, 500, 240);
|
|
146
|
+
ctx.scale(1.5, 1.5);
|
|
147
|
+
ctx.fillStyle = '#221';
|
|
148
|
+
ctx.strokeStyle = '#221';
|
|
149
|
+
ctx.font = Font.SIZE + 'pt ' + Font.SANS_SERIF;
|
|
150
|
+
const stave = new TabStave(10, 10, 450).addTabGlyph().setContext(ctx).draw();
|
|
151
|
+
const phrase1 = [
|
|
152
|
+
{ type: Bend.UP, text: 'Full' },
|
|
153
|
+
{ type: Bend.DOWN, text: 'Monstrous' },
|
|
154
|
+
{ type: Bend.UP, text: '1/2' },
|
|
155
|
+
{ type: Bend.DOWN, text: '' },
|
|
156
|
+
];
|
|
157
|
+
const bend1 = bendWithPhrase(phrase1).setContext(ctx);
|
|
158
|
+
const notes = [
|
|
159
|
+
note({
|
|
160
|
+
positions: [{ str: 2, fret: 10 }],
|
|
161
|
+
duration: 'w',
|
|
162
|
+
}).addModifier(bend1, 0),
|
|
163
|
+
];
|
|
164
|
+
for (let i = 0; i < notes.length; ++i) {
|
|
165
|
+
const note = notes[i];
|
|
166
|
+
note.addToModifierContext(new ModifierContext());
|
|
167
|
+
const tickContext = new TickContext();
|
|
168
|
+
tickContext
|
|
169
|
+
.addTickable(note)
|
|
170
|
+
.preFormat()
|
|
171
|
+
.setX(75 * i);
|
|
172
|
+
note.setStave(stave).setContext(ctx).draw();
|
|
173
|
+
Note.plotMetrics(ctx, note, 140);
|
|
174
|
+
ok(true, 'Bend ' + i);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
function whackoBends(options, contextBuilder) {
|
|
178
|
+
const ctx = contextBuilder(options.elementId, 400, 240);
|
|
179
|
+
ctx.scale(1.0, 1.0);
|
|
180
|
+
ctx.setBackgroundFillStyle('#FFF');
|
|
181
|
+
ctx.setFont('Arial', VexFlowTests.Font.size);
|
|
182
|
+
const stave = new TabStave(10, 10, 350).addTabGlyph().setContext(ctx).draw();
|
|
183
|
+
const phrase1 = [
|
|
184
|
+
{ type: Bend.UP, text: 'Full' },
|
|
185
|
+
{ type: Bend.DOWN, text: '' },
|
|
186
|
+
{ type: Bend.UP, text: '1/2' },
|
|
187
|
+
{ type: Bend.DOWN, text: '' },
|
|
188
|
+
];
|
|
189
|
+
const phrase2 = [
|
|
190
|
+
{ type: Bend.UP, text: 'Full' },
|
|
191
|
+
{ type: Bend.UP, text: 'Full' },
|
|
192
|
+
{ type: Bend.UP, text: '1/2' },
|
|
193
|
+
{ type: Bend.DOWN, text: '' },
|
|
194
|
+
{ type: Bend.DOWN, text: 'Full' },
|
|
195
|
+
{ type: Bend.DOWN, text: 'Full' },
|
|
196
|
+
{ type: Bend.UP, text: '1/2' },
|
|
197
|
+
{ type: Bend.DOWN, text: '' },
|
|
198
|
+
];
|
|
199
|
+
const notes = [
|
|
200
|
+
note({
|
|
201
|
+
positions: [
|
|
202
|
+
{ str: 2, fret: 10 },
|
|
203
|
+
{ str: 3, fret: 9 },
|
|
204
|
+
],
|
|
205
|
+
duration: 'q',
|
|
206
|
+
})
|
|
207
|
+
.addModifier(bendWithPhrase(phrase1), 0)
|
|
208
|
+
.addModifier(bendWithPhrase(phrase2), 1),
|
|
209
|
+
];
|
|
210
|
+
Formatter.FormatAndDraw(ctx, stave, notes);
|
|
211
|
+
Note.plotMetrics(ctx, notes[0], 140);
|
|
212
|
+
ok(true, 'Whacko Bend & Release');
|
|
213
|
+
}
|
|
214
|
+
VexFlowTests.register(BendTests);
|
|
215
|
+
export { BendTests };
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { VexFlowTests } from './vexflow_test_helpers.js';
|
|
2
|
+
import { BoundingBox } from '../src/index.js';
|
|
3
|
+
const BoundingBoxTests = {
|
|
4
|
+
Start() {
|
|
5
|
+
QUnit.module('BoundingBox');
|
|
6
|
+
test('Initialization Test', initialization);
|
|
7
|
+
test('Merging Text', merging);
|
|
8
|
+
},
|
|
9
|
+
};
|
|
10
|
+
function initialization() {
|
|
11
|
+
const bb = new BoundingBox(4, 5, 6, 7);
|
|
12
|
+
equal(bb.getX(), 4, 'Bad X');
|
|
13
|
+
equal(bb.getY(), 5, 'Bad Y');
|
|
14
|
+
equal(bb.getW(), 6, 'Bad W');
|
|
15
|
+
equal(bb.getH(), 7, 'Bad H');
|
|
16
|
+
bb.setX(5);
|
|
17
|
+
equal(bb.getX(), 5, 'Bad X');
|
|
18
|
+
}
|
|
19
|
+
function merging() {
|
|
20
|
+
const tests = [
|
|
21
|
+
{
|
|
22
|
+
type: 'Intersection',
|
|
23
|
+
bb1: new BoundingBox(10, 10, 10, 10),
|
|
24
|
+
bb2: new BoundingBox(15, 20, 10, 10),
|
|
25
|
+
merged: new BoundingBox(10, 10, 15, 20),
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
type: '1 contains 2',
|
|
29
|
+
bb1: new BoundingBox(10, 10, 30, 30),
|
|
30
|
+
bb2: new BoundingBox(15, 15, 10, 10),
|
|
31
|
+
merged: new BoundingBox(10, 10, 30, 30),
|
|
32
|
+
},
|
|
33
|
+
{
|
|
34
|
+
type: '2 contains 1',
|
|
35
|
+
bb1: new BoundingBox(15, 15, 10, 10),
|
|
36
|
+
bb2: new BoundingBox(10, 10, 30, 30),
|
|
37
|
+
merged: new BoundingBox(10, 10, 30, 30),
|
|
38
|
+
},
|
|
39
|
+
];
|
|
40
|
+
tests.forEach((test) => {
|
|
41
|
+
const type = test.type;
|
|
42
|
+
const bb1 = test.bb1;
|
|
43
|
+
const bb2 = test.bb2;
|
|
44
|
+
const merged = test.merged;
|
|
45
|
+
bb1.mergeWith(bb2);
|
|
46
|
+
equal(bb1.getX(), merged.getX(), type + ' - Bad X');
|
|
47
|
+
equal(bb1.getY(), merged.getY(), type + ' - Bad Y');
|
|
48
|
+
equal(bb1.getW(), merged.getW(), type + ' - Bad W');
|
|
49
|
+
equal(bb1.getH(), merged.getH(), type + ' - Bad H');
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
VexFlowTests.register(BoundingBoxTests);
|
|
53
|
+
export { BoundingBoxTests };
|
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
import { VexFlowTests } from './vexflow_test_helpers.js';
|
|
2
|
+
import { BoundingBoxComputation, Glyph } from '../src/index.js';
|
|
3
|
+
const BoundingBoxComputationTests = {
|
|
4
|
+
Start() {
|
|
5
|
+
QUnit.module('BoundingBoxComputation');
|
|
6
|
+
test('Point Test', point);
|
|
7
|
+
const run = VexFlowTests.runTests;
|
|
8
|
+
quadraticParams.forEach((params, index) => {
|
|
9
|
+
run(`Quadratic Test ${index}`, quadratic, params);
|
|
10
|
+
});
|
|
11
|
+
cubicParams.forEach((params, index) => {
|
|
12
|
+
run(`Cubic Test ${index}`, cubic, params);
|
|
13
|
+
});
|
|
14
|
+
},
|
|
15
|
+
};
|
|
16
|
+
function point() {
|
|
17
|
+
const bboxComp = new BoundingBoxComputation();
|
|
18
|
+
bboxComp.addPoint(2, 3);
|
|
19
|
+
equal(bboxComp.getX1(), 2, 'Bad X1');
|
|
20
|
+
equal(bboxComp.getY1(), 3, 'Bad Y1');
|
|
21
|
+
equal(bboxComp.width(), 0, 'Bad width');
|
|
22
|
+
equal(bboxComp.height(), 0, 'Bad height');
|
|
23
|
+
bboxComp.addPoint(-5, 7);
|
|
24
|
+
equal(bboxComp.getX1(), -5, 'Bad X1');
|
|
25
|
+
equal(bboxComp.getY1(), 3, 'Bad Y1');
|
|
26
|
+
equal(bboxComp.width(), 7, 'Bad width');
|
|
27
|
+
equal(bboxComp.height(), 4, 'Bad height');
|
|
28
|
+
}
|
|
29
|
+
function createContext(options) {
|
|
30
|
+
const points = options.params.points;
|
|
31
|
+
let w = points[0];
|
|
32
|
+
let h = points[1];
|
|
33
|
+
for (let i = 2; i < points.length; i += 2) {
|
|
34
|
+
w = Math.max(w, points[i]);
|
|
35
|
+
h = Math.max(h, points[i + 1]);
|
|
36
|
+
}
|
|
37
|
+
const f = VexFlowTests.makeFactory(options, w + 20, h + 20);
|
|
38
|
+
const ctx = f.getContext();
|
|
39
|
+
ctx.setLineCap('square');
|
|
40
|
+
return ctx;
|
|
41
|
+
}
|
|
42
|
+
function rect(ctx, style, lineWidth, x, y, w, h) {
|
|
43
|
+
ctx.strokeStyle = style;
|
|
44
|
+
ctx.setLineWidth(lineWidth);
|
|
45
|
+
ctx.beginPath();
|
|
46
|
+
ctx.moveTo(x, y);
|
|
47
|
+
ctx.lineTo(x + w, y);
|
|
48
|
+
ctx.lineTo(x + w, y + h);
|
|
49
|
+
ctx.lineTo(x, y + h);
|
|
50
|
+
ctx.lineTo(x, y);
|
|
51
|
+
ctx.stroke();
|
|
52
|
+
}
|
|
53
|
+
const quadraticParams = [
|
|
54
|
+
{
|
|
55
|
+
points: [10, 10, 100, 20, 110, 110],
|
|
56
|
+
box: [10, 10, 100, 100],
|
|
57
|
+
},
|
|
58
|
+
{
|
|
59
|
+
points: [110, 10, 60, 110, 10, 20],
|
|
60
|
+
box: [10, 10, 100, 52.63],
|
|
61
|
+
},
|
|
62
|
+
{
|
|
63
|
+
points: [10, 10, 30, 20, 50, 30],
|
|
64
|
+
box: [10, 10, 40, 20],
|
|
65
|
+
},
|
|
66
|
+
{
|
|
67
|
+
points: [100, 30, 30, 110, 20, 30],
|
|
68
|
+
box: [20, 30, 80, 40],
|
|
69
|
+
},
|
|
70
|
+
];
|
|
71
|
+
function quadratic(options) {
|
|
72
|
+
const points = options.params.points;
|
|
73
|
+
const box = options.params.box;
|
|
74
|
+
const ctx = createContext(options);
|
|
75
|
+
const [x0, y0, x1, y1, x2, y2] = points;
|
|
76
|
+
let [bx, by, bw, bh] = box;
|
|
77
|
+
rect(ctx, '#0f0', 5, bx, by, bw, bh);
|
|
78
|
+
const bboxComp = new BoundingBoxComputation();
|
|
79
|
+
bboxComp.addQuadraticCurve(x0, y0, x1, y1, x2, y2);
|
|
80
|
+
[bx, by, bw, bh] = [bboxComp.getX1(), bboxComp.getY1(), bboxComp.width(), bboxComp.height()];
|
|
81
|
+
rect(ctx, '#00f', 3, bx, by, bw, bh);
|
|
82
|
+
const o = [0, x0, -y0, 2, x2, -y2, x1, -y1];
|
|
83
|
+
const bbox = Glyph.getOutlineBoundingBox(o, 1, 0, 0);
|
|
84
|
+
rect(ctx, '#fa0', 1, bbox.getX(), bbox.getY(), bbox.getW(), bbox.getH());
|
|
85
|
+
ctx.setLineWidth(1);
|
|
86
|
+
ctx.fillStyle = '#000';
|
|
87
|
+
Glyph.renderOutline(ctx, o, 1, 0, 0);
|
|
88
|
+
ctx.strokeStyle = '#f00';
|
|
89
|
+
ctx.beginPath();
|
|
90
|
+
ctx.moveTo(x0, y0);
|
|
91
|
+
ctx.lineTo(x1, y1);
|
|
92
|
+
ctx.lineTo(x2, y2);
|
|
93
|
+
ctx.stroke();
|
|
94
|
+
ok(Math.abs(bboxComp.getX1() - box[0]) < 0.01, `Bad X1: ${bboxComp.getX1()}`);
|
|
95
|
+
ok(Math.abs(bboxComp.getY1() - box[1]) < 0.01, `Bad Y1: ${bboxComp.getY1()}`);
|
|
96
|
+
ok(Math.abs(bboxComp.width() - box[2]) < 0.01, `Bad width: ${bboxComp.width()}`);
|
|
97
|
+
ok(Math.abs(bboxComp.height() - box[3]) < 0.01, `Bad height: ${bboxComp.height()}`);
|
|
98
|
+
ok(Math.abs(bbox.getX() - box[0]) < 0.01, `Bad X: ${bbox.getX()}`);
|
|
99
|
+
ok(Math.abs(bbox.getY() - box[1]) < 0.01, `Bad Y: ${bbox.getY()}`);
|
|
100
|
+
ok(Math.abs(bbox.getW() - box[2]) < 0.01, `Bad W: ${bbox.getW()}`);
|
|
101
|
+
ok(Math.abs(bbox.getH() - box[3]) < 0.01, `Bad H: ${bbox.getH()}`);
|
|
102
|
+
}
|
|
103
|
+
const cubicParams = [
|
|
104
|
+
{
|
|
105
|
+
points: [10, 10, 60, 20, 100, 60, 110, 110],
|
|
106
|
+
box: [10, 10, 100, 100],
|
|
107
|
+
},
|
|
108
|
+
{
|
|
109
|
+
points: [10, 10, 35, 110, 85, 110, 110, 10],
|
|
110
|
+
box: [10, 10, 100, 75],
|
|
111
|
+
},
|
|
112
|
+
{
|
|
113
|
+
points: [10, 110, 90, 10, 30, 10, 110, 110],
|
|
114
|
+
box: [10, 35, 100, 75],
|
|
115
|
+
},
|
|
116
|
+
{
|
|
117
|
+
points: [10, 10, 110, 110, 110, 10, 10, 110],
|
|
118
|
+
box: [10, 10, 75, 100],
|
|
119
|
+
},
|
|
120
|
+
{
|
|
121
|
+
points: [10, 10, 130, 110, -10, 110, 110, 10],
|
|
122
|
+
box: [10, 10, 100, 75],
|
|
123
|
+
},
|
|
124
|
+
{
|
|
125
|
+
points: [50, 10, 10, 110, 110, 110, 74, 10],
|
|
126
|
+
box: [40.38, 10, 41.59, 75],
|
|
127
|
+
},
|
|
128
|
+
{
|
|
129
|
+
points: [10, 30, 35, 60, 110, 110, 60, 10],
|
|
130
|
+
box: [10, 10, 66.82, 59.37],
|
|
131
|
+
},
|
|
132
|
+
{
|
|
133
|
+
points: [210, 70, 10, 10, 190, 10, 120, 90],
|
|
134
|
+
box: [112.02, 27.23, 97.98, 62.77],
|
|
135
|
+
},
|
|
136
|
+
{
|
|
137
|
+
points: [20, 10, 210, 90, 10, 90, 100, 38],
|
|
138
|
+
box: [20, 10, 85.33, 64.06],
|
|
139
|
+
},
|
|
140
|
+
{
|
|
141
|
+
points: [60, 14, 10, 14, 90, 14, 70, 14],
|
|
142
|
+
box: [43.28, 14, 30.01, 0],
|
|
143
|
+
},
|
|
144
|
+
{
|
|
145
|
+
points: [10, 60, 20, 100, 100, 20, 110, 60],
|
|
146
|
+
box: [10, 48.45, 100, 23.1],
|
|
147
|
+
},
|
|
148
|
+
];
|
|
149
|
+
function cubic(options) {
|
|
150
|
+
const points = options.params.points;
|
|
151
|
+
const box = options.params.box;
|
|
152
|
+
const ctx = createContext(options);
|
|
153
|
+
const [x0, y0, x1, y1, x2, y2, x3, y3] = points;
|
|
154
|
+
let [bx, by, bw, bh] = box;
|
|
155
|
+
rect(ctx, '#0f0', 5, bx, by, bw, bh);
|
|
156
|
+
const bboxComp = new BoundingBoxComputation();
|
|
157
|
+
bboxComp.addBezierCurve(x0, y0, x1, y1, x2, y2, x3, y3);
|
|
158
|
+
[bx, by, bw, bh] = [bboxComp.getX1(), bboxComp.getY1(), bboxComp.width(), bboxComp.height()];
|
|
159
|
+
rect(ctx, '#00f', 3, bx, by, bw, bh);
|
|
160
|
+
const o = [0, x0, -y0, 3, x3, -y3, x1, -y1, x2, -y2];
|
|
161
|
+
const bbox = Glyph.getOutlineBoundingBox(o, 1, 0, 0);
|
|
162
|
+
rect(ctx, '#fa0', 1, bbox.getX(), bbox.getY(), bbox.getW(), bbox.getH());
|
|
163
|
+
ctx.setLineWidth(1);
|
|
164
|
+
ctx.fillStyle = '#000';
|
|
165
|
+
Glyph.renderOutline(ctx, o, 1, 0, 0);
|
|
166
|
+
ctx.strokeStyle = '#f00';
|
|
167
|
+
ctx.beginPath();
|
|
168
|
+
ctx.moveTo(x0, y0);
|
|
169
|
+
ctx.lineTo(x1, y1);
|
|
170
|
+
ctx.lineTo(x2, y2);
|
|
171
|
+
ctx.lineTo(x3, y3);
|
|
172
|
+
ctx.stroke();
|
|
173
|
+
ok(Math.abs(bboxComp.getX1() - box[0]) < 0.01, `Bad X1: ${bboxComp.getX1()}`);
|
|
174
|
+
ok(Math.abs(bboxComp.getY1() - box[1]) < 0.01, `Bad Y1: ${bboxComp.getY1()}`);
|
|
175
|
+
ok(Math.abs(bboxComp.width() - box[2]) < 0.01, `Bad width: ${bboxComp.width()}`);
|
|
176
|
+
ok(Math.abs(bboxComp.height() - box[3]) < 0.01, `Bad height: ${bboxComp.height()}`);
|
|
177
|
+
ok(Math.abs(bbox.getX() - box[0]) < 0.01, `Bad X: ${bbox.getX()}`);
|
|
178
|
+
ok(Math.abs(bbox.getY() - box[1]) < 0.01, `Bad Y: ${bbox.getY()}`);
|
|
179
|
+
ok(Math.abs(bbox.getW() - box[2]) < 0.01, `Bad W: ${bbox.getW()}`);
|
|
180
|
+
ok(Math.abs(bbox.getH() - box[3]) < 0.01, `Bad H: ${bbox.getH()}`);
|
|
181
|
+
}
|
|
182
|
+
VexFlowTests.register(BoundingBoxComputationTests);
|
|
183
|
+
export { BoundingBoxComputationTests };
|