diff --git a/dist/showdown.js b/dist/showdown.js index 3c135ab..1c91274 100644 Binary files a/dist/showdown.js and b/dist/showdown.js differ diff --git a/dist/showdown.js.map b/dist/showdown.js.map index a8fa071..9e580f6 100644 Binary files a/dist/showdown.js.map and b/dist/showdown.js.map differ diff --git a/dist/showdown.min.js b/dist/showdown.min.js index 2534711..9179caf 100644 Binary files a/dist/showdown.min.js and b/dist/showdown.min.js differ diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map index a7aa507..b44f8ae 100644 Binary files a/dist/showdown.min.js.map and b/dist/showdown.min.js.map differ diff --git a/src/subParsers/tables.js b/src/subParsers/tables.js index 567823c..97a2eda 100644 --- a/src/subParsers/tables.js +++ b/src/subParsers/tables.js @@ -5,9 +5,9 @@ showdown.subParser('tables', function (text, options, globals) { return text; } - var tableRgx = /^ {0,3}\|?.+\|.+\n {0,3}\|?[ \t]*:?[ \t]*(?:[-=]){2,}[ \t]*:?[ \t]*\|[ \t]*:?[ \t]*(?:[-=]){2,}[\s\S]+?(?:\n\n|¨0)/gm, + var tableRgx = /^ {0,3}\|?.+\|.+\n {0,3}\|?[ \t]*:?[ \t]*(?:[-=]){2,}[ \t]*:?[ \t]*\|[ \t]*:?[ \t]*(?:[-=]){2,}[\s\S]+?(?:\n\n| + + + Tables + + + + + col 3 is + + + col 2 is + + + zebra stripes + + + +
    +
  1. test
  2. +
diff --git a/test/features/tables/#443.2.table-followed-by-list-does-not-parse-correctly.md b/test/features/tables/#443.2.table-followed-by-list-does-not-parse-correctly.md new file mode 100644 index 0000000..2393809 --- /dev/null +++ b/test/features/tables/#443.2.table-followed-by-list-does-not-parse-correctly.md @@ -0,0 +1,7 @@ +| Tables | +| ------------- | +| **col 3 is** | +| col 2 is | +| zebra stripes | + +1. test \ No newline at end of file diff --git a/test/features/tables/#443.table-followed-by-list-does-not-parse-correctly.html b/test/features/tables/#443.table-followed-by-list-does-not-parse-correctly.html new file mode 100644 index 0000000..4c46b80 --- /dev/null +++ b/test/features/tables/#443.table-followed-by-list-does-not-parse-correctly.html @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
TablesAreCool
col 3 isright-aligned$1600
col 2 iscentered$12
zebra stripesare neat$1
+
    +
  1. test
  2. +
diff --git a/test/features/tables/#443.table-followed-by-list-does-not-parse-correctly.md b/test/features/tables/#443.table-followed-by-list-does-not-parse-correctly.md new file mode 100644 index 0000000..8cdfb69 --- /dev/null +++ b/test/features/tables/#443.table-followed-by-list-does-not-parse-correctly.md @@ -0,0 +1,7 @@ +| Tables | Are | Cool | +| ------------- |:-------------:| -----:| +| **col 3 is** | right-aligned | $1600 | +| col 2 is | *centered* | $12 | +| zebra stripes | are neat | $1 | + +1. test