vexflow 4.0.1-beta.1 → 4.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +48 -65
- package/build/cjs/vexflow-bravura.js +2 -2
- package/build/cjs/vexflow-bravura.js.map +1 -1
- package/build/cjs/vexflow-core.js +2 -2
- package/build/cjs/vexflow-core.js.map +1 -1
- package/build/cjs/vexflow-debug-with-tests.js +724 -697
- package/build/cjs/vexflow-debug-with-tests.js.map +1 -1
- package/build/cjs/vexflow-debug.js +550 -610
- package/build/cjs/vexflow-debug.js.map +1 -1
- package/build/cjs/vexflow-font-gonville.js +1 -1
- package/build/cjs/vexflow-font-gonville.js.map +1 -1
- package/build/cjs/vexflow-gonville.js +2 -2
- package/build/cjs/vexflow-gonville.js.map +1 -1
- package/build/cjs/vexflow-petaluma.js +2 -2
- package/build/cjs/vexflow-petaluma.js.map +1 -1
- package/build/cjs/vexflow.js +2 -2
- package/build/cjs/vexflow.js.map +1 -1
- package/build/esm/entry/vexflow-bravura.js +10 -0
- package/build/esm/entry/vexflow-core.js +53 -0
- package/build/esm/entry/vexflow-debug-with-tests.js +11 -0
- package/build/esm/entry/vexflow-debug.js +8 -0
- package/build/esm/entry/vexflow-font-bravura.js +7 -0
- package/build/esm/entry/vexflow-font-custom.js +7 -0
- package/build/esm/entry/vexflow-font-gonville.js +7 -0
- package/build/esm/entry/vexflow-font-petaluma.js +7 -0
- package/build/esm/entry/vexflow-gonville.js +10 -0
- package/build/esm/entry/vexflow-petaluma.js +10 -0
- package/build/esm/entry/vexflow.js +8 -0
- package/build/esm/src/accidental.js +348 -0
- package/build/esm/src/annotation.js +238 -0
- package/build/esm/src/articulation.js +267 -0
- package/build/esm/src/barnote.js +58 -0
- package/build/esm/src/beam.js +644 -0
- package/build/esm/src/bend.js +202 -0
- package/build/esm/src/boundingbox.js +59 -0
- package/build/esm/src/boundingboxcomputation.js +107 -0
- package/build/esm/src/canvascontext.js +202 -0
- package/build/esm/src/chordsymbol.js +578 -0
- package/build/esm/src/clef.js +153 -0
- package/build/esm/src/clefnote.js +65 -0
- package/build/esm/src/crescendo.js +77 -0
- package/build/esm/src/curve.js +118 -0
- package/build/esm/src/dot.js +137 -0
- package/build/esm/src/easyscore.js +374 -0
- package/build/esm/src/element.js +216 -0
- package/build/esm/src/factory.js +445 -0
- package/build/esm/src/flow.js +288 -0
- package/build/esm/src/font.js +262 -0
- package/build/esm/src/fonts/bravura_glyphs.js +3239 -0
- package/build/esm/src/fonts/bravura_metrics.js +507 -0
- package/build/esm/src/fonts/custom_glyphs.js +78 -0
- package/build/esm/src/fonts/custom_metrics.js +5 -0
- package/build/esm/src/fonts/gonville_glyphs.js +828 -0
- package/build/esm/src/fonts/gonville_metrics.js +421 -0
- package/build/esm/src/fonts/load_all.js +10 -0
- package/build/esm/src/fonts/load_bravura.js +6 -0
- package/build/esm/src/fonts/load_custom.js +6 -0
- package/build/esm/src/fonts/load_gonville.js +6 -0
- package/build/esm/src/fonts/load_petaluma.js +6 -0
- package/build/esm/src/fonts/petaluma_glyphs.js +1335 -0
- package/build/esm/src/fonts/petaluma_metrics.js +536 -0
- package/build/esm/src/fonts/petalumascript_glyphs.js +863 -0
- package/build/esm/src/fonts/robotoslab_glyphs.js +863 -0
- package/build/esm/src/fonts/textfonts.js +44 -0
- package/build/esm/src/formatter.js +585 -0
- package/build/esm/src/fraction.js +171 -0
- package/build/esm/src/frethandfinger.js +156 -0
- package/build/esm/src/ghostnote.js +50 -0
- package/build/esm/src/glyph.js +337 -0
- package/build/esm/src/glyphnote.js +55 -0
- package/build/esm/src/gracenote.js +133 -0
- package/build/esm/src/gracenotegroup.js +128 -0
- package/build/esm/src/gracetabnote.js +12 -0
- package/build/esm/src/index.js +89 -0
- package/build/esm/src/keymanager.js +99 -0
- package/build/esm/src/keysignature.js +250 -0
- package/build/esm/src/keysignote.js +28 -0
- package/build/esm/src/modifier.js +128 -0
- package/build/esm/src/modifiercontext.js +110 -0
- package/build/esm/src/multimeasurerest.js +173 -0
- package/build/esm/src/music.js +322 -0
- package/build/esm/src/note.js +371 -0
- package/build/esm/src/notehead.js +169 -0
- package/build/esm/src/notesubgroup.js +59 -0
- package/build/esm/src/ornament.js +206 -0
- package/build/esm/src/parenthesis.js +76 -0
- package/build/esm/src/parser.js +164 -0
- package/build/esm/src/pedalmarking.js +192 -0
- package/build/esm/src/registry.js +81 -0
- package/build/esm/src/rendercontext.js +24 -0
- package/build/esm/src/renderer.js +112 -0
- package/build/esm/src/repeatnote.js +22 -0
- package/build/esm/src/stave.js +547 -0
- package/build/esm/src/stavebarline.js +182 -0
- package/build/esm/src/staveconnector.js +196 -0
- package/build/esm/src/stavehairpin.js +120 -0
- package/build/esm/src/staveline.js +215 -0
- package/build/esm/src/stavemodifier.js +77 -0
- package/build/esm/src/stavenote.js +860 -0
- package/build/esm/src/staverepetition.js +155 -0
- package/build/esm/src/stavesection.js +58 -0
- package/build/esm/src/stavetempo.js +91 -0
- package/build/esm/src/stavetext.js +82 -0
- package/build/esm/src/stavetie.js +141 -0
- package/build/esm/src/stavevolta.js +67 -0
- package/build/esm/src/stem.js +131 -0
- package/build/esm/src/stemmablenote.js +193 -0
- package/build/esm/src/stringnumber.js +231 -0
- package/build/esm/src/strokes.js +200 -0
- package/build/esm/src/svgcontext.js +414 -0
- package/build/esm/src/system.js +109 -0
- package/build/esm/src/tables.js +1102 -0
- package/build/esm/src/tabnote.js +299 -0
- package/build/esm/src/tabslide.js +76 -0
- package/build/esm/src/tabstave.js +17 -0
- package/build/esm/src/tabtie.js +19 -0
- package/build/esm/src/textbracket.js +144 -0
- package/build/esm/src/textdynamics.js +81 -0
- package/build/esm/src/textformatter.js +177 -0
- package/build/esm/src/textnote.js +174 -0
- package/build/esm/src/tickable.js +214 -0
- package/build/esm/src/tickcontext.js +170 -0
- package/build/esm/src/timesigglyph.js +85 -0
- package/build/esm/src/timesignature.js +89 -0
- package/build/esm/src/timesignote.js +32 -0
- package/build/esm/src/tremolo.js +47 -0
- package/build/esm/src/tuning.js +54 -0
- package/build/esm/src/tuplet.js +240 -0
- package/build/esm/src/typeguard.js +30 -0
- package/build/esm/src/util.js +58 -0
- package/build/esm/src/version.js +3 -3
- package/build/esm/src/vex.js +51 -0
- package/build/esm/src/vibrato.js +100 -0
- package/build/esm/src/vibratobracket.js +50 -0
- package/build/esm/src/voice.js +187 -0
- package/build/esm/src/web.js +15 -0
- package/build/esm/tests/accidental_tests.js +974 -0
- package/build/esm/tests/annotation_tests.js +390 -0
- package/build/esm/tests/articulation_tests.js +365 -0
- package/build/esm/tests/auto_beam_formatting_tests.js +548 -0
- package/build/esm/tests/bach_tests.js +335 -0
- package/build/esm/tests/barline_tests.js +52 -0
- package/build/esm/tests/beam_tests.js +614 -0
- package/build/esm/tests/bend_tests.js +215 -0
- package/build/esm/tests/boundingbox_tests.js +53 -0
- package/build/esm/tests/boundingboxcomputation_tests.js +183 -0
- package/build/esm/tests/chordsymbol_tests.js +320 -0
- package/build/esm/tests/clef_tests.js +131 -0
- package/build/esm/tests/curve_tests.js +118 -0
- package/build/esm/tests/dot_tests.js +123 -0
- package/build/esm/tests/easyscore_tests.js +462 -0
- package/build/esm/tests/factory_tests.js +44 -0
- package/build/esm/tests/font_tests.js +135 -0
- package/build/esm/tests/formatter/framestack.js +61 -0
- package/build/esm/tests/formatter/tests.js +203 -0
- package/build/esm/tests/formatter_tests.js +670 -0
- package/build/esm/tests/fraction_tests.js +72 -0
- package/build/esm/tests/ghostnote_tests.js +77 -0
- package/build/esm/tests/glyphnote_tests.js +113 -0
- package/build/esm/tests/gracenote_tests.js +413 -0
- package/build/esm/tests/gracetabnote_tests.js +79 -0
- package/build/esm/tests/index.js +68 -0
- package/build/esm/tests/key_clef_tests.js +103 -0
- package/build/esm/tests/keymanager_tests.js +68 -0
- package/build/esm/tests/keysignature_tests.js +308 -0
- package/build/esm/tests/mocks.js +71 -0
- package/build/esm/tests/modifier_tests.js +24 -0
- package/build/esm/tests/multimeasurerest_tests.js +141 -0
- package/build/esm/tests/music_tests.js +161 -0
- package/build/esm/tests/notehead_tests.js +137 -0
- package/build/esm/tests/notesubgroup_tests.js +149 -0
- package/build/esm/tests/offscreencanvas_tests.js +47 -0
- package/build/esm/tests/ornament_tests.js +298 -0
- package/build/esm/tests/parser_tests.js +122 -0
- package/build/esm/tests/pedalmarking_tests.js +64 -0
- package/build/esm/tests/percussion_tests.js +180 -0
- package/build/esm/tests/registry_tests.js +64 -0
- package/build/esm/tests/renderer_tests.js +113 -0
- package/build/esm/tests/rests_tests.js +248 -0
- package/build/esm/tests/rhythm_tests.js +357 -0
- package/build/esm/tests/stave_tests.js +560 -0
- package/build/esm/tests/staveconnector_tests.js +402 -0
- package/build/esm/tests/stavehairpin_tests.js +90 -0
- package/build/esm/tests/staveline_tests.js +122 -0
- package/build/esm/tests/stavemodifier_tests.js +51 -0
- package/build/esm/tests/stavenote_tests.js +867 -0
- package/build/esm/tests/stavetie_tests.js +108 -0
- package/build/esm/tests/stringnumber_tests.js +259 -0
- package/build/esm/tests/strokes_tests.js +275 -0
- package/build/esm/tests/style_tests.js +98 -0
- package/build/esm/tests/support/qunit.js +2765 -0
- package/build/esm/tests/tabnote_tests.js +474 -0
- package/build/esm/tests/tabslide_tests.js +135 -0
- package/build/esm/tests/tabstave_tests.js +23 -0
- package/build/esm/tests/tabtie_tests.js +173 -0
- package/build/esm/tests/textbracket_tests.js +100 -0
- package/build/esm/tests/textformatter_tests.js +24 -0
- package/build/esm/tests/textnote_tests.js +215 -0
- package/build/esm/tests/threevoice_tests.js +132 -0
- package/build/esm/tests/tickcontext_tests.js +36 -0
- package/build/esm/tests/timesignature_tests.js +134 -0
- package/build/esm/tests/tremolo_tests.js +75 -0
- package/build/esm/tests/tuning_tests.js +56 -0
- package/build/esm/tests/tuplet_tests.js +450 -0
- package/build/esm/tests/typeguard_tests.js +82 -0
- package/build/esm/tests/vexflow_test_helpers.js +266 -0
- package/build/esm/tests/vf_prefix_tests.js +115 -0
- package/build/esm/tests/vibrato_tests.js +92 -0
- package/build/esm/tests/vibratobracket_tests.js +45 -0
- package/build/esm/tests/voice_tests.js +69 -0
- package/build/types/entry/vexflow-bravura.d.ts +2 -0
- package/build/types/entry/vexflow-core.d.ts +2 -0
- package/build/types/entry/vexflow-debug.d.ts +2 -0
- package/build/types/entry/vexflow-font-bravura.d.ts +3771 -0
- package/build/types/entry/vexflow-font-custom.d.ts +86 -0
- package/build/types/entry/vexflow-font-gonville.d.ts +1267 -0
- package/build/types/entry/vexflow-font-petaluma.d.ts +1896 -0
- package/build/types/entry/vexflow-gonville.d.ts +2 -0
- package/build/types/entry/vexflow-petaluma.d.ts +2 -0
- package/build/types/entry/vexflow.d.ts +2 -0
- package/build/types/src/accidental.d.ts +66 -0
- package/build/types/src/annotation.d.ts +61 -0
- package/build/types/src/articulation.d.ts +62 -0
- package/build/types/src/barnote.d.ts +29 -0
- package/build/types/src/beam.d.ts +153 -0
- package/build/types/src/bend.d.ts +73 -0
- package/build/types/src/boundingbox.d.ts +42 -0
- package/build/types/src/boundingboxcomputation.d.ts +33 -0
- package/build/types/src/canvascontext.d.ts +89 -0
- package/build/types/src/chordsymbol.d.ts +149 -0
- package/build/types/src/clef.d.ts +48 -0
- package/build/types/src/clefnote.d.ts +25 -0
- package/build/types/src/crescendo.d.ts +27 -0
- package/build/types/src/curve.d.ts +41 -0
- package/build/types/src/dot.d.ts +20 -0
- package/build/types/src/easyscore.d.ts +152 -0
- package/build/types/src/element.d.ts +202 -0
- package/build/types/src/factory.d.ts +274 -0
- package/build/types/src/flow.d.ts +260 -0
- package/build/types/src/font.d.ts +180 -0
- package/build/types/src/fonts/bravura_glyphs.d.ts +3239 -0
- package/build/types/src/fonts/bravura_metrics.d.ts +533 -0
- package/build/types/src/fonts/custom_glyphs.d.ts +78 -0
- package/build/types/src/fonts/custom_metrics.d.ts +5 -0
- package/build/types/src/fonts/gonville_glyphs.d.ts +828 -0
- package/build/types/src/fonts/gonville_metrics.d.ts +440 -0
- package/build/types/src/fonts/load_all.d.ts +1 -0
- package/build/types/src/fonts/load_bravura.d.ts +1 -0
- package/build/types/src/fonts/load_custom.d.ts +1 -0
- package/build/types/src/fonts/load_gonville.d.ts +1 -0
- package/build/types/src/fonts/load_petaluma.d.ts +1 -0
- package/build/types/src/fonts/petaluma_glyphs.d.ts +1335 -0
- package/build/types/src/fonts/petaluma_metrics.d.ts +562 -0
- package/build/types/src/fonts/petalumascript_glyphs.d.ts +863 -0
- package/build/types/src/fonts/robotoslab_glyphs.d.ts +863 -0
- package/build/types/src/fonts/textfonts.d.ts +1 -0
- package/build/types/src/formatter.d.ts +203 -0
- package/build/types/src/fraction.d.ts +62 -0
- package/build/types/src/frethandfinger.d.ts +22 -0
- package/build/types/src/ghostnote.d.ts +16 -0
- package/build/types/src/glyph.d.ts +141 -0
- package/build/types/src/glyphnote.d.ts +17 -0
- package/build/types/src/gracenote.d.ts +19 -0
- package/build/types/src/gracenotegroup.d.ts +33 -0
- package/build/types/src/gracetabnote.d.ts +5 -0
- package/build/types/src/index.d.ts +89 -0
- package/build/types/src/keymanager.d.ts +25 -0
- package/build/types/src/keysignature.d.ts +50 -0
- package/build/types/src/keysignote.d.ts +11 -0
- package/build/types/src/modifier.d.ts +97 -0
- package/build/types/src/modifiercontext.d.ts +45 -0
- package/build/types/src/multimeasurerest.d.ts +61 -0
- package/build/types/src/music.d.ts +91 -0
- package/build/types/src/note.d.ts +232 -0
- package/build/types/src/notehead.d.ts +70 -0
- package/build/types/src/notesubgroup.d.ts +18 -0
- package/build/types/src/ornament.d.ts +76 -0
- package/build/types/src/parenthesis.d.ts +22 -0
- package/build/types/src/parser.d.ts +45 -0
- package/build/types/src/pedalmarking.d.ts +69 -0
- package/build/types/src/registry.d.ts +40 -0
- package/build/types/src/rendercontext.d.ts +64 -0
- package/build/types/src/renderer.d.ts +35 -0
- package/build/types/src/repeatnote.d.ts +6 -0
- package/build/types/src/stave.d.ts +186 -0
- package/build/types/src/stavebarline.d.ts +28 -0
- package/build/types/src/staveconnector.d.ts +67 -0
- package/build/types/src/stavehairpin.d.ts +56 -0
- package/build/types/src/staveline.d.ts +54 -0
- package/build/types/src/stavemodifier.d.ts +44 -0
- package/build/types/src/stavenote.d.ts +154 -0
- package/build/types/src/staverepetition.d.ts +32 -0
- package/build/types/src/stavesection.d.ts +15 -0
- package/build/types/src/stavetempo.d.ts +25 -0
- package/build/types/src/stavetext.d.ts +25 -0
- package/build/types/src/stavetie.d.ts +59 -0
- package/build/types/src/stavevolta.d.ts +21 -0
- package/build/types/src/stem.d.ts +58 -0
- package/build/types/src/stemmablenote.d.ts +39 -0
- package/build/types/src/stringnumber.d.ts +27 -0
- package/build/types/src/strokes.d.ts +33 -0
- package/build/types/src/svgcontext.d.ts +131 -0
- package/build/types/src/system.d.ts +92 -0
- package/build/types/src/tables.d.ts +96 -0
- package/build/types/src/tabnote.d.ts +44 -0
- package/build/types/src/tabslide.d.ts +34 -0
- package/build/types/src/tabstave.d.ts +7 -0
- package/build/types/src/tabtie.d.ts +18 -0
- package/build/types/src/textbracket.d.ts +55 -0
- package/build/types/src/textdynamics.d.ts +39 -0
- package/build/types/src/textformatter.d.ts +109 -0
- package/build/types/src/textnote.d.ts +49 -0
- package/build/types/src/tickable.d.ts +140 -0
- package/build/types/src/tickcontext.d.ts +82 -0
- package/build/types/src/timesigglyph.d.ts +14 -0
- package/build/types/src/timesignature.d.ts +26 -0
- package/build/types/src/timesignote.d.ts +11 -0
- package/build/types/src/tremolo.d.ts +17 -0
- package/build/types/src/tuning.d.ts +23 -0
- package/build/types/src/tuplet.d.ts +105 -0
- package/build/types/src/typeguard.d.ts +99 -0
- package/build/types/src/util.d.ts +27 -0
- package/build/types/src/version.d.ts +3 -0
- package/build/types/src/vex.d.ts +18 -0
- package/build/types/src/vibrato.d.ts +29 -0
- package/build/types/src/vibratobracket.d.ts +33 -0
- package/build/types/src/voice.d.ts +108 -0
- package/build/types/src/web.d.ts +2 -0
- package/entry/vexflow-bravura.ts +3 -3
- package/entry/vexflow-core.ts +3 -3
- package/entry/vexflow-debug-with-tests.ts +16 -2
- package/entry/vexflow-debug.ts +11 -3
- package/entry/vexflow-gonville.ts +3 -3
- package/entry/vexflow-petaluma.ts +3 -3
- package/entry/vexflow.ts +3 -3
- package/package.json +1 -1
- package/src/annotation.ts +38 -6
- package/src/articulation.ts +8 -2
- package/src/beam.ts +53 -6
- package/src/easyscore.ts +11 -1
- package/src/factory.ts +16 -2
- package/src/flow.ts +35 -20
- package/src/font.ts +0 -4
- package/src/fonts/gonville_glyphs.ts +4 -4
- package/src/formatter.ts +24 -8
- package/src/glyph.ts +8 -0
- package/src/index.ts +2 -7
- package/src/note.ts +2 -1
- package/src/staveline.ts +2 -5
- package/src/stavenote.ts +13 -9
- package/src/stavetext.ts +3 -3
- package/src/system.ts +1 -7
- package/src/textnote.ts +9 -11
|
@@ -0,0 +1,206 @@
|
|
|
1
|
+
import { Glyph } from './glyph.js';
|
|
2
|
+
import { Modifier } from './modifier.js';
|
|
3
|
+
import { Stem } from './stem.js';
|
|
4
|
+
import { Tables } from './tables.js';
|
|
5
|
+
import { TickContext } from './tickcontext.js';
|
|
6
|
+
import { isTabNote } from './typeguard.js';
|
|
7
|
+
import { defined, log, RuntimeError } from './util.js';
|
|
8
|
+
function L(...args) {
|
|
9
|
+
if (Ornament.DEBUG)
|
|
10
|
+
log('Vex.Flow.Ornament', args);
|
|
11
|
+
}
|
|
12
|
+
export class Ornament extends Modifier {
|
|
13
|
+
constructor(type) {
|
|
14
|
+
super();
|
|
15
|
+
this.type = type;
|
|
16
|
+
this.delayed = false;
|
|
17
|
+
this.render_options = {
|
|
18
|
+
font_scale: 38,
|
|
19
|
+
accidentalLowerPadding: 3,
|
|
20
|
+
accidentalUpperPadding: 3,
|
|
21
|
+
};
|
|
22
|
+
this.ornament = Tables.ornamentCodes(this.type);
|
|
23
|
+
const metrics = this.getMetrics();
|
|
24
|
+
this.adjustForStemDirection = false;
|
|
25
|
+
this.reportedWidth = metrics && metrics.reportedWidth ? metrics.reportedWidth : 0;
|
|
26
|
+
this.stemUpYOffset = metrics && metrics.stemUpYOffset ? metrics.stemUpYOffset : 0;
|
|
27
|
+
this.ornamentAlignWithNoteHead = Ornament.ornamentAlignWithNoteHead.indexOf(this.type) >= 0;
|
|
28
|
+
if (!this.ornament) {
|
|
29
|
+
throw new RuntimeError('ArgumentError', `Ornament not found: '${this.type}'`);
|
|
30
|
+
}
|
|
31
|
+
this.x_shift = metrics ? metrics.xOffset : 0;
|
|
32
|
+
this.y_shift = metrics ? metrics.yOffset : 0;
|
|
33
|
+
this.glyph = new Glyph(this.ornament.code, this.render_options.font_scale, {
|
|
34
|
+
category: `ornament.${this.ornament.code}`,
|
|
35
|
+
});
|
|
36
|
+
if (Ornament.ornamentNoteTransition.indexOf(this.type) >= 0) {
|
|
37
|
+
this.delayed = true;
|
|
38
|
+
}
|
|
39
|
+
if (!metrics) {
|
|
40
|
+
this.glyph.setOrigin(0.5, 1.0);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
static get CATEGORY() {
|
|
44
|
+
return "Ornament";
|
|
45
|
+
}
|
|
46
|
+
static format(ornaments, state) {
|
|
47
|
+
if (!ornaments || ornaments.length === 0)
|
|
48
|
+
return false;
|
|
49
|
+
let width = 0;
|
|
50
|
+
let right_shift = state.right_shift;
|
|
51
|
+
let left_shift = state.left_shift;
|
|
52
|
+
let yOffset = 0;
|
|
53
|
+
for (let i = 0; i < ornaments.length; ++i) {
|
|
54
|
+
const ornament = ornaments[i];
|
|
55
|
+
const increment = 2;
|
|
56
|
+
if (Ornament.ornamentRelease.indexOf(ornament.type) >= 0) {
|
|
57
|
+
ornament.x_shift += right_shift + 2;
|
|
58
|
+
}
|
|
59
|
+
if (Ornament.ornamentAttack.indexOf(ornament.type) >= 0) {
|
|
60
|
+
ornament.x_shift -= left_shift + 2;
|
|
61
|
+
}
|
|
62
|
+
if (ornament.reportedWidth && ornament.x_shift < 0) {
|
|
63
|
+
left_shift += ornament.reportedWidth;
|
|
64
|
+
}
|
|
65
|
+
else if (ornament.reportedWidth && ornament.x_shift > 0) {
|
|
66
|
+
right_shift += ornament.reportedWidth;
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
width = Math.max(ornament.getWidth(), width);
|
|
70
|
+
}
|
|
71
|
+
if (Ornament.ornamentArticulation.indexOf(ornament.type) >= 0) {
|
|
72
|
+
const ornamentNote = defined(ornament.note, 'NoAttachedNote');
|
|
73
|
+
if (ornamentNote.getLineNumber() >= 3 || ornament.getPosition() === Modifier.Position.ABOVE) {
|
|
74
|
+
state.top_text_line += increment;
|
|
75
|
+
ornament.y_shift += yOffset;
|
|
76
|
+
yOffset -= ornament.glyph.bbox.getH();
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
state.text_line += increment;
|
|
80
|
+
ornament.y_shift += yOffset;
|
|
81
|
+
yOffset += ornament.glyph.bbox.getH();
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
if (ornament.getPosition() === Modifier.Position.ABOVE) {
|
|
86
|
+
ornament.setTextLine(state.top_text_line);
|
|
87
|
+
state.top_text_line += increment;
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
ornament.setTextLine(state.text_line);
|
|
91
|
+
state.text_line += increment;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
state.left_shift = left_shift + width / 2;
|
|
96
|
+
state.right_shift = right_shift + width / 2;
|
|
97
|
+
return true;
|
|
98
|
+
}
|
|
99
|
+
static get ornamentNoteTransition() {
|
|
100
|
+
return ['flip', 'jazzTurn', 'smear'];
|
|
101
|
+
}
|
|
102
|
+
static get ornamentAttack() {
|
|
103
|
+
return ['scoop'];
|
|
104
|
+
}
|
|
105
|
+
static get ornamentAlignWithNoteHead() {
|
|
106
|
+
return ['doit', 'fall', 'fallLong', 'doitLong', 'bend', 'plungerClosed', 'plungerOpen', 'scoop'];
|
|
107
|
+
}
|
|
108
|
+
static get ornamentRelease() {
|
|
109
|
+
return ['doit', 'fall', 'fallLong', 'doitLong', 'jazzTurn', 'smear', 'flip'];
|
|
110
|
+
}
|
|
111
|
+
static get ornamentArticulation() {
|
|
112
|
+
return ['bend', 'plungerClosed', 'plungerOpen'];
|
|
113
|
+
}
|
|
114
|
+
getMetrics() {
|
|
115
|
+
return Tables.currentMusicFont().getMetrics().glyphs.jazzOrnaments[this.ornament.code];
|
|
116
|
+
}
|
|
117
|
+
setDelayed(delayed) {
|
|
118
|
+
this.delayed = delayed;
|
|
119
|
+
return this;
|
|
120
|
+
}
|
|
121
|
+
setUpperAccidental(accid) {
|
|
122
|
+
const scale = this.render_options.font_scale / 1.3;
|
|
123
|
+
this.accidentalUpper = new Glyph(Tables.accidentalCodes(accid).code, scale);
|
|
124
|
+
this.accidentalUpper.setOrigin(0.5, 1.0);
|
|
125
|
+
return this;
|
|
126
|
+
}
|
|
127
|
+
setLowerAccidental(accid) {
|
|
128
|
+
const scale = this.render_options.font_scale / 1.3;
|
|
129
|
+
this.accidentalLower = new Glyph(Tables.accidentalCodes(accid).code, scale);
|
|
130
|
+
this.accidentalLower.setOrigin(0.5, 1.0);
|
|
131
|
+
return this;
|
|
132
|
+
}
|
|
133
|
+
draw() {
|
|
134
|
+
const ctx = this.checkContext();
|
|
135
|
+
const note = this.checkAttachedNote();
|
|
136
|
+
this.setRendered();
|
|
137
|
+
const stemDir = note.getStemDirection();
|
|
138
|
+
const stave = note.checkStave();
|
|
139
|
+
const classString = Object.keys(this.getAttribute('classes')).join(' ');
|
|
140
|
+
ctx.openGroup(classString, this.getAttribute('id'));
|
|
141
|
+
const stemExtents = note.checkStem().getExtents();
|
|
142
|
+
let y = stemDir === Stem.DOWN ? stemExtents.baseY : stemExtents.topY;
|
|
143
|
+
if (isTabNote(note)) {
|
|
144
|
+
if (note.hasStem()) {
|
|
145
|
+
if (stemDir === Stem.DOWN) {
|
|
146
|
+
y = stave.getYForTopText(this.text_line);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
y = stave.getYForTopText(this.text_line);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
const isPlacedOnNoteheadSide = stemDir === Stem.DOWN;
|
|
154
|
+
const spacing = stave.getSpacingBetweenLines();
|
|
155
|
+
let lineSpacing = 1;
|
|
156
|
+
if (!isPlacedOnNoteheadSide && note.hasBeam()) {
|
|
157
|
+
lineSpacing += 0.5;
|
|
158
|
+
}
|
|
159
|
+
const totalSpacing = spacing * (this.text_line + lineSpacing);
|
|
160
|
+
const glyphYBetweenLines = y - totalSpacing;
|
|
161
|
+
const start = note.getModifierStartXY(this.position, this.index);
|
|
162
|
+
let glyphX = start.x;
|
|
163
|
+
let glyphY = this.ornamentAlignWithNoteHead
|
|
164
|
+
? start.y
|
|
165
|
+
: Math.min(stave.getYForTopText(this.text_line), glyphYBetweenLines);
|
|
166
|
+
glyphY += this.y_shift;
|
|
167
|
+
if (this.delayed) {
|
|
168
|
+
let delayXShift = 0;
|
|
169
|
+
const startX = glyphX - (stave.getX() - 10);
|
|
170
|
+
if (this.delayXShift !== undefined) {
|
|
171
|
+
delayXShift = this.delayXShift;
|
|
172
|
+
}
|
|
173
|
+
else {
|
|
174
|
+
delayXShift += this.glyph.getMetrics().width / 2;
|
|
175
|
+
const nextContext = TickContext.getNextContext(note.getTickContext());
|
|
176
|
+
if (nextContext) {
|
|
177
|
+
delayXShift += (nextContext.getX() - startX) * 0.5;
|
|
178
|
+
}
|
|
179
|
+
else {
|
|
180
|
+
delayXShift += (stave.getX() + stave.getWidth() - startX) * 0.5;
|
|
181
|
+
}
|
|
182
|
+
this.delayXShift = delayXShift;
|
|
183
|
+
}
|
|
184
|
+
glyphX += delayXShift;
|
|
185
|
+
}
|
|
186
|
+
L('Rendering ornament: ', this.ornament, glyphX, glyphY);
|
|
187
|
+
if (this.accidentalLower) {
|
|
188
|
+
this.accidentalLower.render(ctx, glyphX, glyphY);
|
|
189
|
+
glyphY -= this.accidentalLower.getMetrics().height;
|
|
190
|
+
glyphY -= this.render_options.accidentalLowerPadding;
|
|
191
|
+
}
|
|
192
|
+
if (this.stemUpYOffset && note.hasStem() && note.getStemDirection() === 1) {
|
|
193
|
+
glyphY += this.stemUpYOffset;
|
|
194
|
+
}
|
|
195
|
+
if (note.getLineNumber() < 5 && Ornament.ornamentNoteTransition.indexOf(this.type) >= 0) {
|
|
196
|
+
glyphY = note.checkStave().getBoundingBox().getY() + 40;
|
|
197
|
+
}
|
|
198
|
+
this.glyph.render(ctx, glyphX + this.x_shift, glyphY);
|
|
199
|
+
if (this.accidentalUpper) {
|
|
200
|
+
glyphY -= this.glyph.getMetrics().height + this.render_options.accidentalUpperPadding;
|
|
201
|
+
this.accidentalUpper.render(ctx, glyphX, glyphY);
|
|
202
|
+
}
|
|
203
|
+
ctx.closeGroup();
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
Ornament.DEBUG = false;
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
import { Glyph } from './glyph.js';
|
|
2
|
+
import { Modifier, ModifierPosition } from './modifier.js';
|
|
3
|
+
import { Tables } from './tables.js';
|
|
4
|
+
import { isGraceNote } from './typeguard.js';
|
|
5
|
+
export class Parenthesis extends Modifier {
|
|
6
|
+
constructor(position) {
|
|
7
|
+
super();
|
|
8
|
+
this.position = position !== null && position !== void 0 ? position : Modifier.Position.LEFT;
|
|
9
|
+
this.point = Tables.currentMusicFont().lookupMetric('parenthesis.default.point');
|
|
10
|
+
this.setWidth(Tables.currentMusicFont().lookupMetric('parenthesis.default.width'));
|
|
11
|
+
}
|
|
12
|
+
static get CATEGORY() {
|
|
13
|
+
return "Parenthesis";
|
|
14
|
+
}
|
|
15
|
+
static buildAndAttach(notes) {
|
|
16
|
+
for (const note of notes) {
|
|
17
|
+
for (let i = 0; i < note.keys.length; i++) {
|
|
18
|
+
note.addModifier(new Parenthesis(ModifierPosition.LEFT), i);
|
|
19
|
+
note.addModifier(new Parenthesis(ModifierPosition.RIGHT), i);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
static format(parentheses, state) {
|
|
24
|
+
if (!parentheses || parentheses.length === 0)
|
|
25
|
+
return false;
|
|
26
|
+
let x_widthL = 0;
|
|
27
|
+
let x_widthR = 0;
|
|
28
|
+
for (let i = 0; i < parentheses.length; ++i) {
|
|
29
|
+
const parenthesis = parentheses[i];
|
|
30
|
+
const note = parenthesis.getNote();
|
|
31
|
+
const pos = parenthesis.getPosition();
|
|
32
|
+
const index = parenthesis.checkIndex();
|
|
33
|
+
let shift = 0;
|
|
34
|
+
if (pos === ModifierPosition.RIGHT) {
|
|
35
|
+
shift = note.getRightParenthesisPx(index);
|
|
36
|
+
x_widthR = x_widthR > shift + parenthesis.width ? x_widthR : shift + parenthesis.width;
|
|
37
|
+
}
|
|
38
|
+
if (pos === ModifierPosition.LEFT) {
|
|
39
|
+
shift = note.getLeftParenthesisPx(index);
|
|
40
|
+
x_widthL = x_widthL > shift + parenthesis.width ? x_widthL : shift + parenthesis.width;
|
|
41
|
+
}
|
|
42
|
+
parenthesis.setXShift(shift);
|
|
43
|
+
}
|
|
44
|
+
state.left_shift += x_widthL;
|
|
45
|
+
state.right_shift += x_widthR;
|
|
46
|
+
return true;
|
|
47
|
+
}
|
|
48
|
+
setNote(note) {
|
|
49
|
+
this.note = note;
|
|
50
|
+
this.point = Tables.currentMusicFont().lookupMetric('parenthesis.default.point');
|
|
51
|
+
this.setWidth(Tables.currentMusicFont().lookupMetric('parenthesis.default.width'));
|
|
52
|
+
if (isGraceNote(note)) {
|
|
53
|
+
this.point = Tables.currentMusicFont().lookupMetric('parenthesis.gracenote.point');
|
|
54
|
+
this.setWidth(Tables.currentMusicFont().lookupMetric('parenthesis.gracenote.width'));
|
|
55
|
+
}
|
|
56
|
+
return this;
|
|
57
|
+
}
|
|
58
|
+
draw() {
|
|
59
|
+
const ctx = this.checkContext();
|
|
60
|
+
const note = this.checkAttachedNote();
|
|
61
|
+
this.setRendered();
|
|
62
|
+
const start = note.getModifierStartXY(this.position, this.index, { forceFlagRight: true });
|
|
63
|
+
const x = start.x + this.x_shift;
|
|
64
|
+
const y = start.y + this.y_shift;
|
|
65
|
+
if (this.position == Modifier.Position.RIGHT) {
|
|
66
|
+
Glyph.renderGlyph(ctx, x + 1, y, this.point, 'noteheadParenthesisRight', {
|
|
67
|
+
category: `noteHead.standard.noteheadParenthesisRight`,
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
else if (this.position == Modifier.Position.LEFT) {
|
|
71
|
+
Glyph.renderGlyph(ctx, x - 2, y, this.point, 'noteheadParenthesisLeft', {
|
|
72
|
+
category: `noteHead.standard.noteheadParenthesisLeft`,
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
import { log, RuntimeError } from './util.js';
|
|
2
|
+
function L(...args) {
|
|
3
|
+
if (Parser.DEBUG)
|
|
4
|
+
log('Vex.Flow.Parser', args);
|
|
5
|
+
}
|
|
6
|
+
const NO_ERROR_POS = -1;
|
|
7
|
+
function flattenMatches(r) {
|
|
8
|
+
if ('matchedString' in r)
|
|
9
|
+
return r.matchedString;
|
|
10
|
+
if ('results' in r)
|
|
11
|
+
return flattenMatches(r.results);
|
|
12
|
+
const results = r;
|
|
13
|
+
if (results.length === 1)
|
|
14
|
+
return flattenMatches(results[0]);
|
|
15
|
+
if (results.length === 0)
|
|
16
|
+
return null;
|
|
17
|
+
return results.map(flattenMatches);
|
|
18
|
+
}
|
|
19
|
+
export class Parser {
|
|
20
|
+
constructor(grammar) {
|
|
21
|
+
this.grammar = grammar;
|
|
22
|
+
this.line = '';
|
|
23
|
+
this.pos = 0;
|
|
24
|
+
this.errorPos = NO_ERROR_POS;
|
|
25
|
+
}
|
|
26
|
+
parse(line) {
|
|
27
|
+
this.line = line;
|
|
28
|
+
this.pos = 0;
|
|
29
|
+
this.errorPos = NO_ERROR_POS;
|
|
30
|
+
const result = this.expect(this.grammar.begin());
|
|
31
|
+
result.errorPos = this.errorPos;
|
|
32
|
+
return result;
|
|
33
|
+
}
|
|
34
|
+
matchFail(returnPos) {
|
|
35
|
+
if (this.errorPos === NO_ERROR_POS)
|
|
36
|
+
this.errorPos = this.pos;
|
|
37
|
+
this.pos = returnPos;
|
|
38
|
+
}
|
|
39
|
+
matchSuccess() {
|
|
40
|
+
this.errorPos = NO_ERROR_POS;
|
|
41
|
+
}
|
|
42
|
+
matchToken(token, noSpace = false) {
|
|
43
|
+
const regexp = noSpace ? new RegExp('^((' + token + '))') : new RegExp('^((' + token + ')\\s*)');
|
|
44
|
+
const workingLine = this.line.slice(this.pos);
|
|
45
|
+
const result = workingLine.match(regexp);
|
|
46
|
+
if (result !== null) {
|
|
47
|
+
return {
|
|
48
|
+
success: true,
|
|
49
|
+
matchedString: result[2],
|
|
50
|
+
incrementPos: result[1].length,
|
|
51
|
+
pos: this.pos,
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
return { success: false, pos: this.pos };
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
expectOne(rule, maybe = false) {
|
|
59
|
+
const results = [];
|
|
60
|
+
const pos = this.pos;
|
|
61
|
+
let allMatches = true;
|
|
62
|
+
let oneMatch = false;
|
|
63
|
+
maybe = maybe === true || rule.maybe === true;
|
|
64
|
+
if (rule.expect) {
|
|
65
|
+
for (const next of rule.expect) {
|
|
66
|
+
const localPos = this.pos;
|
|
67
|
+
const result = this.expect(next);
|
|
68
|
+
if (result.success) {
|
|
69
|
+
results.push(result);
|
|
70
|
+
oneMatch = true;
|
|
71
|
+
if (rule.or)
|
|
72
|
+
break;
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
allMatches = false;
|
|
76
|
+
if (!rule.or) {
|
|
77
|
+
this.pos = localPos;
|
|
78
|
+
break;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
const gotOne = (rule.or && oneMatch) || allMatches;
|
|
84
|
+
const success = gotOne || maybe === true;
|
|
85
|
+
const numMatches = gotOne ? 1 : 0;
|
|
86
|
+
if (maybe && !gotOne)
|
|
87
|
+
this.pos = pos;
|
|
88
|
+
if (success) {
|
|
89
|
+
this.matchSuccess();
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
this.matchFail(pos);
|
|
93
|
+
}
|
|
94
|
+
return { success, results, numMatches };
|
|
95
|
+
}
|
|
96
|
+
expectOneOrMore(rule, maybe = false) {
|
|
97
|
+
const results = [];
|
|
98
|
+
const pos = this.pos;
|
|
99
|
+
let numMatches = 0;
|
|
100
|
+
let more = true;
|
|
101
|
+
do {
|
|
102
|
+
const result = this.expectOne(rule);
|
|
103
|
+
if (result.success && result.results) {
|
|
104
|
+
numMatches++;
|
|
105
|
+
results.push(result.results);
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
more = false;
|
|
109
|
+
}
|
|
110
|
+
} while (more);
|
|
111
|
+
const success = numMatches > 0 || maybe === true;
|
|
112
|
+
if (maybe && !(numMatches > 0))
|
|
113
|
+
this.pos = pos;
|
|
114
|
+
if (success) {
|
|
115
|
+
this.matchSuccess();
|
|
116
|
+
}
|
|
117
|
+
else {
|
|
118
|
+
this.matchFail(pos);
|
|
119
|
+
}
|
|
120
|
+
return { success, results, numMatches };
|
|
121
|
+
}
|
|
122
|
+
expectZeroOrMore(rule) {
|
|
123
|
+
return this.expectOneOrMore(rule, true);
|
|
124
|
+
}
|
|
125
|
+
expect(ruleFunc) {
|
|
126
|
+
L('Evaluating rule function:', ruleFunc);
|
|
127
|
+
if (!ruleFunc) {
|
|
128
|
+
throw new RuntimeError('Invalid rule function');
|
|
129
|
+
}
|
|
130
|
+
let result;
|
|
131
|
+
const rule = ruleFunc.bind(this.grammar)();
|
|
132
|
+
if (rule.token) {
|
|
133
|
+
result = this.matchToken(rule.token, rule.noSpace === true);
|
|
134
|
+
if (result.success) {
|
|
135
|
+
this.pos += result.incrementPos;
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
else if (rule.expect) {
|
|
139
|
+
if (rule.oneOrMore) {
|
|
140
|
+
result = this.expectOneOrMore(rule);
|
|
141
|
+
}
|
|
142
|
+
else if (rule.zeroOrMore) {
|
|
143
|
+
result = this.expectZeroOrMore(rule);
|
|
144
|
+
}
|
|
145
|
+
else {
|
|
146
|
+
result = this.expectOne(rule);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
L(rule);
|
|
151
|
+
throw new RuntimeError('Bad grammar! No `token` or `expect` property ' + rule);
|
|
152
|
+
}
|
|
153
|
+
const matches = [];
|
|
154
|
+
result.matches = matches;
|
|
155
|
+
if (result.results) {
|
|
156
|
+
result.results.forEach((r) => matches.push(flattenMatches(r)));
|
|
157
|
+
}
|
|
158
|
+
if (rule.run && result.success) {
|
|
159
|
+
rule.run({ matches });
|
|
160
|
+
}
|
|
161
|
+
return result;
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
Parser.DEBUG = false;
|
|
@@ -0,0 +1,192 @@
|
|
|
1
|
+
import { Element } from './element.js';
|
|
2
|
+
import { Font, FontStyle, FontWeight } from './font.js';
|
|
3
|
+
import { Glyph } from './glyph.js';
|
|
4
|
+
import { Tables } from './tables.js';
|
|
5
|
+
import { log, RuntimeError } from './util.js';
|
|
6
|
+
function L(...args) {
|
|
7
|
+
if (PedalMarking.DEBUG)
|
|
8
|
+
log('Vex.Flow.PedalMarking', args);
|
|
9
|
+
}
|
|
10
|
+
function drawPedalGlyph(name, context, x, y, point) {
|
|
11
|
+
const glyph_data = PedalMarking.GLYPHS[name];
|
|
12
|
+
const glyph = new Glyph(glyph_data.code, point, { category: 'pedalMarking' });
|
|
13
|
+
glyph.render(context, x + glyph_data.x_shift, y + glyph_data.y_shift);
|
|
14
|
+
}
|
|
15
|
+
export class PedalMarking extends Element {
|
|
16
|
+
constructor(notes) {
|
|
17
|
+
super();
|
|
18
|
+
this.notes = notes;
|
|
19
|
+
this.type = PedalMarking.type.TEXT;
|
|
20
|
+
this.line = 0;
|
|
21
|
+
this.custom_depress_text = '';
|
|
22
|
+
this.custom_release_text = '';
|
|
23
|
+
this.resetFont();
|
|
24
|
+
this.render_options = {
|
|
25
|
+
bracket_height: 10,
|
|
26
|
+
text_margin_right: 6,
|
|
27
|
+
bracket_line_width: 1,
|
|
28
|
+
color: 'black',
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
static get CATEGORY() {
|
|
32
|
+
return "PedalMarking";
|
|
33
|
+
}
|
|
34
|
+
static createSustain(notes) {
|
|
35
|
+
const pedal = new PedalMarking(notes);
|
|
36
|
+
return pedal;
|
|
37
|
+
}
|
|
38
|
+
static createSostenuto(notes) {
|
|
39
|
+
const pedal = new PedalMarking(notes);
|
|
40
|
+
pedal.setType(PedalMarking.type.MIXED);
|
|
41
|
+
pedal.setCustomText('Sost. Ped.');
|
|
42
|
+
return pedal;
|
|
43
|
+
}
|
|
44
|
+
static createUnaCorda(notes) {
|
|
45
|
+
const pedal = new PedalMarking(notes);
|
|
46
|
+
pedal.setType(PedalMarking.type.TEXT);
|
|
47
|
+
pedal.setCustomText('una corda', 'tre corda');
|
|
48
|
+
return pedal;
|
|
49
|
+
}
|
|
50
|
+
setType(type) {
|
|
51
|
+
type = typeof type === 'string' ? PedalMarking.typeString[type] : type;
|
|
52
|
+
if (type >= PedalMarking.type.TEXT && type <= PedalMarking.type.MIXED) {
|
|
53
|
+
this.type = type;
|
|
54
|
+
}
|
|
55
|
+
return this;
|
|
56
|
+
}
|
|
57
|
+
setCustomText(depress, release) {
|
|
58
|
+
this.custom_depress_text = depress || '';
|
|
59
|
+
this.custom_release_text = release || '';
|
|
60
|
+
return this;
|
|
61
|
+
}
|
|
62
|
+
setLine(line) {
|
|
63
|
+
this.line = line;
|
|
64
|
+
return this;
|
|
65
|
+
}
|
|
66
|
+
drawBracketed() {
|
|
67
|
+
const ctx = this.checkContext();
|
|
68
|
+
let is_pedal_depressed = false;
|
|
69
|
+
let prev_x;
|
|
70
|
+
let prev_y;
|
|
71
|
+
this.notes.forEach((note, index, notes) => {
|
|
72
|
+
is_pedal_depressed = !is_pedal_depressed;
|
|
73
|
+
const x = note.getAbsoluteX();
|
|
74
|
+
const y = note.checkStave().getYForBottomText(this.line + 3);
|
|
75
|
+
if (x < prev_x) {
|
|
76
|
+
throw new RuntimeError('InvalidConfiguration', 'The notes provided must be in order of ascending x positions');
|
|
77
|
+
}
|
|
78
|
+
const next_is_same = notes[index + 1] === note;
|
|
79
|
+
const prev_is_same = notes[index - 1] === note;
|
|
80
|
+
let x_shift = 0;
|
|
81
|
+
const point = Tables.currentMusicFont().lookupMetric(`pedalMarking.${is_pedal_depressed ? 'down' : 'up'}.point`);
|
|
82
|
+
if (is_pedal_depressed) {
|
|
83
|
+
x_shift = prev_is_same ? 5 : 0;
|
|
84
|
+
if (this.type === PedalMarking.type.MIXED && !prev_is_same) {
|
|
85
|
+
if (this.custom_depress_text) {
|
|
86
|
+
const text_width = ctx.measureText(this.custom_depress_text).width;
|
|
87
|
+
ctx.fillText(this.custom_depress_text, x - text_width / 2, y);
|
|
88
|
+
x_shift = text_width / 2 + this.render_options.text_margin_right;
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
drawPedalGlyph('pedal_depress', ctx, x, y, point);
|
|
92
|
+
x_shift = 20 + this.render_options.text_margin_right;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
ctx.beginPath();
|
|
97
|
+
ctx.moveTo(x, y - this.render_options.bracket_height);
|
|
98
|
+
ctx.lineTo(x + x_shift, y);
|
|
99
|
+
ctx.stroke();
|
|
100
|
+
ctx.closePath();
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
x_shift = next_is_same ? -5 : 0;
|
|
105
|
+
ctx.beginPath();
|
|
106
|
+
ctx.moveTo(prev_x, prev_y);
|
|
107
|
+
ctx.lineTo(x + x_shift, y);
|
|
108
|
+
ctx.lineTo(x, y - this.render_options.bracket_height);
|
|
109
|
+
ctx.stroke();
|
|
110
|
+
ctx.closePath();
|
|
111
|
+
}
|
|
112
|
+
prev_x = x + x_shift;
|
|
113
|
+
prev_y = y;
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
drawText() {
|
|
117
|
+
const ctx = this.checkContext();
|
|
118
|
+
let is_pedal_depressed = false;
|
|
119
|
+
this.notes.forEach((note) => {
|
|
120
|
+
is_pedal_depressed = !is_pedal_depressed;
|
|
121
|
+
const stave = note.checkStave();
|
|
122
|
+
const x = note.getAbsoluteX();
|
|
123
|
+
const y = stave.getYForBottomText(this.line + 3);
|
|
124
|
+
const point = Tables.currentMusicFont().lookupMetric(`pedalMarking.${is_pedal_depressed ? 'down' : 'up'}.point`);
|
|
125
|
+
let text_width = 0;
|
|
126
|
+
if (is_pedal_depressed) {
|
|
127
|
+
if (this.custom_depress_text) {
|
|
128
|
+
text_width = ctx.measureText(this.custom_depress_text).width;
|
|
129
|
+
ctx.fillText(this.custom_depress_text, x - text_width / 2, y);
|
|
130
|
+
}
|
|
131
|
+
else {
|
|
132
|
+
drawPedalGlyph('pedal_depress', ctx, x, y, point);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
else {
|
|
136
|
+
if (this.custom_release_text) {
|
|
137
|
+
text_width = ctx.measureText(this.custom_release_text).width;
|
|
138
|
+
ctx.fillText(this.custom_release_text, x - text_width / 2, y);
|
|
139
|
+
}
|
|
140
|
+
else {
|
|
141
|
+
drawPedalGlyph('pedal_release', ctx, x, y, point);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
});
|
|
145
|
+
}
|
|
146
|
+
draw() {
|
|
147
|
+
const ctx = this.checkContext();
|
|
148
|
+
this.setRendered();
|
|
149
|
+
ctx.save();
|
|
150
|
+
ctx.setStrokeStyle(this.render_options.color);
|
|
151
|
+
ctx.setFillStyle(this.render_options.color);
|
|
152
|
+
ctx.setFont(this.textFont);
|
|
153
|
+
L('Rendering Pedal Marking');
|
|
154
|
+
if (this.type === PedalMarking.type.BRACKET || this.type === PedalMarking.type.MIXED) {
|
|
155
|
+
ctx.setLineWidth(this.render_options.bracket_line_width);
|
|
156
|
+
this.drawBracketed();
|
|
157
|
+
}
|
|
158
|
+
else if (this.type === PedalMarking.type.TEXT) {
|
|
159
|
+
this.drawText();
|
|
160
|
+
}
|
|
161
|
+
ctx.restore();
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
PedalMarking.DEBUG = false;
|
|
165
|
+
PedalMarking.TEXT_FONT = {
|
|
166
|
+
family: Font.SERIF,
|
|
167
|
+
size: 12,
|
|
168
|
+
weight: FontWeight.BOLD,
|
|
169
|
+
style: FontStyle.ITALIC,
|
|
170
|
+
};
|
|
171
|
+
PedalMarking.GLYPHS = {
|
|
172
|
+
pedal_depress: {
|
|
173
|
+
code: 'keyboardPedalPed',
|
|
174
|
+
x_shift: -10,
|
|
175
|
+
y_shift: 0,
|
|
176
|
+
},
|
|
177
|
+
pedal_release: {
|
|
178
|
+
code: 'keyboardPedalUp',
|
|
179
|
+
x_shift: -2,
|
|
180
|
+
y_shift: 3,
|
|
181
|
+
},
|
|
182
|
+
};
|
|
183
|
+
PedalMarking.type = {
|
|
184
|
+
TEXT: 1,
|
|
185
|
+
BRACKET: 2,
|
|
186
|
+
MIXED: 3,
|
|
187
|
+
};
|
|
188
|
+
PedalMarking.typeString = {
|
|
189
|
+
text: PedalMarking.type.TEXT,
|
|
190
|
+
bracket: PedalMarking.type.BRACKET,
|
|
191
|
+
mixed: PedalMarking.type.MIXED,
|
|
192
|
+
};
|