From 636fd5959def53e5d1f46221d411d23853cff0c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Estev=C3=A3o=20Soares=20dos=20Santos?= Date: Sun, 23 Aug 2015 02:21:00 +0100 Subject: [PATCH 1/5] docs(converter.js): fix return type of Converter function --- dist/showdown.js | Bin 63972 -> 63870 bytes dist/showdown.js.map | Bin 206552 -> 204007 bytes dist/showdown.min.js | Bin 23037 -> 23037 bytes dist/showdown.min.js.map | Bin 25356 -> 25355 bytes src/converter.js | 7 +------ 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dist/showdown.js b/dist/showdown.js index 6e34599c27d6f30a7edd5f2baab78eb6dba30dc4..edfbf635abd13ac0d5887631063c2888e5c1d8bc 100644 GIT binary patch delta 42 ycmaFznfc!*W&vw`Ek%XmjQsMH{PH{nBjb$%b96bK^YhA5i%L?9HcRWBJPiP3E)a|W delta 160 zcmezOiTTNAW&vw`Ek%XmjQsMH{PH{nL&J>%b9C#u6tol+s&f;wQ$0#@bF38HO7oIS rGV}9lbs#dusU`jeAOTFNbRwjRk+gvftOXMKTrfxIId49yyYn;vT!}YX diff --git a/dist/showdown.js.map b/dist/showdown.js.map index e9e844fcf02bc5c10c194562995b9da1bf8cb4cc..955c87da36619e8bdb162c4a45b576709571d241 100644 GIT binary patch delta 8425 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 Nt+_Jo5WD*9{{dvC5-|V( delta 8035 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 uPeUtOy%fmvy}S~ScN07h0uRF Date: Sun, 23 Aug 2015 02:46:04 +0100 Subject: [PATCH 2/5] docs(lists.js): fix missing jsdoc parameter --- dist/showdown.js | Bin 63870 -> 63940 bytes dist/showdown.js.map | Bin 204007 -> 205453 bytes dist/showdown.min.js.map | Bin 25355 -> 25355 bytes src/subParsers/lists.js | 2 ++ 4 files changed, 2 insertions(+) diff --git a/dist/showdown.js b/dist/showdown.js index edfbf635abd13ac0d5887631063c2888e5c1d8bc..06c0172447e4b778fc22e3ce8efb83cc90b303d5 100644 GIT binary patch delta 91 zcmezOiTTK9<_(8-$`>RSCFUwrC*|koq$cLoDwGsu=7tm{X69t(rE@7LOm@%|+k9o` NJRYJHwjBFq1OWRJB_IF* delta 23 hcmV+y0OVS-J=z?JdtEg&BEVbQf=f)3&Mb;FMdt3~8e%MWV3Ml2pC^3~bgvacA@JzUnHzb5+B+wB01}Tu$!`Y$G?aK@)bD9b zKDe#25eH=cV*L=aoU_>xUTSf;z()A@-%Alx;F!c`FY^(Tds zucitIZT>1u`b?eY%ZGYH}z)7n${pg%=fz zFn(tma_vZibC(S(+guJh{)Usu=SL9L!5E zidbI%V+6l(STePI<)FqT7HW;KYCY&*Z4uOw9z?!K2bKRckxu7lQTZw>~cX7pB*To==aa|qQ>-Ox;nr~m1~`p zUbl^MYVC6HXqvd*45%l^%C86c1D(w~YQ$Z<{V_;y{?g8EPE}RGmf#@;W~LoXLn`Mu zntr0+lW#^)bhX=EeQPW{#q?!r1~t!#3phQV*MA{&c}Q;oo!yztu5QA??fD{HsNZvS zm9~W7*(Z&{#-EK6k<|WF`0ayJI?zFTm!@+22;m4R?8=ZL+Oe&diU+qmEyA06TG+P< z=}^`XL>}PO7=P(_Hd zXgc6fYDSaivi^^Q+Ut98Yml%;suEl<%B+ZGsFq~~JfNqDr`Ep&QPT1#rJ2a)oH;nM z&1RtkKZ@ixPCzMD!ib+jEjzdL77@Hy<>Gp_QfG&Ya{grHx;l|WN0#@X@~w7JLtie> z(spJSaOID2f?C?LG>VEddQ;*Rr0)#)A~BkLoAGUd?|*~sIeVRCBzIgC3LtX=0-U*daY#S^`wr1?(}Yrjb6*1O63h&B{(7HVLp@(8_EIs z&ExyYRfUw_5To>U&=;$sG-QuhitI^V4iroK9aLBy#ZP&KUDVS4=X|+_cz?TAABj#;uoxL8aHDIj28T-?bJBiqB_m(ip<9r^7XNc0pxB; zG=XmG{Q#J9Bnzcv#(u~7@#LFl)v(ie!AZM6HJd>$9j%BZcSE%Dyb6nlI@cB7 z<|Dx}m3*(e*tJB2ksaIr`5bn(RYr45wusUNvdB#F$Af@c?K6E|$=u0Id(&^g= z;#B0QwZuj}H%3w2^Hz>p4!|3|F`QaQ*wNnZ*_hzy%9~v3zA-_q3Q^#Z>j!i|4R_ot z!jKb(@cPJQvr*;J$&JbUdu#$HIdekDcdvt+KZ57m zHl-<2MAME&vTF-!zYW#bI1{>+f2GwDYp8KsUvBM#ccsGtVVlGCDQ*7|L1E81$$8XD z2R38rOtWQ+1z2A~EkmPCcOA%D^yDwtwp#_xb*wLJ9_PJVf; z(e&_i_T2?nFXD)`B9R+E7pc^q=c39q2e>Fs~S`EOh+$mBN*WEBID-b@oYV@SOx(M|eT=~!(HZsaTN=hq~TE1!Y%F2M0?kVcJB zp|qKzsJVL(t;++L_wbrs_H6Y320@INCqr1!9eZ zQ;_iYf@$os(64qTDZo&}!p?gAzieJQQS`>SgB1RTE-K0#<93h9RQ1Q1t3(`sE2NFn zpT?wcJMm^6A$|%H)!3+L9k?EbQH+C6?-&?p9J)>S4kV6~8v8jlzyj=4uT~?%k;f5~ zm~e~?;lV2kO^SXvC6A9?)l5~-4Vv>IRaEvyD{{jPXVH+%?P^4^gYA6z_;Af%2J+cp z8I8H2FK0!Fp0~PYrY(u`_XDo9)=kGOv~Nc&tDzMue{zaV5r^Kh_F zR7>OU^&}Ajo~U`Oo!j39B_2fwn-U0lr5Yo0z>S~3IQ&BufaEoB@}0fu+b5%_@|qo` zt8#4cZtZpI{@4V2n4L%;zs-^c)*+LS!gv*St{amHO6?YuFM=eY}OrqaO)26^0$T?-IB zG-s8{KhNJk!6fLF*jo?By|5>b@gPW*1S|{A6n0Z>8i%tUS&q z#&YwAfGpeZ;MtAy6R2#5lRtR{xur9t@q&XZEz-)qLs-c*+Y)_!<4^q&e0Vv$QK{eHd7OMV5H{h(38wNq`%HdYKx+YMRs73>ir`$>T z_vp?-@kc^wD1}gRjf47C>Kh~r^&92lQ%{(#linhe!{m&#s)uOT4~V%666LDmU0Z}6 zM>Xqd+X!IDX%|6cYz76k0bGE4oo^sPLNHx|7hy$|f2W#j)XeIqL%N#S^`Ka&=i!KK zKjNr(D8(lP);E2vJq~1fP%P1ISXIp83A8notzxJVpnV#wy0-FwZxAc97jJ+=u8r_( zR&CJ@cmU^ogBy#^heWadJ(ovr5&dgB8uB~3roa+!tW|Q9IKU)NgCAHvk`+S zhD)4ar9=GzMO#FwR(BN-+amr+pHW|I>No)Pp-@RtN;OJ$q~HeSFPNL&bm_|+#KJz= z?VhYW>rvYi+0h228{dwnwyn4x^P5Arq$B2A(-co}Q%(XVcmHjfgL57cV{sWFJiKiv zWVJ7WZTVK^h1HlD&!7ztSIB6g@gK~QBUORUpe%4oA%4C}B2@{-RNQ-k+A2l)YjuFM2WpE&FqndG5(vqs;25vV3 zmulRwO;npRMv*DKB@wa3Cfpk7MBtpq#0F|EQY`>iq13tGPC425u7<8AN3?UtIT3<* znpvm`pRSSUuu!r#r)zAp{J+CiOE7)3^e%#az!O&c~Ttt+AU%T*X^ zHBGnhu92;r%YjLH$KV1!a02QXD^We*kGJ?Q342wL3!;(bd&f%U5@bN-d%GhCA7}3-{=XCf4hYx@T86 z){ndvFkR9!f?xt(;%f^rxOPX~Ihy3EtP zX0OQ9mF^v--A7g4n826~+(@u;`(E)|3^Eq6hWGD7QwPTJA6+1)ZOv#3`#=)$ME#9K zx!0efntN+8{LXRc*fJN6Ieh^>NxuWho;}r12aJ_=J#7x*r=Ai8+JH5Mv|}Isps=q; z)3Z_h_fx_a)kRt|$GP3(loMUI&Azg#$eO zt^94ZKfwp`f&HREo4le(FXa7~R4ekE**$mE4H@R8xXLK?thRvG*Cwb_+4GEFTn!%% z7s+PAL#GQ$jlPRYZv3G`ZLBacLI3ILmfn3Ii&w$U6nn)blSe6NYcSa1H_ z0xG5A+8q}#8Qk)sxRYxlQGbmy(CDMALB-msd@x_#Vu1wYWH}X;0KOa$3pAPx;V+&O zMKMb6HU6d?KfaF`0J%IT=U&uKF}iGdxWP&$OxXDC%Z*?XVw~hvuEN<{bcv;JJZV> z@?=uDeqrR#t*KhJ49|X=C)0(O+w)`s|8bCv;y>rfz8vzt>>jzI%B%Jo`kyIb^f0`1 zjgT?pyIvT5jr{u6o@!(5+I8!0toI*oZm#pxFRZIwW(+shuFDMQbhF$yhsi-&E>sB{ zF5|V9<^p8|=M0xUB5~vm`KCV8hszQF)xLLz%cQJ-+!rtkx>qcyHau0{Wz}Az%sa2z zJ5!4*x{Z0u>b(nV=g*k+eMXv6v=A6N16o&&kV!D8VTA0CuO~*x)Px&yjkGy6b#oVw zu3ECZJ`GOcqa$QWudesA@^1KP_FOox-n)EmeVsQwBadG?FS~KdNEzcYmm>lm@4^*T z_0{YI>U^1rr9aA-gYfk+9&+J1nauH5WF%inl40z2%X{$ZNw-Ylht5m%qBLpYxdPcEMVn}bw6aq~+Wy_&Tko zs&;Z-*7Cmb3p<00wa$I8C_Z<2KDs;)XR=2hQUwY;WY zNslOzY1o-JPL5G#cH{1UlrBDWUfO$=7LRrpPMBG4=1Hm2&JP`fL;h4E zd+~u}na2~y$V8i8mvx+M$TEI)49ssfq?50VkuIDHf5Zo8ReQa4-VClZWbFURFEO{Z zm~ZmQ_pES^ll^aNyMuo^4t5w9WL&R$>ELj}w4TLXwU zue!c!4g^$|%K|?0XK9Z$)MJJ3o&prf;?jk+)v7mQK?o*CxvhopRR2)vIAo zP6e8S5hE=@hHlS1p+cwYnhM!n0o9G2&sU(&t7Pq|cj`I^Hh)j9+NQ`pO0_96@m4Xj zrpSIO9EQQIu`(ub?9)?F3YDM8;BNlR^>?4|sNXq78XP_q-d38ZHW1`eh(7D)I;of{ z2lmiM7$)rhBl_>XTPC|Q^;DrQ386*J{sHy__J z6XvM!IsD;Ui<2+Sl&MhLHcJ|@{&1}8il++LIu>8as9%nmB~Pv7v=61*q6jMQ-vK{t z`Ve~c942G$0IlN>K9uF$`xvS_741KGa=n(vhX>2(eyGtU72c|aHK1bukd-DwTW3Dc z=B>x%5BSYvax6z2$H%PW(jAOAsbc4!9+%^K`F}B%)h($;^lIlDH47J4>p%|GLe$En zk7R!yuRiYo2-*Y$?EgrP=gyC0X4jLnkL5V7|5%pr8z0M29CQL76V%796LJV2Jpu5j z^mvDVeOui@)1ryCG+wBC8y+U ze(#hV=+Fun2FN)#p9SQ#UPBJ$o(6hMI1RL}WzT7u&QG33z-xKpY4qPSr{!=?`UGG% z=M&k$=RN_@{{0hag!)A(m#pKgGcqporYC{YtoP)ZzR=51K>juBc+DAP*`6~pmye!7 z5U-p;R@QaEzPFk&g-q&@iR#y}cVGh>Zdm*89jIl!BJM155Gp0{^s`vD;;c;4%RC*j zCm%X1`&jiU=C=9{xU2234CTJ(U}mqG_?UA}4&&x?GCD{vT*u8501+RZ1Ac1n+Rn>R z*x!Ca###IKhtfRsyiCw%)SbeyE6>aD9_Ci`2K^tu!8Hq))g$HdaFv7Dym=l2hDt+D zxgZU_|9_o_)fd3auLi8_Fjf?UR7MAH;(&*rA7 zBTw>VR$^INmQd|(wOfXr-K{;9Vx7-vD>W$7${V$vZ9QE)&-?yn1~l8<^T+A)iJAHR z-uHcO-{<>0&+GO-2A_X9xcdz|PPmsvK+iZmT(j$;?}YeF1tnU8V_#+ghKwSMrD%%9 zQcxoPSTOru76a}#4PZ>tg88Th%IC*I=O~R0|)qrMe?Eg9Df!KK17 z+ZsK(``LA({N<)X-25numNwPF>bguYwrj#%KN0jyZGse%oqsbSV7?;;Lh2^SBXj=6 zBahZ4;1j!9Sg6k-(mG&wCt}ZbrW(JVj34TX)paAGZIx>9`Wv;Brel8vi$>#B^8351 zBBWtC@RjG=dN9@xPZTC(+;dMg{45oLweoq7R&8oT{aBV$4K$jn7N-N!mSPAXpLi9mJc5W#$oppEEqO5 zga%1T1@dUv-%u=6*TO(+0Q|jS0`xtt3CJptszTW82ypz~0Bwu(P~WJNkQiT}swf~R zj2Bf0SZ9@L{M7h$A0PrbWO&s0Zeu>|@5n(%71Qf{LT_|^*?2vaHIKl7 zi_Bk!!~&LWDW1I3NmlssehSCpwjdbjHGugU6WAsjVADN%*!NpKD6S~EZ9E*C76}6% z>9OxArpKNMOy9mi3$K`USpE^y;r3V9DESK7mg=FaQwz#Ejq08Ps0xaKfmj`wKi34* zsc8gJYZ9Qda3tktybQI|6Y6Ve5g4+W%sjlNOT6HY66l>xk@}HBMjD~IfW{V<04LVQgZ0-M zP@av0yJz^+SMjOpi(z}&XjrlCONqVpB|nEf19Z1a>@o-JZ;QoVf2Nbl)epi!4|(h5 z8sW7#XzSC1^&Qn&-c`fgWUVzq51q3{$n7l!P|=o%ha1UmYXRY?NefL|0tk>MFu$zF zWuaa<1rl~}upt_|^I3HJJqhG{J;9TVr5wb(EH)hSt_5P;Mmp=1!vx#!iK0*h;OiYi zs6%V;X1yanL+}G`UPu|P?9nI!*RBHjFk`00GE;Jhc(~HzrDGjbdh&julbCVA)Qy>w z#p{-TutyD)WOr|%R;qHL;?W4fhkA6}M}OMB^)RCYu57H3VRjYW5Qm#2j=siXsS!%Z zd`ZN-L^8Y6sruWKLu)&k5pUT~n5b^0I?xjUStc!{W!w-==}23L9(sR6N1W3}d($qv zKnnJ`ql|)8EYN#hgr&;$`8O<8Rc3cZP+SM&?I^&n9u>Y^uf>Z_vOW%2xX5BHv~A8* z;jSX;|0U9~{~*%%(;!P={7jHl22c7S=4PSH{y&8h`tr3Mhl!}I2_7Em{dX1$nNP+- zTUi296cc6N<3^42bzQ!!Q@;9ECcnXRhsoC>w+al9*EJk3Hn2dIG%#&#Ae7u24&85PVN7WdPCQJYN&SMh<-H!FP=_MPMifD{w8{kW zR`_iA@ZK2c*F}P1i!NPwH~XJ#@KgxmKInTs5OQY(Ld%wLsM``7DiH0%nhRdpk|?Q) z0w7d?{&ObDQaK)|dDD5e3aJx+F+fJK2^PdwxwfZIZ>*Ts3w>f$2S$~ zZ#Ic?fy&2%(yuW?`!1~rAm$xm8fj8pp_(4Yjz+X^n;=g;WDadlv~^Z&=_cR6X@JIm9g- zLp8y?y$JHoYw)?vEKcf*eJ%>U!$NK%&B6E=56^p)8u(Cyc~3A6y91JTEW_TtOvAI( zb9Hu$#V!*J!;Y|6YQ9bI$&PHfCSZM$cw<3JD~s@7m2a`E%7-bCjz821+In0I^~*;P zTWbLW)tx6GPd$BN5srUU5cPd}5G2)O(dz`Qiu3AVv-?-r`x=Xci@7FzAkdttFs z6zCMNKB$G(T^ZsmEi3f(E_x85J5@o6;q6RaGR$5dx5ucF_C`Zp9ty{|%@SjTjFcAz z%6%q0vzrC79LR$OXl)_nb?t1B`bSPw+a6zQX;mGOCA+D*0&LyKM#8}JYBu{U z$&kKt$TK@f$!aUdG8w;YU#m$@S{WL)vfu_{g{yn!s}o=Tw&bDRC0hp%Jv3SkfI2Dq zH1voz?k$y~vmxx52wMWYQl*F6zf%*pXRjK)Nku=Em?KwOZCdD!&`64Y^~b<8kz6VP zS6M7oK530Nmo89b>+n!r-!RcoUXLPKR*X7tT*@eR#o!L7ibIQEdqg&`c(j=X!s|)d z(vX$Z_(f8?Bzi8&!W`na9TZ(-fEG@+l7(`g9+qjfa3Vzq)-^QqTqNFmG*|jMN1Zn` zas;RvW|C)md{r5kAp2iQ)opu1_(WnG8n3~YN+EXW+qapZFG)`WDWR{OCW^;&(3wkJ zL}!LPdu1`4ygM4)ofdhjilEL>hW7p8ax|QHV~$AosT8~nBH;czOf=~kI=&-w_p}b9 z5}7QxS_^rTLIu3oBs^V1Ij7vJ_aT`^NnwhwUX{_Pm*{Ox+b3tsz+KH7hUUvucE(WF z^*yG+TlY|x{^rZ{%lw!Ht`S3*Kc4F8e;zM`fhPm7w~qv$eq0^B*GsRZz?Ss}>H6+> zsE(P5pxul0@bH0b*)X>~9toEYOptk=^~98a>TVSr>Y#D-0>yI3O~pD-_KDjSEmWHI zaDGBGbm!_5WZn1TWo6-wxPA7?+k~qEs9MVqKNlEIHG&02z~OKmxR+6x$cNm6(Q*!_ zfJoUh4&OoLHz=^j>2ar(DupP?1ZRmBRQ^PMRA>O}PWGoIq3y|< z7h(^^oL2prD!uyt=`$j zCPSVx0e@IcvfQXe+e@Sz zcd=;P&!W(Fl*YZJSK}bFK@VeW!Prwns$>)!Fi6m%)vDuEvW@q}fO(o$Jk#T|&(a_7 zXiyIBhxGoQp_w`bnH}P0X+R@}B^t{u259<`@^C9F6>C`$_2<-9QIGEkB>mM)!M;7r zC^``D^4_gvh1sYRjZPRi4*G-DsD<0x3}RA7>u54o++p=ikyM3k+vwbZP_3vKe0>pQ zzaJyrFV$(Q353?PKrsG_x>utX=ig8L)#)wdz00@hL4d38ggQ0l;OzU^V(9r!3tfNF z;^8Ptgx}rIGDz_-c&k}AR1q|8XHGOeL+%lp5ZKNH^)HU zE3(hiLI;ga>Y=Jn;s;8k~+(~keau+ok zcj<(s_{WWG7+j%bpL)t9r@`JUpUu@)iak{FH@2 z^cn;9>}De{PuzDY6SQEN66v|BQg4n0xf{Ut8DV;EAY4uh#7`<1-IXly2g7Yz+}T0i zt?yvvFyPd|sg^)|ql2x5fjnJ6R-r01`&0@#z9;3iU_gW$@$727Ue}OTzV`J-#$yq%-+LF+o$MYSx_KMUrTpi{%RIF z@z@@=iA)Jb=Uz4zn;)W3kvDl(5w70LGGXaCLd6L)9Ptl?bp^CBRh<%T>jGdFu|ioo zy?3ddc<+^Agi^;|W)nxy*PafRF6R&Y(M;IvX&}^}BTu*W>xi3K3y4Z3+90*Lk?v;` zvEgC$1U$2h3h;!k(dc@ZE+q|L=&|b!X6D&NxOpv0hTal?vRex)f(*Fx5w_WzWC3(7 zCMLw){Vbk0=Hqi`$>%+%!ys>KG=_e{hU30nY#KOD4-cXn4exD?Os~O!Q7^dq!$e8V zXs)2txhIrnD<@^?tbOERWjjGBTEiy7$$62`XEtEhIP&w(eU$dZrEu!OKzRS@5Xf>) zQm}z1Y0isyknTRUf`_# zEEgTsM9|ZJG>N3vi_sOjN9fzB1X9JubNkr{L8mh7>LgWRn;$1!%OQz|8;wbfvDlkT zu~4&J-6?MwX>_CjN&1n)K!B@Q)@00njINsvXXx_Ne2~3~?oy)G>|(0q^0E`%uM%-T zaF%rOBprENdTwA3p|R&MrJT4bH9n=q+YXS1L^|?X&haI^dBv)StOc^P3Stn`NGRGa zumIe5faO8>fiSqg$$+oDP8u7ZpzAxjvZX6Qx>lB{-XCfbRfsiW;~@&aASw6nf}nGK zC|-JkEhE5(tsLygJgG{zZLobh)wJJ`BIhZBxZ_E-345O;eR`hIuyq)Ake!!yjv8O= zgNM3X?Mtq^#iPsj6HWBbJQQELbJN1`esM#v`jHgT@nP#_g7C5~J+>ZV?~y{ho`_&A zi_wTFhU!x|bsxuGrg>HLf1dlERLRU&8fj`gahpF(UKa|TT{NDjB}zwo2XW%f&*>jR zdJa()m>NpJJpMFWBt%S_4x6W@sDP~BLjzw=pa%cCk(u#YzhH=Vy0{QM9?ko*x$qTF z=sZg_|7+RHY+{l4!{NbF&+4&n6b;PX6pQu@t>`L5!!Mg4le{^hF#vm?VX5s=I+l&! zKf~UWO~1I@t}DUk{0K%pvBZu;|B*ldD@1e*7ugMa}x(rbw%41GVPrs z=HHxu8_rVYJa>}{`jw*JNa-OR+Wubi;E zzC>J$Pzy+R#7C$|&VJK?gjI6KABZJh3Zm>xc=Ad_*N{P#z*Be zD(P93jg^gA>FJg9U75SGY3=f+wT((aQ)7$W>9RYOn)<5dX8AHte#Ne7JS|=<&U4yb zYn+YE$_C%+jbdRI{?9Z%KBZAnQr9%wm1dW-w#Jn@MaWTbxvsk$c4fncjp8)*KRWYR9*+!`M|k&sk;f;+JW26xP*SVwn`%}~uWDH1O3mm4JU&94Nj`HpYg?*ZcDa|l)m1=(PZV%7k(Q>Ar(tFx&&H}ko|)=V!sA@} zP~~N1DYNX(6?Ub`;i@Hp*i*>I;WveR3?>!v@tC!YM`B|UnX>wG9*rrNxe>3X@L>E? z5nr6E7*Zw9Xj^ej}+Fq=nV%M7j1>|iFVERH=m777 zk7x5#if>Rk89@$+!fEAPH|Vf`+4#{nu|-wg>#ple_l8R>QGJDTt>ou_!REhOd4@1I zHd=@r%ADz{mndTwSCHMmsNf@7rCPOjDrreB!sTdXgPJ{x2X2aZI+#)FOQKa}MSW9s zRedwT*|%dwiL0SLUvN$HWNF&sB|f@YG2dD5c`9Ei8#c;!c*`8h@A5eWuZB64I9tWH zLvx5j-krlo;}3Iqyf+g4pA&cH&gH|fVlFSj2j}v9JT;e(#OFVt*u>8xcKAa-MVgib zV(C0eg$46?4sM%A_!UbGm6a)3D>9VSO@)#q@a#N3Lft%KK2K7=Et}61DBSnV=LPu2 ze4Z9QNLb75uBvL`08C7PNj~=h zt=zPbhp2|mTF3+aUA6Vg?VeXB7V==yrf(rnAi>k5Of~7GOf`5ajSR+hBWWYv2#){r zB5szMlC;Wxms~E$zRFqEplnFrNaeJCjW2(0y@QWcLG9u2#k6M$;X$sFkQsXPgLhE6 zi6o34aYPD2lN=RNS@o1Hkd5hDpGKA6$$FOOrUA0q6*znMVat=6)`*&)mRLz zCfkdui7Z|#BL{4+CSDcQ_NQvRUrl>7HGG^`cwP-p4;kwE4Y;9(0KBh;C#uXPtWe{( zaSC=G=kYIoQ^QZJ#pB%1AK&TC-|0$n9A9bJd55(q}4JH#(Cih90=Y-OxcMs1oJ zfkx{8oR!%386O|*JBgN+P+Ql$rdqgwM5dqPIizakIbMP8MbuY4e~##1eyd$U`D{GT z%MI{hUuV`Ly%cSnIMk;EqMq4!qgQL-A^mp9vr67d_^G6H4dxbCYiD zSZ~a%U+@@GrS=O-=Cjmp;lVGcojq1efPd=?>KFycG4V^TmEQt|+4E>9K~_TYL2sxZx(j?E{jy!)Hu`w&0v{ebM9tNM2y_uTwhybC&#-l@_X^qD8DdFzQmJhQ_&>};Z2u#wfg+hC9bFEf4js-`q3$v z8|RmR4`1X{u=z6aRnB`nQnzt*ny_f}6#S}??CHJCljYi7A%5W)rSM@GeudZLf4@VH z`KXra_n7x7M3;m7fmCWaUvH16| zc~XcFm!UL_QxR+Vid$&^=CAlvy~k3jhPX7Dp!5D$yp7&1_?q8`)e8v)v_IQ(DD8{J ig1^e7q0KoaDhq@A)vp_|pQsnRzUTTEhkwIcGXED0k#M;H diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map index 4c47f05cfaee955fc054ebe58c0ee702b5f85404..9bcb937b6965c6bf9a69ff2e84dcb5c39ce2a3cd 100644 GIT binary patch delta 23 ecmeA^#@Ky~af7c1WAJ7_k6>oT(9MgyGsOXGu?SND delta 23 ecmeA^#@Ky~af7c1W8h{#k6>oT;LVG?GsOXGiwI8u diff --git a/src/subParsers/lists.js b/src/subParsers/lists.js index 1a4f43d..63b98d7 100644 --- a/src/subParsers/lists.js +++ b/src/subParsers/lists.js @@ -8,6 +8,7 @@ showdown.subParser('lists', function (text, options, globals) { * Process the contents of a single ordered or unordered list, splitting it * into individual list items. * @param {string} listStr + * @param {boolean} trimTrailing * @returns {string} */ function processListItems (listStr, trimTrailing) { @@ -95,6 +96,7 @@ showdown.subParser('lists', function (text, options, globals) { * Check and parse consecutive lists (better fix for issue #142) * @param {string} list * @param {string} listType + * @param {boolean} trimTrailing * @returns {string} */ function parseConsecutiveLists(list, listType, trimTrailing) { From 3df706248f2afb336642da60850ff2d059f143e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Estev=C3=A3o=20Soares=20dos=20Santos?= Date: Sun, 23 Aug 2015 03:11:11 +0100 Subject: [PATCH 3/5] fix(blockGamut): fix for headings inside blockquotes The spec states that you can be lazy and only put the `>` before the first line of a hard-wrapped paragraph. It also states that blocquotes can contain any other md element inside. This means headings and horizontal rules should be included in the blockquote but, right now, are treated as independent entities Closes #191 --- dist/showdown.js | Bin 63972 -> 64069 bytes dist/showdown.js.map | Bin 206552 -> 206520 bytes dist/showdown.min.js | Bin 23037 -> 23041 bytes dist/showdown.min.js.map | Bin 25356 -> 25355 bytes src/subParsers/blockGamut.js | 4 +++- src/subParsers/blockQuotes.js | 2 +- test/cases/blockquote-followed-by-code.html | 9 +++++++++ test/cases/blockquote-followed-by-code.md | 8 ++++++++ test/cases/blockquote-inside-code.html | 8 ++++++++ test/cases/blockquote-inside-code.md | 7 +++++++ ...191.blockquote-followed-by-an-heading.html | 4 ++++ .../#191.blockquote-followed-by-an-heading.md | 2 ++ 12 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 test/cases/blockquote-followed-by-code.html create mode 100644 test/cases/blockquote-followed-by-code.md create mode 100644 test/cases/blockquote-inside-code.html create mode 100644 test/cases/blockquote-inside-code.md create mode 100644 test/issues/#191.blockquote-followed-by-an-heading.html create mode 100644 test/issues/#191.blockquote-followed-by-an-heading.md diff --git a/dist/showdown.js b/dist/showdown.js index 6e34599c27d6f30a7edd5f2baab78eb6dba30dc4..0df22edc437ad75b29890d5b23b195d7faa7f535 100644 GIT binary patch delta 151 zcmaFznfd4!W&vw`Ek%XmjQsMH{PH{nBjb$%&*G!>^%crf6$%oIic=Mma`Kb23rq7$ zQi~PRGK-2!6pHf|N-`2lKuVGm^As`?%Tg6GQWH}$^U{kI67y0NGKz}16cm7lWabrT qrl1%xnen#VWa}jL$rEnNZWc`7W!jvSq|VG*ZJ=XZySXbhY6<{e_%@0F delta 56 zcmV-80LTBu^aJGc0}wkeDj^_qXm599Z+C7WF)^_a=3kTE*c-F5U=0G3K4Kk{ZeS;~ OzhWl?0V=cWWm=Sp6&9xe diff --git a/dist/showdown.js.map b/dist/showdown.js.map index e9e844fcf02bc5c10c194562995b9da1bf8cb4cc..c200746c50352db7721a200538eb0943cd469053 100644 GIT binary patch delta 2584 zcmZ`*ZETa*71q7Zo8Z?;oDe%C&esbBh=W7orfWcfVdtYj1|-=(MkW%Hj3iLUv5oUh z5<(}fG^^`VI8s-Mu%dR;R%WCLs#R-Ep|q6cgJ?h#XaikWsuh8$rdF)&*typx(>nEs z-}k-uocrA8JohuSfqmz9;_wSh&-<$3)LsjWj~U_1^W6d^ zq3=oCHm7qNbe=QA*gGDXhsP9_fa%LvDY`ymM)<~QguJkVQ}Im2hQ&+;_pj1G%Z!8D zliBE=XC^$klO@Aj7gW_&>2y|>)6Wf)7yL1zM;y$8S|?MFHq+wpV`}iHDh3jHGKBsV z2Wdsw5PCNsBkxdf@NfdW3d=DIF1cwLq&~WUr{Pi4+Ve%naizRSa(?{KzZvhuTGE0`2{bcp-tk3hLjs&``za zF0yi{I~teTQ6(WIxX9TIXWwsuK$?O*MJx|?(lM-`HbNv$h3tDOI=V@6O-LSYG-2Qb zNo`DI8H!XGQ_5Ht44;gXLq8rbqM>`ngpIYV2pzjwoTNe2n=Y|6F!(8*-UM4^5Q~ee z#M24(X$yS2Q-!ZD=>signXv041%j8CW6A{6W64igF^1n@x!|6t zm78{;L(dAoe=d@xg0_MTbK4ZWrb^gwJ)Km_M6#sORxN2n3BERIhiy}j!;&ex1TVw; zuSY9_yEAr~zb~3kw7oLLgU8oX3T=VoE14Sn+yvniQ}A2b^)o$cdS<|qT-t9qBZ-b# zR@->_FgPx!ljRgF$)=dwNfMW^G`JZy;56rYVQucKl%y~;Og;CD8Jm>S7nAZkbnxsI zl8RO>Zjt3khm@C-$`#^#&Eh~5jI3cbIL^2N#h1iMn`8wwaB9*Fp{pjn@S9lP1H1mZ zRU{_Bk6zTrk^*yPXgr}1SrZNyG9xbfAyL;>nBZZriR6vSN$wKngojrxn7u(*@rnr} z4`W8~R6^jE8FrjD!ks-TT)&bm!PfzMDJxi}x5}G9Fz{4Jm<5w=jSe5Rb`2~YGlTY3 zvPC5KeK%Q3fKENL;>j6u?&MV!LyuF>oiNCTA&J%CwOSajQoy%16>MYVwHd1B=2}$} za^l?}%fn#@xqW(!0-;Y8tlQ6)!nMPTA?pJNOk*7DfU_IZalC-yk=a}bIj9xeX}dRX zsW3jLV55cVcZ{WB;}4iw^iWiyQmJuli_X*kZLesv6qEl8GQs_<0RpqJR;iE`EzCz| zo241t)nZEABzI?2I67A@9U8-5$PUaZV7zXZEBuu(@{9#jQi*0Hn1<8HQlRlZ8Ll86 zroL1_+pI$9dbu=UnS_^2BC|$#p3`Tb#}GY#`B z3GtijJR67ne3#;Ba5Z>v-p@VEgLU1!j$X&Qc_Y34-OU^D<3wE!dV6>gdIxwWp6TJa z6zcc$W_mr*OY_DX+>E|no{lMB@hp6~m#;zHhxGN2UY>_lD|iZ~_3>5s=X{+3EBp9H zS~$|jt7YiOOmsVJeP4k4;-_PwsE=^mt-`lEreV+Da->P!r zOH;+gT6e4FZt_rM_rA{NyCpZR;{hIsiobu z$E!8DTC_HgH-^&g^0v494~7W%T6=uj2F=^niT9W;6-y6L0UtA6F8-~bFJ~?^43L1< z0bYYYen7JPa)8?wzKrILZqXB--vS>>A=rgdq$#Gs^R$DNAti zA;K*<#A~CgpF70Yi((%!aC=%GQJ`(>57NK4?5DX^JS_OHJKT^HOODA$`NUSNCjE%^ Y^H1}q;%O|@{7WCtKU4B^{+sdt092EAKmY&$ delta 2276 zcmZ`(eN>a@6+h2S-h}rJBvC^7a`5soP(T{A)1%0efT%~Q#?{SD*a&p2(^gC)1LZRU z)^(^vugyI@PQ|mHty^u4?K<0Tj;zx|WkrzIX_ZN~cBh_>o@JiX&CXhP-=yxWXIuVx z?t62e-~HX+z4v)#Eb+=%VrcPiG4yK*#rkYK^ScyG9od4;@92%~E6QE2Di?;N6dZV6 z#?Uzf*Ruwej(w&*;;h2)r%b%J$qcc%hus@`!t`i}E&am(@;hmtBLp%GaX6DQ`QoPLplZMC`NO#lf$EHq-% z`IQDOprx8-nIQwC;|g9opOT^Z9;^OeNaT7#q@$Xy$LMvFsKirinaNvBII=<5aB#E) zkG;x-gL<(L!=oPbZ;|Q5c~Okck0lID@5k|yEG-RvImo(M#|p{6m5r{!MA|#S$aiWL zn#p6&kU4>79uNt*@h=P>#f^%E;LyX5p$kc{G&7fsXfWXuq%y!*-b*<6;gC zr7_O`^#Ij1fe<|j01vYfNRTirvWkT4w9SUBU zDAXL#TusOIqLhwoVw8c4B8~hTghb~{#eVWE7Z&o?aHnaF89#Y@LGX`E@8m~`IDdHp zhF><~_-isn9ubD8!eBwq&n@(=B98E1sz!f-EFQzrOEoyrFN+q;{Cx$k3CehoQpp)& z+?hdMis(8$ZV0C0w$r?5XVS4`pMrr}3B6Mi&U-frt^Y{H2j8{u;MmZ8(}LE^Hm=e} z_6NE6h{HtgLEi1iB?TXyT7=#QWNqcn+|D4+PedA8Z|U)NR}wux#Nyn!yaBB>vS`My zU0JVLczIwpPTb%HZdJII5*==5)fgS4nGz*^g$wDKFKN$77TVw8*;Zv*SR`hnd$ocU z0~S&%xkp|HV>>@cK*^Dc>XZ$~-pQrNw}m3AaMqI<|D7P!;i?@i=JcNBLym%sx%L;Z+G_ ztQ6^_z9QCwZ#k~Nk%vPo4Y>6WCFoozk^465)-fzHgJEuIxt+&6>=8-ets?s^QAC9= zvO4!4u+Xt$k%u+cedPZtOS2OH`g96CYXUozRne(8go@z>3U<6NW8@bGJbfb_t#*a1 zPl|*-&-7`}wD?nyUh04}^0dM?<>tC(Rc&qX@$1tHOGwuSWwfXb*3q6esHYokP|MG0 z&UP()2h6A3?U1Tj5)9d_)&d22bb`7H@G0OX*iO0+;KK?fMgN>Qx^n;s^m}^fzEQ=G!XarMYEPZ*L zEj9GQLXJz?4Mp)IQ%hyGa@G9vHMM-t*Q|PdO%$zzY+75OOVGw8jefivoSKvpjlT&- TO8la34ml5ja@zU?JUjF+eDO1! diff --git a/dist/showdown.min.js b/dist/showdown.min.js index 989c04d168ea541c4dfbe42d0076dd0ce64ab9b7..5e40d7ca57489657679640d31856310ba683a1af 100644 GIT binary patch delta 54 zcmeynnXz#TBfq|uqC#;-etAlMd7gri@kah)mB|-XRW~=Q_%TkNX2L(2MXiyw+Cay+ Kc5|CrxiJ6?SrU8z delta 50 zcmZqN!uWSHBfq|uqC#;-etAlMd7gry;YR*qmCegk{23=Vsi;n#ZNfL1MXixhYjc-c GxiJ90qY(4} diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map index f36df2adcb9b4d9a1fe8f3af5c82afba046f4239..fdb1735217840224a24244c23431e005e16e863a 100644 GIT binary patch delta 87 zcmeA<#@Ky~al>zIM$gH4!Qzv%bVV7RCpYLyOcvI0=SX)lchT{8Oq(2_EH-(zjuH@W qWAZJV+^D-o!obzIM%T%?!Qzu0LWC!W=$LS3I+?rZ_&a7eO+M%^Hu;2(5)f}=be>$V yD=~SctuTwbqi@CJ2HiCh#mmULE diff --git a/src/subParsers/blockGamut.js b/src/subParsers/blockGamut.js index e2c24a6..1ede1b9 100644 --- a/src/subParsers/blockGamut.js +++ b/src/subParsers/blockGamut.js @@ -5,6 +5,9 @@ showdown.subParser('blockGamut', function (text, options, globals) { 'use strict'; + // we parse blockquotes first so that we can have headings and hrs + // inside blockquotes + text = showdown.subParser('blockQuotes')(text, options, globals); text = showdown.subParser('headers')(text, options, globals); // Do Horizontal Rules: @@ -16,7 +19,6 @@ showdown.subParser('blockGamut', function (text, options, globals) { 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); // We already ran _HashHTMLBlocks() before, in Markdown(), but that // was to escape raw HTML in the original Markdown source. This time, diff --git a/src/subParsers/blockQuotes.js b/src/subParsers/blockQuotes.js index 4b1782f..909aaee 100644 --- a/src/subParsers/blockQuotes.js +++ b/src/subParsers/blockQuotes.js @@ -14,7 +14,7 @@ showdown.subParser('blockQuotes', function (text, options, globals) { /gm, function(){...}); */ - text = text.replace(/((^[ \t]*>[ \t]?.+\n(.+\n)*\n*)+)/gm, function (wholeMatch, m1) { + text = text.replace(/((^[ \t]{0,3}>[ \t]?.+\n(.+\n)*\n*)+)/gm, function (wholeMatch, m1) { var bq = m1; // attacklab: hack around Konqueror 3.5.4 bug: diff --git a/test/cases/blockquote-followed-by-code.html b/test/cases/blockquote-followed-by-code.html new file mode 100644 index 0000000..a37d0e0 --- /dev/null +++ b/test/cases/blockquote-followed-by-code.html @@ -0,0 +1,9 @@ +
+

a blockquote with a 4 space indented line (not code)

+
+

sep

+
+

a blockquote

+
+
with some code after
+
diff --git a/test/cases/blockquote-followed-by-code.md b/test/cases/blockquote-followed-by-code.md new file mode 100644 index 0000000..b0426b7 --- /dev/null +++ b/test/cases/blockquote-followed-by-code.md @@ -0,0 +1,8 @@ +> a blockquote + with a 4 space indented line (not code) + +sep + +> a blockquote + + with some code after diff --git a/test/cases/blockquote-inside-code.html b/test/cases/blockquote-inside-code.html new file mode 100644 index 0000000..d0c40b5 --- /dev/null +++ b/test/cases/blockquote-inside-code.html @@ -0,0 +1,8 @@ +
> this is a pseudo blockquote
+    > inside a code block
+
+ +

foo

+
> this is another bq
+    inside code
+
diff --git a/test/cases/blockquote-inside-code.md b/test/cases/blockquote-inside-code.md new file mode 100644 index 0000000..eeb225a --- /dev/null +++ b/test/cases/blockquote-inside-code.md @@ -0,0 +1,7 @@ + > this is a pseudo blockquote + > inside a code block + +foo + + > this is another bq + inside code diff --git a/test/issues/#191.blockquote-followed-by-an-heading.html b/test/issues/#191.blockquote-followed-by-an-heading.html new file mode 100644 index 0000000..b594288 --- /dev/null +++ b/test/issues/#191.blockquote-followed-by-an-heading.html @@ -0,0 +1,4 @@ +
+

a blockquote

+

followed by an heading

+
\ No newline at end of file diff --git a/test/issues/#191.blockquote-followed-by-an-heading.md b/test/issues/#191.blockquote-followed-by-an-heading.md new file mode 100644 index 0000000..f60ccb8 --- /dev/null +++ b/test/issues/#191.blockquote-followed-by-an-heading.md @@ -0,0 +1,2 @@ +> a blockquote +# followed by an heading From ed2cf595b0bf920c3ca08fd0361387badc91ebd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Estev=C3=A3o=20Soares=20dos=20Santos?= Date: Tue, 25 Aug 2015 21:10:49 +0100 Subject: [PATCH 4/5] fix(blockQuote): fix 'github style codeblocks' not being parsed inside 'blockquote' Closes #192 --- dist/showdown.js | Bin 64037 -> 64108 bytes dist/showdown.js.map | Bin 206895 -> 207077 bytes dist/showdown.min.js | Bin 23041 -> 23082 bytes dist/showdown.min.js.map | Bin 25354 -> 25403 bytes src/subParsers/blockQuotes.js | 1 + .../github-style-codeblock-inside-quote.html | 15 +++++++++++++++ .../github-style-codeblock-inside-quote.md | 13 +++++++++++++ 7 files changed, 29 insertions(+) create mode 100644 test/cases/github-style-codeblock-inside-quote.html create mode 100644 test/cases/github-style-codeblock-inside-quote.md diff --git a/dist/showdown.js b/dist/showdown.js index 89a537bb766f7b3f6926d39519d9dcd22a8aa9ef..c49a8a6f6cf13fb1aac5c21168d80faa3b39cca8 100644 GIT binary patch delta 51 zcmZ4bh55}FW&vw`Ek%XmjQsMH{PH{nBh!rnqUn=)y96g2q)SYm@5IWKR5N delta 31 ncmaF!g?Z^0W&vw`Ek%XmjQsMH{PH{nBjb$%qUnos(kBA|!fXqv diff --git a/dist/showdown.js.map b/dist/showdown.js.map index 4d56677b2306414962e6c4ce6cee865e7e6323dd..776b97463e9ac9aae67f67d11e67b8145688d61e 100644 GIT binary patch delta 93 zcmZ2~f#>N(o(->WP4Ae)$TPh?nbBbSj0ucFlQ+y|oiveka={llkf6@w?h7K5D{m@* w#3w(vDY7~5wh#-WadYGS?Tz;t1D8%ex|&IlMN=cGaC#yev()zOEld@Q0pY4B&Hw-a delta 66 zcmV-I0KNa^(G0K946y6klkoHkllR&zvyIzd1OqWcN|VtWACtf`3X^T<36r3h29v4j Y8G}IJw?N{>;et9m4yOOqmSnyAOHXW diff --git a/dist/showdown.min.js b/dist/showdown.min.js index 5e40d7ca57489657679640d31856310ba683a1af..8057c7527a779ab0a80c32af023129f30c7bc881 100644 GIT binary patch delta 48 zcmZqN!nkS+Bfq|uqC#;-etAlMd7gri=|+BO^~uRD!W?NjNjk}zI%$*ZT%dI_5hWx$3w& ZI(nKqgQ(zO9d}3PDwka6&HMCxOaNnc7T5p) delta 43 ycmdmejIrw&;|5+mj&f&59e>9vr^z4v#U^X(X|fkPg#ZO|CP(X)Z)VoFFaZEirw&vA diff --git a/src/subParsers/blockQuotes.js b/src/subParsers/blockQuotes.js index 909aaee..257e068 100644 --- a/src/subParsers/blockQuotes.js +++ b/src/subParsers/blockQuotes.js @@ -25,6 +25,7 @@ showdown.subParser('blockQuotes', function (text, options, globals) { bq = bq.replace(/~0/g, ''); bq = bq.replace(/^[ \t]+$/gm, ''); // trim whitespace-only lines + bq = showdown.subParser('githubCodeBlocks')(bq, options, globals); bq = showdown.subParser('blockGamut')(bq, options, globals); // recurse bq = bq.replace(/(^|\n)/g, '$1 '); diff --git a/test/cases/github-style-codeblock-inside-quote.html b/test/cases/github-style-codeblock-inside-quote.html new file mode 100644 index 0000000..85fa51c --- /dev/null +++ b/test/cases/github-style-codeblock-inside-quote.html @@ -0,0 +1,15 @@ +
+

Define a function in javascript:

+ +
function MyFunc(a) {
+  var s = '`';
+  }
+
+ +
+

And some nested quote

+ +
<div>HTML!</div>
+
+
+
diff --git a/test/cases/github-style-codeblock-inside-quote.md b/test/cases/github-style-codeblock-inside-quote.md new file mode 100644 index 0000000..23c4714 --- /dev/null +++ b/test/cases/github-style-codeblock-inside-quote.md @@ -0,0 +1,13 @@ +> Define a function in javascript: +> +> ``` +> function MyFunc(a) { +> var s = '`'; +> } +> ``` +> +>> And some nested quote +>> +>> ```html +>>
HTML!
+>> ``` From 50256233eb2a8d067e37e693df136f3c68250098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Estev=C3=A3o=20Soares=20dos=20Santos?= Date: Thu, 27 Aug 2015 03:41:59 +0100 Subject: [PATCH 5/5] fix(tables): fix md tables being parsed inside indented code blocks. Closes #193 --- dist/showdown.js | Bin 64108 -> 64108 bytes dist/showdown.js.map | Bin 207077 -> 206852 bytes dist/showdown.min.js | Bin 23082 -> 23082 bytes dist/showdown.min.js.map | Bin 25403 -> 25403 bytes src/subParsers/blockGamut.js | 2 +- .../tables/table-inside-codeblock.html | 8 ++++++++ .../features/tables/table-inside-codeblock.md | 8 ++++++++ 7 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 test/features/tables/table-inside-codeblock.html create mode 100644 test/features/tables/table-inside-codeblock.md diff --git a/dist/showdown.js b/dist/showdown.js index c49a8a6f6cf13fb1aac5c21168d80faa3b39cca8..0433f6b0baa620b14dfbb63d604cd9f7d6744da8 100644 GIT binary patch delta 48 zcmaF!h55}FW&vw`Ek%XmjQsMH{PH{nBlC>{%MvGlO-z}rpCCJVTcXnB`~Cn-(VPmrCwEiq+segfO(_$1yL E0Mb?xkN^Mx diff --git a/dist/showdown.js.map b/dist/showdown.js.map index 776b97463e9ac9aae67f67d11e67b8145688d61e..050ce34b44b380af5eb92434c735d2fc7a63949c 100644 GIT binary patch delta 946 zcmbu7OH30{6ozweTOPxs0~X}nfru4stwaNn8t6bP2nz`&kRVZrRt0fdOCd;FTB32| zBh?ci|EfCzL!Elu5IeGiM{1V}AyZ{nv4vM0um7Xp;Zm3BC z*C~pfvSPRaCYBE1&sJi35ZazA+2uVrwosKOOU$;NR#=}$IG9{Wm7OGyHYg@AUP<&2 ze5XTUmT2I{D=qNv%amy&b`(vd0<~{Q2_y#8{Kh-?fl%X&_ji3H%4GBJck{ zIm8xED2^{GU_>Rw>NnRJCQL#5h}1~1LRS}#4MmV`<(mOi7oc+*R(vL!(<3=KMjL65udtjA#KmhhvO zHes=k=A++7OR&R74f0AfNZm|rHVZbV(Cl>gjXEVy?|{%gG~gJll}p3DZsC&SDqiWL zyD@N^rXxQ_i?QJ$&BHrml*i70KTSJ@Ok86HBH@^i>M`+yrl90!w4S_(26akeVp#iQ{1{8o*}m+cpM`h7Oh+IRao#~ NiYk9PJWlJM`~fl|N0tBp delta 827 zcmY*WSxA&o6z1H2X7v9Zozcd|y>UrVa)}mcaT%8g6&eV7P{|PrLP>{tDREpvi4ck( zPxjd+L(%e-QxOtIOpuV)=qNt;WFZ8?koe+L4|PYu?CIRY`Of*4I~+FuTr>yTW?|PT zjjP9Our81d^Rr~*z-$U!BV=Ujs6ia5Y2Q#0!((35f4Ljna|xhNhh!v zqSB~Yji;9i*qWeH7j9Hi`i|X&6_v}vF6b6g;k!w(Fj;9I>y9{fuW8UvQx-c8XdHg0 z!4((HC!8~yqT*t+gr04Z(Kvc!E)Co9xE8PSV7`j+<7DUHmStPCTM>swa}B8dAnip3 z2Ex?wpCHjykA*HO!A3LLrP%f*vLm^ac+4a11)rJN|F(wFn1Dz*CG*0NB$S_{wCkhaV2qRo3B^~QNk&9K6V!{4CktC4? zeWG!99s|Eq#ACisUVqRhGI7@_Qlo9j?#qIlevzqoTf6XDQL?etFLHMG)6v#1viGzT z{Zg2uGs8R}oRY3-Ks3lQHXs^h`92^DcVz0HgaJi^68%rB`?s{#Gbqxd7gXFH7g?B? M6t=0EK~eSMFOU5y&;S4c diff --git a/dist/showdown.min.js b/dist/showdown.min.js index 8057c7527a779ab0a80c32af023129f30c7bc881..327c987ae6c021f0dfa8b8d84144b07c9decacf8 100644 GIT binary patch delta 39 vcmZ3rg>lsuMt*%QMTO#w{PL9i@;n72^Nsv%s*|^OdD!=)ws;LP87pV>; delta 39 vcmZ3rg>lsuMt*%QMTO#w{PL9i@;n72(~bOXs*|s&%1@rE>bUu delta 41 xcmdmejB)od#tl5WlQVQhCx?efPUg{dX7VkY?5HF@`A>+!WGh|a%{O(EOaVbz4$}Yt diff --git a/src/subParsers/blockGamut.js b/src/subParsers/blockGamut.js index 1ede1b9..200266f 100644 --- a/src/subParsers/blockGamut.js +++ b/src/subParsers/blockGamut.js @@ -16,9 +16,9 @@ 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('tables')(text, options, globals); // We already ran _HashHTMLBlocks() before, in Markdown(), but that // was to escape raw HTML in the original Markdown source. This time, diff --git a/test/features/tables/table-inside-codeblock.html b/test/features/tables/table-inside-codeblock.html new file mode 100644 index 0000000..ced23c6 --- /dev/null +++ b/test/features/tables/table-inside-codeblock.html @@ -0,0 +1,8 @@ +

some text

+ +
| Tables        | Are           | Cool  |
+| ------------- |:-------------:| -----:|
+| **col 3 is**  | right-aligned | $1600 |
+| col 2 is      | *centered*    |   $12 |
+| zebra stripes | ~~are neat~~  |    $1 |
+
diff --git a/test/features/tables/table-inside-codeblock.md b/test/features/tables/table-inside-codeblock.md new file mode 100644 index 0000000..6b82cdc --- /dev/null +++ b/test/features/tables/table-inside-codeblock.md @@ -0,0 +1,8 @@ +some text + + + | Tables | Are | Cool | + | ------------- |:-------------:| -----:| + | **col 3 is** | right-aligned | $1600 | + | col 2 is | *centered* | $12 | + | zebra stripes | ~~are neat~~ | $1 |