Merge pull request #1446 from UziTech/list-table

Fix tables in a list
markedjs · Mar 12, 2019 · e540b6a · e540b6a
2 parents f8679c9 + 6c22ae4
commit e540b6a
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 2 deletions.
diff --git 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, '')),

diff --git a/test/new/list_table.html b/test/new/list_table.html
@@ -0,0 +1,44 @@
+<ul>
+	<li>
+		<p>Table in list:</p>
+		<table>
+			<thead>
+				<tr>
+					<th>column1</th>
+					<th>column2</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td>value1</td>
+					<td>value2</td>
+				</tr>
+				<tr>
+					<td>value3</td>
+					<td>value4</td>
+				</tr>
+			</tbody>
+		</table>
+	</li>
+	<li>
+		<p>No leading pipe table in list:</p>
+		<table>
+			<thead>
+				<tr>
+					<th>column1</th>
+					<th>column2</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td>value1</td>
+					<td>value2</td>
+				</tr>
+				<tr>
+					<td>value3</td>
+					<td>value4</td>
+				</tr>
+			</tbody>
+		</table>
+	</li>
+</ul>
diff --git a/test/new/list_table.md 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