From 0bdd02b2cce3f054c36c78bc3fabcc3f21363736 Mon Sep 17 00:00:00 2001 From: Estevao Soares dos Santos Date: Sat, 13 Jun 2015 14:59:14 +0100 Subject: [PATCH] fix(subParsers/lists.js): partial fix for odd behavior on multiple consecutive lists Consecutive lists we're previously being condensed into one unique list, with odd paragraph output. This fix correctly splits lists, but does not change the weird paragraph output closes #142 --- dist/showdown.js | Bin 53445 -> 54744 bytes dist/showdown.js.map | Bin 168901 -> 178422 bytes dist/showdown.min.js | Bin 16985 -> 17384 bytes dist/showdown.min.js.map | Bin 18534 -> 19389 bytes src/subParsers/lists.js | 103 +++++++++++++----- ...aviour_for_multiple_consecutive_lists.html | 4 +- 6 files changed, 79 insertions(+), 28 deletions(-) diff --git a/dist/showdown.js b/dist/showdown.js index cf41fddf930a83987e27f1d548549de7c28680d5..71fc430b28ad661867404fdb47c27148529d3504 100644 GIT binary patch delta 1921 zcma)7L66%+6c)SMrCJHKv{Heh!pm0L*l{*aQX~-BBveI}DmYMDF16jtO(vTWj$?Vo z&8C|)>J2U+G2(!bkT|q^sMu{9EwB|=j;InRj$C?e{{nBuc9Oy(uoBCjdGCAQ``&xw zU%y}c067!yt;lb1 z+Vvp_yA8tFhm`S)oOIaatDWDLR-|jVxrMHx|HIXV%8D3_-(18Mk-7DTIJ$dWRCX_j zZ+B0L$Gc_mWbbwH?8=gO{L!*Fx0eyo@=k?KVDL1>S`wZM8^9d`?|X;0ED6LVW0kOo+0t(>D(Zvl(1SJoITw6v|jc z;7sYQa@daG<|dNftxGqtI9S7;@JTr^oQ(P_IaiBJ(ICM&qm3<%^liNuL~C z_9%x&*Jq>=ae9+L*E1sz6cfgjF-OjljBAbBuazuo2+j zHiMdO(#~dHSxb+0*F#~^*s>faS+;N;L&%oN&Mf=*UR1)U(p~f^R>-5b2()O(II!r3 zOhO^Ys8-P_aAb#$X?hiLr+8{P<}Y5ZzcNx~+2UxDBxO;jz&zR@T3Me32k>R?GS|aQ zi+L!=MUy$v7HDZe$W&*psZ7$SZy4AGBl(C|Lb&fBy5*$pF}I#3GNm!InTDE+lFFiz8iJKMk=(s~dtwF?g{86gCn*;=AI>k*tJ)rP#=Vk@7^1l&}V5Yqp~L6dfPO6s1cFFgP^8n`?f#0X8UzrgY9De>`=3E#=0}Gn}%J`EwH&`ST?gSbh=jCT9c}U%zug@SmT4Vw$oi<(MD^ty50sd%djV zbjt5iF{?uzI%RC|EVeVei_dwK)NSH{4?gL6)F%o0d(!x@@U-jaDs}f`WpUK9DR+EK(>a z%1=%$F80YRF7Yf$%`H~2RY)t%OD@UG&)YnA`B~P$q%N> zP8L`vG?~3y0L+(P=Lutr0S(sI&oxxgRq#noOv%hk_sPsl<(kwj4pv#e&U7+oHy@ZS z(9Jq|%Q|bP0$o%K zbASqvQ>x_kO}lNkW#nN2MWaGsawMwdvQbazJZb)T8D##|VwNQDm#TW`e&Hx%Zx!z55^8MYNn;-6BXPoS^FUi{)W*5{K Vz>o%+fXx7)1YSEfEA8JV1_0ymyP*I8 diff --git a/dist/showdown.js.map b/dist/showdown.js.map index c5117293a554b04163dbb2ebed2cc4c99ed1b3ba..b16805d30b97cbfeac7ea8b5203af2de1c1ce29c 100644 GIT binary patch delta 24073 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 Dq5y%w delta 22389 zcmch834D~*x%clJGD&8#%uM!$ByS)P5<(WjzGkwp1_`TMAPFHrAj^HN|G4}#o^O9vtxpd+V5ro7Wu3}Y&Bv;?y+$7Z5@3gM`TU1 ziQH2BZ_*#sROp+ZCLGV$L|>4ekUz|Hdf3LSB6m%o=;*Nc*J$;xksut^QHqY9Oco&8 z<|pDy098B#i5D27MSHH6o7g))R+P<+5(O?lwT8&ew}?Gft1#j%;=#Eg^rh64OaFQA}ck;+&VOLbhKQ5a^dj%9gGs~^qhErRwbc4>4L@nPsRWlyao zN-u*1dvpPdqyGIE#cclV;uGX{+lFqJwan#OM)mP5UgVaAh`y2GqU`GcF+SBW2`vj> ztO%W2JS?HP88*?qElTu`v5A7w0cvP#p|(J2hH}$+qAM*y^cGn~|KkqPw$P?VyY1oH zC5nBodsYUDvUD4{W0+m^-wExG*0RhIM^a-3T0**58j=VDu!;73J9W)tFv&Av;?8AZ zqRogJP6s{KXwma^O$o*5SLT2wfQO_Y)Ay9D&!X}d7KA1spo7%YNqakOs(b5O=UXk=}TO?)!ShQ(~A zq!gPwbZqHtND&iaW-6U-E2h_WK^_z{GelZIp0WcMb%C4>vTI5lpEYB`x$11C1 zts>POBeuk*V_gfK4`xB)hq2qWm6VWUFPyn4IZ1t=Tu6Dl@xA8-Z6WKZ{Rqnt+v6fd zZ`@+FM-weu#9~D0uVJ01?4qZ^LgCU-O1}o$z&o~+*GJT z$7E^eIkzQAU5bS%UcawPj#ti%^y9VNd2*VIys1Jsel0CfM``JbxsEu+(KfxZh)PKo zMsnORfwwMMN58z`7uObQv&m#8_iXhon5C#JEe#W4wn&?Nw?UC7w%!=+ODIlga~PUC zU((uZQke+^cUmptoXalUw`d#EDa+&p0cMPjwRKx;qRYtgDof@;x-<@%KXsJoZ446a zVM)?S5`;VT1vMytp4i%oXmeEST`Yxm9%rSZJIzLW4#FAxTH}r~W?@AXR>sn(cQ2k5ybmR0*gAiJ zICV>S=Y|9-3kIF#0aV!ttg)?FG^|U&5|LD}AK&u}1$#8w=OA5~Dy;FkB5`3-n&?>^ z#&!snKc_P)seIC?YT)u$Ah8XF;SxbA**6{dWpD@9xoix0pjT|LKVf@eW?2Z zB%uLOL!3`Q6usX<1#9r4r`swSrMvHA5#rU%Bn@fwmdhqvKZ=(LFw0Ny9yi zG*pO0V4>R|1i$U&AZu$FP-A7*YGq?nMNd|?hCq3R;!IYWXoq6m2Q75=Ml9d64j4C$ zMRhunL3YN8g8y)c_AH3D)J8@K2K41>&)F<0CMr$DG!za=WjbacI|3eFf{D6p!Z9A+ zFxvu&28rzvc4Xd}ikeMgZ{8TuQ5r>+cR_)UoJfU{ojE49^@^=bbazG5NAsDDzJ3;b z_5aBxj!o0NwO)xMq1_nz`z4kJP?gcEavwhH-vq!3?@{&^C;IOLGFD((T+Ge}^aQZY z)t2HZ5|tB`xjQdo7O7tX37OTj6E}gSVFm0Zhc0n!>zG)gt#F=q?e7qz7iJ7}(&ztE z6EMk=uu`&Vr=BWc@xG5jK&yn&5X>Z%!}#QRgZ*E^aZyk#sYEvHGR>}Ra^x`HFaC6! z!-}Y^F$-h|`9=pg*7*`^u|J0l6OZGR!U68biY}Lx3Pzy@_}TnWiQ^r@`hN`36A~vX z%PsW&Bftg=lNCBi5KE?NG(5dX9CX7*N)v38A{7})BP8mq4vT$;4))~S_ z)&ej74>R%qOk|y95JY5(aNBK<9h>%1%;36Dq>M5P!15?n`xUIPi1&+v!o8WtEd6A* z?0gA^U#5eWH_2$nSt%|A=PNfpSr(#n*rcGY+X`LG2w>~Pk!{ghRgPtLHK0{gEz4G) z@&WDoQG+R6DRYVy+Z>cOii-v`|Vk91gG(k^iEmew#?Gi~*kX27wbR4N>-Q0SeQ? zH{M0H-Z73EO=gPv}Pp)=Nr)Maw;^URc$`ljxbZt6h7sZ;mxI0>w%QkWC zDvb{E|MeX@SL+R8@`v3()GtgEeH%5Ut>VPW!D1dWS{3_V9iiYFM%Kbv8cmK7%(|yg z)gihl+X%UD^y8!af$yqi%fKsMEGlb5J*yG38vV17`~2@z%fUOVY2X`kR=ziIPdAf; zcd)5J`8DfWm+M-8nl7aGcLCLW{qM{cAQQNl-Kb01briD+SSWM}lVHUXXf{XkmdA>d zWucW7hixX8;t&c8XF~Ez5X_3*OTXq6KfL?*CQ3k zfRH7`_s#Ty4Ai#I*{FLyB!>{n3Ps05NF_lws@TOWM@v!i;+;LJ#^tK<89_sdT1-|K z^!r_GoakB;E?(c1ui{UGc)dMAebQPH)7B=bzza|+k%z*6M-w2E-h)vZp|9ES4NSs8j(h(ow9YnfK^)HlZ$BX_kll;S7<#?E;Lgv0Eu*Z zJ=R8j&#_?OoNp@LRLH_D-mPrZ8MZ{Ms+yxB)bwI4apg*0EpMQ(Gl-Mz<#w^O&0_Zz zOS*tX?Vg}2@6K{Rur158iH#L@aZkLp^D~f|7$Eivl!10HIRPpOP1lY-sQgb8m)4zC z>Tg}3LyVUW-2xa+iT{Iob|4`Cuhy+Tg#yrLNY_*KdD0-^ts822@WJavL0uj?jX^@x zM2e2OamooMixV5PL%YRa>ata=9f<(1Vu@^8`Z(WYifvAPvNAP~Sh`V#aW{8&BY+0d+QyJgYgh&(aL+HERW9v+{_-gaKBGv7nA3p%+`A_-`N-A|^--~|6 z`GwNiVlBSrf_s1`0&*r%ZX9CH$;5c-U5{*z9~R+gxKcs$Us7Mp@alu2W5leD8vOW` zH}VR~Q+gAr?;|pqD$4s;RfG=D6mj@g-4=u{#M$-?rCNYJnJIlityF!Y?$HQQvUS+$ zOcvdD1P3+f@=RoZmO$N`5Pf9Pg$A=Y^=yoC9f~`K;3@ma-A95&;ZG4r(ePii)LZnb z;xnlX1rr+ew~h*qQ?;kGKh=o$rMEosSGNwFdBV9hL1R>%8|m}|ES`@2kOfi2VkoC( zYoxe#YocA6pU)>eMV+goXRAQ%HExJgx#9|!YlRx85rH>;AgSt z)+!5X%}81I(B67Bh8(wn|E{K$8ab8F-fTq0f;Un7`CE=?rZ$g~@s4jQ5w7!SfZT1< zSk=f4p^h5V7qU6pP(;ffL~pMAV|3W7bUZgDhqw1NuRw32K| z@7r7~@?x^}^ECxFo8(zO-=X)Qf_snz?7u^ujK+s>cy!iiGFxn2ExJLKgF_cd(e7=@ zR4_>?S}I$=^b~tvYUbT$%V3TJ4g;q24^=|8XCcJjuOA$Zz&fZUr2xVp5V=T#CbVlb z3c|=J`6W(wUg|VKR`2o5b!v3yOHrcoC7Y;wG+pN^y|Ya!S~BTTWTTph60h&b8!I2R zmdKwjzjC#uE0fy-%(kUaWVU6BjtB@N%p%-7M@jSLlZ(ac8ET=^Z3SwtsU`IHRsbe@ zGkPLGEa){@W%QKGZx-&>{i;%+@PA`Ys<;EJLi(bj(4x9od{dEJPj!~(-e?gGyRsA% zX(%3=5L6a1m2MN?&Ouqd(OXt)v1i|)+oGnY+?d=v7Zl{VfHkky_LewQI-8ThItnO<29R-+zn4tm>!0>Q^r!Nhb(dS?m z-B*G4t-&^Eij>8MiZ_x`PVR}*WhyYZ^jKfy8bF`S8qyz!k~V#K(sFM^J10<+b%l61 zge(;dfaJP&;cTeCJuu!IJ9d00QPdj)>ljK^4!QO)BiS2{(4ZYgFv9r=&LBH1@&HT1 zHojTyKE~?Z+0Q;178at9KJ-=rbS#zW(EsfbsVtq-&|n_Ck;uI{UzDCzQ9KujUqwaf zU^-~3@af$SRgU~Ptn{Npd~K1io2}&70;bznY3sxTD9C|+tS*(Jp^oqv8hyW6)GY}EMRfvzIx@&o92l# zvk|W^MoC8&j$1}4v(53_hOhIjePpPZG!arbB0L4X;G5!bCSegjt#uB>kgAFbnyyoi zIE527N1u&ySDGit(55H}W@0>Bn z52JkyU#IiAtO>>3g>f7?tEz)VPm;E(!rIV`K7?%bbtc+aO{-)ZD}zqDk-7}oJ2qjQb8~{&;3&tK{RWN0;SqN=?FF~e0 zxdf_V-Kyg_l*0*M@&rlWIzK(ywInA)UdXSD{yS5SL?L_c`6h}S1*~3LCM%Kkel%UO z1AM&{MLh*9Pw6I4)UQhv^4uK7?RLe&wh|38rMuL~{&R54zLrDm3Hh zz(PhL)3|lA=sLTcmTqSuk;*$|Op(Nw${#Koj+~F|Ebae0B|@r2w%ARTpvosE??B|@ zzQv{8;iBXNCtY8}k|?%_<#+zrAyT?6Dh)e+9iSosjuU_rOu`GhRr?PPA<{>nqgw2$xE>ZM- z3nP+`wwJJ_y7L?RgBTSwtk;B!S=(@E{f z)?MPn*=(A>kfo~`al_b!k_%lNXOPgTMOAH6{k0s_|JaPoRK(UO!ij+8X_+sJ7xOjk5;TTo>b*EWH!A${d2d!Dm zW=jb=y@}3SEtox_o);v%iBhd>vk5dsiJs+)yt6U1x|F3W4cvQMu(`y=X}2=P zs*Yo6{8DyYz6dfwvbR+7Td4x4p7LMv5aLaY2n1w-|zAr>{Lz%!`EERMk18xOH1<9LE()dYVaM< znXSU3%UPbkStxL#`Z!;`#y_WD+fZtD&2c$#k)R(ow zvRj}%Sxr7qIy_HDff7S*7lhKY#Mg?=Qr-%l6^wDt!ATAdHoI1{CXJE&zDKjJ_Sf|^ zWibp-hK=simO^XHck=X)(tFr|5q#?B91XH zC#c|{;-wz%{sGR3taf#vK<&7?h3!#o&&1uM)kxek*Wkx(*P^6uKZY9@r-FTQU*wCo zime@mA}>6i96NP>SA8A?K!xT*iZlw5A)Pv|$L%zfd){;PaOo>CxQ{j%Fl*}0T*qc< zsTJw%o?HWHEgwPR5)=0?@Mn=`2R13=e$gKf;FO%m20Jt3N~6N53K@m=ALNr>^U3aNdV3^ z{OM1;a1Y%5UK@36gEjXamiJ3L&pBX^0rW{Kiy>E37ANR9(0)e^&fK-#?tAhck&m9g@! z*8|ctAIC-4H{z+U3%qoXk4J0=YTb;y+BMfI`)034M2a7L9;8~m@~nj1o7rB`*Mvxg zw29oMAxhpx)OfP{q*DFoTVuuX&n==eCJM!@y2+x;l9W-Jl_1nSGAc>;N$Z5KzIR%; zs@$@#=N%;;{4$I_+`_UX$@I!XG+3SJ^bjloK9xQuvoVwRS zmGx|;=w7UK2yvcvLWlCkwQ9?DHKB8}53xQYUS8=`-8X%CLjnYK@{58E+TW%XL1n)L z3ub>#k`h9>B?$Umze|CKiPP1Az!?F+O&0N!=bZGaQ^wo}KpfNoAlZiC^RE*r%SSCK($J(kY$NX1}Np{QIN zFZv<^0?SmJS)^K`JDoQAcq?Syd(4UktmwEmTHJrTU4|SjZd|dAqrR2u0$Eox@Vcyb z>YLaUxknHVBV~x7$_cPKbVzZ=d(<4_R*O^<}y^p!5NZc zFjBo5B2t@U)EOpqZHHE%#$X&K4w$XGxOqYI%<*~SVmg10@?)Eg-16Qoj-{p5<^IYp z>+ayq<~X_aB%}rE5oqC|-4^h2}m5h4oyrQTGBEj{B5_`dZ})%Z59KQLmfL6_vN^Lkvz4wB5}jZ9XC8(MfrQ7hy`g zeB)T^NQMo=5|;ul%0o^Ib=(ZN=M7Y>j{0v#QEt*e_NA!vFb4r73qMpRRh~7Qe=;Gu zzX>s|ST+kIMAx}Q>b@43rQ*0%9Q?>3`+%}w3c}qCnTv#Te{$yrnFnFO6J>|Jh;nWL zc!ep*KcWCY!HvuPaMg$G)NzZfI+i2#oxVkCSBECIY|EvP`)AmNKOHZ3qKc^qDl=|D zk!7xP;%TgN_))89dnbgR-;YuTw!z)Sf<29Hem*>*>}f=W7pG#1EIL+`>j18N>n&v4 z|HJ_}tK1_%p)4HdNZc8Y<92fet8id*7&U!df=cu1+9;V^XzmYT7wvmg+yq{eod|W) zbDwCBP(HvnFA%5xh|4X9l<(P4+T(~Jo8A>{@zJr6NJ9xNy#vVD(G$$^cP6hKWk>1U z8fN7=#q|3XGI+|X3;J&~BB|q1)Y`^>Fni|{<9zi5YR2C0vz?-S8M4-g0pj+yk=kyd zq_=SR|2D2BM_X92u&<04iF2amoeQeC9dV{-gH^m66Gnep0THQ<~rSBenyJ^a8ur9d^ z86AK_-Se$zCLXE5jROxZiuEDxeAHs2OQYeO@`SFnE_OgqAX)zTfxeC)?@!`n291Jb z)L1B+UkeJ56%t*z20fCHGUikOb-BD;o-Ct0yGEprPB=Oj-@F;f)Ki=2Dw7b}60*SO zLh2+*X=tsoFXW>CwjzRQ)g5fRN-n&v*soodL+)E)?t`>2>Kb^4?tn;caS;}OvonxU zWX70*2O~a`my`2{D87wfu%C^{S-41Dfa{omldZobi+)`D^yO;l(z0ZH>an}n-jV8V zoXV(lC<}&F_as|t7D}gDS)#;VR#EbsXi+v^oeY8+mPie)L> z<80N@+DF$svFr#SoJ3LbV#V`|aL1zy<@~o#nJtP3|LhdK-^R-xQlR*>CYf%0n(1pQ z(}lBc4E658jgXbXg&V`}Knpp4hMm;qw~DoaVpf!cdc)C{@Xm%|2T|A0nC_e7l-9pO zUK-kq_|q+Rl_UulL1@;`S+!ZnfZ1sEu}qwZil+B|4s3-pRdLNi{4GhOzA#WG&U`yg z@3j0#6zzP5WvD56SvMZr+e14JEC zFLD=I=&z0DU%m9CTGSyboxR&62npeNc9$+P=c}9JvW@1xErf!00v7>f%6rM)dj-(& zS7@b5g-Jt{x5+&edIkYg;#%BAr_^h3-YEMk-oGJ}mxQT*o(#rcgo>tb0hC{0i&RAd za~ND?%Z5vey7epLf;!}wsEw-Z{(x+m@6m)%Q+yo{l}F?oeZ|xFwUiFr$sQWfRJ=g- z$q`ZDGdKb*xQGOcOUBaJ%Oyu{L3166*?#ssN>ZCUiImsowE+&VLp=Df^eB0-B$;MwV} zF?Q{0Yr{sFIaL2Li}MaT@-j;vcF?b1W+T0W`d?=8tJF%(o+?jmwOqz10KHZ9#;#^h zQ*Fb>He*Z8&Oy&J+l*~hbuBgeVN;E#r3uvU@^Ws{viU6HRKPwSK_}0$mO6{pl4}8h{5m zH2qaJR!vIs(Y3Lzaa~oNsSJ}qy7N`<;xE3$W@io{TX8?X#$z->>G)M;G`FlPQ<|2q zXyI#Y8r}37%Ns<&b8jOnpMQ-dITT$3n4#xx=J7PX7ok%z({llE{rDUBORRmpprN~$ zC535YFly?Wp>=w{7XdBwb(UgR&kdu^`=r`0GFA+ zfrKai9@wn>62O7`5{nAfld-`gzk!1Pa0vmv>?<^IPhP_L1AlAah_ts@E;hdQEjEhU z-eM_3r2Esi*!URlazmu{&$n0_-oaIT3iSEljJKf`slll}%c|MoscC4IK0eUyr96%0 zHT8|#YK*D|!#9Yejc6-9|F-EvV+><`OJ+tKA|whh>D5QV&p`p7?h<-2UbcTRu)T{a2ye(^4>XXH6t#G7-DrTWdU{v6OG z9wj&%TRiR-Px^qJpF77U4%lk^d#rTgcTlQHuH9ga1H;)HYU|)Z8F2r{-eb9R)p<5@ z1SV7N1#CF_eVmGZd!9wx%=ILrhu?=dQv2{)G8!fqX{y;+vm-+;@`v}?L`^lMLdJR6 z?%*YFJOY4V2PJL(P60oAfmIBU z($#-p6Q_QMl$26^9;a2Uj7TO-Y2`?{{?yjEZgWkwN0~Wo{j*G(Dzno^mta40KY(Q@ z6L0>2Wzew?06Ks10VH$r0~RUS!n(elq?JRrZ8M)r`y)FaLY96uRt8j!6J)aPXUR|p z_O7n0YHp^@{cK!@`mW6qnG?%p8pf{rsx37OJoR-mjCm~$)e;jR@1N<1;`;j082Sc3 z)IxH5MB>bgY_cRXK19nGVG`Tjc9CUztw}Mgaf)|{d^8X=XotdT7cYY8pijZ?MEPUQ zr)->#eqa|~?42*S_~EB)N`$G30b9@~pR)LT-*X5+FJ4#Gu(8A&P9(~?e$9{tOa8{@ zTxmhCB}G9+2a(eMH#TybZ%ZJTD{-r_%=K%O>J(jAuk`OM&TCVKk-o9kv#DiW zQRDiW!n(%lEzRk^=!KV?s+u<~Sh=Ls`-)EdosIHJ2=CX)Df6r9;p$oR-rrejx=EId z&{7l?)rkMFmTFI9)3^-tp%iD{XDkWH))*j4B{~pT`x#vKz-KB?o&F3y_`g0w!z=M0 zEZe)f$q#;MaU)YMscG6+V>D_|Nv;1tuzBPk$OiBJ1NIW}Im=7+3QQZal!kX1uZz}w z&Kl{x&za$mXdz!9$W8cyl|-rOYKFP3E|4GXS*Af7;(>Qpi`hGSEQzU$J7^`4uyqzKuYzhE@Pj zyPf7luWS%Xkz=BV0~`KaG7QeZ%WRGJy+H%YH-%0;A0pr^_!>N{`I;pwGf>o4R{`Rs zOV>%CLClGC`^eX5votXt0n)P=pyI`^;ivLJq>p}y5>!bsgXVvOJnjC5El9eI4W({L zg4ElEZ&-}ds6RMry^;M}Sto!RXlwGfusc80>iCvrd2!k>yqmA?aB`F}cg&W=zs2I5 z*$Ms(&ruB)o9F?Ji<5zCC- zD`|ZIpGOY|@IvYj;A0e0U|l>eC}(4qk&gEjhhRyoEvV8qTX;SlxA06oD22z`%gfXB zxZ-rFHTuHBNBQ2;lt7;9|JEGHlVO=h19=g>8_36boeBYIeT}DT9j0do^AvhyB@d>R z={z2TD}vN7_59^WxPu-H;)!_vQV>tUuiP(?^@4+WDvb~3ODXp-w^-T~AqRtb8lCwN zxbVebo=6`C^HF58^2ut<2skV)vGNQbx534VjkGk)?$cIo_q`jxQnRQy)Cva4%Uc=@ z4cv_S#`U!uYEiypRZx^f6Kw-28mlPM6SXz@?ZQO4%Fo`j@mytpsk)rj;ocW0y#=*0 z!O{>ufp&%P#Bi9?z(w4lJen@rUdBQNOOauZ^6!_-p`bBOp zd66}G_Qo37nxJKGv*^*vu1)^T)S^s(Aa#*pJe_8R@sTQ*4_K&b{d($u8&>;!I}f8f z!+Ek(M}dK}Ukc;1X$1%1PYLHURPY_JL`yS$@;2(to5Q(Nt}tdOQ*VYtz7{)QPS@Ib z9=VV3Xb1dL*Ii0I2xCv!`NY9Rp)Ncq(ZLO`CzUwh2(1pDqHN?;Fv87~4xUVJJ9s8> zCm)Zliuun>4NwwY^?eLk?}UZl>_ntNa896CoIFwqS`GIP*4CoF50pS`1Rqbu5qzSe z1mw0y@JwBmnv&l|&qTn~&qweSot@-#Z6W}mv5`EZTm#q2Mj3kP)<&MP7z1*0$~_Be zs@B&u8F_Mo{65?KXMP_%YNB`41oNN%PN(V-E|T1Qw)9>%UqX+#`C|IY&F9d>9I(A{ zD^Hd=Si7lrw4I*W%Co7`%}e!!eNDqpNN(l{X^IlV7;Oxu7*BkUCepfQK0e1BnVp@j z$&*9mKkv*bUf$I2Ojg%o9dL_| z9Xu^ra^{6|rqy_4PSJ)!sa@P4z7rOH`ex+ivWIvOUAGf~Le)E6J9%-ei6*vhYOJeS zQst@M1jt^WHpkW@;AIwIVhi#+Y1l6`ejM0R!@Lx=z$p6iMsxw=ZsMtfR#|WpAFI5iygWlq z&Y-o2T$cuPp$YK&t#OlfCtjvn~_*vSPt{BAI8`BZ<}M= zCEhv2bMY(iR@hV%&DOs>xAMu+=0e6egw|boSrgkbGBEAuxAI9C_}5!`a;SF%a=)S_ zmC|nG)l{?rn(a#A0s6wdShxWY}r5J+-<#5zQ zA4X8Q;@q+p`08DULF6#31<7c4IcLG%f`#^Wz`F*oJp!4UPG-qeuo_~@KZFr~>EI#s z>IrV8za8XJsS_qBMZ^4M2UP|y(+u8Osgoxp zjdg0)48O@pgHfggIl#?PhpIW{U8WPAyOSr&kLbv<6kyrN zyMXDwp2&kDWM8~V2>~qD=Vf8(^T)vA>bv;ZAk&rTfxGx32r=XsFR*IzAa$B~H_vw9 ztGOp0VJXTy&JEwh@88W!G4cG}%FoB#qny9~9-f1T_uRv?7x-2)6BF{%ES*N1JuBrY zA|T8h`M{gF@IL3V0p;b?^Lto**}Xh4*j%!W9{CWx7Wch;kEB@>>Ek|KdT4-EMM4#E z2CxX)79CSD0+MjyTgq`hzIISp@!4E`o}}<{lA*SLf$9bwtfUP~XsRf0qlyMZ5!ihx z^(;fqnBT>}45z}AT(-C}4cYO7G&a;U)ifZ|XVdYMd=6@YO#0(V?m~jf^d>Z#)XgUj zdeG9%RTtPd;=yj7txjY8IWW^0H+KeI?B>gm%duAZsBvp(=_x)|oxI^|29o=LO*&5T z33>7Xrb%RaLz+y6nMTgWdfBMV^rfG18M^?96$A&dI95!g=tucX4e{KM@|%$8zjzdt zQtDAy=o9sDjMm41yB>NBUi;!>e6y^r3`1g_`g|E$OCIObsU1JE)eFB)@}ZOZNj_|2 qLM%0LlAQR-<9xOs#?E+xPtzS!Gme<}PlllPj`Ph=1w6?=<^LCWo^+1@ diff --git a/dist/showdown.min.js b/dist/showdown.min.js index b7a711fd551e129cda8f5f861b830f28ffbd1a51..c6af08233e54799d4f37787f137e9bade6248426 100644 GIT binary patch delta 810 zcmZWnKabNe991Vk0*>KsfTGeGRN2^dHM2nNOYdt#O zxqGOdnK#vw!{HVCm7jMRRc{Yps4wkZ^`U#~I^jg1Hx(hNvc`Ki5ELXJ5wh9osZ_nA zy_QtJJ8dd!bPOd8jba%*_w$0~5X?nU768G9CXz}cXW85j88oNq1Cs!Nh*UqVJ3Gx4 zRJ)i_uD*>ryLQgXWuA5uJi}lz7Y@KueLgx^$ICP<#Uky-&?iCTFr+4&WbRAH!;hWQ zNv6N4nK{Tz#4(Ae>v|qx6aW&_fgQO6&nRDKj0SeR$YJ%wMB~ZCH|8u&N^WDEG=n+y z-NZABxzM(UhzPpg0tRG=?4UJb-nuEDCoqfKn;*B3l2G2Rho@n^p76H z6ifh)D#6Mg2F^4E8;ep~l#^&((Hol*)z_P|WA*!zQo050Yp53*B`Zo;!LHo5JVdlq zbMow3)x0FT`Wru6HSvHm3)sGPcY}*%b+o?C$wePk8zgLEi)g4zy#F*nHm7{6 z_X0P?*As-Mifk@Qn4pWgg;8)3mk<$7W4&+@TA?xIsxvAtX=$?FPp&?W?zM#aI_e!r j%5=tLrnl|?(X-9y0LO5qw;KZ;@CvE(UjLIbZeRTaO3ecv delta 477 zcmaKoPfEi;6vionXhG{n3bsf(ip(_Arm51>q|@RJTx%@k-y{Pil}T$CY3)Yv0CNI& zZi`D1ynqMr1iJMEnxv(6C2#e?``-6^-`7Lt<35v9$|WiE2V-Y24kT5b=ZX#STHo77 z5qF0p9!R3qsEeob9l;xy1x!bQJ!FFbn%Kn@d)PCJ;^(kXWa+X78L_M3$ht6j=yC}9EF6ZSLh@N7I94zK2s81m z9*7#*%pwfhebxao6Q9kqUEP!kxT^s@p`hZiHOo*@(()S?rlP4yGuI(jX-YOfF7(M$knNUP;$c z4WEh^t*6uV-Yjg#4W+Ho`0szvutyxx(vBcq6>7z~X?iD)mHh=p43o$y67$l@^SfTy F`UTL?ltcgk diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map index 7e2391782707f70d327b68e4dc7718394210eb1f..91ca92a6c68f3d4527b035ae981dec8ed45cc779 100644 GIT binary patch delta 2263 zcmZ`)&u<$=6jnj1+JdNnA}ZPxsj3ht1GbwuPDC7MX1pGcH=B*Kaop_z6dWhEv#}lT z+OZ=c-#8+q5#mqahLC#U0#{BwaO5B01P2aWE8csP&?GGf&v@p2@4fH+n74m?bLHpn zuKf7b)#+e=e4pKKC(T3Hl0GbPKeB5(k-cu*Yz&k3sJYgTlNjy?&3G8mzX)!&CjBN{ zHj>sbY7OCEs~7Dy2NnnG1b)dlfi;fW4TN^l(5YI|jI$^^1}$=cxPG+RL`U$aO^U7d z9`5K4w*A4*Ui{>zt2eWEYMcd}2lGXyI6n{)wpg5qT#-5EuTRr?&BI4bbFNXsJ(e!< ziP&a79|=x6V8G$Lnk%y^Y>Q<)xoESNEt}QlnVTts=>;<2=S;NxV5*`bcmT8hyj2)T zFv)#Z<2(dMvLlZqTJm!mw*XEcs<8&=jbnvZ-q;~Y0A|#vI17Ydgkxxz;b8r<=nPNf z-IOKIJfxtxoD;J|>$3M9&Uaok=Z+~9z3)(pQqoilcRm6$IUCf_rj7`@7-nF(vXJY( zESckcY8q@|`T`d%4511bGpflEDckJV*h9hPHd>XOFdjnI>91yztIZM`@NrRD&0P4O zMuF22cp&pSrBP0KRTRHooYJWZ$;QGFJq2oK-g_0)@Ya!5b&1r~Q3caQ1V)x{xcM?U zs9?REmR!ezhm_#mGNzfAP{DVYH|28U?10?C2Xb#$03bVJ195c>%lTsMREI)zD5?ca zJcbDN-9GAEh>omqzg4*uTqF-DE?_i;NNiC$bfsMK4~twnm$^2j*F^_5bMC_nT9P~* zVI;CIFUzp;9pU*U^jDb)|SJk=qT&{DX*BaW*-&xyxI=@&w{JWv zX+WK4`3lfnUA|@R6>eO&kJs-wCR4cenv)Yf3McHEjY6t^B*4AQ2$~B2%d&W$CAX8y zwUgvIOUhrByP4v+WU3#&XY%Sz^TWN@%|C@-)6{&`gm}A$%D%8VmtBDmLh=qp?(N$x zTQPsGrlzy@by8<|Ic$IR*xu<(5$BDMV{>1CK<326CT~=t<~qiXmTPtloS~^vaej%k zbrey{|2Kqj3@+HYohz{>Bs{>zmi=PSlCb9BCE_Q60la}Dt0nCm@$s;6nTFug5aKzh01_tCgk*NE!X3ox z+ba#Va}qK4k`@HckTRWm@>D*3^#ROL;M9W=iXW>4W$^U_UoiftW&OBpeo^n{#~QMu z>Z~U?e>9;(ZUyXLL(Cm&?-?YmnOs-}BFU+FprtIpmc LjRiNS?|=C(tig8} delta 1458 zcmZuxQA-;^5Jn0W?Sl`kv=l_J;)7Y57#pK)Xqnx+oSXGHucyQliWRH5XiQ=fV=WY4 zN?%)8O8yJIjvZHx!s$Yo%z0RX7|hIfnOg7PT$|m*L&Oh6Jp{h zX*IT&>fIjh8<)$bg(HXP zYWPV+=^GdEjNdGro5Q7)_OxMXiy2%o zzyWGGWe_7a4EI*A$P2zODOE(;O}mpSk?6FOC^nUIvGp3pLFXA=ROhmFNlghC2xJ*y z+EciC(C$j7|6ukyaf`-rPv*dxFh;P_Y^df=`%`6oz$6chuw!rXo@joKG- zcqo%XP8{2ocW$Yotn-w_iTxn6&uH&5I3O`lRl^`sMXET<5MB?+wB1hG&P?C78}|oo zR{hLrIv(~InK>-eSzlB^HKjr_3K~qzucb>tTjgX=Y85)=bEEts!SU8po1Q(NbDZOv zL{9bIA({zcPtAq5Q1r-hmo()Qo2pt+pqTVWPl@seCT=56PIFNvR~ z>zp?i!?&7fiu9%Z$C=az<#D3O{~ zeQCeCV|QB@PFDXi^p86>dLYRdc}y2?wcnSWip`ZjZR8n^Ntm2Agz7okVuU-RF;eYH zYzVS5ltH5nU!5Q|X>5(#lZ9($2(jTAot#a2-)>a8T%?8lqsO67K74Jk76drmln`$? z2};d2JpZ6QDj2+3L^-^wXi0#z+@gJA#zzVS7O&SH+2$&?ZXQk*E6B~P -1)) { - item = showdown.subParser('blockGamut')(item, options, globals); - } else { - // Recursion for sub-lists: - item = showdown.subParser('lists')(item, options, globals); - item = item.replace(/\n$/, ''); // chomp(item) - item = showdown.subParser('spanGamut')(item, options, globals); - } + listStr = listStr.replace(rgx, function (wholeMatch, m1, m2, m3, m4) { + var item = showdown.subParser('outdent')(m4, options, globals); + //m1 - LeadingLine - return '
  • ' + item + '
  • \n'; - }); + if (m1 || (item.search(/\n{2,}/) > -1)) { + item = showdown.subParser('blockGamut')(item, options, globals); + } else { + // Recursion for sub-lists: + item = showdown.subParser('lists')(item, options, globals); + item = item.replace(/\n$/, ''); // chomp(item) + item = showdown.subParser('spanGamut')(item, options, globals); + } + + // this is a "hack" to differentiate between ordered and unordered lists + // related to issue #142 + var tp = (m3.search(/[*+-]/g) > -1) ? 'ul' : 'ol'; + return spl + tp + '
  • ' + item + '
  • \n'; + }); // attacklab: strip sentinel listStr = listStr.replace(/~0/g, ''); globals.gListLevel--; return listStr; - }; + } + + /** + * Slit consecutive ol/ul lists (related to issue 142) + * @param {Array} results + * @param {string} listType + * @returns {string|*} + */ + function splitConsecutiveLists (results, listType) { + var cthulhu = /(]+?>|

    |<\/p>)/img, + holder = [[]], + res = '', + y = 0; + + // Initialize first sublist + holder[0].type = listType; + + for (var i = 0; i < results.length; ++i) { + var txt = results[i].slice(2), + nListType = results[i].slice(0, 2); + + if (listType != nListType) { + y++; + holder[y] = []; + holder[y].type = nListType; + listType = nListType; + } + holder[y].push(txt); + } + for (i = 0; i < holder.length; ++i) { + res += '<' + holder[i].type + '>\n'; + for (var ii = 0; ii < holder[i].length; ++ii) { + if (holder[i].length > 1 && ii === holder[i].length - 1 && !cthulhu.test(holder[i][ii - 1])) { + //holder[i][ii] = holder[i][ii].replace(cthulhu, ''); + } + res += holder[i][ii]; + } + res += '\n'; + } + return res; + } // attacklab: add sentinel to hack around khtml/safari bug: // http://bugs.webkit.org/show_bug.cgi?id=11231 text += '~0'; - // Re-usable pattern to match any entirel ul or ol list: + // Re-usable pattern to match any entire ul or ol list: /* var whole_list = / @@ -105,35 +151,40 @@ showdown.subParser('lists', function (text, options, globals) { if (globals.gListLevel) { text = text.replace(wholeList, function (wholeMatch, m1, m2) { - var list = m1, - listType = (m2.search(/[*+-]/g) > -1) ? 'ul' : 'ol'; + var listType = (m2.search(/[*+-]/g) > -1) ? 'ul' : 'ol', + result = processListItems(m1); // Turn double returns into triple returns, so that we can make a // paragraph for the last item in a list, if necessary: - list = list.replace(/\n{2,}/g, '\n\n\n'); - - var result = processListItems(list); + //list = list.replace(/\n{2,}/g, '\n\n\n'); + //result = processListItems(list); // Trim any trailing whitespace, to put the closing `` // up on the preceding line, to get it past the current stupid // HTML block parser. This is a hack to work around the terrible // hack that is the HTML block parser. result = result.replace(/\s+$/, ''); - result = '<' + listType + '>' + result + '\n'; + var splRes = result.split(spl); + splRes.shift(); + result = splitConsecutiveLists(splRes, listType); return result; }); } else { wholeList = /(\n\n|^\n?)(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/g; + //wholeList = /(\n\n|^\n?)( {0,3}([*+-]|\d+\.)[ \t]+[\s\S]+?)(?=(~0)|(\n\n(?!\t| {2,}| {0,3}([*+-]|\d+\.)[ \t])))/g; text = text.replace(wholeList, function (wholeMatch, m1, m2, m3) { // Turn double returns into triple returns, so that we can make a // paragraph for the last item in a list, if necessary: var list = m2.replace(/\n{2,}/g, '\n\n\n'), + //var list = (m2.slice(-2) !== '~0') ? m2 + '\n' : m2, //add a newline after the list listType = (m3.search(/[*+-]/g) > -1) ? 'ul' : 'ol', - result = processListItems(list); + result = processListItems(list), + splRes = result.split(spl); - return m1 + '<' + listType + '>\n' + result + '\n'; + splRes.shift(); + return m1 + splitConsecutiveLists(splRes, listType) + '\n'; }); } diff --git a/test/issues/#142.odd_behaviour_for_multiple_consecutive_lists.html b/test/issues/#142.odd_behaviour_for_multiple_consecutive_lists.html index 02452ed..ce25a77 100644 --- a/test/issues/#142.odd_behaviour_for_multiple_consecutive_lists.html +++ b/test/issues/#142.odd_behaviour_for_multiple_consecutive_lists.html @@ -1,8 +1,8 @@

    • Item 1
    • -
    • Item 2
    • +
    • Item 2

      -
    1. Item 1
    2. +
    3. Item 1

    4. Item 2