adding instrumental, increasing newlines for exporter

Signed-off-by: RJ Garcia <rj@bighead.net>

src/exporter/song.js

@@ -55,7 +55,7 @@ TextExporter.prototype = (function(proto)
         var self = this;
         return _.map(song.parts, function(part)
         {
-            return sprintf('# %s\n%s', part.title, exportLines(self, part.lines));
+            return sprintf('# %s\n%s\n', part.title, exportLines(self, part.lines));
         }).join('\n');
     }
 

src/lexer.js

@@ -11,11 +11,12 @@ var LexerPrototype = {
 
 var LexStates = Util.defineEnum(['NORMAL', 'LINE']);
 var TokenTypes = Util.defineEnum([
-    'TITLE', 'KEY', 'FLOW', 'COLON', 'STRING', 'SEPARATOR', 'CHORD', 'LPAREN', 'RPAREN', 'ARROW', 'MULTIPLIER', 'CHORD_DEF_SEPARATOR', 'CHORD_DEF', 'HASH', 'LINE', 'WHITESPACE', 'INTRO', 'VERSE', 'PRE_CHORUS', 'CHORUS', 'BRIDGE', 'OUTRO', 'INT', 'NEWLINE', 'NULL',
+    'TITLE', 'KEY', 'FLOW', 'COLON', 'STRING', 'SEPARATOR', 'CHORD', 'LPAREN', 'RPAREN', 'ARROW', 'MULTIPLIER', 'CHORD_DEF_SEPARATOR', 'CHORD_DEF', 'HASH', 'LINE', 'WHITESPACE', 'INTRO', 'VERSE', 'PRE_CHORUS', 'CHORUS', 'BRIDGE', 'OUTRO', 'INSTRUMENTAL', 'INT', 'NEWLINE', 'NULL',
 ]);
 var TitleKeyWordTokenTypes = [
     TokenTypes.INTRO, TokenTypes.VERSE, TokenTypes.PRE_CHORUS,
     TokenTypes.CHORUS, TokenTypes.BRIDGE, TokenTypes.OUTRO,
+    TokenTypes.INSTRUMENTAL,
 ];
 
 function tokenTypeToString(type)
@@ -69,6 +70,8 @@ function tokenTypeToString(type)
             return 'BRIDGE';
         case TokenTypes.OUTRO:
             return 'OUTRO';
+        case TokenTypes.INSTRUMENTAL:
+            return 'INSTRUMENTAL';
         case TokenTypes.INT:
             return 'INT';
         case TokenTypes.NULL:
@@ -103,7 +106,7 @@ Lexer.prototype = (function(proto)
             '(' +
                 'm[769]?|' +
                 'maj[79]?|' +
-                'sus[24]|' +
+                'sus[24]?|' +
                 '7(sus4|[#b][59])?|' +
                 '6(\/9)?|' +
                 '9(b5)?|' +
@@ -135,6 +138,7 @@ Lexer.prototype = (function(proto)
         new TokRegExp(/^Chorus/, 'chorus'),
         new TokRegExp(/^Bridge/, 'bridge'),
         new TokRegExp(/^Outro/, 'outro'),
+        new TokRegExp(/^Instrumental/, 'instrumental'),
         new TokRegExp(/^title/, 'title'),
         new TokRegExp(/^key/, 'key'),
         new TokRegExp(/^flow/, 'flow'),
@@ -172,6 +176,7 @@ Lexer.prototype = (function(proto)
             case 'chorus':     return new Token(TokenTypes.CHORUS);
             case 'bridge':     return new Token(TokenTypes.BRIDGE);
             case 'outro':      return new Token(TokenTypes.OUTRO);
+            case 'instrumental': return new Token(TokenTypes.INSTRUMENTAL);
             case 'title':      return new Token(TokenTypes.TITLE);
             case 'key':        return new Token(TokenTypes.KEY);
             case 'flow':       return new Token(TokenTypes.FLOW);