fixes #151, can have separate lane for bass notes with different duration, a bit hacky in implementation though

Author: yjpark

apps/notation_tabs/src/test.rs

@@ -24,26 +24,28 @@ pub fn new_tab() -> Tab {
                 Fretboard
                 $duration = _1
                 "Em" Shape ( 0 2 2 0 0 0 )
-                "G" Shape ( 3 2 0 0 0 0 )
+                "G" Shape ( 3 2 0 0 0 3 )
                 $duration = T_1_8
-                "picks" Pick [ 6 3 2 1 2 3 ]
-                Pick [ 6 3 2 1 2 3 ] |
+                "picks" Pick [ _ 3 2 1 2 3 ]
+                Pick [ _ 3 2 1 2 3 ] |
+                $duration = _1_2
+                "bass" Pick [ 6 6 ] |
             ]}
         ]
         Sections: [
             {"A" Verse [
                 {
                     chord [ "6-" 1 ]
-                    guitar [ "Em" 1 ; "picks" | ]
+                    guitar [ "Em" 1 ; "picks" | ; "bass" | ]
                 } {
                     chord [ "6-" 1 ]
-                    guitar [ "Em" 1 ; "picks" | ]
+                    guitar [ "Em" 1 ; "picks" | ; "bass" | ]
                 } {
                     chord [ "1" 1 ]
-                    guitar [ "G" 1 ; "picks" | ]
+                    guitar [ "G" 1 ; "picks" | ; "bass" | ]
                 } {
                     chord [ "1" 1 ]
-                    guitar [ "G" 1 ; "picks" | ]
+                    guitar [ "G" 1 ; "picks" | ; "bass" | ]
                 }
             ]}
         ]

apps/notation_viewer/assets/tabs/scarborough_fair.ron

@@ -2302,7 +2302,7 @@
                 )),// [28]
                 Core(Tone(
                     Single((
-                        octave: P5,
+                        octave: P4,
                         pitch: (
                             name: C,
                             sign: Sharp,

apps/notation_viewer/assets/tabs/test.ron

@@ -128,7 +128,7 @@
                     (
                         barre: None,
                         frets: (
-                            Some(0),
+                            Some(3),
                             Some(0),
                             Some(0),
                             Some(0),
@@ -151,16 +151,7 @@
                     "T_1_8",
                 ),// [6]
                 Mark("picks"),// [7]
-                Fretted6(Pick(
-                    Single((
-                        string: 6,
-                        fret: None,
-                        fret_finger: None,
-                        pick_finger: None,
-                        pick_direction: None,
-                    )),
-                    Triplet(Eighth),
-                )),// [8]
+                Core(Rest(Triplet(Eighth))),// [8]
                 Fretted6(Pick(
                     Single((
                         string: 3,
@@ -211,16 +202,7 @@
                     )),
                     Triplet(Eighth),
                 )),// [13]
-                Fretted6(Pick(
-                    Single((
-                        string: 6,
-                        fret: None,
-                        fret_finger: None,
-                        pick_finger: None,
-                        pick_direction: None,
-                    )),
-                    Triplet(Eighth),
-                )),// [14]
+                Core(Rest(Triplet(Eighth))),// [14]
                 Fretted6(Pick(
                     Single((
                         string: 3,
@@ -271,6 +253,32 @@
                     )),
                     Triplet(Eighth),
                 )),// [19]
+                Mark("|"),// [20]
+                Extra(
+                    "dsl::context::duration",
+                    "_1_2",
+                ),// [21]
+                Mark("bass"),// [22]
+                Fretted6(Pick(
+                    Single((
+                        string: 6,
+                        fret: None,
+                        fret_finger: None,
+                        pick_finger: None,
+                        pick_direction: None,
+                    )),
+                    Simple(Half),
+                )),// [23]
+                Fretted6(Pick(
+                    Single((
+                        string: 6,
+                        fret: None,
+                        fret_finger: None,
+                        pick_finger: None,
+                        pick_direction: None,
+                    )),
+                    Simple(Half),
+                )),// [24]
                 Mark("|"),
             ],
         ),
@@ -304,6 +312,11 @@
                                     begin: Mark("picks"),
                                     end: Mark("|"),
                                     rounds: None,
+                                ),// [1]
+                                (
+                                    begin: Mark("bass"),
+                                    end: Mark("|"),
+                                    rounds: None,
                                 ),
                             ],
                         ),
@@ -333,6 +346,11 @@
                                     begin: Mark("picks"),
                                     end: Mark("|"),
                                     rounds: None,
+                                ),// [1]
+                                (
+                                    begin: Mark("bass"),
+                                    end: Mark("|"),
+                                    rounds: None,
                                 ),
                             ],
                         ),
@@ -362,6 +380,11 @@
                                     begin: Mark("picks"),
                                     end: Mark("|"),
                                     rounds: None,
+                                ),// [1]
+                                (
+                                    begin: Mark("bass"),
+                                    end: Mark("|"),
+                                    rounds: None,
                                 ),
                             ],
                         ),
@@ -391,6 +414,11 @@
                                     begin: Mark("picks"),
                                     end: Mark("|"),
                                     rounds: None,
+                                ),// [1]
+                                (
+                                    begin: Mark("bass"),
+                                    end: Mark("|"),
+                                    rounds: None,
                                 ),
                             ],
                         ),