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,173 @@
|
|
|
1
|
+
import { Element } from './element.js';
|
|
2
|
+
import { Glyph } from './glyph.js';
|
|
3
|
+
import { NoteHead } from './notehead.js';
|
|
4
|
+
import { StaveModifierPosition } from './stavemodifier.js';
|
|
5
|
+
import { Tables } from './tables.js';
|
|
6
|
+
import { TimeSignature } from './timesignature.js';
|
|
7
|
+
import { isBarline } from './typeguard.js';
|
|
8
|
+
import { defined } from './util.js';
|
|
9
|
+
let semibreve_rest;
|
|
10
|
+
function get_semibreve_rest() {
|
|
11
|
+
if (!semibreve_rest) {
|
|
12
|
+
const noteHead = new NoteHead({ duration: 'w', note_type: 'r' });
|
|
13
|
+
semibreve_rest = {
|
|
14
|
+
glyph_font_scale: noteHead.render_options.glyph_font_scale,
|
|
15
|
+
glyph_code: noteHead.glyph_code,
|
|
16
|
+
width: noteHead.getWidth(),
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
return semibreve_rest;
|
|
20
|
+
}
|
|
21
|
+
export class MultiMeasureRest extends Element {
|
|
22
|
+
constructor(number_of_measures, options) {
|
|
23
|
+
super();
|
|
24
|
+
this.xs = { left: NaN, right: NaN };
|
|
25
|
+
this.hasPaddingLeft = false;
|
|
26
|
+
this.hasPaddingRight = false;
|
|
27
|
+
this.hasLineThickness = false;
|
|
28
|
+
this.hasSymbolSpacing = false;
|
|
29
|
+
this.number_of_measures = number_of_measures;
|
|
30
|
+
this.hasPaddingLeft = typeof options.padding_left === 'number';
|
|
31
|
+
this.hasPaddingRight = typeof options.padding_right === 'number';
|
|
32
|
+
this.hasLineThickness = typeof options.line_thickness === 'number';
|
|
33
|
+
this.hasSymbolSpacing = typeof options.symbol_spacing === 'number';
|
|
34
|
+
const musicFont = Tables.currentMusicFont();
|
|
35
|
+
this.render_options = Object.assign({ use_symbols: false, show_number: true, number_line: -0.5, number_glyph_point: musicFont.lookupMetric('digits.point'), line: 2, spacing_between_lines_px: Tables.STAVE_LINE_DISTANCE, serif_thickness: 2, semibreve_rest_glyph_scale: Tables.NOTATION_FONT_SCALE, padding_left: 0, padding_right: 0, line_thickness: 5, symbol_spacing: 0 }, options);
|
|
36
|
+
const fontLineShift = musicFont.lookupMetric('digits.shiftLine', 0);
|
|
37
|
+
this.render_options.number_line += fontLineShift;
|
|
38
|
+
}
|
|
39
|
+
static get CATEGORY() {
|
|
40
|
+
return "MultiMeasureRest";
|
|
41
|
+
}
|
|
42
|
+
getXs() {
|
|
43
|
+
return this.xs;
|
|
44
|
+
}
|
|
45
|
+
setStave(stave) {
|
|
46
|
+
this.stave = stave;
|
|
47
|
+
return this;
|
|
48
|
+
}
|
|
49
|
+
getStave() {
|
|
50
|
+
return this.stave;
|
|
51
|
+
}
|
|
52
|
+
checkStave() {
|
|
53
|
+
return defined(this.stave, 'NoStave', 'No stave attached to instance.');
|
|
54
|
+
}
|
|
55
|
+
drawLine(stave, ctx, left, right, spacingBetweenLines) {
|
|
56
|
+
const options = this.render_options;
|
|
57
|
+
const y = stave.getYForLine(options.line);
|
|
58
|
+
const padding = (right - left) * 0.1;
|
|
59
|
+
left += padding;
|
|
60
|
+
right -= padding;
|
|
61
|
+
let lineThicknessHalf;
|
|
62
|
+
if (this.hasLineThickness) {
|
|
63
|
+
lineThicknessHalf = options.line_thickness * 0.5;
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
lineThicknessHalf = spacingBetweenLines * 0.25;
|
|
67
|
+
}
|
|
68
|
+
const serifThickness = options.serif_thickness;
|
|
69
|
+
const top = y - spacingBetweenLines;
|
|
70
|
+
const bot = y + spacingBetweenLines;
|
|
71
|
+
const leftIndented = left + serifThickness;
|
|
72
|
+
const rightIndented = right - serifThickness;
|
|
73
|
+
const lineTop = y - lineThicknessHalf;
|
|
74
|
+
const lineBottom = y + lineThicknessHalf;
|
|
75
|
+
ctx.save();
|
|
76
|
+
ctx.beginPath();
|
|
77
|
+
ctx.moveTo(left, top);
|
|
78
|
+
ctx.lineTo(leftIndented, top);
|
|
79
|
+
ctx.lineTo(leftIndented, lineTop);
|
|
80
|
+
ctx.lineTo(rightIndented, lineTop);
|
|
81
|
+
ctx.lineTo(rightIndented, top);
|
|
82
|
+
ctx.lineTo(right, top);
|
|
83
|
+
ctx.lineTo(right, bot);
|
|
84
|
+
ctx.lineTo(rightIndented, bot);
|
|
85
|
+
ctx.lineTo(rightIndented, lineBottom);
|
|
86
|
+
ctx.lineTo(leftIndented, lineBottom);
|
|
87
|
+
ctx.lineTo(leftIndented, bot);
|
|
88
|
+
ctx.lineTo(left, bot);
|
|
89
|
+
ctx.closePath();
|
|
90
|
+
ctx.fill();
|
|
91
|
+
}
|
|
92
|
+
drawSymbols(stave, ctx, left, right, spacingBetweenLines) {
|
|
93
|
+
const n4 = Math.floor(this.number_of_measures / 4);
|
|
94
|
+
const n = this.number_of_measures % 4;
|
|
95
|
+
const n2 = Math.floor(n / 2);
|
|
96
|
+
const n1 = n % 2;
|
|
97
|
+
const options = this.render_options;
|
|
98
|
+
semibreve_rest = undefined;
|
|
99
|
+
const rest = get_semibreve_rest();
|
|
100
|
+
const rest_scale = options.semibreve_rest_glyph_scale;
|
|
101
|
+
const rest_width = rest.width * (rest_scale / rest.glyph_font_scale);
|
|
102
|
+
const glyphs = {
|
|
103
|
+
2: {
|
|
104
|
+
width: rest_width * 0.5,
|
|
105
|
+
height: spacingBetweenLines,
|
|
106
|
+
},
|
|
107
|
+
1: {
|
|
108
|
+
width: rest_width,
|
|
109
|
+
},
|
|
110
|
+
};
|
|
111
|
+
const spacing = this.hasSymbolSpacing ? options.symbol_spacing : 10;
|
|
112
|
+
const width = n4 * glyphs[2].width + n2 * glyphs[2].width + n1 * glyphs[1].width + (n4 + n2 + n1 - 1) * spacing;
|
|
113
|
+
let x = left + (right - left) * 0.5 - width * 0.5;
|
|
114
|
+
const line = options.line;
|
|
115
|
+
const yTop = stave.getYForLine(line - 1);
|
|
116
|
+
const yMiddle = stave.getYForLine(line);
|
|
117
|
+
const yBottom = stave.getYForLine(line + 1);
|
|
118
|
+
ctx.save();
|
|
119
|
+
ctx.setStrokeStyle('none');
|
|
120
|
+
ctx.setLineWidth(0);
|
|
121
|
+
for (let i = 0; i < n4; ++i) {
|
|
122
|
+
ctx.fillRect(x, yMiddle - glyphs[2].height, glyphs[2].width, glyphs[2].height);
|
|
123
|
+
ctx.fillRect(x, yBottom - glyphs[2].height, glyphs[2].width, glyphs[2].height);
|
|
124
|
+
x += glyphs[2].width + spacing;
|
|
125
|
+
}
|
|
126
|
+
for (let i = 0; i < n2; ++i) {
|
|
127
|
+
ctx.fillRect(x, yMiddle - glyphs[2].height, glyphs[2].width, glyphs[2].height);
|
|
128
|
+
x += glyphs[2].width + spacing;
|
|
129
|
+
}
|
|
130
|
+
for (let i = 0; i < n1; ++i) {
|
|
131
|
+
Glyph.renderGlyph(ctx, x, yTop, rest_scale, rest.glyph_code);
|
|
132
|
+
x += glyphs[1].width + spacing;
|
|
133
|
+
}
|
|
134
|
+
ctx.restore();
|
|
135
|
+
}
|
|
136
|
+
draw() {
|
|
137
|
+
const ctx = this.checkContext();
|
|
138
|
+
this.setRendered();
|
|
139
|
+
const stave = this.checkStave();
|
|
140
|
+
let left = stave.getNoteStartX();
|
|
141
|
+
let right = stave.getNoteEndX();
|
|
142
|
+
const begModifiers = stave.getModifiers(StaveModifierPosition.BEGIN);
|
|
143
|
+
if (begModifiers.length === 1 && isBarline(begModifiers[0])) {
|
|
144
|
+
left -= begModifiers[0].getWidth();
|
|
145
|
+
}
|
|
146
|
+
const options = this.render_options;
|
|
147
|
+
if (this.hasPaddingLeft) {
|
|
148
|
+
left = stave.getX() + options.padding_left;
|
|
149
|
+
}
|
|
150
|
+
if (this.hasPaddingRight) {
|
|
151
|
+
right = stave.getX() + stave.getWidth() - options.padding_right;
|
|
152
|
+
}
|
|
153
|
+
this.xs.left = left;
|
|
154
|
+
this.xs.right = right;
|
|
155
|
+
const spacingBetweenLines = options.spacing_between_lines_px;
|
|
156
|
+
if (options.use_symbols) {
|
|
157
|
+
this.drawSymbols(stave, ctx, left, right, spacingBetweenLines);
|
|
158
|
+
}
|
|
159
|
+
else {
|
|
160
|
+
this.drawLine(stave, ctx, left, right, spacingBetweenLines);
|
|
161
|
+
}
|
|
162
|
+
if (options.show_number) {
|
|
163
|
+
const timeSpec = '/' + this.number_of_measures;
|
|
164
|
+
const timeSig = new TimeSignature(timeSpec, 0, false);
|
|
165
|
+
timeSig.point = options.number_glyph_point;
|
|
166
|
+
timeSig.setTimeSig(timeSpec);
|
|
167
|
+
timeSig.setStave(stave);
|
|
168
|
+
timeSig.setX(left + (right - left) * 0.5 - timeSig.getInfo().glyph.getMetrics().width * 0.5);
|
|
169
|
+
timeSig.bottomLine = options.number_line;
|
|
170
|
+
timeSig.setContext(ctx).draw();
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
}
|
|
@@ -0,0 +1,322 @@
|
|
|
1
|
+
import { RuntimeError } from './util.js';
|
|
2
|
+
export class Music {
|
|
3
|
+
static get NUM_TONES() {
|
|
4
|
+
return this.canonical_notes.length;
|
|
5
|
+
}
|
|
6
|
+
static get roots() {
|
|
7
|
+
return ['c', 'd', 'e', 'f', 'g', 'a', 'b'];
|
|
8
|
+
}
|
|
9
|
+
static get root_values() {
|
|
10
|
+
return [0, 2, 4, 5, 7, 9, 11];
|
|
11
|
+
}
|
|
12
|
+
static get root_indices() {
|
|
13
|
+
return {
|
|
14
|
+
c: 0,
|
|
15
|
+
d: 1,
|
|
16
|
+
e: 2,
|
|
17
|
+
f: 3,
|
|
18
|
+
g: 4,
|
|
19
|
+
a: 5,
|
|
20
|
+
b: 6,
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
static get canonical_notes() {
|
|
24
|
+
return ['c', 'c#', 'd', 'd#', 'e', 'f', 'f#', 'g', 'g#', 'a', 'a#', 'b'];
|
|
25
|
+
}
|
|
26
|
+
static get diatonic_intervals() {
|
|
27
|
+
return ['unison', 'm2', 'M2', 'm3', 'M3', 'p4', 'dim5', 'p5', 'm6', 'M6', 'b7', 'M7', 'octave'];
|
|
28
|
+
}
|
|
29
|
+
static get diatonic_accidentals() {
|
|
30
|
+
return {
|
|
31
|
+
unison: { note: 0, accidental: 0 },
|
|
32
|
+
m2: { note: 1, accidental: -1 },
|
|
33
|
+
M2: { note: 1, accidental: 0 },
|
|
34
|
+
m3: { note: 2, accidental: -1 },
|
|
35
|
+
M3: { note: 2, accidental: 0 },
|
|
36
|
+
p4: { note: 3, accidental: 0 },
|
|
37
|
+
dim5: { note: 4, accidental: -1 },
|
|
38
|
+
p5: { note: 4, accidental: 0 },
|
|
39
|
+
m6: { note: 5, accidental: -1 },
|
|
40
|
+
M6: { note: 5, accidental: 0 },
|
|
41
|
+
b7: { note: 6, accidental: -1 },
|
|
42
|
+
M7: { note: 6, accidental: 0 },
|
|
43
|
+
octave: { note: 7, accidental: 0 },
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
static get intervals() {
|
|
47
|
+
return {
|
|
48
|
+
u: 0,
|
|
49
|
+
unison: 0,
|
|
50
|
+
m2: 1,
|
|
51
|
+
b2: 1,
|
|
52
|
+
min2: 1,
|
|
53
|
+
S: 1,
|
|
54
|
+
H: 1,
|
|
55
|
+
2: 2,
|
|
56
|
+
M2: 2,
|
|
57
|
+
maj2: 2,
|
|
58
|
+
T: 2,
|
|
59
|
+
W: 2,
|
|
60
|
+
m3: 3,
|
|
61
|
+
b3: 3,
|
|
62
|
+
min3: 3,
|
|
63
|
+
M3: 4,
|
|
64
|
+
3: 4,
|
|
65
|
+
maj3: 4,
|
|
66
|
+
4: 5,
|
|
67
|
+
p4: 5,
|
|
68
|
+
'#4': 6,
|
|
69
|
+
b5: 6,
|
|
70
|
+
aug4: 6,
|
|
71
|
+
dim5: 6,
|
|
72
|
+
5: 7,
|
|
73
|
+
p5: 7,
|
|
74
|
+
'#5': 8,
|
|
75
|
+
b6: 8,
|
|
76
|
+
aug5: 8,
|
|
77
|
+
6: 9,
|
|
78
|
+
M6: 9,
|
|
79
|
+
maj6: 9,
|
|
80
|
+
b7: 10,
|
|
81
|
+
m7: 10,
|
|
82
|
+
min7: 10,
|
|
83
|
+
dom7: 10,
|
|
84
|
+
M7: 11,
|
|
85
|
+
maj7: 11,
|
|
86
|
+
8: 12,
|
|
87
|
+
octave: 12,
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
static get scales() {
|
|
91
|
+
return {
|
|
92
|
+
major: [2, 2, 1, 2, 2, 2, 1],
|
|
93
|
+
minor: [2, 1, 2, 2, 1, 2, 2],
|
|
94
|
+
ionian: [2, 2, 1, 2, 2, 2, 1],
|
|
95
|
+
dorian: [2, 1, 2, 2, 2, 1, 2],
|
|
96
|
+
phyrgian: [1, 2, 2, 2, 1, 2, 2],
|
|
97
|
+
lydian: [2, 2, 2, 1, 2, 2, 1],
|
|
98
|
+
mixolydian: [2, 2, 1, 2, 2, 1, 2],
|
|
99
|
+
aeolian: [2, 1, 2, 2, 1, 2, 2],
|
|
100
|
+
locrian: [1, 2, 2, 1, 2, 2, 2],
|
|
101
|
+
};
|
|
102
|
+
}
|
|
103
|
+
static get scaleTypes() {
|
|
104
|
+
return {
|
|
105
|
+
M: Music.scales.major,
|
|
106
|
+
m: Music.scales.minor,
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
static get accidentals() {
|
|
110
|
+
return ['bb', 'b', 'n', '#', '##'];
|
|
111
|
+
}
|
|
112
|
+
static get noteValues() {
|
|
113
|
+
return {
|
|
114
|
+
c: { root_index: 0, int_val: 0 },
|
|
115
|
+
cn: { root_index: 0, int_val: 0 },
|
|
116
|
+
'c#': { root_index: 0, int_val: 1 },
|
|
117
|
+
'c##': { root_index: 0, int_val: 2 },
|
|
118
|
+
cb: { root_index: 0, int_val: 11 },
|
|
119
|
+
cbb: { root_index: 0, int_val: 10 },
|
|
120
|
+
d: { root_index: 1, int_val: 2 },
|
|
121
|
+
dn: { root_index: 1, int_val: 2 },
|
|
122
|
+
'd#': { root_index: 1, int_val: 3 },
|
|
123
|
+
'd##': { root_index: 1, int_val: 4 },
|
|
124
|
+
db: { root_index: 1, int_val: 1 },
|
|
125
|
+
dbb: { root_index: 1, int_val: 0 },
|
|
126
|
+
e: { root_index: 2, int_val: 4 },
|
|
127
|
+
en: { root_index: 2, int_val: 4 },
|
|
128
|
+
'e#': { root_index: 2, int_val: 5 },
|
|
129
|
+
'e##': { root_index: 2, int_val: 6 },
|
|
130
|
+
eb: { root_index: 2, int_val: 3 },
|
|
131
|
+
ebb: { root_index: 2, int_val: 2 },
|
|
132
|
+
f: { root_index: 3, int_val: 5 },
|
|
133
|
+
fn: { root_index: 3, int_val: 5 },
|
|
134
|
+
'f#': { root_index: 3, int_val: 6 },
|
|
135
|
+
'f##': { root_index: 3, int_val: 7 },
|
|
136
|
+
fb: { root_index: 3, int_val: 4 },
|
|
137
|
+
fbb: { root_index: 3, int_val: 3 },
|
|
138
|
+
g: { root_index: 4, int_val: 7 },
|
|
139
|
+
gn: { root_index: 4, int_val: 7 },
|
|
140
|
+
'g#': { root_index: 4, int_val: 8 },
|
|
141
|
+
'g##': { root_index: 4, int_val: 9 },
|
|
142
|
+
gb: { root_index: 4, int_val: 6 },
|
|
143
|
+
gbb: { root_index: 4, int_val: 5 },
|
|
144
|
+
a: { root_index: 5, int_val: 9 },
|
|
145
|
+
an: { root_index: 5, int_val: 9 },
|
|
146
|
+
'a#': { root_index: 5, int_val: 10 },
|
|
147
|
+
'a##': { root_index: 5, int_val: 11 },
|
|
148
|
+
ab: { root_index: 5, int_val: 8 },
|
|
149
|
+
abb: { root_index: 5, int_val: 7 },
|
|
150
|
+
b: { root_index: 6, int_val: 11 },
|
|
151
|
+
bn: { root_index: 6, int_val: 11 },
|
|
152
|
+
'b#': { root_index: 6, int_val: 0 },
|
|
153
|
+
'b##': { root_index: 6, int_val: 1 },
|
|
154
|
+
bb: { root_index: 6, int_val: 10 },
|
|
155
|
+
bbb: { root_index: 6, int_val: 9 },
|
|
156
|
+
};
|
|
157
|
+
}
|
|
158
|
+
isValidNoteValue(note) {
|
|
159
|
+
return note >= 0 && note < Music.canonical_notes.length;
|
|
160
|
+
}
|
|
161
|
+
isValidIntervalValue(interval) {
|
|
162
|
+
return interval >= 0 && interval < Music.diatonic_intervals.length;
|
|
163
|
+
}
|
|
164
|
+
getNoteParts(noteString) {
|
|
165
|
+
if (!noteString || noteString.length < 1) {
|
|
166
|
+
throw new RuntimeError('BadArguments', 'Invalid note name: ' + noteString);
|
|
167
|
+
}
|
|
168
|
+
if (noteString.length > 3) {
|
|
169
|
+
throw new RuntimeError('BadArguments', 'Invalid note name: ' + noteString);
|
|
170
|
+
}
|
|
171
|
+
const note = noteString.toLowerCase();
|
|
172
|
+
const regex = /^([cdefgab])(b|bb|n|#|##)?$/;
|
|
173
|
+
const match = regex.exec(note);
|
|
174
|
+
if (match !== null) {
|
|
175
|
+
const root = match[1];
|
|
176
|
+
const accidental = match[2];
|
|
177
|
+
return {
|
|
178
|
+
root,
|
|
179
|
+
accidental,
|
|
180
|
+
};
|
|
181
|
+
}
|
|
182
|
+
else {
|
|
183
|
+
throw new RuntimeError('BadArguments', 'Invalid note name: ' + noteString);
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
getKeyParts(keyString) {
|
|
187
|
+
if (!keyString || keyString.length < 1) {
|
|
188
|
+
throw new RuntimeError('BadArguments', 'Invalid key: ' + keyString);
|
|
189
|
+
}
|
|
190
|
+
const key = keyString.toLowerCase();
|
|
191
|
+
const regex = /^([cdefgab])(b|#)?(mel|harm|m|M)?$/;
|
|
192
|
+
const match = regex.exec(key);
|
|
193
|
+
if (match !== null) {
|
|
194
|
+
const root = match[1];
|
|
195
|
+
const accidental = match[2];
|
|
196
|
+
let type = match[3];
|
|
197
|
+
if (!type)
|
|
198
|
+
type = 'M';
|
|
199
|
+
return {
|
|
200
|
+
root,
|
|
201
|
+
accidental,
|
|
202
|
+
type,
|
|
203
|
+
};
|
|
204
|
+
}
|
|
205
|
+
else {
|
|
206
|
+
throw new RuntimeError('BadArguments', `Invalid key: ${keyString}`);
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
getNoteValue(noteString) {
|
|
210
|
+
const value = Music.noteValues[noteString];
|
|
211
|
+
if (value === undefined) {
|
|
212
|
+
throw new RuntimeError('BadArguments', `Invalid note name: ${noteString}`);
|
|
213
|
+
}
|
|
214
|
+
return value.int_val;
|
|
215
|
+
}
|
|
216
|
+
getIntervalValue(intervalString) {
|
|
217
|
+
const value = Music.intervals[intervalString];
|
|
218
|
+
if (value === undefined) {
|
|
219
|
+
throw new RuntimeError('BadArguments', `Invalid interval name: ${intervalString}`);
|
|
220
|
+
}
|
|
221
|
+
return value;
|
|
222
|
+
}
|
|
223
|
+
getCanonicalNoteName(noteValue) {
|
|
224
|
+
if (!this.isValidNoteValue(noteValue)) {
|
|
225
|
+
throw new RuntimeError('BadArguments', `Invalid note value: ${noteValue}`);
|
|
226
|
+
}
|
|
227
|
+
return Music.canonical_notes[noteValue];
|
|
228
|
+
}
|
|
229
|
+
getCanonicalIntervalName(intervalValue) {
|
|
230
|
+
if (!this.isValidIntervalValue(intervalValue)) {
|
|
231
|
+
throw new RuntimeError('BadArguments', `Invalid interval value: ${intervalValue}`);
|
|
232
|
+
}
|
|
233
|
+
return Music.diatonic_intervals[intervalValue];
|
|
234
|
+
}
|
|
235
|
+
getRelativeNoteValue(noteValue, intervalValue, direction = 1) {
|
|
236
|
+
if (direction !== 1 && direction !== -1) {
|
|
237
|
+
throw new RuntimeError('BadArguments', `Invalid direction: ${direction}`);
|
|
238
|
+
}
|
|
239
|
+
let sum = (noteValue + direction * intervalValue) % Music.NUM_TONES;
|
|
240
|
+
if (sum < 0)
|
|
241
|
+
sum += Music.NUM_TONES;
|
|
242
|
+
return sum;
|
|
243
|
+
}
|
|
244
|
+
getRelativeNoteName(root, noteValue) {
|
|
245
|
+
const parts = this.getNoteParts(root);
|
|
246
|
+
const rootValue = this.getNoteValue(parts.root);
|
|
247
|
+
let interval = noteValue - rootValue;
|
|
248
|
+
if (Math.abs(interval) > Music.NUM_TONES - 3) {
|
|
249
|
+
let multiplier = 1;
|
|
250
|
+
if (interval > 0)
|
|
251
|
+
multiplier = -1;
|
|
252
|
+
const reverse_interval = ((noteValue + 1 + (rootValue + 1)) % Music.NUM_TONES) * multiplier;
|
|
253
|
+
if (Math.abs(reverse_interval) > 2) {
|
|
254
|
+
throw new RuntimeError('BadArguments', `Notes not related: ${root}, ${noteValue})`);
|
|
255
|
+
}
|
|
256
|
+
else {
|
|
257
|
+
interval = reverse_interval;
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
if (Math.abs(interval) > 2) {
|
|
261
|
+
throw new RuntimeError('BadArguments', `Notes not related: ${root}, ${noteValue})`);
|
|
262
|
+
}
|
|
263
|
+
let relativeNoteName = parts.root;
|
|
264
|
+
if (interval > 0) {
|
|
265
|
+
for (let i = 1; i <= interval; ++i) {
|
|
266
|
+
relativeNoteName += '#';
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
else if (interval < 0) {
|
|
270
|
+
for (let i = -1; i >= interval; --i) {
|
|
271
|
+
relativeNoteName += 'b';
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
return relativeNoteName;
|
|
275
|
+
}
|
|
276
|
+
getScaleTones(key, intervals) {
|
|
277
|
+
const tones = [key];
|
|
278
|
+
let nextNote = key;
|
|
279
|
+
for (let i = 0; i < intervals.length; i++) {
|
|
280
|
+
nextNote = this.getRelativeNoteValue(nextNote, intervals[i]);
|
|
281
|
+
if (nextNote !== key)
|
|
282
|
+
tones.push(nextNote);
|
|
283
|
+
}
|
|
284
|
+
return tones;
|
|
285
|
+
}
|
|
286
|
+
getIntervalBetween(note1, note2, direction = 1) {
|
|
287
|
+
if (direction !== 1 && direction !== -1) {
|
|
288
|
+
throw new RuntimeError('BadArguments', `Invalid direction: ${direction}`);
|
|
289
|
+
}
|
|
290
|
+
if (!this.isValidNoteValue(note1) || !this.isValidNoteValue(note2)) {
|
|
291
|
+
throw new RuntimeError('BadArguments', `Invalid notes: ${note1}, ${note2}`);
|
|
292
|
+
}
|
|
293
|
+
let difference = direction === 1 ? note2 - note1 : note1 - note2;
|
|
294
|
+
if (difference < 0)
|
|
295
|
+
difference += Music.NUM_TONES;
|
|
296
|
+
return difference;
|
|
297
|
+
}
|
|
298
|
+
createScaleMap(keySignature) {
|
|
299
|
+
const keySigParts = this.getKeyParts(keySignature);
|
|
300
|
+
if (!keySigParts.type)
|
|
301
|
+
throw new RuntimeError('BadArguments', 'Unsupported key type: undefined');
|
|
302
|
+
const scaleName = Music.scaleTypes[keySigParts.type];
|
|
303
|
+
let keySigString = keySigParts.root;
|
|
304
|
+
if (keySigParts.accidental)
|
|
305
|
+
keySigString += keySigParts.accidental;
|
|
306
|
+
if (!scaleName)
|
|
307
|
+
throw new RuntimeError('BadArguments', 'Unsupported key type: ' + keySignature);
|
|
308
|
+
const scale = this.getScaleTones(this.getNoteValue(keySigString), scaleName);
|
|
309
|
+
const noteLocation = Music.root_indices[keySigParts.root];
|
|
310
|
+
const scaleMap = {};
|
|
311
|
+
for (let i = 0; i < Music.roots.length; ++i) {
|
|
312
|
+
const index = (noteLocation + i) % Music.roots.length;
|
|
313
|
+
const rootName = Music.roots[index];
|
|
314
|
+
let noteName = this.getRelativeNoteName(rootName, scale[i]);
|
|
315
|
+
if (noteName.length === 1) {
|
|
316
|
+
noteName += 'n';
|
|
317
|
+
}
|
|
318
|
+
scaleMap[rootName] = noteName;
|
|
319
|
+
}
|
|
320
|
+
return scaleMap;
|
|
321
|
+
}
|
|
322
|
+
}
|