Skip to content

Commit 310778c

Browse files
committed
small fixes on teh scarborough fair tab
1 parent e5740a6 commit 310778c

File tree

3 files changed

+147
-91
lines changed

3 files changed

+147
-91
lines changed

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ pub fn new_tab() -> Tab {
107107
"v4:1" Word [ "tell", "her"+ "to" ] |
108108
"v4:2" Word [ "reap", "it"+ "in", "a", ] |
109109
"v4:3" Word [ "si-", "ckle"+ "of" ] |
110-
"v4:4" Word [ "lea-"* "ther" ] |
110+
"v4:4" Word [ "lea-", "ther", @ ""* ] |
111111
"v4:12" Word [ _* "and", "to-" ] |
112112
"v4:13" Word [ "ga-" "ther" "it" ] |
113113
"v4:14" Word [ "all"* "in", "a", ] |
@@ -138,10 +138,11 @@ pub fn new_tab() -> Tab {
138138
"v2:1" Tone [ .6, .6+ .6 ] |
139139
"v2:2" Tone [ 3 3 3 ] |
140140
"v2:3" Tone [ .7 1 .7 ] |
141+
"v3:2" Tone [ 3 2 1 ] |
141142
"v3:13" Tone [ 6 6 6 ] |
142143
"v4:2" Tone [ 3, 3+ 3, 3, ] |
143144
"v4:3" Tone [ .7, 1+ .7 ] |
144-
"v4:4" Tone [ .6* .6 ] |
145+
"v4:4" Tone [ .6, .6, @ .6* ] |
145146
"v4:12" Tone [ _* 6, 6, ] |
146147
"v4:14" Tone [ 5* 2, 2, ] |
147148
"v4:15" Tone [ 1 .7 .6 ] |
@@ -188,7 +189,7 @@ pub fn new_tab() -> Tab {
188189
chord [ "6sus2" 1 ]
189190
guitar [ "Asus2" 1 ; "i" | ]
190191
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 ]
192+
vocal [ "v:2" | @ 1 5 ; "v2:2" | @ 2 ; "v3:2" | @ 3 ; "v4:2" | @ 4 ]
192193
}
193194
{
194195
chord [ "5" 1 ]
@@ -248,25 +249,25 @@ pub fn new_tab() -> Tab {
248249
chord [ "6sus2" 1 ]
249250
guitar [ "Asus2" 1 ; "v:17" | ]
250251
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 ]
252+
vocal [ "v:13" | @ 1 2 5 ; "v3:13" | @ 3 4 ]
252253
}
253254
{
254255
chord [ "1" 1 ]
255256
guitar [ "C" 1 ; "i" | ]
256257
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+
vocal [ "v:14" | @ 1 2 3 5 ; "v4:14" | @ 4 ]
258259
}
259260
{
260261
chord [ "v:19" | ]
261262
guitar [ "C_G/B_Am" | ; "v:19" | ]
262263
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+
vocal [ "v:15" | @ 1 2 3 5 ; "v4:15" | @ 4 ]
264265
}
265266
{
266267
chord [ "5" 1 ]
267268
guitar [ "G" 1 ; "v:20" | ]
268269
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+
vocal [ "v:16" | @ 1 2 3 5 ; "v4:16" | @ 4 ]
270271
}
271272
{
272273
chord [ "5" 1 ]

apps/notation_tool/write-all-tabs.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ cargo run write-tab --tab songs:pu_shu:bai_hua_lin -o ../notation_viewer/assets/
44
cargo run write-tab --tab songs:jay:long_juan_feng -o ../notation_viewer/assets/songs/jay/long_juan_feng.ron
55
cargo run write-tab --tab songs:misc:stand_by_me -o ../notation_viewer/assets/songs/misc/stand_by_me.ron
66
cargo run write-tab --tab songs:misc:scarborough_fair -o ../notation_viewer/assets/songs/misc/scarborough_fair.ron
7-
cargo run write-tab --tab songs:misc:scarborough_fair_hard -o ../notation_viewer/assets/songs/misc/scarborough_fair_hard.ron
87

0 commit comments

Comments
 (0)