Skip to content

Commit 9cb8f73

Browse files
yjparkyjpark
committed
save uuid to tab, add default shape
1 parent 6188bd0 commit 9cb8f73

File tree

13 files changed

+211
-507
lines changed

13 files changed

+211
-507
lines changed

‎apps/notation_tool/src/tab/beginner/right_hand_1.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use notation_proto::prelude::*;
33

44
pub fn new_tab() -> Tab {
55
tab! {
6+
"c430733f-46c3-4db2-9685-a72c05027e62"
67
Meta: TabMeta::new(Key::G, Scale::Major, Signature::_4_4, Tempo::Bpm(60))
78
Tracks: [
89
{chord Chord [

‎apps/notation_tool/src/tab/songs/jay/long_juan_feng.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use notation_proto::prelude::*;
44
//photo book 02 - page 68
55
pub fn new_tab() -> Tab {
66
tab! {
7+
"ef6bb44b-17cf-47e6-a50e-0ab636868334"
78
Meta: TabMeta::new(Key::A, Scale::Major, Signature::_4_4, Tempo::Bpm(72))
89
Tracks: [
910
{chord Chord [

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

Lines changed: 37 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ use notation_proto::prelude::*;
33

44
pub fn new_tab() -> Tab {
55
tab! {
6+
"06dd7278-cdaf-40dd-abc6-6e66ec2d6b8c"
67
Meta: TabMeta::new(Key::E, Scale::Minor, Signature::_3_4, Tempo::Bpm(129))
78
Tracks: [
89
{chord Chord [
910
$duration = D_1_2
10-
"6-_7" Chord ( 6: 3- 5 7- )
11-
"6-_7/4" Chord ( 6: 3- 5 7- /4 )
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 )
1415
"6sus2" Chord ( 6: 2 5 )
@@ -22,14 +23,14 @@ pub fn new_tab() -> Tab {
2223
"v:19"
2324
$duration = _1_4
2425
Chord ( 1: 3 5 )
25-
Chord ( 5: 3 5 /3) |
26+
Chord ( 5: 3 5 /3)
2627
Chord ( 6: 3- 5 ) |
2728
]}
2829
{guitar Guitar [
2930
Fretboard capo: 7
3031
$duration = D_1_2
31-
"Am7" Shape ( 0 0 4 0 3 0 )
32-
"Am7/D" Shape ( 0 5 4 0 3 0 )
32+
"Asus4" Shape ( 0 0 4 0 3 0 )
33+
"Dadd11" Shape ( 0 5 4 0 3 0 )
3334
"G/C" Shape ( _ 3 0 0 0 _ )
3435
"Asus2" Shape ( _ 0 2 2 0 0 )
3536
"G'" Shape ( 3 _ 0 0 0 _ )
@@ -56,6 +57,9 @@ pub fn new_tab() -> Tab {
5657
"v:21" Pick [ (4@2 2@1 *) (4 2 *) 6* ] |
5758
"v:23" Pick [ (6 2) 3 4 3 (4@2 2@1 *) ] |
5859
"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 ] |
5963
]}
6064
{lyrics Lyrics [
6165
$duration = _1_4
@@ -102,32 +106,6 @@ pub fn new_tab() -> Tab {
102106
"v4:2" Word [ "reap", "it"+ "in", "a", ] |
103107
"v4:3" Word [ "si-", "ckle"+ "of" ] |
104108
"v4:4" Word [ "lea-"* "ther" ] |
105-
"v4:12" Word [ _* "" ] |
106-
"v4:13" Word [ ""* "" ] |
107-
"v4:14" Word [ ""* "" ] |
108-
"v4:15" Word [ "" "" "" ] |
109-
"v4:16" Word [ "", "", @ ""* ] |
110-
"v4:18" Word [ ""* "" ] |
111-
"v4:19" Word [ ""* "" ] |
112-
"v4:20" Word [ "" "" "" ] |
113-
"v4:21" Word [ ""*+ ] |
114-
"v5:1" Word [ ""* "" ] |
115-
"v5:2" Word [ "", ""* "", ] |
116-
"v5:3" Word [ ""+ "", "" ] |
117-
"v5:4" Word [ ""*+ ] |
118-
"v5:6" Word [ _ "" "" ] |
119-
"v5:7" Word [ ""* "" ] |
120-
"v5:8" Word [ "" "" "" ] |
121-
"v5:9" Word [ ""*+ ] |
122-
"v5:12" Word [ _* "" ] |
123-
"v5:13" Word [ ""* "" ] |
124-
"v5:14" Word [ ""* "" ] |
125-
"v5:15" Word [ "" "" "" ] |
126-
"v5:16" Word [ "", "", @ ""* ] |
127-
"v5:18" Word [ ""* "" ] |
128-
"v5:19" Word [ ""* "" ] |
129-
"v5:20" Word [ "" "" "" ] |
130-
"v5:21" Word [ ""*+ ] |
131109
]}
132110
{vocal Vocal [
133111
$key = E
@@ -166,20 +144,20 @@ pub fn new_tab() -> Tab {
166144
Sections: [
167145
{intro Intro [
168146
{
169-
chord [ "6-_7" 1 ]
170-
guitar [ "Am7" 1 ; "i" | ]
147+
chord [ "6sus4_7" 1 ]
148+
guitar [ "Asus4" 1 ; "i" | ]
171149
} {
172-
chord [ "6-_7/4" 1 ]
173-
guitar [ "Am7/D" 1 ; "i" | ]
150+
chord [ "2_9_11" 1 ]
151+
guitar [ "Dadd11" 1 ; "i" | ]
174152
} {
175153
chord [ "5/4" 1 ]
176154
guitar [ "G/C" 1 ; "i:3" | ]
177155
}
178156
]}
179157
{verse Verse [
180158
{
181-
chord [ "6-_7" 1 ]
182-
guitar [ "Am7" 1 ; "i" | ]
159+
chord [ "6sus4_7" 1 ]
160+
guitar [ "Asus4" 1 ; "i" | ]
183161
lyrics [ "v1:1" | @ 1 5 ; "v2:1" | @ 2 ; "v3:1" | @ 3 ; "v4:1" | @ 4 ; "v5:1" | @ 5 ]
184162
vocal [ "v:1" | @ 1 5 ; "v2:1" | @ 2 3 4 ]
185163
}
@@ -190,8 +168,8 @@ pub fn new_tab() -> Tab {
190168
vocal [ "v:2" | @ 1 5 ; "v2:2" | @ 2 3 ; "v4:2" | @ 4 ]
191169
}
192170
{
193-
chord [ "6-_7" 1 ]
194-
guitar [ "Am7" 1 ; "i" | ]
171+
chord [ "6sus4_7" 1 ]
172+
guitar [ "Asus4" 1 ; "i" | ]
195173
lyrics [ "v1:3" | @ 1 5 ; "v2:3" | @ 2 ; "v3:3" | @ 3 ; "v4:3" | @ 4 ; "v5:3" | @ 5 ]
196174
vocal [ "v:3" | @ 1 5 ; "v2:3" | @ 2 3 ; "v4:3" | @ 4 ]
197175
}
@@ -202,12 +180,12 @@ pub fn new_tab() -> Tab {
202180
vocal [ "v:4" | @ 1 2 3 5 ; "v4:4" | @ 4 ]
203181
}
204182
{
205-
chord [ "6-_7" 1 ]
206-
guitar [ "Am7" 1 ; "i" | ]
183+
chord [ "6sus4_7" 1 ]
184+
guitar [ "Asus4" 1 ; "i" | ]
207185
}
208186
{
209187
chord [ "6sus2" 1 ]
210-
guitar [ "Am7" 1 ; "i" | ]
188+
guitar [ "Asus4" 1 ; "i" | ]
211189
lyrics [ "v:6" | ]
212190
vocal [ "v:6" | ]
213191
}
@@ -218,8 +196,8 @@ pub fn new_tab() -> Tab {
218196
vocal [ "v:7" | ]
219197
}
220198
{
221-
chord [ "6-_7" 1 ]
222-
guitar [ "Am7" 1 ; "i" | ]
199+
chord [ "6sus4_7" 1 ]
200+
guitar [ "Asus4" 1 ; "i" | ]
223201
lyrics [ "v:8" | ]
224202
vocal [ "v:8" | ]
225203
}
@@ -244,8 +222,8 @@ pub fn new_tab() -> Tab {
244222
vocal [ "v:12" | ]
245223
}
246224
{
247-
chord [ "6-_7" 1 ]
248-
guitar [ "Am7" 1 ; "i" | ]
225+
chord [ "6sus4_7" 1 ]
226+
guitar [ "Asus4" 1 ; "i" | ]
249227
lyrics [ "v1:13" | @ 1 5 ; "v2:13" | @ 2 ; "v3:13" | @ 3 ; "v4:13" | @ 4 ]
250228
vocal [ "v:13" | @ 1 2 ; "v3:13" | @ 3 4 5 ]
251229
}
@@ -256,8 +234,8 @@ pub fn new_tab() -> Tab {
256234
vocal [ "v:14" | @ 1 2 3 ; "v4:14" | @ 4 5 ]
257235
}
258236
{
259-
chord [ "6-_7" 1 ]
260-
guitar [ "Am7" 1 ; "i" | ]
237+
chord [ "6sus4_7" 1 ]
238+
guitar [ "Asus4" 1 ; "i" | ]
261239
lyrics [ "v1:15" | @ 1 5 ; "v2:15" | @ 2 ; "v3:15" | @ 3 ; "v4:15" | @ 4 ]
262240
vocal [ "v:15" | @ 1 2 3 ; "v4:15" | @ 4 5 ]
263241
}
@@ -308,8 +286,18 @@ pub fn new_tab() -> Tab {
308286
guitar [ "G" 1 ; "v:24" | ]
309287
}
310288
]}
289+
{outro Outro [
290+
{
291+
chord [ "6-" 1 ]
292+
guitar [ "o:1" | ]
293+
}
294+
{
295+
chord [ "6-" 1 ]
296+
guitar [ "o:2" | ]
297+
}
298+
]}
311299
]
312-
Form: intro verse verse verse
300+
Form: intro verse verse verse verse verse intro outro
313301
}
314302
}
315303

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use notation_proto::prelude::*;
33

44
pub fn new_tab() -> Tab {
55
tab! {
6+
"ae2d8c46-9a9f-4ae8-932b-31d811797ea5"
67
Meta: TabMeta::new(Key::A, Scale::Major, Signature::_4_4, Tempo::Bpm(120))
78
Tracks: [
89
{chord Chord [

‎apps/notation_tool/src/tab/songs/pu_shu/bai_hua_lin.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use notation_proto::prelude::*;
33

44
pub fn new_tab() -> Tab {
55
tab! {
6+
"15ab6b58-1eaf-4075-95ab-f0b35117eddb"
67
Meta: TabMeta::new(Key::E, Scale::Minor, Signature::_3_4, Tempo::Bpm(118))
78
Tracks: [
89
{chord Chord [

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use notation_proto::prelude::*;
33

44
pub fn new_tab() -> Tab {
55
tab! {
6+
"8bf15271-53dc-482e-8704-d62a56085ebb"
67
Meta: TabMeta::new(Key::G, Scale::Major, Signature::_4_4, Tempo::Bpm(60))
78
Tracks: [
89
{chord Chord [

0 commit comments

Comments
 (0)