Add powerset to list_utils; improve chord parser.

1 files changed, 12 insertions, 7 deletions

diff --git a/music/chords.g4 b/music/chords.g4
index bd180a9..9083e75 100644
--- a/music/chords.g4
+++ b/music/chords.g4
@@ -50,10 +50,11 @@ augmentedExpr: AUGMENTED;
 powerChordExpr: '5';
 
 addNotesExpr
-    : SIX
-    | SEVEN
+    : ADD* SIX
+    | ADD* SEVEN
     | MAJ_SEVEN
-    | ADD_NINE
+    | ADD* NINE
+    | ADD* ELEVEN
     ;
 
 extensionExpr
@@ -108,19 +109,23 @@ 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';
 
-MAJ_SEVEN: MAJOR '7';
+NINE: '9';
 
-ADD_NINE: ('add'|'Add')* '9';
+ELEVEN: '11';
+
+MAJ_SEVEN: MAJOR '7';
 
 INTERVAL: (MAJOR|MINOR)* ('b'|'#')* DIGITS ;