Skip to content

Commit b8ccd47

Browse files
yjparkyjpark
committed
bugfix with tab
1 parent b2e9b2d commit b8ccd47

File tree

9 files changed

+600
-505
lines changed

9 files changed

+600
-505
lines changed

‎apps/notation_tool/src/tab/mod.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ pub fn get_tab_list<'a>() -> Vec<TabInfo<'a>> {
3737
"songs:misc:scarborough_fair",
3838
songs::misc::scarborough_fair::new_tab,
3939
),
40-
TabInfo::new(
41-
"songs:misc:scarborough_fair",
42-
songs::misc::scarborough_fair_hard::new_tab,
43-
),
4440
]
4541
}
4642

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
pub mod stand_by_me;
2-
pub mod scarborough_fair;
3-
pub mod scarborough_fair_hard;
2+
pub mod scarborough_fair;

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

Lines changed: 100 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,58 @@ use notation_proto::prelude::*;
33

44
pub fn new_tab() -> Tab {
55
tab! {
6-
"86a6b734-1aa2-11ec-a594-3f319a5fdca9"
7-
Meta: TabMeta::new(Key::E, Scale::Minor, Signature::_3_4, Tempo::Bpm(129))
6+
"06dd7278-cdaf-40dd-abc6-6e66ec2d6b8c"
7+
Meta: TabMeta::new(Key::E, Scale::Minor, Signature::_3_4, Tempo::Bpm(110))
88
Tracks: [
99
{chord Chord [
1010
$duration = D_1_2
11-
"6" Chord ( 6: 3- 5 )
11+
"6sus4_7" Chord ( 6: 4 5 7- )
12+
"2_9_11" Chord ( 2: 3 9 11 )
1213
"5/4" Chord ( 5: 3 5 /4 )
1314
"5" Chord ( 5: 3 5 )
15+
"6sus2" Chord ( 6: 2 5 )
16+
"6-" Chord ( 6: 3- 5 )
1417
"1" Chord ( 1: 3 5 )
15-
"2" Chord ( 2: 3 5 )
18+
"v:12"
19+
$duration = _1_4
20+
Chord ( 1: 3 5 )
21+
$duration = _1_2
22+
Chord ( 2: 3 5 ) |
23+
"v:19"
24+
$duration = _1_4
25+
Chord ( 1: 3 5 )
26+
Chord ( 5: 3 5 /3)
27+
Chord ( 6: 3- 5 ) |
1628
]}
1729
{guitar Guitar [
1830
Fretboard capo: 7
1931
$duration = D_1_2
20-
"Em" Shape ( 0 2 2 0 0 0 )
21-
"D" Shape ( _ _ 0 2 3 2 )
22-
"Dsus4" Shape ( _ _ 0 2 3 3 )
32+
"Asus4" Shape ( 0 0 4 0 3 0 )
33+
"Dadd11" Shape ( 0 5 4 0 3 0 )
34+
"G/C" Shape ( _ 3 0 0 0 _ )
35+
"Asus2" Shape ( _ 0 2 2 0 0 )
36+
"G'" Shape ( 3 _ 0 0 0 _ )
2337
"G" Shape ( 3 2 0 0 0 3 )
24-
"A" Shape ( _ 0 2 2 2 0 )
38+
"C" Shape ( 0 3 2 0 1 0 )
39+
"Am" Shape ( 0 0 2 2 1 0 )
40+
"C_D"
41+
$duration = _1_4
42+
Shape ( 0 3 2 0 1 0 )
43+
$duration = _1_2
44+
Shape ( 0 0 0 2 3 2 ) |
45+
"C_G/B_Am"
46+
$duration = _1_4
47+
Shape ( 0 3 2 0 1 0 )
48+
Shape ( _ 2 0 0 3 0 )
49+
Shape ( 0 0 2 2 1 0 ) |
2550
$duration = _1_8
2651
"i" Pick [ 5 1 3 4 2 3 ] |
52+
"i'" Pick [ 5 1 3 4 1 3 ] |
2753
"i:3" Pick [ 5 2 3* 5@2* ] |
2854
"v:7" Pick [ (6 2) 3 4 (4@2 2@1) (4 2) 3 ] |
2955
"v:12" Pick [ (5 2 1) 3 (4 2 1) 3 (4 2) 3 ] |
3056
"v:17" Pick [ 5 1 3 4 5 5@2 ] |
57+
"v:19" Pick [ (5 1) 3 (5 2) 3 (5 2) 3 ] |
3158
"v:20" Pick [ (6 2) 3 4 3 (4@2 2@1) (4 2) ] |
3259
"v:21" Pick [ (4@2 2@1 *) (4 2 *) 6* ] |
3360
"v:23" Pick [ (6 2) 3 4 3 (4@2 2@1 *) ] |
@@ -133,123 +160,139 @@ pub fn new_tab() -> Tab {
133160
chord [ "5/4" 1 ]
134161
guitar [ "G/C" 1 ; "i:3" | ]
135162
}
136-
]}
137-
{verse Verse [
138163
{
139164
chord [ "6sus4_7" 1 ]
140165
guitar [ "Asus4" 1 ; "i" | ]
141-
lyrics [ "v1:1" | @ 1 5 ; "v2:1" | @ 2 ; "v3:1" | @ 3 ; "v4:1" | @ 4 ; "v5:1" | @ 5 ]
142-
vocal [ "v:1" | @ 1 5 ; "v2:1" | @ 2 3 4 ]
143166
}
144167
{
145168
chord [ "6sus2" 1 ]
146169
guitar [ "Asus2" 1 ; "i" | ]
147-
lyrics [ "v1:2" | @ 1 5 ; "v2:2" | @ 2 ; "v3:2" | @ 3 ; "v4:2" | @ 4 ; "v5:2" | @ 5 ]
148-
vocal [ "v:2" | @ 1 5 ; "v2:2" | @ 2 3 ; "v4:2" | @ 4 ]
149170
}
150171
{
151172
chord [ "6sus4_7" 1 ]
152173
guitar [ "Asus4" 1 ; "i" | ]
153-
lyrics [ "v1:3" | @ 1 5 ; "v2:3" | @ 2 ; "v3:3" | @ 3 ; "v4:3" | @ 4 ; "v5:3" | @ 5 ]
154-
vocal [ "v:3" | @ 1 5 ; "v2:3" | @ 2 3 ; "v4:3" | @ 4 ]
155174
}
156175
{
157176
chord [ "6sus2" 1 ]
158177
guitar [ "Asus2" 1 ; "i" | ]
159-
lyrics [ "v1:4" | @ 1 5 ; "v2:4" | @ 2 ; "v3:4" | @ 3 ; "v4:4" | @ 4 ; "v5:4" | @ 5 ]
160-
vocal [ "v:4" | @ 1 2 3 5 ; "v4:4" | @ 4 ]
161178
}
179+
]}
180+
{verse Verse [
162181
{
163182
chord [ "6sus4_7" 1 ]
164183
guitar [ "Asus4" 1 ; "i" | ]
184+
lyrics [ "v1:1" | @ 1 5 ; "v2:1" | @ 2 ; "v3:1" | @ 3 ; "v4:1" | @ 4 ; "v5:1" | @ 5 ]
185+
vocal [ "v:1" | @ 1 5 ; "v2:1" | @ 2 3 4 ]
165186
}
166187
{
167188
chord [ "6sus2" 1 ]
168-
guitar [ "Asus4" 1 ; "i" | ]
169-
lyrics [ "v:6" | ]
170-
vocal [ "v:6" | ]
189+
guitar [ "Asus2" 1 ; "i" | ]
190+
lyrics [ "v1:2" | @ 1 5 ; "v2:2" | @ 2 ; "v3:2" | @ 3 ; "v4:2" | @ 4 ; "v5:2" | @ 5 ]
191+
vocal [ "v:2" | @ 1 5 ; "v2:2" | @ 2 3 ; "v4:2" | @ 4 ]
171192
}
172193
{
173194
chord [ "5" 1 ]
174195
guitar [ "G'" 1 ; "v:7" | ]
175-
lyrics [ "v:7" | ]
176-
vocal [ "v:7" | ]
196+
lyrics [ "v1:3" | @ 1 5 ; "v2:3" | @ 2 ; "v3:3" | @ 3 ; "v4:3" | @ 4 ; "v5:3" | @ 5 ]
197+
vocal [ "v:3" | @ 1 5 ; "v2:3" | @ 2 3 ; "v4:3" | @ 4 ]
177198
}
178199
{
179200
chord [ "6sus4_7" 1 ]
180201
guitar [ "Asus4" 1 ; "i" | ]
181-
lyrics [ "v:8" | ]
182-
vocal [ "v:8" | ]
202+
lyrics [ "v1:4" | @ 1 5 ; "v2:4" | @ 2 ; "v3:4" | @ 3 ; "v4:4" | @ 4 ; "v5:4" | @ 5 ]
203+
vocal [ "v:4" | @ 1 2 3 5 ; "v4:4" | @ 4 ]
183204
}
184205
{
185206
chord [ "6sus2" 1 ]
186207
guitar [ "Asus2" 1 ; "i" | ]
187-
lyrics [ "v:9" | ]
188-
vocal [ "v:9" | ]
189208
}
190209
{
191210
chord [ "1" 1 ]
192211
guitar [ "C" 1 ; "i" | ]
212+
lyrics [ "v:6" | ]
213+
vocal [ "v:6" | ]
193214
}
194215
{
195216
chord [ "6-" 1 ]
196217
guitar [ "Am" 1 ; "i" | ]
218+
lyrics [ "v:7" | ]
219+
vocal [ "v:7" | ]
197220
}
198221
{
199222
chord [ "v:12" | ]
200223
guitar [ "C_D" | ; "v:12" | ]
201-
lyrics [ "v1:12" | @ 1 5 ; "v2:12" | @ 2 ; "v3:12" | @ 3 ; "v4:12" | @ 4 ]
202-
vocal [ "v:12" | ]
224+
lyrics [ "v:8" | ]
225+
vocal [ "v:8" | ]
203226
}
204227
{
205228
chord [ "6sus4_7" 1 ]
206229
guitar [ "Asus4" 1 ; "i" | ]
207-
lyrics [ "v1:13" | @ 1 5 ; "v2:13" | @ 2 ; "v3:13" | @ 3 ; "v4:13" | @ 4 ]
208-
vocal [ "v:13" | @ 1 2 ; "v3:13" | @ 3 4 5 ]
230+
lyrics [ "v:9" | ]
231+
vocal [ "v:9" | ]
209232
}
210233
{
211234
chord [ "6sus2" 1 ]
212235
guitar [ "Asus2" 1 ; "i" | ]
213-
lyrics [ "v1:14" | @ 1 5 ; "v2:14" | @ 2 ; "v3:14" | @ 3 ; "v4:14" | @ 4 ]
214-
vocal [ "v:14" | @ 1 2 3 ; "v4:14" | @ 4 5 ]
215236
}
216237
{
217238
chord [ "6sus4_7" 1 ]
218239
guitar [ "Asus4" 1 ; "i" | ]
219-
lyrics [ "v1:15" | @ 1 5 ; "v2:15" | @ 2 ; "v3:15" | @ 3 ; "v4:15" | @ 4 ]
220-
vocal [ "v:15" | @ 1 2 3 ; "v4:15" | @ 4 5 ]
221240
}
222241
{
223242
chord [ "6sus2" 1 ]
224243
guitar [ "Asus2" 1 ; "i" | ]
225-
lyrics [ "v1:16" | @ 1 5 ; "v2:16" | @ 2 ; "v3:16" | @ 3 ; "v4:16" | @ 4 ]
226-
vocal [ "v:16" | @ 1 2 3 ; "v4:16" | @ 4 5 ]
244+
lyrics [ "v1:12" | @ 1 5 ; "v2:12" | @ 2 ; "v3:12" | @ 3 ; "v4:12" | @ 4 ]
245+
vocal [ "v:12" | ]
227246
}
228247
{
229248
chord [ "6sus2" 1 ]
230249
guitar [ "Asus2" 1 ; "v:17" | ]
250+
lyrics [ "v1:13" | @ 1 5 ; "v2:13" | @ 2 ; "v3:13" | @ 3 ; "v4:13" | @ 4 ]
251+
vocal [ "v:13" | @ 1 2 ; "v3:13" | @ 3 4 5 ]
231252
}
232253
{
233254
chord [ "1" 1 ]
234255
guitar [ "C" 1 ; "i" | ]
256+
lyrics [ "v1:14" | @ 1 5 ; "v2:14" | @ 2 ; "v3:14" | @ 3 ; "v4:14" | @ 4 ]
257+
vocal [ "v:14" | @ 1 2 3 ; "v4:14" | @ 4 5 ]
258+
}
259+
{
260+
chord [ "v:19" | ]
261+
guitar [ "C_G/B_Am" | ; "v:19" | ]
262+
lyrics [ "v1:15" | @ 1 5 ; "v2:15" | @ 2 ; "v3:15" | @ 3 ; "v4:15" | @ 4 ]
263+
vocal [ "v:15" | @ 1 2 3 ; "v4:15" | @ 4 5 ]
264+
}
265+
{
266+
chord [ "5" 1 ]
267+
guitar [ "G" 1 ; "v:20" | ]
268+
lyrics [ "v1:16" | @ 1 5 ; "v2:16" | @ 2 ; "v3:16" | @ 3 ; "v4:16" | @ 4 ]
269+
vocal [ "v:16" | @ 1 2 3 ; "v4:16" | @ 4 5 ]
270+
}
271+
{
272+
chord [ "5" 1 ]
273+
guitar [ "G" 1 ; "v:21" | ]
274+
}
275+
{
276+
chord [ "6sus2" 1 ]
277+
guitar [ "Asus2" 1 ; "i'" | ]
235278
lyrics [ "v1:18" | @ 1 5 ; "v2:18" | @ 2 3 4 ]
236279
vocal [ "v:18" | ]
237280
}
238281
{
239-
chord [ "v:19" | ]
240-
guitar [ "C_G/B_Am" | ; "v:12" | ]
282+
chord [ "5" 1 ]
283+
guitar [ "G" 1 ; "v:23" | ]
241284
lyrics [ "v1:19" | @ 1 5 ; "v2:19" | @ 2 3 4 ]
242285
vocal [ "v:19" | ]
243286
}
244287
{
245288
chord [ "5" 1 ]
246-
guitar [ "G" 1 ; "v:20" | ]
289+
guitar [ "G" 1 ; "v:24" | ]
247290
lyrics [ "v1:20" | @ 1 5 ; "v2:20" | @ 2 3 4 ]
248291
vocal [ "v:20" | ]
249292
}
250293
{
251-
chord [ "5" 1 ]
252-
guitar [ "G" 1 ; "v:21" | ]
294+
chord [ "6sus4_7" 1 ]
295+
guitar [ "Asus4" 1 ; "i" | ]
253296
lyrics [ "v1:21" | @ 1 5 ; "v2:21" | @ 2 3 4 ]
254297
vocal [ "v:21" | ]
255298
}
@@ -258,15 +301,25 @@ pub fn new_tab() -> Tab {
258301
guitar [ "Asus2" 1 ; "i" | ]
259302
}
260303
{
261-
chord [ "5" 1 ]
262-
guitar [ "G" 1 ; "v:23" | ]
304+
chord [ "6sus4_7" 1 ]
305+
guitar [ "Asus4" 1 ; "i" | ]
263306
}
264307
{
265-
chord [ "5" 1 ]
266-
guitar [ "G" 1 ; "v:24" | ]
308+
chord [ "6sus2" 1 ]
309+
guitar [ "Asus2" 1 ; "i" | ]
267310
}
268311
]}
269312
{outro Outro [
313+
{
314+
chord [ "6sus4_7" 1 ]
315+
guitar [ "Asus4" 1 ; "i" | ]
316+
} {
317+
chord [ "2_9_11" 1 ]
318+
guitar [ "Dadd11" 1 ; "i" | ]
319+
} {
320+
chord [ "5/4" 1 ]
321+
guitar [ "G/C" 1 ; "i:3" | ]
322+
}
270323
{
271324
chord [ "6-" 1 ]
272325
guitar [ "o:1" | ]
@@ -277,7 +330,7 @@ pub fn new_tab() -> Tab {
277330
}
278331
]}
279332
]
280-
Form: intro verse verse verse verse verse intro outro
333+
Form: intro verse verse verse verse verse outro
281334
}
282335
}
283336

0 commit comments

Comments
 (0)