vexflow 5.0.0-alpha.4 → 5.0.0-beta.0
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 +6 -6
- 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 +1546 -1393
- package/build/cjs/vexflow-debug-with-tests.js.map +1 -1
- package/build/cjs/vexflow-debug.js +600 -549
- package/build/cjs/vexflow-debug.js.map +1 -1
- package/build/cjs/vexflow.js +2 -2
- package/build/cjs/vexflow.js.map +1 -1
- package/build/esm/src/annotation.js +0 -2
- package/build/esm/src/barnote.js +3 -3
- package/build/esm/src/beam.js +2 -4
- package/build/esm/src/bend.js +11 -3
- package/build/esm/src/chordsymbol.js +0 -4
- package/build/esm/src/clef.js +0 -2
- package/build/esm/src/curve.js +8 -5
- package/build/esm/src/element.js +11 -17
- package/build/esm/src/factory.js +4 -4
- package/build/esm/src/flag.js +20 -0
- package/build/esm/src/formatter.js +4 -4
- package/build/esm/src/glyphnote.js +0 -2
- package/build/esm/src/gracenote.js +0 -2
- package/build/esm/src/gracenotegroup.js +17 -8
- package/build/esm/src/index.js +1 -0
- package/build/esm/src/keysignature.js +38 -31
- package/build/esm/src/keysignote.js +1 -1
- package/build/esm/src/metrics.js +55 -7
- package/build/esm/src/modifier.js +4 -2
- package/build/esm/src/notehead.js +6 -1
- package/build/esm/src/ornament.js +0 -2
- package/build/esm/src/pedalmarking.js +33 -41
- package/build/esm/src/stave.js +10 -16
- package/build/esm/src/stavebarline.js +2 -3
- package/build/esm/src/stavehairpin.js +1 -1
- package/build/esm/src/staveline.js +0 -4
- package/build/esm/src/stavemodifier.js +0 -2
- package/build/esm/src/stavenote.js +16 -28
- package/build/esm/src/staverepetition.js +3 -2
- package/build/esm/src/stavesection.js +13 -15
- package/build/esm/src/stavetempo.js +3 -2
- package/build/esm/src/stavetext.js +2 -2
- package/build/esm/src/stavetie.js +0 -4
- package/build/esm/src/stavevolta.js +3 -2
- package/build/esm/src/stem.js +0 -4
- package/build/esm/src/stemmablenote.js +5 -6
- package/build/esm/src/stringnumber.js +0 -2
- package/build/esm/src/svgcontext.js +0 -1
- package/build/esm/src/tabnote.js +2 -8
- package/build/esm/src/textbracket.js +0 -3
- package/build/esm/src/textnote.js +0 -2
- package/build/esm/src/timesignature.js +2 -4
- package/build/esm/src/timesignote.js +2 -0
- package/build/esm/src/tuplet.js +37 -30
- package/build/esm/src/version.js +3 -3
- package/build/esm/src/vexflow.js +6 -2
- package/build/esm/tests/accidental_tests.js +30 -17
- package/build/esm/tests/annotation_tests.js +12 -12
- package/build/esm/tests/articulation_tests.js +13 -13
- package/build/esm/tests/auto_beam_formatting_tests.js +33 -33
- package/build/esm/tests/beam_tests.js +1 -1
- package/build/esm/tests/bend_tests.js +7 -7
- package/build/esm/tests/chordsymbol_tests.js +8 -8
- package/build/esm/tests/curve_tests.js +34 -0
- package/build/esm/tests/{bach_tests.js → demo_petzold_tests.js} +7 -7
- package/build/esm/tests/dot_tests.js +4 -4
- package/build/esm/tests/formatter_tests.js +25 -25
- package/build/esm/tests/gracenote_tests.js +2 -1
- package/build/esm/tests/gracetabnote_tests.js +1 -1
- package/build/esm/tests/index.js +1 -1
- package/build/esm/tests/key_clef_tests.js +6 -6
- package/build/esm/tests/keysignature_tests.js +20 -17
- package/build/esm/tests/notehead_tests.js +10 -7
- package/build/esm/tests/offscreencanvas_tests.js +1 -1
- package/build/esm/tests/ornament_tests.js +8 -8
- package/build/esm/tests/pedalmarking_tests.js +27 -0
- package/build/esm/tests/percussion_tests.js +6 -3
- package/build/esm/tests/renderer_tests.js +1 -1
- package/build/esm/tests/rests_tests.js +26 -26
- package/build/esm/tests/rhythm_tests.js +15 -15
- package/build/esm/tests/stave_tests.js +44 -43
- package/build/esm/tests/staveconnector_tests.js +73 -73
- package/build/esm/tests/stavehairpin_tests.js +1 -1
- package/build/esm/tests/stavemodifier_tests.js +3 -3
- package/build/esm/tests/stavenote_tests.js +29 -29
- package/build/esm/tests/stringnumber_tests.js +1 -1
- package/build/esm/tests/strokes_tests.js +1 -1
- package/build/esm/tests/style_tests.js +1 -1
- package/build/esm/tests/tabnote_tests.js +7 -7
- package/build/esm/tests/tabslide_tests.js +6 -6
- package/build/esm/tests/tabstave_tests.js +1 -1
- package/build/esm/tests/tabtie_tests.js +8 -8
- package/build/esm/tests/textnote_tests.js +1 -1
- package/build/esm/tests/threevoice_tests.js +2 -2
- package/build/esm/tests/timesignature_tests.js +23 -13
- package/build/esm/tests/vibrato_tests.js +3 -3
- package/build/esm/tests/voice_tests.js +1 -1
- package/build/types/src/bend.d.ts +6 -0
- package/build/types/src/curve.d.ts +5 -4
- package/build/types/src/element.d.ts +10 -11
- package/build/types/src/factory.d.ts +2 -2
- package/build/types/src/flag.d.ts +12 -0
- package/build/types/src/frethandfinger.d.ts +1 -1
- package/build/types/src/index.d.ts +1 -0
- package/build/types/src/keysignature.d.ts +7 -7
- package/build/types/src/metrics.d.ts +5 -0
- package/build/types/src/modifier.d.ts +1 -1
- package/build/types/src/pedalmarking.d.ts +2 -2
- package/build/types/src/stave.d.ts +1 -3
- package/build/types/src/stavebarline.d.ts +1 -1
- package/build/types/src/staveline.d.ts +1 -1
- package/build/types/src/stavemodifier.d.ts +0 -1
- package/build/types/src/staverepetition.d.ts +1 -1
- package/build/types/src/stavesection.d.ts +3 -4
- package/build/types/src/stavetempo.d.ts +1 -2
- package/build/types/src/stavetext.d.ts +1 -2
- package/build/types/src/stavevolta.d.ts +1 -2
- package/build/types/src/stemmablenote.d.ts +2 -3
- package/build/types/src/tuplet.d.ts +2 -12
- package/build/types/src/typeguard.d.ts +1 -0
- package/package.json +32 -28
|
@@ -26,7 +26,7 @@ function setupContext(options, contextBuilder, width = 350, height = 150) {
|
|
|
26
26
|
const context = contextBuilder(options.elementId, width, height);
|
|
27
27
|
context.scale(0.9, 0.9);
|
|
28
28
|
context.font = '10pt Arial';
|
|
29
|
-
const stave = new Stave(10, 30, width).addClef('treble').addTimeSignature('4/4').setContext(context).
|
|
29
|
+
const stave = new Stave(10, 30, width).addClef('treble').addTimeSignature('4/4').setContext(context).drawWithStyle();
|
|
30
30
|
return { context, stave };
|
|
31
31
|
}
|
|
32
32
|
function basic(options, contextBuilder) {
|
|
@@ -79,9 +79,9 @@ function beamsUp(options, contextBuilder) {
|
|
|
79
79
|
const beam2 = new Beam(notes.slice(4, 8));
|
|
80
80
|
const beam3 = new Beam(notes.slice(8, 12));
|
|
81
81
|
Formatter.FormatAndDraw(context, stave, notes);
|
|
82
|
-
beam1.setContext(context).
|
|
83
|
-
beam2.setContext(context).
|
|
84
|
-
beam3.setContext(context).
|
|
82
|
+
beam1.setContext(context).drawWithStyle();
|
|
83
|
+
beam2.setContext(context).drawWithStyle();
|
|
84
|
+
beam3.setContext(context).drawWithStyle();
|
|
85
85
|
options.assert.ok(true, 'Auto Align Rests - Beams Up Test');
|
|
86
86
|
}
|
|
87
87
|
function beamsDown(options, contextBuilder) {
|
|
@@ -104,9 +104,9 @@ function beamsDown(options, contextBuilder) {
|
|
|
104
104
|
const beam2 = new Beam(notes.slice(4, 8));
|
|
105
105
|
const beam3 = new Beam(notes.slice(8, 12));
|
|
106
106
|
Formatter.FormatAndDraw(context, stave, notes);
|
|
107
|
-
beam1.setContext(context).
|
|
108
|
-
beam2.setContext(context).
|
|
109
|
-
beam3.setContext(context).
|
|
107
|
+
beam1.setContext(context).drawWithStyle();
|
|
108
|
+
beam2.setContext(context).drawWithStyle();
|
|
109
|
+
beam3.setContext(context).drawWithStyle();
|
|
110
110
|
options.assert.ok(true, 'Auto Align Rests - Beams Down Test');
|
|
111
111
|
}
|
|
112
112
|
function tupletsUp(options, contextBuilder) {
|
|
@@ -130,10 +130,10 @@ function tupletsUp(options, contextBuilder) {
|
|
|
130
130
|
const tuplet3 = new Tuplet(notes.slice(6, 9)).setTupletLocation(Tuplet.LOCATION_TOP);
|
|
131
131
|
const tuplet4 = new Tuplet(notes.slice(9, 12)).setTupletLocation(Tuplet.LOCATION_TOP);
|
|
132
132
|
Formatter.FormatAndDraw(context, stave, notes);
|
|
133
|
-
tuplet1.setContext(context).
|
|
134
|
-
tuplet2.setContext(context).
|
|
135
|
-
tuplet3.setContext(context).
|
|
136
|
-
tuplet4.setContext(context).
|
|
133
|
+
tuplet1.setContext(context).drawWithStyle();
|
|
134
|
+
tuplet2.setContext(context).drawWithStyle();
|
|
135
|
+
tuplet3.setContext(context).drawWithStyle();
|
|
136
|
+
tuplet4.setContext(context).drawWithStyle();
|
|
137
137
|
options.assert.ok(true, 'Auto Align Rests - Tuplets Stem Up Test');
|
|
138
138
|
}
|
|
139
139
|
function tupletsDown(options, contextBuilder) {
|
|
@@ -161,14 +161,14 @@ function tupletsDown(options, contextBuilder) {
|
|
|
161
161
|
const tuplet3 = new Tuplet(notes.slice(6, 9)).setTupletLocation(Tuplet.LOCATION_BOTTOM);
|
|
162
162
|
const tuplet4 = new Tuplet(notes.slice(9, 12)).setTupletLocation(Tuplet.LOCATION_BOTTOM);
|
|
163
163
|
Formatter.FormatAndDraw(context, stave, notes);
|
|
164
|
-
tuplet1.setContext(context).
|
|
165
|
-
tuplet2.setContext(context).
|
|
166
|
-
tuplet3.setContext(context).
|
|
167
|
-
tuplet4.setContext(context).
|
|
168
|
-
beam1.setContext(context).
|
|
169
|
-
beam2.setContext(context).
|
|
170
|
-
beam3.setContext(context).
|
|
171
|
-
beam4.setContext(context).
|
|
164
|
+
tuplet1.setContext(context).drawWithStyle();
|
|
165
|
+
tuplet2.setContext(context).drawWithStyle();
|
|
166
|
+
tuplet3.setContext(context).drawWithStyle();
|
|
167
|
+
tuplet4.setContext(context).drawWithStyle();
|
|
168
|
+
beam1.setContext(context).drawWithStyle();
|
|
169
|
+
beam2.setContext(context).drawWithStyle();
|
|
170
|
+
beam3.setContext(context).drawWithStyle();
|
|
171
|
+
beam4.setContext(context).drawWithStyle();
|
|
172
172
|
options.assert.ok(true, 'Auto Align Rests - Tuplets Stem Down Test');
|
|
173
173
|
}
|
|
174
174
|
function singleVoiceDefaultAlignment(options, contextBuilder) {
|
|
@@ -194,8 +194,8 @@ function singleVoiceDefaultAlignment(options, contextBuilder) {
|
|
|
194
194
|
const beam = new Beam(notes.slice(5, 9));
|
|
195
195
|
const tuplet = new Tuplet(notes.slice(9, 12)).setTupletLocation(Tuplet.LOCATION_TOP);
|
|
196
196
|
Formatter.FormatAndDraw(context, stave, notes);
|
|
197
|
-
tuplet.setContext(context).
|
|
198
|
-
beam.setContext(context).
|
|
197
|
+
tuplet.setContext(context).drawWithStyle();
|
|
198
|
+
beam.setContext(context).drawWithStyle();
|
|
199
199
|
options.assert.ok(true, 'Auto Align Rests - Default Test');
|
|
200
200
|
}
|
|
201
201
|
function singleVoiceAlignAll(options, contextBuilder) {
|
|
@@ -221,13 +221,13 @@ function singleVoiceAlignAll(options, contextBuilder) {
|
|
|
221
221
|
const beam = new Beam(notes.slice(5, 9));
|
|
222
222
|
const tuplet = new Tuplet(notes.slice(9, 12)).setTupletLocation(Tuplet.LOCATION_TOP);
|
|
223
223
|
Formatter.FormatAndDraw(context, stave, notes, { alignRests: true });
|
|
224
|
-
tuplet.setContext(context).
|
|
225
|
-
beam.setContext(context).
|
|
224
|
+
tuplet.setContext(context).drawWithStyle();
|
|
225
|
+
beam.setContext(context).drawWithStyle();
|
|
226
226
|
options.assert.ok(true, 'Auto Align Rests - Align All Test');
|
|
227
227
|
}
|
|
228
228
|
function multiVoice(options, contextBuilder) {
|
|
229
229
|
const ctx = contextBuilder(options.elementId, 600, 200);
|
|
230
|
-
const stave = new Stave(50, 10, 500).addClef('treble').setContext(ctx).addTimeSignature('4/4').
|
|
230
|
+
const stave = new Stave(50, 10, 500).addClef('treble').setContext(ctx).addTimeSignature('4/4').drawWithStyle();
|
|
231
231
|
const noteOnStave = (noteStruct) => new StaveNote(noteStruct).setStave(stave);
|
|
232
232
|
const notes1 = [
|
|
233
233
|
noteOnStave({ keys: ['c/4', 'e/4', 'g/4'], duration: '4' }),
|
|
@@ -252,8 +252,8 @@ function multiVoice(options, contextBuilder) {
|
|
|
252
252
|
const beam2_2 = new Beam(notes2.slice(4, 8));
|
|
253
253
|
voice2.draw(ctx);
|
|
254
254
|
voice1.draw(ctx);
|
|
255
|
-
beam2_1.setContext(ctx).
|
|
256
|
-
beam2_2.setContext(ctx).
|
|
255
|
+
beam2_1.setContext(ctx).drawWithStyle();
|
|
256
|
+
beam2_2.setContext(ctx).drawWithStyle();
|
|
257
257
|
options.assert.ok(true, 'Strokes Test Multi Voice');
|
|
258
258
|
}
|
|
259
259
|
VexFlowTests.register(RestsTests);
|
|
@@ -24,20 +24,20 @@ function drawBasic(options, contextBuilder) {
|
|
|
24
24
|
staveBar1.addClef('treble');
|
|
25
25
|
staveBar1.addTimeSignature('4/4');
|
|
26
26
|
staveBar1.addKeySignature('C');
|
|
27
|
-
staveBar1.setContext(ctx).
|
|
27
|
+
staveBar1.setContext(ctx).drawWithStyle();
|
|
28
28
|
const notesBar1 = [new StaveNote({ keys: ['b/4'], duration: '1s', stemDirection: -1 })];
|
|
29
29
|
Formatter.FormatAndDraw(ctx, staveBar1, notesBar1);
|
|
30
30
|
const staveBar2 = new Stave(staveBar1.getWidth() + staveBar1.getX(), staveBar1.getY(), 120);
|
|
31
31
|
staveBar2.setBegBarType(BarlineType.SINGLE);
|
|
32
32
|
staveBar2.setEndBarType(BarlineType.SINGLE);
|
|
33
|
-
staveBar2.setContext(ctx).
|
|
33
|
+
staveBar2.setContext(ctx).drawWithStyle();
|
|
34
34
|
const notesBar2 = [
|
|
35
35
|
new StaveNote({ keys: ['b/4'], duration: '2s', stemDirection: -1 }),
|
|
36
36
|
new StaveNote({ keys: ['b/4'], duration: '2s', stemDirection: -1 }),
|
|
37
37
|
];
|
|
38
38
|
Formatter.FormatAndDraw(ctx, staveBar2, notesBar2);
|
|
39
39
|
const staveBar3 = new Stave(staveBar2.getWidth() + staveBar2.getX(), staveBar2.getY(), 170);
|
|
40
|
-
staveBar3.setContext(ctx).
|
|
40
|
+
staveBar3.setContext(ctx).drawWithStyle();
|
|
41
41
|
const notesBar3 = [
|
|
42
42
|
new StaveNote({
|
|
43
43
|
keys: ['b/4'],
|
|
@@ -62,7 +62,7 @@ function drawBasic(options, contextBuilder) {
|
|
|
62
62
|
];
|
|
63
63
|
Formatter.FormatAndDraw(ctx, staveBar3, notesBar3);
|
|
64
64
|
const staveBar4 = new Stave(staveBar3.getWidth() + staveBar3.getX(), staveBar3.getY(), 200);
|
|
65
|
-
staveBar4.setContext(ctx).
|
|
65
|
+
staveBar4.setContext(ctx).drawWithStyle();
|
|
66
66
|
const notesBar4 = [
|
|
67
67
|
new StaveNote({
|
|
68
68
|
keys: ['b/4'],
|
|
@@ -116,7 +116,7 @@ function drawBeamedSlashNotes(options, contextBuilder) {
|
|
|
116
116
|
staveBar1.addClef('treble');
|
|
117
117
|
staveBar1.addTimeSignature('4/4');
|
|
118
118
|
staveBar1.addKeySignature('C');
|
|
119
|
-
staveBar1.setContext(ctx).
|
|
119
|
+
staveBar1.setContext(ctx).drawWithStyle();
|
|
120
120
|
const notesBar1Part1 = [
|
|
121
121
|
new StaveNote({
|
|
122
122
|
keys: ['b/4'],
|
|
@@ -165,8 +165,8 @@ function drawBeamedSlashNotes(options, contextBuilder) {
|
|
|
165
165
|
const beam2 = new Beam(notesBar1Part2);
|
|
166
166
|
const notesBar1 = notesBar1Part1.concat(notesBar1Part2);
|
|
167
167
|
Formatter.FormatAndDraw(ctx, staveBar1, notesBar1);
|
|
168
|
-
beam1.setContext(ctx).
|
|
169
|
-
beam2.setContext(ctx).
|
|
168
|
+
beam1.setContext(ctx).drawWithStyle();
|
|
169
|
+
beam2.setContext(ctx).drawWithStyle();
|
|
170
170
|
options.assert.expect(0);
|
|
171
171
|
}
|
|
172
172
|
function drawSlashAndBeamAndRests(options, contextBuilder) {
|
|
@@ -177,7 +177,7 @@ function drawSlashAndBeamAndRests(options, contextBuilder) {
|
|
|
177
177
|
staveBar1.addClef('treble');
|
|
178
178
|
staveBar1.addTimeSignature('4/4');
|
|
179
179
|
staveBar1.addKeySignature('F');
|
|
180
|
-
staveBar1.setContext(ctx).
|
|
180
|
+
staveBar1.setContext(ctx).drawWithStyle();
|
|
181
181
|
const notesBar1Part1 = [
|
|
182
182
|
new StaveNote({
|
|
183
183
|
keys: ['b/4'],
|
|
@@ -221,9 +221,9 @@ function drawSlashAndBeamAndRests(options, contextBuilder) {
|
|
|
221
221
|
];
|
|
222
222
|
const beam1 = new Beam(notesBar1Part1);
|
|
223
223
|
Formatter.FormatAndDraw(ctx, staveBar1, notesBar1Part1.concat(notesBar1Part2));
|
|
224
|
-
beam1.setContext(ctx).
|
|
224
|
+
beam1.setContext(ctx).drawWithStyle();
|
|
225
225
|
const staveBar2 = new Stave(staveBar1.getWidth() + staveBar1.getX(), staveBar1.getY(), 220);
|
|
226
|
-
staveBar2.setContext(ctx).
|
|
226
|
+
staveBar2.setContext(ctx).drawWithStyle();
|
|
227
227
|
const notesBar2 = [
|
|
228
228
|
new StaveNote({
|
|
229
229
|
keys: ['b/4'],
|
|
@@ -243,7 +243,7 @@ function drawSixtenthWithScratches(options, contextBuilder) {
|
|
|
243
243
|
staveBar1.addClef('treble');
|
|
244
244
|
staveBar1.addTimeSignature('4/4');
|
|
245
245
|
staveBar1.addKeySignature('F');
|
|
246
|
-
staveBar1.setContext(ctx).
|
|
246
|
+
staveBar1.setContext(ctx).drawWithStyle();
|
|
247
247
|
const notesBar1Part1 = [
|
|
248
248
|
new StaveNote({
|
|
249
249
|
keys: ['b/4'],
|
|
@@ -292,8 +292,8 @@ function drawSixtenthWithScratches(options, contextBuilder) {
|
|
|
292
292
|
const beam1 = new Beam(notesBar1Part1);
|
|
293
293
|
const beam2 = new Beam(notesBar1Part2);
|
|
294
294
|
Formatter.FormatAndDraw(ctx, staveBar1, notesBar1Part1.concat(notesBar1Part2));
|
|
295
|
-
beam1.setContext(ctx).
|
|
296
|
-
beam2.setContext(ctx).
|
|
295
|
+
beam1.setContext(ctx).drawWithStyle();
|
|
296
|
+
beam2.setContext(ctx).drawWithStyle();
|
|
297
297
|
options.assert.expect(0);
|
|
298
298
|
}
|
|
299
299
|
function drawThirtySecondWithScratches(options, contextBuilder) {
|
|
@@ -304,7 +304,7 @@ function drawThirtySecondWithScratches(options, contextBuilder) {
|
|
|
304
304
|
staveBar1.addClef('treble');
|
|
305
305
|
staveBar1.addTimeSignature('4/4');
|
|
306
306
|
staveBar1.addKeySignature('F');
|
|
307
|
-
staveBar1.setContext(ctx).
|
|
307
|
+
staveBar1.setContext(ctx).drawWithStyle();
|
|
308
308
|
const notesBar1Part1 = [
|
|
309
309
|
new StaveNote({
|
|
310
310
|
keys: ['b/4'],
|
|
@@ -350,7 +350,7 @@ function drawThirtySecondWithScratches(options, contextBuilder) {
|
|
|
350
350
|
notesBar1Part1[0].addModifier(new Annotation('C7').setFont('Times', VexFlowTests.Font.size + 3), 0);
|
|
351
351
|
const beam1 = new Beam(notesBar1Part1);
|
|
352
352
|
Formatter.FormatAndDraw(ctx, staveBar1, notesBar1Part1);
|
|
353
|
-
beam1.setContext(ctx).
|
|
353
|
+
beam1.setContext(ctx).drawWithStyle();
|
|
354
354
|
options.assert.expect(0);
|
|
355
355
|
}
|
|
356
356
|
VexFlowTests.register(RhythmTests);
|
|
@@ -9,6 +9,7 @@ import { Stave } from '../src/stave.js';
|
|
|
9
9
|
import { Barline, BarlineType } from '../src/stavebarline.js';
|
|
10
10
|
import { StaveNote } from '../src/stavenote.js';
|
|
11
11
|
import { Repetition } from '../src/staverepetition.js';
|
|
12
|
+
import { StaveSection } from '../src/stavesection.js';
|
|
12
13
|
import { VoltaType } from '../src/stavevolta.js';
|
|
13
14
|
import { TextJustification } from '../src/textnote.js';
|
|
14
15
|
import { TimeSignature } from '../src/timesignature.js';
|
|
@@ -73,7 +74,7 @@ function draw(options, contextBuilder) {
|
|
|
73
74
|
const ctx = contextBuilder(options.elementId, 400, 150);
|
|
74
75
|
const stave = new Stave(10, 10, 300);
|
|
75
76
|
stave.setContext(ctx);
|
|
76
|
-
stave.
|
|
77
|
+
stave.drawWithStyle();
|
|
77
78
|
options.assert.equal(stave.getYForNote(0), 100, 'getYForNote(0)');
|
|
78
79
|
options.assert.equal(stave.getYForLine(5), 100, 'getYForLine(5)');
|
|
79
80
|
options.assert.equal(stave.getYForLine(0), 50, 'getYForLine(0) - Top Line');
|
|
@@ -84,10 +85,10 @@ function drawOpenStave(options, contextBuilder) {
|
|
|
84
85
|
const ctx = contextBuilder(options.elementId, 400, 350);
|
|
85
86
|
let stave = new Stave(10, 10, 300, { leftBar: false });
|
|
86
87
|
stave.setContext(ctx);
|
|
87
|
-
stave.
|
|
88
|
+
stave.drawWithStyle();
|
|
88
89
|
stave = new Stave(10, 150, 300, { rightBar: false });
|
|
89
90
|
stave.setContext(ctx);
|
|
90
|
-
stave.
|
|
91
|
+
stave.drawWithStyle();
|
|
91
92
|
options.assert.ok(true, 'all pass');
|
|
92
93
|
}
|
|
93
94
|
function drawMultipleMeasures(options, contextBuilder) {
|
|
@@ -98,7 +99,7 @@ function drawMultipleMeasures(options, contextBuilder) {
|
|
|
98
99
|
staveBar1.setBegBarType(BarlineType.REPEAT_BEGIN);
|
|
99
100
|
staveBar1.setEndBarType(BarlineType.DOUBLE);
|
|
100
101
|
staveBar1.setSection('A', 0, 0, (_a = options.params) === null || _a === void 0 ? void 0 : _a.fontSize, false);
|
|
101
|
-
staveBar1.addClef('treble').setContext(ctx).
|
|
102
|
+
staveBar1.addClef('treble').setContext(ctx).drawWithStyle();
|
|
102
103
|
const notesBar1 = [
|
|
103
104
|
new StaveNote({ keys: ['c/4'], duration: 'q' }),
|
|
104
105
|
new StaveNote({ keys: ['d/4'], duration: 'q' }),
|
|
@@ -107,9 +108,9 @@ function drawMultipleMeasures(options, contextBuilder) {
|
|
|
107
108
|
];
|
|
108
109
|
Formatter.FormatAndDraw(ctx, staveBar1, notesBar1);
|
|
109
110
|
const staveBar2 = new Stave(staveBar1.getWidth() + staveBar1.getX(), staveBar1.getY(), 300);
|
|
110
|
-
staveBar2.
|
|
111
|
+
staveBar2.addModifier(new StaveSection('B').setFontSize((_b = options.params) === null || _b === void 0 ? void 0 : _b.fontSize));
|
|
111
112
|
staveBar2.setEndBarType(BarlineType.END);
|
|
112
|
-
staveBar2.setContext(ctx).
|
|
113
|
+
staveBar2.setContext(ctx).drawWithStyle();
|
|
113
114
|
const notesBar2Part1 = [
|
|
114
115
|
new StaveNote({ keys: ['c/4'], duration: '8' }),
|
|
115
116
|
new StaveNote({ keys: ['d/4'], duration: '8' }),
|
|
@@ -126,8 +127,8 @@ function drawMultipleMeasures(options, contextBuilder) {
|
|
|
126
127
|
const beam2 = new Beam(notesBar2Part2);
|
|
127
128
|
const notesBar2 = notesBar2Part1.concat(notesBar2Part2);
|
|
128
129
|
Formatter.FormatAndDraw(ctx, staveBar2, notesBar2);
|
|
129
|
-
beam1.setContext(ctx).
|
|
130
|
-
beam2.setContext(ctx).
|
|
130
|
+
beam1.setContext(ctx).drawWithStyle();
|
|
131
|
+
beam2.setContext(ctx).drawWithStyle();
|
|
131
132
|
}
|
|
132
133
|
function drawRepeats(options, contextBuilder) {
|
|
133
134
|
options.assert.expect(0);
|
|
@@ -137,7 +138,7 @@ function drawRepeats(options, contextBuilder) {
|
|
|
137
138
|
staveBar1.setEndBarType(BarlineType.REPEAT_END);
|
|
138
139
|
staveBar1.addClef('treble');
|
|
139
140
|
staveBar1.addKeySignature('A');
|
|
140
|
-
staveBar1.setContext(ctx).
|
|
141
|
+
staveBar1.setContext(ctx).drawWithStyle();
|
|
141
142
|
const notesBar1 = [
|
|
142
143
|
new StaveNote({ keys: ['c/4'], duration: 'q' }),
|
|
143
144
|
new StaveNote({ keys: ['d/4'], duration: 'q' }),
|
|
@@ -148,7 +149,7 @@ function drawRepeats(options, contextBuilder) {
|
|
|
148
149
|
const staveBar2 = new Stave(staveBar1.getWidth() + staveBar1.getX(), staveBar1.getY(), 250);
|
|
149
150
|
staveBar2.setBegBarType(BarlineType.REPEAT_BEGIN);
|
|
150
151
|
staveBar2.setEndBarType(BarlineType.REPEAT_END);
|
|
151
|
-
staveBar2.setContext(ctx).
|
|
152
|
+
staveBar2.setContext(ctx).drawWithStyle();
|
|
152
153
|
const notesBar2Part1 = [
|
|
153
154
|
new StaveNote({ keys: ['c/4'], duration: '8' }),
|
|
154
155
|
new StaveNote({ keys: ['d/4'], duration: '8' }),
|
|
@@ -168,16 +169,16 @@ function drawRepeats(options, contextBuilder) {
|
|
|
168
169
|
const beam2 = new Beam(notesBar2Part2);
|
|
169
170
|
const notesBar2 = notesBar2Part1.concat(notesBar2Part2);
|
|
170
171
|
Formatter.FormatAndDraw(ctx, staveBar2, notesBar2);
|
|
171
|
-
beam1.setContext(ctx).
|
|
172
|
-
beam2.setContext(ctx).
|
|
172
|
+
beam1.setContext(ctx).drawWithStyle();
|
|
173
|
+
beam2.setContext(ctx).drawWithStyle();
|
|
173
174
|
const staveBar3 = new Stave(staveBar2.getWidth() + staveBar2.getX(), staveBar2.getY(), 50);
|
|
174
|
-
staveBar3.setContext(ctx).
|
|
175
|
+
staveBar3.setContext(ctx).drawWithStyle();
|
|
175
176
|
const notesBar3 = [new StaveNote({ keys: ['d/5'], duration: 'wr' })];
|
|
176
177
|
Formatter.FormatAndDraw(ctx, staveBar3, notesBar3);
|
|
177
178
|
const staveBar4 = new Stave(staveBar3.getWidth() + staveBar3.getX(), staveBar3.getY(), 250 - staveBar1.getModifierXShift());
|
|
178
179
|
staveBar4.setBegBarType(BarlineType.REPEAT_BEGIN);
|
|
179
180
|
staveBar4.setEndBarType(BarlineType.REPEAT_END);
|
|
180
|
-
staveBar4.setContext(ctx).
|
|
181
|
+
staveBar4.setContext(ctx).drawWithStyle();
|
|
181
182
|
const notesBar4 = [
|
|
182
183
|
new StaveNote({ keys: ['c/4'], duration: 'q' }),
|
|
183
184
|
new StaveNote({ keys: ['d/4'], duration: 'q' }),
|
|
@@ -224,7 +225,7 @@ function drawEndModifiers(options, contextBuilder) {
|
|
|
224
225
|
staveBar.setEndTimeSignature(endMods.timeSig);
|
|
225
226
|
}
|
|
226
227
|
}
|
|
227
|
-
staveBar.setContext(ctx).
|
|
228
|
+
staveBar.setContext(ctx).drawWithStyle();
|
|
228
229
|
const notesBar = [
|
|
229
230
|
new StaveNote({ keys: ['c/4'], duration: 'q' }),
|
|
230
231
|
new StaveNote({ keys: ['d/4'], duration: 'q' }),
|
|
@@ -268,7 +269,7 @@ function drawStaveRepetition(options, contextBuilder) {
|
|
|
268
269
|
mm1.addClef('treble');
|
|
269
270
|
mm1.setRepetitionType(Repetition.type.DS_AL_FINE, options.params.yShift);
|
|
270
271
|
mm1.setMeasure(1);
|
|
271
|
-
mm1.setContext(ctx).
|
|
272
|
+
mm1.setContext(ctx).drawWithStyle();
|
|
272
273
|
const notesmm1 = [
|
|
273
274
|
new StaveNote({ keys: ['a/4'], duration: 'q' }),
|
|
274
275
|
new StaveNote({ keys: ['f/4'], duration: 'q' }),
|
|
@@ -279,7 +280,7 @@ function drawStaveRepetition(options, contextBuilder) {
|
|
|
279
280
|
const mm2 = new Stave(mm1.getWidth() + mm1.getX(), mm1.getY(), 150);
|
|
280
281
|
mm2.setRepetitionType(Repetition.type.TO_CODA, options.params.yShift);
|
|
281
282
|
mm2.setMeasure(2);
|
|
282
|
-
mm2.setContext(ctx).
|
|
283
|
+
mm2.setContext(ctx).drawWithStyle();
|
|
283
284
|
const notesmm2 = [
|
|
284
285
|
new StaveNote({ keys: ['a/4'], duration: 'q' }),
|
|
285
286
|
new StaveNote({ keys: ['f/4'], duration: 'q' }),
|
|
@@ -290,7 +291,7 @@ function drawStaveRepetition(options, contextBuilder) {
|
|
|
290
291
|
const mm3 = new Stave(mm2.getWidth() + mm2.getX(), mm1.getY(), 150);
|
|
291
292
|
mm3.setRepetitionType(Repetition.type.DS_AL_CODA, options.params.yShift);
|
|
292
293
|
mm3.setMeasure(3);
|
|
293
|
-
mm3.setContext(ctx).
|
|
294
|
+
mm3.setContext(ctx).drawWithStyle();
|
|
294
295
|
const notesmm3 = [
|
|
295
296
|
new StaveNote({ keys: ['a/4'], duration: 'q' }),
|
|
296
297
|
new StaveNote({ keys: ['f/4'], duration: 'q' }),
|
|
@@ -301,7 +302,7 @@ function drawStaveRepetition(options, contextBuilder) {
|
|
|
301
302
|
const mm4 = new Stave(mm3.getWidth() + mm3.getX(), mm1.getY(), 150);
|
|
302
303
|
mm4.setRepetitionType(Repetition.type.CODA_LEFT, options.params.yShift);
|
|
303
304
|
mm4.setMeasure(4);
|
|
304
|
-
mm4.setContext(ctx).
|
|
305
|
+
mm4.setContext(ctx).drawWithStyle();
|
|
305
306
|
const notesmm4 = [
|
|
306
307
|
new StaveNote({ keys: ['a/4'], duration: 'q' }),
|
|
307
308
|
new StaveNote({ keys: ['f/4'], duration: 'q' }),
|
|
@@ -319,53 +320,53 @@ function drawVolta(options, contextBuilder) {
|
|
|
319
320
|
mm1.addClef('treble');
|
|
320
321
|
mm1.addKeySignature('A');
|
|
321
322
|
mm1.setMeasure(1);
|
|
322
|
-
mm1.
|
|
323
|
-
mm1.setContext(ctx).
|
|
323
|
+
mm1.addModifier(new StaveSection('A'));
|
|
324
|
+
mm1.setContext(ctx).drawWithStyle();
|
|
324
325
|
const notesmm1 = [new StaveNote({ keys: ['c/4'], duration: 'w' })];
|
|
325
326
|
Formatter.FormatAndDraw(ctx, mm1, notesmm1);
|
|
326
327
|
const mm2 = new Stave(mm1.getWidth() + mm1.getX(), mm1.getY(), 60);
|
|
327
328
|
mm2.setRepetitionType(Repetition.type.CODA_RIGHT);
|
|
328
329
|
mm2.setMeasure(2);
|
|
329
|
-
mm2.setContext(ctx).
|
|
330
|
+
mm2.setContext(ctx).drawWithStyle();
|
|
330
331
|
const notesmm2 = [new StaveNote({ keys: ['d/4'], duration: 'w' })];
|
|
331
332
|
Formatter.FormatAndDraw(ctx, mm2, notesmm2);
|
|
332
333
|
const mm3 = new Stave(mm2.getWidth() + mm2.getX(), mm1.getY(), 60);
|
|
333
334
|
mm3.setVoltaType(VoltaType.BEGIN, '1.', -5);
|
|
334
335
|
mm3.setMeasure(3);
|
|
335
|
-
mm3.setContext(ctx).
|
|
336
|
+
mm3.setContext(ctx).drawWithStyle();
|
|
336
337
|
const notesmm3 = [new StaveNote({ keys: ['e/4'], duration: 'w' })];
|
|
337
338
|
Formatter.FormatAndDraw(ctx, mm3, notesmm3);
|
|
338
339
|
const mm4 = new Stave(mm3.getWidth() + mm3.getX(), mm1.getY(), 60);
|
|
339
340
|
mm4.setVoltaType(VoltaType.MID, '', -5);
|
|
340
341
|
mm4.setMeasure(4);
|
|
341
|
-
mm4.setContext(ctx).
|
|
342
|
+
mm4.setContext(ctx).drawWithStyle();
|
|
342
343
|
const notesmm4 = [new StaveNote({ keys: ['f/4'], duration: 'w' })];
|
|
343
344
|
Formatter.FormatAndDraw(ctx, mm4, notesmm4);
|
|
344
345
|
const mm5 = new Stave(mm4.getWidth() + mm4.getX(), mm1.getY(), 60);
|
|
345
346
|
mm5.setEndBarType(BarlineType.REPEAT_END);
|
|
346
347
|
mm5.setVoltaType(VoltaType.END, '', -5);
|
|
347
348
|
mm5.setMeasure(5);
|
|
348
|
-
mm5.setContext(ctx).
|
|
349
|
+
mm5.setContext(ctx).drawWithStyle();
|
|
349
350
|
const notesmm5 = [new StaveNote({ keys: ['g/4'], duration: 'w' })];
|
|
350
351
|
Formatter.FormatAndDraw(ctx, mm5, notesmm5);
|
|
351
352
|
const mm6 = new Stave(mm5.getWidth() + mm5.getX(), mm1.getY(), 60);
|
|
352
353
|
mm6.setVoltaType(VoltaType.BEGIN_END, '2.', -5);
|
|
353
354
|
mm6.setEndBarType(BarlineType.DOUBLE);
|
|
354
355
|
mm6.setMeasure(6);
|
|
355
|
-
mm6.setContext(ctx).
|
|
356
|
+
mm6.setContext(ctx).drawWithStyle();
|
|
356
357
|
const notesmm6 = [new StaveNote({ keys: ['a/4'], duration: 'w' })];
|
|
357
358
|
Formatter.FormatAndDraw(ctx, mm6, notesmm6);
|
|
358
359
|
const mm7 = new Stave(mm6.getWidth() + mm6.getX(), mm1.getY(), 60);
|
|
359
360
|
mm7.setMeasure(7);
|
|
360
|
-
mm7.
|
|
361
|
-
mm7.setContext(ctx).
|
|
361
|
+
mm7.addModifier(new StaveSection('B').setPadding(4));
|
|
362
|
+
mm7.setContext(ctx).drawWithStyle();
|
|
362
363
|
const notesmm7 = [new StaveNote({ keys: ['b/4'], duration: 'w' })];
|
|
363
364
|
Formatter.FormatAndDraw(ctx, mm7, notesmm7);
|
|
364
365
|
const mm8 = new Stave(mm7.getWidth() + mm7.getX(), mm1.getY(), 60);
|
|
365
366
|
mm8.setEndBarType(BarlineType.DOUBLE);
|
|
366
367
|
mm8.setRepetitionType(Repetition.type.DS_AL_CODA);
|
|
367
368
|
mm8.setMeasure(8);
|
|
368
|
-
mm8.setContext(ctx).
|
|
369
|
+
mm8.setContext(ctx).drawWithStyle();
|
|
369
370
|
const notesmm8 = [new StaveNote({ keys: ['c/5'], duration: 'w' })];
|
|
370
371
|
Formatter.FormatAndDraw(ctx, mm8, notesmm8);
|
|
371
372
|
const mm9 = new Stave(mm8.getWidth() + mm8.getX() + 20, mm1.getY(), 125);
|
|
@@ -374,7 +375,7 @@ function drawVolta(options, contextBuilder) {
|
|
|
374
375
|
mm9.addClef('treble');
|
|
375
376
|
mm9.addKeySignature('A');
|
|
376
377
|
mm9.setMeasure(9);
|
|
377
|
-
mm9.setContext(ctx).
|
|
378
|
+
mm9.setContext(ctx).drawWithStyle();
|
|
378
379
|
const notesmm9 = [new StaveNote({ keys: ['d/5'], duration: 'w' })];
|
|
379
380
|
Formatter.FormatAndDraw(ctx, mm9, notesmm9);
|
|
380
381
|
}
|
|
@@ -388,7 +389,7 @@ function drawVoltaModifier(options, contextBuilder) {
|
|
|
388
389
|
mm1.addKeySignature('A');
|
|
389
390
|
mm1.setMeasure(1);
|
|
390
391
|
mm1.setSection('A', 0);
|
|
391
|
-
mm1.setContext(ctx).
|
|
392
|
+
mm1.setContext(ctx).drawWithStyle();
|
|
392
393
|
const notesmm1 = [new StaveNote({ keys: ['c/4'], duration: 'w' })];
|
|
393
394
|
Formatter.FormatAndDraw(ctx, mm1, notesmm1);
|
|
394
395
|
const mm2 = new Stave(mm1.getX() + mm1.getWidth(), mm1.getY(), 175);
|
|
@@ -398,7 +399,7 @@ function drawVoltaModifier(options, contextBuilder) {
|
|
|
398
399
|
mm2.addClef('treble');
|
|
399
400
|
mm2.addKeySignature('A');
|
|
400
401
|
mm2.setMeasure(2);
|
|
401
|
-
mm2.setContext(ctx).
|
|
402
|
+
mm2.setContext(ctx).drawWithStyle();
|
|
402
403
|
const notesmm2 = [new StaveNote({ keys: ['c/4'], duration: 'w' })];
|
|
403
404
|
Formatter.FormatAndDraw(ctx, mm2, notesmm2);
|
|
404
405
|
const mm3 = new Stave(mm2.getX() + mm2.getWidth(), mm2.getY(), 175);
|
|
@@ -408,7 +409,7 @@ function drawVoltaModifier(options, contextBuilder) {
|
|
|
408
409
|
mm3.addKeySignature('B');
|
|
409
410
|
mm3.setMeasure(3);
|
|
410
411
|
mm3.setSection('B', 0);
|
|
411
|
-
mm3.setContext(ctx).
|
|
412
|
+
mm3.setContext(ctx).drawWithStyle();
|
|
412
413
|
const notesmm3 = [new StaveNote({ keys: ['c/4'], duration: 'w' })];
|
|
413
414
|
Formatter.FormatAndDraw(ctx, mm3, notesmm3);
|
|
414
415
|
const mm4 = new Stave(mm3.getX() + mm3.getWidth(), mm3.getY(), 175);
|
|
@@ -418,7 +419,7 @@ function drawVoltaModifier(options, contextBuilder) {
|
|
|
418
419
|
mm4.addKeySignature('A');
|
|
419
420
|
mm4.setMeasure(4);
|
|
420
421
|
mm4.setSection('C', 0);
|
|
421
|
-
mm4.setContext(ctx).
|
|
422
|
+
mm4.setContext(ctx).drawWithStyle();
|
|
422
423
|
const notesmm4 = [new StaveNote({ keys: ['c/4'], duration: 'w' })];
|
|
423
424
|
Formatter.FormatAndDraw(ctx, mm4, notesmm4);
|
|
424
425
|
const mm5 = new Stave(mm4.getX() + mm4.getWidth(), mm4.getY(), 175);
|
|
@@ -427,15 +428,15 @@ function drawVoltaModifier(options, contextBuilder) {
|
|
|
427
428
|
mm5.addClef('treble');
|
|
428
429
|
mm5.addKeySignature('A');
|
|
429
430
|
mm5.setMeasure(5);
|
|
430
|
-
mm5.
|
|
431
|
-
mm5.setContext(ctx).
|
|
431
|
+
mm5.addModifier(new StaveSection('D'));
|
|
432
|
+
mm5.setContext(ctx).drawWithStyle();
|
|
432
433
|
const notesmm5 = [new StaveNote({ keys: ['c/4'], duration: 'w' })];
|
|
433
434
|
Formatter.FormatAndDraw(ctx, mm5, notesmm5);
|
|
434
435
|
const mm6 = new Stave(mm5.getX() + mm5.getWidth(), mm5.getY(), 175);
|
|
435
436
|
mm6.setRepetitionType(Repetition.type.DS);
|
|
436
437
|
mm6.setMeasure(6);
|
|
437
|
-
mm6.
|
|
438
|
-
mm6.setContext(ctx).
|
|
438
|
+
mm6.addModifier(new StaveSection('E'));
|
|
439
|
+
mm6.setContext(ctx).drawWithStyle();
|
|
439
440
|
const notesmm6 = [new StaveNote({ keys: ['c/4'], duration: 'w' })];
|
|
440
441
|
Formatter.FormatAndDraw(ctx, mm6, notesmm6);
|
|
441
442
|
}
|
|
@@ -450,7 +451,7 @@ function drawTempo(options, contextBuilder) {
|
|
|
450
451
|
if (x === 0)
|
|
451
452
|
staveBar.addClef('treble');
|
|
452
453
|
staveBar.setTempo(tempo, tempoY);
|
|
453
|
-
staveBar.setContext(ctx).
|
|
454
|
+
staveBar.setContext(ctx).drawWithStyle();
|
|
454
455
|
const notesBar = notes || [
|
|
455
456
|
new StaveNote({ keys: ['c/4'], duration: 'q' }),
|
|
456
457
|
new StaveNote({ keys: ['d/4'], duration: 'q' }),
|
|
@@ -500,7 +501,7 @@ function configureSingleLine(options, contextBuilder) {
|
|
|
500
501
|
.setConfigForLine(2, { visible: true })
|
|
501
502
|
.setConfigForLine(3, { visible: false })
|
|
502
503
|
.setConfigForLine(4, { visible: true });
|
|
503
|
-
stave.setContext(ctx).
|
|
504
|
+
stave.setContext(ctx).drawWithStyle();
|
|
504
505
|
const config = stave.getConfigForLines();
|
|
505
506
|
options.assert.equal(config[0].visible, true, 'getLinesConfiguration() - Line 0');
|
|
506
507
|
options.assert.equal(config[1].visible, false, 'getLinesConfiguration() - Line 1');
|
|
@@ -515,7 +516,7 @@ function configureAllLines(options, contextBuilder) {
|
|
|
515
516
|
stave
|
|
516
517
|
.setConfigForLines([{ visible: false }, {}, { visible: false }, { visible: true }, { visible: false }])
|
|
517
518
|
.setContext(ctx)
|
|
518
|
-
.
|
|
519
|
+
.drawWithStyle();
|
|
519
520
|
const config = stave.getConfigForLines();
|
|
520
521
|
options.assert.equal(config[0].visible, false, 'getLinesConfiguration() - Line 0');
|
|
521
522
|
options.assert.equal(config[1].visible, true, 'getLinesConfiguration() - Line 1');
|
|
@@ -531,7 +532,7 @@ function drawStaveText(options, contextBuilder) {
|
|
|
531
532
|
stave.setStaveText('Right Text', Modifier.Position.RIGHT);
|
|
532
533
|
stave.setStaveText('Above Text', Modifier.Position.ABOVE);
|
|
533
534
|
stave.setStaveText('Below Text', Modifier.Position.BELOW);
|
|
534
|
-
stave.setContext(ctx).
|
|
535
|
+
stave.setContext(ctx).drawWithStyle();
|
|
535
536
|
options.assert.ok(true, 'all pass');
|
|
536
537
|
}
|
|
537
538
|
function drawStaveTextMultiLine(options, contextBuilder) {
|
|
@@ -551,7 +552,7 @@ function drawStaveTextMultiLine(options, contextBuilder) {
|
|
|
551
552
|
shiftY: 10,
|
|
552
553
|
justification: TextJustification.RIGHT,
|
|
553
554
|
});
|
|
554
|
-
stave.setContext(ctx).
|
|
555
|
+
stave.setContext(ctx).drawWithStyle();
|
|
555
556
|
options.assert.ok(true, 'all pass');
|
|
556
557
|
}
|
|
557
558
|
function factoryAPI(options) {
|