X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fscale-definitions.ly;h=0b48ce633a3bbcf675e961b7ee7512f09479e63c;hb=994cc3b8368898b4650b908db3e1f2d80a787527;hp=873f58313b425c7674a635834fe092cf890e8dc1;hpb=c52973e438ce3490d688860bb71849a7b3c26fef;p=lilypond.git diff --git a/ly/scale-definitions.ly b/ly/scale-definitions.ly index 873f58313b..0b48ce633a 100644 --- a/ly/scale-definitions.ly +++ b/ly/scale-definitions.ly @@ -8,8 +8,8 @@ major = #'( (4 . 0) (5 . 0) (6 . 0) - ) + minor = #'( (0 . 0) (1 . 0) @@ -19,14 +19,81 @@ minor = #'( (5 . -1) (6 . -1) ) - - -%{ OUTDATED: someone please fix these -ionian = 0 -locrian = 1 -aeolian = 3 -mixolydian = 5 -lydian = 7 -phrygian = 8 -dorian = 10 -%} + + +ionian = #'( + (0 . 0) + (1 . 0) + (2 . 0) + (3 . 0) + (4 . 0) + (5 . 0) + (6 . 0) + ) + + +locrian = #'( + (0 . 0) + (1 . -1) + (2 . -1) + (3 . 0) + (4 . -1) + (5 . -1) + (6 . -1) + ) + + +aeolian = #'( + (0 . 0) + (1 . 0) + (2 . -1) + (3 . 0) + (4 . 0) + (5 . -1) + (6 . -1) + ) + + +mixolydian = #'( + (0 . 0) + (1 . 0) + (2 . 0) + (3 . 0) + (4 . 0) + (5 . 0) + (6 . -1) + ) + + +lydian = #'( + (0 . 0) + (1 . 0) + (2 . 0) + (3 . 1) + (4 . 0) + (5 . 0) + (6 . 0) + ) + + +phrygian = #'( + (0 . 0) + (1 . -1) + (2 . -1) + (3 . 0) + (4 . 0) + (5 . -1) + (6 . -1) +) + + +dorian = #'( + (0 . 0) + (1 . 0) + (2 . -1) + (3 . 0) + (4 . 0) + (5 . 0) + (6 . -1) + ) +