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,337 @@
|
|
|
1
|
+
import { BoundingBox } from './boundingbox.js';
|
|
2
|
+
import { BoundingBoxComputation } from './boundingboxcomputation.js';
|
|
3
|
+
import { Element } from './element.js';
|
|
4
|
+
import { defined, RuntimeError } from './util.js';
|
|
5
|
+
class GlyphCacheEntry {
|
|
6
|
+
constructor(fontStack, code, category) {
|
|
7
|
+
this.point = -1;
|
|
8
|
+
this.metrics = Glyph.loadMetrics(fontStack, code, category);
|
|
9
|
+
this.bbox = Glyph.getOutlineBoundingBox(this.metrics.outline, this.metrics.scale, this.metrics.x_shift, this.metrics.y_shift);
|
|
10
|
+
if (category) {
|
|
11
|
+
this.point = Glyph.lookupFontMetric(this.metrics.font, category, code, 'point', -1);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
class GlyphCache {
|
|
16
|
+
constructor() {
|
|
17
|
+
this.cache = new Map();
|
|
18
|
+
}
|
|
19
|
+
lookup(code, category) {
|
|
20
|
+
let entries = this.cache.get(Glyph.CURRENT_CACHE_KEY);
|
|
21
|
+
if (entries === undefined) {
|
|
22
|
+
entries = {};
|
|
23
|
+
this.cache.set(Glyph.CURRENT_CACHE_KEY, entries);
|
|
24
|
+
}
|
|
25
|
+
const key = category ? `${code}%${category}` : code;
|
|
26
|
+
let entry = entries[key];
|
|
27
|
+
if (entry === undefined) {
|
|
28
|
+
entry = new GlyphCacheEntry(Glyph.MUSIC_FONT_STACK, code, category);
|
|
29
|
+
entries[key] = entry;
|
|
30
|
+
}
|
|
31
|
+
return entry;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
class GlyphOutline {
|
|
35
|
+
constructor(outline, originX, originY, scale) {
|
|
36
|
+
this.outline = outline;
|
|
37
|
+
this.originX = originX;
|
|
38
|
+
this.originY = originY;
|
|
39
|
+
this.scale = scale;
|
|
40
|
+
this.i = 0;
|
|
41
|
+
}
|
|
42
|
+
done() {
|
|
43
|
+
return this.i >= this.outline.length;
|
|
44
|
+
}
|
|
45
|
+
next() {
|
|
46
|
+
return this.outline[this.i++];
|
|
47
|
+
}
|
|
48
|
+
nextX() {
|
|
49
|
+
return this.originX + this.outline[this.i++] * this.scale;
|
|
50
|
+
}
|
|
51
|
+
nextY() {
|
|
52
|
+
return this.originY - this.outline[this.i++] * this.scale;
|
|
53
|
+
}
|
|
54
|
+
static parse(str) {
|
|
55
|
+
const result = [];
|
|
56
|
+
const parts = str.split(' ');
|
|
57
|
+
let i = 0;
|
|
58
|
+
while (i < parts.length) {
|
|
59
|
+
switch (parts[i++]) {
|
|
60
|
+
case 'm':
|
|
61
|
+
result.push(0, parseInt(parts[i++]), parseInt(parts[i++]));
|
|
62
|
+
break;
|
|
63
|
+
case 'l':
|
|
64
|
+
result.push(1, parseInt(parts[i++]), parseInt(parts[i++]));
|
|
65
|
+
break;
|
|
66
|
+
case 'q':
|
|
67
|
+
result.push(2, parseInt(parts[i++]), parseInt(parts[i++]), parseInt(parts[i++]), parseInt(parts[i++]));
|
|
68
|
+
break;
|
|
69
|
+
case 'b':
|
|
70
|
+
result.push(3, parseInt(parts[i++]), parseInt(parts[i++]), parseInt(parts[i++]), parseInt(parts[i++]), parseInt(parts[i++]), parseInt(parts[i++]));
|
|
71
|
+
break;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
return result;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
export class Glyph extends Element {
|
|
78
|
+
constructor(code, point, options) {
|
|
79
|
+
super();
|
|
80
|
+
this.bbox = new BoundingBox(0, 0, 0, 0);
|
|
81
|
+
this.topGlyphs = [];
|
|
82
|
+
this.botGlyphs = [];
|
|
83
|
+
this.options = {};
|
|
84
|
+
this.scale = 1;
|
|
85
|
+
this.code = code;
|
|
86
|
+
this.point = point;
|
|
87
|
+
this.originShift = { x: 0, y: 0 };
|
|
88
|
+
this.x_shift = 0;
|
|
89
|
+
this.y_shift = 0;
|
|
90
|
+
if (options) {
|
|
91
|
+
this.setOptions(options);
|
|
92
|
+
}
|
|
93
|
+
else {
|
|
94
|
+
this.reset();
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
static get CATEGORY() {
|
|
98
|
+
return "Glyph";
|
|
99
|
+
}
|
|
100
|
+
static lookupFontMetric(font, category, code, key, defaultValue) {
|
|
101
|
+
let value = font.lookupMetric(`glyphs.${category}.${code}.${key}`, undefined);
|
|
102
|
+
if (value === undefined) {
|
|
103
|
+
value = font.lookupMetric(`glyphs.${category}.${key}`, defaultValue);
|
|
104
|
+
}
|
|
105
|
+
return value;
|
|
106
|
+
}
|
|
107
|
+
static lookupGlyph(fontStack, code) {
|
|
108
|
+
defined(fontStack, 'BadFontStack', 'Font stack is misconfigured');
|
|
109
|
+
let glyph;
|
|
110
|
+
let font;
|
|
111
|
+
for (let i = 0; i < fontStack.length; i++) {
|
|
112
|
+
font = fontStack[i];
|
|
113
|
+
glyph = font.getGlyphs()[code];
|
|
114
|
+
if (glyph)
|
|
115
|
+
return { glyph, font };
|
|
116
|
+
}
|
|
117
|
+
throw new RuntimeError('BadGlyph', `Glyph ${code} does not exist in font.`);
|
|
118
|
+
}
|
|
119
|
+
static loadMetrics(fontStack, code, category) {
|
|
120
|
+
const { glyph, font } = Glyph.lookupGlyph(fontStack, code);
|
|
121
|
+
if (!glyph.o)
|
|
122
|
+
throw new RuntimeError('BadGlyph', `Glyph ${code} has no outline defined.`);
|
|
123
|
+
let x_shift = 0;
|
|
124
|
+
let y_shift = 0;
|
|
125
|
+
let scale = 1;
|
|
126
|
+
if (category && font) {
|
|
127
|
+
x_shift = Glyph.lookupFontMetric(font, category, code, 'shiftX', 0);
|
|
128
|
+
y_shift = Glyph.lookupFontMetric(font, category, code, 'shiftY', 0);
|
|
129
|
+
scale = Glyph.lookupFontMetric(font, category, code, 'scale', 1);
|
|
130
|
+
}
|
|
131
|
+
const x_min = glyph.x_min;
|
|
132
|
+
const x_max = glyph.x_max;
|
|
133
|
+
const ha = glyph.ha;
|
|
134
|
+
if (!glyph.cached_outline) {
|
|
135
|
+
glyph.cached_outline = GlyphOutline.parse(glyph.o);
|
|
136
|
+
}
|
|
137
|
+
return {
|
|
138
|
+
x_min,
|
|
139
|
+
x_max,
|
|
140
|
+
x_shift,
|
|
141
|
+
y_shift,
|
|
142
|
+
scale,
|
|
143
|
+
ha,
|
|
144
|
+
outline: glyph.cached_outline,
|
|
145
|
+
font,
|
|
146
|
+
width: x_max - x_min,
|
|
147
|
+
height: ha,
|
|
148
|
+
};
|
|
149
|
+
}
|
|
150
|
+
static renderGlyph(ctx, x_pos, y_pos, point, code, options) {
|
|
151
|
+
var _a;
|
|
152
|
+
const data = Glyph.cache.lookup(code, options === null || options === void 0 ? void 0 : options.category);
|
|
153
|
+
const metrics = data.metrics;
|
|
154
|
+
if (data.point != -1) {
|
|
155
|
+
point = data.point;
|
|
156
|
+
}
|
|
157
|
+
const customScale = (_a = options === null || options === void 0 ? void 0 : options.scale) !== null && _a !== void 0 ? _a : 1;
|
|
158
|
+
const scale = ((point * 72.0) / (metrics.font.getResolution() * 100.0)) * metrics.scale * customScale;
|
|
159
|
+
Glyph.renderOutline(ctx, metrics.outline, scale, x_pos + metrics.x_shift * customScale, y_pos + metrics.y_shift * customScale);
|
|
160
|
+
return metrics;
|
|
161
|
+
}
|
|
162
|
+
static renderOutline(ctx, outline, scale, x_pos, y_pos) {
|
|
163
|
+
const go = new GlyphOutline(outline, x_pos, y_pos, scale);
|
|
164
|
+
ctx.beginPath();
|
|
165
|
+
let x, y;
|
|
166
|
+
while (!go.done()) {
|
|
167
|
+
switch (go.next()) {
|
|
168
|
+
case 0:
|
|
169
|
+
ctx.moveTo(go.nextX(), go.nextY());
|
|
170
|
+
break;
|
|
171
|
+
case 1:
|
|
172
|
+
ctx.lineTo(go.nextX(), go.nextY());
|
|
173
|
+
break;
|
|
174
|
+
case 2:
|
|
175
|
+
x = go.nextX();
|
|
176
|
+
y = go.nextY();
|
|
177
|
+
ctx.quadraticCurveTo(go.nextX(), go.nextY(), x, y);
|
|
178
|
+
break;
|
|
179
|
+
case 3:
|
|
180
|
+
x = go.nextX();
|
|
181
|
+
y = go.nextY();
|
|
182
|
+
ctx.bezierCurveTo(go.nextX(), go.nextY(), go.nextX(), go.nextY(), x, y);
|
|
183
|
+
break;
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
ctx.fill();
|
|
187
|
+
}
|
|
188
|
+
static getOutlineBoundingBox(outline, scale, x_pos, y_pos) {
|
|
189
|
+
const go = new GlyphOutline(outline, x_pos, y_pos, scale);
|
|
190
|
+
const bboxComp = new BoundingBoxComputation();
|
|
191
|
+
let penX = x_pos;
|
|
192
|
+
let penY = y_pos;
|
|
193
|
+
let x, y;
|
|
194
|
+
while (!go.done()) {
|
|
195
|
+
switch (go.next()) {
|
|
196
|
+
case 0:
|
|
197
|
+
penX = go.nextX();
|
|
198
|
+
penY = go.nextY();
|
|
199
|
+
break;
|
|
200
|
+
case 1:
|
|
201
|
+
bboxComp.addPoint(penX, penY);
|
|
202
|
+
penX = go.nextX();
|
|
203
|
+
penY = go.nextY();
|
|
204
|
+
bboxComp.addPoint(penX, penY);
|
|
205
|
+
break;
|
|
206
|
+
case 2:
|
|
207
|
+
x = go.nextX();
|
|
208
|
+
y = go.nextY();
|
|
209
|
+
bboxComp.addQuadraticCurve(penX, penY, go.nextX(), go.nextY(), x, y);
|
|
210
|
+
penX = x;
|
|
211
|
+
penY = y;
|
|
212
|
+
break;
|
|
213
|
+
case 3:
|
|
214
|
+
x = go.nextX();
|
|
215
|
+
y = go.nextY();
|
|
216
|
+
bboxComp.addBezierCurve(penX, penY, go.nextX(), go.nextY(), go.nextX(), go.nextY(), x, y);
|
|
217
|
+
penX = x;
|
|
218
|
+
penY = y;
|
|
219
|
+
break;
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
return new BoundingBox(bboxComp.getX1(), bboxComp.getY1(), bboxComp.width(), bboxComp.height());
|
|
223
|
+
}
|
|
224
|
+
static getWidth(code, point, category) {
|
|
225
|
+
const data = Glyph.cache.lookup(code, category);
|
|
226
|
+
if (data.point != -1) {
|
|
227
|
+
point = data.point;
|
|
228
|
+
}
|
|
229
|
+
const scale = (point * 72) / (data.metrics.font.getResolution() * 100);
|
|
230
|
+
return data.bbox.getW() * scale;
|
|
231
|
+
}
|
|
232
|
+
draw(...args) {
|
|
233
|
+
}
|
|
234
|
+
getCode() {
|
|
235
|
+
return this.code;
|
|
236
|
+
}
|
|
237
|
+
setOptions(options) {
|
|
238
|
+
this.options = Object.assign(Object.assign({}, this.options), options);
|
|
239
|
+
this.reset();
|
|
240
|
+
}
|
|
241
|
+
setPoint(point) {
|
|
242
|
+
this.point = point;
|
|
243
|
+
return this;
|
|
244
|
+
}
|
|
245
|
+
setStave(stave) {
|
|
246
|
+
this.stave = stave;
|
|
247
|
+
return this;
|
|
248
|
+
}
|
|
249
|
+
getXShift() {
|
|
250
|
+
return this.x_shift;
|
|
251
|
+
}
|
|
252
|
+
setXShift(x_shift) {
|
|
253
|
+
this.x_shift = x_shift;
|
|
254
|
+
return this;
|
|
255
|
+
}
|
|
256
|
+
getYshift() {
|
|
257
|
+
return this.y_shift;
|
|
258
|
+
}
|
|
259
|
+
setYShift(y_shift) {
|
|
260
|
+
this.y_shift = y_shift;
|
|
261
|
+
return this;
|
|
262
|
+
}
|
|
263
|
+
reset() {
|
|
264
|
+
const data = Glyph.cache.lookup(this.code, this.options.category);
|
|
265
|
+
this.metrics = data.metrics;
|
|
266
|
+
if (data.point != -1) {
|
|
267
|
+
this.point = data.point;
|
|
268
|
+
}
|
|
269
|
+
this.scale = (this.point * 72) / (this.metrics.font.getResolution() * 100);
|
|
270
|
+
this.bbox = new BoundingBox(data.bbox.getX() * this.scale, data.bbox.getY() * this.scale, data.bbox.getW() * this.scale, data.bbox.getH() * this.scale);
|
|
271
|
+
}
|
|
272
|
+
checkMetrics() {
|
|
273
|
+
return defined(this.metrics, 'BadGlyph', `Glyph ${this.code} is not initialized.`);
|
|
274
|
+
}
|
|
275
|
+
getMetrics() {
|
|
276
|
+
const metrics = this.checkMetrics();
|
|
277
|
+
const metricsScale = metrics.scale;
|
|
278
|
+
return {
|
|
279
|
+
x_min: metrics.x_min * this.scale * metricsScale,
|
|
280
|
+
x_max: metrics.x_max * this.scale * metricsScale,
|
|
281
|
+
width: this.bbox.getW(),
|
|
282
|
+
height: this.bbox.getH(),
|
|
283
|
+
scale: this.scale * metricsScale,
|
|
284
|
+
x_shift: metrics.x_shift,
|
|
285
|
+
y_shift: metrics.y_shift,
|
|
286
|
+
outline: metrics.outline,
|
|
287
|
+
font: metrics.font,
|
|
288
|
+
ha: metrics.ha,
|
|
289
|
+
};
|
|
290
|
+
}
|
|
291
|
+
setOriginX(x) {
|
|
292
|
+
const { bbox } = this;
|
|
293
|
+
const originX = Math.abs(bbox.getX() / bbox.getW());
|
|
294
|
+
const xShift = (x - originX) * bbox.getW();
|
|
295
|
+
this.originShift.x = -xShift;
|
|
296
|
+
}
|
|
297
|
+
setOriginY(y) {
|
|
298
|
+
const { bbox } = this;
|
|
299
|
+
const originY = Math.abs(bbox.getY() / bbox.getH());
|
|
300
|
+
const yShift = (y - originY) * bbox.getH();
|
|
301
|
+
this.originShift.y = -yShift;
|
|
302
|
+
}
|
|
303
|
+
setOrigin(x, y) {
|
|
304
|
+
this.setOriginX(x);
|
|
305
|
+
this.setOriginY(y);
|
|
306
|
+
}
|
|
307
|
+
render(ctx, x, y) {
|
|
308
|
+
const metrics = this.checkMetrics();
|
|
309
|
+
const outline = metrics.outline;
|
|
310
|
+
const scale = this.scale * metrics.scale;
|
|
311
|
+
this.setRendered();
|
|
312
|
+
this.applyStyle(ctx);
|
|
313
|
+
const xPos = x + this.originShift.x + metrics.x_shift;
|
|
314
|
+
const yPos = y + this.originShift.y + metrics.y_shift;
|
|
315
|
+
Glyph.renderOutline(ctx, outline, scale, xPos, yPos);
|
|
316
|
+
this.restoreStyle(ctx);
|
|
317
|
+
}
|
|
318
|
+
checkStave() {
|
|
319
|
+
return defined(this.stave, 'NoStave', 'No stave attached to instance.');
|
|
320
|
+
}
|
|
321
|
+
renderToStave(x) {
|
|
322
|
+
const context = this.checkContext();
|
|
323
|
+
const metrics = this.checkMetrics();
|
|
324
|
+
const stave = this.checkStave();
|
|
325
|
+
const outline = metrics.outline;
|
|
326
|
+
const scale = this.scale * metrics.scale;
|
|
327
|
+
this.setRendered();
|
|
328
|
+
this.applyStyle();
|
|
329
|
+
const xPos = x + this.x_shift + metrics.x_shift;
|
|
330
|
+
const yPos = stave.getYForGlyphs() + this.y_shift + metrics.y_shift;
|
|
331
|
+
Glyph.renderOutline(context, outline, scale, xPos, yPos);
|
|
332
|
+
this.restoreStyle();
|
|
333
|
+
}
|
|
334
|
+
}
|
|
335
|
+
Glyph.cache = new GlyphCache();
|
|
336
|
+
Glyph.CURRENT_CACHE_KEY = '';
|
|
337
|
+
Glyph.MUSIC_FONT_STACK = [];
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { Note } from './note.js';
|
|
2
|
+
export class GlyphNote extends Note {
|
|
3
|
+
constructor(glyph, noteStruct, options) {
|
|
4
|
+
super(noteStruct);
|
|
5
|
+
this.options = Object.assign({ ignoreTicks: false, line: 2 }, options);
|
|
6
|
+
this.ignore_ticks = this.options.ignoreTicks;
|
|
7
|
+
if (glyph) {
|
|
8
|
+
this.setGlyph(glyph);
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
static get CATEGORY() {
|
|
12
|
+
return "GlyphNote";
|
|
13
|
+
}
|
|
14
|
+
setGlyph(glyph) {
|
|
15
|
+
this.glyph = glyph;
|
|
16
|
+
this.setWidth(this.glyph.getMetrics().width);
|
|
17
|
+
return this;
|
|
18
|
+
}
|
|
19
|
+
getBoundingBox() {
|
|
20
|
+
return this.glyph.getBoundingBox();
|
|
21
|
+
}
|
|
22
|
+
preFormat() {
|
|
23
|
+
if (!this.preFormatted && this.modifierContext) {
|
|
24
|
+
this.modifierContext.preFormat();
|
|
25
|
+
}
|
|
26
|
+
this.preFormatted = true;
|
|
27
|
+
return this;
|
|
28
|
+
}
|
|
29
|
+
drawModifiers() {
|
|
30
|
+
const ctx = this.checkContext();
|
|
31
|
+
ctx.openGroup('modifiers');
|
|
32
|
+
for (let i = 0; i < this.modifiers.length; i++) {
|
|
33
|
+
const modifier = this.modifiers[i];
|
|
34
|
+
modifier.setContext(ctx);
|
|
35
|
+
modifier.drawWithStyle();
|
|
36
|
+
}
|
|
37
|
+
ctx.closeGroup();
|
|
38
|
+
}
|
|
39
|
+
draw() {
|
|
40
|
+
const stave = this.checkStave();
|
|
41
|
+
const ctx = stave.checkContext();
|
|
42
|
+
this.setRendered();
|
|
43
|
+
ctx.openGroup('glyphNote', this.getAttribute('id'));
|
|
44
|
+
const glyph = this.glyph;
|
|
45
|
+
if (!glyph.getContext()) {
|
|
46
|
+
glyph.setContext(ctx);
|
|
47
|
+
}
|
|
48
|
+
glyph.setStave(stave);
|
|
49
|
+
glyph.setYShift(stave.getYForLine(this.options.line) - stave.getYForGlyphs());
|
|
50
|
+
const x = this.isCenterAligned() ? this.getAbsoluteX() - this.getWidth() / 2 : this.getAbsoluteX();
|
|
51
|
+
glyph.renderToStave(x);
|
|
52
|
+
this.drawModifiers();
|
|
53
|
+
ctx.closeGroup();
|
|
54
|
+
}
|
|
55
|
+
}
|
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
import { StaveNote } from './stavenote.js';
|
|
2
|
+
import { Stem } from './stem.js';
|
|
3
|
+
import { Tables } from './tables.js';
|
|
4
|
+
import { RuntimeError } from './util.js';
|
|
5
|
+
export class GraceNote extends StaveNote {
|
|
6
|
+
constructor(noteStruct) {
|
|
7
|
+
super(Object.assign({ glyph_font_scale: Tables.NOTATION_FONT_SCALE * GraceNote.SCALE, stroke_px: GraceNote.LEDGER_LINE_OFFSET }, noteStruct));
|
|
8
|
+
this.slash = noteStruct.slash || false;
|
|
9
|
+
this.slur = true;
|
|
10
|
+
this.buildNoteHeads();
|
|
11
|
+
this.width = 3;
|
|
12
|
+
}
|
|
13
|
+
static get CATEGORY() {
|
|
14
|
+
return "GraceNote";
|
|
15
|
+
}
|
|
16
|
+
static get LEDGER_LINE_OFFSET() {
|
|
17
|
+
return 2;
|
|
18
|
+
}
|
|
19
|
+
static get SCALE() {
|
|
20
|
+
return 0.66;
|
|
21
|
+
}
|
|
22
|
+
getStemExtension() {
|
|
23
|
+
if (this.stem_extension_override) {
|
|
24
|
+
return this.stem_extension_override;
|
|
25
|
+
}
|
|
26
|
+
const glyph = this.getGlyph();
|
|
27
|
+
if (glyph) {
|
|
28
|
+
let ret = super.getStemExtension();
|
|
29
|
+
if (glyph.stem) {
|
|
30
|
+
const staveNoteScale = this.getStaveNoteScale();
|
|
31
|
+
ret = (Stem.HEIGHT + ret) * staveNoteScale - Stem.HEIGHT;
|
|
32
|
+
}
|
|
33
|
+
return ret;
|
|
34
|
+
}
|
|
35
|
+
return 0;
|
|
36
|
+
}
|
|
37
|
+
getStaveNoteScale() {
|
|
38
|
+
return this.render_options.glyph_font_scale / Tables.NOTATION_FONT_SCALE;
|
|
39
|
+
}
|
|
40
|
+
draw() {
|
|
41
|
+
super.draw();
|
|
42
|
+
this.setRendered();
|
|
43
|
+
const stem = this.stem;
|
|
44
|
+
if (this.slash && stem) {
|
|
45
|
+
const staveNoteScale = this.getStaveNoteScale();
|
|
46
|
+
const offsetScale = staveNoteScale / 0.66;
|
|
47
|
+
let slashBBox = undefined;
|
|
48
|
+
const beam = this.beam;
|
|
49
|
+
if (beam) {
|
|
50
|
+
if (!beam.postFormatted) {
|
|
51
|
+
beam.postFormat();
|
|
52
|
+
}
|
|
53
|
+
slashBBox = this.calcBeamedNotesSlashBBox(8 * offsetScale, 8 * offsetScale, {
|
|
54
|
+
stem: 6 * offsetScale,
|
|
55
|
+
beam: 5 * offsetScale,
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
const stem_direction = this.getStemDirection();
|
|
60
|
+
const noteHeadBounds = this.getNoteHeadBounds();
|
|
61
|
+
const noteStemHeight = stem.getHeight();
|
|
62
|
+
let x = this.getAbsoluteX();
|
|
63
|
+
let y = stem_direction === Stem.DOWN
|
|
64
|
+
? noteHeadBounds.y_top - noteStemHeight
|
|
65
|
+
: noteHeadBounds.y_bottom - noteStemHeight;
|
|
66
|
+
const defaultStemExtention = stem_direction === Stem.DOWN ? this.glyph.stem_down_extension : this.glyph.stem_up_extension;
|
|
67
|
+
let defaultOffsetY = Tables.STEM_HEIGHT;
|
|
68
|
+
defaultOffsetY -= defaultOffsetY / 2.8;
|
|
69
|
+
defaultOffsetY += defaultStemExtention;
|
|
70
|
+
y += defaultOffsetY * staveNoteScale * stem_direction;
|
|
71
|
+
const offsets = stem_direction === Stem.UP
|
|
72
|
+
? {
|
|
73
|
+
x1: 1,
|
|
74
|
+
y1: 0,
|
|
75
|
+
x2: 13,
|
|
76
|
+
y2: -9,
|
|
77
|
+
}
|
|
78
|
+
: {
|
|
79
|
+
x1: -4,
|
|
80
|
+
y1: 1,
|
|
81
|
+
x2: 13,
|
|
82
|
+
y2: 9,
|
|
83
|
+
};
|
|
84
|
+
x += offsets.x1 * offsetScale;
|
|
85
|
+
y += offsets.y1 * offsetScale;
|
|
86
|
+
slashBBox = {
|
|
87
|
+
x1: x,
|
|
88
|
+
y1: y,
|
|
89
|
+
x2: x + offsets.x2 * offsetScale,
|
|
90
|
+
y2: y + offsets.y2 * offsetScale,
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
const ctx = this.checkContext();
|
|
94
|
+
ctx.save();
|
|
95
|
+
ctx.setLineWidth(1 * offsetScale);
|
|
96
|
+
ctx.beginPath();
|
|
97
|
+
ctx.moveTo(slashBBox.x1, slashBBox.y1);
|
|
98
|
+
ctx.lineTo(slashBBox.x2, slashBBox.y2);
|
|
99
|
+
ctx.closePath();
|
|
100
|
+
ctx.stroke();
|
|
101
|
+
ctx.restore();
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
calcBeamedNotesSlashBBox(slashStemOffset, slashBeamOffset, protrusions) {
|
|
105
|
+
const beam = this.beam;
|
|
106
|
+
if (!beam)
|
|
107
|
+
throw new RuntimeError('NoBeam', "Can't calculate without a beam.");
|
|
108
|
+
const beam_slope = beam.slope;
|
|
109
|
+
const isBeamEndNote = beam.notes[beam.notes.length - 1] === this;
|
|
110
|
+
const scaleX = isBeamEndNote ? -1 : 1;
|
|
111
|
+
const beam_angle = Math.atan(beam_slope * scaleX);
|
|
112
|
+
const iPointOnBeam = {
|
|
113
|
+
dx: Math.cos(beam_angle) * slashBeamOffset,
|
|
114
|
+
dy: Math.sin(beam_angle) * slashBeamOffset,
|
|
115
|
+
};
|
|
116
|
+
slashStemOffset *= this.getStemDirection();
|
|
117
|
+
const slash_angle = Math.atan((iPointOnBeam.dy - slashStemOffset) / iPointOnBeam.dx);
|
|
118
|
+
const protrusion_stem_dx = Math.cos(slash_angle) * protrusions.stem * scaleX;
|
|
119
|
+
const protrusion_stem_dy = Math.sin(slash_angle) * protrusions.stem;
|
|
120
|
+
const protrusion_beam_dx = Math.cos(slash_angle) * protrusions.beam * scaleX;
|
|
121
|
+
const protrusion_beam_dy = Math.sin(slash_angle) * protrusions.beam;
|
|
122
|
+
const stemX = this.getStemX();
|
|
123
|
+
const stem0X = beam.notes[0].getStemX();
|
|
124
|
+
const stemY = beam.getBeamYToDraw() + (stemX - stem0X) * beam_slope;
|
|
125
|
+
const ret = {
|
|
126
|
+
x1: stemX - protrusion_stem_dx,
|
|
127
|
+
y1: stemY + slashStemOffset - protrusion_stem_dy,
|
|
128
|
+
x2: stemX + iPointOnBeam.dx * scaleX + protrusion_beam_dx,
|
|
129
|
+
y2: stemY + iPointOnBeam.dy + protrusion_beam_dy,
|
|
130
|
+
};
|
|
131
|
+
return ret;
|
|
132
|
+
}
|
|
133
|
+
}
|
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
import { Beam } from './beam.js';
|
|
2
|
+
import { Formatter } from './formatter.js';
|
|
3
|
+
import { Modifier } from './modifier.js';
|
|
4
|
+
import { StaveTie } from './stavetie.js';
|
|
5
|
+
import { Tables } from './tables.js';
|
|
6
|
+
import { TabTie } from './tabtie.js';
|
|
7
|
+
import { isStaveNote } from './typeguard.js';
|
|
8
|
+
import { log } from './util.js';
|
|
9
|
+
import { Voice } from './voice.js';
|
|
10
|
+
function L(...args) {
|
|
11
|
+
if (GraceNoteGroup.DEBUG)
|
|
12
|
+
log('Vex.Flow.GraceNoteGroup', args);
|
|
13
|
+
}
|
|
14
|
+
export class GraceNoteGroup extends Modifier {
|
|
15
|
+
constructor(grace_notes, show_slur) {
|
|
16
|
+
super();
|
|
17
|
+
this.preFormatted = false;
|
|
18
|
+
this.position = Modifier.Position.LEFT;
|
|
19
|
+
this.grace_notes = grace_notes;
|
|
20
|
+
this.width = 0;
|
|
21
|
+
this.show_slur = show_slur;
|
|
22
|
+
this.slur = undefined;
|
|
23
|
+
this.voice = new Voice({
|
|
24
|
+
num_beats: 4,
|
|
25
|
+
beat_value: 4,
|
|
26
|
+
resolution: Tables.RESOLUTION,
|
|
27
|
+
}).setStrict(false);
|
|
28
|
+
this.render_options = {
|
|
29
|
+
slur_y_shift: 0,
|
|
30
|
+
};
|
|
31
|
+
this.beams = [];
|
|
32
|
+
this.voice.addTickables(this.grace_notes);
|
|
33
|
+
return this;
|
|
34
|
+
}
|
|
35
|
+
static get CATEGORY() {
|
|
36
|
+
return "GraceNoteGroup";
|
|
37
|
+
}
|
|
38
|
+
static format(gracenote_groups, state) {
|
|
39
|
+
const group_spacing_stave = 4;
|
|
40
|
+
const group_spacing_tab = 0;
|
|
41
|
+
if (!gracenote_groups || gracenote_groups.length === 0)
|
|
42
|
+
return false;
|
|
43
|
+
const group_list = [];
|
|
44
|
+
let prev_note = null;
|
|
45
|
+
let shiftL = 0;
|
|
46
|
+
for (let i = 0; i < gracenote_groups.length; ++i) {
|
|
47
|
+
const gracenote_group = gracenote_groups[i];
|
|
48
|
+
const note = gracenote_group.getNote();
|
|
49
|
+
const is_stavenote = isStaveNote(note);
|
|
50
|
+
const spacing = is_stavenote ? group_spacing_stave : group_spacing_tab;
|
|
51
|
+
if (is_stavenote && note !== prev_note) {
|
|
52
|
+
for (let n = 0; n < note.keys.length; ++n) {
|
|
53
|
+
shiftL = Math.max(note.getLeftDisplacedHeadPx(), shiftL);
|
|
54
|
+
}
|
|
55
|
+
prev_note = note;
|
|
56
|
+
}
|
|
57
|
+
group_list.push({ shift: shiftL, gracenote_group, spacing });
|
|
58
|
+
}
|
|
59
|
+
let group_shift = group_list[0].shift;
|
|
60
|
+
let formatWidth;
|
|
61
|
+
for (let i = 0; i < group_list.length; ++i) {
|
|
62
|
+
const gracenote_group = group_list[i].gracenote_group;
|
|
63
|
+
gracenote_group.preFormat();
|
|
64
|
+
formatWidth = gracenote_group.getWidth() + group_list[i].spacing;
|
|
65
|
+
group_shift = Math.max(formatWidth, group_shift);
|
|
66
|
+
}
|
|
67
|
+
for (let i = 0; i < group_list.length; ++i) {
|
|
68
|
+
const gracenote_group = group_list[i].gracenote_group;
|
|
69
|
+
formatWidth = gracenote_group.getWidth() + group_list[i].spacing;
|
|
70
|
+
gracenote_group.setSpacingFromNextModifier(group_shift - Math.min(formatWidth, group_shift));
|
|
71
|
+
}
|
|
72
|
+
state.left_shift += group_shift;
|
|
73
|
+
return true;
|
|
74
|
+
}
|
|
75
|
+
preFormat() {
|
|
76
|
+
if (this.preFormatted)
|
|
77
|
+
return;
|
|
78
|
+
if (!this.formatter) {
|
|
79
|
+
this.formatter = new Formatter();
|
|
80
|
+
}
|
|
81
|
+
this.formatter.joinVoices([this.voice]).format([this.voice], 0, {});
|
|
82
|
+
this.setWidth(this.formatter.getMinTotalWidth());
|
|
83
|
+
this.preFormatted = true;
|
|
84
|
+
}
|
|
85
|
+
beamNotes(grace_notes) {
|
|
86
|
+
grace_notes = grace_notes || this.grace_notes;
|
|
87
|
+
if (grace_notes.length > 1) {
|
|
88
|
+
const beam = new Beam(grace_notes);
|
|
89
|
+
beam.render_options.beam_width = 3;
|
|
90
|
+
beam.render_options.partial_beam_length = 4;
|
|
91
|
+
this.beams.push(beam);
|
|
92
|
+
}
|
|
93
|
+
return this;
|
|
94
|
+
}
|
|
95
|
+
setWidth(width) {
|
|
96
|
+
this.width = width;
|
|
97
|
+
return this;
|
|
98
|
+
}
|
|
99
|
+
getWidth() {
|
|
100
|
+
return this.width;
|
|
101
|
+
}
|
|
102
|
+
getGraceNotes() {
|
|
103
|
+
return this.grace_notes;
|
|
104
|
+
}
|
|
105
|
+
draw() {
|
|
106
|
+
const ctx = this.checkContext();
|
|
107
|
+
const note = this.checkAttachedNote();
|
|
108
|
+
this.setRendered();
|
|
109
|
+
L('Drawing grace note group for:', note);
|
|
110
|
+
this.alignSubNotesWithNote(this.getGraceNotes(), note);
|
|
111
|
+
this.grace_notes.forEach((graceNote) => graceNote.setContext(ctx).draw());
|
|
112
|
+
this.beams.forEach((beam) => beam.setContext(ctx).draw());
|
|
113
|
+
if (this.show_slur) {
|
|
114
|
+
const is_stavenote = isStaveNote(note);
|
|
115
|
+
const TieClass = is_stavenote ? StaveTie : TabTie;
|
|
116
|
+
this.slur = new TieClass({
|
|
117
|
+
last_note: this.grace_notes[0],
|
|
118
|
+
first_note: note,
|
|
119
|
+
first_indices: [0],
|
|
120
|
+
last_indices: [0],
|
|
121
|
+
});
|
|
122
|
+
this.slur.render_options.cp2 = 12;
|
|
123
|
+
this.slur.render_options.y_shift = (is_stavenote ? 7 : 5) + this.render_options.slur_y_shift;
|
|
124
|
+
this.slur.setContext(ctx).draw();
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
GraceNoteGroup.DEBUG = false;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { Font } from './font.js';
|
|
2
|
+
import { TabNote } from './tabnote.js';
|
|
3
|
+
export class GraceTabNote extends TabNote {
|
|
4
|
+
static get CATEGORY() {
|
|
5
|
+
return "GraceTabNote";
|
|
6
|
+
}
|
|
7
|
+
constructor(noteStruct) {
|
|
8
|
+
super(noteStruct, false);
|
|
9
|
+
this.render_options = Object.assign(Object.assign({}, this.render_options), { y_shift: 0.3, scale: 0.6, font: `7.5pt ${Font.SANS_SERIF}` });
|
|
10
|
+
this.updateWidth();
|
|
11
|
+
}
|
|
12
|
+
}
|