Skip to content

Commit b5bc50e

Browse files
yjparkyjpark
committed
fixes #95, support dorian scale, fixes #96, limit mouse wheel panning position
1 parent d4a3b6e commit b5bc50e

File tree

5 files changed

+178
-140
lines changed

5 files changed

+178
-140
lines changed

‎apps/notation_tool/src/tab/songs/misc/scarborough_fair.rs‎

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@ use notation_proto::prelude::*;
44
pub fn new_tab() -> Tab {
55
tab! {
66
"06dd7278-cdaf-40dd-abc6-6e66ec2d6b8c"
7-
Meta: TabMeta::new(Key::E, Scale::Minor, Signature::_3_4, Tempo::Bpm(110))
7+
Meta: TabMeta::new(Key::E, Scale::Dorian, Signature::_3_4, Tempo::Bpm(110))
88
Tracks: [
99
{chord Chord [
1010
$duration = D_1_2
11-
"6sus4_7" Chord ( 6: 4 5 7- )
12-
"2_9_11" Chord ( 2: 3 9 11 )
13-
"5/4" Chord ( 5: 3 5 /4 )
14-
"5" Chord ( 5: 3 5 )
15-
"6sus2" Chord ( 6: 2 5 )
16-
"6-" Chord ( 6: 3- 5 )
11+
"2sus4_7" Chord ( 2: 4 5 7- )
12+
"5_9_11" Chord ( 5: 3 9 11 )
13+
"1/4" Chord ( 1: 3 5 /4 )
1714
"1" Chord ( 1: 3 5 )
15+
"2sus2" Chord ( 2: 2 5 )
16+
"2-" Chord ( 2: 3- 5 )
17+
"4" Chord ( 4: 3 5 )
1818
"v:12"
1919
$duration = _1_4
20-
Chord ( 1: 3 5 )
20+
Chord ( 4: 3 5 )
2121
$duration = _1_2
22-
Chord ( 2: 3 5 ) |
22+
Chord ( 5: 3 5 ) |
2323
"v:19"
2424
$duration = _1_4
25-
Chord ( 1: 3 5 )
26-
Chord ( 5: 3 5 /3)
27-
Chord ( 6: 3- 5 ) |
25+
Chord ( 4: 3 5 )
26+
Chord ( 1: 3 5 /3)
27+
Chord ( 2: 3- 5 ) |
2828
]}
2929
{guitar Guitar [
3030
Fretboard capo: 7
@@ -116,105 +116,105 @@ pub fn new_tab() -> Tab {
116116
]}
117117
{vocal Vocal [
118118
$key = E
119-
$scale = Minor
119+
$scale = Dorian
120120
$duration = _1_4
121-
"v:1" Tone [ .6* .6 ] |
122-
"v:2" Tone [ 3, 3* 3, ] |
123-
"v:3" Tone [ .7+ 1, .7 ] |
124-
"v:4" Tone [ .6*+ ] |
125-
"v:6" Tone [ _ 3 5 ] |
126-
"v:7" Tone [ 6* 5 ] |
127-
"v:8" Tone [ 3 #4 2 ] |
128-
"v:9" Tone [ 3*+ ] |
129-
"v:12" Tone [ _* 6 ] |
130-
"v:13" Tone [ 6* 6 ] |
131-
"v:14" Tone [ 5* 3 ] |
132-
"v:15" Tone [ 3 2 1 ] |
133-
"v:16" Tone [ .7, .5, @ .5* ] |
134-
"v:18" Tone [ .6* 3 ] |
135-
"v:19" Tone [ 2* 1 ] |
136-
"v:20" Tone [ .7 .6 .5 ] |
137-
"v:21" Tone [ .6*+ ] |
138-
"v2:1" Tone [ .6, .6+ .6 ] |
139-
"v2:2" Tone [ 3 3 3 ] |
140-
"v2:3" Tone [ .7 1 .7 ] |
141-
"v3:2" Tone [ 3 2 1 ] |
142-
"v3:13" Tone [ 6 6 6 ] |
143-
"v4:2" Tone [ 3, 3+ 3, 3, ] |
144-
"v4:3" Tone [ .7, 1+ .7 ] |
145-
"v4:4" Tone [ .6, .6, @ .6* ] |
146-
"v4:12" Tone [ _* 6, 6, ] |
147-
"v4:14" Tone [ 5* 2, 2, ] |
148-
"v4:15" Tone [ 1 .7 .6 ] |
149-
"v4:16" Tone [ .7, .5, @ .5* ] |
121+
"v:1" Tone [ 2* 2 ] |
122+
"v:2" Tone [ 6, 6* 6, ] |
123+
"v:3" Tone [ 3+ 4, 3 ] |
124+
"v:4" Tone [ 2*+ ] |
125+
"v:6" Tone [ _ 6 ^1 ] |
126+
"v:7" Tone [ ^2* ^1 ] |
127+
"v:8" Tone [ 6 7 5 ] |
128+
"v:9" Tone [ 6*+ ] |
129+
"v:12" Tone [ _* ^2 ] |
130+
"v:13" Tone [ ^2* ^2 ] |
131+
"v:14" Tone [ ^1* 6 ] |
132+
"v:15" Tone [ 6 5 4 ] |
133+
"v:16" Tone [ 3, 1, @ 1* ] |
134+
"v:18" Tone [ 2* 6 ] |
135+
"v:19" Tone [ 5* 4 ] |
136+
"v:20" Tone [ 3 2 1 ] |
137+
"v:21" Tone [ 2*+ ] |
138+
"v2:1" Tone [ 2, 2+ 2 ] |
139+
"v2:2" Tone [ 6 6 6 ] |
140+
"v2:3" Tone [ 3 4 3 ] |
141+
"v3:2" Tone [ 6 5 4 ] |
142+
"v3:13" Tone [ ^2 ^2 ^2 ] |
143+
"v4:2" Tone [ 6, 6+ 6, 6, ] |
144+
"v4:3" Tone [ 3, 4+ 3 ] |
145+
"v4:4" Tone [ 2, 2, @ 2* ] |
146+
"v4:12" Tone [ _* ^2, ^2, ] |
147+
"v4:14" Tone [ ^1* 5, 5, ] |
148+
"v4:15" Tone [ 4 3 2 ] |
149+
"v4:16" Tone [ 3, 1, @ 1* ] |
150150
]}
151151
]
152152
Sections: [
153153
{intro Intro [
154154
{
155-
chord [ "6sus4_7" 1 ]
155+
chord [ "2sus4_7" 1 ]
156156
guitar [ "Asus4" 1 ; "i" | ]
157157
} {
158-
chord [ "2_9_11" 1 ]
158+
chord [ "5_9_11" 1 ]
159159
guitar [ "Dadd11" 1 ; "i" | ]
160160
} {
161-
chord [ "5/4" 1 ]
161+
chord [ "1/4" 1 ]
162162
guitar [ "G/C" 1 ; "i:3" | ]
163163
}
164164
{
165-
chord [ "6sus4_7" 1 ]
165+
chord [ "2sus4_7" 1 ]
166166
guitar [ "Asus4" 1 ; "i" | ]
167167
}
168168
{
169-
chord [ "6sus2" 1 ]
169+
chord [ "2sus2" 1 ]
170170
guitar [ "Asus2" 1 ; "i" | ]
171171
}
172172
{
173-
chord [ "6sus4_7" 1 ]
173+
chord [ "2sus4_7" 1 ]
174174
guitar [ "Asus4" 1 ; "i" | ]
175175
}
176176
{
177-
chord [ "6sus2" 1 ]
177+
chord [ "2sus2" 1 ]
178178
guitar [ "Asus2" 1 ; "i" | ]
179179
}
180180
]}
181181
{verse Verse [
182182
{
183-
chord [ "6sus4_7" 1 ]
183+
chord [ "2sus4_7" 1 ]
184184
guitar [ "Asus4" 1 ; "i" | ]
185185
lyrics [ "v1:1" | @ 1 5 ; "v2:1" | @ 2 ; "v3:1" | @ 3 ; "v4:1" | @ 4 ; "v5:1" | @ 5 ]
186186
vocal [ "v:1" | @ 1 5 ; "v2:1" | @ 2 3 4 ]
187187
}
188188
{
189-
chord [ "6sus2" 1 ]
189+
chord [ "2sus2" 1 ]
190190
guitar [ "Asus2" 1 ; "i" | ]
191191
lyrics [ "v1:2" | @ 1 5 ; "v2:2" | @ 2 ; "v3:2" | @ 3 ; "v4:2" | @ 4 ; "v5:2" | @ 5 ]
192192
vocal [ "v:2" | @ 1 5 ; "v2:2" | @ 2 ; "v3:2" | @ 3 ; "v4:2" | @ 4 ]
193193
}
194194
{
195-
chord [ "5" 1 ]
195+
chord [ "1" 1 ]
196196
guitar [ "G'" 1 ; "v:7" | ]
197197
lyrics [ "v1:3" | @ 1 5 ; "v2:3" | @ 2 ; "v3:3" | @ 3 ; "v4:3" | @ 4 ; "v5:3" | @ 5 ]
198198
vocal [ "v:3" | @ 1 5 ; "v2:3" | @ 2 3 ; "v4:3" | @ 4 ]
199199
}
200200
{
201-
chord [ "6sus4_7" 1 ]
201+
chord [ "2sus4_7" 1 ]
202202
guitar [ "Asus4" 1 ; "i" | ]
203203
lyrics [ "v1:4" | @ 1 5 ; "v2:4" | @ 2 ; "v3:4" | @ 3 ; "v4:4" | @ 4 ; "v5:4" | @ 5 ]
204204
vocal [ "v:4" | @ 1 2 3 5 ; "v4:4" | @ 4 ]
205205
}
206206
{
207-
chord [ "6sus2" 1 ]
207+
chord [ "2sus2" 1 ]
208208
guitar [ "Asus2" 1 ; "i" | ]
209209
}
210210
{
211-
chord [ "1" 1 ]
211+
chord [ "4" 1 ]
212212
guitar [ "C" 1 ; "i" | ]
213213
lyrics [ "v:6" | ]
214214
vocal [ "v:6" | ]
215215
}
216216
{
217-
chord [ "6-" 1 ]
217+
chord [ "2-" 1 ]
218218
guitar [ "Am" 1 ; "i" | ]
219219
lyrics [ "v:7" | ]
220220
vocal [ "v:7" | ]
@@ -226,33 +226,33 @@ pub fn new_tab() -> Tab {
226226
vocal [ "v:8" | ]
227227
}
228228
{
229-
chord [ "6sus4_7" 1 ]
229+
chord [ "2sus4_7" 1 ]
230230
guitar [ "Asus4" 1 ; "i" | ]
231231
lyrics [ "v:9" | ]
232232
vocal [ "v:9" | ]
233233
}
234234
{
235-
chord [ "6sus2" 1 ]
235+
chord [ "2sus2" 1 ]
236236
guitar [ "Asus2" 1 ; "i" | ]
237237
}
238238
{
239-
chord [ "6sus4_7" 1 ]
239+
chord [ "2sus4_7" 1 ]
240240
guitar [ "Asus4" 1 ; "i" | ]
241241
}
242242
{
243-
chord [ "6sus2" 1 ]
243+
chord [ "2sus2" 1 ]
244244
guitar [ "Asus2" 1 ; "i" | ]
245245
lyrics [ "v1:12" | @ 1 5 ; "v2:12" | @ 2 ; "v3:12" | @ 3 ; "v4:12" | @ 4 ]
246246
vocal [ "v:12" | ]
247247
}
248248
{
249-
chord [ "6sus2" 1 ]
249+
chord [ "2sus2" 1 ]
250250
guitar [ "Asus2" 1 ; "v:17" | ]
251251
lyrics [ "v1:13" | @ 1 5 ; "v2:13" | @ 2 ; "v3:13" | @ 3 ; "v4:13" | @ 4 ]
252252
vocal [ "v:13" | @ 1 2 5 ; "v3:13" | @ 3 4 ]
253253
}
254254
{
255-
chord [ "1" 1 ]
255+
chord [ "4" 1 ]
256256
guitar [ "C" 1 ; "i" | ]
257257
lyrics [ "v1:14" | @ 1 5 ; "v2:14" | @ 2 ; "v3:14" | @ 3 ; "v4:14" | @ 4 ]
258258
vocal [ "v:14" | @ 1 2 3 5 ; "v4:14" | @ 4 ]
@@ -264,69 +264,69 @@ pub fn new_tab() -> Tab {
264264
vocal [ "v:15" | @ 1 2 3 5 ; "v4:15" | @ 4 ]
265265
}
266266
{
267-
chord [ "5" 1 ]
267+
chord [ "1" 1 ]
268268
guitar [ "G" 1 ; "v:20" | ]
269269
lyrics [ "v1:16" | @ 1 5 ; "v2:16" | @ 2 ; "v3:16" | @ 3 ; "v4:16" | @ 4 ]
270270
vocal [ "v:16" | @ 1 2 3 5 ; "v4:16" | @ 4 ]
271271
}
272272
{
273-
chord [ "5" 1 ]
273+
chord [ "1" 1 ]
274274
guitar [ "G" 1 ; "v:21" | ]
275275
}
276276
{
277-
chord [ "6sus2" 1 ]
277+
chord [ "2sus2" 1 ]
278278
guitar [ "Asus2" 1 ; "i'" | ]
279279
lyrics [ "v1:18" | @ 1 5 ; "v2:18" | @ 2 3 4 ]
280280
vocal [ "v:18" | ]
281281
}
282282
{
283-
chord [ "5" 1 ]
283+
chord [ "1" 1 ]
284284
guitar [ "G" 1 ; "v:23" | ]
285285
lyrics [ "v1:19" | @ 1 5 ; "v2:19" | @ 2 3 4 ]
286286
vocal [ "v:19" | ]
287287
}
288288
{
289-
chord [ "5" 1 ]
289+
chord [ "1" 1 ]
290290
guitar [ "G" 1 ; "v:24" | ]
291291
lyrics [ "v1:20" | @ 1 5 ; "v2:20" | @ 2 3 4 ]
292292
vocal [ "v:20" | ]
293293
}
294294
{
295-
chord [ "6sus4_7" 1 ]
295+
chord [ "2sus4_7" 1 ]
296296
guitar [ "Asus4" 1 ; "i" | ]
297297
lyrics [ "v1:21" | @ 1 5 ; "v2:21" | @ 2 3 4 ]
298298
vocal [ "v:21" | ]
299299
}
300300
{
301-
chord [ "6sus2" 1 ]
301+
chord [ "2sus2" 1 ]
302302
guitar [ "Asus2" 1 ; "i" | ]
303303
}
304304
{
305-
chord [ "6sus4_7" 1 ]
305+
chord [ "2sus4_7" 1 ]
306306
guitar [ "Asus4" 1 ; "i" | ]
307307
}
308308
{
309-
chord [ "6sus2" 1 ]
309+
chord [ "2sus2" 1 ]
310310
guitar [ "Asus2" 1 ; "i" | ]
311311
}
312312
]}
313313
{outro Outro [
314314
{
315-
chord [ "6sus4_7" 1 ]
315+
chord [ "2sus4_7" 1 ]
316316
guitar [ "Asus4" 1 ; "i" | ]
317317
} {
318318
chord [ "2_9_11" 1 ]
319319
guitar [ "Dadd11" 1 ; "i" | ]
320320
} {
321-
chord [ "5/4" 1 ]
321+
chord [ "1/4" 1 ]
322322
guitar [ "G/C" 1 ; "i:3" | ]
323323
}
324324
{
325-
chord [ "6-" 1 ]
325+
chord [ "2-" 1 ]
326326
guitar [ "o:1" | ]
327327
}
328328
{
329-
chord [ "6-" 1 ]
329+
chord [ "2-" 1 ]
330330
guitar [ "o:2" | ]
331331
}
332332
]}

0 commit comments

Comments
 (0)