From afa14d61fa0f2a93da3beb580052d84ac9ba16ea Mon Sep 17 00:00:00 2001 From: Tony Brix Date: Mon, 11 Mar 2019 09:06:55 -0500 Subject: [PATCH 1/2] add test --- test/new/list_table.html | 44 ++++++++++++++++++++++++++++++++++++++++ test/new/list_table.md | 13 ++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 test/new/list_table.html create mode 100644 test/new/list_table.md diff --git a/test/new/list_table.html b/test/new/list_table.html new file mode 100644 index 0000000000..3a8b6388b7 --- /dev/null +++ b/test/new/list_table.html @@ -0,0 +1,44 @@ + diff --git a/test/new/list_table.md b/test/new/list_table.md new file mode 100644 index 0000000000..95541b1101 --- /dev/null +++ b/test/new/list_table.md @@ -0,0 +1,13 @@ +* Table in list: + + | column1 | column2 | + |---------|---------| + | value1 | value2 | + | value3 | value4 | + +* No leading pipe table in list: + + column1 | column2 + --------|-------- + value1 | value2 + value3 | value4 From 6c22ae4e9e6d0b9fb7fe16e78ba208c5888f7f0d Mon Sep 17 00:00:00 2001 From: Tony Brix Date: Mon, 11 Mar 2019 09:07:25 -0500 Subject: [PATCH 2/2] tables don't have to be top level --- lib/marked.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/marked.js b/lib/marked.js index f34e2df0bc..51faeffb7b 100644 --- a/lib/marked.js +++ b/lib/marked.js @@ -249,7 +249,7 @@ Lexer.prototype.token = function(src, top) { } // table no leading pipe (gfm) - if (top && (cap = this.rules.nptable.exec(src))) { + if (cap = this.rules.nptable.exec(src)) { item = { type: 'table', header: splitCells(cap[1].replace(/^ *| *\| *$/g, '')), @@ -447,7 +447,7 @@ Lexer.prototype.token = function(src, top) { } // table (gfm) - if (top && (cap = this.rules.table.exec(src))) { + if (cap = this.rules.table.exec(src)) { item = { type: 'table', header: splitCells(cap[1].replace(/^ *| *\| *$/g, '')),