Skip to content

Commit eec0896

Browse files
yjparkyjpark
committed
add bass duration for scarboraugh_fair
1 parent 106c7eb commit eec0896

File tree

2 files changed

+385
-228
lines changed

2 files changed

+385
-228
lines changed

‎apps/notation_tabs/src/scarborough_fair.rs‎

Lines changed: 44 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env rust-script
22
//! ```cargo
33
//! [dependencies]
4-
//! notation_tab = { version = "0.3.0", path = "crates/notation_tab" }
4+
//! notation_tab = { version = "0.4.0", path = "../../../crates/notation_tab" }
55
//! ```
66
77
use notation_tab::prelude::*;
@@ -46,6 +46,12 @@ pub fn new_tab() -> Tab {
4646
"G" Shape ( 3 2 0 0 0 3 )
4747
"C" Shape ( 0 3 2 0 1 0 )
4848
"Am" Shape ( 0 0 2 2 1 0 )
49+
"b:6" Pick 6 |
50+
"b:5" Pick 5 |
51+
$duration = _1_4
52+
"b:5_1" Pick [ (5@3 *) ] |
53+
"b:5_2" Pick [ (5 *) ] |
54+
"b:6_1" Pick [ (6 *) ] |
4955
"C_D"
5056
$duration = _1_4
5157
"C" Shape ( 0 3 2 0 1 0 )
@@ -57,16 +63,16 @@ pub fn new_tab() -> Tab {
5763
"G/B" Shape ( _ 2 0 0 3 0 )
5864
"Am" Shape ( 0 0 2 2 1 0 ) |
5965
$duration = _1_8
60-
"i" Pick [ 5 1 3 4 2 3 ] |
61-
"i'" Pick [ 5 1 3 4 1 3 ] |
62-
"i:3" Pick [ 5 2 3* 5@2* ] |
63-
"v:7" Pick [ (6 2) 3 4 (4@2 2@1) (4 2) 3 ] |
66+
"i" Pick [ _ 1 3 4 2 3 ] |
67+
"i'" Pick [ _ 1 3 4 1 3 ] |
68+
"i:3" Pick [ _ 2 3* 5@2* ] |
69+
"v:7" Pick [ (2) 3 4 (4@2 2@1) (4 2) 3 ] |
6470
"v:12" Pick [ (5 2 1) 3 (4 2 1) 3 (4 2) 3 ] |
65-
"v:17" Pick [ 5 1 3 4 5 5@2 ] |
71+
"v:17" Pick [ _ 1 3 4 5 5@2 ] |
6672
"v:19" Pick [ (5 1) 3 (5 2) 3 (5 2) 3 ] |
67-
"v:20" Pick [ (6 2) 3 4 3 (4@2 2@1) (4 2) ] |
73+
"v:20" Pick [ (2) 3 4 3 (4@2 2@1) (4 2) ] |
6874
"v:21" Pick [ (4@2 2@1 *) (4 2 *) 6* ] |
69-
"v:23" Pick [ (6 2) 3 4 3 (4@2 2@1 *) ] |
75+
"v:23" Pick [ (2) 3 4 3 (4@2 2@1 *) ] |
7076
"v:24" Pick [ (4 2 *) (4 2 -) (4@2 2@1 -) (4 2 -) (6 3) 4 ] |
7177
$duration = D_1_2
7278
"o:1" Pick [ 5 ] |
@@ -160,69 +166,69 @@ pub fn new_tab() -> Tab {
160166
{intro Intro [
161167
{
162168
chord [ "2sus4_7" 1 ]
163-
guitar [ "Asus4" 1 ; "i" | ]
169+
guitar [ "Asus4" 1 ; "b:5" | ; "i" | ]
164170
} {
165171
chord [ "2sus4_7/4" 1 ]
166-
guitar [ "Asus4/D" 1 ; "i" | ]
172+
guitar [ "Asus4/D" 1 ; "b:5" | ; "i" | ]
167173
} {
168174
chord [ "1/4" 1 ]
169-
guitar [ "G/C" 1 ; "i:3" | ]
175+
guitar [ "G/C" 1 ; "b:5_1" | ; "i:3" | ]
170176
}
171177
{
172178
chord [ "2sus4_7" 1 ]
173-
guitar [ "Asus4" 1 ; "i" | ]
179+
guitar [ "Asus4" 1 ; "b:5" | ; "i" | ]
174180
}
175181
{
176182
chord [ "2sus2" 1 ]
177-
guitar [ "Asus2" 1 ; "i" | ]
183+
guitar [ "Asus2" 1 ; "b:5" | ; "i" | ]
178184
}
179185
{
180186
chord [ "2sus4_7" 1 ]
181-
guitar [ "Asus4" 1 ; "i" | ]
187+
guitar [ "Asus4" 1 ; "b:5" | ; "i" | ]
182188
}
183189
{
184190
chord [ "2sus2" 1 ]
185-
guitar [ "Asus2" 1 ; "i" | ]
191+
guitar [ "Asus2" 1 ; "b:5" | ; "i" | ]
186192
}
187193
]}
188194
{verse Verse [
189195
{
190196
chord [ "2sus4_7" 1 ]
191-
guitar [ "Asus4" 1 ; "i" | ]
197+
guitar [ "Asus4" 1 ; "b:5" | ; "i" | ]
192198
lyrics [ "v1:1" | @ 1 5 ; "v2:1" | @ 2 ; "v3:1" | @ 3 ; "v4:1" | @ 4 ; "v5:1" | @ 5 ]
193199
vocal [ "v:1" | @ 1 5 ; "v2:1" | @ 2 3 4 ]
194200
}
195201
{
196202
chord [ "2sus2" 1 ]
197-
guitar [ "Asus2" 1 ; "i" | ]
203+
guitar [ "Asus2" 1 ; "b:5" | ; "i" | ]
198204
lyrics [ "v1:2" | @ 1 5 ; "v2:2" | @ 2 ; "v3:2" | @ 3 ; "v4:2" | @ 4 ; "v5:2" | @ 5 ]
199205
vocal [ "v:2" | @ 1 5 ; "v2:2" | @ 2 ; "v3:2" | @ 3 ; "v4:2" | @ 4 ]
200206
}
201207
{
202208
chord [ "1" 1 ]
203-
guitar [ "G'" 1 ; "v:7" | ]
209+
guitar [ "G'" 1 ; "b:6" | ; "v:7" | ]
204210
lyrics [ "v1:3" | @ 1 5 ; "v2:3" | @ 2 ; "v3:3" | @ 3 ; "v4:3" | @ 4 ; "v5:3" | @ 5 ]
205211
vocal [ "v:3" | @ 1 5 ; "v2:3" | @ 2 3 ; "v4:3" | @ 4 ]
206212
}
207213
{
208214
chord [ "2sus4_7" 1 ]
209-
guitar [ "Asus4" 1 ; "i" | ]
215+
guitar [ "Asus4" 1 ; "b:5" | ; "i" | ]
210216
lyrics [ "v1:4" | @ 1 5 ; "v2:4" | @ 2 ; "v3:4" | @ 3 ; "v4:4" | @ 4 ; "v5:4" | @ 5 ]
211217
vocal [ "v:4" | @ 1 2 3 5 ; "v4:4" | @ 4 ]
212218
}
213219
{
214220
chord [ "2sus2" 1 ]
215-
guitar [ "Asus2" 1 ; "i" | ]
221+
guitar [ "Asus2" 1 ; "b:5" | ; "i" | ]
216222
}
217223
{
218224
chord [ "4" 1 ]
219-
guitar [ "C" 1 ; "i" | ]
225+
guitar [ "C" 1 ; "b:5" | ; "i" | ]
220226
lyrics [ "v:6" | ]
221227
vocal [ "v:6" | ]
222228
}
223229
{
224230
chord [ "2-" 1 ]
225-
guitar [ "Am" 1 ; "i" | ]
231+
guitar [ "Am" 1 ; "b:5" | ; "i" | ]
226232
lyrics [ "v:7" | ]
227233
vocal [ "v:7" | ]
228234
}
@@ -234,33 +240,33 @@ pub fn new_tab() -> Tab {
234240
}
235241
{
236242
chord [ "2sus4_7" 1 ]
237-
guitar [ "Asus4" 1 ; "i" | ]
243+
guitar [ "Asus4" 1 ; "b:5" | ; "i" | ]
238244
lyrics [ "v:9" | ]
239245
vocal [ "v:9" | ]
240246
}
241247
{
242248
chord [ "2sus2" 1 ]
243-
guitar [ "Asus2" 1 ; "i" | ]
249+
guitar [ "Asus2" 1 ; "b:5" | ; "i" | ]
244250
}
245251
{
246252
chord [ "2sus4_7" 1 ]
247-
guitar [ "Asus4" 1 ; "i" | ]
253+
guitar [ "Asus4" 1 ; "b:5" | ; "i" | ]
248254
}
249255
{
250256
chord [ "2sus2" 1 ]
251-
guitar [ "Asus2" 1 ; "i" | ]
257+
guitar [ "Asus2" 1 ; "b:5" | ; "i" | ]
252258
lyrics [ "v1:12" | @ 1 5 ; "v2:12" | @ 2 ; "v3:12" | @ 3 ; "v4:12" | @ 4 ]
253259
vocal [ "v:12" | ]
254260
}
255261
{
256262
chord [ "2sus2" 1 ]
257-
guitar [ "Asus2" 1 ; "v:17" | ]
263+
guitar [ "Asus2" 1 ; "b:5_2" | ; "v:17" | ]
258264
lyrics [ "v1:13" | @ 1 5 ; "v2:13" | @ 2 ; "v3:13" | @ 3 ; "v4:13" | @ 4 ]
259265
vocal [ "v:13" | @ 1 2 5 ; "v3:13" | @ 3 4 ]
260266
}
261267
{
262268
chord [ "4" 1 ]
263-
guitar [ "C" 1 ; "i" | ]
269+
guitar [ "C" 1 ; "b:5" | ; "i" | ]
264270
lyrics [ "v1:14" | @ 1 5 ; "v2:14" | @ 2 ; "v3:14" | @ 3 ; "v4:14" | @ 4 ]
265271
vocal [ "v:14" | @ 1 2 3 5 ; "v4:14" | @ 4 ]
266272
}
@@ -272,7 +278,7 @@ pub fn new_tab() -> Tab {
272278
}
273279
{
274280
chord [ "1" 1 ]
275-
guitar [ "G" 1 ; "v:20" | ]
281+
guitar [ "G" 1 ; "b:6_1" | ; "v:20" | ]
276282
lyrics [ "v1:16" | @ 1 5 ; "v2:16" | @ 2 ; "v3:16" | @ 3 ; "v4:16" | @ 4 ]
277283
vocal [ "v:16" | @ 1 2 3 5 ; "v4:16" | @ 4 ]
278284
}
@@ -282,13 +288,13 @@ pub fn new_tab() -> Tab {
282288
}
283289
{
284290
chord [ "2sus2" 1 ]
285-
guitar [ "Asus2" 1 ; "i'" | ]
291+
guitar [ "Asus2" 1 ; "b:5" | ; "i'" | ]
286292
lyrics [ "v1:18" | @ 1 5 ; "v2:18" | @ 2 3 4 ]
287293
vocal [ "v:18" | ]
288294
}
289295
{
290296
chord [ "1" 1 ]
291-
guitar [ "G" 1 ; "v:23" | ]
297+
guitar [ "G" 1 ; "b:6_1" | ; "v:23" | ]
292298
lyrics [ "v1:19" | @ 1 5 ; "v2:19" | @ 2 3 4 ]
293299
vocal [ "v:19" | ]
294300
}
@@ -300,33 +306,33 @@ pub fn new_tab() -> Tab {
300306
}
301307
{
302308
chord [ "2sus4_7" 1 ]
303-
guitar [ "Asus4" 1 ; "i" | ]
309+
guitar [ "Asus4" 1 ; "b:5" | ; "i" | ]
304310
lyrics [ "v1:21" | @ 1 5 ; "v2:21" | @ 2 3 4 ]
305311
vocal [ "v:21" | ]
306312
}
307313
{
308314
chord [ "2sus2" 1 ]
309-
guitar [ "Asus2" 1 ; "i" | ]
315+
guitar [ "Asus2" 1 ; "b:5" | ; "i" | ]
310316
}
311317
{
312318
chord [ "2sus4_7" 1 ]
313-
guitar [ "Asus4" 1 ; "i" | ]
319+
guitar [ "Asus4" 1 ; "b:5" | ; "i" | ]
314320
}
315321
{
316322
chord [ "2sus2" 1 ]
317-
guitar [ "Asus2" 1 ; "i" | ]
323+
guitar [ "Asus2" 1 ; "b:5" | ; "i" | ]
318324
}
319325
]}
320326
{outro Outro [
321327
{
322328
chord [ "2sus4_7" 1 ]
323-
guitar [ "Asus4" 1 ; "i" | ]
329+
guitar [ "Asus4" 1 ; "b:5" | ; "i" | ]
324330
} {
325331
chord [ "2sus4_7/4" 1 ]
326-
guitar [ "Asus4/D" 1 ; "i" | ]
332+
guitar [ "Asus4/D" 1 ; "b:5" | ; "i" | ]
327333
} {
328334
chord [ "1/4" 1 ]
329-
guitar [ "G/C" 1 ; "i:3" | ]
335+
guitar [ "G/C" 1 ; "b:5_1" | ; "i:3" | ]
330336
}
331337
{
332338
chord [ "2-" 1 ]

0 commit comments

Comments
 (0)