X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=music%2Fchords.g4;h=182461760d11f9e836740f2d5ec55a1567ce0a23;hb=e46158e49121b8a955bb07b73f5bcf9928b79c90;hp=9083e7530a6ff1d5bc9b4c1f2a3c200b7f35af39;hpb=290e40e0bf150ab889ada06e500a5835d3935da6;p=python_utils.git diff --git a/music/chords.g4 b/music/chords.g4 index 9083e75..1824617 100644 --- a/music/chords.g4 +++ b/music/chords.g4 @@ -17,7 +17,8 @@ grammar chords; parse - : rootNote majMinSusPowerExpr* addNotesExpr* extensionExpr* overBassNoteExpr* + : rootNote majMinSusPowerExpr* addNotesExpr* overBassNoteExpr* + | rootNote majMinSusPowerExpr* addNotesExpr extensionExpr* overBassNoteExpr ; rootNote @@ -53,6 +54,7 @@ addNotesExpr : ADD* SIX | ADD* SEVEN | MAJ_SEVEN + | MIN_SEVEN | ADD* NINE | ADD* ELEVEN ; @@ -127,6 +129,8 @@ ELEVEN: '11'; MAJ_SEVEN: MAJOR '7'; +MIN_SEVEN: MINOR '7'; + INTERVAL: (MAJOR|MINOR)* ('b'|'#')* DIGITS ; DIGITS: [1-9]+ ;