Skip to content

Commit 7692ed0

Browse files
yjparkyjpark
committed
update tab
1 parent 9cb8f73 commit 7692ed0

File tree

2 files changed

+310
-32
lines changed

2 files changed

+310
-32
lines changed

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

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,25 @@ use notation_proto::prelude::*;
33

44
pub fn new_tab() -> Tab {
55
tab! {
6-
"06dd7278-cdaf-40dd-abc6-6e66ec2d6b8c"
6+
"86a6b734-1aa2-11ec-a594-3f319a5fdca9"
77
Meta: TabMeta::new(Key::E, Scale::Minor, Signature::_3_4, Tempo::Bpm(129))
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 )
11+
"6" Chord ( 6: 3- 5 )
1312
"5/4" Chord ( 5: 3 5 /4 )
1413
"5" Chord ( 5: 3 5 )
15-
"6sus2" Chord ( 6: 2 5 )
16-
"6-" Chord ( 6: 3- 5 )
1714
"1" Chord ( 1: 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 ) |
15+
"2" Chord ( 2: 3 5 )
2816
]}
2917
{guitar Guitar [
3018
Fretboard capo: 7
3119
$duration = D_1_2
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 _ )
20+
"Em" Shape ( 0 2 2 0 0 0 )
21+
"D" Shape ( _ _ 0 2 3 2 )
22+
"Dsus4" Shape ( _ _ 0 2 3 3 )
3723
"G" Shape ( 3 2 0 0 0 3 )
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 ) |
24+
"A" Shape ( _ 0 2 2 2 0 )
5025
$duration = _1_8
5126
"i" Pick [ 5 1 3 4 2 3 ] |
5227
"i:3" Pick [ 5 2 3* 5@2* ] |

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

