Skip to content

Commit 6887e03

Browse files
yjparkyjpark
committed
bugfix with kb scale page, bump versions
1 parent ef3e599 commit 6887e03

File tree

12 files changed

+37
-33
lines changed

12 files changed

+37
-33
lines changed

‎Cargo.lock‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/notation_kb/src/theory/scale.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,11 @@ impl ScalePage {
9999
let duration = Duration::_1_4;
100100
let mut add_note = |syllable: &Syllable, add_octave| {
101101
let octave = if add_octave { Octave::P5 } else { Octave::P4 };
102-
let note = self.scale.calc_note_from_syllable(&self.key, syllable, &octave);
102+
let semitones =
103+
Semitones::from(octave) +
104+
Semitones::from(self.key.clone()) +
105+
Semitones::from(self.scale.calc_syllable_for_sort(syllable));
106+
let note = self.scale.calc_note_from_semitones(&self.key, semitones);
103107
entries.push(ProtoEntry::from(CoreEntry::from((Tone::from(note), duration))));
104108
};
105109
let mut syllables = self.scale.get_syllables();

‎crates/notation_bevy/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "notation_bevy"
3-
version = "0.4.3"
3+
version = "0.4.4"
44
edition = "2021"
55
license = "MIT OR Apache-2.0"
66
homepage = "https://www.notation.fun"
@@ -34,10 +34,10 @@ dsl = [
3434
[dependencies]
3535
notation_bevy_utils = { version = "0.4.2", path = "../notation_bevy_utils" }
3636

37-
notation_model = { version = "0.4.3", path = "../notation_model" }
37+
notation_model = { version = "0.4.4", path = "../notation_model" }
3838

39-
notation_midi = { version = "0.4.3", path = "../notation_midi", optional = true }
40-
notation_dsl = { version = "0.4.3", path = "../notation_dsl", optional = true }
39+
notation_midi = { version = "0.4.4", path = "../notation_midi", optional = true }
40+
notation_dsl = { version = "0.4.4", path = "../notation_dsl", optional = true }
4141

4242
serde = { version = "1.0.133", features = [ "derive" ] }
4343
# https://github.com/serde-rs/serde/issues/1937

‎crates/notation_dsl/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "notation_dsl"
3-
version = "0.4.3"
3+
version = "0.4.4"
44
edition = "2021"
55
license = "MIT OR Apache-2.0"
66
homepage = "https://www.notation.fun"
@@ -12,7 +12,7 @@ description = "Fun notation - DSL to create notation files"
1212
[lib]
1313

1414
[dependencies]
15-
notation_proto = { version = "0.4.3", path = "../notation_proto" }
15+
notation_proto = { version = "0.4.4", path = "../notation_proto" }
1616

1717
syn = { version = "1.0", features = ["full"] }
1818
quote = "1.0"

‎crates/notation_fretted/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "notation_fretted"
3-
version = "0.4.3"
3+
version = "0.4.4"
44
edition = "2021"
55
license = "MIT OR Apache-2.0"
66
homepage = "https://www.notation.fun"

‎crates/notation_guitar/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "notation_guitar"
3-
version = "0.4.3"
3+
version = "0.4.4"
44
edition = "2021"
55
license = "MIT OR Apache-2.0"
66
homepage = "https://www.notation.fun"
@@ -12,6 +12,6 @@ description = "Fun notation - definition for guitar"
1212

1313
[dependencies]
1414
notation_core = { version = "0.4.3", path = "../notation_core" }
15-
notation_fretted = { version = "0.4.3", path = "../notation_fretted" }
15+
notation_fretted = { version = "0.4.4", path = "../notation_fretted" }
1616

1717
serde = { version = "1.0.126", features = ["derive"] }

‎crates/notation_macro/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "notation_macro"
3-
version = "0.4.3"
3+
version = "0.4.4"
44
edition = "2021"
55
license = "MIT OR Apache-2.0"
66
homepage = "https://www.notation.fun"
@@ -13,4 +13,4 @@ description = "Fun notation - DSL to create notation files"
1313
proc-macro = true
1414

1515
[dependencies]
16-
notation_dsl = { version = "0.4.3", path = "../notation_dsl" }
16+
notation_dsl = { version = "0.4.4", path = "../notation_dsl" }

‎crates/notation_midi/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "notation_midi"
3-
version = "0.4.3"
3+
version = "0.4.4"
44
edition = "2021"
55
license = "MIT OR Apache-2.0"
66
homepage = "https://www.notation.fun"
@@ -13,7 +13,7 @@ description = "Fun notation - midi features"
1313
[features]
1414

1515
[dependencies]
16-
notation_model = { version = "0.4.3", path = "../notation_model" }
16+
notation_model = { version = "0.4.4", path = "../notation_model" }
1717
notation_audio = { version = "0.4.0", path = "../notation_audio" }
1818

1919
midir = "0.7"

‎crates/notation_model/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "notation_model"
3-
version = "0.4.3"
3+
version = "0.4.4"
44
edition = "2021"
55
license = "MIT OR Apache-2.0"
66
homepage = "https://www.notation.fun"
@@ -11,7 +11,7 @@ description = "Fun notation - runtime models"
1111
[lib]
1212

1313
[dependencies]
14-
notation_proto = { version = "0.4.3", path = "../notation_proto" }
14+
notation_proto = { version = "0.4.4", path = "../notation_proto" }
1515
thiserror = "1.0"
1616
fehler = "1.0"
1717
uuid = { version = "0.8", features = ["serde", "v4"] }

‎crates/notation_proto/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "notation_proto"
3-
version = "0.4.3"
3+
version = "0.4.4"
44
edition = "2021"
55
license = "MIT OR Apache-2.0"
66
homepage = "https://www.notation.fun"
@@ -16,5 +16,5 @@ serde = { version = "1.0.126", features = ["derive", "alloc"] }
1616
uuid = { version = "0.8", features = ["serde", "v4"] }
1717

1818
notation_core = { version = "0.4.3", path = "../notation_core" }
19-
notation_fretted = { version = "0.4.3", path = "../notation_fretted" }
20-
notation_guitar = { version = "0.4.3", path = "../notation_guitar" }
19+
notation_fretted = { version = "0.4.4", path = "../notation_fretted" }
20+
notation_guitar = { version = "0.4.4", path = "../notation_guitar" }

0 commit comments

Comments
 (0)