wip

Author: yjpark

apps/notation_kb/src/theory/scale.rs

@@ -93,7 +93,7 @@ impl ScalePage {
     pub fn make_tab(&self) -> ProtoTab {
         let meta = TabMeta::new(
             self.key.clone(), self.scale.clone(),
-            Signature::_4_4, Tempo::Bpm(60),
+            Signature::_4_4, Tempo::Bpm(80),
         );
         let mut entries = vec![];
         let duration = Duration::_1_4;

apps/notation_tabs/src/long_juan_feng.rs

@@ -26,7 +26,7 @@ pub fn new_tab() -> Tab {
                 "3-" Chord ( 3: 3- 5 7- )
                 "4" Chord ( 4: 3 5 7 )
                 "5" Chord ( 5: 3 5 )
-                "b6" Chord ( %6: 3- 5% 7% )
+                "b6" Chord ( 6%: 3- 5% 7% )
                 "6-" Chord ( 6: 3- 5 7- )
                 $duration = _1_2
                 "1,4"
@@ -130,8 +130,8 @@ pub fn new_tab() -> Tab {
                 $duration = _1_4
                 "v:1,2" Tone [ .5 2 2, 1, 3 ] |
                 "v:3" Tone [ .6 3 3, 2, 4 ] |
-                "v:4_1" Tone [ .%6 3,+ 4,, 3, 2, 1, .%6,, .5,, ] |
-                "v:4_2" Tone [ .%6 3,+ 4,, 3, 2, 1, 5,, 6,, ] |
+                "v:4_1" Tone [ .6% 3,+ 4,, 3, 2, 1, .6%,, .5,, ] |
+                "v:4_2" Tone [ .6% 3,+ 4,, 3, 2, 1, 5,, 6,, ] |
                 $duration = _1_8
                 "p:1" Tone [ 6 3 3 1 1 .5 1 5 ] |
                 "p:2" Tone [ 5 2 2 .7 .7 .5 .7 1 ] |

crates/notation_core/src/key.rs

@@ -71,17 +71,17 @@ impl Key {
             "G" => Self::G,
             "A" => Self::A,
             "B" => Self::B,
-            "#C" => Self::C_SHARP,
-            "#D" => Self::D_SHARP,
-            "#E" => Self::E_SHARP,
-            "#F" => Self::F_SHARP,
-            "#G" => Self::G_SHARP,
-            "#A" => Self::A_SHARP,
-            "bD" => Self::D_FLAT,
-            "bE" => Self::E_FLAT,
-            "bG" => Self::G_FLAT,
-            "bA" => Self::A_FLAT,
-            "bB" => Self::B_FLAT,
+            "C#" => Self::C_SHARP,
+            "D#" => Self::D_SHARP,
+            "E#" => Self::E_SHARP,
+            "F#" => Self::F_SHARP,
+            "G#" => Self::G_SHARP,
+            "A#" => Self::A_SHARP,
+            "Db" => Self::D_FLAT,
+            "Eb" => Self::E_FLAT,
+            "Gb" => Self::G_FLAT,
+            "Ab" => Self::A_FLAT,
+            "Bb" => Self::B_FLAT,
             _ => Self::default(),
         }
     }

crates/notation_core/src/pitch.rs

@@ -60,7 +60,7 @@ pub struct Pitch {
 
 impl Display for Pitch {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}{}", self.sign, self.name)
+        write!(f, "{}{}", self.name, self.sign)
     }
 }
 
@@ -335,34 +335,34 @@ impl Pitch {
             "G" => Pitch::G,
             "A" => Pitch::A,
             "B" => Pitch::B,
-            "#C" => Pitch::C_SHARP,
-            "#D" => Pitch::D_SHARP,
-            "#E" => Pitch::E_SHARP,
-            "#F" => Pitch::F_SHARP,
-            "#G" => Pitch::G_SHARP,
-            "#A" => Pitch::A_SHARP,
-            "#B" => Pitch::B_SHARP,
-            "bC" => Pitch::C_FLAT,
-            "bD" => Pitch::D_FLAT,
-            "bE" => Pitch::E_FLAT,
-            "bF" => Pitch::F_FLAT,
-            "bG" => Pitch::G_FLAT,
-            "bA" => Pitch::A_FLAT,
-            "bB" => Pitch::B_FLAT,
-            "##C" => Pitch::C_DOUBLE_SHARP,
-            "##D" => Pitch::D_DOUBLE_SHARP,
-            "##E" => Pitch::E_DOUBLE_SHARP,
-            "##F" => Pitch::F_DOUBLE_SHARP,
-            "##G" => Pitch::G_DOUBLE_SHARP,
-            "##A" => Pitch::A_DOUBLE_SHARP,
-            "##B" => Pitch::B_DOUBLE_SHARP,
-            "bbC" => Pitch::C_DOUBLE_FLAT,
-            "bbD" => Pitch::D_DOUBLE_FLAT,
-            "bbE" => Pitch::E_DOUBLE_FLAT,
-            "bbF" => Pitch::F_DOUBLE_FLAT,
-            "bbG" => Pitch::G_DOUBLE_FLAT,
-            "bbA" => Pitch::A_DOUBLE_FLAT,
-            "bbB" => Pitch::B_DOUBLE_FLAT,
+            "C#" => Pitch::C_SHARP,
+            "D#" => Pitch::D_SHARP,
+            "E#" => Pitch::E_SHARP,
+            "F#" => Pitch::F_SHARP,
+            "G#" => Pitch::G_SHARP,
+            "A#" => Pitch::A_SHARP,
+            "B#" => Pitch::B_SHARP,
+            "Cb" => Pitch::C_FLAT,
+            "Db" => Pitch::D_FLAT,
+            "Eb" => Pitch::E_FLAT,
+            "Fb" => Pitch::F_FLAT,
+            "Gb" => Pitch::G_FLAT,
+            "Ab" => Pitch::A_FLAT,
+            "Bb" => Pitch::B_FLAT,
+            "C##" => Pitch::C_DOUBLE_SHARP,
+            "D##" => Pitch::D_DOUBLE_SHARP,
+            "E##" => Pitch::E_DOUBLE_SHARP,
+            "F##" => Pitch::F_DOUBLE_SHARP,
+            "G##" => Pitch::G_DOUBLE_SHARP,
+            "A##" => Pitch::A_DOUBLE_SHARP,
+            "B##" => Pitch::B_DOUBLE_SHARP,
+            "Cbb" => Pitch::C_DOUBLE_FLAT,
+            "Dbb" => Pitch::D_DOUBLE_FLAT,
+            "Ebb" => Pitch::E_DOUBLE_FLAT,
+            "Fbb" => Pitch::F_DOUBLE_FLAT,
+            "Gbb" => Pitch::G_DOUBLE_FLAT,
+            "Abb" => Pitch::A_DOUBLE_FLAT,
+            "Bbb" => Pitch::B_DOUBLE_FLAT,
             _ => Pitch::C,
         }
     }

crates/notation_dsl/src/core/note.rs

@@ -12,20 +12,20 @@ use super::pitch_sign::PitchSignDsl;
 
 pub struct NoteDsl {
     pub octave_tweak: Option<OctaveTweakDsl>,
-    pub pitch_sign: PitchSignDsl,
     pub pitch_name: PitchNameDsl,
+    pub pitch_sign: PitchSignDsl,
 }
 
 impl Parse for NoteDsl {
     #[throws(Error)]
     fn parse(input: ParseStream) -> Self {
         let octave_tweak = OctaveTweakDsl::try_parse(input);
-        let pitch_sign = input.parse::<PitchSignDsl>()?;
         let pitch_name = input.parse::<PitchNameDsl>()?;
+        let pitch_sign = input.parse::<PitchSignDsl>()?;
         NoteDsl {
             octave_tweak,
-            pitch_sign,
             pitch_name,
+            pitch_sign,
         }
     }
 }
@@ -40,8 +40,8 @@ impl ToTokens for NoteDsl {
     fn to_tokens(&self, tokens: &mut TokenStream) {
         let NoteDsl {
             octave_tweak,
-            pitch_sign,
             pitch_name,
+            pitch_sign,
         } = self;
         if pitch_name.from_syllable {
             let syllable = Syllable::from((pitch_sign.sign, pitch_name.name));

crates/notation_dsl/src/core/syllable.rs

@@ -27,8 +27,9 @@ impl SyllableDsl {
     }
     #[throws(Error)]
     fn parse_sharp(input: ParseStream) -> Self {
+        let syllable = input.parse::<LitInt>()?.base10_parse::<u8>()?;
         input.parse::<Token![#]>()?;
-        SyllableDsl::new(match input.parse::<LitInt>()?.base10_parse::<u8>()? {
+        SyllableDsl::new(match syllable {
             1 => Syllable::Di,
             2 => Syllable::Ri,
             4 => Syllable::Fi,
@@ -39,8 +40,9 @@ impl SyllableDsl {
     }
     #[throws(Error)]
     fn parse_flat(input: ParseStream) -> Self {
+        let syllable = input.parse::<LitInt>()?.base10_parse::<u8>()?;
         input.parse::<Token![%]>()?;
-        SyllableDsl::new(match input.parse::<LitInt>()?.base10_parse::<u8>()? {
+        SyllableDsl::new(match syllable {
             2 => Syllable::Ra,
             3 => Syllable::Me,
             5 => Syllable::Se,
@@ -54,9 +56,9 @@ impl SyllableDsl {
 impl Parse for SyllableDsl {
     #[throws(Error)]
     fn parse(input: ParseStream) -> Self {
-        if input.peek(Token![#]) {
+        if input.peek2(Token![#]) {
             Self::parse_sharp(input)?
-        } else if input.peek(Token![%]) {
+        } else if input.peek2(Token![%]) {
             Self::parse_flat(input)?
         } else {
             Self::parse_natural(input)?