diff --git a/data/definitions/CMakeLists.txt b/data/definitions/CMakeLists.txt index 7217d75..b44d57a 100644 --- a/data/definitions/CMakeLists.txt +++ b/data/definitions/CMakeLists.txt @@ -1,9 +1,14 @@ set(minuet_DEFINITIONS - intervals-ascending-melodic-definitions.json + intervals-ascending-melodic-harmonic-definitions.json intervals-descending-melodic-definitions.json chords-root-position-definitions.json scales-major-and-its-modes-definitions.json + scales-harmonic-minor-and-its-modes-definitions.json + scales-harmonic-major-and-its-modes-definitions.json + scales-pentatonic-major-and-its-modes-definitions.json + scales-simmetric-definitions.json + scales-bebop-definitions.json rhythm-definitions.json ) install(FILES ${minuet_DEFINITIONS} DESTINATION ${KDE_INSTALL_DATADIR}/minuet/definitions) diff --git a/data/definitions/intervals-ascending-melodic-definitions.json b/data/definitions/intervals-ascending-melodic-harmonic-definitions.json similarity index 51% rename from data/definitions/intervals-ascending-melodic-definitions.json rename to data/definitions/intervals-ascending-melodic-harmonic-definitions.json index 27aec9c..86adc6a 100644 --- a/data/definitions/intervals-ascending-melodic-definitions.json +++ b/data/definitions/intervals-ascending-melodic-harmonic-definitions.json @@ -1,124 +1,124 @@ { "definitions": [ { - "tags": ["interval", "ascending", "2", "minor"], + "tags": ["interval", "ascending", "harmonic", "2", "minor"], "name": "Minor Second", "sequence": "1" }, { - "tags": ["interval", "ascending", "2", "major"], + "tags": ["interval", "ascending", "harmonic", "2", "major"], "name": "Major Second", "sequence": "2" }, { - "tags": ["interval", "ascending", "3", "minor"], + "tags": ["interval", "ascending", "harmonic", "3", "minor"], "name": "Minor Third", "sequence": "3" }, { - "tags": ["interval", "ascending", "3", "major"], + "tags": ["interval", "ascending", "harmonic", "3", "major"], "name": "Major Third", "sequence": "4" }, { - "tags": ["interval", "ascending", "4"], + "tags": ["interval", "ascending", "harmonic", "4"], "name": "Perfect Fourth", "sequence": "5" }, { - "tags": ["interval", "ascending", "tritone"], + "tags": ["interval", "ascending", "harmonic", "tritone"], "name": "Tritone", "sequence": "6" }, { - "tags": ["interval", "ascending", "5"], + "tags": ["interval", "ascending", "harmonic", "5"], "name": "Perfect Fifth", "sequence": "7" }, { - "tags": ["interval", "ascending", "6", "minor"], + "tags": ["interval", "ascending", "harmonic", "6", "minor"], "name": "Minor Sixth", "sequence": "8" }, { - "tags": ["interval", "ascending", "6", "major"], + "tags": ["interval", "ascending", "harmonic", "6", "major"], "name": "Major Sixth", "sequence": "9" }, { - "tags": ["interval", "ascending", "7", "minor"], + "tags": ["interval", "ascending", "harmonic", "7", "minor"], "name": "Minor Seventh", "sequence": "10" }, { - "tags": ["interval", "ascending", "7", "major"], + "tags": ["interval", "ascending", "harmonic", "7", "major"], "name": "Major Seventh", "sequence": "11" }, { - "tags": ["interval", "ascending", "8"], + "tags": ["interval", "ascending", "harmonic", "8"], "name": "Perfect Octave", "sequence": "12" }, { - "tags": ["interval", "ascending", "9", "minor"], + "tags": ["interval", "ascending", "harmonic", "9", "minor"], "name": "Minor Ninth", "sequence": "13" }, { - "tags": ["interval", "ascending", "9", "major"], + "tags": ["interval", "ascending", "harmonic", "9", "major"], "name": "Major Ninth", "sequence": "14" }, { - "tags": ["interval", "ascending", "10", "minor"], + "tags": ["interval", "ascending", "harmonic", "10", "minor"], "name": "Minor Tenth", "sequence": "15" }, { - "tags": ["interval", "ascending", "10", "major"], + "tags": ["interval", "ascending", "harmonic", "10", "major"], "name": "Major Tenth", "sequence": "16" }, { - "tags": ["interval", "ascending", "11"], + "tags": ["interval", "ascending", "harmonic", "11"], "name": "Perfect Eleventh", "sequence": "17" }, { - "tags": ["interval", "ascending", "8+tritone"], + "tags": ["interval", "ascending", "harmonic", "8+tritone"], "name": "Octave + Tritone", "sequence": "18" }, { - "tags": ["interval", "ascending", "12"], + "tags": ["interval", "ascending", "harmonic", "12"], "name": "Perfect Twelfth", "sequence": "19" }, { - "tags": ["interval", "ascending", "13", "minor"], + "tags": ["interval", "ascending", "harmonic", "13", "minor"], "name": "Minor Thirteenth", "sequence": "20" }, { - "tags": ["interval", "ascending", "13", "major"], + "tags": ["interval", "ascending", "harmonic", "13", "major"], "name": "Major Thirteenth", "sequence": "21" }, { - "tags": ["interval", "ascending", "14", "minor"], + "tags": ["interval", "ascending", "harmonic", "14", "minor"], "name": "Minor Fourteenth", "sequence": "22" }, { - "tags": ["interval", "ascending", "14", "major"], + "tags": ["interval", "ascending", "harmonic", "14", "major"], "name": "Major Fourteenth", "sequence": "23" }, { - "tags": ["interval", "ascending", "double8"], + "tags": ["interval", "ascending", "harmonic", "double8"], "name": "Perfect Double Octave", "sequence": "24" } ] } diff --git a/data/definitions/scales-bebop-definitions.json b/data/definitions/scales-bebop-definitions.json new file mode 100644 index 0000000..08bad25 --- /dev/null +++ b/data/definitions/scales-bebop-definitions.json @@ -0,0 +1,29 @@ +{ + "definitions": [ + { + "tags": ["scale", "ascending", "bebop"], + "name": "Bebop Major", + "sequence": "2 4 5 7 8 9 11 12" + }, + { + "tags": ["scale", "ascending", "bebop"], + "name": "Bebop Dominant", + "sequence": "2 4 5 7 9 10 11 12" + }, + { + "tags": ["scale", "ascending", "bebop"], + "name": "Bebop Dorian", + "sequence": "2 3 4 5 7 9 10 12" + }, + { + "tags": ["scale", "ascending", "bebop"], + "name": "Bebop Minor", + "sequence": "2 3 5 7 8 9 11 12" + }, + { + "tags": ["scale", "ascending", "bebop"], + "name": "Bebop Locrian", + "sequence": "1 3 5 6 7 8 10 12" + } + ] +} diff --git a/data/definitions/scales-harmonic-major-and-its-modes-definitions.json b/data/definitions/scales-harmonic-major-and-its-modes-definitions.json new file mode 100644 index 0000000..38c4935 --- /dev/null +++ b/data/definitions/scales-harmonic-major-and-its-modes-definitions.json @@ -0,0 +1,39 @@ +{ + "definitions": [ + { + "tags": ["scale", "ascending", "major", "harmonic"], + "name": "Harmonic Major", + "sequence": "2 4 5 7 8 11 12" + }, + { + "tags": ["scale", "ascending", "major", "harmonic"], + "name": "Dorian b5", + "sequence": "2 3 5 6 9 10 12" + }, + { + "tags": ["scale", "ascending", "major", "harmonic"], + "name": "Phrygian b4", + "sequence": "1 3 4 7 8 10 12" + }, + { + "tags": ["scale", "ascending", "major", "harmonic"], + "name": "Lydian b3", + "sequence": "2 3 6 7 9 11 12" + }, + { + "tags": ["scale", "ascending", "major", "harmonic"], + "name": "Mixolydian b9", + "sequence": "1 4 5 7 9 10 12" + }, + { + "tags": ["scale", "ascending", "major", "harmonic"], + "name": "Lydian #2 #5", + "sequence": "3 4 6 8 9 11 12" + }, + { + "tags": ["scale", "ascending", "major", "harmonic"], + "name": "Locrian bb7", + "sequence": "1 3 5 6 8 9 12" + } + ] +} diff --git a/data/definitions/scales-harmonic-minor-and-its-modes-definitions.json b/data/definitions/scales-harmonic-minor-and-its-modes-definitions.json new file mode 100644 index 0000000..e266375 --- /dev/null +++ b/data/definitions/scales-harmonic-minor-and-its-modes-definitions.json @@ -0,0 +1,39 @@ +{ + "definitions": [ + { + "tags": ["scale", "ascending", "minor", "harmonic"], + "name": "Harmonic Minor", + "sequence": "2 3 5 7 8 11 12" + }, + { + "tags": ["scale", "ascending", "minor", "harmonic"], + "name": "Locrian #6", + "sequence": "1 3 5 6 9 10 12" + }, + { + "tags": ["scale", "ascending", "minor", "harmonic"], + "name": "Ionian Augmented", + "sequence": "2 4 5 8 9 11 12" + }, + { + "tags": ["scale", "ascending", "minor", "harmonic"], + "name": "Romanian", + "sequence": "2 3 6 7 9 10 12" + }, + { + "tags": ["scale", "ascending", "minor", "harmonic"], + "name": "Phrygian Dominant", + "sequence": "1 4 5 7 8 10 12" + }, + { + "tags": ["scale", "ascending", "minor", "harmonic"], + "name": "Lydian #2", + "sequence": "3 4 6 7 9 11 12" + }, + { + "tags": ["scale", "ascending", "minor", "harmonic"], + "name": "Ultralocrian", + "sequence": "1 3 4 6 8 9 12" + } + ] +} diff --git a/data/definitions/scales-pentatonic-major-and-its-modes-definitions.json b/data/definitions/scales-pentatonic-major-and-its-modes-definitions.json new file mode 100644 index 0000000..71a03ff --- /dev/null +++ b/data/definitions/scales-pentatonic-major-and-its-modes-definitions.json @@ -0,0 +1,29 @@ +{ + "definitions": [ + { + "tags": ["scale", "ascending", "major", "pentatonic"], + "name": "Major Pentatonic", + "sequence": "2 4 7 9" + }, + { + "tags": ["scale", "ascending", "major", "pentatonic"], + "name": "Suspended Pentatonic", + "sequence": "2 5 7 10" + }, + { + "tags": ["scale", "ascending", "major", "pentatonic"], + "name": "Man Gong", + "sequence": "3 5 8 10" + }, + { + "tags": ["scale", "ascending", "major", "pentatonic"], + "name": "Ritusen", + "sequence": "2 5 7 9" + }, + { + "tags": ["scale", "ascending", "major", "pentatonic"], + "name": "Minor Pentatonic", + "sequence": "3 5 7 10" + } + ] +} diff --git a/data/definitions/scales-simmetric-definitions.json b/data/definitions/scales-simmetric-definitions.json new file mode 100644 index 0000000..f245bec --- /dev/null +++ b/data/definitions/scales-simmetric-definitions.json @@ -0,0 +1,29 @@ +{ + "definitions": [ + { + "tags": ["scale", "ascending", "simmetric"], + "name": "Diminished W-H", + "sequence": "2 3 5 6 8 9 11 12" + }, + { + "tags": ["scale", "ascending", "simmetric"], + "name": "Diminished H-W", + "sequence": "1 3 4 6 7 9 10 12" + }, + { + "tags": ["scale", "ascending", "simmetric"], + "name": "Whole Tone", + "sequence": "2 4 6 8 10 12" + }, + { + "tags": ["scale", "ascending", "simmetric"], + "name": "Augmented", + "sequence": "3 4 7 8 11 12" + }, + { + "tags": ["scale", "ascending", "simmetric"], + "name": "Augmented Inverse", + "sequence": "1 4 5 8 9 12" + } + ] +} diff --git a/data/exercises/CMakeLists.txt b/data/exercises/CMakeLists.txt index f91f7a9..07f2394 100644 --- a/data/exercises/CMakeLists.txt +++ b/data/exercises/CMakeLists.txt @@ -1,10 +1,16 @@ set(minuet_EXERCISES intervals-ascending-melodic-exercises.json intervals-descending-melodic-exercises.json + intervals-harmonic-exercises.json chords-root-position-exercises.json scales-major-and-its-modes-exercises.json + scales-harmonic-minor-and-its-modes-exercises.json + scales-harmonic-major-and-its-modes-exercises.json + scales-pentatonic-major-and-its-modes-exercises.json + scales-simmetric-exercises.json + scales-bebop-exercises.json rhythm-easy.json rhythm-medium.json ) install(FILES ${minuet_EXERCISES} DESTINATION ${KDE_INSTALL_DATADIR}/minuet/exercises) diff --git a/data/exercises/intervals-harmonic-exercises.json b/data/exercises/intervals-harmonic-exercises.json new file mode 100644 index 0000000..6a6a7fa --- /dev/null +++ b/data/exercises/intervals-harmonic-exercises.json @@ -0,0 +1,80 @@ +{ + "exercises": [ + { + "name": "Intervals", + "root": "21..104", + "playMode": "chord", + "userMessage": "Hear the interval and then choose an answer from options below", + "numberOfSelectedOptions": 1, + "_icon": "minuet-intervals.svg", + "children": [ + { + "name": "Harmonic Intervals", + "and-tags": ["interval", "harmonic"], + "children": [ + { + "name": "Seconds", + "or-tags": ["2"] + }, + { + "name": "Thirds", + "or-tags": ["3"] + }, + { + "name": "Fourths and Fifths", + "or-tags": ["4", "5"] + }, + { + "name": "Sixths", + "or-tags": ["6"] + }, + { + "name": "Sevenths", + "or-tags": ["7"] + }, + { + "name": "Ninths", + "or-tags": ["9"] + }, + { + "name": "Tenths", + "or-tags": ["10"] + }, + { + "name": "Tritone and Sevenths", + "or-tags": ["tritone", "7"] + }, + { + "name": "Fourths, Fifths, and Octave", + "or-tags": ["4", "5", "8"] + }, + { + "name": "Seconds and Thirds", + "or-tags": ["2", "3"] + }, + { + "name": "Sixths and Sevenths", + "or-tags": ["6", "7"] + }, + { + "name": "Sevenths and Ninths", + "or-tags": ["7", "9"] + }, + { + "name": "Second to Octave", + "or-tags": ["2", "3", "4", "tritone", "5", "6", "7", "8"] + }, + { + "name": "Second to Tenth", + "or-tags": ["2", "3", "4", "tritone", "5", "6", "7", "8", "9", "10"] + }, + { + "name": "Second to 15th", + "or-tags": ["2", "3", "4", "tritone", "5", "6", "7", "8", "9", "10", "11", "8+tritone", "12", "13", "14", "double8"] + } + ] + } + ] + } + ] +} diff --git a/data/exercises/scales-bebop-exercises.json b/data/exercises/scales-bebop-exercises.json new file mode 100644 index 0000000..a0b9a0a --- /dev/null +++ b/data/exercises/scales-bebop-exercises.json @@ -0,0 +1,18 @@ +{ + "exercises": [ + { + "name": "Scales", + "root": "21..104", + "playMode": "scale", + "userMessage": "Hear the scale and then choose an answer from options below", + "numberOfSelectedOptions": 1, + "_icon": "minuet-scales.svg", + "children": [ + { + "name": "Bebop Scales", + "and-tags": ["scale", "bebop"] + } + ] + } + ] +} diff --git a/data/exercises/scales-harmonic-major-and-its-modes-exercises.json b/data/exercises/scales-harmonic-major-and-its-modes-exercises.json new file mode 100644 index 0000000..2562e55 --- /dev/null +++ b/data/exercises/scales-harmonic-major-and-its-modes-exercises.json @@ -0,0 +1,18 @@ +{ + "exercises": [ + { + "name": "Scales", + "root": "21..104", + "playMode": "scale", + "userMessage": "Hear the scale and then choose an answer from options below", + "numberOfSelectedOptions": 1, + "_icon": "minuet-scales.svg", + "children": [ + { + "name": "Harmonic Major Scale and its Modes", + "and-tags": ["scale", "harmonic", "major"] + } + ] + } + ] +} diff --git a/data/exercises/scales-harmonic-minor-and-its-modes-exercises.json b/data/exercises/scales-harmonic-minor-and-its-modes-exercises.json new file mode 100644 index 0000000..e59837e --- /dev/null +++ b/data/exercises/scales-harmonic-minor-and-its-modes-exercises.json @@ -0,0 +1,18 @@ +{ + "exercises": [ + { + "name": "Scales", + "root": "21..104", + "playMode": "scale", + "userMessage": "Hear the scale and then choose an answer from options below", + "numberOfSelectedOptions": 1, + "_icon": "minuet-scales.svg", + "children": [ + { + "name": "Harmonic Minor Scale and its Modes", + "and-tags": ["scale", "harmonic", "minor"] + } + ] + } + ] +} diff --git a/data/exercises/scales-pentatonic-major-and-its-modes-exercises.json b/data/exercises/scales-pentatonic-major-and-its-modes-exercises.json new file mode 100644 index 0000000..b913b11 --- /dev/null +++ b/data/exercises/scales-pentatonic-major-and-its-modes-exercises.json @@ -0,0 +1,18 @@ +{ + "exercises": [ + { + "name": "Scales", + "root": "21..104", + "playMode": "scale", + "userMessage": "Hear the scale and then choose an answer from options below", + "numberOfSelectedOptions": 1, + "_icon": "minuet-scales.svg", + "children": [ + { + "name": "Pentatonic Major Scale and its Modes", + "and-tags": ["scale", "pentatonic", "major"] + } + ] + } + ] +} diff --git a/data/exercises/scales-simmetric-exercises.json b/data/exercises/scales-simmetric-exercises.json new file mode 100644 index 0000000..6800e77 --- /dev/null +++ b/data/exercises/scales-simmetric-exercises.json @@ -0,0 +1,18 @@ +{ + "exercises": [ + { + "name": "Scales", + "root": "21..104", + "playMode": "scale", + "userMessage": "Hear the scale and then choose an answer from options below", + "numberOfSelectedOptions": 1, + "_icon": "minuet-scales.svg", + "children": [ + { + "name": "Simmetric Scales", + "and-tags": ["scale", "simmetric"] + } + ] + } + ] +}