Add support for multline

.jshintignore

@@ -1 +1,2 @@
 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

@@ -196,6 +196,17 @@ ast.Tex.defineVisitor("contains_func", {
             match(target, '\\end{'+t+'}') ||
             matrix_has(m);
     },
+    MULTLINE: function(target, t, m) {
+        // \begin{env} .. \\ .. \\ .. \\ .. \end{env}
+        // t is the environment name.
+        // m is a one-dimensional array.
+        var expr_has = function(e) { return arr_contains_func(e, target); };
+        var line_has = function(l) { return some(l, expr_has); };
+        var lines_have = function(m) { return some(m, line_has); };
+        return match(target, '\\begin{'+t+'}') ||
+            match(target, '\\end{'+t+'}') ||
+            lines_have(m);
+    },
     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,20 @@ 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" ]
     });
     // 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 = 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' +
+//        '/* jshint latedef: false */\n' +
         'module.exports = ' + parserSource + ';';
 
     fs.writeFileSync(outFile, parserSource, 'utf8');

lib/parser.pegjs

@@ -218,6 +218,10 @@ lit
     { return ast.Tex.MATRIX("smallmatrix", lst2arr(m)); }
   / BEGIN_CASES    m:matrix END_CASES
     { return ast.Tex.MATRIX("cases", lst2arr(m)); }
+  / BEGIN_MULTLINE  m:multline END_MULTLINE
+    { return ast.Tex.MULTLINE("multline", lst2arr(m)); }
+  / BEGIN_MULTLINE_STAR  m:multline END_MULTLINE_STAR
+    { return ast.Tex.MULTLINE("multline*", lst2arr(m)); }
   / "\\begin{" alpha+ "}" /* better error messages for unknown environments */
     { throw new peg$SyntaxError("Illegal TeX function", [], text(), location()); }
   / f:generic_func &{ return !tu.all_functions[f]; }
@@ -294,6 +298,10 @@ litstuff = //basically lit without DELIMITER or LITERAL as an option (replaced b
     { return ast.Tex.MATRIX("smallmatrix", lst2arr(m)); }
   / BEGIN_CASES    m:matrix END_CASES
     { return ast.Tex.MATRIX("cases", lst2arr(m)); }
+  / BEGIN_MULTLINE  m:multline END_MULTLINE
+    { return ast.Tex.MULTLINE("multline", lst2arr(m)); }
+  / BEGIN_MULTLINE_STAR  m:multline END_MULTLINE_STAR
+    { return ast.Tex.MULTLINE("multline*", lst2arr(m)); }
   / "\\begin{" alpha+ "}" /* better error messages for unknown environments */
     { throw new peg$SyntaxError("Illegal TeX function", [], text(), location()); }
   / f:generic_func &{ return !tu.all_functions[f]; }
@@ -348,6 +356,15 @@ line
   = e:expr tail:( NEXT_CELL l:line { return l; } )?
     { return { head: e.toArray(), tail: tail }; }
 
+multline
+  = l:mline_start tail:( NEXT_ROW m:multline { return m; } )?
+    { return { head: lst2arr(l), tail: tail }; }
+mline_start
+  = f:HLINE m:mline_start
+    { m.head.unshift(ast.Tex.LITERAL(ast.RenderT.TEX_ONLY(f + " "))); return m; }
+  / e:expr
+    { return { head: e.toArray(), tail: null }; }
+
 column_spec
   = CURLY_OPEN cs:(one_col+ { return text(); }) CURLY_CLOSE
     { return ast.Tex.CURLY([ast.Tex.LITERAL(ast.RenderT.TEX_ONLY(cs))]); }
@@ -543,6 +560,14 @@ BEGIN_CASES
  = BEGIN "{cases}" _
 END_CASES
  = END "{cases}" _
+BEGIN_MULTLINE
+ = BEGIN "{multline}" _
+END_MULTLINE
+ = END "{multline}" _
+BEGIN_MULTLINE_STAR
+ = BEGIN "{multline*}" _
+END_MULTLINE_STAR
+ = END "{multline*}" _
 
 SQ_CLOSE
  =  "]" _

lib/render.js

@@ -125,6 +125,10 @@ ast.Tex.defineVisitor("render_tex", {
         var render_matrix = function(m) { return m.map(render_line).join('\\\\'); };
         return curlies("\\begin{"+t+"}" + render_matrix(m) + "\\end{"+t+"}");
     },
+    MULTLINE: function(t, m) {
+        var render_lines = function(l) { return l.map(render).join('\\\\'); };
+        return "\\begin{"+t+"}" + render_lines(m) + "\\end{"+t+"}";
+    },
     LR: function(l, r, tl) {
         return "\\left" + l.tex_part() + render(tl) + "\\right" + r.tex_part();
     }

lib/texutil.js

@@ -700,6 +700,8 @@ module.exports.ams_required = arr2set([
     "\\begin{alignedat}",
     "\\begin{smallmatrix}",
     "\\begin{cases}",
+    "\\begin{multline}",
+    "\\begin{multline*}",
 
     "\\ulcorner",
     "\\urcorner",

package.json

@@ -26,7 +26,7 @@
     "devDependencies": {
         "jshint": "~2.9.1",
         "mocha": "~3.0.2",
-        "pegjs": "~0.9.0",
+        "pegjs": "~0.10.0",
         "balanced-match": "~0.4.2"
     },
     "bin": {