From 5ec75c459b4e05fc5a24a0bc0b6d11f3d64903c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Estev=C3=A3o=20Soares=20dos=20Santos?=
 <estevao.santos@gmail.com>
Date: Sat, 11 Jul 2015 19:50:26 +0100
Subject: [PATCH] fix(subparsers/tables.js): fix parser order so that tables
 include all spanGamut elements

---
 dist/showdown.js                             | Bin 60912 -> 60957 bytes
 dist/showdown.js.map                         | Bin 191960 -> 192080 bytes
 dist/showdown.min.js                         | Bin 20653 -> 20675 bytes
 dist/showdown.min.js.map                     | Bin 23564 -> 23606 bytes
 src/converter.js                             |   1 -
 src/subParsers/blockGamut.js                 |   1 +
 test/features/tables/with-span-elements.html |  26 +++++++++++++++++++
 test/features/tables/with-span-elements.md   |   9 +++++++
 8 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 test/features/tables/with-span-elements.html
 create mode 100644 test/features/tables/with-span-elements.md

diff --git a/dist/showdown.js b/dist/showdown.js
index 6731a4362e3438c860959228c6efac950ff5d97d..a3a24da2e7c2c577ecdd516e5da62a9cd0139dac 100644
GIT binary patch
delta 36
ucmV+<0NelY+XJ241F-ofvkNEeE(CO8Vr-LvRvweC&mEI2v<S2RRq>ZVfDwNH

delta 28
kcmbPxhxx;8<_$m9I7$+ea#D-cbvD0O`=+;9CG6*P0LDWNnE(I)

diff --git a/dist/showdown.js.map b/dist/showdown.js.map
index d180338e260db5cedcbfbae31c85226449d79e2c..2e2415417711eb983f2b17734cad68e55e01b233 100644
GIT binary patch
delta 82
zcmV-Y0ImPn+Y8X#3$QU$vrAKyF#&9|;DiGvmzb*oWtZFm0SdG2st5#^4X^<imre%(
olY^kIx1g^9xns9%69Shq1ax6yY?qHl0w0&0%>o^_14aVXr=NErHUIzs

delta 120
zcmV-;0Ehq3+zZ&-3$QU$lP4Yx0cx`)Q=l;eZdFE?v0ecwm#`uM3X^ay3X{-L1d~rN
z2A9x}0Sc2q$PSl)$^j6Qkf9EfAQS|%NriwVvo5O=1OYXJL9e$#uK{CZ2y|g$Y-MvN
aEVr2x0-`dPjIRO+mqbPaH@CV*0+y$2Mk}QN

diff --git a/dist/showdown.min.js b/dist/showdown.min.js
index 4e22f0d533a7bcb7feb224d06a288e09f892cf21..230391ba6185b7bd94f03f57924acf1bce59247f 100644
GIT binary patch
delta 29
lcmZ3xkn!+B#tnCcH$M|L<z_8OOv*`}tmrJYSz3OQApp4n3l9JQ

delta 28
kcmX@Ska6uo#tnCcIZ6_fa#D+xbT;1+HsjuGC_l*%0IJst&j0`b

diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map
index 91cb364c5c3aefd8d432526ecbdfc51af9548552..13fc3d5a220d23d794200a8f68997fb14339da39 100644
GIT binary patch
delta 57
zcmeC#!MJS)<Aw-vMx)J<;!{`{OD4aQR@y8obBl{3)5+XL$KNqya=nK5WCL|&Aa<V|
M?5nrATz#qu06Pj382|tP

delta 57
zcmV-90LK5exB-l~0kBvX0W`B&7nB46c9ZTKA_P-GLqW3-9NP*DXF@kbEKfmZL2yEo
PpDr1b4<}@^p(m9zFnALN

diff --git a/src/converter.js b/src/converter.js
index 3033510..32e8db4 100644
--- a/src/converter.js
+++ b/src/converter.js
@@ -44,7 +44,6 @@ showdown.Converter = function (converterOptions) {
        * @type {string[]}
        */
       parserOrder = [
-        'tables',
         'githubCodeBlocks',
         'hashHTMLBlocks',
         'stripLinkDefinitions',
diff --git a/src/subParsers/blockGamut.js b/src/subParsers/blockGamut.js
index 574399d..e2c24a6 100644
--- a/src/subParsers/blockGamut.js
+++ b/src/subParsers/blockGamut.js
@@ -13,6 +13,7 @@ showdown.subParser('blockGamut', function (text, options, globals) {
   text = text.replace(/^[ ]{0,2}([ ]?\-[ ]?){3,}[ \t]*$/gm, key);
   text = text.replace(/^[ ]{0,2}([ ]?_[ ]?){3,}[ \t]*$/gm, key);
 
+  text = showdown.subParser('tables')(text, options, globals);
   text = showdown.subParser('lists')(text, options, globals);
   text = showdown.subParser('codeBlocks')(text, options, globals);
   text = showdown.subParser('blockQuotes')(text, options, globals);
diff --git a/test/features/tables/with-span-elements.html b/test/features/tables/with-span-elements.html
new file mode 100644
index 0000000..1b4a4d1
--- /dev/null
+++ b/test/features/tables/with-span-elements.html
@@ -0,0 +1,26 @@
+<table>
+    <thead>
+    <tr>
+        <th>First Header</th>
+        <th>Second Header</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td><strong>bold</strong></td>
+        <td><img src="foo.jpg" alt="img" /></td>
+    </tr>
+    <tr>
+        <td><em>italic</em></td>
+        <td><a href="bla.html">link</a></td>
+    </tr>
+    <tr>
+        <td><code>some code</code></td>
+        <td><a href="www.google.com">google</a></td>
+    </tr>
+    <tr>
+        <td><a href="www.foo.com">www.foo.com</a></td>
+        <td>normal</td>
+    </tr>
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/test/features/tables/with-span-elements.md b/test/features/tables/with-span-elements.md
new file mode 100644
index 0000000..6a918e6
--- /dev/null
+++ b/test/features/tables/with-span-elements.md
@@ -0,0 +1,9 @@
+| First Header  | Second Header     |
+| ------------- | ----------------- |
+| **bold**      | ![img](foo.jpg)   |
+| _italic_      | [link](bla.html)  |
+| `some code`   | [google][1]       |
+| <www.foo.com> | normal            |
+
+
+  [1]: www.google.com