Add support for multline

.jshintignore

@@ -1 +1,3 @@
 node_modules
+lib/parser.js
+

lib/ast.js

@@ -163,6 +163,7 @@ var Tex = module.exports.Tex = new Enum( 'Tex', {
     FUN2sq:  { args: [ 'string', 'self', 'self' ] },
     FUN3:    { args: [ 'string', 'self', 'self', 'self'] },
     MATRIX:  { args: [ 'string', [ [ [ 'self' ] ] ] ] },
+    MULTLINE:  { args: [ 'string', [ [ [ 'self' ] ] ] ] },
     DECLh:   { args: [ 'string', FontForce, [ 'self' ] ] },
     JACOBI:  { args: [ 'self', 'self', 'self', 'self']},
     LAGUERRE1: { args:['self', 'self']},

lib/astutil.js

@@ -65,6 +65,18 @@ ast.RenderT.prototype.tex_contains_func = function(target) {
     return t.charAt(0) === '\\' && match(target, t);
 };
 
+var matrixFunction = function(target, t, m) {
+    // \begin{env} .. & .. \\ .. & .. \\ .. & .. \end{env}
+    // t is the environment name.
+    // m is a doubly-nested array
+    var expr_has = function(e) { return arr_contains_func(e, target); };
+    var line_has = function(l) { return some(l, expr_has); };
+    var matrix_has = function(m) { return some(m, line_has); };
+    return match(target, '\\begin{'+t+'}') ||
+        match(target, '\\end{'+t+'}') ||
+        matrix_has(m);
+};
+
 // This defines a function of one argument, which becomes the first argument
 // in the visitor functions.  The subsequent arguments in the definition
 // are the fields of that particular AST class.
@@ -185,17 +197,8 @@ ast.Tex.defineVisitor("contains_func", {
         // \big\d where big is \big, \Big, \bigg, \Bigg, \biggl, etc
         return match(target, big) || d.tex_contains_func(target);
     },
-    MATRIX: function(target, t, m) {
-        // \begin{env} .. & .. \\ .. & .. \\ .. & .. \end{env}
-        // t is the environment name.
-        // m is a doubly-nested array
-        var expr_has = function(e) { return arr_contains_func(e, target); };
-        var line_has = function(l) { return some(l, expr_has); };
-        var matrix_has = function(m) { return some(m, line_has); };
-        return match(target, '\\begin{'+t+'}') ||
-            match(target, '\\end{'+t+'}') ||
-            matrix_has(m);
-    },
+    MATRIX: matrixFunction,
+    MULTLINE: matrixFunction,
     LR: function(target, l, r, tl) {
         // \left\l tl1 tl2 tl3 ... \right\r  (a balanced pair of delimiters)
         return match(target, '\\left') || match(target, '\\right') ||

lib/build-parser.js

@@ -8,20 +8,13 @@ var buildParser = module.exports = function(inFile, outFile) {
     var PEG = require('pegjs');
     var fs = require('fs');
 
-    var parserSource = PEG.buildParser(fs.readFileSync(inFile, 'utf8'), {
+    var parserSource = PEG.generate(fs.readFileSync(inFile, 'utf8'), {
         /* PEGJS options */
         output: "source",
         cache: true,// makes repeated calls to generic_func production efficient
-        allowedStartTules: [ "start" ]
+        allowedStartRules: [ "start" ]
     });
-    // hack up the source to make it pass jshint
-    parserSource = parserSource
-        .replace(/(peg\$subclass\(child, parent\)|peg\$SyntaxError\(message, expected, found, location\)|peg\$parse\(input\)) {/g,
-        function (m) {
-            return m + "\n    /*jshint validthis:true, newcap:false*/ ";
-        }).replace(/\n(\s+)([?:+]) (expectedDescs|" or "|peg)/g, ' $2\n$1$3');
     parserSource =
-        '/* jshint latedef: false */\n' +
         'module.exports = ' + parserSource + ';';
 
     fs.writeFileSync(outFile, parserSource, 'utf8');