X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=music%2Fchords.g4;h=182461760d11f9e836740f2d5ec55a1567ce0a23;hb=e46158e49121b8a955bb07b73f5bcf9928b79c90;hp=bd180a96a2586c96aae3a53bbc027fb8473b82a7;hpb=068d71327bf6ec8618cd70a6d3fce5d075503cae;p=python_utils.git

diff --git a/music/chords.g4 b/music/chords.g4
index bd180a9..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
@@ -50,10 +51,12 @@ augmentedExpr: AUGMENTED;
 powerChordExpr: '5';
 
 addNotesExpr
-    : SIX
-    | SEVEN
+    : ADD* SIX
+    | ADD* SEVEN
     | MAJ_SEVEN
-    | ADD_NINE
+    | MIN_SEVEN
+    | ADD* NINE
+    | ADD* ELEVEN
     ;
 
 extensionExpr
@@ -108,19 +111,25 @@ MINOR: ('m'|'min'|'minor');
 
 SUS: ('sus'|'suspended');
 
-DIMINISHED: ('dim'|'diminished');
+DIMINISHED: ('dim'|'diminished'|'-');
 
-AUGMENTED: ('aug'|'augmented');
+AUGMENTED: ('aug'|'augmented'|'+');
 
 SLASH: ('/'|'\\');
 
+ADD: ('add'|'Add'|'dom');
+
 SIX: '6';
 
 SEVEN: '7';
 
+NINE: '9';
+
+ELEVEN: '11';
+
 MAJ_SEVEN: MAJOR '7';
 
-ADD_NINE: ('add'|'Add')* '9';
+MIN_SEVEN: MINOR '7';
 
 INTERVAL: (MAJOR|MINOR)* ('b'|'#')* DIGITS ;