Skip to content

Commit e94cc3d

Browse files
committed
hide shape fret finger in case picked fret are lower
1 parent 55acf74 commit e94cc3d

File tree

9 files changed

+966
-22
lines changed

9 files changed

+966
-22
lines changed

apps/notation_tool/src/tab/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ pub fn get_tab_list<'a>() -> Vec<TabInfo<'a>> {
2929
"songs:jay:long_juan_feng",
3030
songs::jay::long_juan_feng::new_tab,
3131
),
32+
TabInfo::new(
33+
"songs:misc:stand_by_me",
34+
songs::misc::stand_by_me::new_tab,
35+
),
3236
]
3337
}
3438

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pub mod stand_by_me;
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
use notation_dsl::tab;
2+
use notation_proto::prelude::*;
3+
4+
pub fn new_tab() -> Tab {
5+
tab! {
6+
Meta: TabMeta::new(Key::A, Scale::Major, Signature::_4_4, Tempo::Bpm(120))
7+
Tracks: [
8+
{chord Chord [
9+
$duration = _1
10+
"1" Chord ( 1: 3 5 )
11+
"6-" Chord ( 6: 3- 5 )
12+
"4" Chord ( 4: 3 5 )
13+
"5" Chord ( 5: 3 5 )
14+
]}
15+
{guitar Guitar [
16+
Fretboard
17+
$duration = _1
18+
"A" Shape ( 0 0 2 2 2 0 )
19+
"#Fm" Shape ( 2 4 4 2 2 2 )
20+
"D" Shape ( _ _ 0 2 3 2 )
21+
"E" Shape ( 0 2 2 1 0 0 )
22+
$duration = _1_8
23+
"i:1" Pick [ 3* _ 3* _ 4 3@1 ] |
24+
"i:2" Pick [ 3* _ 3* _ 3 3@1 ] |
25+
"i:3" Pick [ 4* _ 4* _ 4@2* ] |
26+
"i:4" Pick [ 4* _ 4* _ 4 4@2 ] |
27+
"i:5" Pick [ 4* _ 4* _ 4 4@4 ] |
28+
"i:6" Pick [ 4* _ 4* _ 4 3 ] |
29+
]}
30+
]
31+
Sections: [
32+
{intro Intro [
33+
{
34+
chord [ "1" 1 ]
35+
guitar [ "A" 1 ; "i:1" | ]
36+
}
37+
{
38+
chord [ "1" 1 ]
39+
guitar [ "A" 1 ; "i:2" | ]
40+
}
41+
{
42+
chord [ "6-" 1 ]
43+
guitar [ "#Fm" 1 ; "i:3" | ]
44+
}
45+
{
46+
chord [ "6-" 1 ]
47+
guitar [ "#Fm" 1 ; "i:4" | ]
48+
}
49+
{
50+
chord [ "4" 1 ]
51+
guitar [ "D" 1 ; "i:5" | ]
52+
}
53+
{
54+
chord [ "5" 1 ]
55+
guitar [ "E" 1 ; "i:6" | ]
56+
}
57+
{
58+
chord [ "1" 1 ]
59+
guitar [ "A" 1 ; "i:1" | ]
60+
}
61+
{
62+
chord [ "1" 1 ]
63+
guitar [ "A" 1 ; "i:1" | ]
64+
}
65+
]}
66+
{verse Verse [
67+
{
68+
chord [ "6-" 1 ]
69+
guitar [ "Em" 1 ; "picks" | ]
70+
} {
71+
chord [ "6-" 1 ]
72+
guitar [ "Em" 1 ; "picks" | ]
73+
} {
74+
chord [ "1" 1 ]
75+
guitar [ "G" 1 ; "picks" | ]
76+
} {
77+
chord [ "1" 1 ]
78+
guitar [ "G" 1 ; "picks" | ]
79+
}
80+
]}
81+
]
82+
Form: intro
83+
}
84+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
pub mod misc;
12
pub mod jay;
23
pub mod pu_shu;

apps/notation_tool/write-all-tabs.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ cargo run write-tab --tab test -o ../notation_viewer/assets/test.ron
22
cargo run write-tab --tab beginner:1_right_hand -o ../notation_viewer/assets/beginner/1_right_hand.ron
33
cargo run write-tab --tab songs:pu_shu:bai_hua_lin -o ../notation_viewer/assets/songs/pu_shu/bai_hua_lin.ron
44
cargo run write-tab --tab songs:jay:long_juan_feng -o ../notation_viewer/assets/songs/jay/long_juan_feng.ron
5+
cargo run write-tab --tab songs:misc:stand_by_me -o ../notation_viewer/assets/songs/misc/stand_by_me.ron
56

0 commit comments

Comments
 (0)