From 9cfe8b141259de9c0c7086155fed654140448ddf Mon Sep 17 00:00:00 2001
From: Estevao Soares dos Santos <estevao.santos@gmail.com>
Date: Wed, 9 Nov 2016 02:54:18 +0000
Subject: [PATCH] fix(lists): fix sublists inconsistent behavior

Nested ul and ol lists behave inconsistently in the requirement
of having 3 spaces to be considered a nested list.
This fix changes the requirement to only one space in
both cases.

Closes #299
---
 dist/showdown.js                              | Bin 69923 -> 69838 bytes
 dist/showdown.js.map                          | Bin 207117 -> 206786 bytes
 dist/showdown.min.js                          | Bin 28289 -> 28236 bytes
 dist/showdown.min.js.map                      | Bin 31989 -> 31918 bytes
 src/subParsers/lists.js                       |  10 +++------
 ...-unordered-list-inconsistent-behavior.html |  20 ++++++++++++++++++
 ...ed-unordered-list-inconsistent-behavior.md |  12 +++++++++++
 7 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 test/issues/#299.nested-ordered-unordered-list-inconsistent-behavior.html
 create mode 100644 test/issues/#299.nested-ordered-unordered-list-inconsistent-behavior.md

diff --git a/dist/showdown.js b/dist/showdown.js
index 01d9975c658dba08540576138754fd10781daac2..81bc73cbeb21495acf5761307c5c0bae167f4218 100644
GIT binary patch
delta 91
zcmZ3yh~?Zu76EI0Ek%XmjQsMH{PH{n1Ivv9JMT04Pd;_uPCh0@J4P>BA*Li&KRs8$
qN<lv^T1#6u7ACUU<H1>`$!!PuH^)Cd%*>{vkd~NJyjk%%lNJEh`5_+w

delta 115
zcmX@NkY({A76EI0Ek%XmjQsMH{PH{n1EY-sJMS}wPCj+tZt{nR+M+sK3SdxNn&gvN
zTvDuHs}LQ#S^dFTrpd~a#1vq{dO4|i=_MJ~3fkJ4nhMoiP+hf?8xM+XW`2B_dGpz4
Gj9LI(@hJuX

diff --git a/dist/showdown.js.map b/dist/showdown.js.map
index 87da1fedd44ead7922dfacd290c24a8715086b63..dae8a338fce83638c996da4fbd09961c24c51ce8 100644
GIT binary patch
delta 232
zcmeCZ#B=C8Ps0|*XKN-uu#%hnz?60Rh3|~QlLIsaCMU45!UQ<ktQ{Sl&0QyNoG&{0
zKq%+r4?-;4kFRCSW1YTe2BYlc3sYGpE7-Gd|F@ZO4g2H<JFdwI=UFEwm~${1PM6!s
zD7F3UZbo@VCQGmB6VEeBPj@h7<eK~;fopQZG?B?0in*q5&}8JAeqcJI$m9thSlVOv
zGH#FE%M@n8=s$hSS0;Pqn3xppm>9iig_xL<SpD=|1uF&pxM(eH-B`HLc8hOJubHN+
bU1Jj1Uig#g12dbBLRw-@@%DtjOl!3PgojvA

delta 344
zcmX?fo~QQ`Ps0|*XKSW^$YGS5{J@lJ@`hrr$rmPb0okn66I2;lrz@m0vP@rai;)|m
zMnD57_Xt&<gQ?1Gdg69QsmT{SIG75YrZ0R8VQ)`g%b3SH`O<N@$pxY2(**(<MJ7+M
z=AZt+nUQZ28w-1ui?ySpv*YB23X+rWx(iGWNavW|@Sag{`kp*SkQIE>9quv$g>|{6
ze^|$8GTmMt=%73`M*iv1>luT$U)jufm2Gm}S`Nm%?FV-;S~4={czaAg7{jPC`9lKN
z<c4V?An#1ypvlNJ{lIjP-5*%mv-dD=&)&lnX2BRb{m>UC`{{qaG3krx#N;V}L2+r4
zPiApRv4X8abnJGOuS~C*razEo7L$ZY=;fs5rI%z_D`;zHYARI6<V`;r$|S#C{s+?s
M=IvsCnAT_m05?s5AOHXW

diff --git a/dist/showdown.min.js b/dist/showdown.min.js
index 8da6161c8007b5560a6ad57286f6afd0efd82fc4..9dcaa3cd7b45fafc674dba828133c9efa0d64be5 100644
GIT binary patch
delta 230
zcmZp?%XsDvBfq|uqC#;-etAlMd7grS<wpJ|5%n=C+A(_33Na<I`suk=`f<@(+PbkY
zzD}C0l9F{%YDsBPp01&yt!<)SacW{wa)w5VroCcXX<l+kW`3SRx<;aAby;GOLI$z|
zYp{+CdyO=0Tcwyh8zt=|Z6&*yJSFW^4WKzWnaQad2245`lba(G1c63Cg)%fXHLcRL
zCp$!`u+;($wn_srnRL=7=Lbqnj*ns6+#5BYkxfU@P_tHZvZ9mt<ZKJc&G9ixLI6zU
BM|}VQ

delta 250
zcmX?ehq3W4Bfq|uqC#;-etAlMd7grS(MJ9!5tCO%YNe;yM#t);+bStpXQpZB8Y<e_
zCh8TZCKe@UXryRrRx75J<|UV8=I1G7Y9wk_mn9Y{q#>)Y25U*P*GSj4Rf@^8QPNJ*
zR<eu9Q_@b=02-8&nVhO&pp&LKSusj@az~_(AkY}7aGIv3rd7K3Wd0}>jas1L)@k`g
z8XyZYYz?e4Y|`{{QuESFGOV?=Gc>JhQ*(+_71BY9xvYy)OG=CK6w+%a3&zNA4vm`6
Z$gEilw8BYza<+x!WdA6(%?2?tLI6^OPOks}

diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map
index e891a15c6fec9a2e0dab7d36511c53a9936984ae..2e90ab4f587ef244e5d8a04b5bc8a9163e8e30ba 100644
GIT binary patch
delta 2242
zcma)7OK%%h6jo3LkpgXbrHb0Lp#?;h+c*z9wj~sC@14nbJQ+_W6W4K&C~gwlvByqq
zkH?Qh3QLxVE3pEJZn{K>ELb8W*sy?2*Ja5sU{O|_bH)jcgb<r??s<OaJCFSNZ0wt7
zW8dDHIGvlA*}hc~oYw_|9~o-C&UDT__;ke<b9h^**51@rlgnM^a-NsW;M@(=qrIPA
zB2)O=FXzV%u4if>P=A%<6E-&%Rw>ewTB*cmE2gi98hJ948yoQ9W;~06B3oSL2cjw<
zmoLn=`l>SX%A$=R3e1CqL-kAL;XMNdMb<I6+)iZi;c)y~F^RC;iyp=5M=wL{JhQn~
z(}r2~Xmj%PN!1&hkK2SINg=FM7A&~U3S2gYWEPjaNg8`U`UzE`mK^UzkG}e%_SX0y
zA}CZp)XL-Yr13&^uRb;2h#o_gtMm6#65*9J{CW#H$SMO7$6u&R=lTX|3JdD{`t){O
zCsck8NZ?L`tjiR@J&a_n95@*@(L@%tBEr63!4NXPMBKP0D*{6U1N25hWH3iQmQ!>7
zt#=#i7~VRxz)fG$x|G@tOjZJfBV|le9slhsv&4LfxGltN_1M4te%wT6LP@PJVEpnb
zgddf~twqFULkDf1<y8xFIkOQLiPKAs*Tx?7sBSBbhTOEFO1S|t0K60ASf0z8=#Y+_
zO^`uPok(ON=s*M(`d(~0k;2XNX}76e8czwdDEjKhwtKmO2n~zsDEVrp^ZVHT=fSnz
zb{1;kRtslOmRTHTUS};>fR?zRN(i=0x(?_%7j;R&QiAIoLYP~K)FWm}?WkiNbrjr~
z3rXe?0A~j)-tI?@s++WG_o)jOEmf#~4z^BO*fefM-N6;H1B&PYLq?M3+#5tqAh}IN
z^aT=b5_9>qgCV?*1Q!^8>~EJkY9E@UDZ*DKHJURVBKLrjx{ywN+0C3J98l@ogn>Mq
z$~rn`tLunp2kVguG3#Jbo5sLRVp0?OZ}C+=(ja@f79%(m#~>!m6iIAw!QG}b29q!V
zk{s1e`07dmXP8sJ-DTozEoor(J<6UIaWb&U+lG?C+Gt=Fy(Z%7yYO~mNIBg^28rLo
zLY;k@h)s-RcGl3Rz<L?p%ap+;(0Q<?eiKtF_h3?`dQ&qk0-7h7$hi)^03Xw*T{0S~
z)w{Vhj0PGB8r28e1djq(oz*8}f;Mwjr^!2@x(dy804396WDid)`Rt|s=-qke|5?WR
zH^zEut$+7=f{MZ&$2Ea)I!w98rLXtYXaAwE=>zqopEwy3^yi!PFU91rh~Y)pM#_dM
zHhclYiPHyn2JXdr<-Af@wT(dzf!V0Z#RYYNC?eGIA+yz|gUJ&ZT%-@^fJ5lD2vNR`
zFIkmQ8&PI#5|_X-SU-=rbMA3Yzb|_vblM1uTNS!Y#RgrAe1KzZ9OCWg7FW~5tLpmT
zb@jpUjkS8@)~8Oj&!WH+I|W|)?lR4YyAa)!It4E6Q3Z!&W{y(#)z`ym^>py!i3bVK
zpmCgh9dg4+;`(aZJms>&=n!C_XsoRH=ybq#qBC3&*g{{z1xLOmlI6HGW%~r$3rACG
zVs#1GrGRE=tx%mELR#1%?|)3OuIL6i?F<%}mW$D*EkzY})h9<cUudqWg~F8ju=1w*
z_2}bloc8ZP9O{V8>tokpoe5Kgj+V1*GrU9^G|+-=zzw8-c#iKNz5+XdBfHg5{o|R-
ez6<_Fp4B7K<Kw$mnl7NWHY=#%R#iPczV<i4a)ku|

delta 2153
zcma)7&2!sS5FZC-Vy4rk1C)}|ruiU+k_Wbv*shs!czRN0S&?N$aaCsqN*dzt*p4O3
zvRm3C2L>+hAK)M0YjR{bFvFSQ#0)2naALS{=x||om6qnlMYi_s{`R-~+kN`#apLdC
ziEmcUB>mC7t(G77$BSoHc3ofLe5^3|5qVW(CKr65F^zK<9@-sdaNZDL=2@jhcC)K7
zn{&IbF`e_i0&b!!n8SIMEKVptJ@|1}M-2FXyI#Es9z}#OF~aDT=?Bksj!(lc<BvNm
zGZ#=)z%oM7DWRJykLs_=pX&23nOtw{lo<%<JXPEYrSsk;IoG(j);GFZsG`3Eg!OG?
zZR7}`#@25E%ccUMUBw8b(^x#aX<<T-(q-hs#=W-<G}M@{bFrH*;fqb&%oLU8oQ^o#
z{9xANW+<j5nJK>}zf`Xrf8ER^(m9Jr6bQjwD=~|6i+No16l@~&mQE}v4pLZ=Jm1bI
zC-KWv+U=!eI&OX>qjvrJI-R(YLEY;qP?y!kr^;;t=*JEjIosiHt_ig5srYm^u*)J)
za@1`PY}z)RcpGxixw4y!#R4%%O!BT1fCD<9ja1Rw$^aXy*07Y@Erbx&Y^<)qYS6T_
z4(EDSDPoRl)0V$?u3qa`uo33agfMMG9Z_m0FxVb2JUMJ?l67C7YmoYT)NZd?mUp|$
zH*;9A2!%it5Ao}_{ws@{n;2t(s1`5rHqDjYFv%l-{C)Su#N7$iZKep^u%IHb4K^UW
zAC_5_i?%YNvv?@M1`}+@CId+aN=SgG=O7+cBX#^vPklbQhSSe$JvkjZ=laM{H>r-j
zp8R$Ao7X8K{~A^S6M!8w*a7DUL5T$QaY99%ZNl<t><BjTNI7+sRalPBa7+ECXL2sM
zvKqu<jR+hZA(27tLe};U6kO(!bb|Sp4-M7;l-s0%Nt+tUhryjyA0^{vtPSpr6%wcm
z{n7I@_-<PM6D(|`Xxv<1zzMICh-2CzYe<{p)&L1E5E>k;(>an`Bj-`x28*^!8OYIY
zRWN6%UBP_&*esD%8Z<2yN$eCbmjT+E{1!hs!8T}WlVS<y<mOn5*8oD|n**SACO}+4
zfi^6k!$q08O&!YPu);+Ij?N95;;n*?R1SzrLCKMWMT{*d8@zRBAdGff$;nQ*oXE(}
z!-Wf@Ej;qrxX8!FI#d~GJd{6##-dN0s>BEd(LgB_r$<HVefidSVJ1_Szf4v$v_NZk
z?Q-*oSb2jA^iLENSP~$KuSodGoBU$Dviko#{}^9RPN;xARaT<qL|&$%`NTvT(RKQN
z@wv8^mY+r0nM?)Pth`Honx4+A-@q2?T_qil25dBJW~KF%EKKlrS}sj40%l>d@CXL-
zgg0Cwu1{4|g9>y=GzE@^-9ekaLq$VV!24NAM^7W3ND7~q2^sAGlXJ60w_fd#wyzrE
zDCq<GNSPc8IiEZtcW)s7oLqGe<Jc+nb@&7dUa_wbs(o~W6mvG>tvn?3y#p#^NN&bS
zeh7k8T~+=(c_ld}TsM>tr<a%33Ehn1jl$4)Le2H~s?5vprc3Wr<=l<pNr15ew5%9Y
zkP*ejjVQghj~LH*BH4If?VyOP3t}@K)oe_AEDQG+W(HgGTXh~jiWlT3_dk3gNBZ}b
zq5SLqr8huIyna<s!A#+2gd6k~uzNN#@mL?OnLB-%d9Zk{=Kuk{$~v*>?t|;s1`c%J
Y+-cznH`@+QxW|!8-B(GNNLl{)U%p0dg#Z8m

diff --git a/src/subParsers/lists.js b/src/subParsers/lists.js
index c2a6789..a1608cb 100644
--- a/src/subParsers/lists.js
+++ b/src/subParsers/lists.js
@@ -102,9 +102,8 @@ showdown.subParser('lists', function (text, options, globals) {
    */
   function parseConsecutiveLists(list, listType, trimTrailing) {
     // check if we caught 2 or more consecutive lists by mistake
-    // we use the counterRgx, meaning if listType is UL we look for UL and vice versa
-    var counterRxg = (listType === 'ul') ? /^ {0,2}\d+\.[ \t]/gm : /^ {0,2}[*+-][ \t]/gm,
-      subLists = [],
+    // we use the counterRgx, meaning if listType is UL we look for OL and vice versa
+    var counterRxg = (listType === 'ul') ? /^\d+\.[ \t]/gm : /^[*+-][ \t]/gm,
       result = '';
 
     if (list.search(counterRxg) !== -1) {
@@ -124,9 +123,6 @@ showdown.subParser('lists', function (text, options, globals) {
           result += '\n<' + listType + '>\n' + processListItems(txt, !!trimTrailing) + '</' + listType + '>\n';
         }
       })(list);
-      for (var i = 0; i < subLists.length; ++i) {
-
-      }
     } else {
       result = '\n<' + listType + '>\n' + processListItems(list, !!trimTrailing) + '</' + listType + '>\n';
     }
@@ -151,7 +147,7 @@ showdown.subParser('lists', function (text, options, globals) {
     text = text.replace(wholeList, function (wholeMatch, m1, list, m3) {
 
       var listType = (m3.search(/[*+-]/g) > -1) ? 'ul' : 'ol';
-      return parseConsecutiveLists(list, listType);
+      return parseConsecutiveLists(list, listType, false);
     });
   }
 
diff --git a/test/issues/#299.nested-ordered-unordered-list-inconsistent-behavior.html b/test/issues/#299.nested-ordered-unordered-list-inconsistent-behavior.html
new file mode 100644
index 0000000..5ce685a
--- /dev/null
+++ b/test/issues/#299.nested-ordered-unordered-list-inconsistent-behavior.html
@@ -0,0 +1,20 @@
+<ul>
+    <li>one</li>
+</ul>
+<ol>
+    <li>two</li>
+</ol>
+<p>foo</p>
+<ul>
+    <li>one
+
+        <ol>
+            <li>two</li></ol></li>
+</ul>
+<p>foo</p>
+<ul>
+    <li>one
+
+        <ul>
+            <li>two</li></ul></li>
+</ul>
diff --git a/test/issues/#299.nested-ordered-unordered-list-inconsistent-behavior.md b/test/issues/#299.nested-ordered-unordered-list-inconsistent-behavior.md
new file mode 100644
index 0000000..54829f9
--- /dev/null
+++ b/test/issues/#299.nested-ordered-unordered-list-inconsistent-behavior.md
@@ -0,0 +1,12 @@
+* one
+1. two
+
+foo
+
+* one
+ 1. two
+
+foo
+
+* one
+ * two
\ No newline at end of file