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,232 @@
|
|
|
1
|
+
import { Element } from './element.js';
|
|
2
|
+
import { Modifier, ModifierPosition } from './modifier.js';
|
|
3
|
+
import { Stem } from './stem.js';
|
|
4
|
+
import { Tables } from './tables.js';
|
|
5
|
+
import { TextFormatter } from './textformatter.js';
|
|
6
|
+
import { isStemmableNote, isTabNote } from './typeguard.js';
|
|
7
|
+
import { log } from './util.js';
|
|
8
|
+
function L(...args) {
|
|
9
|
+
if (Annotation.DEBUG)
|
|
10
|
+
log('Vex.Flow.Annotation', args);
|
|
11
|
+
}
|
|
12
|
+
export var AnnotationHorizontalJustify;
|
|
13
|
+
(function (AnnotationHorizontalJustify) {
|
|
14
|
+
AnnotationHorizontalJustify[AnnotationHorizontalJustify["LEFT"] = 1] = "LEFT";
|
|
15
|
+
AnnotationHorizontalJustify[AnnotationHorizontalJustify["CENTER"] = 2] = "CENTER";
|
|
16
|
+
AnnotationHorizontalJustify[AnnotationHorizontalJustify["RIGHT"] = 3] = "RIGHT";
|
|
17
|
+
AnnotationHorizontalJustify[AnnotationHorizontalJustify["CENTER_STEM"] = 4] = "CENTER_STEM";
|
|
18
|
+
})(AnnotationHorizontalJustify || (AnnotationHorizontalJustify = {}));
|
|
19
|
+
export var AnnotationVerticalJustify;
|
|
20
|
+
(function (AnnotationVerticalJustify) {
|
|
21
|
+
AnnotationVerticalJustify[AnnotationVerticalJustify["TOP"] = 1] = "TOP";
|
|
22
|
+
AnnotationVerticalJustify[AnnotationVerticalJustify["CENTER"] = 2] = "CENTER";
|
|
23
|
+
AnnotationVerticalJustify[AnnotationVerticalJustify["BOTTOM"] = 3] = "BOTTOM";
|
|
24
|
+
AnnotationVerticalJustify[AnnotationVerticalJustify["CENTER_STEM"] = 4] = "CENTER_STEM";
|
|
25
|
+
})(AnnotationVerticalJustify || (AnnotationVerticalJustify = {}));
|
|
26
|
+
export class Annotation extends Modifier {
|
|
27
|
+
constructor(text) {
|
|
28
|
+
super();
|
|
29
|
+
this.text = text;
|
|
30
|
+
this.horizontalJustification = AnnotationHorizontalJustify.CENTER;
|
|
31
|
+
this.verticalJustification = AnnotationVerticalJustify.TOP;
|
|
32
|
+
this.resetFont();
|
|
33
|
+
this.setWidth(Tables.textWidth(text));
|
|
34
|
+
}
|
|
35
|
+
static get CATEGORY() {
|
|
36
|
+
return "Annotation";
|
|
37
|
+
}
|
|
38
|
+
static format(annotations, state) {
|
|
39
|
+
if (!annotations || annotations.length === 0)
|
|
40
|
+
return false;
|
|
41
|
+
let leftWidth = 0;
|
|
42
|
+
let rightWidth = 0;
|
|
43
|
+
let maxLeftGlyphWidth = 0;
|
|
44
|
+
let maxRightGlyphWidth = 0;
|
|
45
|
+
for (let i = 0; i < annotations.length; ++i) {
|
|
46
|
+
const annotation = annotations[i];
|
|
47
|
+
const textFormatter = TextFormatter.create(annotation.textFont);
|
|
48
|
+
const textLines = (5 + textFormatter.maxHeight) / Tables.STAVE_LINE_DISTANCE;
|
|
49
|
+
let verticalSpaceNeeded = textLines;
|
|
50
|
+
const note = annotation.checkAttachedNote();
|
|
51
|
+
const glyphWidth = note.getGlyph().getWidth();
|
|
52
|
+
const textWidth = textFormatter.getWidthForTextInPx(annotation.text);
|
|
53
|
+
if (annotation.horizontalJustification === AnnotationHorizontalJustify.LEFT) {
|
|
54
|
+
maxLeftGlyphWidth = Math.max(glyphWidth, maxLeftGlyphWidth);
|
|
55
|
+
leftWidth = Math.max(leftWidth, textWidth);
|
|
56
|
+
}
|
|
57
|
+
else if (annotation.horizontalJustification === AnnotationHorizontalJustify.RIGHT) {
|
|
58
|
+
maxRightGlyphWidth = Math.max(glyphWidth, maxLeftGlyphWidth);
|
|
59
|
+
rightWidth = Math.max(rightWidth, textWidth);
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
leftWidth = Math.max(leftWidth, textWidth / 2);
|
|
63
|
+
rightWidth = Math.max(rightWidth, textWidth / 2);
|
|
64
|
+
maxLeftGlyphWidth = Math.max(glyphWidth / 2, maxLeftGlyphWidth);
|
|
65
|
+
maxRightGlyphWidth = Math.max(glyphWidth / 2, maxRightGlyphWidth);
|
|
66
|
+
}
|
|
67
|
+
const stave = note.getStave();
|
|
68
|
+
const stemDirection = note.hasStem() ? note.getStemDirection() : Stem.UP;
|
|
69
|
+
let stemHeight = 0;
|
|
70
|
+
let lines = 5;
|
|
71
|
+
if (isTabNote(note)) {
|
|
72
|
+
if (note.render_options.draw_stem) {
|
|
73
|
+
const stem = note.getStem();
|
|
74
|
+
if (stem) {
|
|
75
|
+
stemHeight = Math.abs(stem.getHeight()) / Tables.STAVE_LINE_DISTANCE;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
stemHeight = 0;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
else if (isStemmableNote(note)) {
|
|
83
|
+
const stem = note.getStem();
|
|
84
|
+
if (stem && note.getNoteType() === 'n') {
|
|
85
|
+
stemHeight = Math.abs(stem.getHeight()) / Tables.STAVE_LINE_DISTANCE;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
if (stave) {
|
|
89
|
+
lines = stave.getNumLines();
|
|
90
|
+
}
|
|
91
|
+
if (annotation.verticalJustification === this.VerticalJustify.TOP) {
|
|
92
|
+
let noteLine = note.getLineNumber(true);
|
|
93
|
+
if (isTabNote(note)) {
|
|
94
|
+
noteLine = lines - (note.leastString() - 0.5);
|
|
95
|
+
}
|
|
96
|
+
if (stemDirection === Stem.UP) {
|
|
97
|
+
noteLine += stemHeight;
|
|
98
|
+
}
|
|
99
|
+
const curTop = noteLine + state.top_text_line + 0.5;
|
|
100
|
+
if (curTop < lines) {
|
|
101
|
+
annotation.setTextLine(lines - noteLine);
|
|
102
|
+
verticalSpaceNeeded += lines - noteLine;
|
|
103
|
+
state.top_text_line = verticalSpaceNeeded;
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
106
|
+
annotation.setTextLine(state.top_text_line);
|
|
107
|
+
state.top_text_line += verticalSpaceNeeded;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
else if (annotation.verticalJustification === this.VerticalJustify.BOTTOM) {
|
|
111
|
+
let noteLine = lines - note.getLineNumber();
|
|
112
|
+
if (isTabNote(note)) {
|
|
113
|
+
noteLine = note.greatestString() - 1;
|
|
114
|
+
}
|
|
115
|
+
if (stemDirection === Stem.DOWN) {
|
|
116
|
+
noteLine += stemHeight;
|
|
117
|
+
}
|
|
118
|
+
const curBottom = noteLine + state.text_line + 1;
|
|
119
|
+
if (curBottom < lines) {
|
|
120
|
+
annotation.setTextLine(lines - curBottom);
|
|
121
|
+
verticalSpaceNeeded += lines - curBottom;
|
|
122
|
+
state.text_line = verticalSpaceNeeded;
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
annotation.setTextLine(state.text_line);
|
|
126
|
+
state.text_line += verticalSpaceNeeded;
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
else {
|
|
130
|
+
annotation.setTextLine(state.text_line);
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
const rightOverlap = Math.min(Math.max(rightWidth - maxRightGlyphWidth, 0), Math.max(rightWidth - state.right_shift, 0));
|
|
134
|
+
const leftOverlap = Math.min(Math.max(leftWidth - maxLeftGlyphWidth, 0), Math.max(leftWidth - state.left_shift, 0));
|
|
135
|
+
state.left_shift += leftOverlap / 2;
|
|
136
|
+
state.right_shift += rightOverlap / 2;
|
|
137
|
+
return true;
|
|
138
|
+
}
|
|
139
|
+
setVerticalJustification(just) {
|
|
140
|
+
this.verticalJustification = typeof just === 'string' ? Annotation.VerticalJustifyString[just] : just;
|
|
141
|
+
return this;
|
|
142
|
+
}
|
|
143
|
+
getJustification() {
|
|
144
|
+
return this.horizontalJustification;
|
|
145
|
+
}
|
|
146
|
+
setJustification(just) {
|
|
147
|
+
this.horizontalJustification = typeof just === 'string' ? Annotation.HorizontalJustifyString[just] : just;
|
|
148
|
+
return this;
|
|
149
|
+
}
|
|
150
|
+
draw() {
|
|
151
|
+
const ctx = this.checkContext();
|
|
152
|
+
const note = this.checkAttachedNote();
|
|
153
|
+
const stemDirection = note.hasStem() ? note.getStemDirection() : Stem.UP;
|
|
154
|
+
const textFormatter = TextFormatter.create(this.textFont);
|
|
155
|
+
const start = note.getModifierStartXY(ModifierPosition.ABOVE, this.index);
|
|
156
|
+
this.setRendered();
|
|
157
|
+
ctx.save();
|
|
158
|
+
const classString = Object.keys(this.getAttribute('classes')).join(' ');
|
|
159
|
+
ctx.openGroup(classString, this.getAttribute('id'));
|
|
160
|
+
ctx.setFont(this.textFont);
|
|
161
|
+
const text_width = ctx.measureText(this.text).width;
|
|
162
|
+
const text_height = textFormatter.maxHeight + 2;
|
|
163
|
+
let x;
|
|
164
|
+
let y;
|
|
165
|
+
if (this.horizontalJustification === AnnotationHorizontalJustify.LEFT) {
|
|
166
|
+
x = start.x;
|
|
167
|
+
}
|
|
168
|
+
else if (this.horizontalJustification === AnnotationHorizontalJustify.RIGHT) {
|
|
169
|
+
x = start.x - text_width;
|
|
170
|
+
}
|
|
171
|
+
else if (this.horizontalJustification === AnnotationHorizontalJustify.CENTER) {
|
|
172
|
+
x = start.x - text_width / 2;
|
|
173
|
+
}
|
|
174
|
+
else {
|
|
175
|
+
x = note.getStemX() - text_width / 2;
|
|
176
|
+
}
|
|
177
|
+
let stem_ext = {};
|
|
178
|
+
let spacing = 0;
|
|
179
|
+
const has_stem = note.hasStem();
|
|
180
|
+
const stave = note.checkStave();
|
|
181
|
+
if (has_stem) {
|
|
182
|
+
stem_ext = note.checkStem().getExtents();
|
|
183
|
+
spacing = stave.getSpacingBetweenLines();
|
|
184
|
+
}
|
|
185
|
+
if (this.verticalJustification === AnnotationVerticalJustify.BOTTOM) {
|
|
186
|
+
const ys = note.getYs();
|
|
187
|
+
y = ys.reduce((a, b) => (a > b ? a : b));
|
|
188
|
+
y += (this.text_line + 1) * Tables.STAVE_LINE_DISTANCE + text_height;
|
|
189
|
+
if (has_stem && stemDirection === Stem.DOWN) {
|
|
190
|
+
y = Math.max(y, stem_ext.topY + text_height + spacing * this.text_line);
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
else if (this.verticalJustification === AnnotationVerticalJustify.CENTER) {
|
|
194
|
+
const yt = note.getYForTopText(this.text_line) - 1;
|
|
195
|
+
const yb = stave.getYForBottomText(this.text_line);
|
|
196
|
+
y = yt + (yb - yt) / 2 + text_height / 2;
|
|
197
|
+
}
|
|
198
|
+
else if (this.verticalJustification === AnnotationVerticalJustify.TOP) {
|
|
199
|
+
y = note.getYs()[0] - (this.text_line + 1) * Tables.STAVE_LINE_DISTANCE;
|
|
200
|
+
if (has_stem && stemDirection === Stem.UP) {
|
|
201
|
+
spacing = stem_ext.topY < stave.getTopLineTopY() ? Tables.STAVE_LINE_DISTANCE : spacing;
|
|
202
|
+
y = Math.min(y, stem_ext.topY - spacing * (this.text_line + 1));
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
else {
|
|
206
|
+
const extents = note.getStemExtents();
|
|
207
|
+
y = extents.topY + (extents.baseY - extents.topY) / 2 + text_height / 2;
|
|
208
|
+
}
|
|
209
|
+
L('Rendering annotation: ', this.text, x, y);
|
|
210
|
+
ctx.fillText(this.text, x, y);
|
|
211
|
+
ctx.closeGroup();
|
|
212
|
+
ctx.restore();
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
Annotation.DEBUG = false;
|
|
216
|
+
Annotation.TEXT_FONT = Object.assign({}, Element.TEXT_FONT);
|
|
217
|
+
Annotation.HorizontalJustify = AnnotationHorizontalJustify;
|
|
218
|
+
Annotation.HorizontalJustifyString = {
|
|
219
|
+
left: AnnotationHorizontalJustify.LEFT,
|
|
220
|
+
right: AnnotationHorizontalJustify.RIGHT,
|
|
221
|
+
center: AnnotationHorizontalJustify.CENTER,
|
|
222
|
+
centerStem: AnnotationHorizontalJustify.CENTER_STEM,
|
|
223
|
+
};
|
|
224
|
+
Annotation.VerticalJustify = AnnotationVerticalJustify;
|
|
225
|
+
Annotation.VerticalJustifyString = {
|
|
226
|
+
above: AnnotationVerticalJustify.TOP,
|
|
227
|
+
top: AnnotationVerticalJustify.TOP,
|
|
228
|
+
below: AnnotationVerticalJustify.BOTTOM,
|
|
229
|
+
bottom: AnnotationVerticalJustify.BOTTOM,
|
|
230
|
+
center: AnnotationVerticalJustify.CENTER,
|
|
231
|
+
centerStem: AnnotationVerticalJustify.CENTER_STEM,
|
|
232
|
+
};
|
|
@@ -0,0 +1,267 @@
|
|
|
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 { isGraceNote, isStaveNote, isStemmableNote, isTabNote } from './typeguard.js';
|
|
6
|
+
import { defined, log, RuntimeError } from './util.js';
|
|
7
|
+
function L(...args) {
|
|
8
|
+
if (Articulation.DEBUG)
|
|
9
|
+
log('Vex.Flow.Articulation', args);
|
|
10
|
+
}
|
|
11
|
+
const { ABOVE, BELOW } = Modifier.Position;
|
|
12
|
+
function roundToNearestHalf(mathFn, value) {
|
|
13
|
+
return mathFn(value / 0.5) * 0.5;
|
|
14
|
+
}
|
|
15
|
+
function isWithinLines(line, position) {
|
|
16
|
+
return position === ABOVE ? line <= 5 : line >= 1;
|
|
17
|
+
}
|
|
18
|
+
function getRoundingFunction(line, position) {
|
|
19
|
+
if (isWithinLines(line, position)) {
|
|
20
|
+
if (position === ABOVE) {
|
|
21
|
+
return Math.ceil;
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
return Math.floor;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
return Math.round;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
function snapLineToStaff(canSitBetweenLines, line, position, offsetDirection) {
|
|
32
|
+
const snappedLine = roundToNearestHalf(getRoundingFunction(line, position), line);
|
|
33
|
+
const canSnapToStaffSpace = canSitBetweenLines && isWithinLines(snappedLine, position);
|
|
34
|
+
const onStaffLine = snappedLine % 1 === 0;
|
|
35
|
+
if (canSnapToStaffSpace && onStaffLine) {
|
|
36
|
+
const HALF_STAFF_SPACE = 0.5;
|
|
37
|
+
return snappedLine + HALF_STAFF_SPACE * -offsetDirection;
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
return snappedLine;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
const isStaveOrGraceNote = (note) => isStaveNote(note) || isGraceNote(note);
|
|
44
|
+
function getTopY(note, textLine) {
|
|
45
|
+
const stemDirection = note.getStemDirection();
|
|
46
|
+
const { topY: stemTipY, baseY: stemBaseY } = note.getStemExtents();
|
|
47
|
+
if (isStaveOrGraceNote(note)) {
|
|
48
|
+
if (note.hasStem()) {
|
|
49
|
+
if (stemDirection === Stem.UP) {
|
|
50
|
+
return stemTipY;
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
return stemBaseY;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
return Math.min(...note.getYs());
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
else if (isTabNote(note)) {
|
|
61
|
+
if (note.hasStem()) {
|
|
62
|
+
if (stemDirection === Stem.UP) {
|
|
63
|
+
return stemTipY;
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
return note.checkStave().getYForTopText(textLine);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
return note.checkStave().getYForTopText(textLine);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
throw new RuntimeError('UnknownCategory', 'Only can get the top and bottom ys of stavenotes and tabnotes');
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
function getBottomY(note, textLine) {
|
|
78
|
+
const stemDirection = note.getStemDirection();
|
|
79
|
+
const { topY: stemTipY, baseY: stemBaseY } = note.getStemExtents();
|
|
80
|
+
if (isStaveOrGraceNote(note)) {
|
|
81
|
+
if (note.hasStem()) {
|
|
82
|
+
if (stemDirection === Stem.UP) {
|
|
83
|
+
return stemBaseY;
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
return stemTipY;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
return Math.max(...note.getYs());
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
else if (isTabNote(note)) {
|
|
94
|
+
if (note.hasStem()) {
|
|
95
|
+
if (stemDirection === Stem.UP) {
|
|
96
|
+
return note.checkStave().getYForBottomText(textLine);
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
return stemTipY;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
return note.checkStave().getYForBottomText(textLine);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
throw new RuntimeError('UnknownCategory', 'Only can get the top and bottom ys of stavenotes and tabnotes');
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
function getInitialOffset(note, position) {
|
|
111
|
+
const isOnStemTip = (position === ABOVE && note.getStemDirection() === Stem.UP) ||
|
|
112
|
+
(position === BELOW && note.getStemDirection() === Stem.DOWN);
|
|
113
|
+
if (isStaveOrGraceNote(note)) {
|
|
114
|
+
if (note.hasStem() && isOnStemTip) {
|
|
115
|
+
return 0.5;
|
|
116
|
+
}
|
|
117
|
+
else {
|
|
118
|
+
return 1;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
else {
|
|
122
|
+
if (note.hasStem() && isOnStemTip) {
|
|
123
|
+
return 1;
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
return 0;
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
export class Articulation extends Modifier {
|
|
131
|
+
constructor(type) {
|
|
132
|
+
super();
|
|
133
|
+
this.type = type;
|
|
134
|
+
this.position = BELOW;
|
|
135
|
+
this.render_options = {
|
|
136
|
+
font_scale: 38,
|
|
137
|
+
};
|
|
138
|
+
this.reset();
|
|
139
|
+
}
|
|
140
|
+
static get CATEGORY() {
|
|
141
|
+
return "Articulation";
|
|
142
|
+
}
|
|
143
|
+
static format(articulations, state) {
|
|
144
|
+
if (!articulations || articulations.length === 0)
|
|
145
|
+
return false;
|
|
146
|
+
const margin = 0.5;
|
|
147
|
+
let maxGlyphWidth = 0;
|
|
148
|
+
const getIncrement = (articulation, line, position) => roundToNearestHalf(getRoundingFunction(line, position), defined(articulation.glyph.getMetrics().height) / 10 + margin);
|
|
149
|
+
articulations.forEach((articulation) => {
|
|
150
|
+
const note = articulation.checkAttachedNote();
|
|
151
|
+
maxGlyphWidth = Math.max(note.getGlyph().getWidth(), maxGlyphWidth);
|
|
152
|
+
let lines = 5;
|
|
153
|
+
const stemDirection = note.hasStem() ? note.getStemDirection() : Stem.UP;
|
|
154
|
+
let stemHeight = 0;
|
|
155
|
+
if (isStemmableNote(note)) {
|
|
156
|
+
const stem = note.getStem();
|
|
157
|
+
if (stem) {
|
|
158
|
+
stemHeight = Math.abs(stem.getHeight()) / Tables.STAVE_LINE_DISTANCE;
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
const stave = note.getStave();
|
|
162
|
+
if (stave) {
|
|
163
|
+
lines = stave.getNumLines();
|
|
164
|
+
}
|
|
165
|
+
if (articulation.getPosition() === ABOVE) {
|
|
166
|
+
let noteLine = note.getLineNumber(true);
|
|
167
|
+
if (stemDirection === Stem.UP) {
|
|
168
|
+
noteLine += stemHeight;
|
|
169
|
+
}
|
|
170
|
+
let increment = getIncrement(articulation, state.top_text_line, ABOVE);
|
|
171
|
+
const curTop = noteLine + state.top_text_line + 0.5;
|
|
172
|
+
if (!articulation.articulation.between_lines && curTop < lines) {
|
|
173
|
+
increment += lines - curTop;
|
|
174
|
+
}
|
|
175
|
+
articulation.setTextLine(state.top_text_line);
|
|
176
|
+
state.top_text_line += increment;
|
|
177
|
+
}
|
|
178
|
+
else if (articulation.getPosition() === BELOW) {
|
|
179
|
+
let noteLine = Math.max(lines - note.getLineNumber(), 0);
|
|
180
|
+
if (stemDirection === Stem.DOWN) {
|
|
181
|
+
noteLine += stemHeight;
|
|
182
|
+
}
|
|
183
|
+
let increment = getIncrement(articulation, state.text_line, BELOW);
|
|
184
|
+
const curBottom = noteLine + state.text_line + 0.5;
|
|
185
|
+
if (!articulation.articulation.between_lines && curBottom < lines) {
|
|
186
|
+
increment += lines - curBottom;
|
|
187
|
+
}
|
|
188
|
+
articulation.setTextLine(state.text_line);
|
|
189
|
+
state.text_line += increment;
|
|
190
|
+
}
|
|
191
|
+
});
|
|
192
|
+
const width = articulations
|
|
193
|
+
.map((articulation) => articulation.getWidth())
|
|
194
|
+
.reduce((maxWidth, articWidth) => Math.max(articWidth, maxWidth));
|
|
195
|
+
const overlap = Math.min(Math.max(width - maxGlyphWidth, 0), Math.max(width - (state.left_shift + state.right_shift), 0));
|
|
196
|
+
state.left_shift += overlap / 2;
|
|
197
|
+
state.right_shift += overlap / 2;
|
|
198
|
+
return true;
|
|
199
|
+
}
|
|
200
|
+
static easyScoreHook({ articulations }, note, builder) {
|
|
201
|
+
if (!articulations)
|
|
202
|
+
return;
|
|
203
|
+
const articNameToCode = {
|
|
204
|
+
staccato: 'a.',
|
|
205
|
+
tenuto: 'a-',
|
|
206
|
+
accent: 'a>',
|
|
207
|
+
};
|
|
208
|
+
articulations
|
|
209
|
+
.split(',')
|
|
210
|
+
.map((articString) => articString.trim().split('.'))
|
|
211
|
+
.map(([name, position]) => {
|
|
212
|
+
const artic = { type: articNameToCode[name] };
|
|
213
|
+
if (position)
|
|
214
|
+
artic.position = Modifier.PositionString[position];
|
|
215
|
+
return builder.getFactory().Articulation(artic);
|
|
216
|
+
})
|
|
217
|
+
.map((artic) => note.addModifier(artic, 0));
|
|
218
|
+
}
|
|
219
|
+
reset() {
|
|
220
|
+
this.articulation = Tables.articulationCodes(this.type);
|
|
221
|
+
const articulation = defined(this.articulation, 'ArgumentError', `Articulation not found: ${this.type}`);
|
|
222
|
+
const code = (this.position === ABOVE ? articulation.aboveCode : articulation.belowCode) || articulation.code;
|
|
223
|
+
this.glyph = new Glyph(code !== null && code !== void 0 ? code : '', this.render_options.font_scale);
|
|
224
|
+
this.setWidth(defined(this.glyph.getMetrics().width));
|
|
225
|
+
}
|
|
226
|
+
draw() {
|
|
227
|
+
const ctx = this.checkContext();
|
|
228
|
+
const note = this.checkAttachedNote();
|
|
229
|
+
this.setRendered();
|
|
230
|
+
const index = this.checkIndex();
|
|
231
|
+
const { position, glyph, text_line: textLine } = this;
|
|
232
|
+
const canSitBetweenLines = this.articulation.between_lines;
|
|
233
|
+
const stave = note.checkStave();
|
|
234
|
+
const staffSpace = stave.getSpacingBetweenLines();
|
|
235
|
+
const isTab = isTabNote(note);
|
|
236
|
+
const { x } = note.getModifierStartXY(position, index);
|
|
237
|
+
const shouldSitOutsideStaff = !canSitBetweenLines || isTab;
|
|
238
|
+
const initialOffset = getInitialOffset(note, position);
|
|
239
|
+
const padding = Tables.currentMusicFont().lookupMetric(`articulation.${glyph.getCode()}.padding`, 0);
|
|
240
|
+
let y = {
|
|
241
|
+
[ABOVE]: () => {
|
|
242
|
+
glyph.setOrigin(0.5, 1);
|
|
243
|
+
const y = getTopY(note, textLine) - (textLine + initialOffset) * staffSpace;
|
|
244
|
+
return shouldSitOutsideStaff ? Math.min(stave.getYForTopText(Articulation.INITIAL_OFFSET), y) : y;
|
|
245
|
+
},
|
|
246
|
+
[BELOW]: () => {
|
|
247
|
+
glyph.setOrigin(0.5, 0);
|
|
248
|
+
const y = getBottomY(note, textLine) + (textLine + initialOffset) * staffSpace;
|
|
249
|
+
return shouldSitOutsideStaff ? Math.max(stave.getYForBottomText(Articulation.INITIAL_OFFSET), y) : y;
|
|
250
|
+
},
|
|
251
|
+
}[position]();
|
|
252
|
+
if (!isTab) {
|
|
253
|
+
const offsetDirection = position === ABOVE ? -1 : +1;
|
|
254
|
+
const noteLine = note.getKeyProps()[index].line;
|
|
255
|
+
const distanceFromNote = (note.getYs()[index] - y) / staffSpace;
|
|
256
|
+
const articLine = distanceFromNote + Number(noteLine);
|
|
257
|
+
const snappedLine = snapLineToStaff(canSitBetweenLines, articLine, position, offsetDirection);
|
|
258
|
+
if (isWithinLines(snappedLine, position))
|
|
259
|
+
glyph.setOrigin(0.5, 0.5);
|
|
260
|
+
y += Math.abs(snappedLine - articLine) * staffSpace * offsetDirection + padding * offsetDirection;
|
|
261
|
+
}
|
|
262
|
+
L(`Rendering articulation at (x: ${x}, y: ${y})`);
|
|
263
|
+
glyph.render(ctx, x, y);
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
Articulation.DEBUG = false;
|
|
267
|
+
Articulation.INITIAL_OFFSET = -0.5;
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import { Note } from './note.js';
|
|
2
|
+
import { Barline, BarlineType } from './stavebarline.js';
|
|
3
|
+
import { log } from './util.js';
|
|
4
|
+
function L(...args) {
|
|
5
|
+
if (BarNote.DEBUG)
|
|
6
|
+
log('Vex.Flow.BarNote', args);
|
|
7
|
+
}
|
|
8
|
+
export class BarNote extends Note {
|
|
9
|
+
constructor(type = BarlineType.SINGLE) {
|
|
10
|
+
super({ duration: 'b' });
|
|
11
|
+
this.metrics = {
|
|
12
|
+
widths: {},
|
|
13
|
+
};
|
|
14
|
+
const TYPE = BarlineType;
|
|
15
|
+
this.metrics.widths = {
|
|
16
|
+
[TYPE.SINGLE]: 8,
|
|
17
|
+
[TYPE.DOUBLE]: 12,
|
|
18
|
+
[TYPE.END]: 15,
|
|
19
|
+
[TYPE.REPEAT_BEGIN]: 14,
|
|
20
|
+
[TYPE.REPEAT_END]: 14,
|
|
21
|
+
[TYPE.REPEAT_BOTH]: 18,
|
|
22
|
+
[TYPE.NONE]: 0,
|
|
23
|
+
};
|
|
24
|
+
this.ignore_ticks = true;
|
|
25
|
+
this.setType(type);
|
|
26
|
+
}
|
|
27
|
+
static get CATEGORY() {
|
|
28
|
+
return "BarNote";
|
|
29
|
+
}
|
|
30
|
+
getType() {
|
|
31
|
+
return this.type;
|
|
32
|
+
}
|
|
33
|
+
setType(type) {
|
|
34
|
+
this.type = typeof type === 'string' ? Barline.typeString[type] : type;
|
|
35
|
+
this.setWidth(this.metrics.widths[this.type]);
|
|
36
|
+
return this;
|
|
37
|
+
}
|
|
38
|
+
addToModifierContext(mc) {
|
|
39
|
+
return this;
|
|
40
|
+
}
|
|
41
|
+
preFormat() {
|
|
42
|
+
this.preFormatted = true;
|
|
43
|
+
return this;
|
|
44
|
+
}
|
|
45
|
+
draw() {
|
|
46
|
+
const ctx = this.checkContext();
|
|
47
|
+
L('Rendering bar line at: ', this.getAbsoluteX());
|
|
48
|
+
if (this.style)
|
|
49
|
+
this.applyStyle(ctx);
|
|
50
|
+
const barline = new Barline(this.type);
|
|
51
|
+
barline.setX(this.getAbsoluteX());
|
|
52
|
+
barline.draw(this.checkStave());
|
|
53
|
+
if (this.style)
|
|
54
|
+
this.restoreStyle(ctx);
|
|
55
|
+
this.setRendered();
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
BarNote.DEBUG = false;
|