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,44 @@
|
|
|
1
|
+
import { Font } from '../font.js';
|
|
2
|
+
import { TextFormatter } from '../textformatter.js';
|
|
3
|
+
import { PetalumaScriptFont } from './petalumascript_glyphs.js';
|
|
4
|
+
import { RobotoSlabFont } from './robotoslab_glyphs.js';
|
|
5
|
+
export function loadTextFonts() {
|
|
6
|
+
{
|
|
7
|
+
const fontData = RobotoSlabFont;
|
|
8
|
+
const { fontFamily, resolution, glyphs } = fontData;
|
|
9
|
+
Font.load(fontFamily, fontData);
|
|
10
|
+
const maxSizeGlyph = 'b';
|
|
11
|
+
TextFormatter.registerInfo({
|
|
12
|
+
family: fontFamily,
|
|
13
|
+
resolution,
|
|
14
|
+
glyphs,
|
|
15
|
+
maxSizeGlyph,
|
|
16
|
+
monospaced: false,
|
|
17
|
+
bold: false,
|
|
18
|
+
italic: false,
|
|
19
|
+
superscriptOffset: 0.66,
|
|
20
|
+
subscriptOffset: 0.66,
|
|
21
|
+
serifs: true,
|
|
22
|
+
description: 'Text font to pair with the Bravura / Gonville music fonts.',
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
{
|
|
26
|
+
const fontData = PetalumaScriptFont;
|
|
27
|
+
const { fontFamily, resolution, glyphs } = fontData;
|
|
28
|
+
Font.load(fontFamily, fontData);
|
|
29
|
+
const maxSizeGlyph = 'b';
|
|
30
|
+
TextFormatter.registerInfo({
|
|
31
|
+
family: fontFamily,
|
|
32
|
+
resolution,
|
|
33
|
+
glyphs,
|
|
34
|
+
maxSizeGlyph,
|
|
35
|
+
monospaced: false,
|
|
36
|
+
bold: false,
|
|
37
|
+
italic: false,
|
|
38
|
+
superscriptOffset: 0.66,
|
|
39
|
+
subscriptOffset: 0.66,
|
|
40
|
+
serifs: false,
|
|
41
|
+
description: 'Text font to pair with the Petaluma music font.',
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
}
|
|
@@ -0,0 +1,568 @@
|
|
|
1
|
+
import { Beam } from './beam.js';
|
|
2
|
+
import { Font } from './font.js';
|
|
3
|
+
import { Fraction } from './fraction.js';
|
|
4
|
+
import { ModifierContext } from './modifiercontext.js';
|
|
5
|
+
import { Stave } from './stave.js';
|
|
6
|
+
import { StaveConnector } from './staveconnector.js';
|
|
7
|
+
import { Tables } from './tables.js';
|
|
8
|
+
import { TickContext } from './tickcontext.js';
|
|
9
|
+
import { isNote, isStaveNote } from './typeguard.js';
|
|
10
|
+
import { defined, log, midLine, RuntimeError } from './util.js';
|
|
11
|
+
import { Voice } from './voice.js';
|
|
12
|
+
const sumArray = (arr) => arr.reduce((a, b) => a + b, 0);
|
|
13
|
+
function createContexts(voices, makeContext, addToContext) {
|
|
14
|
+
const resolutionMultiplier = Formatter.getResolutionMultiplier(voices);
|
|
15
|
+
const tickToContextMap = {};
|
|
16
|
+
const tickList = [];
|
|
17
|
+
const contexts = [];
|
|
18
|
+
voices.forEach((voice, voiceIndex) => {
|
|
19
|
+
const ticksUsed = new Fraction(0, resolutionMultiplier);
|
|
20
|
+
voice.getTickables().forEach((tickable) => {
|
|
21
|
+
const integerTicks = ticksUsed.numerator;
|
|
22
|
+
if (!tickToContextMap[integerTicks]) {
|
|
23
|
+
const newContext = makeContext({ tickID: integerTicks });
|
|
24
|
+
contexts.push(newContext);
|
|
25
|
+
tickToContextMap[integerTicks] = newContext;
|
|
26
|
+
tickList.push(integerTicks);
|
|
27
|
+
}
|
|
28
|
+
addToContext(tickable, tickToContextMap[integerTicks], voiceIndex);
|
|
29
|
+
ticksUsed.add(tickable.getTicks());
|
|
30
|
+
});
|
|
31
|
+
});
|
|
32
|
+
return {
|
|
33
|
+
map: tickToContextMap,
|
|
34
|
+
array: contexts,
|
|
35
|
+
list: tickList.sort((a, b) => a - b),
|
|
36
|
+
resolutionMultiplier,
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
function L(...args) {
|
|
40
|
+
if (Formatter.DEBUG)
|
|
41
|
+
log('Vex.Flow.Formatter', args);
|
|
42
|
+
}
|
|
43
|
+
function getRestLineForNextNoteGroup(notes, currRestLine, currNoteIndex, compare) {
|
|
44
|
+
let nextRestLine = currRestLine;
|
|
45
|
+
for (let noteIndex = currNoteIndex + 1; noteIndex < notes.length; noteIndex++) {
|
|
46
|
+
const note = notes[noteIndex];
|
|
47
|
+
if (isNote(note) && !note.isRest() && !note.shouldIgnoreTicks()) {
|
|
48
|
+
nextRestLine = note.getLineForRest();
|
|
49
|
+
break;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
if (compare && currRestLine !== nextRestLine) {
|
|
53
|
+
const top = Math.max(currRestLine, nextRestLine);
|
|
54
|
+
const bot = Math.min(currRestLine, nextRestLine);
|
|
55
|
+
nextRestLine = midLine(top, bot);
|
|
56
|
+
}
|
|
57
|
+
return nextRestLine;
|
|
58
|
+
}
|
|
59
|
+
export class Formatter {
|
|
60
|
+
constructor(options) {
|
|
61
|
+
this.formatterOptions = Object.assign({ globalSoftmax: false, softmaxFactor: 100, maxIterations: 5 }, options);
|
|
62
|
+
this.justifyWidth = 0;
|
|
63
|
+
this.totalCost = 0;
|
|
64
|
+
this.totalShift = 0;
|
|
65
|
+
this.durationStats = {};
|
|
66
|
+
this.minTotalWidth = 0;
|
|
67
|
+
this.hasMinTotalWidth = false;
|
|
68
|
+
this.tickContexts = undefined;
|
|
69
|
+
this.modifierContexts = undefined;
|
|
70
|
+
this.contextGaps = {
|
|
71
|
+
total: 0,
|
|
72
|
+
gaps: [],
|
|
73
|
+
};
|
|
74
|
+
this.voices = [];
|
|
75
|
+
this.lossHistory = [];
|
|
76
|
+
}
|
|
77
|
+
static SimpleFormat(notes, x = 0, { paddingBetween = 10 } = {}) {
|
|
78
|
+
notes.reduce((accumulator, note) => {
|
|
79
|
+
note.addToModifierContext(new ModifierContext());
|
|
80
|
+
const tick = new TickContext().addTickable(note).preFormat();
|
|
81
|
+
const metrics = tick.getMetrics();
|
|
82
|
+
tick.setX(accumulator + metrics.totalLeftPx);
|
|
83
|
+
return accumulator + tick.getWidth() + metrics.totalRightPx + paddingBetween;
|
|
84
|
+
}, x);
|
|
85
|
+
}
|
|
86
|
+
static plotDebugging(ctx, formatter, xPos, y1, y2, options) {
|
|
87
|
+
options = Object.assign({ stavePadding: Tables.currentMusicFont().lookupMetric('stave.padding') }, options);
|
|
88
|
+
const x = xPos + options.stavePadding;
|
|
89
|
+
const contextGaps = formatter.contextGaps;
|
|
90
|
+
function stroke(x1, x2, color) {
|
|
91
|
+
ctx.beginPath();
|
|
92
|
+
ctx.setStrokeStyle(color);
|
|
93
|
+
ctx.setFillStyle(color);
|
|
94
|
+
ctx.setLineWidth(1);
|
|
95
|
+
ctx.fillRect(x1, y1, Math.max(x2 - x1, 0), y2 - y1);
|
|
96
|
+
}
|
|
97
|
+
ctx.save();
|
|
98
|
+
ctx.setFont(Font.SANS_SERIF, 8);
|
|
99
|
+
contextGaps.gaps.forEach((gap) => {
|
|
100
|
+
stroke(x + gap.x1, x + gap.x2, 'rgba(100,200,100,0.4)');
|
|
101
|
+
ctx.setFillStyle('green');
|
|
102
|
+
ctx.fillText(Math.round(gap.x2 - gap.x1).toString(), x + gap.x1, y2 + 12);
|
|
103
|
+
});
|
|
104
|
+
ctx.setFillStyle('red');
|
|
105
|
+
ctx.fillText(`Loss: ${(formatter.totalCost || 0).toFixed(2)} Shift: ${(formatter.totalShift || 0).toFixed(2)} Gap: ${contextGaps.total.toFixed(2)}`, x - 20, y2 + 27);
|
|
106
|
+
ctx.restore();
|
|
107
|
+
}
|
|
108
|
+
static FormatAndDraw(ctx, stave, notes, params) {
|
|
109
|
+
let options = {
|
|
110
|
+
auto_beam: false,
|
|
111
|
+
align_rests: false,
|
|
112
|
+
};
|
|
113
|
+
if (typeof params === 'object') {
|
|
114
|
+
options = Object.assign(Object.assign({}, options), params);
|
|
115
|
+
}
|
|
116
|
+
else if (typeof params === 'boolean') {
|
|
117
|
+
options.auto_beam = params;
|
|
118
|
+
}
|
|
119
|
+
const voice = new Voice(Tables.TIME4_4).setMode(Voice.Mode.SOFT).addTickables(notes);
|
|
120
|
+
const beams = options.auto_beam ? Beam.applyAndGetBeams(voice) : [];
|
|
121
|
+
new Formatter()
|
|
122
|
+
.joinVoices([voice])
|
|
123
|
+
.formatToStave([voice], stave, { align_rests: options.align_rests, stave });
|
|
124
|
+
voice.setStave(stave).draw(ctx, stave);
|
|
125
|
+
beams.forEach((beam) => beam.setContext(ctx).draw());
|
|
126
|
+
return voice.getBoundingBox();
|
|
127
|
+
}
|
|
128
|
+
static FormatAndDrawTab(ctx, tabstave, stave, tabnotes, notes, autobeam, params) {
|
|
129
|
+
let opts = {
|
|
130
|
+
auto_beam: autobeam,
|
|
131
|
+
align_rests: false,
|
|
132
|
+
};
|
|
133
|
+
if (typeof params === 'object') {
|
|
134
|
+
opts = Object.assign(Object.assign({}, opts), params);
|
|
135
|
+
}
|
|
136
|
+
else if (typeof params === 'boolean') {
|
|
137
|
+
opts.auto_beam = params;
|
|
138
|
+
}
|
|
139
|
+
const notevoice = new Voice(Tables.TIME4_4).setMode(Voice.Mode.SOFT).addTickables(notes);
|
|
140
|
+
const tabvoice = new Voice(Tables.TIME4_4).setMode(Voice.Mode.SOFT).addTickables(tabnotes);
|
|
141
|
+
const beams = opts.auto_beam ? Beam.applyAndGetBeams(notevoice) : [];
|
|
142
|
+
new Formatter()
|
|
143
|
+
.joinVoices([notevoice])
|
|
144
|
+
.joinVoices([tabvoice])
|
|
145
|
+
.formatToStave([notevoice, tabvoice], stave, { align_rests: opts.align_rests });
|
|
146
|
+
notevoice.draw(ctx, stave);
|
|
147
|
+
tabvoice.draw(ctx, tabstave);
|
|
148
|
+
beams.forEach((beam) => beam.setContext(ctx).draw());
|
|
149
|
+
new StaveConnector(stave, tabstave).setContext(ctx).draw();
|
|
150
|
+
}
|
|
151
|
+
static AlignRestsToNotes(tickables, alignAllNotes, alignTuplets) {
|
|
152
|
+
tickables.forEach((currTickable, index) => {
|
|
153
|
+
if (isStaveNote(currTickable) && currTickable.isRest()) {
|
|
154
|
+
if (currTickable.getTuplet() && !alignTuplets) {
|
|
155
|
+
return;
|
|
156
|
+
}
|
|
157
|
+
const position = currTickable.getGlyph().position.toUpperCase();
|
|
158
|
+
if (position !== 'R/4' && position !== 'B/4') {
|
|
159
|
+
return;
|
|
160
|
+
}
|
|
161
|
+
if (alignAllNotes || currTickable.getBeam()) {
|
|
162
|
+
const props = currTickable.getKeyProps()[0];
|
|
163
|
+
if (index === 0) {
|
|
164
|
+
props.line = getRestLineForNextNoteGroup(tickables, props.line, index, false);
|
|
165
|
+
}
|
|
166
|
+
else if (index > 0 && index < tickables.length) {
|
|
167
|
+
const prevTickable = tickables[index - 1];
|
|
168
|
+
if (isStaveNote(prevTickable)) {
|
|
169
|
+
if (prevTickable.isRest()) {
|
|
170
|
+
props.line = prevTickable.getKeyProps()[0].line;
|
|
171
|
+
}
|
|
172
|
+
else {
|
|
173
|
+
const restLine = prevTickable.getLineForRest();
|
|
174
|
+
props.line = getRestLineForNextNoteGroup(tickables, restLine, index, true);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
currTickable.setKeyLine(0, props.line);
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
});
|
|
182
|
+
}
|
|
183
|
+
alignRests(voices, alignAllNotes) {
|
|
184
|
+
if (!voices || !voices.length) {
|
|
185
|
+
throw new RuntimeError('BadArgument', 'No voices to format rests');
|
|
186
|
+
}
|
|
187
|
+
voices.forEach((voice) => Formatter.AlignRestsToNotes(voice.getTickables(), alignAllNotes));
|
|
188
|
+
}
|
|
189
|
+
preCalculateMinTotalWidth(voices) {
|
|
190
|
+
const unalignedPadding = Tables.currentMusicFont().lookupMetric('stave.unalignedNotePadding');
|
|
191
|
+
let unalignedCtxCount = 0;
|
|
192
|
+
let wsum = 0;
|
|
193
|
+
let dsum = 0;
|
|
194
|
+
const widths = [];
|
|
195
|
+
const durations = [];
|
|
196
|
+
if (this.hasMinTotalWidth)
|
|
197
|
+
return this.minTotalWidth;
|
|
198
|
+
if (!this.tickContexts) {
|
|
199
|
+
if (!voices) {
|
|
200
|
+
throw new RuntimeError('BadArgument', "'voices' required to run preCalculateMinTotalWidth");
|
|
201
|
+
}
|
|
202
|
+
this.createTickContexts(voices);
|
|
203
|
+
}
|
|
204
|
+
const { list: contextList, map: contextMap } = this.tickContexts;
|
|
205
|
+
this.minTotalWidth = 0;
|
|
206
|
+
contextList.forEach((tick) => {
|
|
207
|
+
const context = contextMap[tick];
|
|
208
|
+
context.preFormat();
|
|
209
|
+
if (context.getTickables().length < voices.length) {
|
|
210
|
+
unalignedCtxCount += 1;
|
|
211
|
+
}
|
|
212
|
+
context.getTickables().forEach((t) => {
|
|
213
|
+
wsum += t.getMetrics().width;
|
|
214
|
+
dsum += t.getTicks().value();
|
|
215
|
+
widths.push(t.getMetrics().width);
|
|
216
|
+
durations.push(t.getTicks().value());
|
|
217
|
+
});
|
|
218
|
+
const width = context.getWidth();
|
|
219
|
+
this.minTotalWidth += width;
|
|
220
|
+
});
|
|
221
|
+
this.hasMinTotalWidth = true;
|
|
222
|
+
const wavg = wsum > 0 ? wsum / widths.length : 1 / widths.length;
|
|
223
|
+
const wvar = sumArray(widths.map((ll) => Math.pow(ll - wavg, 2)));
|
|
224
|
+
const wpads = Math.pow(wvar / widths.length, 0.5) / wavg;
|
|
225
|
+
const davg = dsum / durations.length;
|
|
226
|
+
const dvar = sumArray(durations.map((ll) => Math.pow(ll - davg, 2)));
|
|
227
|
+
const dpads = Math.pow(dvar / durations.length, 0.5) / davg;
|
|
228
|
+
const padmax = Math.max(dpads, wpads) * contextList.length * unalignedPadding;
|
|
229
|
+
const unalignedPad = unalignedPadding * unalignedCtxCount;
|
|
230
|
+
return this.minTotalWidth + Math.max(unalignedPad, padmax);
|
|
231
|
+
}
|
|
232
|
+
getMinTotalWidth() {
|
|
233
|
+
if (!this.hasMinTotalWidth) {
|
|
234
|
+
throw new RuntimeError('NoMinTotalWidth', "Call 'preCalculateMinTotalWidth' or 'preFormat' before calling 'getMinTotalWidth'");
|
|
235
|
+
}
|
|
236
|
+
return this.minTotalWidth;
|
|
237
|
+
}
|
|
238
|
+
static getResolutionMultiplier(voices) {
|
|
239
|
+
if (!voices || !voices.length) {
|
|
240
|
+
throw new RuntimeError('BadArgument', 'No voices to format');
|
|
241
|
+
}
|
|
242
|
+
const totalTicks = voices[0].getTotalTicks();
|
|
243
|
+
const resolutionMultiplier = voices.reduce((accumulator, voice) => {
|
|
244
|
+
if (!voice.getTotalTicks().equals(totalTicks)) {
|
|
245
|
+
throw new RuntimeError('TickMismatch', 'Voices should have same total note duration in ticks.');
|
|
246
|
+
}
|
|
247
|
+
if (voice.getMode() === Voice.Mode.STRICT && !voice.isComplete()) {
|
|
248
|
+
throw new RuntimeError('IncompleteVoice', 'Voice does not have enough notes.');
|
|
249
|
+
}
|
|
250
|
+
return Math.max(accumulator, Fraction.LCM(accumulator, voice.getResolutionMultiplier()));
|
|
251
|
+
}, 1);
|
|
252
|
+
return resolutionMultiplier;
|
|
253
|
+
}
|
|
254
|
+
createModifierContexts(voices) {
|
|
255
|
+
const fn = (tickable, context) => tickable.addToModifierContext(context);
|
|
256
|
+
const contexts = createContexts(voices, () => new ModifierContext(), fn);
|
|
257
|
+
this.modifierContexts = contexts;
|
|
258
|
+
return contexts;
|
|
259
|
+
}
|
|
260
|
+
createTickContexts(voices) {
|
|
261
|
+
const fn = (tickable, context, voiceIndex) => context.addTickable(tickable, voiceIndex);
|
|
262
|
+
const contexts = createContexts(voices, (tick) => new TickContext(tick), fn);
|
|
263
|
+
this.tickContexts = contexts;
|
|
264
|
+
const contextArray = this.tickContexts.array;
|
|
265
|
+
contextArray.forEach((context) => {
|
|
266
|
+
context.tContexts = contextArray;
|
|
267
|
+
});
|
|
268
|
+
return contexts;
|
|
269
|
+
}
|
|
270
|
+
preFormat(justifyWidth = 0, renderingContext, voicesParam, stave) {
|
|
271
|
+
const contexts = this.tickContexts;
|
|
272
|
+
if (!contexts) {
|
|
273
|
+
throw new RuntimeError('NoTickContexts', 'preFormat requires TickContexts');
|
|
274
|
+
}
|
|
275
|
+
const { list: contextList, map: contextMap } = contexts;
|
|
276
|
+
this.lossHistory = [];
|
|
277
|
+
if (voicesParam && stave) {
|
|
278
|
+
voicesParam.forEach((voice) => voice.setStave(stave).preFormat());
|
|
279
|
+
}
|
|
280
|
+
let x = 0;
|
|
281
|
+
let shift = 0;
|
|
282
|
+
this.minTotalWidth = 0;
|
|
283
|
+
let totalTicks = 0;
|
|
284
|
+
contextList.forEach((tick) => {
|
|
285
|
+
const context = contextMap[tick];
|
|
286
|
+
context.preFormat();
|
|
287
|
+
const width = context.getWidth();
|
|
288
|
+
this.minTotalWidth += width;
|
|
289
|
+
const maxTicks = context.getMaxTicks().value();
|
|
290
|
+
totalTicks += maxTicks;
|
|
291
|
+
const metrics = context.getMetrics();
|
|
292
|
+
x = x + shift + metrics.totalLeftPx;
|
|
293
|
+
context.setX(x);
|
|
294
|
+
shift = width - metrics.totalLeftPx;
|
|
295
|
+
});
|
|
296
|
+
const { globalSoftmax, softmaxFactor, maxIterations } = this.formatterOptions;
|
|
297
|
+
const exp = (tick) => Math.pow(softmaxFactor, (contextMap[tick].getMaxTicks().value() / totalTicks));
|
|
298
|
+
const expTicksUsed = sumArray(contextList.map(exp));
|
|
299
|
+
this.minTotalWidth = x + shift;
|
|
300
|
+
this.hasMinTotalWidth = true;
|
|
301
|
+
if (justifyWidth <= 0)
|
|
302
|
+
return this.evaluate();
|
|
303
|
+
const firstContext = contextMap[contextList[0]];
|
|
304
|
+
const lastContext = contextMap[contextList[contextList.length - 1]];
|
|
305
|
+
function calculateIdealDistances(adjustedJustifyWidth) {
|
|
306
|
+
const distances = contextList.map((tick, i) => {
|
|
307
|
+
const context = contextMap[tick];
|
|
308
|
+
const voices = context.getTickablesByVoice();
|
|
309
|
+
let backTickable;
|
|
310
|
+
if (i > 0) {
|
|
311
|
+
const prevContext = contextMap[contextList[i - 1]];
|
|
312
|
+
for (let j = i - 1; j >= 0; j--) {
|
|
313
|
+
const backTick = contextMap[contextList[j]];
|
|
314
|
+
const backVoices = backTick.getTickablesByVoice();
|
|
315
|
+
const matchingVoices = [];
|
|
316
|
+
Object.keys(voices).forEach((v) => {
|
|
317
|
+
if (backVoices[v]) {
|
|
318
|
+
matchingVoices.push(v);
|
|
319
|
+
}
|
|
320
|
+
});
|
|
321
|
+
if (matchingVoices.length > 0) {
|
|
322
|
+
let maxTicks = 0;
|
|
323
|
+
let maxNegativeShiftPx = Infinity;
|
|
324
|
+
let expectedDistance = 0;
|
|
325
|
+
matchingVoices.forEach((v) => {
|
|
326
|
+
const ticks = backVoices[v].getTicks().value();
|
|
327
|
+
if (ticks > maxTicks) {
|
|
328
|
+
backTickable = backVoices[v];
|
|
329
|
+
maxTicks = ticks;
|
|
330
|
+
}
|
|
331
|
+
const thisTickable = voices[v];
|
|
332
|
+
const insideLeftEdge = thisTickable.getX() -
|
|
333
|
+
(thisTickable.getMetrics().modLeftPx + thisTickable.getMetrics().leftDisplacedHeadPx);
|
|
334
|
+
const backMetrics = backVoices[v].getMetrics();
|
|
335
|
+
const insideRightEdge = backVoices[v].getX() + backMetrics.notePx + backMetrics.modRightPx + backMetrics.rightDisplacedHeadPx;
|
|
336
|
+
maxNegativeShiftPx = Math.min(maxNegativeShiftPx, insideLeftEdge - insideRightEdge);
|
|
337
|
+
});
|
|
338
|
+
maxNegativeShiftPx = Math.min(maxNegativeShiftPx, context.getX() - (prevContext.getX() + adjustedJustifyWidth * 0.05));
|
|
339
|
+
if (globalSoftmax) {
|
|
340
|
+
const t = totalTicks;
|
|
341
|
+
expectedDistance = (Math.pow(softmaxFactor, (maxTicks / t)) / expTicksUsed) * adjustedJustifyWidth;
|
|
342
|
+
}
|
|
343
|
+
else if (typeof backTickable !== 'undefined') {
|
|
344
|
+
expectedDistance = backTickable.getVoice().softmax(maxTicks) * adjustedJustifyWidth;
|
|
345
|
+
}
|
|
346
|
+
return {
|
|
347
|
+
expectedDistance,
|
|
348
|
+
maxNegativeShiftPx,
|
|
349
|
+
fromTickable: backTickable,
|
|
350
|
+
};
|
|
351
|
+
}
|
|
352
|
+
}
|
|
353
|
+
}
|
|
354
|
+
return { expectedDistance: 0, fromTickablePx: 0, maxNegativeShiftPx: 0 };
|
|
355
|
+
});
|
|
356
|
+
return distances;
|
|
357
|
+
}
|
|
358
|
+
function shiftToIdealDistances(idealDistances) {
|
|
359
|
+
const centerX = adjustedJustifyWidth / 2;
|
|
360
|
+
let spaceAccum = 0;
|
|
361
|
+
contextList.forEach((tick, index) => {
|
|
362
|
+
const context = contextMap[tick];
|
|
363
|
+
if (index > 0) {
|
|
364
|
+
const contextX = context.getX();
|
|
365
|
+
const ideal = idealDistances[index];
|
|
366
|
+
const errorPx = defined(ideal.fromTickable).getX() + ideal.expectedDistance - (contextX + spaceAccum);
|
|
367
|
+
let negativeShiftPx = 0;
|
|
368
|
+
if (errorPx > 0) {
|
|
369
|
+
spaceAccum += errorPx;
|
|
370
|
+
}
|
|
371
|
+
else if (errorPx < 0) {
|
|
372
|
+
negativeShiftPx = Math.min(ideal.maxNegativeShiftPx, Math.abs(errorPx));
|
|
373
|
+
spaceAccum += -negativeShiftPx;
|
|
374
|
+
}
|
|
375
|
+
context.setX(contextX + spaceAccum);
|
|
376
|
+
}
|
|
377
|
+
context.getCenterAlignedTickables().forEach((tickable) => {
|
|
378
|
+
tickable.setCenterXShift(centerX - context.getX());
|
|
379
|
+
});
|
|
380
|
+
});
|
|
381
|
+
return lastContext.getX() - firstContext.getX();
|
|
382
|
+
}
|
|
383
|
+
const adjustedJustifyWidth = justifyWidth -
|
|
384
|
+
lastContext.getMetrics().notePx -
|
|
385
|
+
lastContext.getMetrics().totalRightPx -
|
|
386
|
+
firstContext.getMetrics().totalLeftPx;
|
|
387
|
+
const musicFont = Tables.currentMusicFont();
|
|
388
|
+
const configMinPadding = musicFont.lookupMetric('stave.endPaddingMin');
|
|
389
|
+
const configMaxPadding = musicFont.lookupMetric('stave.endPaddingMax');
|
|
390
|
+
let targetWidth = adjustedJustifyWidth;
|
|
391
|
+
const distances = calculateIdealDistances(targetWidth);
|
|
392
|
+
let actualWidth = shiftToIdealDistances(distances);
|
|
393
|
+
const calcMinDistance = (targetWidth, distances) => {
|
|
394
|
+
let mdCalc = targetWidth / 2;
|
|
395
|
+
if (distances.length > 1) {
|
|
396
|
+
for (let di = 1; di < distances.length; ++di) {
|
|
397
|
+
mdCalc = Math.min(distances[di].expectedDistance / 2, mdCalc);
|
|
398
|
+
}
|
|
399
|
+
}
|
|
400
|
+
return mdCalc;
|
|
401
|
+
};
|
|
402
|
+
const minDistance = calcMinDistance(targetWidth, distances);
|
|
403
|
+
if (contextList.length === 1)
|
|
404
|
+
return 0;
|
|
405
|
+
const paddingMax = configMaxPadding * 2 < minDistance ? minDistance : configMaxPadding;
|
|
406
|
+
const paddingMin = paddingMax - (configMaxPadding - configMinPadding);
|
|
407
|
+
const maxX = adjustedJustifyWidth - paddingMin;
|
|
408
|
+
let iterations = maxIterations;
|
|
409
|
+
while ((actualWidth > maxX && iterations > 0) || (actualWidth + paddingMax < maxX && iterations > 1)) {
|
|
410
|
+
targetWidth -= actualWidth - maxX;
|
|
411
|
+
actualWidth = shiftToIdealDistances(calculateIdealDistances(targetWidth));
|
|
412
|
+
iterations--;
|
|
413
|
+
}
|
|
414
|
+
this.justifyWidth = justifyWidth;
|
|
415
|
+
return this.evaluate();
|
|
416
|
+
}
|
|
417
|
+
evaluate() {
|
|
418
|
+
if (!this.tickContexts)
|
|
419
|
+
return 0;
|
|
420
|
+
const contexts = this.tickContexts;
|
|
421
|
+
const justifyWidth = this.justifyWidth;
|
|
422
|
+
this.contextGaps = { total: 0, gaps: [] };
|
|
423
|
+
contexts.list.forEach((tick, index) => {
|
|
424
|
+
if (index === 0)
|
|
425
|
+
return;
|
|
426
|
+
const prevTick = contexts.list[index - 1];
|
|
427
|
+
const prevContext = contexts.map[prevTick];
|
|
428
|
+
const context = contexts.map[tick];
|
|
429
|
+
const prevMetrics = prevContext.getMetrics();
|
|
430
|
+
const currMetrics = context.getMetrics();
|
|
431
|
+
const insideRightEdge = prevContext.getX() + prevMetrics.notePx + prevMetrics.totalRightPx;
|
|
432
|
+
const insideLeftEdge = context.getX() - currMetrics.totalLeftPx;
|
|
433
|
+
const gap = insideLeftEdge - insideRightEdge;
|
|
434
|
+
this.contextGaps.total += gap;
|
|
435
|
+
this.contextGaps.gaps.push({ x1: insideRightEdge, x2: insideLeftEdge });
|
|
436
|
+
context.getFormatterMetrics().freedom.left = gap;
|
|
437
|
+
prevContext.getFormatterMetrics().freedom.right = gap;
|
|
438
|
+
});
|
|
439
|
+
this.durationStats = {};
|
|
440
|
+
const durationStats = this.durationStats;
|
|
441
|
+
function updateStats(duration, space) {
|
|
442
|
+
const stats = durationStats[duration];
|
|
443
|
+
if (stats === undefined) {
|
|
444
|
+
durationStats[duration] = { mean: space, count: 1 };
|
|
445
|
+
}
|
|
446
|
+
else {
|
|
447
|
+
stats.count += 1;
|
|
448
|
+
stats.mean = (stats.mean + space) / 2;
|
|
449
|
+
}
|
|
450
|
+
}
|
|
451
|
+
this.voices.forEach((voice) => {
|
|
452
|
+
voice.getTickables().forEach((note, i, notes) => {
|
|
453
|
+
const duration = note.getTicks().clone().simplify().toString();
|
|
454
|
+
const metrics = note.getMetrics();
|
|
455
|
+
const formatterMetrics = note.getFormatterMetrics();
|
|
456
|
+
const leftNoteEdge = note.getX() + metrics.notePx + metrics.modRightPx + metrics.rightDisplacedHeadPx;
|
|
457
|
+
let space = 0;
|
|
458
|
+
if (i < notes.length - 1) {
|
|
459
|
+
const rightNote = notes[i + 1];
|
|
460
|
+
const rightMetrics = rightNote.getMetrics();
|
|
461
|
+
const rightNoteEdge = rightNote.getX() - rightMetrics.modLeftPx - rightMetrics.leftDisplacedHeadPx;
|
|
462
|
+
space = rightNoteEdge - leftNoteEdge;
|
|
463
|
+
formatterMetrics.space.used = rightNote.getX() - note.getX();
|
|
464
|
+
rightNote.getFormatterMetrics().freedom.left = space;
|
|
465
|
+
}
|
|
466
|
+
else {
|
|
467
|
+
space = justifyWidth - leftNoteEdge;
|
|
468
|
+
formatterMetrics.space.used = justifyWidth - note.getX();
|
|
469
|
+
}
|
|
470
|
+
formatterMetrics.freedom.right = space;
|
|
471
|
+
updateStats(duration, formatterMetrics.space.used);
|
|
472
|
+
});
|
|
473
|
+
});
|
|
474
|
+
let totalDeviation = 0;
|
|
475
|
+
this.voices.forEach((voice) => {
|
|
476
|
+
voice.getTickables().forEach((note) => {
|
|
477
|
+
const duration = note.getTicks().clone().simplify().toString();
|
|
478
|
+
const metrics = note.getFormatterMetrics();
|
|
479
|
+
metrics.space.mean = durationStats[duration].mean;
|
|
480
|
+
metrics.duration = duration;
|
|
481
|
+
metrics.iterations += 1;
|
|
482
|
+
metrics.space.deviation = metrics.space.used - metrics.space.mean;
|
|
483
|
+
totalDeviation += Math.pow(metrics.space.deviation, 2);
|
|
484
|
+
});
|
|
485
|
+
});
|
|
486
|
+
this.totalCost = Math.sqrt(totalDeviation);
|
|
487
|
+
this.lossHistory.push(this.totalCost);
|
|
488
|
+
return this.totalCost;
|
|
489
|
+
}
|
|
490
|
+
tune(options) {
|
|
491
|
+
var _a;
|
|
492
|
+
const contexts = this.tickContexts;
|
|
493
|
+
if (!contexts) {
|
|
494
|
+
return 0;
|
|
495
|
+
}
|
|
496
|
+
const alpha = (_a = options === null || options === void 0 ? void 0 : options.alpha) !== null && _a !== void 0 ? _a : 0.5;
|
|
497
|
+
function move(current, shift, prev, next) {
|
|
498
|
+
current.setX(current.getX() + shift);
|
|
499
|
+
current.getFormatterMetrics().freedom.left += shift;
|
|
500
|
+
current.getFormatterMetrics().freedom.right -= shift;
|
|
501
|
+
if (prev)
|
|
502
|
+
prev.getFormatterMetrics().freedom.right += shift;
|
|
503
|
+
if (next)
|
|
504
|
+
next.getFormatterMetrics().freedom.left -= shift;
|
|
505
|
+
}
|
|
506
|
+
let shift = 0;
|
|
507
|
+
this.totalShift = 0;
|
|
508
|
+
contexts.list.forEach((tick, index, list) => {
|
|
509
|
+
const context = contexts.map[tick];
|
|
510
|
+
const prevContext = index > 0 ? contexts.map[list[index - 1]] : undefined;
|
|
511
|
+
const nextContext = index < list.length - 1 ? contexts.map[list[index + 1]] : undefined;
|
|
512
|
+
move(context, shift, prevContext, nextContext);
|
|
513
|
+
const cost = -sumArray(context.getTickables().map((t) => t.getFormatterMetrics().space.deviation));
|
|
514
|
+
if (cost > 0) {
|
|
515
|
+
shift = -Math.min(context.getFormatterMetrics().freedom.right, Math.abs(cost));
|
|
516
|
+
}
|
|
517
|
+
else if (cost < 0) {
|
|
518
|
+
if (nextContext) {
|
|
519
|
+
shift = Math.min(nextContext.getFormatterMetrics().freedom.right, Math.abs(cost));
|
|
520
|
+
}
|
|
521
|
+
else {
|
|
522
|
+
shift = 0;
|
|
523
|
+
}
|
|
524
|
+
}
|
|
525
|
+
shift *= alpha;
|
|
526
|
+
this.totalShift += shift;
|
|
527
|
+
});
|
|
528
|
+
return this.evaluate();
|
|
529
|
+
}
|
|
530
|
+
postFormat() {
|
|
531
|
+
const postFormatContexts = (contexts) => contexts.list.forEach((tick) => contexts.map[tick].postFormat());
|
|
532
|
+
if (this.modifierContexts)
|
|
533
|
+
postFormatContexts(this.modifierContexts);
|
|
534
|
+
if (this.tickContexts)
|
|
535
|
+
postFormatContexts(this.tickContexts);
|
|
536
|
+
return this;
|
|
537
|
+
}
|
|
538
|
+
joinVoices(voices) {
|
|
539
|
+
this.createModifierContexts(voices);
|
|
540
|
+
this.hasMinTotalWidth = false;
|
|
541
|
+
return this;
|
|
542
|
+
}
|
|
543
|
+
format(voices, justifyWidth, options) {
|
|
544
|
+
const opts = Object.assign({ align_rests: false }, options);
|
|
545
|
+
this.voices = voices;
|
|
546
|
+
const softmaxFactor = this.formatterOptions.softmaxFactor;
|
|
547
|
+
if (softmaxFactor) {
|
|
548
|
+
this.voices.forEach((v) => v.setSoftmaxFactor(softmaxFactor));
|
|
549
|
+
}
|
|
550
|
+
this.alignRests(voices, opts.align_rests);
|
|
551
|
+
this.createTickContexts(voices);
|
|
552
|
+
this.preFormat(justifyWidth, opts.context, voices, opts.stave);
|
|
553
|
+
if (opts.stave)
|
|
554
|
+
this.postFormat();
|
|
555
|
+
return this;
|
|
556
|
+
}
|
|
557
|
+
formatToStave(voices, stave, optionsParam) {
|
|
558
|
+
const options = Object.assign({ context: stave.getContext() }, optionsParam);
|
|
559
|
+
const justifyWidth = stave.getNoteEndX() - stave.getNoteStartX() - Stave.defaultPadding;
|
|
560
|
+
L('Formatting voices to width: ', justifyWidth);
|
|
561
|
+
return this.format(voices, justifyWidth, options);
|
|
562
|
+
}
|
|
563
|
+
getTickContext(tick) {
|
|
564
|
+
var _a;
|
|
565
|
+
return (_a = this.tickContexts) === null || _a === void 0 ? void 0 : _a.map[tick];
|
|
566
|
+
}
|
|
567
|
+
}
|
|
568
|
+
Formatter.DEBUG = false;
|