Lines changed: 303 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,303 @@
1+
use notation_dsl::tab;
2+
use notation_proto::prelude::*;
3+
4+
pub fn new_tab() -> Tab {
5+
tab! {
6+
"06dd7278-cdaf-40dd-abc6-6e66ec2d6b8c"
7+
Meta: TabMeta::new(Key::E, Scale::Minor, Signature::_3_4, Tempo::Bpm(129))
8+
Tracks: [
9+
{chord Chord [
10+
$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 )
17+
"1" Chord ( 1: 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 ) |
28+
]}
29+
{guitar Guitar [
30+
Fretboard capo: 7
31+
$duration = D_1_2
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 _ )
37+
"G" Shape ( 3 2 0 0 0 3 )
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 ) |
50+
$duration = _1_8
51+
"i" Pick [ 5 1 3 4 2 3 ] |
52+
"i:3" Pick [ 5 2 3* 5@2* ] |
53+
"v:7" Pick [ (6 2) 3 4 (4@2 2@1) (4 2) 3 ] |
54+
"v:12" Pick [ (5 2 1) 3 (4 2 1) 3 (4 2) 3 ] |
55+
"v:17" Pick [ 5 1 3 4 5 5@2 ] |
56+
"v:20" Pick [ (6 2) 3 4 3 (4@2 2@1) (4 2) ] |
57+
"v:21" Pick [ (4@2 2@1 *) (4 2 *) 6* ] |
58+
"v:23" Pick [ (6 2) 3 4 3 (4@2 2@1 *) ] |
59+
"v:24" Pick [ (4 2 *) (4 2 -) (4@2 2@1 -) (4 2 -) (6 3) 4 ] |
60+
$duration = D_1_2
61+
"o:1" Pick [ 5 ] |
62+
"o:2" Pick [ 1@12 ] |
63+
]}
64+
{lyrics Lyrics [
65+
$duration = _1_4
66+
"v1:1" Word [ "are"* "you" ] |
67+
"v1:2" Word [ "go-", "ing"* "to", ] |
68+
"v1:3" Word [ "scar-"+ "bo-", "rough" ] |
69+
"v1:4" Word [ "fare"*+ ] |
70+
"v:6" Word [ _ "pars-" "ley" ] |
71+
"v:7" Word [ "sage"* "rose-" ] |
72+
"v:8" Word [ "ma-" "ry" "and" ] |
73+
"v:9" Word [ "thyme"*+ ] |
74+
"v1:12" Word [ _* "re-" ] |
75+
"v1:13" Word [ "mem-"* "ber" ] |
76+
"v1:14" Word [ "me"* "to" ] |
77+
"v1:15" Word [ "one" "who" "lives" ] |
78+
"v1:16" Word [ "there"*+ ] |
79+
"v1:18" Word [ "she"* "once" ] |
80+
"v1:19" Word [ "was"* "a" ] |
81+
"v1:20" Word [ "true" "love" "of" ] |
82+
"v1:21" Word [ "mine"*+ ] |
83+
"v2:1" Word [ "tell", "her"+ "to" ] |
84+
"v2:2" Word [ "make" "me" "a" ] |
85+
"v2:3" Word [ "cam-"* "bric" ] |
86+
"v2:4" Word [ "shirt"*+ ] |
87+
"v2:12" Word [ _* "with-" ] |
88+
"v2:13" Word [ "out"* "no" ] |
89+
"v2:14" Word [ "seams"* "nor" ] |
90+
"v2:15" Word [ "needle"*+ ] |
91+
"v2:16" Word [ "work"*+ ] |
92+
"v2:18" Word [ "then"* "she'll" ] |
93+
"v2:19" Word [ "be"* "a" ] |
94+
"v2:20" Word [ "true" "love" "of" ] |
95+
"v2:21" Word [ "mine"*+ ] |
96+
"v3:1" Word [ "tell", "her"+ "to" ] |
97+
"v3:2" Word [ "find" "me" "an" ] |
98+
"v3:3" Word [ "acre"* "of" ] |
99+
"v3:4" Word [ "land"*+ ] |
100+
"v3:12" Word [ _* "bet-" ] |
101+
"v3:13" Word [ "ween" "the" "salt" ] |
102+
"v3:14" Word [ "wa-"* "ter" ] |
103+
"v3:15" Word [ "and" "the" "sea" ] |
104+
"v3:16" Word [ "strand"*+ ] |
105+
"v4:1" Word [ "tell", "her"+ "to" ] |
106+
"v4:2" Word [ "reap", "it"+ "in", "a", ] |
107+
"v4:3" Word [ "si-", "ckle"+ "of" ] |
108+
"v4:4" Word [ "lea-"* "ther" ] |
109+
]}
110+
{vocal Vocal [
111+
$key = E
112+
$scale = Minor
113+
$duration = _1_4
114+
"v:1" Tone [ .6* .6 ] |
115+
"v:2" Tone [ 3, 3* 3, ] |
116+
"v:3" Tone [ .7+ 1, .7 ] |
117+
"v:4" Tone [ .6*+ ] |
118+
"v:6" Tone [ _ 3 5 ] |
119+
"v:7" Tone [ 6* 5 ] |
120+
"v:8" Tone [ 3 #4 2 ] |
121+
"v:9" Tone [ 3*+ ] |
122+
"v:12" Tone [ _* 6 ] |
123+
"v:13" Tone [ 6* 6 ] |
124+
"v:14" Tone [ 5* 3 ] |
125+
"v:15" Tone [ 3 2 1 ] |
126+
"v:16" Tone [ .7, .5, @ .5* ] |
127+
"v:18" Tone [ .6* 3 ] |
128+
"v:19" Tone [ 2* 1 ] |
129+
"v:20" Tone [ .7 .6 .5 ] |
130+
"v:21" Tone [ .6*+ ] |
131+
"v2:1" Tone [ .6, .6+ .6 ] |
132+
"v2:2" Tone [ 3 3 3 ] |
133+
"v2:3" Tone [ .7 1 .7 ] |
134+
"v3:13" Tone [ 6 6 6 ] |
135+
"v4:2" Tone [ 3, 3+ 3, 3, ] |
136+
"v4:3" Tone [ .7, 1+ .7 ] |
137+
"v4:4" Tone [ .6* .6 ] |
138+
"v4:12" Tone [ _* 6, 6, ] |
139+
"v4:14" Tone [ 5* 2, 2, ] |
140+
"v4:15" Tone [ 1 ,7 ,6 ] |
141+
"v4:16" Tone [ 2, .5, @ .5* ] |
142+
]}
143+
]
144+
Sections: [
145+
{intro Intro [
146+
{
147+
chord [ "6sus4_7" 1 ]
148+
guitar [ "Asus4" 1 ; "i" | ]
149+
} {
150+
chord [ "2_9_11" 1 ]
151+
guitar [ "Dadd11" 1 ; "i" | ]
152+
} {
153+
chord [ "5/4" 1 ]
154+
guitar [ "G/C" 1 ; "i:3" | ]
155+
}
156+
]}
157+
{verse Verse [
158+
{
159+
chord [ "6sus4_7" 1 ]
160+
guitar [ "Asus4" 1 ; "i" | ]
161+
lyrics [ "v1:1" | @ 1 5 ; "v2:1" | @ 2 ; "v3:1" | @ 3 ; "v4:1" | @ 4 ; "v5:1" | @ 5 ]
162+
vocal [ "v:1" | @ 1 5 ; "v2:1" | @ 2 3 4 ]
163+
}
164+
{
165+
chord [ "6sus2" 1 ]
166+
guitar [ "Asus2" 1 ; "i" | ]
167+
lyrics [ "v1:2" | @ 1 5 ; "v2:2" | @ 2 ; "v3:2" | @ 3 ; "v4:2" | @ 4 ; "v5:2" | @ 5 ]
168+
vocal [ "v:2" | @ 1 5 ; "v2:2" | @ 2 3 ; "v4:2" | @ 4 ]
169+
}
170+
{
171+
chord [ "6sus4_7" 1 ]
172+
guitar [ "Asus4" 1 ; "i" | ]
173+
lyrics [ "v1:3" | @ 1 5 ; "v2:3" | @ 2 ; "v3:3" | @ 3 ; "v4:3" | @ 4 ; "v5:3" | @ 5 ]
174+
vocal [ "v:3" | @ 1 5 ; "v2:3" | @ 2 3 ; "v4:3" | @ 4 ]
175+
}
176+
{
177+
chord [ "6sus2" 1 ]
178+
guitar [ "Asus2" 1 ; "i" | ]
179+
lyrics [ "v1:4" | @ 1 5 ; "v2:4" | @ 2 ; "v3:4" | @ 3 ; "v4:4" | @ 4 ; "v5:4" | @ 5 ]
180+
vocal [ "v:4" | @ 1 2 3 5 ; "v4:4" | @ 4 ]
181+
}
182+
{
183+
chord [ "6sus4_7" 1 ]
184+
guitar [ "Asus4" 1 ; "i" | ]
185+
}
186+
{
187+
chord [ "6sus2" 1 ]
188+
guitar [ "Asus4" 1 ; "i" | ]
189+
lyrics [ "v:6" | ]
190+
vocal [ "v:6" | ]
191+
}
192+
{
193+
chord [ "5" 1 ]
194+
guitar [ "G'" 1 ; "v:7" | ]
195+
lyrics [ "v:7" | ]
196+
vocal [ "v:7" | ]
197+
}
198+
{
199+
chord [ "6sus4_7" 1 ]
200+
guitar [ "Asus4" 1 ; "i" | ]
201+
lyrics [ "v:8" | ]
202+
vocal [ "v:8" | ]
203+
}
204+
{
205+
chord [ "6sus2" 1 ]
206+
guitar [ "Asus2" 1 ; "i" | ]
207+
lyrics [ "v:9" | ]
208+
vocal [ "v:9" | ]
209+
}
210+
{
211+
chord [ "1" 1 ]
212+
guitar [ "C" 1 ; "i" | ]
213+
}
214+
{
215+
chord [ "6-" 1 ]
216+
guitar [ "Am" 1 ; "i" | ]
217+
}
218+
{
219+
chord [ "v:12" | ]
220+
guitar [ "C_D" | ; "v:12" | ]
221+
lyrics [ "v1:12" | @ 1 5 ; "v2:12" | @ 2 ; "v3:12" | @ 3 ; "v4:12" | @ 4 ]
222+
vocal [ "v:12" | ]
223+
}
224+
{
225+
chord [ "6sus4_7" 1 ]
226+
guitar [ "Asus4" 1 ; "i" | ]
227+
lyrics [ "v1:13" | @ 1 5 ; "v2:13" | @ 2 ; "v3:13" | @ 3 ; "v4:13" | @ 4 ]
228+
vocal [ "v:13" | @ 1 2 ; "v3:13" | @ 3 4 5 ]
229+
}
230+
{
231+
chord [ "6sus2" 1 ]
232+
guitar [ "Asus2" 1 ; "i" | ]
233+
lyrics [ "v1:14" | @ 1 5 ; "v2:14" | @ 2 ; "v3:14" | @ 3 ; "v4:14" | @ 4 ]
234+
vocal [ "v:14" | @ 1 2 3 ; "v4:14" | @ 4 5 ]
235+
}
236+
{
237+
chord [ "6sus4_7" 1 ]
238+
guitar [ "Asus4" 1 ; "i" | ]
239+
lyrics [ "v1:15" | @ 1 5 ; "v2:15" | @ 2 ; "v3:15" | @ 3 ; "v4:15" | @ 4 ]
240+
vocal [ "v:15" | @ 1 2 3 ; "v4:15" | @ 4 5 ]
241+
}
242+
{
243+
chord [ "6sus2" 1 ]
244+
guitar [ "Asus2" 1 ; "i" | ]
245+
lyrics [ "v1:16" | @ 1 5 ; "v2:16" | @ 2 ; "v3:16" | @ 3 ; "v4:16" | @ 4 ]
246+
vocal [ "v:16" | @ 1 2 3 ; "v4:16" | @ 4 5 ]
247+
}
248+
{
249+
chord [ "6sus2" 1 ]
250+
guitar [ "Asus2" 1 ; "v:17" | ]
251+
}
252+
{
253+
chord [ "1" 1 ]
254+
guitar [ "C" 1 ; "i" | ]
255+
lyrics [ "v1:18" | @ 1 5 ; "v2:18" | @ 2 3 4 ]
256+
vocal [ "v:18" | ]
257+
}
258+
{
259+
chord [ "v:19" | ]
260+
guitar [ "C_G/B_Am" | ; "v:12" | ]
261+
lyrics [ "v1:19" | @ 1 5 ; "v2:19" | @ 2 3 4 ]
262+
vocal [ "v:19" | ]
263+
}
264+
{
265+
chord [ "5" 1 ]
266+
guitar [ "G" 1 ; "v:20" | ]
267+
lyrics [ "v1:20" | @ 1 5 ; "v2:20" | @ 2 3 4 ]
268+
vocal [ "v:20" | ]
269+
}
270+
{
271+
chord [ "5" 1 ]
272+
guitar [ "G" 1 ; "v:21" | ]
273+
lyrics [ "v1:21" | @ 1 5 ; "v2:21" | @ 2 3 4 ]
274+
vocal [ "v:21" | ]
275+
}
276+
{
277+
chord [ "6sus2" 1 ]
278+
guitar [ "Asus2" 1 ; "i" | ]
279+
}
280+
{
281+
chord [ "5" 1 ]
282+
guitar [ "G" 1 ; "v:23" | ]
283+
}
284+
{
285+
chord [ "5" 1 ]
286+
guitar [ "G" 1 ; "v:24" | ]
287+
}
288+
]}
289+
{outro Outro [
290+
{
291+
chord [ "6-" 1 ]
292+
guitar [ "o:1" | ]
293+
}
294+
{
295+
chord [ "6-" 1 ]
296+
guitar [ "o:2" | ]
297+
}
298+
]}
299+
]
300+
Form: intro verse verse verse verse verse intro outro
301+
}
302+
}
303+

0 commit comments

Comments
 (0)